From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0055.outbound.protection.outlook.com [104.47.2.55]) by dpdk.org (Postfix) with ESMTP id ED3C15B3E for ; Thu, 25 Oct 2018 22:21:14 +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=LyvD+b/LlVjesucaoS45+wm7i439rjSPx4Jb55m6JzM=; b=EICZC5CHYxVvTjj2C19OToRyrZhvRej5DV9Lz+wJ1eIEotjFyWoy5fyH/HOQ7Wl8PsWi8ghXEQQF/OlYMYgXGZASSzE5A+gOZZAMFasd4VD6NeMN2H++H35fvjaA9k87+kZCH62jGC3IKYLcCA7oNyuaqW/fO5e0xdlpzaowR/8= Received: from AM4PR05MB3265.eurprd05.prod.outlook.com (10.171.186.150) by AM4PR05MB3314.eurprd05.prod.outlook.com (10.171.187.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1250.30; Thu, 25 Oct 2018 20:21:13 +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.022; Thu, 25 Oct 2018 20:21:13 +0000 From: Slava Ovsiienko To: Yongseok Koh CC: Shahaf Shuler , "dev@dpdk.org" Thread-Topic: [PATCH v2 5/7] net/mlx5: e-switch VXLAN tunnel devices management Thread-Index: AQHUZJFaIbp0XMz/YU2qGX8/bdbdC6UvKhsAgAFDBmA= Date: Thu, 25 Oct 2018 20:21:12 +0000 Message-ID: References: <1538461807-37507-1-git-send-email-viacheslavo@mellanox.com> <1539612815-47199-1-git-send-email-viacheslavo@mellanox.com> <1539612815-47199-6-git-send-email-viacheslavo@mellanox.com> <20181025002759.GA26874@mtidpdk.mti.labs.mlnx> In-Reply-To: <20181025002759.GA26874@mtidpdk.mti.labs.mlnx> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [193.201.81.176] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM4PR05MB3314; 6:4N5kqlpUoSsEZ34miG46eTJ/eOzDf0cGMZzcpqnb1zTqeioDHInOYaoaN5IOtIMjOQhL8fPqJgToYYROwcQz5XO3XBtsuJQSjG7Yd2OQCyiUVgGp/LiPuVFHK1Dwn65h70+JFaQoraRBNca0YNiGOjnt7mJ5CqdIlCenMieLR2EaCgk8Tmca1BhAt5U8KuMjMM0ZR5Go5GF5A3m3gDeWlvSYcCUuprUZdruVEZD3eNdJfRhhj0OK+wmCpyMuB+fuzD5pGNP2O22O7/VQzQDjb1ld4F83Cn7GuI1hP8See46gj5i6OAYOB2uLef6zyQSPNV13vVybnAzlcu7cIazIrIIre7YV7rJqkILYHmjsHvVCW5eT6XjnpW5qwWy+zY9EBat1EsI0u13chz+iT+xMAJBiz4IDZL17B69BhTNGtYu1jsYtY2ru2UxaTLb46lkNuDyh3IIWur9ilD9Kf0rHxg==; 5:Ac/hpySwLILY7VQnGE/jww8K6cf1ii67WHGmUlr09465FXFf9dn/Lk3i7F7/UC6VdkvCFPbr9i3DxjOZaENkcLcMOMwv0j2eiunhcmfp5LkQFK2fOh9v2z1elQseIGptaIeS9oAv4UopKU6NnqRJdNeXe30qTvKR/Yi6w2qyua8=; 7:iobQ4xnf/ZtNhqXY/IpJVW649RRVvEGIWpDwCWACvkv8PMZJCPGK/pFQB8OqECOLCuKjg98Jo3fwNENOWTRITF5aC6AjPdEF67zcqqJxQqlkhrRYKC77x62RE/2HCSwmVz3t/yr1QWNSVgGzMJC93U1LZz70V+a73X/xwG01jMOvXJR5ezAtwG6zhaykyylcHWTk4bAmtizVec69QeJPa7xQKhmO4WMf23voI2jO2k4bZcydqEGur9X5zjRbtfUk x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-correlation-id: 68ace368-f51f-41a0-a7e9-08d63ab768be 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:AM4PR05MB3314; x-ms-traffictypediagnostic: AM4PR05MB3314: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(211171220733660)(788757137089); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231355)(944501410)(52105095)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:AM4PR05MB3314; BCL:0; PCL:0; RULEID:; SRVR:AM4PR05MB3314; x-forefront-prvs: 083691450C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(346002)(136003)(366004)(396003)(189003)(199004)(52314003)(13464003)(55016002)(561944003)(6636002)(9686003)(2900100001)(6436002)(6246003)(5660300001)(53946003)(53936002)(6862004)(229853002)(4326008)(2906002)(102836004)(6346003)(6116002)(26005)(25786009)(86362001)(14454004)(74316002)(3846002)(7736002)(478600001)(305945005)(186003)(53546011)(476003)(71200400001)(76176011)(7696005)(99286004)(5250100002)(8676002)(81156014)(66066001)(11346002)(486006)(8936002)(446003)(6506007)(71190400001)(4744004)(81166006)(105586002)(316002)(5024004)(97736004)(14444005)(256004)(106356001)(93886005)(68736007)(54906003)(33656002)(559001)(579004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3314; H:AM4PR05MB3265.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=viacheslavo@mellanox.com; x-microsoft-antispam-message-info: yf4Zzb1mDKfClaNiemYWe2h+5029hxZYwX9m73MgigsUlWfPtuL6i0DoJ/ilSl3s92uXK6+ACeAkRb6Iec46E0qHdDgc1zvtzBKCYetN4sDgJAcda04sciE6z730G4sJl09wuYjpJ9prNbwUE8YwBTBLSUU1rmWyTjaMCLSuWIcFI5IFTutmHWuhOZnYa10hUiKunigtSBswYMlYz9Hi6daWFKKtD9T5h9w8Et9PrJTKjo/bi3QBZKjfv78fD65onwEYZBka/HeNGt7OzGHiTsaFSSd3u6owYQ/OSKxwAQ+sidq9zwN9Zgul2kfZHDlwOjgCz4jW326RaUx64m5dRv9jm/klvohnFG7WVT9ewYE= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM 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: 68ace368-f51f-41a0-a7e9-08d63ab768be X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Oct 2018 20:21:12.8067 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR05MB3314 Subject: Re: [dpdk-dev] [PATCH v2 5/7] net/mlx5: e-switch VXLAN tunnel devices management 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, 25 Oct 2018 20:21:15 -0000 > -----Original Message----- > From: Yongseok Koh > Sent: Thursday, October 25, 2018 3:28 > To: Slava Ovsiienko > Cc: Shahaf Shuler ; dev@dpdk.org > Subject: Re: [PATCH v2 5/7] net/mlx5: e-switch VXLAN tunnel devices > management >=20 > On Mon, Oct 15, 2018 at 02:13:33PM +0000, Viacheslav Ovsiienko wrote: > > VXLAN interfaces are dynamically created for each local UDP port of > > outer networks and then used as targets for TC "flower" filters in > > order to perform encapsulation. These VXLAN interfaces are > > system-wide, the only one device with given UDP port can exist in the > > system (the attempt of creating another device with the same UDP local > > port returns EEXIST), so PMD should support the shared device > > instances database for PMD instances. These VXLAN implicitly created > > devices are called VTEPs (Virtual Tunnel End Points). > > > > Creation of the VTEP occurs at the moment of rule applying. The link > > is set up, root ingress qdisc is also initialized. > > > > Encapsulation VTEPs are created on per port basis, the single VTEP is > > attached to the outer interface and is shared for all encapsulation > > rules on this interface. The source UDP port is automatically selected > > in range 30000-60000. > > > > For decapsulaton one VTEP is created per every unique UDP local port > > to accept tunnel traffic. The name of created VTEP consists of prefix > > "vmlx_" and the number of UDP port in decimal digits without leading > > zeros (vmlx_4789). The VTEP can be preliminary created in the system > > before the launching > > application, it allows to share UDP ports between primary > > and secondary processes. > > > > Suggested-by: Adrien Mazarguil > > Signed-off-by: Viacheslav Ovsiienko > > --- > > drivers/net/mlx5/mlx5_flow_tcf.c | 503 > > ++++++++++++++++++++++++++++++++++++++- > > 1 file changed, 499 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c > > b/drivers/net/mlx5/mlx5_flow_tcf.c > > index d6840d5..efa9c3b 100644 > > --- a/drivers/net/mlx5/mlx5_flow_tcf.c > > +++ b/drivers/net/mlx5/mlx5_flow_tcf.c > > @@ -3443,6 +3443,432 @@ struct pedit_parser { > > return -err; > > } > > > > +/* VTEP device list is shared between PMD port instances. */ static > > +LIST_HEAD(, mlx5_flow_tcf_vtep) > > + vtep_list_vxlan =3D LIST_HEAD_INITIALIZER(); static > pthread_mutex_t > > +vtep_list_mutex =3D PTHREAD_MUTEX_INITIALIZER; >=20 > What's the reason for choosing pthread_mutex instead of rte_*_lock? The sharing this database for secondary processes? >=20 > > + > > +/** > > + * Deletes VTEP network device. > > + * > > + * @param[in] tcf > > + * Context object initialized by mlx5_flow_tcf_context_create(). > > + * @param[in] vtep > > + * Object represinting the network device to delete. Memory > > + * allocated for this object is freed by routine. > > + */ > > +static void > > +flow_tcf_delete_iface(struct mlx6_flow_tcf_context *tcf, > > + struct mlx5_flow_tcf_vtep *vtep) { > > + struct nlmsghdr *nlh; > > + struct ifinfomsg *ifm; > > + alignas(struct nlmsghdr) > > + uint8_t buf[mnl_nlmsg_size(MNL_ALIGN(sizeof(*ifm))) + 8]; > > + int ret; > > + > > + assert(!vtep->refcnt); > > + if (vtep->created && vtep->ifindex) { >=20 > First of all vtep->created seems of no use. It is introduced to select th= e error > message in flow_tcf_create_iface(). I don't see any necessity to distingu= ish > between 'vtep is allocated by rte_malloc()' and 'vtep is created in kerne= l'. created flag indicates the iface is created by our code. The VXLAN decap devices must have the specified UDP port, we can not create multiple VXLAN devices with the same UDP port - EEXIST is returned. So, we = have to share device. One option is create device before DPDK application launch= and use these pre-created devices. Inthis case created flag is not set and VXLAN de= vice is not reinitialized, and not deleted. > And why do you need to check vtep->ifindex as well? If vtep is created in > kernel and its ifindex isn't set, that should be an error which had to be= hanled > in flow_tcf_create_iface(). Such a vtep shouldn't exist. Yes, if we did not get ifindex of device - vtep is not created, error retur= ned. We just can not operate w/o ifindex. >=20 > Also, the refcnt management is a bit strange. Please put an abstraction b= y > adding create_iface(), get_iface() and release_iface(). In the get_ifce()= , > vtep->refcnt should be incremented. And in the release_iface(), it > vtep->decrease the OK. Good proposal. I'll refactor the code. > refcnt and if it reaches to zero, the iface can be removed. create_iface(= ) will > set the refcnt to 1. And if you refer to mlx5_hrxq_get(), it even does > searching the list not by repeating the same lookup code here and there. > That will make your code much simpler. >=20 > > + DRV_LOG(INFO, "VTEP delete (%d)", vtep->ifindex); > > + nlh =3D mnl_nlmsg_put_header(buf); > > + nlh->nlmsg_type =3D RTM_DELLINK; > > + nlh->nlmsg_flags =3D NLM_F_REQUEST; > > + ifm =3D mnl_nlmsg_put_extra_header(nlh, sizeof(*ifm)); > > + ifm->ifi_family =3D AF_UNSPEC; > > + ifm->ifi_index =3D vtep->ifindex; > > + ret =3D flow_tcf_nl_ack(tcf, nlh, 0, NULL, NULL); > > + if (ret) > > + DRV_LOG(WARNING, "netlink: error deleting VXLAN > " > > + "encap/decap ifindex %u", > > + ifm->ifi_index); > > + } > > + rte_free(vtep); > > +} > > + > > +/** > > + * Creates VTEP network device. > > + * > > + * @param[in] tcf > > + * Context object initialized by mlx5_flow_tcf_context_create(). > > + * @param[in] ifouter > > + * Outer interface to attach new-created VXLAN device > > + * If zero the VXLAN device will not be attached to any device. > > + * @param[in] port > > + * UDP port of created VTEP device. > > + * @param[out] error > > + * Perform verbose error reporting if not NULL. > > + * > > + * @return > > + * Pointer to created device structure on success, NULL otherwise > > + * and rte_errno is set. > > + */ > > +#ifndef HAVE_IFLA_VXLAN_COLLECT_METADATA >=20 > Why negative(ifndef) first intead of positive(ifdef)? Hm. Did I miss the rule. Positive #ifdef first? OK. >=20 > > +static struct mlx5_flow_tcf_vtep* > > +flow_tcf_create_iface(struct mlx5_flow_tcf_context *tcf __rte_unused, > > + unsigned int ifouter __rte_unused, > > + uint16_t port __rte_unused, > > + struct rte_flow_error *error) { > > + rte_flow_error_set(error, ENOTSUP, > > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, > > + "netlink: failed to create VTEP, " > > + "VXLAN metadat is not supported by kernel"); >=20 > Typo. OK. "metadata are not supported". >=20 > > + return NULL; > > +} > > +#else > > +static struct mlx5_flow_tcf_vtep* > > +flow_tcf_create_iface(struct mlx5_flow_tcf_context *tcf, >=20 > How about adding 'vtep'? It sounds vague - creating a general interface. > E.g., flow_tcf_create_vtep_iface()? OK. >=20 > > + unsigned int ifouter, > > + uint16_t port, struct rte_flow_error *error) { > > + struct mlx5_flow_tcf_vtep *vtep; > > + struct nlmsghdr *nlh; > > + struct ifinfomsg *ifm; > > + char name[sizeof(MLX5_VXLAN_DEVICE_PFX) + 24]; > > + alignas(struct nlmsghdr) > > + uint8_t buf[mnl_nlmsg_size(sizeof(*ifm)) + 128 + >=20 > Use a macro for '128'. Can't know the meaning. OK. I think we should calculate the buffer size explicitly. >=20 > > + SZ_NLATTR_DATA_OF(sizeof(name)) + > > + SZ_NLATTR_NEST * 2 + > > + SZ_NLATTR_STRZ_OF("vxlan") + > > + SZ_NLATTR_DATA_OF(sizeof(uint32_t)) + > > + SZ_NLATTR_DATA_OF(sizeof(uint32_t)) + > > + SZ_NLATTR_DATA_OF(sizeof(uint16_t)) + > > + SZ_NLATTR_DATA_OF(sizeof(uint8_t))]; > > + struct nlattr *na_info; > > + struct nlattr *na_vxlan; > > + rte_be16_t vxlan_port =3D RTE_BE16(port); >=20 > Use rte_cpu_to_be_*() instead. Yes, I'll recheck the whole code for this issue. >=20 > > + int ret; > > + > > + vtep =3D rte_zmalloc(__func__, sizeof(*vtep), > > + alignof(struct mlx5_flow_tcf_vtep)); > > + if (!vtep) { > > + rte_flow_error_set > > + (error, ENOMEM, > RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > > + NULL, "unadble to allocate memory for VTEP desc"); > > + return NULL; > > + } > > + *vtep =3D (struct mlx5_flow_tcf_vtep){ > > + .refcnt =3D 0, > > + .port =3D port, > > + .created =3D 0, > > + .ifouter =3D 0, > > + .ifindex =3D 0, > > + .local =3D LIST_HEAD_INITIALIZER(), > > + .neigh =3D LIST_HEAD_INITIALIZER(), > > + }; > > + memset(buf, 0, sizeof(buf)); > > + nlh =3D mnl_nlmsg_put_header(buf); > > + nlh->nlmsg_type =3D RTM_NEWLINK; > > + nlh->nlmsg_flags =3D NLM_F_REQUEST | NLM_F_CREATE | > NLM_F_EXCL; > > + ifm =3D mnl_nlmsg_put_extra_header(nlh, sizeof(*ifm)); > > + ifm->ifi_family =3D AF_UNSPEC; > > + ifm->ifi_type =3D 0; > > + ifm->ifi_index =3D 0; > > + ifm->ifi_flags =3D IFF_UP; > > + ifm->ifi_change =3D 0xffffffff; > > + snprintf(name, sizeof(name), "%s%u", MLX5_VXLAN_DEVICE_PFX, > port); > > + mnl_attr_put_strz(nlh, IFLA_IFNAME, name); > > + na_info =3D mnl_attr_nest_start(nlh, IFLA_LINKINFO); > > + assert(na_info); > > + mnl_attr_put_strz(nlh, IFLA_INFO_KIND, "vxlan"); > > + na_vxlan =3D mnl_attr_nest_start(nlh, IFLA_INFO_DATA); > > + if (ifouter) > > + mnl_attr_put_u32(nlh, IFLA_VXLAN_LINK, ifouter); > > + assert(na_vxlan); > > + mnl_attr_put_u8(nlh, IFLA_VXLAN_COLLECT_METADATA, 1); > > + mnl_attr_put_u8(nlh, IFLA_VXLAN_UDP_ZERO_CSUM6_RX, 1); > > + mnl_attr_put_u8(nlh, IFLA_VXLAN_LEARNING, 0); > > + mnl_attr_put_u16(nlh, IFLA_VXLAN_PORT, vxlan_port); > > + mnl_attr_nest_end(nlh, na_vxlan); > > + mnl_attr_nest_end(nlh, na_info); > > + assert(sizeof(buf) >=3D nlh->nlmsg_len); > > + ret =3D flow_tcf_nl_ack(tcf, nlh, 0, NULL, NULL); > > + if (ret) > > + DRV_LOG(WARNING, > > + "netlink: VTEP %s create failure (%d)", > > + name, rte_errno); > > + else > > + vtep->created =3D 1; >=20 > Flow of code here isn't smooth, thus could be error-prone. Most of all, I > don't like ret has multiple meanings. ret should be return value but you = are > using it to store ifindex. >=20 > > + if (ret && ifouter) > > + ret =3D 0; > > + else > > + ret =3D if_nametoindex(name); >=20 > If vtep isn't created and ifouter is set, then skip init below, which mea= ns, if ifouter is set for VXLAN encap devices. They should be attached to ifouter and can not be shared. So, if ifouter I set - we do not use the precreated/= existing VXLAN devices. We have to create our own not shared device. > vtep is created or ifouter is set, it tries to get ifindex of vtep. > But why do you want to try to call this API even if it failed to create v= tep? > Let's not make code flow convoluted even though it logically works. Let's > make it straightforward. >=20 > > + if (ret) { > > + vtep->ifindex =3D ret; > > + vtep->ifouter =3D ifouter; > > + memset(buf, 0, sizeof(buf)); > > + nlh =3D mnl_nlmsg_put_header(buf); > > + nlh->nlmsg_type =3D RTM_NEWLINK; > > + nlh->nlmsg_flags =3D NLM_F_REQUEST; > > + ifm =3D mnl_nlmsg_put_extra_header(nlh, sizeof(*ifm)); > > + ifm->ifi_family =3D AF_UNSPEC; > > + ifm->ifi_type =3D 0; > > + ifm->ifi_index =3D vtep->ifindex; > > + ifm->ifi_flags =3D IFF_UP; > > + ifm->ifi_change =3D IFF_UP; > > + ret =3D flow_tcf_nl_ack(tcf, nlh, 0, NULL, NULL); > > + if (ret) { > > + DRV_LOG(WARNING, > > + "netlink: VTEP %s set link up failure (%d)", > > + name, rte_errno); > > + rte_free(vtep); > > + rte_flow_error_set > > + (error, -errno, > > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > NULL, > > + "netlink: failed to set VTEP link up"); > > + vtep =3D NULL; > > + } else { > > + ret =3D mlx5_flow_tcf_init(tcf, vtep->ifindex, error); > > + if (ret) > > + DRV_LOG(WARNING, > > + "VTEP %s init failure (%d)", name, rte_errno); > > + } > > + } else { > > + DRV_LOG(WARNING, > > + "VTEP %s failed to get index (%d)", name, errno); > > + rte_flow_error_set > > + (error, -errno, > > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, > > + !vtep->created ? "netlink: failed to create VTEP" : > > + "netlink: failed to retrieve VTEP ifindex"); > > + ret =3D 1; >=20 > If it fails to create a vtep above, it will print out two warning message= s and > one rte_flow_error message. And it even selects message to print between > two? > And there's another info msg at the end even in case of failure. Do you r= eally > want to do this even with manipulating ret to change code path? Not a go= od > practice. >=20 > Usually, code path should be straightforward for sucessful path and for > errors/failures, return immediately or use 'goto' if there's need for cle= anup. >=20 > Please refactor entire function. I think I'll split it in two ones - for attached and potentially shared ifa= ces. >=20 > > + } > > + if (ret) { > > + flow_tcf_delete_iface(tcf, vtep); > > + vtep =3D NULL; > > + } > > + DRV_LOG(INFO, "VTEP create (%d, %s)", vtep->port, vtep ? "OK" : > "error"); > > + return vtep; > > +} > > +#endif /* HAVE_IFLA_VXLAN_COLLECT_METADATA */ > > + > > +/** > > + * Create target interface index for VXLAN tunneling decapsulation. > > + * In order to share the UDP port within the other interfaces the > > + * VXLAN device created as not attached to any interface (if created). > > + * > > + * @param[in] tcf > > + * Context object initialized by mlx5_flow_tcf_context_create(). > > + * @param[in] dev_flow > > + * Flow tcf object with tunnel structure pointer set. > > + * @param[out] error > > + * Perform verbose error reporting if not NULL. > > + * @return > > + * Interface index on success, zero otherwise and rte_errno is set. >=20 > Return negative errno in case of failure like others. Anyway, we have to return an index. If we do not return it as function resu= lt we will need to provide some extra pointing parameter, it complicates the c= ode. >=20 > * Interface index on success, a negative errno value otherwise and > rte_errno is set. >=20 > > + */ > > +static unsigned int > > +flow_tcf_decap_vtep_create(struct mlx5_flow_tcf_context *tcf, > > + struct mlx5_flow *dev_flow, > > + struct rte_flow_error *error) > > +{ > > + struct mlx5_flow_tcf_vtep *vtep, *vlst; > > + uint16_t port =3D dev_flow->tcf.vxlan_decap->udp_port; > > + > > + vtep =3D NULL; > > + LIST_FOREACH(vlst, &vtep_list_vxlan, next) { > > + if (vlst->port =3D=3D port) { > > + vtep =3D vlst; > > + break; > > + } > > + } >=20 > You just need one variable. Yes. There is a long story, I forgot to revert code to one variable after d= ebugging. >=20 > struct mlx5_flow_tcf_vtep *vtep; >=20 > LIST_FOREACH(vtep, &vtep_list_vxlan, next) { > if (vtep->port =3D=3D port) > break; > } >=20 > > + if (!vtep) { > > + vtep =3D flow_tcf_create_iface(tcf, 0, port, error); > > + if (vtep) > > + LIST_INSERT_HEAD(&vtep_list_vxlan, vtep, next); > > + } else { > > + if (vtep->ifouter) { > > + rte_flow_error_set(error, -errno, > > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > NULL, > > + "Failed to create decap VTEP, attached " > > + "device with the same UDP port exists"); > > + vtep =3D NULL; >=20 > Making vtep null to skip the following code? Yes. To avoid multiple return operators in code. > Please merge the two same > if/else and make the code path strightforward. And which errno do you > expect here? > Should it be set EEXIST instead? Not always. Netlink returns the code.=20 >=20 > > + } > > + } > > + if (vtep) { > > + vtep->refcnt++; > > + assert(vtep->ifindex); > > + return vtep->ifindex; > > + } else { > > + return 0; > > + } >=20 > Why repeating same if/else? >=20 >=20 > This is my suggestion but if you take my suggestion to have > flow_tcf_[create|get|release]_iface(), this will get much simpler. Agree. >=20 > { > struct mlx5_flow_tcf_vtep *vtep; > uint16_t port =3D dev_flow->tcf.vxlan_decap->udp_port; >=20 > LIST_FOREACH(vtep, &vtep_list_vxlan, next) { > if (vtep->port =3D=3D port) > break; > } > if (vtep && vtep->ifouter) > return rte_flow_error_set(... EEXIST ...); > else if (vtep) { > ++vtep->refcnt; > } else { > vtep =3D flow_tcf_create_iface(tcf, 0, port, error); > if (!vtep) > return rte_flow_error_set(...); > LIST_INSERT_HEAD(&vtep_list_vxlan, vtep, next); > } > assert(vtep->ifindex); > return vtep->ifindex; > } >=20 >=20 > > +} > > + > > +/** > > + * Creates target interface index for VXLAN tunneling encapsulation. > > + * > > + * @param[in] tcf > > + * Context object initialized by mlx5_flow_tcf_context_create(). > > + * @param[in] ifouter > > + * Network interface index to attach VXLAN encap device to. > > + * @param[in] dev_flow > > + * Flow tcf object with tunnel structure pointer set. > > + * @param[out] error > > + * Perform verbose error reporting if not NULL. > > + * @return > > + * Interface index on success, zero otherwise and rte_errno is set. > > + */ > > +static unsigned int > > +flow_tcf_encap_vtep_create(struct mlx5_flow_tcf_context *tcf, > > + unsigned int ifouter, > > + struct mlx5_flow *dev_flow __rte_unused, > > + struct rte_flow_error *error) > > +{ > > + static uint16_t encap_port =3D MLX5_VXLAN_PORT_RANGE_MIN - 1; > > + struct mlx5_flow_tcf_vtep *vtep, *vlst; > > + > > + assert(ifouter); > > + /* Look whether the attached VTEP for encap is created. */ > > + vtep =3D NULL; > > + LIST_FOREACH(vlst, &vtep_list_vxlan, next) { > > + if (vlst->ifouter =3D=3D ifouter) { > > + vtep =3D vlst; > > + break; > > + } > > + } >=20 > Same here. >=20 > > + if (!vtep) { > > + uint16_t pcnt; > > + > > + /* Not found, we should create the new attached VTEP. */ > > +/* > > + * TODO: not implemented yet > > + * flow_tcf_encap_iface_cleanup(tcf, ifouter); > > + * flow_tcf_encap_local_cleanup(tcf, ifouter); > > + * flow_tcf_encap_neigh_cleanup(tcf, ifouter); */ >=20 > Personal note is not appropriate even though it is removed in the followi= ng > patch. >=20 > > + for (pcnt =3D 0; pcnt <=3D (MLX5_VXLAN_PORT_RANGE_MAX > > + - MLX5_VXLAN_PORT_RANGE_MIN); > pcnt++) { > > + encap_port++; > > + /* Wraparound the UDP port index. */ > > + if (encap_port < MLX5_VXLAN_PORT_RANGE_MIN > || > > + encap_port > MLX5_VXLAN_PORT_RANGE_MAX) > > + encap_port =3D > MLX5_VXLAN_PORT_RANGE_MIN; > > + /* Check whether UDP port is in already in use. */ > > + vtep =3D NULL; > > + LIST_FOREACH(vlst, &vtep_list_vxlan, next) { > > + if (vlst->port =3D=3D encap_port) { > > + vtep =3D vlst; > > + break; > > + } > > + } >=20 > If you want to find out an empty port number, you can use rte_bitmap > instead of repeating searching the entire list for all possible port numb= ers. We do not expect too many VXLAN devices have been created. bitmap. >=20 > > + if (vtep) { > > + vtep =3D NULL; > > + continue; > > + } > > + vtep =3D flow_tcf_create_iface(tcf, ifouter, > > + encap_port, error); > > + if (vtep) { > > + LIST_INSERT_HEAD(&vtep_list_vxlan, vtep, > next); > > + break; > > + } > > + if (rte_errno !=3D EEXIST) > > + break; > > + } > > + } > > + if (!vtep) > > + return 0; > > + vtep->refcnt++; > > + assert(vtep->ifindex); > > + return vtep->ifindex; >=20 > Please refactor this func according to what I suggested for > flow_tcf_decap_vtep_create() and flow_tcf_delete_iface(). >=20 > > +} > > + > > +/** > > + * Creates target interface index for tunneling of any type. > > + * > > + * @param[in] tcf > > + * Context object initialized by mlx5_flow_tcf_context_create(). > > + * @param[in] ifouter > > + * Network interface index to attach VXLAN encap device to. > > + * @param[in] dev_flow > > + * Flow tcf object with tunnel structure pointer set. > > + * @param[out] error > > + * Perform verbose error reporting if not NULL. > > + * @return > > + * Interface index on success, zero otherwise and rte_errno is set. >=20 > * Interface index on success, a negative errno value otherwise and > * rte_errno is set. >=20 > > + */ > > +static unsigned int > > +flow_tcf_tunnel_vtep_create(struct mlx5_flow_tcf_context *tcf, > > + unsigned int ifouter, > > + struct mlx5_flow *dev_flow, > > + struct rte_flow_error *error) > > +{ > > + unsigned int ret; > > + > > + assert(dev_flow->tcf.tunnel); > > + pthread_mutex_lock(&vtep_list_mutex); > > + switch (dev_flow->tcf.tunnel->type) { > > + case MLX5_FLOW_TCF_TUNACT_VXLAN_ENCAP: > > + ret =3D flow_tcf_encap_vtep_create(tcf, ifouter, > > + dev_flow, error); > > + break; > > + case MLX5_FLOW_TCF_TUNACT_VXLAN_DECAP: > > + ret =3D flow_tcf_decap_vtep_create(tcf, dev_flow, error); > > + break; > > + default: > > + rte_flow_error_set(error, ENOTSUP, > > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > NULL, > > + "unsupported tunnel type"); > > + ret =3D 0; > > + break; > > + } > > + pthread_mutex_unlock(&vtep_list_mutex); > > + return ret; > > +} > > + > > +/** > > + * Deletes tunneling interface by UDP port. > > + * > > + * @param[in] tcf > > + * Context object initialized by mlx5_flow_tcf_context_create(). > > + * @param[in] ifindex > > + * Network interface index of VXLAN device. > > + * @param[in] dev_flow > > + * Flow tcf object with tunnel structure pointer set. > > + */ > > +static void > > +flow_tcf_tunnel_vtep_delete(struct mlx5_flow_tcf_context *tcf, > > + unsigned int ifindex, > > + struct mlx5_flow *dev_flow) > > +{ > > + struct mlx5_flow_tcf_vtep *vtep, *vlst; > > + > > + assert(dev_flow->tcf.tunnel); > > + pthread_mutex_lock(&vtep_list_mutex); > > + vtep =3D NULL; > > + LIST_FOREACH(vlst, &vtep_list_vxlan, next) { > > + if (vlst->ifindex =3D=3D ifindex) { > > + vtep =3D vlst; > > + break; > > + } > > + } >=20 > It is weird. You just can have vtep pointer in the dev_flow->tcf.tunnel i= nstead > of ifindex_tun which is same as vtep->ifindex like the assertion below. T= hen, > this lookup can be skipped. OK. Good optimization. >=20 > > + if (!vtep) { > > + DRV_LOG(WARNING, "No VTEP device found in the list"); > > + goto exit; > > + } > > + switch (dev_flow->tcf.tunnel->type) { > > + case MLX5_FLOW_TCF_TUNACT_VXLAN_DECAP: > > + break; > > + case MLX5_FLOW_TCF_TUNACT_VXLAN_ENCAP: > > +/* > > + * TODO: Remove the encap ancillary rules first. > > + * flow_tcf_encap_neigh(tcf, vtep, dev_flow, false, NULL); > > + * flow_tcf_encap_local(tcf, vtep, dev_flow, false, NULL); */ >=20 > Is it a personal note? Please remove. OK. >=20 > > + break; > > + default: > > + assert(false); > > + DRV_LOG(WARNING, "Unsupported tunnel type"); > > + break; > > + } > > + assert(dev_flow->tcf.tunnel->ifindex_tun =3D=3D vtep->ifindex); > > + assert(vtep->refcnt); > > + if (!vtep->refcnt || !--vtep->refcnt) { > > + LIST_REMOVE(vtep, next); > > + flow_tcf_delete_iface(tcf, vtep); > > + } > > +exit: > > + pthread_mutex_unlock(&vtep_list_mutex); > > +} > > + > > /** > > * Apply flow to E-Switch by sending Netlink message. > > * > > @@ -3461,18 +3887,61 @@ struct pedit_parser { > > struct rte_flow_error *error) { > > struct priv *priv =3D dev->data->dev_private; > > - struct mlx5_flow_tcf_context *nl =3D priv->tcf_context; > > + struct mlx5_flow_tcf_context *tcf =3D priv->tcf_context; > > struct mlx5_flow *dev_flow; > > struct nlmsghdr *nlh; > > + int ret; > > > > dev_flow =3D LIST_FIRST(&flow->dev_flows); > > /* E-Switch flow can't be expanded. */ > > assert(!LIST_NEXT(dev_flow, next)); > > + if (dev_flow->tcf.applied) > > + return 0; > > nlh =3D dev_flow->tcf.nlh; > > nlh->nlmsg_type =3D RTM_NEWTFILTER; > > nlh->nlmsg_flags =3D NLM_F_REQUEST | NLM_F_CREATE | > NLM_F_EXCL; > > - if (!flow_tcf_nl_ack(nl, nlh, 0, NULL, NULL)) > > + if (dev_flow->tcf.tunnel) { > > + /* > > + * Replace the interface index, target for > > + * encapsulation, source for decapsulation. > > + */ > > + assert(!dev_flow->tcf.tunnel->ifindex_tun); > > + assert(dev_flow->tcf.tunnel->ifindex_ptr); > > + /* Create actual VTEP device when rule is being applied. */ > > + dev_flow->tcf.tunnel->ifindex_tun > > + =3D flow_tcf_tunnel_vtep_create(tcf, > > + *dev_flow->tcf.tunnel->ifindex_ptr, > > + dev_flow, error); > > + DRV_LOG(INFO, "Replace ifindex: %d->%d", > > + dev_flow->tcf.tunnel->ifindex_tun, > > + *dev_flow->tcf.tunnel->ifindex_ptr); > > + if (!dev_flow->tcf.tunnel->ifindex_tun) > > + return -rte_errno; > > + dev_flow->tcf.tunnel->ifindex_org > > + =3D *dev_flow->tcf.tunnel->ifindex_ptr; > > + *dev_flow->tcf.tunnel->ifindex_ptr > > + =3D dev_flow->tcf.tunnel->ifindex_tun; > > + } > > + ret =3D flow_tcf_nl_ack(tcf, nlh, 0, NULL, NULL); > > + if (dev_flow->tcf.tunnel) { > > + DRV_LOG(INFO, "Restore ifindex: %d->%d", > > + dev_flow->tcf.tunnel->ifindex_org, > > + *dev_flow->tcf.tunnel->ifindex_ptr); > > + *dev_flow->tcf.tunnel->ifindex_ptr > > + =3D dev_flow->tcf.tunnel->ifindex_org; > > + dev_flow->tcf.tunnel->ifindex_org =3D 0; >=20 > ifindex_org looks a temporary storage in this code. And this kind of hass= le > (replace/restore) is there because you took the ifindex from the netlink > message. Why don't you have just >=20 > struct mlx5_flow_tcf_tunnel_hdr { > uint32_t type; /**< Tunnel action type. */ > unsigned int ifindex; /**< Original dst/src interface */ > struct mlx5_flow_tcf_vtep *vtep; /**< Tunnel endpoint device. */ > unsigned int *nlmsg_ifindex_ptr; /**< ifindex ptr in Netlink message. > */ }; >=20 > and don't change ifindex? I propose to use the local variable for ifindex_org and do not keep it in structure. *ifindex_ptr will keep. With best regards, Slava >=20 > Thanks, > Yongseok >=20 > > + } > > + if (!ret) { > > + dev_flow->tcf.applied =3D 1; > > return 0; > > + } > > + DRV_LOG(WARNING, "netlink: failed to create TC rule (%d)", > rte_errno); > > + if (dev_flow->tcf.tunnel->ifindex_tun) { > > + flow_tcf_tunnel_vtep_delete(tcf, > > + dev_flow->tcf.tunnel->ifindex_tun, > > + dev_flow); > > + dev_flow->tcf.tunnel->ifindex_tun =3D 0; > > + } > > return rte_flow_error_set(error, rte_errno, > > RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > NULL, > > "netlink: failed to create TC flow rule"); @@ > -3490,7 +3959,7 > > @@ struct pedit_parser { flow_tcf_remove(struct rte_eth_dev *dev, > > struct rte_flow *flow) { > > struct priv *priv =3D dev->data->dev_private; > > - struct mlx5_flow_tcf_context *nl =3D priv->tcf_context; > > + struct mlx5_flow_tcf_context *tcf =3D priv->tcf_context; > > struct mlx5_flow *dev_flow; > > struct nlmsghdr *nlh; > > > > @@ -3501,10 +3970,36 @@ struct pedit_parser { > > return; > > /* E-Switch flow can't be expanded. */ > > assert(!LIST_NEXT(dev_flow, next)); > > + if (!dev_flow->tcf.applied) > > + return; > > + if (dev_flow->tcf.tunnel) { > > + /* > > + * Replace the interface index, target for > > + * encapsulation, source for decapsulation. > > + */ > > + assert(dev_flow->tcf.tunnel->ifindex_tun); > > + assert(dev_flow->tcf.tunnel->ifindex_ptr); > > + dev_flow->tcf.tunnel->ifindex_org > > + =3D *dev_flow->tcf.tunnel->ifindex_ptr; > > + *dev_flow->tcf.tunnel->ifindex_ptr > > + =3D dev_flow->tcf.tunnel->ifindex_tun; > > + } > > nlh =3D dev_flow->tcf.nlh; > > nlh->nlmsg_type =3D RTM_DELTFILTER; > > nlh->nlmsg_flags =3D NLM_F_REQUEST; > > - flow_tcf_nl_ack(nl, nlh, 0, NULL, NULL); > > + flow_tcf_nl_ack(tcf, nlh, 0, NULL, NULL); > > + if (dev_flow->tcf.tunnel) { > > + *dev_flow->tcf.tunnel->ifindex_ptr > > + =3D dev_flow->tcf.tunnel->ifindex_org; > > + dev_flow->tcf.tunnel->ifindex_org =3D 0; > > + if (dev_flow->tcf.tunnel->ifindex_tun) { > > + flow_tcf_tunnel_vtep_delete(tcf, > > + dev_flow->tcf.tunnel->ifindex_tun, > > + dev_flow); > > + dev_flow->tcf.tunnel->ifindex_tun =3D 0; > > + } > > + } > > + dev_flow->tcf.applied =3D 0; > > } > > > > /** > >