2019-02-14 11:24:32

by Huang Zijiang

Subject: [PATCH 2/2] net: Replace dev_kfree_skb_any by dev_consume_skb_any

The skb should be freed by dev_consume_skb_any() efx_tx_tso_fallback()
when skb is still used. The skb is be replaced by segments, so the
original skb should be consumed(not drop).

Signed-off-by: Huang Zijiang <[email protected]>
---
drivers/net/ethernet/sfc/tx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c
index c3ad564..ed551f0 100644
--- a/drivers/net/ethernet/sfc/tx.c
+++ b/drivers/net/ethernet/sfc/tx.c
@@ -471,7 +471,7 @@ static int efx_tx_tso_fallback(struct efx_tx_queue *tx_queue,
if (IS_ERR(segments))
return PTR_ERR(segments);

- dev_kfree_skb_any(skb);
+ dev_consume_skb_any(skb);
skb = segments;

while (skb) {
--
1.8.3.1

2019-02-14 17:15:38

by Sergei Shtylyov

Subject: Re: [PATCH 2/2] net: Replace dev_kfree_skb_any by dev_consume_skb_any

Hello!

On 14.02.2019 9:42, Huang Zijiang wrote:

> The skb should be freed by dev_consume_skb_any() efx_tx_tso_fallback()
^ in?

> when skb is still used. The skb is be replaced by segments, so the
^^ will?

> original skb should be consumed(not drop).
>
> Signed-off-by: Huang Zijiang <[email protected]>
[...]

MBR, Sergei

2019-02-14 17:20:00

by Bert Kenward

Subject: Re: [PATCH 2/2] net: Replace dev_kfree_skb_any by dev_consume_skb_any

On 14/02/2019 06:42, Huang Zijiang wrote:
> The skb should be freed by dev_consume_skb_any() efx_tx_tso_fallback()
> when skb is still used. The skb is be replaced by segments, so the
> original skb should be consumed(not drop).
>
> Signed-off-by: Huang Zijiang <[email protected]>

Sergei's commit message fixups look good, but apart from that:

Acked-by: Bert Kenward <[email protected]>

> ---
> drivers/net/ethernet/sfc/tx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c
> index c3ad564..ed551f0 100644
> --- a/drivers/net/ethernet/sfc/tx.c
> +++ b/drivers/net/ethernet/sfc/tx.c
> @@ -471,7 +471,7 @@ static int efx_tx_tso_fallback(struct efx_tx_queue *tx_queue,
> if (IS_ERR(segments))
> return PTR_ERR(segments);
>
> - dev_kfree_skb_any(skb);
> + dev_consume_skb_any(skb);
> skb = segments;
>
> while (skb) {
>

2019-02-15 01:08:53

by David Miller

Subject: Re: [PATCH 2/2] net: Replace dev_kfree_skb_any by dev_consume_skb_any

From: Huang Zijiang <[email protected]>
Date: Thu, 14 Feb 2019 14:42:13 +0800

> The skb should be freed by dev_consume_skb_any() efx_tx_tso_fallback()
> when skb is still used. The skb is be replaced by segments, so the
> original skb should be consumed(not drop).
>
> Signed-off-by: Huang Zijiang <[email protected]>

Applied with Sergei's suggested commit message fixups.

Thanks.