From mboxrd@z Thu Jan 1 00:00:00 1970 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 82081C433FE for ; Wed, 23 Feb 2022 08:32:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238990AbiBWIdF (ORCPT ); Wed, 23 Feb 2022 03:33:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234121AbiBWIdC (ORCPT ); Wed, 23 Feb 2022 03:33:02 -0500 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C90D05F4D1; Wed, 23 Feb 2022 00:32:33 -0800 (PST) Received: by mail-wm1-x32e.google.com with SMTP id m13-20020a7bca4d000000b00380e379bae2so1031968wml.3; Wed, 23 Feb 2022 00:32:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jFVmMGrwnTLkYOHt3O0nRMd5k4/Pk0KBxQ8GsL+PzUc=; b=C+ukOcWfST6K92nF41zqT1RjIWNcFAvpQWkFky6B4FpyWuiFwmaNvYyrMONEm3oaKA WAUhWfKTqMzePPK5SZsdYyzwqcOkwzd4PPaZo5vhQjcx6xItBgzxf7SqfpbsvuzQrcvV 1BMi+PYlvBnmTfj+viUlP2DZFzuvvwzcKDxulY1CZG2FrnENeScqSQsx3gOIqadcwwYR 7GUTgpNpNHiAiVIAJuZcg5nf8KxTFTOACti2FuvvwN8KVXTAH5lCooa7O9TS0MYrHxXQ wVBeGxxnFpqlEPrpycKb+u+hAz9eo3djRIrDMoHst2W4KQ1t7mcyrYiwX3SK9bqtxFBE /4Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jFVmMGrwnTLkYOHt3O0nRMd5k4/Pk0KBxQ8GsL+PzUc=; b=q9N5pXXytejBqeIoooAQdZa+i1qvZDHeZ5mSDAfVJ3E5oa7Hq10iXsUiMJ/yLtqwBH LtMeVKTMkHoSsXsjglT7uoMnrtdnkn7bLu4bzhWOUmZCGnaBSAqwf0pt4HCoE4D5HxiO BfQtljuccOm5ZS/eci+32wb7Uvj1B1m3iUkiH4EM9r1e8eTKoDrRs2xuzp86lX6GjwDn lSuizzEeWY4Hqqq2CxkUxfSkzK353fSj/66gCektLVeIh0jkDe9sU+kG1v32YHjuz6vw oQ0j8HYzEZJ6R3FJbbN4GGF/LyZcTi+MbF9JbgmRj3VZ6AwmZmvDGRsextqapCtyS6Hq Ei+Q== X-Gm-Message-State: AOAM530DWUSRVnhDgEoC4rqyKuGC3lS6yRwnleOwpL9070BF5UMT6A4T wNZY07tQo6iAkEa9nfRUnFCCWpjWqLE= X-Google-Smtp-Source: ABdhPJy8gPHXkYzxUdBk7rnCqnhWG5/UwHjZLR5Zx9rWNfoRD1WoMT5HFkDcFqHpQazqetra7FASFA== X-Received: by 2002:a05:600c:4e13:b0:37b:e449:7afe with SMTP id b19-20020a05600c4e1300b0037be4497afemr6497601wmq.60.1645605152143; Wed, 23 Feb 2022 00:32:32 -0800 (PST) Received: from leap.localnet (host-79-27-0-81.retail.telecomitalia.it. [79.27.0.81]) by smtp.gmail.com with ESMTPSA id j9sm5828549wmc.5.2022.02.23.00.32.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Feb 2022 00:32:31 -0800 (PST) From: "Fabio M. De Francesco" To: jgg@ziepe.ca, liangwenpeng@huawei.com, liweihang@huawei.com, netdev@vger.kernel.org, syzkaller-bugs@googlegroups.com, syzbot , Tony Lu Cc: linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org Subject: Re: [syzbot] BUG: sleeping function called from invalid context in smc_pnet_apply_ib Date: Wed, 23 Feb 2022 09:32:28 +0100 Message-ID: <1810329.tdWV9SEqCh@leap> In-Reply-To: <0000000000008bcf6e05d83ab885@google.com> References: <0000000000008bcf6e05d83ab885@google.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart2094941.irdbgypaU6" Content-Transfer-Encoding: 7Bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a multi-part message in MIME format. --nextPart2094941.irdbgypaU6 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" On gioved=C3=AC 17 febbraio 2022 19:13:19 CET syzbot wrote: > syzbot has found a reproducer for the following issue on: >=20 > HEAD commit: 5740d0689096 net: sched: limit TC_ACT_REPEAT loops > git tree: net > console output: https://syzkaller.appspot.com/x/log.txt?x=3D1474360e700000 > kernel config: https://syzkaller.appspot.com/x/.config?x=3D88e226f0197ae= ba5 > dashboard link: https://syzkaller.appspot.com/bug?extid=3D4f322a6d84e991c= 38775 > compiler: gcc (Debian 10.2.1-6) 10.2.1 20210110, GNU ld (GNU Binuti= ls for Debian) 2.35.2 > syz repro: https://syzkaller.appspot.com/x/repro.syz?x=3D13dd93f2700= 000 > C reproducer: https://syzkaller.appspot.com/x/repro.c?x=3D16a497e2700000 >=20 > IMPORTANT: if you fix the issue, please add the following tag to the comm= it: > Reported-by: syzbot+4f322a6d84e991c38775@syzkaller.appspotmail.com >=20 > infiniband syz1: set active > infiniband syz1: added lo > RDS/IB: syz1: added > smc: adding ib device syz1 with port count 1 > BUG: sleeping function called from invalid context at kernel/locking/mute= x.c:577 > in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 3589, name: syz-ex= ecutor180 > preempt_count: 1, expected: 0 > RCU nest depth: 0, expected: 0 > 6 locks held by syz-executor180/3589: > #0: ffffffff90865838 (&rdma_nl_types[idx].sem){.+.+}-{3:3}, at: rdma_nl_= rcv_msg+0x161/0x690 drivers/infiniband/core/netlink.c:164 > #1: ffffffff8d04edf0 (link_ops_rwsem){++++}-{3:3}, at: nldev_newlink+0x2= 5d/0x560 drivers/infiniband/core/nldev.c:1707 > #2: ffffffff8d03e650 (devices_rwsem){++++}-{3:3}, at: enable_device_and_= get+0xfc/0x3b0 drivers/infiniband/core/device.c:1321 > #3: ffffffff8d03e510 (clients_rwsem){++++}-{3:3}, at: enable_device_and_= get+0x15b/0x3b0 drivers/infiniband/core/device.c:1329 > #4: ffff8880790445c0 (&device->client_data_rwsem){++++}-{3:3}, at: add_c= lient_context+0x3d0/0x5e0 drivers/infiniband/core/device.c:718 > #5: ffff88814a29c818 (&pnettable->lock){++++}-{2:2}, at: smc_pnetid_by_t= able_ib+0x18c/0x470 net/smc/smc_pnet.c:1159 > Preemption disabled at: > [<0000000000000000>] 0x0 > CPU: 0 PID: 3589 Comm: syz-executor180 Not tainted 5.17.0-rc3-syzkaller-0= 0174-g5740d0689096 #0 > Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS G= oogle 01/01/2011 > Call Trace: > > __dump_stack lib/dump_stack.c:88 [inline] > dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106 > __might_resched.cold+0x222/0x26b kernel/sched/core.c:9576 > __mutex_lock_common kernel/locking/mutex.c:577 [inline] > __mutex_lock+0x9f/0x12f0 kernel/locking/mutex.c:733 > smc_pnet_apply_ib+0x28/0x160 net/smc/smc_pnet.c:251 > smc_pnetid_by_table_ib+0x2ae/0x470 net/smc/smc_pnet.c:1164 > smc_ib_add_dev+0x4d7/0x900 net/smc/smc_ib.c:940 > add_client_context+0x405/0x5e0 drivers/infiniband/core/device.c:720 > enable_device_and_get+0x1cd/0x3b0 drivers/infiniband/core/device.c:1331 > ib_register_device drivers/infiniband/core/device.c:1419 [inline] > ib_register_device+0x814/0xaf0 drivers/infiniband/core/device.c:1365 > rxe_register_device+0x2fe/0x3b0 drivers/infiniband/sw/rxe/rxe_verbs.c:11= 46 > rxe_add+0x1331/0x1710 drivers/infiniband/sw/rxe/rxe.c:246 > rxe_net_add+0x8c/0xe0 drivers/infiniband/sw/rxe/rxe_net.c:538 > rxe_newlink drivers/infiniband/sw/rxe/rxe.c:268 [inline] > rxe_newlink+0xa9/0xd0 drivers/infiniband/sw/rxe/rxe.c:249 > nldev_newlink+0x30a/0x560 drivers/infiniband/core/nldev.c:1717 > rdma_nl_rcv_msg+0x36d/0x690 drivers/infiniband/core/netlink.c:195 > rdma_nl_rcv_skb drivers/infiniband/core/netlink.c:239 [inline] > rdma_nl_rcv+0x2ee/0x430 drivers/infiniband/core/netlink.c:259 > netlink_unicast_kernel net/netlink/af_netlink.c:1317 [inline] > netlink_unicast+0x539/0x7e0 net/netlink/af_netlink.c:1343 > netlink_sendmsg+0x904/0xe00 net/netlink/af_netlink.c:1919 > sock_sendmsg_nosec net/socket.c:705 [inline] > sock_sendmsg+0xcf/0x120 net/socket.c:725 > ____sys_sendmsg+0x6e8/0x810 net/socket.c:2413 > ___sys_sendmsg+0xf3/0x170 net/socket.c:2467 > __sys_sendmsg+0xe5/0x1b0 net/socket.c:2496 > do_syscall_x64 arch/x86/entry/common.c:50 [inline] > do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 > entry_SYSCALL_64_after_hwframe+0x44/0xae > RIP: 0033:0x7f7ef25bed59 > Code: 28 c3 e8 5a 14 00 00 66 2e 0f 1f 84 00 00 00 00 00 48 89 f8 48 89 f= 7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff= ff 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48 > RSP: 002b:00007ffcd0ce91d8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e > RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f7ef25bed59 > RDX: 0000000000000000 RSI: 00000000200000c0 RDI: 0000000000000005 > RBP: 00007f7ef25827c0 R08: 0000000000000014 R09: 0000000000000000 > R10: 0000000000000041 R11: 0000000000000246 R12: 00007f7ef2582850 > R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 > >=20 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > [ BUG: Invalid wait context ] > 5.17.0-rc3-syzkaller-00174-g5740d0689096 #0 Tainted: G W =20 > ----------------------------- > syz-executor180/3589 is trying to lock: > ffffffff8d7100d8 (smc_ib_devices.mutex){+.+.}-{3:3}, at: smc_pnet_apply_i= b+0x28/0x160 net/smc/smc_pnet.c:251 > other info that might help us debug this: > context-{4:4} > 6 locks held by syz-executor180/3589: > #0: ffffffff90865838 (&rdma_nl_types[idx].sem){.+.+}-{3:3}, at: rdma_nl_= rcv_msg+0x161/0x690 drivers/infiniband/core/netlink.c:164 > #1: ffffffff8d04edf0 (link_ops_rwsem){++++}-{3:3}, at: nldev_newlink+0x2= 5d/0x560 drivers/infiniband/core/nldev.c:1707 > #2: ffffffff8d03e650 (devices_rwsem){++++}-{3:3}, at: enable_device_and_= get+0xfc/0x3b0 drivers/infiniband/core/device.c:1321 > #3: ffffffff8d03e510 (clients_rwsem){++++}-{3:3}, at: enable_device_and_= get+0x15b/0x3b0 drivers/infiniband/core/device.c:1329 > #4: ffff8880790445c0 (&device->client_data_rwsem){++++}-{3:3}, at: add_c= lient_context+0x3d0/0x5e0 drivers/infiniband/core/device.c:718 > #5: ffff88814a29c818 (&pnettable->lock){++++}-{2:2}, at: smc_pnetid_by_t= able_ib+0x18c/0x470 net/smc/smc_pnet.c:1159 > stack backtrace: > CPU: 0 PID: 3589 Comm: syz-executor180 Tainted: G W 5.17.0= =2Drc3-syzkaller-00174-g5740d0689096 #0 > Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS G= oogle 01/01/2011 > Call Trace: > > __dump_stack lib/dump_stack.c:88 [inline] > dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106 > print_lock_invalid_wait_context kernel/locking/lockdep.c:4678 [inline] > check_wait_context kernel/locking/lockdep.c:4739 [inline] > __lock_acquire.cold+0x213/0x3ab kernel/locking/lockdep.c:4977 > lock_acquire kernel/locking/lockdep.c:5639 [inline] > lock_acquire+0x1ab/0x510 kernel/locking/lockdep.c:5604 > __mutex_lock_common kernel/locking/mutex.c:600 [inline] > __mutex_lock+0x12f/0x12f0 kernel/locking/mutex.c:733 > smc_pnet_apply_ib+0x28/0x160 net/smc/smc_pnet.c:251 > smc_pnetid_by_table_ib+0x2ae/0x470 net/smc/smc_pnet.c:1164 > smc_ib_add_dev+0x4d7/0x900 net/smc/smc_ib.c:940 > add_client_context+0x405/0x5e0 drivers/infiniband/core/device.c:720 > enable_device_and_get+0x1cd/0x3b0 drivers/infiniband/core/device.c:1331 > ib_register_device drivers/infiniband/core/device.c:1419 [inline] > ib_register_device+0x814/0xaf0 drivers/infiniband/core/device.c:1365 > rxe_register_device+0x2fe/0x3b0 drivers/infiniband/sw/rxe/rxe_verbs.c:11= 46 > rxe_add+0x1331/0x1710 drivers/infiniband/sw/rxe/rxe.c:246 > rxe_net_add+0x8c/0xe0 drivers/infiniband/sw/rxe/rxe_net.c:538 > rxe_newlink drivers/infiniband/sw/rxe/rxe.c:268 [inline] > rxe_newlink+0xa9/0xd0 drivers/infiniband/sw/rxe/rxe.c:249 > nldev_newlink+0x30a/0x560 drivers/infiniband/core/nldev.c:1717 > rdma_nl_rcv_msg+0x36d/0x690 drivers/infiniband/core/netlink.c:195 > rdma_nl_rcv_skb drivers/infiniband/core/netlink.c:239 [inline] > rdma_nl_rcv+0x2ee/0x430 drivers/infiniband/core/netlink.c:259 > netlink_unicast_kernel net/netlink/af_netlink.c:1317 [inline] > netlink_unicast+0x539/0x7e0 net/netlink/af_netlink.c:1343 > netlink_sendmsg+0x904/0xe00 net/netlink/af_netlink.c:1919 > sock_sendmsg_nosec net/socket.c:705 [inline] > sock_sendmsg+0xcf/0x120 net/socket.c:725 > ____sys_sendmsg+0x6e8/0x810 net/socket.c:2413 > ___sys_sendmsg+0xf3/0x170 net/socket.c:2467 > __sys_sendmsg+0xe5/0x1b0 net/socket.c:2496 > do_syscall_x64 arch/x86/entry/common.c:50 [inline] > do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 > entry_SYSCALL_64_after_hwframe+0x44/0xae > RIP: 0033:0x7f7ef25bed59 > Code: 28 c3 e8 5a 14 00 00 66 2e 0f 1f 84 00 00 00 00 00 48 89 f8 48 89 f= 7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff= ff 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48 > RSP: 002b:00007ffcd0ce91d8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e > RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f7ef25bed59 > RDX: 0000000000000000 RSI: 00000000200000c0 RDI: 0000000000000005 > RBP: 00007f7ef25827c0 R08: 0000000000000014 R09: 0000000000000000 > R10: 0000000000000041 R11: 0000000000000246 R12: 00007f7ef2582850 > R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 > > smc: ib device syz1 port 1 has pnetid SYZ2 (user defined) >=20 >=20 As confirmed by Tony Lu (thanks!), replace rwlocks with mutexes for locking= =20 "struct smc_pnettable". #syz test: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git= master =46abio M. De Francesco --nextPart2094941.irdbgypaU6 Content-Disposition: attachment; filename="diff" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="diff" diff --git a/net/smc/smc_pnet.c b/net/smc/smc_pnet.c index 0599246c0376..29f0a559d884 100644 --- a/net/smc/smc_pnet.c +++ b/net/smc/smc_pnet.c @@ -113,7 +113,7 @@ static int smc_pnet_remove_by_pnetid(struct net *net, char *pnet_name) pnettable = &sn->pnettable; /* remove table entry */ - write_lock(&pnettable->lock); + mutex_lock(&pnettable->lock); list_for_each_entry_safe(pnetelem, tmp_pe, &pnettable->pnetlist, list) { if (!pnet_name || @@ -131,7 +131,7 @@ static int smc_pnet_remove_by_pnetid(struct net *net, char *pnet_name) rc = 0; } } - write_unlock(&pnettable->lock); + mutex_unlock(&pnettable->lock); /* if this is not the initial namespace, stop here */ if (net != &init_net) @@ -192,7 +192,7 @@ static int smc_pnet_add_by_ndev(struct net_device *ndev) sn = net_generic(net, smc_net_id); pnettable = &sn->pnettable; - write_lock(&pnettable->lock); + mutex_lock(&pnettable->lock); list_for_each_entry_safe(pnetelem, tmp_pe, &pnettable->pnetlist, list) { if (pnetelem->type == SMC_PNET_ETH && !pnetelem->ndev && !strncmp(pnetelem->eth_name, ndev->name, IFNAMSIZ)) { @@ -206,7 +206,7 @@ static int smc_pnet_add_by_ndev(struct net_device *ndev) break; } } - write_unlock(&pnettable->lock); + mutex_unlock(&pnettable->lock); return rc; } @@ -224,7 +224,7 @@ static int smc_pnet_remove_by_ndev(struct net_device *ndev) sn = net_generic(net, smc_net_id); pnettable = &sn->pnettable; - write_lock(&pnettable->lock); + mutex_lock(&pnettable->lock); list_for_each_entry_safe(pnetelem, tmp_pe, &pnettable->pnetlist, list) { if (pnetelem->type == SMC_PNET_ETH && pnetelem->ndev == ndev) { dev_put_track(pnetelem->ndev, &pnetelem->dev_tracker); @@ -237,7 +237,7 @@ static int smc_pnet_remove_by_ndev(struct net_device *ndev) break; } } - write_unlock(&pnettable->lock); + mutex_unlock(&pnettable->lock); return rc; } @@ -370,7 +370,7 @@ static int smc_pnet_add_eth(struct smc_pnettable *pnettable, struct net *net, strncpy(new_pe->eth_name, eth_name, IFNAMSIZ); rc = -EEXIST; new_netdev = true; - write_lock(&pnettable->lock); + mutex_lock(&pnettable->lock); list_for_each_entry(tmp_pe, &pnettable->pnetlist, list) { if (tmp_pe->type == SMC_PNET_ETH && !strncmp(tmp_pe->eth_name, eth_name, IFNAMSIZ)) { @@ -385,9 +385,9 @@ static int smc_pnet_add_eth(struct smc_pnettable *pnettable, struct net *net, GFP_ATOMIC); } list_add_tail(&new_pe->list, &pnettable->pnetlist); - write_unlock(&pnettable->lock); + mutex_unlock(&pnettable->lock); } else { - write_unlock(&pnettable->lock); + mutex_unlock(&pnettable->lock); kfree(new_pe); goto out_put; } @@ -448,7 +448,7 @@ static int smc_pnet_add_ib(struct smc_pnettable *pnettable, char *ib_name, new_pe->ib_port = ib_port; new_ibdev = true; - write_lock(&pnettable->lock); + mutex_lock(&pnettable->lock); list_for_each_entry(tmp_pe, &pnettable->pnetlist, list) { if (tmp_pe->type == SMC_PNET_IB && !strncmp(tmp_pe->ib_name, ib_name, IB_DEVICE_NAME_MAX)) { @@ -458,9 +458,9 @@ static int smc_pnet_add_ib(struct smc_pnettable *pnettable, char *ib_name, } if (new_ibdev) { list_add_tail(&new_pe->list, &pnettable->pnetlist); - write_unlock(&pnettable->lock); + mutex_unlock(&pnettable->lock); } else { - write_unlock(&pnettable->lock); + mutex_unlock(&pnettable->lock); kfree(new_pe); } return (new_ibdev) ? 0 : -EEXIST; @@ -605,7 +605,7 @@ static int _smc_pnet_dump(struct net *net, struct sk_buff *skb, u32 portid, pnettable = &sn->pnettable; /* dump pnettable entries */ - read_lock(&pnettable->lock); + mutex_lock(&pnettable->lock); list_for_each_entry(pnetelem, &pnettable->pnetlist, list) { if (pnetid && !smc_pnet_match(pnetelem->pnet_name, pnetid)) continue; @@ -620,7 +620,7 @@ static int _smc_pnet_dump(struct net *net, struct sk_buff *skb, u32 portid, break; } } - read_unlock(&pnettable->lock); + mutex_unlock(&pnettable->lock); return idx; } @@ -864,7 +864,7 @@ int smc_pnet_net_init(struct net *net) struct smc_pnetids_ndev *pnetids_ndev = &sn->pnetids_ndev; INIT_LIST_HEAD(&pnettable->pnetlist); - rwlock_init(&pnettable->lock); + mutex_init(&pnettable->lock); INIT_LIST_HEAD(&pnetids_ndev->list); rwlock_init(&pnetids_ndev->lock); @@ -944,7 +944,7 @@ static int smc_pnet_find_ndev_pnetid_by_table(struct net_device *ndev, sn = net_generic(net, smc_net_id); pnettable = &sn->pnettable; - read_lock(&pnettable->lock); + mutex_lock(&pnettable->lock); list_for_each_entry(pnetelem, &pnettable->pnetlist, list) { if (pnetelem->type == SMC_PNET_ETH && ndev == pnetelem->ndev) { /* get pnetid of netdev device */ @@ -953,7 +953,7 @@ static int smc_pnet_find_ndev_pnetid_by_table(struct net_device *ndev, break; } } - read_unlock(&pnettable->lock); + mutex_unlock(&pnettable->lock); return rc; } @@ -1156,7 +1156,7 @@ int smc_pnetid_by_table_ib(struct smc_ib_device *smcibdev, u8 ib_port) sn = net_generic(&init_net, smc_net_id); pnettable = &sn->pnettable; - read_lock(&pnettable->lock); + mutex_lock(&pnettable->lock); list_for_each_entry(tmp_pe, &pnettable->pnetlist, list) { if (tmp_pe->type == SMC_PNET_IB && !strncmp(tmp_pe->ib_name, ib_name, IB_DEVICE_NAME_MAX) && @@ -1166,7 +1166,7 @@ int smc_pnetid_by_table_ib(struct smc_ib_device *smcibdev, u8 ib_port) break; } } - read_unlock(&pnettable->lock); + mutex_unlock(&pnettable->lock); return rc; } @@ -1185,7 +1185,7 @@ int smc_pnetid_by_table_smcd(struct smcd_dev *smcddev) sn = net_generic(&init_net, smc_net_id); pnettable = &sn->pnettable; - read_lock(&pnettable->lock); + mutex_lock(&pnettable->lock); list_for_each_entry(tmp_pe, &pnettable->pnetlist, list) { if (tmp_pe->type == SMC_PNET_IB && !strncmp(tmp_pe->ib_name, ib_name, IB_DEVICE_NAME_MAX)) { @@ -1194,7 +1194,7 @@ int smc_pnetid_by_table_smcd(struct smcd_dev *smcddev) break; } } - read_unlock(&pnettable->lock); + mutex_unlock(&pnettable->lock); return rc; } diff --git a/net/smc/smc_pnet.h b/net/smc/smc_pnet.h index 14039272f7e4..07d3670d786b 100644 --- a/net/smc/smc_pnet.h +++ b/net/smc/smc_pnet.h @@ -29,7 +29,7 @@ struct smc_link_group; * @pnetlist: List of PNETIDs */ struct smc_pnettable { - rwlock_t lock; + mutex lock; struct list_head pnetlist; }; --nextPart2094941.irdbgypaU6--