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 EC3CA46211 for ; Thu, 13 Feb 2025 11:00:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E795740287; Thu, 13 Feb 2025 11:00:51 +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 3ED2A40287 for ; Thu, 13 Feb 2025 11:00:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440849; 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=rFVX5xK0LlmaUN6XVdvW/eHW/SFqlHyYFLNPA+Z8yq0=; b=JLbhSN+s8eeOkJ/JRUleojlA2YNe417TmqT/uChRFzyCJqoniParv4DZ1f10AoBSPFFk6X c4u6F1BuHD1Qj9XDMEIfYioyH06VcL+J6Q/3xlccDBHCsla+kH7oZCVzave3O+soLsjhkY oAEPo6MwunZ8BDbjVZAzgM2sAyx6CC4= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-496-761Ck8SOOpOwvB9UqjhT5w-1; Thu, 13 Feb 2025 05:00:48 -0500 X-MC-Unique: 761Ck8SOOpOwvB9UqjhT5w-1 X-Mimecast-MFC-AGG-ID: 761Ck8SOOpOwvB9UqjhT5w Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3A9CA19560B9; Thu, 13 Feb 2025 10:00:47 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 61E881800365; Thu, 13 Feb 2025 10:00:45 +0000 (UTC) From: Kevin Traynor To: Dan Nowlin Cc: Yuan Wang , Bruce Richardson , dpdk stable Subject: patch 'net/ixgbe/base: add missing buffer copy for ACI' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:57:54 +0000 Message-ID: <20250213095933.362078-27-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: CNpT5OE-yxgO0Bg5p6QAWBAw_XliOSq1mWIgVeAN0mQ_1739440847 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 24.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 02/17/25. 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/00ef3d8f8fd1d6ce46177087d7ffb81f4e3447c6 Thanks. Kevin --- >From 00ef3d8f8fd1d6ce46177087d7ffb81f4e3447c6 Mon Sep 17 00:00:00 2001 From: Dan Nowlin Date: Tue, 14 Jan 2025 18:10:19 +0800 Subject: [PATCH] net/ixgbe/base: add missing buffer copy for ACI [ upstream commit 37239792b0d67fedc011db54ffa32b022a391787 ] Add missing buffer copy in ixgbe_aci_send_cmd(). In ixgbe_aci_send_cmd() there is code to retry aq commands for certain commands. To achieve this the function makes a copy of the original ixgbe_aci_desc structure and allocates memory to store an original copy of the command buffer. This allows the original structure and buffer to be restored before attempting the command again. However, the function didn't perform the actual copy of the original command buffer into the copy buffer. Fixes: 25b48e569f2f ("net/ixgbe/base: add E610 Admin Command Interface") Signed-off-by: Dan Nowlin Signed-off-by: Yuan Wang Acked-by: Bruce Richardson --- drivers/net/ixgbe/base/ixgbe_e610.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ixgbe/base/ixgbe_e610.c b/drivers/net/ixgbe/base/ixgbe_e610.c index 31c2d986aa..1967519be0 100644 --- a/drivers/net/ixgbe/base/ixgbe_e610.c +++ b/drivers/net/ixgbe/base/ixgbe_e610.c @@ -283,4 +283,5 @@ s32 ixgbe_aci_send_cmd(struct ixgbe_hw *hw, struct ixgbe_aci_desc *desc, if (!buf_cpy) return IXGBE_ERR_OUT_OF_MEM; + memcpy(buf_cpy, buf, buf_size); } memcpy(&desc_cpy, desc, sizeof(desc_cpy)); -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:37.523609485 +0000 +++ 0027-net-ixgbe-base-add-missing-buffer-copy-for-ACI.patch 2025-02-12 17:29:34.282945524 +0000 @@ -1 +1 @@ -From 37239792b0d67fedc011db54ffa32b022a391787 Mon Sep 17 00:00:00 2001 +From 00ef3d8f8fd1d6ce46177087d7ffb81f4e3447c6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 37239792b0d67fedc011db54ffa32b022a391787 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index dc4eafaa5a..5474c3012a 100644 +index 31c2d986aa..1967519be0 100644