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 D94AAA04B1 for ; Thu, 5 Nov 2020 13:42:01 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D2F80C31B; Thu, 5 Nov 2020 13:42:00 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id AED1FC808 for ; Thu, 5 Nov 2020 13:41:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580118; 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=a5Y1bILWo+uKuR7yWVo6w0SzRP7KNxuro2YIPSP03BE=; b=UCkRQ67KV6+3S2ujkQvl4vd8q7tX/M8ezx+jX36Ql/KrzRp3T00fnaM+OFMGIUbQw9AuqQ YXsS1mHoqbBNKrwumN8V9lqvGcaRkqOofVgrmxiMM1+zldBjEW2wId4qdXs7NKHtEQdUWe XZ4yZLSfbobnkasIleESto6jmwRcmCs= 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-433-TJt_3ww-N2GrxJDMBeDpIw-1; Thu, 05 Nov 2020 07:41:53 -0500 X-MC-Unique: TJt_3ww-N2GrxJDMBeDpIw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 75C551868403; Thu, 5 Nov 2020 12:41:52 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 873075C3E1; Thu, 5 Nov 2020 12:41:51 +0000 (UTC) From: Kevin Traynor To: Lukasz Wojciechowski Cc: dpdk stable Date: Thu, 5 Nov 2020 12:39:53 +0000 Message-Id: <20201105124015.306404-46-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'raw/skeleton: allow closing already closed device' has been queued to LTS release 18.11.11 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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/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/21e209841c900a4ca532830df84cb357a152d582 Thanks. Kevin. --- >From 21e209841c900a4ca532830df84cb357a152d582 Mon Sep 17 00:00:00 2001 From: Lukasz Wojciechowski Date: Mon, 21 Sep 2020 23:44:20 +0200 Subject: [PATCH] raw/skeleton: allow closing already closed device [ upstream commit e640362b34e868b82bfb047761e05056ba77e58e ] This patch return OK code (0) from skeleton_rawdev_close function if firmware is in SKELETON_FW_READY state. Formerly it returned -EINVAL error code. Returning an error here is troublesome as it disallows proper release of the rawdev. The rte_rawdev_pmd_release function from librte_rawdev library calls drivers' rawdev_close handler and continues execution only in case of errorless call. (see lib/librte_rawdev/rte_rawdev.c:540) The SKELETON_FW_READY state is reached after creation, reset, unload or close of the device. The device should be ok to be released in such situations. To reproduce issue fixed by this patch, call rawdev_autotest from dpdk-test app for few times. As the device is not properly released, the next calls will fail. Fixes: 61c592a8d035 ("raw/skeleton: introduce skeleton rawdev driver") Signed-off-by: Lukasz Wojciechowski --- drivers/raw/skeleton_rawdev/skeleton_rawdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev.c b/drivers/raw/skeleton_rawdev/skeleton_rawdev.c index 6eabd97ee2..78815b056c 100644 --- a/drivers/raw/skeleton_rawdev/skeleton_rawdev.c +++ b/drivers/raw/skeleton_rawdev/skeleton_rawdev.c @@ -190,7 +190,9 @@ static int skeleton_rawdev_close(struct rte_rawdev *dev) break; case SKELETON_FW_READY: + SKELETON_PMD_DEBUG("Device already in stopped state"); + break; case SKELETON_FW_ERROR: default: - SKELETON_PMD_DEBUG("Device already in stopped state"); + SKELETON_PMD_DEBUG("Device in impossible state"); ret = -EINVAL; break; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:55.124556575 +0000 +++ 0046-raw-skeleton-allow-closing-already-closed-device.patch 2020-11-05 12:38:54.245896024 +0000 @@ -1 +1 @@ -From e640362b34e868b82bfb047761e05056ba77e58e Mon Sep 17 00:00:00 2001 +From 21e209841c900a4ca532830df84cb357a152d582 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e640362b34e868b82bfb047761e05056ba77e58e ] + @@ -25 +26,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ - drivers/raw/skeleton/skeleton_rawdev.c | 4 +++- + drivers/raw/skeleton_rawdev/skeleton_rawdev.c | 4 +++- @@ -32,5 +33,5 @@ -diff --git a/drivers/raw/skeleton/skeleton_rawdev.c b/drivers/raw/skeleton/skeleton_rawdev.c -index f8b47a391a..aa3beaad18 100644 ---- a/drivers/raw/skeleton/skeleton_rawdev.c -+++ b/drivers/raw/skeleton/skeleton_rawdev.c -@@ -191,7 +191,9 @@ static int skeleton_rawdev_close(struct rte_rawdev *dev) +diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev.c b/drivers/raw/skeleton_rawdev/skeleton_rawdev.c +index 6eabd97ee2..78815b056c 100644 +--- a/drivers/raw/skeleton_rawdev/skeleton_rawdev.c ++++ b/drivers/raw/skeleton_rawdev/skeleton_rawdev.c +@@ -190,7 +190,9 @@ static int skeleton_rawdev_close(struct rte_rawdev *dev)