Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3401C282DD for ; Wed, 8 Jan 2020 21:59:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE5CA206DB for ; Wed, 8 Jan 2020 21:59:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="eyO1Celq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727280AbgAHV7Y (ORCPT ); Wed, 8 Jan 2020 16:59:24 -0500 Received: from frisell.zx2c4.com ([192.95.5.64]:47029 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727124AbgAHV7X (ORCPT ); Wed, 8 Jan 2020 16:59:23 -0500 Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 80fe77a9; Wed, 8 Jan 2020 21:00:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=mail; bh=fpDOqHDxETum3ysxuM/uIGDqR Dk=; b=eyO1CelqROt6GPvfRswTaOEQWSeQOWfLzvfQuMH7WaQopiee5H4l1KWB8 PgwU7KQq3LRqbKO2IZsJc2UgeBjyyZpKUT8U6ookVTFtLoQ2bGGlV5zL6UD9zrci WsK5qRZZ8R8eTN0rV2rb1Ul2eCP9pkhVUzgPvxTqjzkNd/7D06u9sDerhIpaRtFW A96rtpeoYrrh6BEMSajg1EQNsNmWVYT7dY4n84hqDByrInKxMYxGAcWVD3Q1v7MP FsPBov6ESim2JJPJ/rJ4MQg3xJuQxYtHBWqQ78nJA7zCJNIrGh6kg7ekl7FaBr0y 0seI+nP4Rwq/ewPpVBzjqkwNG50mg== Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id ca7d6bd9 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Wed, 8 Jan 2020 21:00:01 +0000 (UTC) From: "Jason A. Donenfeld" To: netdev@vger.kernel.org, davem@davemloft.net, siva.kallam@broadcom.com, christopher.lee@cspi.com, ecree@solarflare.com, johannes.berg@intel.com Cc: "Jason A. Donenfeld" Subject: [PATCH 2/8] net: tap: use skb_list_walk_safe helper for gso segments Date: Wed, 8 Jan 2020 16:59:03 -0500 Message-Id: <20200108215909.421487-3-Jason@zx2c4.com> In-Reply-To: <20200108215909.421487-1-Jason@zx2c4.com> References: <20200108215909.421487-1-Jason@zx2c4.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is a straight-forward conversion case for the new function, and while we're at it, we can remove a null write to skb->next by replacing it with skb_mark_not_on_list. Signed-off-by: Jason A. Donenfeld --- drivers/net/tap.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/net/tap.c b/drivers/net/tap.c index a6d63665ad03..1f4bdd94407a 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -341,6 +341,7 @@ rx_handler_result_t tap_handle_frame(struct sk_buff **pskb) features |= tap->tap_features; if (netif_needs_gso(skb, features)) { struct sk_buff *segs = __skb_gso_segment(skb, features, false); + struct sk_buff *next; if (IS_ERR(segs)) goto drop; @@ -352,16 +353,13 @@ rx_handler_result_t tap_handle_frame(struct sk_buff **pskb) } consume_skb(skb); - while (segs) { - struct sk_buff *nskb = segs->next; - - segs->next = NULL; - if (ptr_ring_produce(&q->ring, segs)) { - kfree_skb(segs); - kfree_skb_list(nskb); + skb_list_walk_safe(segs, skb, next) { + skb_mark_not_on_list(skb); + if (ptr_ring_produce(&q->ring, skb)) { + kfree_skb(skb); + kfree_skb_list(next); break; } - segs = nskb; } } else { /* If we receive a partial checksum and the tap side -- 2.24.1