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: usb: cdc-acm: fix race during wakeup blocking TX traffic From: Oliver Neukum Message-Id: <1553594441.2729.7.camel@suse.com> Date: Tue, 26 Mar 2019 11:00:41 +0100 To: Romain Izard , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org List-ID: T24gRnIsIDIwMTktMDMtMjIgYXQgMTY6NTMgKzAxMDAsIFJvbWFpbiBJemFyZCB3cm90ZToKPiBX aGVuIHRoZSBrZXJuZWwgaXMgY29tcGlsZWQgd2l0aCBwcmVlbXB0aW9uIGVuYWJsZWQsIHRoZSBV UkIgY29tcGxldGlvbgo+IGhhbmRsZXIgY2FuIHJ1biBpbiBwYXJhbGxlbCB3aXRoIHRoZSB3b3Jr IHJlc3BvbnNpYmxlIGZvciB3YWtpbmcgdXAgdGhlCj4gdHR5IGxheWVyLiBJZiB0aGUgVVJCIGhh bmRsZXIgc2V0cyB0aGUgRVZFTlRfVFRZX1dBS0VVUCBiaXQgZHVyaW5nIHRoZQo+IGNhbGwgdG8g dHR5X3BvcnRfdHR5X3dha2V1cCgpIHRvIHNpZ25hbCB0aGF0IHRoZXJlIGlzIHJvb20gZm9yIGFk ZGl0aW9uYWwKPiBpbnB1dCwgaXQgd2lsbCBiZSBjbGVhcmVkIGF0IHRoZSBlbmQgb2YgdGhpcyBj YWxsLiBBcyBhIHJlc3VsdCwgVFggdHJhZmZpYwo+IG9uIHRoZSB1cHBlciBsYXllciB3aWxsIGJl IGJsb2NrZWQuCgpHb29kIGNhdGNoLgoKPiBUaGlzIGNhbiBiZSBzZWVuIHdpdGggYSBrZXJuZWwg Y29uZmlndXJlZCB3aXRoIENPTkZJR19QUkVFTVBULCBhbmQgYSBmYXN0Cj4gbW9kZW0gY29ubmVj dGVkIHdpdGggUFBQIHJ1bm5pbmcgb3ZlciBhIFVTQiBDREMtQUNNIHBvcnQuCj4gCj4gVXNlIHRl c3RfYW5kX2NsZWFyX2JpdCgpIGluc3RlYWQsIHdoaWNoIGVuc3VyZXMgdGhhdCBlYWNoIHdha2V1 cCByZXF1ZXN0ZWQKPiBieSB0aGUgVVJCIGNvbXBsZXRpb24gY29kZSB3aWxsIHRyaWdnZXIgYSBj YWxsIHRvIHR0eV9wb3J0X3R0eV93YWtldXAoKS4KPiAKPiBGaXhlczogMWFiYTU3OWYzY2Y1IGNk Yy1hY206IGhhbmRsZSByZWFkIHBpcGUgZXJyb3JzCj4gU2lnbmVkLW9mZi1ieTogUm9tYWluIEl6 YXJkIDxyb21haW4uaXphcmQucHJvQGdtYWlsLmNvbT4KQWNrZWQtYnk6IE9saXZlciBOZXVrdW0g PG9uZXVrdW1Ac3VzZS5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvdXNiL2NsYXNzL2NkYy1hY20uYyB8 IDQgKy0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDMgZGVsZXRpb25zKC0p Cj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL2NsYXNzL2NkYy1hY20uYyBiL2RyaXZlcnMv dXNiL2NsYXNzL2NkYy1hY20uYwo+IGluZGV4IDczOWY4OTYwODExYS4uZWM2NjZlYjRiN2I0IDEw MDY0NAo+IC0tLSBhL2RyaXZlcnMvdXNiL2NsYXNzL2NkYy1hY20uYwo+ICsrKyBiL2RyaXZlcnMv dXNiL2NsYXNzL2NkYy1hY20uYwo+IEBAIC01NTgsMTAgKzU1OCw4IEBAIHN0YXRpYyB2b2lkIGFj bV9zb2Z0aW50KHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKPiAgCQljbGVhcl9iaXQoRVZFTlRf UlhfU1RBTEwsICZhY20tPmZsYWdzKTsKPiAgCX0KPiAgCj4gLQlpZiAodGVzdF9iaXQoRVZFTlRf VFRZX1dBS0VVUCwgJmFjbS0+ZmxhZ3MpKSB7Cj4gKwlpZiAodGVzdF9hbmRfY2xlYXJfYml0KEVW RU5UX1RUWV9XQUtFVVAsICZhY20tPmZsYWdzKSkKPiAgCQl0dHlfcG9ydF90dHlfd2FrZXVwKCZh Y20tPnBvcnQpOwo+IC0JCWNsZWFyX2JpdChFVkVOVF9UVFlfV0FLRVVQLCAmYWNtLT5mbGFncyk7 Cj4gLQl9Cj4gIH0KPiAgCj4gIC8qCg== 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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 9EB21C43381 for ; Tue, 26 Mar 2019 10:12:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7574D20857 for ; Tue, 26 Mar 2019 10:12:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731303AbfCZKMb (ORCPT ); Tue, 26 Mar 2019 06:12:31 -0400 Received: from mx2.suse.de ([195.135.220.15]:50308 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726258AbfCZKMb (ORCPT ); Tue, 26 Mar 2019 06:12:31 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 0A2CDAE3D; Tue, 26 Mar 2019 10:12:30 +0000 (UTC) Message-ID: <1553594441.2729.7.camel@suse.com> Subject: Re: [PATCH] usb: cdc-acm: fix race during wakeup blocking TX traffic From: Oliver Neukum To: Romain Izard , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Date: Tue, 26 Mar 2019 11:00:41 +0100 In-Reply-To: <20190322155302.28414-1-romain.izard.pro@gmail.com> References: <20190322155302.28414-1-romain.izard.pro@gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.26.6 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fr, 2019-03-22 at 16:53 +0100, Romain Izard wrote: > When the kernel is compiled with preemption enabled, the URB completion > handler can run in parallel with the work responsible for waking up the > tty layer. If the URB handler sets the EVENT_TTY_WAKEUP bit during the > call to tty_port_tty_wakeup() to signal that there is room for additional > input, it will be cleared at the end of this call. As a result, TX traffic > on the upper layer will be blocked. Good catch. > This can be seen with a kernel configured with CONFIG_PREEMPT, and a fast > modem connected with PPP running over a USB CDC-ACM port. > > Use test_and_clear_bit() instead, which ensures that each wakeup requested > by the URB completion code will trigger a call to tty_port_tty_wakeup(). > > Fixes: 1aba579f3cf5 cdc-acm: handle read pipe errors > Signed-off-by: Romain Izard Acked-by: Oliver Neukum > --- > drivers/usb/class/cdc-acm.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c > index 739f8960811a..ec666eb4b7b4 100644 > --- a/drivers/usb/class/cdc-acm.c > +++ b/drivers/usb/class/cdc-acm.c > @@ -558,10 +558,8 @@ static void acm_softint(struct work_struct *work) > clear_bit(EVENT_RX_STALL, &acm->flags); > } > > - if (test_bit(EVENT_TTY_WAKEUP, &acm->flags)) { > + if (test_and_clear_bit(EVENT_TTY_WAKEUP, &acm->flags)) > tty_port_tty_wakeup(&acm->port); > - clear_bit(EVENT_TTY_WAKEUP, &acm->flags); > - } > } > > /*