Commit 92de776d authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-updates-2023-12-20' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2023-12-20

mlx5 Socket direct support and management PF profile.

Tariq Says:
===========
Support Socket-Direct multi-dev netdev

This series adds support for combining multiple devices (PFs) of the
same port under one netdev instance. Passing traffic through different
devices belonging to different NUMA sockets saves cross-numa traffic and
allows apps running on the same netdev from different numas to still
feel a sense of proximity to the device and achieve improved
performance.

We achieve this by grouping PFs together, and creating the netdev only
once all group members are probed. Symmetrically, we destroy the netdev
once any of the PFs is removed.

The channels are distributed between all devices, a proper configuration
would utilize the correct close numa when working on a certain app/cpu.

We pick one device to be a primary (leader), and it fills a special
role.  The other devices (secondaries) are disconnected from the network
in the chip level (set to silent mode). All RX/TX traffic is steered
through the primary to/from the secondaries.

Currently, we limit the support to PFs only, and up to two devices
(sockets).

===========

Armen Says:
===========
Management PF support and module integration

This patch rolls out comprehensive support for the Management Physical
Function (MGMT PF) within the mlx5 driver. It involves updating the
mlx5 interface header to introduce necessary definitions for MGMT PF
and adding a new management PF netdev profile, which will allow the host
side to communicate with the embedded linux on Blue-field devices.

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cd4d7263 22c46406

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

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ mlx5_core-$(CONFIG_MLX5_CORE_EN) += en/rqt.o en/tir.o en/rss.o en/rx_res.o \ 
		en/reporter_tx.o en/reporter_rx.o en/params.o en/xsk/pool.o \

		en/xsk/setup.o en/xsk/rx.o en/xsk/tx.o en/devlink.o en/ptp.o \

		en/qos.o en/htb.o en/trap.o en/fs_tt_redirect.o en/selq.o \

		lib/crypto.o

		en/mgmt_pf.o lib/crypto.o lib/sd.o



#

# Netdev extra

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

+3 −0
Original line number Diff line number Diff line
@@ -190,6 +190,9 @@ bool mlx5_rdma_supported(struct mlx5_core_dev *dev) 
	if (is_mp_supported(dev))

		return false;



	if (mlx5_core_is_mgmt_pf(dev))

		return false;



	return true;

}

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

+6 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ int mlx5_ec_init(struct mlx5_core_dev *dev) 
	if (!mlx5_core_is_ecpf(dev))

		return 0;



	if (mlx5_core_is_mgmt_pf(dev))

		return 0;



	return mlx5_host_pf_init(dev);

}
@@ -85,6 +88,9 @@ void mlx5_ec_cleanup(struct mlx5_core_dev *dev) 
	if (!mlx5_core_is_ecpf(dev))

		return;



	if (mlx5_core_is_mgmt_pf(dev))

		return;



	mlx5_host_pf_cleanup(dev);



	err = mlx5_wait_for_pages(dev, &dev->priv.page_counters[MLX5_HOST_PF]);

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

+11 −4
Original line number Diff line number Diff line
@@ -60,8 +60,10 @@ 
#include "lib/clock.h"

#include "en/rx_res.h"

#include "en/selq.h"

#include "lib/sd.h"



extern const struct net_device_ops mlx5e_netdev_ops;

extern const struct net_device_ops mlx5e_mgmt_netdev_ops;

struct page_pool;



