lkml.org 
[lkml]   [2019]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 120/434] net/smc: increase device refcount for added link group
    Date
    From: Ursula Braun <ubraun@linux.ibm.com>

    [ Upstream commit b3cb53c05f20c5b4026a36a7bbd3010d1f3e0a55 ]

    SMCD link groups belong to certain ISM-devices and SMCR link group
    links belong to certain IB-devices. Increase the refcount for
    these devices, as long as corresponding link groups exist.

    Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
    Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
    Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/smc/smc_core.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c
    index 2ba97ff325a5..0c5fcb8ed404 100644
    --- a/net/smc/smc_core.c
    +++ b/net/smc/smc_core.c
    @@ -231,10 +231,12 @@ static int smc_lgr_create(struct smc_sock *smc, struct smc_init_info *ini)
    lgr->conns_all = RB_ROOT;
    if (ini->is_smcd) {
    /* SMC-D specific settings */
    + get_device(&ini->ism_dev->dev);
    lgr->peer_gid = ini->ism_gid;
    lgr->smcd = ini->ism_dev;
    } else {
    /* SMC-R specific settings */
    + get_device(&ini->ib_dev->ibdev->dev);
    lgr->role = smc->listen_smc ? SMC_SERV : SMC_CLNT;
    memcpy(lgr->peer_systemid, ini->ib_lcl->id_for_peer,
    SMC_SYSTEMID_LEN);
    @@ -433,10 +435,13 @@ static void smc_lgr_free_bufs(struct smc_link_group *lgr)
    static void smc_lgr_free(struct smc_link_group *lgr)
    {
    smc_lgr_free_bufs(lgr);
    - if (lgr->is_smcd)
    + if (lgr->is_smcd) {
    smc_ism_put_vlan(lgr->smcd, lgr->vlan_id);
    - else
    + put_device(&lgr->smcd->dev);
    + } else {
    smc_link_clear(&lgr->lnk[SMC_SINGLE_LINK]);
    + put_device(&lgr->lnk[SMC_SINGLE_LINK].smcibdev->ibdev->dev);
    + }
    kfree(lgr);
    }

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-29 18:46    [W:2.853 / U:1.588 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site