From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DD730A0555 for ; Thu, 9 Jun 2022 13:38:45 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D2BB740A7D; Thu, 9 Jun 2022 13:38:45 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id E2B65406B4 for ; Thu, 9 Jun 2022 13:38:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774723; 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=lQ7hoyNSwyxLWd4Cs1cWh8WHDLjih373SupBsVFTdM8=; b=LM/5Nkf1lhmuw7MmbcIkhKy3TV94FczeTquiNQveD26zZuVkeSfnE2HcNjJ57cRUNabzrk E9aaFRY8EPgdjlIhFF/aI+AcIhZl2IhULpr9dJdsZe9NhJZAjnK9SQoatOupok3hACyZQF o1p+sh1YHqQfhhIjimTwHcHKIRCqfYw= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-177-uAdBJI5POpqq6osWZoIL7w-1; Thu, 09 Jun 2022 07:38:40 -0400 X-MC-Unique: uAdBJI5POpqq6osWZoIL7w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4065A29AA2E9; Thu, 9 Jun 2022 11:38:40 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 37DA418EA6; Thu, 9 Jun 2022 11:38:39 +0000 (UTC) From: Kevin Traynor To: Radu Nicolau Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix device stop' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:53 +0100 Message-Id: <20220609113701.386938-66-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.2 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/13/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/45e89ed9fdcfef1d525988e97d74a2871505fef3 Thanks. Kevin --- >From 45e89ed9fdcfef1d525988e97d74a2871505fef3 Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Mon, 23 May 2022 13:04:36 +0100 Subject: [PATCH] net/iavf: fix device stop [ upstream commit 5933c656b972441718d65275c6bdbec24ee71f9e ] Move security context destroy from device stop to device close function. Deleting the context on device stop can prevent the application from properly cleaning and releasing resources. Fixes: 6bc987ecb860 ("net/iavf: support IPsec inline crypto") Signed-off-by: Radu Nicolau Acked-by: Qi Zhang --- drivers/net/iavf/iavf_ethdev.c | 6 +++--- drivers/net/iavf/iavf_ipsec_crypto.c | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 7e7042bd07..a3e66dda9f 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1041,7 +1041,4 @@ iavf_dev_stop(struct rte_eth_dev *dev) false); - /* free iAVF security device context all related resources */ - iavf_security_ctx_destroy(adapter); - adapter->stopped = 1; dev->data->dev_started = 0; @@ -2595,4 +2592,7 @@ iavf_dev_close(struct rte_eth_dev *dev) ret = iavf_dev_stop(dev); + /* free iAVF security device context all related resources */ + iavf_security_ctx_destroy(adapter); + iavf_flow_flush(dev, NULL); iavf_flow_uninit(adapter); diff --git a/drivers/net/iavf/iavf_ipsec_crypto.c b/drivers/net/iavf/iavf_ipsec_crypto.c index 72ce39a052..fa1cecc1e1 100644 --- a/drivers/net/iavf/iavf_ipsec_crypto.c +++ b/drivers/net/iavf/iavf_ipsec_crypto.c @@ -1552,6 +1552,4 @@ iavf_security_ctx_destroy(struct iavf_adapter *adapter) return -ENODEV; - /* TODO: Add resources cleanup */ - /* free and reset security data structures */ rte_free(iavf_sctx); -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:31.275791777 +0100 +++ 0066-net-iavf-fix-device-stop.patch 2022-06-09 12:34:29.808980748 +0100 @@ -1 +1 @@ -From 5933c656b972441718d65275c6bdbec24ee71f9e Mon Sep 17 00:00:00 2001 +From 45e89ed9fdcfef1d525988e97d74a2871505fef3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5933c656b972441718d65275c6bdbec24ee71f9e ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 7a3b37d5e3..e85ae0ed0e 100644 +index 7e7042bd07..a3e66dda9f 100644 @@ -24 +25 @@ -@@ -1089,7 +1089,4 @@ iavf_dev_stop(struct rte_eth_dev *dev) +@@ -1041,7 +1041,4 @@ iavf_dev_stop(struct rte_eth_dev *dev) @@ -32,2 +33,2 @@ -@@ -2714,4 +2711,7 @@ iavf_dev_close(struct rte_eth_dev *dev) - adapter->closed = true; +@@ -2595,4 +2592,7 @@ iavf_dev_close(struct rte_eth_dev *dev) + ret = iavf_dev_stop(dev);