Re: [PATCH] virtio_net: replace if (cond) BUG() with BUG_ON()

2021-03-18 Thread Leon Romanovsky
On Wed, Mar 17, 2021 at 01:57:15PM +0800, Jiapeng Chong wrote:
> Fix the following coccicheck warnings:
>
> ./drivers/net/virtio_net.c:1551:2-5: WARNING: Use BUG_ON instead of if
> condition followed by BUG.
>
> Reported-by: Abaci Robot 
> Signed-off-by: Jiapeng Chong 
> ---
>  drivers/net/virtio_net.c | 6 ++
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 82e520d..093530b 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -1545,10 +1545,8 @@ static int xmit_skb(struct send_queue *sq, struct 
> sk_buff *skb)
>   else
>   hdr = skb_vnet_hdr(skb);
>
> - if (virtio_net_hdr_from_skb(skb, >hdr,
> - virtio_is_little_endian(vi->vdev), false,
> - 0))
> - BUG();
> + BUG_ON(virtio_net_hdr_from_skb(skb, >hdr,  
> virtio_is_little_endian(vi->vdev),
> +false, 0));

This BUG() in virtio isn't supposed to be in the first place.
You should return -EINVAL instead of crashing system.

Thanks

>
>   if (vi->mergeable_rx_bufs)
>   hdr->num_buffers = 0;
> --
> 1.8.3.1
>


[PATCH] virtio_net: replace if (cond) BUG() with BUG_ON()

2021-03-16 Thread Jiapeng Chong
Fix the following coccicheck warnings:

./drivers/net/virtio_net.c:1551:2-5: WARNING: Use BUG_ON instead of if
condition followed by BUG.

Reported-by: Abaci Robot 
Signed-off-by: Jiapeng Chong 
---
 drivers/net/virtio_net.c | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 82e520d..093530b 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1545,10 +1545,8 @@ static int xmit_skb(struct send_queue *sq, struct 
sk_buff *skb)
else
hdr = skb_vnet_hdr(skb);
 
-   if (virtio_net_hdr_from_skb(skb, >hdr,
-   virtio_is_little_endian(vi->vdev), false,
-   0))
-   BUG();
+   BUG_ON(virtio_net_hdr_from_skb(skb, >hdr,  
virtio_is_little_endian(vi->vdev),
+  false, 0));
 
if (vi->mergeable_rx_bufs)
hdr->num_buffers = 0;
-- 
1.8.3.1