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 D36004326F for ; Thu, 2 Nov 2023 14:14:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9883042E0E; Thu, 2 Nov 2023 14:14:37 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 2F9EA42DDB for ; Thu, 2 Nov 2023 14:14:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C68OOBe/DCM9AHqP9UwYusKW/wJx482XHIY77zZap3o=; b=VaJrJcD/oX8mm8gFniAqGnYZ1y0YKo6bc6jIJb36HNoEevd01n5l4/1vN8pf1eYJpI+E6T kn4oMmaIINRIbpv5iCu0fjcT0x1aOnMPqnCiWZNITre7mVk8bZF4rubeG1Na4B+PTpPht9 r3dUyimsGuKrBDR+cKaPQs4o5SQOk1o= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-655-mUlacMpNNDGIiRiiXCgonw-1; Thu, 02 Nov 2023 09:14:32 -0400 X-MC-Unique: mUlacMpNNDGIiRiiXCgonw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 807DA1C04322; Thu, 2 Nov 2023 13:14:32 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 965BB474FA0; Thu, 2 Nov 2023 13:14:31 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix Tx debug' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:09 +0000 Message-ID: <20231102131254.315947-63-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.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 11/08/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/11e3255ee88cb4613c3610ca2bb31b1784a0b8df Thanks. Kevin --- >From 11e3255ee88cb4613c3610ca2bb31b1784a0b8df 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 [ 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 1881f97803..88a00ca2c3 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2327,5 +2327,5 @@ iavf_fill_ctx_desc_segmentation_field(volatile uint64_t *field, } -#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", -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:42.354021330 +0000 +++ 0063-net-iavf-fix-Tx-debug.patch 2023-11-02 13:09:40.875163535 +0000 @@ -1 +1 @@ -From 145b3f04a2971423c483c7f4cc00a7491668a893 Mon Sep 17 00:00:00 2001 +From 11e3255ee88cb4613c3610ca2bb31b1784a0b8df Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 145b3f04a2971423c483c7f4cc00a7491668a893 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index e2d61659cd..72e8ae8aa6 100644 +index 1881f97803..88a00ca2c3 100644 @@ -23 +24 @@ -@@ -2537,5 +2537,5 @@ iavf_fill_ctx_desc_segmentation_field(volatile uint64_t *field, +@@ -2327,5 +2327,5 @@ iavf_fill_ctx_desc_segmentation_field(volatile uint64_t *field,