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 0A43EA04A3 for ; Fri, 5 Jun 2020 20:26:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 000A01D51B; Fri, 5 Jun 2020 20:26:11 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 136B61D534 for ; Fri, 5 Jun 2020 20:26:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LbybgCBE7fjINk0gYn05Whl7DunJDgAV8ROqCNLHvuU=; b=BunuxZQF26sev22hSrx/QJ8HNtgE4sfugpvER947MJoONJFLrjX4SEM5xYC59M46JET74Y +bMqqwI1zAKJISRuL7gI9y3z9fMLkrc9HPLXP1xD9LeHBcC1X3oHpSOPoXGeBDqq3jBGS8 a0KQDc1kCAOZE0SPUw7zT5A1N+wkLZQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-466-vSR2MIyfN1WgppFPbQKl4w-1; Fri, 05 Jun 2020 14:26:06 -0400 X-MC-Unique: vSR2MIyfN1WgppFPbQKl4w-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 672C2800685; Fri, 5 Jun 2020 18:26:05 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25829619D3; Fri, 5 Jun 2020 18:26:03 +0000 (UTC) From: Kevin Traynor To: Pavan Nikhilesh Cc: Jerin Jacob , dpdk stable Date: Fri, 5 Jun 2020 19:24:14 +0100 Message-Id: <20200605182525.22483-17-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eventdev: fix probe and remove for secondary process' has been queued to LTS release 18.11.9 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 LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/10/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/9b46674b69e29d26d5d23943abbf65a1a270de25 Thanks. Kevin. --- >From 9b46674b69e29d26d5d23943abbf65a1a270de25 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 | 15 +++++++++------ lib/librte_eventdev/rte_eventdev_pmd_pci.h | 8 +++++--- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c index 6396a96490..a2db0fd5fb 100644 --- a/lib/librte_eventdev/rte_eventdev.c +++ b/lib/librte_eventdev/rte_eventdev.c @@ -14,4 +14,5 @@ #include +#include #include #include @@ -1363,13 +1364,15 @@ rte_event_pmd_allocate(const char *name, int socket_id) eventdev->data = eventdev_data; - snprintf(eventdev->data->name, RTE_EVENTDEV_NAME_MAX_LEN, - "%s", name); + 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 @@ -113,7 +113,9 @@ rte_event_pmd_pci_remove(struct rte_pci_device *pci_dev, 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 */ -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:51.865081148 +0100 +++ 0017-eventdev-fix-probe-and-remove-for-secondary-process.patch 2020-06-05 19:20:50.737042472 +0100 @@ -1 +1 @@ -From a5f30c925b88bb3613535fb27eb3459d19226cd0 Mon Sep 17 00:00:00 2001 +From 9b46674b69e29d26d5d23943abbf65a1a270de25 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a5f30c925b88bb3613535fb27eb3459d19226cd0 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ - lib/librte_eventdev/rte_eventdev.c | 13 ++++++++----- + lib/librte_eventdev/rte_eventdev.c | 15 +++++++++------ @@ -20 +21 @@ - 2 files changed, 13 insertions(+), 8 deletions(-) + 2 files changed, 14 insertions(+), 9 deletions(-) @@ -23 +24 @@ -index e72d8b941c..82c177c734 100644 +index 6396a96490..a2db0fd5fb 100644 @@ -26 +27,7 @@ -@@ -1374,12 +1374,15 @@ rte_event_pmd_allocate(const char *name, int socket_id) +@@ -14,4 +14,5 @@ + #include + ++#include + #include + #include +@@ -1363,13 +1364,15 @@ rte_event_pmd_allocate(const char *name, int socket_id) @@ -29 +36,2 @@ -- strlcpy(eventdev->data->name, name, RTE_EVENTDEV_NAME_MAX_LEN); +- snprintf(eventdev->data->name, RTE_EVENTDEV_NAME_MAX_LEN, +- "%s", name);