| Message ID | 20190829165025.15750-3-efremov@linux.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v3,01/11] checkpatch: check for nested (un)?likely() calls | expand |
On Thu, 2019-08-29 at 19:50 +0300, Denis Efremov wrote: > "unlikely(WARN_ON_ONCE(x))" is excessive. WARN_ON_ONCE() already uses > unlikely() internally. > > Signed-off-by: Denis Efremov <efremov@linux.com> > Cc: Boris Pismenny <borisp@mellanox.com> > Cc: Saeed Mahameed <saeedm@mellanox.com> > Cc: Leon Romanovsky <leon@kernel.org> > Cc: Joe Perches <joe@perches.com> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: netdev@vger.kernel.org > --- > drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git > a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c > b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c > index 7833ddef0427..e5222d17df35 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c > @@ -408,7 +408,7 @@ struct sk_buff *mlx5e_ktls_handle_tx_skb(struct > net_device *netdev, > goto out; > > tls_ctx = tls_get_ctx(skb->sk); > - if (unlikely(WARN_ON_ONCE(tls_ctx->netdev != netdev))) > + if (WARN_ON_ONCE(tls_ctx->netdev != netdev)) > goto err_out; > > priv_tx = mlx5e_get_ktls_tx_priv_ctx(tls_ctx); Acked-by: Saeed Mahameed <saeedm@mellanox.com> Dave, you can take this one.
From: Saeed Mahameed <saeedm@mellanox.com> Date: Thu, 29 Aug 2019 21:23:30 +0000 > On Thu, 2019-08-29 at 19:50 +0300, Denis Efremov wrote: >> "unlikely(WARN_ON_ONCE(x))" is excessive. WARN_ON_ONCE() already uses >> unlikely() internally. >> >> Signed-off-by: Denis Efremov <efremov@linux.com> >> Cc: Boris Pismenny <borisp@mellanox.com> >> Cc: Saeed Mahameed <saeedm@mellanox.com> >> Cc: Leon Romanovsky <leon@kernel.org> >> Cc: Joe Perches <joe@perches.com> >> Cc: Andrew Morton <akpm@linux-foundation.org> >> Cc: netdev@vger.kernel.org >> --- >> drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git >> a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c >> b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c >> index 7833ddef0427..e5222d17df35 100644 >> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c >> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c >> @@ -408,7 +408,7 @@ struct sk_buff *mlx5e_ktls_handle_tx_skb(struct >> net_device *netdev, >> goto out; >> >> tls_ctx = tls_get_ctx(skb->sk); >> - if (unlikely(WARN_ON_ONCE(tls_ctx->netdev != netdev))) >> + if (WARN_ON_ONCE(tls_ctx->netdev != netdev)) >> goto err_out; >> >> priv_tx = mlx5e_get_ktls_tx_priv_ctx(tls_ctx); > > Acked-by: Saeed Mahameed <saeedm@mellanox.com> > > Dave, you can take this one. Ok, applied to net-next as well as the UDP patch.
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c index 7833ddef0427..e5222d17df35 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c @@ -408,7 +408,7 @@ struct sk_buff *mlx5e_ktls_handle_tx_skb(struct net_device *netdev, goto out; tls_ctx = tls_get_ctx(skb->sk); - if (unlikely(WARN_ON_ONCE(tls_ctx->netdev != netdev))) + if (WARN_ON_ONCE(tls_ctx->netdev != netdev)) goto err_out; priv_tx = mlx5e_get_ktls_tx_priv_ctx(tls_ctx);
"unlikely(WARN_ON_ONCE(x))" is excessive. WARN_ON_ONCE() already uses unlikely() internally. Signed-off-by: Denis Efremov <efremov@linux.com> Cc: Boris Pismenny <borisp@mellanox.com> Cc: Saeed Mahameed <saeedm@mellanox.com> Cc: Leon Romanovsky <leon@kernel.org> Cc: Joe Perches <joe@perches.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: netdev@vger.kernel.org --- drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)