From nobody Tue Jun 17 19:21:58 2025 X-Original-To: dev-commits-src-main@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 4bMGvq017kz5VqMc; Tue, 17 Jun 2025 19:21:59 +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 4bMGvp4lRrz43MB; Tue, 17 Jun 2025 19:21:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750188118; 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=f18AIDwDXNfvuQjR5v6yOss8UlJEggUUnzEPP319sNA=; b=Y/UN6j5TYOj+bJszk4+uZlavBFTrUzioUBLrc136KoeseCdFJstO3N6gxkTe4mtXr0mWi0 2T/kJ5rFXavmQFBky4DT6v1aotkV1JdXm+TkfVhzDOkFlYNXQmkonZOJqq54Qll7LxTkeN swCc8IFdA3GsUfXpbL9bQOzxNuK5KUTRjtK8XjHbXAYPIOi7sPnUo9O70odnK81vlfJJfv rN8rpafsk6mmAPrpYu0N7drXkUO6XZlMMkU3+AaJcM/rDyNwLb7tazK4/zocIXgQnOos4f OnWV0jVSZnGlcDN4SeCtRuYhzVtFs1kgmuqQW27SOJLXnz4yk1XV5TA5mrt/YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750188118; 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=f18AIDwDXNfvuQjR5v6yOss8UlJEggUUnzEPP319sNA=; b=qOr8M/zIDDmNP/wEAYgXsZ10XvPRjAnUfhP3fGc9yqzFrQ5RJWRgehI62EUEEaqWdAlidA g7KoMPlW6N3LJFjtcoCh1TtkjvevHnllwEtHgjjvjCVaHCsgV/ZMCp2gZ0Cz1D0NRwqA6+ 0bYDDs9zsXvml9Vpa1qtJ0jBBU27Da6YpbgFpsqrGGf5rusp7giECAkZ17W9107HRMR2ID 0EnuVOkcuxmaUopScT8mFZ27Cymp03F1HNGCwXZW/6m1WI7ZjSLlga8VAdZyeksQMuVO3t cSCDTfTJeMnEDG7l1nSF5t607ga68+V9RR2ef21viv85SCTaGsX+Yij8q5isJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750188118; a=rsa-sha256; cv=none; b=e/HdN7nMYr0cosqzFLybBYy89WZhx5NIRgs+bMtH/Iu6jv44qgEBHZw7aeHcuKFx4H+/Em 8SOA43nty+vXAOY+lXLh4kYPS0UqjfaGiLsULdiNtyGGtRDmS5oVOETTcnhdJ36FzJtnBi nAQDAzB45npbIjsiL8xfGU0VpAFXhjRSyvLh25YbGkNcy5W6lPj1oJGBhQfxdwwEY3Twrr SNP5gptsEoXMSpAZOk8mcyiJdd8m8EvvhUDvUftQN15DVRcSpfMTmTqsWDDMcmLN2gNljR dvDYXm99aFz6sQudTkB4iD92pARJDjBgYVyw2J4x7N1ey4rsv3QvH82JXUTIrA== 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 4bMGvp46hdzxXw; Tue, 17 Jun 2025 19:21:58 +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 55HJLwVZ057458; Tue, 17 Jun 2025 19:21:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HJLwsa057455; Tue, 17 Jun 2025 19:21:58 GMT (envelope-from git) Date: Tue, 17 Jun 2025 19:21:58 GMT Message-Id: <202506171921.55HJLwsa057455@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Krzysztof Galazka Subject: git: 7ffe1a1f6318 - main - pci: Save MSIX ctrl value before pci_mask_msix call List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ffe1a1f6318bb0116900114950114e5f81418fd Auto-Submitted: auto-generated The branch main has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=7ffe1a1f6318bb0116900114950114e5f81418fd commit 7ffe1a1f6318bb0116900114950114e5f81418fd Author: Krzysztof Galazka AuthorDate: 2025-06-17 19:17:02 +0000 Commit: Krzysztof Galazka CommitDate: 2025-06-17 19:17:21 +0000 pci: Save MSIX ctrl value before pci_mask_msix call Function pci_mask_msix uses cached value of MSI-X CTRL register to verify if vector index is valid. Update that value in pci_alloc_msix_method before it is used to avoid kernel panic. Signed-off-by: Krzysztof Galazka Reviewed by: jhb Approved by: kbowling (mentor) Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D49484 --- sys/dev/pci/pci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 27355c335915..f94438cda041 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1927,7 +1927,11 @@ pci_alloc_msix_method(device_t dev, device_t child, int *count) } } - /* Mask all vectors. */ + /* + * Mask all vectors. Note that the message index assertion in + * pci_mask_msix requires msix_ctrl to be set. + */ + cfg->msix.msix_ctrl = ctrl; for (i = 0; i < msgnum; i++) pci_mask_msix(child, i);