Commit 4e6e167b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'smc-rv23' 

Karsten Graul says:

====================
net/smc: introduce SMC-Rv2 support

Please apply the following patch series for smc to netdev's net-next tree.

SMC-Rv2 support (see https://www.ibm.com/support/pages/node/6326337

)
provides routable RoCE support for SMC-R, eliminating the current
same-subnet restriction, by exploiting the UDP encapsulation feature
of the RoCE adapter hardware.

v2: resend of the v1 patch series, and CC linux-rdma this time
v3: rebase after net tree was merged into net-next
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 24bcbe1c 29397e34

include/uapi/linux/smc.h

+15 −2
Original line number Diff line number Diff line
@@ -84,17 +84,28 @@ enum { 
	SMC_NLA_SYS_IS_ISM_V2,		/* u8 */

	SMC_NLA_SYS_LOCAL_HOST,		/* string */

	SMC_NLA_SYS_SEID,		/* string */

	SMC_NLA_SYS_IS_SMCR_V2,		/* u8 */

	__SMC_NLA_SYS_MAX,

	SMC_NLA_SYS_MAX = __SMC_NLA_SYS_MAX - 1

};



/* SMC_NLA_LGR_V2 nested attributes */

/* SMC_NLA_LGR_D_V2_COMMON and SMC_NLA_LGR_R_V2_COMMON nested attributes */

enum {

	SMC_NLA_LGR_V2_VER,		/* u8 */

	SMC_NLA_LGR_V2_REL,		/* u8 */

	SMC_NLA_LGR_V2_OS,		/* u8 */

	SMC_NLA_LGR_V2_NEG_EID,		/* string */

	SMC_NLA_LGR_V2_PEER_HOST,	/* string */

	__SMC_NLA_LGR_V2_MAX,

	SMC_NLA_LGR_V2_MAX = __SMC_NLA_LGR_V2_MAX - 1

};



/* SMC_NLA_LGR_R_V2 nested attributes */

enum {

	SMC_NLA_LGR_R_V2_UNSPEC,

	SMC_NLA_LGR_R_V2_DIRECT,	/* u8 */

	__SMC_NLA_LGR_R_V2_MAX,

	SMC_NLA_LGR_R_V2_MAX = __SMC_NLA_LGR_R_V2_MAX - 1

};



/* SMC_GEN_LGR_SMCR attributes */
@@ -106,6 +117,8 @@ enum { 
	SMC_NLA_LGR_R_PNETID,		/* string */

	SMC_NLA_LGR_R_VLAN_ID,		/* u8 */

	SMC_NLA_LGR_R_CONNS_NUM,	/* u32 */

	SMC_NLA_LGR_R_V2_COMMON,	/* nest */

	SMC_NLA_LGR_R_V2,		/* nest */

	__SMC_NLA_LGR_R_MAX,

	SMC_NLA_LGR_R_MAX = __SMC_NLA_LGR_R_MAX - 1

};
@@ -138,7 +151,7 @@ enum { 
	SMC_NLA_LGR_D_PNETID,		/* string */

	SMC_NLA_LGR_D_CHID,		/* u16 */

	SMC_NLA_LGR_D_PAD,		/* flag */

	SMC_NLA_LGR_V2,			/* nest */

	SMC_NLA_LGR_D_V2_COMMON,	/* nest */

	__SMC_NLA_LGR_D_MAX,

	SMC_NLA_LGR_D_MAX = __SMC_NLA_LGR_D_MAX - 1

};

net/smc/af_smc.c

+311 −120

File changed.

Preview size limit exceeded, changes collapsed.

net/smc/smc.h

