diff mbox series

[net-next,v4,1/8] bnxt_en: add support for rx-copybreak ethtool command

Message ID 20241022162359.2713094-2-ap420073@gmail.com (mailing list archive)
State Changes Requested
Delegated to: Netdev Maintainers
Headers show
Series bnxt_en: implement device memory TCP for bnxt | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net-next, async
netdev/ynl success Generated files up to date; no warnings/errors; GEN HAS DIFF 2 files changed, 38 insertions(+);
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 5 this patch: 5
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 6 of 6 maintainers
netdev/build_clang success Errors and warnings before: 3 this patch: 3
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 5 this patch: 5
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 165 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 2 this patch: 2
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2024-10-23--12-00 (tests: 777)

Commit Message

Taehee Yoo Oct. 22, 2024, 4:23 p.m. UTC 
The bnxt_en driver supports rx-copybreak, but it couldn't be set by
userspace. Only the default value(256) has worked.
This patch makes the bnxt_en driver support following command.
`ethtool --set-tunable <devname> rx-copybreak <value> ` and
`ethtool --get-tunable <devname> rx-copybreak`.

Reviewed-by: Brett Creeley <brett.creeley@amd.com>
Tested-by: Stanislav Fomichev <sdf@fomichev.me>
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
---

v4:
 - Remove min rx-copybreak value.
 - Add Review tag from Brett.
 - Add Test tag from Stanislav.

v3:
 - Update copybreak value after closing nic and before opening nic when
   the device is running.

v2:
 - Define max/vim rx_copybreak value.

 drivers/net/ethernet/broadcom/bnxt/bnxt.c     | 23 +++++----
 drivers/net/ethernet/broadcom/bnxt/bnxt.h     |  5 +-
 .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 48 ++++++++++++++++++-
 3 files changed, 65 insertions(+), 11 deletions(-)

Comments

Michael Chan Oct. 24, 2024, 6:40 a.m. UTC | #1 
On Tue, Oct 22, 2024 at 9:24 AM Taehee Yoo <ap420073@gmail.com> wrote:
>
> The bnxt_en driver supports rx-copybreak, but it couldn't be set by
> userspace. Only the default value(256) has worked.
> This patch makes the bnxt_en driver support following command.
> `ethtool --set-tunable <devname> rx-copybreak <value> ` and
> `ethtool --get-tunable <devname> rx-copybreak`.
>
> Reviewed-by: Brett Creeley <brett.creeley@amd.com>
> Tested-by: Stanislav Fomichev <sdf@fomichev.me>
> Signed-off-by: Taehee Yoo <ap420073@gmail.com>
> ---
>
> v4:
>  - Remove min rx-copybreak value.
>  - Add Review tag from Brett.
>  - Add Test tag from Stanislav.
>
> v3:
>  - Update copybreak value after closing nic and before opening nic when
>    the device is running.
>
> v2:
>  - Define max/vim rx_copybreak value.
>
>  drivers/net/ethernet/broadcom/bnxt/bnxt.c     | 23 +++++----
>  drivers/net/ethernet/broadcom/bnxt/bnxt.h     |  5 +-
>  .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 48 ++++++++++++++++++-
>  3 files changed, 65 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> index bda3742d4e32..0f5fe9ba691d 100644
> --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c

> @@ -4510,7 +4513,8 @@ void bnxt_set_ring_params(struct bnxt *bp)
>                                   ALIGN(max(NET_SKB_PAD, XDP_PACKET_HEADROOM), 8) -
>                                   SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
>                 } else {
> -                       rx_size = SKB_DATA_ALIGN(BNXT_RX_COPY_THRESH + NET_IP_ALIGN);
> +                       rx_size = SKB_DATA_ALIGN(bp->rx_copybreak +
> +                                                NET_IP_ALIGN);

When rx_copybreak is 0 or very small, rx_size will be very small and
will be a problem.  We need rx_size to be big enough to contain the
packet header, so rx_size cannot be below some minimum (256?).

>                         rx_space = rx_size + NET_SKB_PAD +
>                                 SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
>                 }
> @@ -6424,8 +6428,8 @@ static int bnxt_hwrm_vnic_set_hds(struct bnxt *bp, struct bnxt_vnic_info *vnic)
>                                           VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_IPV6);
>                 req->enables |=
>                         cpu_to_le32(VNIC_PLCMODES_CFG_REQ_ENABLES_HDS_THRESHOLD_VALID);
> -               req->jumbo_thresh = cpu_to_le16(bp->rx_copy_thresh);
> -               req->hds_threshold = cpu_to_le16(bp->rx_copy_thresh);
> +               req->jumbo_thresh = cpu_to_le16(bp->rx_copybreak);
> +               req->hds_threshold = cpu_to_le16(bp->rx_copybreak);

