From nobody Mon Sep 02 08:50:49 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 4Wy2XT6lR7z5Mp6d; Mon, 02 Sep 2024 08:50:49 +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 4Wy2XT1v2pz42MY; Mon, 2 Sep 2024 08:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725267049; 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=SpT5rEju7Ew++r/DNDb2jrNqM3ebjua9OoVHfLc7JXg=; b=o/YunXOcHnJGThmj2fUgTymiLIoZ9Dv9fa+EJJd6mBwrbcUpV8P5ZBIQu0XfUOLeMgGU4a SZHyXfTlvwEz3XRss0o89CjVa2VQdsG6Scu6ZVuZy7wTcJa5Xms++U1T+Y30HaFSWUmp8X JGpfkQxYTJoiCwLwwAl05DQiXT26owBw+1c40qKNj6Cj9Zwjbk11L/kBbwucpMutt3YMP7 q6PrGAjvJqn7FSLXMi+3Bzh6PuTAAMQLIk5NqJrz8ZG+DKM5iZFBzML4OqgnYYQn25otd/ +qk5aJ4em673BSsAAUxcZDNiYYxayGauetlIEcjBNKy3bkvdAGYMDv+mDdC6SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725267049; a=rsa-sha256; cv=none; b=QgRdXxcpW8fEZ27uQoUZOFjctdcePO8JAJwp49KQ7PDUCj2J4ZUIuGDpmCQ8vjmOE6bn2A kh9S3GDbCIA4X4K00Yu11vuP0pIq3WUwLs4UFaOZ7z509SKPL2k+Myu6/9IAa+MxV9IRIU 3OeHswUlY3ISv2tCTo+Rd7vv4M/5s1hiI6obNvH9YsPmfM2i1aohgDAtTYU9j+7/iVkofn 29OEHvAXeSR0arSebnZBFx9R2D98FiOI5yVtIG6gbq/oqDt+MV3gIFCBv7NOZd6Nq6y/M0 3P8xNdRCBOkGAh91PM6QV+btASPT4Qb4N0ARinvCBL+OxT5NDQdbydDguiVv2Q== 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=1725267049; 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=SpT5rEju7Ew++r/DNDb2jrNqM3ebjua9OoVHfLc7JXg=; b=etm6+SGgdu0MGZ2ksuzYjYoXPun2cgFi36XOU+tRGmhAqrknrfT3mWs76XtUu1kQIEKYrb SXt6DJm+fkhgq6pPUMeJkmgtMuZ+TpaL2D9RWotjGCa1LMFulzNG85lUxc1MD/anObaQa8 /gt1h+1/Unzb2+7P/c+EBvBxrs+TK+UtCCgXNV7uyYU4rQJ4JNkt24EJWZInY0JB42/J2V SdYkmrRZMo+lU9Y5i4+Ta88OpzsVRvL0XXcfv4/wEgj9LLYwVPUjwdaAgkFImOWCbiZPYK XxhrcFEv4vySseVg+Ijnd/uYx/4zqn/J1wbVQWNf6w9WMwveEqS+V/1njwVYZA== 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 4Wy2XT1TJpz1597; Mon, 2 Sep 2024 08:50:49 +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 4828on55007411; Mon, 2 Sep 2024 08:50:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4828on7K007408; Mon, 2 Sep 2024 08:50:49 GMT (envelope-from git) Date: Mon, 2 Sep 2024 08:50:49 GMT Message-Id: <202409020850.4828on7K007408@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: be3d6ab9e147 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: be3d6ab9e14790848e9331db27d48f92d6160bef Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=be3d6ab9e14790848e9331db27d48f92d6160bef commit be3d6ab9e14790848e9331db27d48f92d6160bef Author: Andrew Turner AuthorDate: 2024-07-29 10:28:15 +0000 Commit: Andrew Turner CommitDate: 2024-09-02 08:49:38 +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 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];