From patchwork Tue Mar 13 21:29:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Duyck X-Patchwork-Id: 10280871 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0858C602BD for ; Tue, 13 Mar 2018 21:30:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF4C328535 for ; Tue, 13 Mar 2018 21:30:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EBEC4285A5; Tue, 13 Mar 2018 21:30:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58D9128535 for ; Tue, 13 Mar 2018 21:30:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752840AbeCMV3w (ORCPT ); Tue, 13 Mar 2018 17:29:52 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:38285 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752555AbeCMV3v (ORCPT ); Tue, 13 Mar 2018 17:29:51 -0400 Received: by mail-pl0-f66.google.com with SMTP id m22-v6so556762pls.5; Tue, 13 Mar 2018 14:29:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=j3Og+ENt3+Y2jUGYB9m1kQwWgI/AxSEmDluLYu5I6I8=; b=SbzACczRh8RkzxiP6lLJE4UTv9pFT2Ryo6E3Ftrq3uUetBRHVPsaKRUNRA6MAGum0o 0rHw9456oBogrTSB1Vyy3YAELUWLtaKDd2ug+kZYQXTde9Vst6M74k5/4h/QF/J9qtYx VyolNar1mjWTV7f7HsMy6xl/LwbYqF5OIO3OdcyHj9b4Je4lrTPGE9TPRZe0gl7n63JZ +n12Jz0MV+1BouViD21vsW3XU04qqX37PW2cSqpcfQk+5qsXDRjg9uGTbpgbmg3hVVsL 47NdRpHubW4uSboPaw/x5oQPLH3kC9dvAVoUt2iFGjqxR/SJfRrTGBvEVJKTKHNLuiRv Czaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=j3Og+ENt3+Y2jUGYB9m1kQwWgI/AxSEmDluLYu5I6I8=; b=YphALZLMvnCRRbgafRD5MkctZMoKxPqfZluCNF83zXZCXQtJMaJPk8ZdD+Bm9KZPBM 5OaE13CX9mp8KJPRshepXvizx9TNJYQnIQWLTIUA8rnRDwMNfZ8TCSatulavgziq47VU JLUQ3SzxU4ioYN2dhdoqAd4PVSv8yMU5rf3nOz0UJgzxpeLfvR7Csr+WqM87NI9r9lli 9eMk9VTz8TGpnQIg/qquoHqPlpeK9EVrAg05nzQsHp5mE8okE/X3hKYMuoakvuowpwyK WmmHznPa3ffVyVlzEevAUYZ4Y9J3fxLUYgOUKQDGvaqURWmkgjBA/mTqQxNULGe2jfEg InZw== X-Gm-Message-State: AElRT7Hhd5w4DF1Saa2hjElurXG6x6dsgwMexaAGJM/GL9/BGoKwHLqY xumW4QFFICQ19JLbbQ+iQ/8= X-Google-Smtp-Source: AG47ELsib3xB4/k5BNIVEd38LaI7VAOO9gtNP6+NG8Y7h37Ex2lBxigV2yzRU23Ev3DhUwiewAvYeA== X-Received: by 2002:a17:902:a70c:: with SMTP id w12-v6mr1062406plq.243.1520976590639; Tue, 13 Mar 2018 14:29:50 -0700 (PDT) Received: from localhost.localdomain ([2001:470:b:9c3:9e5c:8eff:fe4f:f2d0]) by smtp.gmail.com with ESMTPSA id k195sm1621058pgc.71.2018.03.13.14.29.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Mar 2018 14:29:50 -0700 (PDT) Subject: [pci PATCH v6 2/5] virtio_pci: Add support for unmanaged SR-IOV on virtio_pci devices From: Alexander Duyck To: bhelgaas@google.com, alexander.h.duyck@intel.com, linux-pci@vger.kernel.org Cc: virtio-dev@lists.oasis-open.org, kvm@vger.kernel.org, netdev@vger.kernel.org, dan.daly@intel.com, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, keith.busch@intel.com, netanel@amazon.com, ddutile@redhat.com, mheyne@amazon.de, liang-min.wang@intel.com, mark.d.rustad@intel.com, dwmw2@infradead.org, hch@lst.de, dwmw@amazon.co.uk Date: Tue, 13 Mar 2018 14:29:49 -0700 Message-ID: <20180313212855.3553.97762.stgit@localhost.localdomain> In-Reply-To: <20180313212508.3553.65326.stgit@localhost.localdomain> References: <20180313212508.3553.65326.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Alexander Duyck Hardware-realized virtio_pci devices can implement SR-IOV, so this patch enables its use. The device in question is an upcoming Intel NIC that implements both a virtio_net PF and virtio_net VFs. These are hardware realizations of what has been up to now been a software interface. The device in question has the following 4-part PCI IDs: PF: vendor: 1af4 device: 1041 subvendor: 8086 subdevice: 15fe VF: vendor: 1af4 device: 1041 subvendor: 8086 subdevice: 05fe The patch currently needs no check for device ID, because the callback will never be made for devices that do not assert the capability or when run on a platform incapable of SR-IOV. One reason for this patch is because the hardware requires the vendor ID of a VF to be the same as the vendor ID of the PF that created it. So it seemed logical to simply have a fully-functioning virtio_net PF create the VFs. This patch makes that possible. Signed-off-by: Mark Rustad Signed-off-by: Alexander Duyck Reviewed-by: Christoph Hellwig --- v4: Dropped call to pci_disable_sriov in virtio_pci_remove function v5: Replaced call to pci_sriov_configure_unmanaged with pci_sriov_configure_simple v6: Dropped "#ifdef" checks for IOV wrapping sriov_configure definition drivers/virtio/virtio_pci_common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c index 48d4d1cf1cb6..67a227fd7aa0 100644 --- a/drivers/virtio/virtio_pci_common.c +++ b/drivers/virtio/virtio_pci_common.c @@ -596,6 +596,7 @@ static void virtio_pci_remove(struct pci_dev *pci_dev) #ifdef CONFIG_PM_SLEEP .driver.pm = &virtio_pci_pm_ops, #endif + .sriov_configure = pci_sriov_configure_simple, }; module_pci_driver(virtio_pci_driver);