Skip to content

Commit cd02217

Browse files
torvaldstorvalds
committed
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Pull rdma fixes from Jason Gunthorpe: "One regression from 5.8 and a few bugs from earlier kernels: - Various spelling corrections in kernel prints - Bug fixes in hfi1 and bntx_re - Revert a 5.8 patch in hns - Batch update for Mellanox and Cumulus maintainers emails" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: MAINTAINERS: Update Mellanox and Cumulus Network addresses to new domain Revert "RDMA/hns: Reserve one sge in order to avoid local length error" RDMA/hfi1: Correct an interlock issue for TID RDMA WRITE request RDMA/bnxt_re: Do not add user qps to flushlist RDMA/core: Fix spelling mistake "Could't" -> "Couldn't" RDMA/usnic: Fix spelling mistake "transistion" -> "transition" RDMA/hns: Fix spelling mistake "epmty" -> "empty"
2 parents 7f04f3e + f6da70d commit cd02217

File tree

12 files changed

+45
-47
lines changed

12 files changed

+45
-47
lines changed

‎.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ Jan Glauber <[email protected]> <[email protected]>
132132
Jan Glauber <[email protected]> <[email protected]>
133133
Jan Glauber <[email protected]> <[email protected]>
134134
Jason Gunthorpe <[email protected]> <[email protected]>
135+
Jason Gunthorpe <[email protected]> <[email protected]>
135136
Jason Gunthorpe <[email protected]> <[email protected]>
136137
<[email protected]> <[email protected]>
137138
Javi Merino <[email protected]> <[email protected]>
@@ -178,6 +179,7 @@ Leonardo Bras <[email protected]> <[email protected]>
178179
Leonid I Ananiev <[email protected]>
179180
Leon Romanovsky <[email protected]> <[email protected]>
180181
Leon Romanovsky <[email protected]> <[email protected]>
182+
Leon Romanovsky <[email protected]> <[email protected]>
181183
Linas Vepstas <[email protected]>
182184
Linus Lüssing <[email protected]> <[email protected]>
183185
Linus Lüssing <[email protected]> <[email protected]>

‎MAINTAINERS

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5050,7 +5050,7 @@ F: include/linux/dm-*.h
50505050
F: include/uapi/linux/dm-*.h
50515051

50525052
DEVLINK
5053-
M: Jiri Pirko <jiri@mellanox.com>
5053+
M: Jiri Pirko <jiri@nvidia.com>
50545054
L: [email protected]
50555055
S: Supported
50565056
F: Documentation/networking/devlink
@@ -6081,7 +6081,7 @@ F: include/linux/dynamic_debug.h
60816081
F: lib/dynamic_debug.c
60826082

60836083
DYNAMIC INTERRUPT MODERATION
6084-
M: Tal Gilboa <talgi@mellanox.com>
6084+
M: Tal Gilboa <talgi@nvidia.com>
60856085
S: Maintained
60866086
F: Documentation/networking/net_dim.rst
60876087
F: include/linux/dim.h
@@ -6161,7 +6161,7 @@ F: Documentation/devicetree/bindings/edac/aspeed-sdram-edac.txt
61616161
F: drivers/edac/aspeed_edac.c
61626162

61636163
EDAC-BLUEFIELD
6164-
M: Shravan Kumar Ramani <sramani@mellanox.com>
6164+
M: Shravan Kumar Ramani <sramani@nvidia.com>
61656165
S: Supported
61666166
F: drivers/edac/bluefield_edac.c
61676167

@@ -6483,8 +6483,8 @@ S: Odd Fixes
64836483
F: drivers/net/ethernet/agere/
64846484

64856485
ETHERNET BRIDGE
6486-
M: Roopa Prabhu <roopa@cumulusnetworks.com>
6487-
M: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
6486+
M: Roopa Prabhu <roopa@nvidia.com>
6487+
M: Nikolay Aleksandrov <nikolay@nvidia.com>
64886488
L: [email protected] (moderated for non-subscribers)
64896489
L: [email protected]
64906490
S: Maintained
@@ -6599,7 +6599,7 @@ F: drivers/iommu/exynos-iommu.c
65996599

