From nobody Sat Feb 7 21:15:30 2026 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 88DB035502E; Fri, 14 Nov 2025 21:19:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763155175; cv=none; b=fTtNs/eGog5lx104SXk679tI855Vzooyqo0ps1ZhsSrtsYJURf86N+oWA7S6FOk2mPk3O+mCRG2pks+zTMmQlcedTk1isH7v1nxGzgk6HzqivkFn87PusFbd3mFndjh1L25/rgU0K4Tb2yHGISEFfaDy8csWpCH2AQiyoIIsGGM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763155175; c=relaxed/simple; bh=qAppDtmq4RZmDXIxIomimfZXh1p8unkN9SunTrsVs6I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=Z/J1m1tRUAIz7vAT32xlsha5rTX4Bkrmupmh/vdRlyNa6kQJoqzpzNxgk+hDaEbqHkUMRj2B9nTpjkhW1bo/M4l2NgBLui3oefYrMju7uUj5PRdbWeJJLXC1Czuq3P9whLM9GYCEBCulPl1/3Nu5RvccRm8IEoaifdkvzen+UG4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=mgKCNaae; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="mgKCNaae" Received: by linux.microsoft.com (Postfix, from userid 1231) id 39841201AE67; Fri, 14 Nov 2025 13:19:33 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 39841201AE67 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1763155173; bh=YgwzmMqOcrNlI7yfupM3/trEvTD0ly+JPEobPCbJOyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mgKCNaaeedMGLvyyTMf9nxcR4R2Wlk98Q5AT6Oaqc7tmhtRMZ8IKZwIhK1SxLQ4p2 lzJ36VHkXg8PMsuyV0SXAGNhatUnnSrSmdGmOyr+IS6fpcERZ5OOKOB71XEZUKZ05S glFDF4Oa2ZdpW+RceR2HKTL8e7R5aldF+uVHuAFY= From: Aditya Garg To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, longli@microsoft.com, kotaranov@microsoft.com, horms@kernel.org, shradhagupta@linux.microsoft.com, ssengar@linux.microsoft.com, ernis@linux.microsoft.com, dipayanroy@linux.microsoft.com, shirazsaleem@microsoft.com, leon@kernel.org, mlevitsk@redhat.com, yury.norov@gmail.com, sbhatta@marvell.com, linux-hyperv@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, gargaditya@microsoft.com Cc: Aditya Garg Subject: [PATCH net-next v5 1/2] net: mana: Handle SKB if TX SGEs exceed hardware limit Date: Fri, 14 Nov 2025 13:16:42 -0800 Message-Id: <1763155003-21503-2-git-send-email-gargaditya@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1763155003-21503-1-git-send-email-gargaditya@linux.microsoft.com> References: <1763155003-21503-1-git-send-email-gargaditya@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The MANA hardware supports a maximum of 30 scatter-gather entries (SGEs) per TX WQE. Exceeding this limit can cause TX failures. Add ndo_features_check() callback to validate SKB layout before transmission. For GSO SKBs that would exceed the hardware SGE limit, clear NETIF_F_GSO_MASK to enforce software segmentation in the stack. Add a fallback in mana_start_xmit() to linearize non-GSO SKBs that still exceed the SGE limit. Also, Add ethtool counter for SKBs linearized Co-developed-by: Dipayaan Roy Signed-off-by: Dipayaan Roy Signed-off-by: Aditya Garg Reviewed-by: Eric Dumazet --- Changes in v5: * Drop skb_is_gso() check for disabling GSO in mana_features_check(). * Register .ndo_features_check conditionally to avoid unnecessary call. Changes in v4: * No change. --- drivers/net/ethernet/microsoft/mana/mana_en.c | 41 ++++++++++++++++++- .../ethernet/microsoft/mana/mana_ethtool.c | 2 + include/net/mana/gdma.h | 8 +++- include/net/mana/mana.h | 1 + 4 files changed, 49 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/et= hernet/microsoft/mana/mana_en.c index cccd5b63cee6..d92069954fd9 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -11,6 +11,7 @@ #include #include #include +#include =20 #include #include @@ -329,6 +330,22 @@ netdev_tx_t mana_start_xmit(struct sk_buff *skb, struc= t net_device *ndev) cq =3D &apc->tx_qp[txq_idx].tx_cq; tx_stats =3D &txq->stats; =20 + BUILD_BUG_ON(MAX_TX_WQE_SGL_ENTRIES !=3D MANA_MAX_TX_WQE_SGL_ENTRIES); +#if (MAX_SKB_FRAGS + 2 > MANA_MAX_TX_WQE_SGL_ENTRIES) + if (skb_shinfo(skb)->nr_frags + 2 > MAX_TX_WQE_SGL_ENTRIES) { + /* GSO skb with Hardware SGE limit exceeded is not expected here + * as they are handled in mana_features_check() callback + */ + if (skb_linearize(skb)) { + netdev_warn_once(ndev, "Failed to linearize skb with nr_frags=3D%d and = is_gso=3D%d\n", + skb_shinfo(skb)->nr_frags, + skb_is_gso(skb)); + goto tx_drop_count; + } + apc->eth_stats.linear_pkt_tx_cnt++; + } +#endif + pkg.tx_oob.s_oob.vcq_num =3D cq->gdma_id; pkg.tx_oob.s_oob.vsq_frame =3D txq->vsq_frame; =20 @@ -442,8 +459,6 @@ netdev_tx_t mana_start_xmit(struct sk_buff *skb, struct= net_device *ndev) } } =20 - WARN_ON_ONCE(pkg.wqe_req.num_sge > MAX_TX_WQE_SGL_ENTRIES); - if (pkg.wqe_req.num_sge <=3D ARRAY_SIZE(pkg.sgl_array)) { pkg.wqe_req.sgl =3D pkg.sgl_array; } else { @@ -518,6 +533,25 @@ netdev_tx_t mana_start_xmit(struct sk_buff *skb, struc= t net_device *ndev) return NETDEV_TX_OK; } =20 +#if (MAX_SKB_FRAGS + 2 > MANA_MAX_TX_WQE_SGL_ENTRIES) +static netdev_features_t mana_features_check(struct sk_buff *skb, + struct net_device *ndev, + netdev_features_t features) +{ + if (skb_shinfo(skb)->nr_frags + 2 > MAX_TX_WQE_SGL_ENTRIES) { + /* Exceeds HW SGE limit. + * GSO case: + * Disable GSO so the stack will software-segment the skb + * into smaller skbs that fit the SGE budget. + * Non-GSO case: + * The xmit path will attempt skb_linearize() as a fallback. + */ + features &=3D ~NETIF_F_GSO_MASK; + } + return features; +} +#endif + static void mana_get_stats64(struct net_device *ndev, struct rtnl_link_stats64 *st) { @@ -878,6 +912,9 @@ static const struct net_device_ops mana_devops =3D { .ndo_open =3D mana_open, .ndo_stop =3D mana_close, .ndo_select_queue =3D mana_select_queue, +#if (MAX_SKB_FRAGS + 2 > MANA_MAX_TX_WQE_SGL_ENTRIES) + .ndo_features_check =3D mana_features_check, +#endif .ndo_start_xmit =3D mana_start_xmit, .ndo_validate_addr =3D eth_validate_addr, .ndo_get_stats64 =3D mana_get_stats64, diff --git a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c b/drivers/n= et/ethernet/microsoft/mana/mana_ethtool.c index a1afa75a9463..fa5e1a2f06a9 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c +++ b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c @@ -71,6 +71,8 @@ static const struct mana_stats_desc mana_eth_stats[] =3D { {"tx_cq_err", offsetof(struct mana_ethtool_stats, tx_cqe_err)}, {"tx_cqe_unknown_type", offsetof(struct mana_ethtool_stats, tx_cqe_unknown_type)}, + {"linear_pkt_tx_cnt", offsetof(struct mana_ethtool_stats, + linear_pkt_tx_cnt)}, {"rx_coalesced_err", offsetof(struct mana_ethtool_stats, rx_coalesced_err)}, {"rx_cqe_unknown_type", offsetof(struct mana_ethtool_stats, diff --git a/include/net/mana/gdma.h b/include/net/mana/gdma.h index 637f42485dba..6dae78dc468f 100644 --- a/include/net/mana/gdma.h +++ b/include/net/mana/gdma.h @@ -489,6 +489,8 @@ struct gdma_wqe { #define MAX_TX_WQE_SIZE 512 #define MAX_RX_WQE_SIZE 256 =20 +#define MANA_MAX_TX_WQE_SGL_ENTRIES 30 + #define MAX_TX_WQE_SGL_ENTRIES ((GDMA_MAX_SQE_SIZE - \ sizeof(struct gdma_sge) - INLINE_OOB_SMALL_SIZE) / \ sizeof(struct gdma_sge)) @@ -592,6 +594,9 @@ enum { #define GDMA_DRV_CAP_FLAG_1_HANDLE_RECONFIG_EQE BIT(17) #define GDMA_DRV_CAP_FLAG_1_HW_VPORT_LINK_AWARE BIT(6) =20 +/* Driver supports linearizing the skb when num_sge exceeds hardware limit= */ +#define GDMA_DRV_CAP_FLAG_1_SKB_LINEARIZE BIT(20) + #define GDMA_DRV_CAP_FLAGS1 \ (GDMA_DRV_CAP_FLAG_1_EQ_SHARING_MULTI_VPORT | \ GDMA_DRV_CAP_FLAG_1_NAPI_WKDONE_FIX | \ @@ -601,7 +606,8 @@ enum { GDMA_DRV_CAP_FLAG_1_DYNAMIC_IRQ_ALLOC_SUPPORT | \ GDMA_DRV_CAP_FLAG_1_SELF_RESET_ON_EQE | \ GDMA_DRV_CAP_FLAG_1_HANDLE_RECONFIG_EQE | \ - GDMA_DRV_CAP_FLAG_1_HW_VPORT_LINK_AWARE) + GDMA_DRV_CAP_FLAG_1_HW_VPORT_LINK_AWARE | \ + GDMA_DRV_CAP_FLAG_1_SKB_LINEARIZE) =20 #define GDMA_DRV_CAP_FLAGS2 0 =20 diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h index 8906901535f5..50a532fb30d6 100644 --- a/include/net/mana/mana.h +++ b/include/net/mana/mana.h @@ -404,6 +404,7 @@ struct mana_ethtool_stats { u64 hc_tx_err_gdma; u64 tx_cqe_err; u64 tx_cqe_unknown_type; + u64 linear_pkt_tx_cnt; u64 rx_coalesced_err; u64 rx_cqe_unknown_type; }; --=20 2.43.0 From nobody Sat Feb 7 21:15:30 2026 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7DBCE3557FD; Fri, 14 Nov 2025 21:19:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763155175; cv=none; b=aRqnMH3OuuvCMm42/0lBzRr+whIQa1O2y0yML49wtk84/RcnF2VNibHAAm4gnvz4q08yo7zi3COVaLVL5DZna2kGjizOhlFD6E0xAcP9ta2C57M1w5sK9sFZkxQ2m8ms0VFHAfmFOKo2IoX1OHuZxoCLWuaaD3u6Y5zirIC5YeU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763155175; c=relaxed/simple; bh=Nu30pldOwGlys8I2ywWDSu8pAPSxOvcDnI2VUKLe1hQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=oozK8+PzpAHAGwerJ8UlZLnX1gEYo2/Mk3Z4icZdKeHmXsTSfIFg1cxlhhWq0Ux5MC/3jGOvwbvdRSbT8CQytAZY0kkkVKNOd2Ok8lf7Nbt2nKT7YQpGO1rUMoTxIfzYZ9rIcqBy+nPiXyhNBf37HkZPTx5/aZpUeggFjsygtPw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=pMbgVEc+; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="pMbgVEc+" Received: by linux.microsoft.com (Postfix, from userid 1231) id 33AFF201AE68; Fri, 14 Nov 2025 13:19:34 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 33AFF201AE68 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1763155174; bh=81onwcqImC0AKbBfwuNL6qtdSNr5P5GozI4oWfMmqfY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pMbgVEc+aVoQ9Y5y2p2gHwmgO1OZkIY8RX1dheo525PkBrtEv0o52rbn3OIHdyv5e w9DfCe9PWWrusvDUmCOM887MOmHGXgHecoWFBdWuEnsJA69ynZijnepR8BxHVW/lth dTy8gJnVOXumz1RwbFb3E2v5n2fqwTxvM71NXVGs= From: Aditya Garg To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, longli@microsoft.com, kotaranov@microsoft.com, horms@kernel.org, shradhagupta@linux.microsoft.com, ssengar@linux.microsoft.com, ernis@linux.microsoft.com, dipayanroy@linux.microsoft.com, shirazsaleem@microsoft.com, leon@kernel.org, mlevitsk@redhat.com, yury.norov@gmail.com, sbhatta@marvell.com, linux-hyperv@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, gargaditya@microsoft.com Cc: Aditya Garg Subject: [PATCH net-next v5 2/2] net: mana: Drop TX skb on post_work_request failure and unmap resources Date: Fri, 14 Nov 2025 13:16:43 -0800 Message-Id: <1763155003-21503-3-git-send-email-gargaditya@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1763155003-21503-1-git-send-email-gargaditya@linux.microsoft.com> References: <1763155003-21503-1-git-send-email-gargaditya@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Drop TX packets when posting the work request fails and ensure DMA mappings are always cleaned up. Signed-off-by: Aditya Garg --- Changes in v5: * No change. Changes in v4: * Fix warning during build reported by kernel test robot --- drivers/net/ethernet/microsoft/mana/gdma_main.c | 6 +----- drivers/net/ethernet/microsoft/mana/mana_en.c | 7 +++---- include/net/mana/mana.h | 1 + 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/= ethernet/microsoft/mana/gdma_main.c index effe0a2f207a..8fd70b34807a 100644 --- a/drivers/net/ethernet/microsoft/mana/gdma_main.c +++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c @@ -1300,7 +1300,6 @@ int mana_gd_post_work_request(struct gdma_queue *wq, struct gdma_posted_wqe_info *wqe_info) { u32 client_oob_size =3D wqe_req->inline_oob_size; - struct gdma_context *gc; u32 sgl_data_size; u32 max_wqe_size; u32 wqe_size; @@ -1330,11 +1329,8 @@ int mana_gd_post_work_request(struct gdma_queue *wq, if (wqe_size > max_wqe_size) return -EINVAL; =20 - if (wq->monitor_avl_buf && wqe_size > mana_gd_wq_avail_space(wq)) { - gc =3D wq->gdma_dev->gdma_context; - dev_err(gc->dev, "unsuccessful flow control!\n"); + if (wq->monitor_avl_buf && wqe_size > mana_gd_wq_avail_space(wq)) return -ENOSPC; - } =20 if (wqe_info) wqe_info->wqe_size_in_bu =3D wqe_size / GDMA_WQE_BU_SIZE; diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/et= hernet/microsoft/mana/mana_en.c index d92069954fd9..d656c0882343 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -493,9 +493,9 @@ netdev_tx_t mana_start_xmit(struct sk_buff *skb, struct= net_device *ndev) =20 if (err) { (void)skb_dequeue_tail(&txq->pending_skbs); + mana_unmap_skb(skb, apc); netdev_warn(ndev, "Failed to post TX OOB: %d\n", err); - err =3D NETDEV_TX_BUSY; - goto tx_busy; + goto free_sgl_ptr; } =20 err =3D NETDEV_TX_OK; @@ -515,7 +515,6 @@ netdev_tx_t mana_start_xmit(struct sk_buff *skb, struct= net_device *ndev) tx_stats->bytes +=3D len + ((num_gso_seg - 1) * gso_hs); u64_stats_update_end(&tx_stats->syncp); =20 -tx_busy: if (netif_tx_queue_stopped(net_txq) && mana_can_tx(gdma_sq)) { netif_tx_wake_queue(net_txq); apc->eth_stats.wake_queue++; @@ -1683,7 +1682,7 @@ static int mana_move_wq_tail(struct gdma_queue *wq, u= 32 num_units) return 0; } =20 -static void mana_unmap_skb(struct sk_buff *skb, struct mana_port_context *= apc) +void mana_unmap_skb(struct sk_buff *skb, struct mana_port_context *apc) { struct mana_skb_head *ash =3D (struct mana_skb_head *)skb->head; struct gdma_context *gc =3D apc->ac->gdma_dev->gdma_context; diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h index 50a532fb30d6..d05457d3e1ab 100644 --- a/include/net/mana/mana.h +++ b/include/net/mana/mana.h @@ -585,6 +585,7 @@ int mana_set_bw_clamp(struct mana_port_context *apc, u3= 2 speed, void mana_query_phy_stats(struct mana_port_context *apc); int mana_pre_alloc_rxbufs(struct mana_port_context *apc, int mtu, int num_= queues); void mana_pre_dealloc_rxbufs(struct mana_port_context *apc); +void mana_unmap_skb(struct sk_buff *skb, struct mana_port_context *apc); =20 extern const struct ethtool_ops mana_ethtool_ops; extern struct dentry *mana_debugfs_root; --=20 2.43.0