+19 −1
Original line number Diff line number Diff line
@@ -56,7 +56,20 @@ enum smc_state { /* possible states of an SMC socket */ 
struct smc_link_group;



struct smc_wr_rx_hdr {	/* common prefix part of LLC and CDC to demultiplex */

	union {

		u8 type;

#if defined(__BIG_ENDIAN_BITFIELD)

		struct {

			u8 llc_version:4,

			   llc_type:4;

		};

#elif defined(__LITTLE_ENDIAN_BITFIELD)

		struct {

			u8 llc_type:4,

			   llc_version:4;

		};

#endif

	};

} __aligned(1);



struct smc_cdc_conn_state_flags {
@@ -286,7 +299,12 @@ static inline bool using_ipsec(struct smc_sock *smc) 
}

#endif



struct smc_gidlist;



struct sock *smc_accept_dequeue(struct sock *parent, struct socket *new_sock);

void smc_close_non_accepted(struct sock *sk);

void smc_fill_gid_list(struct smc_link_group *lgr,

		       struct smc_gidlist *gidlist,

		       struct smc_ib_device *known_dev, u8 *known_gid);



#endif	/* __SMC_H */

net/smc/smc_clc.c

+118 −29

File changed.

Preview size limit exceeded, changes collapsed.

net/smc/smc_clc.h

+51 −4
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#define SMC_CLC_DECL_NOV2DEXT	0x03030005  /* peer sent no clc SMC-Dv2 ext.  */

#define SMC_CLC_DECL_NOSEID	0x03030006  /* peer sent no SEID	      */

#define SMC_CLC_DECL_NOSMCD2DEV	0x03030007  /* no SMC-Dv2 device found	      */

#define SMC_CLC_DECL_NOUEID	0x03030008  /* peer sent no UEID	      */

#define SMC_CLC_DECL_MODEUNSUPP	0x03040000  /* smc modes do not match (R or D)*/

#define SMC_CLC_DECL_RMBE_EC	0x03050000  /* peer has eyecatcher in RMBE    */

#define SMC_CLC_DECL_OPTUNSUPP	0x03060000  /* fastopen sockopt not supported */
@@ -54,6 +55,8 @@ 
#define SMC_CLC_DECL_NOSRVLINK	0x030b0000  /* SMC-R link from srv not found  */

#define SMC_CLC_DECL_VERSMISMAT	0x030c0000  /* SMC version mismatch	      */

#define SMC_CLC_DECL_MAX_DMB	0x030d0000  /* SMC-D DMB limit exceeded       */

#define SMC_CLC_DECL_NOROUTE	0x030e0000  /* SMC-Rv2 conn. no route to peer */

#define SMC_CLC_DECL_NOINDIRECT	0x030f0000  /* SMC-Rv2 conn. indirect mismatch*/

#define SMC_CLC_DECL_SYNCERR	0x04000000  /* synchronization error          */

#define SMC_CLC_DECL_PEERDECL	0x05000000  /* peer declined during handshake */

#define SMC_CLC_DECL_INTERR	0x09990000  /* internal error		      */
@@ -213,11 +216,14 @@ struct smcd_clc_msg_accept_confirm_common { /* SMCD accept/confirm */ 
#define SMC_CLC_OS_AIX		3



struct smc_clc_first_contact_ext {

	u8 reserved1;

#if defined(__BIG_ENDIAN_BITFIELD)

	u8 v2_direct : 1,

	   reserved  : 7;

	u8 os_type : 4,

	   release : 4;

#elif defined(__LITTLE_ENDIAN_BITFIELD)

	u8 reserved  : 7,

	   v2_direct : 1;

	u8 release : 4,

	   os_type : 4;

#endif
@@ -225,6 +231,13 @@ struct smc_clc_first_contact_ext { 
	u8 hostname[SMC_MAX_HOSTNAME_LEN];

};



struct smc_clc_fce_gid_ext {

	u8 reserved[16];

	u8 gid_cnt;

	u8 reserved2[3];

	u8 gid[][SMC_GID_SIZE];

};



struct smc_clc_msg_accept_confirm {	/* clc accept / confirm message */

	struct smc_clc_msg_hdr hdr;

	union {
@@ -239,13 +252,17 @@ struct smc_clc_msg_accept_confirm { /* clc accept / confirm message */ 
struct smc_clc_msg_accept_confirm_v2 {	/* clc accept / confirm message */

	struct smc_clc_msg_hdr hdr;

	union {

		struct smcr_clc_msg_accept_confirm r0; /* SMC-R */

		struct { /* SMC-R */

			struct smcr_clc_msg_accept_confirm r0;

			u8 eid[SMC_MAX_EID_LEN];

			u8 reserved6[8];

		} r1;

		struct { /* SMC-D */

			struct smcd_clc_msg_accept_confirm_common d0;

			__be16 chid;

			u8 eid[SMC_MAX_EID_LEN];

			u8 reserved5[8];

		};

		} d1;

	};

};
@@ -264,6 +281,24 @@ struct smc_clc_msg_decline { /* clc decline message */ 
	struct smc_clc_msg_trail trl; /* eye catcher "SMCD" or "SMCR" EBCDIC */

} __aligned(4);



#define SMC_DECL_DIAG_COUNT_V2	4 /* no. of additional peer diagnosis codes */



struct smc_clc_msg_decline_v2 {	/* clc decline message */

	struct smc_clc_msg_hdr hdr;

	u8 id_for_peer[SMC_SYSTEMID_LEN]; /* sender peer_id */

	__be32 peer_diagnosis;	/* diagnosis information */

#if defined(__BIG_ENDIAN_BITFIELD)

	u8 os_type  : 4,

	   reserved : 4;

#elif defined(__LITTLE_ENDIAN_BITFIELD)

	u8 reserved : 4,

	   os_type  : 4;

#endif

	u8 reserved2[3];

	__be32 peer_diagnosis_v2[SMC_DECL_DIAG_COUNT_V2];

	struct smc_clc_msg_trail trl; /* eye catcher "SMCD" or "SMCR" EBCDIC */

} __aligned(4);



/* determine start of the prefix area within the proposal message */

static inline struct smc_clc_msg_proposal_prefix *

smc_clc_proposal_get_prefix(struct smc_clc_msg_proposal *pclc)
@@ -282,6 +317,17 @@ static inline bool smcd_indicated(int smc_type) 
	return smc_type == SMC_TYPE_D || smc_type == SMC_TYPE_B;

}



static inline u8 smc_indicated_type(int is_smcd, int is_smcr)

{

	if (is_smcd && is_smcr)

		return SMC_TYPE_B;

	if (is_smcd)

		return SMC_TYPE_D;

	if (is_smcr)

		return SMC_TYPE_R;

	return SMC_TYPE_N;

}



/* get SMC-D info from proposal message */

static inline struct smc_clc_msg_smcd *

smc_get_clc_msg_smcd(struct smc_clc_msg_proposal *prop)
@@ -334,7 +380,7 @@ int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen, 
int smc_clc_send_decline(struct smc_sock *smc, u32 peer_diag_info, u8 version);

int smc_clc_send_proposal(struct smc_sock *smc, struct smc_init_info *ini);

int smc_clc_send_confirm(struct smc_sock *smc, bool clnt_first_contact,

			 u8 version, u8 *eid);

			 u8 version, u8 *eid, struct smc_init_info *ini);

int smc_clc_send_accept(struct smc_sock *smc, bool srv_first_contact,

			u8 version, u8 *negotiated_eid);

void smc_clc_init(void) __init;
@@ -343,6 +389,7 @@ void smc_clc_get_hostname(u8 **host); 
bool smc_clc_match_eid(u8 *negotiated_eid,

		       struct smc_clc_v2_extension *smc_v2_ext,

		       u8 *peer_eid, u8 *local_eid);

int smc_clc_ueid_count(void);

int smc_nl_dump_ueid(struct sk_buff *skb, struct netlink_callback *cb);

int smc_nl_add_ueid(struct sk_buff *skb, struct genl_info *info);

int smc_nl_remove_ueid(struct sk_buff *skb, struct genl_info *info);