66006600
EZchip NPS platform support
66016601
M: Vineet Gupta <[email protected]>
6602-
M: Ofer Levi <oferle@mellanox.com>
6602+
M: Ofer Levi <oferle@nvidia.com>
66036603
S: Supported
66046604
F: arch/arc/boot/dts/eznps.dts
66056605
F: arch/arc/plat-eznps
@@ -8563,7 +8563,7 @@ F: drivers/iio/pressure/dps310.c
85638563

85648564
INFINIBAND SUBSYSTEM
85658565
M: Doug Ledford <[email protected]>
8566-
M: Jason Gunthorpe <jgg@mellanox.com>
8566+
M: Jason Gunthorpe <jgg@nvidia.com>
85678567
L: [email protected]
85688568
S: Supported
85698569
W: https://github.com/linux-rdma/rdma-core
@@ -9226,7 +9226,7 @@ F: drivers/firmware/iscsi_ibft*
92269226

92279227
ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
92289228
M: Sagi Grimberg <[email protected]>
9229-
M: Max Gurtovoy <maxg@mellanox.com>
9229+
M: Max Gurtovoy <maxg@nvidia.com>
92309230
L: [email protected]
92319231
S: Supported
92329232
W: http://www.openfabrics.org
@@ -11072,23 +11072,23 @@ F: Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt
1107211072
F: drivers/input/touchscreen/melfas_mip4.c
1107311073

1107411074
MELLANOX ETHERNET DRIVER (mlx4_en)
11075-
M: Tariq Toukan <tariqt@mellanox.com>
11075+
M: Tariq Toukan <tariqt@nvidia.com>
1107611076
L: [email protected]
1107711077
S: Supported
1107811078
W: http://www.mellanox.com
1107911079
Q: http://patchwork.ozlabs.org/project/netdev/list/
1108011080
F: drivers/net/ethernet/mellanox/mlx4/en_*
1108111081

1108211082
MELLANOX ETHERNET DRIVER (mlx5e)
11083-
M: Saeed Mahameed <saeedm@mellanox.com>
11083+
M: Saeed Mahameed <saeedm@nvidia.com>
1108411084
L: [email protected]
1108511085
S: Supported
1108611086
W: http://www.mellanox.com
1108711087
Q: http://patchwork.ozlabs.org/project/netdev/list/
1108811088
F: drivers/net/ethernet/mellanox/mlx5/core/en_*
1108911089

