From: Elad Nachman <eladv6@gmail.com> To: ferruh.yigit@intel.com Cc: iryzhov@nfware.com, stephen@networkplumber.org, dev@dpdk.org, eladv6@gmail.com Subject: [dpdk-dev] [PATCH V2] kni: fix rtnl deadlocks and race conditions v2 Date: Tue, 23 Feb 2021 14:05:12 +0200 Message-ID: <20210223120512.29216-1-eladv6@gmail.com> (raw) In-Reply-To: <20201126144613.4986-1-eladv6@gmail.com> This version 2 of the patch leverages on Stephen Hemminger's 64106 patch from Dec 2019, and fixes the issues reported by Ferruh and Igor: A. KNI sync lock is being locked while rtnl is held. If two threads are calling kni_net_process_request() , then the first one will take the sync lock, release rtnl lock then sleep. The second thread will try to lock sync lock while holding rtnl. The first thread will wake, and try to lock rtnl, resulting in a deadlock. The remedy is to release rtnl before locking the KNI sync lock. Since in between nothing is accessing Linux network-wise, no rtnl locking is needed. B. There is a race condition in __dev_close_many() processing the close_list while the application terminates. It looks like if two vEth devices are terminating, and one releases the rtnl lock, the other takes it, updating the close_list in an unstable state, causing the close_list to become a circular linked list, hence list_for_each_entry() will endlessly loop inside __dev_close_many() . Since the description for the original patch indicate the original motivation was bringing the device up, I have changed kni_net_process_request() to hold the rtnl mutex in case of bringing the device down since this is the path called from __dev_close_many() , causing the corruption of the close_list. Depends-on: patch-64106 ("kni: fix kernel deadlock when using mlx devices") Signed-off-by: Elad Nachman <eladv6@gmail.com> --- V2: * rebuild the patch as increment from patch 64106 * fix comment and blank lines --- kernel/linux/kni/kni_net.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c index f0b6e9a8d..b41360220 100644 --- a/kernel/linux/kni/kni_net.c +++ b/kernel/linux/kni/kni_net.c @@ -110,9 +110,22 @@ kni_net_process_request(struct net_device *dev, struct rte_kni_request *req) void *resp_va; uint32_t num; int ret_val; + int req_is_dev_stop = 0; + + if (req->req_id == RTE_KNI_REQ_CFG_NETWORK_IF && + req->if_up == 0) + req_is_dev_stop = 1; ASSERT_RTNL(); + /* Since we need to wait and RTNL mutex is held + * drop the mutex and hold reference to keep device + */ + if (!req_is_dev_stop) { + dev_hold(dev); + rtnl_unlock(); + } + mutex_lock(&kni->sync_lock); /* Construct data */ @@ -124,16 +137,8 @@ kni_net_process_request(struct net_device *dev, struct rte_kni_request *req) goto fail; } - /* Since we need to wait and RTNL mutex is held - * drop the mutex and hold refernce to keep device - */ - dev_hold(dev); - rtnl_unlock(); - ret_val = wait_event_interruptible_timeout(kni->wq, kni_fifo_count(kni->resp_q), 3 * HZ); - rtnl_lock(); - dev_put(dev); if (signal_pending(current) || ret_val <= 0) { ret = -ETIME; @@ -152,6 +157,10 @@ kni_net_process_request(struct net_device *dev, struct rte_kni_request *req) fail: mutex_unlock(&kni->sync_lock); + if (!req_is_dev_stop) { + rtnl_lock(); + dev_put(dev); + } return ret; } -- 2.17.1
next prev parent reply other threads:[~2021-02-23 13:01 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-26 14:46 [dpdk-dev] [PATCH] kni: fix rtnl deadlocks and race conditions Elad Nachman 2021-02-19 18:41 ` Ferruh Yigit 2021-02-21 8:03 ` Elad Nachman 2021-02-22 15:58 ` Ferruh Yigit 2021-02-23 12:05 ` Elad Nachman [this message] 2021-02-23 12:53 ` [dpdk-dev] [PATCH V2] kni: fix rtnl deadlocks and race conditions v2 Ferruh Yigit 2021-02-23 13:44 ` [dpdk-dev] [PATCH 1/2] kni: fix rtnl deadlocks and race conditions v3 Elad Nachman 2021-02-23 13:45 ` [dpdk-dev] [PATCH 2/2] " Elad Nachman 2021-02-24 12:49 ` Igor Ryzhov 2021-02-24 13:33 ` Elad Nachman 2021-02-24 14:04 ` Igor Ryzhov 2021-02-24 14:06 ` Elad Nachman 2021-02-24 14:41 ` Igor Ryzhov 2021-02-24 14:56 ` Elad Nachman 2021-02-24 15:18 ` Igor Ryzhov [not found] ` <CACXF7qkhkzFc-=v=iiBzh2V7rLjk1U34VUfPbNrnYJND_0TKHQ@mail.gmail.com> 2021-02-24 16:31 ` Igor Ryzhov 2021-02-24 15:54 ` Stephen Hemminger 2021-02-25 14:32 ` [dpdk-dev] [PATCH 1/2] kni: fix kernel deadlock when using mlx devices Elad Nachman 2021-02-25 14:32 ` [dpdk-dev] [PATCH 2/2] kni: fix rtnl deadlocks and race conditions v4 Elad Nachman 2021-02-25 21:01 ` Igor Ryzhov 2021-02-26 15:48 ` Stephen Hemminger 2021-02-26 17:43 ` Elad Nachman 2021-03-01 8:10 ` Igor Ryzhov 2021-03-01 16:38 ` Stephen Hemminger 2021-03-15 16:58 ` Ferruh Yigit 2021-03-01 20:27 ` Dan Gora 2021-03-01 21:26 ` Dan Gora 2021-03-02 16:44 ` Elad Nachman 2021-03-15 17:17 ` Ferruh Yigit 2021-03-16 18:35 ` Elad Nachman 2021-03-16 18:42 ` Ferruh Yigit 2021-03-15 17:17 ` [dpdk-dev] [PATCH 1/2] kni: fix kernel deadlock when using mlx devices Ferruh Yigit 2021-03-29 14:36 ` [dpdk-dev] [PATCH v5 1/3] kni: refactor user request processing Ferruh Yigit 2021-03-29 14:36 ` [dpdk-dev] [PATCH v5 2/3] kni: support async user request Ferruh Yigit 2021-03-29 14:36 ` [dpdk-dev] [PATCH v5 3/3] kni: fix kernel deadlock when using mlx devices Ferruh Yigit 2021-04-09 14:56 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit 2021-04-12 14:35 ` Elad Nachman 2021-04-20 23:07 ` Thomas Monjalon 2021-04-23 8:41 ` Igor Ryzhov 2021-04-23 8:59 ` Ferruh Yigit 2021-04-23 12:43 ` Igor Ryzhov 2021-04-23 12:58 ` Igor Ryzhov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210223120512.29216-1-eladv6@gmail.com \ --to=eladv6@gmail.com \ --cc=dev@dpdk.org \ --cc=ferruh.yigit@intel.com \ --cc=iryzhov@nfware.com \ --cc=stephen@networkplumber.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git