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 0D7BB45BB6 for ; Wed, 23 Oct 2024 23:20:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05C0C40261; Wed, 23 Oct 2024 23:20:46 +0200 (CEST) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 17A4F40261 for ; Wed, 23 Oct 2024 23:20:45 +0200 (CEST) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-431548bd1b4so2035385e9.3 for ; Wed, 23 Oct 2024 14:20:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718445; x=1730323245; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=In0osC0RZD8W+o3JU4ocCbnu9qsHBakg5OdONGgSbew=; b=QdjnsCp1Aj2R1lpXPrK8OohEWaHdbHNE3m0SZGs8RAQfySUW+sZ6U2Ck2o7SZqGDW9 g2Hcj23kCs1JfmLvj+yRcP+1IYna+4UCbAvk3ej1dNL4/FgoTrIOCAALhVKqsFF0bAsh 4VcC5pN+uFV6VyL3Nz40gbPv6CXzFRQaDJRHvEKAPCS+RZCXXue6R6VO63jIitJSSiWP mAe8yUBao/iDPYje/VILKo4pQo8g1i0A/8Hy1K3XkWVKkoD/c3hzBrASiGOh97tpq4bm NQ+U+8D7hPN1eKCmm+gsNgc21q/VwDNxMcAlWtB5TJ2Glw24nBEfHN9KRErPc0wE/ig3 31jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718445; x=1730323245; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=In0osC0RZD8W+o3JU4ocCbnu9qsHBakg5OdONGgSbew=; b=mhI0vJ3gAooJpY4eYibZ+HxmuOn/A7J+HXoy6SFrYUp3HWIO01dbgJ9puAeN/4FdrP 7PzwCqFOnzX7YApfl/rg3CIsAHfiwuBBHh5dr+OmZ6jozp2cJZpViMReIqIoM+ZoDsNF OlFFK2rnghJapYB5r/qbq4IJdH/oT3brFM+TUmlYwBCK830K7tjCeXfaCYr34+a+3f7L fEHmfljEUdfClwN456FcZoV8xC9EUd3PdXKKYB/aQv0mKN3mxbjcSItmV2AIuNZQYVhS UqkkyOaDsE8esoPYtN4+LgOuSEWg5uuXV0NzGoUhErOMC18IIWQIdTN6ZBoIgchZ2Bvz rSFA== X-Forwarded-Encrypted: i=1; AJvYcCUZgL5IIJGSTe4kcc0JClCvmg7VjrhVF4P9CTvUzrXGhDJ176VJ9H0u544qO+SzkngBeTPZzU4=@dpdk.org X-Gm-Message-State: AOJu0YxUMYdjgSuikYg2rsA8jVBK2pjJIn6H1a477/yP14wWcewkKgkn scfr0Rn+rnHMxyGrJ2Z2oSM4pk4jmu17Rz7gMehx0G0IBw+1l8CG1YBGcAQ4 X-Google-Smtp-Source: AGHT+IFytTkDw15cSacZeo55zFQArR65LHA1oHvG/cMrLRY4/czqHIQ0JkA3LmKgMunUgjzRT9YECQ== X-Received: by 2002:a05:600c:4f8a:b0:431:5c7b:e937 with SMTP id 5b1f17b1804b1-431842098d7mr36635625e9.17.1729718444516; Wed, 23 Oct 2024 14:20:44 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43186bdb76esm26970995e9.14.2024.10.23.14.20.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:20:43 -0700 (PDT) From: luca.boccassi@gmail.com To: Vanshika Shukla Cc: Hemant Agrawal , dpdk stable Subject: patch 'net/dpaa: fix reallocate mbuf handling' has been queued to stable release 22.11.7 Date: Wed, 23 Oct 2024 22:16:40 +0100 Message-ID: <20241023211704.1216956-60-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/25/24. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/30d634d95ffab0f0d9dc8b4fc477814ff179fea7 Thanks. Luca Boccassi --- >From 30d634d95ffab0f0d9dc8b4fc477814ff179fea7 Mon Sep 17 00:00:00 2001 From: Vanshika Shukla Date: Tue, 1 Oct 2024 16:33:25 +0530 Subject: [PATCH] net/dpaa: fix reallocate mbuf handling [ upstream commit 7594cafa92189fd5bad87a5caa6b7a92bbab0979 ] This patch fixes the bug in the reallocate_mbuf code handling. The source location is corrected when copying the data in the new mbuf. Fixes: f8c7a17a48c9 ("net/dpaa: support Tx scatter gather for non-DPAA buffer") Signed-off-by: Vanshika Shukla Acked-by: Hemant Agrawal --- drivers/net/dpaa/dpaa_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index ce4f3d6c85..018d55bbdc 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -1034,7 +1034,7 @@ reallocate_mbuf(struct qman_fq *txq, struct rte_mbuf *mbuf) /* Copy the data */ data = rte_pktmbuf_append(new_mbufs[0], bytes_to_copy); - rte_memcpy((uint8_t *)data, rte_pktmbuf_mtod_offset(mbuf, + rte_memcpy((uint8_t *)data, rte_pktmbuf_mtod_offset(temp_mbuf, void *, offset1), bytes_to_copy); /* Set new offsets and the temp buffers */ -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:42.787962075 +0100 +++ 0060-net-dpaa-fix-reallocate-mbuf-handling.patch 2024-10-23 22:16:40.519943519 +0100 @@ -1 +1 @@ -From 7594cafa92189fd5bad87a5caa6b7a92bbab0979 Mon Sep 17 00:00:00 2001 +From 30d634d95ffab0f0d9dc8b4fc477814ff179fea7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7594cafa92189fd5bad87a5caa6b7a92bbab0979 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 1d7efdef88..247e7b92ba 100644 +index ce4f3d6c85..018d55bbdc 100644 @@ -23 +24 @@ -@@ -1223,7 +1223,7 @@ reallocate_mbuf(struct qman_fq *txq, struct rte_mbuf *mbuf) +@@ -1034,7 +1034,7 @@ reallocate_mbuf(struct qman_fq *txq, struct rte_mbuf *mbuf)