Skip to content

Commit d768869

Browse files
torvaldstorvalds
committed
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Pull rdma updates from Jason Gunthorpe: "Again another fairly quiet cycle with few notable core code changes and the usual variety of driver bug fixes and small improvements. - Various driver updates and bug fixes for siw, bnxt_re, hns, qedr, iw_cxgb4, vmw_pvrdma, mlx5 - Improvements in SRPT from working with iWarp - SRIOV VF support for bnxt_re - Skeleton kernel-doc files for drivers/infiniband - User visible counters for events related to ODP - Common code for tracking of mmap lifetimes so that drivers can link HW object liftime to a VMA - ODP bug fixes and rework - RDMA READ support for efa - Removal of the very old cxgb3 driver" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (168 commits) RDMA/hns: Delete unnecessary callback functions for cq RDMA/hns: Rename the functions used inside creating cq RDMA/hns: Redefine the member of hns_roce_cq struct RDMA/hns: Redefine interfaces used in creating cq RDMA/efa: Expose RDMA read related attributes RDMA/efa: Support remote read access in MR registration RDMA/efa: Store network attributes in device attributes IB/hfi1: remove redundant assignment to variable ret RDMA/bnxt_re: Fix missing le16_to_cpu RDMA/bnxt_re: Fix stat push into dma buffer on gen p5 devices RDMA/bnxt_re: Fix chip number validation Broadcom's Gen P5 series RDMA/bnxt_re: Fix Kconfig indentation IB/mlx5: Implement callbacks for getting VFs GUID attributes IB/ipoib: Add ndo operation for getting VFs GUID attributes IB/core: Add interfaces to get VF node and port GUIDs net/core: Add support for getting VF GUIDs RDMA/qedr: Fix null-pointer dereference when calling rdma_user_mmap_get_offset RDMA/cm: Use refcount_t type for refcount variable IB/mlx5: Support extended number of strides for Striding RQ IB/mlx4: Update HW GID table while adding vlan GID ...
2 parents 0e45384 + f295e4c commit d768869

File tree

184 files changed

+4214
-12877
lines changed

Some content is hidden

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

184 files changed

+4214
-12877
lines changed

‎Documentation/ABI/stable/sysfs-class-infiniband

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -314,25 +314,6 @@ Description:
314314
board_id: (RO) Manufacturing board ID
315315

316316

317-
sysfs interface for Chelsio T3 RDMA Driver (cxgb3)
318-
--------------------------------------------------
319-
320-
What: /sys/class/infiniband/cxgb3_X/hw_rev
321-
What: /sys/class/infiniband/cxgb3_X/hca_type
322-
What: /sys/class/infiniband/cxgb3_X/board_id
323-
Date: Feb, 2007
324-
KernelVersion: v2.6.21
325-
Contact: [email protected]
326-
Description:
327-
hw_rev: (RO) Hardware revision number
328-
329-
hca_type: (RO) HCA type. Here it is a driver short name.
330-
It should normally match the name in its bus
331-
driver structure (e.g. pci_driver::name).
332-
333-
board_id: (RO) Manufacturing board id
334-
335-
336317
sysfs interface for Mellanox ConnectX HCA IB driver (mlx4)
337318
----------------------------------------------------------
338319

‎Documentation/ABI/stable/sysfs-driver-ib_srp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ Description: Interface for making ib_srp connect to a new target.
6767
initiator is allowed to queue per SCSI host. The default
6868
value for this parameter is 62. The lowest supported value
6969
is 2.
70+
* max_it_iu_size, a decimal number specifying the maximum
71+
initiator to target information unit length.
7072

7173
What: /sys/class/infiniband_srp/srp-<hca>-<port_number>/ibdev
7274
Date: January 2, 2006

‎Documentation/DMA-attributes.txt

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,6 @@ DMA attributes
55
This document describes the semantics of the DMA attributes that are
66
defined in linux/dma-mapping.h.
77