1109011090
MELLANOX ETHERNET INNOVA DRIVERS
11091-
R: Boris Pismenny <borisp@mellanox.com>
11091+
R: Boris Pismenny <borisp@nvidia.com>
1109211092
L: [email protected]
1109311093
S: Supported
1109411094
W: http://www.mellanox.com
@@ -11099,8 +11099,8 @@ F: drivers/net/ethernet/mellanox/mlx5/core/fpga/*
1109911099
F: include/linux/mlx5/mlx5_ifc_fpga.h
1110011100

1110111101
MELLANOX ETHERNET SWITCH DRIVERS
11102-
M: Jiri Pirko <jiri@mellanox.com>
11103-
M: Ido Schimmel <idosch@mellanox.com>
11102+
M: Jiri Pirko <jiri@nvidia.com>
11103+
M: Ido Schimmel <idosch@nvidia.com>
1110411104
L: [email protected]
1110511105
S: Supported
1110611106
W: http://www.mellanox.com
@@ -11109,7 +11109,7 @@ F: drivers/net/ethernet/mellanox/mlxsw/
1110911109
F: tools/testing/selftests/drivers/net/mlxsw/
1111011110

1111111111
MELLANOX FIRMWARE FLASH LIBRARY (mlxfw)
11112-
M: mlxsw@mellanox.com
11112+
M: mlxsw@nvidia.com
1111311113
L: [email protected]
1111411114
S: Supported
1111511115
W: http://www.mellanox.com
@@ -11119,15 +11119,15 @@ F: drivers/net/ethernet/mellanox/mlxfw/
1111911119
MELLANOX HARDWARE PLATFORM SUPPORT
1112011120
M: Andy Shevchenko <[email protected]>
1112111121
M: Darren Hart <[email protected]>
11122-
M: Vadim Pasternak <vadimp@mellanox.com>
11122+
M: Vadim Pasternak <vadimp@nvidia.com>
1112311123
L: [email protected]
1112411124
S: Supported
1112511125
F: Documentation/ABI/testing/sysfs-platform-mellanox-bootctl
1112611126
F: drivers/platform/mellanox/
1112711127
F: include/linux/platform_data/mlxreg.h
1112811128

1112911129
MELLANOX MLX4 core VPI driver
11130-
M: Tariq Toukan <tariqt@mellanox.com>
11130+
M: Tariq Toukan <tariqt@nvidia.com>
1113111131
L: [email protected]
1113211132
L: [email protected]
1113311133
S: Supported
@@ -11137,7 +11137,7 @@ F: drivers/net/ethernet/mellanox/mlx4/
1113711137
F: include/linux/mlx4/
1113811138

1113911139
MELLANOX MLX4 IB driver
11140-
M: Yishai Hadas <yishaih@mellanox.com>
11140+
M: Yishai Hadas <yishaih@nvidia.com>
1114111141
L: [email protected]
1114211142
S: Supported
1114311143
W: http://www.mellanox.com
@@ -11147,8 +11147,8 @@ F: include/linux/mlx4/
1114711147
F: include/uapi/rdma/mlx4-abi.h
1114811148

1114911149
MELLANOX MLX5 core VPI driver
11150-
M: Saeed Mahameed <saeedm@mellanox.com>
11151-
M: Leon Romanovsky <leonro@mellanox.com>
11150+
M: Saeed Mahameed <saeedm@nvidia.com>
11151+
M: Leon Romanovsky <leonro@nvidia.com>
1115211152
L: [email protected]
1115311153
L: [email protected]
1115411154
S: Supported
@@ -11159,7 +11159,7 @@ F: drivers/net/ethernet/mellanox/mlx5/core/
1115911159
F: include/linux/mlx5/
1116011160

1116111161
MELLANOX MLX5 IB driver
11162-
M: Leon Romanovsky <leonro@mellanox.com>
11162+
M: Leon Romanovsky <leonro@nvidia.com>
1116311163
L: [email protected]
1116411164
S: Supported
1116511165
W: http://www.mellanox.com
@@ -11169,24 +11169,24 @@ F: include/linux/mlx5/
1116911169
F: include/uapi/rdma/mlx5-abi.h
1117011170

1117111171
MELLANOX MLXCPLD I2C AND MUX DRIVER
11172-
M: Vadim Pasternak <vadimp@mellanox.com>
11173-
M: Michael Shych <michaelsh@mellanox.com>
11172+
M: Vadim Pasternak <vadimp@nvidia.com>
11173+
M: Michael Shych <michaelsh@nvidia.com>
1117411174
L: [email protected]
1117511175
S: Supported
1117611176
F: Documentation/i2c/busses/i2c-mlxcpld.rst
1117711177
F: drivers/i2c/busses/i2c-mlxcpld.c
1117811178
F: drivers/i2c/muxes/i2c-mux-mlxcpld.c
1117911179

1118011180
MELLANOX MLXCPLD LED DRIVER
11181-
M: Vadim Pasternak <vadimp@mellanox.com>
11181+
M: Vadim Pasternak <vadimp@nvidia.com>
1118211182
L: [email protected]
1118311183
S: Supported
1118411184
F: Documentation/leds/leds-mlxcpld.rst
1118511185
F: drivers/leds/leds-mlxcpld.c
1118611186
F: drivers/leds/leds-mlxreg.c
1118711187

1118811188
MELLANOX PLATFORM DRIVER
11189-
M: Vadim Pasternak <vadimp@mellanox.com>
11189+
M: Vadim Pasternak <vadimp@nvidia.com>
1119011190
L: [email protected]
1119111191
S: Supported
1119211192
F: drivers/platform/x86/mlx-platform.c
@@ -12167,8 +12167,8 @@ F: net/ipv6/syncookies.c
1216712167
F: net/ipv6/tcp*.c
1216812168

1216912169
NETWORKING [TLS]
12170-
M: Boris Pismenny <borisp@mellanox.com>
12171-
M: Aviad Yehezkel <aviadye@mellanox.com>
12170+
M: Boris Pismenny <borisp@nvidia.com>
12171+
M: Aviad Yehezkel <aviadye@nvidia.com>
1217212172
M: John Fastabend <[email protected]>
1217312173
M: Daniel Borkmann <[email protected]>
1217412174
M: Jakub Kicinski <[email protected]>
@@ -12468,7 +12468,7 @@ S: Supported
1246812468
F: drivers/nfc/nxp-nci
1246912469

1247012470
OBJAGG
12471-
M: Jiri Pirko <jiri@mellanox.com>
12471+
M: Jiri Pirko <jiri@nvidia.com>
1247212472
L: [email protected]
1247312473
S: Supported
1247412474
F: include/linux/objagg.h
@@ -13110,7 +13110,7 @@ F: drivers/video/logo/logo_parisc*
1311013110
F: include/linux/hp_sdc.h
1311113111

1311213112
PARMAN
13113-
M: Jiri Pirko <jiri@mellanox.com>
13113+
M: Jiri Pirko <jiri@nvidia.com>
1311413114
L: [email protected]
1311513115
S: Supported
1311613116
F: include/linux/parman.h
@@ -16034,7 +16034,7 @@ F: drivers/infiniband/sw/siw/
1603416034
F: include/uapi/rdma/siw-abi.h
1603516035

1603616036
SOFT-ROCE DRIVER (rxe)
16037-
M: Zhu Yanjun <yanjunz@mellanox.com>
16037+
M: Zhu Yanjun <yanjunz@nvidia.com>
1603816038
L: [email protected]
1603916039
S: Supported
1604016040
F: drivers/infiniband/sw/rxe/

‎drivers/infiniband/core/device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2751,7 +2751,7 @@ static int __init ib_core_init(void)
27512751

27522752
ret = addr_init();
27532753
if (ret) {
2754-
pr_warn("Could't init IB address resolution\n");
2754+
pr_warn("Couldn't init IB address resolution\n");
27552755
goto err_ibnl;
27562756
}
27572757

‎drivers/infiniband/hw/bnxt_re/main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,8 @@ static int bnxt_re_handle_qp_async_event(struct creq_qp_event *qp_event,
821821
struct ib_event event;
822822
unsigned int flags;
823823

824-
if (qp->qplib_qp.state == CMDQ_MODIFY_QP_NEW_STATE_ERR) {
824+
if (qp->qplib_qp.state == CMDQ_MODIFY_QP_NEW_STATE_ERR &&
825+
rdma_is_kernel_res(&qp->ib_qp.res)) {
825826
flags = bnxt_re_lock_cqs(qp);
826827
bnxt_qplib_add_flush_qp(&qp->qplib_qp);
827828
bnxt_re_unlock_cqs(qp, flags);

‎drivers/infiniband/hw/hfi1/tid_rdma.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3215,6 +3215,7 @@ bool hfi1_tid_rdma_wqe_interlock(struct rvt_qp *qp, struct rvt_swqe *wqe)
32153215
case IB_WR_ATOMIC_CMP_AND_SWP:
32163216
case IB_WR_ATOMIC_FETCH_AND_ADD:
32173217
case IB_WR_RDMA_WRITE:
3218+
case IB_WR_RDMA_WRITE_WITH_IMM:
32183219
switch (prev->wr.opcode) {
32193220
case IB_WR_TID_RDMA_WRITE:
32203221
req = wqe_to_tid_req(prev);

‎drivers/infiniband/hw/hns/hns_roce_device.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@
6565
#define HNS_ROCE_CQE_WCMD_EMPTY_BIT 0x2
6666
#define HNS_ROCE_MIN_CQE_CNT 16
6767

68-
#define HNS_ROCE_RESERVED_SGE 1
69-
7068
#define HNS_ROCE_MAX_IRQ_NUM 128
7169

7270
#define HNS_ROCE_SGE_IN_WQE 2

‎drivers/infiniband/hw/hns/hns_roce_hw_v1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ static void hns_roce_set_sdb_ext(struct hns_roce_dev *hr_dev, u32 ext_sdb_alept,
535535
roce_write(hr_dev, ROCEE_EXT_DB_SQ_H_REG, val);
536536

537537
dev_dbg(dev, "ext SDB depth: 0x%x\n", db->ext_db->esdb_dep);
538-
dev_dbg(dev, "ext SDB threshold: epmty: 0x%x, ful: 0x%x\n",
538+
dev_dbg(dev, "ext SDB threshold: empty: 0x%x, ful: 0x%x\n",
539539
ext_sdb_alept, ext_sdb_alful);
540540
}
541541

‎drivers/infiniband/hw/hns/hns_roce_hw_v2.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ static int hns_roce_v2_post_recv(struct ib_qp *ibqp,
633633

634634
wqe_idx = (hr_qp->rq.head + nreq) & (hr_qp->rq.wqe_cnt - 1);
635635

636-
if (unlikely(wr->num_sge >= hr_qp->rq.max_gs)) {
636+
if (unlikely(wr->num_sge > hr_qp->rq.max_gs)) {
637637
ibdev_err(ibdev, "rq:num_sge=%d >= qp->sq.max_gs=%d\n",
638638
wr->num_sge, hr_qp->rq.max_gs);
639639
ret = -EINVAL;
@@ -653,7 +653,6 @@ static int hns_roce_v2_post_recv(struct ib_qp *ibqp,
653653
if (wr->num_sge < hr_qp->rq.max_gs) {
654654
dseg->lkey = cpu_to_le32(HNS_ROCE_INVALID_LKEY);
655655
dseg->addr = 0;
656-
dseg->len = cpu_to_le32(HNS_ROCE_INVALID_SGE_LENGTH);
657656
}
658657

659658
/* rq support inline data */
@@ -787,8 +786,8 @@ static int hns_roce_v2_post_srq_recv(struct ib_srq *ibsrq,
787786
}
788787