#define MLX5E_METADATA_ETHER_TYPE (0x8CE4)
@@ -791,6 +793,8 @@ struct mlx5e_channel { 
	struct hwtstamp_config    *tstamp;

	DECLARE_BITMAP(state, MLX5E_CHANNEL_NUM_STATES);

	int                        ix;

	int                        vec_ix;

	int                        sd_ix;

	int                        cpu;

	/* Sync between icosq recovery and XSK enable/disable. */

	struct mutex               icosq_recovery_lock;
@@ -914,7 +918,7 @@ struct mlx5e_priv { 
	bool                       tx_ptp_opened;

	bool                       rx_ptp_opened;

	struct hwtstamp_config     tstamp;

	u16                        q_counter;

	u16                        q_counter[MLX5_SD_MAX_GROUP_SZ];

	u16                        drop_rq_q_counter;

	struct notifier_block      events_nb;

	struct notifier_block      blocking_events_nb;
@@ -1029,12 +1033,12 @@ struct mlx5e_xsk_param; 


struct mlx5e_rq_param;

int mlx5e_open_rq(struct mlx5e_params *params, struct mlx5e_rq_param *param,

		  struct mlx5e_xsk_param *xsk, int node,

		  struct mlx5e_xsk_param *xsk, int node, u16 q_counter,

		  struct mlx5e_rq *rq);

#define MLX5E_RQ_WQES_TIMEOUT 20000 /* msecs */

int mlx5e_wait_for_min_rx_wqes(struct mlx5e_rq *rq, int wait_time);

void mlx5e_close_rq(struct mlx5e_rq *rq);

int mlx5e_create_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param);

int mlx5e_create_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param, u16 q_counter);

void mlx5e_destroy_rq(struct mlx5e_rq *rq);



struct mlx5e_sq_param;
@@ -1122,9 +1126,10 @@ static inline bool mlx5_tx_swp_supported(struct mlx5_core_dev *mdev) 
}



extern const struct ethtool_ops mlx5e_ethtool_ops;

extern const struct mlx5e_profile mlx5e_mgmt_pf_nic_profile;



int mlx5e_create_mkey(struct mlx5_core_dev *mdev, u32 pdn, u32 *mkey);

int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev);

int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev, bool create_tises);

void mlx5e_destroy_mdev_resources(struct mlx5_core_dev *mdev);

int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb,

		       bool enable_mc_lb);
@@ -1227,6 +1232,8 @@ netdev_features_t mlx5e_features_check(struct sk_buff *skb, 
				       struct net_device *netdev,

				       netdev_features_t features);

int mlx5e_set_features(struct net_device *netdev, netdev_features_t features);

void mlx5e_nic_set_rx_mode(struct mlx5e_priv *priv);



#ifdef CONFIG_MLX5_ESWITCH

int mlx5e_set_vf_mac(struct net_device *dev, int vf, u8 *mac);

int mlx5e_set_vf_rate(struct net_device *dev, int vf, int min_tx_rate, int max_tx_rate);

drivers/net/ethernet/mellanox/mlx5/core/en/channels.c

+8 −2
Original line number Diff line number Diff line
@@ -23,20 +23,26 @@ bool mlx5e_channels_is_xsk(struct mlx5e_channels *chs, unsigned int ix) 
	return test_bit(MLX5E_CHANNEL_STATE_XSK, c->state);

}



void mlx5e_channels_get_regular_rqn(struct mlx5e_channels *chs, unsigned int ix, u32 *rqn)

void mlx5e_channels_get_regular_rqn(struct mlx5e_channels *chs, unsigned int ix, u32 *rqn,

				    u32 *vhca_id)

{

	struct mlx5e_channel *c = mlx5e_channels_get(chs, ix);



	*rqn = c->rq.rqn;

	if (vhca_id)

		*vhca_id = MLX5_CAP_GEN(c->mdev, vhca_id);

}



void mlx5e_channels_get_xsk_rqn(struct mlx5e_channels *chs, unsigned int ix, u32 *rqn)

void mlx5e_channels_get_xsk_rqn(struct mlx5e_channels *chs, unsigned int ix, u32 *rqn,

				u32 *vhca_id)

{

	struct mlx5e_channel *c = mlx5e_channels_get(chs, ix);



	WARN_ON_ONCE(!test_bit(MLX5E_CHANNEL_STATE_XSK, c->state));



	*rqn = c->xskrq.rqn;

	if (vhca_id)

		*vhca_id = MLX5_CAP_GEN(c->mdev, vhca_id);

}



bool mlx5e_channels_get_ptp_rqn(struct mlx5e_channels *chs, u32 *rqn)