8-
DMA_ATTR_WRITE_BARRIER
9-
----------------------
10-
11-
DMA_ATTR_WRITE_BARRIER is a (write) barrier attribute for DMA. DMA
12-
to a memory region with the DMA_ATTR_WRITE_BARRIER attribute forces
13-
all pending DMA writes to complete, and thus provides a mechanism to
14-
strictly order DMA from a device across all intervening busses and
15-
bridges. This barrier is not specific to a particular type of
16-
interconnect, it applies to the system as a whole, and so its
17-
implementation must account for the idiosyncrasies of the system all
18-
the way from the DMA device to memory.
19-
20-
As an example of a situation where DMA_ATTR_WRITE_BARRIER would be
21-
useful, suppose that a device does a DMA write to indicate that data is
22-
ready and available in memory. The DMA of the "completion indication"
23-
could race with data DMA. Mapping the memory used for completion
24-
indications with DMA_ATTR_WRITE_BARRIER would prevent the race.
25-
268
DMA_ATTR_WEAK_ORDERING
279
----------------------
2810

‎Documentation/driver-api/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ available subsections can be seen below.
2626
device_link
2727
component
2828
message-based
29+
infiniband
2930
sound
3031
frame-buffer
3132
regulator

‎Documentation/driver-api/infiniband.rst

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
===========================================
2+
InfiniBand and Remote DMA (RDMA) Interfaces
3+
===========================================
4+
5+
Introduction and Overview
6+
=========================
7+
8+
TBD
9+
10+
InfiniBand core interfaces
11+
==========================
12+
13+
.. kernel-doc:: drivers/infiniband/core/iwpm_util.h
14+
:internal:
15+
16+
.. kernel-doc:: drivers/infiniband/core/cq.c
17+
:export:
18+
19+
.. kernel-doc:: drivers/infiniband/core/cm.c
20+
:export:
21+
22+
.. kernel-doc:: drivers/infiniband/core/rw.c
23+
:export:
24+
25+
.. kernel-doc:: drivers/infiniband/core/device.c
26+
:export:
27+
28+
.. kernel-doc:: drivers/infiniband/core/verbs.c
29+
:export:
30+
31+
.. kernel-doc:: drivers/infiniband/core/packer.c
32+
:export:
33+
34+
.. kernel-doc:: drivers/infiniband/core/sa_query.c
35+
:export:
36+
37+
.. kernel-doc:: drivers/infiniband/core/ud_header.c
38+
:export:
39+
40+
.. kernel-doc:: drivers/infiniband/core/fmr_pool.c
41+
:export:
42+
43+
.. kernel-doc:: drivers/infiniband/core/umem.c
44+
:export:
45+
46+
.. kernel-doc:: drivers/infiniband/core/umem_odp.c
47+
:export:
48+
49+
RDMA Verbs transport library
50+
============================
51+
52+
.. kernel-doc:: drivers/infiniband/sw/rdmavt/mr.c
53+
:export:
54+
55+
.. kernel-doc:: drivers/infiniband/sw/rdmavt/rc.c
56+
:export:
57+
58+
.. kernel-doc:: drivers/infiniband/sw/rdmavt/ah.c
59+
:export:
60+
61+
.. kernel-doc:: drivers/infiniband/sw/rdmavt/vt.c
62+
:export:
63+
64+
.. kernel-doc:: drivers/infiniband/sw/rdmavt/cq.c
65+
:export:
66+
67+
.. kernel-doc:: drivers/infiniband/sw/rdmavt/qp.c
68+
:export:
69+
70+
.. kernel-doc:: drivers/infiniband/sw/rdmavt/mcast.c
71+
:export:
72+
73+
Upper Layer Protocols
74+
=====================
75+
76+
iSCSI Extensions for RDMA (iSER)
77+
--------------------------------
78+
79+
.. kernel-doc:: drivers/infiniband/ulp/iser/iscsi_iser.h
80+
:internal:
81+
82+
.. kernel-doc:: drivers/infiniband/ulp/iser/iscsi_iser.c
83+
:functions: iscsi_iser_pdu_alloc iser_initialize_task_headers \
84+
iscsi_iser_task_init iscsi_iser_mtask_xmit iscsi_iser_task_xmit \
85+
iscsi_iser_cleanup_task iscsi_iser_check_protection \
86+
iscsi_iser_conn_create iscsi_iser_conn_bind \
87+
iscsi_iser_conn_start iscsi_iser_conn_stop \
88+
iscsi_iser_session_destroy iscsi_iser_session_create \
89+
iscsi_iser_set_param iscsi_iser_ep_connect iscsi_iser_ep_poll \
90+
iscsi_iser_ep_disconnect
91+
92+
.. kernel-doc:: drivers/infiniband/ulp/iser/iser_initiator.c
93+
:internal:
94+
95+
.. kernel-doc:: drivers/infiniband/ulp/iser/iser_verbs.c
96+
:internal:
97+
98+
Omni-Path (OPA) Virtual NIC support
99+
-----------------------------------
100+
101+
.. kernel-doc:: drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h
102+
:internal:
103+
104+
.. kernel-doc:: drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h
105+
:internal:
106+
107+
.. kernel-doc:: drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c
108+
:internal:
109+
110+
.. kernel-doc:: drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c
111+
:internal:
112+
113+
InfiniBand SCSI RDMA protocol target support
114+
--------------------------------------------
115+
116+
.. kernel-doc:: drivers/infiniband/ulp/srpt/ib_srpt.h
117+
:internal:
118+
119+
.. kernel-doc:: drivers/infiniband/ulp/srpt/ib_srpt.c
120+
:internal:
121+
122+
iSCSI Extensions for RDMA (iSER) target support
123+
-----------------------------------------------
124+
125+
.. kernel-doc:: drivers/infiniband/ulp/isert/ib_isert.c
126+
:internal:
127+

‎MAINTAINERS

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4471,14 +4471,6 @@ W: http://www.chelsio.com
44714471
S: Supported
44724472
F: drivers/scsi/cxgbi/cxgb3i
44734473

4474-
CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
4475-
M: Potnuri Bharat Teja <[email protected]>
4476-
L: [email protected]
4477-
W: http://www.openfabrics.org
4478-
S: Supported
4479-
F: drivers/infiniband/hw/cxgb3/
4480-
F: include/uapi/rdma/cxgb3-abi.h
4481-
44824474
CXGB4 CRYPTO DRIVER (chcr)
44834475
M: Atul Gupta <[email protected]>
44844476
L: [email protected]

‎drivers/infiniband/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ config INFINIBAND_ADDR_TRANS_CONFIGFS
8383
if INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS
8484
source "drivers/infiniband/hw/mthca/Kconfig"
8585
source "drivers/infiniband/hw/qib/Kconfig"
86-
source "drivers/infiniband/hw/cxgb3/Kconfig"
8786
source "drivers/infiniband/hw/cxgb4/Kconfig"
8887
source "drivers/infiniband/hw/efa/Kconfig"
8988
source "drivers/infiniband/hw/i40iw/Kconfig"

‎drivers/infiniband/core/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ib_core-y := packer.o ud_header.o verbs.o cq.o rw.o sysfs.o \
1111
device.o fmr_pool.o cache.o netlink.o \
1212
roce_gid_mgmt.o mr_pool.o addr.o sa_query.o \
1313
multicast.o mad.o smi.o agent.o mad_rmpp.o \
14-
nldev.o restrack.o counters.o
14+
nldev.o restrack.o counters.o ib_core_uverbs.o
1515

1616
ib_core-$(CONFIG_SECURITY_INFINIBAND) += security.o
1717
ib_core-$(CONFIG_CGROUP_RDMA) += cgroup.o

‎drivers/infiniband/core/cache.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -819,22 +819,16 @@ static void cleanup_gid_table_port(struct ib_device *ib_dev, u8 port,
819819
struct ib_gid_table *table)
820820
{
821821
int i;
822-
bool deleted = false;
823822

824823
if (!table)
825824
return;
826825

827826
mutex_lock(&table->lock);
828827
for (i = 0; i < table->sz; ++i) {
829-
if (is_gid_entry_valid(table->data_vec[i])) {
828+
if (is_gid_entry_valid(table->data_vec[i]))
830829
del_gid(ib_dev, port, table, i);
831-
deleted = true;
832-
}
833830
}
834831
mutex_unlock(&table->lock);
835-
836-
if (deleted)
837-
dispatch_gid_change_event(ib_dev, port);
838832
}
839833

840834
void ib_cache_gid_set_default_gid(struct ib_device *ib_dev, u8 port,

0 commit comments

Comments
 (0)