Re: [PATCH tip/core/rcu 01/12] rcu: Remove rcu_swap_protected()

Kalle Valo
2019-12-12T09:31:53Z

+ linux-wireless

"Paul E. McKenney" <paulmck@kernel.org> writes:

> On Wed, Dec 11, 2019 at 08:09:11PM +0100, Matthias Brugger wrote:
>> On 11/12/2019 19:37, Paul E. McKenney wrote:
>>
>> > --- a/drivers/net/wireless/mediatek/mt76/agg-rx.c
>> > +++ b/drivers/net/wireless/mediatek/mt76/agg-rx.c
>> > @@ -281,8 +281,8 @@ void mt76_rx_aggr_stop(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tidno)
>> > {
>> > struct mt76_rx_tid *tid = NULL;
>> >
>> > - rcu_swap_protected(wcid->aggr[tidno], tid,
>> > - lockdep_is_held(&dev->mutex));
>> > + tid = rcu_swap_protected(wcid->aggr[tidno], tid,
>> > + lockdep_is_held(&dev->mutex));
>>
>> I suppose you meant: rcu_replace_pointer() here.
>
> Indeed I did, and thank you for catching this! Bad patch day here. :-/
>
> Update below...
>
> Thanx, Paul
>
> ------------------------------------------------------------------------
>
> commit ad5572b091429a45e863acaa6a36cf396d44f58d
> Author: Paul E. McKenney <paulmck@kernel.org>
> Date: Wed Dec 11 10:30:21 2019 -0800
>
> wireless/mediatek: Replace rcu_swap_protected() with rcu_replace_pointer()
>
> This commit replaces the use of rcu_swap_protected() with the more
> intuitively appealing rcu_replace_pointer() as a step towards removing
> rcu_swap_protected().
>
> Link: https://lore.kernel.org/lkml/CAHk-=wiAsJLw1egFEE=Z7-GGtM6wcvtyytXZA1+BHqta4gg6Hw@mail.gmail.com/
> Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
> Reported-by: "Martin K. Petersen" <martin.petersen@oracle.com>
> [ paulmck: Apply Matthias Brugger feedback. ]
> Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
> Reviewed-by: "Martin K. Petersen" <martin.petersen@oracle.com>
> Cc: Felix Fietkau <nbd@nbd.name>
> Cc: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
> Cc: Ryder Lee <ryder.lee@mediatek.com>
> Cc: Roy Luo <royluo@google.com>
> Cc: Kalle Valo <kvalo@codeaurora.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: <linux-wireless@vger.kernel.org>
> Cc: <netdev@vger.kernel.org>
> Cc: <linux-arm-kernel@lists.infradead.org>
> Cc: <linux-mediatek@lists.infradead.org>

Via which tree is this supposed to go? If I should take this please
resend to linux-wireless so that patchwork sees it, but if someone else
is planning to take this:

Acked-by: Kalle Valo <kvalo@codeaurora.org>

--