github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 04:23:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'mlx5-next' into wip/leon-for-next

Browse Source 
* mlx5-next:
  net/mlx5: Check device memory pointer before usage
  net/mlx5: fs, fix RDMA TRANSPORT init cleanup flow
  net/mlx5: Add IFC bits for PCIe Congestion Event object
  net/mlx5: Small refactor for general object capabilities
This commit is contained in:
Leon Romanovsky 2025-07-07 06:29:16 -04:00
commit f3b7a65ce5
5 changed files with 77 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/infiniband/hw/mlx5/dm.c
View File

@ -282,7 +282,7 @@ static struct ib_dm *handle_alloc_dm_memic(struct ib_ucontext *ctx,
int err;
u64 address;
if (!MLX5_CAP_DEV_MEM(dm_db->dev, memic))
if (!dm_db || !MLX5_CAP_DEV_MEM(dm_db->dev, memic))
return ERR_PTR(-EOPNOTSUPP);
dm = kzalloc(sizeof(*dm), GFP_KERNEL);

22
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
View File

@ -3247,6 +3247,7 @@ init_rdma_transport_rx_root_ns_one(struct mlx5_flow_steering *steering,
{
struct mlx5_flow_root_namespace *root_ns;
struct fs_prio *prio;
int ret;
int i;
steering->rdma_transport_rx_root_ns[vport_idx] =
@ -3258,11 +3259,17 @@ init_rdma_transport_rx_root_ns_one(struct mlx5_flow_steering *steering,
for (i = 0; i < MLX5_RDMA_TRANSPORT_BYPASS_PRIO; i++) {
prio = fs_create_prio(&root_ns->ns, i, 1);
if (IS_ERR(prio))
return PTR_ERR(prio);
if (IS_ERR(prio)) {
ret = PTR_ERR(prio);
goto err;
}
}
set_prio_attrs(root_ns);
return 0;
err:
cleanup_root_ns(root_ns);
return ret;
}
static int
@ -3271,6 +3278,7 @@ init_rdma_transport_tx_root_ns_one(struct mlx5_flow_steering *steering,
{
struct mlx5_flow_root_namespace *root_ns;
struct fs_prio *prio;
int ret;
int i;
steering->rdma_transport_tx_root_ns[vport_idx] =
@ -3282,11 +3290,17 @@ init_rdma_transport_tx_root_ns_one(struct mlx5_flow_steering *steering,
for (i = 0; i < MLX5_RDMA_TRANSPORT_BYPASS_PRIO; i++) {
prio = fs_create_prio(&root_ns->ns, i, 1);
if (IS_ERR(prio))
return PTR_ERR(prio);
if (IS_ERR(prio)) {
ret = PTR_ERR(prio);
goto err;
}
}
set_prio_attrs(root_ns);
return 0;
err:
cleanup_root_ns(root_ns);
return ret;
}
static int init_rdma_transport_rx_root_ns(struct mlx5_flow_steering *steering)

4
drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c
View File

@ -30,7 +30,7 @@ struct mlx5_dm *mlx5_dm_create(struct mlx5_core_dev *dev)
dm = kzalloc(sizeof(*dm), GFP_KERNEL);
if (!dm)
return ERR_PTR(-ENOMEM);
return NULL;
spin_lock_init(&dm->lock);
@ -96,7 +96,7 @@ struct mlx5_dm *mlx5_dm_create(struct mlx5_core_dev *dev)
err_steering:
kfree(dm);
return ERR_PTR(-ENOMEM);
return NULL;
}
void mlx5_dm_cleanup(struct mlx5_core_dev *dev)

3
drivers/net/ethernet/mellanox/mlx5/core/main.c
View File

@ -1102,9 +1102,6 @@ static int mlx5_init_once(struct mlx5_core_dev *dev)
}
dev->dm = mlx5_dm_create(dev);
if (IS_ERR(dev->dm))
mlx5_core_warn(dev, "Failed to init device memory %ld\n", PTR_ERR(dev->dm));
dev->tracer = mlx5_fw_tracer_create(dev);
dev->hv_vhca = mlx5_hv_vhca_create(dev);
dev->rsc_dump = mlx5_rsc_dump_create(dev);

67
include/linux/mlx5/mlx5_ifc.h
View File

@ -12501,17 +12501,6 @@ struct mlx5_ifc_affiliated_event_header_bits {
u8 obj_id[0x20];
};
enum {
MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_ENCRYPTION_KEY = BIT_ULL(0xc),
MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_IPSEC = BIT_ULL(0x13),
MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_SAMPLER = BIT_ULL(0x20),
MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_FLOW_METER_ASO = BIT_ULL(0x24),
};
enum {
MLX5_HCA_CAP_2_GENERAL_OBJECT_TYPES_RDMA_CTRL = BIT_ULL(0x13),
};
enum {
MLX5_GENERAL_OBJECT_TYPES_ENCRYPTION_KEY = 0xc,
MLX5_GENERAL_OBJECT_TYPES_IPSEC = 0x13,
@ -12520,9 +12509,28 @@ enum {
MLX5_GENERAL_OBJECT_TYPES_MACSEC = 0x27,
MLX5_GENERAL_OBJECT_TYPES_INT_KEK = 0x47,
MLX5_GENERAL_OBJECT_TYPES_RDMA_CTRL = 0x53,
MLX5_GENERAL_OBJECT_TYPES_PCIE_CONG_EVENT = 0x58,
MLX5_GENERAL_OBJECT_TYPES_FLOW_TABLE_ALIAS = 0xff15,
};
enum {
MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_ENCRYPTION_KEY =
BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_ENCRYPTION_KEY),
MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_IPSEC =
BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_IPSEC),
MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_SAMPLER =
BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_SAMPLER),
MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_FLOW_METER_ASO =
BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_FLOW_METER_ASO),
};
enum {
MLX5_HCA_CAP_2_GENERAL_OBJECT_TYPES_RDMA_CTRL =
BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_RDMA_CTRL - 0x40),
MLX5_HCA_CAP_2_GENERAL_OBJECT_TYPES_PCIE_CONG_EVENT =
BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_PCIE_CONG_EVENT - 0x40),
};
enum {
MLX5_IPSEC_OBJECT_ICV_LEN_16B,
};
@ -13279,4 +13287,41 @@ struct mlx5_ifc_mrtcq_reg_bits {
u8 reserved_at_80[0x180];
};
struct mlx5_ifc_pcie_cong_event_obj_bits {
u8 modify_select_field[0x40];
u8 inbound_event_en[0x1];
u8 outbound_event_en[0x1];
u8 reserved_at_42[0x1e];
u8 reserved_at_60[0x1];
u8 inbound_cong_state[0x3];
u8 reserved_at_64[0x1];
u8 outbound_cong_state[0x3];
u8 reserved_at_68[0x18];
u8 inbound_cong_low_threshold[0x10];
u8 inbound_cong_high_threshold[0x10];
u8 outbound_cong_low_threshold[0x10];
u8 outbound_cong_high_threshold[0x10];
u8 reserved_at_e0[0x340];
};
struct mlx5_ifc_pcie_cong_event_cmd_in_bits {
struct mlx5_ifc_general_obj_in_cmd_hdr_bits hdr;
struct mlx5_ifc_pcie_cong_event_obj_bits cong_obj;
};
struct mlx5_ifc_pcie_cong_event_cmd_out_bits {
struct mlx5_ifc_general_obj_out_cmd_hdr_bits hdr;
struct mlx5_ifc_pcie_cong_event_obj_bits cong_obj;
};
enum mlx5e_pcie_cong_event_mod_field {
MLX5_PCIE_CONG_EVENT_MOD_EVENT_EN = BIT(0),
MLX5_PCIE_CONG_EVENT_MOD_THRESH = BIT(2),
};
#endif /* MLX5_IFC_H */