From nobody Mon Aug 19 11:03:24 2024 X-Original-To: dev-commits-src-all@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 4WnV7w5g5Sz5Sp3f; Mon, 19 Aug 2024 11:03:24 +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 4WnV7w4yC9z4S1x; Mon, 19 Aug 2024 11:03:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724065404; 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=oyZasvq2xhSTrD5V1Nn/xAPkdp48WqhSo2iXOL9bKBE=; b=oR2gUx4tVQaldAfxv59OKEIZBjiIrqa3gZKj7l8Uwam5BzNaVqAGSP9e3toKoICpWKqALa O/O3uWIRfG0B4ybuaoABZ5fop85kjvxcHMp0E6JKdKfcVCkdV/fkCJWWAwC9ordFG1JwUV UAUdqHAZ2zNw+HBKUe/tUk9qDxMmzA07WFKtZ76Ocg/rhe4C9ndl8h7QtC/1AM37Bw/hTF GQYWue44EOtuPvuejZhnJzvx+reppshxwUCVOQqRV5e8VsP+yxmu6DSqu/08MOMAomw9yX Q2GigNYY1DZFR7Ncn0CVJsHADFX5JThtkL3PPLey+zdhGj6kh3JcIM4T5wOnMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724065404; a=rsa-sha256; cv=none; b=rOgezABVffJtAQL7UYz+Mc7Nw/XAQm6JmtV5EpkQ9IgfEm/4B8CPURbBewO+zIYMBCqpah 55UkUVp/d7DeFe4MpxilfXuDRbXGF33VdmX6kTmRiTjerHgpDE9vikVJ4lYlV6/Q669T6b 1NxvGVaaOO1p1T9uRjZYHRWJQzAkdYUbhaHcANrmAkS3x8HlsWV6hoxwca5noDATtqJ5fT TMydGvo+4947NSmBCoh5isgUBPkcm0bTK9joF7yD2dmqYgX3cQUKcuNHd8bzQx5mOke2a3 96tN2EuIRGqOyXP3jhC2V+diWU+TTiyNHk9t4wV+l9iLiOFxMRb/SCLWVF5R3g== 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=1724065404; 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=oyZasvq2xhSTrD5V1Nn/xAPkdp48WqhSo2iXOL9bKBE=; b=aI609e7ZTcztf2PGU/kudERao7FMiGzUycum6H6AJIsobQMzE9yA16Unu/yXQ34tASXV41 PnMV8sHOO5Y9JVThx4qOwHH0qhoYwt+eiuPTSRY4cikwmY3OHuNE4kjNGFgBIlYU+L+/gK jmomr2tHfJQ32ooKFxyZdtI1G3b4hiHlaroaiiDdlJJ1CDu7Jk1fwYODScXY87P3YzLPxY cleYYTq/CAhEIQn/Gq8jYCk977CMlXvrZt7ODdN8Cjl2TMfPZ06qHyXd1z0kDC8LAB2JQQ zjUSaVWV1gRCk6gpHr9EYEWTLCGuuF6fXbTt5PGRczjcUCxJWFHiTjUg5o7Qsw== 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 4WnV7w4YcNzF9l; Mon, 19 Aug 2024 11:03:24 +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 47JB3Ooh037441; Mon, 19 Aug 2024 11:03:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47JB3OVp037438; Mon, 19 Aug 2024 11:03:24 GMT (envelope-from git) Date: Mon, 19 Aug 2024 11:03:24 GMT Message-Id: <202408191103.47JB3OVp037438@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 5048308bdb76 - main - buf_ring: Remove PREFETCH_DEFINED List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 5048308bdb76f40e88c9133658fc61d82158ded2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=5048308bdb76f40e88c9133658fc61d82158ded2 commit 5048308bdb76f40e88c9133658fc61d82158ded2 Author: Andrew Turner AuthorDate: 2024-07-29 10:28:15 +0000 Commit: Andrew Turner CommitDate: 2024-08-19 09:04:24 +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 --- 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 cb18175c3a75..6bd3b91dcd04 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];