From nobody Mon Mar 07 15:43:35 2022 X-Original-To: dev-commits-src-main@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 1BF2E19F0BBD; Mon, 7 Mar 2022 15:43:37 +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 4KC2mm1lL5z3qkV; Mon, 7 Mar 2022 15:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646667816; 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=MMJRTmd2+7I/zaWk/59s/j9V9jbPwbOPO9eT9Sd4D24=; b=ASKYfmL3iH4AyVBc6KatZ4y917X4V4ZfSdSaui/uZM53VxdhL2US5iUcD3OafQLFHlIoSt VUup5IhDfUgGe1Ts8rJ15r9pYJjLvdFr3O0vUiXbO1gS27Bgdm8n5vPrwDAhUigvABZHUh INp15d1TPBmdFHk7iO4ZMuoPO7K7SC+C0ZSKDtgLIOG59Rk4A/w4+tsOJx++e+LvCzxldI zD2L3E2A6QRJp+1OCjH/gvjrmwXkOTJKxzk/mKQtyVYbRY60CU+FicI8ghCxVJYQ2Zt9Iw VyqjVzmoMD8ywANfjN3Xe8dqCD0RSYII+6iRawcarS+MowDUtgA7TXoOaMZMYA== 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 106B33010; Mon, 7 Mar 2022 15:43:36 +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 227FhZnR048500; Mon, 7 Mar 2022 15:43:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227FhZGp048499; Mon, 7 Mar 2022 15:43:35 GMT (envelope-from git) Date: Mon, 7 Mar 2022 15:43:35 GMT Message-Id: <202203071543.227FhZGp048499@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: afb44cb01018 - main - rmlock: Temporarily revert commit c84bb8cd771c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: afb44cb01018eb1363cb4ee20a31534b844d00f7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646667816; 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=MMJRTmd2+7I/zaWk/59s/j9V9jbPwbOPO9eT9Sd4D24=; b=tJ4isTL4/lr8DXJppEDxZMWQLKdD3WaEdBSPYT2dxofOyuyGz93tZX0kyyA/v4kg1kG9j9 BbjwXUEgCT3macaHy8Bfbw1pOZD+AlsYHAdwkQS82NNGbTLK652yGr/Sw3iohH9AU4vBbm 2Dn21NN+A4/MGNULoRG5GZixh7ADQiwCnR7Rq/x33C3ghryQa/fe//m5rYkIJZeUMA2WRk QQdAP1qWSx8Y8iz7YPlWt+R2B0SxL67UVO1DpAIs6r73Dc4L4iF2Gs0yvUOXm5PgG4Qfqz 4pmKSwL47r5x7/q43u2rok8Tznw5y6uiBzLjsEV2boGys+fDj9rDaeD3PbE3DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646667816; a=rsa-sha256; cv=none; b=bM4jezvhsU5uwhsYO2JgQQgAoN2MSW87m6ckROpjWYNP7KfbknvgDr2lRfRxG86/bemUUM DRwoz1TBlDwhIVPrg0/rfHxDrfEJjx+S98x3FxJBzaRz1087SaTdXG4l8d8Wak/o5cVb4z ujs1iIQVXfsEiwEqM8wjQiIBclaSRtaAe0NGFhXF3V8hu+bCU7lCXnqDI5HPgJkPHGdDrs u/rYUJCw2wC3SPCLiXzDhiwnGQ7/cJYqBrhS0kOZwmH9q/gms85Kme//FdrcS7IurZ5zuO 8Tz7aQGhFZLLFguDbzJspID3fVjW7yMMChF1MfafWhtVQZNUgJGRY12z97Otyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=afb44cb01018eb1363cb4ee20a31534b844d00f7 commit afb44cb01018eb1363cb4ee20a31534b844d00f7 Author: Mark Johnston AuthorDate: 2022-03-07 15:35:59 +0000 Commit: Mark Johnston CommitDate: 2022-03-07 15:43:19 +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 --- 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 0cdcfb8fec62..d7dea8efc40e 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) td->td_critnest++; /* critical_enter(); */ atomic_interrupt_fence(); - pc = get_pcpu(); + pc = cpuid_to_pcpu[td->td_oncpu]; rm_tracker_add(pc, tracker); sched_pin(); @@ -515,7 +515,7 @@ _rm_runlock(struct rmlock *rm, struct rm_priotracker *tracker) td->td_critnest++; /* critical_enter(); */ atomic_interrupt_fence(); - pc = get_pcpu(); + pc = cpuid_to_pcpu[td->td_oncpu]; rm_tracker_remove(pc, tracker); atomic_interrupt_fence();