From patchwork Tue Feb 23 13:45:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elad Nachman X-Patchwork-Id: 88106 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 96EF0A034F; Tue, 23 Feb 2021 14:45:10 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 80BB2188920; Tue, 23 Feb 2021 14:45:10 +0100 (CET) Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by mails.dpdk.org (Postfix) with ESMTP id DE72040041 for ; Tue, 23 Feb 2021 14:45:08 +0100 (CET) Received: by mail-ed1-f41.google.com with SMTP id j9so25992288edp.1 for ; Tue, 23 Feb 2021 05:45:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hCkJQPLmBcZenOs1N1MP2vzmx6aBBhy7li+K5BSvy3g=; b=TdUimtzFUelWViJxq/fWdr1pk/R5mxKHmGTLZ00cST0HyzcPqYWo4yBA5wzS+tpr4b Pi3/II8STL8eCEBjDAgPuyOXQci0c3uGHwd4LXlzAlhEFaWlvCvlXLazRvzxQfNr3cuW 73uAqC8PQ+6jFb25Vzz9OPAzcZXAAuLtNaaUsjMlhPF9kcprbPOtVmZQYCJZ6WZHEi8l OOAVMDr7wkzOUCehY076JS36yjMf+Ql4S+ScLSH5qmO1lPPBBoD8jLDNchzI/9kr/NJ5 GuzAaF/ZrpoMqckTykpbmrV7tvb9janXyo1F0eIglctzzSWcu0U5yNWVx/7qZrY8kPlw TTsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hCkJQPLmBcZenOs1N1MP2vzmx6aBBhy7li+K5BSvy3g=; b=fOU3e/hT08PxbzdbOEHJ+AjLZbo7ZPZg9BgjS/SnnVPcGwV6KG492fLdY8jAsgCQ/5 ocrs3ZBYL0qg9TOlvBXcm+zLY/WOAb/f1KcEEjf2eq8Y2tR8wRIXh4vlPM1l43/i/d4X cYt68maGVgDonNyLCFF2ZFnLX+y4ZE7orXmxSSYAz83vyt1xa2mVnijKf7KYbBeXLG4Z onTSy+xK2qjGxSKXGD9LYmod83IVl8n+wdiAIwuFDFolVoz8Zvt/orI7OGDeCAcYQfG7 rE8enuOJ1DhhEOA7VDjiEdwbdUcTBSqtp9qJ7+SFK0PD0SJK/jRB4tm99cCIkqslUAD2 eeHg== X-Gm-Message-State: AOAM530DRBND5rmX0FJqYfM4QtElJVQHAevU/uxfrOwFsC2K4beyiug/ 8DAhDGXH3LvdiY3oN7xtvvo= X-Google-Smtp-Source: ABdhPJzyeghIxwx87eYEZmWVS/9McV+8omdyN1L0y4DjF07Ckmuj8Uji/FPZOXnTBJOzE8GGFktp1Q== X-Received: by 2002:aa7:c3c9:: with SMTP id l9mr21351454edr.250.1614087908709; Tue, 23 Feb 2021 05:45:08 -0800 (PST) Received: from localhost (46-117-188-146.bb.netvision.net.il. [46.117.188.146]) by smtp.gmail.com with ESMTPSA id e22sm15089957edj.54.2021.02.23.05.45.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Feb 2021 05:45:08 -0800 (PST) From: Elad Nachman To: ferruh.yigit@intel.com Cc: iryzhov@nfware.com, stephen@networkplumber.org, dev@dpdk.org, eladv6@gmail.com Date: Tue, 23 Feb 2021 15:45:04 +0200 Message-Id: <20210223134504.699-1-eladv6@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201126144613.4986-1-eladv6@gmail.com> References: <20201126144613.4986-1-eladv6@gmail.com> Subject: [dpdk-dev] [PATCH 2/2] kni: fix rtnl deadlocks and race conditions v3 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This part of the series includes my fixes for the issues reported by Ferruh and Igor on top of part 1 of the patch series: 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. Signed-off-by: Elad Nachman --- v3: * Include original patch and new patch as a series of patch, added a comment to the new patch v2: * rebuild the patch as increment from patch 64106 * fix comment and blank lines --- kernel/linux/kni/kni_net.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c index f0b6e9a8d..017e44812 100644 --- a/kernel/linux/kni/kni_net.c +++ b/kernel/linux/kni/kni_net.c @@ -110,9 +110,26 @@ 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; + + /* For configuring the interface to down, + * rtnl must be held all the way to prevent race condition + * inside __dev_close_many() between two netdev instances of KNI + */ + 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 +141,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 +161,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; }