| Message ID | 20170501193700.89264-1-briannorris@chromium.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 21f569af9ab3608382482166ae9aba802b097e3f |
| Delegated to: | Kalle Valo |
| Headers | show |
On Mon, May 01, 2017 at 12:36:59PM -0700, Brian Norris wrote: > The non-atomic test + set is a little awkward here, and it technically > means we might double-schedule work unnecessarily. AFAICT, this is not > really a problem, since the extra "work" will be a no-op (the flag(s) > will be cleared by then), but it's still an anti-pattern. > > Rewrite this to use the atomic test_and_set_bit() helper instead. > > Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > --- > v3: fix bisectability (unused code warning) -- some code from patch 2 > crept in here > > v2: new > --- > drivers/net/wireless/marvell/mwifiex/pcie.c | 9 +++------ > drivers/net/wireless/marvell/mwifiex/sdio.c | 16 +++++----------- > 2 files changed, 8 insertions(+), 17 deletions(-) > > diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c > index ac62bce50e96..5f56e8e6d612 100644 > --- a/drivers/net/wireless/marvell/mwifiex/pcie.c > +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c > @@ -2837,12 +2837,9 @@ static void mwifiex_pcie_device_dump(struct mwifiex_adapter *adapter) > { > struct pcie_service_card *card = adapter->card; > > - if (test_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags)) > - return; > - > - set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags); > - > - schedule_work(&card->work); > + if (!test_and_set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, > + &card->work_flags)) > + schedule_work(&card->work); > } > > static void mwifiex_pcie_free_buffers(struct mwifiex_adapter *adapter) > diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c > index 0af1c6733c92..d38d31bb9b79 100644 > --- a/drivers/net/wireless/marvell/mwifiex/sdio.c > +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c > @@ -2533,12 +2533,8 @@ static void mwifiex_sdio_card_reset(struct mwifiex_adapter *adapter) > { > struct sdio_mmc_card *card = adapter->card; > > - if (test_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &card->work_flags)) > - return; > - > - set_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &card->work_flags); > - > - schedule_work(&card->work); > + if (!test_and_set_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &card->work_flags)) > + schedule_work(&card->work); > } > > /* This function dumps FW information */ > @@ -2546,11 +2542,9 @@ static void mwifiex_sdio_device_dump(struct mwifiex_adapter *adapter) > { > struct sdio_mmc_card *card = adapter->card; > > - if (test_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags)) > - return; > - > - set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags); > - schedule_work(&card->work); > + if (!test_and_set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, > + &card->work_flags)) > + schedule_work(&card->work); > } > > /* Function to dump SDIO function registers and SDIO scratch registers in case > -- > 2.13.0.rc0.306.g87b477812d-goog >
Brian Norris <briannorris@chromium.org> wrote: > The non-atomic test + set is a little awkward here, and it technically > means we might double-schedule work unnecessarily. AFAICT, this is not > really a problem, since the extra "work" will be a no-op (the flag(s) > will be cleared by then), but it's still an anti-pattern. > > Rewrite this to use the atomic test_and_set_bit() helper instead. > > Signed-off-by: Brian Norris <briannorris@chromium.org> > Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2 patches applied to wireless-drivers-next.git, thanks. 21f569af9ab3 mwifiex: initiate card-specific work atomically 6d7d579a8243 mwifiex: pcie: add card_reset() support
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index ac62bce50e96..5f56e8e6d612 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c @@ -2837,12 +2837,9 @@ static void mwifiex_pcie_device_dump(struct mwifiex_adapter *adapter) { struct pcie_service_card *card = adapter->card; - if (test_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags)) - return; - - set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags); - - schedule_work(&card->work); + if (!test_and_set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, + &card->work_flags)) + schedule_work(&card->work); } static void mwifiex_pcie_free_buffers(struct mwifiex_adapter *adapter) diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c index 0af1c6733c92..d38d31bb9b79 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.c +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c @@ -2533,12 +2533,8 @@ static void mwifiex_sdio_card_reset(struct mwifiex_adapter *adapter) { struct sdio_mmc_card *card = adapter->card; - if (test_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &card->work_flags)) - return; - - set_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &card->work_flags); - - schedule_work(&card->work); + if (!test_and_set_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &card->work_flags)) + schedule_work(&card->work); } /* This function dumps FW information */ @@ -2546,11 +2542,9 @@ static void mwifiex_sdio_device_dump(struct mwifiex_adapter *adapter) { struct sdio_mmc_card *card = adapter->card; - if (test_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags)) - return; - - set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags); - schedule_work(&card->work); + if (!test_and_set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, + &card->work_flags)) + schedule_work(&card->work); } /* Function to dump SDIO function registers and SDIO scratch registers in case
The non-atomic test + set is a little awkward here, and it technically means we might double-schedule work unnecessarily. AFAICT, this is not really a problem, since the extra "work" will be a no-op (the flag(s) will be cleared by then), but it's still an anti-pattern. Rewrite this to use the atomic test_and_set_bit() helper instead. Signed-off-by: Brian Norris <briannorris@chromium.org> --- v3: fix bisectability (unused code warning) -- some code from patch 2 crept in here v2: new --- drivers/net/wireless/marvell/mwifiex/pcie.c | 9 +++------ drivers/net/wireless/marvell/mwifiex/sdio.c | 16 +++++----------- 2 files changed, 8 insertions(+), 17 deletions(-)