From nobody Mon Aug 14 06:42:48 2023 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 4RPPwT3Ltzz4mVk0; Mon, 14 Aug 2023 06:42:49 +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 4RPPwT0Vszz3YL5; Mon, 14 Aug 2023 06:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691995369; 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=+ZIIZIFX4zPUF5VLu/Dg1Pfa7QZXPcbYu6FSRAJ7h4k=; b=RkL2P7atsXacBCzzfidIfDxLtZlRF9aHbhwSS7CJGifXumIpWR1YbtztIxGfhDWn6W7+Lc NPe3tYoWn+ebN4OlaGcqnyfdvwp6aQy2HColzEyKS8tfzE1ULjypSRkc9yZreL1U6wmV9o dpRmE7ZVpmqps+hAMw9ed3fM9Jlx9zgTCwDq4gA3lXpx093ZiIxXz/we8aD59DHpVp50h6 zkUHvijMgsjprY0tMRULvKGUqmGQxR+1RYRzY+wGai8UOU6UmBoc4n6g5Jm4cCcXJrL9rh v+h9Xxu6fjVz+yfs9NYOzRyJ+3+7M5TfdbP/XTXdwFdB3P7ato3ySIT2nunANQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691995369; 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=+ZIIZIFX4zPUF5VLu/Dg1Pfa7QZXPcbYu6FSRAJ7h4k=; b=PrIw+xsYKnU+oguPUZbQmBirXPWeopJxNNaAEKfvy6vmfsriXAIlD00wZfLkhDN4R51V1i p3gXud0R7DMGTS9XSElJpTmnJ7oq2zj4sZS+MOsQ25a7IaP1yvz6m57jrRHHXcjGogyXNK OT8meDW3D4ZVRsrqGxndfTBhGjOe8Hi/9ksNe1raBdNlPTDzD1hWkXTDyIh3RoNFGFomHw GLFWDuLo7zD4RcFNFtH7VwvnqA96uQjVDx2i5n9wuWN0Y4+gYQ4SjhAwfUSYG3EOa1ZgG1 H1wuGjLVORAHCk3tYSnM7Onfjs6Ilfh5hCyo1uAuYgJ8TRiqLGi8WIj/lgDJZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691995369; a=rsa-sha256; cv=none; b=Lsh3rzLQSED//zpXVi9Y1b/sbVVTM85OnJPyIXo0mtWUmnMjoOp4fPhoW/wcFIil4ZClax 9n0Vz1FrsPAzPBVC4CtvVcCSL+wRAEF1pF0C3cx347cj+16UwlXp4gJy+fid0Rc3db1/OZ 6IIyAm/DTP3krrAq8gBPUz+iAs9IqsGjwngPWU66FF3IOWzBRCstuHt9yRjvQOOnZtpkEf g4qtwZLmI+O0RQZ8xc4kg4yh8HVV+WGEdu9tmPOfiJ1kvTlQLUSi2bRS7CEBCFnl8SVGTY gNFT4MwGDGfVprmWnyMTQm9hJeVtDZOhGy4ANvvY84mvDFF+rwHHaHBsDHWLhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RPPwS6j2Tz3yc; Mon, 14 Aug 2023 06:42:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37E6gmS2045056; Mon, 14 Aug 2023 06:42:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37E6gmrn045053; Mon, 14 Aug 2023 06:42:48 GMT (envelope-from git) Date: Mon, 14 Aug 2023 06:42:48 GMT Message-Id: <202308140642.37E6gmrn045053@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 6cb8b3b5cde1 - main - sctp: use consistent names for locking macros 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6cb8b3b5cde18ac5465f1cf1df3fbac359cb09e9 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6cb8b3b5cde18ac5465f1cf1df3fbac359cb09e9 commit 6cb8b3b5cde18ac5465f1cf1df3fbac359cb09e9 Author: Michael Tuexen AuthorDate: 2023-08-13 20:32:54 +0000 Commit: Michael Tuexen CommitDate: 2023-08-13 20:35:53 +0000 sctp: use consistent names for locking macros While there, add also a macro for an assert. Will be used shortly. No functional change intended. MFC after: 1 week --- sys/netinet/sctp_lock_bsd.h | 9 +++++++-- sys/netinet/sctp_pcb.c | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/netinet/sctp_lock_bsd.h b/sys/netinet/sctp_lock_bsd.h index 2087db337a37..a0cff81e706e 100644 --- a/sys/netinet/sctp_lock_bsd.h +++ b/sys/netinet/sctp_lock_bsd.h @@ -234,12 +234,12 @@ __FBSDID("$FreeBSD$"); * or cookie secrets we lock the INP level. */ -#define SCTP_INP_READ_INIT(_inp) do { \ +#define SCTP_INP_READ_LOCK_INIT(_inp) do { \ mtx_init(&(_inp)->inp_rdata_mtx, "sctp-read", "inpr", \ MTX_DEF | MTX_DUPOK); \ } while (0) -#define SCTP_INP_READ_DESTROY(_inp) do { \ +#define SCTP_INP_READ_LOCK_DESTROY(_inp) do { \ mtx_destroy(&(_inp)->inp_rdata_mtx); \ } while (0) @@ -251,6 +251,11 @@ __FBSDID("$FreeBSD$"); mtx_unlock(&(_inp)->inp_rdata_mtx); \ } while (0) +#define SCTP_INP_READ_LOCK_ASSERT(_inp) do { \ + KASSERT(mtx_owned(&(_inp)->inp_rdata_mtx), \ + ("Don't own INP read queue lock")); \ +} while (0) + #define SCTP_INP_LOCK_INIT(_inp) do { \ mtx_init(&(_inp)->inp_mtx, "sctp-inp", "inp", \ MTX_DEF | MTX_DUPOK); \ diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 220d8b72667d..aad5879afe63 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -2501,7 +2501,7 @@ sctp_inpcb_alloc(struct socket *so, uint32_t vrf_id) SCTP_INP_LOCK_INIT(inp); rw_init_flags(&inp->ip_inp.inp.inp_lock, "sctpinp", RW_RECURSE | RW_DUPOK); - SCTP_INP_READ_INIT(inp); + SCTP_INP_READ_LOCK_INIT(inp); SCTP_ASOC_CREATE_LOCK_INIT(inp); /* lock the new ep */ SCTP_INP_WLOCK(inp); @@ -3678,7 +3678,7 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from) crfree(inp->ip_inp.inp.inp_cred); INP_LOCK_DESTROY(&inp->ip_inp.inp); SCTP_INP_LOCK_DESTROY(inp); - SCTP_INP_READ_DESTROY(inp); + SCTP_INP_READ_LOCK_DESTROY(inp); SCTP_ASOC_CREATE_LOCK_DESTROY(inp); SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_ep), inp); SCTP_DECR_EP_COUNT();