History

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

Pull rdma updates from Jason Gunthorpe: "Quite a small cycle this time, even with the rc8. I suppose everyone went to sleep over xmas. - Minor driver updates for hfi1, cxgb4, erdma, hns, irdma, mlx5, siw, mana - inline CQE support for hns - Have mlx5 display device error codes - Pinned DMABUF support for irdma - Continued rxe cleanups, particularly converting the MRs to use xarray - Improvements to what can be cached in the mlx5 mkey cache" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (61 commits) IB/mlx5: Extend debug control for CC parameters IB/hfi1: Fix sdma.h tx->num_descs off-by-one errors IB/hfi1: Fix math bugs in hfi1_can_pin_pages() RDMA/irdma: Add support for dmabuf pin memory regions RDMA/mlx5: Use query_special_contexts for mkeys net/mlx5e: Use query_special_contexts for mkeys net/mlx5: Change define name for 0x100 lkey value net/mlx5: Expose bits for querying special mkeys RDMA/rxe: Fix missing memory barriers in rxe_queue.h RDMA/mana_ib: Fix a bug when the PF indicates more entries for registering memory on first packet RDMA/rxe: Remove rxe_alloc() RDMA/cma: Distinguish between sockaddr_in and sockaddr_in6 by size Subject: RDMA/rxe: Handle zero length rdma iw_cxgb4: Fix potential NULL dereference in c4iw_fill_res_cm_id_entry() RDMA/mlx5: Use rdma_umem_for_each_dma_block() RDMA/umem: Remove unused 'work' member from struct ib_umem RDMA/irdma: Cap MSIX used to online CPUs + 1 RDMA/mlx5: Check reg_create() create for errors RDMA/restrack: Correct spelling RDMA/cxgb4: Fix potential null-ptr-deref in pass_establish() ...

Linus Torvalds committed 3 years ago

Commit 8cbd9232 parents 143c7bc 66fb1d565 files · +2112 −1597Browse files

Showing the changes to include (10 of 65 files). Show all

Unified · Split

10 files
  1. include/linux/mlx4/qp.h +1 −0
  2. include/linux/mlx5/driver.h +0 −1
  3. include/linux/mlx5/mlx5_ifc.h +20 −2
  4. include/linux/mlx5/qp.h +1 −1
  5. include/rdma/ib_sa.h +1 −1
  6. include/rdma/ib_umem.h +0 −1
  7. include/rdma/ib_verbs.h +1 −1
  8. include/rdma/rdma_cm.h +0 −1
  9. include/rdma/restrack.h +2 −2
  10. include/uapi/rdma/hns-abi.h +4 −0
