From patchwork Thu Feb 25 14:32:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elad Nachman X-Patchwork-Id: 88226 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 299E6A034F; Thu, 25 Feb 2021 15:32:46 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 15AD61608B3; Thu, 25 Feb 2021 15:32:46 +0100 (CET) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by mails.dpdk.org (Postfix) with ESMTP id 570F840692 for ; Thu, 25 Feb 2021 15:32:44 +0100 (CET) Received: by mail-ed1-f43.google.com with SMTP id h19so7126905edb.9 for ; Thu, 25 Feb 2021 06:32:44 -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=jqKbaCCGwOp+FhdC0FHSuaq8zTtdce0kjjjGUfFQWrA=; b=EbnmSppz4k9B51N54NESg67wVfCVMojtmPLgrlmuWDTm37DTSuuoJaIzDxZYfK8/wH 4RtyO7qzIm13/UgKytJJPPpL1p8ZcGJ28AbkGx6rZV9eQ82C14mbhRd3ZdGeHzamKANt QaqMcZFYByFNWCVVnYQ1qznzHPF5xqnSkBwlL/sdCZzqUalGKegXUkLUj31lWmAFkJql zALzUkB/DmtLIsXCy0vaEAY2ClMihsRpRVDBxmvrES0FJ/FRFuZzIsDtixs1/hYvesHK SxInIHibC9U7+udcnPVtEUOSqjJ/V0YQ4uNf7GO/EeAchjAaj9QanAGm+bOqbisDz1Y3 2wTQ== 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=jqKbaCCGwOp+FhdC0FHSuaq8zTtdce0kjjjGUfFQWrA=; b=QAuVBiX6z5UQSCHogOY80GCFCC5BkUaB7m7pbQdK4X5Enjkn0xzq/Rm55080tU9WwR nf4x0ixykIZAVoWw7DMqyqRYYsBYOwykTsHdw1Tyx374tyy6S2Z0/cBV9EyCSxaov4gH g5+hMNHfkWzAi2fIpiHSVnfVgdfhsfrDRd1C/hIZyXA5bA+g+IOUsm2249jZfMfwXoPf Z8ZwYZdOVi2fHxKeAgQCpVM78GXyQ6tVSMO2NLXj5MmiqiVF4+xnVzEdk4geo1e4dGZc 3W4KQ2PT8ErOLDuWDf07+iYMdu/jGOCvj39tRhL6cp42A9IKMiyMmz7maExjRPtpHn7G WlPQ== X-Gm-Message-State: AOAM533D4CHPxXv1kEHyOhsEFTi1GQ6VKG3ExZRj4xzlJ4TISHHKrvdc 8PaITXitgB9/tzu50VrzVH0= X-Google-Smtp-Source: ABdhPJzQBV4Bp7HDEysgk052M7mEAMyXP336ZPSehImuYjCNtL2Ni1vBHVkPXSE1wZ1N6oXpz4gwfw== X-Received: by 2002:a05:6402:34c4:: with SMTP id w4mr3114667edc.153.1614263564109; Thu, 25 Feb 2021 06:32:44 -0800 (PST) Received: from localhost (46-117-188-146.bb.netvision.net.il. [46.117.188.146]) by smtp.gmail.com with ESMTPSA id fi11sm1108815ejb.73.2021.02.25.06.32.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Feb 2021 06:32:43 -0800 (PST) From: Elad Nachman To: ferruh.yigit@intel.com Cc: iryzhov@nfware.com, stephen@networkplumber.org, dev@dpdk.org, eladv6@gmail.com Date: Thu, 25 Feb 2021 16:32:38 +0200 Message-Id: <20210225143239.14220-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 1/2] kni: fix kernel deadlock when using mlx devices 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 first part of v4 of the patch re-introduces Stephen Hemminger's patch 64106 . This part changes the parameter kni_net_process_request() gets and introduces the initial rtnl unlocking mechanism. Signed-off-by: Elad Nachman --- v4: * for if down case, send asynchronously with rtnl locked and without wait, returning immediately to avoid both kernel race conditions and deadlock in user-space 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 | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c index 4b752083d..f0b6e9a8d 100644 --- a/kernel/linux/kni/kni_net.c +++ b/kernel/linux/kni/kni_net.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -102,17 +103,15 @@ get_data_kva(struct kni_dev *kni, void *pkt_kva) * It can be called to process the request. */ static int -kni_net_process_request(struct kni_dev *kni, struct rte_kni_request *req) +kni_net_process_request(struct net_device *dev, struct rte_kni_request *req) { + struct kni_dev *kni = netdev_priv(dev); int ret = -1; void *resp_va; uint32_t num; int ret_val; - if (!kni || !req) { - pr_err("No kni instance or request\n"); - return -EINVAL; - } + ASSERT_RTNL(); mutex_lock(&kni->sync_lock); @@ -125,8 +124,17 @@ kni_net_process_request(struct kni_dev *kni, struct rte_kni_request *req) goto fail; } + /* Since we need to wait and RTNL mutex is held + * drop the mutex and hold reference 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; goto fail; @@ -155,7 +163,6 @@ kni_net_open(struct net_device *dev) { int ret; struct rte_kni_request req; - struct kni_dev *kni = netdev_priv(dev); netif_start_queue(dev); if (kni_dflt_carrier == 1) @@ -168,7 +175,7 @@ kni_net_open(struct net_device *dev) /* Setting if_up to non-zero means up */ req.if_up = 1; - ret = kni_net_process_request(kni, &req); + ret = kni_net_process_request(dev, &req); return (ret == 0) ? req.result : ret; } @@ -178,7 +185,6 @@ kni_net_release(struct net_device *dev) { int ret; struct rte_kni_request req; - struct kni_dev *kni = netdev_priv(dev); netif_stop_queue(dev); /* can't transmit any more */ netif_carrier_off(dev); @@ -188,7 +194,7 @@ kni_net_release(struct net_device *dev) /* Setting if_up to 0 means down */ req.if_up = 0; - ret = kni_net_process_request(kni, &req); + ret = kni_net_process_request(dev, &req); return (ret == 0) ? req.result : ret; } @@ -643,14 +649,13 @@ kni_net_change_mtu(struct net_device *dev, int new_mtu) { int ret; struct rte_kni_request req; - struct kni_dev *kni = netdev_priv(dev); pr_debug("kni_net_change_mtu new mtu %d to be set\n", new_mtu); memset(&req, 0, sizeof(req)); req.req_id = RTE_KNI_REQ_CHANGE_MTU; req.new_mtu = new_mtu; - ret = kni_net_process_request(kni, &req); + ret = kni_net_process_request(dev, &req); if (ret == 0 && req.result == 0) dev->mtu = new_mtu; @@ -661,7 +666,6 @@ static void kni_net_change_rx_flags(struct net_device *netdev, int flags) { struct rte_kni_request req; - struct kni_dev *kni = netdev_priv(netdev); memset(&req, 0, sizeof(req)); @@ -683,7 +687,7 @@ kni_net_change_rx_flags(struct net_device *netdev, int flags) req.promiscusity = 0; } - kni_net_process_request(kni, &req); + kni_net_process_request(netdev, &req); } /* @@ -742,7 +746,6 @@ kni_net_set_mac(struct net_device *netdev, void *p) { int ret; struct rte_kni_request req; - struct kni_dev *kni; struct sockaddr *addr = p; memset(&req, 0, sizeof(req)); @@ -754,8 +757,7 @@ kni_net_set_mac(struct net_device *netdev, void *p) memcpy(req.mac_addr, addr->sa_data, netdev->addr_len); memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); - kni = netdev_priv(netdev); - ret = kni_net_process_request(kni, &req); + ret = kni_net_process_request(netdev, &req); return (ret == 0 ? req.result : ret); }