Commit 919ce2a4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bnxt_en-Add-XDP-support' 



Michael Chan says:

====================
bnxt_en: Add XDP support.

The first 10 patches refactor the code (rx/tx code paths and ring logic)
and add the basic infrastructure to support XDP.  The 11th patch adds
basic ndo_xdp to support XDP_DROP and XDP_PASS only.  The 12th patch
completes the series with XDP_TX.

Thanks to Andy Gospodarek for testing and uncovering some bugs.

v3: Removed Kconfig option.
    Pass modified offset and length to stack for XDP_PASS.
    Improved buffer recycling scheme for XDP_TX.
    Other minor fixes.

v2: Addressed review comments from Alexei Starovoitov, Jakub Kicinski,
and David Miller:
	- Added missing dma syncs.
	- Added XDP headroom support.
	- Added tracing in exception path.
	- Clarified a parameter change.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b44700e9 38413406

drivers/net/ethernet/broadcom/bnxt/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_BNXT) += bnxt_en.o



bnxt_en-y := bnxt.o bnxt_sriov.o bnxt_ethtool.o bnxt_dcb.o bnxt_ulp.o
 
bnxt_en-y := bnxt.o bnxt_sriov.o bnxt_ethtool.o bnxt_dcb.o bnxt_ulp.o bnxt_xdp.o

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+292 −114

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+57 −5

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

+20 −33
Original line number Diff line number Diff line
@@ -387,10 +387,10 @@ static int bnxt_set_channels(struct net_device *dev, 
			     struct ethtool_channels *channel)

{

	struct bnxt *bp = netdev_priv(dev);

	int max_rx_rings, max_tx_rings, tcs;

	int req_tx_rings, rsv_tx_rings;

	u32 rc = 0;

	int req_tx_rings, req_rx_rings, tcs;

	bool sh = false;

	int tx_xdp = 0;

	int rc = 0;



	if (channel->other_count)

		return -EINVAL;
@@ -410,32 +410,21 @@ static int bnxt_set_channels(struct net_device *dev, 
	if (channel->combined_count)

		sh = true;



	bnxt_get_max_rings(bp, &max_rx_rings, &max_tx_rings, sh);



	tcs = netdev_get_num_tc(dev);

	if (tcs > 1)

		max_tx_rings /= tcs;



	if (sh &&

	    channel->combined_count > max_t(int, max_rx_rings, max_tx_rings))

		return -ENOMEM;



	if (!sh && (channel->rx_count > max_rx_rings ||

		    channel->tx_count > max_tx_rings))

		return -ENOMEM;



	req_tx_rings = sh ? channel->combined_count : channel->tx_count;

	req_tx_rings = min_t(int, req_tx_rings, max_tx_rings);

	if (tcs > 1)

		req_tx_rings *= tcs;



	rsv_tx_rings = req_tx_rings;

	if (bnxt_hwrm_reserve_tx_rings(bp, &rsv_tx_rings))

		return -ENOMEM;



	if (rsv_tx_rings < req_tx_rings) {

		netdev_warn(dev, "Unable to allocate the requested tx rings\n");

		return -ENOMEM;

	req_rx_rings = sh ? channel->combined_count : channel->rx_count;

	if (bp->tx_nr_rings_xdp) {

		if (!sh) {

			netdev_err(dev, "Only combined mode supported when XDP is enabled.\n");

			return -EINVAL;

		}

		tx_xdp = req_rx_rings;

	}

	rc = bnxt_reserve_rings(bp, req_tx_rings, req_rx_rings, tcs, tx_xdp);

	if (rc) {

		netdev_warn(dev, "Unable to allocate the requested rings\n");

		return rc;

	}



	if (netif_running(dev)) {
@@ -454,19 +443,17 @@ static int bnxt_set_channels(struct net_device *dev, 


	if (sh) {

		bp->flags |= BNXT_FLAG_SHARED_RINGS;

		bp->rx_nr_rings = min_t(int, channel->combined_count,

					max_rx_rings);

		bp->tx_nr_rings_per_tc = min_t(int, channel->combined_count,

					       max_tx_rings);

		bp->rx_nr_rings = channel->combined_count;

		bp->tx_nr_rings_per_tc = channel->combined_count;

	} else {

		bp->flags &= ~BNXT_FLAG_SHARED_RINGS;

		bp->rx_nr_rings = channel->rx_count;

		bp->tx_nr_rings_per_tc = channel->tx_count;

	}



	bp->tx_nr_rings = bp->tx_nr_rings_per_tc;

	bp->tx_nr_rings_xdp = tx_xdp;

	bp->tx_nr_rings = bp->tx_nr_rings_per_tc + tx_xdp;

	if (tcs > 1)

		bp->tx_nr_rings = bp->tx_nr_rings_per_tc * tcs;

		bp->tx_nr_rings = bp->tx_nr_rings_per_tc * tcs + tx_xdp;



	bp->cp_nr_rings = sh ? max_t(int, bp->tx_nr_rings, bp->rx_nr_rings) :

			       bp->tx_nr_rings + bp->rx_nr_rings;

drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c

0 → 100644
+240 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE