From patchwork Fri Mar 2 23:45:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Duyck X-Patchwork-Id: 10255869 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 E8CC560211 for ; Fri, 2 Mar 2018 23:45:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D7AC0285E4 for ; Fri, 2 Mar 2018 23:45:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC84C285EE; Fri, 2 Mar 2018 23:45:26 +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 4E4F2285F2 for ; Fri, 2 Mar 2018 23:45:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935016AbeCBXpZ (ORCPT ); Fri, 2 Mar 2018 18:45:25 -0500 Received: from mail-io0-f194.google.com ([209.85.223.194]:36027 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935015AbeCBXpX (ORCPT ); Fri, 2 Mar 2018 18:45:23 -0500 Received: by mail-io0-f194.google.com with SMTP id e30so12338110ioc.3; Fri, 02 Mar 2018 15:45:23 -0800 (PST) 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=CuLv+rs5mWy18or5XaHfw+elVLJSsYvA3+3YSK4r3rg=; b=Zr9NMFaSrgBPN/ObcdItL30wJY/bqxNc+eVELaXdBc18gCXcz70JFEm8hL7PoXkCkz qrUYoPLM45o+MpWnAzdAaUP2CWocBleNUyF/mugEYN59iSqW5cV8AdoyQ/PvebdV282P dPJApypmoDzQ3tsa/CcOxU/XPjdVQa/FWv1x0nYXGrrygQjRue7ntRnYC4ncYW7xQcgQ grogMIvAYh4UGQu+uiisEyFmyrDNJV3WI2UIUkq/ZEgqAgSEpYUjn/ftGWFKAq/8pqoG BkSyipur7cVUrm0XaWIxpQ2ksSd02eDss6E2TzUDhffp9o0ZtJ61LBCl2CS6J6aEUvyc d4LQ== 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=CuLv+rs5mWy18or5XaHfw+elVLJSsYvA3+3YSK4r3rg=; b=rB/UubEVl4xLKTpCfE9dJwhy+ZiOopQVV+IRCr+3tT/r8Y4VewSpVZzBX7fc3DN0Qv wn7Bzcb008HXIrnyCJ3ZnKjqioa73KdEGybKUob8aKRxAkDAF7kfgZGIpFiAw75bDDu5 SkfGrhFDb6KJBZoZx9JnGubOeCNwzk8eEnOd+AI1abAltobz/7cbO9fHwrUaZpl6hT0t 8a+usTsIGdMcFmBcnN+xcgYwyZvh7ykdpppFFgGGGPUMNXOenGpueJhnziEl+0JxcvTQ 6tqHnX023u4J7poYIpr23Ab1cDN4i9JUQqpsh1bVXwwYM5nLMZjKkD2UP8UEUpnNBaea NpHA== X-Gm-Message-State: APf1xPDYUiYEApu2TFwwZk9TaIZDIg5k2twgEh2lXvD+K8z5bhteb5WZ TQlnJrpUUF3yrbojKED4sDM= X-Google-Smtp-Source: AG47ELtwqyuPoV6fjKnu5ZGqd6jhbVM4wVLjhRxSVefG5Kl0nCMTcTG9vbD+8617M+mdn+ba3Nka+w== X-Received: by 10.107.168.25 with SMTP id r25mr8681881ioe.16.1520034322517; Fri, 02 Mar 2018 15:45:22 -0800 (PST) Received: from localhost.localdomain ([2001:470:b:9c3:9e5c:8eff:fe4f:f2d0]) by smtp.gmail.com with ESMTPSA id s79sm1336073ita.7.2018.03.02.15.45.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Mar 2018 15:45:22 -0800 (PST) Subject: [PATCH 3/3] 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, mheyne@amazon.de, liang-min.wang@intel.com, mark.d.rustad@intel.com, dwmw2@infradead.org, dwmw@amazon.co.uk Date: Fri, 02 Mar 2018 15:45:20 -0800 Message-ID: <20180302234459.3337.5625.stgit@localhost.localdomain> In-Reply-To: <20180302234218.3337.16486.stgit@localhost.localdomain> References: <20180302234218.3337.16486.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 --- drivers/virtio/virtio_pci_common.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c index 48d4d1cf1cb6..ca1549393255 100644 --- a/drivers/virtio/virtio_pci_common.c +++ b/drivers/virtio/virtio_pci_common.c @@ -584,6 +584,7 @@ static void virtio_pci_remove(struct pci_dev *pci_dev) else virtio_pci_modern_remove(vp_dev); + pci_disable_sriov(pci_dev); pci_disable_device(pci_dev); put_device(dev); } @@ -596,6 +597,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_unmanaged, +#endif }; module_pci_driver(virtio_pci_driver);