Re: [PATCH net-next v2 3/6] net/smc: support smc v2.x features validate

Jan Karcher
2023-08-18T19:43:28Z

On 17/08/2023 15:20, Guangguan Wang wrote:
> Support SMC v2.x features validate for SMC v2.1. This is the frame
> code for SMC v2.x features validate, and will take effects only when
> the negotiated release version is v2.1 or later.
>
> For Server, v2.x features' validation should be done in smc_clc_srv_
> v2x_features_validate when receiving v2.1 or later CLC Proposal Message,
> such as max conns, max links negotiation, the decision of the final
> value of max conns and max links should be made in this function.
> And final check for server when receiving v2.1 or later CLC Confirm
> Message should be done in smc_clc_v2x_features_confirm_check.
>
> For client, v2.x features' validation should be done in smc_clc_clnt_
> v2x_features_validate when receiving v2.1 or later CLC Accept Message,
> for example, the decision to accpt the accepted value or to decline
> should be made in this function.
>
> Signed-off-by: Guangguan Wang <guangguan.wang@linux.alibaba.com>
> Reviewed-by: Tony Lu <tonylu@linux.alibaba.com>

Thank you for your contribution, Guangguan.

Reviewed-by: Jan Karcher <jaka@linux.ibm.com>

> ---
> net/smc/af_smc.c | 18 ++++++++++++++++++
> net/smc/smc_clc.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
> net/smc/smc_clc.h | 7 +++++++
> 3 files changed, 71 insertions(+)
>
> diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
> index 10bec585983f..9174dedd9b3b 100644
> --- a/net/smc/af_smc.c
> +++ b/net/smc/af_smc.c
> @@ -1168,6 +1168,7 @@ static int smc_connect_rdma_v2_prepare(struct smc_sock *smc,
> (struct smc_clc_msg_accept_confirm_v2 *)aclc;
> struct smc_clc_first_contact_ext *fce =
> smc_get_clc_first_contact_ext(clc_v2, false);
> + int rc;
>
> if (!ini->first_contact_peer || aclc->hdr.version == SMC_V1)
> return 0;
> @@ -1188,6 +1189,9 @@ static int smc_connect_rdma_v2_prepare(struct smc_sock *smc,
> }
>
> ini->release_nr = fce->release;
> + rc = smc_clc_clnt_v2x_features_validate(fce, ini);
> + if (rc)
> + return rc;
>
> return 0;
> }
> @@ -1362,6 +1366,9 @@ static int smc_connect_ism(struct smc_sock *smc,
> smc_get_clc_first_contact_ext(aclc_v2, true);
>
> ini->release_nr = fce->release;
> + rc = smc_clc_clnt_v2x_features_validate(fce, ini);
> + if (rc)
> + return rc;
> }
>
> rc = smc_v2_determine_accepted_chid(aclc_v2, ini);
> @@ -2412,6 +2419,10 @@ static void smc_listen_work(struct work_struct *work)
> if (rc)
> goto out_decl;
>
> + rc = smc_clc_srv_v2x_features_validate(pclc, ini);
> + if (rc)
> + goto out_decl;
> +
> mutex_lock(&smc_server_lgr_pending);
> smc_close_init(new_smc);
> smc_rx_init(new_smc);
> @@ -2444,6 +2455,13 @@ static void smc_listen_work(struct work_struct *work)
> goto out_decl;
> }
>
> + rc = smc_clc_v2x_features_confirm_check(cclc, ini);
> + if (rc) {
> + if (!ini->is_smcd)
> + goto out_unlock;
> + goto out_decl;
> + }
> +
> /* finish worker */
> if (!ini->is_smcd) {
> rc = smc_listen_rdma_finish(new_smc, cclc,
> diff --git a/net/smc/smc_clc.c b/net/smc/smc_clc.c
> index 728f88616266..d3c892ee7177 100644
> --- a/net/smc/smc_clc.c
> +++ b/net/smc/smc_clc.c
> @@ -1158,6 +1158,52 @@ int smc_clc_send_accept(struct smc_sock *new_smc, bool srv_first_contact,
> return len > 0 ? 0 : len;
> }
>
> +int smc_clc_srv_v2x_features_validate(struct smc_clc_msg_proposal *pclc,
> + struct smc_init_info *ini)
> +{
> + struct smc_clc_v2_extension *pclc_v2_ext;
> +
> + if ((!(ini->smcd_version & SMC_V2) && !(ini->smcr_version & SMC_V2)) ||
> + ini->release_nr < SMC_RELEASE_1)
> + return 0;
> +
> + pclc_v2_ext = smc_get_clc_v2_ext(pclc);
> + if (!pclc_v2_ext)
> + return SMC_CLC_DECL_NOV2EXT;
> +
> + return 0;
> +}
> +
> +int smc_clc_clnt_v2x_features_validate(struct smc_clc_first_contact_ext *fce,
> + struct smc_init_info *ini)
> +{
> + if (ini->release_nr < SMC_RELEASE_1)
> + return 0;
> +
> + return 0;
> +}
> +
> +int smc_clc_v2x_features_confirm_check(struct smc_clc_msg_accept_confirm *cclc,
> + struct smc_init_info *ini)
> +{
> + struct smc_clc_msg_accept_confirm_v2 *clc_v2 =
> + (struct smc_clc_msg_accept_confirm_v2 *)cclc;
> + struct smc_clc_first_contact_ext *fce =
> + smc_get_clc_first_contact_ext(clc_v2, ini->is_smcd);
> +
> + if (cclc->hdr.version == SMC_V1 ||
> + !(cclc->hdr.typev2 & SMC_FIRST_CONTACT_MASK))
> + return 0;
> +
> + if (ini->release_nr != fce->release)
> + return SMC_CLC_DECL_RELEASEERR;
> +
> + if (fce->release < SMC_RELEASE_1)
> + return 0;
> +
> + return 0;
> +}
> +
> void smc_clc_get_hostname(u8 **host)
> {
> *host = &smc_hostname[0];
> diff --git a/net/smc/smc_clc.h b/net/smc/smc_clc.h
> index bd75382f374d..552d0656252c 100644
> --- a/net/smc/smc_clc.h
> +++ b/net/smc/smc_clc.h
> @@ -45,6 +45,7 @@
> #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_RELEASEERR 0x03030009 /* release version negotiate failed */
> #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 */
> @@ -415,6 +416,12 @@ int smc_clc_send_confirm(struct smc_sock *smc, bool clnt_first_contact,
> 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, struct smc_init_info *ini);
> +int smc_clc_srv_v2x_features_validate(struct smc_clc_msg_proposal *pclc,
> + struct smc_init_info *ini);
> +int smc_clc_clnt_v2x_features_validate(struct smc_clc_first_contact_ext *fce,
> + struct smc_init_info *ini);
> +int smc_clc_v2x_features_confirm_check(struct smc_clc_msg_accept_confirm *cclc,
> + struct smc_init_info *ini);
> void smc_clc_init(void) __init;
> void smc_clc_exit(void);
> void smc_clc_get_hostname(u8 **host);