Convert CM to bitmaps

PATCH In review Leon Romanovsky 2 participants 47 messages Oct 27, 2019 – Nov 18, 2019 InfiniBand

lore

Share & tools

lore

Leon Romanovsky

author

2019-10-27 07:06 UTC #0 lore raw

cover Convert CM to bitmaps

From: Leon Romanovsky <[email protected]>

Hi,

This series is based n previously sent CM cleanup series [1] and continues already started task to clean up CM related code.

Over the years, the IB/core gained a number of anti-patterns which led to mistakes. First and most distracting is spread of hardware specification types (e.g. __beXX) to the core logic. Second, endless copy/paste to access IBTA binary blobs, which made any IBTA extensions not an easy task.

In next series, we will add Enhance Connection Establishment bits which were added recently to IBTA and will continue to convert rest of the CM code to propose macros by eliminating __beXX variables from core code.

Thanks

[1] https://lore.kernel.org/linux-rdma/[email protected]

BTW,
I know that it is more than 15 patches, but they are small and self-contained.

Leon Romanovsky (43):
RDMA/cm: Add naive SET/GET implementations to hide CM wire format RDMA/cm: Request For Communication (REQ) message definitions RDMA/cm: Message Receipt Acknowledgment (MRA) message definitions RDMA/cm: Reject (REJ) message definitions
RDMA/cm: Reply To Request for communication (REP) definitions RDMA/cm: Ready To Use (RTU) definitions
RDMA/cm: Request For Communication Release (DREQ) definitions RDMA/cm: Reply To Request For Communication Release (DREP) definitions RDMA/cm: Load Alternate Path (LAP) definitions
RDMA/cm: Alternate Path Response (APR) message definitions RDMA/cm: Service ID Resolution Request (SIDR_REQ) definitions RDMA/cm: Service ID Resolution Response (SIDR_REP) definitions RDMA/cm: Convert QPN and EECN to be u32 variables
RDMA/cm: Convert REQ responded resources to the new scheme RDMA/cm: Convert REQ initiator depth to the new scheme RDMA/cm: Convert REQ remote response timeout
RDMA/cm: Simplify QP type to wire protocol translation RDMA/cm: Convert REQ flow control
RDMA/cm: Convert starting PSN to be u32 variable
RDMA/cm: Update REQ local response timeout
RDMA/cm: Convert REQ retry count to use new scheme RDMA/cm: Update REQ path MTU field
RDMA/cm: Convert REQ RNR retry timeout counter
RDMA/cm: Convert REQ MAX CM retries
RDMA/cm: Convert REQ SRQ field
RDMA/cm: Convert REQ flow label field
RDMA/cm: Convert REQ packet rate
RDMA/cm: Convert REQ SL fields
RDMA/cm: Convert REQ subnet local fields
RDMA/cm: Convert REQ local ack timeout
RDMA/cm: Convert MRA MRAed field
RDMA/cm: Convert MRA service timeout
RDMA/cm: Update REJ struct to use new scheme
RDMA/cm: Convert REP target ack delay field
RDMA/cm: Convert REP failover accepted field
RDMA/cm: Convert REP flow control field
RDMA/cm: Convert REP RNR retry count field
RDMA/cm: Convert REP SRQ field
RDMA/cm: Delete unused CM LAP functions
RDMA/cm: Convert LAP flow label field
RDMA/cm: Convert LAP fields
RDMA/cm: Delete unused CM ARP functions
RDMA/cm: Convert SIDR_REP to new scheme

 drivers/infiniband/core/cm.c      | 519 +++++++----------
 drivers/infiniband/core/cm_msgs.h | 920 +++++++++++-------------------
 drivers/infiniband/core/cma.c     |  11 +-
 include/rdma/ib_cm.h              |  51 --
 4 files changed, 549 insertions(+), 952 deletions(-)

--
2.20.1

Leon Romanovsky

author

2019-10-27 07:06 UTC #1 lore raw

PATCH 1/43 RDMA/cm: Add naive SET/GET implementations to hide CM wire format

From: Leon Romanovsky <[email protected]>

There is no separation between RDMA-CM wire format as it is declared in IBTA and kernel logic which implements needed support. Such situation causes to many mistakes in conversion between big-endian (wire format) and CPU format used by kernel. It also mixes RDMA core code with combination of uXX and beXX variables.

The idea that every converted variable will have two fields which describes the byte offset and mask for the access, e.g.

#define CM_REP_LOCAL_QPN_OFFSET 12
#define CM_REP_LOCAL_QPN_MASK GENMASK(23, 0)

Such format will allow us to use same GET/SET macros for all be16/be32 variables and bitfields too.

Separate wire protocol from kernel logic by special GET/SET macros.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm_msgs.h | 71 +++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

drivers/infiniband/core/cm_msgs.h +71 -0

index 92d7260ac913..99e35a4610f1 100644
@@ -8,6 +8,7 @@
 #ifndef CM_MSGS_H
 #define CM_MSGS_H
 
+#include <linux/bitfield.h>
 #include <rdma/ib_mad.h>
 #include <rdma/ib_cm.h>

@@ -17,6 +18,76 @@
  */
 
 #define IB_CM_CLASS_VERSION	2 /* IB specification 1.2 */
