From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e23smtp02.au.ibm.com (e23smtp02.au.ibm.com [202.81.31.144]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id C56931A0873 for ; Thu, 7 Aug 2014 12:10:17 +1000 (EST) Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 7 Aug 2014 12:10:16 +1000 Received: from d23relay08.au.ibm.com (d23relay08.au.ibm.com [9.185.71.33]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 566FF3578048 for ; Thu, 7 Aug 2014 12:10:11 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay08.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s772AjOc13434934 for ; Thu, 7 Aug 2014 12:10:45 +1000 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s772AAjk028039 for ; Thu, 7 Aug 2014 12:10:11 +1000 Date: Thu, 7 Aug 2014 12:10:07 +1000 From: Gavin Shan To: Alexey Kardashevskiy Subject: Re: [PATCH v3 4/4] drivers/vfio: Enable VFIO if EEH is not supported Message-ID: <20140807021007.GA5230@shangw> Reply-To: Gavin Shan References: <1407318545-17554-1-git-send-email-gwshan@linux.vnet.ibm.com> <1407318545-17554-5-git-send-email-gwshan@linux.vnet.ibm.com> <1407329433.316.80.camel@ul30vt.home> <53E22827.2000204@ozlabs.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <53E22827.2000204@ozlabs.ru> Cc: Alex Williamson , linuxppc-dev@lists.ozlabs.org, Gavin Shan , kvm@vger.kernel.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, Aug 06, 2014 at 11:05:43PM +1000, Alexey Kardashevskiy wrote: >On 08/06/2014 10:50 PM, Alex Williamson wrote: >> On Wed, 2014-08-06 at 19:49 +1000, Gavin Shan wrote: >>> From: Alexey Kardashevskiy >>> >>> The existing vfio_pci_open() fails upon error returned from >>> vfio_spapr_pci_eeh_open(), which breaks POWER7's P5IOC2 PHB >>> support which this patch brings back. >>> >>> The patch fixes the issue by dropping the return value of >>> vfio_spapr_pci_eeh_open(). >>> >>> Signed-off-by: Alexey Kardashevskiy >>> Signed-off-by: Gavin Shan >>> --- >>> v3: Drop return value of vfio_spapr_pci_eeh_open() >>> --- >>> drivers/vfio/pci/vfio_pci.c | 6 +----- >>> drivers/vfio/vfio_spapr_eeh.c | 4 ++-- >>> include/linux/vfio.h | 5 ++--- >>> 3 files changed, 5 insertions(+), 10 deletions(-) >>> >>> diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c >>> index e2ee80f..32d69c8 100644 >>> --- a/drivers/vfio/pci/vfio_pci.c >>> +++ b/drivers/vfio/pci/vfio_pci.c >>> @@ -178,11 +178,7 @@ static int vfio_pci_open(void *device_data) >>> if (ret) >>> goto error; >>> >>> - ret = vfio_spapr_pci_eeh_open(vdev->pdev); >>> - if (ret) { >>> - vfio_pci_disable(vdev); >>> - goto error; >>> - } >>> + vfio_spapr_pci_eeh_open(vdev->pdev); >>> } >>> >>> return 0; >>> diff --git a/drivers/vfio/vfio_spapr_eeh.c b/drivers/vfio/vfio_spapr_eeh.c >>> index 4779cac..86dfceb 100644 >>> --- a/drivers/vfio/vfio_spapr_eeh.c >>> +++ b/drivers/vfio/vfio_spapr_eeh.c >>> @@ -19,9 +19,9 @@ >>> #define DRIVER_DESC "VFIO IOMMU SPAPR EEH" >>> >>> /* We might build address mapping here for "fast" path later */ >>> -int vfio_spapr_pci_eeh_open(struct pci_dev *pdev) >>> +void vfio_spapr_pci_eeh_open(struct pci_dev *pdev) >>> { >>> - return eeh_dev_open(pdev); >>> + eeh_dev_open(pdev); >> >> Wasn't there some intent to provide a warning message, that would now be >> done here? Has that idea been dropped? > > >Comrade Gavin just forgot it :) > >Gavin, please add it. Thanks! > Sure, I'll add following warning message in eeh_dev_open() in separate patch in v4 in case nobody objects. int eeh_dev_open(struct pci_dev *pdev) { : /* No EEH device or PE ? */ edev = pci_dev_to_eeh_dev(pdev); if (!edev || !edev->pe) { pr_warn_once("%s: Device %s not supported\n", __func__, pci_name(pdev)); goto out; } : } Thanks, Gavin > > >> >>> } >>> EXPORT_SYMBOL_GPL(vfio_spapr_pci_eeh_open); >>> >>> diff --git a/include/linux/vfio.h b/include/linux/vfio.h >>> index 224128a..d320411 100644 >>> --- a/include/linux/vfio.h >>> +++ b/include/linux/vfio.h >>> @@ -100,15 +100,14 @@ extern long vfio_external_check_extension(struct vfio_group *group, >>> >>> struct pci_dev; >>> #ifdef CONFIG_EEH >>> -extern int vfio_spapr_pci_eeh_open(struct pci_dev *pdev); >>> +extern void vfio_spapr_pci_eeh_open(struct pci_dev *pdev); >>> extern void vfio_spapr_pci_eeh_release(struct pci_dev *pdev); >>> extern long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, >>> unsigned int cmd, >>> unsigned long arg); >>> #else >>> -static inline int vfio_spapr_pci_eeh_open(struct pci_dev *pdev) >>> +static inline void vfio_spapr_pci_eeh_open(struct pci_dev *pdev) >>> { >>> - return 0; >>> } >>> >>> static inline void vfio_spapr_pci_eeh_release(struct pci_dev *pdev) >> >> >> > > >-- >Alexey > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gavin Shan Subject: Re: [PATCH v3 4/4] drivers/vfio: Enable VFIO if EEH is not supported Date: Thu, 7 Aug 2014 12:10:07 +1000 Message-ID: <20140807021007.GA5230@shangw> References: <1407318545-17554-1-git-send-email-gwshan@linux.vnet.ibm.com> <1407318545-17554-5-git-send-email-gwshan@linux.vnet.ibm.com> <1407329433.316.80.camel@ul30vt.home> <53E22827.2000204@ozlabs.ru> Reply-To: Gavin Shan Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: Alex Williamson , linuxppc-dev@lists.ozlabs.org, Gavin Shan , kvm@vger.kernel.org To: Alexey Kardashevskiy Return-path: Content-Disposition: inline In-Reply-To: <53E22827.2000204@ozlabs.ru> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org Sender: "Linuxppc-dev" List-Id: kvm.vger.kernel.org T24gV2VkLCBBdWcgMDYsIDIwMTQgYXQgMTE6MDU6NDNQTSArMTAwMCwgQWxleGV5IEthcmRhc2hl dnNraXkgd3JvdGU6Cj5PbiAwOC8wNi8yMDE0IDEwOjUwIFBNLCBBbGV4IFdpbGxpYW1zb24gd3Jv dGU6Cj4+IE9uIFdlZCwgMjAxNC0wOC0wNiBhdCAxOTo0OSArMTAwMCwgR2F2aW4gU2hhbiB3cm90 ZToKPj4+IEZyb206IEFsZXhleSBLYXJkYXNoZXZza2l5IDxhaWtAb3psYWJzLnJ1Pgo+Pj4KPj4+ IFRoZSBleGlzdGluZyB2ZmlvX3BjaV9vcGVuKCkgZmFpbHMgdXBvbiBlcnJvciByZXR1cm5lZCBm cm9tCj4+PiB2ZmlvX3NwYXByX3BjaV9lZWhfb3BlbigpLCB3aGljaCBicmVha3MgUE9XRVI3J3Mg UDVJT0MyIFBIQgo+Pj4gc3VwcG9ydCB3aGljaCB0aGlzIHBhdGNoIGJyaW5ncyBiYWNrLgo+Pj4K Pj4+IFRoZSBwYXRjaCBmaXhlcyB0aGUgaXNzdWUgYnkgZHJvcHBpbmcgdGhlIHJldHVybiB2YWx1 ZSBvZgo+Pj4gdmZpb19zcGFwcl9wY2lfZWVoX29wZW4oKS4KPj4+Cj4+PiBTaWduZWQtb2ZmLWJ5 OiBBbGV4ZXkgS2FyZGFzaGV2c2tpeSA8YWlrQG96bGFicy5ydT4KPj4+IFNpZ25lZC1vZmYtYnk6 IEdhdmluIFNoYW4gPGd3c2hhbkBsaW51eC52bmV0LmlibS5jb20+Cj4+PiAtLS0KPj4+IHYzOiBE cm9wIHJldHVybiB2YWx1ZSBvZiB2ZmlvX3NwYXByX3BjaV9lZWhfb3BlbigpCj4+PiAtLS0KPj4+ ICBkcml2ZXJzL3ZmaW8vcGNpL3ZmaW9fcGNpLmMgICB8IDYgKy0tLS0tCj4+PiAgZHJpdmVycy92 ZmlvL3ZmaW9fc3BhcHJfZWVoLmMgfCA0ICsrLS0KPj4+ICBpbmNsdWRlL2xpbnV4L3ZmaW8uaCAg ICAgICAgICB8IDUgKystLS0KPj4+ICAzIGZpbGVzIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwg MTAgZGVsZXRpb25zKC0pCj4+Pgo+Pj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvdmZpby9wY2kvdmZp b19wY2kuYyBiL2RyaXZlcnMvdmZpby9wY2kvdmZpb19wY2kuYwo+Pj4gaW5kZXggZTJlZTgwZi4u MzJkNjljOCAxMDA2NDQKPj4+IC0tLSBhL2RyaXZlcnMvdmZpby9wY2kvdmZpb19wY2kuYwo+Pj4g KysrIGIvZHJpdmVycy92ZmlvL3BjaS92ZmlvX3BjaS5jCj4+PiBAQCAtMTc4LDExICsxNzgsNyBA QCBzdGF0aWMgaW50IHZmaW9fcGNpX29wZW4odm9pZCAqZGV2aWNlX2RhdGEpCj4+PiAgCQlpZiAo cmV0KQo+Pj4gIAkJCWdvdG8gZXJyb3I7Cj4+PiAgCj4+PiAtCQlyZXQgPSB2ZmlvX3NwYXByX3Bj aV9lZWhfb3Blbih2ZGV2LT5wZGV2KTsKPj4+IC0JCWlmIChyZXQpIHsKPj4+IC0JCQl2ZmlvX3Bj aV9kaXNhYmxlKHZkZXYpOwo+Pj4gLQkJCWdvdG8gZXJyb3I7Cj4+PiAtCQl9Cj4+PiArCQl2Zmlv X3NwYXByX3BjaV9lZWhfb3Blbih2ZGV2LT5wZGV2KTsKPj4+ICAJfQo+Pj4gIAo+Pj4gIAlyZXR1 cm4gMDsKPj4+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3ZmaW8vdmZpb19zcGFwcl9lZWguYyBiL2Ry aXZlcnMvdmZpby92ZmlvX3NwYXByX2VlaC5jCj4+PiBpbmRleCA0Nzc5Y2FjLi44NmRmY2ViIDEw MDY0NAo+Pj4gLS0tIGEvZHJpdmVycy92ZmlvL3ZmaW9fc3BhcHJfZWVoLmMKPj4+ICsrKyBiL2Ry aXZlcnMvdmZpby92ZmlvX3NwYXByX2VlaC5jCj4+PiBAQCAtMTksOSArMTksOSBAQAo+Pj4gICNk ZWZpbmUgRFJJVkVSX0RFU0MJIlZGSU8gSU9NTVUgU1BBUFIgRUVIIgo+Pj4gIAo+Pj4gIC8qIFdl IG1pZ2h0IGJ1aWxkIGFkZHJlc3MgbWFwcGluZyBoZXJlIGZvciAiZmFzdCIgcGF0aCBsYXRlciAq Lwo+Pj4gLWludCB2ZmlvX3NwYXByX3BjaV9lZWhfb3BlbihzdHJ1Y3QgcGNpX2RldiAqcGRldikK Pj4+ICt2b2lkIHZmaW9fc3BhcHJfcGNpX2VlaF9vcGVuKHN0cnVjdCBwY2lfZGV2ICpwZGV2KQo+ Pj4gIHsKPj4+IC0JcmV0dXJuIGVlaF9kZXZfb3BlbihwZGV2KTsKPj4+ICsJZWVoX2Rldl9vcGVu KHBkZXYpOwo+PiAKPj4gV2Fzbid0IHRoZXJlIHNvbWUgaW50ZW50IHRvIHByb3ZpZGUgYSB3YXJu aW5nIG1lc3NhZ2UsIHRoYXQgd291bGQgbm93IGJlCj4+IGRvbmUgaGVyZT8gIEhhcyB0aGF0IGlk ZWEgYmVlbiBkcm9wcGVkPwo+Cj4KPkNvbXJhZGUgR2F2aW4ganVzdCBmb3Jnb3QgaXQgOikKPgo+ R2F2aW4sIHBsZWFzZSBhZGQgaXQuIFRoYW5rcyEKPgoKU3VyZSwgSSdsbCBhZGQgZm9sbG93aW5n IHdhcm5pbmcgbWVzc2FnZSBpbiBlZWhfZGV2X29wZW4oKSBpbgpzZXBhcmF0ZSBwYXRjaCBpbiB2 NCBpbiBjYXNlIG5vYm9keSBvYmplY3RzLgoKaW50IGVlaF9kZXZfb3BlbihzdHJ1Y3QgcGNpX2Rl diAqcGRldikKewogICAgICAgIDoKICAgICAgICAvKiBObyBFRUggZGV2aWNlIG9yIFBFID8gKi8K ICAgICAgICBlZGV2ID0gcGNpX2Rldl90b19lZWhfZGV2KHBkZXYpOwogICAgICAgIGlmICghZWRl diB8fCAhZWRldi0+cGUpIHsKCQlwcl93YXJuX29uY2UoIiVzOiBEZXZpY2UgJXMgbm90IHN1cHBv cnRlZFxuIiwKCQkJICAgICBfX2Z1bmNfXywgcGNpX25hbWUocGRldikpOwogICAgICAgICAgICAg ICAgZ290byBvdXQ7CiAgICAgICAgfQogICAgICAgIDoKfQoKVGhhbmtzLApHYXZpbgoKPgo+Cj4+ IAo+Pj4gIH0KPj4+ICBFWFBPUlRfU1lNQk9MX0dQTCh2ZmlvX3NwYXByX3BjaV9lZWhfb3Blbik7 Cj4+PiAgCj4+PiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC92ZmlvLmggYi9pbmNsdWRlL2xp bnV4L3ZmaW8uaAo+Pj4gaW5kZXggMjI0MTI4YS4uZDMyMDQxMSAxMDA2NDQKPj4+IC0tLSBhL2lu Y2x1ZGUvbGludXgvdmZpby5oCj4+PiArKysgYi9pbmNsdWRlL2xpbnV4L3ZmaW8uaAo+Pj4gQEAg LTEwMCwxNSArMTAwLDE0IEBAIGV4dGVybiBsb25nIHZmaW9fZXh0ZXJuYWxfY2hlY2tfZXh0ZW5z aW9uKHN0cnVjdCB2ZmlvX2dyb3VwICpncm91cCwKPj4+ICAKPj4+ICBzdHJ1Y3QgcGNpX2RldjsK Pj4+ICAjaWZkZWYgQ09ORklHX0VFSAo+Pj4gLWV4dGVybiBpbnQgdmZpb19zcGFwcl9wY2lfZWVo X29wZW4oc3RydWN0IHBjaV9kZXYgKnBkZXYpOwo+Pj4gK2V4dGVybiB2b2lkIHZmaW9fc3BhcHJf cGNpX2VlaF9vcGVuKHN0cnVjdCBwY2lfZGV2ICpwZGV2KTsKPj4+ICBleHRlcm4gdm9pZCB2Zmlv X3NwYXByX3BjaV9lZWhfcmVsZWFzZShzdHJ1Y3QgcGNpX2RldiAqcGRldik7Cj4+PiAgZXh0ZXJu IGxvbmcgdmZpb19zcGFwcl9pb21tdV9lZWhfaW9jdGwoc3RydWN0IGlvbW11X2dyb3VwICpncm91 cCwKPj4+ICAJCQkJICAgICAgIHVuc2lnbmVkIGludCBjbWQsCj4+PiAgCQkJCSAgICAgICB1bnNp Z25lZCBsb25nIGFyZyk7Cj4+PiAgI2Vsc2UKPj4+IC1zdGF0aWMgaW5saW5lIGludCB2ZmlvX3Nw YXByX3BjaV9lZWhfb3BlbihzdHJ1Y3QgcGNpX2RldiAqcGRldikKPj4+ICtzdGF0aWMgaW5saW5l IHZvaWQgdmZpb19zcGFwcl9wY2lfZWVoX29wZW4oc3RydWN0IHBjaV9kZXYgKnBkZXYpCj4+PiAg ewo+Pj4gLQlyZXR1cm4gMDsKPj4+ICB9Cj4+PiAgCj4+PiAgc3RhdGljIGlubGluZSB2b2lkIHZm aW9fc3BhcHJfcGNpX2VlaF9yZWxlYXNlKHN0cnVjdCBwY2lfZGV2ICpwZGV2KQo+PiAKPj4gCj4+ IAo+Cj4KPi0tIAo+QWxleGV5Cj4KCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkxpbnV4cHBjLWRldiBtYWlsaW5nIGxpc3QKTGludXhwcGMtZGV2QGxpc3Rz Lm96bGFicy5vcmcKaHR0cHM6Ly9saXN0cy5vemxhYnMub3JnL2xpc3RpbmZvL2xpbnV4cHBjLWRl dg==