rtlwifi: use tasklet_setup to initialize rx_work_tasklet
PATCH 1/1 rtlwifi: use tasklet_setup to initialize rx_work_tasklet
In commit d3ccc14dfe95 most of the tasklets in this driver was updated to the new API. However for the rx_work_tasklet only the type of the callback was changed from
void _rtl_rx_work(unsigned long data)
to
void _rtl_rx_work(struct tasklet_struct *t).
The initialization of rx_work_tasklet was still open-coded and the function pointer just cast into the old type, and hence nothing sets rx_work_tasklet.use_callback = true and the callback was still called as
t->func(t->data);
with uninitialized/zero t->data.
Commit 6b8c7574a5f8 changed the casting of _rtl_rx_work a bit and initialized t->data to a pointer to the tasklet cast to an unsigned long.
This way calling t->func(t->data) might actually work through all the casting, but it still doesn't update the code to use the new tasklet API.
Let's use the new tasklet_setup to initialize rx_work_tasklet properly and set rx_work_tasklet.use_callback = true so that the callback is called as
t->callback(t);
without all the casting.
--- drivers/net/wireless/realtek/rtlwifi/usb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/realtek/rtlwifi/usb.c +1 -2
@@ -310,8 +310,7 @@ static int _rtl_usb_init_rx(struct ieee80211_hw *hw)init_usb_anchor (&rtlusb->rx_cleanup_urbs);skb_queue_head_init (&rtlusb->rx_queue); - rtlusb->rx_work_tasklet.func = (void (*))_rtl_rx_work; - rtlusb->rx_work_tasklet.data = (unsigned long )&rtlusb->rx_work_tasklet; +tasklet_setup (&rtlusb->rx_work_tasklet, _rtl_rx_work);return 0 ; }
Signature · 1 line
2.30.0
Quoted 28 lines · Emil Renner Berthing
In commit
d3ccc14dfe95most of the tasklets in this driver was updated to the new API. However for therx_work_taskletonly the type of the callback was changed from
void_rtl_rx_work(unsigned long data)
to
void_rtl_rx_work(struct tasklet_struct *t).The initialization of
rx_work_taskletwas still open-coded and the function pointer just cast into the old type, and hence nothing sets rx_work_tasklet.use_callback = true and the callback was still called ast->func(t->data);with uninitialized/zero
t->data.Commit
6b8c7574a5f8changed the casting of_rtl_rx_worka bit and initializedt->datato a pointer to the tasklet cast to an unsigned long.This way calling
t->func(t->data)might actually work through all the casting, but it still doesn't update the code to use the new tasklet API.Let's use the new
tasklet_setupto initializerx_work_taskletproperly and set rx_work_tasklet.use_callback = true so that the callback is called as
Quoted 7 lines
t->callback(t);without all the casting.
Fixes 6b8c7574a5f8 ("rtlwifi: fix build warning")Fixes d3ccc14dfe95 ("rtlwifi/rtw88: convert tasklets to use new tasklet_setup() API")Signed-off-by Emil Renner Berthing <[email protected]>
Since the current code works, this could target net-next without Fixes tags.
Quoted 31 lines · Willem de Bruijn
Quoted 30 lines · Emil Renner Berthing
In commit
d3ccc14dfe95most of the tasklets in this driver was updated to the new API. However for therx_work_taskletonly the type of the callback was changed from
void_rtl_rx_work(unsigned long data)
to
void_rtl_rx_work(struct tasklet_struct *t).The initialization of
rx_work_taskletwas still open-coded and the function pointer just cast into the old type, and hence nothing sets rx_work_tasklet.use_callback = true and the callback was still called ast->func(t->data);with uninitialized/zero
t->data.Commit
6b8c7574a5f8changed the casting of_rtl_rx_worka bit and initializedt->datato a pointer to the tasklet cast to an unsigned long.This way calling
t->func(t->data)might actually work through all the casting, but it still doesn't update the code to use the new tasklet API.Let's use the new
tasklet_setupto initializerx_work_taskletproperly and set rx_work_tasklet.use_callback = true so that the callback is called ast->callback(t);
Quoted 8 lines
Quoted 6 lines
without all the casting.
Fixes 6b8c7574a5f8 ("rtlwifi: fix build warning")Fixes d3ccc14dfe95 ("rtlwifi/rtw88: convert tasklets to use new
tasklet_setup()API")Signed-off-by Emil Renner Berthing <[email protected]>Since the current code works, this could target net-next
This should go to wireless-drivers-next, not net-next.
Quoted 1 line
without Fixes tags.
Correct, no need for Fixes tag as there's no bug to fix. This is only cleanup AFAICS.
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 41 lines · Kalle Valo
Quoted 38 lines · Willem de Bruijn
Quoted 36 lines · Emil Renner Berthing
In commit
d3ccc14dfe95most of the tasklets in this driver was updated to the new API. However for therx_work_taskletonly the type of the callback was changed from
void_rtl_rx_work(unsigned long data)
to
void_rtl_rx_work(struct tasklet_struct *t).The initialization of
rx_work_taskletwas still open-coded and the function pointer just cast into the old type, and hence nothing sets rx_work_tasklet.use_callback = true and the callback was still called ast->func(t->data);with uninitialized/zero
t->data.Commit
6b8c7574a5f8changed the casting of_rtl_rx_worka bit and initializedt->datato a pointer to the tasklet cast to an unsigned long.This way calling
t->func(t->data)might actually work through all the casting, but it still doesn't update the code to use the new tasklet API.Let's use the new
tasklet_setupto initializerx_work_taskletproperly and set rx_work_tasklet.use_callback = true so that the callback is called ast->callback(t);without all the casting.
Fixes 6b8c7574a5f8 ("rtlwifi: fix build warning")Fixes d3ccc14dfe95 ("rtlwifi/rtw88: convert tasklets to use new
tasklet_setup()API")Signed-off-by Emil Renner Berthing <[email protected]>
Quoted 8 lines
Quoted 1 line
Since the current code works, this could target net-next
This should go to wireless-drivers-next, not net-next.
Quoted 1 line
without Fixes tags.
Correct, no need for Fixes tag as there's no bug to fix. This is only cleanup AFAICS.
I can definitely see how you can reasonably disagree, but I would not be comfortable having code that only works because the calling conventions of all relevant architectures happen to put the first unsigned long argument and the first pointer argument in the same register.
If you want to be conservative I'd much rather revert all the changes around rx_work_tasklet including the new type of the _rtl_rx_work callback, so we don't have to rely on calling conventions matching up.
In any case: as long as this fix eventually ends up upstream I'm fine.
/Emil
Quoted 42 lines · Emil Renner Berthing
Quoted 41 lines · Kalle Valo
Quoted 38 lines · Willem de Bruijn
Quoted 36 lines · Emil Renner Berthing
In commit
d3ccc14dfe95most of the tasklets in this driver was updated to the new API. However for therx_work_taskletonly the type of the callback was changed from
void_rtl_rx_work(unsigned long data)
to
void_rtl_rx_work(struct tasklet_struct *t).The initialization of
rx_work_taskletwas still open-coded and the function pointer just cast into the old type, and hence nothing sets rx_work_tasklet.use_callback = true and the callback was still called ast->func(t->data);with uninitialized/zero
t->data.Commit
6b8c7574a5f8changed the casting of_rtl_rx_worka bit and initializedt->datato a pointer to the tasklet cast to an unsigned long.This way calling
t->func(t->data)might actually work through all the casting, but it still doesn't update the code to use the new tasklet API.Let's use the new
tasklet_setupto initializerx_work_taskletproperly and set rx_work_tasklet.use_callback = true so that the callback is called ast->callback(t);without all the casting.
Fixes 6b8c7574a5f8 ("rtlwifi: fix build warning")Fixes d3ccc14dfe95 ("rtlwifi/rtw88: convert tasklets to use new
tasklet_setup()API")Signed-off-by Emil Renner Berthing <[email protected]>
Quoted 8 lines
Quoted 8 lines
Quoted 1 line
Since the current code works, this could target net-next
This should go to wireless-drivers-next, not net-next.
Quoted 1 line
without Fixes tags.
Correct, no need for Fixes tag as there's no bug to fix. This is only cleanup AFAICS.
Forgot to mention that I can remove the Fixes tags during commit, so no need to resend just because of those.
Quoted 5 lines
I can definitely see how you can reasonably disagree, but I would not be comfortable having code that only works because the calling conventions of all relevant architectures happen to put the first unsigned long argument and the first pointer argument in the same register.
If there's a bug this patch fixes please explain it clearly in the commit log. But as I read it (though I admit very quickly) I understood this is just cleanup.
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 3 lines · Kalle Valo
...
Forgot to mention that I can remove the Fixes tags during commit, so no need to resend just because of those.
Cool, thanks.
Quoted 9 lines
Quoted 5 lines
I can definitely see how you can reasonably disagree, but I would not be comfortable having code that only works because the calling conventions of all relevant architectures happen to put the first unsigned long argument and the first pointer argument in the same register.
If there's a bug this patch fixes please explain it clearly in the commit log. But as I read it (though I admit very quickly) I understood this is just cleanup.
Sorry, I'll try again.
So the tasklet_struct looks like this:
struct tasklet_struct {
..
bool use_callback;
union {
void (*func)(unsigned long);
void (*callback)(struct tasklet_struct *); };
unsigned long data;
};
..and the use_callback flag is used like this:
if (t->use_callback)
t->callback(t);
else
t->func(t->data);
Now commit d3ccc14dfe95 changed the _rtl_rx_work to be of the new callback, not func, type. But it didn't actually set the use_callback flag, and just typecast the _rtl_rx_work function pointer and assigned it to the func member. So _rtl_rx_work is still called as t->func(t->data) even though it was rewritten to be called as t->callback(t).
Now 6b8c7574a5f8 set t->data = (unsigned long)t, so calling t->func(t->data) will probably work on most architectures because:
a) "unsigned long" and "struct tasklet_struct *" has the same width on all Linux-capable architectures and
b) calling t->func(t->data) will put the value from t->data into the same register as the function
void _rtl_rx_work(struct tasklet_struct *t)
expects to find the pointer t in the C calling conventions used by
all relevant architectures.
I guess it's debatable weather this is a bug or just ugly code.
/Emil
Quoted 27 lines · Emil Renner Berthing
In commit
d3ccc14dfe95most of the tasklets in this driver was updated to the new API. However for therx_work_taskletonly the type of the callback was changed from
void_rtl_rx_work(unsigned long data)
to
void_rtl_rx_work(struct tasklet_struct *t).The initialization of
rx_work_taskletwas still open-coded and the function pointer just cast into the old type, and hence nothing sets rx_work_tasklet.use_callback = true and the callback was still called ast->func(t->data);with uninitialized/zero
t->data.Commit
6b8c7574a5f8changed the casting of_rtl_rx_worka bit and initializedt->datato a pointer to the tasklet cast to an unsigned long.This way calling
t->func(t->data)might actually work through all the casting, but it still doesn't update the code to use the new tasklet API.Let's use the new
tasklet_setupto initializerx_work_taskletproperly and set rx_work_tasklet.use_callback = true so that the callback is called as
Quoted 6 lines
t->callback(t);without all the casting.
Signed-off-by Emil Renner Berthing <[email protected]>Acked-by Willem de Bruijn <[email protected]>
Patch applied to wireless-drivers-next.git, thanks.
ca04217add8e rtlwifi: use tasklet_setup to initialize rx_work_tasklet
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches