History

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

Pull rdma fixes from Jason Gunthorpe: - Fix several syzkaller found bugs: - Poor parsing of the RDMA_NL_LS_OP_IP_RESOLVE netlink - GID entry refcount leaking when CM destruction races with multicast establishment - Missing refcount put in ib_del_sub_device_and_put() - Fixup recently introduced uABI padding for 32 bit consistency - Avoid user triggered math overflow in MANA and AFA - Reading invalid netdev data during an event - kdoc fixes - Fix never-working gid copying in ib_get_gids_from_rdma_hdr - Typo in bnxt when validating the BAR - bnxt mis-parsed IB_SEND_IP_CSUM so it didn't work always - bnxt out of bounds access in bnxt related to the counters on new devices - Allocate the bnxt PDE table with the right sizing - Use dma_free_coherent() correctly in bnxt - Allow rxe to be unloadable when CONFIG_PROVE_LOCKING by adjusting the tracking of the global sockets it uses - Missing unlocking on error path in rxe - Compute the right number of pages in a MR in rtrs * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: RDMA/bnxt_re: fix dma_free_coherent() pointer RDMA/rtrs: Fix clt_path::max_pages_per_mr calculation IB/rxe: Fix missing umem_odp->umem_mutex unlock on error path RDMA/bnxt_re: Fix to use correct page size for PDE table RDMA/bnxt_re: Fix OOB write in bnxt_re_copy_err_stats() RDMA/bnxt_re: Fix IB_SEND_IP_CSUM handling in post_send RDMA/core: always drop device refcount in ib_del_sub_device_and_put() RDMA/rxe: let rxe_reclassify_recv_socket() call sk_owner_put() RDMA/bnxt_re: Fix incorrect BAR check in bnxt_qplib_map_creq_db() RDMA/core: Fix logic error in ib_get_gids_from_rdma_hdr() RDMA/efa: Remove possible negative shift RTRS/rtrs: clean up rtrs headers kernel-doc RDMA/irdma: avoid invalid read in irdma_net_event RDMA/mana_ib: check cqe length for kernel CQs RDMA/irdma: Fix irdma_alloc_ucontext_resp padding RDMA/ucma: Fix rdma_ucm_query_ib_service_resp struct padding RDMA/cm: Fix leaking the multicast GID table reference RDMA/core: Check for the presence of LS_NLA_TYPE_DGID correctly

Linus Torvalds committed 10 months ago

Commit 6ce4d442 parents 3d35fa1 fcd431a18 files · +107 −68Browse files

Showing the changes to include/uapi (2 of 18 files). Show all

Unified · Split

2 files
  1. include/uapi/rdma/irdma-abi.h +1 −1
  2. include/uapi/rdma/rdma_user_cm.h +3 −1
include/uapi/rdma/irdma-abi.h+1−1
@@ -57,8 +57,8 @@ struct irdma_alloc_ucontext_resp { · 56 unmodified lines
5757 __u8 rsvd2;
5858 __aligned_u64 comp_mask;
5959 __u16 min_hw_wq_size;
60+ __u8 revd3[2];
6061 __u32 max_hw_srq_quanta;
61− __u8 rsvd3[2];
6262 };
6363
6464 struct irdma_alloc_pd_resp {
include/uapi/rdma/rdma_user_cm.h+3−1
@@ -192,6 +192,7 @@ struct rdma_ucm_query_path_resp { · 191 unmodified lines
192192
193193 struct rdma_ucm_query_ib_service_resp {
194194 __u32 num_service_recs;
195+ __u32 reserved;
195196 struct ib_user_service_rec recs[];
196197 };
197198
@@ -354,7 +355,7 @@ enum { · 156 unmodified lines
354355
355356 #define RDMA_USER_CM_IB_SERVICE_NAME_SIZE 64
356357 struct rdma_ucm_ib_service {
357− __u64 service_id;
358+ __aligned_u64 service_id;
358359 __u8 service_name[RDMA_USER_CM_IB_SERVICE_NAME_SIZE];
359360 __u32 flags;
360361 __u32 reserved;
@@ -362,6 +363,7 @@ struct rdma_ucm_ib_service { · 1 unmodified line
362363
363364 struct rdma_ucm_resolve_ib_service {
364365 __u32 id;
366+ __u32 reserved;
365367 struct rdma_ucm_ib_service ibs;
366368 };
367369