From nobody Mon Sep 02 09:12:42 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wy31k4J06z5MqZS; Mon, 02 Sep 2024 09:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wy31k1JLvz4CSl; Mon, 2 Sep 2024 09:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725268362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0lTnEKAp1/RMXWnO32ex32GHNi3sxSWJhEY+6mHle/8=; b=suyiKH96ctbaTP+V/AxlUzB6DDrsnKaiN1MnsctniHmAIiRWbxlTBwIM2Pvjxul/+ac8fs XDIdeVUy/huhuWTsSQyQd7qkANRztLp98ojek+bx9gf30+mcECv2YljIldL5XKxM8AkhJj 3leqTT9onBZ3DLLzLcJSvTIBESjL+VetPS0n1U6jcbu24X4bk4XiGObzmyX1ITgnjn8SD4 SeL/dsJw5fVUxpvHLeS9XgEYez6hG3DueXjuhaSfsccgKcEc89spb5MMup8d4iVXg+Afy+ PxCX45xK57pPeFsPTllRv4VtzeKHlWem3mC4GQf8G5WxPdyE09y9pFKI0mHzRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725268362; a=rsa-sha256; cv=none; b=dnUaflfF7tTcbrIeZvNtbHj+n08bbLdcQLp+Yxn3Dv5btS0Q32I9G6LDmlsPq1kec6TkMR auxCrR5qq2Bh7Tldu+W9ACV2rSZQvg+gIbBw/56Dnb9TQAMLYv0vTQWKe8uxar8A0eKxCH dImdiWL2ZUVg+A0QiTYP64Oe5/unGw8fnoDVrgiBaLCKhHG1FRD5pth/WX4JkXXY/DyZb4 TayyYvzX5cVltZPR/jXL3wNDgw0EUX2sJgbc0tz2lQP1w8Fbl/sYfhVlTF2INq9QmN0fwz cm5ASsdnx7Y4y04EE5I7owcWmk1KnPYMv/Ev1J0tmnHzzUUvAnm3YTEWHeA/vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725268362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0lTnEKAp1/RMXWnO32ex32GHNi3sxSWJhEY+6mHle/8=; b=EfVb+FjnIDX+/RUlgY3+CBuhNjGRrLSQSL1CXMmx2yqmzJ+AID53XHRtz3w6M4XWNukAZa 3I2VoYEJucsWpK8h+g0nIt4ZADDTMS4Sjz7e7kedIXhL8pou5CGHHZ64afdrCOjHS9qh8f +Akfrlb6cBMoQa17DQS/BtNT832ggghOtI8ZF/7eql/WJayntCNjfqvfRcGnffVEOnrYVF pEB9pJQKDx8BPClFWo6Xdyb0OHAZz4JEy9QxfoJE5COSIAJINZVrKfIafucCrtQQfeUpHC CfeXiY+7NrdtVhvZLXuZSkHZbfGsP541YHPbZl5RbsSc6AE+H2dTKwhQiZQu8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wy31k0vvYz160k; Mon, 2 Sep 2024 09:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4829CgF4049743; Mon, 2 Sep 2024 09:12:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4829Cgcw049740; Mon, 2 Sep 2024 09:12:42 GMT (envelope-from git) Date: Mon, 2 Sep 2024 09:12:42 GMT Message-Id: <202409020912.4829Cgcw049740@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 6793d9305bfc - stable/13 - buf_ring: Remove PREFETCH_DEFINED List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6793d9305bfc8b758f2308d9ea437e80fc02b3d7 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=6793d9305bfc8b758f2308d9ea437e80fc02b3d7 commit 6793d9305bfc8b758f2308d9ea437e80fc02b3d7 Author: Andrew Turner AuthorDate: 2024-07-29 10:28:15 +0000 Commit: Andrew Turner CommitDate: 2024-09-02 09:11:57 +0000 buf_ring: Remove PREFETCH_DEFINED I'm not able to find anything in the tree that ever defined it. Remove as it's unused so is untested. Reviewed by: alc, imp, kib, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46148 (cherry picked from commit 5048308bdb76f40e88c9133658fc61d82158ded2) --- sys/sys/buf_ring.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/sys/sys/buf_ring.h b/sys/sys/buf_ring.h index 0645f97aa77c..ad87a48bc695 100644 --- a/sys/sys/buf_ring.h +++ b/sys/sys/buf_ring.h @@ -165,9 +165,6 @@ static __inline void * buf_ring_dequeue_sc(struct buf_ring *br) { uint32_t cons_head, cons_next; -#ifdef PREFETCH_DEFINED - uint32_t cons_next_next; -#endif uint32_t prod_tail; void *buf; @@ -204,20 +201,10 @@ buf_ring_dequeue_sc(struct buf_ring *br) prod_tail = atomic_load_acq_32(&br->br_prod_tail); cons_next = (cons_head + 1) & br->br_cons_mask; -#ifdef PREFETCH_DEFINED - cons_next_next = (cons_head + 2) & br->br_cons_mask; -#endif if (cons_head == prod_tail) return (NULL); -#ifdef PREFETCH_DEFINED - if (cons_next != prod_tail) { - prefetch(br->br_ring[cons_next]); - if (cons_next_next != prod_tail) - prefetch(br->br_ring[cons_next_next]); - } -#endif br->br_cons_head = cons_next; buf = br->br_ring[cons_head];