Similarly, these thresholds should not go to 0 when rx_copybreak becomes small.

>         }
>         req->vnic_id = cpu_to_le32(vnic->fw_vnic_id);
>         return hwrm_req_send(bp, req);

> @@ -4769,7 +4813,7 @@ static int bnxt_run_loopback(struct bnxt *bp)
>         cpr = &rxr->bnapi->cp_ring;
>         if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS)
>                 cpr = rxr->rx_cpr;
> -       pkt_size = min(bp->dev->mtu + ETH_HLEN, bp->rx_copy_thresh);
> +       pkt_size = min(bp->dev->mtu + ETH_HLEN, bp->rx_copybreak);

The loopback test will also not work if rx_copybreak is very small.  I
think we should always use 256 bytes for the loopback test packet
size.  Thanks.

>         skb = netdev_alloc_skb(bp->dev, pkt_size);
>         if (!skb)
>                 return -ENOMEM;
Taehee Yoo Oct. 24, 2024, 4:38 p.m. UTC | #2 
On Thu, Oct 24, 2024 at 3:41 PM Michael Chan

Hi Michael,
Thank you so much for the review!

<michael.chan@broadcom.com> wrote:
>
> On Tue, Oct 22, 2024 at 9:24 AM Taehee Yoo <ap420073@gmail.com> wrote:
> >
> > The bnxt_en driver supports rx-copybreak, but it couldn't be set by
> > userspace. Only the default value(256) has worked.
> > This patch makes the bnxt_en driver support following command.
> > `ethtool --set-tunable <devname> rx-copybreak <value> ` and
> > `ethtool --get-tunable <devname> rx-copybreak`.
> >
> > Reviewed-by: Brett Creeley <brett.creeley@amd.com>
> > Tested-by: Stanislav Fomichev <sdf@fomichev.me>
> > Signed-off-by: Taehee Yoo <ap420073@gmail.com>
> > ---
> >
> > v4:
> >  - Remove min rx-copybreak value.
> >  - Add Review tag from Brett.
> >  - Add Test tag from Stanislav.
> >
> > v3:
> >  - Update copybreak value after closing nic and before opening nic when
> >    the device is running.
> >
> > v2:
> >  - Define max/vim rx_copybreak value.
> >
> >  drivers/net/ethernet/broadcom/bnxt/bnxt.c     | 23 +++++----
> >  drivers/net/ethernet/broadcom/bnxt/bnxt.h     |  5 +-
> >  .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 48 ++++++++++++++++++-
> >  3 files changed, 65 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> > index bda3742d4e32..0f5fe9ba691d 100644
> > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
>
> > @@ -4510,7 +4513,8 @@ void bnxt_set_ring_params(struct bnxt *bp)
> >                                   ALIGN(max(NET_SKB_PAD, XDP_PACKET_HEADROOM), 8) -
> >                                   SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
> >                 } else {
> > -                       rx_size = SKB_DATA_ALIGN(BNXT_RX_COPY_THRESH + NET_IP_ALIGN);
> > +                       rx_size = SKB_DATA_ALIGN(bp->rx_copybreak +
> > +                                                NET_IP_ALIGN);
>
> When rx_copybreak is 0 or very small, rx_size will be very small and
> will be a problem.  We need rx_size to be big enough to contain the
> packet header, so rx_size cannot be below some minimum (256?).
>
> >                         rx_space = rx_size + NET_SKB_PAD +
> >                                 SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
> >                 }
> > @@ -6424,8 +6428,8 @@ static int bnxt_hwrm_vnic_set_hds(struct bnxt *bp, struct bnxt_vnic_info *vnic)
> >                                           VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_IPV6);
> >                 req->enables |=
> >                         cpu_to_le32(VNIC_PLCMODES_CFG_REQ_ENABLES_HDS_THRESHOLD_VALID);
> > -               req->jumbo_thresh = cpu_to_le16(bp->rx_copy_thresh);
> > -               req->hds_threshold = cpu_to_le16(bp->rx_copy_thresh);
> > +               req->jumbo_thresh = cpu_to_le16(bp->rx_copybreak);
> > +               req->hds_threshold = cpu_to_le16(bp->rx_copybreak);
>
> Similarly, these thresholds should not go to 0 when rx_copybreak becomes small.
>
> >         }
> >         req->vnic_id = cpu_to_le32(vnic->fw_vnic_id);
> >         return hwrm_req_send(bp, req);
>
> > @@ -4769,7 +4813,7 @@ static int bnxt_run_loopback(struct bnxt *bp)
> >         cpr = &rxr->bnapi->cp_ring;
> >         if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS)
> >                 cpr = rxr->rx_cpr;
> > -       pkt_size = min(bp->dev->mtu + ETH_HLEN, bp->rx_copy_thresh);
> > +       pkt_size = min(bp->dev->mtu + ETH_HLEN, bp->rx_copybreak);
>
> The loopback test will also not work if rx_copybreak is very small.  I
> think we should always use 256 bytes for the loopback test packet
> size.  Thanks.
>
> >         skb = netdev_alloc_skb(bp->dev, pkt_size);
> >         if (!skb)
> >                 return -ENOMEM;

