From patchwork Mon Mar 12 17:23:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Duyck X-Patchwork-Id: 10276793 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 4ECCA603B5 for ; Mon, 12 Mar 2018 17:23:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 360AC285A4 for ; Mon, 12 Mar 2018 17:23:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A3992861D; Mon, 12 Mar 2018 17:23:08 +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=ham 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 B973C285A4 for ; Mon, 12 Mar 2018 17:23:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932551AbeCLRXG (ORCPT ); Mon, 12 Mar 2018 13:23:06 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:45298 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932386AbeCLRXF (ORCPT ); Mon, 12 Mar 2018 13:23:05 -0400 Received: by mail-pf0-f196.google.com with SMTP id h19so4627626pfd.12; Mon, 12 Mar 2018 10:23:04 -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=GLbk1dPDPkbmVuSmBKN0IkqkTzu578dWEqiTnimtC1Q=; b=rCuYO3cuzaAM6Bcj5aDIkl1EWfucVtrTLkbFPltiVbMmk7+njQDpVdWVRRf8bc1gxv qepNR0UCMay8STtLAKcCTu+KGNuMwtMEfMPMUqbli4l29bn2lf6ac8+qdc8ZUF0ChCYm crscMWZ8NPAPRlOJDYS5n6WsjUGWUPBqSQHKC7VVlzR5qxGTZsMOKOSSdM7pD102Z/L/ tPQ0gn4SFN5hyPataJQmM+3sDATnN30tafBnWNFVgy5c8o0HoKy1a/yXtc2FVoHcv5f3 L+5GR6cbQe8SKzxJvy/a/DS7J5ejXix6GWLLCl3v3mLmsDfNN7Ism7Mtm4fyWJeoYgoq juzg== 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=GLbk1dPDPkbmVuSmBKN0IkqkTzu578dWEqiTnimtC1Q=; b=p3kL122XZNtcnY2N8EuG7jIf8tuPRAi4bG8AqgrIEiKjIjavYVQikcUzIWiZQQMkmV KHWfd0sWJBrrrKtllxaPWcitjI++bhkGtX5NOYkxliG3LAZyXCRJoR1bHVtnrxyvu3dx ISRoWoSBm8DDtjbN3Y8FZteKtqDB+M3xbU+DOWBocl5AKG0xYZgAlI6o5Th0ezZto8ra WZNJoR9240PcYMuNdwB38n/CJKcOkJdrU3htZvrlRZSbl1G0/Kr3oUkIQRbmHcKORl7O CD6nm+ze0hVC/w3JTvFXV651UQ1rrLiHcV9ZfLv7Ubq6JxFAkolutoqUk15Upaa38uiV YU8Q== X-Gm-Message-State: AElRT7Eo9sOPZSYhb0vIhpqlLtW7rDRZe1kxgDn6IRRFGd80pbVLEXdM fLOMXDMxT+UjECJWcoxdGZw= X-Google-Smtp-Source: AG47ELvyAxjrX86Pwt+OZ1ktOZiXYotmpC1VdGOwse2XpTwI9tk/5K8AkwGqqlJB6pfuEwlF55vFxg== X-Received: by 10.98.33.76 with SMTP id h73mr8651697pfh.144.1520875384238; Mon, 12 Mar 2018 10:23:04 -0700 (PDT) Received: from localhost.localdomain ([2001:470:b:9c3:9e5c:8eff:fe4f:f2d0]) by smtp.gmail.com with ESMTPSA id r30sm18391118pff.7.2018.03.12.10.23.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Mar 2018 10:23:03 -0700 (PDT) Subject: [pci PATCH v5 2/4] 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, mheyne@amazon.de, liang-min.wang@intel.com, mark.d.rustad@intel.com, dwmw2@infradead.org, hch@lst.de, dwmw@amazon.co.uk Date: Mon, 12 Mar 2018 10:23:02 -0700 Message-ID: <20180312172136.3487.95702.stgit@localhost.localdomain> In-Reply-To: <20180312171813.3487.94803.stgit@localhost.localdomain> References: <20180312171813.3487.94803.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 --- 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 drivers/virtio/virtio_pci_common.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c index 48d4d1cf1cb6..41938d36b0cb 100644 --- a/drivers/virtio/virtio_pci_common.c +++ b/drivers/virtio/virtio_pci_common.c @@ -596,6 +596,9 @@ static void virtio_pci_remove(struct pci_dev *pci_dev) #ifdef CONFIG_PM_SLEEP .driver.pm = &virtio_pci_pm_ops, #endif +#ifdef CONFIG_PCI_IOV + .sriov_configure = pci_sriov_configure_simple, +#endif }; module_pci_driver(virtio_pci_driver);