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 D8D9AA0597; Tue, 21 Apr 2020 14:06:18 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B8B5D1C0BE; Tue, 21 Apr 2020 14:06:18 +0200 (CEST) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00072.outbound.protection.outlook.com [40.107.0.72]) by dpdk.org (Postfix) with ESMTP id E4C101C037 for ; Tue, 21 Apr 2020 14:06:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FOevSCHxnuZgunftwiQWrTEGwxg61J79/rr0xiXmAIa66dll6OjGPEfZ9cPNrJESyaGCASQXNLpwpQReMYDnrlllENgCMrwndZrJ/XSx79GzZ2V6RS9w68tPPwyQ0WVaqVYYpi1Nxmr/e5yQhTxlYGtTMbXrp39XvD3Gb/n+rAynXUhk2+rTaf2kPu79WgjrcLb81RNkyLusjlDOQtV6KR+nUL2fP4D2cE5MmnSu/GYmtg/WBYnRnVhXdm1kpR3245+FqhCuM0tAWeXL31LFFwZjfA6J/F6A7ga7XwbAwHZzNcvr+6b5Oed7KZUrw73NrYNjTFAfyi2CsC9ElCk9jQ== 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=g8ho9BCMGnavGvMrbAf7vPvFP+YLDDxXEb/CE22KJBQ=; b=fjNMi7DsJNeXPVtjPEvXj3q2Qj5qSu5+RjqfM7FCLHAka7Oyb5ltKWEolcV4oSRGEuIrNVzXpzAK3kFmtlsp8It8OjcpLh7JtY+La0/sgIfQWe5amTJ1/qvxch0LB+rBf2w+4LcJsci8KUQPTCAgEwRkhJdNDP4Fap7VRm+KLTp3Zfej3FGRjvjfxoYGuAstGdiSLKf7n2qFLwYVZKZvzzV9Ik4ikM7qS1vlHCM//S5jPNPQEJZgRYBewxUNZJ7OHwe+DXiVyiGi/eNaEMidkMLteQgGpAIBZQiK0Uz0iFaB4siRyPKrPEKbPeBcI3Kpl/Gak/lBQSGBCrsYGpZdvw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=g8ho9BCMGnavGvMrbAf7vPvFP+YLDDxXEb/CE22KJBQ=; b=EAgWc65OeTEVku9MHW22ghyh9zxO+cbTJiYekqIfS5Zq62hTFK8EXbxYNEqheow9JuNfCbn6S+kdVY7VD7d6X/hw/1Dce+es9TRwdWlPjRVLTvo4BUneR6soCtGGNxydIxqmslEvLWtrSEFOOQwWCibW4D66wm7oD6Qfa2NoKO4= Received: from AM0PR05MB6707.eurprd05.prod.outlook.com (2603:10a6:20b:15b::17) by AM0PR05MB6482.eurprd05.prod.outlook.com (2603:10a6:208:146::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.29; Tue, 21 Apr 2020 12:06:17 +0000 Received: from AM0PR05MB6707.eurprd05.prod.outlook.com ([fe80::508:747b:cc12:5f6e]) by AM0PR05MB6707.eurprd05.prod.outlook.com ([fe80::508:747b:cc12:5f6e%6]) with mapi id 15.20.2921.030; Tue, 21 Apr 2020 12:06:17 +0000 From: Raslan Darawsheh To: Wentao Cui , Matan Azrad , Shahaf Shuler , Slava Ovsiienko CC: "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH] net/mlx5: optimize memory of mlx5 flow meter Thread-Index: AQHWFr0Nb0Xa4XnmUUaXpE1lx8ptmaiDfPSA Date: Tue, 21 Apr 2020 12:06:16 +0000 Message-ID: References: <0001-net-mlx5-optimize-memory-of-mlx5-flow-meter.patch> <20200420024002.20601-1-wentaoc@mellanox.com> In-Reply-To: <20200420024002.20601-1-wentaoc@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=rasland@mellanox.com; x-originating-ip: [188.161.228.234] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 082e3c6b-c374-4e41-1e61-08d7e5ec6553 x-ms-traffictypediagnostic: AM0PR05MB6482:|AM0PR05MB6482: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3276; x-forefront-prvs: 038002787A x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR05MB6707.eurprd05.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10009020)(4636009)(376002)(396003)(136003)(366004)(39860400002)(346002)(186003)(5660300002)(4326008)(52536014)(7696005)(86362001)(478600001)(66446008)(64756008)(9686003)(76116006)(66476007)(66556008)(66946007)(55016002)(33656002)(2906002)(6636002)(8936002)(110136005)(26005)(71200400001)(8676002)(81156014)(316002)(6506007)(53546011); DIR:OUT; SFP:1101; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Bt0eDdBMDX5yjHaVsErIT7WFFz2fWMwt4IeMB0liAIML5vVdUGraYJweV/7Y4BqMnsTwM4G3QYTBSFrqIS+F2ilyq+AUM93zzch+xTRhBJ7da7GrA4dzeox4A9EE9jZqImKoRptqD/+KuM/pRqPhobfy4zbbpon/b6kab6lq7CMNrza9Cdf7q5x9Fu7MGIm0NwDrJy7SXkh6iRSmOlt44/TSYxCxdCU2SGHuOrr7loCs9LtkYdgbZTgwkKiz75sjsFsXSdBjaRqRL3XDXdh+5z/b04O5oMJ53ovam8KJy9xd8FU0fdD7aa0ycV2F3WW/QD8HLyMXM5nRKXwDRZbY9eWLGmWBo/ozUtMgwDFKKhZdmXpzJ4JVRoSQXBoBexXGBuC63sB31IdXd9xMLYjsC9eLwSiAgx+CncxiPutxIHFmptqvLjwQXi/Rkx1T0upF x-ms-exchange-antispam-messagedata: jrpI1/5rhVjD+CTnILjFwiTtiq8zgc+WhKNsjdnptMDR+i/jLI8pogiPdhHzagNYIo3X75fxjRCWGI57UdhNTSXey0Qu80R7MdIIzmxaDeA9zHL143rhFECVSnnsKJc7fcWBkBMkQpbGG5rxtYho2A== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 082e3c6b-c374-4e41-1e61-08d7e5ec6553 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Apr 2020 12:06:17.0197 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: bg8ve0S7or1fqB1bQT0kl9RQMfI6I8eXDN/JdhcTReANkAv1WWT9Kbw2c848VUGdea3AcEfnpuOWf7BwDY25tA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB6482 Subject: Re: [dpdk-dev] [PATCH] net/mlx5: optimize memory of mlx5 flow meter 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" Hi, > -----Original Message----- > From: dev On Behalf Of Wentao Cui > Sent: Monday, April 20, 2020 5:40 AM > To: Matan Azrad ; Shahaf Shuler > ; Slava Ovsiienko > Cc: dev@dpdk.org > Subject: [dpdk-dev] [PATCH] net/mlx5: optimize memory of mlx5 flow meter >=20 > This commit focus on flow meter data structures > optimization: mlx5_flow_meter. >=20 > Optimize memory consumption of flow meter data structure. > Reorganize flow meter data structure,delete unnecessary > data fields. >=20 > Signed-off-by: Wentao Cui > --- > drivers/net/mlx5/mlx5_flow.h | 37 ++++++++++++++++++++++++++---- > drivers/net/mlx5/mlx5_flow_dv.c | 8 +++---- > drivers/net/mlx5/mlx5_flow_meter.c | 26 ++++++++++++--------- > 3 files changed, 52 insertions(+), 19 deletions(-) >=20 > diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h > index d697eba0e9..74017cfa31 100644 > --- a/drivers/net/mlx5/mlx5_flow.h > +++ b/drivers/net/mlx5/mlx5_flow.h > @@ -709,12 +709,41 @@ struct mlx5_flow_meter { > uint32_t idx; /* Index to meter object. */ > uint32_t meter_id; > /**< Meter id. */ > - struct rte_mtr_params params; > - /**< Meter rule parameters. */ > struct mlx5_flow_meter_profile *profile; > /**< Meter profile parameters. */ > - struct rte_flow_attr attr; > - /**< Flow attributes. */ > + > + /** Policer actions (per meter output color). */ > + enum rte_mtr_policer_action action[RTE_COLORS]; > + > + /** Set of stats counters to be enabled. > + * @see enum rte_mtr_stats_type > + */ > + uint64_t stats_mask; > + > + /**< Rule applies to ingress traffic. */ > + uint32_t ingress:1; > + > + /**< Rule applies to egress traffic. */ > + uint32_t egress:1; > + /** > + * Instead of simply matching the properties of traffic as it would > + * appear on a given DPDK port ID, enabling this attribute transfers > + * a flow rule to the lowest possible level of any device endpoints > + * found in the pattern. > + * > + * When supported, this effectively enables an application to > + * re-route traffic not necessarily intended for it (e.g. coming > + * from or addressed to different physical ports, VFs or > + * applications) at the device level. > + * > + * It complements the behavior of some pattern items such as > + * RTE_FLOW_ITEM_TYPE_PHY_PORT and is meaningless without > them. > + * > + * When transferring flow rules, ingress and egress attributes keep > + * their original meaning, as if processing traffic emitted or > + * received by the application. > + */ > + uint32_t transfer:1; > struct mlx5_meter_domains_infos *mfts; > /**< Flow table created for this meter. */ > struct mlx5_flow_policer_stats policer_stats; > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c > index cfc911c9ca..b552b0ea7c 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -3707,9 +3707,9 @@ mlx5_flow_validate_action_meter(struct > rte_eth_dev *dev, > return rte_flow_error_set(error, EINVAL, > RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > "Meter not found"); > - if (fm->ref_cnt && (!(fm->attr.transfer =3D=3D attr->transfer || > - (!fm->attr.ingress && !attr->ingress && attr->egress) || > - (!fm->attr.egress && !attr->egress && attr->ingress)))) > + if (fm->ref_cnt && (!(fm->transfer =3D=3D attr->transfer || > + (!fm->ingress && !attr->ingress && attr->egress) || > + (!fm->egress && !attr->egress && attr->ingress)))) > return rte_flow_error_set(error, EINVAL, > RTE_FLOW_ERROR_TYPE_ACTION, > NULL, > "Flow attributes are either invalid " > @@ -9008,7 +9008,7 @@ flow_dv_create_policer_forward_rule(struct > mlx5_flow_meter *fm, > rte_col_2_mlx5_col(i), UINT8_MAX); > if (mtb->count_actns[i]) > actions[j++] =3D mtb->count_actns[i]; > - if (fm->params.action[i] =3D=3D MTR_POLICER_ACTION_DROP) > + if (fm->action[i] =3D=3D MTR_POLICER_ACTION_DROP) > actions[j++] =3D mtb->drop_actn; > else > actions[j++] =3D dtb->jump_actn; > diff --git a/drivers/net/mlx5/mlx5_flow_meter.c > b/drivers/net/mlx5/mlx5_flow_meter.c > index b5fbf5d316..08f7dc8d11 100644 > --- a/drivers/net/mlx5/mlx5_flow_meter.c > +++ b/drivers/net/mlx5/mlx5_flow_meter.c > @@ -55,8 +55,8 @@ mlx5_flow_meter_action_create(struct mlx5_priv *priv, > MLX5_SET(flow_meter_parameters, > attr, ebs_mantissa, srtcm->ebs_mantissa); > mtr_init.next_table =3D > - fm->attr.transfer ? fm->mfts->transfer.tbl->obj : > - fm->attr.egress ? fm->mfts->egress.tbl->obj : > + fm->transfer ? fm->mfts->transfer.tbl->obj : > + fm->egress ? fm->mfts->egress.tbl->obj : > fm->mfts->ingress.tbl->obj; > mtr_init.reg_c_index =3D priv->mtr_color_reg - REG_C_0; > mtr_init.flow_meter_parameter =3D fm->mfts->fmp; > @@ -657,7 +657,9 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, > uint32_t meter_id, > /* Fill the flow meter parameters. */ > fm->meter_id =3D meter_id; > fm->profile =3D fmp; > - fm->params =3D *params; > + memcpy(fm->action, params->action, sizeof(params->action)); > + fm->stats_mask =3D params->stats_mask; > + > /* Alloc policer counters. */ > for (i =3D 0; i < RTE_DIM(fm->policer_stats.cnt); i++) { > fm->policer_stats.cnt[i] =3D mlx5_counter_alloc(dev); > @@ -1050,7 +1052,7 @@ mlx5_flow_meter_stats_read(struct rte_eth_dev > *dev, > &bytes); > if (ret) > goto error; > - if (fm->params.action[i] =3D=3D > MTR_POLICER_ACTION_DROP) { > + if (fm->action[i] =3D=3D MTR_POLICER_ACTION_DROP) { > pkts_dropped +=3D pkts; > bytes_dropped +=3D bytes; > } > @@ -1181,7 +1183,9 @@ mlx5_flow_meter_attach(struct mlx5_priv *priv, > uint32_t meter_id, > } > if (!fm->ref_cnt++) { > MLX5_ASSERT(!fm->mfts->meter_action); > - fm->attr =3D *attr; > + fm->ingress =3D attr->ingress; > + fm->egress =3D attr->egress; > + fm->transfer =3D attr->transfer; > /* This also creates the meter object. */ > fm->mfts->meter_action =3D > mlx5_flow_meter_action_create(priv, > fm); > @@ -1189,9 +1193,9 @@ mlx5_flow_meter_attach(struct mlx5_priv *priv, > uint32_t meter_id, > goto error_detach; > } else { > MLX5_ASSERT(fm->mfts->meter_action); > - if (attr->transfer !=3D fm->attr.transfer || > - attr->ingress !=3D fm->attr.ingress || > - attr->egress !=3D fm->attr.egress) { > + if (attr->transfer !=3D fm->transfer || > + attr->ingress !=3D fm->ingress || > + attr->egress !=3D fm->egress) { > DRV_LOG(ERR, "meter I/O attributes do not " > "match flow I/O attributes."); > goto error_detach; > @@ -1216,15 +1220,15 @@ mlx5_flow_meter_attach(struct mlx5_priv *priv, > uint32_t meter_id, > void > mlx5_flow_meter_detach(struct mlx5_flow_meter *fm) > { > - const struct rte_flow_attr attr =3D { 0 }; > - > MLX5_ASSERT(fm->ref_cnt); > if (--fm->ref_cnt) > return; > if (fm->mfts->meter_action) > mlx5_glue->destroy_flow_action(fm->mfts->meter_action); > fm->mfts->meter_action =3D NULL; > - fm->attr =3D attr; > + fm->ingress =3D 0; > + fm->egress =3D 0; > + fm->transfer =3D 0; > } >=20 > /** > -- > 2.21.0 Patch applied to next-net-mlx, Kindest regards, Raslan Darawsheh