Commit 4c7d2e17 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 

Tony Nguyen says:

====================
100GbE Intel Wired LAN Driver Updates 2022-03-09

This series contains updates to ice driver only.

Martyna implements switchdev filtering on inner EtherType field for
tunnels.

Marcin adds reporting of slowpath statistics for port representors.

Jonathan Toppins changes a non-fatal link error message from warning to
debug.

Maciej removes unnecessary checks in ice_clean_tx_irq().

Amritha adds support for ADQ to match outer destination MAC for tunnels.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  ice: Add support for outer dest MAC for ADQ tunnels
  ice: avoid XDP checks in ice_clean_tx_irq()
  ice: change "can't set link" message to dbg level
  ice: Add slow path offload stats on port representor in switchdev
  ice: Add support for inner etype in switchdev
====================

Link: https://lore.kernel.org/r/20220309190315.1380414-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 46224853 02ddec19

drivers/net/ethernet/intel/ice/ice.h

+3 −0
Original line number Diff line number Diff line
@@ -834,6 +834,9 @@ u16 ice_get_avail_rxq_count(struct ice_pf *pf); 
int ice_vsi_recfg_qs(struct ice_vsi *vsi, int new_rx, int new_tx);

void ice_update_vsi_stats(struct ice_vsi *vsi);

void ice_update_pf_stats(struct ice_pf *pf);

void

ice_fetch_u64_stats_per_ring(struct u64_stats_sync *syncp,

			     struct ice_q_stats stats, u64 *pkts, u64 *bytes);

int ice_up(struct ice_vsi *vsi);

int ice_down(struct ice_vsi *vsi);

int ice_vsi_cfg(struct ice_vsi *vsi);

drivers/net/ethernet/intel/ice/ice_lib.c

+3 −3
Original line number Diff line number Diff line
@@ -3960,7 +3960,7 @@ int ice_set_link(struct ice_vsi *vsi, bool ena) 
	 */

	if (status == -EIO) {

		if (hw->adminq.sq_last_status == ICE_AQ_RC_EMODE)

			dev_warn(dev, "can't set link to %s, err %d aq_err %s. not fatal, continuing\n",

			dev_dbg(dev, "can't set link to %s, err %d aq_err %s. not fatal, continuing\n",

				(ena ? "ON" : "OFF"), status,

				ice_aq_str(hw->adminq.sq_last_status));

	} else if (status) {

drivers/net/ethernet/intel/ice/ice_main.c

+3 −3
Original line number Diff line number Diff line
@@ -6134,9 +6134,9 @@ int ice_up(struct ice_vsi *vsi) 
 * This function fetches stats from the ring considering the atomic operations

 * that needs to be performed to read u64 values in 32 bit machine.

 */

static void

ice_fetch_u64_stats_per_ring(struct u64_stats_sync *syncp, struct ice_q_stats stats,

			     u64 *pkts, u64 *bytes)

void

ice_fetch_u64_stats_per_ring(struct u64_stats_sync *syncp,

			     struct ice_q_stats stats, u64 *pkts, u64 *bytes)

{

	unsigned int start;

drivers/net/ethernet/intel/ice/ice_protocol_type.h

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ enum ice_protocol_type { 
	ICE_MAC_OFOS = 0,

	ICE_MAC_IL,

	ICE_ETYPE_OL,

	ICE_ETYPE_IL,

	ICE_VLAN_OFOS,

	ICE_IPV4_OFOS,

	ICE_IPV4_IL,
@@ -92,6 +93,7 @@ enum ice_prot_id { 
#define ICE_MAC_OFOS_HW		1

#define ICE_MAC_IL_HW		4

#define ICE_ETYPE_OL_HW		9

#define ICE_ETYPE_IL_HW		10

#define ICE_VLAN_OF_HW		16

#define ICE_VLAN_OL_HW		17

#define ICE_IPV4_OFOS_HW	32

drivers/net/ethernet/intel/ice/ice_repr.c

+55 −0
Original line number Diff line number Diff line
@@ -142,6 +142,59 @@ ice_repr_get_devlink_port(struct net_device *netdev) 
	return &repr->vf->devlink_port;

}



/**

 * ice_repr_sp_stats64 - get slow path stats for port representor

 * @dev: network interface device structure

 * @stats: netlink stats structure

 *

 * RX/TX stats are being swapped here to be consistent with VF stats. In slow

 * path, port representor receives data when the corresponding VF is sending it

 * (and vice versa), TX and RX bytes/packets are effectively swapped on port

 * representor.

 */

static int

ice_repr_sp_stats64(const struct net_device *dev,

		    struct rtnl_link_stats64 *stats)

{

	struct ice_netdev_priv *np = netdev_priv(dev);

	int vf_id = np->repr->vf->vf_id;

	struct ice_tx_ring *tx_ring;

	struct ice_rx_ring *rx_ring;

	u64 pkts, bytes;



	tx_ring = np->vsi->tx_rings[vf_id];

	ice_fetch_u64_stats_per_ring(&tx_ring->syncp, tx_ring->stats,

				     &pkts, &bytes);

	stats->rx_packets = pkts;

	stats->rx_bytes = bytes;



	rx_ring = np->vsi->rx_rings[vf_id];

	ice_fetch_u64_stats_per_ring(&rx_ring->syncp, rx_ring->stats,

				     &pkts, &bytes);

	stats->tx_packets = pkts;

	stats->tx_bytes = bytes;

	stats->tx_dropped = rx_ring->rx_stats.alloc_page_failed +

			    rx_ring->rx_stats.alloc_buf_failed;



	return 0;

}



static bool

ice_repr_ndo_has_offload_stats(const struct net_device *dev, int attr_id)

{

	return attr_id == IFLA_OFFLOAD_XSTATS_CPU_HIT;

}



static int

ice_repr_ndo_get_offload_stats(int attr_id, const struct net_device *dev,

			       void *sp)

{

	if (attr_id == IFLA_OFFLOAD_XSTATS_CPU_HIT)

		return ice_repr_sp_stats64(dev, (struct rtnl_link_stats64 *)sp);



	return -EINVAL;

}



static int

ice_repr_setup_tc_cls_flower(struct ice_repr *repr,

			     struct flow_cls_offload *flower)
@@ -199,6 +252,8 @@ static const struct net_device_ops ice_repr_netdev_ops = { 
	.ndo_start_xmit = ice_eswitch_port_start_xmit,

	.ndo_get_devlink_port = ice_repr_get_devlink_port,

	.ndo_setup_tc = ice_repr_setup_tc,

	.ndo_has_offload_stats = ice_repr_ndo_has_offload_stats,

	.ndo_get_offload_stats = ice_repr_ndo_get_offload_stats,

};



/**