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 DAB10468E4 for ; Thu, 12 Jun 2025 23:09:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CD6DB42DD9; Thu, 12 Jun 2025 23:09:42 +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 4E4D142DD9 for ; Thu, 12 Jun 2025 23:09:42 +0200 (CEST) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4508287895dso16583375e9.1 for ; Thu, 12 Jun 2025 14:09:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762582; x=1750367382; 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=V9vy3sT1m+xj20G1NcfDeW1EsY4I5gylJogsXrhPz8A=; b=l2LiM3sDCXpYC8dGM6uVS7U8THStKMBCRQHtikGU6du8QL9wOsq3BUiXjNaT+UAtCm GLDTMDP/n6ZqQqtueo+GV0phPu+zrYhmDMMq2YKkpYRAW2sS3f5dzgn4HGJTkUcGjt7j g9LDskWzkUw8w8FRlrQ3srVHjYuqBf3UJzR+T6u08amohULdzGCUPUTet2CbDcHRmpst HCKgkY7LHkJMRWdvEShMZxZdp33H5QhSqyg4kZzVnk5ihrkcWFe7SDc+dJhBfm5iqpi2 01QtZkLSKaGNaryXC9azwJdlW+y1MgsaBKU5G8J/pz5ILuqTggTHpzY+1U2FrHJTfK3q J/jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762582; x=1750367382; 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=V9vy3sT1m+xj20G1NcfDeW1EsY4I5gylJogsXrhPz8A=; b=SLvB1xQUZkPlySbqKNvKAgaTzvVa21Vcv3YbzzKOPMLvpYU+/RuV4QRfNliBJmciso y5nC9rKE7DiyMnxv7Mt5akI//ciVwggLZUGea/WVli8Fe0Vdc8yCCUuaPAEIzu5OmxJG mPjGK63XSBxFRDb31wLrVk7B7TJ/Si6/85k7712/2YL+FmiaqMP+7Y3auRjvcxkcxBWf MWnNWga+Iv2YpRYpjY4FRfDiDyi6nxjH85O5NSZYLfBobcD1NjnZcmNOXYYLKIs+bSHD a0g8/XvYFMVZJRskuygLzb1V2Frk/TYLJlSMC5BrBonkTkKrAdQudfjtszGF2UdJxo/I hDjQ== X-Gm-Message-State: AOJu0YxobZaC0QAeCAdJUje18o4qN++XLAo4UYpL+ZRm6LUGlSWeCVs7 aB/lAAnjjW9Z9+zjZwXPSFqsU1n8UgDvQoaab5BEkVF9qORjC1qdx6sY X-Gm-Gg: ASbGncuh39iXXMvUnWGPqEwBl1cH47SLjunXQu/Z92QUMgBB09C+4eUZW+O7QBb9dta VijWCUIpt+jbVaKvehPfJiS097620fvwXGROTaqdhry2CDLfR8pdoD/blHCkIYaFeXr4vwkzDqo UwFK/Xny+trumxM1LPCVx3WDro9JOOaR2tiqj/lAxNjqpPLMbCDMnypVfv8mfwhLN07N6nys9Mg l0e74G/tiblmNl78vlEnlmvQyhjO5OS6aXDW8URO9cB1sfBKyqGEXTV2qAP5qyHp0DsbneUjeLq P3GREQ/SjLZqwxTf7eI4HjDmcWJuj6E0OG4Cw1YdChFD8/PGfspESK2pgXVxWcCwhaub X-Google-Smtp-Source: AGHT+IFazVTwuzZvU5NPA4bLGMi0MdHROhyaw14NxPZwizK1qjbZwdVYTTTJAsNmErIJizkCgOC97Q== X-Received: by 2002:a05:6000:4012:b0:3a4:e1f5:41f4 with SMTP id ffacd0b85a97d-3a56a2f8acemr29651f8f.17.1749762581681; Thu, 12 Jun 2025 14:09:41 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4532e224617sm32151525e9.2.2025.06.12.14.09.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:09:41 -0700 (PDT) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: dpdk stable Subject: patch 'net/null: fix packet copy' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:06:53 +0100 Message-ID: <20250612210733.2506558-36-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-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.9 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/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/f9c5f0b7a3c92b78647337cccacdda29c6655e5e Thanks. Luca Boccassi --- >From f9c5f0b7a3c92b78647337cccacdda29c6655e5e Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 1 Apr 2025 16:47:26 -0700 Subject: [PATCH] net/null: fix packet copy [ upstream commit 0ffd3bc09be5f77b26c16e501e4b4465b1bcb8da ] If doing copy on transmit, can potentially copy paste the data in the mbuf. Change to only copy data from that segment. Fixes: c743e50c475f ("null: new poll mode driver") Signed-off-by: Stephen Hemminger --- drivers/net/null/rte_eth_null.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index 1fbe572bd1..6798714156 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -35,7 +35,7 @@ struct null_queue { struct pmd_internals *internals; struct rte_mempool *mb_pool; - struct rte_mbuf *dummy_packet; + void *dummy_packet; rte_atomic64_t rx_pkts; rte_atomic64_t tx_pkts; @@ -160,17 +160,17 @@ eth_null_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) static uint16_t eth_null_copy_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) { - int i; struct null_queue *h = q; - unsigned int packet_size; + unsigned int i; if ((q == NULL) || (bufs == NULL)) return 0; - packet_size = h->internals->packet_size; for (i = 0; i < nb_bufs; i++) { - rte_memcpy(h->dummy_packet, rte_pktmbuf_mtod(bufs[i], void *), - packet_size); + struct rte_mbuf *m = bufs[i]; + size_t len = RTE_MIN(h->internals->packet_size, m->data_len); + + rte_memcpy(h->dummy_packet, rte_pktmbuf_mtod(m, void *), len); rte_pktmbuf_free(bufs[i]); } -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:25.215660175 +0100 +++ 0036-net-null-fix-packet-copy.patch 2025-06-12 22:06:23.858044384 +0100 @@ -1 +1 @@ -From 0ffd3bc09be5f77b26c16e501e4b4465b1bcb8da Mon Sep 17 00:00:00 2001 +From f9c5f0b7a3c92b78647337cccacdda29c6655e5e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0ffd3bc09be5f77b26c16e501e4b4465b1bcb8da ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 6764cf2ec1..966748689f 100644 +index 1fbe572bd1..6798714156 100644 @@ -28,3 +29,3 @@ - RTE_ATOMIC(uint64_t) rx_pkts; - RTE_ATOMIC(uint64_t) tx_pkts; -@@ -163,17 +163,17 @@ eth_null_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) + rte_atomic64_t rx_pkts; + rte_atomic64_t tx_pkts; +@@ -160,17 +160,17 @@ eth_null_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)