I tested `ethtool -t eth0` and I checked it fails if rx-copybreak is too
small. Sorry for missing that.
I think we can use max(BNXT_DEFAULT_RX_COPYBREAK,
bp->rx_copybreak) for both cases.
I tested it, it works well.
So I will use that if you are okay!

Thank you so much,
Tahee Yoo
Michael Chan Oct. 25, 2024, 4:54 a.m. UTC | #3 
On Thu, Oct 24, 2024 at 9:38 AM Taehee Yoo <ap420073@gmail.com> wrote:
>
> On Thu, Oct 24, 2024 at 3:41 PM Michael Chan

> > > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> > > index bda3742d4e32..0f5fe9ba691d 100644
> > > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> > > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> >
> > > @@ -4510,7 +4513,8 @@ void bnxt_set_ring_params(struct bnxt *bp)
> > >                                   ALIGN(max(NET_SKB_PAD, XDP_PACKET_HEADROOM), 8) -
> > >                                   SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
> > >                 } else {
> > > -                       rx_size = SKB_DATA_ALIGN(BNXT_RX_COPY_THRESH + NET_IP_ALIGN);
> > > +                       rx_size = SKB_DATA_ALIGN(bp->rx_copybreak +
> > > +                                                NET_IP_ALIGN);
> >
> > When rx_copybreak is 0 or very small, rx_size will be very small and
> > will be a problem.  We need rx_size to be big enough to contain the
> > packet header, so rx_size cannot be below some minimum (256?).
> >
> > >                         rx_space = rx_size + NET_SKB_PAD +
> > >                                 SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
> > >                 }
> > > @@ -6424,8 +6428,8 @@ static int bnxt_hwrm_vnic_set_hds(struct bnxt *bp, struct bnxt_vnic_info *vnic)
> > >                                           VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_IPV6);
> > >                 req->enables |=
> > >                         cpu_to_le32(VNIC_PLCMODES_CFG_REQ_ENABLES_HDS_THRESHOLD_VALID);
> > > -               req->jumbo_thresh = cpu_to_le16(bp->rx_copy_thresh);
> > > -               req->hds_threshold = cpu_to_le16(bp->rx_copy_thresh);
> > > +               req->jumbo_thresh = cpu_to_le16(bp->rx_copybreak);
> > > +               req->hds_threshold = cpu_to_le16(bp->rx_copybreak);
> >
> > Similarly, these thresholds should not go to 0 when rx_copybreak becomes small.
> >
> > >         }
> > >         req->vnic_id = cpu_to_le32(vnic->fw_vnic_id);
> > >         return hwrm_req_send(bp, req);
> >
> > > @@ -4769,7 +4813,7 @@ static int bnxt_run_loopback(struct bnxt *bp)
> > >         cpr = &rxr->bnapi->cp_ring;
> > >         if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS)
> > >                 cpr = rxr->rx_cpr;
> > > -       pkt_size = min(bp->dev->mtu + ETH_HLEN, bp->rx_copy_thresh);
> > > +       pkt_size = min(bp->dev->mtu + ETH_HLEN, bp->rx_copybreak);
> >
> > The loopback test will also not work if rx_copybreak is very small.  I
> > think we should always use 256 bytes for the loopback test packet
> > size.  Thanks.
> >
> > >         skb = netdev_alloc_skb(bp->dev, pkt_size);
> > >         if (!skb)
> > >                 return -ENOMEM;
>
> I tested `ethtool -t eth0` and I checked it fails if rx-copybreak is too
> small. Sorry for missing that.
> I think we can use max(BNXT_DEFAULT_RX_COPYBREAK,
> bp->rx_copybreak) for both cases.
> I tested it, it works well.
> So I will use that if you are okay!
>

