From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B525BC27C7B for ; Fri, 14 Jun 2024 05:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Subject:Cc:To: From:Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Dw/wpX2rAqV+uUeAuGGK7ciQ1Eeb9FNFDIAoWNVW3Fw=; b=STvVWaV+mOphzTNw9lVls8RpGG cWqw6RoFGYoeuPyV4y/V3ggOodbnX7EHyCs9N533K6GULLyK60FlnAdjv7BOu+aUMCKxNEaty3bq5 S0v0iCnxQIG0k4Km0ACzEmh8P0pFqS9LMj3yWubQHdfknhnBAm9UO66YVOVz62TQ3Na40uf+YWiVL +WtNlleNiJDjiVJ5exkK4PwELop2lu1nZ6WvN98TA8xbVZGq6AsQo42tzc2ERZpem0+Jq3/geK6f0 MIuOLQFkobjMCCDNjHx7SKNq/IuJDDTgm9jc/CibZJvIl7Ethh8FMxtTbbvO+cPjTtFsNN4sQbRVD z1WRibyA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHzUg-00000001VSF-0wHt; Fri, 14 Jun 2024 05:28:58 +0000 Received: from mail-oa1-x32.google.com ([2001:4860:4864:20::32]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHzUb-00000001VRP-2GGA for linux-arm-kernel@lists.infradead.org; Fri, 14 Jun 2024 05:28:56 +0000 Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-254fa9fe36eso745163fac.2 for ; Thu, 13 Jun 2024 22:28:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718342928; x=1718947728; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=Dw/wpX2rAqV+uUeAuGGK7ciQ1Eeb9FNFDIAoWNVW3Fw=; b=nmiF6K4oqAkDdN3WBHt7XKwFRAp15FC+rcC7t9iW7FCZK6DmoYOpb+a5HR3g+Gk0p3 RYYliqQb2keiWDqAALDw+Qt2Oo3Sc989LkRCGrKcBF8G5vqfn3tUbAD/Pk9IAjXFDLku /KPkx2AlcbW8aZtY6UTXkgE7Lb9p2gotfbCLcHHw1glTWeIYydfhyasGy2su+KqXd5EE F7RH6Q4myACHA+o1uVDae8Gk7tGs2bUjBdxM/bud8kp48TR6xzA9Tjym5Ts8E4oPEGQz VYeaYSVgiB1ATves7ZfaNS3/QZTsVlkwfgWyuv3ZiG/kdmaIdAeG7QOkxuFQKS3iesVs 0VuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718342928; x=1718947728; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Dw/wpX2rAqV+uUeAuGGK7ciQ1Eeb9FNFDIAoWNVW3Fw=; b=pXCbloLEnAbecyDVbc92ZoEX1NOsr0arO2BWyYUoUZyT0ssii6XQQk1/XLWGDiUgFO YGyBfkv7UEYBpCE6xUl3TD4DT6VTZnzCwRBG0E5irjUO/Hz5MAcQnbHOuKCpUejkYzlv E3fEsKNSfDIbFHhhj46OinSGSpOlaCnQnmkaRIh0cNAWZ0SG5YkzzhcxwnIFYwlOuyTE s1Tk2P+fQ2vHiViSeXXba6ZBEWjeKBLATsKjy8ibjJLzdFOXIPFyS1vIFzil/KdEmcpW rFuvXCqlgloKrMEMbN6BGmC/XeLy0ai6iBO4m7d6tjrurzv55IqngLN08nK7j7Elnsc2 HRhA== X-Forwarded-Encrypted: i=1; AJvYcCXzZWOFsAMe+33/nCTwRphdnFv8sWo8ORF4Vp/9qjvGk4/LBujYEQa2NglFv7WVhNNedmSQN5+JqHM46H/Kl6hJqABpbQChirL4H2SRH9ZPTl6+SoM= X-Gm-Message-State: AOJu0YyqHlgtEp6KXUXOcLiOgUpqkKx87+Np8Z7rWbUGWyiLuqyJ3IJs XSPRzw/C1xdtqvW9pKFRLzBePh43ob8LyayfA47GbPgYs2AYy55r X-Google-Smtp-Source: AGHT+IHGmC3uIyBCAhuw0E+MosfhQS9mHFZU4B9Da80064YdPUcHuTQB2Xbr9RyhO+OvfFAHopjXmg== X-Received: by 2002:a05:6870:41d4:b0:254:a09c:6ddf with SMTP id 586e51a60fabf-2584298e0ffmr1896203fac.24.1718342928140; Thu, 13 Jun 2024 22:28:48 -0700 (PDT) Received: from localhost ([129.146.253.192]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-705cc91f699sm2242495b3a.36.2024.06.13.22.28.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jun 2024 22:28:47 -0700 (PDT) Date: Fri, 14 Jun 2024 13:28:35 +0800 From: Furong Xu <0x1207@gmail.com> To: "Russell King (Oracle)" Cc: "David S. Miller" , Alexandre Torgue , Jose Abreu , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Joao Pinto , Corinna Vinschen , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, xfr@outlook.com, rock.xu@nio.com Subject: Re: [PATCH net-next v1] net: stmmac: Enable TSO on VLANs Message-ID: <20240614132835.000025bb@gmail.com> In-Reply-To: References: <20240613023808.448495-1-0x1207@gmail.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.34; x86_64-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240613_222853_720432_382E4BFB X-CRM114-Status: GOOD ( 15.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, 13 Jun 2024 11:45:45 +0100 "Russell King (Oracle)" wrote: > On Thu, Jun 13, 2024 at 10:38:08AM +0800, Furong Xu wrote: > > @@ -4239,16 +4239,32 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) > > struct stmmac_txq_stats *txq_stats; > > int tmp_pay_len = 0, first_tx; > > struct stmmac_tx_queue *tx_q; > > - bool has_vlan, set_ic; > > + bool set_ic; > > u8 proto_hdr_len, hdr; > > u32 pay_len, mss; > > dma_addr_t des; > > int i; > > + struct vlan_ethhdr *veth; > > > > tx_q = &priv->dma_conf.tx_queue[queue]; > > txq_stats = &priv->xstats.txq_stats[queue]; > > first_tx = tx_q->cur_tx; > > > > + if (skb_vlan_tag_present(skb)) { > > + /* Always insert VLAN tag to SKB payload for TSO frames. > > + * > > + * Never insert VLAN tag by HW, since segments splited by > > + * TSO engine will be un-tagged by mistake. > > + */ > > + skb_push(skb, VLAN_HLEN); > > + memmove(skb->data, skb->data + VLAN_HLEN, ETH_ALEN * 2); > > + > > + veth = skb_vlan_eth_hdr(skb); > > + veth->h_vlan_proto = skb->vlan_proto; > > + veth->h_vlan_TCI = htons(skb_vlan_tag_get(skb)); > > + __vlan_hwaccel_clear_tag(skb); > > + } > > I think drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c:: > otx2_sq_append_skb() does something similar, but uses a helper > instead: > > if (skb_shinfo(skb)->gso_size && !is_hw_tso_supported(pfvf, skb)) { > /* Insert vlan tag before giving pkt to tso */ > if (skb_vlan_tag_present(skb)) > skb = __vlan_hwaccel_push_inside(skb); > otx2_sq_append_tso(pfvf, sq, skb, qidx); > return true; > } > > Maybe __vlan_hwaccel_push_inside() should be used here? > Yes, it should. Thanks for your comments. I will send a new patch.