[v2] ipv6: mcast: Simplify mld_clear_{report|query}()

[PATCH v2 net-next] ipv6: mcast: Simplify mld_clear_{report|query}()

Posted by Yue Haibing 6 months, 4 weeks ago

Use __skb_queue_purge() instead of re-implementing it. Note that it uses
kfree_skb_reason() instead of kfree_skb() internally, and pass
SKB_DROP_REASON_QUEUE_PURGE drop reason to the kfree_skb tracepoint.

Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
---
v2: Add drop reason note
---
 net/ipv6/mcast.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 8aecdd85a6ae..36ca27496b3c 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -845,21 +845,15 @@ static void mld_clear_delrec(struct inet6_dev *idev)
 
 static void mld_clear_query(struct inet6_dev *idev)
 {
-	struct sk_buff *skb;
-
 	spin_lock_bh(&idev->mc_query_lock);
-	while ((skb = __skb_dequeue(&idev->mc_query_queue)))
-		kfree_skb(skb);
+	__skb_queue_purge(&idev->mc_query_queue);
 	spin_unlock_bh(&idev->mc_query_lock);
 }
 
 static void mld_clear_report(struct inet6_dev *idev)
 {
-	struct sk_buff *skb;
-
 	spin_lock_bh(&idev->mc_report_lock);
-	while ((skb = __skb_dequeue(&idev->mc_report_queue)))
-		kfree_skb(skb);
+	__skb_queue_purge(&idev->mc_report_queue);
 	spin_unlock_bh(&idev->mc_report_lock);
 }
 
-- 
2.34.1

Re: [PATCH v2 net-next] ipv6: mcast: Simplify mld_clear_{report|query}()

Posted by Hangbin Liu 6 months, 3 weeks ago

On Tue, Jul 15, 2025 at 08:07:09PM +0800, Yue Haibing wrote:
> Use __skb_queue_purge() instead of re-implementing it. Note that it uses
> kfree_skb_reason() instead of kfree_skb() internally, and pass
> SKB_DROP_REASON_QUEUE_PURGE drop reason to the kfree_skb tracepoint.
> 
> Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
> ---
> v2: Add drop reason note
> ---
>  net/ipv6/mcast.c | 10 ++--------
>  1 file changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
> index 8aecdd85a6ae..36ca27496b3c 100644
> --- a/net/ipv6/mcast.c
> +++ b/net/ipv6/mcast.c
> @@ -845,21 +845,15 @@ static void mld_clear_delrec(struct inet6_dev *idev)
>  
>  static void mld_clear_query(struct inet6_dev *idev)
>  {
> -	struct sk_buff *skb;
> -
>  	spin_lock_bh(&idev->mc_query_lock);
> -	while ((skb = __skb_dequeue(&idev->mc_query_queue)))
> -		kfree_skb(skb);
> +	__skb_queue_purge(&idev->mc_query_queue);
>  	spin_unlock_bh(&idev->mc_query_lock);
>  }
>  
>  static void mld_clear_report(struct inet6_dev *idev)
>  {
> -	struct sk_buff *skb;
> -
>  	spin_lock_bh(&idev->mc_report_lock);
> -	while ((skb = __skb_dequeue(&idev->mc_report_queue)))
> -		kfree_skb(skb);
> +	__skb_queue_purge(&idev->mc_report_queue);
>  	spin_unlock_bh(&idev->mc_report_lock);
>  }
>  
> -- 
> 2.34.1
> 

Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>