From nobody Wed Sep 11 08:44:38 2024 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 4X3YzB5m6Sz5W7q5; Wed, 11 Sep 2024 08:44:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X3YzB3S83z41R4; Wed, 11 Sep 2024 08:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726044278; 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=4u96C7aMU9oIgImLa9izIeEg2Tcn4U4lZlCYfehoxLM=; b=Hu3p5cfLhNwk4FRzInfNZnJmsKvhMTEsoEzWeFow21a5MheM7QnMzTPmjH16bVEsGB3+G2 /03t9JqjBME7QClSpZw0wYUPqovcwF7stxA/b0fzTfnXS60jBKz0yAYDwn11HaNXxQj9TK B3x50YV3Ge7RlYoJAim5qEtIzZL5qZn3HQlzTM4ZcCRSliAVGwOjvR40WIfEXxnRGGNdAZ AUKSPt0bBSV9YnuMcPGcEXjK+QGBPb864afpX6FebLpHM1yJwmVG5GHYrY6f++GZN7b86C M96OJPte5NsgsgRSJZTLKv0a0ZHM13Xr8TGkoW3AZI9dtMdUZI7F3pacBawrzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726044278; a=rsa-sha256; cv=none; b=JXUTdsvoE+4crWIds1eB/i2vva9jhI5dQ4o0tBL9AeH0QriXlMFpAzFMhgEXWZyChqqzG/ c7YazJ9sySe6Fqz3VgkwWtrxJmG2r7iWz27uc9doiR7qx+TTSpkYKNKNjFmnc5qTRB14oC 5MeFtzMGQmkSjNsu+2dUPDhVv9P5a03E39i8uewtByQAfTD19R4Z9csf1vtO7bi0WAxrXD SjE+qNmRnR3MyyWfXoL8nrOOxquJQSXlYRI8yxTEPLMbVUMkLsJcPerk7D3dUFqsfceQBI UPLpTdIWJqkK9jggJbIS1++ZVqTo57Gz0gFEq3PvjnyagW5vxOQJzxjEaelNnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726044278; 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=4u96C7aMU9oIgImLa9izIeEg2Tcn4U4lZlCYfehoxLM=; b=C+gCh6mRnML0TknQ9k1KMfgqrmcUnHk4evwigA8V723po2pwkxSewrC5Kqp1Rki13osBOt IUtZt413BVlyuK86Psome4PEjfjkg/LuBK+uZqCvESi/MShQBuRBzj1EMSRCF7KTWwYHCx NPKQRuH13J9uaDH8hSRMy/DtISvUp3jOebMZTZr6daM7mWLlKnokviqH1utLll3FJxiJSj 6clGhHMH1pXrmiQDaaUugAjleA+V6MsEld2Y6txtrTJr5mwdkYgsT8DzfetUzYkWTqJTW4 bakfsBAFzlqxs8I0/vHlUHr3tKCvf54FrNis9LwYbFLSbekkksbhs7bCrV4yxQ== 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 4X3YzB3462zP7V; Wed, 11 Sep 2024 08:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48B8icqG008141; Wed, 11 Sep 2024 08:44:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48B8icjW008138; Wed, 11 Sep 2024 08:44:38 GMT (envelope-from git) Date: Wed, 11 Sep 2024 08:44:38 GMT Message-Id: <202409110844.48B8icjW008138@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 483c1340a009 - stable/14 - msi_release(): consistently unlock msi_lock around iommu_unmap_msi_intr() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 483c1340a009ba51e3694f3990e6c07479667002 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=483c1340a009ba51e3694f3990e6c07479667002 commit 483c1340a009ba51e3694f3990e6c07479667002 Author: Konstantin Belousov AuthorDate: 2024-08-27 02:28:49 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-11 08:44:00 +0000 msi_release(): consistently unlock msi_lock around iommu_unmap_msi_intr() (cherry picked from commit e8fc8eb8b8f55072379f65f5f058b81870031b7d) --- sys/x86/x86/msi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c index 177bd7868ec4..c8e7db9469ed 100644 --- a/sys/x86/x86/msi.c +++ b/sys/x86/x86/msi.c @@ -555,7 +555,9 @@ msi_release(int *irqs, int count) KASSERT(msi->msi_first == first, ("message not in group")); KASSERT(msi->msi_dev == first->msi_dev, ("owner mismatch")); #ifdef IOMMU + mtx_unlock(&msi_lock); iommu_unmap_msi_intr(first->msi_dev, msi->msi_remap_cookie); + mtx_lock(&msi_lock); #endif msi->msi_first = NULL; msi->msi_dev = NULL;