Skip to content

Commit ebfdf60

Browse files
author
CKI KWF Bot
committed
Merge: mlx5: drivers update up to Linux v6.15
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/322 Hi all, This MR includes updates for the mlx5 drivers. It has backports of changes up to kernel v6.15. JIRA: https://issues.redhat.com/browse/RHEL-73520 JIRA: https://issues.redhat.com/browse/RHEL-68478 JIRA: https://issues.redhat.com/browse/RHEL-72227 JIRA: https://issues.redhat.com/browse/RHEL-79734 JIRA: https://issues.redhat.com/browse/RHEL-81281 JIRA: https://issues.redhat.com/browse/RHEL-83170 JIRA: https://issues.redhat.com/browse/RHEL-85331 JIRA: https://issues.redhat.com/browse/RHEL-92435 JIRA: https://issues.redhat.com/browse/RHEL-93771 JIRA: https://issues.redhat.com/browse/RHEL-94894 JIRA: https://issues.redhat.com/browse/RHEL-99327 CVE: CVE-2024-53224 CVE: CVE-2024-56660 CVE: CVE-2024-57801 CVE: CVE-2025-21662 CVE: CVE-2025-21674 CVE: CVE-2025-21675 CVE: CVE-2025-21714 CVE: CVE-2025-21717 CVE: CVE-2025-21732 CVE: CVE-2025-21751 CVE: CVE-2025-21800 CVE: CVE-2025-21882 CVE: CVE-2025-21886 CVE: CVE-2025-21892 CVE: CVE-2025-21970 CVE: CVE-2025-21975 CVE: CVE-2025-22086 CVE: CVE-2025-22091 CVE: CVE-2025-37888 Omitted-fix: 25b2f46 wifi: ath12k: ahb: Replace del_timer_sync() with timer_delete_sync() (v6.16-rc1) Fixes a part of the changes which was not applied in the partial backport of 8fa7292 treewide: Switch/rename to timer_delete[_sync]() (v6.15-rc1) Omitted-fix: 1450e45 bna: bnad_dim_timeout: Rename del_timer_sync in comment (v6.16-rc1) Fixes a part of the changes which was not applied in the partial backport of 8fa7292 treewide: Switch/rename to timer_delete[_sync]() (v6.15-rc1) Omitted-fix: 50af973 ocfs2: o2net_idle_timer: Rename del_timer_sync in comment (v6.16-rc1) Fixes a part of the changes which was not applied in the partial backport of 8fa7292 treewide: Switch/rename to timer_delete[_sync]() (v6.15-rc1) Omitted-fix: c8c70ff scsi: scsi_transport_fc: Rename del_timer() in comment (v6.16-rc1) Fixes a part of the changes which was not applied in the partial backport of 8fa7292 treewide: Switch/rename to timer_delete[_sync]() (v6.15-rc1) Omitted-fix: bfabc4f ipvs: Rename del_timer in comment in ip_vs_conn_expire_now() (tags/net-next-6.17) Fixes a part of the changes which was not applied in the partial backport of 8fa7292 treewide: Switch/rename to timer_delete[_sync]() (v6.15-rc1) All patches are accepted upstream in Linus' tree. Each patch commit message describes its origin. This patch set passed incremental build testing to verify that it is bisectable. Sanity tests ran over mlx5 drivers on x86_64 systems (using ConnectX-4/5/6), including the following: Ethernet: -- IPv4 traffic (ICMP, TCP, UDP). -- IPv6 traffic (ICMP, TCP, UDP). VLAN: -- IPv4 traffic (ICMP, TCP, UDP). -- IPv6 traffic (ICMP, TCP, UDP). RoCE: -- RDMA (ibv_*_pingpong). -- RDMACM (examples that comes with librdmacm packages). Infiniband: -- RDMA (ibv_*_pingpong). -- RDMACM (examples that comes with librdmacm packages). IPoIB: -- IPv4 traffic (ICMP, TCP, UDP). -- IPv6 traffic (ICMP, TCP, UDP). PKey: -- IPv4 traffic (ICMP, TCP, UDP). -- IPv6 traffic (ICMP, TCP, UDP). ASAP2/OVS: -- Various sanity tests covering OVS offloads. NFSoRDMA: -- Discover, mount and write. iSER: -- Discover, login and mount. SRP: -- Verify srp_daemon service is up and system can discover SRP targets. Signed-off-by: Benjamin Poirier <bpoirier@redhat.com> Approved-by: Michal Schmidt <mschmidt@redhat.com> Approved-by: Eder Zulian <ezulian@redhat.com> Approved-by: mheib <mheib@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 361c4fe + 56fc4f0 commit ebfdf60

File tree

216 files changed

+10449
-4055
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

216 files changed

+10449
-4055
lines changed

