From patchwork Fri Mar 7 18:03:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 871221 Delivered-To: patch@linaro.org Received: by 2002:a5d:64c8:0:b0:38f:210b:807b with SMTP id f8csp894974wri; Fri, 7 Mar 2025 10:06:21 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVmH8H/uDgEEQJ/MVfwauB6xJuRo8WEHmnhlrO9y7FXfFDm5h8FdGbPfkXboyqTbc6hGKXYRw==@linaro.org X-Google-Smtp-Source: AGHT+IEsE6k5t70aAPX8Pw/XAy0ns6MGOx3v66tCfaxRMmmaidgfbSSKcSH7XGciZOKrYEilU0N6 X-Received: by 2002:a05:6102:d8f:b0:4bb:e6bc:e16d with SMTP id ada2fe7eead31-4c30a6b1f28mr2828414137.20.1741370781682; Fri, 07 Mar 2025 10:06:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741370781; cv=none; d=google.com; s=arc-20240605; b=VA8IMWt8axbgz7mvIqfM3JXdirZRtO3275tZNObwDcL/S/6M1ae4lS+x+ord9SO3Fx xTiV+7OAOHbPZQf4pr1miOYN2VFvt6Itr+GHmwCCsPldbyNlKK34t+RNCawKdpd/6UKV ZvWY/mAF18ZU+E147ER+Kum4mQbSgr09gERO45b8uyr/oEFvjrIb1fqlaoAXcZb85cVQ daIHKawYdYY5ZBQ9q1gjWb5UotJSfeRtfpWRZyNbI3q8BXnLmKGdXGd+YeiwX8aufE3c jWKT66h5hNy04ETAty1iVW0HtygF6we9fP8VLKiCZFwTH7kReKQTOyCwBUF+0NAIcnDD GPXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qgqJlQXPaNCurtKb37o64LFzMpOza3vmaLhco3Sgch0=; fh=ZyzqLhNGJAXkYZjVqygzIY1NON/Kumlz+Vm/jUj6bQE=; b=f6+J1sf8Nb4EzTC9LcS7bz/Dt89uPjsDfMdAC1T+bs1DDuZ/c0gNahmND+gIEAuoMF 2hgp5JeVz+GQREF3kItB3x2RXHMGAa+iQJXKt8+Xk0zl87K/7ZnlOscHz5ktFwk7pjfC 7v6aSWIYz1WFqbJ2bSNP6hbsez5r+poqTlEVrm3mk9kPVUFLH4PWJ+/XTz/UygOaWOTz th9eFEOiFjcKJeCtzfONDGMdtw81cPO7jRE85KNQkdOxbEbmwxwnH3CdXx7ZEAg8KpF4 v4dLBctvVXp/H1BouHkNVfr5ZDz/X3/hIbH6ylWC4/TwKJKX+S9+Vob5JLICO8MjG3yQ Vj2Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rPeIhdYT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-4c2fbc72050si995818137.248.2025.03.07.10.06.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 10:06:21 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rPeIhdYT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqc3u-0004Ft-HE; Fri, 07 Mar 2025 13:04:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tqc3m-00047k-4G for qemu-devel@nongnu.org; Fri, 07 Mar 2025 13:04:34 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqc3j-0002FR-QJ for qemu-devel@nongnu.org; Fri, 07 Mar 2025 13:04:33 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-390f69f8083so1829250f8f.0 for ; Fri, 07 Mar 2025 10:04:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741370670; x=1741975470; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qgqJlQXPaNCurtKb37o64LFzMpOza3vmaLhco3Sgch0=; b=rPeIhdYTUtupcpshUxhysVrJVQ+V76TMO64qM7dZw4WaOEGyx5Wn8QYsAHx+g1ovwV nYFKm/8/3NdnLLKC1gi3aA5uh6+dO0S2o3bv6yPVYa32HnMDTm0EeddIiu3LPvRUJsJz k4qkg4kVrjA8KMCGkxi+5k30mk09MUhfXPxRnaXNo0xGXQKCNAEpaxc1eYSkX3kEmKwS qfjXpkpEX1JdatQorUFbBkl+eeOa490WmsvhSWGaIcJNxF376/Uqq+HP64dkDJ75+eO+ se0G/IlUjPVHElz3vbXvo34hiQYSB8xlFz6aBZh7iSLGDFh4AY6dPjmkH1j+J+01YC+1 jKMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741370670; x=1741975470; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qgqJlQXPaNCurtKb37o64LFzMpOza3vmaLhco3Sgch0=; b=L3Ksdrg4b0hRPERZzrjrkeep3jPwyrfR1yoHvh0sNn63kpJqoNyOjsX738yreRxDwf NM4BOxqIDjqv5DU7qsNdlfIc/BwK5GRDsKB/t+ycOR36GuSzwqp0DGoBYJ87P50j9h6H VGrYGyYrwzcM4u1Nlv8D3UUKuUh//MujARmyIaxDR6TBrVcMd7zx/p+/wFZK6urX+43y rKwdqyPSuzLdF8qX4+PleDuyn2YSuxGl5sS9/EXrPN/OgCFizk1XqkzG/7j5WznFnVzy IyCDOqLZ3A14X2cUsCiwHW0WNVE1BA94yKZdvBRUP1xlfBoZ5Hl3yhvl+Ku0gqHb7AaV Ue8Q== X-Gm-Message-State: AOJu0Yw78qelfpRdkZfjki19jpMX9G1ChMClXXJrmtSQa8XIPOrp3+X6 Wxu9xo/1F8zG7jk8APFcF4n0f9acMKzcsG6dTuhCMYv9ArSFNWzS/fsIcq88ocVbgFCM0OmcCWn GUeM= X-Gm-Gg: ASbGncvDMJlgSpwHJ2WTz3y+mCBl/A8Jgv+Jv9DUzvAcrcmZhhQmZoJOAE+wMk6NTZz yOQfTMM/4KkU857atGXbF96p/9RzPVSbkrnls88sBMsHnpGFGp0v3a0blihWUY0Nbwu/LqRRDKI JzsHMwXVNdDpPDUTuiUJ9wymfG6/V9hEs1UNjWQXxk2dIw5E0TN/t1X6pmWfNYEiR+jucE8GSTW Z6NyfLpIb0oYAKzQQ/KGjfWhvd0IBv0edWlXcY9wLnr6vdE953ExDEMxp2RGdh8qB4kHUJWbkvw 3ejAM2bL1kvgETZ+1dhnd728bqyt8EcLvlAJRzdM8fpu4BHgA3WqTCg/GUnwBJ5do0Pif1F3IO0 Bde7Po23Xe68Qpd21DrE= X-Received: by 2002:a5d:64a4:0:b0:390:fbdd:994d with SMTP id ffacd0b85a97d-39132d45d52mr2858940f8f.27.1741370669687; Fri, 07 Mar 2025 10:04:29 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c015a29sm5961965f8f.42.2025.03.07.10.04.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 10:04:29 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alex Williamson , Igor Mammedov , qemu-ppc@nongnu.org, Thomas Huth , Richard Henderson , Tony Krowiak , Ilya Leoshkevich , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, Yi Liu , Paolo Bonzini , Zhenzhong Duan , Matthew Rosato , Eric Farman , Peter Xu , Pierrick Bouvier , Daniel Henrique Barboza , Eric Auger , qemu-s390x@nongnu.org, Jason Herne , =?utf-8?q?C=C3=A9dric_Le_Goater?= , David Hildenbrand , =?utf-8?q?Alex_Benn=C3=A9e?= , Harsh Prateek Bora , Nicholas Piggin , Halil Pasic , Christian Borntraeger Subject: [PATCH 09/14] hw/vfio/pci: Convert CONFIG_KVM check to runtime one Date: Fri, 7 Mar 2025 19:03:32 +0100 Message-ID: <20250307180337.14811-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250307180337.14811-1-philmd@linaro.org> References: <20250307180337.14811-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Use the runtime kvm_enabled() helper to check whether KVM is available or not. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Cédric Le Goater --- hw/vfio/pci.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index fdbc15885d4..9872884ff8a 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -118,8 +118,13 @@ static void vfio_intx_eoi(VFIODevice *vbasedev) static bool vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) { -#ifdef CONFIG_KVM - int irq_fd = event_notifier_get_fd(&vdev->intx.interrupt); + int irq_fd; + + if (!kvm_enabled()) { + return true; + } + + irq_fd = event_notifier_get_fd(&vdev->intx.interrupt); if (vdev->no_kvm_intx || !kvm_irqfds_enabled() || vdev->intx.route.mode != PCI_INTX_ENABLED || @@ -171,16 +176,13 @@ fail_irqfd: fail: qemu_set_fd_handler(irq_fd, vfio_intx_interrupt, NULL, vdev); vfio_unmask_single_irqindex(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX); + return false; -#else - return true; -#endif } static void vfio_intx_disable_kvm(VFIOPCIDevice *vdev) { -#ifdef CONFIG_KVM - if (!vdev->intx.kvm_accel) { + if (!kvm_enabled() || !vdev->intx.kvm_accel) { return; } @@ -211,7 +213,6 @@ static void vfio_intx_disable_kvm(VFIOPCIDevice *vdev) vfio_unmask_single_irqindex(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX); trace_vfio_intx_disable_kvm(vdev->vbasedev.name); -#endif } static void vfio_intx_update(VFIOPCIDevice *vdev, PCIINTxRoute *route) @@ -278,7 +279,6 @@ static bool vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp) vdev->intx.pin = pin - 1; /* Pin A (1) -> irq[0] */ pci_config_set_interrupt_pin(vdev->pdev.config, pin); -#ifdef CONFIG_KVM /* * Only conditional to avoid generating error messages on platforms * where we won't actually use the result anyway. @@ -287,7 +287,6 @@ static bool vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp) vdev->intx.route = pci_device_route_intx_to_irq(&vdev->pdev, vdev->intx.pin); } -#endif ret = event_notifier_init(&vdev->intx.interrupt, 0); if (ret) {