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 EC63DA0527 for ; Mon, 9 Nov 2020 19:44:33 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E50BB6883; Mon, 9 Nov 2020 19:44:32 +0100 (CET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by dpdk.org (Postfix) with ESMTP id BA4F06883 for ; Mon, 9 Nov 2020 19:44:30 +0100 (CET) Received: by mail-wm1-f50.google.com with SMTP id c9so449531wml.5 for ; Mon, 09 Nov 2020 10:44:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ac55lowbDJ+45CoIWKLfbz+6lnxdkYvuFWaEJdKtYA8=; b=ER+djw1fIQHIAx5+wFyYXGzwIa8WDOwB/Eh68Tzp92SuPg0SF4gSQNpWCWPfS+n2S+ tAmk9VAw88ehtY/6rS1iKPNfAwC5IhGKOAm/VIavd+biSc9lXNzNT7t1s45E+akf2ofW L+PwsgdBH6qUoRWNwBS2b+MjvfaGwVJ7sr4C3ANIMyFTQ39S4r1OW8SC9Lv17wRr4G9l h8NCPrL+rEadmnBKb3mxV8uKibpuJzCiD6mL1DA6EDqTdBE1jzVrJhCcMv4SKa9D9Ze4 Vov6Rxfsoaa3Atug+5sMNl68tQ+HUbEH0mbw7aeE8DAqAJuRvUcQomGK5rFyyJCM1vTN qGWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ac55lowbDJ+45CoIWKLfbz+6lnxdkYvuFWaEJdKtYA8=; b=kVciloUchYimtMR+c/F8ypXwHL9sydEN4bNTygZFC2ytAMLsLca3wgh9m/Nc5OKGmc JjBCkdDFvlQr0s99eKFdTnOgMmg5jR9zjCm2lOVXCiUx3F1PU4dHa/botyOhpRe6db3v tZ92JP/Kyaow9xCYxTJ8pJ20AaMfYbG/eSxwBrKi4k02W07MORqupSIarAQQTV2QXcdZ IU20cqQyGaHgg7o+KCtpV01VeHtKzAT5NE6iFNl+wYgVukUqjcghv2Efw+P8YbkeYWfF 1C904M1d/ECweUVTGwxEvHo3wdzHUy6eQJ1a1ucvepryRE7Ebh7oDjGpOa66DiGnNKLZ ELuQ== X-Gm-Message-State: AOAM530ltE1xbelNmpUT1yq226uFAZyCiWn4lSbjjCOxTJ7N6E5wzLqX 0qSHwv+BxdvmcG8d5B5n/CW0/8Zza0/5PSR9 X-Google-Smtp-Source: ABdhPJzr94a410NNLDx8dQ3AApYrW5kXCSdQ6HLC1msG3yBBHfp9emwGMOCratgSsV0o1K+Ji944TQ== X-Received: by 2002:a1c:7dc8:: with SMTP id y191mr594310wmc.118.1604947470541; Mon, 09 Nov 2020 10:44:30 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c2sm272085wmf.47.2020.11.09.10.44.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:44:29 -0800 (PST) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: Andrew Rybchenko , dpdk stable Date: Mon, 9 Nov 2020 18:40:44 +0000 Message-Id: <20201109184111.3463090-56-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'ethdev: move non-offload capabilities' has been queued to stable release 19.11.6 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 stable release 19.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/11/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/f03080aa7d797cf630881ba56d4167744b06d5c1 Thanks. Luca Boccassi --- >From f03080aa7d797cf630881ba56d4167744b06d5c1 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 51f9f2569f..017459e595 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -1160,17 +1160,20 @@ struct rte_eth_conf { #define DEV_TX_OFFLOAD_IP_TNL_TSO 0x00080000 /** Device supports outer UDP checksum */ #define DEV_TX_OFFLOAD_OUTER_UDP_CKSUM 0x00100000 - -#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 * mentioned in rte_tx_offload_names in rte_ethdev.c file. */ +/**@{@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. * These are used if an application requests default parameters -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:13.345800073 +0000 +++ 0056-ethdev-move-non-offload-capabilities.patch 2020-11-09 18:40:11.191312216 +0000 @@ -1 +1 @@ -From e9ef7ec12be0764924b6eebfe2f00b15ed0345ff Mon Sep 17 00:00:00 2001 +From f03080aa7d797cf630881ba56d4167744b06d5c1 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 51f9f2569f..017459e595 100644 @@ -27,5 +28,4 @@ -@@ -1419,18 +1419,20 @@ struct rte_eth_conf { - * The mbuf field and flag are registered when the offload is configured. - */ - #define DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP 0x00200000 -- +@@ -1160,17 +1160,20 @@ struct rte_eth_conf { + #define DEV_TX_OFFLOAD_IP_TNL_TSO 0x00080000 + /** Device supports outer UDP checksum */ + #define DEV_TX_OFFLOAD_OUTER_UDP_CKSUM 0x00100000