From nobody Fri Aug 11 03:33:30 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 4RMTsR00xcz4m6NB; Fri, 11 Aug 2023 03:33:31 +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 4RMTsQ40pBz4QRd; Fri, 11 Aug 2023 03:33:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691724810; 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=ZHApIOSWMvQI1QMX/mFfulYkQ3tFcZluAtaRvOU5ZrQ=; b=HYkEhr+YfnsrJEnWVnCPCNJOreuC/ewZYVVivRgr3wR6mvhfiT3meMrqjEj7NXLpfIDnWN x3cFsJ33hOdhiVB403QcdXXedaLzVM05g2ioGP0kvL371c46FFDmEWPp+1Zpv1Hkh6D0q0 dyzyap/0i7w9YZdPHcCZHVxlc/PmrddiWHMUuZeCCutGGuDunfa7SSVhcfU9bbd6MIEkFc EFVkJpgYqsF6x5QsV3CXD4olJRZ7G62N6cbr+evtuZjBIyvzjRhsW6ugFLxBb/HBzxa7Cn KyN622htuHgLfZBOZzLOZKxEitteyaeKK/LvCfUy/28TbTX224D+0PYKhupfsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691724810; 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=ZHApIOSWMvQI1QMX/mFfulYkQ3tFcZluAtaRvOU5ZrQ=; b=m/3zIobSlRKT+Fye8uYJdGcT5ZChDB8pR3nRm0bXowxTIpPFWWFUTYtz+/Pa1/5+s+ubh3 AGCAMI7FG/2eHwmcLwsHHBMrDrBWg+LZygwbzSYy0kzhtc7g7nuhQ6pB2el70hHIg2EeSd Jhu5WBk91SDjvW9Oq+sri6/ilb+yVn0qwqlSXrR+hFE13EtI1zypO/sP7e4j0sqzyrBzgv 6xh1NLMqKpsSnMNxN2YVcp0fj90Q6x1vd+viDa1iVWrMlc0n2Pq+U6R0+8LbpGeuNQH19P iOy2yaUE4jfv32TvEF+Cxhpp0YETPWbxnitQvgPBKEQaPYdPRiBuiXtJp3FyHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691724810; a=rsa-sha256; cv=none; b=Mjz0SY1kqkBEAkUfb3TdFFk/mTDBNhpe09QNZvWyJwA+SbndErq80oWcAVqgBhdyr6hL1K gQagKewCij6ZwmRWiiooOq9kMYcOJH/7MppEHLOZ2rY82RqGXYezQmnkwVEuPfyTm8Vh83 ENQyNBuHkMbjkTVGZK36KByXFmJBwIG8bAMxenHQdRQJ2VZeHGU361DeJe37fZEsNKBUN7 gQDErphZIkfNkSr9vkVNn0WB/NHZPmr7VAtrvdVlkMtgpqBs7UKLujF26ScqSuY13EDL4k vYe/Nqof5foOEIDe56HM+ORJ7yF2IK1l6sgSKU1pyhgbOu62CS4XUPecRPibvw== 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 4RMTsQ2t07z8HX; Fri, 11 Aug 2023 03:33:30 +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 37B3XU7B042819; Fri, 11 Aug 2023 03:33:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B3XUsM042816; Fri, 11 Aug 2023 03:33:30 GMT (envelope-from git) Date: Fri, 11 Aug 2023 03:33:30 GMT Message-Id: <202308110333.37B3XUsM042816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: 7b9bd54ae86d - main - mana: fix a KASSERT panic on recursed lock access in mana_cfg_vport 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: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b9bd54ae86db1ac81d10964be4e3acf1b877495 Auto-Submitted: auto-generated The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=7b9bd54ae86db1ac81d10964be4e3acf1b877495 commit 7b9bd54ae86db1ac81d10964be4e3acf1b877495 Author: Wei Hu AuthorDate: 2023-08-11 03:30:38 +0000 Commit: Wei Hu CommitDate: 2023-08-11 03:30:38 +0000 mana: fix a KASSERT panic on recursed lock access in mana_cfg_vport The panic stack looks like this: panic: _sx_xlock_hard: recursed on non-recursive sx MANA port lock @ /usr/src/sys/dev/mana/mana_en.c:1022 KDB: stack backtrace: vpanic() at vpanic+0x150/frame 0xfffffe011b3c1970 panic() at panic+0x43/frame 0xfffffe011b3c19d0 _sx_xlock_hard() at _sx_xlock_hard+0x82d/frame 0xfffffe011b3c1a70 _sx_xlock() at _sx_xlock+0xb0/frame 0xfffffe011b3c1ab0 mana_cfg_vport() at mana_cfg_vport+0x79/frame 0xfffffe011b3c1b40 mana_alloc_queues() at mana_alloc_queues+0x3b/frame 0xfffffe011b3c1c50 mana_up() at mana_up+0x40/frame 0xfffffe011b3c1c70 mana_ioctl() at mana_ioctl+0x25b/frame 0xfffffe011b3c1cb0 ifhwioctl() at ifhwioctl+0xd11/frame 0xfffffe011b3c1db0 hn_xpnt_vf_init() at hn_xpnt_vf_init+0x15f/frame 0xfffffe011b3c1e10 The lock has already been held in the caller. Remove this redundant lock attempt. Reported by: NetApp Sponsored by: Microsoft --- sys/dev/mana/mana_en.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 9d9a4084efe1..4bab6719e59f 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -983,14 +983,12 @@ mana_query_vport_cfg(struct mana_port_context *apc, uint32_t vport_index, void mana_uncfg_vport(struct mana_port_context *apc) { - MANA_APC_LOCK_LOCK(apc); apc->vport_use_count--; if (apc->vport_use_count < 0) { mana_err(NULL, "WARNING: vport_use_count less than 0: %u\n", apc->vport_use_count); } - MANA_APC_LOCK_UNLOCK(apc); } int @@ -1019,13 +1017,10 @@ mana_cfg_vport(struct mana_port_context *apc, uint32_t protection_dom_id, * QPs on a physical port up to the hardware limits independent of the * Ethernet usage on the same port. */ - MANA_APC_LOCK_LOCK(apc); if (apc->vport_use_count > 0) { - MANA_APC_LOCK_UNLOCK(apc); return EBUSY; } apc->vport_use_count++; - MANA_APC_LOCK_UNLOCK(apc); mana_gd_init_req_hdr(&req.hdr, MANA_CONFIG_VPORT_TX, sizeof(req), sizeof(resp));