From patchwork Thu Mar 15 18:42:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Duyck X-Patchwork-Id: 10285545 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 51B7E6061F for ; Thu, 15 Mar 2018 18:43:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 436E7283C7 for ; Thu, 15 Mar 2018 18:43:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37EFD28C0E; Thu, 15 Mar 2018 18:43:10 +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 D2B61283C7 for ; Thu, 15 Mar 2018 18:43:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752781AbeCOSmr (ORCPT ); Thu, 15 Mar 2018 14:42:47 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:35381 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751975AbeCOSmo (ORCPT ); Thu, 15 Mar 2018 14:42:44 -0400 Received: by mail-pl0-f65.google.com with SMTP id p9-v6so1772198pls.2; Thu, 15 Mar 2018 11:42:44 -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=8KQiBH710nBNC4SO7kRk2jl4edV/1hV24gpxsXaxUSA=; b=fWVywo79PousrmGeCTS0IpQTmusQP+PxbS+2eJbnnmefI2o/KxX59ZcqSiUUO8Hrk7 QRHUIpNkC9xIH4vNgerNvQmmgCp+BI5lPKhoEe3cFn1Y6BG2+Vr28ZUbuTfctH7Ddeq5 ivcPH3p0Hdnh4ZFBywRzsB9WfiOqTr4grkZklg7qjmcWHiGkITjEZ7I6LnwuiAMbaRsp S+L8NV3cuWYckA1nEhZtrQQi3dxSDEIX9DzxXMSvQKTH1kizsIxxdhjrtxHRLvrGh9u3 +LVgGx+ouwWMMgpVmjpu0ceUIA7+PJ5pGbQFneASW/hnRU9UqTfyvOTyr7doQhROpEvT CtkQ== 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=8KQiBH710nBNC4SO7kRk2jl4edV/1hV24gpxsXaxUSA=; b=RHBhnHlKOAgwB6vvCEAlZ29lLhI1UlM6Ks+xCVunGB49JyEt+wQCuc45utICVph5uS uWIBEx/dcu58JPO06L5vEcvQC/ggCERM7AHlXElAFHAjS+EN+HrEyLb5TORyg5/S5Cge XmYNoy/iGUYu0+OOWCk39SuNOv5oEmcL/uHCPBwG24Km7VhLTsQstDBoPE2br+mz7dpT LYnHG46rEetl+7tyKMWf03HmWl2+5CQxPsBufDunMBoKXMOScnQ63Wxe05GAguEq37Qa SbfxP2HSrOOpYEFu5nQvur5q38T2zNfGpmfT4XPeoUK0q26z07hQQgMiuZZsf3XvQ2cu nkYA== X-Gm-Message-State: AElRT7E7lzhbrdFsBQJ1GcGGogrM27/ILqnzVmPY6VeKLSKvzvhxyZpg b4le6EHGj+3udayi7lcPC/E= X-Google-Smtp-Source: AG47ELvhjxeDbzm9aIFRbS416l0jzp4yxdjF+cBd8ruiN92zkFZcgTikbhx0gfUHkezbk1KRnM1ltQ== X-Received: by 2002:a17:902:bd05:: with SMTP id p5-v6mr9197135pls.137.1521139363957; Thu, 15 Mar 2018 11:42:43 -0700 (PDT) Received: from localhost.localdomain ([2001:470:b:9c3:9e5c:8eff:fe4f:f2d0]) by smtp.gmail.com with ESMTPSA id s86sm11695307pfi.4.2018.03.15.11.42.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Mar 2018 11:42:43 -0700 (PDT) Subject: [pci PATCH v7 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: Thu, 15 Mar 2018 11:42:41 -0700 Message-ID: <20180315184132.3102.90947.stgit@localhost.localdomain> In-Reply-To: <20180315183449.3102.64791.stgit@localhost.localdomain> References: <20180315183449.3102.64791.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@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. Reviewed-by: Christoph Hellwig Signed-off-by: Mark Rustad Signed-off-by: Alexander Duyck Tested-by: Mark Rustad --- 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 v7: No code change, added Reviewed-by 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);