lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 450/772] Revert "net/smc: fix listen processing for SMC-Rv2"
    Date
    From: liuyacan <liuyacan@corp.netease.com>

    [ Upstream commit 9029ac03f20a5999bc5627277c6cf008ab8e23ed ]

    This reverts commit 8c3b8dc5cc9bf6d273ebe18b16e2d6882bcfb36d.

    Some rollback issue will be fixed in other patches in the future.

    Link: https://lore.kernel.org/all/20220523055056.2078994-1-liuyacan@corp.netease.com/

    Fixes: 8c3b8dc5cc9b ("net/smc: fix listen processing for SMC-Rv2")
    Signed-off-by: liuyacan <liuyacan@corp.netease.com>
    Link: https://lore.kernel.org/r/20220524090230.2140302-1-liuyacan@corp.netease.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/smc/af_smc.c | 44 +++++++++++++++++---------------------------
    1 file changed, 17 insertions(+), 27 deletions(-)

    diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
    index dafb2bc0b6b6..b9fe31834354 100644
    --- a/net/smc/af_smc.c
    +++ b/net/smc/af_smc.c
    @@ -1930,13 +1930,13 @@ static int smc_listen_rdma_reg(struct smc_sock *new_smc, bool local_first)
    return 0;
    }

    -static int smc_find_rdma_v2_device_serv(struct smc_sock *new_smc,
    - struct smc_clc_msg_proposal *pclc,
    - struct smc_init_info *ini)
    +static void smc_find_rdma_v2_device_serv(struct smc_sock *new_smc,
    + struct smc_clc_msg_proposal *pclc,
    + struct smc_init_info *ini)
    {
    struct smc_clc_v2_extension *smc_v2_ext;
    u8 smcr_version;
    - int rc = 0;
    + int rc;

    if (!(ini->smcr_version & SMC_V2) || !smcr_indicated(ini->smc_type_v2))
    goto not_found;
    @@ -1954,31 +1954,26 @@ static int smc_find_rdma_v2_device_serv(struct smc_sock *new_smc,
    ini->smcrv2.saddr = new_smc->clcsock->sk->sk_rcv_saddr;
    ini->smcrv2.daddr = smc_ib_gid_to_ipv4(smc_v2_ext->roce);
    rc = smc_find_rdma_device(new_smc, ini);
    - if (rc)
    + if (rc) {
    + smc_find_ism_store_rc(rc, ini);
    goto not_found;
    -
    + }
    if (!ini->smcrv2.uses_gateway)
    memcpy(ini->smcrv2.nexthop_mac, pclc->lcl.mac, ETH_ALEN);

    smcr_version = ini->smcr_version;
    ini->smcr_version = SMC_V2;
    rc = smc_listen_rdma_init(new_smc, ini);
    - if (rc) {
    - ini->smcr_version = smcr_version;
    - goto not_found;
    - }
    - rc = smc_listen_rdma_reg(new_smc, ini->first_contact_local);
    - if (rc) {
    - ini->smcr_version = smcr_version;
    - goto not_found;
    - }
    - return 0;
    + if (!rc)
    + rc = smc_listen_rdma_reg(new_smc, ini->first_contact_local);
    + if (!rc)
    + return;
    + ini->smcr_version = smcr_version;
    + smc_find_ism_store_rc(rc, ini);

    not_found:
    - rc = rc ?: SMC_CLC_DECL_NOSMCDEV;
    ini->smcr_version &= ~SMC_V2;
    ini->check_smcrv2 = false;
    - return rc;
    }

    static int smc_find_rdma_v1_device_serv(struct smc_sock *new_smc,
    @@ -2011,7 +2006,6 @@ static int smc_listen_find_device(struct smc_sock *new_smc,
    struct smc_init_info *ini)
    {
    int prfx_rc;
    - int rc;

    /* check for ISM device matching V2 proposed device */
    smc_find_ism_v2_device_serv(new_smc, pclc, ini);
    @@ -2039,18 +2033,14 @@ static int smc_listen_find_device(struct smc_sock *new_smc,
    return ini->rc ?: SMC_CLC_DECL_NOSMCDDEV;

    /* check if RDMA V2 is available */
    - rc = smc_find_rdma_v2_device_serv(new_smc, pclc, ini);
    - if (!rc)
    + smc_find_rdma_v2_device_serv(new_smc, pclc, ini);
    + if (ini->smcrv2.ib_dev_v2)
    return 0;

    - /* skip V1 check if V2 is unavailable for non-Device reason */
    - if (rc != SMC_CLC_DECL_NOSMCDEV &&
    - rc != SMC_CLC_DECL_NOSMCRDEV &&
    - rc != SMC_CLC_DECL_NOSMCDDEV)
    - return rc;
    -
    /* check if RDMA V1 is available */
    if (!prfx_rc) {
    + int rc;
    +
    rc = smc_find_rdma_v1_device_serv(new_smc, pclc, ini);
    smc_find_ism_store_rc(rc, ini);
    return (!rc) ? 0 : ini->rc;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 23:19    [W:4.048 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site