+#define _CM_SET(p, offset, mask, value)                                        \
+	({                                                                     \
+		void *field = (u8 *)p + sizeof(struct ib_mad_hdr) + offset;    \
+		u8 bytes =                                                     \
+			DIV_ROUND_UP(__builtin_popcount(mask), BITS_PER_BYTE); \
+		switch (bytes) {                                               \
+		case 1: {                                                      \
+			*(u8 *)field &= ~mask;                                 \
+			*(u8 *)field |= FIELD_PREP(mask, value);               \
+		} break;                                                       \
+		case 2: {                                                      \
+			u16 val = ntohs(*(__be16 *)field) & ~mask;             \
+			val |= FIELD_PREP(mask, value);                        \
+			*(__be16 *)field = htons(val);                         \
+		} break;                                                       \
+		case 3: {                                                      \
+			u32 val = ntohl(*(__be32 *)field) & ~(mask << 8);      \
+			val |= FIELD_PREP(mask, value) << 8;                   \
+			*(__be32 *)field = htonl(val);                         \
+		} break;                                                       \
+		default: {                                                     \
+			u32 val = ntohl(*(__be32 *)field) & ~mask;             \
+			val |= FIELD_PREP(mask, value);                        \
+			*(__be32 *)field = htonl(val);                         \
+		} break;                                                       \
+		}                                                              \
+	})
+#define CM_SET(field, p, value)                                                \
+	_CM_SET(p, CM_##field##_OFFSET, CM_##field##_MASK, value)
+#define CM_SET64(field, p, value)                                              \
+	({                                                                     \
+		_CM_SET(p, CM_##field##_OFFSET,                                \
+			lower_32_bits(CM_##field##_MASK),                      \
+			lower_32_bits(value));                                 \
+		_CM_SET(p, CM_##field##_OFFSET + sizeof(__be32),               \
+			upper_32_bits(CM_##field##_MASK),                      \
+			upper_32_bits(value));                                 \
+	})
+
+#define _CM_GET(p, offset, mask)                                               \
+	({                                                                     \
+		void *field = (u8 *)p + sizeof(struct ib_mad_hdr) + offset;    \
+		u8 bytes =                                                     \
+			DIV_ROUND_UP(__builtin_popcount(mask), BITS_PER_BYTE); \
+		u32 ret;                                                       \
+		switch (bytes) {                                               \
+		case 1:                                                        \
+			ret = FIELD_GET(mask, *(u8 *)field);                   \
+			break;                                                 \
+		case 2:                                                        \
+			ret = FIELD_GET(mask, ntohs(*(__be16 *)field));        \
+			break;                                                 \
+		case 3:                                                        \
+			ret = FIELD_GET(mask, ntohl(*(__be32 *)field) >> 8);   \
+			break;                                                 \
+		default:                                                       \
+			ret = FIELD_GET(mask, ntohl(*(__be32 *)field));        \
+		}                                                              \
+		ret;                                                           \
+	})
+
+#define CM_GET(field, p) _CM_GET(p, CM_##field##_OFFSET, CM_##field##_MASK)
+#define CM_GET64(field, p)                                                     \
+	({                                                                     \
+		u64 a = _CM_GET(p, CM_##field##_OFFSET,                        \
+				lower_32_bits(CM_##field##_MASK));             \
+		u64 b = _CM_GET(p, CM_##field##_OFFSET + sizeof(__be32),       \
+				upper_32_bits(CM_##field##_MASK));             \
+		a | (b << 32);                                                 \
+	})
 
 struct cm_req_msg {
 	struct ib_mad_hdr hdr;

Signature · 1 line

2.20.1

Jason Gunthorpe

2019-11-15 20:46 UTC #2 lore raw

Re: [PATCH rdma-next 01/43] RDMA/cm: Add naive SET/GET implementations to hide CM wire format

Quoted 10 lines · Leon Romanovsky

#define IB_CM_CLASS_VERSION 2 /* IB specification 1.2 */

drivers/infiniband/core/cm_msgs.h +9 -0

+#define _CM_SET(p, offset, mask, value)                                        \
+	({                                                                     \
+		void *field = (u8 *)p + sizeof(struct ib_mad_hdr) + offset;    \
+		u8 bytes =                                                     \
+			DIV_ROUND_UP(__builtin_popcount(mask), BITS_PER_BYTE); \
+		switch (bytes) {                                               \
+		case 1: {                                                      \
+			*(u8 *)field &= ~mask;                                 \
+			*(u8 *)field |= FIELD_PREP(mask, value);               \

drivers/infiniband/core/cm_msgs.h line 39

Quoted 10 lines

drivers/infiniband/core/cm_msgs.h +10 -0

+		} break;                                                       \
+		case 2: {                                                      \
+			u16 val = ntohs(*(__be16 *)field) & ~mask;             \
+			val |= FIELD_PREP(mask, value);                        \
+			*(__be16 *)field = htons(val);                         \
+		} break;                                                       \
+		case 3: {                                                      \
+			u32 val = ntohl(*(__be32 *)field) & ~(mask << 8);      \
+			val |= FIELD_PREP(mask, value) << 8;                   \
+			*(__be32 *)field = htonl(val);                         \

This doesn't work for flow label which has a 20 byte field, the <<8 is just a hack to fix the 24 byte case.

This is also some typo's:

Quoted 2 lines

+ #define CM_REQ_LOCAL_EECN_OFFSET 36
+ #define CM_REQ_LOCAL_EECN_MASK GENMASK(24, 0)

Should be 23, 0

Quoted 2 lines

+ #define CM_REQ_PRIMARY_PACKET_RATE_OFFSET 91
+ #define CM_REQ_PRIMARY_PACKET_RATE_MASK GENMASK(3, 2)

Packet rate is a 6 bit field, not a 2 bit field

I only looked at REQ. I assume all the others have a similar error rate.

Overall, I don't like this approach. The macros are messy/buggy and there isn't a clear mapping of the data in the tables to the C code.

How about this instead:

static inline u32 _cm_get8(const u8 *ptr)

{
	return *ptr;
}

static inline void _cm_set8(u8 *ptr, u32 mask, u32 prep_value)

{
	*ptr = (*ptr & ~mask) | prep_value;
}

static inline u16 _cm_get16(const __be16 *ptr)

{
	return be16_to_cpu(*ptr);
}

static inline void _cm_set16(__be16 *ptr, u16 mask, u16 prep_value)

{
	*ptr = cpu_to_be16((be16_to_cpu(*ptr) & ~mask) | prep_value);
}

static inline u32 _cm_get32(const __be32 *ptr)

{
	return be32_to_cpu(*ptr);
}

static inline void _cm_set32(__be32 *ptr, u32 mask, u32 prep_value)

{
	*ptr = cpu_to_be32((be32_to_cpu(*ptr) & ~mask) | prep_value);
}

static inline u64 _cm_get64(const __be64 *ptr)

{
	/*
	 * The mads are constructed so that 32 bit and smaller are naturally
	 * aligned, everything larger has a max alignment of 4 bytes.
	 */
	return be64_to_cpu(get_unaligned(ptr));
}

static inline void _cm_set64(__be64 *ptr, u64 mask, u64 prep_value)

{
	put_unaligned(cpu_to_be64((_cm_get64(ptr) & ~mask) | prep_value), ptr);
}

#define _CM_SET(field_struct, field_offset, field_mask, mask_width, ptr,       \
		value)                                                         \
	({                                                                     \
		field_struct *_ptr = ptr;                                      \
		_cm_set##mask_width((void *)_ptr + (field_offset), field_mask, \
				    FIELD_PREP(field_mask, value));            \
	})

#define CM_SET(field, ptr, value) _CM_SET(field, ptr, value)

#define _CM_SET_GID(field, ptr, val)                                           \
	({                                                                     \
		field_struct *_ptr = ptr;                                      \
		const union ib_gid *_val = val;                                \
		memcpy((void *)_ptr + field_offset, _val, sizeof(*_out));      \
	})

#define CM_SET_GID(field, ptr, val) _CM_SET_GID(field, ptr, val)

#define _CM_GET(field_struct, field_offset, field_mask, mask_width, ptr)       \
	({                                                                     \
		const field_struct *_ptr = ptr;                                \
		(u##mask_width) FIELD_GET(                                     \
			field_mask, _cm_get##mask_width((const void *)_ptr +   \
							(field_offset)));      \
	})

#define CM_GET(field, ptr) _CM_GET(field, ptr)

#define _CM_GET_GID(field_struct, field_offset, ptr, out)                      \
	({                                                                     \
		const field_struct *_ptr = ptr;                                \
		union ib_gid *_out = out;                                      \
		memcpy(_out, (void *)_ptr + field_offset, sizeof(*_out));      \
	})

#define CM_GET_GID(field, ptr, out) _CM_GET_GID(field, ptr, out)

/*
* The generated list becomes the parameters to the macros, the order is:

 *  - struct this applies to
 *  - starting offset of the max
 *  - GENMASK or GENMASK_ULL in CPU order
 *  - The width of data the mask operations should work on, in bits

/*
* Extraction using a tabular description like table 106. bit_offset is from
* the Byte[Bit] notation.
*/

#define IBA_FIELD_BLOC(field_struct, byte_offset, bit_offset, num_bits)        \
	field_struct, byte_offset,                                             \
		GENMASK(7 - (bit_offset), 7 - (bit_offset) - (num_bits - 1)),  \
		8

#define IBA_FIELD8_LOC(field_struct, byte_offset, num_bits) \
IBA_FIELD_BLOC(field_struct, byte_offset, 0, num_bits)

#define IBA_FIELD16_LOC(field_struct, byte_offset, num_bits)                   \
	field_struct, (byte_offset)&0xFFFE,                                    \
		GENMASK(15 - (((byte_offset) % 2) * 8),                        \
			15 - (((byte_offset) % 2) * 8) - (num_bits - 1)),      \
		16

#define IBA_FIELD32_LOC(field_struct, byte_offset, num_bits)                   \
	field_struct, (byte_offset)&0xFFFC,                                    \
		GENMASK(31 - (((byte_offset) % 4) * 8),                        \
			31 - (((byte_offset) % 4) * 8) - (num_bits - 1)),      \
		32

#define IBA_FIELD64_LOC(field_struct, byte_offset, num_bits)                   \
	field_struct, (byte_offset)&0xFFF8,                                    \
		GENMASK_ULL(63 - (((byte_offset) % 8) * 8),                    \
			    63 - (((byte_offset) % 8) * 8) - (num_bits - 1)),  \
		64

#define IBA_FIELD_GID_LOC(field_struct, byte_offset) field_struct, byte_offset

/* From Table 106 */
#define CM_REQ_LOCAL_COMM_ID IBA_FIELD32_LOC(struct cm_req_msg, 0, 32) #define CM_REQ_SERVICE_ID IBA_FIELD64_LOC(struct cm_req_msg, 8, 64) #define CM_REQ_LOCAL_CA_GUID IBA_FIELD64_LOC(struct cm_req_msg, 16, 64) #define CM_REQ_LOCAL_Q_KEY IBA_FIELD32_LOC(struct cm_req_msg, 28, 32) #define CM_REQ_LOCAL_QPN IBA_FIELD32_LOC(struct cm_req_msg, 32, 24) #define CM_REQ_RESPONDED_RESOURCES IBA_FIELD8_LOC(struct cm_req_msg, 35, 8) #define CM_REQ_LOCAL_EECN IBA_FIELD32_LOC(struct cm_req_msg, 36, 24) #define CM_REQ_INITIATOR_DEPTH IBA_FIELD8_LOC(struct cm_req_msg, 39, 8) #define CM_REQ_REMOTE_EECN IBA_FIELD32_LOC(struct cm_req_msg, 40, 24) #define CM_REQ_REMOTE_CM_RESPONSE_TIMEOUT IBA_FIELD8_LOC(struct cm_req_msg, 43, 5) #define CM_REQ_TRANSPORT_SERVICE_TYPE IBA_FIELD_BLOC(struct cm_req_msg, 43, 5, 2) #define CM_REQ_END_TO_END_FLOW_CONTROL IBA_FIELD_BLOC(struct cm_req_msg, 43, 7, 1) #define CM_REQ_STARTING_PSN IBA_FIELD32_LOC(struct cm_req_msg, 44, 24) #define CM_REQ_LOCAL_CM_RESPONSE_TIMEOUT IBA_FIELD8_LOC(struct cm_req_msg, 47, 5) #define CM_REQ_RETRY_COUNT IBA_FIELD_BLOC(struct cm_req_msg, 47, 5, 3) #define CM_REQ_PARTITION_KEY IBA_FIELD16_LOC(struct cm_req_msg, 48, 16) #define CM_REQ_PATH_PACKET_PAYLOAD_MTU IBA_FIELD8_LOC(struct cm_req_msg, 50, 4) #define CM_REQ_RDC_EXISTS IBA_FIELD_BLOC(struct cm_req_msg, 50, 4, 1) #define CM_REQ_RNR_RETRY_COUNT IBA_FIELD_BLOC(struct cm_req_msg, 50, 5, 3) #define CM_REQ_MAX_CM_RETRIES IBA_FIELD8_LOC(struct cm_req_msg, 51, 4) #define CM_REQ_SRQ IBA_FIELD_BLOC(struct cm_req_msg, 51, 4, 1)
#define CM_REQ_EXTENDED_TRANSPORT_TYPE IBA_FIELD_BLOC(struct cm_req_msg, 51, 5, 3) #define CM_REQ_PRIMARY_LOCAL_PORT_LID IBA_FIELD16_LOC(struct cm_req_msg, 52, 16) #define CM_REQ_PRIMARY_REMOTE_PORT_LID IBA_FIELD16_LOC(struct cm_req_msg, 54, 16) #define CM_REQ_PRIMARY_LOCAL_PORT_GID IBA_FIELD_GID_LOC(struct cm_req_msg, 56) #define CM_REQ_PRIMARY_REMOTE_PORT_GID IBA_FIELD_GID_LOC(struct cm_req_msg, 72) #define CM_REQ_PRIMARY_FLOW_LABEL IBA_FIELD32_LOC(struct cm_req_msg, 88, 20) #define CM_REQ_PRIMARY_PACKET_RATE IBA_FIELD_BLOC(struct cm_req_msg, 91, 2, 6) #define CM_REQ_PRIMARY_TRAFFIC_CLASS IBA_FIELD8_LOC(struct cm_req_msg, 92, 8) #define CM_REQ_PRIMARY_HOP_LIMIT IBA_FIELD8_LOC(struct cm_req_msg, 93, 8) #define CM_REQ_PRIMARY_SL IBA_FIELD8_LOC(struct cm_req_msg, 94, 4) #define CM_REQ_PRIMARY_SUBNET_LOCAL IBA_FIELD_BLOC(struct cm_req_msg, 94, 4, 1) #define CM_REQ_PRIMARY_LOCAL_ACK_TIMEOUT IBA_FIELD8_LOC(struct cm_req_msg, 95, 5) #define CM_REQ_ALTERNATE_LOCAL_PORT_LID IBA_FIELD16_LOC(struct cm_req_msg, 96, 16) #define CM_REQ_ALTERNATE_REMOTE_PORT_LID IBA_FIELD16_LOC(struct cm_req_msg, 98, 16) #define CM_REQ_ALTERNATE_LOCAL_PORT_GID IBA_FIELD_GID_LOC(struct cm_req_msg, 100) #define CM_REQ_ALTERNATE_REMOTE_PORT_GID IBA_FIELD_GID_LOC(struct cm_req_msg, 116) #define CM_REQ_ALTERNATE_FLOW_LABEL IBA_FIELD32_LOC(struct cm_req_msg, 132, 20) #define CM_REQ_ALTERNATE_PACKET_RATE IBA_FIELD_BLOC(struct cm_req_msg, 135, 2, 6) #define CM_REQ_ALTERNATE_TRAFFIC_CLASS IBA_FIELD8_LOC(struct cm_req_msg, 136, 8) #define CM_REQ_ALTERNATE_HOP_LIMIT IBA_FIELD8_LOC(struct cm_req_msg, 137, 8) #define CM_REQ_ALTERNATE_SL IBA_FIELD8_LOC(struct cm_req_msg, 138, 4) #define CM_REQ_ALTERNATE_SUBNET_LOCAL IBA_FIELD_BLOC(struct cm_req_msg, 138, 4, 1) #define CM_REQ_ALTERNATE_LOCAL_ACK_TIMEOUT IBA_FIELD8_LOC(struct cm_req_msg, 139, 5) #define CM_REQ_SAP_SUPPORTED IBA_FIELD_BLOC(struct cm_req_msg, 139, 5, 1)

Leon Romanovsky

author

2019-11-18 13:05 UTC #3 lore raw

Re: [PATCH rdma-next 01/43] RDMA/cm: Add naive SET/GET implementations to hide CM wire format

Quoted 38 lines · Jason Gunthorpe

Quoted 10 lines · Leon Romanovsky
#define IB_CM_CLASS_VERSION 2 /* IB specification 1.2 */
drivers/infiniband/core/cm_msgs.h +9 -0
+#define _CM_SET(p, offset, mask, value)                                        \
+	({                                                                     \
+		void *field = (u8 *)p + sizeof(struct ib_mad_hdr) + offset;    \
+		u8 bytes =                                                     \
+			DIV_ROUND_UP(__builtin_popcount(mask), BITS_PER_BYTE); \
+		switch (bytes) {                                               \
+		case 1: {                                                      \
+			*(u8 *)field &= ~mask;                                 \
+			*(u8 *)field |= FIELD_PREP(mask, value);               \
drivers/infiniband/core/cm_msgs.h line 39
Quoted 10 lines
drivers/infiniband/core/cm_msgs.h +10 -0
+		} break;                                                       \
+		case 2: {                                                      \
+			u16 val = ntohs(*(__be16 *)field) & ~mask;             \
+			val |= FIELD_PREP(mask, value);                        \
+			*(__be16 *)field = htons(val);                         \
+		} break;                                                       \
+		case 3: {                                                      \
+			u32 val = ntohl(*(__be32 *)field) & ~(mask << 8);      \
+			val |= FIELD_PREP(mask, value) << 8;                   \
+			*(__be32 *)field = htonl(val);                         \
This doesn't work for flow label which has a 20 byte field, the <<8 is just a hack to fix the 24 byte case.
This is also some typo's:
Quoted 2 lines
+ #define CM_REQ_LOCAL_EECN_OFFSET 36
+ #define CM_REQ_LOCAL_EECN_MASK GENMASK(24, 0)
Should be 23, 0
Quoted 2 lines
+ #define CM_REQ_PRIMARY_PACKET_RATE_OFFSET 91
+ #define CM_REQ_PRIMARY_PACKET_RATE_MASK GENMASK(3, 2)
Packet rate is a 6 bit field, not a 2 bit field

Quoted 7 lines

I only looked at REQ. I assume all the others have a similar error rate.
Overall, I don't like this approach. The macros are messy/buggy and there isn't a clear mapping of the data in the tables to the C code.
How about this instead:

I very liked type safety in your solution, but I think that IBA_FIELD*_LOC() macros add too much magic into such simple thing like spec declarations.

I'll update, recheck and resend.

Thanks

Jason Gunthorpe

2019-11-18 13:43 UTC #4 lore raw

Re: [PATCH rdma-next 01/43] RDMA/cm: Add naive SET/GET implementations to hide CM wire format

Quoted 42 lines · Leon Romanovsky

Quoted 41 lines · Jason Gunthorpe
Quoted 10 lines · Leon Romanovsky
#define IB_CM_CLASS_VERSION 2 /* IB specification 1.2 */
drivers/infiniband/core/cm_msgs.h +9 -0
+#define _CM_SET(p, offset, mask, value)                                        \
+	({                                                                     \
+		void *field = (u8 *)p + sizeof(struct ib_mad_hdr) + offset;    \
+		u8 bytes =                                                     \
+			DIV_ROUND_UP(__builtin_popcount(mask), BITS_PER_BYTE); \
+		switch (bytes) {                                               \
+		case 1: {                                                      \
+			*(u8 *)field &= ~mask;                                 \
+			*(u8 *)field |= FIELD_PREP(mask, value);               \
drivers/infiniband/core/cm_msgs.h line 39
Quoted 10 lines
drivers/infiniband/core/cm_msgs.h +10 -0
+		} break;                                                       \
+		case 2: {                                                      \
+			u16 val = ntohs(*(__be16 *)field) & ~mask;             \
+			val |= FIELD_PREP(mask, value);                        \
+			*(__be16 *)field = htons(val);                         \
+		} break;                                                       \
+		case 3: {                                                      \
+			u32 val = ntohl(*(__be32 *)field) & ~(mask << 8);      \
+			val |= FIELD_PREP(mask, value) << 8;                   \
+			*(__be32 *)field = htonl(val);                         \
This doesn't work for flow label which has a 20 byte field, the <<8 is just a hack to fix the 24 byte case.
This is also some typo's:
Quoted 2 lines
+ #define CM_REQ_LOCAL_EECN_OFFSET 36
+ #define CM_REQ_LOCAL_EECN_MASK GENMASK(24, 0)
Should be 23, 0
Quoted 2 lines
+ #define CM_REQ_PRIMARY_PACKET_RATE_OFFSET 91
+ #define CM_REQ_PRIMARY_PACKET_RATE_MASK GENMASK(3, 2)
Packet rate is a 6 bit field, not a 2 bit field
I only looked at REQ. I assume all the others have a similar error rate.

Quoted 7 lines

Quoted 4 lines
Overall, I don't like this approach. The macros are messy/buggy and there isn't a clear mapping of the data in the tables to the C code.
How about this instead:
I very liked type safety in your solution, but I think that IBA_FIELD*_LOC() macros add too much magic into such simple thing like spec declarations.

That 'magic' means we can just copy the spec text directly and don't have to reprocess it by hand via different magic, which caused all the mistakes above.

Jason

Leon Romanovsky

author

2019-10-27 07:06 UTC #5 lore raw

PATCH 2/43 RDMA/cm: Request For Communication (REQ) message definitions

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Add Request For Communication (REQ) message definitions as it is written in IBTA release 1.3 volume 1.

There are three types of definitions:
1. Regular ones with offset and mask, they will be accessible by CM_GET()/CM_SET().
2. GIDs with offset only, they will be accessible by CM_GET_GID()/CM_SET_GID().
3. Private data with offset and length in bytes.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  4 +-
 drivers/infiniband/core/cm_msgs.h | 99 ++++++++++++++++++++++++++++++-
 drivers/infiniband/core/cma.c     |  3 +-
 include/rdma/ib_cm.h              |  1 -
 4 files changed, 102 insertions(+), 5 deletions(-)

drivers/infiniband/core/cm.c +2 -2

index ecd868954958..7163a5782bea 100644
@@ -1368,7 +1368,7 @@ static int cm_validate_req_param(struct ib_cm_req_param *param)
 		return -EINVAL;
 
 	if (param->private_data &&
-	    param->private_data_len > IB_CM_REQ_PRIVATE_DATA_SIZE)
+	    param->private_data_len > CM_REQ_PRIVATE_DATA_SIZE)
 		return -EINVAL;
 
 	if (param->alternate_path &&

@@ -1681,7 +1681,7 @@ static void cm_format_req_event(struct cm_work *work,
 	param->srq = cm_req_get_srq(req_msg);
 	param->ppath_sgid_attr = cm_id_priv->av.ah_attr.grh.sgid_attr;
 	work->cm_event.private_data = &req_msg->private_data;
-	work->cm_event.private_data_len = IB_CM_REQ_PRIVATE_DATA_SIZE;
+	work->cm_event.private_data_len = CM_REQ_PRIVATE_DATA_SIZE;
 }
 
 static void cm_process_work(struct cm_id_private *cm_id_priv,

drivers/infiniband/core/cm_msgs.h +98 -1

111 lines not on this page · raw message

drivers/infiniband/core/cma.c +2 -1

index 8f318928f29d..8e98faf071cf 100644
@@ -36,6 +36,7 @@
 
 #include "core_priv.h"
 #include "cma_priv.h"
+#include "cm_msgs.h"
 
 MODULE_AUTHOR("Sean Hefty");
 MODULE_DESCRIPTION("Generic RDMA CM Agent");

@@ -2085,7 +2086,7 @@ static void cma_set_req_event_data(struct rdma_cm_event *event,
 				   void *private_data, int offset)
 {
 	event->param.conn.private_data = private_data + offset;
-	event->param.conn.private_data_len = IB_CM_REQ_PRIVATE_DATA_SIZE - offset;
+	event->param.conn.private_data_len = CM_REQ_PRIVATE_DATA_SIZE - offset;
 	event->param.conn.responder_resources = req_data->responder_resources;
 	event->param.conn.initiator_depth = req_data->initiator_depth;
 	event->param.conn.flow_control = req_data->flow_control;

include/rdma/ib_cm.h +0 -1

index b476e0e27ec9..956256b2fc5d 100644
@@ -65,7 +65,6 @@ enum ib_cm_event_type {
 };
 
 enum ib_cm_data_size {
-	IB_CM_REQ_PRIVATE_DATA_SIZE	 = 92,
 	IB_CM_MRA_PRIVATE_DATA_SIZE	 = 222,
 	IB_CM_REJ_PRIVATE_DATA_SIZE	 = 148,
 	IB_CM_REP_PRIVATE_DATA_SIZE	 = 196,

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:06 UTC #6 lore raw

PATCH 3/43 RDMA/cm: Message Receipt Acknowledgment (MRA) message definitions

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Add Message Receipt Acknowledgment (MRA) definitions as it is written in IBTA release 1.3 volume 1.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  4 ++--
 drivers/infiniband/core/cm_msgs.h | 13 ++++++++++++-
 include/rdma/ib_cm.h              |  1 -
 3 files changed, 14 insertions(+), 4 deletions(-)

drivers/infiniband/core/cm.c +2 -2

index 7163a5782bea..c477629f5106 100644
@@ -2894,7 +2894,7 @@ int ib_send_cm_mra(struct ib_cm_id *cm_id,
 	unsigned long flags;
 	int ret;
 
-	if (private_data && private_data_len > IB_CM_MRA_PRIVATE_DATA_SIZE)
+	if (private_data && private_data_len > CM_MRA_PRIVATE_DATA_SIZE)
 		return -EINVAL;
 
 	data = cm_copy_private_data(private_data, private_data_len);

@@ -2988,7 +2988,7 @@ static int cm_mra_handler(struct cm_work *work)
 		return -EINVAL;
 
 	work->cm_event.private_data = &mra_msg->private_data;
-	work->cm_event.private_data_len = IB_CM_MRA_PRIVATE_DATA_SIZE;
+	work->cm_event.private_data_len = CM_MRA_PRIVATE_DATA_SIZE;
 	work->cm_event.param.mra_rcvd.service_timeout =
 					cm_mra_get_service_timeout(mra_msg);
 	timeout = cm_convert_to_ms(cm_mra_get_service_timeout(mra_msg)) +

drivers/infiniband/core/cm_msgs.h +12 -1

index a9112af2b325..20784b0fa4af 100644
@@ -186,6 +186,17 @@
 #define CM_REQ_PRIVATE_DATA_OFFSET 140
 #define CM_REQ_PRIVATE_DATA_SIZE 92
 
+#define CM_MRA_LOCAL_COMM_ID_OFFSET 0
+#define CM_MRA_LOCAL_COMM_ID_MASK GENMASK(31, 0)
+#define CM_MRA_REMOTE_COMM_ID_OFFSET 4
+#define CM_MRA_REMOTE_COMM_ID_MASK GENMASK(31, 0)
+#define CM_MRA_MESSAGE_MRAED_OFFSET 8
+#define CM_MRA_MESSAGE_MRAED_MASK GENMASK(1, 0)
+#define CM_MRA_SERVICE_TIMEOUT_OFFSET 9
+#define CM_MRA_SERVICE_TIMEOUT_MASK GENMASK(4, 0)
+#define CM_MRA_PRIVATE_DATA_OFFSET 10
+#define CM_MRA_PRIVATE_DATA_SIZE 222
+
 struct cm_req_msg {
 	struct ib_mad_hdr hdr;

@@ -563,7 +574,7 @@ enum cm_msg_response {
 	/* service timeout:5, rsvd:3 */
 	u8 offset9;
 
-	u8 private_data[IB_CM_MRA_PRIVATE_DATA_SIZE];
+	u8 private_data[CM_MRA_PRIVATE_DATA_SIZE];
 
 } __packed;

include/rdma/ib_cm.h +0 -1

index 956256b2fc5d..6d73316be651 100644
@@ -65,7 +65,6 @@ enum ib_cm_event_type {
 };
 
 enum ib_cm_data_size {
-	IB_CM_MRA_PRIVATE_DATA_SIZE	 = 222,
 	IB_CM_REJ_PRIVATE_DATA_SIZE	 = 148,
 	IB_CM_REP_PRIVATE_DATA_SIZE	 = 196,
 	IB_CM_RTU_PRIVATE_DATA_SIZE	 = 224,

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:06 UTC #7 lore raw

PATCH 4/43 RDMA/cm: Reject (REJ) message definitions

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Add Reject (REJ) definitions as it is written
in IBTA release 1.3 volume 1.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  6 +++---
 drivers/infiniband/core/cm_msgs.h | 19 +++++++++++++++++--
 drivers/infiniband/core/cma.c     |  2 +-
 include/rdma/ib_cm.h              |  2 --
 4 files changed, 21 insertions(+), 8 deletions(-)

drivers/infiniband/core/cm.c +3 -3

index c477629f5106..d8e28c15b9d8 100644
@@ -2713,8 +2713,8 @@ int ib_send_cm_rej(struct ib_cm_id *cm_id,
 	unsigned long flags;
 	int ret;
 
-	if ((private_data && private_data_len > IB_CM_REJ_PRIVATE_DATA_SIZE) ||
-	    (ari && ari_length > IB_CM_REJ_ARI_LENGTH))
+	if ((private_data && private_data_len > CM_REJ_PRIVATE_DATA_SIZE) ||
+	    (ari && ari_length > CM_REJ_ARI_SIZE))
 		return -EINVAL;
 
 	cm_id_priv = container_of(cm_id, struct cm_id_private, id);

@@ -2775,7 +2775,7 @@ static void cm_format_rej_event(struct cm_work *work)
 	param->ari_length = cm_rej_get_reject_info_len(rej_msg);
 	param->reason = __be16_to_cpu(rej_msg->reason);
 	work->cm_event.private_data = &rej_msg->private_data;
-	work->cm_event.private_data_len = IB_CM_REJ_PRIVATE_DATA_SIZE;
+	work->cm_event.private_data_len = CM_REJ_PRIVATE_DATA_SIZE;
 }
 
 static struct cm_id_private * cm_acquire_rejected_id(struct cm_rej_msg *rej_msg)

drivers/infiniband/core/cm_msgs.h +17 -2

index 20784b0fa4af..448f9ba39564 100644
@@ -197,6 +197,21 @@
 #define CM_MRA_PRIVATE_DATA_OFFSET 10
 #define CM_MRA_PRIVATE_DATA_SIZE 222
 
+#define CM_REJ_LOCAL_COMM_ID_OFFSET 0
+#define CM_REJ_LOCAL_COMM_ID_MASK GENMASK(31, 0)
+#define CM_REJ_REMOTE_COMM_ID_OFFSET 4
+#define CM_REJ_REMOTE_COMM_ID__MASK GENMASK(31, 0)
+#define CM_REJ_MESSAGE_REJECTED_OFFSET 8
+#define CM_REJ_MESSAGE_REJECTED_MASK GENMASK(1, 0)
+#define CM_REJ_REJECTED_INFO_LENGTH_OFFSET 9
+#define CM_REJ_REJECTED_INFO_LENGTH_MASK GENMASK(6, 0)
+#define CM_REJ_REASON_OFFSET 10
+#define CM_REJ_REASON_MASK GENMASK(15, 0)
+#define CM_REJ_ARI_OFFSET 12
+#define CM_REJ_ARI_SIZE 72
+#define CM_REJ_PRIVATE_DATA_OFFSET 84
+#define CM_REJ_PRIVATE_DATA_SIZE 148
+
 struct cm_req_msg {
 	struct ib_mad_hdr hdr;

@@ -610,9 +625,9 @@ struct cm_rej_msg {
 	/* reject info length:7, rsvd:1. */
 	u8 offset9;
 	__be16 reason;
-	u8 ari[IB_CM_REJ_ARI_LENGTH];
+	u8 ari[CM_REJ_ARI_SIZE];
 
-	u8 private_data[IB_CM_REJ_PRIVATE_DATA_SIZE];
+	u8 private_data[CM_REJ_PRIVATE_DATA_SIZE];
 
 } __packed;

drivers/infiniband/core/cma.c +1 -1

index 8e98faf071cf..38909e4835d5 100644
@@ -1951,7 +1951,7 @@ static int cma_ib_handler(struct ib_cm_id *cm_id,
 		event.status = ib_event->param.rej_rcvd.reason;
 		event.event = RDMA_CM_EVENT_REJECTED;
 		event.param.conn.private_data = ib_event->private_data;
-		event.param.conn.private_data_len = IB_CM_REJ_PRIVATE_DATA_SIZE;
+		event.param.conn.private_data_len = CM_REJ_PRIVATE_DATA_SIZE;
 		break;
 	default:
 		pr_err("RDMA CMA: unexpected IB CM event: %d\n",

include/rdma/ib_cm.h +0 -2

index 6d73316be651..a5b9bd49041b 100644
@@ -65,12 +65,10 @@ enum ib_cm_event_type {
 };
 
 enum ib_cm_data_size {
-	IB_CM_REJ_PRIVATE_DATA_SIZE	 = 148,
 	IB_CM_REP_PRIVATE_DATA_SIZE	 = 196,
 	IB_CM_RTU_PRIVATE_DATA_SIZE	 = 224,
 	IB_CM_DREQ_PRIVATE_DATA_SIZE	 = 220,
 	IB_CM_DREP_PRIVATE_DATA_SIZE	 = 224,
-	IB_CM_REJ_ARI_LENGTH		 = 72,
 	IB_CM_LAP_PRIVATE_DATA_SIZE	 = 168,
 	IB_CM_APR_PRIVATE_DATA_SIZE	 = 148,
 	IB_CM_APR_INFO_LENGTH		 = 72,

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:06 UTC #8 lore raw

PATCH 5/43 RDMA/cm: Reply To Request for communication (REP) definitions

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Add REP message definitions as it is written
in IBTA release 1.3 volume 1.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  4 ++--
 drivers/infiniband/core/cm_msgs.h | 34 ++++++++++++++++++++++++++++++-
 drivers/infiniband/core/cma.c     |  2 +-
 include/rdma/ib_cm.h              |  1 -
 4 files changed, 36 insertions(+), 5 deletions(-)

drivers/infiniband/core/cm.c +2 -2

index d8e28c15b9d8..85836f8e5c67 100644
@@ -2068,7 +2068,7 @@ int ib_send_cm_rep(struct ib_cm_id *cm_id,
 	int ret;
 
 	if (param->private_data &&
-	    param->private_data_len > IB_CM_REP_PRIVATE_DATA_SIZE)
+	    param->private_data_len > CM_REP_PRIVATE_DATA_SIZE)
 		return -EINVAL;
 
 	cm_id_priv = container_of(cm_id, struct cm_id_private, id);

@@ -2194,7 +2194,7 @@ static void cm_format_rep_event(struct cm_work *work, enum ib_qp_type qp_type)
 	param->rnr_retry_count = cm_rep_get_rnr_retry_count(rep_msg);
 	param->srq = cm_rep_get_srq(rep_msg);
 	work->cm_event.private_data = &rep_msg->private_data;
-	work->cm_event.private_data_len = IB_CM_REP_PRIVATE_DATA_SIZE;
+	work->cm_event.private_data_len = CM_REP_PRIVATE_DATA_SIZE;
 }
 
 static void cm_dup_rep_handler(struct cm_work *work)

drivers/infiniband/core/cm_msgs.h +33 -1

index 448f9ba39564..39fcd1231378 100644
@@ -212,6 +212,38 @@
 #define CM_REJ_PRIVATE_DATA_OFFSET 84
 #define CM_REJ_PRIVATE_DATA_SIZE 148
 
+#define CM_REP_LOCAL_COMM_ID_OFFSET 0
+#define CM_REP_LOCAL_COMM_ID_MASK GENMASK(31, 0)
+#define CM_REP_REMOTE_COMM_ID_OFFSET 4
+#define CM_REP_REMOTE_COMM_ID_MASK GENMASK(31, 0)
+#define CM_REP_LOCAL_Q_KEY_OFFSET 8
+#define CM_REP_LOCAL_Q_KEY_MASK GENMASK(31, 0)
+#define CM_REP_LOCAL_QPN_OFFSET 12
+#define CM_REP_LOCAL_QPN_MASK GENMASK(23, 0)
+#define CM_REP_LOCAL_EE_CONTEXT_NUMBER_OFFSET 16
+#define CM_REP_LOCAL_EE_CONTEXT_NUMBER_MASK GENMASK(23, 0)
+#define CM_REP_STARTING_PSN_OFFSET 20
+#define CM_REP_STARTING_PSN_MASK GENMASK(23, 0)
+#define CM_REP_RESPONDER_RESOURCES_OFFSET 24
+#define CM_REP_RESPONDED_RESOURCES_MASK GENMASK(7, 0)
+#define CM_REP_INITIATOR_DEPTH_OFFSET 25
+#define CM_REP_INITIATOR_DEPTH_MASK GENMASK(7, 0)
+#define CM_REP_TARGET_ACK_DELAY_OFFSET 26
+#define CM_REP_TARGET_ACK_DELAY_MASK GENMASK(4, 0)
+
+#define CM_REP_FAILOVER_ACCEPTED_OFFSET 26
+#define CM_REP_FAILOVER_ACCEPTED_MASK GENMASK(6, 5)
+#define CM_REP_END_TO_END_FLOW_CONTROL_OFFSET 26
+#define CM_REP_END_TO_END_FLOW_CONTROL_MASK GENMASK(7, 7)
+#define CM_REP_RNR_RETRY_COUNT_OFFSET 27
+#define CM_REP_RNR_RETRY_COUNT_MASK GENMASK(2, 0)
+#define CM_REP_SRQ_OFFSET 27
+#define CM_REP_SRQ_MASK GENMASK(3, 3)
+#define CM_REP_LOCAL_CA_GUID_OFFSET 28
+#define CM_REP_LOCAL_CA_GUID_MASK GENMASK_ULL(63, 0)
+#define CM_REP_PRIVATE_DATA_OFFSET 36
+#define CM_REP_PRIVATE_DATA_SIZE 196
+
 struct cm_req_msg {
 	struct ib_mad_hdr hdr;

@@ -672,7 +704,7 @@ struct cm_rep_msg {
 	u8 offset27;
 	__be64 local_ca_guid;
 
-	u8 private_data[IB_CM_REP_PRIVATE_DATA_SIZE];
+	u8 private_data[CM_REP_PRIVATE_DATA_SIZE];
 
 } __packed;

drivers/infiniband/core/cma.c +1 -1

index 38909e4835d5..997f8c29e34e 100644
@@ -1882,7 +1882,7 @@ static void cma_set_rep_event_data(struct rdma_cm_event *event,
 				   void *private_data)
 {
 	event->param.conn.private_data = private_data;
-	event->param.conn.private_data_len = IB_CM_REP_PRIVATE_DATA_SIZE;
+	event->param.conn.private_data_len = CM_REP_PRIVATE_DATA_SIZE;
 	event->param.conn.responder_resources = rep_data->responder_resources;
 	event->param.conn.initiator_depth = rep_data->initiator_depth;
 	event->param.conn.flow_control = rep_data->flow_control;

include/rdma/ib_cm.h +0 -1

index a5b9bd49041b..ebfbf63388de 100644
@@ -65,7 +65,6 @@ enum ib_cm_event_type {
 };
 
 enum ib_cm_data_size {
-	IB_CM_REP_PRIVATE_DATA_SIZE	 = 196,
 	IB_CM_RTU_PRIVATE_DATA_SIZE	 = 224,
 	IB_CM_DREQ_PRIVATE_DATA_SIZE	 = 220,
 	IB_CM_DREP_PRIVATE_DATA_SIZE	 = 224,

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #9 lore raw

PATCH 6/43 RDMA/cm: Ready To Use (RTU) definitions

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Add RTU message definitions as it is written in IBTA release 1.3 volume 1.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      | 4 ++--
 drivers/infiniband/core/cm_msgs.h | 9 ++++++++-
 include/rdma/ib_cm.h              | 1 -
 3 files changed, 10 insertions(+), 4 deletions(-)

drivers/infiniband/core/cm.c +2 -2

index 85836f8e5c67..41cf2a0de051 100644
@@ -2132,7 +2132,7 @@ int ib_send_cm_rtu(struct ib_cm_id *cm_id,
 	void *data;
 	int ret;
 
-	if (private_data && private_data_len > IB_CM_RTU_PRIVATE_DATA_SIZE)
+	if (private_data && private_data_len > CM_RTU_PRIVATE_DATA_SIZE)
 		return -EINVAL;
 
 	data = cm_copy_private_data(private_data, private_data_len);

@@ -2397,7 +2397,7 @@ static int cm_rtu_handler(struct cm_work *work)
 		return -EINVAL;
 
 	work->cm_event.private_data = &rtu_msg->private_data;
-	work->cm_event.private_data_len = IB_CM_RTU_PRIVATE_DATA_SIZE;
+	work->cm_event.private_data_len = CM_RTU_PRIVATE_DATA_SIZE;
 
 	spin_lock_irq(&cm_id_priv->lock);
 	if (cm_id_priv->id.state != IB_CM_REP_SENT &&

drivers/infiniband/core/cm_msgs.h +8 -1

index 39fcd1231378..6917e007c573 100644
@@ -244,6 +244,13 @@
 #define CM_REP_PRIVATE_DATA_OFFSET 36
 #define CM_REP_PRIVATE_DATA_SIZE 196
 
+#define CM_RTU_LOCAL_COMM_ID_OFFSET 0
+#define CM_RTU_LOCAL_COMM_ID_MASK GENMASK(31, 0)
+#define CM_RTU_REMOTE_COMM_ID_OFFSET 4
+#define CM_RTU_REMOTE_COMM_ID_MASK GENMASK(31, 0)
+#define CM_RTU_PRIVATE_DATA_OFFSET 8
+#define CM_RTU_PRIVATE_DATA_SIZE 224
+
 struct cm_req_msg {
 	struct ib_mad_hdr hdr;

@@ -812,7 +819,7 @@ struct cm_rtu_msg {
 	__be32 local_comm_id;
 	__be32 remote_comm_id;
 
-	u8 private_data[IB_CM_RTU_PRIVATE_DATA_SIZE];
+	u8 private_data[CM_RTU_PRIVATE_DATA_SIZE];
 
 } __packed;

include/rdma/ib_cm.h +0 -1

index ebfbf63388de..34dc12b30399 100644
@@ -65,7 +65,6 @@ enum ib_cm_event_type {
 };
 
 enum ib_cm_data_size {
-	IB_CM_RTU_PRIVATE_DATA_SIZE	 = 224,
 	IB_CM_DREQ_PRIVATE_DATA_SIZE	 = 220,
 	IB_CM_DREP_PRIVATE_DATA_SIZE	 = 224,
 	IB_CM_LAP_PRIVATE_DATA_SIZE	 = 168,

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:06 UTC #10 lore raw

PATCH 7/43 RDMA/cm: Request For Communication Release (DREQ) definitions

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Add DREQ definitions as it is written in IBTA release 1.3 volume 1.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  4 ++--
 drivers/infiniband/core/cm_msgs.h | 11 ++++++++++-
 include/rdma/ib_cm.h              |  1 -
 3 files changed, 12 insertions(+), 4 deletions(-)

drivers/infiniband/core/cm.c +2 -2

index 41cf2a0de051..7f3cc66372eb 100644
@@ -2449,7 +2449,7 @@ int ib_send_cm_dreq(struct ib_cm_id *cm_id,
 	unsigned long flags;
 	int ret;
 
-	if (private_data && private_data_len > IB_CM_DREQ_PRIVATE_DATA_SIZE)
+	if (private_data && private_data_len > CM_DREQ_PRIVATE_DATA_SIZE)
 		return -EINVAL;
 
 	cm_id_priv = container_of(cm_id, struct cm_id_private, id);

@@ -2600,7 +2600,7 @@ static int cm_dreq_handler(struct cm_work *work)
 	}
 
 	work->cm_event.private_data = &dreq_msg->private_data;
-	work->cm_event.private_data_len = IB_CM_DREQ_PRIVATE_DATA_SIZE;
+	work->cm_event.private_data_len = CM_DREQ_PRIVATE_DATA_SIZE;
 
 	spin_lock_irq(&cm_id_priv->lock);
 	if (cm_id_priv->local_qpn != cm_dreq_get_remote_qpn(dreq_msg))

drivers/infiniband/core/cm_msgs.h +10 -1

index 6917e007c573..dded0bd59479 100644
@@ -251,6 +251,15 @@
 #define CM_RTU_PRIVATE_DATA_OFFSET 8
 #define CM_RTU_PRIVATE_DATA_SIZE 224
 
+#define CM_DREQ_LOCAL_COMM_ID_OFFSET 0
+#define CM_DREQ_LOCAL_COMM_ID_MASK GENMASK(31, 0)
+#define CM_DREQ_REMOTE_COMM_ID_OFFSET 4
+#define CM_DREQ_REMOTE_COMM_ID__MASK GENMASK(31, 0)
+#define CM_DREQ_REMOTE_QPN_EECN_OFFSET 8
+#define CM_DREQ_REMOTE_QPN_EECN_MASK GENMASK(23, 0)
+#define CM_DREQ_PRIVATE_DATA_OFFSET 12
+#define CM_DREQ_PRIVATE_DATA_SIZE 220
+
 struct cm_req_msg {
 	struct ib_mad_hdr hdr;

@@ -831,7 +840,7 @@ struct cm_dreq_msg {
 	/* remote QPN/EECN:24, rsvd:8 */
 	__be32 offset8;
 
-	u8 private_data[IB_CM_DREQ_PRIVATE_DATA_SIZE];
+	u8 private_data[CM_DREQ_PRIVATE_DATA_SIZE];
 
 } __packed;

include/rdma/ib_cm.h +0 -1

index 34dc12b30399..77f4818aaf10 100644
@@ -65,7 +65,6 @@ enum ib_cm_event_type {
 };
 
 enum ib_cm_data_size {
-	IB_CM_DREQ_PRIVATE_DATA_SIZE	 = 220,
 	IB_CM_DREP_PRIVATE_DATA_SIZE	 = 224,
 	IB_CM_LAP_PRIVATE_DATA_SIZE	 = 168,
 	IB_CM_APR_PRIVATE_DATA_SIZE	 = 148,

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:06 UTC #11 lore raw

PATCH 8/43 RDMA/cm: Reply To Request For Communication Release (DREP) definitions

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Add DREP definitions as it is written in IBTA release 1.3 volume 1.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      | 4 ++--
 drivers/infiniband/core/cm_msgs.h | 9 ++++++++-
 include/rdma/ib_cm.h              | 1 -
 3 files changed, 10 insertions(+), 4 deletions(-)

drivers/infiniband/core/cm.c +2 -2

index 7f3cc66372eb..4858b6aaac7f 100644
@@ -2514,7 +2514,7 @@ int ib_send_cm_drep(struct ib_cm_id *cm_id,
 	void *data;
 	int ret;
 
-	if (private_data && private_data_len > IB_CM_DREP_PRIVATE_DATA_SIZE)
+	if (private_data && private_data_len > CM_DREP_PRIVATE_DATA_SIZE)
 		return -EINVAL;
 
 	data = cm_copy_private_data(private_data, private_data_len);

@@ -2675,7 +2675,7 @@ static int cm_drep_handler(struct cm_work *work)
 		return -EINVAL;
 
 	work->cm_event.private_data = &drep_msg->private_data;
-	work->cm_event.private_data_len = IB_CM_DREP_PRIVATE_DATA_SIZE;
+	work->cm_event.private_data_len = CM_DREP_PRIVATE_DATA_SIZE;
 
 	spin_lock_irq(&cm_id_priv->lock);
 	if (cm_id_priv->id.state != IB_CM_DREQ_SENT &&

drivers/infiniband/core/cm_msgs.h +8 -1

index dded0bd59479..a7ccd27a2f19 100644
@@ -260,6 +260,13 @@
 #define CM_DREQ_PRIVATE_DATA_OFFSET 12
 #define CM_DREQ_PRIVATE_DATA_SIZE 220
 
+#define CM_DREP_LOCAL_COMM_ID_OFFSET 0
+#define CM_DREP_LOCAL_COMM_ID_MASK GENMASK(31, 0)
+#define CM_DREP_REMOTE_COMM_ID_OFFSET 4
+#define CM_DREP_REMOTE_COMM_ID_MASK GENMASK(31, 0)
+#define CM_DREP_PRIVATE_DATA_OFFSET 8
+#define CM_DREP_PRIVATE_DATA_SIZE 224
+
 struct cm_req_msg {
 	struct ib_mad_hdr hdr;

@@ -861,7 +868,7 @@ struct cm_drep_msg {
 	__be32 local_comm_id;
 	__be32 remote_comm_id;
 
-	u8 private_data[IB_CM_DREP_PRIVATE_DATA_SIZE];
+	u8 private_data[CM_DREP_PRIVATE_DATA_SIZE];
 
 } __packed;

include/rdma/ib_cm.h +0 -1

index 77f4818aaf10..f1fccc8f387f 100644
@@ -65,7 +65,6 @@ enum ib_cm_event_type {
 };
 
 enum ib_cm_data_size {
-	IB_CM_DREP_PRIVATE_DATA_SIZE	 = 224,
 	IB_CM_LAP_PRIVATE_DATA_SIZE	 = 168,
 	IB_CM_APR_PRIVATE_DATA_SIZE	 = 148,
 	IB_CM_APR_INFO_LENGTH		 = 72,

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:06 UTC #12 lore raw

PATCH 9/43 RDMA/cm: Load Alternate Path (LAP) definitions

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Add LAP message definitions as it is written in IBTA release 1.3 volume 1.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  4 ++--
 drivers/infiniband/core/cm_msgs.h | 37 ++++++++++++++++++++++++++++++-
 include/rdma/ib_cm.h              |  1 -
 3 files changed, 38 insertions(+), 4 deletions(-)

drivers/infiniband/core/cm.c +2 -2

index 4858b6aaac7f..a735481d85f0 100644
@@ -3107,7 +3107,7 @@ int ib_send_cm_lap(struct ib_cm_id *cm_id,
 	unsigned long flags;
 	int ret;
 
-	if (private_data && private_data_len > IB_CM_LAP_PRIVATE_DATA_SIZE)
+	if (private_data && private_data_len > CM_LAP_PRIVATE_DATA_SIZE)
 		return -EINVAL;
 
 	cm_id_priv = container_of(cm_id, struct cm_id_private, id);

@@ -3221,7 +3221,7 @@ static int cm_lap_handler(struct cm_work *work)
 	param->alternate_path = &work->path[0];
 	cm_format_path_from_lap(cm_id_priv, param->alternate_path, lap_msg);
 	work->cm_event.private_data = &lap_msg->private_data;
-	work->cm_event.private_data_len = IB_CM_LAP_PRIVATE_DATA_SIZE;
+	work->cm_event.private_data_len = CM_LAP_PRIVATE_DATA_SIZE;
 
 	spin_lock_irq(&cm_id_priv->lock);
 	if (cm_id_priv->id.state != IB_CM_ESTABLISHED)

drivers/infiniband/core/cm_msgs.h +36 -1

index a7ccd27a2f19..76a5053933e9 100644
@@ -267,6 +267,41 @@
 #define CM_DREP_PRIVATE_DATA_OFFSET 8
 #define CM_DREP_PRIVATE_DATA_SIZE 224
 
+#define CM_LAP_LOCAL_COMM_ID_OFFSET 0
+#define CM_LAP_LOCAL_COMM_ID_MASK GENMASK(31, 0)
+#define CM_LAP_REMOTE_COMM_ID_OFFSET 4
+#define CM_LAP_REMOTE_COMM_ID_MASK GENMASK(31, 0)
+#define CM_LAP_REMOTE_QPN_EECN_OFFSET 12
+#define CM_LAP_REMOTE_QPN_EECN_MASK GENMASK(23, 0)
+#define CM_LAP_REMOTE_CM_RESPONSE_TIMEOUT_OFFSET 15
+#define CM_LAP_REMOTE_CM_RESPONSE_TIMEOUT_MASK GENMASK(4, 0)
+#define CM_LAP_ALTERNATE_LOCAL_PORT_LID_OFFSET 20
+#define CM_LAP_ALTERNATE_LOCAL_PORT_LID_MASK GENMASK(15, 0)
+#define CM_LAP_ALTERNATE_REMOTE_PORT_LID_OFFSET 22
+#define CM_LAP_ALTERNATE_REMOTE_PORT_LID_MASK GENMASK(15, 0)
+#define CM_LAP_ALTERNATE_LOCAL_PORT_GID_OFFSET 24
+#define CM_LAP_ALTERNATE_REMOTE_PORT_GID_OFFSET 40
+#define CM_LAP_ALTERNATE_FLOW_LABEL_OFFSET 56
+#define CM_LAP_ALTERNATE_FLOW_LABEL_MASK GENMASK(19, 0)
+
+#define CM_LAP_ALTERNATE_TRAFFIC_CLASS_OFFSET 59
+#define CM_LAP_ALTERNATE_TRAFFIC_CLASS_MASK GENMASK(7, 0)
+#define CM_LAP_ALTERNATE_HOP_LIMIT_OFFSET 60
+#define CM_LAP_ALTERNATE_HOP_LIMIT_MASK GENMASK(7, 0)
+#define CM_LAP_ALTERNATE_PACKET_RATE_OFFSET 61
+#define CM_LAP_ALTERNATE_PACKET_RATE_MASK GENMASK(7, 2)
+#define CM_LAP_ALTERNATE_SL_OFFSET 62
+#define CM_LAP_ALTERNATE_SL_MASK GENMASK(3, 0)
+
+#define CM_LAP_ALTERNATE_SUBNET_LOCAL_OFFSET 62
+#define CM_LAP_ALTERNATE_SUBNET_LOCAL_MASK GENMASK(4, 4)
+
+#define CM_LAP_ALTERNATE_LOCAL_ACK_TIMEOUT_OFFSET 63
+#define CM_LAP_ALTERNATE_LOCAL_ACK_TIMEOUT_MASK GENMASK(4, 0)
+
+#define CM_LAP_PRIVATE_DATA_OFFSET 64
+#define CM_LAP_PRIVATE_DATA_SIZE 168
+
 struct cm_req_msg {
 	struct ib_mad_hdr hdr;

@@ -897,7 +932,7 @@ struct cm_lap_msg {
 	/* local ACK timeout:5, rsvd:3 */
 	u8 offset63;
 
-	u8 private_data[IB_CM_LAP_PRIVATE_DATA_SIZE];
+	u8 private_data[CM_LAP_PRIVATE_DATA_SIZE];
 } __packed;
 
 static inline __be32 cm_lap_get_remote_qpn(struct cm_lap_msg *lap_msg)

include/rdma/ib_cm.h +0 -1

index f1fccc8f387f..08d3217bdaf1 100644
@@ -65,7 +65,6 @@ enum ib_cm_event_type {
 };
 
 enum ib_cm_data_size {
-	IB_CM_LAP_PRIVATE_DATA_SIZE	 = 168,
 	IB_CM_APR_PRIVATE_DATA_SIZE	 = 148,
 	IB_CM_APR_INFO_LENGTH		 = 72,
 	IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE = 216,

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #13 lore raw

PATCH 10/43 RDMA/cm: Alternate Path Response (APR) message definitions

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Add APR definitions as it is written in IBTA release 1.3 volume 1.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  6 +++---
 drivers/infiniband/core/cm_msgs.h | 20 ++++++++++++++++++--
 include/rdma/ib_cm.h              |  1 -
 3 files changed, 21 insertions(+), 6 deletions(-)

drivers/infiniband/core/cm.c +3 -3

index a735481d85f0..e72fc4071313 100644
@@ -3320,8 +3320,8 @@ int ib_send_cm_apr(struct ib_cm_id *cm_id,
 	unsigned long flags;
 	int ret;
 
-	if ((private_data && private_data_len > IB_CM_APR_PRIVATE_DATA_SIZE) ||
-	    (info && info_length > IB_CM_APR_INFO_LENGTH))
+	if ((private_data && private_data_len > CM_APR_PRIVATE_DATA_SIZE) ||
+	    (info && info_length > CM_APR_ADDITIONAL_INFORMATION_SIZE))
 		return -EINVAL;
 
 	cm_id_priv = container_of(cm_id, struct cm_id_private, id);

@@ -3375,7 +3375,7 @@ static int cm_apr_handler(struct cm_work *work)
 	work->cm_event.param.apr_rcvd.apr_info = &apr_msg->info;
 	work->cm_event.param.apr_rcvd.info_len = apr_msg->info_length;
 	work->cm_event.private_data = &apr_msg->private_data;
-	work->cm_event.private_data_len = IB_CM_APR_PRIVATE_DATA_SIZE;
+	work->cm_event.private_data_len = CM_APR_PRIVATE_DATA_SIZE;
 
 	spin_lock_irq(&cm_id_priv->lock);
 	if (cm_id_priv->id.state != IB_CM_ESTABLISHED ||

drivers/infiniband/core/cm_msgs.h +18 -2

index 76a5053933e9..656641e6f447 100644
@@ -302,6 +302,22 @@
 #define CM_LAP_PRIVATE_DATA_OFFSET 64
 #define CM_LAP_PRIVATE_DATA_SIZE 168
 
+#define CM_APR_LOCAL_COMM_ID_OFFSET 0
+#define CM_APR_LOCAL_COMM_ID_MASK GENMASK(31, 0)
+#define CM_APR_REMOTE_COMM_ID_OFFSET 4
+#define CM_APR_REMOTE_COMM_ID_MASK GENMASK(31, 0)
+#define CM_APR_ADDITIONAL_INFORMATION_LENGTH_OFFSET 8
+#define CM_APR_ADDITIONAL_INFORMATION_LENGTH_MASK GENMASK(7, 0)
+
+#define CM_APR_AR_STATUS_OFFSET 9
+#define CM_APR_AR_STATUS_MASK GENMASK(7, 0)
+
+#define CM_APR_ADDITIONAL_INFORMATION_OFFSET 12
+#define CM_APR_ADDITIONAL_INFORMATION_SIZE 72
+
+#define CM_APR_PRIVATE_DATA_OFFSET 84
+#define CM_APR_PRIVATE_DATA_SIZE 148
+
 struct cm_req_msg {
 	struct ib_mad_hdr hdr;

@@ -1039,9 +1055,9 @@ struct cm_apr_msg {
 	u8 info_length;
 	u8 ap_status;
 	__be16 rsvd;
-	u8 info[IB_CM_APR_INFO_LENGTH];
+	u8 info[CM_APR_ADDITIONAL_INFORMATION_SIZE];
 
-	u8 private_data[IB_CM_APR_PRIVATE_DATA_SIZE];
+	u8 private_data[CM_APR_PRIVATE_DATA_SIZE];
 } __packed;
 
 struct cm_sidr_req_msg {

include/rdma/ib_cm.h +0 -1

index 08d3217bdaf1..18a3e2ee0758 100644
@@ -65,7 +65,6 @@ enum ib_cm_event_type {
 };
 
 enum ib_cm_data_size {
-	IB_CM_APR_PRIVATE_DATA_SIZE	 = 148,
 	IB_CM_APR_INFO_LENGTH		 = 72,
 	IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE = 216,
 	IB_CM_SIDR_REP_PRIVATE_DATA_SIZE = 136,

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #14 lore raw

PATCH 11/43 RDMA/cm: Service ID Resolution Request (SIDR_REQ) definitions

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Add SIDR_REQ message definitions as it is written
in IBTA release 1.3 volume 1.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  4 ++--
 drivers/infiniband/core/cm_msgs.h | 11 ++++++++++-
 drivers/infiniband/core/cma.c     |  2 +-
 include/rdma/ib_cm.h              |  2 --
 4 files changed, 13 insertions(+), 6 deletions(-)

drivers/infiniband/core/cm.c +2 -2

index e72fc4071313..55a14acaa333 100644
@@ -3465,7 +3465,7 @@ int ib_send_cm_sidr_req(struct ib_cm_id *cm_id,
 	int ret;
 
 	if (!param->path || (param->private_data &&
-	     param->private_data_len > IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE))
+	     param->private_data_len > CM_SIDR_REQ_PRIVATE_DATA_SIZE))
 		return -EINVAL;
 
 	cm_id_priv = container_of(cm_id, struct cm_id_private, id);

@@ -3524,7 +3524,7 @@ static void cm_format_sidr_req_event(struct cm_work *work,
 	param->port = work->port->port_num;
 	param->sgid_attr = rx_cm_id->av.ah_attr.grh.sgid_attr;
 	work->cm_event.private_data = &sidr_req_msg->private_data;
-	work->cm_event.private_data_len = IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE;
+	work->cm_event.private_data_len = CM_SIDR_REQ_PRIVATE_DATA_SIZE;
 }
 
 static int cm_sidr_req_handler(struct cm_work *work)

drivers/infiniband/core/cm_msgs.h +10 -1

index 656641e6f447..9d32b84bdcb0 100644
@@ -318,6 +318,15 @@
 #define CM_APR_PRIVATE_DATA_OFFSET 84
 #define CM_APR_PRIVATE_DATA_SIZE 148
 
+#define CM_SIDR_REQ_REQUESTID_OFFSET 0
+#define CM_SIDR_REQ_REQUESTID_MASK GENMASK(31, 0)
+#define CM_SIDR_REQ_PARTITION_KEY_OFFSET 4
+#define CM_SIDR_REQ_PARTITION_KEY_MASK GENMASK(15, 0)
+#define CM_SIDR_REQ_SERVICEID_OFFSET 8
+#define CM_SIDR_REQ_SERVICEID_MASK GENMASK_ULL(63, 0)
+#define CM_SIDR_REQ_PRIVATE_DATA_OFFSET 16
+#define CM_SIDR_REQ_PRIVATE_DATA_SIZE 216
+
 struct cm_req_msg {
 	struct ib_mad_hdr hdr;

@@ -1068,7 +1077,7 @@ struct cm_sidr_req_msg {
 	__be16 rsvd;
 	__be64 service_id;
 
-	u32 private_data[IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE / sizeof(u32)];
+	u32 private_data[CM_SIDR_REQ_PRIVATE_DATA_SIZE / sizeof(u32)];
 } __packed;
 
 struct cm_sidr_rep_msg {

drivers/infiniband/core/cma.c +1 -1

index 997f8c29e34e..d3bbca5b61e3 100644
@@ -2137,7 +2137,7 @@ static int cma_ib_req_handler(struct ib_cm_id *cm_id,
 		conn_id = cma_ib_new_udp_id(&listen_id->id, ib_event, net_dev);
 		event.param.ud.private_data = ib_event->private_data + offset;
 		event.param.ud.private_data_len =
-				IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE - offset;
+			CM_SIDR_REQ_PRIVATE_DATA_SIZE - offset;
 	} else {
 		conn_id = cma_ib_new_conn_id(&listen_id->id, ib_event, net_dev);
 		cma_set_req_event_data(&event, &ib_event->param.req_rcvd,

include/rdma/ib_cm.h +0 -2

index 18a3e2ee0758..8f0c377ad250 100644
@@ -65,8 +65,6 @@ enum ib_cm_event_type {
 };
 
 enum ib_cm_data_size {
-	IB_CM_APR_INFO_LENGTH		 = 72,
-	IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE = 216,
 	IB_CM_SIDR_REP_PRIVATE_DATA_SIZE = 136,
 	IB_CM_SIDR_REP_INFO_LENGTH	 = 72,
 };

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #15 lore raw

PATCH 12/43 RDMA/cm: Service ID Resolution Response (SIDR_REP) definitions

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Add SIDR_REP message definitions as it is written
in IBTA release 1.3 volume 1.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  7 ++++---
 drivers/infiniband/core/cm_msgs.h | 21 +++++++++++++++++++--
 drivers/infiniband/core/cma.c     |  2 +-
 include/rdma/ib_cm.h              |  5 -----
 4 files changed, 24 insertions(+), 11 deletions(-)

drivers/infiniband/core/cm.c +4 -3

index 55a14acaa333..d07a5f141720 100644
@@ -3618,9 +3618,10 @@ int ib_send_cm_sidr_rep(struct ib_cm_id *cm_id,
 	unsigned long flags;
 	int ret;
 
-	if ((param->info && param->info_length > IB_CM_SIDR_REP_INFO_LENGTH) ||
+	if ((param->info &&
+	     param->info_length > CM_SIDR_REP_ADDITIONAL_INFORMATION_SIZE) ||
 	    (param->private_data &&
-	     param->private_data_len > IB_CM_SIDR_REP_PRIVATE_DATA_SIZE))
+	     param->private_data_len > CM_SIDR_REP_PRIVATE_DATA_SIZE))
 		return -EINVAL;
 
 	cm_id_priv = container_of(cm_id, struct cm_id_private, id);

@@ -3674,7 +3675,7 @@ static void cm_format_sidr_rep_event(struct cm_work *work,
 	param->info_len = sidr_rep_msg->info_length;
 	param->sgid_attr = cm_id_priv->av.ah_attr.grh.sgid_attr;
 	work->cm_event.private_data = &sidr_rep_msg->private_data;
-	work->cm_event.private_data_len = IB_CM_SIDR_REP_PRIVATE_DATA_SIZE;
+	work->cm_event.private_data_len = CM_SIDR_REP_PRIVATE_DATA_SIZE;
 }
 
 static int cm_sidr_rep_handler(struct cm_work *work)

drivers/infiniband/core/cm_msgs.h +19 -2

index 9d32b84bdcb0..08b337551775 100644
@@ -327,6 +327,23 @@
 #define CM_SIDR_REQ_PRIVATE_DATA_OFFSET 16
 #define CM_SIDR_REQ_PRIVATE_DATA_SIZE 216
 
+#define CM_SIDR_REP_REQUESTID_OFFSET 0
+#define CM_SIDR_REP_REQUESTID_MASK GENMASK(31, 0)
+#define CM_SIDR_REP_STATUS_OFFSET 4
+#define CM_SIDR_REP_STATUS_MASK GENMASK(7, 0)
+#define CM_SIDR_REP_ADDITIONAL_INFORMATION_LENGTH_OFFSET 5
+#define CM_SIDR_REP_ADDITIONAL_INFORMATION_LENGTH_MASK GENMASK(7, 0)
+#define CM_SIDR_REP_QPN_OFFSET 8
+#define CM_SIDR_REP_QPN_MASK GENMASK(23, 0)
+#define CM_SIDR_REP_SERVICEID_OFFSET 12
+#define CM_SIDR_REP_SERVICEID_MASK GENMASK_ULL(63, 0)
+#define CM_SIDR_REP_Q_KEY_OFFSET 20
+#define CM_SIDR_REP_Q_KEY_MASK GENMASK(31, 0)
+#define CM_SIDR_REP_ADDITIONAL_INFORMATION_OFFSET 24
+#define CM_SIDR_REP_ADDITIONAL_INFORMATION_SIZE 72
+#define CM_SIDR_REP_PRIVATE_DATA_OFFSET 96
+#define CM_SIDR_REP_PRIVATE_DATA_SIZE 136
+
 struct cm_req_msg {
 	struct ib_mad_hdr hdr;

@@ -1091,9 +1108,9 @@ struct cm_sidr_rep_msg {
 	__be32 offset8;
 	__be64 service_id;
 	__be32 qkey;
-	u8 info[IB_CM_SIDR_REP_INFO_LENGTH];
+	u8 info[CM_SIDR_REP_ADDITIONAL_INFORMATION_SIZE];
 
-	u8 private_data[IB_CM_SIDR_REP_PRIVATE_DATA_SIZE];
+	u8 private_data[CM_SIDR_REP_PRIVATE_DATA_SIZE];
 } __packed;
 
 static inline __be32 cm_sidr_rep_get_qpn(struct cm_sidr_rep_msg *sidr_rep_msg)

drivers/infiniband/core/cma.c +1 -1

index d3bbca5b61e3..4a54cf561a95 100644
@@ -3694,7 +3694,7 @@ static int cma_sidr_rep_handler(struct ib_cm_id *cm_id,
 		break;
 	case IB_CM_SIDR_REP_RECEIVED:
 		event.param.ud.private_data = ib_event->private_data;
-		event.param.ud.private_data_len = IB_CM_SIDR_REP_PRIVATE_DATA_SIZE;
+		event.param.ud.private_data_len = CM_SIDR_REP_PRIVATE_DATA_SIZE;
 		if (rep->status != IB_SIDR_SUCCESS) {
 			event.event = RDMA_CM_EVENT_UNREACHABLE;
 			event.status = ib_event->param.sidr_rep_rcvd.status;

include/rdma/ib_cm.h +0 -5

index 8f0c377ad250..6237c369dbd6 100644
@@ -64,11 +64,6 @@ enum ib_cm_event_type {
 	IB_CM_SIDR_REP_RECEIVED
 };
 
-enum ib_cm_data_size {
-	IB_CM_SIDR_REP_PRIVATE_DATA_SIZE = 136,
-	IB_CM_SIDR_REP_INFO_LENGTH	 = 72,
-};
-
 struct ib_cm_id;
 
 struct ib_cm_req_event_param {

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #16 lore raw

PATCH 13/43 RDMA/cm: Convert QPN and EECN to be u32 variables

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Remove unnecessary ambiguity in mixing be32<->u32 declarations of QPN and EECN, convert them from be32 to u32 with help of newly introduced CM_GET/CM_SET macros.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      | 55 ++++++++++++++++----------
 drivers/infiniband/core/cm_msgs.h | 64 +------------------------------
 2 files changed, 35 insertions(+), 84 deletions(-)

drivers/infiniband/core/cm.c +34 ~~-21~~

index d07a5f141720..81a67805b029 100644
@@ -225,7 +225,7 @@ struct cm_timewait_info {
 	struct rb_node remote_qp_node;
 	struct rb_node remote_id_node;
 	__be64 remote_ca_guid;
-	__be32 remote_qpn;
+	u32 remote_qpn;
 	u8 inserted_remote_qp;
 	u8 inserted_remote_id;
 };

@@ -250,8 +250,8 @@ struct cm_id_private {
 
 	void *private_data;
 	__be64 tid;
-	__be32 local_qpn;
-	__be32 remote_qpn;
+	u32 local_qpn;
+	u32 remote_qpn;
 	enum ib_qp_type qp_type;
 	__be32 sq_psn;
 	__be32 rq_psn;

@@ -764,15 +764,15 @@ static struct cm_timewait_info * cm_insert_remote_qpn(struct cm_timewait_info
 	struct rb_node *parent = NULL;
 	struct cm_timewait_info *cur_timewait_info;
 	__be64 remote_ca_guid = timewait_info->remote_ca_guid;
-	__be32 remote_qpn = timewait_info->remote_qpn;
+	u32 remote_qpn = timewait_info->remote_qpn;
 
 	while (*link) {
 		parent = *link;
 		cur_timewait_info = rb_entry(parent, struct cm_timewait_info,
 					     remote_qp_node);
-		if (be32_lt(remote_qpn, cur_timewait_info->remote_qpn))
+		if (remote_qpn < cur_timewait_info->remote_qpn)
 			link = &(*link)->rb_left;
-		else if (be32_gt(remote_qpn, cur_timewait_info->remote_qpn))
+		else if (remote_qpn > cur_timewait_info->remote_qpn)
 			link = &(*link)->rb_right;
 		else if (be64_lt(remote_ca_guid, cur_timewait_info->remote_ca_guid))
 			link = &(*link)->rb_left;

@@ -1265,7 +1265,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 	req_msg->local_comm_id = cm_id_priv->id.local_id;
 	req_msg->service_id = param->service_id;
 	req_msg->local_ca_guid = cm_id_priv->id.device->node_guid;
-	cm_req_set_local_qpn(req_msg, cpu_to_be32(param->qp_num));
+	CM_SET(REQ_LOCAL_QPN, req_msg, param->qp_num);
 	cm_req_set_init_depth(req_msg, param->initiator_depth);
 	cm_req_set_remote_resp_timeout(req_msg,
 				       param->remote_cm_response_timeout);

@@ -1443,7 +1443,7 @@ int ib_send_cm_req(struct ib_cm_id *cm_id,
 	cm_id_priv->msg->timeout_ms = cm_id_priv->timeout_ms;
 	cm_id_priv->msg->context[1] = (void *) (unsigned long) IB_CM_REQ_SENT;
 
-	cm_id_priv->local_qpn = cm_req_get_local_qpn(req_msg);
+	cm_id_priv->local_qpn = CM_GET(REQ_LOCAL_QPN, req_msg);
 	cm_id_priv->rq_psn = cm_req_get_starting_psn(req_msg);
 
 	spin_lock_irqsave(&cm_id_priv->lock, flags);

@@ -1666,7 +1666,7 @@ static void cm_format_req_event(struct cm_work *work,
 	}
 	param->remote_ca_guid = req_msg->local_ca_guid;
 	param->remote_qkey = be32_to_cpu(req_msg->local_qkey);
-	param->remote_qpn = be32_to_cpu(cm_req_get_local_qpn(req_msg));
+	param->remote_qpn = CM_GET(REP_LOCAL_QPN, req_msg);
 	param->qp_type = cm_req_get_qp_type(req_msg);
 	param->starting_psn = be32_to_cpu(cm_req_get_starting_psn(req_msg));
 	param->responder_resources = cm_req_get_init_depth(req_msg);

@@ -1929,7 +1929,7 @@ static int cm_req_handler(struct cm_work *work)
 	}
 	cm_id_priv->timewait_info->work.remote_id = req_msg->local_comm_id;
 	cm_id_priv->timewait_info->remote_ca_guid = req_msg->local_ca_guid;
-	cm_id_priv->timewait_info->remote_qpn = cm_req_get_local_qpn(req_msg);
+	cm_id_priv->timewait_info->remote_qpn = CM_GET(REQ_LOCAL_QPN, req_msg);
 
 	listen_cm_id_priv = cm_match_req(work, cm_id_priv);
 	if (!listen_cm_id_priv) {

@@ -2003,7 +2003,7 @@ static int cm_req_handler(struct cm_work *work)
 	cm_id_priv->timeout_ms = cm_convert_to_ms(
 					cm_req_get_local_resp_timeout(req_msg));
 	cm_id_priv->max_cm_retries = cm_req_get_max_cm_retries(req_msg);
-	cm_id_priv->remote_qpn = cm_req_get_local_qpn(req_msg);
+	cm_id_priv->remote_qpn = CM_GET(REQ_LOCAL_QPN, req_msg);
 	cm_id_priv->initiator_depth = cm_req_get_resp_res(req_msg);
 	cm_id_priv->responder_resources = cm_req_get_init_depth(req_msg);
 	cm_id_priv->path_mtu = cm_req_get_path_mtu(req_msg);

@@ -2047,10 +2047,10 @@ static void cm_format_rep(struct cm_rep_msg *rep_msg,
 		rep_msg->initiator_depth = param->initiator_depth;
 		cm_rep_set_flow_ctrl(rep_msg, param->flow_control);
 		cm_rep_set_srq(rep_msg, param->srq);
-		cm_rep_set_local_qpn(rep_msg, cpu_to_be32(param->qp_num));
+		CM_SET(REP_LOCAL_QPN, rep_msg, param->qp_num);
 	} else {
 		cm_rep_set_srq(rep_msg, 1);
-		cm_rep_set_local_eecn(rep_msg, cpu_to_be32(param->qp_num));
+		CM_SET(REP_LOCAL_EE_CONTEXT_NUMBER, rep_msg, param->qp_num);
 	}
 
 	if (param->private_data && param->private_data_len)

@@ -2102,7 +2102,7 @@ int ib_send_cm_rep(struct ib_cm_id *cm_id,
 	cm_id_priv->initiator_depth = param->initiator_depth;
 	cm_id_priv->responder_resources = param->responder_resources;
 	cm_id_priv->rq_psn = cm_rep_get_starting_psn(rep_msg);
-	cm_id_priv->local_qpn = cpu_to_be32(param->qp_num);
+	cm_id_priv->local_qpn = param->qp_num;
 
 out:	spin_unlock_irqrestore(&cm_id_priv->lock, flags);
 	return ret;

@@ -2184,7 +2184,11 @@ static void cm_format_rep_event(struct cm_work *work, enum ib_qp_type qp_type)
 	param = &work->cm_event.param.rep_rcvd;
 	param->remote_ca_guid = rep_msg->local_ca_guid;
 	param->remote_qkey = be32_to_cpu(rep_msg->local_qkey);
-	param->remote_qpn = be32_to_cpu(cm_rep_get_qpn(rep_msg, qp_type));
+	if (qp_type == IB_QPT_XRC_INI)
+		param->remote_qpn =
+			CM_GET(REP_LOCAL_EE_CONTEXT_NUMBER, rep_msg);
+	else
+		param->remote_qpn = CM_GET(REP_LOCAL_QPN, rep_msg);
 	param->starting_psn = be32_to_cpu(cm_rep_get_starting_psn(rep_msg));
 	param->responder_resources = rep_msg->initiator_depth;
 	param->initiator_depth = rep_msg->resp_resources;

@@ -2277,7 +2281,12 @@ static int cm_rep_handler(struct cm_work *work)
 
 	cm_id_priv->timewait_info->work.remote_id = rep_msg->local_comm_id;
 	cm_id_priv->timewait_info->remote_ca_guid = rep_msg->local_ca_guid;
-	cm_id_priv->timewait_info->remote_qpn = cm_rep_get_qpn(rep_msg, cm_id_priv->qp_type);
+	if (cm_id_priv->qp_type == IB_QPT_XRC_INI)
+		cm_id_priv->timewait_info->remote_qpn =
+			CM_GET(REP_LOCAL_EE_CONTEXT_NUMBER, rep_msg);
+	else
+		cm_id_priv->timewait_info->remote_qpn =
+			CM_GET(REP_LOCAL_QPN, rep_msg);
 
 	spin_lock(&cm.lock);
 	/* Check for duplicate REP. */

@@ -2320,7 +2329,11 @@ static int cm_rep_handler(struct cm_work *work)
 
 	cm_id_priv->id.state = IB_CM_REP_RCVD;
 	cm_id_priv->id.remote_id = rep_msg->local_comm_id;
-	cm_id_priv->remote_qpn = cm_rep_get_qpn(rep_msg, cm_id_priv->qp_type);
+	if (cm_id_priv->qp_type == IB_QPT_XRC_INI)
+		cm_id_priv->remote_qpn =
+			CM_GET(REP_LOCAL_EE_CONTEXT_NUMBER, rep_msg);
+	else
+		cm_id_priv->remote_qpn = CM_GET(REP_LOCAL_QPN, rep_msg);
 	cm_id_priv->initiator_depth = rep_msg->resp_resources;
 	cm_id_priv->responder_resources = rep_msg->initiator_depth;
 	cm_id_priv->sq_psn = cm_rep_get_starting_psn(rep_msg);

@@ -2434,7 +2447,7 @@ static void cm_format_dreq(struct cm_dreq_msg *dreq_msg,
 			  cm_form_tid(cm_id_priv));
 	dreq_msg->local_comm_id = cm_id_priv->id.local_id;
 	dreq_msg->remote_comm_id = cm_id_priv->id.remote_id;
-	cm_dreq_set_remote_qpn(dreq_msg, cm_id_priv->remote_qpn);
+	CM_SET(DREQ_REMOTE_QPN_EECN, dreq_msg, cm_id_priv->remote_qpn);
 
 	if (private_data && private_data_len)
 		memcpy(dreq_msg->private_data, private_data, private_data_len);

@@ -2603,7 +2616,7 @@ static int cm_dreq_handler(struct cm_work *work)
 	work->cm_event.private_data_len = CM_DREQ_PRIVATE_DATA_SIZE;
 
 	spin_lock_irq(&cm_id_priv->lock);
-	if (cm_id_priv->local_qpn != cm_dreq_get_remote_qpn(dreq_msg))
+	if (cm_id_priv->local_qpn != CM_GET(DREQ_REMOTE_QPN_EECN, dreq_msg))
 		goto unlock;
 
 	switch (cm_id_priv->id.state) {

@@ -3068,7 +3081,7 @@ static void cm_format_lap(struct cm_lap_msg *lap_msg,
 			  cm_form_tid(cm_id_priv));
 	lap_msg->local_comm_id = cm_id_priv->id.local_id;
 	lap_msg->remote_comm_id = cm_id_priv->id.remote_id;
-	cm_lap_set_remote_qpn(lap_msg, cm_id_priv->remote_qpn);
+	CM_SET(LAP_REMOTE_QPN_EECN, lap_msg, cm_id_priv->remote_qpn);
 	/* todo: need remote CM response timeout */
 	cm_lap_set_remote_resp_timeout(lap_msg, 0x1F);
 	lap_msg->alt_local_lid =

@@ -4111,7 +4124,7 @@ static int cm_init_qp_rtr_attr(struct cm_id_private *cm_id_priv,
 				IB_QP_DEST_QPN | IB_QP_RQ_PSN;
 		qp_attr->ah_attr = cm_id_priv->av.ah_attr;
 		qp_attr->path_mtu = cm_id_priv->path_mtu;
-		qp_attr->dest_qp_num = be32_to_cpu(cm_id_priv->remote_qpn);
+		qp_attr->dest_qp_num = cm_id_priv->remote_qpn;
 		qp_attr->rq_psn = be32_to_cpu(cm_id_priv->rq_psn);
 		if (cm_id_priv->qp_type == IB_QPT_RC ||
 		    cm_id_priv->qp_type == IB_QPT_XRC_TGT) {

drivers/infiniband/core/cm_msgs.h +1 ~~-63~~

94 lines not on this page · raw message

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #17 lore raw

PATCH 14/43 RDMA/cm: Convert REQ responded resources to the new scheme

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Use new scheme to get/set REQ responded resources.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  7 ++++---
 drivers/infiniband/core/cm_msgs.h | 12 ------------
 2 files changed, 4 insertions(+), 15 deletions(-)

drivers/infiniband/core/cm.c +4 -3

index 81a67805b029..25cbc0860bd4 100644
@@ -1279,7 +1279,8 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 	cm_req_set_max_cm_retries(req_msg, param->max_cm_retries);
 
 	if (param->qp_type != IB_QPT_XRC_INI) {
-		cm_req_set_resp_res(req_msg, param->responder_resources);
+		CM_SET(REQ_RESPONDED_RESOURCES, req_msg,
+		       param->responder_resources);
 		cm_req_set_retry_count(req_msg, param->retry_count);
 		cm_req_set_rnr_retry_count(req_msg, param->rnr_retry_count);
 		cm_req_set_srq(req_msg, param->srq);

@@ -1670,7 +1671,7 @@ static void cm_format_req_event(struct cm_work *work,
 	param->qp_type = cm_req_get_qp_type(req_msg);
 	param->starting_psn = be32_to_cpu(cm_req_get_starting_psn(req_msg));
 	param->responder_resources = cm_req_get_init_depth(req_msg);
-	param->initiator_depth = cm_req_get_resp_res(req_msg);
+	param->initiator_depth = CM_GET(REQ_RESPONDED_RESOURCES, req_msg);
 	param->local_cm_response_timeout =
 					cm_req_get_remote_resp_timeout(req_msg);
 	param->flow_control = cm_req_get_flow_ctrl(req_msg);

@@ -2004,7 +2005,7 @@ static int cm_req_handler(struct cm_work *work)
 					cm_req_get_local_resp_timeout(req_msg));
 	cm_id_priv->max_cm_retries = cm_req_get_max_cm_retries(req_msg);
 	cm_id_priv->remote_qpn = CM_GET(REQ_LOCAL_QPN, req_msg);
-	cm_id_priv->initiator_depth = cm_req_get_resp_res(req_msg);
+	cm_id_priv->initiator_depth = CM_GET(REQ_RESPONDED_RESOURCES, req_msg);
 	cm_id_priv->responder_resources = cm_req_get_init_depth(req_msg);
 	cm_id_priv->path_mtu = cm_req_get_path_mtu(req_msg);
 	cm_id_priv->pkey = req_msg->pkey;

drivers/infiniband/core/cm_msgs.h +0 ~~-12~~

index 4cef1fe58813..ab32f8cd98d0 100644
@@ -400,18 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline u8 cm_req_get_resp_res(struct cm_req_msg *req_msg)
-{
-	return (u8) be32_to_cpu(req_msg->offset32);
-}
-
-static inline void cm_req_set_resp_res(struct cm_req_msg *req_msg, u8 resp_res)
-{
-	req_msg->offset32 = cpu_to_be32(resp_res |
-					(be32_to_cpu(req_msg->offset32) &
-					 0xFFFFFF00));
-}
-
 static inline u8 cm_req_get_init_depth(struct cm_req_msg *req_msg)
 {
 	return (u8) be32_to_cpu(req_msg->offset36);

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #18 lore raw

PATCH 15/43 RDMA/cm: Convert REQ initiator depth to the new scheme

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Adapt REQ initiator depth to new get/set macros.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  6 +++---
 drivers/infiniband/core/cm_msgs.h | 13 -------------
 2 files changed, 3 insertions(+), 16 deletions(-)

drivers/infiniband/core/cm.c +3 -3

index 25cbc0860bd4..519a025773ff 100644
@@ -1266,7 +1266,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 	req_msg->service_id = param->service_id;
 	req_msg->local_ca_guid = cm_id_priv->id.device->node_guid;
 	CM_SET(REQ_LOCAL_QPN, req_msg, param->qp_num);
-	cm_req_set_init_depth(req_msg, param->initiator_depth);
+	CM_SET(REQ_INITIATOR_DEPTH, req_msg, param->initiator_depth);
 	cm_req_set_remote_resp_timeout(req_msg,
 				       param->remote_cm_response_timeout);
 	cm_req_set_qp_type(req_msg, param->qp_type);

@@ -1670,7 +1670,7 @@ static void cm_format_req_event(struct cm_work *work,
 	param->remote_qpn = CM_GET(REP_LOCAL_QPN, req_msg);
 	param->qp_type = cm_req_get_qp_type(req_msg);
 	param->starting_psn = be32_to_cpu(cm_req_get_starting_psn(req_msg));
-	param->responder_resources = cm_req_get_init_depth(req_msg);
+	param->responder_resources = CM_GET(REQ_INITIATOR_DEPTH, req_msg);
 	param->initiator_depth = CM_GET(REQ_RESPONDED_RESOURCES, req_msg);
 	param->local_cm_response_timeout =
 					cm_req_get_remote_resp_timeout(req_msg);

@@ -2006,7 +2006,7 @@ static int cm_req_handler(struct cm_work *work)
 	cm_id_priv->max_cm_retries = cm_req_get_max_cm_retries(req_msg);
 	cm_id_priv->remote_qpn = CM_GET(REQ_LOCAL_QPN, req_msg);
 	cm_id_priv->initiator_depth = CM_GET(REQ_RESPONDED_RESOURCES, req_msg);
-	cm_id_priv->responder_resources = cm_req_get_init_depth(req_msg);
+	cm_id_priv->responder_resources = CM_GET(REQ_INITIATOR_DEPTH, req_msg);
 	cm_id_priv->path_mtu = cm_req_get_path_mtu(req_msg);
 	cm_id_priv->pkey = req_msg->pkey;
 	cm_id_priv->sq_psn = cm_req_get_starting_psn(req_msg);

drivers/infiniband/core/cm_msgs.h +0 ~~-13~~

index ab32f8cd98d0..4f4531d38535 100644
@@ -400,19 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline u8 cm_req_get_init_depth(struct cm_req_msg *req_msg)
-{
-	return (u8) be32_to_cpu(req_msg->offset36);
-}
-
-static inline void cm_req_set_init_depth(struct cm_req_msg *req_msg,
-					 u8 init_depth)
-{
-	req_msg->offset36 = cpu_to_be32(init_depth |
-					(be32_to_cpu(req_msg->offset36) &
-					 0xFFFFFF00));
-}
-
 static inline u8 cm_req_get_remote_resp_timeout(struct cm_req_msg *req_msg)
 {
 	return (u8) ((be32_to_cpu(req_msg->offset40) & 0xF8) >> 3);

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #19 lore raw

PATCH 16/43 RDMA/cm: Convert REQ remote response timeout

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Use new get/set macros to access REQ remote response timeout.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  6 +++---
 drivers/infiniband/core/cm_msgs.h | 13 -------------
 2 files changed, 3 insertions(+), 16 deletions(-)

drivers/infiniband/core/cm.c +3 -3

index 519a025773ff..4e5c2ad1532e 100644
@@ -1267,8 +1267,8 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 	req_msg->local_ca_guid = cm_id_priv->id.device->node_guid;
 	CM_SET(REQ_LOCAL_QPN, req_msg, param->qp_num);
 	CM_SET(REQ_INITIATOR_DEPTH, req_msg, param->initiator_depth);
-	cm_req_set_remote_resp_timeout(req_msg,
-				       param->remote_cm_response_timeout);
+	CM_SET(REQ_REMOTE_CM_RESPONSE_TIMEOUT, req_msg,
+	       param->remote_cm_response_timeout);
 	cm_req_set_qp_type(req_msg, param->qp_type);
 	cm_req_set_flow_ctrl(req_msg, param->flow_control);
 	cm_req_set_starting_psn(req_msg, cpu_to_be32(param->starting_psn));

@@ -1673,7 +1673,7 @@ static void cm_format_req_event(struct cm_work *work,
 	param->responder_resources = CM_GET(REQ_INITIATOR_DEPTH, req_msg);
 	param->initiator_depth = CM_GET(REQ_RESPONDED_RESOURCES, req_msg);
 	param->local_cm_response_timeout =
-					cm_req_get_remote_resp_timeout(req_msg);
+		CM_GET(REQ_REMOTE_CM_RESPONSE_TIMEOUT, req_msg);
 	param->flow_control = cm_req_get_flow_ctrl(req_msg);
 	param->remote_cm_response_timeout =
 					cm_req_get_local_resp_timeout(req_msg);

drivers/infiniband/core/cm_msgs.h +0 ~~-13~~

index 4f4531d38535..955a9a5ceeb7 100644
@@ -400,19 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline u8 cm_req_get_remote_resp_timeout(struct cm_req_msg *req_msg)
-{
-	return (u8) ((be32_to_cpu(req_msg->offset40) & 0xF8) >> 3);
-}
-
-static inline void cm_req_set_remote_resp_timeout(struct cm_req_msg *req_msg,
-						  u8 resp_timeout)
-{
-	req_msg->offset40 = cpu_to_be32((resp_timeout << 3) |
-					 (be32_to_cpu(req_msg->offset40) &
-					  0xFFFFFF07));
-}
-
 static inline enum ib_qp_type cm_req_get_qp_type(struct cm_req_msg *req_msg)
 {
 	u8 transport_type = (u8) (be32_to_cpu(req_msg->offset40) & 0x06) >> 1;

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #20 lore raw

PATCH 17/43 RDMA/cm: Simplify QP type to wire protocol translation

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Simplify QP type to/from wire protocol logic and move it to be near implementation and not in header file.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      | 25 +++++++++++++++++++++
 drivers/infiniband/core/cm_msgs.h | 37 -------------------------------
 2 files changed, 25 insertions(+), 37 deletions(-)

drivers/infiniband/core/cm.c +25 -0

index 4e5c2ad1532e..17954b71cf09 100644
@@ -1247,6 +1247,20 @@ static void cm_format_mad_hdr(struct ib_mad_hdr *hdr,
 	hdr->tid	   = tid;
 }
 
+static void cm_req_set_qp_type(struct cm_req_msg *req_msg,
+			       enum ib_qp_type qp_type)
+{
+	static const u8 qp_types[IB_QPT_MAX] = {
+		[IB_QPT_UC] = 1,
+		[IB_QPT_XRC_INI] = 3,
+	};
+
+	if (qp_type == IB_QPT_XRC_INI)
+		CM_SET(REQ_EXTENDED_TRANSPORT_TYPE, req_msg, 0x1);
+
+	CM_SET(REQ_TRANSPORT_SERVICE_TYPE, req_msg, qp_types[qp_type]);
+}
+
 static void cm_format_req(struct cm_req_msg *req_msg,
 			  struct cm_id_private *cm_id_priv,
 			  struct ib_cm_req_param *param)

@@ -1645,6 +1659,17 @@ static void cm_opa_to_ib_sgid(struct cm_work *work,
 	}
 }
 
+static enum ib_qp_type cm_req_get_qp_type(struct cm_req_msg *req_msg)
+{
+	static const enum ib_qp_type qp_type[] = { IB_QPT_RC, IB_QPT_UC, 0, 0 };
+	u8 transport_type = CM_GET(REQ_TRANSPORT_SERVICE_TYPE, req_msg);
+
+	if (transport_type == 3 &&
+	    (CM_GET(REQ_EXTENDED_TRANSPORT_TYPE, req_msg) == 1))
+		return IB_QPT_XRC_TGT;
+	return qp_type[transport_type];
+}
+
 static void cm_format_req_event(struct cm_work *work,
 				struct cm_id_private *cm_id_priv,
 				struct ib_cm_id *listen_id)

drivers/infiniband/core/cm_msgs.h +0 ~~-37~~

index 955a9a5ceeb7..e073308dad09 100644
@@ -400,43 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline enum ib_qp_type cm_req_get_qp_type(struct cm_req_msg *req_msg)
-{
-	u8 transport_type = (u8) (be32_to_cpu(req_msg->offset40) & 0x06) >> 1;
-	switch(transport_type) {
-	case 0: return IB_QPT_RC;
-	case 1: return IB_QPT_UC;
-	case 3:
-		switch (req_msg->offset51 & 0x7) {
-		case 1: return IB_QPT_XRC_TGT;
-		default: return 0;
-		}
-	default: return 0;
-	}
-}
-
-static inline void cm_req_set_qp_type(struct cm_req_msg *req_msg,
-				      enum ib_qp_type qp_type)
-{
-	switch(qp_type) {
-	case IB_QPT_UC:
-		req_msg->offset40 = cpu_to_be32((be32_to_cpu(
-						  req_msg->offset40) &
-						   0xFFFFFFF9) | 0x2);
-		break;
-	case IB_QPT_XRC_INI:
-		req_msg->offset40 = cpu_to_be32((be32_to_cpu(
-						 req_msg->offset40) &
-						   0xFFFFFFF9) | 0x6);
-		req_msg->offset51 = (req_msg->offset51 & 0xF8) | 1;
-		break;
-	default:
-		req_msg->offset40 = cpu_to_be32(be32_to_cpu(
-						 req_msg->offset40) &
-						  0xFFFFFFF9);
-	}
-}
-
 static inline u8 cm_req_get_flow_ctrl(struct cm_req_msg *req_msg)
 {
 	return be32_to_cpu(req_msg->offset40) & 0x1;

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #21 lore raw

PATCH 18/43 RDMA/cm: Convert REQ flow control

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Use CM_GET/CM_SET for REQ flow control field.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  4 ++--
 drivers/infiniband/core/cm_msgs.h | 13 -------------
 2 files changed, 2 insertions(+), 15 deletions(-)

drivers/infiniband/core/cm.c +2 -2

index 17954b71cf09..3e2eb096b2f9 100644
@@ -1284,7 +1284,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 	CM_SET(REQ_REMOTE_CM_RESPONSE_TIMEOUT, req_msg,
 	       param->remote_cm_response_timeout);
 	cm_req_set_qp_type(req_msg, param->qp_type);
-	cm_req_set_flow_ctrl(req_msg, param->flow_control);
+	CM_SET(REQ_END_TO_END_FLOW_CONTROL, req_msg, param->flow_control);
 	cm_req_set_starting_psn(req_msg, cpu_to_be32(param->starting_psn));
 	cm_req_set_local_resp_timeout(req_msg,
 				      param->local_cm_response_timeout);

@@ -1699,7 +1699,7 @@ static void cm_format_req_event(struct cm_work *work,
 	param->initiator_depth = CM_GET(REQ_RESPONDED_RESOURCES, req_msg);
 	param->local_cm_response_timeout =
 		CM_GET(REQ_REMOTE_CM_RESPONSE_TIMEOUT, req_msg);
-	param->flow_control = cm_req_get_flow_ctrl(req_msg);
+	param->flow_control = CM_GET(REQ_END_TO_END_FLOW_CONTROL, req_msg);
 	param->remote_cm_response_timeout =
 					cm_req_get_local_resp_timeout(req_msg);
 	param->retry_count = cm_req_get_retry_count(req_msg);

drivers/infiniband/core/cm_msgs.h +0 ~~-13~~

index e073308dad09..538ce42b97c3 100644
@@ -400,19 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline u8 cm_req_get_flow_ctrl(struct cm_req_msg *req_msg)
-{
-	return be32_to_cpu(req_msg->offset40) & 0x1;
-}
-
-static inline void cm_req_set_flow_ctrl(struct cm_req_msg *req_msg,
-					u8 flow_ctrl)
-{
-	req_msg->offset40 = cpu_to_be32((flow_ctrl & 0x1) |
-					 (be32_to_cpu(req_msg->offset40) &
-					  0xFFFFFFFE));
-}
-
 static inline __be32 cm_req_get_starting_psn(struct cm_req_msg *req_msg)
 {
 	return cpu_to_be32(be32_to_cpu(req_msg->offset44) >> 8);

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #22 lore raw

PATCH 19/43 RDMA/cm: Convert starting PSN to be u32 variable

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Remove extra conversion between be32<->u32 for starting PSN by using newly created CM_GET/CM_SET macros.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      | 24 ++++++++++++------------
 drivers/infiniband/core/cm_msgs.h | 24 ------------------------
 2 files changed, 12 insertions(+), 36 deletions(-)

drivers/infiniband/core/cm.c +12 ~~-12~~

index 3e2eb096b2f9..0367da67501b 100644
@@ -253,8 +253,8 @@ struct cm_id_private {
 	u32 local_qpn;
 	u32 remote_qpn;
 	enum ib_qp_type qp_type;
-	__be32 sq_psn;
-	__be32 rq_psn;
+	u32 sq_psn;
+	u32 rq_psn;
 	int timeout_ms;
 	enum ib_mtu path_mtu;
 	__be16 pkey;

@@ -1285,7 +1285,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 	       param->remote_cm_response_timeout);
 	cm_req_set_qp_type(req_msg, param->qp_type);
 	CM_SET(REQ_END_TO_END_FLOW_CONTROL, req_msg, param->flow_control);
-	cm_req_set_starting_psn(req_msg, cpu_to_be32(param->starting_psn));
+	CM_SET(REQ_STARTING_PSN, req_msg, param->starting_psn);
 	cm_req_set_local_resp_timeout(req_msg,
 				      param->local_cm_response_timeout);
 	req_msg->pkey = param->primary_path->pkey;

@@ -1459,7 +1459,7 @@ int ib_send_cm_req(struct ib_cm_id *cm_id,
 	cm_id_priv->msg->context[1] = (void *) (unsigned long) IB_CM_REQ_SENT;
 
 	cm_id_priv->local_qpn = CM_GET(REQ_LOCAL_QPN, req_msg);
-	cm_id_priv->rq_psn = cm_req_get_starting_psn(req_msg);
+	cm_id_priv->rq_psn = CM_GET(REQ_STARTING_PSN, req_msg);
 
 	spin_lock_irqsave(&cm_id_priv->lock, flags);
 	ret = ib_post_send_mad(cm_id_priv->msg, NULL);

@@ -1694,7 +1694,7 @@ static void cm_format_req_event(struct cm_work *work,
 	param->remote_qkey = be32_to_cpu(req_msg->local_qkey);
 	param->remote_qpn = CM_GET(REP_LOCAL_QPN, req_msg);
 	param->qp_type = cm_req_get_qp_type(req_msg);
-	param->starting_psn = be32_to_cpu(cm_req_get_starting_psn(req_msg));
+	param->starting_psn = CM_GET(REQ_STARTING_PSN, req_msg);
 	param->responder_resources = CM_GET(REQ_INITIATOR_DEPTH, req_msg);
 	param->initiator_depth = CM_GET(REQ_RESPONDED_RESOURCES, req_msg);
 	param->local_cm_response_timeout =

@@ -2034,7 +2034,7 @@ static int cm_req_handler(struct cm_work *work)
 	cm_id_priv->responder_resources = CM_GET(REQ_INITIATOR_DEPTH, req_msg);
 	cm_id_priv->path_mtu = cm_req_get_path_mtu(req_msg);
 	cm_id_priv->pkey = req_msg->pkey;
-	cm_id_priv->sq_psn = cm_req_get_starting_psn(req_msg);
+	cm_id_priv->sq_psn = CM_GET(REQ_STARTING_PSN, req_msg);
 	cm_id_priv->retry_count = cm_req_get_retry_count(req_msg);
 	cm_id_priv->rnr_retry_count = cm_req_get_rnr_retry_count(req_msg);
 	cm_id_priv->qp_type = cm_req_get_qp_type(req_msg);

@@ -2061,7 +2061,7 @@ static void cm_format_rep(struct cm_rep_msg *rep_msg,
 	cm_format_mad_hdr(&rep_msg->hdr, CM_REP_ATTR_ID, cm_id_priv->tid);
 	rep_msg->local_comm_id = cm_id_priv->id.local_id;
 	rep_msg->remote_comm_id = cm_id_priv->id.remote_id;
-	cm_rep_set_starting_psn(rep_msg, cpu_to_be32(param->starting_psn));
+	CM_SET(REP_STARTING_PSN, rep_msg, param->starting_psn);
 	rep_msg->resp_resources = param->responder_resources;
 	cm_rep_set_target_ack_delay(rep_msg,
 				    cm_id_priv->av.port->cm_dev->ack_delay);

@@ -2127,7 +2127,7 @@ int ib_send_cm_rep(struct ib_cm_id *cm_id,
 	cm_id_priv->msg = msg;
 	cm_id_priv->initiator_depth = param->initiator_depth;
 	cm_id_priv->responder_resources = param->responder_resources;
-	cm_id_priv->rq_psn = cm_rep_get_starting_psn(rep_msg);
+	cm_id_priv->rq_psn = CM_GET(REP_STARTING_PSN, rep_msg);
 	cm_id_priv->local_qpn = param->qp_num;
 
 out:	spin_unlock_irqrestore(&cm_id_priv->lock, flags);

@@ -2215,7 +2215,7 @@ static void cm_format_rep_event(struct cm_work *work, enum ib_qp_type qp_type)
 			CM_GET(REP_LOCAL_EE_CONTEXT_NUMBER, rep_msg);
 	else
 		param->remote_qpn = CM_GET(REP_LOCAL_QPN, rep_msg);
-	param->starting_psn = be32_to_cpu(cm_rep_get_starting_psn(rep_msg));
+	param->starting_psn = CM_GET(REP_STARTING_PSN, rep_msg);
 	param->responder_resources = rep_msg->initiator_depth;
 	param->initiator_depth = rep_msg->resp_resources;
 	param->target_ack_delay = cm_rep_get_target_ack_delay(rep_msg);

@@ -2362,7 +2362,7 @@ static int cm_rep_handler(struct cm_work *work)
 		cm_id_priv->remote_qpn = CM_GET(REP_LOCAL_QPN, rep_msg);
 	cm_id_priv->initiator_depth = rep_msg->resp_resources;
 	cm_id_priv->responder_resources = rep_msg->initiator_depth;
-	cm_id_priv->sq_psn = cm_rep_get_starting_psn(rep_msg);
+	cm_id_priv->sq_psn = CM_GET(REP_STARTING_PSN, rep_msg);
 	cm_id_priv->rnr_retry_count = cm_rep_get_rnr_retry_count(rep_msg);
 	cm_id_priv->target_ack_delay = cm_rep_get_target_ack_delay(rep_msg);
 	cm_id_priv->av.timeout =

@@ -4151,7 +4151,7 @@ static int cm_init_qp_rtr_attr(struct cm_id_private *cm_id_priv,
 		qp_attr->ah_attr = cm_id_priv->av.ah_attr;
 		qp_attr->path_mtu = cm_id_priv->path_mtu;
 		qp_attr->dest_qp_num = cm_id_priv->remote_qpn;
-		qp_attr->rq_psn = be32_to_cpu(cm_id_priv->rq_psn);
+		qp_attr->rq_psn = cm_id_priv->rq_psn;
 		if (cm_id_priv->qp_type == IB_QPT_RC ||
 		    cm_id_priv->qp_type == IB_QPT_XRC_TGT) {
 			*qp_attr_mask |= IB_QP_MAX_DEST_RD_ATOMIC |

@@ -4200,7 +4200,7 @@ static int cm_init_qp_rts_attr(struct cm_id_private *cm_id_priv,
 	case IB_CM_ESTABLISHED:
 		if (cm_id_priv->id.lap_state == IB_CM_LAP_UNINIT) {
 			*qp_attr_mask = IB_QP_STATE | IB_QP_SQ_PSN;
-			qp_attr->sq_psn = be32_to_cpu(cm_id_priv->sq_psn);
+			qp_attr->sq_psn = cm_id_priv->sq_psn;
 			switch (cm_id_priv->qp_type) {
 			case IB_QPT_RC:
 			case IB_QPT_XRC_INI:

drivers/infiniband/core/cm_msgs.h +0 ~~-24~~

index 538ce42b97c3..b63bba57394e 100644
@@ -400,18 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline __be32 cm_req_get_starting_psn(struct cm_req_msg *req_msg)
-{
-	return cpu_to_be32(be32_to_cpu(req_msg->offset44) >> 8);
-}
-
-static inline void cm_req_set_starting_psn(struct cm_req_msg *req_msg,
-					   __be32 starting_psn)
-{
-	req_msg->offset44 = cpu_to_be32((be32_to_cpu(starting_psn) << 8) |
-			    (be32_to_cpu(req_msg->offset44) & 0x000000FF));
-}
-
 static inline u8 cm_req_get_local_resp_timeout(struct cm_req_msg *req_msg)
 {
 	return (u8) ((be32_to_cpu(req_msg->offset44) & 0xF8) >> 3);

@@ -709,18 +697,6 @@ struct cm_rep_msg {
 
 } __packed;
 
-static inline __be32 cm_rep_get_starting_psn(struct cm_rep_msg *rep_msg)
-{
-	return cpu_to_be32(be32_to_cpu(rep_msg->offset20) >> 8);
-}
-
-static inline void cm_rep_set_starting_psn(struct cm_rep_msg *rep_msg,
-					   __be32 starting_psn)
-{
-	rep_msg->offset20 = cpu_to_be32((be32_to_cpu(starting_psn) << 8) |
-			    (be32_to_cpu(rep_msg->offset20) & 0x000000FF));
-}
-
 static inline u8 cm_rep_get_target_ack_delay(struct cm_rep_msg *rep_msg)
 {
 	return (u8) (rep_msg->offset26 >> 3);

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #23 lore raw

PATCH 20/43 RDMA/cm: Update REQ local response timeout

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Use newly introduces CM_GET/CM_SET to add access REQ local response timeout.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  8 ++++----
 drivers/infiniband/core/cm_msgs.h | 12 ------------
 2 files changed, 4 insertions(+), 16 deletions(-)

drivers/infiniband/core/cm.c +4 -4

index 0367da67501b..b9eec4bf6419 100644
@@ -1286,8 +1286,8 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 	cm_req_set_qp_type(req_msg, param->qp_type);
 	CM_SET(REQ_END_TO_END_FLOW_CONTROL, req_msg, param->flow_control);
 	CM_SET(REQ_STARTING_PSN, req_msg, param->starting_psn);
-	cm_req_set_local_resp_timeout(req_msg,
-				      param->local_cm_response_timeout);
+	CM_SET(REQ_LOCAL_CM_RESPONSE_TIMEOUT, req_msg,
+	       param->local_cm_response_timeout);
 	req_msg->pkey = param->primary_path->pkey;
 	cm_req_set_path_mtu(req_msg, param->primary_path->mtu);
 	cm_req_set_max_cm_retries(req_msg, param->max_cm_retries);

@@ -1701,7 +1701,7 @@ static void cm_format_req_event(struct cm_work *work,
 		CM_GET(REQ_REMOTE_CM_RESPONSE_TIMEOUT, req_msg);
 	param->flow_control = CM_GET(REQ_END_TO_END_FLOW_CONTROL, req_msg);
 	param->remote_cm_response_timeout =
-					cm_req_get_local_resp_timeout(req_msg);
+		CM_GET(REQ_LOCAL_CM_RESPONSE_TIMEOUT, req_msg);
 	param->retry_count = cm_req_get_retry_count(req_msg);
 	param->rnr_retry_count = cm_req_get_rnr_retry_count(req_msg);
 	param->srq = cm_req_get_srq(req_msg);

@@ -2027,7 +2027,7 @@ static int cm_req_handler(struct cm_work *work)
 	}
 	cm_id_priv->tid = req_msg->hdr.tid;
 	cm_id_priv->timeout_ms = cm_convert_to_ms(
-					cm_req_get_local_resp_timeout(req_msg));
+		CM_GET(REQ_LOCAL_CM_RESPONSE_TIMEOUT, req_msg));
 	cm_id_priv->max_cm_retries = cm_req_get_max_cm_retries(req_msg);
 	cm_id_priv->remote_qpn = CM_GET(REQ_LOCAL_QPN, req_msg);
 	cm_id_priv->initiator_depth = CM_GET(REQ_RESPONDED_RESOURCES, req_msg);

drivers/infiniband/core/cm_msgs.h +0 ~~-12~~

index b63bba57394e..2deaed83c9eb 100644
@@ -400,18 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline u8 cm_req_get_local_resp_timeout(struct cm_req_msg *req_msg)
-{
-	return (u8) ((be32_to_cpu(req_msg->offset44) & 0xF8) >> 3);
-}
-
-static inline void cm_req_set_local_resp_timeout(struct cm_req_msg *req_msg,
-						 u8 resp_timeout)
-{
-	req_msg->offset44 = cpu_to_be32((resp_timeout << 3) |
-			    (be32_to_cpu(req_msg->offset44) & 0xFFFFFF07));
-}
-
 static inline u8 cm_req_get_retry_count(struct cm_req_msg *req_msg)
 {
 	return (u8) (be32_to_cpu(req_msg->offset44) & 0x7);

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #24 lore raw

PATCH 21/43 RDMA/cm: Convert REQ retry count to use new scheme

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert REQ retry count to new CM_GET/CM_SET macros.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  6 +++---
 drivers/infiniband/core/cm_msgs.h | 12 ------------
 2 files changed, 3 insertions(+), 15 deletions(-)

drivers/infiniband/core/cm.c +3 -3

index b9eec4bf6419..ea3540cf9deb 100644
@@ -1295,7 +1295,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 	if (param->qp_type != IB_QPT_XRC_INI) {
 		CM_SET(REQ_RESPONDED_RESOURCES, req_msg,
 		       param->responder_resources);
-		cm_req_set_retry_count(req_msg, param->retry_count);
+		CM_SET(REQ_RETRY_COUNT, req_msg, param->retry_count);
 		cm_req_set_rnr_retry_count(req_msg, param->rnr_retry_count);
 		cm_req_set_srq(req_msg, param->srq);
 	}

@@ -1702,7 +1702,7 @@ static void cm_format_req_event(struct cm_work *work,
 	param->flow_control = CM_GET(REQ_END_TO_END_FLOW_CONTROL, req_msg);
 	param->remote_cm_response_timeout =
 		CM_GET(REQ_LOCAL_CM_RESPONSE_TIMEOUT, req_msg);
-	param->retry_count = cm_req_get_retry_count(req_msg);
+	param->retry_count = CM_GET(REQ_RETRY_COUNT, req_msg);
 	param->rnr_retry_count = cm_req_get_rnr_retry_count(req_msg);
 	param->srq = cm_req_get_srq(req_msg);
 	param->ppath_sgid_attr = cm_id_priv->av.ah_attr.grh.sgid_attr;

@@ -2035,7 +2035,7 @@ static int cm_req_handler(struct cm_work *work)
 	cm_id_priv->path_mtu = cm_req_get_path_mtu(req_msg);
 	cm_id_priv->pkey = req_msg->pkey;
 	cm_id_priv->sq_psn = CM_GET(REQ_STARTING_PSN, req_msg);
-	cm_id_priv->retry_count = cm_req_get_retry_count(req_msg);
+	cm_id_priv->retry_count = CM_GET(REQ_RETRY_COUNT, req_msg);
 	cm_id_priv->rnr_retry_count = cm_req_get_rnr_retry_count(req_msg);
 	cm_id_priv->qp_type = cm_req_get_qp_type(req_msg);

drivers/infiniband/core/cm_msgs.h +0 ~~-12~~

index 2deaed83c9eb..ff7d4e9da833 100644
@@ -400,18 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline u8 cm_req_get_retry_count(struct cm_req_msg *req_msg)
-{
-	return (u8) (be32_to_cpu(req_msg->offset44) & 0x7);
-}
-
-static inline void cm_req_set_retry_count(struct cm_req_msg *req_msg,
-					  u8 retry_count)
-{
-	req_msg->offset44 = cpu_to_be32((retry_count & 0x7) |
-			    (be32_to_cpu(req_msg->offset44) & 0xFFFFFFF8));
-}
-
 static inline u8 cm_req_get_path_mtu(struct cm_req_msg *req_msg)
 {
 	return req_msg->offset50 >> 4;

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #25 lore raw

PATCH 22/43 RDMA/cm: Update REQ path MTU field

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert REQ path MTU field to use CM_GET/CM_SET macros.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  8 ++++----
 drivers/infiniband/core/cm_msgs.h | 10 ----------
 2 files changed, 4 insertions(+), 14 deletions(-)

drivers/infiniband/core/cm.c +4 -4

index ea3540cf9deb..442fb4dee55b 100644
@@ -1289,7 +1289,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 	CM_SET(REQ_LOCAL_CM_RESPONSE_TIMEOUT, req_msg,
 	       param->local_cm_response_timeout);
 	req_msg->pkey = param->primary_path->pkey;
-	cm_req_set_path_mtu(req_msg, param->primary_path->mtu);
+	CM_SET(REQ_PATH_PACKET_PAYLOAD_MTU, req_msg, param->primary_path->mtu);
 	cm_req_set_max_cm_retries(req_msg, param->max_cm_retries);
 
 	if (param->qp_type != IB_QPT_XRC_INI) {

@@ -1576,7 +1576,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
 	primary_path->pkey = req_msg->pkey;
 	primary_path->sl = cm_req_get_primary_sl(req_msg);
 	primary_path->mtu_selector = IB_SA_EQ;
-	primary_path->mtu = cm_req_get_path_mtu(req_msg);
+	primary_path->mtu = CM_GET(REQ_PATH_PACKET_PAYLOAD_MTU, req_msg);
 	primary_path->rate_selector = IB_SA_EQ;
 	primary_path->rate = cm_req_get_primary_packet_rate(req_msg);
 	primary_path->packet_life_time_selector = IB_SA_EQ;

@@ -1597,7 +1597,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
 		alt_path->pkey = req_msg->pkey;
 		alt_path->sl = cm_req_get_alt_sl(req_msg);
 		alt_path->mtu_selector = IB_SA_EQ;
-		alt_path->mtu = cm_req_get_path_mtu(req_msg);
+		alt_path->mtu = CM_GET(REQ_PATH_PACKET_PAYLOAD_MTU, req_msg);
 		alt_path->rate_selector = IB_SA_EQ;
 		alt_path->rate = cm_req_get_alt_packet_rate(req_msg);
 		alt_path->packet_life_time_selector = IB_SA_EQ;

@@ -2032,7 +2032,7 @@ static int cm_req_handler(struct cm_work *work)
 	cm_id_priv->remote_qpn = CM_GET(REQ_LOCAL_QPN, req_msg);
 	cm_id_priv->initiator_depth = CM_GET(REQ_RESPONDED_RESOURCES, req_msg);
 	cm_id_priv->responder_resources = CM_GET(REQ_INITIATOR_DEPTH, req_msg);
-	cm_id_priv->path_mtu = cm_req_get_path_mtu(req_msg);
+	cm_id_priv->path_mtu = CM_GET(REQ_PATH_PACKET_PAYLOAD_MTU, req_msg);
 	cm_id_priv->pkey = req_msg->pkey;
 	cm_id_priv->sq_psn = CM_GET(REQ_STARTING_PSN, req_msg);
 	cm_id_priv->retry_count = CM_GET(REQ_RETRY_COUNT, req_msg);

drivers/infiniband/core/cm_msgs.h +0 ~~-10~~

index ff7d4e9da833..485bfc523c64 100644
@@ -400,16 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline u8 cm_req_get_path_mtu(struct cm_req_msg *req_msg)
-{
-	return req_msg->offset50 >> 4;
-}
-
-static inline void cm_req_set_path_mtu(struct cm_req_msg *req_msg, u8 path_mtu)
-{
-	req_msg->offset50 = (u8) ((req_msg->offset50 & 0xF) | (path_mtu << 4));
-}
-
 static inline u8 cm_req_get_rnr_retry_count(struct cm_req_msg *req_msg)
 {
 	return req_msg->offset50 & 0x7;

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #26 lore raw

PATCH 23/43 RDMA/cm: Convert REQ RNR retry timeout counter

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert REQ RNR retry timeout counter to new scheme.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  6 +++---
 drivers/infiniband/core/cm_msgs.h | 12 ------------
 2 files changed, 3 insertions(+), 15 deletions(-)

drivers/infiniband/core/cm.c +3 -3

index 442fb4dee55b..64b416e7f183 100644
@@ -1296,7 +1296,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 		CM_SET(REQ_RESPONDED_RESOURCES, req_msg,
 		       param->responder_resources);
 		CM_SET(REQ_RETRY_COUNT, req_msg, param->retry_count);
-		cm_req_set_rnr_retry_count(req_msg, param->rnr_retry_count);
+		CM_SET(REQ_RNR_RETRY_COUNT, req_msg, param->rnr_retry_count);
 		cm_req_set_srq(req_msg, param->srq);
 	}

@@ -1703,7 +1703,7 @@ static void cm_format_req_event(struct cm_work *work,
 	param->remote_cm_response_timeout =
 		CM_GET(REQ_LOCAL_CM_RESPONSE_TIMEOUT, req_msg);
 	param->retry_count = CM_GET(REQ_RETRY_COUNT, req_msg);
-	param->rnr_retry_count = cm_req_get_rnr_retry_count(req_msg);
+	param->rnr_retry_count = CM_GET(REQ_RNR_RETRY_COUNT, req_msg);
 	param->srq = cm_req_get_srq(req_msg);
 	param->ppath_sgid_attr = cm_id_priv->av.ah_attr.grh.sgid_attr;
 	work->cm_event.private_data = &req_msg->private_data;

@@ -2036,7 +2036,7 @@ static int cm_req_handler(struct cm_work *work)
 	cm_id_priv->pkey = req_msg->pkey;
 	cm_id_priv->sq_psn = CM_GET(REQ_STARTING_PSN, req_msg);
 	cm_id_priv->retry_count = CM_GET(REQ_RETRY_COUNT, req_msg);
-	cm_id_priv->rnr_retry_count = cm_req_get_rnr_retry_count(req_msg);
+	cm_id_priv->rnr_retry_count = CM_GET(REQ_RNR_RETRY_COUNT, req_msg);
 	cm_id_priv->qp_type = cm_req_get_qp_type(req_msg);
 
 	cm_format_req_event(work, cm_id_priv, &listen_cm_id_priv->id);

drivers/infiniband/core/cm_msgs.h +0 ~~-12~~

index 485bfc523c64..37e9bf512940 100644
@@ -400,18 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline u8 cm_req_get_rnr_retry_count(struct cm_req_msg *req_msg)
-{
-	return req_msg->offset50 & 0x7;
-}
-
-static inline void cm_req_set_rnr_retry_count(struct cm_req_msg *req_msg,
-					      u8 rnr_retry_count)
-{
-	req_msg->offset50 = (u8) ((req_msg->offset50 & 0xF8) |
-				  (rnr_retry_count & 0x7));
-}
-
 static inline u8 cm_req_get_max_cm_retries(struct cm_req_msg *req_msg)
 {
 	return req_msg->offset51 >> 4;

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #27 lore raw

PATCH 24/43 RDMA/cm: Convert REQ MAX CM retries

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert REQ MAX CM retries to new scheme.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  4 ++--
 drivers/infiniband/core/cm_msgs.h | 11 -----------
 2 files changed, 2 insertions(+), 13 deletions(-)

drivers/infiniband/core/cm.c +2 -2

index 64b416e7f183..0450d75f8d53 100644
@@ -1290,7 +1290,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 	       param->local_cm_response_timeout);
 	req_msg->pkey = param->primary_path->pkey;
 	CM_SET(REQ_PATH_PACKET_PAYLOAD_MTU, req_msg, param->primary_path->mtu);
-	cm_req_set_max_cm_retries(req_msg, param->max_cm_retries);
+	CM_SET(REQ_MAX_CM_RETRIES, req_msg, param->max_cm_retries);
 
 	if (param->qp_type != IB_QPT_XRC_INI) {
 		CM_SET(REQ_RESPONDED_RESOURCES, req_msg,

@@ -2028,7 +2028,7 @@ static int cm_req_handler(struct cm_work *work)
 	cm_id_priv->tid = req_msg->hdr.tid;
 	cm_id_priv->timeout_ms = cm_convert_to_ms(
 		CM_GET(REQ_LOCAL_CM_RESPONSE_TIMEOUT, req_msg));
-	cm_id_priv->max_cm_retries = cm_req_get_max_cm_retries(req_msg);
+	cm_id_priv->max_cm_retries = CM_GET(REQ_MAX_CM_RETRIES, req_msg);
 	cm_id_priv->remote_qpn = CM_GET(REQ_LOCAL_QPN, req_msg);
 	cm_id_priv->initiator_depth = CM_GET(REQ_RESPONDED_RESOURCES, req_msg);
 	cm_id_priv->responder_resources = CM_GET(REQ_INITIATOR_DEPTH, req_msg);

drivers/infiniband/core/cm_msgs.h +0 ~~-11~~

index 37e9bf512940..677b61a85e1f 100644
@@ -400,17 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline u8 cm_req_get_max_cm_retries(struct cm_req_msg *req_msg)
-{
-	return req_msg->offset51 >> 4;
-}
-
-static inline void cm_req_set_max_cm_retries(struct cm_req_msg *req_msg,
-					     u8 retries)
-{
-	req_msg->offset51 = (u8) ((req_msg->offset51 & 0xF) | (retries << 4));
-}
-
 static inline u8 cm_req_get_srq(struct cm_req_msg *req_msg)
 {
 	return (req_msg->offset51 & 0x8) >> 3;

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #28 lore raw

PATCH 25/43 RDMA/cm: Convert REQ SRQ field

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert REQ SRQ field to new scheme.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  4 ++--
 drivers/infiniband/core/cm_msgs.h | 11 -----------
 2 files changed, 2 insertions(+), 13 deletions(-)

drivers/infiniband/core/cm.c +2 -2

index 0450d75f8d53..d28501559d7d 100644
@@ -1297,7 +1297,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 		       param->responder_resources);
 		CM_SET(REQ_RETRY_COUNT, req_msg, param->retry_count);
 		CM_SET(REQ_RNR_RETRY_COUNT, req_msg, param->rnr_retry_count);
-		cm_req_set_srq(req_msg, param->srq);
+		CM_SET(REQ_SRQ, req_msg, param->srq);
 	}
 
 	req_msg->primary_local_gid = pri_path->sgid;

@@ -1704,7 +1704,7 @@ static void cm_format_req_event(struct cm_work *work,
 		CM_GET(REQ_LOCAL_CM_RESPONSE_TIMEOUT, req_msg);
 	param->retry_count = CM_GET(REQ_RETRY_COUNT, req_msg);
 	param->rnr_retry_count = CM_GET(REQ_RNR_RETRY_COUNT, req_msg);
-	param->srq = cm_req_get_srq(req_msg);
+	param->srq = CM_GET(REQ_SRQ, req_msg);
 	param->ppath_sgid_attr = cm_id_priv->av.ah_attr.grh.sgid_attr;
 	work->cm_event.private_data = &req_msg->private_data;
 	work->cm_event.private_data_len = CM_REQ_PRIVATE_DATA_SIZE;

drivers/infiniband/core/cm_msgs.h +0 ~~-11~~

index 677b61a85e1f..112ece857fd8 100644
@@ -400,17 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline u8 cm_req_get_srq(struct cm_req_msg *req_msg)
-{
-	return (req_msg->offset51 & 0x8) >> 3;
-}
-
-static inline void cm_req_set_srq(struct cm_req_msg *req_msg, u8 srq)
-{
-	req_msg->offset51 = (u8) ((req_msg->offset51 & 0xF7) |
-				  ((srq & 0x1) << 3));
-}
-
 static inline __be32 cm_req_get_primary_flow_label(struct cm_req_msg *req_msg)
 {
 	return cpu_to_be32(be32_to_cpu(req_msg->primary_offset88) >> 12);

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:07 UTC #29 lore raw

PATCH 26/43 RDMA/cm: Convert REQ flow label field

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Use new CM_GET/CM_SET macros.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      | 13 ++++++++-----
 drivers/infiniband/core/cm_msgs.h | 28 ----------------------------
 2 files changed, 8 insertions(+), 33 deletions(-)

drivers/infiniband/core/cm.c +8 -5

index d28501559d7d..a1bee95ba9bd 100644
@@ -1318,7 +1318,8 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 		req_msg->primary_local_lid = IB_LID_PERMISSIVE;
 		req_msg->primary_remote_lid = IB_LID_PERMISSIVE;
 	}
-	cm_req_set_primary_flow_label(req_msg, pri_path->flow_label);
+	CM_SET(REQ_PRIMARY_FLOW_LABEL, req_msg,
+	       be32_to_cpu(pri_path->flow_label));
 	cm_req_set_primary_packet_rate(req_msg, pri_path->rate);
 	req_msg->primary_traffic_class = pri_path->traffic_class;
 	req_msg->primary_hop_limit = pri_path->hop_limit;

@@ -1352,8 +1353,8 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 			req_msg->alt_local_lid = IB_LID_PERMISSIVE;
 			req_msg->alt_remote_lid = IB_LID_PERMISSIVE;
 		}
-		cm_req_set_alt_flow_label(req_msg,
-					  alt_path->flow_label);
+		CM_SET(REQ_ALTERNATE_FLOW_LABEL, req_msg,
+		       be32_to_cpu(alt_path->flow_label));
 		cm_req_set_alt_packet_rate(req_msg, alt_path->rate);
 		req_msg->alt_traffic_class = alt_path->traffic_class;
 		req_msg->alt_hop_limit = alt_path->hop_limit;

@@ -1569,7 +1570,8 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
 {
 	primary_path->dgid = req_msg->primary_local_gid;
 	primary_path->sgid = req_msg->primary_remote_gid;
-	primary_path->flow_label = cm_req_get_primary_flow_label(req_msg);
+	primary_path->flow_label =
+		cpu_to_be32(CM_GET(REQ_PRIMARY_FLOW_LABEL, req_msg));
 	primary_path->hop_limit = req_msg->primary_hop_limit;
 	primary_path->traffic_class = req_msg->primary_traffic_class;
 	primary_path->reversible = 1;

@@ -1590,7 +1592,8 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
 	if (cm_req_has_alt_path(req_msg)) {
 		alt_path->dgid = req_msg->alt_local_gid;
 		alt_path->sgid = req_msg->alt_remote_gid;
-		alt_path->flow_label = cm_req_get_alt_flow_label(req_msg);
+		alt_path->flow_label =
+			cpu_to_be32(CM_GET(REQ_ALTERNATE_FLOW_LABEL, req_msg));
 		alt_path->hop_limit = req_msg->alt_hop_limit;
 		alt_path->traffic_class = req_msg->alt_traffic_class;
 		alt_path->reversible = 1;

drivers/infiniband/core/cm_msgs.h +0 ~~-28~~

index 112ece857fd8..dfcdfe2cd5ba 100644
@@ -400,20 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline __be32 cm_req_get_primary_flow_label(struct cm_req_msg *req_msg)
-{
-	return cpu_to_be32(be32_to_cpu(req_msg->primary_offset88) >> 12);
-}
-
-static inline void cm_req_set_primary_flow_label(struct cm_req_msg *req_msg,
-						 __be32 flow_label)
-{
-	req_msg->primary_offset88 = cpu_to_be32(
-				    (be32_to_cpu(req_msg->primary_offset88) &
-				     0x00000FFF) |
-				     (be32_to_cpu(flow_label) << 12));
-}
-
 static inline u8 cm_req_get_primary_packet_rate(struct cm_req_msg *req_msg)
 {
 	return (u8) (be32_to_cpu(req_msg->primary_offset88) & 0x3F);

@@ -462,20 +448,6 @@ static inline void cm_req_set_primary_local_ack_timeout(struct cm_req_msg *req_m
 					  (local_ack_timeout << 3));
 }
 
-static inline __be32 cm_req_get_alt_flow_label(struct cm_req_msg *req_msg)
-{
-	return cpu_to_be32(be32_to_cpu(req_msg->alt_offset132) >> 12);
-}
-
-static inline void cm_req_set_alt_flow_label(struct cm_req_msg *req_msg,
-					     __be32 flow_label)
-{
-	req_msg->alt_offset132 = cpu_to_be32(
-				 (be32_to_cpu(req_msg->alt_offset132) &
-				  0x00000FFF) |
-				  (be32_to_cpu(flow_label) << 12));
-}
-
 static inline u8 cm_req_get_alt_packet_rate(struct cm_req_msg *req_msg)
 {
 	return (u8) (be32_to_cpu(req_msg->alt_offset132) & 0x3F);

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #30 lore raw

PATCH 27/43 RDMA/cm: Convert REQ packet rate

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Change primary and alternate packet rate fields to use newly introduced macros.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  8 ++++----
 drivers/infiniband/core/cm_msgs.h | 26 --------------------------
 2 files changed, 4 insertions(+), 30 deletions(-)

drivers/infiniband/core/cm.c +4 -4

index a1bee95ba9bd..a081eb5b1ac7 100644
@@ -1320,7 +1320,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 	}
 	CM_SET(REQ_PRIMARY_FLOW_LABEL, req_msg,
 	       be32_to_cpu(pri_path->flow_label));
-	cm_req_set_primary_packet_rate(req_msg, pri_path->rate);
+	CM_SET(REQ_PRIMARY_PACKET_RATE, req_msg, pri_path->rate);
 	req_msg->primary_traffic_class = pri_path->traffic_class;
 	req_msg->primary_hop_limit = pri_path->hop_limit;
 	cm_req_set_primary_sl(req_msg, pri_path->sl);

@@ -1355,7 +1355,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 		}
 		CM_SET(REQ_ALTERNATE_FLOW_LABEL, req_msg,
 		       be32_to_cpu(alt_path->flow_label));
-		cm_req_set_alt_packet_rate(req_msg, alt_path->rate);
+		CM_SET(REQ_ALTERNATE_PACKET_RATE, req_msg, alt_path->rate);
 		req_msg->alt_traffic_class = alt_path->traffic_class;
 		req_msg->alt_hop_limit = alt_path->hop_limit;
 		cm_req_set_alt_sl(req_msg, alt_path->sl);

@@ -1580,7 +1580,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
 	primary_path->mtu_selector = IB_SA_EQ;
 	primary_path->mtu = CM_GET(REQ_PATH_PACKET_PAYLOAD_MTU, req_msg);
 	primary_path->rate_selector = IB_SA_EQ;
-	primary_path->rate = cm_req_get_primary_packet_rate(req_msg);
+	primary_path->rate = CM_GET(REQ_PRIMARY_PACKET_RATE, req_msg);
 	primary_path->packet_life_time_selector = IB_SA_EQ;
 	primary_path->packet_life_time =
 		cm_req_get_primary_local_ack_timeout(req_msg);

@@ -1602,7 +1602,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
 		alt_path->mtu_selector = IB_SA_EQ;
 		alt_path->mtu = CM_GET(REQ_PATH_PACKET_PAYLOAD_MTU, req_msg);
 		alt_path->rate_selector = IB_SA_EQ;
-		alt_path->rate = cm_req_get_alt_packet_rate(req_msg);
+		alt_path->rate = CM_GET(REQ_ALTERNATE_PACKET_RATE, req_msg);
 		alt_path->packet_life_time_selector = IB_SA_EQ;
 		alt_path->packet_life_time =
 			cm_req_get_alt_local_ack_timeout(req_msg);

drivers/infiniband/core/cm_msgs.h +0 ~~-26~~

index dfcdfe2cd5ba..b272587ee226 100644
@@ -400,19 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline u8 cm_req_get_primary_packet_rate(struct cm_req_msg *req_msg)
-{
-	return (u8) (be32_to_cpu(req_msg->primary_offset88) & 0x3F);
-}
-
-static inline void cm_req_set_primary_packet_rate(struct cm_req_msg *req_msg,
-						  u8 rate)
-{
-	req_msg->primary_offset88 = cpu_to_be32(
-				    (be32_to_cpu(req_msg->primary_offset88) &
-				     0xFFFFFFC0) | (rate & 0x3F));
-}
-
 static inline u8 cm_req_get_primary_sl(struct cm_req_msg *req_msg)
 {
 	return (u8) (req_msg->primary_offset94 >> 4);

@@ -448,19 +435,6 @@ static inline void cm_req_set_primary_local_ack_timeout(struct cm_req_msg *req_m
 					  (local_ack_timeout << 3));
 }
 
-static inline u8 cm_req_get_alt_packet_rate(struct cm_req_msg *req_msg)
-{
-	return (u8) (be32_to_cpu(req_msg->alt_offset132) & 0x3F);
-}
-
-static inline void cm_req_set_alt_packet_rate(struct cm_req_msg *req_msg,
-					      u8 rate)
-{
-	req_msg->alt_offset132 = cpu_to_be32(
-				 (be32_to_cpu(req_msg->alt_offset132) &
-				  0xFFFFFFC0) | (rate & 0x3F));
-}
-
 static inline u8 cm_req_get_alt_sl(struct cm_req_msg *req_msg)
 {
 	return (u8) (req_msg->alt_offset138 >> 4);

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #31 lore raw

PATCH 28/43 RDMA/cm: Convert REQ SL fields

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert REQ SL fields.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      | 12 ++++++------
 drivers/infiniband/core/cm_msgs.h | 22 ----------------------
 2 files changed, 6 insertions(+), 28 deletions(-)

drivers/infiniband/core/cm.c +6 -6

index a081eb5b1ac7..9f27dbc38707 100644
@@ -1323,7 +1323,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 	CM_SET(REQ_PRIMARY_PACKET_RATE, req_msg, pri_path->rate);
 	req_msg->primary_traffic_class = pri_path->traffic_class;
 	req_msg->primary_hop_limit = pri_path->hop_limit;
-	cm_req_set_primary_sl(req_msg, pri_path->sl);
+	CM_SET(REQ_PRIMARY_SL, req_msg, pri_path->sl);
 	cm_req_set_primary_subnet_local(req_msg, (pri_path->hop_limit <= 1));
 	cm_req_set_primary_local_ack_timeout(req_msg,
 		cm_ack_timeout(cm_id_priv->av.port->cm_dev->ack_delay,

@@ -1358,7 +1358,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 		CM_SET(REQ_ALTERNATE_PACKET_RATE, req_msg, alt_path->rate);
 		req_msg->alt_traffic_class = alt_path->traffic_class;
 		req_msg->alt_hop_limit = alt_path->hop_limit;
-		cm_req_set_alt_sl(req_msg, alt_path->sl);
+		CM_SET(REQ_ALTERNATE_SL, req_msg, alt_path->sl);
 		cm_req_set_alt_subnet_local(req_msg, (alt_path->hop_limit <= 1));
 		cm_req_set_alt_local_ack_timeout(req_msg,
 			cm_ack_timeout(cm_id_priv->av.port->cm_dev->ack_delay,

@@ -1576,7 +1576,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
 	primary_path->traffic_class = req_msg->primary_traffic_class;
 	primary_path->reversible = 1;
 	primary_path->pkey = req_msg->pkey;
-	primary_path->sl = cm_req_get_primary_sl(req_msg);
+	primary_path->sl = CM_GET(REQ_PRIMARY_SL, req_msg);
 	primary_path->mtu_selector = IB_SA_EQ;
 	primary_path->mtu = CM_GET(REQ_PATH_PACKET_PAYLOAD_MTU, req_msg);
 	primary_path->rate_selector = IB_SA_EQ;

@@ -1598,7 +1598,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
 		alt_path->traffic_class = req_msg->alt_traffic_class;
 		alt_path->reversible = 1;
 		alt_path->pkey = req_msg->pkey;
-		alt_path->sl = cm_req_get_alt_sl(req_msg);
+		alt_path->sl = CM_GET(REQ_ALTERNATE_SL, req_msg);
 		alt_path->mtu_selector = IB_SA_EQ;
 		alt_path->mtu = CM_GET(REQ_PATH_PACKET_PAYLOAD_MTU, req_msg);
 		alt_path->rate_selector = IB_SA_EQ;

@@ -1910,7 +1910,7 @@ static void cm_process_routed_req(struct cm_req_msg *req_msg, struct ib_wc *wc)
 	if (!cm_req_get_primary_subnet_local(req_msg)) {
 		if (req_msg->primary_local_lid == IB_LID_PERMISSIVE) {
 			req_msg->primary_local_lid = ib_lid_be16(wc->slid);
-			cm_req_set_primary_sl(req_msg, wc->sl);
+			CM_SET(REQ_PRIMARY_SL, req_msg, wc->sl);
 		}
 
 		if (req_msg->primary_remote_lid == IB_LID_PERMISSIVE)

@@ -1920,7 +1920,7 @@ static void cm_process_routed_req(struct cm_req_msg *req_msg, struct ib_wc *wc)
 	if (!cm_req_get_alt_subnet_local(req_msg)) {
 		if (req_msg->alt_local_lid == IB_LID_PERMISSIVE) {
 			req_msg->alt_local_lid = ib_lid_be16(wc->slid);
-			cm_req_set_alt_sl(req_msg, wc->sl);
+			CM_SET(REQ_ALTERNATE_SL, req_msg, wc->sl);
 		}
 
 		if (req_msg->alt_remote_lid == IB_LID_PERMISSIVE)

drivers/infiniband/core/cm_msgs.h +0 ~~-22~~

index b272587ee226..3ed35a44481d 100644
@@ -400,17 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline u8 cm_req_get_primary_sl(struct cm_req_msg *req_msg)
-{
-	return (u8) (req_msg->primary_offset94 >> 4);
-}
-
-static inline void cm_req_set_primary_sl(struct cm_req_msg *req_msg, u8 sl)
-{
-	req_msg->primary_offset94 = (u8) ((req_msg->primary_offset94 & 0x0F) |
-					  (sl << 4));
-}
-
 static inline u8 cm_req_get_primary_subnet_local(struct cm_req_msg *req_msg)
 {
 	return (u8) ((req_msg->primary_offset94 & 0x08) >> 3);

@@ -435,17 +424,6 @@ static inline void cm_req_set_primary_local_ack_timeout(struct cm_req_msg *req_m
 					  (local_ack_timeout << 3));
 }
 
-static inline u8 cm_req_get_alt_sl(struct cm_req_msg *req_msg)
-{
-	return (u8) (req_msg->alt_offset138 >> 4);
-}
-
-static inline void cm_req_set_alt_sl(struct cm_req_msg *req_msg, u8 sl)
-{
-	req_msg->alt_offset138 = (u8) ((req_msg->alt_offset138 & 0x0F) |
-				       (sl << 4));
-}
-
 static inline u8 cm_req_get_alt_subnet_local(struct cm_req_msg *req_msg)
 {
 	return (u8) ((req_msg->alt_offset138 & 0x08) >> 3);

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #32 lore raw

PATCH 29/43 RDMA/cm: Convert REQ subnet local fields

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert REQ subnet local fields.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  9 +++++----
 drivers/infiniband/core/cm_msgs.h | 24 ------------------------
 2 files changed, 5 insertions(+), 28 deletions(-)

drivers/infiniband/core/cm.c +5 -4

index 9f27dbc38707..36abe43ad8a6 100644
@@ -1324,7 +1324,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 	req_msg->primary_traffic_class = pri_path->traffic_class;
 	req_msg->primary_hop_limit = pri_path->hop_limit;
 	CM_SET(REQ_PRIMARY_SL, req_msg, pri_path->sl);
-	cm_req_set_primary_subnet_local(req_msg, (pri_path->hop_limit <= 1));
+	CM_SET(REQ_PRIMARY_SUBNET_LOCAL, req_msg, (pri_path->hop_limit <= 1));
 	cm_req_set_primary_local_ack_timeout(req_msg,
 		cm_ack_timeout(cm_id_priv->av.port->cm_dev->ack_delay,
 			       pri_path->packet_life_time));

@@ -1359,7 +1359,8 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 		req_msg->alt_traffic_class = alt_path->traffic_class;
 		req_msg->alt_hop_limit = alt_path->hop_limit;
 		CM_SET(REQ_ALTERNATE_SL, req_msg, alt_path->sl);
-		cm_req_set_alt_subnet_local(req_msg, (alt_path->hop_limit <= 1));
+		CM_SET(REQ_ALTERNATE_SUBNET_LOCAL, req_msg,
+		       (alt_path->hop_limit <= 1));
 		cm_req_set_alt_local_ack_timeout(req_msg,
 			cm_ack_timeout(cm_id_priv->av.port->cm_dev->ack_delay,
 				       alt_path->packet_life_time));

@@ -1907,7 +1908,7 @@ static struct cm_id_private * cm_match_req(struct cm_work *work,
  */
 static void cm_process_routed_req(struct cm_req_msg *req_msg, struct ib_wc *wc)
 {
-	if (!cm_req_get_primary_subnet_local(req_msg)) {
+	if (!CM_GET(REQ_PRIMARY_SUBNET_LOCAL, req_msg)) {
 		if (req_msg->primary_local_lid == IB_LID_PERMISSIVE) {
 			req_msg->primary_local_lid = ib_lid_be16(wc->slid);
 			CM_SET(REQ_PRIMARY_SL, req_msg, wc->sl);

@@ -1917,7 +1918,7 @@ static void cm_process_routed_req(struct cm_req_msg *req_msg, struct ib_wc *wc)
 			req_msg->primary_remote_lid = cpu_to_be16(wc->dlid_path_bits);
 	}
 
-	if (!cm_req_get_alt_subnet_local(req_msg)) {
+	if (!CM_GET(REQ_ALTERNATE_SUBNET_LOCAL, req_msg)) {
 		if (req_msg->alt_local_lid == IB_LID_PERMISSIVE) {
 			req_msg->alt_local_lid = ib_lid_be16(wc->slid);
 			CM_SET(REQ_ALTERNATE_SL, req_msg, wc->sl);

drivers/infiniband/core/cm_msgs.h +0 ~~-24~~

index 3ed35a44481d..0faa48a51d7b 100644
@@ -400,18 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline u8 cm_req_get_primary_subnet_local(struct cm_req_msg *req_msg)
-{
-	return (u8) ((req_msg->primary_offset94 & 0x08) >> 3);
-}
-
-static inline void cm_req_set_primary_subnet_local(struct cm_req_msg *req_msg,
-						   u8 subnet_local)
-{
-	req_msg->primary_offset94 = (u8) ((req_msg->primary_offset94 & 0xF7) |
-					  ((subnet_local & 0x1) << 3));
-}
-
 static inline u8 cm_req_get_primary_local_ack_timeout(struct cm_req_msg *req_msg)
 {
 	return (u8) (req_msg->primary_offset95 >> 3);

@@ -424,18 +412,6 @@ static inline void cm_req_set_primary_local_ack_timeout(struct cm_req_msg *req_m
 					  (local_ack_timeout << 3));
 }
 
-static inline u8 cm_req_get_alt_subnet_local(struct cm_req_msg *req_msg)
-{
-	return (u8) ((req_msg->alt_offset138 & 0x08) >> 3);
-}
-
-static inline void cm_req_set_alt_subnet_local(struct cm_req_msg *req_msg,
-					       u8 subnet_local)
-{
-	req_msg->alt_offset138 = (u8) ((req_msg->alt_offset138 & 0xF7) |
-				       ((subnet_local & 0x1) << 3));
-}
-
 static inline u8 cm_req_get_alt_local_ack_timeout(struct cm_req_msg *req_msg)
 {
 	return (u8) (req_msg->alt_offset139 >> 3);

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #33 lore raw

PATCH 30/43 RDMA/cm: Convert REQ local ack timeout

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert REQ local ack timeout fields.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      | 16 ++++++++--------
 drivers/infiniband/core/cm_msgs.h | 24 ------------------------
 2 files changed, 8 insertions(+), 32 deletions(-)

drivers/infiniband/core/cm.c +8 -8

index 36abe43ad8a6..cb4b16a47e00 100644
@@ -1325,9 +1325,9 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 	req_msg->primary_hop_limit = pri_path->hop_limit;
 	CM_SET(REQ_PRIMARY_SL, req_msg, pri_path->sl);
 	CM_SET(REQ_PRIMARY_SUBNET_LOCAL, req_msg, (pri_path->hop_limit <= 1));
-	cm_req_set_primary_local_ack_timeout(req_msg,
-		cm_ack_timeout(cm_id_priv->av.port->cm_dev->ack_delay,
-			       pri_path->packet_life_time));
+	CM_SET(REQ_PRIMARY_LOCAL_ACK_TIMEOUT, req_msg,
+	       cm_ack_timeout(cm_id_priv->av.port->cm_dev->ack_delay,
+			      pri_path->packet_life_time));
 
 	if (alt_path) {
 		bool alt_ext = false;

@@ -1361,9 +1361,9 @@ static void cm_format_req(struct cm_req_msg *req_msg,
 		CM_SET(REQ_ALTERNATE_SL, req_msg, alt_path->sl);
 		CM_SET(REQ_ALTERNATE_SUBNET_LOCAL, req_msg,
 		       (alt_path->hop_limit <= 1));
-		cm_req_set_alt_local_ack_timeout(req_msg,
-			cm_ack_timeout(cm_id_priv->av.port->cm_dev->ack_delay,
-				       alt_path->packet_life_time));
+		CM_SET(REQ_ALTERNATE_LOCAL_ACK_TIMEOUT, req_msg,
+		       cm_ack_timeout(cm_id_priv->av.port->cm_dev->ack_delay,
+				      alt_path->packet_life_time));
 	}
 
 	if (param->private_data && param->private_data_len)

@@ -1584,7 +1584,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
 	primary_path->rate = CM_GET(REQ_PRIMARY_PACKET_RATE, req_msg);
 	primary_path->packet_life_time_selector = IB_SA_EQ;
 	primary_path->packet_life_time =
-		cm_req_get_primary_local_ack_timeout(req_msg);
+		CM_GET(REQ_PRIMARY_LOCAL_ACK_TIMEOUT, req_msg);
 	primary_path->packet_life_time -= (primary_path->packet_life_time > 0);
 	primary_path->service_id = req_msg->service_id;
 	if (sa_path_is_roce(primary_path))

@@ -1606,7 +1606,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
 		alt_path->rate = CM_GET(REQ_ALTERNATE_PACKET_RATE, req_msg);
 		alt_path->packet_life_time_selector = IB_SA_EQ;
 		alt_path->packet_life_time =
-			cm_req_get_alt_local_ack_timeout(req_msg);
+			CM_GET(REQ_ALTERNATE_LOCAL_ACK_TIMEOUT, req_msg);
 		alt_path->packet_life_time -= (alt_path->packet_life_time > 0);
 		alt_path->service_id = req_msg->service_id;

drivers/infiniband/core/cm_msgs.h +0 ~~-24~~

index 0faa48a51d7b..8a7c0a910618 100644
@@ -400,30 +400,6 @@ struct cm_req_msg {
 
 } __packed;
 
-static inline u8 cm_req_get_primary_local_ack_timeout(struct cm_req_msg *req_msg)
-{
-	return (u8) (req_msg->primary_offset95 >> 3);
-}
-
-static inline void cm_req_set_primary_local_ack_timeout(struct cm_req_msg *req_msg,
-							u8 local_ack_timeout)
-{
-	req_msg->primary_offset95 = (u8) ((req_msg->primary_offset95 & 0x07) |
-					  (local_ack_timeout << 3));
-}
-
-static inline u8 cm_req_get_alt_local_ack_timeout(struct cm_req_msg *req_msg)
-{
-	return (u8) (req_msg->alt_offset139 >> 3);
-}
-
-static inline void cm_req_set_alt_local_ack_timeout(struct cm_req_msg *req_msg,
-						    u8 local_ack_timeout)
-{
-	req_msg->alt_offset139 = (u8) ((req_msg->alt_offset139 & 0x07) |
-				       (local_ack_timeout << 3));
-}
-
 /* Message REJected or MRAed */
 enum cm_msg_response {
 	CM_MSG_RESPONSE_REQ = 0x0,

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #34 lore raw

PATCH 31/43 RDMA/cm: Convert MRA MRAed field

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert MRA MRAed field.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      | 11 ++++++-----
 drivers/infiniband/core/cm_msgs.h | 10 ----------
 2 files changed, 6 insertions(+), 15 deletions(-)

drivers/infiniband/core/cm.c +6 -5

index cb4b16a47e00..11502ab48d35 100644
@@ -1745,7 +1745,7 @@ static void cm_format_mra(struct cm_mra_msg *mra_msg,
 			  const void *private_data, u8 private_data_len)
 {
 	cm_format_mad_hdr(&mra_msg->hdr, CM_MRA_ATTR_ID, cm_id_priv->tid);
-	cm_mra_set_msg_mraed(mra_msg, msg_mraed);
+	CM_SET(MRA_MESSAGE_MRAED, mra_msg, msg_mraed);
 	mra_msg->local_comm_id = cm_id_priv->id.local_id;
 	mra_msg->remote_comm_id = cm_id_priv->id.remote_id;
 	cm_mra_set_service_timeout(mra_msg, service_timeout);

@@ -3007,7 +3007,7 @@ EXPORT_SYMBOL(ib_send_cm_mra);
 
 static struct cm_id_private * cm_acquire_mraed_id(struct cm_mra_msg *mra_msg)
 {
-	switch (cm_mra_get_msg_mraed(mra_msg)) {
+	switch (CM_GET(MRA_MESSAGE_MRAED, mra_msg)) {
 	case CM_MSG_RESPONSE_REQ:
 		return cm_acquire_id(mra_msg->remote_comm_id, 0);
 	case CM_MSG_RESPONSE_REP:

@@ -3040,21 +3040,22 @@ static int cm_mra_handler(struct cm_work *work)
 	spin_lock_irq(&cm_id_priv->lock);
 	switch (cm_id_priv->id.state) {
 	case IB_CM_REQ_SENT:
-		if (cm_mra_get_msg_mraed(mra_msg) != CM_MSG_RESPONSE_REQ ||
+		if (CM_GET(MRA_MESSAGE_MRAED, mra_msg) != CM_MSG_RESPONSE_REQ ||
 		    ib_modify_mad(cm_id_priv->av.port->mad_agent,
 				  cm_id_priv->msg, timeout))
 			goto out;
 		cm_id_priv->id.state = IB_CM_MRA_REQ_RCVD;
 		break;
 	case IB_CM_REP_SENT:
-		if (cm_mra_get_msg_mraed(mra_msg) != CM_MSG_RESPONSE_REP ||
+		if (CM_GET(MRA_MESSAGE_MRAED, mra_msg) != CM_MSG_RESPONSE_REP ||
 		    ib_modify_mad(cm_id_priv->av.port->mad_agent,
 				  cm_id_priv->msg, timeout))
 			goto out;
 		cm_id_priv->id.state = IB_CM_MRA_REP_RCVD;
 		break;
 	case IB_CM_ESTABLISHED:
-		if (cm_mra_get_msg_mraed(mra_msg) != CM_MSG_RESPONSE_OTHER ||
+		if (CM_GET(MRA_MESSAGE_MRAED, mra_msg) !=
+			    CM_MSG_RESPONSE_OTHER ||
 		    cm_id_priv->id.lap_state != IB_CM_LAP_SENT ||
 		    ib_modify_mad(cm_id_priv->av.port->mad_agent,
 				  cm_id_priv->msg, timeout)) {

drivers/infiniband/core/cm_msgs.h +0 ~~-10~~

index 8a7c0a910618..bf94c3dc391e 100644
@@ -421,16 +421,6 @@ enum cm_msg_response {
 
 } __packed;
 
-static inline u8 cm_mra_get_msg_mraed(struct cm_mra_msg *mra_msg)
-{
-	return (u8) (mra_msg->offset8 >> 6);
-}
-
-static inline void cm_mra_set_msg_mraed(struct cm_mra_msg *mra_msg, u8 msg)
-{
-	mra_msg->offset8 = (u8) ((mra_msg->offset8 & 0x3F) | (msg << 6));
-}
-
 static inline u8 cm_mra_get_service_timeout(struct cm_mra_msg *mra_msg)
 {
 	return (u8) (mra_msg->offset9 >> 3);

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #35 lore raw

PATCH 32/43 RDMA/cm: Convert MRA service timeout

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert MRA service timeout field.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  6 +++---
 drivers/infiniband/core/cm_msgs.h | 12 ------------
 2 files changed, 3 insertions(+), 15 deletions(-)

drivers/infiniband/core/cm.c +3 -3

index 11502ab48d35..903bacb92a22 100644
@@ -1748,7 +1748,7 @@ static void cm_format_mra(struct cm_mra_msg *mra_msg,
 	CM_SET(MRA_MESSAGE_MRAED, mra_msg, msg_mraed);
 	mra_msg->local_comm_id = cm_id_priv->id.local_id;
 	mra_msg->remote_comm_id = cm_id_priv->id.remote_id;
-	cm_mra_set_service_timeout(mra_msg, service_timeout);
+	CM_SET(MRA_SERVICE_TIMEOUT, mra_msg, service_timeout);
 
 	if (private_data && private_data_len)
 		memcpy(mra_msg->private_data, private_data, private_data_len);

@@ -3033,8 +3033,8 @@ static int cm_mra_handler(struct cm_work *work)
 	work->cm_event.private_data = &mra_msg->private_data;
 	work->cm_event.private_data_len = CM_MRA_PRIVATE_DATA_SIZE;
 	work->cm_event.param.mra_rcvd.service_timeout =
-					cm_mra_get_service_timeout(mra_msg);
-	timeout = cm_convert_to_ms(cm_mra_get_service_timeout(mra_msg)) +
+		CM_GET(MRA_SERVICE_TIMEOUT, mra_msg);
+	timeout = cm_convert_to_ms(CM_GET(MRA_SERVICE_TIMEOUT, mra_msg)) +
 		  cm_convert_to_ms(cm_id_priv->av.timeout);
 
 	spin_lock_irq(&cm_id_priv->lock);

drivers/infiniband/core/cm_msgs.h +0 ~~-12~~

index bf94c3dc391e..96a27876d2ae 100644
@@ -421,18 +421,6 @@ enum cm_msg_response {
 
 } __packed;
 
-static inline u8 cm_mra_get_service_timeout(struct cm_mra_msg *mra_msg)
-{
-	return (u8) (mra_msg->offset9 >> 3);
-}
-
-static inline void cm_mra_set_service_timeout(struct cm_mra_msg *mra_msg,
-					      u8 service_timeout)
-{
-	mra_msg->offset9 = (u8) ((mra_msg->offset9 & 0x07) |
-				 (service_timeout << 3));
-}
-
 struct cm_rej_msg {
 	struct ib_mad_hdr hdr;

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #36 lore raw

PATCH 33/43 RDMA/cm: Update REJ struct to use new scheme

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert both message rejected and rejected info length fields.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      | 18 +++++++++---------
 drivers/infiniband/core/cm_msgs.h | 21 ---------------------
 2 files changed, 9 insertions(+), 30 deletions(-)

drivers/infiniband/core/cm.c +9 -9

index 903bacb92a22..af32d1e68b11 100644
@@ -1501,11 +1501,11 @@ static int cm_issue_rej(struct cm_port *port,
 	cm_format_mad_hdr(&rej_msg->hdr, CM_REJ_ATTR_ID, rcv_msg->hdr.tid);
 	rej_msg->remote_comm_id = rcv_msg->local_comm_id;
 	rej_msg->local_comm_id = rcv_msg->remote_comm_id;
-	cm_rej_set_msg_rejected(rej_msg, msg_rejected);
+	CM_SET(REJ_MESSAGE_REJECTED, rej_msg, msg_rejected);
 	rej_msg->reason = cpu_to_be16(reason);
 
 	if (ari && ari_length) {
-		cm_rej_set_reject_info_len(rej_msg, ari_length);
+		CM_SET(REJ_REJECTED_INFO_LENGTH, rej_msg, ari_length);
 		memcpy(rej_msg->ari, ari, ari_length);
 	}

@@ -1768,26 +1768,26 @@ static void cm_format_rej(struct cm_rej_msg *rej_msg,
 	switch(cm_id_priv->id.state) {
 	case IB_CM_REQ_RCVD:
 		rej_msg->local_comm_id = 0;
-		cm_rej_set_msg_rejected(rej_msg, CM_MSG_RESPONSE_REQ);
+		CM_SET(REJ_MESSAGE_REJECTED, rej_msg, CM_MSG_RESPONSE_REQ);
 		break;
 	case IB_CM_MRA_REQ_SENT:
 		rej_msg->local_comm_id = cm_id_priv->id.local_id;
-		cm_rej_set_msg_rejected(rej_msg, CM_MSG_RESPONSE_REQ);
+		CM_SET(REJ_MESSAGE_REJECTED, rej_msg, CM_MSG_RESPONSE_REQ);
 		break;
 	case IB_CM_REP_RCVD:
 	case IB_CM_MRA_REP_SENT:
 		rej_msg->local_comm_id = cm_id_priv->id.local_id;
-		cm_rej_set_msg_rejected(rej_msg, CM_MSG_RESPONSE_REP);
+		CM_SET(REJ_MESSAGE_REJECTED, rej_msg, CM_MSG_RESPONSE_REP);
 		break;
 	default:
 		rej_msg->local_comm_id = cm_id_priv->id.local_id;
-		cm_rej_set_msg_rejected(rej_msg, CM_MSG_RESPONSE_OTHER);
+		CM_SET(REJ_MESSAGE_REJECTED, rej_msg, CM_MSG_RESPONSE_OTHER);
 		break;
 	}
 
 	rej_msg->reason = cpu_to_be16(reason);
 	if (ari && ari_length) {
-		cm_rej_set_reject_info_len(rej_msg, ari_length);
+		CM_SET(REJ_REJECTED_INFO_LENGTH, rej_msg, ari_length);
 		memcpy(rej_msg->ari, ari, ari_length);
 	}

@@ -2815,7 +2815,7 @@ static void cm_format_rej_event(struct cm_work *work)
 	rej_msg = (struct cm_rej_msg *)work->mad_recv_wc->recv_buf.mad;
 	param = &work->cm_event.param.rej_rcvd;
 	param->ari = rej_msg->ari;
-	param->ari_length = cm_rej_get_reject_info_len(rej_msg);
+	param->ari_length = CM_GET(REJ_REJECTED_INFO_LENGTH, rej_msg);
 	param->reason = __be16_to_cpu(rej_msg->reason);
 	work->cm_event.private_data = &rej_msg->private_data;
 	work->cm_event.private_data_len = CM_REJ_PRIVATE_DATA_SIZE;

@@ -2846,7 +2846,7 @@ static struct cm_id_private * cm_acquire_rejected_id(struct cm_rej_msg *rej_msg)
 				cm_id_priv = NULL;
 		}
 		spin_unlock_irq(&cm.lock);
-	} else if (cm_rej_get_msg_rejected(rej_msg) == CM_MSG_RESPONSE_REQ)
+	} else if (CM_GET(REJ_MESSAGE_REJECTED, rej_msg) == CM_MSG_RESPONSE_REQ)
 		cm_id_priv = cm_acquire_id(rej_msg->remote_comm_id, 0);
 	else
 		cm_id_priv = cm_acquire_id(rej_msg->remote_comm_id, remote_id);

drivers/infiniband/core/cm_msgs.h +0 ~~-21~~

index 96a27876d2ae..6dc1a1086820 100644
@@ -437,27 +437,6 @@ struct cm_rej_msg {
 
 } __packed;
 
-static inline u8 cm_rej_get_msg_rejected(struct cm_rej_msg *rej_msg)
-{
-	return (u8) (rej_msg->offset8 >> 6);
-}
-
-static inline void cm_rej_set_msg_rejected(struct cm_rej_msg *rej_msg, u8 msg)
-{
-	rej_msg->offset8 = (u8) ((rej_msg->offset8 & 0x3F) | (msg << 6));
-}
-
-static inline u8 cm_rej_get_reject_info_len(struct cm_rej_msg *rej_msg)
-{
-	return (u8) (rej_msg->offset9 >> 1);
-}
-
-static inline void cm_rej_set_reject_info_len(struct cm_rej_msg *rej_msg,
-					      u8 len)
-{
-	rej_msg->offset9 = (u8) ((rej_msg->offset9 & 0x1) | (len << 1));
-}
-
 struct cm_rep_msg {
 	struct ib_mad_hdr hdr;

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #37 lore raw

PATCH 34/43 RDMA/cm: Convert REP target ack delay field

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert REP target ack delay field.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  8 ++++----
 drivers/infiniband/core/cm_msgs.h | 12 ------------
 2 files changed, 4 insertions(+), 16 deletions(-)

drivers/infiniband/core/cm.c +4 -4

index af32d1e68b11..596be796f7bc 100644
@@ -2067,8 +2067,8 @@ static void cm_format_rep(struct cm_rep_msg *rep_msg,
 	rep_msg->remote_comm_id = cm_id_priv->id.remote_id;
 	CM_SET(REP_STARTING_PSN, rep_msg, param->starting_psn);
 	rep_msg->resp_resources = param->responder_resources;
-	cm_rep_set_target_ack_delay(rep_msg,
-				    cm_id_priv->av.port->cm_dev->ack_delay);
+	CM_SET(REP_TARGET_ACK_DELAY, rep_msg,
+	       cm_id_priv->av.port->cm_dev->ack_delay);
 	cm_rep_set_failover(rep_msg, param->failover_accepted);
 	cm_rep_set_rnr_retry_count(rep_msg, param->rnr_retry_count);
 	rep_msg->local_ca_guid = cm_id_priv->id.device->node_guid;

@@ -2222,7 +2222,7 @@ static void cm_format_rep_event(struct cm_work *work, enum ib_qp_type qp_type)
 	param->starting_psn = CM_GET(REP_STARTING_PSN, rep_msg);
 	param->responder_resources = rep_msg->initiator_depth;
 	param->initiator_depth = rep_msg->resp_resources;
-	param->target_ack_delay = cm_rep_get_target_ack_delay(rep_msg);
+	param->target_ack_delay = CM_GET(REP_TARGET_ACK_DELAY, rep_msg);
 	param->failover_accepted = cm_rep_get_failover(rep_msg);
 	param->flow_control = cm_rep_get_flow_ctrl(rep_msg);
 	param->rnr_retry_count = cm_rep_get_rnr_retry_count(rep_msg);

@@ -2368,7 +2368,7 @@ static int cm_rep_handler(struct cm_work *work)
 	cm_id_priv->responder_resources = rep_msg->initiator_depth;
 	cm_id_priv->sq_psn = CM_GET(REP_STARTING_PSN, rep_msg);
 	cm_id_priv->rnr_retry_count = cm_rep_get_rnr_retry_count(rep_msg);
-	cm_id_priv->target_ack_delay = cm_rep_get_target_ack_delay(rep_msg);
+	cm_id_priv->target_ack_delay = CM_GET(REP_TARGET_ACK_DELAY, rep_msg);
 	cm_id_priv->av.timeout =
 			cm_ack_timeout(cm_id_priv->target_ack_delay,
 				       cm_id_priv->av.timeout - 1);

drivers/infiniband/core/cm_msgs.h +0 ~~-12~~

index 6dc1a1086820..a3207f984c32 100644
@@ -462,18 +462,6 @@ struct cm_rep_msg {
 
 } __packed;
 
-static inline u8 cm_rep_get_target_ack_delay(struct cm_rep_msg *rep_msg)
-{
-	return (u8) (rep_msg->offset26 >> 3);
-}
-
-static inline void cm_rep_set_target_ack_delay(struct cm_rep_msg *rep_msg,
-					       u8 target_ack_delay)
-{
-	rep_msg->offset26 = (u8) ((rep_msg->offset26 & 0x07) |
-				  (target_ack_delay << 3));
-}
-
 static inline u8 cm_rep_get_failover(struct cm_rep_msg *rep_msg)
 {
 	return (u8) ((rep_msg->offset26 & 0x06) >> 1);

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #38 lore raw

PATCH 35/43 RDMA/cm: Convert REP failover accepted field

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Update REP failover accepted field to the new scheme.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  4 ++--
 drivers/infiniband/core/cm_msgs.h | 11 -----------
 2 files changed, 2 insertions(+), 13 deletions(-)

drivers/infiniband/core/cm.c +2 -2

index 596be796f7bc..4b1f90ba4ec9 100644
@@ -2069,7 +2069,7 @@ static void cm_format_rep(struct cm_rep_msg *rep_msg,
 	rep_msg->resp_resources = param->responder_resources;
 	CM_SET(REP_TARGET_ACK_DELAY, rep_msg,
 	       cm_id_priv->av.port->cm_dev->ack_delay);
-	cm_rep_set_failover(rep_msg, param->failover_accepted);
+	CM_SET(REP_FAILOVER_ACCEPTED, rep_msg, param->failover_accepted);
 	cm_rep_set_rnr_retry_count(rep_msg, param->rnr_retry_count);
 	rep_msg->local_ca_guid = cm_id_priv->id.device->node_guid;

@@ -2223,7 +2223,7 @@ static void cm_format_rep_event(struct cm_work *work, enum ib_qp_type qp_type)
 	param->responder_resources = rep_msg->initiator_depth;
 	param->initiator_depth = rep_msg->resp_resources;
 	param->target_ack_delay = CM_GET(REP_TARGET_ACK_DELAY, rep_msg);
-	param->failover_accepted = cm_rep_get_failover(rep_msg);
+	param->failover_accepted = CM_GET(REP_FAILOVER_ACCEPTED, rep_msg);
 	param->flow_control = cm_rep_get_flow_ctrl(rep_msg);
 	param->rnr_retry_count = cm_rep_get_rnr_retry_count(rep_msg);
 	param->srq = cm_rep_get_srq(rep_msg);

drivers/infiniband/core/cm_msgs.h +0 ~~-11~~

index a3207f984c32..fdc3cd9d2f88 100644
@@ -462,17 +462,6 @@ struct cm_rep_msg {
 
 } __packed;
 
-static inline u8 cm_rep_get_failover(struct cm_rep_msg *rep_msg)
-{
-	return (u8) ((rep_msg->offset26 & 0x06) >> 1);
-}
-
-static inline void cm_rep_set_failover(struct cm_rep_msg *rep_msg, u8 failover)
-{
-	rep_msg->offset26 = (u8) ((rep_msg->offset26 & 0xF9) |
-				  ((failover & 0x3) << 1));
-}
-
 static inline u8 cm_rep_get_flow_ctrl(struct cm_rep_msg *rep_msg)
 {
 	return (u8) (rep_msg->offset26 & 0x01);

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #39 lore raw

PATCH 36/43 RDMA/cm: Convert REP flow control field

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert REP flow control field.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  5 +++--
 drivers/infiniband/core/cm_msgs.h | 12 ------------
 2 files changed, 3 insertions(+), 14 deletions(-)

drivers/infiniband/core/cm.c +3 -2

index 4b1f90ba4ec9..2c99bd99eac3 100644
@@ -2075,7 +2075,8 @@ static void cm_format_rep(struct cm_rep_msg *rep_msg,
 
 	if (cm_id_priv->qp_type != IB_QPT_XRC_TGT) {
 		rep_msg->initiator_depth = param->initiator_depth;
-		cm_rep_set_flow_ctrl(rep_msg, param->flow_control);
+		CM_SET(REP_END_TO_END_FLOW_CONTROL, rep_msg,
+		       param->flow_control);
 		cm_rep_set_srq(rep_msg, param->srq);
 		CM_SET(REP_LOCAL_QPN, rep_msg, param->qp_num);
 	} else {

@@ -2224,7 +2225,7 @@ static void cm_format_rep_event(struct cm_work *work, enum ib_qp_type qp_type)
 	param->initiator_depth = rep_msg->resp_resources;
 	param->target_ack_delay = CM_GET(REP_TARGET_ACK_DELAY, rep_msg);
 	param->failover_accepted = CM_GET(REP_FAILOVER_ACCEPTED, rep_msg);
-	param->flow_control = cm_rep_get_flow_ctrl(rep_msg);
+	param->flow_control = CM_GET(REP_END_TO_END_FLOW_CONTROL, rep_msg);
 	param->rnr_retry_count = cm_rep_get_rnr_retry_count(rep_msg);
 	param->srq = cm_rep_get_srq(rep_msg);
 	work->cm_event.private_data = &rep_msg->private_data;

drivers/infiniband/core/cm_msgs.h +0 ~~-12~~

index fdc3cd9d2f88..d9b831810dc2 100644
@@ -462,18 +462,6 @@ struct cm_rep_msg {
 
 } __packed;
 
-static inline u8 cm_rep_get_flow_ctrl(struct cm_rep_msg *rep_msg)
-{
-	return (u8) (rep_msg->offset26 & 0x01);
-}
-
-static inline void cm_rep_set_flow_ctrl(struct cm_rep_msg *rep_msg,
-					    u8 flow_ctrl)
-{
-	rep_msg->offset26 = (u8) ((rep_msg->offset26 & 0xFE) |
-				  (flow_ctrl & 0x1));
-}
-
 static inline u8 cm_rep_get_rnr_retry_count(struct cm_rep_msg *rep_msg)
 {
 	return (u8) (rep_msg->offset27 >> 5);

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #40 lore raw

PATCH 37/43 RDMA/cm: Convert REP RNR retry count field

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert REP RNR retry count field.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  6 +++---
 drivers/infiniband/core/cm_msgs.h | 12 ------------
 2 files changed, 3 insertions(+), 15 deletions(-)

drivers/infiniband/core/cm.c +3 -3

index 2c99bd99eac3..78d595c1d39b 100644
@@ -2070,7 +2070,7 @@ static void cm_format_rep(struct cm_rep_msg *rep_msg,
 	CM_SET(REP_TARGET_ACK_DELAY, rep_msg,
 	       cm_id_priv->av.port->cm_dev->ack_delay);
 	CM_SET(REP_FAILOVER_ACCEPTED, rep_msg, param->failover_accepted);
-	cm_rep_set_rnr_retry_count(rep_msg, param->rnr_retry_count);
+	CM_SET(REP_RNR_RETRY_COUNT, rep_msg, param->rnr_retry_count);
 	rep_msg->local_ca_guid = cm_id_priv->id.device->node_guid;
 
 	if (cm_id_priv->qp_type != IB_QPT_XRC_TGT) {

@@ -2226,7 +2226,7 @@ static void cm_format_rep_event(struct cm_work *work, enum ib_qp_type qp_type)
 	param->target_ack_delay = CM_GET(REP_TARGET_ACK_DELAY, rep_msg);
 	param->failover_accepted = CM_GET(REP_FAILOVER_ACCEPTED, rep_msg);
 	param->flow_control = CM_GET(REP_END_TO_END_FLOW_CONTROL, rep_msg);
-	param->rnr_retry_count = cm_rep_get_rnr_retry_count(rep_msg);
+	param->rnr_retry_count = CM_GET(REP_RNR_RETRY_COUNT, rep_msg);
 	param->srq = cm_rep_get_srq(rep_msg);
 	work->cm_event.private_data = &rep_msg->private_data;
 	work->cm_event.private_data_len = CM_REP_PRIVATE_DATA_SIZE;

@@ -2368,7 +2368,7 @@ static int cm_rep_handler(struct cm_work *work)
 	cm_id_priv->initiator_depth = rep_msg->resp_resources;
 	cm_id_priv->responder_resources = rep_msg->initiator_depth;
 	cm_id_priv->sq_psn = CM_GET(REP_STARTING_PSN, rep_msg);
-	cm_id_priv->rnr_retry_count = cm_rep_get_rnr_retry_count(rep_msg);
+	cm_id_priv->rnr_retry_count = CM_GET(REP_RNR_RETRY_COUNT, rep_msg);
 	cm_id_priv->target_ack_delay = CM_GET(REP_TARGET_ACK_DELAY, rep_msg);
 	cm_id_priv->av.timeout =
 			cm_ack_timeout(cm_id_priv->target_ack_delay,

drivers/infiniband/core/cm_msgs.h +0 ~~-12~~

index d9b831810dc2..c02bba29a27d 100644
@@ -462,18 +462,6 @@ struct cm_rep_msg {
 
 } __packed;
 
-static inline u8 cm_rep_get_rnr_retry_count(struct cm_rep_msg *rep_msg)
-{
-	return (u8) (rep_msg->offset27 >> 5);
-}
-
-static inline void cm_rep_set_rnr_retry_count(struct cm_rep_msg *rep_msg,
-					      u8 rnr_retry_count)
-{
-	rep_msg->offset27 = (u8) ((rep_msg->offset27 & 0x1F) |
-				  (rnr_retry_count << 5));
-}
-
 static inline u8 cm_rep_get_srq(struct cm_rep_msg *rep_msg)
 {
 	return (u8) ((rep_msg->offset27 >> 4) & 0x1);

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #41 lore raw

PATCH 38/43 RDMA/cm: Convert REP SRQ field

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert REP SRQ field.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  6 +++---
 drivers/infiniband/core/cm_msgs.h | 11 -----------
 2 files changed, 3 insertions(+), 14 deletions(-)

drivers/infiniband/core/cm.c +3 -3

index 78d595c1d39b..035617f3b16c 100644
@@ -2077,10 +2077,10 @@ static void cm_format_rep(struct cm_rep_msg *rep_msg,
 		rep_msg->initiator_depth = param->initiator_depth;
 		CM_SET(REP_END_TO_END_FLOW_CONTROL, rep_msg,
 		       param->flow_control);
-		cm_rep_set_srq(rep_msg, param->srq);
+		CM_SET(REP_SRQ, rep_msg, param->srq);
 		CM_SET(REP_LOCAL_QPN, rep_msg, param->qp_num);
 	} else {
-		cm_rep_set_srq(rep_msg, 1);
+		CM_SET(REP_SRQ, rep_msg, 1);
 		CM_SET(REP_LOCAL_EE_CONTEXT_NUMBER, rep_msg, param->qp_num);
 	}

@@ -2227,7 +2227,7 @@ static void cm_format_rep_event(struct cm_work *work, enum ib_qp_type qp_type)
 	param->failover_accepted = CM_GET(REP_FAILOVER_ACCEPTED, rep_msg);
 	param->flow_control = CM_GET(REP_END_TO_END_FLOW_CONTROL, rep_msg);
 	param->rnr_retry_count = CM_GET(REP_RNR_RETRY_COUNT, rep_msg);
-	param->srq = cm_rep_get_srq(rep_msg);
+	param->srq = CM_GET(REP_SRQ, rep_msg);
 	work->cm_event.private_data = &rep_msg->private_data;
 	work->cm_event.private_data_len = CM_REP_PRIVATE_DATA_SIZE;
 }

drivers/infiniband/core/cm_msgs.h +0 ~~-11~~

index c02bba29a27d..dfda88462818 100644
@@ -462,17 +462,6 @@ struct cm_rep_msg {
 
 } __packed;
 
-static inline u8 cm_rep_get_srq(struct cm_rep_msg *rep_msg)
-{
-	return (u8) ((rep_msg->offset27 >> 4) & 0x1);
-}
-
-static inline void cm_rep_set_srq(struct cm_rep_msg *rep_msg, u8 srq)
-{
-	rep_msg->offset27 = (u8) ((rep_msg->offset27 & 0xEF) |
-				  ((srq & 0x1) << 4));
-}
-
 struct cm_rtu_msg {
 	struct ib_mad_hdr hdr;

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #42 lore raw

PATCH 39/43 RDMA/cm: Delete unused CM LAP functions

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Clean the code by deleting LAP functions, which are not called anyway.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      | 98 -------------------------------
 drivers/infiniband/core/cm_msgs.h | 58 ------------------
 2 files changed, 156 deletions(-)

drivers/infiniband/core/cm.c +0 ~~-98~~

index 035617f3b16c..25a20c04e07b 100644
@@ -3098,104 +3098,6 @@ static int cm_mra_handler(struct cm_work *work)
 	return -EINVAL;
 }
 
-static void cm_format_lap(struct cm_lap_msg *lap_msg,
-			  struct cm_id_private *cm_id_priv,
-			  struct sa_path_rec *alternate_path,
-			  const void *private_data,
-			  u8 private_data_len)
-{
-	bool alt_ext = false;
-
-	if (alternate_path->rec_type == SA_PATH_REC_TYPE_OPA)
-		alt_ext = opa_is_extended_lid(alternate_path->opa.dlid,
-					      alternate_path->opa.slid);
-	cm_format_mad_hdr(&lap_msg->hdr, CM_LAP_ATTR_ID,
-			  cm_form_tid(cm_id_priv));
-	lap_msg->local_comm_id = cm_id_priv->id.local_id;
-	lap_msg->remote_comm_id = cm_id_priv->id.remote_id;
-	CM_SET(LAP_REMOTE_QPN_EECN, lap_msg, cm_id_priv->remote_qpn);
-	/* todo: need remote CM response timeout */
-	cm_lap_set_remote_resp_timeout(lap_msg, 0x1F);
-	lap_msg->alt_local_lid =
-		htons(ntohl(sa_path_get_slid(alternate_path)));
-	lap_msg->alt_remote_lid =
-		htons(ntohl(sa_path_get_dlid(alternate_path)));
-	lap_msg->alt_local_gid = alternate_path->sgid;
-	lap_msg->alt_remote_gid = alternate_path->dgid;
-	if (alt_ext) {
-		lap_msg->alt_local_gid.global.interface_id
-			= OPA_MAKE_ID(be32_to_cpu(alternate_path->opa.slid));
-		lap_msg->alt_remote_gid.global.interface_id
-			= OPA_MAKE_ID(be32_to_cpu(alternate_path->opa.dlid));
-	}
-	cm_lap_set_flow_label(lap_msg, alternate_path->flow_label);
-	cm_lap_set_traffic_class(lap_msg, alternate_path->traffic_class);
-	lap_msg->alt_hop_limit = alternate_path->hop_limit;
-	cm_lap_set_packet_rate(lap_msg, alternate_path->rate);
-	cm_lap_set_sl(lap_msg, alternate_path->sl);
-	cm_lap_set_subnet_local(lap_msg, 1); /* local only... */
-	cm_lap_set_local_ack_timeout(lap_msg,
-		cm_ack_timeout(cm_id_priv->av.port->cm_dev->ack_delay,
-			       alternate_path->packet_life_time));
-
-	if (private_data && private_data_len)
-		memcpy(lap_msg->private_data, private_data, private_data_len);
-}
-
-int ib_send_cm_lap(struct ib_cm_id *cm_id,
-		   struct sa_path_rec *alternate_path,
-		   const void *private_data,
-		   u8 private_data_len)
-{
-	struct cm_id_private *cm_id_priv;
-	struct ib_mad_send_buf *msg;
-	unsigned long flags;
-	int ret;
-
-	if (private_data && private_data_len > CM_LAP_PRIVATE_DATA_SIZE)
-		return -EINVAL;
-
-	cm_id_priv = container_of(cm_id, struct cm_id_private, id);
-	spin_lock_irqsave(&cm_id_priv->lock, flags);
-	if (cm_id->state != IB_CM_ESTABLISHED ||
-	    (cm_id->lap_state != IB_CM_LAP_UNINIT &&
-	     cm_id->lap_state != IB_CM_LAP_IDLE)) {
-		ret = -EINVAL;
-		goto out;
-	}
-
-	ret = cm_init_av_by_path(alternate_path, NULL, &cm_id_priv->alt_av,
-				 cm_id_priv);
-	if (ret)
-		goto out;
-	cm_id_priv->alt_av.timeout =
-			cm_ack_timeout(cm_id_priv->target_ack_delay,
-				       cm_id_priv->alt_av.timeout - 1);
-
-	ret = cm_alloc_msg(cm_id_priv, &msg);
-	if (ret)
-		goto out;
-
-	cm_format_lap((struct cm_lap_msg *) msg->mad, cm_id_priv,
-		      alternate_path, private_data, private_data_len);
-	msg->timeout_ms = cm_id_priv->timeout_ms;
-	msg->context[1] = (void *) (unsigned long) IB_CM_ESTABLISHED;
-
-	ret = ib_post_send_mad(msg, NULL);
-	if (ret) {
-		spin_unlock_irqrestore(&cm_id_priv->lock, flags);
-		cm_free_msg(msg);
-		return ret;
-	}
-
-	cm_id->lap_state = IB_CM_LAP_SENT;
-	cm_id_priv->msg = msg;
-
-out:	spin_unlock_irqrestore(&cm_id_priv->lock, flags);
-	return ret;
-}
-EXPORT_SYMBOL(ib_send_cm_lap);
-
 static void cm_format_path_lid_from_lap(struct cm_lap_msg *lap_msg,
 					struct sa_path_rec *path)
 {

drivers/infiniband/core/cm_msgs.h +0 ~~-58~~

89 lines not on this page · raw message

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #43 lore raw

PATCH 40/43 RDMA/cm: Convert LAP flow label field

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert LAP flow label field.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      | 3 ++-
 drivers/infiniband/core/cm_msgs.h | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)

drivers/infiniband/core/cm.c +2 -1

index 25a20c04e07b..2fe1e8908445 100644
@@ -3121,7 +3121,8 @@ static void cm_format_path_from_lap(struct cm_id_private *cm_id_priv,
 {
 	path->dgid = lap_msg->alt_local_gid;
 	path->sgid = lap_msg->alt_remote_gid;
-	path->flow_label = cm_lap_get_flow_label(lap_msg);
+	path->flow_label =
+		cpu_to_be32(CM_GET(LAP_ALTERNATE_FLOW_LABEL, lap_msg));
 	path->hop_limit = lap_msg->alt_hop_limit;
 	path->traffic_class = cm_lap_get_traffic_class(lap_msg);
 	path->reversible = 1;

drivers/infiniband/core/cm_msgs.h +0 -5

index 41193dc44fee..fa475a59ed53 100644
@@ -522,11 +522,6 @@ struct cm_lap_msg {
 	u8 private_data[CM_LAP_PRIVATE_DATA_SIZE];
 } __packed;
 
-static inline __be32 cm_lap_get_flow_label(struct cm_lap_msg *lap_msg)
-{
-	return cpu_to_be32(be32_to_cpu(lap_msg->offset56) >> 12);
-}
-
 static inline u8 cm_lap_get_traffic_class(struct cm_lap_msg *lap_msg)
 {
 	return (u8) be32_to_cpu(lap_msg->offset56);

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:09 UTC #44 lore raw

PATCH 41/43 RDMA/cm: Convert LAP fields

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Convert LAP fields to the new scheme.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      |  9 +++++----
 drivers/infiniband/core/cm_msgs.h | 20 --------------------
 2 files changed, 5 insertions(+), 24 deletions(-)

drivers/infiniband/core/cm.c +5 -4

index 2fe1e8908445..11dc6e2b7de2 100644
@@ -3124,16 +3124,17 @@ static void cm_format_path_from_lap(struct cm_id_private *cm_id_priv,
 	path->flow_label =
 		cpu_to_be32(CM_GET(LAP_ALTERNATE_FLOW_LABEL, lap_msg));
 	path->hop_limit = lap_msg->alt_hop_limit;
-	path->traffic_class = cm_lap_get_traffic_class(lap_msg);
+	path->traffic_class = CM_GET(LAP_ALTERNATE_TRAFFIC_CLASS, lap_msg);
 	path->reversible = 1;
 	path->pkey = cm_id_priv->pkey;
-	path->sl = cm_lap_get_sl(lap_msg);
+	path->sl = CM_GET(LAP_ALTERNATE_SL, lap_msg);
 	path->mtu_selector = IB_SA_EQ;
 	path->mtu = cm_id_priv->path_mtu;
 	path->rate_selector = IB_SA_EQ;
-	path->rate = cm_lap_get_packet_rate(lap_msg);
+	path->rate = CM_GET(LAP_ALTERNATE_PACKET_RATE, lap_msg);
 	path->packet_life_time_selector = IB_SA_EQ;
-	path->packet_life_time = cm_lap_get_local_ack_timeout(lap_msg);
+	path->packet_life_time =
+		CM_GET(LAP_ALTERNATE_LOCAL_ACK_TIMEOUT, lap_msg);
 	path->packet_life_time -= (path->packet_life_time > 0);
 	cm_format_path_lid_from_lap(lap_msg, path);
 }

drivers/infiniband/core/cm_msgs.h +0 ~~-20~~

index fa475a59ed53..0bf214a5f388 100644
@@ -522,26 +522,6 @@ struct cm_lap_msg {
 	u8 private_data[CM_LAP_PRIVATE_DATA_SIZE];
 } __packed;
 
-static inline u8 cm_lap_get_traffic_class(struct cm_lap_msg *lap_msg)
-{
-	return (u8) be32_to_cpu(lap_msg->offset56);
-}
-
-static inline u8 cm_lap_get_packet_rate(struct cm_lap_msg *lap_msg)
-{
-	return lap_msg->offset61 & 0x3F;
-}
-
-static inline u8 cm_lap_get_sl(struct cm_lap_msg *lap_msg)
-{
-	return lap_msg->offset62 >> 4;
-}
-
-static inline u8 cm_lap_get_local_ack_timeout(struct cm_lap_msg *lap_msg)
-{
-	return lap_msg->offset63 >> 3;
-}
-
 struct cm_apr_msg {
 	struct ib_mad_hdr hdr;

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #45 lore raw

PATCH 42/43 RDMA/cm: Delete unused CM ARP functions

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Clean the code by deleting ARP functions, which are not called anyway.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c | 66 ------------------------------------
 include/rdma/ib_cm.h         | 34 -------------------
 2 files changed, 100 deletions(-)

drivers/infiniband/core/cm.c +0 ~~-66~~

index 11dc6e2b7de2..bc0535608bb5 100644
@@ -3235,72 +3235,6 @@ deref:	cm_deref_id(cm_id_priv);
 	return -EINVAL;
 }
 
-static void cm_format_apr(struct cm_apr_msg *apr_msg,
-			  struct cm_id_private *cm_id_priv,
-			  enum ib_cm_apr_status status,
-			  void *info,
-			  u8 info_length,
-			  const void *private_data,
-			  u8 private_data_len)
-{
-	cm_format_mad_hdr(&apr_msg->hdr, CM_APR_ATTR_ID, cm_id_priv->tid);
-	apr_msg->local_comm_id = cm_id_priv->id.local_id;
-	apr_msg->remote_comm_id = cm_id_priv->id.remote_id;
-	apr_msg->ap_status = (u8) status;
-
-	if (info && info_length) {
-		apr_msg->info_length = info_length;
-		memcpy(apr_msg->info, info, info_length);
-	}
-
-	if (private_data && private_data_len)
-		memcpy(apr_msg->private_data, private_data, private_data_len);
-}
-
-int ib_send_cm_apr(struct ib_cm_id *cm_id,
-		   enum ib_cm_apr_status status,
-		   void *info,
-		   u8 info_length,
-		   const void *private_data,
-		   u8 private_data_len)
-{
-	struct cm_id_private *cm_id_priv;
-	struct ib_mad_send_buf *msg;
-	unsigned long flags;
-	int ret;
-
-	if ((private_data && private_data_len > CM_APR_PRIVATE_DATA_SIZE) ||
-	    (info && info_length > CM_APR_ADDITIONAL_INFORMATION_SIZE))
-		return -EINVAL;
-
-	cm_id_priv = container_of(cm_id, struct cm_id_private, id);
-	spin_lock_irqsave(&cm_id_priv->lock, flags);
-	if (cm_id->state != IB_CM_ESTABLISHED ||
-	    (cm_id->lap_state != IB_CM_LAP_RCVD &&
-	     cm_id->lap_state != IB_CM_MRA_LAP_SENT)) {
-		ret = -EINVAL;
-		goto out;
-	}
-
-	ret = cm_alloc_msg(cm_id_priv, &msg);
-	if (ret)
-		goto out;
-
-	cm_format_apr((struct cm_apr_msg *) msg->mad, cm_id_priv, status,
-		      info, info_length, private_data, private_data_len);
-	ret = ib_post_send_mad(msg, NULL);
-	if (ret) {
-		spin_unlock_irqrestore(&cm_id_priv->lock, flags);
-		cm_free_msg(msg);
-		return ret;
-	}
-
-	cm_id->lap_state = IB_CM_LAP_IDLE;
-out:	spin_unlock_irqrestore(&cm_id_priv->lock, flags);
-	return ret;
-}
-EXPORT_SYMBOL(ib_send_cm_apr);
-
 static int cm_apr_handler(struct cm_work *work)
 {
 	struct cm_id_private *cm_id_priv;

include/rdma/ib_cm.h +0 ~~-34~~

index 6237c369dbd6..adccdc12b8e3 100644
@@ -483,21 +483,6 @@ int ib_send_cm_mra(struct ib_cm_id *cm_id,
 		   const void *private_data,
 		   u8 private_data_len);
 
-/**
- * ib_send_cm_lap - Sends a load alternate path request.
- * @cm_id: Connection identifier associated with the load alternate path
- *   message.
- * @alternate_path: A path record that identifies the alternate path to
- *   load.
- * @private_data: Optional user-defined private data sent with the
- *   load alternate path message.
- * @private_data_len: Size of the private data buffer, in bytes.
- */
-int ib_send_cm_lap(struct ib_cm_id *cm_id,
-		   struct sa_path_rec *alternate_path,
-		   const void *private_data,
-		   u8 private_data_len);
-
 /**
  * ib_cm_init_qp_attr - Initializes the QP attributes for use in transitioning
  *   to a specified QP state.

@@ -518,25 +503,6 @@ int ib_cm_init_qp_attr(struct ib_cm_id *cm_id,
 		       struct ib_qp_attr *qp_attr,
 		       int *qp_attr_mask);
 
-/**
- * ib_send_cm_apr - Sends an alternate path response message in response to
- *   a load alternate path request.
- * @cm_id: Connection identifier associated with the alternate path response.
- * @status: Reply status sent with the alternate path response.
- * @info: Optional additional information sent with the alternate path
- *   response.
- * @info_length: Size of the additional information, in bytes.
- * @private_data: Optional user-defined private data sent with the
- *   alternate path response message.
- * @private_data_len: Size of the private data buffer, in bytes.
- */
-int ib_send_cm_apr(struct ib_cm_id *cm_id,
-		   enum ib_cm_apr_status status,
-		   void *info,
-		   u8 info_length,
-		   const void *private_data,
-		   u8 private_data_len);
-
 struct ib_cm_sidr_req_param {
 	struct sa_path_rec	*path;
 	const struct ib_gid_attr *sgid_attr;

Signature · 1 line

2.20.1

Leon Romanovsky

author

2019-10-27 07:08 UTC #46 lore raw

PATCH 43/43 RDMA/cm: Convert SIDR_REP to new scheme

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Use new scheme to access SIDR_REP fields.

Signed-off-by Leon Romanovsky <[email protected]>

---
 drivers/infiniband/core/cm.c      | 15 ++++++++-------
 drivers/infiniband/core/cm_msgs.h | 14 --------------
 2 files changed, 8 insertions(+), 21 deletions(-)

drivers/infiniband/core/cm.c +8 -7

index bc0535608bb5..beb67eef5fb4 100644
@@ -3480,10 +3480,10 @@ static void cm_format_sidr_rep(struct cm_sidr_rep_msg *sidr_rep_msg,
 	cm_format_mad_hdr(&sidr_rep_msg->hdr, CM_SIDR_REP_ATTR_ID,
 			  cm_id_priv->tid);
 	sidr_rep_msg->request_id = cm_id_priv->id.remote_id;
-	sidr_rep_msg->status = param->status;
-	cm_sidr_rep_set_qpn(sidr_rep_msg, cpu_to_be32(param->qp_num));
+	CM_SET(SIDR_REP_STATUS, sidr_rep_msg, param->status);
+	CM_SET(SIDR_REP_QPN, sidr_rep_msg, param->qp_num);
 	sidr_rep_msg->service_id = cm_id_priv->id.service_id;
-	sidr_rep_msg->qkey = cpu_to_be32(param->qkey);
+	CM_SET(SIDR_REP_Q_KEY, sidr_rep_msg, param->qkey);
 
 	if (param->info && param->info_length)
 		memcpy(sidr_rep_msg->info, param->info, param->info_length);

@@ -3551,11 +3551,12 @@ static void cm_format_sidr_rep_event(struct cm_work *work,
 	sidr_rep_msg = (struct cm_sidr_rep_msg *)
 				work->mad_recv_wc->recv_buf.mad;
 	param = &work->cm_event.param.sidr_rep_rcvd;
-	param->status = sidr_rep_msg->status;
-	param->qkey = be32_to_cpu(sidr_rep_msg->qkey);
-	param->qpn = be32_to_cpu(cm_sidr_rep_get_qpn(sidr_rep_msg));
+	param->status = CM_GET(SIDR_REP_STATUS, sidr_rep_msg);
+	param->qkey = CM_GET(SIDR_REP_Q_KEY, sidr_rep_msg);
+	param->qpn = CM_GET(SIDR_REP_QPN, sidr_rep_msg);
 	param->info = &sidr_rep_msg->info;
-	param->info_len = sidr_rep_msg->info_length;
+	param->info_len =
+		CM_GET(SIDR_REP_ADDITIONAL_INFORMATION_LENGTH, sidr_rep_msg);
 	param->sgid_attr = cm_id_priv->av.ah_attr.grh.sgid_attr;
 	work->cm_event.private_data = &sidr_rep_msg->private_data;
 	work->cm_event.private_data_len = CM_SIDR_REP_PRIVATE_DATA_SIZE;

drivers/infiniband/core/cm_msgs.h +0 ~~-14~~

index 0bf214a5f388..dba60f8dfafb 100644
@@ -562,18 +562,4 @@ struct cm_sidr_rep_msg {
 
 	u8 private_data[CM_SIDR_REP_PRIVATE_DATA_SIZE];
 } __packed;
-
-static inline __be32 cm_sidr_rep_get_qpn(struct cm_sidr_rep_msg *sidr_rep_msg)
-{
-	return cpu_to_be32(be32_to_cpu(sidr_rep_msg->offset8) >> 8);
-}
-
-static inline void cm_sidr_rep_set_qpn(struct cm_sidr_rep_msg *sidr_rep_msg,
-				       __be32 qpn)
-{
-	sidr_rep_msg->offset8 = cpu_to_be32((be32_to_cpu(qpn) << 8) |
-					(be32_to_cpu(sidr_rep_msg->offset8) &
-					 0x000000FF));
-}
-
 #endif /* CM_MSGS_H */

Signature · 1 line

2.20.1