From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 9959DA00E6 for ; Thu, 18 Apr 2019 14:19:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 40C771B9E1; Thu, 18 Apr 2019 14:19:05 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20051.outbound.protection.outlook.com [40.107.2.51]) by dpdk.org (Postfix) with ESMTP id 372481B9E0 for ; Thu, 18 Apr 2019 14:19:04 +0200 (CEST) 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=JMoo8N90LJXDWytAi/2cYOSZPsIZx1+W/RQ64MoNag8=; b=uzC5gbB8m0odUIOSD4MR8727F/QK8At/Zn5ndD7y1TbPz7ut00r/7fyTlkgOjSfG1hAE7iNscPySQdwjBihje3NUyQ5f1Vdhra9ZgxOaH06Be7fJ6XOg2zrK/e4jUFW4BZmJq+gz7RNA42qVgoVc0BKYDm2vQq4IyfQAL0fB8q8= Received: from AM0PR0502MB3971.eurprd05.prod.outlook.com (52.133.40.151) by AM0PR0502MB3764.eurprd05.prod.outlook.com (52.133.47.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1792.19; Thu, 18 Apr 2019 12:19:02 +0000 Received: from AM0PR0502MB3971.eurprd05.prod.outlook.com ([fe80::7da6:9e13:922a:9d88]) by AM0PR0502MB3971.eurprd05.prod.outlook.com ([fe80::7da6:9e13:922a:9d88%5]) with mapi id 15.20.1813.013; Thu, 18 Apr 2019 12:19:02 +0000 From: Yongseok Koh To: Ori Kam CC: Shahaf Shuler , Matan Azrad , Slava Ovsiienko , Moti Haimovsky , "dev@dpdk.org" Thread-Topic: [PATCH v2 6/9] net/mlx5: add transfer attribute to matcher Thread-Index: AQHU9doECippTc6olEyEt+44JjwRpKZB1hMA Date: Thu, 18 Apr 2019 12:19:02 +0000 Message-ID: <20190418121853.GL31179@mtidpdk.mti.labs.mlnx> References: <1555276357-4892-1-git-send-email-orika@mellanox.com> <1555586930-109097-1-git-send-email-orika@mellanox.com> <1555586930-109097-7-git-send-email-orika@mellanox.com> In-Reply-To: <1555586930-109097-7-git-send-email-orika@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR11CA0106.namprd11.prod.outlook.com (2603:10b6:a03:f4::47) To AM0PR0502MB3971.eurprd05.prod.outlook.com (2603:10a6:208:11::23) authentication-results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [209.116.155.178] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 597f9b87-fce5-4192-df41-08d6c3f80ad5 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:AM0PR0502MB3764; x-ms-traffictypediagnostic: AM0PR0502MB3764: x-microsoft-antispam-prvs: x-forefront-prvs: 0011612A55 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(39860400002)(396003)(376002)(366004)(346002)(199004)(189003)(26005)(102836004)(66066001)(6506007)(386003)(86362001)(2906002)(76176011)(52116002)(6636002)(186003)(99286004)(97736004)(229853002)(8936002)(3846002)(6116002)(33656002)(71200400001)(71190400001)(7736002)(68736007)(6436002)(81156014)(81166006)(8676002)(305945005)(316002)(6486002)(54906003)(1076003)(478600001)(6862004)(9686003)(4326008)(6512007)(256004)(6246003)(14444005)(14454004)(53936002)(5660300002)(476003)(446003)(11346002)(486006)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0502MB3764; H:AM0PR0502MB3971.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: cJicdT92wkejoOLZ3NrpjhLkEklPTQBLVk5rV/kPJfpLz5eUj3jV013JGn3A4+R/OCUFu/T6WAH9Mnq+NvMDEzbuIVf0IXGlAW1Rh8yj/bE21d5S1dyk6iOmP4P3LRLhfqAktbFOdKO9ILY0W+tqo/+P0nG3LqgPDVlixFQ66JlcGwbyAQ7enilsf75B3ftr7ekq9ZEe05eqVr5wlYv5SQcklAoawt022qMtcqj7Tapw9ZCDmMLq7/SMnMKc3SBwxGZFSPycoT/c8kIeeGlPKyXqEgP1VwbR3AT4C10I/PwrHyw9738P3sME1HSpoXXWf0Jw3DV0hRBa/gc4i/IcmhYJQhUEhf14vUWT16HcwCMAPUl+WIEqg2kWwr/V3YqTrB7rAb13QuwQgA24lwTwHO2b32xSrd350xVgwC3seqE= Content-Type: text/plain; charset="UTF-8" Content-ID: <622BA11397734743B169A90FEA06E38B@eurprd05.prod.outlook.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 597f9b87-fce5-4192-df41-08d6c3f80ad5 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Apr 2019 12:19:02.4130 (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-Transport-CrossTenantHeadersStamped: AM0PR0502MB3764 Subject: Re: [dpdk-dev] [PATCH v2 6/9] net/mlx5: add transfer attribute to matcher 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" Message-ID: <20190418121902.HKq7qE4wwSzERCvYCyzda9dMsU3DlR98ykhx-so1cBo@z> On Thu, Apr 18, 2019 at 11:28:47AM +0000, Ori Kam wrote: > In current implementation the DV steering supported only NIC steering. > This commit adds the transfer attribute in order to create a matcher > on the FDB tabels. >=20 > Signed-off-by: Ori Kam > --- Acked-by: Yongseok Koh > v2: > * Address ML comments. > --- > drivers/net/mlx5/mlx5_flow.c | 1 + > drivers/net/mlx5/mlx5_flow.h | 2 ++ > drivers/net/mlx5/mlx5_flow_dv.c | 22 ++++++++++++++++++---- > 3 files changed, 21 insertions(+), 4 deletions(-) >=20 > diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c > index b1effda..8afb966 100644 > --- a/drivers/net/mlx5/mlx5_flow.c > +++ b/drivers/net/mlx5/mlx5_flow.c > @@ -2095,6 +2095,7 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_d= ev *dev, int32_t priority, > flow =3D rte_calloc(__func__, 1, flow_size, 0); > flow->drv_type =3D flow_get_drv_type(dev, attr); > flow->ingress =3D attr->ingress; > + flow->transfer =3D attr->transfer; > assert(flow->drv_type > MLX5_FLOW_TYPE_MIN && > flow->drv_type < MLX5_FLOW_TYPE_MAX); > flow->queue =3D (void *)(flow + 1); > diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h > index 85954c2..9d72024 100644 > --- a/drivers/net/mlx5/mlx5_flow.h > +++ b/drivers/net/mlx5/mlx5_flow.h > @@ -210,6 +210,7 @@ struct mlx5_flow_dv_matcher { > uint16_t crc; /**< CRC of key. */ > uint16_t priority; /**< Priority of matcher. */ > uint8_t egress; /**< Egress matcher. */ > + uint8_t transfer; /**< 1 if the flow is E-Switch flow. */ > uint32_t group; /**< The matcher group. */ > struct mlx5_flow_dv_match_params mask; /**< Matcher mask. */ > }; > @@ -382,6 +383,7 @@ struct rte_flow { > struct mlx5_fdir *fdir; /**< Pointer to associated FDIR if any. */ > uint8_t ingress; /**< 1 if the flow is ingress. */ > uint32_t group; /**< The group index. */ > + uint8_t transfer; /**< 1 if the flow is E-Switch flow. */ > }; > =20 > typedef int (*mlx5_flow_validate_t)(struct rte_eth_dev *dev, > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow= _dv.c > index e3d9aa2..182abb3 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -3192,6 +3192,8 @@ struct field_modify_info modify_tcp[] =3D { > * Table id to use. > * @param[in] egress > * Direction of the table. > + * @param[in] transfer > + * E-Switch or NIC flow. > * @param[out] error > * pointer to error structure. > * > @@ -3201,6 +3203,7 @@ struct field_modify_info modify_tcp[] =3D { > static struct mlx5_flow_tbl_resource * > flow_dv_tbl_resource_get(struct rte_eth_dev *dev, > uint32_t table_id, uint8_t egress, > + uint8_t transfer, > struct rte_flow_error *error) > { > struct mlx5_priv *priv =3D dev->data->dev_private; > @@ -3208,7 +3211,12 @@ struct field_modify_info modify_tcp[] =3D { > struct mlx5_flow_tbl_resource *tbl; > =20 > #ifdef HAVE_MLX5DV_DR > - if (egress) { > + if (transfer) { > + tbl =3D &sh->fdb_tbl[table_id]; > + if (!tbl->obj) > + tbl->obj =3D mlx5_glue->dr_create_flow_tbl > + (sh->fdb_ns, table_id); > + } else if (egress) { > tbl =3D &sh->tx_tbl[table_id]; > if (!tbl->obj) > tbl->obj =3D mlx5_glue->dr_create_flow_tbl > @@ -3230,7 +3238,9 @@ struct field_modify_info modify_tcp[] =3D { > #else > (void)error; > (void)tbl; > - if (egress) > + if (transfer) > + return &sh->fdb_tbl[table_id]; > + else if (egress) > return &sh->tx_tbl[table_id]; > else > return &sh->rx_tbl[table_id]; > @@ -3295,6 +3305,7 @@ struct field_modify_info modify_tcp[] =3D { > matcher->priority =3D=3D cache_matcher->priority && > matcher->egress =3D=3D cache_matcher->egress && > matcher->group =3D=3D cache_matcher->group && > + matcher->transfer =3D=3D cache_matcher->transfer && > !memcmp((const void *)matcher->mask.buf, > (const void *)cache_matcher->mask.buf, > cache_matcher->mask.size)) { > @@ -3316,7 +3327,8 @@ struct field_modify_info modify_tcp[] =3D { > RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, > "cannot allocate matcher memory"); > tbl =3D flow_dv_tbl_resource_get(dev, matcher->group * MLX5_GROUP_FACTO= R, > - matcher->egress, error); > + matcher->egress, matcher->transfer, > + error); > if (!tbl) { > rte_free(cache_matcher); > return rte_flow_error_set(error, ENOMEM, > @@ -3643,7 +3655,8 @@ struct field_modify_info modify_tcp[] =3D { > jump_data =3D action->conf; > tbl =3D flow_dv_tbl_resource_get(dev, jump_data->group * > MLX5_GROUP_FACTOR, > - attr->egress, error); > + attr->egress, > + attr->transfer, error); > if (!tbl) > return rte_flow_error_set > (error, errno, > @@ -3871,6 +3884,7 @@ struct field_modify_info modify_tcp[] =3D { > matcher.priority); > matcher.egress =3D attr->egress; > matcher.group =3D attr->group; > + matcher.transfer =3D attr->transfer; > if (flow_dv_matcher_register(dev, &matcher, dev_flow, error)) > return -rte_errno; > return 0; > --=20 > 1.8.3.1 >=20