Yes, please go ahead.  I think all 3 places I commented above should
use max(BNXT_DEFAULT_RX_COPYBREAK, bp->rx_copybreak).  Thanks.
Taehee Yoo Oct. 25, 2024, 8:07 a.m. UTC | #4 
On Fri, Oct 25, 2024 at 1:55 PM Michael Chan <michael.chan@broadcom.com> wrote:
>
> On Thu, Oct 24, 2024 at 9:38 AM Taehee Yoo <ap420073@gmail.com> wrote:
> >
> > On Thu, Oct 24, 2024 at 3:41 PM Michael Chan
>
> > > > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> > > > index bda3742d4e32..0f5fe9ba691d 100644
> > > > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> > > > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> > >
> > > > @@ -4510,7 +4513,8 @@ void bnxt_set_ring_params(struct bnxt *bp)
> > > >                                   ALIGN(max(NET_SKB_PAD, XDP_PACKET_HEADROOM), 8) -
> > > >                                   SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
> > > >                 } else {
> > > > -                       rx_size = SKB_DATA_ALIGN(BNXT_RX_COPY_THRESH + NET_IP_ALIGN);
> > > > +                       rx_size = SKB_DATA_ALIGN(bp->rx_copybreak +
> > > > +                                                NET_IP_ALIGN);
> > >
> > > When rx_copybreak is 0 or very small, rx_size will be very small and
> > > will be a problem.  We need rx_size to be big enough to contain the
> > > packet header, so rx_size cannot be below some minimum (256?).
> > >
> > > >                         rx_space = rx_size + NET_SKB_PAD +
> > > >                                 SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
> > > >                 }
> > > > @@ -6424,8 +6428,8 @@ static int bnxt_hwrm_vnic_set_hds(struct bnxt *bp, struct bnxt_vnic_info *vnic)
> > > >                                           VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_IPV6);
> > > >                 req->enables |=
> > > >                         cpu_to_le32(VNIC_PLCMODES_CFG_REQ_ENABLES_HDS_THRESHOLD_VALID);
> > > > -               req->jumbo_thresh = cpu_to_le16(bp->rx_copy_thresh);
> > > > -               req->hds_threshold = cpu_to_le16(bp->rx_copy_thresh);
> > > > +               req->jumbo_thresh = cpu_to_le16(bp->rx_copybreak);
> > > > +               req->hds_threshold = cpu_to_le16(bp->rx_copybreak);
> > >
> > > Similarly, these thresholds should not go to 0 when rx_copybreak becomes small.
> > >
> > > >         }
> > > >         req->vnic_id = cpu_to_le32(vnic->fw_vnic_id);
> > > >         return hwrm_req_send(bp, req);
> > >
> > > > @@ -4769,7 +4813,7 @@ static int bnxt_run_loopback(struct bnxt *bp)
> > > >         cpr = &rxr->bnapi->cp_ring;
> > > >         if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS)
> > > >                 cpr = rxr->rx_cpr;
> > > > -       pkt_size = min(bp->dev->mtu + ETH_HLEN, bp->rx_copy_thresh);
> > > > +       pkt_size = min(bp->dev->mtu + ETH_HLEN, bp->rx_copybreak);
> > >
> > > The loopback test will also not work if rx_copybreak is very small.  I
> > > think we should always use 256 bytes for the loopback test packet
> > > size.  Thanks.
> > >
> > > >         skb = netdev_alloc_skb(bp->dev, pkt_size);
> > > >         if (!skb)
> > > >                 return -ENOMEM;
> >
> > I tested `ethtool -t eth0` and I checked it fails if rx-copybreak is too
> > small. Sorry for missing that.
> > I think we can use max(BNXT_DEFAULT_RX_COPYBREAK,
> > bp->rx_copybreak) for both cases.
> > I tested it, it works well.
> > So I will use that if you are okay!
> >
>
> Yes, please go ahead.  I think all 3 places I commented above should
> use max(BNXT_DEFAULT_RX_COPYBREAK, bp->rx_copybreak).  Thanks.

Thanks a lot for your confirmation :)

