From patchwork Fri Mar 21 21:16:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 14026056 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C131230BDC for ; Fri, 21 Mar 2025 21:17:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742591840; cv=none; b=MIz+MZNhX//3zQnWVydanktubgoSpnROWd0TSmDmGx6uNAFjmHY+0o2uLZzn6+dA+btYlI1mpqK1IPtFA6uCr3lKHxw3iSlDqQZjlbg9OTgSWTkXwEEsR2zZLHd0juPRRsUy6zgC2ywdPqTfCc5Jl7TnFWLNST6WJJcbqPG5c1s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742591840; c=relaxed/simple; bh=IqVLT/fj0Pa/es+R02oKGA+IlnPtbFjP/pfs6cWq5ac=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KEwjxtO4/hN0HhPBXICZrXzYSb6HvUcXoEaX0xtu6YI5KR05e+KTMQrGPFhLD4VYqjBdCfndXtASSuCv1vP0JvtTN8KkzOs/fpGaaIHY2BMAL3P6vKZWr7z7JY4mDOJmB8e0+iDNZH8V4SFYAaOBcnCGeV9gS+RbZfAQLepu1Oo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=gwBwuXmZ; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="gwBwuXmZ" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2260c915749so35049345ad.3 for ; Fri, 21 Mar 2025 14:17:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1742591837; x=1743196637; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2zoSVAv9eAagIOw9dYpuP931ulMdAEfWrIR+6VNfhxQ=; b=gwBwuXmZGO6z2Dk7stFv+hyRXVJVKPGE5ixQW4YPTFQACMDqewk1wO5mBrLuLO8ksQ ShRwhXuiWwyqL5fkwCv6ElU4zk2Y0JQX6cAumptSm4+BBaS18M5splpiG7HUfMogpLO5 pccD8pAd0QKULLKRSPkdHtLs7TLYpuYAzTWR8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742591837; x=1743196637; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2zoSVAv9eAagIOw9dYpuP931ulMdAEfWrIR+6VNfhxQ=; b=opO7qIrY1VppXs0gbA+290PPtktb4VO840SfsTXTNS+VzsbUu9Bd42F9h9yPT8heOM ZStiSfx6dSzINvfZJrZDohoeD9PnFUsvnjzgDHPjtPthATOy9mnjpxSKpU/pUjlSGl4j oQgNQUu1LySNWViDQKxi68SvdWS9dxt8qhBUXc6zEL3SC9lbhKLABR/b5+h9pgsa2WPt 0xmN/K2yE2/gD28pvHUk/bH60lHdc3gCBZYHEFqde7BWdaTgCVCIR0mIeSCZY9oI6ZGH ORw+JKLoa9rSoTbD/X3L+MfMlKZ9VYHnC9xoO6z9Pv1kKVPdoaAtPYUGoAEnHJacLeKK +t1Q== X-Gm-Message-State: AOJu0Yz0KEIuhqAl2H/UByLYK81LXtmCZXkpcjS9GzTWeC8y4AIDMu+0 QL1/mOaVszG9mcxaIJe+ROpQ8lgFCYe7GH2pjGauOZuVGFcq+AZ60EQONALcjw== X-Gm-Gg: ASbGncvq1ka9xQx6evXE0DCc6j4LX5qVSB58MgLffqUoLI2Nxh7J5kZ0sDmP6xc7IgT XEepBsliT7A+KsyGNcYyDnH2IqThak7YJdtAO0eykzGmKBxDHjAoCnPM0m3S303BCS8tLgK7dtF Mi6fnw7dfai4KlnKtIO9cHz5OGy5t8YI6oKbeHa3ulNScg7FlKxf9CiJZQC+aeZ60ZUBvWFg6Qy FTZmzr8SFhjNvzm6nYrKdrgn8tLAGkHun38AShKmp0DBudD6LO/4jKeBAxm3inRqw5popI5bjpi xMEcd9nHHFdgPol6EsODX/3DaPbQWY1oVaAABt06uMEB/g3akP7sE0aeVilwpS7Znubtkrxf+Wj HWdtmGIGNj8pnqsPyaRmC X-Google-Smtp-Source: AGHT+IHG/443kL7kidUg661UEiKuY2CcHZg7CbCwIEI6Ahv4Y3I3M5SF1N6uwF7nEoekmdoxRnDGOA== X-Received: by 2002:a17:902:ef12:b0:224:249f:9734 with SMTP id d9443c01a7336-22780c54cfemr82881955ad.4.1742591837446; Fri, 21 Mar 2025 14:17:17 -0700 (PDT) Received: from lvnvda3289.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22780f4a034sm22386055ad.98.2025.03.21.14.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 14:17:16 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, andrew+netdev@lunn.ch, pavan.chebbi@broadcom.com, andrew.gospodarek@broadcom.com, osk@google.com, Kalesh AP , Somnath Kotur Subject: [PATCH net 1/2] bnxt_en: Mask the bd_cnt field in the TX BD properly Date: Fri, 21 Mar 2025 14:16:38 -0700 Message-ID: <20250321211639.3812992-2-michael.chan@broadcom.com> X-Mailer: git-send-email 2.43.4 In-Reply-To: <20250321211639.3812992-1-michael.chan@broadcom.com> References: <20250321211639.3812992-1-michael.chan@broadcom.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The bd_cnt field in the TX BD specifies the total number of BDs for the TX packet. The bd_cnt field has 5 bits and the maximum number supported is 32 with the value 0. CONFIG_MAX_SKB_FRAGS can be modified and the total number of SKB fragments can approach or exceed the maximum supported by the chip. Add a macro to properly mask the bd_cnt field so that the value 32 will be properly masked and set to 0 in the bd_cnd field. Without this patch, the out-of-range bd_cnt value will corrupt the TX BD and may cause TX timeout. The next patch will check for values exceeding 32. Fixes: 3948b05950fd ("net: introduce a config option to tweak MAX_SKB_FRAGS") Reviewed-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Andy Gospodarek Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 ++-- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 ++ drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 0ddc3d41e2d8..158e9789c1f4 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -564,7 +564,7 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) TX_BD_FLAGS_LHINT_512_AND_SMALLER | TX_BD_FLAGS_COAL_NOW | TX_BD_FLAGS_PACKET_END | - (2 << TX_BD_FLAGS_BD_CNT_SHIFT)); + TX_BD_CNT(2)); if (skb->ip_summed == CHECKSUM_PARTIAL) tx_push1->tx_bd_hsize_lflags = @@ -639,7 +639,7 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) dma_unmap_addr_set(tx_buf, mapping, mapping); flags = (len << TX_BD_LEN_SHIFT) | TX_BD_TYPE_LONG_TX_BD | - ((last_frag + 2) << TX_BD_FLAGS_BD_CNT_SHIFT); + TX_BD_CNT(last_frag + 2); txbd->tx_bd_haddr = cpu_to_le64(mapping); txbd->tx_bd_opaque = SET_TX_OPAQUE(bp, txr, prod, 2 + last_frag); diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index 2373f423a523..3b4a044db73e 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -82,6 +82,8 @@ struct tx_bd { #define TX_OPAQUE_PROD(bp, opq) ((TX_OPAQUE_IDX(opq) + TX_OPAQUE_BDS(opq)) &\ (bp)->tx_ring_mask) +#define TX_BD_CNT(n) (((n) << TX_BD_FLAGS_BD_CNT_SHIFT) & TX_BD_FLAGS_BD_CNT) + struct tx_bd_ext { __le32 tx_bd_hsize_lflags; #define TX_BD_FLAGS_TCP_UDP_CHKSUM (1 << 0) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c index 299822cacca4..d71bad3cfd6b 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c @@ -48,8 +48,7 @@ struct bnxt_sw_tx_bd *bnxt_xmit_bd(struct bnxt *bp, tx_buf->page = virt_to_head_page(xdp->data); txbd = &txr->tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)]; - flags = (len << TX_BD_LEN_SHIFT) | - ((num_frags + 1) << TX_BD_FLAGS_BD_CNT_SHIFT) | + flags = (len << TX_BD_LEN_SHIFT) | TX_BD_CNT(num_frags + 1) | bnxt_lhint_arr[len >> 9]; txbd->tx_bd_len_flags_type = cpu_to_le32(flags); txbd->tx_bd_opaque = SET_TX_OPAQUE(bp, txr, prod, 1 + num_frags); From patchwork Fri Mar 21 21:16:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 14026057 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1D0F1E9B34 for ; Fri, 21 Mar 2025 21:17:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742591841; cv=none; b=iM3cU/jA0bCCl+JqZ1KjljtITgNQVeNY+fcEBS1SmE4aBb8fiDuBvhpprDzlpcJk6nUpn/mVTkhGmdSkGqBevKbgLR5CgTaXlpfhQJBzNvsl1ws6P9Bo2I+/CbVaTHl/CRSFpF2qo+uUK6rU/7eYBUlsgQpqgse+8qk8kvWsBq4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742591841; c=relaxed/simple; bh=8VH5ZBR2pM/FZIhsdwpFvhRpQCc3sQ7FLUxfUytMFew=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pm5nWjT4xCHlnRMXtc9Xzrgbc/yFCo26eR6n+XNKZcfWAKsPTpXQ5rUUQ5zmDET08b1XTSdh2Ib+qE12lzHXC2lHvTy5d8Pt5gZfaELv+CCQ8mK+9nCOiwGOUhRLHrafFWbrAxqIdpHDZpKBTlt+4Sp4h5zwHFgHzoWGk61m9aE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=Cm3IapUg; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="Cm3IapUg" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-223594b3c6dso58234695ad.2 for ; Fri, 21 Mar 2025 14:17:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1742591839; x=1743196639; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0GWxDl3NKRQpR9b0MB26S0fCiRIMgEtnDkyEGLrp2mE=; b=Cm3IapUgXDCoWmaubOIAupKpeVTupTiwvGKm3X6RYKLLAkZdiPJZtvGZpX3UVzdrmz wla7DUWkZd9q5G4ref1vLnqicvLY7ApTMi4sF4kLHvaE96KcLVJPrYzBWozxtVc7tzyr 4hY1TCx0Rl6gQMIuPriR142syhK7h1cli5Rak= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742591839; x=1743196639; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0GWxDl3NKRQpR9b0MB26S0fCiRIMgEtnDkyEGLrp2mE=; b=PehmnJ+AzoOsF2urKF9RZ2lFUtQ3V5y+XCd6+MibDcEpw1UmW67zFMUxDbRtNVg5i+ Flr4Up0OjapbH7RUMjnHfNWH+SCyjkyGm2z6uf95O84rBJxE1zj5+USR05P7/OO79Gg1 WlP0dRBKrRIkMabsYbhBKtPyrySc8JqXdygENx8RFA2AORO8j2DFvuWjx4Frf/L2M/Jg d/EFV1C1wnklgqPqJpKU5mU1xmd46KG7Rum+ZunrNqn5toOQxyYG6ULKnfOVAznl8s5I DLKNWGHdkL+/4y3GoUMa4Xd4xTXMLCk0LEi9qlXhI7N68CG4g2Ki4GRbtOk9u33cTGyl o0bA== X-Gm-Message-State: AOJu0Yx0E6Sl78XS5UQ4T89uYbN9R9Zpyxsrg2MtBGtQvK06c/X2NKQO ghvO8R8FN38+eJ1s7FyWWszN6f7LHmVps7oH774hp/2QdbcUFn23icVT9S0EIg== X-Gm-Gg: ASbGnctnYLv6qMn5UT7SeWLCSKXf3dfE1Ul8ngwpgp434x/C6Tr6aV+ss322g3aOzhf tX9Qs65kkC0RVAjDCmmcvRZPRTyfLDwFQ9eWXnsqVaJzZvgfESAoSeRT8JXGrxDkvAIMX9uV6Al qHjJduXS1dalvowhIrudeexD32NhL9vrL8TbfBEd07RG2mIQaz1L0Na28siuKOuMohcKjNnhA+k EcICkeHWFPBU72zlePqAE8pzD8Et/t3p26UbPqxKPnv9K2jc73yn+L+o5er78PMz5px6snfegh9 uICFrrSQLes90tD8oa8sjBvGY7OTq2M0VuaZYQIxrbk23n1FbZgAyOQyBsYqurU5DkzE/9GwBI4 owg8jyOe8xyqr5bmgzcL4 X-Google-Smtp-Source: AGHT+IEWJ9LaNh3/4jHt9AopZylkCMg0KKSIGrRqyu/n5Gr/HIExvjCDHFaVqE6a0g5mUNueJJyyEQ== X-Received: by 2002:a17:902:ce0f:b0:223:66bc:f1de with SMTP id d9443c01a7336-22780d7e389mr82414725ad.21.1742591839009; Fri, 21 Mar 2025 14:17:19 -0700 (PDT) Received: from lvnvda3289.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22780f4a034sm22386055ad.98.2025.03.21.14.17.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 14:17:18 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, andrew+netdev@lunn.ch, pavan.chebbi@broadcom.com, andrew.gospodarek@broadcom.com, osk@google.com, Somnath Kotur , Kalesh AP Subject: [PATCH net 2/2] bnxt_en: Linearize TX SKB if the fragments exceed the max Date: Fri, 21 Mar 2025 14:16:39 -0700 Message-ID: <20250321211639.3812992-3-michael.chan@broadcom.com> X-Mailer: git-send-email 2.43.4 In-Reply-To: <20250321211639.3812992-1-michael.chan@broadcom.com> References: <20250321211639.3812992-1-michael.chan@broadcom.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org If skb_shinfo(skb)->nr_frags excceds what the chip can support, linearize the SKB and warn once to let the user know. net.core.max_skb_frags can be lowered, for example, to avoid the issue. Fixes: 3948b05950fd ("net: introduce a config option to tweak MAX_SKB_FRAGS") Reviewed-by: Somnath Kotur Reviewed-by: Kalesh AP Reviewed-by: Andy Gospodarek Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 11 +++++++++++ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 158e9789c1f4..2cd79b59cf00 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -485,6 +485,17 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) txr = &bp->tx_ring[bp->tx_ring_map[i]]; prod = txr->tx_prod; +#if (MAX_SKB_FRAGS > TX_MAX_FRAGS) + if (skb_shinfo(skb)->nr_frags > TX_MAX_FRAGS) { + netdev_warn_once(dev, "SKB has too many (%d) fragments, max supported is %d. SKB will be linearized.\n", + skb_shinfo(skb)->nr_frags, TX_MAX_FRAGS); + if (skb_linearize(skb)) { + dev_kfree_skb_any(skb); + dev_core_stats_tx_dropped_inc(dev); + return NETDEV_TX_OK; + } + } +#endif free_size = bnxt_tx_avail(bp, txr); if (unlikely(free_size < skb_shinfo(skb)->nr_frags + 2)) { /* We must have raced with NAPI cleanup */ diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index 3b4a044db73e..d621fb621f30 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -84,6 +84,10 @@ struct tx_bd { #define TX_BD_CNT(n) (((n) << TX_BD_FLAGS_BD_CNT_SHIFT) & TX_BD_FLAGS_BD_CNT) +#define TX_MAX_BD_CNT 32 + +#define TX_MAX_FRAGS (TX_MAX_BD_CNT - 2) + struct tx_bd_ext { __le32 tx_bd_hsize_lflags; #define TX_BD_FLAGS_TCP_UDP_CHKSUM (1 << 0)