From nobody Fri Jan 14 21:09:11 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 127A8194C6C7; Fri, 14 Jan 2022 21:09:12 +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 4JbDSR6nGrz3hHj; Fri, 14 Jan 2022 21:09:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642194552; 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=1Jn+Cez9fNLaIR0MxZv1fX/gS7t7CD5TV3xQ7OIsEtk=; b=bPWiZyJLmv/X+6gMLrkdp9CnNCvOk4aSiuw8WZwUNt8mnbdUVVxVCBJYI+f44d+i0aoIQs 7tiwSfXSkfZ0ut8P4TWHTtfKzVdqzAPGLFTfrp8XRAiCSucy0cO8CC5y5sEjN0R6ZaBovU SZPlreLxD0s93+Xka0+oF/04Fr0J7kMedNdnDZ7OHxviyumRFltP8rr44DHMJMHOcy3+Cn UBhEZCWTvyEpVPTKTivWfHFSD/XVhXqUqwN56EZHje2gePooC4QUDL+VL5Owy7hrWArdwf nXx6R1WZXKUdg3U2mUyelTG182a4/OeMoQD6VzEewF9PhTWrwztQPRC21CaV0g== 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 C3E071AA31; Fri, 14 Jan 2022 21:09:11 +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 20EL9Bgh028132; Fri, 14 Jan 2022 21:09:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20EL9BtS028131; Fri, 14 Jan 2022 21:09:11 GMT (envelope-from git) Date: Fri, 14 Jan 2022 21:09:11 GMT Message-Id: <202201142109.20EL9BtS028131@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vincenzo Maffione Subject: git: e0e12405285b - main - netmap: fix LOR in iflib_netmap_register 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: vmaffione X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0e12405285b61a724c646b8f8e99e3ec775291e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642194552; 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=1Jn+Cez9fNLaIR0MxZv1fX/gS7t7CD5TV3xQ7OIsEtk=; b=IEMYLI4zifG8xNij3eXD7ISvzwScX+Twp0NkXC07rPkW28OOEPA1OIQZxQORszISoyPTXJ WQquE4ScKf4DXqODxpxwDimUOtCGhQ6+IgH/gRQateSrdpH3mSW8OQ3V2tYfpZdxIrGN0M +Sm0rr9DoNFKx57cpBRkEX93UlAXSSmKP8eP1vuEr3A1xt/WuKDjID4niAbGFz60hSO5Ei 2aRIUKK20KXKtVVSOl4HWuzTAk8XFynNU6qvQbPRnA7y5WNAuXSYL0D4bTe6k51wiMQTI8 s3eNdLv3DvvnutlzEl0yB1Bq+5gcoTRTpnDy2Hvq+DqrsDFWfdi/tsutP8DUXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642194552; a=rsa-sha256; cv=none; b=O92ezOwZWllfGZDmoQ7qHNScnn5DI/ZSqmsdYK6HRZsybmG2piEQ+ZFi3HRUBNVNUndX/S kzPP9vJv9Dw+/K70QBZuBa3DCiDP2tggO62PjxqFGFtE/ZbZh49SiFCQ8YrWK9/JVVLffh 5CTCoBRzvbX0lZFgOoAbSQF85HYEpsGZ/WUIuoLdNPMPRdK8oXFDMXBBia8/3mUz8ryKUL DkCQ3Q4WR/AhWMcpQvhucN7h5JAUwprZUuOJYWKn13N+mF01XovniR//NOEoPTkJLE6+xP cVGVmybueEmlYWFK6vPVEfqsAZh3F9f9+ntwDGBbUWBBEOj6ItJ7cHUSOprE/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=e0e12405285b61a724c646b8f8e99e3ec775291e commit e0e12405285b61a724c646b8f8e99e3ec775291e Author: Vincenzo Maffione AuthorDate: 2022-01-14 21:09:04 +0000 Commit: Vincenzo Maffione CommitDate: 2022-01-14 21:09:04 +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 --- sys/net/iflib.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 3fcab699f9e0..88027a6dc283 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -5057,6 +5057,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); @@ -5250,6 +5251,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); @@ -5265,6 +5267,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);