From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keller, Jacob E Date: Fri, 2 Dec 2016 16:41:59 +0000 Subject: [Intel-wired-lan] [PATCH net v2] igb: re-assign hw address pointer on reset after PCI error In-Reply-To: <58416F5C.20602@linux.vnet.ibm.com> References: <1478803603-30306-1-git-send-email-gpiccoli@linux.vnet.ibm.com> <58416F5C.20602@linux.vnet.ibm.com> Message-ID: <1480696918.16244.2.camel@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: intel-wired-lan@osuosl.org List-ID: On Fri, 2016-12-02 at 10:55 -0200, Guilherme G. Piccoli wrote: > On 11/10/2016 04:46 PM, Guilherme G. Piccoli wrote: > > Whenever the igb driver detects the result of a read operation > > returns > > a value composed only by F's (like 0xFFFFFFFF), it will detach the > > net_device, clear the hw_addr pointer and warn to the user that > > adapter's > > link is lost - those steps happen on igb_rd32(). > > > > In case a PCI error happens on Power architecture, there's a > > recovery > > mechanism called EEH, that will reset the PCI slot and call > > driver's > > handlers to reset the adapter and network functionality as well. > > > > We observed that once hw_addr is NULL after the error is detected > > on > > igb_rd32(), it's never assigned back, so in the process of > > resetting > > the network functionality we got a NULL pointer dereference in both > > igb_configure_tx_ring() and igb_configure_rx_ring(). In order to > > avoid > > such bug, this patch re-assigns the hw_addr value in the slot_reset > > handler. > > > > Reported-by: Anthony H. Thai > > Reported-by: Harsha Thyagaraja > > Signed-off-by: Guilherme G. Piccoli > > --- > > ?drivers/net/ethernet/intel/igb/igb_main.c | 5 +++++ > > ?1 file changed, 5 insertions(+) > > > > diff --git a/drivers/net/ethernet/intel/igb/igb_main.c > > b/drivers/net/ethernet/intel/igb/igb_main.c > > index edc9a6a..136ee9e 100644 > > --- a/drivers/net/ethernet/intel/igb/igb_main.c > > +++ b/drivers/net/ethernet/intel/igb/igb_main.c > > @@ -7878,6 +7878,11 @@ static pci_ers_result_t > > igb_io_slot_reset(struct pci_dev *pdev) > > ? pci_enable_wake(pdev, PCI_D3hot, 0); > > ? pci_enable_wake(pdev, PCI_D3cold, 0); > > > > + /* In case of PCI error, adapter lose its HW > > address > > + ?* so we should re-assign it here. > > + ?*/ > > + hw->hw_addr = adapter->io_addr; > > + > > ? igb_reset(adapter); > > ? wr32(E1000_WUS, ~0); > > ? result = PCI_ERS_RESULT_RECOVERED; > > > > Ping? > > Sorry to annoy, any news on this? > Thanks in advance! > > Cheers, > > > Guilherme > This seems reasonable. It's similar to what fm10k driver does under this circumstance. Thanks, Jake From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Keller, Jacob E" Subject: Re: [PATCH net v2] igb: re-assign hw address pointer on reset after PCI error Date: Fri, 2 Dec 2016 16:41:59 +0000 Message-ID: <1480696918.16244.2.camel@intel.com> References: <1478803603-30306-1-git-send-email-gpiccoli@linux.vnet.ibm.com> <58416F5C.20602@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: "netdev@vger.kernel.org" , "Fujinaka, Todd" To: "gpiccoli@linux.vnet.ibm.com" , "intel-wired-lan@lists.osuosl.org" , "Kirsher, Jeffrey T" , "alexander.duyck@gmail.com" Return-path: Received: from mga11.intel.com ([192.55.52.93]:17531 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752998AbcLBQmB (ORCPT ); Fri, 2 Dec 2016 11:42:01 -0500 In-Reply-To: <58416F5C.20602@linux.vnet.ibm.com> Content-Language: en-US Content-ID: <42EE1A582779DE47BA69D028FE34B0B0@intel.com> Sender: netdev-owner@vger.kernel.org List-ID: T24gRnJpLCAyMDE2LTEyLTAyIGF0IDEwOjU1IC0wMjAwLCBHdWlsaGVybWUgRy4gUGljY29saSB3 cm90ZToNCj4gT24gMTEvMTAvMjAxNiAwNDo0NiBQTSwgR3VpbGhlcm1lIEcuIFBpY2NvbGkgd3Jv dGU6DQo+ID4gV2hlbmV2ZXIgdGhlIGlnYiBkcml2ZXIgZGV0ZWN0cyB0aGUgcmVzdWx0IG9mIGEg cmVhZCBvcGVyYXRpb24NCj4gPiByZXR1cm5zDQo+ID4gYSB2YWx1ZSBjb21wb3NlZCBvbmx5IGJ5 IEYncyAobGlrZSAweEZGRkZGRkZGKSwgaXQgd2lsbCBkZXRhY2ggdGhlDQo+ID4gbmV0X2Rldmlj ZSwgY2xlYXIgdGhlIGh3X2FkZHIgcG9pbnRlciBhbmQgd2FybiB0byB0aGUgdXNlciB0aGF0DQo+ ID4gYWRhcHRlcidzDQo+ID4gbGluayBpcyBsb3N0IC0gdGhvc2Ugc3RlcHMgaGFwcGVuIG9uIGln Yl9yZDMyKCkuDQo+ID4gDQo+ID4gSW4gY2FzZSBhIFBDSSBlcnJvciBoYXBwZW5zIG9uIFBvd2Vy IGFyY2hpdGVjdHVyZSwgdGhlcmUncyBhDQo+ID4gcmVjb3ZlcnkNCj4gPiBtZWNoYW5pc20gY2Fs bGVkIEVFSCwgdGhhdCB3aWxsIHJlc2V0IHRoZSBQQ0kgc2xvdCBhbmQgY2FsbA0KPiA+IGRyaXZl cidzDQo+ID4gaGFuZGxlcnMgdG8gcmVzZXQgdGhlIGFkYXB0ZXIgYW5kIG5ldHdvcmsgZnVuY3Rp b25hbGl0eSBhcyB3ZWxsLg0KPiA+IA0KPiA+IFdlIG9ic2VydmVkIHRoYXQgb25jZSBod19hZGRy IGlzIE5VTEwgYWZ0ZXIgdGhlIGVycm9yIGlzIGRldGVjdGVkDQo+ID4gb24NCj4gPiBpZ2JfcmQz MigpLCBpdCdzIG5ldmVyIGFzc2lnbmVkIGJhY2ssIHNvIGluIHRoZSBwcm9jZXNzIG9mDQo+ID4g cmVzZXR0aW5nDQo+ID4gdGhlIG5ldHdvcmsgZnVuY3Rpb25hbGl0eSB3ZSBnb3QgYSBOVUxMIHBv aW50ZXIgZGVyZWZlcmVuY2UgaW4gYm90aA0KPiA+IGlnYl9jb25maWd1cmVfdHhfcmluZygpIGFu ZCBpZ2JfY29uZmlndXJlX3J4X3JpbmcoKS4gSW4gb3JkZXIgdG8NCj4gPiBhdm9pZA0KPiA+IHN1 Y2ggYnVnLCB0aGlzIHBhdGNoIHJlLWFzc2lnbnMgdGhlIGh3X2FkZHIgdmFsdWUgaW4gdGhlIHNs b3RfcmVzZXQNCj4gPiBoYW5kbGVyLg0KPiA+IA0KPiA+IFJlcG9ydGVkLWJ5OiBBbnRob255IEgu IFRoYWkgPGFodGhhaUB1cy5pYm0uY29tPg0KPiA+IFJlcG9ydGVkLWJ5OiBIYXJzaGEgVGh5YWdh cmFqYSA8aGF0aHlhZ2FAaW4uaWJtLmNvbT4NCj4gPiBTaWduZWQtb2ZmLWJ5OiBHdWlsaGVybWUg Ry4gUGljY29saSA8Z3BpY2NvbGlAbGludXgudm5ldC5pYm0uY29tPg0KPiA+IC0tLQ0KPiA+IMKg ZHJpdmVycy9uZXQvZXRoZXJuZXQvaW50ZWwvaWdiL2lnYl9tYWluLmMgfCA1ICsrKysrDQo+ID4g wqAxIGZpbGUgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspDQo+ID4gDQo+ID4gZGlmZiAtLWdpdCBh L2RyaXZlcnMvbmV0L2V0aGVybmV0L2ludGVsL2lnYi9pZ2JfbWFpbi5jDQo+ID4gYi9kcml2ZXJz L25ldC9ldGhlcm5ldC9pbnRlbC9pZ2IvaWdiX21haW4uYw0KPiA+IGluZGV4IGVkYzlhNmEuLjEz NmVlOWUgMTAwNjQ0DQo+ID4gLS0tIGEvZHJpdmVycy9uZXQvZXRoZXJuZXQvaW50ZWwvaWdiL2ln Yl9tYWluLmMNCj4gPiArKysgYi9kcml2ZXJzL25ldC9ldGhlcm5ldC9pbnRlbC9pZ2IvaWdiX21h aW4uYw0KPiA+IEBAIC03ODc4LDYgKzc4NzgsMTEgQEAgc3RhdGljIHBjaV9lcnNfcmVzdWx0X3QN Cj4gPiBpZ2JfaW9fc2xvdF9yZXNldChzdHJ1Y3QgcGNpX2RldiAqcGRldikNCj4gPiDCoAkJcGNp X2VuYWJsZV93YWtlKHBkZXYsIFBDSV9EM2hvdCwgMCk7DQo+ID4gwqAJCXBjaV9lbmFibGVfd2Fr ZShwZGV2LCBQQ0lfRDNjb2xkLCAwKTsNCj4gPiANCj4gPiArCQkvKiBJbiBjYXNlIG9mIFBDSSBl cnJvciwgYWRhcHRlciBsb3NlIGl0cyBIVw0KPiA+IGFkZHJlc3MNCj4gPiArCQnCoCogc28gd2Ug c2hvdWxkIHJlLWFzc2lnbiBpdCBoZXJlLg0KPiA+ICsJCcKgKi8NCj4gPiArCQlody0+aHdfYWRk ciA9IGFkYXB0ZXItPmlvX2FkZHI7DQo+ID4gKw0KPiA+IMKgCQlpZ2JfcmVzZXQoYWRhcHRlcik7 DQo+ID4gwqAJCXdyMzIoRTEwMDBfV1VTLCB+MCk7DQo+ID4gwqAJCXJlc3VsdCA9IFBDSV9FUlNf UkVTVUxUX1JFQ09WRVJFRDsNCj4gPiANCj4gDQo+IFBpbmc/DQo+IA0KPiBTb3JyeSB0byBhbm5v eSwgYW55IG5ld3Mgb24gdGhpcz8NCj4gVGhhbmtzIGluIGFkdmFuY2UhDQo+IA0KPiBDaGVlcnMs DQo+IA0KPiANCj4gR3VpbGhlcm1lDQo+IA0KDQpUaGlzIHNlZW1zIHJlYXNvbmFibGUuIEl0J3Mg c2ltaWxhciB0byB3aGF0IGZtMTBrIGRyaXZlciBkb2VzIHVuZGVyDQp0aGlzIGNpcmN1bXN0YW5j ZS4NCg0KVGhhbmtzLA0KSmFrZQ==