From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0048.outbound.protection.outlook.com [104.47.1.48]) by dpdk.org (Postfix) with ESMTP id 9B8501B118 for ; Thu, 1 Nov 2018 22:03:25 +0100 (CET) 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=jYgxMNWLOmRlhm3b2lai7mwEuupshrXBLhjpDkTtvCA=; b=qSy1Ujorst36g0OyR+tLa4ZX+282qi0zDLr3vlbbvBSbC1UK6r5XCci9dl7APPP3VNmFj/LUnyDvxhTn72OP5f4ff3ckMF4ObCdY9JJWiAJkWMRgqyY2yJvUsUZOScoFZ98gD63djtCgwQeDOx/glXGWNM6Do1N3MBudEq2LFAI= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB3996.eurprd05.prod.outlook.com (52.134.65.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.24; Thu, 1 Nov 2018 21:03:23 +0000 Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::f8a1:fcab:94f0:97cc]) by DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::f8a1:fcab:94f0:97cc%4]) with mapi id 15.20.1273.030; Thu, 1 Nov 2018 21:03:23 +0000 From: Yongseok Koh To: Slava Ovsiienko CC: Shahaf Shuler , "dev@dpdk.org" Thread-Topic: [PATCH v3 07/13] net/mlx5: add VXLAN support to flow prepare routine Thread-Index: AQHUcd0jGw61YEBSckOUljMJFRg7baU7aOKA Date: Thu, 1 Nov 2018 21:03:23 +0000 Message-ID: <20181101210314.GH6118@mtidpdk.mti.labs.mlnx> References: <1539612815-47199-1-git-send-email-viacheslavo@mellanox.com> <1541074741-41368-1-git-send-email-viacheslavo@mellanox.com> <1541074741-41368-8-git-send-email-viacheslavo@mellanox.com> In-Reply-To: <1541074741-41368-8-git-send-email-viacheslavo@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR07CA0043.namprd07.prod.outlook.com (2603:10b6:a03:60::20) To DB3PR0502MB3980.eurprd05.prod.outlook.com (2603:10a6:8:10::27) 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-microsoft-exchange-diagnostics: 1; DB3PR0502MB3996; 6:9rBoEDS2looazfK2kSksiSxzq8+QsWPiHupA0+BEdmdYUaH8k09KCcOWGtYtZZW5M2HftEmaloi+xaJvNunF6H9sJtHdoM817b2vrcKMQ3XRKlVRhrgpcMcYnAi9nzKV2pdiEx80W9QJJfD/Vp+rMFhVdheTPjuh7sm6hpncdBP+1UCW85Ac7mwOjrzt5X/cxDvE5It2rjO/cY1z87fy8wfu8TZqlTep4smxMRJ2RsEabpb6m4HhpfHNFUA920Jl+0Y3CoidAhUUnznsGI/zKEdO6wIfIb8SEN8VoulQT+P+abL8FzQ0YRkrVHpf0oWMI8M1oMCf+vHkg18Lz/NNOI6cn2h6RfoaYD7feUj9MnIv9LhtZesUtsjCV3O0zRDaSwgaoU31bpncO4NCemXD+PndEJBlIeRD/DbrSZcOQj2kFd2IPhFZg09zav6/xvlm2BLCvdmYwiBRJOZTsp5V4Q==; 5:taUmWCk5lizk/IwSBpztBR6Szg9GqbEEwOnwHXR9NGAP4Ly5kgeF5IXKiEZ+x+mntrKxSjozGOXNX7QBhfDUoXXW8kxJdq0rrw4/a0hpVk4TQ/dtoWwhXXMnhGaD/3bvuV1eMMDk108+FX8hB9rq/nR2om0XyUfVj9+ID+/thE4=; 7:hBOHF1Kz+mkU02T3OlrWMROPFRdFU5+RyjSKAOEu8bBo0MzppkPmNZq5PRpcnOAWN/iY0cdaY/2XYbHdHK2/aGJ61nPxv2tQL5bI063bdG3ysr8UF1ibqiOchovcQ2D4oUyxHs4IvYjpYmmrgHJapg== x-ms-office365-filtering-correlation-id: 9f46823b-b6ce-41e2-aa2a-08d6403d7575 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB3PR0502MB3996; x-ms-traffictypediagnostic: DB3PR0502MB3996: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93001095)(3231382)(944501410)(52105095)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:DB3PR0502MB3996; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB3996; x-forefront-prvs: 0843C17679 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(346002)(366004)(39860400002)(376002)(396003)(199004)(189003)(9686003)(6862004)(8676002)(8936002)(4326008)(7736002)(2900100001)(478600001)(97736004)(14454004)(52116002)(71200400001)(71190400001)(81156014)(81166006)(102836004)(386003)(6506007)(68736007)(86362001)(305945005)(25786009)(99286004)(2906002)(105586002)(106356001)(256004)(14444005)(54906003)(186003)(229853002)(66066001)(26005)(6436002)(6486002)(33896004)(6246003)(3846002)(33656002)(76176011)(6512007)(6636002)(486006)(1076002)(476003)(446003)(6116002)(5660300001)(11346002)(316002)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB3996; H:DB3PR0502MB3980.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-microsoft-antispam-message-info: Ix2DwoKP8xueF+1QXv5RC0ICwUKnM+LQSyKXDCQAnLPwtKdtFaP19vTIVHZ50yjGTPtysgw/GihxHrCgByhF1mWWTtP7JpgrfYffHh4myF4EiAKc3tQx+3AR2E96oAnlpDmzunrYinLeH54+cMdgITJvdxhprA/HzJT0swuG+d9F4lwJ/TQmHZaQtacth+1Pjyp4C3ZZH65Ta1D6ZYiAhZ5BqX+aAIDfXWNMTJa7/ntRCEqW/vYGtzscvoaS1jrcWRHQaVU4E/IKtUk9Icwwd74jrN/HGI8wNd7NCZyXBZX/hdjT0VHUnXLV1xaznIvMgQhyliADuwXAt2K/4PJP4Qh3SftOXy7LJGXXcMBtH58= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-ID: <3453C7378B57204187819B4579D2CD24@eurprd05.prod.outlook.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f46823b-b6ce-41e2-aa2a-08d6403d7575 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Nov 2018 21:03:23.1915 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB3996 Subject: Re: [dpdk-dev] [PATCH v3 07/13] net/mlx5: add VXLAN support to flow prepare routine 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: , X-List-Received-Date: Thu, 01 Nov 2018 21:03:26 -0000 On Thu, Nov 01, 2018 at 05:19:28AM -0700, Slava Ovsiienko wrote: > The e-switch Flow prepare function is updated to support VXLAN > encapsulation/and decapsulation actions. The function calculates > buffer size for Netlink message and Flow description structures, > including optional ones for tunneling purposes. >=20 > Suggested-by: Adrien Mazarguil > Signed-off-by: Viacheslav Ovsiienko > --- > drivers/net/mlx5/mlx5_flow_tcf.c | 133 +++++++++++++++++++++++++++++++++= +++++- > 1 file changed, 130 insertions(+), 3 deletions(-) >=20 > diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flo= w_tcf.c > index 7e00232..b5be264 100644 > --- a/drivers/net/mlx5/mlx5_flow_tcf.c > +++ b/drivers/net/mlx5/mlx5_flow_tcf.c > @@ -2389,7 +2389,7 @@ struct pedit_parser { > case RTE_FLOW_ITEM_TYPE_IPV6: > size +=3D SZ_NLATTR_TYPE_OF(uint16_t) + /* Ether type. */ > SZ_NLATTR_TYPE_OF(uint8_t) + /* IP proto. */ > - SZ_NLATTR_TYPE_OF(IPV6_ADDR_LEN) * 4; > + SZ_NLATTR_DATA_OF(IPV6_ADDR_LEN) * 4; > /* dst/src IP addr and mask. */ > flags |=3D MLX5_FLOW_LAYER_OUTER_L3_IPV6; > break; > @@ -2405,6 +2405,10 @@ struct pedit_parser { > /* dst/src port and mask. */ > flags |=3D MLX5_FLOW_LAYER_OUTER_L4_TCP; > break; > + case RTE_FLOW_ITEM_TYPE_VXLAN: > + size +=3D SZ_NLATTR_TYPE_OF(uint32_t); > + flags |=3D MLX5_FLOW_LAYER_VXLAN; > + break; > default: > DRV_LOG(WARNING, > "unsupported item %p type %d," > @@ -2418,6 +2422,69 @@ struct pedit_parser { > } > =20 > /** > + * Calculate size of memory to store the VXLAN encapsultion > + * related items in the Netlink message buffer. Items list > + * is specified by RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP action. > + * The item list should be validated. > + * > + * @param[in] action > + * RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP action object. > + * List of pattern items to scan data from. > + * > + * @return > + * The size the part of Netlink message buffer to store the > + * VXLAN encapsulation item attributes. > + */ > +static int > +flow_tcf_vxlan_encap_size(const struct rte_flow_action *action) > +{ > + const struct rte_flow_item *items; > + int size =3D 0; > + > + assert(action->type =3D=3D RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP); > + assert(action->conf); > + > + items =3D ((const struct rte_flow_action_vxlan_encap *) > + action->conf)->definition; > + assert(items); > + for (; items->type !=3D RTE_FLOW_ITEM_TYPE_END; items++) { > + switch (items->type) { > + case RTE_FLOW_ITEM_TYPE_VOID: > + break; > + case RTE_FLOW_ITEM_TYPE_ETH: > + /* This item does not require message buffer. */ > + break; > + case RTE_FLOW_ITEM_TYPE_IPV4: > + size +=3D SZ_NLATTR_DATA_OF(IPV4_ADDR_LEN) * 2; > + break; > + case RTE_FLOW_ITEM_TYPE_IPV6: > + size +=3D SZ_NLATTR_DATA_OF(IPV6_ADDR_LEN) * 2; > + break; > + case RTE_FLOW_ITEM_TYPE_UDP: { > + const struct rte_flow_item_udp *udp =3D items->mask; > + > + size +=3D SZ_NLATTR_TYPE_OF(uint16_t); > + if (!udp || udp->hdr.src_port !=3D RTE_BE16(0x0000)) > + size +=3D SZ_NLATTR_TYPE_OF(uint16_t); > + break; > + } > + case RTE_FLOW_ITEM_TYPE_VXLAN: > + size +=3D SZ_NLATTR_TYPE_OF(uint32_t); > + break; > + default: > + assert(false); > + DRV_LOG(WARNING, > + "unsupported item %p type %d," > + " items must be validated" > + " before flow creation", > + (const void *)items, items->type); > + return 0; > + } > + } > + return size; > +} > + > +/** > * Calculate maximum size of memory for flow actions of Linux TC flower = and > * extract specified actions. > * > @@ -2486,6 +2553,29 @@ struct pedit_parser { > SZ_NLATTR_TYPE_OF(uint16_t) + /* VLAN ID. */ > SZ_NLATTR_TYPE_OF(uint8_t); /* VLAN prio. */ > break; > + case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP: > + size +=3D SZ_NLATTR_NEST + /* na_act_index. */ > + SZ_NLATTR_STRZ_OF("tunnel_key") + > + SZ_NLATTR_NEST + /* TCA_ACT_OPTIONS. */ > + SZ_NLATTR_TYPE_OF(uint8_t); > + size +=3D SZ_NLATTR_TYPE_OF(struct tc_tunnel_key); > + size +=3D flow_tcf_vxlan_encap_size(actions) + > + RTE_ALIGN_CEIL /* preceding encap params. */ > + (sizeof(struct flow_tcf_vxlan_encap), > + MNL_ALIGNTO); > + flags |=3D MLX5_FLOW_ACTION_VXLAN_ENCAP; > + break; > + case RTE_FLOW_ACTION_TYPE_VXLAN_DECAP: > + size +=3D SZ_NLATTR_NEST + /* na_act_index. */ > + SZ_NLATTR_STRZ_OF("tunnel_key") + > + SZ_NLATTR_NEST + /* TCA_ACT_OPTIONS. */ > + SZ_NLATTR_TYPE_OF(uint8_t); > + size +=3D SZ_NLATTR_TYPE_OF(struct tc_tunnel_key); > + size +=3D RTE_ALIGN_CEIL /* preceding decap params. */ > + (sizeof(struct flow_tcf_vxlan_decap), > + MNL_ALIGNTO); > + flags |=3D MLX5_FLOW_ACTION_VXLAN_DECAP; > + break; > case RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC: > case RTE_FLOW_ACTION_TYPE_SET_IPV4_DST: > case RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC: > @@ -2561,12 +2651,15 @@ struct pedit_parser { > uint64_t *item_flags, uint64_t *action_flags, > struct rte_flow_error *error) > { > - size_t size =3D sizeof(struct mlx5_flow) + > + size_t size =3D RTE_ALIGN_CEIL > + (sizeof(struct mlx5_flow), > + alignof(struct flow_tcf_tunnel_hdr)) + > MNL_ALIGN(sizeof(struct nlmsghdr)) + > MNL_ALIGN(sizeof(struct tcmsg)); > struct mlx5_flow *dev_flow; > struct nlmsghdr *nlh; > struct tcmsg *tcm; > + uint8_t *sp, *tun =3D NULL; > =20 > size +=3D flow_tcf_get_items_and_size(attr, items, item_flags); > size +=3D flow_tcf_get_actions_and_size(actions, action_flags); > @@ -2577,10 +2670,44 @@ struct pedit_parser { > "not enough memory to create E-Switch flow"); > return NULL; > } > - nlh =3D mnl_nlmsg_put_header((void *)(dev_flow + 1)); > + sp =3D (uint8_t *)(dev_flow + 1); > + if (*action_flags & MLX5_FLOW_ACTION_VXLAN_ENCAP) { > + sp =3D RTE_PTR_ALIGN > + (sp, alignof(struct flow_tcf_tunnel_hdr)); > + tun =3D sp; > + sp +=3D RTE_ALIGN_CEIL > + (sizeof(struct flow_tcf_vxlan_encap), > + MNL_ALIGNTO); > +#ifndef NDEBUG > + size -=3D RTE_ALIGN_CEIL > + (sizeof(struct flow_tcf_vxlan_encap), > + MNL_ALIGNTO); > +#endif > + } else if (*action_flags & MLX5_FLOW_ACTION_VXLAN_DECAP) { > + sp =3D RTE_PTR_ALIGN > + (sp, alignof(struct flow_tcf_tunnel_hdr)); > + tun =3D sp; > + sp +=3D RTE_ALIGN_CEIL > + (sizeof(struct flow_tcf_vxlan_decap), > + MNL_ALIGNTO); > +#ifndef NDEBUG > + size -=3D RTE_ALIGN_CEIL > + (sizeof(struct flow_tcf_vxlan_decap), > + MNL_ALIGNTO); > +#endif > + } else { > + sp =3D RTE_PTR_ALIGN(sp, MNL_ALIGNTO); > + } > + nlh =3D mnl_nlmsg_put_header(sp); > tcm =3D mnl_nlmsg_put_extra_header(nlh, sizeof(*tcm)); > *dev_flow =3D (struct mlx5_flow){ > .tcf =3D (struct mlx5_flow_tcf){ > +#ifndef NDEBUG > + .nlsize =3D size - RTE_ALIGN_CEIL > + (sizeof(struct mlx5_flow), > + alignof(struct flow_tcf_tunnel_hdr)), > +#endif > + .tunnel =3D (struct flow_tcf_tunnel_hdr *)tun, > .nlh =3D nlh, > .tcm =3D tcm, > }, One favor. Can you set the header type here instead of _translate()? dev_flow->tcf.tunnel->type =3D tun_type; tun_type can be set above (FLOW_TCF_TUNACT_VXLAN_ENCAP/DECAP). This is because I'm deleting flow->actions field and dev_flow->layers field= as it causes some confusion in parsing. Please put my acked-by tag if you agree and make the change in v4. Thanks, Yongseok