Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp1046927ybi; Thu, 30 May 2019 10:42:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqyYW5rb3r15fKiruGCc6tMW5Bvy7WsZomdfUcUjik+HKZO7MJ7i3aIm3TS3RXJNdKwllKh3 X-Received: by 2002:a63:ee0a:: with SMTP id e10mr4713861pgi.28.1559238169305; Thu, 30 May 2019 10:42:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559238169; cv=none; d=google.com; s=arc-20160816; b=lWAYEGmX7BhUfYDe7tlU+W+6ecXmoDihsHYb+zClX0z1uZoybzfGpWd9/nRS1jQwrZ myas0emnfogGBYlwXnkumaIK5D9V5/XQDPveoR78NWUJdpunrRRUCivq80l7kN5Yraxq 9oxesuDpZLMgTvCUANSGf44fRQaaR/uzh7qmeIiJAVKqMumw7aj0OQpYn6k0Rpb/EsO8 RhRWj5nXdbsKg4PX5SYbmVr+YeH5raFWD2MxlCDKRTSchDxrWwLeF3qTMr534/UV3gFe OCizHDYe3nfEEbvfGT3zoUclo9PpnJ/xWWCPQpEAUOFYr6aUix9pFHcURLG5zwgtwJ49 qubQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-language :content-transfer-encoding:in-reply-to:mime-version:user-agent:date :message-id:organization:from:references:cc:to:subject:reply-to; bh=6rtvuh183GEG+kah8n3HMQFNfZJ30uShta60UdP8O4Q=; b=RFRKyp6ebRmhIWsJrO7/gejgmprTf3ZgtEUwnjCToMCSD5lTzkwP3bYYjA+Pjpdx7l 4vGAf9gwmAMe9xLN/FYA5ZBy7lRkTeh6Db+808mnrpqE4uJdxjQG5RefsZE45iEaNufQ g1kRnjXHw5K1prXxjO7PLy91goodonCvWTgtusEyWu4jyoEh6V1Pw8Knbx00bfxaF96e O4ah71B9+Vw3zcblDiG4fLU/QEz8mkSGxmmNYcMB410AoLEzDNm5HQYhw9oeIb69Zs8S b2qZZHLTx/J+PO/y5AjuHNS0wo0cFcPomhl82LL6fnyKTnBt/a0MgFaPLi5DzukTI+Nx dx6g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h187si4115622pfb.129.2019.05.30.10.42.33; Thu, 30 May 2019 10:42:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726527AbfE3Rl3 (ORCPT + 99 others); Thu, 30 May 2019 13:41:29 -0400 Received: from mga04.intel.com ([192.55.52.120]:26068 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726307AbfE3Rl3 (ORCPT ); Thu, 30 May 2019 13:41:29 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 May 2019 10:41:28 -0700 X-ExtLoop1: 1 Received: from linux.intel.com ([10.54.29.200]) by fmsmga008.fm.intel.com with ESMTP; 30 May 2019 10:41:28 -0700 Received: from [10.54.74.33] (skuppusw-desk.jf.intel.com [10.54.74.33]) by linux.intel.com (Postfix) with ESMTP id A26095804BA; Thu, 30 May 2019 10:41:27 -0700 (PDT) Reply-To: sathyanarayanan.kuppuswamy@linux.intel.com Subject: Re: [PATCH v2 1/5] PCI/ATS: Add PRI support for PCIe VF devices To: "Raj, Ashok" , Bjorn Helgaas Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, keith.busch@intel.com References: <20190529225714.GE28250@google.com> <20190529230426.GB5108@araj-mobl1.jf.intel.com> <20190530131738.GK28250@google.com> <20190530172055.GB18559@araj-mobl1.jf.intel.com> From: sathyanarayanan kuppuswamy Organization: Intel Message-ID: Date: Thu, 30 May 2019 10:39:35 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190530172055.GB18559@araj-mobl1.jf.intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 5/30/19 10:20 AM, Raj, Ashok wrote: > On Thu, May 30, 2019 at 08:17:38AM -0500, Bjorn Helgaas wrote: >> On Wed, May 29, 2019 at 04:04:27PM -0700, Raj, Ashok wrote: >>> On Wed, May 29, 2019 at 05:57:14PM -0500, Bjorn Helgaas wrote: >>>> On Mon, May 06, 2019 at 10:20:03AM -0700, sathyanarayanan.kuppuswamy@linux.intel.com wrote: >>>>> From: Kuppuswamy Sathyanarayanan >>>>> >>>>> When IOMMU tries to enable PRI for VF device in >>>>> iommu_enable_dev_iotlb(), it always fails because PRI support for PCIe >>>>> VF device is currently broken in PCIE driver. Current implementation >>>>> expects the given PCIe device (PF & VF) to implement PRI capability >>>>> before enabling the PRI support. But this assumption is incorrect. As >>>>> per PCIe spec r4.0, sec 9.3.7.11, all VFs associated with PF can only >>>>> use the Page Request Interface (PRI) of the PF and not implement it. >>>>> Hence we need to create exception for handling the PRI support for PCIe >>>>> VF device. >>>>> >>>>> Since PRI is shared between PF/VF devices, following rules should apply. >>>>> >>>>> 1. Enable PRI in VF only if its already enabled in PF. >>>>> 2. When enabling/disabling PRI for VF, instead of configuring the >>>>> registers just increase/decrease the usage count (pri_ref_cnt) of PF. >>>>> 3. Disable PRI in PF only if pr_ref_cnt is zero. >>>> s/pr_ref_cnt/pri_ref_cnt/ >>>> >>>>> Cc: Ashok Raj >>>>> Cc: Keith Busch >>>>> Suggested-by: Ashok Raj >>>>> Signed-off-by: Kuppuswamy Sathyanarayanan >>>>> --- >>>>> drivers/pci/ats.c | 53 +++++++++++++++++++++++++++++++++++++++++++-- >>>>> include/linux/pci.h | 1 + >>>>> 2 files changed, 52 insertions(+), 2 deletions(-) >>>>> >>>>> diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c >>>>> index 97c08146534a..5582e5d83a3f 100644 >>>>> --- a/drivers/pci/ats.c >>>>> +++ b/drivers/pci/ats.c >>>>> @@ -181,12 +181,39 @@ int pci_enable_pri(struct pci_dev *pdev, u32 reqs) >>>>> u16 control, status; >>>>> u32 max_requests; >>>>> int pos; >>>>> + struct pci_dev *pf; >>>>> >>>>> if (WARN_ON(pdev->pri_enabled)) >>>>> return -EBUSY; >>>>> >>>>> pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI); >>>>> - if (!pos) >>>>> + >>>>> + if (pdev->is_virtfn) { >>>>> + /* >>>>> + * Per PCIe r4.0, sec 9.3.7.11, VF must not implement PRI >>>>> + * Capability. >>>>> + */ >>>>> + if (pos) { >>>>> + dev_err(&pdev->dev, "VF must not implement PRI"); >>>>> + return -EINVAL; >>>>> + } >>>> This seems gratuitous. It finds implementation errors, but since we >>>> correctly use the PF here anyway, it doesn't *need* to prevent PRI on >>>> the VF from working. >>>> >>>> I think you should just have: >>>> >>>> if (pdev->is_virtfn) { >>>> pf = pci_physfn(pdev); >>>> if (!pf->pri_enabled) >>>> return -EINVAL; >>> This would be incorrect. Since if we never did any bind_mm to the PF >>> PRI would not have been enabled. Currently this is done in the IOMMU >>> driver, and not in the device driver. >> This is functionally the same as the original patch, only omitting the >> "VF must not implement PRI" check. >> >>> I suppose we should enable PF capability if its not enabled. Same >>> comment would be applicable for PASID as well. >> Operating on a device other than the one the driver owns opens the >> issue of mutual exclusion and races, so would require careful >> scrutiny. Are PRI/PASID things that could be *always* enabled for the >> PF at enumeration-time, or do we have to wait until a driver claims >> the VF? If the latter, are there coordination issues between drivers >> of different VFs? > I suppose that's a reasonably good alternative. You mean we could > do this when VF's are being created? Otherwise we can do this as its > done today, on demand for all normal PF's. If we are going to enable it with default features then its doable. But for cases with custom requirements, it will become complicated. For example, in following code, IOMMU sets PRI Outstanding Page Allocation quota as 32 or 1 based on errata info. So if we just enable it by default then we may not be able to take these requirements into consideration. 2051 static int pdev_iommuv2_enable(struct pci_dev *pdev) 2052 { 2053         bool reset_enable; 2054         int reqs, ret; 2055 2056         /* FIXME: Hardcode number of outstanding requests for now */ 2057         reqs = 32; 2058         if (pdev_pri_erratum(pdev, AMD_PRI_DEV_ERRATUM_LIMIT_REQ_ONE)) 2059                 reqs = 1; 2060         reset_enable = pdev_pri_erratum(pdev, AMD_PRI_DEV_ERRATUM_ENABLE_RESET); 2073         ret = pci_enable_pri(pdev, reqs); > > > Cheers, > Ashok > -- Sathyanarayanan Kuppuswamy Linux kernel developer