From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CCCB5A04DD for ; Wed, 18 Nov 2020 17:39:12 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 58F2DC9A4; Wed, 18 Nov 2020 17:38:41 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 7FE74C8C6 for ; Wed, 18 Nov 2020 17:38:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717519; 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=k37Vl5pWtZK0EXZ9nx4LvllGLPhKIFObKQtGTHoMUbo=; b=Iaz7JmG6NDewZEWh98vCiqcuwNlqezc75mJ30UTf3Yn8RP2rlr7Xrq4V6nwncIo7Mw1nu4 OHPgp0ZkZ8NT1+uycsRi6P3/MmZqX9tm5P5BpmbzgHrqB15jAg6vdyts/9VvAgkut3K0dp kRaMlQIS6gOQ241VELHuHm37+9+LT2M= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-283-RQPIUoHLNj2J05YGkZZGaA-1; Wed, 18 Nov 2020 11:38:35 -0500 X-MC-Unique: RQPIUoHLNj2J05YGkZZGaA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 648521922967; Wed, 18 Nov 2020 16:38:33 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BF195C3E1; Wed, 18 Nov 2020 16:38:32 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: Andrew Rybchenko , dpdk stable Date: Wed, 18 Nov 2020 16:35:58 +0000 Message-Id: <20201118163558.1101823-72-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'ethdev: move non-offload capabilities' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.11 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/24/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/d767546029d3df964a2168a982220fc64c0b4802 Thanks. Kevin. --- >From d767546029d3df964a2168a982220fc64c0b4802 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Tue, 27 Oct 2020 14:20:22 +0100 Subject: [PATCH] ethdev: move non-offload capabilities [ upstream commit e9ef7ec12be0764924b6eebfe2f00b15ed0345ff ] The definitions of RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP and RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP were inserted before the last comment of Tx offloads. It is moved in a better place, with comments moved to be before the definition. A group comment is added to better describe device capabilities. Fixes: cac923cfea47 ("ethdev: support runtime queue setup") Signed-off-by: Thomas Monjalon Acked-by: Andrew Rybchenko --- lib/librte_ethdev/rte_ethdev.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index e1f299c993..8fec807475 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -1019,10 +1019,4 @@ struct rte_eth_conf { */ #define DEV_TX_OFFLOAD_MATCH_METADATA 0x00200000 - -#define RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP 0x00000001 -/**< Device supports Rx queue setup after device started*/ -#define RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP 0x00000002 -/**< Device supports Tx queue setup after device started*/ - /* * If new Tx offload capabilities are defined, they also must be @@ -1030,4 +1024,13 @@ struct rte_eth_conf { */ +/**@{@name Device capabilities + * Non-offload capabilities reported in rte_eth_dev_info.dev_capa. + */ +/** Device supports Rx queue setup after device started. */ +#define RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP 0x00000001 +/** Device supports Tx queue setup after device started. */ +#define RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP 0x00000002 +/**@}*/ + /* * Fallback default preferred Rx/Tx port parameters. -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-18 16:33:39.287209304 +0000 +++ 0072-ethdev-move-non-offload-capabilities.patch 2020-11-18 16:33:38.008215113 +0000 @@ -1 +1 @@ -From e9ef7ec12be0764924b6eebfe2f00b15ed0345ff Mon Sep 17 00:00:00 2001 +From d767546029d3df964a2168a982220fc64c0b4802 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e9ef7ec12be0764924b6eebfe2f00b15ed0345ff ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -20,2 +21,2 @@ - lib/librte_ethdev/rte_ethdev.h | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) + lib/librte_ethdev/rte_ethdev.h | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) @@ -24 +25 @@ -index f689550745..619cbe521e 100644 +index e1f299c993..8fec807475 100644 @@ -27 +28 @@ -@@ -1420,11 +1420,4 @@ struct rte_eth_conf { +@@ -1019,10 +1019,4 @@ struct rte_eth_conf { @@ -29,2 +30 @@ - #define DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP 0x00200000 -- + #define DEV_TX_OFFLOAD_MATCH_METADATA 0x00200000 @@ -39 +39 @@ -@@ -1432,4 +1425,13 @@ struct rte_eth_conf { +@@ -1030,4 +1024,13 @@ struct rte_eth_conf {