From nobody Thu Dec 15 19:27:58 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 4NY2M314ttz4V4yj; Thu, 15 Dec 2022 19:27:59 +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 4NY2M30Tjpz43PX; Thu, 15 Dec 2022 19:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671132479; 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=OPmp8ADZIQGLUxzy/Liaoxc5tee1UKjnpdVWBkdFUF0=; b=OM7UXZCmGgab+NaYq+ccvqxin5P1jSzPFes8GX0n5TB3xQ6/JBslPwakvXLkBeCo2BG4f1 sEP+/sH7nIu5W5VgGE8yWD4UyVCIHgsU6uE3iRbNFE6HNCTAMYRKfVKipvzyfUL8e3Y5J5 /dkrYrS9eceT6pLYpUbKUQjs0WkhoCEVmuvqzIDwVr7eeKFkO/LBN/wbkPVRjYFre9msBH QG9Yr6CRL8D0KRRmCTnWn/0zbQMB+/4GVlpBRiTs0dWxoJmgMWLarr8s1hJWAztQKhXGG9 OVqnhGntZ9TGJRHsV2l+lGJHlbhbHg10GwlCbFPOvhyoSa5+TRyHiUrK+6MrGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671132479; 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=OPmp8ADZIQGLUxzy/Liaoxc5tee1UKjnpdVWBkdFUF0=; b=od/oj/VU9ZoAtKaWRthEQdVJlHWj0QkA0qAMh1YP8YVdqOWykYsAtgL28j7HbYtaEBq4hD uanQ1pEA2DvQ4BODOCOFvQZPkbom/Jn4sqwyde/KBhQX1+kOETKC1sa81EkAfDkKo3y0Bx JsarheV4HuvZbTpNU7CkndyV/2kfjDSUqAOuqpmhtJiAM36slqnTiOcScZLgM4oGDNOD/T K7O9H/TjPjFXEZF2LQtHG5QtF6bTR7zngKhpkyPsFX00kpEOlgIJW0UVcI8SgF0RMD0SwF aV7w+aiRsbfd5eJFB4PBUVE7erWNuhr9gGDBVfZ+vuUsyqNFwoR6F8W5xbfrfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671132479; a=rsa-sha256; cv=none; b=Jq3Fxo22tbwPQqZWw1cEqvVR7/G8mh7u6qiE8aV0Wx7Iqj57do44H02URG7kuIZJTroNao a7/8u2e0vs7L5MVaQKZD4yT5N4v08tve0RhZY0RcmEkkOQ0yrFE7rpebMpWb+O/iQ8R+FT Zf/xDblI8faNVh93wVSPjh8xozhf/8JY1D1coFuhoSrTfR7a6GH0843gJsRBjbIZY1YgKa wdJJNSoyb15KAxP9KQ1aZOtoA9Ix8roGAWGBtlcLJvJPVuIGt5cOOGzxkyB6K4eW10u2Kw JwlL4eXLnDXY2ivJmLARWlXL0uNXUwMWFFSaaZkiFec6idjyvLPyZ+jOSDhlPQ== 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 4NY2M26dZlzl4p; Thu, 15 Dec 2022 19:27:58 +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 2BFJRwGN071439; Thu, 15 Dec 2022 19:27:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BFJRwg4071438; Thu, 15 Dec 2022 19:27:58 GMT (envelope-from git) Date: Thu, 15 Dec 2022 19:27:58 GMT Message-Id: <202212151927.2BFJRwg4071438@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b357d40f0818 - main - kdebug_secasv: Update for recent locking changes. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b357d40f0818c570b870f1ac1a7fb61dcceba53f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b357d40f0818c570b870f1ac1a7fb61dcceba53f commit b357d40f0818c570b870f1ac1a7fb61dcceba53f Author: John Baldwin AuthorDate: 2022-12-15 19:27:39 +0000 Commit: John Baldwin CommitDate: 2022-12-15 19:27:39 +0000 kdebug_secasv: Update for recent locking changes. Reviewed by: kp Fixes: 0361f165f219 ipsec: replace SECASVAR mtx by rmlock Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D37690 --- sys/netipsec/key_debug.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netipsec/key_debug.c b/sys/netipsec/key_debug.c index 3705879397ff..a6e76ef358dd 100644 --- a/sys/netipsec/key_debug.c +++ b/sys/netipsec/key_debug.c @@ -882,9 +882,11 @@ kdebug_secasv(struct secasvar *sav) kdebug_secnatt(sav->natt); if (sav->replay != NULL) { KEYDBG(DUMP, - SECASVAR_LOCK(sav); + SECASVAR_RLOCK_TRACKER; + + SECASVAR_RLOCK(sav); kdebug_secreplay(sav->replay); - SECASVAR_UNLOCK(sav)); + SECASVAR_RUNLOCK(sav)); } printf("}\n"); }