‎Documentation/networking/device_drivers/ethernet/mellanox/mlx5/counters.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,6 +1082,11 @@ like flow control, FEC and more.
10821082
need to replace the cable/transceiver.
10831083
- Error
10841084

1085+
* - `total_success_recovery_phy`
1086+
- The number of total successful recovery events of any type during
1087+
ports reset cycle.
1088+
- Error
1089+
10851090
* - `rx_out_of_buffer`
10861091
- Number of times receive queue had no software buffers allocated for the
10871092
adapter's incoming traffic.

‎Documentation/networking/devlink/mlx5.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ parameters.
5353
* ``smfs`` Software managed flow steering. In SMFS mode, the HW
5454
steering entities are created and manage through the driver without
5555
firmware intervention.
56+
* ``hmfs`` Hardware managed flow steering. In HMFS mode, the driver
57+
is configuring steering rules directly to the HW using Work Queues with
58+
a special new type of WQE (Work Queue Element).
5659

5760
SMFS mode is faster and provides better rule insertion rate compared to
5861
default DMFS mode.
@@ -277,6 +280,10 @@ Description of the vnic counters:
277280
number of packets handled by the VNIC experiencing unexpected steering
278281
failure (at any point in steering flow owned by the VNIC, including the FDB
279282
for the eswitch owner).
283+
- icm_consumption
284+
amount of Interconnect Host Memory (ICM) consumed by the vnic in
285+
granularity of 4KB. ICM is host memory allocated by SW upon HCA request
286+
and is used for storing data structures that control HCA operation.
280287

281288
User commands examples:
282289

‎drivers/infiniband/hw/mlx5/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ mlx5_ib-y := ah.o \
99
data_direct.o \
1010
dm.o \
1111
doorbell.o \
12+
fs.o \
1213
gsi.o \
1314
ib_virt.o \
1415
mad.o \
@@ -26,7 +27,6 @@ mlx5_ib-y := ah.o \
2627
mlx5_ib-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += odp.o
2728
mlx5_ib-$(CONFIG_MLX5_ESWITCH) += ib_rep.o
2829
mlx5_ib-$(CONFIG_INFINIBAND_USER_ACCESS) += devx.o \
29-
fs.o \
3030
qos.o \
3131
std_types.o
3232
mlx5_ib-$(CONFIG_MLX5_MACSEC) += macsec.o

‎drivers/infiniband/hw/mlx5/ah.c‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,12 @@ static __be16 mlx5_ah_get_udp_sport(const struct mlx5_ib_dev *dev,
5050
return sport;
5151
}
5252

53-
static void create_ib_ah(struct mlx5_ib_dev *dev, struct mlx5_ib_ah *ah,
53+
static int create_ib_ah(struct mlx5_ib_dev *dev, struct mlx5_ib_ah *ah,
5454
struct rdma_ah_init_attr *init_attr)
5555
{
5656
struct rdma_ah_attr *ah_attr = init_attr->ah_attr;
5757
enum ib_gid_type gid_type;
58+
int rate_val;
5859

5960
if (rdma_ah_get_ah_flags(ah_attr) & IB_AH_GRH) {
6061
const struct ib_global_route *grh = rdma_ah_read_grh(ah_attr);
@@ -67,7 +68,10 @@ static void create_ib_ah(struct mlx5_ib_dev *dev, struct mlx5_ib_ah *ah,
6768
ah->av.tclass = grh->traffic_class;
6869
}
6970

70-
ah->av.stat_rate_sl = (rdma_ah_get_static_rate(ah_attr) << 4);
71+
rate_val = mlx5r_ib_rate(dev, rdma_ah_get_static_rate(ah_attr));
72+
if (rate_val < 0)
73+
return rate_val;
74+
ah->av.stat_rate_sl = rate_val << 4;
7175

7276
if (ah_attr->type == RDMA_AH_ATTR_TYPE_ROCE) {
7377
if (init_attr->xmit_slave)
@@ -88,6 +92,8 @@ static void create_ib_ah(struct mlx5_ib_dev *dev, struct mlx5_ib_ah *ah,
8892
ah->av.fl_mlid = rdma_ah_get_path_bits(ah_attr) & 0x7f;
8993
ah->av.stat_rate_sl |= (rdma_ah_get_sl(ah_attr) & 0xf);
9094
}
95+
96+
return 0;
9197
}
9298

9399
int mlx5_ib_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr,
@@ -120,8 +126,7 @@ int mlx5_ib_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr,
120126
return err;
121127
}
122128

123-
create_ib_ah(dev, ah, init_attr);
124-
return 0;
129+
return create_ib_ah(dev, ah, init_attr);
125130
}
126131

127132
int mlx5_ib_query_ah(struct ib_ah *ibah, struct rdma_ah_attr *ah_attr)

0 commit comments

Comments
 (0)