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 E63CEA00E6 for ; Thu, 18 Apr 2019 14:28:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B2D5F1B9F8; Thu, 18 Apr 2019 14:28:04 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130081.outbound.protection.outlook.com [40.107.13.81]) by dpdk.org (Postfix) with ESMTP id AA6351B9F7 for ; Thu, 18 Apr 2019 14:28:02 +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=E5Pb/6VW4jEHiYXVLWtKhXWh4uYuANkqOcQM3VMYiUs=; b=dye3gNFTV6XQXZMBCWm8Zel2+vwluLl03px5OWbBAyk+pLopbej9xEEv7O+uFK3iXT/sooxEOYoG+oUhR/B6MVnWyRH9tsH8x5lvFQYlk87vVybWPOWK/itu3T4UVcYK5eJZtnzIB/JLHD6Fw9BnIXHANmPPQFLoKI2BySw+Zkg= 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:28:00 +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:28:00 +0000 From: Yongseok Koh To: Ori Kam CC: Shahaf Shuler , Matan Azrad , Slava Ovsiienko , Moti Haimovsky , "dev@dpdk.org" Thread-Topic: [PATCH v2 9/9] net/mlx5: add drop action to Direct Verbs E-Switch Thread-Index: AQHU9doQdQT/lTpKfkGOOsJucSXw46ZB2JOA Date: Thu, 18 Apr 2019 12:28:00 +0000 Message-ID: <20190418122751.GO31179@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-10-git-send-email-orika@mellanox.com> In-Reply-To: <1555586930-109097-10-git-send-email-orika@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR02CA0042.namprd02.prod.outlook.com (2603:10b6:a03:54::19) 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: 91c9390a-0cd4-484e-abce-08d6c3f94b61 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)(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: AD9nUhq4AdaFMGeSgSAkreJ6LgddrTRJlHW1zyS1vByZauy+7hSjXBw05IWxAmLrPpPsF2Qd+P0N8+k02XBCU6vtUxhMsTa4S/CE7VIGWwkW2jMDN144X/qUnukecjDtSB+gkcuaKS6W8/Pa/Rai/zQbCVrBiq9M3IPlKML3R373KZa5xag0uvDi/GbjAQHaYj921Xx5sYa44PUsXfD2LzPLADGgAjL88OIDK1it9XfDnRhPFUSFprexRq77A01/rNSED3e6qKUD+SNg3xAFpWAIITfmMv8FcEdE/TFXT7MDxfYUuA0OghNOh4LsUfHZn92q0ZIo6nlxAcTMNGvOFBjoXzqA200tRSsF/ygFV5aasEZ9HbWKesryZ2S/mDRmBYKLE5PGo/L19GGwC3wYbXEtXKcVAXXjkfMv8bO/sVM= Content-Type: text/plain; charset="UTF-8" Content-ID: <5F88DCA8B21CAF499C8DF2BD5501241E@eurprd05.prod.outlook.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 91c9390a-0cd4-484e-abce-08d6c3f94b61 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Apr 2019 12:28:00.0800 (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 9/9] net/mlx5: add drop action to Direct Verbs E-Switch 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: <20190418122800.PsMKzCkRH_p7YdBnhEqOgsinHnFlqGA8lXHTTZTfApc@z> On Thu, Apr 18, 2019 at 11:28:50AM +0000, Ori Kam wrote: > This commit adds support for drop action when creating E-Switch flow > using DV. >=20 > Signed-off-by: Ori Kam > --- > v2: > * Address ML comments. > --- > drivers/net/mlx5/mlx5.c | 9 +++++++++ > drivers/net/mlx5/mlx5.h | 1 + > drivers/net/mlx5/mlx5_flow_dv.c | 23 ++++++++++++++++------- > drivers/net/mlx5/mlx5_glue.c | 12 ++++++++++++ > drivers/net/mlx5/mlx5_glue.h | 1 + > 5 files changed, 39 insertions(+), 7 deletions(-) >=20 > diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c > index ff24e1d..65c69af 100644 > --- a/drivers/net/mlx5/mlx5.c > +++ b/drivers/net/mlx5/mlx5.c > @@ -357,6 +357,7 @@ struct mlx5_dev_spawn_data { > goto error; > } > sh->fdb_ns =3D ns; > + sh->esw_drop_action =3D mlx5_glue->dr_create_flow_action_drop(); > } > #endif > sh->dv_refcnt++; > @@ -377,6 +378,10 @@ struct mlx5_dev_spawn_data { > mlx5_glue->dr_destroy_ns(sh->fdb_ns); > sh->fdb_ns =3D NULL; > } > + if (sh->esw_drop_action) { > + mlx5_glue->destroy_flow_action(sh->esw_drop_action); > + sh->esw_drop_action =3D NULL; > + } > return err; > #else > (void)priv; > @@ -417,6 +422,10 @@ struct mlx5_dev_spawn_data { > mlx5_glue->dr_destroy_ns(sh->fdb_ns); > sh->fdb_ns =3D NULL; > } > + if (sh->esw_drop_action) { > + mlx5_glue->destroy_flow_action(sh->esw_drop_action); > + sh->esw_drop_action =3D NULL; > + } > #endif > pthread_mutex_destroy(&sh->dv_mutex); > #else > diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h > index 4b6dbc2..a736d57 100644 > --- a/drivers/net/mlx5/mlx5.h > +++ b/drivers/net/mlx5/mlx5.h > @@ -275,6 +275,7 @@ struct mlx5_ibv_shared { > /* RX Direct Rules tables. */ > void *tx_ns; /* TX Direct Rules name space handle. */ > struct mlx5_flow_tbl_resource tx_tbl[MLX5_MAX_TABLES]; > + void *esw_drop_action; /* Pointer to DR E-Switch drop action. */ > /* TX Direct Rules tables/ */ > LIST_HEAD(matchers, mlx5_flow_dv_matcher) matchers; > LIST_HEAD(encap_decap, mlx5_flow_dv_encap_decap_resource) encaps_decaps= ; > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow= _dv.c > index 5997182..5ec8caf 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -4049,6 +4049,7 @@ struct field_modify_info modify_tcp[] =3D { > { > struct mlx5_flow_dv *dv; > struct mlx5_flow *dev_flow; > + struct mlx5_priv *priv =3D dev->data->dev_private; > int n; > int err; > =20 > @@ -4056,13 +4057,21 @@ struct field_modify_info modify_tcp[] =3D { > dv =3D &dev_flow->dv; > n =3D dv->actions_n; > if (flow->actions & MLX5_FLOW_ACTION_DROP) { > - dv->hrxq =3D mlx5_hrxq_drop_new(dev); > - if (!dv->hrxq) { > - rte_flow_error_set > - (error, errno, > - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, > - "cannot get drop hash queue"); > - goto error; > + if (flow->transfer) > + dv->actions[n++] =3D priv->sh->esw_drop_action; > + else { > + dv->hrxq =3D mlx5_hrxq_drop_new(dev); > + if (!dv->hrxq) { > + rte_flow_error_set > + (error, errno, > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > + NULL, > + "cannot get drop hash queue"); > + goto error; > + } > + dv->actions[n++] =3D > + mlx5_glue->dv_create_flow_action_dest_ibv_qp > + (dv->hrxq->qp); Looks like a bug when rebasing it. dv->actions[] is set twice. You should remove this line and move the below = one to this place. Right? Thanks, Yongseok > } > dv->actions[n++] =3D dv->hrxq->action; > } else if (flow->actions & > diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c > index 117190f..b32cd09c 100644 > --- a/drivers/net/mlx5/mlx5_glue.c > +++ b/drivers/net/mlx5/mlx5_glue.c > @@ -394,6 +394,16 @@ > } > =20 > static void * > +mlx5_glue_dr_create_flow_action_drop(void) > +{ > +#ifdef HAVE_MLX5DV_DR_ESWITCH > + return mlx5dv_dr_create_action_drop(); > +#else > + return NULL; > +#endif > +} > + > +static void * > mlx5_glue_dr_create_flow_tbl(void *ns, uint32_t level) > { > #ifdef HAVE_MLX5DV_DR > @@ -861,6 +871,8 @@ > mlx5_glue_dr_create_flow_action_dest_flow_tbl, > .dr_create_flow_action_dest_vport =3D > mlx5_glue_dr_create_flow_action_dest_vport, > + .dr_create_flow_action_drop =3D > + mlx5_glue_dr_create_flow_action_drop, > .dr_create_flow_tbl =3D mlx5_glue_dr_create_flow_tbl, > .dr_destroy_flow_tbl =3D mlx5_glue_dr_destroy_flow_tbl, > .dr_create_ns =3D mlx5_glue_dr_create_ns, > diff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h > index 26f5cb3..1d06583 100644 > --- a/drivers/net/mlx5/mlx5_glue.h > +++ b/drivers/net/mlx5/mlx5_glue.h > @@ -147,6 +147,7 @@ struct mlx5_glue { > struct ibv_cq *(*cq_ex_to_cq)(struct ibv_cq_ex *cq); > void *(*dr_create_flow_action_dest_flow_tbl)(void *tbl); > void *(*dr_create_flow_action_dest_vport)(void *ns, uint32_t vport); > + void *(*dr_create_flow_action_drop)(); > void *(*dr_create_flow_tbl)(void *ns, uint32_t level); > int (*dr_destroy_flow_tbl)(void *tbl); > void *(*dr_create_ns)(struct ibv_context *ctx, > --=20 > 1.8.3.1 >=20