From nobody Mon Mar 14 14:46:04 2022 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 297321A26C53; Mon, 14 Mar 2022 14:46:05 +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 4KHK990XwHz3hKD; Mon, 14 Mar 2022 14:46:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647269165; 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=WEucPtK1SuZXzQeOQJ4qfXfQ5nm7niJsRMtFX4UqFcU=; b=wEyXZWmLZ4OQ3Y5r9/pPf1YTSxMSDdTnDlPVyHdfYaIGfxJN8f1sjnAprAjsIGSPMZLebi N/gyJTQSvzJAwocDcYcKbE+cg0Z2tOghZFGC1loHH8iFSmkHkzE8AG7blJUl+qHb+GbCUv zo6k0Lmj4vWkczky0LZ9QAkA8gCDv8IZq4yB5ZrGwDHI/HJdcDvP97vWixlwlEysKWbPvM KhF91TbxowpkGeYcS3CeKLXc6YsxD/txdlpwGyJeuD6nuibgjS/OMrsJa4SuIKZ/iiW6/5 drWgazclKZFq+DN13bJu0uXjfaTy9Ke7E8EcbN7a0nbtVoYFBvovwW9LL4UF9w== 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 E787B7694; Mon, 14 Mar 2022 14:46:04 +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 22EEk4Ju051847; Mon, 14 Mar 2022 14:46:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22EEk4l1051846; Mon, 14 Mar 2022 14:46:04 GMT (envelope-from git) Date: Mon, 14 Mar 2022 14:46:04 GMT Message-Id: <202203141446.22EEk4l1051846@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: 40e9da8c6b64 - stable/13 - rmlock: Add required compiler barriers to _rm_runlock() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 40e9da8c6b6453f7a26737c64e3de9da11f9f8a4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647269165; 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=WEucPtK1SuZXzQeOQJ4qfXfQ5nm7niJsRMtFX4UqFcU=; b=x0eG+zzssLwqYFheOTBQGEAlkafe3Z+Ns91dzoU6cwvlDGSqYpNYmK7owCRA5709aktUtm hnUwXesOoT2Q+46DpP2uuMKVAxsmnL9yO5FbDU2c2dBGNSDxty7rGt8xYySmUU4NQjnbtR q9BM067nlV8xF70O47M3mjbsoyX6i/J4HviHfp4PB6GswWc8+j+ICJ9Up1RfyUbQNhnPu5 TAABPUmji0r1mdXiMAk1gHIvMS4fZEsAutvJxCIjkrZZ3EU2dOYk5gIO3Rt4hYsiXhPMnB IFZbEgPWVMk8JSejiOxdvepysUr8YdxOmTWLdSP3h85o6VMQ/w+5EZ2xEaqlkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647269165; a=rsa-sha256; cv=none; b=Kte3D7Ll1dCXxswdVmAvf49cmsEBRBGIEHxnsztnDJq5M57xD6bEdJwSixyuyxR5TAOprn BtKWWXtgJEd8Z+2+UkeJcaZE8b0gcHmcYH9teUeX/9KNUEXXpXc6YL4LHuyQg510iiP8XN EqKr+3Z1fiA7VogbxY7Ox+tZ4OEZ0XNomuOgZCf3NuzhNyZ+dsbdKA7wTJ+TQHjvlsTcZO 6r9oaoC7MDsq2ELpWGlvDtyYqp1Yf0YgWzKkxUWk1fXSfPsQc3bly5nFdzWW0vK073WmJx qvKvAZzCq0M4xGyeaim76KrxkGKgENJVbrnGcXIW3B0XlNYM7oj4ruT1CJbf9A== 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=40e9da8c6b6453f7a26737c64e3de9da11f9f8a4 commit 40e9da8c6b6453f7a26737c64e3de9da11f9f8a4 Author: Mark Johnston AuthorDate: 2022-03-01 13:55:43 +0000 Commit: Mark Johnston CommitDate: 2022-03-14 14:45:06 +0000 rmlock: Add required compiler barriers to _rm_runlock() Also remove excessive whitespace in _rm_rlock(). Reviewed by: jah, mjg Sponsored by: The FreeBSD Foundation (cherry picked from commit 89ae8eb74e87ac19aa2d7abe4ba16bcccd32bb9f) --- sys/kern/kern_rmlock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_rmlock.c b/sys/kern/kern_rmlock.c index 66a035554b17..d7dea8efc40e 100644 --- a/sys/kern/kern_rmlock.c +++ b/sys/kern/kern_rmlock.c @@ -449,17 +449,13 @@ _rm_rlock(struct rmlock *rm, struct rm_priotracker *tracker, int trylock) THREAD_NO_SLEEPING(); td->td_critnest++; /* critical_enter(); */ - atomic_interrupt_fence(); pc = cpuid_to_pcpu[td->td_oncpu]; - rm_tracker_add(pc, tracker); - sched_pin(); atomic_interrupt_fence(); - td->td_critnest--; /* @@ -517,8 +513,12 @@ _rm_runlock(struct rmlock *rm, struct rm_priotracker *tracker) return; td->td_critnest++; /* critical_enter(); */ + atomic_interrupt_fence(); + pc = cpuid_to_pcpu[td->td_oncpu]; rm_tracker_remove(pc, tracker); + + atomic_interrupt_fence(); td->td_critnest--; sched_unpin();