From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 6809BA00C2;
Wed, 22 Apr 2020 10:09:34 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 3F6111C1C9;
Wed, 22 Apr 2020 10:09:34 +0200 (CEST)
Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com
[67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 4C6771C0AD
for <dev@dpdk.org>; Wed, 22 Apr 2020 10:09:33 +0200 (CEST)
Received: from pps.filterd (m0045851.ppops.net [127.0.0.1])
by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id
03M81M3I021014; Wed, 22 Apr 2020 01:09:32 -0700
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;
h=date : from : to :
cc : subject : message-id : references : content-type :
content-transfer-encoding : in-reply-to : mime-version; s=pfpt0818;
bh=oEDI925Tus84z6Ul2tM5F/gxpWKeCvtVJfOGCKA5a/A=;
b=jDTuYMQaiZcrz0VtOZ2S5NrNs20ZWyV6UQy8afXSq7bonhYlmtU/kEu8UdARWARaIIhj
Q3vd64k47iPHKoxmjr/XDZOctdOfZXpcPmslN1qaJ2n8tWlu1xsSEynG98ZwhtxmwN0p
iR/fCRxMnTzUDNVrP7+5qmIfwhGE9/BdgUoVZNZbUq+Bx9dlACIR5l+kXrHHSA9o76Nn
PmD3pA/HUzRB7/Kso/k977rrJ83sAaatg9k0GFMKNn/M1RM1dTE7KCGjXfq0JFyaoIfs
N69LQuazmcO8fzDPBrDIOiPMOktmGhDDKEAwwi6j+k/+DwQGqeeYNfu/mENFfuHzRxp9 YA==
Received: from sc-exch01.marvell.com ([199.233.58.181])
by mx0b-0016f401.pphosted.com with ESMTP id 30jd01153k-1
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);
Wed, 22 Apr 2020 01:09:32 -0700
Received: from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH01.marvell.com
(10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 22 Apr
2020 01:09:30 -0700
Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.168)
by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id
15.0.1497.2 via Frontend Transport; Wed, 22 Apr 2020 01:09:29 -0700
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=jjaw6Z8DVLJpNlzuWtJcgyBoRfckc7J42hUJIr/SG3AraW5n/A230HZAeB5jBr5Z7AK5ahJK2gBRa5xqHDksHIgT5W5CDFck2MbBDhU4gFUUQoNnJYkBMJAsb4pui2mxB4p7tyw4NKy6hwsboApsCdoiOBo3PG+7VtOBM3vAJ9JL6m0TqXowhEMJ7r/elXj2mG5VI6yMl09he4VHEeW1VLefsVBbh4hteP8B/IKYvp4EOrjZk7pa17NdwRcjTQH4t6MYHQuKp/aN+GIDlPyWK+wsHuVR2EaMwdWc4G+B+NMkZEe1SK8AnX9qLDRQIiBf+5FV0Tm4cH7mHl34HPRWnQ==
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-SenderADCheck;
bh=oEDI925Tus84z6Ul2tM5F/gxpWKeCvtVJfOGCKA5a/A=;
b=O5wLti5M/ZW87LaxhboOLa8fgl8g1mgpoTidgT0BsQP9MPUFPcON5V0dStFFwKH7ElwQxOU76L8P1m3tEbL+1aVyPdS3eStLr0uRAoyZLT+fT67wSyl7ADxPqq8ASdp00z77N7EjO78QZB+Qt5syIO+uGIS1oX1VCHVTvzwg36TzJ9pzW90GHdrWLdje8/3Zws4bRlfAWYVi2KD54a5uylsA4B54RE7V3xF3rKcCR7+0TzeeM6AEdKzvTFDAb2/1zVaEHY4o2mznppXrXrSWrKMleGb5UNvR2gbsJ2FrDND2whSr7/OHz6ZD5IU0Xwc59ogDA5um99ZIt969nc4Diw==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com;
dkim=pass header.d=marvell.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=oEDI925Tus84z6Ul2tM5F/gxpWKeCvtVJfOGCKA5a/A=;
b=NveoN3RNHneNL935tFy+1ltJbGWX1+j7u9iIB65DNYr5Iqo1VBKgZeabh9ZL/7EUPVVR7SW47e8WSQdvpWyOSWONxwGOyux4Yg+58oaRKHiBcuc6I0Zbhpg1D32l34EE6VsHJN3y2MKitmG3lG2ab4sEu1onueKsdH5umlE2MW0=
Received: from BYAPR18MB2917.namprd18.prod.outlook.com (2603:10b6:a03:105::19)
by BYAPR18MB2871.namprd18.prod.outlook.com (2603:10b6:a03:10d::27)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Wed, 22 Apr
2020 08:09:26 +0000
Received: from BYAPR18MB2917.namprd18.prod.outlook.com
([fe80::a1ec:e959:77df:cd58]) by BYAPR18MB2917.namprd18.prod.outlook.com
([fe80::a1ec:e959:77df:cd58%5]) with mapi id 15.20.2921.030; Wed, 22 Apr 2020
08:09:26 +0000
Date: Wed, 22 Apr 2020 13:39:07 +0530
From: Nithin Dabilpuram <ndabilpuram@marvell.com>
To: Nithin Dabilpuram <nithind1988@gmail.com>
CC: Jasvinder Singh <jasvinder.singh@intel.com>, Cristian Dumitrescu
<cristian.dumitrescu@intel.com>, Thomas Monjalon <thomas@monjalon.net>,
Ferruh Yigit <ferruh.yigit@intel.com>, Andrew Rybchenko
<arybchenko@solarflare.com>, <dev@dpdk.org>,
<jerinj@marvell.com>, <kkanas@marvell.com>
Message-ID: <20200422080842.GA760@outlook.office365.com>
References: <20200330160019.29674-1-ndabilpuram@marvell.com>
<20200422075948.10051-1-nithind1988@gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20200422075948.10051-1-nithind1988@gmail.com>
User-Agent: Mutt/1.12.2 (34cd43c) (2019-09-21)
X-ClientProxiedBy: PN1PR0101CA0005.INDPRD01.PROD.OUTLOOK.COM
(2603:1096:c00:e::15) To BYAPR18MB2917.namprd18.prod.outlook.com
(2603:10b6:a03:105::19)
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from outlook.office365.com (115.113.156.2) by
PN1PR0101CA0005.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00:e::15) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend
Transport; Wed, 22 Apr 2020 08:09:22 +0000
X-Originating-IP: [115.113.156.2]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: df17fb36-2971-4e56-f7af-08d7e6947937
X-MS-TrafficTypeDiagnostic: BYAPR18MB2871:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BYAPR18MB2871CB9CD2493BB32C21AA6DAFD20@BYAPR18MB2871.namprd18.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:9508;
X-Forefront-PRVS: 03818C953D
X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:BYAPR18MB2917.namprd18.prod.outlook.com; PTR:; CAT:NONE;
SFTY:;
SFS:(10009020)(4636009)(366004)(396003)(39850400004)(376002)(136003)(346002)(16526019)(6916009)(6666004)(1076003)(7696005)(4326008)(33656002)(26005)(5660300002)(52116002)(8676002)(6506007)(66556008)(956004)(66476007)(107886003)(55236004)(66946007)(30864003)(9686003)(478600001)(86362001)(8936002)(54906003)(81156014)(316002)(186003)(2906002)(55016002)(290074003);
DIR:OUT; SFP:1101;
Received-SPF: None (protection.outlook.com: marvell.com does not designate
permitted sender hosts)
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: Hg7M/fgd8ZEpA3g6TPzNMNdPLgg7aFwNcT0Hnxe3GWq/UEAaewbaT8oSuXbcI96CoijihlwRM3p+YLV83iMtq/8QfiC5inc3y21KQMTOsdtF/vrjRzOqhBoK/VcHnrYE3CKzOyxt/zIyDTRJjJvHFA93DLv2OrF8M6l+jgJz7ZjUCr9niM7fc6bO8YKpFwHw27T3xYDXkNF0HBDN9VzLbhf7yfR87kjNJ0GgbKa+Ym8vAIbtIeCaBx/rpisyjRzf87cBmu6Q0pjWM1Xl4VgP5gj4jT1PUxn7ubGr/uPT14K8x+Fjpq/2ZH0N3XcV9hvXlKap5c7k19CIRZlNYqU248CkKZs5qDv6b+eOhuoickZ/spcaXo3WHApsZEYrMnc0LP9/RuaMA3JrgaVkihfwVUExuKYwENJ9jq2Xo8MFS887mOsG0aJZzcWyszNbGV53Mbjwz7Z9kJ0UX4R7baRMzf0LmoKN/ZDiBeOi/iokMzJHRbG0by58Ds9Xtxr/i2TZ
X-MS-Exchange-AntiSpam-MessageData: Y2X3PhTeR+Tc/YIAw2NNctr+zuUx3bP8q+EEw39jDpHC4+2u7jUboXWCiuH5e8g4GWm77quieApTOW7T0L05I+adPhsmuzWiZ+GnJfsZs1kQiSmtEPFDr/MhPnWstxg6pzfa0odle97+JaSQlri2dg==
X-MS-Exchange-CrossTenant-Network-Message-Id: df17fb36-2971-4e56-f7af-08d7e6947937
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2020 08:09:26.5740 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 70e1fb47-1155-421d-87fc-2e58f638b6e0
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: fwIVNh3BEQmCuZPVeLoidZiYUC6QmOBEXqHTcpBEsh+n9lcOSaz+YCAMaAOjzeNtDeMho+H/5T120CX62G88jg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR18MB2871
X-OriginatorOrg: marvell.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676
definitions=2020-04-22_02:2020-04-21,
2020-04-22 signatures=0
Subject: Re: [dpdk-dev] [PATCH v3] ethdev: add tm support for shaper config
in pkt mode
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Please ignore this patch. Had issue with subject line.
Consider patch "[v3,1/4] ethdev: add tm support for shaper config in pkt mode "
instead.
On Wed, Apr 22, 2020 at 01:29:44PM +0530, Nithin Dabilpuram wrote:
> From: Nithin Dabilpuram <ndabilpuram@marvell.com>
>
> Some NIC hardware support shaper to work in packet mode i.e
> shaping or ratelimiting traffic is in packets per second (PPS) as
> opposed to default bytes per second (BPS). Hence this patch
> adds support to configure shared or private shaper in packet mode,
> provide rate in PPS and add related tm capabilities in port/level/node
> capability structures.
>
> This patch also updates tm port/level/node capability structures with
> exiting features of scheduler wfq packet mode, scheduler wfq byte mode
> and private/shared shaper byte mode.
>
> SoftNIC PMD is also updated with new capabilities.
>
> Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
> ---
>
> v2..v3:
> - Fix typo's
> - Add shaper_shared_(packet, byte)_mode_supported in level and node cap
> - Fix comment in pkt_length_adjust.
> - Move rte_eth_softnic_tm.c capability update to patch 1/4 to
> avoid compilations issues in node and level cap array in softnicpmd.
> ../drivers/net/softnic/rte_eth_softnic_tm.c:782:3: warning: braces around scalar initializer
> {.nonleaf = {
> ../drivers/net/softnic/rte_eth_softnic_tm.c:782:3: note: (near initialization for ‘tm_node_cap[0].shaper_shared_byte_mode_supported’)
> ../drivers/net/softnic/rte_eth_softnic_tm.c:782:4: error: field name not in record or union initializer
> {.nonleaf = {
>
> v1..v2:
> - Add seperate capability for shaper and scheduler pktmode and bytemode.
> - Add packet_mode field in struct rte_tm_shaper_params to indicate
> packet mode shaper profile.
>
>
> drivers/net/softnic/rte_eth_softnic_tm.c | 65 ++++++++++
> lib/librte_ethdev/rte_tm.h | 196 ++++++++++++++++++++++++++++++-
> 2 files changed, 259 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/softnic/rte_eth_softnic_tm.c b/drivers/net/softnic/rte_eth_softnic_tm.c
> index 80a470c..344819f 100644
> --- a/drivers/net/softnic/rte_eth_softnic_tm.c
> +++ b/drivers/net/softnic/rte_eth_softnic_tm.c
> @@ -447,6 +447,8 @@ static const struct rte_tm_capabilities tm_cap = {
> .shaper_private_dual_rate_n_max = 0,
> .shaper_private_rate_min = 1,
> .shaper_private_rate_max = UINT32_MAX,
> + .shaper_private_packet_mode_supported = 0,
> + .shaper_private_byte_mode_supported = 1,
>
> .shaper_shared_n_max = UINT32_MAX,
> .shaper_shared_n_nodes_per_shaper_max = UINT32_MAX,
> @@ -454,6 +456,8 @@ static const struct rte_tm_capabilities tm_cap = {
> .shaper_shared_dual_rate_n_max = 0,
> .shaper_shared_rate_min = 1,
> .shaper_shared_rate_max = UINT32_MAX,
> + .shaper_shared_packet_mode_supported = 0,
> + .shaper_shared_byte_mode_supported = 1,
>
> .shaper_pkt_length_adjust_min = RTE_TM_ETH_FRAMING_OVERHEAD_FCS,
> .shaper_pkt_length_adjust_max = RTE_TM_ETH_FRAMING_OVERHEAD_FCS,
> @@ -463,6 +467,8 @@ static const struct rte_tm_capabilities tm_cap = {
> .sched_wfq_n_children_per_group_max = UINT32_MAX,
> .sched_wfq_n_groups_max = 1,
> .sched_wfq_weight_max = UINT32_MAX,
> + .sched_wfq_packet_mode_supported = 0,
> + .sched_wfq_byte_mode_supported = 1,
>
> .cman_wred_packet_mode_supported = WRED_SUPPORTED,
> .cman_wred_byte_mode_supported = 0,
> @@ -548,13 +554,19 @@ static const struct rte_tm_level_capabilities tm_level_cap[] = {
> .shaper_private_dual_rate_supported = 0,
> .shaper_private_rate_min = 1,
> .shaper_private_rate_max = UINT32_MAX,
> + .shaper_private_packet_mode_supported = 0,
> + .shaper_private_byte_mode_supported = 1,
> .shaper_shared_n_max = 0,
> + .shaper_shared_packet_mode_supported = 0,
> + .shaper_shared_byte_mode_supported = 0,
>
> .sched_n_children_max = UINT32_MAX,
> .sched_sp_n_priorities_max = 1,
> .sched_wfq_n_children_per_group_max = UINT32_MAX,
> .sched_wfq_n_groups_max = 1,
> .sched_wfq_weight_max = 1,
> + .sched_wfq_packet_mode_supported = 0,
> + .sched_wfq_byte_mode_supported = 0,
>
> .stats_mask = STATS_MASK_DEFAULT,
> } },
> @@ -572,7 +584,11 @@ static const struct rte_tm_level_capabilities tm_level_cap[] = {
> .shaper_private_dual_rate_supported = 0,
> .shaper_private_rate_min = 1,
> .shaper_private_rate_max = UINT32_MAX,
> + .shaper_private_packet_mode_supported = 0,
> + .shaper_private_byte_mode_supported = 1,
> .shaper_shared_n_max = 0,
> + .shaper_shared_packet_mode_supported = 0,
> + .shaper_shared_byte_mode_supported = 0,
>
> .sched_n_children_max = UINT32_MAX,
> .sched_sp_n_priorities_max = 1,
> @@ -580,9 +596,14 @@ static const struct rte_tm_level_capabilities tm_level_cap[] = {
> .sched_wfq_n_groups_max = 1,
> #ifdef RTE_SCHED_SUBPORT_TC_OV
> .sched_wfq_weight_max = UINT32_MAX,
> + .sched_wfq_packet_mode_supported = 0,
> + .sched_wfq_byte_mode_supported = 1,
> #else
> .sched_wfq_weight_max = 1,
> + .sched_wfq_packet_mode_supported = 0,
> + .sched_wfq_byte_mode_supported = 0,
> #endif
> +
> .stats_mask = STATS_MASK_DEFAULT,
> } },
> },
> @@ -599,7 +620,11 @@ static const struct rte_tm_level_capabilities tm_level_cap[] = {
> .shaper_private_dual_rate_supported = 0,
> .shaper_private_rate_min = 1,
> .shaper_private_rate_max = UINT32_MAX,
> + .shaper_private_packet_mode_supported = 0,
> + .shaper_private_byte_mode_supported = 1,
> .shaper_shared_n_max = 0,
> + .shaper_shared_packet_mode_supported = 0,
> + .shaper_shared_byte_mode_supported = 0,
>
> .sched_n_children_max =
> RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE,
> @@ -608,6 +633,8 @@ static const struct rte_tm_level_capabilities tm_level_cap[] = {
> .sched_wfq_n_children_per_group_max = 1,
> .sched_wfq_n_groups_max = 0,
> .sched_wfq_weight_max = 1,
> + .sched_wfq_packet_mode_supported = 0,
> + .sched_wfq_byte_mode_supported = 0,
>
> .stats_mask = STATS_MASK_DEFAULT,
> } },
> @@ -625,7 +652,11 @@ static const struct rte_tm_level_capabilities tm_level_cap[] = {
> .shaper_private_dual_rate_supported = 0,
> .shaper_private_rate_min = 1,
> .shaper_private_rate_max = UINT32_MAX,
> + .shaper_private_packet_mode_supported = 0,
> + .shaper_private_byte_mode_supported = 1,
> .shaper_shared_n_max = 1,
> + .shaper_shared_packet_mode_supported = 0,
> + .shaper_shared_byte_mode_supported = 1,
>
> .sched_n_children_max =
> RTE_SCHED_BE_QUEUES_PER_PIPE,
> @@ -634,6 +665,8 @@ static const struct rte_tm_level_capabilities tm_level_cap[] = {
> RTE_SCHED_BE_QUEUES_PER_PIPE,
> .sched_wfq_n_groups_max = 1,
> .sched_wfq_weight_max = UINT32_MAX,
> + .sched_wfq_packet_mode_supported = 0,
> + .sched_wfq_byte_mode_supported = 1,
>
> .stats_mask = STATS_MASK_DEFAULT,
> } },
> @@ -651,7 +684,11 @@ static const struct rte_tm_level_capabilities tm_level_cap[] = {
> .shaper_private_dual_rate_supported = 0,
> .shaper_private_rate_min = 0,
> .shaper_private_rate_max = 0,
> + .shaper_private_packet_mode_supported = 0,
> + .shaper_private_byte_mode_supported = 0,
> .shaper_shared_n_max = 0,
> + .shaper_shared_packet_mode_supported = 0,
> + .shaper_shared_byte_mode_supported = 0,
>
> .cman_head_drop_supported = 0,
> .cman_wred_packet_mode_supported = WRED_SUPPORTED,
> @@ -736,7 +773,11 @@ static const struct rte_tm_node_capabilities tm_node_cap[] = {
> .shaper_private_dual_rate_supported = 0,
> .shaper_private_rate_min = 1,
> .shaper_private_rate_max = UINT32_MAX,
> + .shaper_private_packet_mode_supported = 0,
> + .shaper_private_byte_mode_supported = 1,
> .shaper_shared_n_max = 0,
> + .shaper_shared_packet_mode_supported = 0,
> + .shaper_shared_byte_mode_supported = 0,
>
> {.nonleaf = {
> .sched_n_children_max = UINT32_MAX,
> @@ -744,6 +785,8 @@ static const struct rte_tm_node_capabilities tm_node_cap[] = {
> .sched_wfq_n_children_per_group_max = UINT32_MAX,
> .sched_wfq_n_groups_max = 1,
> .sched_wfq_weight_max = 1,
> + .sched_wfq_packet_mode_supported = 0,
> + .sched_wfq_byte_mode_supported = 0,
> } },
>
> .stats_mask = STATS_MASK_DEFAULT,
> @@ -754,7 +797,11 @@ static const struct rte_tm_node_capabilities tm_node_cap[] = {
> .shaper_private_dual_rate_supported = 0,
> .shaper_private_rate_min = 1,
> .shaper_private_rate_max = UINT32_MAX,
> + .shaper_private_packet_mode_supported = 0,
> + .shaper_private_byte_mode_supported = 1,
> .shaper_shared_n_max = 0,
> + .shaper_shared_packet_mode_supported = 0,
> + .shaper_shared_byte_mode_supported = 0,
>
> {.nonleaf = {
> .sched_n_children_max = UINT32_MAX,
> @@ -762,6 +809,8 @@ static const struct rte_tm_node_capabilities tm_node_cap[] = {
> .sched_wfq_n_children_per_group_max = UINT32_MAX,
> .sched_wfq_n_groups_max = 1,
> .sched_wfq_weight_max = UINT32_MAX,
> + .sched_wfq_packet_mode_supported = 0,
> + .sched_wfq_byte_mode_supported = 0,
> } },
>
> .stats_mask = STATS_MASK_DEFAULT,
> @@ -772,7 +821,11 @@ static const struct rte_tm_node_capabilities tm_node_cap[] = {
> .shaper_private_dual_rate_supported = 0,
> .shaper_private_rate_min = 1,
> .shaper_private_rate_max = UINT32_MAX,
> + .shaper_private_packet_mode_supported = 0,
> + .shaper_private_byte_mode_supported = 1,
> .shaper_shared_n_max = 0,
> + .shaper_shared_packet_mode_supported = 0,
> + .shaper_shared_byte_mode_supported = 0,
>
> {.nonleaf = {
> .sched_n_children_max =
> @@ -782,6 +835,8 @@ static const struct rte_tm_node_capabilities tm_node_cap[] = {
> .sched_wfq_n_children_per_group_max = 1,
> .sched_wfq_n_groups_max = 0,
> .sched_wfq_weight_max = 1,
> + .sched_wfq_packet_mode_supported = 0,
> + .sched_wfq_byte_mode_supported = 0,
> } },
>
> .stats_mask = STATS_MASK_DEFAULT,
> @@ -792,7 +847,11 @@ static const struct rte_tm_node_capabilities tm_node_cap[] = {
> .shaper_private_dual_rate_supported = 0,
> .shaper_private_rate_min = 1,
> .shaper_private_rate_max = UINT32_MAX,
> + .shaper_private_packet_mode_supported = 0,
> + .shaper_private_byte_mode_supported = 1,
> .shaper_shared_n_max = 1,
> + .shaper_shared_packet_mode_supported = 0,
> + .shaper_shared_byte_mode_supported = 1,
>
> {.nonleaf = {
> .sched_n_children_max =
> @@ -802,6 +861,8 @@ static const struct rte_tm_node_capabilities tm_node_cap[] = {
> RTE_SCHED_BE_QUEUES_PER_PIPE,
> .sched_wfq_n_groups_max = 1,
> .sched_wfq_weight_max = UINT32_MAX,
> + .sched_wfq_packet_mode_supported = 0,
> + .sched_wfq_byte_mode_supported = 1,
> } },
>
> .stats_mask = STATS_MASK_DEFAULT,
> @@ -812,7 +873,11 @@ static const struct rte_tm_node_capabilities tm_node_cap[] = {
> .shaper_private_dual_rate_supported = 0,
> .shaper_private_rate_min = 0,
> .shaper_private_rate_max = 0,
> + .shaper_private_packet_mode_supported = 0,
> + .shaper_private_byte_mode_supported = 0,
> .shaper_shared_n_max = 0,
> + .shaper_shared_packet_mode_supported = 0,
> + .shaper_shared_byte_mode_supported = 0,
>
>
> {.leaf = {
> diff --git a/lib/librte_ethdev/rte_tm.h b/lib/librte_ethdev/rte_tm.h
> index f9c0cf3..b3865af 100644
> --- a/lib/librte_ethdev/rte_tm.h
> +++ b/lib/librte_ethdev/rte_tm.h
> @@ -250,6 +250,23 @@ struct rte_tm_capabilities {
> */
> uint64_t shaper_private_rate_max;
>
> + /** Shaper private packet mode supported. When non-zero, this parameter
> + * indicates that there is at least one node that can be configured
> + * with packet mode in it's private shaper. When shaper is configured
> + * in packet mode, committed/peak rate provided is interpreted
> + * in packets per second.
> + */
> + int shaper_private_packet_mode_supported;
> +
> + /** Shaper private byte mode supported. When non-zero, this parameter
> + * indicates that there is at least one node that can be configured
> + * with byte mode in it's private shaper. When shaper is configured
> + * in byte mode, committed/peak rate provided is interpreted in
> + * bytes per second.
> + */
> + int shaper_private_byte_mode_supported;
> +
> +
> /** Maximum number of shared shapers. The value of zero indicates that
> * shared shapers are not supported.
> */
> @@ -284,6 +301,21 @@ struct rte_tm_capabilities {
> */
> uint64_t shaper_shared_rate_max;
>
> + /** Shaper shared packet mode supported. When non-zero, this parameter
> + * indicates a shared shaper can be configured with packet mode.
> + * When shared shaper is configured in packet mode, committed/peak rate
> + * provided is interpreted in packets per second.
> + */
> + int shaper_shared_packet_mode_supported;
> +
> + /** Shaper shared byte mode supported. When non-zero, this parameter
> + * indicates that a shared shaper can be configured with byte mode.
> + * When shared shaper is configured in byte mode, committed/peak rate
> + * provided is interpreted in bytes per second.
> + */
> + int shaper_shared_byte_mode_supported;
> +
> +
> /** Minimum value allowed for packet length adjustment for any private
> * or shared shaper.
> */
> @@ -339,6 +371,22 @@ struct rte_tm_capabilities {
> */
> uint32_t sched_wfq_weight_max;
>
> + /** WFQ packet mode supported. When non-zero, this parameter indicates
> + * that there is at least one non-leaf node that supports packet mode
> + * for WFQ among it's children. WFQ weights will be applied against
> + * packet count for scheduling children when a non-leaf node
> + * is configured appropriately.
> + */
> + int sched_wfq_packet_mode_supported;
> +
> + /** WFQ byte mode supported. When non-zero, this parameter indicates
> + * that there is at least one non-leaf node that supports byte mode
> + * for WFQ among it's children. WFQ weights will be applied against
> + * bytes for scheduling children when a non-leaf node is configured
> + * appropriately.
> + */
> + int sched_wfq_byte_mode_supported;
> +
> /** WRED packet mode support. When non-zero, this parameter indicates
> * that there is at least one leaf node that supports the WRED packet
> * mode, which might not be true for all the leaf nodes. In packet
> @@ -485,6 +533,24 @@ struct rte_tm_level_capabilities {
> */
> uint64_t shaper_private_rate_max;
>
> + /** Shaper private packet mode supported. When non-zero,
> + * this parameter indicates there is at least one
> + * non-leaf node at this level that can be configured
> + * with packet mode in it's private shaper. When private
> + * shaper is configured in packet mode, committed/peak
> + * rate provided is interpreted in packets per second.
> + */
> + int shaper_private_packet_mode_supported;
> +
> + /** Shaper private byte mode supported. When non-zero,
> + * this parameter indicates there is at least one
> + * non-leaf node at this level that can be configured
> + * with byte mode in it's private shaper. When private
> + * shaper is configured in byte mode, committed/peak
> + * rate provided is interpreted in bytes per second.
> + */
> + int shaper_private_byte_mode_supported;
> +
> /** Maximum number of shared shapers that any non-leaf
> * node on this level can be part of. The value of zero
> * indicates that shared shapers are not supported by
> @@ -495,6 +561,20 @@ struct rte_tm_level_capabilities {
> */
> uint32_t shaper_shared_n_max;
>
> + /** Shaper shared packet mode supported. When non-zero,
> + * this parameter indicates that there is at least one
> + * non-leaf node on this level that can be part of
> + * shared shapers which work in packet mode.
> + */
> + int shaper_shared_packet_mode_supported;
> +
> + /** Shaper shared byte mode supported. When non-zero,
> + * this parameter indicates that there is at least one
> + * non-leaf node on this level that can be part of
> + * shared shapers which work in byte mode.
> + */
> + int shaper_shared_byte_mode_supported;
> +
> /** Maximum number of children nodes. This parameter
> * indicates that there is at least one non-leaf node on
> * this level that can be configured with this many
> @@ -554,6 +634,25 @@ struct rte_tm_level_capabilities {
> */
> uint32_t sched_wfq_weight_max;
>
> + /** WFQ packet mode supported. When non-zero, this
> + * parameter indicates that there is at least one
> + * non-leaf node at this level that supports packet
> + * mode for WFQ among it's children. WFQ weights will
> + * be applied against packet count for scheduling
> + * children when a non-leaf node is configured
> + * appropriately.
> + */
> + int sched_wfq_packet_mode_supported;
> +
> + /** WFQ byte mode supported. When non-zero, this
> + * parameter indicates that there is at least one
> + * non-leaf node at this level that supports byte
> + * mode for WFQ among it's children. WFQ weights will
> + * be applied against bytes for scheduling children
> + * when a non-leaf node is configured appropriately.
> + */
> + int sched_wfq_byte_mode_supported;
> +
> /** Mask of statistics counter types supported by the
> * non-leaf nodes on this level. Every supported
> * statistics counter type is supported by at least one
> @@ -596,6 +695,24 @@ struct rte_tm_level_capabilities {
> */
> uint64_t shaper_private_rate_max;
>
> + /** Shaper private packet mode supported. When non-zero,
> + * this parameter indicates there is at least one leaf
> + * node at this level that can be configured with
> + * packet mode in it's private shaper. When private
> + * shaper is configured in packet mode, committed/peak
> + * rate provided is interpreted in packets per second.
> + */
> + int shaper_private_packet_mode_supported;
> +
> + /** Shaper private byte mode supported. When non-zero,
> + * this parameter indicates there is at least one leaf
> + * node at this level that can be configured with
> + * byte mode in it's private shaper. When private shaper
> + * is configured in byte mode, committed/peak rate
> + * provided is interpreted in bytes per second.
> + */
> + int shaper_private_byte_mode_supported;
> +
> /** Maximum number of shared shapers that any leaf node
> * on this level can be part of. The value of zero
> * indicates that shared shapers are not supported by
> @@ -606,6 +723,20 @@ struct rte_tm_level_capabilities {
> */
> uint32_t shaper_shared_n_max;
>
> + /** Shaper shared packet mode supported. When non-zero,
> + * this parameter indicates that there is at least one
> + * leaf node on this level that can be part of
> + * shared shapers which work in packet mode.
> + */
> + int shaper_shared_packet_mode_supported;
> +
> + /** Shaper shared byte mode supported. When non-zero,
> + * this parameter indicates that there is at least one
> + * leaf node on this level that can be part of
> + * shared shapers which work in byte mode.
> + */
> + int shaper_shared_byte_mode_supported;
> +
> /** WRED packet mode support. When non-zero, this
> * parameter indicates that there is at least one leaf
> * node on this level that supports the WRED packet
> @@ -686,12 +817,38 @@ struct rte_tm_node_capabilities {
> */
> uint64_t shaper_private_rate_max;
>
> + /** Shaper private packet mode supported. When non-zero, this parameter
> + * indicates private shaper of current node can be configured with
> + * packet mode. When configured in packet mode, committed/peak rate
> + * provided is interpreted in packets per second.
> + */
> + int shaper_private_packet_mode_supported;
> +
> + /** Shaper private byte mode supported. When non-zero, this parameter
> + * indicates private shaper of current node can be configured with
> + * byte mode. When configured in byte mode, committed/peak rate
> + * provided is interpreted in bytes per second.
> + */
> + int shaper_private_byte_mode_supported;
> +
> /** Maximum number of shared shapers the current node can be part of.
> * The value of zero indicates that shared shapers are not supported by
> * the current node.
> */
> uint32_t shaper_shared_n_max;
>
> + /** Shaper shared packet mode supported. When non-zero,
> + * this parameter indicates that current node can be part of
> + * shared shapers which work in packet mode.
> + */
> + int shaper_shared_packet_mode_supported;
> +
> + /** Shaper shared byte mode supported. When non-zero,
> + * this parameter indicates that current node can be part of
> + * shared shapers which work in byte mode.
> + */
> + int shaper_shared_byte_mode_supported;
> +
> RTE_STD_C11
> union {
> /** Items valid only for non-leaf nodes. */
> @@ -735,6 +892,23 @@ struct rte_tm_node_capabilities {
> * WFQ weight, so WFQ is reduced to FQ.
> */
> uint32_t sched_wfq_weight_max;
> +
> + /** WFQ packet mode supported. When non-zero, this
> + * parameter indicates that current node supports packet
> + * mode for WFQ among it's children. WFQ weights will be
> + * applied against packet count for scheduling children
> + * when configured appropriately.
> + */
> + int sched_wfq_packet_mode_supported;
> +
> + /** WFQ byte mode supported. When non-zero, this
> + * parameter indicates that current node supports byte
> + * mode for WFQ among it's children. WFQ weights will be
> + * applied against bytes for scheduling children when
> + * configured appropriately.
> + */
> + int sched_wfq_byte_mode_supported;
> +
> } nonleaf;
>
> /** Items valid only for leaf nodes. */
> @@ -836,10 +1010,10 @@ struct rte_tm_wred_params {
> * Token bucket
> */
> struct rte_tm_token_bucket {
> - /** Token bucket rate (bytes per second) */
> + /** Token bucket rate (bytes per second or packets per second) */
> uint64_t rate;
>
> - /** Token bucket size (bytes), a.k.a. max burst size */
> + /** Token bucket size (bytes or packets), a.k.a. max burst size */
> uint64_t size;
> };
>
> @@ -860,6 +1034,11 @@ struct rte_tm_token_bucket {
> * Dual rate shapers use both the committed and the peak token buckets. The
> * rate of the peak bucket has to be bigger than zero, as well as greater than
> * or equal to the rate of the committed bucket.
> + *
> + * @see struct rte_tm_capabilities::shaper_private_packet_mode_supported
> + * @see struct rte_tm_capabilities::shaper_private_byte_mode_supported
> + * @see struct rte_tm_capabilities::shaper_shared_packet_mode_supported
> + * @see struct rte_tm_capabilities::shaper_shared_byte_mode_supported
> */
> struct rte_tm_shaper_params {
> /** Committed token bucket */
> @@ -872,8 +1051,19 @@ struct rte_tm_shaper_params {
> * purpose of shaping. Can be used to correct the packet length with
> * the framing overhead bytes that are also consumed on the wire (e.g.
> * RTE_TM_ETH_FRAMING_OVERHEAD_FCS).
> + * This field is ignored when the profile enables packet mode.
> */
> int32_t pkt_length_adjust;
> +
> + /** When zero, the private or shared shaper that is associated to this
> + * profile works in byte mode and hence *rate* and *size* fields in
> + * both token bucket configurations are specified in bytes per second
> + * and bytes respectively.
> + * When non-zero, that private or shared shaper works in packet mode and
> + * hence *rate* and *size* fields in both token bucket configurations
> + * are specified in packets per second and packets respectively.
> + */
> + int packet_mode;
> };
>
> /**
> @@ -925,6 +1115,8 @@ struct rte_tm_node_params {
> * When non-NULL, it points to a pre-allocated array of
> * *n_sp_priorities* values, with non-zero value for
> * byte-mode and zero for packet-mode.
> + * @see struct rte_tm_node_capabilities::sched_wfq_packet_mode_supported
> + * @see struct rte_tm_node_capabilities::sched_wfq_byte_mode_supported
> */
> int *wfq_weight_mode;
>
> --
> 2.8.4
>