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 AF3F0A052A; Wed, 23 Dec 2020 10:35:39 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 992F6CA4D; Wed, 23 Dec 2020 10:35:38 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 2946ECA39 for ; Wed, 23 Dec 2020 10:35:36 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 0BN9UW5t023477 for ; Wed, 23 Dec 2020 01:35:34 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pfpt0220; bh=/xGxV/j32f22pKCcTT6WFcrjbcdpBkfKHkNMzldxh7g=; b=bslVdmVSyDcxeQ5Yk1+SJWC+wqwaNExfzl45deQHbgu/4/wtXjd1EKw1OQ117UzLqaLu 4ATv+IirZ90+Yc4uN7/x+187nsxGizOC4UZZiwOttFa21mJ4hF0DR11IGV02b2HVKl/k LER+WeZSNtfiMNB3ZE/Prq1yc51l5Sx/nSN4MTe+v0jcpfvdNGHfvTBiybcJYV4Zam+w rea2MtTy4LLTDQ4RJnuqLtiWdq6/RQIiIREBIX5nHtgf7KW3hAzfiA3FfnQVHxVz8QQp 3RvNDaw9Txb5uCXN18GTfRFphLwDEGEUG6qhiOVKTSqKGmnYBH+hpOfLwxb6w+NIH4tA MA== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0a-0016f401.pphosted.com with ESMTP id 35k0ebdrt8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 23 Dec 2020 01:35:34 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 23 Dec 2020 01:35:33 -0800 Received: from SC-EXCH02.marvell.com (10.93.176.82) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 23 Dec 2020 01:35:32 -0800 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.174) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Wed, 23 Dec 2020 01:35:31 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hRQURCcIcGAlJa4oLNw/aNGqVP13QouncI/QLO5yQ1bB9pRoNzIzBzvcoGwU3xRgf1CrDIbgNj8ZGNShwBJc5g4ilBWtXBFjMNTukNNX68nI9D3KszAulmLCRcjk0BJbQRidhfOM3KC8k9Tc4KLhU847smARc/oCAC1cPMoL8rIsn5++OYsXjMHUaBGVelyCgw9aSzTbTe/r46FNyUznYDQFdRQH7xOnoD6w3piDZmvEaYQWjf2R8DztfUgaYeA3V7sIUKonUGSLrLA2r08fkywsFP+0DrrVVImIMs7NRwAKj7sXs8Gf1Y6TAM449hIZC1s+P1+ZWxTnZutiFjoz2A== 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=/xGxV/j32f22pKCcTT6WFcrjbcdpBkfKHkNMzldxh7g=; b=H/h9eR8GVPgwj5wGufGqucsadtMqlBe1SXtYgXumgSkM1czXEKqOY9C4qLRDxz2IOvRONMuIQysIolIeOvteT7UCtdYi6hg41cxCYeKM+4GoW+R4k0FXZXMJpQfIhWWCKZw98+cUvJtC2J5mDxUayzgvTpBpds1uXP6rCWVcilrWmHYRJg8RER4oBSpGwmxfioga71/ffrkYvEDj/zROmYm8wYy2yrBdmMv3iY1JPHvpYi5iLtRbCeSjjgiaoB0RkR1dwpe4Ivt+5O8vGTVcBHWPHmWNbOe48sxSVJyE0CLiyQ/+Nqf5lubGmaP5RE9SFyav4dSW6J7VEAD8CMo+xw== 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=/xGxV/j32f22pKCcTT6WFcrjbcdpBkfKHkNMzldxh7g=; b=qh59EZILs7+D6+XRN0apI7oMAEfL7buyU19PUWHQ0OnLtac/oMQmaxZLwOmIqvlWvcgAcB6ji6hyg60Kd42FM+ZpyAnyEcelht8GmPqzxuovZCgLIIzvQUuzFFhSYjzuwJH7Qrdb/UixrLO3mooyz/h86Rp04me0H7DfUO8RDu8= Received: from DM5PR1801MB2058.namprd18.prod.outlook.com (2603:10b6:4:67::31) by DM6PR18MB2795.namprd18.prod.outlook.com (2603:10b6:5:172::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3700.27; Wed, 23 Dec 2020 09:35:30 +0000 Received: from DM5PR1801MB2058.namprd18.prod.outlook.com ([fe80::303b:5c79:93c7:b432]) by DM5PR1801MB2058.namprd18.prod.outlook.com ([fe80::303b:5c79:93c7:b432%7]) with mapi id 15.20.3676.033; Wed, 23 Dec 2020 09:35:30 +0000 From: Michael Shamis To: Liron Himi , Jerin Jacob Kollanukkaran CC: "dev@dpdk.org" , Liron Himi Thread-Topic: [dpdk-dev] [PATCH v1 25/38] net/mvpp2: support udf configuration Thread-Index: AQHWyJTjBqvLT5EaSUqh9PRpZukEHKoEjIXA Date: Wed, 23 Dec 2020 09:35:30 +0000 Message-ID: References: <20201202101212.4717-1-lironh@marvell.com> <20201202101212.4717-26-lironh@marvell.com> In-Reply-To: <20201202101212.4717-26-lironh@marvell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [83.130.154.133] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7ccf1ff4-f309-4979-a54d-08d8a72616a1 x-ms-traffictypediagnostic: DM6PR18MB2795: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:901; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 0oQJxwB+e2jQJ5sYsCCXiHqKbsXiT6Rrog4bq+36umW6ys10n24WHMv+JKi+QVbbw6d0Yc0R8FQVxCsYbbWPoqfMBziiCl/D5DvabNnsbw3K6QT/idpvZ2Nuklw1PWt1fLvmAb/OsLOXDDh6kQtmLHSKH5KHXfnfFJGtl6SNsvropOzIJSdM17SF6BgUvRgRY0zudEd9mMSOF1a/Q/fQf5sdsk1sA0YMBLtV04mBM6sMYhZjv29lKHsjDg7XcHrnJ4vXIJpKrTCkEwaj5Oqv86FpVqBEn8LOUOcNdGDHjb1gIuCdrbMT31jgQ92Ss8nGEnJjUgW1oSa7IC4fbZvrq+VRtBdl90+6pF2Bw9bD0dp1XLaC32V/txkeDZPLZ3EidcH/pFOVl6IXndh0ugvVlQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR1801MB2058.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(396003)(39860400002)(346002)(376002)(366004)(7696005)(26005)(54906003)(2906002)(8676002)(478600001)(186003)(9686003)(5660300002)(55016002)(83380400001)(4326008)(107886003)(8936002)(66946007)(86362001)(64756008)(66556008)(53546011)(66476007)(6636002)(6506007)(52536014)(33656002)(76116006)(110136005)(71200400001)(66446008)(316002); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?Qb1fzzSNHePBg5vLzk6qapXEZYVuwDiRF2FZcedSZ+Qdhs6hVP7hEHNpJVg4?= =?us-ascii?Q?EzcARMeUrd7SZloNl00U5S1p8uuglor6YgSDOi0XRnQnvZLAIB6GzrguBLKb?= =?us-ascii?Q?vm1X0qysdUV6FeygepMaL8ZPx7S5bUTyKLPQ1a7i1ABRl/VtbxcyRmdDKiNV?= =?us-ascii?Q?I24AjGEX6P6eYFNtAxbNLo5lZesF1XLxR/kIasEHykAv9AruN9mfM8aJiac+?= =?us-ascii?Q?7eXkz3I9NoeGdPIqWyKvYjW4zSPLiZ1+5dHrXt3OYLOZTD2kpqVKtJGfJPuc?= =?us-ascii?Q?CPP3HzRsvyXs+uvllmy5dBVkyrfxoAhSh3uVxrQC33UhPAcFRpZYsLxZc9oD?= =?us-ascii?Q?uKhf41cbjLxOZF9qxbLOecshlQFBFEJB64lfyGZH5dWh+LA0vUMFj75LBqSO?= =?us-ascii?Q?5FUCVdQ06hchSBQ+CBSibdrcsjeLAJBWdmb68FLTL7jyer+WcX7PM2JisMDh?= =?us-ascii?Q?LzRl8qh1ap3RJyvSgASEoBL2KetxRuAMMfxGIEwb+HlA1IphGKTsT+pLvvCh?= =?us-ascii?Q?W5vKC1HySGMg5WTpmI1f6NuKUaqrO4uRIrONNfnF8BTu0RZRUsNsHlOUoYIi?= =?us-ascii?Q?CMRHZqRzwzaahO9WSwfh6xdzfUsRmKOHkWbwe3pWNGU1FkO5revQhy7aAvsH?= =?us-ascii?Q?VTq2ZX8Xy3IHiY4wO6kwLWcNX7dHolUv7HVqa4ogJeBc8YFFLoLSxAdJq953?= =?us-ascii?Q?Hf2XEhwGKsOpC0aJZ8iGI5mnO1Jrh/U79ZwC+zhnaVTi6lyHhV6TxUfM6Ytg?= =?us-ascii?Q?wviVtqPhob+cMRUEr8XE/1NLtbTpwCc5MaO61r75WhCoRZ/31Iy8bdsB8Xja?= =?us-ascii?Q?wPFsp+sTIqJ8nxzHqD+PLT+bAkiII0a8hfCI5QnbdKXZBoSom5awpgJZSE9F?= =?us-ascii?Q?h9GzeBysz2eGlEMIg9jX4ZCprjwWw4qLbdMc5qDUKdICJXxtpjqFMAM38mfd?= =?us-ascii?Q?Qe3w+h+EbnY4P12U7EKX6CzFmTT3+WjetOIGyI2an3Y=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM5PR1801MB2058.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ccf1ff4-f309-4979-a54d-08d8a72616a1 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Dec 2020 09:35:30.2184 (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: 3htCeWu90P2CjYa14WvXMGMrp4hjxn1DDwP+Lf0Sk+TIHIFJV1KFcUY9NrczEhwpeX1cRU7S6fod3TKYPEOm9Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR18MB2795 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343, 18.0.737 definitions=2020-12-23_04:2020-12-21, 2020-12-23 signatures=0 Subject: Re: [dpdk-dev] [PATCH v1 25/38] net/mvpp2: support udf configuration X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Reviewed-by: Michael Shamis -----Original Message----- From: dev On Behalf Of lironh@marvell.com Sent: Wednesday, December 2, 2020 12:12 PM To: Jerin Jacob Kollanukkaran Cc: dev@dpdk.org; Liron Himi Subject: [dpdk-dev] [PATCH v1 25/38] net/mvpp2: support udf configuration From: Liron Himi extend the config file with 'udf' (user-defined) settings Signed-off-by: Liron Himi Reviewed-by: Liron Himi --- drivers/net/mvpp2/mrvl_ethdev.c | 4 +- drivers/net/mvpp2/mrvl_qos.c | 212 ++++++++++++++++++++++++++++++++ drivers/net/mvpp2/mrvl_qos.h | 3 + 3 files changed, 218 insertions(+), 1 deletion(-) diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethde= v.c index 6bd3b0430..5ff11e2c9 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.c +++ b/drivers/net/mvpp2/mrvl_ethdev.c @@ -3027,7 +3027,9 @@ mrvl_init_pp2(void) init_params.hif_reserved_map =3D MRVL_MUSDK_HIFS_RESERVED; init_params.bm_pool_reserved_map =3D MRVL_MUSDK_BPOOLS_RESERVED; init_params.rss_tbl_reserved_map =3D MRVL_MUSDK_RSS_RESERVED; - + if (mrvl_cfg && mrvl_cfg->pp2_cfg.prs_udfs.num_udfs) + memcpy(&init_params.prs_udfs, &mrvl_cfg->pp2_cfg.prs_udfs, + sizeof(struct pp2_parse_udfs)); return pp2_init(&init_params); } =20 diff --git a/drivers/net/mvpp2/mrvl_qos.c b/drivers/net/mvpp2/mrvl_qos.c in= dex 1c65b5276..f5275efc7 100644 --- a/drivers/net/mvpp2/mrvl_qos.c +++ b/drivers/net/mvpp2/mrvl_qos.c @@ -35,6 +35,7 @@ #define MRVL_TOK_TXQ "txq" #define MRVL_TOK_VLAN "vlan" #define MRVL_TOK_VLAN_IP "vlan/ip" +#define MRVL_TOK_PARSER_UDF "parser udf" =20 /* egress specific configuration tokens */ #define MRVL_TOK_BURST_SIZE "b= urst_size" @@ -62,6 +63,18 @@ #define MRVL_TOK_PLCR_DEFAULT_COLOR_YELLOW "yellow" #define MRVL_TOK_PLCR_DEFAULT_COLOR_RED "red" =20 +/* paser udf specific configuration tokens */ #define=20 +MRVL_TOK_PARSER_UDF_PROTO "proto" +#define MRVL_TOK_PARSER_UDF_FIELD "field" +#define MRVL_TOK_PARSER_UDF_KEY "key" +#define MRVL_TOK_PARSER_UDF_MASK "mask" +#define MRVL_TOK_PARSER_UDF_OFFSET "offset" +#define MRVL_TOK_PARSER_UDF_PROTO_ETH "eth" +#define MRVL_TOK_PARSER_UDF_FIELD_ETH_TYPE "type" +#define MRVL_TOK_PARSER_UDF_PROTO_UDP "udp" +#define MRVL_TOK_PARSER_UDF_FIELD_UDP_DPORT "dport" + + /** Number of tokens in range a-b =3D 2. */ #define MAX_RNG_TOKENS 2 =20 @@ -453,6 +466,175 @@ parse_policer(struct rte_cfgfile *file, int port, con= st char *sec_name, return 0; } =20 +/** + * Parse parser udf. + * + * @param file Config file handle. + * @param sec_name section name + * @param udf udf index + * @param cfg[out] Parsing results. + * @returns 0 in case of success, negative value otherwise. + */ +static int +parse_udf(struct rte_cfgfile *file, const char *sec_name, int udf, + struct mrvl_cfg *cfg) +{ + struct pp2_parse_udf_params *udf_params; + const char *entry, *entry_field; + uint32_t val, i; + uint8_t field_size; + char malloc_name[32], tmp_arr[3]; + /* field len in chars equal to '0x' + rest of data */ +#define FIELD_LEN_IN_CHARS(field_size) (uint32_t)(2 + (field_size) * 2) + + udf_params =3D &cfg->pp2_cfg.prs_udfs.udfs[udf]; + + /* Read 'proto' field */ + entry =3D rte_cfgfile_get_entry(file, sec_name, + MRVL_TOK_PARSER_UDF_PROTO); + if (!entry) { + MRVL_LOG(ERR, "UDF[%d]: '%s' field must be set\n", udf, + MRVL_TOK_PARSER_UDF_PROTO); + return -1; + } + + /* Read 'field' field */ + entry_field =3D rte_cfgfile_get_entry(file, sec_name, + MRVL_TOK_PARSER_UDF_FIELD); + if (!entry_field) { + MRVL_LOG(ERR, "UDF[%d]: '%s' field must be set\n", udf, + MRVL_TOK_PARSER_UDF_FIELD); + return -1; + } + + if (!strncmp(entry, MRVL_TOK_PARSER_UDF_PROTO_ETH, + sizeof(MRVL_TOK_PARSER_UDF_PROTO_ETH))) { + udf_params->match_proto =3D MV_NET_PROTO_ETH; + if (!strncmp(entry_field, MRVL_TOK_PARSER_UDF_FIELD_ETH_TYPE, + sizeof(MRVL_TOK_PARSER_UDF_FIELD_ETH_TYPE))) { + udf_params->match_field.eth =3D MV_NET_ETH_F_TYPE; + field_size =3D 2; + } else { + MRVL_LOG(ERR, "UDF[%d]: mismatch between '%s' proto " + "and '%s' field\n", udf, + MRVL_TOK_PARSER_UDF_PROTO_ETH, + entry_field); + return -1; + } + } else if (!strncmp(entry, MRVL_TOK_PARSER_UDF_PROTO_UDP, + sizeof(MRVL_TOK_PARSER_UDF_PROTO_UDP))) { + udf_params->match_proto =3D MV_NET_PROTO_UDP; + if (!strncmp(entry_field, MRVL_TOK_PARSER_UDF_FIELD_UDP_DPORT, + sizeof(MRVL_TOK_PARSER_UDF_FIELD_UDP_DPORT))) { + udf_params->match_field.udp =3D MV_NET_UDP_F_DP; + field_size =3D 2; + } else { + MRVL_LOG(ERR, "UDF[%d]: mismatch between '%s' proto " + "and '%s' field\n", udf, + MRVL_TOK_PARSER_UDF_PROTO_UDP, + entry_field); + return -1; + } + } else { + MRVL_LOG(ERR, "UDF[%d]: Unsupported '%s' proto\n", udf, entry); + return -1; + } + + snprintf(malloc_name, sizeof(malloc_name), "mrvl_udf_%d_key", udf); + udf_params->match_key =3D rte_zmalloc(malloc_name, field_size, 0); + if (udf_params->match_key =3D=3D NULL) { + MRVL_LOG(ERR, "Cannot allocate udf %d key\n", udf); + return -1; + } + snprintf(malloc_name, sizeof(malloc_name), "mrvl_udf_%d_mask", udf); + udf_params->match_mask =3D rte_zmalloc(malloc_name, field_size, 0); + if (udf_params->match_mask =3D=3D NULL) { + MRVL_LOG(ERR, "Cannot allocate udf %d mask\n", udf); + return -1; + } + + /* Read 'key' field */ + entry =3D rte_cfgfile_get_entry(file, sec_name, MRVL_TOK_PARSER_UDF_KEY); + if (!entry) { + MRVL_LOG(ERR, "UDF[%d]: '%s' field must be set\n", udf, + MRVL_TOK_PARSER_UDF_KEY); + return -1; + } + + if (strncmp(entry, "0x", 2) !=3D 0) { + MRVL_LOG(ERR, "UDF[%d]: '%s' field must start with '0x'\n", + udf, MRVL_TOK_PARSER_UDF_KEY); + return -EINVAL; + } + + if (strlen(entry) !=3D FIELD_LEN_IN_CHARS(field_size)) { + MRVL_LOG(ERR, "UDF[%d]: '%s' field's len must be %d\n", udf, + MRVL_TOK_PARSER_UDF_KEY, + FIELD_LEN_IN_CHARS(field_size)); + return -EINVAL; + } + + entry +=3D 2; /* skip the '0x' */ + for (i =3D 0; i < field_size; i++) { + strncpy(tmp_arr, entry, 2); + tmp_arr[2] =3D '\0'; + if (get_val_securely8(tmp_arr, 16, + &udf_params->match_key[i]) < 0) { + MRVL_LOG(ERR, "UDF[%d]: '%s' field's value is not in " + "hex format\n", udf, MRVL_TOK_PARSER_UDF_KEY); + return -EINVAL; + } + entry +=3D 2; + } + + /* Read 'mask' field */ + entry =3D rte_cfgfile_get_entry(file, sec_name, MRVL_TOK_PARSER_UDF_MASK)= ; + if (!entry) { + MRVL_LOG(ERR, "UDF[%d]: '%s' field must be set\n", udf, + MRVL_TOK_PARSER_UDF_MASK); + return -1; + } + if (strncmp(entry, "0x", 2) !=3D 0) { + MRVL_LOG(ERR, "UDF[%d]: '%s' field must start with '0x'\n", + udf, MRVL_TOK_PARSER_UDF_MASK); + return -EINVAL; + } + + if (strlen(entry) !=3D FIELD_LEN_IN_CHARS(field_size)) { + MRVL_LOG(ERR, "UDF[%d]: '%s' field's len must be %d\n", udf, + MRVL_TOK_PARSER_UDF_MASK, + FIELD_LEN_IN_CHARS(field_size)); + return -EINVAL; + } + + entry +=3D 2; /* skip the '0x' */ + for (i =3D 0; i < field_size; i++) { + strncpy(tmp_arr, entry, 2); + tmp_arr[2] =3D '\0'; + if (get_val_securely8(tmp_arr, 16, + &udf_params->match_mask[i]) < 0) { + MRVL_LOG(ERR, "UDF[%d]: '%s' field's value is not in " + "hex format\n", udf, MRVL_TOK_PARSER_UDF_MASK); + return -EINVAL; + } + entry +=3D 2; + } + + /* Read offset */ + entry =3D rte_cfgfile_get_entry(file, sec_name, + MRVL_TOK_PARSER_UDF_OFFSET); + if (!entry) { + MRVL_LOG(ERR, "UDF[%d]: '%s' field must be set\n", udf, + MRVL_TOK_PARSER_UDF_OFFSET); + return -1; + } + if (get_val_securely(entry, &val) < 0) + return -1; + udf_params->offset =3D val; + + return 0; +} + /** * Parse configuration - rte_kvargs_process handler. * @@ -487,6 +669,36 @@ mrvl_get_cfg(const char *key __rte_unused, const char = *path, void *extra_args) return -1; } =20 + /* PP2 configuration */ + n =3D rte_cfgfile_num_sections(file, MRVL_TOK_PARSER_UDF, + sizeof(MRVL_TOK_PARSER_UDF) - 1); + + if (n && n > PP2_MAX_UDFS_SUPPORTED) { + MRVL_LOG(ERR, "found %d udf sections, but only %d are supported\n", + n, PP2_MAX_UDFS_SUPPORTED); + return -1; + } + (*cfg)->pp2_cfg.prs_udfs.num_udfs =3D n; + for (i =3D 0; i < n; i++) { + snprintf(sec_name, sizeof(sec_name), "%s %d", + MRVL_TOK_PARSER_UDF, i); + + /* udf sections must be sequential. */ + if (rte_cfgfile_num_sections(file, sec_name, + strlen(sec_name)) <=3D 0) { + MRVL_LOG(ERR, "udf sections must be sequential (0 - %d)\n", + PP2_MAX_UDFS_SUPPORTED - 1); + return -1; + } + + ret =3D parse_udf(file, sec_name, i, *cfg); + if (ret) { + MRVL_LOG(ERR, "Error in parsing %s!\n", sec_name); + return -1; + } + } + + /* PP2 Ports configuration */ n =3D rte_cfgfile_num_sections(file, MRVL_TOK_PORT, sizeof(MRVL_TOK_PORT) - 1); =20 diff --git a/drivers/net/mvpp2/mrvl_qos.h b/drivers/net/mvpp2/mrvl_qos.h in= dex 928cfe366..daf4776ec 100644 --- a/drivers/net/mvpp2/mrvl_qos.h +++ b/drivers/net/mvpp2/mrvl_qos.h @@ -19,6 +19,9 @@ =20 /* config. */ struct mrvl_cfg { + struct { + struct pp2_parse_udfs prs_udfs; + } pp2_cfg; struct port_cfg { enum pp2_ppio_eth_start_hdr eth_start_hdr; int rate_limit_enable; -- 2.28.0