net/smc: fix sleep bug in smc_pnet_find_roce_resource() (92f3cb0e) · Commits · 戴 / test

net/smc/smc_core.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		#include <linux/workqueue.h>
		#include <linux/wait.h>
		#include <linux/reboot.h>
		#include <linux/mutex.h>
		#include <net/tcp.h>
		#include <net/sock.h>
		#include <rdma/ib_verbs.h>
		@@ -1961,14 +1962,14 @@ static void smc_core_going_away(void)
		struct smc_ib_device *smcibdev;
		struct smcd_dev *smcd;

		spin_lock(&smc_ib_devices.lock);
		mutex_lock(&smc_ib_devices.mutex);
		list_for_each_entry(smcibdev, &smc_ib_devices.list, list) {
		int i;

		for (i = 0; i < SMC_MAX_PORTS; i++)
		set_bit(i, smcibdev->ports_going_away);
		}
		spin_unlock(&smc_ib_devices.lock);
		mutex_unlock(&smc_ib_devices.mutex);

		spin_lock(&smcd_dev_list.lock);
		list_for_each_entry(smcd, &smcd_dev_list.list, list) {

net/smc/smc_ib.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		#include <linux/workqueue.h>
		#include <linux/scatterlist.h>
		#include <linux/wait.h>
		#include <linux/mutex.h>
		#include <rdma/ib_verbs.h>
		#include <rdma/ib_cache.h>

		@@ -33,7 +34,7 @@
		#define SMC_QP_RNR_RETRY 7 /* 7: infinite */

		struct smc_ib_devices smc_ib_devices = { /* smc-registered ib devices */
		.lock = __SPIN_LOCK_UNLOCKED(smc_ib_devices.lock),
		.mutex = __MUTEX_INITIALIZER(smc_ib_devices.mutex),
		.list = LIST_HEAD_INIT(smc_ib_devices.list),
		};

		@@ -565,9 +566,9 @@ static int smc_ib_add_dev(struct ib_device *ibdev)
		INIT_WORK(&smcibdev->port_event_work, smc_ib_port_event_work);
		atomic_set(&smcibdev->lnk_cnt, 0);
		init_waitqueue_head(&smcibdev->lnks_deleted);
		spin_lock(&smc_ib_devices.lock);
		mutex_lock(&smc_ib_devices.mutex);
		list_add_tail(&smcibdev->list, &smc_ib_devices.list);
		spin_unlock(&smc_ib_devices.lock);
		mutex_unlock(&smc_ib_devices.mutex);
		ib_set_client_data(ibdev, &smc_ib_client, smcibdev);
		INIT_IB_EVENT_HANDLER(&smcibdev->event_handler, smcibdev->ibdev,
		smc_ib_global_event_handler);
		@@ -602,9 +603,9 @@ static void smc_ib_remove_dev(struct ib_device ibdev, void client_data)
		{
		struct smc_ib_device *smcibdev = client_data;

		spin_lock(&smc_ib_devices.lock);
		mutex_lock(&smc_ib_devices.mutex);
		list_del_init(&smcibdev->list); /* remove from smc_ib_devices */
		spin_unlock(&smc_ib_devices.lock);
		mutex_unlock(&smc_ib_devices.mutex);
		pr_warn_ratelimited("smc: removing ib device %s\n",
		smcibdev->ibdev->name);
		smc_smcr_terminate_all(smcibdev);

net/smc/smc_ib.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@

		#include <linux/interrupt.h>
		#include <linux/if_ether.h>
		#include <linux/mutex.h>
		#include <linux/wait.h>
		#include <rdma/ib_verbs.h>
		#include <net/smc.h>
		@@ -25,7 +26,7 @@

		struct smc_ib_devices { /* list of smc ib devices definition */
		struct list_head list;
		spinlock_t lock; /* protects list of smc ib devices */
		struct mutex mutex; /* protects list of smc ib devices */
		};

		extern struct smc_ib_devices smc_ib_devices; /* list of smc ib devices */

net/smc/smc_pnet.c

+11 −10

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		#include <linux/module.h>
		#include <linux/list.h>
		#include <linux/ctype.h>
		#include <linux/mutex.h>
		#include <net/netlink.h>
		#include <net/genetlink.h>

		@@ -129,7 +130,7 @@ static int smc_pnet_remove_by_pnetid(struct net net, char pnet_name)
		return rc;

		/* remove ib devices */
		spin_lock(&smc_ib_devices.lock);
		mutex_lock(&smc_ib_devices.mutex);
		list_for_each_entry(ibdev, &smc_ib_devices.list, list) {
		for (ibport = 0; ibport < SMC_MAX_PORTS; ibport++) {
		if (ibdev->pnetid_by_user[ibport] &&
		@@ -149,7 +150,7 @@ static int smc_pnet_remove_by_pnetid(struct net net, char pnet_name)
		}
		}
		}
		spin_unlock(&smc_ib_devices.lock);
		mutex_unlock(&smc_ib_devices.mutex);
		/* remove smcd devices */
		spin_lock(&smcd_dev_list.lock);
		list_for_each_entry(smcd_dev, &smcd_dev_list.list, list) {
		@@ -240,14 +241,14 @@ static bool smc_pnet_apply_ib(struct smc_ib_device *ib_dev, u8 ib_port,
		u8 pnet_null[SMC_MAX_PNETID_LEN] = {0};
		bool applied = false;

		spin_lock(&smc_ib_devices.lock);
		mutex_lock(&smc_ib_devices.mutex);
		if (smc_pnet_match(ib_dev->pnetid[ib_port - 1], pnet_null)) {
		memcpy(ib_dev->pnetid[ib_port - 1], pnet_name,
		SMC_MAX_PNETID_LEN);
		ib_dev->pnetid_by_user[ib_port - 1] = true;
		applied = true;
		}
		spin_unlock(&smc_ib_devices.lock);
		mutex_unlock(&smc_ib_devices.mutex);
		return applied;
		}

		@@ -300,7 +301,7 @@ static struct smc_ib_device smc_pnet_find_ib(char ib_name)
		{
		struct smc_ib_device *ibdev;

		spin_lock(&smc_ib_devices.lock);
		mutex_lock(&smc_ib_devices.mutex);
		list_for_each_entry(ibdev, &smc_ib_devices.list, list) {
		if (!strncmp(ibdev->ibdev->name, ib_name,
		sizeof(ibdev->ibdev->name)) \|\|
		@@ -311,7 +312,7 @@ static struct smc_ib_device smc_pnet_find_ib(char ib_name)
		}
		ibdev = NULL;
		out:
		spin_unlock(&smc_ib_devices.lock);
		mutex_unlock(&smc_ib_devices.mutex);
		return ibdev;
		}

		@@ -825,7 +826,7 @@ static void _smc_pnet_find_roce_by_pnetid(u8 *pnet_id,
		int i;

		ini->ib_dev = NULL;
		spin_lock(&smc_ib_devices.lock);
		mutex_lock(&smc_ib_devices.mutex);
		list_for_each_entry(ibdev, &smc_ib_devices.list, list) {
		if (ibdev == known_dev)
		continue;
		@@ -844,7 +845,7 @@ static void _smc_pnet_find_roce_by_pnetid(u8 *pnet_id,
		}
		}
		out:
		spin_unlock(&smc_ib_devices.lock);
		mutex_unlock(&smc_ib_devices.mutex);
		}

		/* find alternate roce device with same pnet_id and vlan_id */
		@@ -863,7 +864,7 @@ static void smc_pnet_find_rdma_dev(struct net_device *netdev,
		{
		struct smc_ib_device *ibdev;

		spin_lock(&smc_ib_devices.lock);
		mutex_lock(&smc_ib_devices.mutex);
		list_for_each_entry(ibdev, &smc_ib_devices.list, list) {
		struct net_device *ndev;
		int i;
		@@ -888,7 +889,7 @@ static void smc_pnet_find_rdma_dev(struct net_device *netdev,
		}
		}
		}
		spin_unlock(&smc_ib_devices.lock);
		mutex_unlock(&smc_ib_devices.mutex);
		}

		/* Determine the corresponding IB device port based on the hardware PNETID.

Admin message