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 B0F91455AD for ; Mon, 15 Jul 2024 17:27:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ABCD94065F; Mon, 15 Jul 2024 17:27:27 +0200 (CEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 5DA87402B0 for ; Mon, 15 Jul 2024 17:27:26 +0200 (CEST) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-367b0cc6c65so2767235f8f.3 for ; Mon, 15 Jul 2024 08:27:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057246; x=1721662046; 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=aY6VFmoVX1d79x6bNOBVnNxzIUN4+zXdt7P+9dQHG4U=; b=XAJUnAvupCtfZj9CN3ry0/pTmSoqdi2d+G0QFls9eRPdwzBORNF3liiJXaI7e/11H7 jz/A6OAA8wekYPRjegufoYQpSa4v06jqXi3LyNGlO1ZWeyxlqW6+zCse2EupegT3LBH7 EtjBXwonaOoZZMu/iqopm3hjQWtwZRJj0EvH3L9LZrJUB9Ponvp5kC+KDnWM9OVMU6IO OYIkYfkp6KFGO/R9pm0d78SRkTPsSv+kOFOlQToZQwCzQiMNU7lMkq8fMzjT1Ub4MIe8 E2RYNci2otGzgy2uVho2l/YR0kurd0bqFnTNmPPzF5gU8kpE0y5ye4lC0UXzw5bcSZ2y tKvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057246; x=1721662046; 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=aY6VFmoVX1d79x6bNOBVnNxzIUN4+zXdt7P+9dQHG4U=; b=MvtjrGcXI7fkI4yI+QDT/rB2fD8lrt4/8uUOtUMGZxG6a0tBw6xhUVVP52PTnX4DoF B2O380I+Z84y01A8fSRAi43989OToZJr7f5DOsV7pOJZdIuSwOKFWypvzMa0jF/Bl9DN TqFq77HbaHybSGQQQYKlZtTZF627TUumVRRjvYvzMgI0I55PBvqquM2AAZn2NKOVLqK9 MXN/yxUNjqXCdFbN5I6FDqD9vjMkM2lpsP2sZ8ud2NxLQUDQgYAd6dT9JBAuHmtwaugZ nBLeoaKZl9GOBAsfI+ECn2bmApaNCE6UWKmbUSwga+gh4AzVsOqRD3gfFtoYi6bAaplZ ILxg== X-Forwarded-Encrypted: i=1; AJvYcCX2TDjVc8OBhmWqrVe4a/F6aoIK6zA8GgqyeguaP7/IAAvuYxEE0qfQEDMmOcZFh1V1etAm2SvANJSAWmf7iO0= X-Gm-Message-State: AOJu0YyprkEFExWvlPF6nvN0nMzIpXDMwidc0mONHKAtx2eMHKVKhGKa Z5OpROlp3eveujlv/6xgBPGI3avDcCuaFO5WuhLj62Oakon0jb4dmtw87jkB X-Google-Smtp-Source: AGHT+IG/rI5NWSJftSFsMmcamPhczXsN/kDXo2LEge60FoiA+tLf+qY5feNUFsOsUwkxWp/AkSOiNw== X-Received: by 2002:a05:6000:bcc:b0:362:2111:4816 with SMTP id ffacd0b85a97d-368240cb29fmr40286f8f.55.1721057245770; Mon, 15 Jul 2024 08:27:25 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3680dacca16sm6670882f8f.58.2024.07.15.08.27.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:27:25 -0700 (PDT) From: luca.boccassi@gmail.com To: Shijith Thotton Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Stephen Hemminger , dpdk stable Subject: patch 'mbuf: fix dynamic fields copy' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:25:44 +0100 Message-Id: <20240715152704.2229503-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com> References: <20240624235907.885628-81-luca.boccassi@gmail.com> <20240715152704.2229503-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/17/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/f172fd7567fa2b1f7c4825ddc6cbc33403f1b74c Thanks. Luca Boccassi --- >From f172fd7567fa2b1f7c4825ddc6cbc33403f1b74c Mon Sep 17 00:00:00 2001 From: Shijith Thotton Date: Thu, 27 Jun 2024 13:27:56 +0530 Subject: [PATCH] mbuf: fix dynamic fields copy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 95bea772528d316c969a170e6206f3b05ac39413 ] Fixed rte_mbuf_dynfield_copy() API to copy dynamic fields from one mbuf to another. When RTE_IOVA_AS_PA is not defined during the build, an additional dynamic field (dynfield2) becomes available. This field should be conditionally copied to ensure the complete duplication of dynamic fields between mbufs. This patch fixes the same. Bugzilla ID: 1472 Fixes: 03b57eb7ab9a ("mbuf: add second dynamic field member") Signed-off-by: Shijith Thotton Reviewed-by: Morten Brørup Acked-by: Stephen Hemminger --- lib/mbuf/rte_mbuf.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h index 3a82eb136d..a1b4c2b31d 100644 --- a/lib/mbuf/rte_mbuf.h +++ b/lib/mbuf/rte_mbuf.h @@ -1120,6 +1120,9 @@ rte_pktmbuf_attach_extbuf(struct rte_mbuf *m, void *buf_addr, static inline void rte_mbuf_dynfield_copy(struct rte_mbuf *mdst, const struct rte_mbuf *msrc) { +#if !RTE_IOVA_AS_PA + mdst->dynfield2 = msrc->dynfield2; +#endif memcpy(&mdst->dynfield1, msrc->dynfield1, sizeof(mdst->dynfield1)); } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:35.093517065 +0100 +++ 0006-mbuf-fix-dynamic-fields-copy.patch 2024-07-15 16:19:34.444203816 +0100 @@ -1 +1 @@ -From 95bea772528d316c969a170e6206f3b05ac39413 Mon Sep 17 00:00:00 2001 +From f172fd7567fa2b1f7c4825ddc6cbc33403f1b74c Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 95bea772528d316c969a170e6206f3b05ac39413 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 4c4722e002..babe16c72c 100644 +index 3a82eb136d..a1b4c2b31d 100644 @@ -30 +31 @@ -@@ -1119,6 +1119,9 @@ rte_pktmbuf_attach_extbuf(struct rte_mbuf *m, void *buf_addr, +@@ -1120,6 +1120,9 @@ rte_pktmbuf_attach_extbuf(struct rte_mbuf *m, void *buf_addr, @@ -34 +35 @@ -+#if !RTE_IOVA_IN_MBUF ++#if !RTE_IOVA_AS_PA