Commit 6431ce6c authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-updates-2022-05-17' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2022-05-17

MISC updates to mlx5 dirver

1) Aya Levin allows relaxed ordering over VFs

2) Gal Pressman Adds support XDP SQs for uplink representors in switchdev mode

3) Add debugfs TC stats and command failure syndrome for debuggability

4) Tariq uses variants of vzalloc where it could help

5) Multiport eswitch support from Elic Cohen:

Eli Cohen Says:
===============

The multiport eswitch feature allows to forward traffic from a
representor net device to the uplink port of an associated eswitch's
uplink port.

This feature requires creating a LAG object. Since LAG can be created
only once for a function, the feature is mutual exclusive with either
bonding or multipath.

Multipath eswitch mode is entered automatically these conditions are
met:
1. No other LAG related mode is active.
2. A rule that explicitly forwards to an uplink port is inserted.

The implementation maintains a reference count on such rules. When the
reference count reaches zero, the LAG is released and other modes may be
used.

When an explicit rule that explicitly forwards to an uplink port is
inserted while another LAG mode is active, that rule will not be
offloaded by the hardware since the hardware cannot guarantee that the
rule will actually be forwarded to that port.

Example rules that forwards to an uplink port is:

$ tc filter add dev rep0 root flower action mirred egress \
  redirect dev uplinkrep0

$ tc filter add dev rep0 root flower action mirred egress \
  redirect dev uplinkrep1

This feature is supported only if LAG_RESOURCE_ALLOCATION firmware
configuration parameter is set to true.

The series consists of three patches:
1. Lag state machine refactor
   This patch does not add new functionality but rather changes the way
   the state of the LAG is maintained.
2. Small fix to remove unused argument.
3. The actual implementation of the feature.
===============

====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6e144b47 94db3317

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ mlx5_core-$(CONFIG_MLX5_CORE_EN_DCB) += en_dcbnl.o en/port_buffer.o 
mlx5_core-$(CONFIG_PCI_HYPERV_INTERFACE) += en/hv_vhca_stats.o

mlx5_core-$(CONFIG_MLX5_ESWITCH)     += lag/mp.o lag/port_sel.o lib/geneve.o lib/port_tun.o \

					en_rep.o en/rep/bond.o en/mod_hdr.o \

					en/mapping.o

					en/mapping.o lag/mpesw.o

mlx5_core-$(CONFIG_MLX5_CLS_ACT)     += en_tc.o en/rep/tc.o en/rep/neigh.o \

					lib/fs_chains.o en/tc_tun.o \

					esw/indir_table.o en/tc_tun_encap.o \

drivers/net/ethernet/mellanox/mlx5/core/alloc.c

+0 −6
Original line number Diff line number Diff line
@@ -213,12 +213,6 @@ int mlx5_db_alloc_node(struct mlx5_core_dev *dev, struct mlx5_db *db, int node) 
}

EXPORT_SYMBOL_GPL(mlx5_db_alloc_node);



int mlx5_db_alloc(struct mlx5_core_dev *dev, struct mlx5_db *db)

{

	return mlx5_db_alloc_node(dev, db, dev->priv.numa_node);

}

EXPORT_SYMBOL_GPL(mlx5_db_alloc);



void mlx5_db_free(struct mlx5_core_dev *dev, struct mlx5_db *db)

{

	u32 db_per_page = PAGE_SIZE / cache_line_size();

drivers/net/ethernet/mellanox/mlx5/core/cmd.c

+5 −2
Original line number Diff line number Diff line
@@ -1887,7 +1887,8 @@ static int cmd_exec(struct mlx5_core_dev *dev, void *in, int in_size, void *out, 
	return err;

}



static void cmd_status_log(struct mlx5_core_dev *dev, u16 opcode, u8 status, int err)

static void cmd_status_log(struct mlx5_core_dev *dev, u16 opcode, u8 status,

			   u32 syndrome, int err)

{

	struct mlx5_cmd_stats *stats;
@@ -1902,6 +1903,7 @@ static void cmd_status_log(struct mlx5_core_dev *dev, u16 opcode, u8 status, int 
	if (err == -EREMOTEIO) {

		stats->failed_mbox_status++;

		stats->last_failed_mbox_status = status;

		stats->last_failed_syndrome = syndrome;

	}

	spin_unlock_irq(&stats->lock);

}
@@ -1909,6 +1911,7 @@ static void cmd_status_log(struct mlx5_core_dev *dev, u16 opcode, u8 status, int 
/* preserve -EREMOTEIO for outbox.status != OK, otherwise return err as is */

static int cmd_status_err(struct mlx5_core_dev *dev, int err, u16 opcode, void *out)

{

	u32 syndrome = MLX5_GET(mbox_out, out, syndrome);

	u8 status = MLX5_GET(mbox_out, out, status);



	if (err == -EREMOTEIO) /* -EREMOTEIO is preserved */
@@ -1917,7 +1920,7 @@ static int cmd_status_err(struct mlx5_core_dev *dev, int err, u16 opcode, void * 
	if (!err && status != MLX5_CMD_STAT_OK)

		err = -EREMOTEIO;



	cmd_status_log(dev, opcode, status, err);

	cmd_status_log(dev, opcode, status, syndrome, err);

	return err;

}

drivers/net/ethernet/mellanox/mlx5/core/debugfs.c

+2 −0
Original line number Diff line number Diff line
@@ -192,6 +192,8 @@ void mlx5_cmdif_debugfs_init(struct mlx5_core_dev *dev) 
					   &stats->last_failed_errno);

			debugfs_create_u8("last_failed_mbox_status", 0400, stats->root,

					  &stats->last_failed_mbox_status);

			debugfs_create_x32("last_failed_syndrome", 0400, stats->root,

					   &stats->last_failed_syndrome);

		}

	}

}

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −0
Original line number Diff line number Diff line
@@ -1220,6 +1220,7 @@ mlx5e_tx_mpwqe_supported(struct mlx5_core_dev *mdev) 
		MLX5_CAP_ETH(mdev, enhanced_multi_pkt_send_wqe);

}



int mlx5e_get_pf_num_tirs(struct mlx5_core_dev *mdev);

int mlx5e_priv_init(struct mlx5e_priv *priv,

		    const struct mlx5e_profile *profile,

		    struct net_device *netdev,