From nobody Mon Mar 07 15:47:25 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 34B9919F42D5; Mon, 7 Mar 2022 15:47:26 +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 4KC2s947Vwz3tG2; Mon, 7 Mar 2022 15:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646668046; 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=taOPgX8GgMrJ671tIKRRndbcn++xyagexGdH0NsfjcQ=; b=fWuZJws2LUbm7hxiVn7435hNW5dDgljS79TuGimd8oSY6HeDxHkkYQXV+a4mO5riZypYV8 +w0Bb+PwLLNENnjZyDLp4avEjNvsl0D4Yz0BOZXhoi2NOLWno4EzqbP+MnoAG4QxHtXFhQ kWa7sszwhyv4oGPf0Arbkwy7jDXsdtq7FfTZsjWUEbkGGU86L7vr4XPaBtczo8DlAvhwRB lyOlGNN6nHcv9OREcpXQJZ/kkQRr6JU1vjUgNuXdiERtZkHdtT9r0l9I8ggUmwQSuN9L67 5rNcs2HBAGF4HUfKOMWs1gUIzih/3xJg+3OhKs0a0rsaLe4jRXTXAcWtyz+ltA== 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 392D43180; Mon, 7 Mar 2022 15:47:25 +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 227FlPMR049302; Mon, 7 Mar 2022 15:47:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227FlP2M049301; Mon, 7 Mar 2022 15:47:25 GMT (envelope-from git) Date: Mon, 7 Mar 2022 15:47:25 GMT Message-Id: <202203071547.227FlP2M049301@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: 4a80132dcd48 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 4a80132dcd48d6dc8802ead5b38a52ab24f72785 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646668046; 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=taOPgX8GgMrJ671tIKRRndbcn++xyagexGdH0NsfjcQ=; b=OXowpv7szjWc/EvVYvIpruJxzdnrhqjPT8tboi2cEDhJ1HDFCAKzXjEsqDJK+CbsnAT6q0 GlpIWPsQhksmOLgTk7LhQLKzMhEBSrMGVp5ZvhL6WTrFRBEvVs9HCpkbf6BD3dRtCyMC5D TIVj6tNebeW6zZ48uQ0GDSFi2fbr4bChQxNXfA+CgSoXimpzAB1hZb/n0m7PD3Om8zc0F7 WqsuEfWnTVk0PYH1k8oDEaqlBRDy4daBRbRzf4I62vq8kssgWcbSXaJcZceiVEmc9Qws01 lvv01UIMnRIjnF9VVKcpMHo2CoiZn+CYmE0SXB3XFY/Zi0i4ioPmKNcs92fGsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646668046; a=rsa-sha256; cv=none; b=fnX5oxNCE+iI1hZ1NxldsOotA/wn/DWemMHjugIYG+HEbuDGW/lFdbE6KV5pWhVPnVc2bK RAoFiJlEfEgWrmqvw44yxx8Np1u8j7VuQcoF58e303X7afj3+HvYD3u/c3qVB8A6mJ6Wdx HS9AnXxhEWHDArM9CuFfREoFHS075EUZcSi2ihkCLox6XnLAq4cPoI6SsI2RM0uX9tJiVV R8epRDTFrY4QAX+Rs/8g2efW+5g7KotKfo/K+S9PEOD6OxzfoRNybIumiFKHtbwC4+SY1Q hn18xuey/8VP5Xnd/wYTJP4EA4IAVpq0QTHb/l/QrqiwV0rXHeewLxF+muMTaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4a80132dcd48d6dc8802ead5b38a52ab24f72785 commit 4a80132dcd48d6dc8802ead5b38a52ab24f72785 Author: Mark Johnston AuthorDate: 2022-03-07 15:35:59 +0000 Commit: Mark Johnston CommitDate: 2022-03-07 15:45:24 +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 bbea8041360a..66a035554b17 100644 --- a/sys/kern/kern_rmlock.c +++ b/sys/kern/kern_rmlock.c @@ -452,7 +452,7 @@ _rm_rlock(struct rmlock *rm, struct rm_priotracker *tracker, int trylock) atomic_interrupt_fence(); - pc = get_pcpu(); + pc = cpuid_to_pcpu[td->td_oncpu]; rm_tracker_add(pc, tracker); @@ -517,7 +517,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();