From patchwork Wed Feb 12 06:51:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 13971260 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 A1C95C02198 for ; Wed, 12 Feb 2025 06:55:06 +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:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1ZMCvDd/Ezj4aFDcX2uSgRxKCo45Kz+LLQsJyZlloOE=; b=tq6cLJEiKnfxLpaFoQ0mXyG+Jz WA7wvvBSg34vEY91UXZOIgD6sMLo9LQqTcWqbhrzs9RjlZN9uipKJxnYWObpMRRhEriDYYqDlIPW2 cGPJTbL6CYvUmPUqELJSWLolMzoPvZOQ70XpA8KRBRfSmPJMf0I/DzF35pBFlXWCVxldeQGR8m80d dBcknLyIdmZxhBI/1NlZHRejV7um/ObhbrvANiPvNX455ol2zna2fok3GhGQsZjVY8XAJh0FZLuKH ecxGO86u2JIe+3KdqPvbDK/cnUP0060IUlJwbj75UyQdDtjPNiikH+xst246o//78Ychas/iZ0h+y NLKOb/nw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1ti6eH-00000006QKs-2lWk; Wed, 12 Feb 2025 06:55:05 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1ti6bX-00000006Puz-0D18; Wed, 12 Feb 2025 06:52:16 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id D08CEA41156; Wed, 12 Feb 2025 06:50:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D355C4CEDF; Wed, 12 Feb 2025 06:52:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739343133; bh=ZR5/2ulMQlwhUwl/HtlTLXlzn5sAotIiGMhXEhkdb3s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=rB88eptIRhWJaqF3WPpr08Ft5KB7I/GhHDFkfLzvTd+lGjkFJJBEfn3C9/jWKDybf 3X+Pc3kyzxQSONHBSye6YqFG5jzExQe9QzaSkaZKt13+GhcUNhLwjclwjg2KXDpRGe LsY5GceWC4otQA7u8/GlFtVucBQyUSTwUqq0C+UdMLbdKk1R3f/zMaslE9CDBwE/TB mxy0QqhTWr0xMKr+NshuwevoVXlBBxOz9J9dvAiTdXgS8Y2wJtCBJQmgUPnhnUhFMB UEiVSTtpQAsNVX3e3iNeN6/LRQhZjZprRFFWko7dNsy4bnTm8s65Y3Pwc8ZDqcfMES mZspdKOl19NTg== From: Lorenzo Bianconi Date: Wed, 12 Feb 2025 07:51:47 +0100 Subject: [PATCH net-next 1/2] net: airoha: Fix TSO support for header cloned skbs MIME-Version: 1.0 Message-Id: <20250212-airoha-fix-tso-v1-1-1652558a79b4@kernel.org> References: <20250212-airoha-fix-tso-v1-0-1652558a79b4@kernel.org> In-Reply-To: <20250212-airoha-fix-tso-v1-0-1652558a79b4@kernel.org> To: Felix Fietkau , Sean Wang , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , AngeloGioacchino Del Regno Cc: linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, netdev@vger.kernel.org, Lorenzo Bianconi X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250211_225215_227389_7F2DAD7A X-CRM114-Status: GOOD ( 13.44 ) X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org For GSO packets, skb_cow_head() will reallocate the skb for TSO header cloned skbs in airoha_dev_xmit(). For this reason, sinfo pointer can be no more valid. Fix the issue relying on skb_shinfo() macro directly in airoha_dev_xmit(). This is not a user visible issue since we can't currently enable TSO for DSA user ports since we are missing to initialize net_device vlan_features field. Fixes: 23020f049327 ("net: airoha: Introduce ethernet support for EN7581 SoC") Signed-off-by: Lorenzo Bianconi Reviewed-by: Mateusz Polchlopek --- drivers/net/ethernet/mediatek/airoha_eth.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/mediatek/airoha_eth.c b/drivers/net/ethernet/mediatek/airoha_eth.c index 09f448f291240257c5748725848ede231c502fbd..aa5f220ddbcf9ca5bee1173114294cb3aec701c9 100644 --- a/drivers/net/ethernet/mediatek/airoha_eth.c +++ b/drivers/net/ethernet/mediatek/airoha_eth.c @@ -2556,11 +2556,10 @@ static u16 airoha_dev_select_queue(struct net_device *dev, struct sk_buff *skb, static netdev_tx_t airoha_dev_xmit(struct sk_buff *skb, struct net_device *dev) { - struct skb_shared_info *sinfo = skb_shinfo(skb); struct airoha_gdm_port *port = netdev_priv(dev); + u32 nr_frags = 1 + skb_shinfo(skb)->nr_frags; u32 msg0, msg1, len = skb_headlen(skb); struct airoha_qdma *qdma = port->qdma; - u32 nr_frags = 1 + sinfo->nr_frags; struct netdev_queue *txq; struct airoha_queue *q; void *data = skb->data; @@ -2583,8 +2582,9 @@ static netdev_tx_t airoha_dev_xmit(struct sk_buff *skb, if (skb_cow_head(skb, 0)) goto error; - if (sinfo->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) { - __be16 csum = cpu_to_be16(sinfo->gso_size); + if (skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | + SKB_GSO_TCPV6)) { + __be16 csum = cpu_to_be16(skb_shinfo(skb)->gso_size); tcp_hdr(skb)->check = (__force __sum16)csum; msg0 |= FIELD_PREP(QDMA_ETH_TXMSG_TSO_MASK, 1); @@ -2613,7 +2613,7 @@ static netdev_tx_t airoha_dev_xmit(struct sk_buff *skb, for (i = 0; i < nr_frags; i++) { struct airoha_qdma_desc *desc = &q->desc[index]; struct airoha_queue_entry *e = &q->entry[index]; - skb_frag_t *frag = &sinfo->frags[i]; + skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; dma_addr_t addr; u32 val; From patchwork Wed Feb 12 06:51:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 13971261 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 AA329C0219E for ; Wed, 12 Feb 2025 06:56:31 +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:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=dYy7nG1QPt71ocXmaGOtu33ba5dvMFSO35bM0gjFPfo=; b=oWFvv38RwpfHPdCzBtgsm5d8i/ hkyJebrRhNLQuGKLjZZPTVXMG4XR6SL3/kURDFCMIaGbwlgziwfPV9tNfiUsZOcOrzRBefliFkQ5Y pluTuo+u8qsq7Ah0nMV/Cx8pqY56onYlLuAljhDVzTjEbaPPHS65R1N7avBl5Fz5tWdyZbGPZT0cP gW9aAcR0n/5hVN62QM3DdnJwGnqT2L6rIX2WK5HUPqiJhViQn9u0u3A1CV7WjGsAabDt2b/oA5ICD AmZj2g70L8Q8IG15J38ZFHPTedtSWvbG/RG48ClNbWakKNPUZjFRw8GyMLD+ag6UGzJhFA+y3U4Pl mDUTBMyg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1ti6fe-00000006QXK-3RM5; Wed, 12 Feb 2025 06:56:30 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1ti6bZ-00000006PwQ-2i7A; Wed, 12 Feb 2025 06:52:18 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 83542A410E0; Wed, 12 Feb 2025 06:50:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40045C4CEDF; Wed, 12 Feb 2025 06:52:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739343136; bh=oNuvzrX0ScmnFLsPRD7UuqsTQ2lVnZz8AOiY3gY+NZs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=iS47+CZiIjvI+nlWbAE37Zd4ChrRWym+nToPuDtYNeXBfYWg9VqhmNOAH9jCRQbSv Novnyz7ViJoZUlQ0J1QHdgMyXB3vsi/6ortYFNBSG6LWN8hvNnjSCWVCt7MB5xvI7r t1zS8VU7ZdQXHuY/5OF23qrcspKRzcEsmwS7LXWJqXYx/yDR1ib7LZE/hp7d9WJ45q 1hemK6W6LWcSfMQg8wx+Q4uhbRF+gunxJpTky0uk40oVB4hFqM2ckK6mKuiUqSIqvk WzcbPFZ3tPMm0RqSCB1X2Mc94+gUJPfFUbGTVw6XoxuckB+RPqYehi9hQ8c5PzhI4p QeLWoVWnmCzrg== From: Lorenzo Bianconi Date: Wed, 12 Feb 2025 07:51:48 +0100 Subject: [PATCH net-next 2/2] net: airoha: Enable TSO/Scatter Gather for LAN port MIME-Version: 1.0 Message-Id: <20250212-airoha-fix-tso-v1-2-1652558a79b4@kernel.org> References: <20250212-airoha-fix-tso-v1-0-1652558a79b4@kernel.org> In-Reply-To: <20250212-airoha-fix-tso-v1-0-1652558a79b4@kernel.org> To: Felix Fietkau , Sean Wang , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , AngeloGioacchino Del Regno Cc: linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, netdev@vger.kernel.org, Lorenzo Bianconi X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250211_225217_756329_E0FC7F05 X-CRM114-Status: UNSURE ( 7.63 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Set net_device vlan_features in order to enable TSO and Scatter Gather for DSA user ports. Signed-off-by: Lorenzo Bianconi Reviewed-by: Mateusz Polchlopek --- drivers/net/ethernet/mediatek/airoha_eth.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/mediatek/airoha_eth.c b/drivers/net/ethernet/mediatek/airoha_eth.c index aa5f220ddbcf9ca5bee1173114294cb3aec701c9..321e5d15198c5ec6a0764be418aa447e8d9e4512 100644 --- a/drivers/net/ethernet/mediatek/airoha_eth.c +++ b/drivers/net/ethernet/mediatek/airoha_eth.c @@ -3188,6 +3188,7 @@ static int airoha_alloc_gdm_port(struct airoha_eth *eth, struct device_node *np) NETIF_F_SG | NETIF_F_TSO | NETIF_F_HW_TC; dev->features |= dev->hw_features; + dev->vlan_features = dev->hw_features; dev->dev.of_node = np; dev->irq = qdma->irq; SET_NETDEV_DEV(dev, eth->dev);