Received: by 2002:ab2:69cc:0:b0:1f4:be93:e15a with SMTP id n12csp1322040lqp; Mon, 15 Apr 2024 02:57:04 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXJMuUUpEcbfxe/GLw4mTWX1K11F79CNKpABlJ/9wrPJowV0jAxzpxCQbhAKjuTmsS5mwIY0IX6N9NuNyckpTa+Km/fvDL5FxamaDm2cw== X-Google-Smtp-Source: AGHT+IH7b9lRN7QXmQoP6TPQgm/8XnFT+x1ja+tWEB6RT9X90rBspfphsi8Z5Yzf+8lGDhIkpVIy X-Received: by 2002:a05:6e02:1526:b0:36a:28d5:d040 with SMTP id i6-20020a056e02152600b0036a28d5d040mr12398790ilu.17.1713175024551; Mon, 15 Apr 2024 02:57:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713175024; cv=pass; d=google.com; s=arc-20160816; b=g3M0tvQ6IAhk0gQ7hQac/gN79pLIASY5z74uEpKfG7XkG4N8LuQaExbbvh/GJdsUyA yVuC8dn5x1u8gnAg5H36PgZnquaa75z8AZd0YRhE7fBW4fUFvlXF/xPybTri9spOS1fF 8nCOl2LgMdQ0xJBzzLMTu+jUbMQwNdscngeFHII92qzlAmP07/GAcdqGUa1m8Uou9iSP +gFR+XjYLyATTnFycLfHTLXKgGH3lViPGLds16k1/FvewucVANkxzCr3fyFZVrTbQxhf KgWMggcFAghmThyMjck1LT9uOV4lG1IQh6rCA0fhGKG7YZVdPI3nZClKJrEvFCENLj64 WSow== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=qzjLLrVZ2WlbXJs9eecoepNiJy8kKKrXHElJQR6FSzM=; fh=4QG8JldDsSGgNvIBKkpjxUq7EoGw0Kp2cqehO+01mDo=; b=FkFNfy3oHRXEsnTgiL9pFj2DoERRPhks31OHFChDDwK5J6kMpbABcEk15yTKWnqmlS UzQ7vKKu356lzxm2v63TSlxGuhniZTtqJMCp3ulZ0Ihxrfd+raNB/Hf/hhP6ucWAcX9w Q3UzjOYHSGpxn5E9a20oqI0Fl0Hjm+vwC7wJYoDn15G01DOjZkneZ2SjuZl/ToEPmK5n eevTIrmMCXLT1awjIluIlu+CYhINtJ0oBLe+c5TzJRwDivywTXk09po8efKdZ7XvigAn duhqQrohNJnm5Tbn+uo/UzIuTwAqtqU8YE2ltvy5g60bM+JjHtV1S5ZPnCVBs7KqK7Bo VKqw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=bp.renesas.com dmarc=pass fromdomain=bp.renesas.com); spf=pass (google.com: domain of linux-kernel+bounces-144859-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-144859-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id w10-20020a63474a000000b005f4371d0d46si7509608pgk.193.2024.04.15.02.57.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 02:57:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-144859-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=bp.renesas.com dmarc=pass fromdomain=bp.renesas.com); spf=pass (google.com: domain of linux-kernel+bounces-144859-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-144859-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 33A48285FCD for ; Mon, 15 Apr 2024 09:49:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E1A8955C1D; Mon, 15 Apr 2024 09:48:37 +0000 (UTC) Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 494F355E7B; Mon, 15 Apr 2024 09:48:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713174517; cv=none; b=gzwMqw6HRpLHiS5lf1O6CyQvKPU3pgWOl4poY0Txy8MhniaOg67ya7j24mT37N+gNGiSG4BUoNpHqe+V1IFI+ZMw++jaFqrosW17FfRwWKLR3GRlAVz4GLp2RWTrIbn2+mRhkAkFr1h0cngKKjFhAUr2BKogQnusyr/I+YIR4mE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713174517; c=relaxed/simple; bh=GUKzBRLx8vQMPtz9yQAWhMU1XT4emqE0dhvCfEhN4HM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IEunvdi+/0Mhx1om0q4TdQaar/7A796zfFGhSDbhdILAMzRzx67zqVUKs3uRAwY6ECP1nY0jbCM8ZGK320JYBBnXYtAoj0NRGjp4qP4jrMkOsc9ZWySXJByqbPZzFJKB+rBUFDO5bUVPwPYXLu+i44IYxRnx6z50wXNGvI6XNw8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-IronPort-AV: E=Sophos;i="6.07,202,1708354800"; d="scan'208";a="205432166" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 15 Apr 2024 18:48:35 +0900 Received: from renesas-deb12.cephei.uk (unknown [10.226.93.74]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 30AE04006DE8; Mon, 15 Apr 2024 18:48:30 +0900 (JST) From: Paul Barker To: Sergey Shtylyov , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Paul Barker , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Geert Uytterhoeven , netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [net-next RFC v3 4/7] net: ravb: Refactor GbEth RX code path Date: Mon, 15 Apr 2024 10:48:01 +0100 Message-Id: <20240415094804.8016-5-paul.barker.ct@bp.renesas.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240415094804.8016-1-paul.barker.ct@bp.renesas.com> References: <20240415094804.8016-1-paul.barker.ct@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit We can reduce code duplication in ravb_rx_gbeth() and add comments to make the code flow easier to understand. Signed-off-by: Paul Barker --- drivers/net/ethernet/renesas/ravb_main.c | 70 ++++++++++++------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index baa01bd81f2d..12618171f6d5 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -818,47 +818,47 @@ static int ravb_rx_gbeth(struct net_device *ndev, int budget, int q) stats->rx_missed_errors++; } else { die_dt = desc->die_dt & 0xF0; - switch (die_dt) { - case DT_FSINGLE: - skb = ravb_get_skb_gbeth(ndev, entry, desc); + skb = ravb_get_skb_gbeth(ndev, entry, desc); + if (die_dt == DT_FSINGLE || die_dt == DT_FSTART) { + /* Start of packet: + * Set initial data length. + */ skb_put(skb, desc_len); + + /* Save this SKB if the packet spans multiple + * descriptors. + */ + if (die_dt == DT_FSTART) + priv->rx_1st_skb = skb; + } else { + /* Continuing a packet: + * Move data into the saved SKB. + */ + skb_copy_to_linear_data_offset(priv->rx_1st_skb, + priv->rx_1st_skb->len, + skb->data, + desc_len); + skb_put(priv->rx_1st_skb, desc_len); + dev_kfree_skb(skb); + + /* Set skb to point at the whole packet so that + * we only need one code path for finishing a + * packet. + */ + skb = priv->rx_1st_skb; + } + + if (die_dt == DT_FSINGLE || die_dt == DT_FEND) { + /* Finishing a packet: + * Determine protocol & checksum, hand off to + * NAPI and update our stats. + */ skb->protocol = eth_type_trans(skb, ndev); if (ndev->features & NETIF_F_RXCSUM) ravb_rx_csum_gbeth(skb); + stats->rx_bytes += skb->len; napi_gro_receive(&priv->napi[q], skb); rx_packets++; - stats->rx_bytes += desc_len; - break; - case DT_FSTART: - priv->rx_1st_skb = ravb_get_skb_gbeth(ndev, entry, desc); - skb_put(priv->rx_1st_skb, desc_len); - break; - case DT_FMID: - skb = ravb_get_skb_gbeth(ndev, entry, desc); - skb_copy_to_linear_data_offset(priv->rx_1st_skb, - priv->rx_1st_skb->len, - skb->data, - desc_len); - skb_put(priv->rx_1st_skb, desc_len); - dev_kfree_skb(skb); - break; - case DT_FEND: - skb = ravb_get_skb_gbeth(ndev, entry, desc); - skb_copy_to_linear_data_offset(priv->rx_1st_skb, - priv->rx_1st_skb->len, - skb->data, - desc_len); - skb_put(priv->rx_1st_skb, desc_len); - dev_kfree_skb(skb); - priv->rx_1st_skb->protocol = - eth_type_trans(priv->rx_1st_skb, ndev); - if (ndev->features & NETIF_F_RXCSUM) - ravb_rx_csum_gbeth(priv->rx_1st_skb); - stats->rx_bytes += priv->rx_1st_skb->len; - napi_gro_receive(&priv->napi[q], - priv->rx_1st_skb); - rx_packets++; - break; } } } -- 2.39.2