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 95D4B41D53 for ; Thu, 23 Feb 2023 16:07:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 91A304324D; Thu, 23 Feb 2023 16:07:28 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 40C064323D for ; Thu, 23 Feb 2023 16:07:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164846; 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=z/s8+AeO3TUkKA6Kg6OWYuCsjzqzMYPvETrYBkeCXlk=; b=Ylm2gGvgyme642Ffcj+70s33LVpHGapTrc6upviJFbuzXxQdyO/XyMeXegbSRFdFFPWTWS Gif29G2Mg18dVIWNIE0lCkJ2HJR51UFEp+vjFHSU/r95UCweLDCQv5IxWaBFDFVjhe5US0 6tTOJnYbno3z7Z/QDjvfFGKafv6uXVg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-358-pMU-HbClPGSPlisaupDjWw-1; Thu, 23 Feb 2023 10:07:25 -0500 X-MC-Unique: pMU-HbClPGSPlisaupDjWw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0E6E2823D62; Thu, 23 Feb 2023 15:07:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B0D72166B2B; Thu, 23 Feb 2023 15:07:24 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Sunil Uttarwar , dpdk stable Subject: patch 'crypto/ccp: remove some dead code for UIO' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:05:20 +0000 Message-Id: <20230223150631.723699-29-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/28/23. 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/bc5f3c068ce22644eee9579e7f723699276e12a0 Thanks. Kevin --- >From bc5f3c068ce22644eee9579e7f723699276e12a0 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 4 Oct 2022 11:51:30 +0200 Subject: [PATCH] crypto/ccp: remove some dead code for UIO [ upstream commit b211d968f77097c868eb963a7de11b1a244b1a65 ] uio_fd is unused. Fixes: 09a0fd736a08 ("crypto/ccp: enable IOMMU") Signed-off-by: David Marchand Acked-by: Sunil Uttarwar --- drivers/crypto/ccp/ccp_dev.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/crypto/ccp/ccp_dev.c b/drivers/crypto/ccp/ccp_dev.c index 8ca092fa6e..3f00b2522b 100644 --- a/drivers/crypto/ccp/ccp_dev.c +++ b/drivers/crypto/ccp/ccp_dev.c @@ -654,5 +654,4 @@ ccp_probe_device(int ccp_type, struct rte_pci_device *pci_dev) { struct ccp_device *ccp_dev = NULL; - int uio_fd = -1; ccp_dev = rte_zmalloc("ccp_device", sizeof(*ccp_dev), @@ -672,6 +671,4 @@ ccp_probe_device(int ccp_type, struct rte_pci_device *pci_dev) fail: CCP_LOG_ERR("CCP Device probe failed"); - if (uio_fd >= 0) - close(uio_fd); if (ccp_dev) rte_free(ccp_dev); -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:24.539925660 +0000 +++ 0029-crypto-ccp-remove-some-dead-code-for-UIO.patch 2023-02-23 14:46:23.742235868 +0000 @@ -1 +1 @@ -From b211d968f77097c868eb963a7de11b1a244b1a65 Mon Sep 17 00:00:00 2001 +From bc5f3c068ce22644eee9579e7f723699276e12a0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b211d968f77097c868eb963a7de11b1a244b1a65 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 9c9cb81236..410e62121e 100644 +index 8ca092fa6e..3f00b2522b 100644 @@ -32,2 +33,2 @@ - rte_free(ccp_dev); - return -1; + if (ccp_dev) + rte_free(ccp_dev);