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=-5.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_MUTT 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 B3194C04AB0 for ; Sat, 25 May 2019 09:38:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8AB102175B for ; Sat, 25 May 2019 09:38:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726736AbfEYJiE (ORCPT ); Sat, 25 May 2019 05:38:04 -0400 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:39451 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726464AbfEYJiE (ORCPT ); Sat, 25 May 2019 05:38:04 -0400 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id 968FB80358; Sat, 25 May 2019 11:37:50 +0200 (CEST) Date: Sat, 25 May 2019 11:37:59 +0200 From: Pavel Machek To: Hugh Dickins Cc: Jacek Anaszewski , linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: Revert "leds: avoid races with workqueue"? Message-ID: <20190525093759.GA17767@amd> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="zYM0uCDKw75PZbzx" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --zYM0uCDKw75PZbzx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi! > I'm having to revert 0db37915d912 ("leds: avoid races with workqueue") > from my 5.2-rc testing tree, because lockdep and other debug options > don't like it: net/mac80211/led.c arranges for led_blink_setup() to be > called at softirq time, and flush_work() is not good for calling > then. This should keep X60 working (as well as it is now; X60 will still have problems with lost events in setup like yours). Can you test this instead of the revert? Thanks, Pavel diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c index aefac4d..ebaac4d 100644 --- a/drivers/leds/led-core.c +++ b/drivers/leds/led-core.c @@ -158,19 +159,14 @@ static void led_set_software_blink(struct led_classde= v *led_cdev, } =20 set_bit(LED_BLINK_SW, &led_cdev->work_flags); - mod_timer(&led_cdev->blink_timer, jiffies + 1); + mod_timer(&led_cdev->blink_timer, jiffies + 1); /* Why oh why? Just call = it directly? */ } =20 - +/* May not block */ static void led_blink_setup(struct led_classdev *led_cdev, unsigned long *delay_on, unsigned long *delay_off) { - /* - * If "set brightness to 0" is pending in workqueue, we don't - * want that to be reordered after blink_set() - */ - flush_work(&led_cdev->set_brightness_work); if (!test_bit(LED_BLINK_ONESHOT, &led_cdev->work_flags) && led_cdev->blink_set && !led_cdev->blink_set(led_cdev, delay_on, delay_off)) diff --git a/drivers/leds/trigger/ledtrig-timer.c b/drivers/leds/trigger/le= dtrig-timer.c index ca898c1..427fc3c 100644 --- a/drivers/leds/trigger/ledtrig-timer.c +++ b/drivers/leds/trigger/ledtrig-timer.c @@ -113,6 +113,11 @@ static int timer_trig_activate(struct led_classdev *le= d_cdev) led_cdev->flags &=3D ~LED_INIT_DEFAULT_TRIGGER; } =20 + /* + * If "set brightness to 0" is pending in workqueue, we don't + * want that to be reordered after blink_set() + */ + flush_work(&led_cdev->set_brightness_work); led_blink_set(led_cdev, &led_cdev->blink_delay_on, &led_cdev->blink_delay_off); =20 --=20 (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blo= g.html --zYM0uCDKw75PZbzx Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlzpDPcACgkQMOfwapXb+vJBTQCdGXyvrKhaF+8tfO2Ckd9ww0th AsAAmwXZqlXOMenyO2Hnp6+x7P7ekSsP =nRA5 -----END PGP SIGNATURE----- --zYM0uCDKw75PZbzx--