From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0042.outbound.protection.outlook.com [104.47.1.42]) by dpdk.org (Postfix) with ESMTP id 1B7231B146 for ; Thu, 1 Nov 2018 13:19:30 +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=9iGL9iZOEtD1A0UZXWJ6PYLpQf+UAU9C/dICM4Fo3ls=; b=tHRZtI0C48UZ2lwX4QVLkHUy0AHDwz4YJqapHUXJ57y1kFkF0CiBUM8Px45So8v+o3ewfkI3x7opmTRFchrH6r3dqcx51Yi4ecABY0O8iB2polPVcWsYQ2Booqh8habZ9MXodz+ZzBzIMYt0U4pV27OeOArYIS6e+7mHUZyjacU= Received: from AM4PR05MB3265.eurprd05.prod.outlook.com (10.171.186.150) by AM4PR05MB3505.eurprd05.prod.outlook.com (10.171.188.10) 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 12:19:29 +0000 Received: from AM4PR05MB3265.eurprd05.prod.outlook.com ([fe80::544b:a68d:e6a5:ba6e]) by AM4PR05MB3265.eurprd05.prod.outlook.com ([fe80::544b:a68d:e6a5:ba6e%2]) with mapi id 15.20.1273.030; Thu, 1 Nov 2018 12:19:29 +0000 From: Slava Ovsiienko To: Shahaf Shuler CC: "dev@dpdk.org" , Yongseok Koh , Slava Ovsiienko Thread-Topic: [PATCH v3 07/13] net/mlx5: add VXLAN support to flow prepare routine Thread-Index: AQHUcd0irT4wo6f3SkCsPzMaNVOCDg== Date: Thu, 1 Nov 2018 12:19:28 +0000 Message-ID: <1541074741-41368-8-git-send-email-viacheslavo@mellanox.com> References: <1539612815-47199-1-git-send-email-viacheslavo@mellanox.com> <1541074741-41368-1-git-send-email-viacheslavo@mellanox.com> In-Reply-To: <1541074741-41368-1-git-send-email-viacheslavo@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LO2P265CA0079.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:8::19) To AM4PR05MB3265.eurprd05.prod.outlook.com (2603:10a6:205:4::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=viacheslavo@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM4PR05MB3505; 6:7arEOjIH4hLTuCBBfDWDqyDnmWRkt++PCqjX1YKaUtE0w1T0r9gWLGdqfC+IwENVa0aE3aeRz2QHXUm29JxMdnxks8+GdWiAc1a6wj5MVob0iPySvta7ScBbUEQDRMaTqat0oTVpP4g6aEf6PeJjX/4BemEkCxgbXs2mvUgebily5h/485dQH4jKq59+Jd8y0Ga63iE+Ec+AYM6Xivy8LIrRsiwiVL87sF5ONmCFY6eHo0ssh7W+00jTtdfkEHkSMmfbe437Dccytc+EJi7i6gxRz+0tikL+YPMBaijwnVWS9fd4oUapzH/7t2TCOW9Z+wqeHJQHdjdQn8pn5iGEeNS73MvwtftUwLjYyadNP4NNP1xOPBY9kx0pnn1JhAPyLBkwcUdJQCrkd8H4CJxwLe26iT7hGUtODC9fzZeRahFxt5BpYUfN4uOlUojLe/nO6BslCnkS4zCPoM0rCIieMQ==; 5:H8EcOkSunxyVvQDy23TrTikAMjuR09x6HrxUth4cygMmTiZK/B1/XkoApMM0Lciq8XSKkLokss3i/Cu0J4bcPV2sGujnDJdonfvSdSytFn4rWhHWSG4ofs6OjoEORhzvAw4OgORLTkYAM2HU7taPXZtnHqGdb3SUZ7C0avrQmHI=; 7:OFH8JuNZHDqSjJu4iNe52r45JFLJ7MTu2KUqEZIjoPEep2BsIPYgD/T/i6A1Sli57UfAEObq21xyriaFpx3e2Hqjv+tbJtDgX1VtXI1MdF2lI5B5MbIFxol1X689IW3zJ6EF9HP0CAmH6Q2vRxxYpA== x-ms-office365-filtering-correlation-id: a20238b9-ef58-430d-defd-08d63ff44540 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:AM4PR05MB3505; x-ms-traffictypediagnostic: AM4PR05MB3505: 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)(3231382)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:AM4PR05MB3505; BCL:0; PCL:0; RULEID:; SRVR:AM4PR05MB3505; x-forefront-prvs: 0843C17679 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(366004)(136003)(39860400002)(199004)(189003)(7736002)(6506007)(386003)(486006)(14444005)(52116002)(76176011)(256004)(4326008)(36756003)(25786009)(8676002)(66066001)(81156014)(81166006)(5250100002)(99286004)(14454004)(6436002)(107886003)(6512007)(5660300001)(478600001)(53936002)(68736007)(26005)(86362001)(102836004)(97736004)(305945005)(6636002)(2900100001)(6486002)(8936002)(71190400001)(71200400001)(316002)(2906002)(476003)(3846002)(6116002)(186003)(11346002)(54906003)(105586002)(446003)(2616005)(106356001)(6862004)(37006003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3505; H:AM4PR05MB3265.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: c//e5bL7dnFZGdsKOUFJFTLGAiXB8uufiayADcAiFV8CJMUZYCWdOxf0bo3CZLWcodUK+jdByt0JNF2i1jnNTJBESAgC2180xgAEMEVGDKYqoYjxTi4s3sTCSzcUZLkF0VUkAoXLFi3R6aodEUscCT7EQZfwUhpf/xzMeeVK+kbSROwnKvjdwYe68b2+86XAzOnIwcb0Y/eUHm2uDCJOm/aKn2FLRkgebQt3YpvrVIoNfqkfySBtng9E85qM9w3xyohU8mfRRzNRK45DmMhr7HTp0Y7IMnUptiA5MGyNMp43z3z9oTK+HiqcCxi6BNdcBG6UGP2RK5of9GSaeCIGarNDw3jxqUDaqgUw4rh0nAU= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: a20238b9-ef58-430d-defd-08d63ff44540 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Nov 2018 12:19:28.8922 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR05MB3505 Subject: [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 12:19:30 -0000 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. Suggested-by: Adrien Mazarguil Signed-off-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_tcf.c | 133 +++++++++++++++++++++++++++++++++++= +++- 1 file changed, 130 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_= 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 an= d * 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, }, --=20 1.8.3.1