]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net/smc: increase device refcount for added link group
authorUrsula Braun <ubraun@linux.ibm.com>
Wed, 9 Oct 2019 08:07:45 +0000 (10:07 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 31 Dec 2019 15:43:53 +0000 (16:43 +0100)
[ 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

index 2ba97ff325a5d1eb90761ad47f1a8fa5d2f743d3..0c5fcb8ed404dfaf7c5b523cc52ca45b64f94b0c 100644 (file)
@@ -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);
 }