From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C28EE33F598 for ; Thu, 4 Jun 2026 15:02:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780585329; cv=none; b=AOcFuZJFBESW1PTXLNADVe0/ltL3158cLetpwph44ymBot3P9ejfxw5AUtdmbmDWh9T8BzBkGEsovN3xTWag4v8agb1uOmey2IX7CRbcNP5SGnzOVLWRIyWGcWPqvdqjiktUsMr8aDHtvK8IXmj4Nk95dz3NfRr3W2qvXYoMe0M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780585329; c=relaxed/simple; bh=nvFyjCT5ppH/Q/ZoWQSkEOugTOmlUlVEiME03kna43M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LEVvoWpb5IS6i49VsQ5e/sCKvb31htDZQAr3tLtCswlibwMTVwkU2hlNHPVCBZxMl1Tyk5Ec+Z00MQV+lB/KnZT6Zy9iBjSQysynXLhP7dKK/aBAq4BhYrkMuI8mvtyKcNJp9OfHs5ivPvO6gIgBGtYVnjUmLJdaESXkYJucFM4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=k+vqdimJ; arc=none smtp.client-ip=209.85.216.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="k+vqdimJ" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-36bd175fdbaso570435a91.0 for ; Thu, 04 Jun 2026 08:02:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780585325; x=1781190125; darn=vger.kernel.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=xaX3iBh5aQ6ieP4wRDACjZGRgQdbq9tB2uoE6aInkl8=; b=k+vqdimJVhQIwiOXTPEluKSN82aPaYZbR4Wdh5bMJaYz0eaiTE1HpFogEkkGMJT2BD 3gyQ+jup4TDLoVawAMcBYrRea+CPYuRECpiJZoOY/DrQ9+2JxytLpLWqqgQ5BGpNMXrK BLFR7IL5WEed7YFjr3o7l/qr6EHV+2ii2CWt1/8P+H1AGC1+0Z1yZSCS1isboTcLfg6s MDtlobdbTD/WM1N4eTnmjIsNe1LwhrUyHpOrdIiBA3wvnbKl1t/FjadenOeo05sbdLqh eKN9reiTA6fRBH4xEwQXJoqPYMbloI0xhQCJ9lVLAb3NZ9g2YB70gbcuVEpDSPePFWHl 3zGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780585325; x=1781190125; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=xaX3iBh5aQ6ieP4wRDACjZGRgQdbq9tB2uoE6aInkl8=; b=MOqEeG/MGs1wAgBKBwdyqilY34VEvrKSCfikCO5Ph136ckMU2NORqs+GxLJpvJr3iO vqyPReTwXviJ7IlCrbymW83Z2ovcb9yh0TFJFKkwC8T2lLB4Yj89bKQygm1mq6DJal1o rshzXs1Y4J2B1i+kr0Yg+aqHnoyuHB4Y3HHmLnYwvlISHRyZOyLUufC8EgFBs19qjcO+ JeRkb5MlxTnSdOVHR3dJHfP+pQmIoCKC8p4HLHVHdfOS0yNQhOafxIQ6eHxDlCgU7utd ogEcKn7zzxE8v/lVXjw1bi0BSURfDh5LrghhQsrlcTIs1dVogn89hMCkM6EaDbDs1u/c w7ew== X-Forwarded-Encrypted: i=1; AFNElJ+Hlyx0kDDHKMM72OcVC6nJLGAnu59p8kgumwyLgcKnAFfr3f5gv82NNQp3AMRi0kz5q97Xrm902PUs@vger.kernel.org X-Gm-Message-State: AOJu0YwbAOMQ9pOXF44im5t7W++XMkJYNhE3kGGcahWM8+gMTpAgnDA6 yWFm+jMDwqDCeLzsurcJYGuyXSbMPRRrm0p7mgZuSjnlqjmuDBPSvq0E X-Gm-Gg: Acq92OG3hi+PuVl1XVLX0TsFP7qlBJtlCz3LtNHD4hL2aMKQG9iPEoXscnmsGe+GvN1 wQwmoUswpYBVPVxom5rZPKZpMlzVQISN4xADt96P5VXrlPjhwC62h4kt9iRkZR79g5CLTYyYGMq woJLluP0xJQvA1zMXBcHPZth70morHdWCTeZ69CkTeIJljXfaFhZCs8iURbLCXXTYwYUdSuUWb6 ICqqinJYh/dZ1f87xAkqa7dlhCwuvKhy5TsABhopik3Nbn84M9pgc5aqB013EMSCQ97b8noYnWv eRMjt7nFycsrUt+d5VquyysGkU5Rh0Z8oROVWamkoDfJQIme3XJx3tIExnHMU+uX+nfswtjVWd+ CYv4KeuO0k4Qy5lbXT/9nMY/Mk4YrOHZRQXgFBOcesC2XgafRJdPLcdxIXi0XTCiUnM5ts7Mp+2 x6rTV3z7iy+uhk5FVlpsodBYYGju8fWpag22GU5dc= X-Received: by 2002:a17:90b:3bc4:b0:36a:1ed8:6fe6 with SMTP id 98e67ed59e1d1-36e332f7e45mr8166646a91.24.1780585324132; Thu, 04 Jun 2026 08:02:04 -0700 (PDT) Received: from localhost ([2a03:2880:7ff:41::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-36f6d109dcdsm4398717a91.9.2026.06.04.08.02.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 08:02:03 -0700 (PDT) From: Dimitri Daskalakis To: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Mahesh J Salgaonkar , Oliver O'Halloran , Niklas Schnelle , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Alex Williamson , Jason Gunthorpe , Kevin Tian , Ankit Agrawal , Leon Romanovsky , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Keith Busch , Alexander Duyck , Jakub Kicinski , Dimitri Daskalakis , linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org Subject: [RFC 06/12] PCI: Convert vfio_pci_core.c to pci_is_sriov_* helpers Date: Thu, 4 Jun 2026 08:01:47 -0700 Message-ID: <20260604150153.3619662-7-dimitri.daskalakis1@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260604150153.3619662-1-dimitri.daskalakis1@gmail.com> References: <20260604150153.3619662-1-dimitri.daskalakis1@gmail.com> Precedence: bulk X-Mailing-List: linux-s390@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Dimitri Daskalakis No functional changes. Assisted-by: Claude:claude-opus-4.7 Signed-off-by: Dimitri Daskalakis --- drivers/vfio/pci/vfio_pci_core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c index 3f8d093aacf8..ad8069612cb2 100644 --- a/drivers/vfio/pci/vfio_pci_core.c +++ b/drivers/vfio/pci/vfio_pci_core.c @@ -1856,7 +1856,7 @@ int vfio_pci_core_match_token_uuid(struct vfio_device *core_vdev, * * If the VF token is provided but unused, an error is generated. */ - if (vdev->pdev->is_virtfn) { + if (pci_is_sriov_virtfn(vdev->pdev)) { struct vfio_pci_core_device *pf_vdev = vdev->sriov_pf_core_dev; bool match; @@ -1979,13 +1979,13 @@ static int vfio_pci_bus_notifier(struct notifier_block *nb, struct pci_dev *physfn = pci_physfn(pdev); if (action == BUS_NOTIFY_ADD_DEVICE && - pdev->is_virtfn && physfn == vdev->pdev) { + pci_is_sriov_virtfn(pdev) && physfn == vdev->pdev) { pci_info(vdev->pdev, "Captured SR-IOV VF %s driver_override\n", pci_name(pdev)); WARN_ON(device_set_driver_override(&pdev->dev, vdev->vdev.ops->name)); } else if (action == BUS_NOTIFY_BOUND_DRIVER && - pdev->is_virtfn && physfn == vdev->pdev) { + pci_is_sriov_virtfn(pdev) && physfn == vdev->pdev) { struct pci_driver *drv = pci_dev_driver(pdev); if (drv && drv != pci_dev_driver(vdev->pdev)) @@ -2005,7 +2005,7 @@ static int vfio_pci_vf_init(struct vfio_pci_core_device *vdev) struct pci_dev *physfn; int ret; - if (pdev->is_virtfn) { + if (pci_is_sriov_virtfn(pdev)) { /* * If this VF was created by our vfio_pci_core_sriov_configure() * then we can find the PF vfio_pci_core_device now, and due to @@ -2025,7 +2025,7 @@ static int vfio_pci_vf_init(struct vfio_pci_core_device *vdev) } /* Not a SRIOV PF */ - if (!pdev->is_physfn) + if (!pci_is_sriov_physfn(pdev)) return 0; vdev->vf_token = kzalloc_obj(*vdev->vf_token); @@ -2166,7 +2166,7 @@ int vfio_pci_core_register_device(struct vfio_pci_core_device *vdev) return -EBUSY; } - if (pci_is_root_bus(pdev->bus) || pdev->is_virtfn) { + if (pci_is_root_bus(pdev->bus) || pci_is_sriov_virtfn(pdev)) { ret = vfio_assign_device_set(&vdev->vdev, vdev); } else if (!pci_probe_reset_slot(pdev->slot)) { ret = vfio_assign_device_set(&vdev->vdev, pdev->slot); -- 2.52.0