| Message ID | 20171005005154.GA23500@beast (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Oct 04, 2017 at 05:51:54PM -0700, Kees Cook wrote: > 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. > > Cc: Tariq Toukan <tariqt@mellanox.com> > Cc: netdev@vger.kernel.org > Cc: linux-rdma@vger.kernel.org > Cc: Thomas Gleixner <tglx@linutronix.de> > Signed-off-by: Kees Cook <keescook@chromium.org> > --- > This requires commit 686fef928bba ("timer: Prepare to change timer > callback argument type") in v4.14-rc3, but should be otherwise > stand-alone. > --- > drivers/net/ethernet/mellanox/mlx4/catas.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > Hi Kees, In RDMA, we had very similar patch [1] to your patch series, but it converts to setup_timer, while you are converting to timer_setup. Which conversion is the right one? [1] https://patchwork.kernel.org/patch/9980701/ Thanks > diff --git a/drivers/net/ethernet/mellanox/mlx4/catas.c b/drivers/net/ethernet/mellanox/mlx4/catas.c > index 53daa6ca5d83..e2b6b0cac1ac 100644 > --- a/drivers/net/ethernet/mellanox/mlx4/catas.c > +++ b/drivers/net/ethernet/mellanox/mlx4/catas.c > @@ -231,10 +231,10 @@ static void dump_err_buf(struct mlx4_dev *dev) > i, swab32(readl(priv->catas_err.map + i))); > } > > -static void poll_catas(unsigned long dev_ptr) > +static void poll_catas(struct timer_list *t) > { > - struct mlx4_dev *dev = (struct mlx4_dev *) dev_ptr; > - struct mlx4_priv *priv = mlx4_priv(dev); > + struct mlx4_priv *priv = from_timer(priv, t, catas_err.timer); > + struct mlx4_dev *dev = &priv->dev; > u32 slave_read; > > if (mlx4_is_slave(dev)) { > @@ -277,7 +277,7 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev) > phys_addr_t addr; > > INIT_LIST_HEAD(&priv->catas_err.list); > - init_timer(&priv->catas_err.timer); > + timer_setup(&priv->catas_err.timer, poll_catas, 0); > priv->catas_err.map = NULL; > > if (!mlx4_is_slave(dev)) { > @@ -293,8 +293,6 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev) > } > } > > - priv->catas_err.timer.data = (unsigned long) dev; > - priv->catas_err.timer.function = poll_catas; > priv->catas_err.timer.expires = > round_jiffies(jiffies + MLX4_CATAS_POLL_INTERVAL); > add_timer(&priv->catas_err.timer); > -- > 2.7.4 > > > -- > Kees Cook > Pixel Security > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Oct 5, 2017 at 2:38 AM, Leon Romanovsky <leon@kernel.org> wrote: > On Wed, Oct 04, 2017 at 05:51:54PM -0700, Kees Cook wrote: >> 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. >> >> Cc: Tariq Toukan <tariqt@mellanox.com> >> Cc: netdev@vger.kernel.org >> Cc: linux-rdma@vger.kernel.org >> Cc: Thomas Gleixner <tglx@linutronix.de> >> Signed-off-by: Kees Cook <keescook@chromium.org> >> --- >> This requires commit 686fef928bba ("timer: Prepare to change timer >> callback argument type") in v4.14-rc3, but should be otherwise >> stand-alone. >> --- >> drivers/net/ethernet/mellanox/mlx4/catas.c | 10 ++++------ >> 1 file changed, 4 insertions(+), 6 deletions(-) >> > > Hi Kees, > > In RDMA, we had very similar patch [1] to your patch series, but it converts to > setup_timer, while you are converting to timer_setup. > > Which conversion is the right one? The timer_setup() is the new API designed to eliminate the .data field and pass in the struct timer_list to callbacks. (Please take the timer_setup() change instead.) Thanks! -Kees > > [1] https://patchwork.kernel.org/patch/9980701/ > > Thanks > >> diff --git a/drivers/net/ethernet/mellanox/mlx4/catas.c b/drivers/net/ethernet/mellanox/mlx4/catas.c >> index 53daa6ca5d83..e2b6b0cac1ac 100644 >> --- a/drivers/net/ethernet/mellanox/mlx4/catas.c >> +++ b/drivers/net/ethernet/mellanox/mlx4/catas.c >> @@ -231,10 +231,10 @@ static void dump_err_buf(struct mlx4_dev *dev) >> i, swab32(readl(priv->catas_err.map + i))); >> } >> >> -static void poll_catas(unsigned long dev_ptr) >> +static void poll_catas(struct timer_list *t) >> { >> - struct mlx4_dev *dev = (struct mlx4_dev *) dev_ptr; >> - struct mlx4_priv *priv = mlx4_priv(dev); >> + struct mlx4_priv *priv = from_timer(priv, t, catas_err.timer); >> + struct mlx4_dev *dev = &priv->dev; >> u32 slave_read; >> >> if (mlx4_is_slave(dev)) { >> @@ -277,7 +277,7 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev) >> phys_addr_t addr; >> >> INIT_LIST_HEAD(&priv->catas_err.list); >> - init_timer(&priv->catas_err.timer); >> + timer_setup(&priv->catas_err.timer, poll_catas, 0); >> priv->catas_err.map = NULL; >> >> if (!mlx4_is_slave(dev)) { >> @@ -293,8 +293,6 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev) >> } >> } >> >> - priv->catas_err.timer.data = (unsigned long) dev; >> - priv->catas_err.timer.function = poll_catas; >> priv->catas_err.timer.expires = >> round_jiffies(jiffies + MLX4_CATAS_POLL_INTERVAL); >> add_timer(&priv->catas_err.timer); >> -- >> 2.7.4 >> >> >> -- >> Kees Cook >> Pixel Security >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2017-10-04 at 17:51 -0700, Kees Cook wrote: > 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. > > Cc: Tariq Toukan <tariqt@mellanox.com> > Cc: netdev@vger.kernel.org > Cc: linux-rdma@vger.kernel.org > Cc: Thomas Gleixner <tglx@linutronix.de> > Signed-off-by: Kees Cook <keescook@chromium.org> > --- > This requires commit 686fef928bba ("timer: Prepare to change timer > callback argument type") in v4.14-rc3, but should be otherwise > stand-alone. Thanks, applied.
diff --git a/drivers/net/ethernet/mellanox/mlx4/catas.c b/drivers/net/ethernet/mellanox/mlx4/catas.c index 53daa6ca5d83..e2b6b0cac1ac 100644 --- a/drivers/net/ethernet/mellanox/mlx4/catas.c +++ b/drivers/net/ethernet/mellanox/mlx4/catas.c @@ -231,10 +231,10 @@ static void dump_err_buf(struct mlx4_dev *dev) i, swab32(readl(priv->catas_err.map + i))); } -static void poll_catas(unsigned long dev_ptr) +static void poll_catas(struct timer_list *t) { - struct mlx4_dev *dev = (struct mlx4_dev *) dev_ptr; - struct mlx4_priv *priv = mlx4_priv(dev); + struct mlx4_priv *priv = from_timer(priv, t, catas_err.timer); + struct mlx4_dev *dev = &priv->dev; u32 slave_read; if (mlx4_is_slave(dev)) { @@ -277,7 +277,7 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev) phys_addr_t addr; INIT_LIST_HEAD(&priv->catas_err.list); - init_timer(&priv->catas_err.timer); + timer_setup(&priv->catas_err.timer, poll_catas, 0); priv->catas_err.map = NULL; if (!mlx4_is_slave(dev)) { @@ -293,8 +293,6 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev) } } - priv->catas_err.timer.data = (unsigned long) dev; - priv->catas_err.timer.function = poll_catas; priv->catas_err.timer.expires = round_jiffies(jiffies + MLX4_CATAS_POLL_INTERVAL); add_timer(&priv->catas_err.timer);
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. Cc: Tariq Toukan <tariqt@mellanox.com> Cc: netdev@vger.kernel.org Cc: linux-rdma@vger.kernel.org Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Kees Cook <keescook@chromium.org> --- This requires commit 686fef928bba ("timer: Prepare to change timer callback argument type") in v4.14-rc3, but should be otherwise stand-alone. --- drivers/net/ethernet/mellanox/mlx4/catas.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)