789788
if (wr->num_sge < srq->max_gs) {
790-
dseg[i].len = cpu_to_le32(HNS_ROCE_INVALID_SGE_LENGTH);
791-
dseg[i].lkey = cpu_to_le32(HNS_ROCE_INVALID_LKEY);
789+
dseg[i].len = 0;
790+
dseg[i].lkey = cpu_to_le32(0x100);
792791
dseg[i].addr = 0;
793792
}
794793

@@ -5070,7 +5069,7 @@ static int hns_roce_v2_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr)
50705069

50715070
attr->srq_limit = limit_wl;
50725071
attr->max_wr = srq->wqe_cnt - 1;
5073-
attr->max_sge = srq->max_gs - HNS_ROCE_RESERVED_SGE;
5072+
attr->max_sge = srq->max_gs;
50745073

50755074
out:
50765075
hns_roce_free_cmd_mailbox(hr_dev, mailbox);

‎drivers/infiniband/hw/hns/hns_roce_hw_v2.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@
9292
#define HNS_ROCE_V2_CQC_TIMER_ENTRY_SZ PAGE_SIZE
9393
#define HNS_ROCE_V2_PAGE_SIZE_SUPPORTED 0xFFFFF000
9494
#define HNS_ROCE_V2_MAX_INNER_MTPT_NUM 2
95-
#define HNS_ROCE_INVALID_LKEY 0x0
96-
#define HNS_ROCE_INVALID_SGE_LENGTH 0x80000000
97-
95+
#define HNS_ROCE_INVALID_LKEY 0x100
9896
#define HNS_ROCE_CMQ_TX_TIMEOUT 30000
9997
#define HNS_ROCE_V2_UC_RC_SGE_NUM_IN_WQE 2
10098
#define HNS_ROCE_V2_RSV_QPS 8