include/linux/mlx4/qp.h+1−0
@@ -504,4 +504,5 @@ static inline u16 folded_qp(u32 q) · 503 unmodified lines
504504
505505 u16 mlx4_qp_roce_entropy(struct mlx4_dev *dev, u32 qpn);
506506
507+void mlx4_put_qp(struct mlx4_qp *qp);
507508 #endif /* MLX4_QP_H */
include/linux/mlx5/driver.h+0−1
@@ -742,7 +742,6 @@ enum { · 741 unmodified lines
742742
743743 enum {
744744 MKEY_CACHE_LAST_STD_ENTRY = 20,
745− MLX5_IMR_MTT_CACHE_ENTRY,
746745 MLX5_IMR_KSM_CACHE_ENTRY,
747746 MAX_MKEY_CACHE_ENTRIES
748747 };
include/linux/mlx5/mlx5_ifc.h+20−2
@@ -1510,7 +1510,9 @@ struct mlx5_ifc_cmd_hca_cap_bits { · 1509 unmodified lines
15101510 u8 relaxed_ordering_write[0x1];
15111511 u8 relaxed_ordering_read[0x1];
15121512 u8 log_max_mkey[0x6];
1513− u8 reserved_at_f0[0x8];
1513+ u8 reserved_at_f0[0x6];
1514+ u8 terminate_scatter_list_mkey[0x1];
1515+ u8 repeated_mkey[0x1];
15141516 u8 dump_fill_mkey[0x1];
15151517 u8 reserved_at_f9[0x2];
15161518 u8 fast_teardown[0x1];
@@ -2183,6 +2185,17 @@ struct mlx5_ifc_cong_control_r_roce_ecn_rp_bits { · 666 unmodified lines
21832185 u8 reserved_at_360[0x4a0];
21842186 };
21852187
2188+struct mlx5_ifc_cong_control_r_roce_general_bits {
2189+ u8 reserved_at_0[0x80];
2190+
2191+ u8 reserved_at_80[0x10];
2192+ u8 rtt_resp_dscp_valid[0x1];
2193+ u8 reserved_at_91[0x9];
2194+ u8 rtt_resp_dscp[0x6];
2195+
2196+ u8 reserved_at_a0[0x760];
2197+};
2198+
21862199 struct mlx5_ifc_cong_control_802_1qau_rp_bits {
21872200 u8 reserved_at_0[0x80];
21882201
@@ -4353,6 +4366,7 @@ union mlx5_ifc_cong_control_roce_ecn_auto_bits { · 2164 unmodified lines
43534366 struct mlx5_ifc_cong_control_802_1qau_rp_bits cong_control_802_1qau_rp;
43544367 struct mlx5_ifc_cong_control_r_roce_ecn_rp_bits cong_control_r_roce_ecn_rp;
43554368 struct mlx5_ifc_cong_control_r_roce_ecn_np_bits cong_control_r_roce_ecn_np;
4369+ struct mlx5_ifc_cong_control_r_roce_general_bits cong_control_r_roce_general;
43564370 u8 reserved_at_0[0x800];
43574371 };
43584372
@@ -5261,7 +5275,11 @@ struct mlx5_ifc_query_special_contexts_out_bits { · 902 unmodified lines
52615275
52625276 u8 null_mkey[0x20];
52635277
5264− u8 reserved_at_a0[0x60];
5278+ u8 terminate_scatter_list_mkey[0x20];
5279+
5280+ u8 repeated_mkey[0x20];
5281+
5282+ u8 reserved_at_a0[0x20];
52655283 };
52665284
52675285 struct mlx5_ifc_query_special_contexts_in_bits {
include/linux/mlx5/qp.h+1−1
@@ -36,7 +36,7 @@ · 35 unmodified lines
3636 #include <linux/mlx5/device.h>
3737 #include <linux/mlx5/driver.h>
3838
39−#define MLX5_INVALID_LKEY 0x100
39+#define MLX5_TERMINATE_SCATTER_LIST_LKEY cpu_to_be32(0x100)
4040 /* UMR (3 WQE_BB's) + SIG (3 WQE_BB's) + PSV (mem) + PSV (wire) */
4141 #define MLX5_SIG_WQE_SIZE (MLX5_SEND_WQE_BB * 8)
4242 #define MLX5_DIF_SIZE 8
include/rdma/ib_sa.h+1−1
@@ -414,7 +414,7 @@ int ib_sa_path_rec_get(struct ib_sa_client *client, struct ib_device *device, · 413 unmodified lines
414414 ib_sa_comp_mask comp_mask, unsigned long timeout_ms,
415415 gfp_t gfp_mask,
416416 void (*callback)(int status, struct sa_path_rec *resp,
417− int num_prs, void *context),
417+ unsigned int num_prs, void *context),
418418 void *context, struct ib_sa_query **query);
419419
420420 struct ib_sa_multicast {
include/rdma/ib_umem.h+0−1
@@ -25,7 +25,6 @@ struct ib_umem { · 24 unmodified lines
2525 u32 writable : 1;
2626 u32 is_odp : 1;
2727 u32 is_dmabuf : 1;
28− struct work_struct work;
2928 struct sg_append_table sgt_append;
3029 };
3130
include/rdma/ib_verbs.h+1−1
@@ -1168,7 +1168,7 @@ enum ib_qp_create_flags { · 1167 unmodified lines
11681168 */
11691169
11701170 struct ib_qp_init_attr {
1171− /* Consumer's event_handler callback must not block */
1171+ /* This callback occurs in workqueue context */
11721172 void (*event_handler)(struct ib_event *, void *);
11731173
11741174 void *qp_context;
include/rdma/rdma_cm.h+0−1
@@ -49,7 +49,6 @@ struct rdma_addr { · 48 unmodified lines
4949 struct rdma_dev_addr dev_addr;
5050 };
5151
52−#define RDMA_PRIMARY_PATH_MAX_REC_NUM 3
5352 struct rdma_route {
5453 struct rdma_addr addr;
5554 struct sa_path_rec *path_rec;
include/rdma/restrack.h+2−2
@@ -162,8 +162,8 @@ struct rdma_restrack_entry *rdma_restrack_get_byid(struct ib_device *dev, · 161 unmodified lines
162162 * rdma_restrack_no_track() - don't add resource to the DB
163163 * @res: resource entry
164164 *
165− * Every user of thie API should be cross examined.
166− * Probaby you don't need to use this function.
165+ * Every user of this API should be cross examined.
166+ * Probably you don't need to use this function.
167167 */
168168 static inline void rdma_restrack_no_track(struct rdma_restrack_entry *res)
169169 {
include/uapi/rdma/hns-abi.h+4−0
@@ -87,10 +87,14 @@ struct hns_roce_ib_create_qp_resp { · 86 unmodified lines
8787
8888 enum {
8989 HNS_ROCE_EXSGE_FLAGS = 1 << 0,
90+ HNS_ROCE_RQ_INLINE_FLAGS = 1 << 1,
91+ HNS_ROCE_CQE_INLINE_FLAGS = 1 << 2,
9092 };
9193
9294 enum {
9395 HNS_ROCE_RSP_EXSGE_FLAGS = 1 << 0,
96+ HNS_ROCE_RSP_RQ_INLINE_FLAGS = 1 << 1,
97+ HNS_ROCE_RSP_CQE_INLINE_FLAGS = 1 << 2,
9498 };
9599
96100 struct hns_roce_ib_alloc_ucontext_resp {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t