From nobody Sun Feb 13 10:48:08 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 46FDA19485E8; Sun, 13 Feb 2022 10:48:09 +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 4JxPG11TPSz4kCq; Sun, 13 Feb 2022 10:48:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644749289; 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=WgAqq8zd5z66QGc6BqS4yDO5d2GvDjxlFN+tMBFGVbM=; b=PQsbPiSWstE8LUKaf0tX9iPdS9eU5DHQioRTn5URLM2PUZKpNLADwpFrAfPaidHfQ/0jBk KSrnKyb95Cdoe2hB+3rW+S1NKiY4ADpkh9ab5TlzaqXsb3tkz8Z1zzw/VaU9ZzUH28QfuM Kw3IRtpJUoZ51QH2Tc0Aa6g+N6ajHSE3dKGgXc0U6W1PIYAAak2+YKUkgrw7MiwdH8zVIm GIl0VPhKBlY0ZpIOlNrYsDGix6JT9ekKHoMhpnfKed8FQpyKFbcb7TL2VS1lGCJ6Wt9m3a AGyt7McmuPRz1kv++FvngveZQVRdKiZyGl97hFcqY+lbj+cSXZmv4rUNuh8Ssw== 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 0E34419AC6; Sun, 13 Feb 2022 10:48:09 +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 21DAm8jS086414; Sun, 13 Feb 2022 10:48:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21DAm8XS086413; Sun, 13 Feb 2022 10:48:08 GMT (envelope-from git) Date: Sun, 13 Feb 2022 10:48:08 GMT Message-Id: <202202131048.21DAm8XS086413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vincenzo Maffione Subject: git: b425101ab6d5 - stable/13 - netmap: fix LOR in iflib_netmap_register 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: vmaffione X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b425101ab6d5eb705ba41edf706dbaf27a55b3c7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644749289; 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=WgAqq8zd5z66QGc6BqS4yDO5d2GvDjxlFN+tMBFGVbM=; b=pxSX2h2gER6lqaOQ5vSjbBA79mH0kA5PGhbmF3v+MgFdeloC81z0CsvLn139z8SNvEc0kG Wlphr34HNyrIblmdgvbdYF4eHdEQ8xxo9cNOepFDVg5AtbLjeqMWqS2oi6JEU/rpZleMf9 tltYDuUiijE3PEGLg2GFXu484mrzvJ/maWROr6tPope/McUkv+EqOTXXAzJfnjHi3ZS42/ Qc3Lpg43HmeEw7s+z/qZWMaW7nPJsypfYSIHVjIlfn4XTbx+D0MAonxYbVtPar3rtvzjnK qpy44pyBJ7JCpWcsgAtXraLz/Kh4Or04Ul+cEivvzY6LSmPJprF/zG8gzMB0IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644749289; a=rsa-sha256; cv=none; b=GHYLmej3NbgxHRXtCudRoKKFoWHUKV6PrWIgS3/2eGtDKuiOeObZaWT906Z1lD0MMyaoVg fzZ4zKB12vcnQhukOBzuePu/ANCHErg/i/UqJTUJ+cNogouu+oMoHYfGCPpWwTpXoXx4r0 vW1FyVNMb0FEhna1n+QpRQKbj3NXphnkrqABOM7Ty9CbkfRRBcc6xC/vdiyXOKluxyXOJQ jXiz/kBwc6feh2eUmtcCGR//LkYTusXo7s0v4lLWHqIxy6oy411geOkX/EJTmZrffT2bh2 vNdrrG1FYc6yIck8G2JyAhk9UETb20PJTUVDW7f4E2lydmYKc2uwrnU59v9qjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=b425101ab6d5eb705ba41edf706dbaf27a55b3c7 commit b425101ab6d5eb705ba41edf706dbaf27a55b3c7 Author: Vincenzo Maffione AuthorDate: 2022-01-14 21:09:04 +0000 Commit: Vincenzo Maffione CommitDate: 2022-02-13 10:19:26 +0000 netmap: fix LOR in iflib_netmap_register In iflib_device_register(), the CTX_LOCK is acquired first and then IFNET_WLOCK is acquired by ether_ifattach(). However, in netmap_hw_reg() we do the opposite: IFNET_RLOCK is acquired first, and then CTX_LOCK is acquired by iflib_netmap_register(). Fix this LOR issue by wrapping the CTX_LOCK/UNLOCK calls in iflib_device_register with an additional IFNET_WLOCK. This is safe since the IFNET_WLOCK is recursive. MFC after: 1 month (cherry picked from commit e0e12405285b61a724c646b8f8e99e3ec775291e) --- sys/net/iflib.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 6dcf7de8256f..81cb66738454 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -5031,6 +5031,7 @@ iflib_device_register(device_t dev, void *sc, if_shared_ctx_t sctx, if_ctx_t *ct ifp = ctx->ifc_ifp; iflib_reset_qvalues(ctx); + IFNET_WLOCK(); CTX_LOCK(ctx); if ((err = IFDI_ATTACH_PRE(ctx)) != 0) { device_printf(dev, "IFDI_ATTACH_PRE failed %d\n", err); @@ -5222,6 +5223,7 @@ iflib_device_register(device_t dev, void *sc, if_shared_ctx_t sctx, if_ctx_t *ct iflib_add_pfil(ctx); ctx->ifc_flags |= IFC_INIT_DONE; CTX_UNLOCK(ctx); + IFNET_WUNLOCK(); return (0); @@ -5237,6 +5239,7 @@ fail_intr_free: iflib_free_intr_mem(ctx); fail_unlock: CTX_UNLOCK(ctx); + IFNET_WUNLOCK(); iflib_deregister(ctx); fail_ctx_free: device_set_softc(ctx->ifc_dev, NULL);