History

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

Pull rdma fixes from Jason Gunthorpe: "Several regression fixes from work that landed in the merge window, particularly in the mlx5 driver: - Various static checker and warning fixes - General bug fixes in rvt, qedr, hns, mlx5 and hfi1 - Several regression fixes related to the ECE and QP changes in last cycle - Fixes for a few long standing crashers in CMA, uverbs ioctl, and xrc" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (25 commits) IB/hfi1: Add atomic triggered sleep/wakeup IB/hfi1: Correct -EBUSY handling in tx code IB/hfi1: Fix module use count flaw due to leftover module put calls IB/hfi1: Restore kfree in dummy_netdev cleanup IB/mad: Fix use after free when destroying MAD agent RDMA/mlx5: Protect from kernel crash if XRC_TGT doesn't have udata RDMA/counter: Query a counter before release RDMA/mad: Fix possible memory leak in ib_mad_post_receive_mads() RDMA/mlx5: Fix integrity enabled QP creation RDMA/mlx5: Remove ECE limitation from the RAW_PACKET QPs RDMA/mlx5: Fix remote gid value in query QP RDMA/mlx5: Don't access ib_qp fields in internal destroy QP path RDMA/core: Check that type_attrs is not NULL prior access RDMA/hns: Fix an cmd queue issue when resetting RDMA/hns: Fix a calltrace when registering MR from userspace RDMA/mlx5: Add missed RST2INIT and INIT2INIT steps during ECE handshake RDMA/cma: Protect bind_list and listen_list while finding matching cm id RDMA/qedr: Fix KASAN: use-after-free in ucma_event_handler+0x532 RDMA/efa: Set maximum pkeys device attribute RDMA/rvt: Fix potential memory leak caused by rvt_alloc_rq ...

Linus Torvalds committed 6 years ago

Commit 87d93e92 parents 908f7d1 38fd98a22 files · +197 −124Browse files

Showing the changes to include/linux (1 of 22 files). Show all

Unified · Split

include/linux/mlx5/mlx5_ifc.h+6−4
@@ -4283,7 +4283,8 @@ struct mlx5_ifc_rst2init_qp_out_bits { · 4282 unmodified lines
4283 4283
4284 u8 syndrome[0x20];4284 u8 syndrome[0x20];
4285 4285
4286 u8 reserved_at_40[0x40];4286 u8 reserved_at_40[0x20];
4287 u8 ece[0x20];
4287};4288};
4288 4289
4289struct mlx5_ifc_rst2init_qp_in_bits {4290struct mlx5_ifc_rst2init_qp_in_bits {
@@ -4300,7 +4301,7 @@ struct mlx5_ifc_rst2init_qp_in_bits { · 10 unmodified lines
4300 4301
4301 u8 opt_param_mask[0x20];4302 u8 opt_param_mask[0x20];
4302 4303
4303 u8 reserved_at_a0[0x20];4304 u8 ece[0x20];
4304 4305
4305 struct mlx5_ifc_qpc_bits qpc;4306 struct mlx5_ifc_qpc_bits qpc;
4306 4307
@@ -6619,7 +6620,8 @@ struct mlx5_ifc_init2init_qp_out_bits { · 2312 unmodified lines
6619 6620
6620 u8 syndrome[0x20];6621 u8 syndrome[0x20];
6621 6622
6622 u8 reserved_at_40[0x40];6623 u8 reserved_at_40[0x20];
6624 u8 ece[0x20];
6623};6625};
6624 6626
6625struct mlx5_ifc_init2init_qp_in_bits {6627struct mlx5_ifc_init2init_qp_in_bits {
@@ -6636,7 +6638,7 @@ struct mlx5_ifc_init2init_qp_in_bits { · 10 unmodified lines
6636 6638
6637 u8 opt_param_mask[0x20];6639 u8 opt_param_mask[0x20];
6638 6640
6639 u8 reserved_at_a0[0x20];6641 u8 ece[0x20];
6640 6642
6641 struct mlx5_ifc_qpc_bits qpc;6643 struct mlx5_ifc_qpc_bits qpc;
6642 6644