‎drivers/infiniband/hw/hns/hns_roce_qp.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,7 @@ static int set_rq_size(struct hns_roce_dev *hr_dev, struct ib_qp_cap *cap,
386386
return -EINVAL;
387387
}
388388

389-
hr_qp->rq.max_gs = roundup_pow_of_two(max(1U, cap->max_recv_sge) +
390-
HNS_ROCE_RESERVED_SGE);
389+
hr_qp->rq.max_gs = roundup_pow_of_two(max(1U, cap->max_recv_sge));
391390

392391
if (hr_dev->caps.max_rq_sg <= HNS_ROCE_SGE_IN_WQE)
393392
hr_qp->rq.wqe_shift = ilog2(hr_dev->caps.max_rq_desc_sz);
@@ -402,7 +401,7 @@ static int set_rq_size(struct hns_roce_dev *hr_dev, struct ib_qp_cap *cap,
402401
hr_qp->rq_inl_buf.wqe_cnt = 0;
403402

404403
cap->max_recv_wr = cnt;
405-
cap->max_recv_sge = hr_qp->rq.max_gs - HNS_ROCE_RESERVED_SGE;
404+
cap->max_recv_sge = hr_qp->rq.max_gs;
406405

407406
return 0;
408407
}

0 commit comments

Comments
 (0)