From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30082.outbound.protection.outlook.com [40.107.3.82]) by dpdk.org (Postfix) with ESMTP id 4BA771B160 for ; Thu, 1 Nov 2018 13:19:32 +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=YR/DzuHbpjBZZgNRj5PjC5GUc6f/qV07aXMyo56gIuM=; b=ocoGihNY9pepxx4c4jssKlvCPJpHBafYfjnR3YoMjV8aYBZUMxgpf6AjctSLv+vTl9PhxCc1yIZkdDMZivO6hxUlrTPlW5GR61b2wVuUjQazCVipFHEtIujaE+JwnEf9Vd0pIMB3GKpd7dRpUiS4p4ZcMo3J9FixtLmsFfRqzyw= Received: from AM4PR05MB3265.eurprd05.prod.outlook.com (10.171.186.150) by AM4PR05MB1457.eurprd05.prod.outlook.com (10.164.79.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1273.20; Thu, 1 Nov 2018 12:19:31 +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:31 +0000 From: Slava Ovsiienko To: Shahaf Shuler CC: "dev@dpdk.org" , Yongseok Koh , Slava Ovsiienko Thread-Topic: [PATCH v3 09/13] net/mlx5: e-switch VXLAN netlink routines update Thread-Index: AQHUcd0kQ9gGFhzyLUufqv7H3lbsqQ== Date: Thu, 1 Nov 2018 12:19:31 +0000 Message-ID: <1541074741-41368-10-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; AM4PR05MB1457; 6:StEDUsr8mJkazExub3AKuhsGBfxIJK4kGIabIPMk9dMuJlnEGQ5zasfQ6LDEMHM8oLOiUYPW2rSfTWhaQ/NVsF9MZQOE/oR1ZwFk5IhqB9Gqwnn+dEfgNiGI0qx+MDQEk2wDtgAadmagPMhCc3u5LkilI/sI0tttxW8gS4eHEoI1xceifFsbVAz5xiru9w1Dgbu5VrGTbulImBCu1hfn6CHYotH+Yluyn+b9TavxuePplrlJXgQaTSoU4f5lWl4nbaVSnizw9q2/cK1BD14ZPmFV8jGs+H3IUdqfjqOphJhuXaNdehTgh2rt+6a2RFbTfEp8krLnQyRj9zLhwBmGUGkEh64w2LXtb55Amm9h+DxeYzUwpBdQNAfbwhfMD5gwjZsRGjwBJFSxQDIs+w5P6n9jp9WfC75yHqoLTlRMDhidxa5JUUQxh3wPvCqUbaD1fCiFIp/lo9f/KdJVg67DDg==; 5:E3ORuxu6dZK/Ezc/vIZ9MlAHVhZc1+Wkn5jJstSUL2LS/JoKutRWStyOPpVYq+91RXJDhztSYNbem5W159cO2aQa02i/1eKmfO/zmhNkiggk1UoUkEeOLOSuRHSjSs3q5b66zwoGIX9CHuyovsDtX+F14qexXIJcxaAzZ9wSBOM=; 7:kNjM3SIOUeaaxBJwmPJkA/68J9zW8B8A8MuU5tLA4ur/mikWGNM0k1yP3h5k+JhzvehhQcEpaJkerTDmM4dm14bAqMs69KfFFOnmGnb9tQyJeIhA0/fG1b4rVak6gxQ3jdPdbYLrRNXQzuPGpihaGw== x-ms-office365-filtering-correlation-id: e208cec2-eb5d-4908-bbfb-08d63ff44682 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:AM4PR05MB1457; x-ms-traffictypediagnostic: AM4PR05MB1457: 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)(5005006)(8121501046)(3231382)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:AM4PR05MB1457; BCL:0; PCL:0; RULEID:; SRVR:AM4PR05MB1457; x-forefront-prvs: 0843C17679 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(979002)(376002)(396003)(39860400002)(346002)(136003)(366004)(199004)(189003)(11346002)(446003)(106356001)(476003)(105586002)(4326008)(97736004)(2616005)(478600001)(6636002)(5250100002)(99286004)(486006)(66066001)(6862004)(2900100001)(25786009)(15650500001)(37006003)(54906003)(5660300001)(316002)(8936002)(8676002)(81156014)(81166006)(68736007)(7736002)(305945005)(3846002)(6116002)(76176011)(2906002)(102836004)(26005)(186003)(386003)(6506007)(107886003)(14454004)(6486002)(52116002)(6512007)(53936002)(6436002)(36756003)(86362001)(71190400001)(71200400001)(14444005)(256004)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB1457; 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: EJ4CpXktf+a/Lc2328tfva9kYWYwj7t61qrcmjOkHEZdILxXZhEQIdPZjW62U7bw/x9lHlI89rcl3+qnZQ1VwquB3E8Xk/zpQeT0m+zmkZZOyHRbWSpWSuBBZN2GOwjiz3OO+PZp1K2BvLULXBqsTCKZtKsJDZCjJf0RyB4ywIbh01ghHDJK2i0k4zJLPKeSFlAYTu0Yv0r6byHpfweRU+8nFT7uxIPxGz9iud1qXuYlx3GRWlA0//1frsZarYREOTan3st8oDk+jZVG5I84ATUvNKxHo6U3/cCujrl0BvuMxblXiMSDaQAHLvgpmtIDI0VG8qctFC7e4/IyuHqVE/XgPYQJZ+8z+azCORmXlHQ= 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: e208cec2-eb5d-4908-bbfb-08d63ff44682 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Nov 2018 12:19:31.0796 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR05MB1457 Subject: [dpdk-dev] [PATCH v3 09/13] net/mlx5: e-switch VXLAN netlink routines update 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:32 -0000 This part of patchset updates Netlink exchange routine. Message sequence numbers became not random ones, the multipart reply messages are supported, not propagating errors to the following socket calls, Netlink replies buffer size is increased to MNL_SOCKET_BUFFER_SIZE and now is preallocated at context creation time instead of stack usage. This update is needed to support Netlink query operations. Suggested-by: Adrien Mazarguil Signed-off-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_tcf.c | 83 +++++++++++++++++++++++++++++-------= ---- 1 file changed, 61 insertions(+), 22 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_= tcf.c index c404a63..67a6ff3 100644 --- a/drivers/net/mlx5/mlx5_flow_tcf.c +++ b/drivers/net/mlx5/mlx5_flow_tcf.c @@ -3678,37 +3678,76 @@ struct pedit_parser { /** * Send Netlink message with acknowledgment. * - * @param ctx + * @param tcf * Flow context to use. * @param nlh * Message to send. This function always raises the NLM_F_ACK flag befor= e * sending. + * @param[in] msglen + * Message length. Message buffer may contain multiple commands and + * nlmsg_len field not always corresponds to actual message length. + * If 0 specified the nlmsg_len field in header is used as message lengt= h. + * @param[in] cb + * Callback handler for received message. + * @param[in] arg + * Context pointer for callback handler. * * @return * 0 on success, a negative errno value otherwise and rte_errno is set. */ static int -flow_tcf_nl_ack(struct mlx5_flow_tcf_context *ctx, struct nlmsghdr *nlh) +flow_tcf_nl_ack(struct mlx5_flow_tcf_context *tcf, + struct nlmsghdr *nlh, + uint32_t msglen, + mnl_cb_t cb, void *arg) { - alignas(struct nlmsghdr) - uint8_t ans[mnl_nlmsg_size(sizeof(struct nlmsgerr)) + - nlh->nlmsg_len - sizeof(*nlh)]; - uint32_t seq =3D ctx->seq++; - struct mnl_socket *nl =3D ctx->nl; - int ret; - - nlh->nlmsg_flags |=3D NLM_F_ACK; + unsigned int portid =3D mnl_socket_get_portid(tcf->nl); + uint32_t seq =3D tcf->seq++; + int err, ret; + + assert(tcf->nl); + assert(tcf->buf); + if (!seq) + /* seq 0 is reserved for kernel event-driven notifications. */ + seq =3D tcf->seq++; nlh->nlmsg_seq =3D seq; - ret =3D mnl_socket_sendto(nl, nlh, nlh->nlmsg_len); - if (ret !=3D -1) - ret =3D mnl_socket_recvfrom(nl, ans, sizeof(ans)); - if (ret !=3D -1) - ret =3D mnl_cb_run - (ans, ret, seq, mnl_socket_get_portid(nl), NULL, NULL); + if (!msglen) { + msglen =3D nlh->nlmsg_len; + nlh->nlmsg_flags |=3D NLM_F_ACK; + } + ret =3D mnl_socket_sendto(tcf->nl, nlh, msglen); + err =3D (ret <=3D 0) ? errno : 0; + nlh =3D (struct nlmsghdr *)(tcf->buf); + /* + * The following loop postpones non-fatal errors until multipart + * messages are complete. + */ if (ret > 0) + while (true) { + ret =3D mnl_socket_recvfrom(tcf->nl, tcf->buf, + tcf->buf_size); + if (ret < 0) { + err =3D errno; + if (err !=3D ENOSPC) + break; + } + if (!err) { + ret =3D mnl_cb_run(nlh, ret, seq, portid, + cb, arg); + if (ret < 0) { + err =3D errno; + break; + } + } + /* Will receive till end of multipart message */ + if (!(nlh->nlmsg_flags & NLM_F_MULTI) || + nlh->nlmsg_type =3D=3D NLMSG_DONE) + break; + } + if (!err) return 0; - rte_errno =3D errno; - return -rte_errno; + rte_errno =3D err; + return -err; } =20 /** @@ -3739,7 +3778,7 @@ struct pedit_parser { 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(ctx, nlh)) + if (!flow_tcf_nl_ack(ctx, nlh, 0, NULL, NULL)) return 0; return rte_flow_error_set(error, rte_errno, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, @@ -3778,7 +3817,7 @@ struct pedit_parser { nlh =3D dev_flow->tcf.nlh; nlh->nlmsg_type =3D RTM_DELTFILTER; nlh->nlmsg_flags =3D NLM_F_REQUEST; - flow_tcf_nl_ack(ctx, nlh); + flow_tcf_nl_ack(ctx, nlh, 0, NULL, NULL); } =20 /** @@ -4311,7 +4350,7 @@ struct pedit_parser { tcm->tcm_handle =3D TC_H_MAKE(TC_H_INGRESS, 0); tcm->tcm_parent =3D TC_H_INGRESS; /* Ignore errors when qdisc is already absent. */ - if (flow_tcf_nl_ack(ctx, nlh) && + if (flow_tcf_nl_ack(ctx, nlh, 0, NULL, NULL) && rte_errno !=3D EINVAL && rte_errno !=3D ENOENT) return rte_flow_error_set(error, rte_errno, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, @@ -4327,7 +4366,7 @@ struct pedit_parser { tcm->tcm_handle =3D TC_H_MAKE(TC_H_INGRESS, 0); tcm->tcm_parent =3D TC_H_INGRESS; mnl_attr_put_strz_check(nlh, sizeof(buf), TCA_KIND, "ingress"); - if (flow_tcf_nl_ack(ctx, nlh)) + if (flow_tcf_nl_ack(ctx, nlh, 0, NULL, NULL)) return rte_flow_error_set(error, rte_errno, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "netlink: failed to create ingress" --=20 1.8.3.1