Re: [PATCH 13/17] iwlwifi: mvm: Convert timers to use timer_setup()
On Mon, Nov 6, 2017 at 11:48 AM, Luca Coelhowrote: > On Mon, 2017-11-06 at 11:45 -0800, Kees Cook wrote: >> On Sun, Oct 29, 2017 at 5:28 AM, Luca Coelho wrote: >> > From: Kees Cook >> > >> > In preparation for unconditionally passing the struct timer_list >> > pointer to >> > all timer callbacks, switch to using the new timer_setup() and >> > from_timer() >> > to pass the timer pointer explicitly. >> > >> > The RCU lifetime on baid_data is unclear, so this adds a direct >> > copy of the >> > rcu_ptr passed to the original callback. It may be possible to >> > improve this >> > to just use baid_data->mvm->baid_map[baid_data->baid] instead. >> > >> > Cc: Johannes Berg >> > Cc: Emmanuel Grumbach >> > Cc: Luca Coelho >> > Cc: Intel Linux Wireless >> > Cc: Kalle Valo >> > Cc: Sara Sharon >> > Cc: linux-wireless@vger.kernel.org >> > Cc: net...@vger.kernel.org >> > Signed-off-by: Kees Cook >> > Signed-off-by: Luca Coelho >> > --- >> > drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 ++- >> > drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 ++-- >> > drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 18 + >> > - >> > 3 files changed, 13 insertions(+), 12 deletions(-) >> >> Hi, >> >> Thanks for taking this! I had a question on timing: is this expected >> to land for 4.15? If not, I would like to take this via the timers >> tree, since it is one of the few remaining conversions. > > Hi Kees, > > Yes, this should land for 4.15. Kalle just pulled my pull-request > (which includes this) to wireless-drivers-next. He told me he'll send > a pull-request for 4.15 during this week and hopefully Dave will pull > from him too. > > I'll let you know if something doesn't go as planned. Awesome, thanks very much! -Kees -- Kees Cook Pixel Security
Re: [PATCH 13/17] iwlwifi: mvm: Convert timers to use timer_setup()
On Mon, 2017-11-06 at 11:45 -0800, Kees Cook wrote: > On Sun, Oct 29, 2017 at 5:28 AM, Luca Coelhowrote: > > From: Kees Cook > > > > In preparation for unconditionally passing the struct timer_list > > pointer to > > all timer callbacks, switch to using the new timer_setup() and > > from_timer() > > to pass the timer pointer explicitly. > > > > The RCU lifetime on baid_data is unclear, so this adds a direct > > copy of the > > rcu_ptr passed to the original callback. It may be possible to > > improve this > > to just use baid_data->mvm->baid_map[baid_data->baid] instead. > > > > Cc: Johannes Berg > > Cc: Emmanuel Grumbach > > Cc: Luca Coelho > > Cc: Intel Linux Wireless > > Cc: Kalle Valo > > Cc: Sara Sharon > > Cc: linux-wireless@vger.kernel.org > > Cc: net...@vger.kernel.org > > Signed-off-by: Kees Cook > > Signed-off-by: Luca Coelho > > --- > > drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 ++- > > drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 ++-- > > drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 18 + > > - > > 3 files changed, 13 insertions(+), 12 deletions(-) > > Hi, > > Thanks for taking this! I had a question on timing: is this expected > to land for 4.15? If not, I would like to take this via the timers > tree, since it is one of the few remaining conversions. Hi Kees, Yes, this should land for 4.15. Kalle just pulled my pull-request (which includes this) to wireless-drivers-next. He told me he'll send a pull-request for 4.15 during this week and hopefully Dave will pull from him too. I'll let you know if something doesn't go as planned. -- Cheers, Luca.
Re: [PATCH 13/17] iwlwifi: mvm: Convert timers to use timer_setup()
On Sun, Oct 29, 2017 at 5:28 AM, Luca Coelhowrote: > From: Kees Cook > > In preparation for unconditionally passing the struct timer_list pointer to > all timer callbacks, switch to using the new timer_setup() and from_timer() > to pass the timer pointer explicitly. > > The RCU lifetime on baid_data is unclear, so this adds a direct copy of the > rcu_ptr passed to the original callback. It may be possible to improve this > to just use baid_data->mvm->baid_map[baid_data->baid] instead. > > Cc: Johannes Berg > Cc: Emmanuel Grumbach > Cc: Luca Coelho > Cc: Intel Linux Wireless > Cc: Kalle Valo > Cc: Sara Sharon > Cc: linux-wireless@vger.kernel.org > Cc: net...@vger.kernel.org > Signed-off-by: Kees Cook > Signed-off-by: Luca Coelho > --- > drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 ++- > drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 ++-- > drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 18 +- > 3 files changed, 13 insertions(+), 12 deletions(-) Hi, Thanks for taking this! I had a question on timing: is this expected to land for 4.15? If not, I would like to take this via the timers tree, since it is one of the few remaining conversions. Thanks! -Kees -- Kees Cook Pixel Security