I asked about jumbo_thresh in another thread, I would like to do it
based on that thread for jumbo_thresh.
And hds_thresh value will be configured by
`ethtool -G eth0 header-data-split-thresh 0", so that we need to
allow 0 ~ 256 value.
I think you indicated jumbo_thresh only, right?

Thank you so much!
Taehee Yoo
diff mbox series

Patch

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index bda3742d4e32..0f5fe9ba691d 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -81,7 +81,6 @@  MODULE_DESCRIPTION("Broadcom NetXtreme network driver");
 
 #define BNXT_RX_OFFSET (NET_SKB_PAD + NET_IP_ALIGN)
 #define BNXT_RX_DMA_OFFSET NET_SKB_PAD
-#define BNXT_RX_COPY_THRESH 256
 
 #define BNXT_TX_PUSH_THRESH 164
 
@@ -1330,13 +1329,13 @@  static struct sk_buff *bnxt_copy_data(struct bnxt_napi *bnapi, u8 *data,
 	if (!skb)
 		return NULL;
 
-	dma_sync_single_for_cpu(&pdev->dev, mapping, bp->rx_copy_thresh,
+	dma_sync_single_for_cpu(&pdev->dev, mapping, bp->rx_copybreak,
 				bp->rx_dir);
 
 	memcpy(skb->data - NET_IP_ALIGN, data - NET_IP_ALIGN,
 	       len + NET_IP_ALIGN);
 
-	dma_sync_single_for_device(&pdev->dev, mapping, bp->rx_copy_thresh,
+	dma_sync_single_for_device(&pdev->dev, mapping, bp->rx_copybreak,
 				   bp->rx_dir);
 
 	skb_put(skb, len);
@@ -1829,7 +1828,7 @@  static inline struct sk_buff *bnxt_tpa_end(struct bnxt *bp,
 		return NULL;
 	}
 
-	if (len <= bp->rx_copy_thresh) {
+	if (len <= bp->rx_copybreak) {
 		skb = bnxt_copy_skb(bnapi, data_ptr, len, mapping);
 		if (!skb) {
 			bnxt_abort_tpa(cpr, idx, agg_bufs);
@@ -2162,7 +2161,7 @@  static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,
 		}
 	}
 
-	if (len <= bp->rx_copy_thresh) {
+	if (len <= bp->rx_copybreak) {
 		if (!xdp_active)
 			skb = bnxt_copy_skb(bnapi, data_ptr, len, dma_addr);
 		else
@@ -4451,6 +4450,11 @@  void bnxt_set_tpa_flags(struct bnxt *bp)
 		bp->flags |= BNXT_FLAG_GRO;
 }
 
+static void bnxt_init_ring_params(struct bnxt *bp)
+{
+	bp->rx_copybreak = BNXT_DEFAULT_RX_COPYBREAK;
+}
+
 /* bp->rx_ring_size, bp->tx_ring_size, dev->mtu, BNXT_FLAG_{G|L}RO flags must
  * be set on entry.
  */
@@ -4465,7 +4469,6 @@  void bnxt_set_ring_params(struct bnxt *bp)
 	rx_space = rx_size + ALIGN(max(NET_SKB_PAD, XDP_PACKET_HEADROOM), 8) +
 		SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
 
-	bp->rx_copy_thresh = BNXT_RX_COPY_THRESH;
 	ring_size = bp->rx_ring_size;
 	bp->rx_agg_ring_size = 0;
 	bp->rx_agg_nr_pages = 0;
@@ -4510,7 +4513,8 @@  void bnxt_set_ring_params(struct bnxt *bp)
 				  ALIGN(max(NET_SKB_PAD, XDP_PACKET_HEADROOM), 8) -
 				  SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
 		} else {
-			rx_size = SKB_DATA_ALIGN(BNXT_RX_COPY_THRESH + NET_IP_ALIGN);
+			rx_size = SKB_DATA_ALIGN(bp->rx_copybreak +
+						 NET_IP_ALIGN);
 			rx_space = rx_size + NET_SKB_PAD +
 				SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
 		}
@@ -6424,8 +6428,8 @@  static int bnxt_hwrm_vnic_set_hds(struct bnxt *bp, struct bnxt_vnic_info *vnic)
 					  VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_IPV6);
 		req->enables |=
 			cpu_to_le32(VNIC_PLCMODES_CFG_REQ_ENABLES_HDS_THRESHOLD_VALID);
-		req->jumbo_thresh = cpu_to_le16(bp->rx_copy_thresh);
-		req->hds_threshold = cpu_to_le16(bp->rx_copy_thresh);
+		req->jumbo_thresh = cpu_to_le16(bp->rx_copybreak);
+		req->hds_threshold = cpu_to_le16(bp->rx_copybreak);
 	}
 	req->vnic_id = cpu_to_le32(vnic->fw_vnic_id);
 	return hwrm_req_send(bp, req);
@@ -15865,6 +15869,7 @@  static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	bnxt_init_l2_fltr_tbl(bp);
 	bnxt_set_rx_skb_mode(bp, false);
 	bnxt_set_tpa_flags(bp);
+	bnxt_init_ring_params(bp);
 	bnxt_set_ring_params(bp);
 	bnxt_rdma_aux_device_init(bp);
 	rc = bnxt_set_dflt_rings(bp, true);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 69231e85140b..1b83a2c8027b 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -34,6 +34,9 @@ 
 #include <linux/firmware/broadcom/tee_bnxt_fw.h>
 #endif
 
+#define BNXT_DEFAULT_RX_COPYBREAK 256
+#define BNXT_MAX_RX_COPYBREAK 1024
+
 extern struct list_head bnxt_block_cb_list;
 
 struct page_pool;
@@ -2299,7 +2302,7 @@  struct bnxt {
 	enum dma_data_direction	rx_dir;
 	u32			rx_ring_size;
 	u32			rx_agg_ring_size;
-	u32			rx_copy_thresh;
+	u32			rx_copybreak;
 	u32			rx_ring_mask;
 	u32			rx_agg_ring_mask;
 	int			rx_nr_pages;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index f71cc8188b4e..9af0a3f34750 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -4319,6 +4319,50 @@  static int bnxt_get_eee(struct net_device *dev, struct ethtool_keee *edata)
 	return 0;
 }
 
+static int bnxt_set_tunable(struct net_device *dev,
+			    const struct ethtool_tunable *tuna,
+			    const void *data)
+{
+	struct bnxt *bp = netdev_priv(dev);
+	u32 rx_copybreak;
+
+	switch (tuna->id) {
+	case ETHTOOL_RX_COPYBREAK:
+		rx_copybreak = *(u32 *)data;
+		if (rx_copybreak > BNXT_MAX_RX_COPYBREAK)
+			return -ERANGE;
+		if (rx_copybreak != bp->rx_copybreak) {
+			if (netif_running(dev)) {
+				bnxt_close_nic(bp, false, false);
+				bp->rx_copybreak = rx_copybreak;
+				bnxt_set_ring_params(bp);
+				bnxt_open_nic(bp, false, false);
+			} else {
+				bp->rx_copybreak = rx_copybreak;
+			}
+		}
+		return 0;
+	default:
+		return -EOPNOTSUPP;
+	}
+}
+
+static int bnxt_get_tunable(struct net_device *dev,
+			    const struct ethtool_tunable *tuna, void *data)
+{
+	struct bnxt *bp = netdev_priv(dev);
+
+	switch (tuna->id) {
+	case ETHTOOL_RX_COPYBREAK:
+		*(u32 *)data = bp->rx_copybreak;
+		break;
+	default:
+		return -EOPNOTSUPP;
+	}
+
+	return 0;
+}
+
 static int bnxt_read_sfp_module_eeprom_info(struct bnxt *bp, u16 i2c_addr,
 					    u16 page_number, u8 bank,
 					    u16 start_addr, u16 data_length,
@@ -4769,7 +4813,7 @@  static int bnxt_run_loopback(struct bnxt *bp)
 	cpr = &rxr->bnapi->cp_ring;
 	if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS)
 		cpr = rxr->rx_cpr;
-	pkt_size = min(bp->dev->mtu + ETH_HLEN, bp->rx_copy_thresh);
+	pkt_size = min(bp->dev->mtu + ETH_HLEN, bp->rx_copybreak);
 	skb = netdev_alloc_skb(bp->dev, pkt_size);
 	if (!skb)
 		return -ENOMEM;
@@ -5342,6 +5386,8 @@  const struct ethtool_ops bnxt_ethtool_ops = {
 	.get_link_ext_stats	= bnxt_get_link_ext_stats,
 	.get_eee		= bnxt_get_eee,
 	.set_eee		= bnxt_set_eee,
+	.get_tunable		= bnxt_get_tunable,
+	.set_tunable		= bnxt_set_tunable,
 	.get_module_info	= bnxt_get_module_info,
 	.get_module_eeprom	= bnxt_get_module_eeprom,
 	.get_module_eeprom_by_page = bnxt_get_module_eeprom_by_page,