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 F0F5B456E6 for ; Tue, 30 Jul 2024 01:33:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E6F4B40B9A; Tue, 30 Jul 2024 01:33:36 +0200 (CEST) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id C77DE4069D for ; Tue, 30 Jul 2024 01:33:34 +0200 (CEST) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4266f3e0df8so20716145e9.2 for ; Mon, 29 Jul 2024 16:33:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722296014; x=1722900814; 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=fXcJ9D9Z+mqSfmkKSgYH8YzAgq4hJyMHB+A8eiMLWC8=; b=L/WqMmrDghCki5OGJ99GtwYh3Noc1ih5ZGXqmkipWvv6Sz8Udc+TJQ4EfmWBlo2hWd 2/Vx8D5u9uaOJy4HeAlGhDQ5HQwr7Ekfr9ufGHCLZyXFS3UobX6UxVNYd2P9+gp38hXR D7c5PewI20wrpAsE10JqOhZmMxmJ/9eewBhUgMLriXvPsof/smVzFjT6AK2K7RSuf3Au CaN6ar7a5pNz5AQrJ5IkpntpR6uu4xzJEEHCB6WdnjFygU4YSLsE7nwE2gRfmxojgpPC UtD0sYYK0oHZ6JP3TWmJMPoEeigM1TqrkKnyEJQ5G6mkm0L9T5y0vUxkSDsekqYYpTZO KB1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722296014; x=1722900814; 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=fXcJ9D9Z+mqSfmkKSgYH8YzAgq4hJyMHB+A8eiMLWC8=; b=jMnTPhLkVgq9x/qkX7FYj5ADfaKAdafZNo1jLcwp8vF/kGFN6uNO/JlNVi7SzZVX78 FI9iqX0oNk16LbVklz8TtblhWPIlevsfaXB7iFebhfRQX3txAGrlkU0U6oTO2PW6QIJW nbUk0qnu7aRfdygftZ6XJD3paz7EEhBOXIgDhmG76+lOD6rt0qQwwQ2erS8eHpnicWHH 3zhZY1oR9BW01Jc6r/r6vnLU1ERaYniKXMVeF5roRCH3IfBxyUV6t1l0kDUNxlPWQoE1 X58JkdTm7d99pfQu1DKUtkeKFYsu+HentusI1X6cNtdcGqlDI1fkftF2SnwoxfEHXq+F fbBQ== X-Forwarded-Encrypted: i=1; AJvYcCX3EYpYHDrGNnhiEtRXoHpjIewUbZjMAB4fPGfoDcqnxOgxztOQhfaxDS43W9Da3vh9LxOKYCoX6wHkYlFwbiU= X-Gm-Message-State: AOJu0YxScf1o3m6m/CyIvYfMp4d/KC5TCfpBC25Cbt+qrTYk4fxPYtkX 0xC94AQtgh0stC/p7z1SOdXJXzAWEH/QvqwJCjWaGR3gzWaGPEw/QvaGaawG X-Google-Smtp-Source: AGHT+IEMvfFPiTq8z/Kpq9wo49LlxUQu3dfVCzhPupz3JPNpgei+wTyE0di6Aq/yDDIxe2SGsp9Gnw== X-Received: by 2002:a05:600c:3554:b0:426:63b8:2cce with SMTP id 5b1f17b1804b1-42811d82d5dmr58775835e9.7.1722296014125; Mon, 29 Jul 2024 16:33:34 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4280d37bad3sm136487075e9.13.2024.07.29.16.33.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 16:33:33 -0700 (PDT) From: luca.boccassi@gmail.com To: Yingming Mao Cc: Shuo Li , dpdk stable Subject: patch 'doc: fix mbuf flags' has been queued to stable release 22.11.6 Date: Tue, 30 Jul 2024 00:33:28 +0100 Message-Id: <20240729233329.2683538-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240729233329.2683538-1-luca.boccassi@gmail.com> References: <20240724113318.616754-40-luca.boccassi@gmail.com> <20240729233329.2683538-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.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 08/01/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/b9c8076d92f67cf300f707d3e7fa3f30b207b221 Thanks. Luca Boccassi --- >From b9c8076d92f67cf300f707d3e7fa3f30b207b221 Mon Sep 17 00:00:00 2001 From: Yingming Mao Date: Thu, 18 Apr 2024 14:20:25 +0800 Subject: [PATCH] doc: fix mbuf flags [ upstream commit 1d9077d101b5c9ac2f841a82187ef5ced0fc7f43 ] Fixes: 2542ad53d867 ("doc: add description of the offload API") Fixes: ae2c2cb60635 ("net/cnxk: avoid command copy from Tx queue") Signed-off-by: Yingming Mao Reviewed-by: Shuo Li --- .mailmap | 3 ++- doc/guides/prog_guide/mbuf_lib.rst | 8 ++++---- drivers/net/cnxk/cn10k_tx.h | 2 +- drivers/net/cnxk/cn9k_tx.h | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.mailmap b/.mailmap index 0398b858fb..b0d505e36d 100644 --- a/.mailmap +++ b/.mailmap @@ -830,7 +830,6 @@ Mandeep Rohilla Manish Chopra Manish Tomar Mao Jiang -Mao YingMing Marcel Apfelbaum Marcel Cornu Marcelo Ricardo Leitner @@ -1271,6 +1270,7 @@ Shuanglin Wang Shuki Katzenelson Shun Hao Shu Shen +Shuo Li Shweta Choudaha Shyam Kumar Shrivastav Shy Shyman @@ -1567,6 +1567,7 @@ Yi Lu Yilun Xu Yinan Wang Ying A Wang +Yingming Mao Yingya Han Yinjun Zhang Yipeng Wang diff --git a/doc/guides/prog_guide/mbuf_lib.rst b/doc/guides/prog_guide/mbuf_lib.rst index 049357c755..749f9c97a8 100644 --- a/doc/guides/prog_guide/mbuf_lib.rst +++ b/doc/guides/prog_guide/mbuf_lib.rst @@ -134,7 +134,7 @@ a vxlan-encapsulated tcp packet: mb->l2_len = len(out_eth) mb->l3_len = len(out_ip) - mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CSUM + mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM set out_ip checksum to 0 in the packet This is supported on hardware advertising RTE_ETH_TX_OFFLOAD_IPV4_CKSUM. @@ -143,7 +143,7 @@ a vxlan-encapsulated tcp packet: mb->l2_len = len(out_eth) mb->l3_len = len(out_ip) - mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CSUM | RTE_MBUF_F_TX_UDP_CKSUM + mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_UDP_CKSUM set out_ip checksum to 0 in the packet set out_udp checksum to pseudo header using rte_ipv4_phdr_cksum() @@ -154,7 +154,7 @@ a vxlan-encapsulated tcp packet: mb->l2_len = len(out_eth + out_ip + out_udp + vxlan + in_eth) mb->l3_len = len(in_ip) - mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CSUM + mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM set in_ip checksum to 0 in the packet This is similar to case 1), but l2_len is different. It is supported @@ -165,7 +165,7 @@ a vxlan-encapsulated tcp packet: mb->l2_len = len(out_eth + out_ip + out_udp + vxlan + in_eth) mb->l3_len = len(in_ip) - mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CSUM | RTE_MBUF_F_TX_TCP_CKSUM + mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_TCP_CKSUM set in_ip checksum to 0 in the packet set in_tcp checksum to pseudo header using rte_ipv4_phdr_cksum() diff --git a/drivers/net/cnxk/cn10k_tx.h b/drivers/net/cnxk/cn10k_tx.h index e96030621b..cd9b1f225e 100644 --- a/drivers/net/cnxk/cn10k_tx.h +++ b/drivers/net/cnxk/cn10k_tx.h @@ -898,7 +898,7 @@ cn10k_nix_xmit_prepare_tstamp(struct cn10k_eth_txq *txq, uintptr_t lmt_addr, struct nix_send_mem_s *send_mem; send_mem = (struct nix_send_mem_s *)(lmt + off); - /* Packets for which PKT_TX_IEEE1588_TMST is not set, tx tstamp + /* Packets for which RTE_MBUF_F_TX_IEEE1588_TMST is not set, Tx tstamp * should not be recorded, hence changing the alg type to * NIX_SENDMEMALG_SUB and also changing send mem addr field to * next 8 bytes as it corrupts the actual Tx tstamp registered diff --git a/drivers/net/cnxk/cn9k_tx.h b/drivers/net/cnxk/cn9k_tx.h index 257f1ce1aa..33db781abe 100644 --- a/drivers/net/cnxk/cn9k_tx.h +++ b/drivers/net/cnxk/cn9k_tx.h @@ -355,7 +355,7 @@ cn9k_nix_xmit_prepare_tstamp(struct cn9k_eth_txq *txq, uint64_t *cmd, send_mem = (struct nix_send_mem_s *)(cmd + off); - /* Packets for which PKT_TX_IEEE1588_TMST is not set, tx tstamp + /* Packets for which RTE_MBUF_F_TX_IEEE1588_TMST is not set, Tx tstamp * should not be recorded, hence changing the alg type to * NIX_SENDMEMALG_SUB and also changing send mem addr field to * next 8 bytes as it corrupts the actual Tx tstamp registered -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-30 00:33:03.408914046 +0100 +++ 0002-doc-fix-mbuf-flags.patch 2024-07-30 00:33:03.317030472 +0100 @@ -1 +1 @@ -From 1d9077d101b5c9ac2f841a82187ef5ced0fc7f43 Mon Sep 17 00:00:00 2001 +From b9c8076d92f67cf300f707d3e7fa3f30b207b221 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1d9077d101b5c9ac2f841a82187ef5ced0fc7f43 ] + @@ -8 +9,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 8aef1c59a4..4a508bafad 100644 +index 0398b858fb..b0d505e36d 100644 @@ -23,2 +24,2 @@ -@@ -893,7 +893,6 @@ Manish Chopra - Manish Kurup +@@ -830,7 +830,6 @@ Mandeep Rohilla + Manish Chopra @@ -31 +32,2 @@ -@@ -1371,6 +1370,7 @@ Shuki Katzenelson +@@ -1271,6 +1270,7 @@ Shuanglin Wang + Shuki Katzenelson @@ -34 +35,0 @@ - Shujing Dong @@ -39 +40 @@ -@@ -1684,6 +1684,7 @@ Yi Lu +@@ -1567,6 +1567,7 @@ Yi Lu @@ -88 +89 @@ -index 84b08403c0..7d9b259a5f 100644 +index e96030621b..cd9b1f225e 100644 @@ -91 +92 @@ -@@ -1242,7 +1242,7 @@ cn10k_nix_xmit_prepare_tstamp(struct cn10k_eth_txq *txq, uintptr_t lmt_addr, +@@ -898,7 +898,7 @@ cn10k_nix_xmit_prepare_tstamp(struct cn10k_eth_txq *txq, uintptr_t lmt_addr, @@ -101 +102 @@ -index b56881c561..9370985864 100644 +index 257f1ce1aa..33db781abe 100644 @@ -104 +105 @@ -@@ -560,7 +560,7 @@ cn9k_nix_xmit_prepare_tstamp(struct cn9k_eth_txq *txq, uint64_t *cmd, +@@ -355,7 +355,7 @@ cn9k_nix_xmit_prepare_tstamp(struct cn9k_eth_txq *txq, uint64_t *cmd,