From nobody Mon Mar 7 15:47:45 2022 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 8BF6F19F483C; Mon, 7 Mar 2022 15:47:46 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KC2sZ1NStz3tW0; Mon, 7 Mar 2022 15:47:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646668066; 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=aNUAjdkQf6PV/oYTEapBBX4q8LY94QBzOgbKrtZQuSw=; b=Tmytn7i91HX/L0ra27EsqV62TvBA08UYW7ltG6gsVCEgoGjKtl4IJy4fO+T/nGQufPiOIS IWYRWcdHN9/gQaeYCWML4V2W3uXVjn1mvG8ZI+GGvMtgRzQF/2eDz9uz0qO83Ecav6dLVM 4zUn40XpWQi2O5YhBrQXp+Ex+gMIyvOweJgZIiTVoup3ANUdFb0sGNT1erNVdQJHSLU7Ho hDsujeNFl6o/UCuZxBpxIybX+aAvo4vDbFvbF9fEqLYd3Kufh3ZLv4bqxX0a8PjKkvjjCd OBLS8rfuZMTjLTgoLoe/FI7mgHYXzStB7LNJyFF7xjX6HosIJdq4ShkUTsUG+A== 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 EEE792E66; Mon, 7 Mar 2022 15:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 227FljaM049465; Mon, 7 Mar 2022 15:47:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227Fljic049464; Mon, 7 Mar 2022 15:47:45 GMT (envelope-from git) Date: Mon, 7 Mar 2022 15:47:45 GMT Message-Id: <202203071547.227Fljic049464@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ea683b4bae98 - stable/12 - rmlock: Temporarily revert commit c84bb8cd771c 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: ea683b4bae98f17dd978fbafc734d8eb1dfd66dc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646668066; 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=aNUAjdkQf6PV/oYTEapBBX4q8LY94QBzOgbKrtZQuSw=; b=aG4nL54GmXXO03MkWvSrbkjio/SZv52bZ1HxA+dgEAljZfU+B/gPKP/TyYaVRtnTPBVWox z1xze2wO/oRtqS1lpFHG5NFSo67YH0j34hDrqCQ3WgwNXEwvMayHQzuR3sbdEPH8Rdo3+U Obv1QKyqVeyXcR6qVFMOKhP4fl+34QeIhFQWVWGa7Gi7GQs/AujuKVqDPAXvhSnKFyKem6 6YX8toR9EfEOEkCDIKRJAYwvrLImnmu4sjiC92nQTs0XHvT0LaOBiFeCkcYqgr1RruoB14 kg4SiR4uBT5Sx4Jqci4MTEr5hQH4k9SFblwz2WvZnCD44cwGT1KCHJa5aocO2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646668066; a=rsa-sha256; cv=none; b=csqGWuQ7z7H2R0kyHG0vtIRUcN946ENw51zwQ7wFmoK2finftsjcu0Mw23wi4Xya86fy2i KZWzSWzxw9DkizcQaJ121Pww11PBEc8uVbX/vLXv9xVOra3z/nIp0VXwb9HKEpQKgT1amF VF3RqrSf92892rk9axij8kpGvhaZRCwAtGykbrCtvEAtkExPvu26BSrt7UYVayCDUFT6Up 2EfnrEnWPmr0hpGFyqMHZ0G+vsoyH5+A4jRjmjz2OqhuOaZxLM/KHm0SpjHsu++1kVe3i9 iZYjWJ3fr15IQ4ZwA0e5LcL4Zi3b4cpyLOnaS4qnKHSzttNHO8T+QzeFch5DIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ea683b4bae98f17dd978fbafc734d8eb1dfd66dc commit ea683b4bae98f17dd978fbafc734d8eb1dfd66dc Author: Mark Johnston AuthorDate: 2022-03-07 15:35:59 +0000 Commit: Mark Johnston CommitDate: 2022-03-07 15:47:38 +0000 rmlock: Temporarily revert commit c84bb8cd771c It appears to have introduced a regression on arm64, possibly due to the fact that the pcpu pointer is reloaded outside of the critical section in _rm_rlock(). Until this is resolved one way or another, let's revert. Reported by: Ronald Klop Sponsored by: The FreeBSD Foundation (cherry picked from commit afb44cb01018eb1363cb4ee20a31534b844d00f7) --- sys/kern/kern_rmlock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_rmlock.c b/sys/kern/kern_rmlock.c index 45290ac5d562..c51c99e6eb3a 100644 --- a/sys/kern/kern_rmlock.c +++ b/sys/kern/kern_rmlock.c @@ -451,7 +451,7 @@ _rm_rlock(struct rmlock *rm, struct rm_priotracker *tracker, int trylock) __compiler_membar(); - pc = get_pcpu(); + pc = cpuid_to_pcpu[td->td_oncpu]; rm_tracker_add(pc, tracker); @@ -516,7 +516,7 @@ _rm_runlock(struct rmlock *rm, struct rm_priotracker *tracker) return; td->td_critnest++; /* critical_enter(); */ - pc = get_pcpu(); + pc = cpuid_to_pcpu[td->td_oncpu]; rm_tracker_remove(pc, tracker); td->td_critnest--; sched_unpin();