From nobody Thu Sep 11 19:31:34 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B25B4C001DE for ; Mon, 7 Aug 2023 06:27:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231224AbjHGG1k (ORCPT ); Mon, 7 Aug 2023 02:27:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231127AbjHGG1d (ORCPT ); Mon, 7 Aug 2023 02:27:33 -0400 Received: from out30-124.freemail.mail.aliyun.com (out30-124.freemail.mail.aliyun.com [115.124.30.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40084170A; Sun, 6 Aug 2023 23:27:29 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R951e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=guangguan.wang@linux.alibaba.com;NM=1;PH=DS;RN=14;SR=0;TI=SMTPD_---0VpANHur_1691389645; Received: from localhost.localdomain(mailfrom:guangguan.wang@linux.alibaba.com fp:SMTPD_---0VpANHur_1691389645) by smtp.aliyun-inc.com; Mon, 07 Aug 2023 14:27:26 +0800 From: Guangguan Wang To: wenjia@linux.ibm.com, jaka@linux.ibm.com, kgraul@linux.ibm.com, tonylu@linux.alibaba.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: horms@kernel.org, alibuda@linux.alibaba.com, guwen@linux.alibaba.com, linux-s390@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH v2 net-next 2/6] net/smc: add vendor unique experimental options area in clc handshake Date: Mon, 7 Aug 2023 14:27:16 +0800 Message-Id: <20230807062720.20555-3-guangguan.wang@linux.alibaba.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230807062720.20555-1-guangguan.wang@linux.alibaba.com> References: <20230807062720.20555-1-guangguan.wang@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add vendor unique experimental options area in clc handshake. In clc accept and confirm msg, vendor unique experimental options use the 16-Bytes reserved field, which defined in struct smc_clc_fce_gid_ext in previous version. Because of the struct smc_clc_first_contact_ext is widely used and limit the scope of modification, this patch moves the 16-Bytes reserved field out of struct smc_clc_fce_gid_ext, and followed with the struct smc_clc_first_contact_ext in a new struct names struct smc_clc_first_contact_ext_v2x. For SMC-R first connection, in previous version, the struct smc_clc_ first_contact_ext and the 16-Bytes reserved field has already been included in clc accept and confirm msg. Thus, this patch use struct smc_clc_first_contact_ext_v2x instead of the struct smc_clc_first_ contact_ext and the 16-Bytes reserved field in SMC-R clc accept and confirm msg is compatible with previous version. For SMC-D first connection, in previous version, only the struct smc_ clc_first_contact_ext is included in clc accept and confirm msg, and the 16-Bytes reserved field is not included. Thus, when the negotiated smc release version is the version before v2.1, we still use struct smc_clc_first_contact_ext for compatible consideration. If the negotiated smc release version is v2.1 or later, use struct smc_clc_first_contact_ ext_v2x instead. Signed-off-by: Guangguan Wang Reviewed-by: Tony Lu --- net/smc/af_smc.c | 2 +- net/smc/smc_clc.c | 44 +++++++++++++++++++++++--------------------- net/smc/smc_clc.h | 15 +++++++++++++-- 3 files changed, 37 insertions(+), 24 deletions(-) diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index bac73eb0542d..52279bdc100a 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -1113,7 +1113,7 @@ static int smc_connect_ism_vlan_cleanup(struct smc_so= ck *smc, =20 #define SMC_CLC_MAX_ACCEPT_LEN \ (sizeof(struct smc_clc_msg_accept_confirm_v2) + \ - sizeof(struct smc_clc_first_contact_ext) + \ + sizeof(struct smc_clc_first_contact_ext_v2x) + \ sizeof(struct smc_clc_msg_trail)) =20 /* CLC handshake during connect */ diff --git a/net/smc/smc_clc.c b/net/smc/smc_clc.c index 4ae27bf65732..ae80c191a834 100644 --- a/net/smc/smc_clc.c +++ b/net/smc/smc_clc.c @@ -391,9 +391,7 @@ smc_clc_msg_acc_conf_valid(struct smc_clc_msg_accept_co= nfirm_v2 *clc_v2) return false; } else { if (hdr->typev1 =3D=3D SMC_TYPE_D && - ntohs(hdr->length) !=3D SMCD_CLC_ACCEPT_CONFIRM_LEN_V2 && - (ntohs(hdr->length) !=3D SMCD_CLC_ACCEPT_CONFIRM_LEN_V2 + - sizeof(struct smc_clc_first_contact_ext))) + ntohs(hdr->length) < SMCD_CLC_ACCEPT_CONFIRM_LEN_V2) return false; if (hdr->typev1 =3D=3D SMC_TYPE_R && ntohs(hdr->length) < SMCR_CLC_ACCEPT_CONFIRM_LEN_V2) @@ -420,13 +418,19 @@ smc_clc_msg_decl_valid(struct smc_clc_msg_decline *dc= lc) return true; } =20 -static void smc_clc_fill_fce(struct smc_clc_first_contact_ext *fce, int *l= en, int release_ver) +static int smc_clc_fill_fce(struct smc_clc_first_contact_ext_v2x *fce, + struct smc_init_info *ini) { + int ret =3D sizeof(*fce); + memset(fce, 0, sizeof(*fce)); - fce->os_type =3D SMC_CLC_OS_LINUX; - fce->release =3D release_ver; - memcpy(fce->hostname, smc_hostname, sizeof(smc_hostname)); - (*len) +=3D sizeof(*fce); + fce->fce_v20.os_type =3D SMC_CLC_OS_LINUX; + fce->fce_v20.release =3D ini->release_ver; + memcpy(fce->fce_v20.hostname, smc_hostname, sizeof(smc_hostname)); + if (ini->is_smcd && ini->release_ver < SMC_RELEASE_1) + ret =3D sizeof(struct smc_clc_first_contact_ext); + + return ret; } =20 /* check if received message has a correct header length and contains valid @@ -986,13 +990,13 @@ static int smc_clc_send_confirm_accept(struct smc_soc= k *smc, u8 *eid, struct smc_init_info *ini) { struct smc_connection *conn =3D &smc->conn; + struct smc_clc_first_contact_ext_v2x fce; struct smc_clc_msg_accept_confirm *clc; - struct smc_clc_first_contact_ext fce; struct smc_clc_fce_gid_ext gle; struct smc_clc_msg_trail trl; + int i, len, fce_len; struct kvec vec[5]; struct msghdr msg; - int i, len; =20 /* send SMC Confirm CLC msg */ clc =3D (struct smc_clc_msg_accept_confirm *)clc_v2; @@ -1018,8 +1022,10 @@ static int smc_clc_send_confirm_accept(struct smc_so= ck *smc, if (eid && eid[0]) memcpy(clc_v2->d1.eid, eid, SMC_MAX_EID_LEN); len =3D SMCD_CLC_ACCEPT_CONFIRM_LEN_V2; - if (first_contact) - smc_clc_fill_fce(&fce, &len, ini->release_ver); + if (first_contact) { + fce_len =3D smc_clc_fill_fce(&fce, ini); + len +=3D fce_len; + } clc_v2->hdr.length =3D htons(len); } memcpy(trl.eyecatcher, SMCD_EYECATCHER, @@ -1063,15 +1069,14 @@ static int smc_clc_send_confirm_accept(struct smc_s= ock *smc, memcpy(clc_v2->r1.eid, eid, SMC_MAX_EID_LEN); len =3D SMCR_CLC_ACCEPT_CONFIRM_LEN_V2; if (first_contact) { - smc_clc_fill_fce(&fce, &len, ini->release_ver); - fce.v2_direct =3D !link->lgr->uses_gateway; - memset(&gle, 0, sizeof(gle)); + fce_len =3D smc_clc_fill_fce(&fce, ini); + len +=3D fce_len; + fce.fce_v20.v2_direct =3D !link->lgr->uses_gateway; if (clc->hdr.type =3D=3D SMC_CLC_CONFIRM) { + memset(&gle, 0, sizeof(gle)); gle.gid_cnt =3D ini->smcrv2.gidlist.len; len +=3D sizeof(gle); len +=3D gle.gid_cnt * sizeof(gle.gid[0]); - } else { - len +=3D sizeof(gle.reserved); } } clc_v2->hdr.length =3D htons(len); @@ -1094,7 +1099,7 @@ static int smc_clc_send_confirm_accept(struct smc_soc= k *smc, sizeof(trl); if (version > SMC_V1 && first_contact) { vec[i].iov_base =3D &fce; - vec[i++].iov_len =3D sizeof(fce); + vec[i++].iov_len =3D fce_len; if (!conn->lgr->is_smcd) { if (clc->hdr.type =3D=3D SMC_CLC_CONFIRM) { vec[i].iov_base =3D &gle; @@ -1102,9 +1107,6 @@ static int smc_clc_send_confirm_accept(struct smc_soc= k *smc, vec[i].iov_base =3D &ini->smcrv2.gidlist.list; vec[i++].iov_len =3D gle.gid_cnt * sizeof(gle.gid[0]); - } else { - vec[i].iov_base =3D &gle.reserved; - vec[i++].iov_len =3D sizeof(gle.reserved); } } } diff --git a/net/smc/smc_clc.h b/net/smc/smc_clc.h index b923e89acafb..6133276a8839 100644 --- a/net/smc/smc_clc.h +++ b/net/smc/smc_clc.h @@ -147,7 +147,9 @@ struct smc_clc_msg_proposal_prefix { /* prefix part of = clc proposal message*/ struct smc_clc_msg_smcd { /* SMC-D GID information */ struct smc_clc_smcd_gid_chid ism; /* ISM native GID+CHID of requestor */ __be16 v2_ext_offset; /* SMC Version 2 Extension Offset */ - u8 reserved[28]; + u8 vendor_oui[3]; + u8 vendor_exp_options[5]; + u8 reserved[20]; }; =20 struct smc_clc_smcd_v2_extension { @@ -231,8 +233,17 @@ struct smc_clc_first_contact_ext { u8 hostname[SMC_MAX_HOSTNAME_LEN]; }; =20 +struct smc_clc_first_contact_ext_v2x { + struct smc_clc_first_contact_ext fce_v20; + u8 reserved3[4]; + __be32 vendor_exp_options; + u8 reserved4[8]; +} __packed; /* format defined in + * IBM Shared Memory Communications Version 2 (Third Edition) + * (https://www.ibm.com/support/pages/node/7009315) + */ + struct smc_clc_fce_gid_ext { - u8 reserved[16]; u8 gid_cnt; u8 reserved2[3]; u8 gid[][SMC_GID_SIZE]; --=20 2.24.3 (Apple Git-128)