From nobody Wed Apr 27 12:50:28 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 BFC5D1AAA876; Wed, 27 Apr 2022 12:50:28 +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 4KpJWS4BfDz4dcq; Wed, 27 Apr 2022 12:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651063828; 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=mjxatQc5Afrlmt0ap4Qo6JjDUCsXan2gtV30goHN9vY=; b=NuUBfxdqUaGQB6PEPG6xPOGcx94VRZn5sjkA+95vEAjWD42Kmfsr37mmh02Zl8eD+oYq99 kLG9fzL2XKvtCBYtkwopGH21xqxVpo0WlcvlCg+CU2+ut8VIbgT2GMUmuYcW6gN1Sy8JqK sxrpadkDeDq0+3fnXFo/kSuyK4Ua16egWC60yI0SLRyF+MrfvFsryK+g0IKG8bVjqPEffe vULeXXU4rp769QUCHSSB7xTJp6YTcJOEQZocXtCUyuNGKT/J6YBs8+ZSZJMGf6gt5zT6W3 3SY1FsEfZG+BdLQ1OknrsuX8kMpMSgc937RrCvLuHBA5BVxrGJOGI7h7bFTXtA== 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 272F1241B6; Wed, 27 Apr 2022 12:50:28 +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 23RCoSie011648; Wed, 27 Apr 2022 12:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RCoSLv011647; Wed, 27 Apr 2022 12:50:28 GMT (envelope-from git) Date: Wed, 27 Apr 2022 12:50:28 GMT Message-Id: <202204271250.23RCoSLv011647@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 8bd26421b6b5 - stable/12 - callout: fix using shared rmlocks 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8bd26421b6b501d49581a687513a7ba8a46b3a80 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651063828; 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=mjxatQc5Afrlmt0ap4Qo6JjDUCsXan2gtV30goHN9vY=; b=DxNRYc831hHntxnZLeRvRxY8aAtcKj8+Q/HWKRzzCVqDcz36DMVbbJvI8H7kenjOj3reiT CtkBGgs21SqK1jXJGrHdtlcov+Nff/4PftMvJSEJc3+ZKEIVWgd7+0KrJ3hdtDLuPuKzUp rsOYucAEM2dDB6vM9gM2M54y+ET3J6+IR0KkpUezhFlcsw3AGnXNnnfiSpziZ4/AXjqBna 5EqXZ/6amr4L5R0f6ut6ear5l29oKmecTvCh5ZyflfCyqR9TInC72lXU2ryApA0Pvo7GUS ctmRtjnlAPQV4yLdHf9bUNgfSe42120DSoHF37IIVQbr5qRGJoC24cKgiY7maQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651063828; a=rsa-sha256; cv=none; b=HLaXWhF0kClJsON6qhD5uSHz5N0O2o8f4TQbqzEDRNXc0RldXo6OchHUDpaV/zsnsl5cYj YFmzliWSy6fXOCa+/UEsXHQNsb2F0mP7oz84NUwMoFcaPOSoA196Y9nXz4leGZ+9twdZWC 9UrMliViYB1QNFH9afwZH/EWDFYyV47BAbhwwRSPfx18laaLGqDfLYn65jBw6q+/z4oBPu 0RbgzLGfw/wnRNltNdh1atPHdoykKH/9wdGxV91XC2GPKukAk1VaUUhMFQIyF1O5rwcnHD +U6eXGuKYNfCjCY5Sst0tcUBmOI1c82vUFOF+8sOIrQ62KTqGyNwj07CanYIbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8bd26421b6b501d49581a687513a7ba8a46b3a80 commit 8bd26421b6b501d49581a687513a7ba8a46b3a80 Author: Kristof Provost AuthorDate: 2022-04-19 15:01:25 +0000 Commit: Kristof Provost CommitDate: 2022-04-27 06:48:58 +0000 callout: fix using shared rmlocks 15b1eb142c changed the callout code to store the CALLOUT_SHAREDLOCK flag in c_iflags (where it used to be c_flags), but failed to update the check in softclock_call_cc(). This resulted in the callout code always taking the write lock, even if a read lock had been requested (with the CALLOUT_SHAREDLOCK flag in callout_init_rm()). Reviewed by: markj MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D34959 (cherry picked from commit a879e40ca2a9e95b3e3dc4810127d3cf105ec0d3) --- sys/kern/kern_timeout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 3980b5d8b980..738604f37494 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -673,7 +673,7 @@ softclock_call_cc(struct callout *c, struct callout_cpu *cc, ("softclock_call_cc: act %p %x", c, c->c_flags)); class = (c->c_lock != NULL) ? LOCK_CLASS(c->c_lock) : NULL; lock_status = 0; - if (c->c_flags & CALLOUT_SHAREDLOCK) { + if (c->c_iflags & CALLOUT_SHAREDLOCK) { if (class == &lock_class_rm) lock_status = (uintptr_t)&tracker; else