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 5B0DD431D5 for ; Sun, 22 Oct 2023 16:31:11 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 54E6A402C0; Sun, 22 Oct 2023 16:31:11 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2044.outbound.protection.outlook.com [40.107.100.44]) by mails.dpdk.org (Postfix) with ESMTP id DFF9340689 for ; Sun, 22 Oct 2023 16:31:09 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XazSlTtDeUiF/CuRRBwSVEBQl/0Dupzf607wUL4th3l9XAlU/uL2s3uj3ud3m2kClNgDZZnbKFy9xkVlZJwsBogTIlPcifEaCOlZ4k9emviKv2brQqcUg3H4DvumjcYzISwnS4ouoHLjaJKLA6YqB5sb+NJGu/i1A8Q7JAR07IlxRJaLfRWMaAyxz+/laDaMW38Fn6OEtTIeFYNBFf87WqstiTBzPtCJpb4bGfoOOKwCUC5N7AC72xshlMM6CJkwXwD8ENCZxK1Dv0gdJjpv1VwCuYEZ1heipIBfAvOMP/1K5kHGHAC3g0DxFr+pwSv+abytUqtey4aSsNMMM6j2iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9thShLSJqKm30WgtU89+0oMQc1LgNHED0QDcmag25Bc=; b=YXktD84qeE9cFD9mV0Xkj280zJZl4xe2Z9QKmqFW5N2lgVeDMMER+vuz4ms2h3xzrDavxqAh+bIt/AitrO8alJWLvuKtgyJQzofMBSMvdZwNAfN7Cl2pT6Dd3ktq7ZH7BdGXjhHraurQ5nwdV3pUSAvnoetIJgtUHSkDp6hP4COLDdbmPwlYX5x+XfG/Ge8j4va2tvL9n9M1hdVKIJUmhnWwqKfDp8tiUII8z7jhOWqLrnKNx2oERFsoDVnnPw+EUIGQ+iFrKSIcuhazZvpUS8z2f05sPhX8T0Kf/FL/XJdfBNiObu24sS3YNyGvflXHm83HizCLP4sWFZjSqmjALw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9thShLSJqKm30WgtU89+0oMQc1LgNHED0QDcmag25Bc=; b=KU2MlAcuuN9Rt2PuIm2PGhwoPgcjXZtoKPCyu2Utx8XEINAdHSYIEQReu3xfDGkrSFO64slvzJZJTGImGJtUxxwUYHXC/iw35iWKJ9YcRXfIGRoYWcynzoiSi+g4ZgsjGxBLk4hgH6Ub9KXO28jSn7XOwM7oTlXnkq19JQJGYuIlBckvJDnPwW7n5BUTH+zjZtFNYA8Ffj1L8MqKIBGGnSENGM+rXl1w0EFoFo5/CoeOBwbCNjVSTvG/0Wjdf+Jo2/c6qi2m4Xe+rhWPe+0kDi2ilunjK1NPHUzvcuAKB5loSu+nKiHwkzUtlZpY+RA4Il0mjiuvsuoHz9WXKN4Zvw== Received: from BYAPR08CA0065.namprd08.prod.outlook.com (2603:10b6:a03:117::42) by CY5PR12MB6035.namprd12.prod.outlook.com (2603:10b6:930:2d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.29; Sun, 22 Oct 2023 14:31:08 +0000 Received: from DS1PEPF00017095.namprd03.prod.outlook.com (2603:10b6:a03:117:cafe::c7) by BYAPR08CA0065.outlook.office365.com (2603:10b6:a03:117::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33 via Frontend Transport; Sun, 22 Oct 2023 14:31:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS1PEPF00017095.mail.protection.outlook.com (10.167.17.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:31:07 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:30:57 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:30:56 -0700 From: Xueming Li To: David Marchand CC: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix Tx debug' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:22:00 +0800 Message-ID: <20231022142250.10324-92-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017095:EE_|CY5PR12MB6035:EE_ X-MS-Office365-Filtering-Correlation-Id: ca90fea8-d506-4507-a1a2-08dbd30b87d4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0I+1cTxIIqrVrFlDsZSmWxRxLfRsUrEVxuyeK4hLT/QZzy6pU1QnQSUeKi7+4p3ucovcKYU08J0yg5Gv+ABEZgXkmbpDPL41IYnNnvcmodvVOJU3R4S2Hr2yjXrKkPgtUwLt6PMrW1n43FpaL8dDcwmpLSqQ92fUHFCWWnW3kIOYZ8ZHsOQi53yYSCBotZ2738SjGtPT2vqGqZN5z/KwH1fuwE+KHFIYaKmkWhUS5wWoCm7EsicKSqrGYuX6G8Z5xCN3THwlBiozBYGtOqqgOE5xDzbIVcgq+2rv2kkk2OB5KpTUZ8sCkZXUS4JDt9HiPavs7cc3bh0knDnSxDqdKfkpgKo8lrV4oCOyOzoa7LvdeyNn7zKZFRbMd5rljHpXPPre38amr5FiAO+TaPnXN0fJ3DNEjY4pIiWvy969CVUHZwiHaX7d83Kl3svZA1wMD4K/9DxISq3ZPJVXTvQ5lukCRS4cEJTDqACH02/89LRUeLIyRJZQEMYPAfulthEucaFoe09KA06AP1TVbri1WXtaxsMLG/4eJ1SoxUlgE1hXFxZqvRLtKEA4dt+mMFgeaDp1uc6gCFRrzJFKsV+q6Y/FBWD+nHz8VolVsMGiF5t4jrKSW+VmOUgZyvGdPjZHOMaYADQ7KdIqFsE10GiDbEiElR2ksVL+JbG1ZwBAuWpy1GnvjJAzBpLLPqsjUrwe+qAFkP5US8U+hvAysc+EyMAkI3h/sOKsgg5qTko/KV3k2ifGW4p3MzsciU7KPJyrYvyNYTCB+J1my7rYhMG/80peU76jd9YP5ADCO9OxeGg= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(136003)(396003)(376002)(39850400004)(230922051799003)(82310400011)(1800799009)(186009)(64100799003)(451199024)(36840700001)(46966006)(40470700004)(2616005)(7696005)(53546011)(40460700003)(356005)(7636003)(82740400003)(86362001)(36860700001)(36756003)(26005)(426003)(336012)(16526019)(1076003)(6286002)(2906002)(4001150100001)(6666004)(478600001)(966005)(47076005)(55016003)(40480700001)(83380400001)(41300700001)(8936002)(8676002)(4326008)(5660300002)(70586007)(6916009)(54906003)(70206006)(316002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:31:07.8454 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ca90fea8-d506-4507-a1a2-08dbd30b87d4 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF00017095.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6035 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/15/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=eec9ac43a7f44c049619078d4a1aed4915167553 Thanks. Xueming Li --- >From eec9ac43a7f44c049619078d4a1aed4915167553 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 13 Sep 2023 15:03:27 +0100 Subject: [PATCH] net/iavf: fix Tx debug Cc: Xueming Li [ upstream commit 145b3f04a2971423c483c7f4cc00a7491668a893 ] Commit 1e728b01120c ("net/iavf: rework Tx path") reintroduced a check on RTE_LIBRTE_IAVF_DEBUG_TX that has been dropped in favor of RTE_ETHDEV_DEBUG_TX. Fixes: 1e728b01120c ("net/iavf: rework Tx path") Signed-off-by: David Marchand Acked-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 97df9d1699..79da50f273 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2483,7 +2483,7 @@ iavf_fill_ctx_desc_segmentation_field(volatile uint64_t *field, total_length -= m->outer_l3_len + m->outer_l2_len; } -#ifdef RTE_LIBRTE_IAVF_DEBUG_TX +#ifdef RTE_ETHDEV_DEBUG_TX if (!m->l4_len || !m->tso_segsz) PMD_TX_LOG(DEBUG, "L4 length %d, LSO Segment size %d", m->l4_len, m->tso_segsz); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:37.693560000 +0800 +++ 0091-net-iavf-fix-Tx-debug.patch 2023-10-22 22:17:34.346723700 +0800 @@ -1 +1 @@ -From 145b3f04a2971423c483c7f4cc00a7491668a893 Mon Sep 17 00:00:00 2001 +From eec9ac43a7f44c049619078d4a1aed4915167553 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 145b3f04a2971423c483c7f4cc00a7491668a893 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index e2d61659cd..72e8ae8aa6 100644 +index 97df9d1699..79da50f273 100644 @@ -23 +25 @@ -@@ -2536,7 +2536,7 @@ iavf_fill_ctx_desc_segmentation_field(volatile uint64_t *field, +@@ -2483,7 +2483,7 @@ iavf_fill_ctx_desc_segmentation_field(volatile uint64_t *field,