From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A8B44A0093 for ; Tue, 19 May 2020 15:14:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9F3E01D702; Tue, 19 May 2020 15:14:12 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 8F5801D904 for ; Tue, 19 May 2020 15:14:10 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id e1so15874077wrt.5 for ; Tue, 19 May 2020 06:14:10 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=rjOAJCXYOGz8GHSgK6GwGR4Pc+c7niW4JOCO9wmxSOE=; b=abtkfnCrtDMi+/jQ3idzqj7IdsazUhaIAnGHNjt1I6fT43LEXLWLa3Lm3Qd6VY1e4h uSf2XFwhCTXafgrG1dsH7H1oqkk8i4Qgyetz24eUWG0te1lmh1w2yfkcjKXbFNAFn6Dg loxTX5OT/ixT+Fr3gsQGr3W+75h7B2wuKm9nt6sKTiDqoTSvYgOrYKcMD2rl6/jMh5ud WZns89ctNgzn/fH86ONd1H0y/PdjYJFDAjLhY02wpPvHB5pAwGfygr6SOVt8NoLChuLp FMEeWoQX/2AOM8wxBvmyU7nuwr1+xlp0zr/iQVEC9LsjZZwhad71+aFobMp3+Gn0MPj+ SPiA== 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:mime-version:content-transfer-encoding; bh=rjOAJCXYOGz8GHSgK6GwGR4Pc+c7niW4JOCO9wmxSOE=; b=jcL5y4cNX6YaEUQBLZ7z2tGFrXkim1BjQKbZX3ctMP44cCmac+v5pFrVvzmlTTACJ/ P6SptKDAV937/nJ7Er3nrYmU3bPb/naAtTGViVybObbJV5GZ7onrnjACD7nKls5HbC6k BaMWtkVgvc7DQzp/Ch+Ah9EdzDkcKp2OIHVeGFmp3ms/js2QzkLm8tV1G4bzjwhSErya hXEIQVP2INEEaMbISwBWztwizvxFiugJmMZY6WGWRPJh2qKmMVZ/hkS/NXjvETyoeuXN sKMNnWkR0bGmvC1MXSmvar5bVAHf+pF1iDmCZYbVf4E0FLaRNjk0aAkXq42gRXY2Hp3c xH2Q== X-Gm-Message-State: AOAM533CodKpsW55gNdOF0wHm9yE5RXE0rGV+lHkw9Z989HuDeV2sPwD K3dpHl9rDTWYri932j78qMs= X-Google-Smtp-Source: ABdhPJwBQyVwtYrwvRqFoc1jtjix2eTRn2lqWdxvur0v2xqtXN82yYxlpAGzFRzWIziMHkKVUkm35g== X-Received: by 2002:adf:df12:: with SMTP id y18mr24573747wrl.94.1589894050335; Tue, 19 May 2020 06:14:10 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a10sm3925285wmf.46.2020.05.19.06.14.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:14:09 -0700 (PDT) From: luca.boccassi@gmail.com To: Pavan Nikhilesh Cc: Jerin Jacob , dpdk stable Date: Tue, 19 May 2020 14:04:53 +0100 Message-Id: <20200519130549.112823-158-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eventdev: fix probe and remove for secondary process' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 85c1aae896b33b12ff65b26e45bdcb8471e2ee02 Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Mon, 27 Apr 2020 23:40:38 +0530 Subject: [PATCH] eventdev: fix probe and remove for secondary process [ upstream commit a5f30c925b88bb3613535fb27eb3459d19226cd0 ] When probing event device in secondary process skip reinitializing the device data structure as it is already done in primary process. When removing event device in secondary process skip closing the event device as it should be done by primary process. Fixes: 322d0345c2bc ("eventdev: implement PMD registration functions") Signed-off-by: Pavan Nikhilesh Acked-by: Jerin Jacob --- lib/librte_eventdev/rte_eventdev.c | 13 ++++++++----- lib/librte_eventdev/rte_eventdev_pmd_pci.h | 8 +++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c index b987e07454..9aca7fbd52 100644 --- a/lib/librte_eventdev/rte_eventdev.c +++ b/lib/librte_eventdev/rte_eventdev.c @@ -1364,14 +1364,17 @@ rte_event_pmd_allocate(const char *name, int socket_id) eventdev->data = eventdev_data; - strlcpy(eventdev->data->name, name, RTE_EVENTDEV_NAME_MAX_LEN); + if (rte_eal_process_type() == RTE_PROC_PRIMARY) { - eventdev->data->dev_id = dev_id; - eventdev->data->socket_id = socket_id; - eventdev->data->dev_started = 0; + strlcpy(eventdev->data->name, name, + RTE_EVENTDEV_NAME_MAX_LEN); + + eventdev->data->dev_id = dev_id; + eventdev->data->socket_id = socket_id; + eventdev->data->dev_started = 0; + } eventdev->attached = RTE_EVENTDEV_ATTACHED; - eventdev_globals.nb_devs++; } diff --git a/lib/librte_eventdev/rte_eventdev_pmd_pci.h b/lib/librte_eventdev/rte_eventdev_pmd_pci.h index 8fb61386fd..443cd38c23 100644 --- a/lib/librte_eventdev/rte_eventdev_pmd_pci.h +++ b/lib/librte_eventdev/rte_eventdev_pmd_pci.h @@ -112,9 +112,11 @@ rte_event_pmd_pci_remove(struct rte_pci_device *pci_dev, if (eventdev == NULL) return -ENODEV; - ret = rte_event_dev_close(eventdev->data->dev_id); - if (ret < 0) - return ret; + if (rte_eal_process_type() == RTE_PROC_PRIMARY) { + ret = rte_event_dev_close(eventdev->data->dev_id); + if (ret < 0) + return ret; + } /* Invoke PMD device un-init function */ if (devuninit) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:50.922122047 +0100 +++ 0158-eventdev-fix-probe-and-remove-for-secondary-process.patch 2020-05-19 14:04:44.496653448 +0100 @@ -1,8 +1,10 @@ -From a5f30c925b88bb3613535fb27eb3459d19226cd0 Mon Sep 17 00:00:00 2001 +From 85c1aae896b33b12ff65b26e45bdcb8471e2ee02 Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Mon, 27 Apr 2020 23:40:38 +0530 Subject: [PATCH] eventdev: fix probe and remove for secondary process +[ upstream commit a5f30c925b88bb3613535fb27eb3459d19226cd0 ] + When probing event device in secondary process skip reinitializing the device data structure as it is already done in primary process. @@ -10,7 +12,6 @@ event device as it should be done by primary process. Fixes: 322d0345c2bc ("eventdev: implement PMD registration functions") -Cc: stable@dpdk.org Signed-off-by: Pavan Nikhilesh Acked-by: Jerin Jacob @@ -20,10 +21,10 @@ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c -index e72d8b941c..82c177c734 100644 +index b987e07454..9aca7fbd52 100644 --- a/lib/librte_eventdev/rte_eventdev.c +++ b/lib/librte_eventdev/rte_eventdev.c -@@ -1373,14 +1373,17 @@ rte_event_pmd_allocate(const char *name, int socket_id) +@@ -1364,14 +1364,17 @@ rte_event_pmd_allocate(const char *name, int socket_id) eventdev->data = eventdev_data;