From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [4.4,18/31] r8152: napi hangup fix after disconnect From: Ben Hutchings Message-Id: <1535128726.2902.32.camel@codethink.co.uk> Date: Fri, 24 Aug 2018 17:38:46 +0100 To: Jiri Slaby , linux-usb@vger.kernel.org, netdev@vger.kernel.org, "David S. Miller" Cc: stable@vger.kernel.org, Greg Kroah-Hartman , LKML List-ID: T24gRnJpLCAyMDE4LTA3LTIwIGF0IDE0OjEzICswMjAwLCBHcmVnIEtyb2FoLUhhcnRtYW4gd3Jv dGU6Cj4gNC40LXN0YWJsZSByZXZpZXcgcGF0Y2guwqDCoElmIGFueW9uZSBoYXMgYW55IG9iamVj dGlvbnMsIHBsZWFzZSBsZXQgbWUga25vdy4KPiAKPiAtLS0tLS0tLS0tLS0tLS0tLS0KPiAKPiBG cm9tOiBKaXJpIFNsYWJ5IDxqc2xhYnlAc3VzZS5jej4KPiAKPiBbIFVwc3RyZWFtIGNvbW1pdCAw ZWUxZjQ3MzQ5NjdhZjgzMjFlY2ViYWY5Yzc0MjIxYWNlMzRmMmQ1IF0KWy4uLl0KPiAtLS0gYS9k cml2ZXJzL25ldC91c2IvcjgxNTIuYwo+ICsrKyBiL2RyaXZlcnMvbmV0L3VzYi9yODE1Mi5jCj4g QEAgLTMxMzksNyArMzEzOSw4IEBAIHN0YXRpYyBpbnQgcnRsODE1Ml9jbG9zZShzdHJ1Y3QgbmV0 X2RldmkKPiDCoCNpZmRlZiBDT05GSUdfUE1fU0xFRVAKPiDCoAl1bnJlZ2lzdGVyX3BtX25vdGlm aWVyKCZ0cC0+cG1fbm90aWZpZXIpOwo+IMKgI2VuZGlmCj4gLQluYXBpX2Rpc2FibGUoJnRwLT5u YXBpKTsKPiArCWlmICghdGVzdF9iaXQoUlRMODE1Ml9VTlBMVUcsICZ0cC0+ZmxhZ3MpKQo+ICsJ CW5hcGlfZGlzYWJsZSgmdHAtPm5hcGkpOwo+IMKgCWNsZWFyX2JpdChXT1JLX0VOQUJMRSwgJnRw LT5mbGFncyk7Cj4gwqAJdXNiX2tpbGxfdXJiKHRwLT5pbnRyX3VyYik7Cj4gwqAJY2FuY2VsX2Rl bGF5ZWRfd29ya19zeW5jKCZ0cC0+c2NoZWR1bGUpOwoKVGhpcyBmbGFnIGFwcGVhcnMgdG8gYmUg c2V0IG9ubHkgaWYgdGhlIFVTQiBkZXZpY2UgaXMgYWN0dWFsbHkKZGlzY29ubmVjdGVkLiAgSW4g Y2FzZSB0aGUgZHJpdmVyIGlzIHVuYm91bmQgZm9yIHNvbWUgb3RoZXIgcmVhc29uCihsaWtlIHRo ZSBtb2R1bGUgaXMgcmVtb3ZlZCksIHRoZSBzYW1lIHByb2JsZW0gd2lsbCBvY2N1ci4KCldoYXQg SSB0aGluayBtaWdodCB3b3JrIGlzIHRvIGRvOgoKCWlmICghbGlzdF9lbXB0eSgmdHAtPm5hcGku ZGV2X2xpc3QpCgkJbmFwaV9kaXNhYmxlKCZ0cC0+bmFwaSk7CgpCZW4uCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BF6FC433F4 for ; Fri, 24 Aug 2018 16:38:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3AB312151C for ; Fri, 24 Aug 2018 16:38:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3AB312151C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=codethink.co.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728221AbeHXUOR (ORCPT ); Fri, 24 Aug 2018 16:14:17 -0400 Received: from imap1.codethink.co.uk ([176.9.8.82]:41783 "EHLO imap1.codethink.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726513AbeHXUOR (ORCPT ); Fri, 24 Aug 2018 16:14:17 -0400 Received: from [148.252.241.226] (helo=xylophone) by imap1.codethink.co.uk with esmtpsa (Exim 4.84_2 #1 (Debian)) id 1ftF6m-0005TA-Dg; Fri, 24 Aug 2018 17:38:48 +0100 Message-ID: <1535128726.2902.32.camel@codethink.co.uk> Subject: Re: [PATCH 4.4 18/31] r8152: napi hangup fix after disconnect From: Ben Hutchings To: Jiri Slaby , linux-usb@vger.kernel.org, netdev@vger.kernel.org, "David S. Miller" Cc: stable@vger.kernel.org, Greg Kroah-Hartman , LKML Date: Fri, 24 Aug 2018 17:38:46 +0100 In-Reply-To: <20180720121340.812996969@linuxfoundation.org> References: <20180720121340.158484922@linuxfoundation.org> <20180720121340.812996969@linuxfoundation.org> Organization: Codethink Ltd. Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6-1+deb9u1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2018-07-20 at 14:13 +0200, Greg Kroah-Hartman wrote: > 4.4-stable review patch.  If anyone has any objections, please let me know. > > ------------------ > > From: Jiri Slaby > > [ Upstream commit 0ee1f4734967af8321ecebaf9c74221ace34f2d5 ] [...] > --- a/drivers/net/usb/r8152.c > +++ b/drivers/net/usb/r8152.c > @@ -3139,7 +3139,8 @@ static int rtl8152_close(struct net_devi >  #ifdef CONFIG_PM_SLEEP >   unregister_pm_notifier(&tp->pm_notifier); >  #endif > - napi_disable(&tp->napi); > + if (!test_bit(RTL8152_UNPLUG, &tp->flags)) > + napi_disable(&tp->napi); >   clear_bit(WORK_ENABLE, &tp->flags); >   usb_kill_urb(tp->intr_urb); >   cancel_delayed_work_sync(&tp->schedule); This flag appears to be set only if the USB device is actually disconnected. In case the driver is unbound for some other reason (like the module is removed), the same problem will occur. What I think might work is to do: if (!list_empty(&tp->napi.dev_list) napi_disable(&tp->napi); Ben. -- Ben Hutchings, Software Developer   Codethink Ltd https://www.codethink.co.uk/ Dale House, 35 Dale Street Manchester, M1 2HF, United Kingdom