From patchwork Mon Feb 26 21:20:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 13572910 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 14C92133290 for ; Mon, 26 Feb 2024 21:20:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708982435; cv=none; b=AqR9zwDbj1nV+/rpfhnPK+mhJrIlaym1qr/qluz64/0YL85AwRvX6BdKl7oZJPNn1ycCrHnaHgpAVMsVqhPMVy4i9cE3LG31p0L8O5p/cNxxXu6BYzaZNQf8Nyuwi01DXJ4muxaA7ydfcwSqrXMroNJ7Gu2RQ5DasWU9c2e8/4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708982435; c=relaxed/simple; bh=Oidir/EiqU/gCD8RtUSNy0TdOX3xQOdb4sVV3N8ZZvs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sZmC7lImmgbaSNkk0k1YizgGJx+SjU4hME1LotCQZYPSiwZFicrQXEogGG8iEseNGFgIRyhYoTrKvxYf7tO2EceLj15MTNDSqEn4GTBCdf8DGHKUEiEeY0AS05yDyMsZxqsHKDIfxsR/gg7kB4lA34PCbngiJMobiUk+vBwlpr0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AdYO6Lot; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="AdYO6Lot" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A01F4C433C7; Mon, 26 Feb 2024 21:20:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708982435; bh=Oidir/EiqU/gCD8RtUSNy0TdOX3xQOdb4sVV3N8ZZvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AdYO6LotCaDJtGUDoy6VMPwUGraVDmJhQctxXBfH1lJs9vO67ltw5+CEtPZMcrWo+ 22MwwzFZ739Eb6I3HHh5uRvuNvnx+r6CJlW6BgHIFsBUaflvBSqW2uJI6suciUxPQ+ Bwjc1mFzjij/y3p/fkadrx4DEMqPVof3zFH9LvujH+B0KSLS2hwLUIQROOqo1mnG1i Alq/0peIraPg03uUthl2omQJM8ia1ZG8XFjXP+/2Lbl2hbtfrHAGZ2kM1LQLA5OzFN T21MagVp1y6dBcQwsshpSpci3mLDhQA4aicTgVOyhjspOtJID42y9TZfovvLZrpPwD k9d7jRiLOgWbw== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, nicolas.dichtel@6wind.com, donald.hunter@gmail.com, jiri@resnulli.us, sdf@google.com, Jakub Kicinski Subject: [PATCH net-next v2 15/15] tools: ynl: use MSG_DONTWAIT for getting notifications Date: Mon, 26 Feb 2024 13:20:21 -0800 Message-ID: <20240226212021.1247379-16-kuba@kernel.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240226212021.1247379-1-kuba@kernel.org> References: <20240226212021.1247379-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org To stick to libmnl wrappers in the past we had to use poll() to check if there are any outstanding notifications on the socket. This is no longer necessary, we can use MSG_DONTWAIT. Acked-by: Nicolas Dichtel Signed-off-by: Jakub Kicinski --- tools/net/ynl/lib/ynl.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/tools/net/ynl/lib/ynl.c b/tools/net/ynl/lib/ynl.c index f8a66ae88ba9..86729119e1ef 100644 --- a/tools/net/ynl/lib/ynl.c +++ b/tools/net/ynl/lib/ynl.c @@ -458,16 +458,20 @@ static int ynl_cb_null(const struct nlmsghdr *nlh, struct ynl_parse_arg *yarg) return YNL_PARSE_CB_ERROR; } -static int ynl_sock_read_msgs(struct ynl_parse_arg *yarg, ynl_parse_cb_t cb) +static int +__ynl_sock_read_msgs(struct ynl_parse_arg *yarg, ynl_parse_cb_t cb, int flags) { struct ynl_sock *ys = yarg->ys; const struct nlmsghdr *nlh; ssize_t len, rem; int ret; - len = recv(ys->socket, ys->rx_buf, YNL_SOCKET_BUFFER_SIZE, 0); - if (len < 0) + len = recv(ys->socket, ys->rx_buf, YNL_SOCKET_BUFFER_SIZE, flags); + if (len < 0) { + if (flags & MSG_DONTWAIT && errno == EAGAIN) + return YNL_PARSE_CB_STOP; return len; + } ret = YNL_PARSE_CB_STOP; for (rem = len; rem > 0; NLMSG_NEXT(nlh, rem)) { @@ -509,6 +513,11 @@ static int ynl_sock_read_msgs(struct ynl_parse_arg *yarg, ynl_parse_cb_t cb) return ret; } +static int ynl_sock_read_msgs(struct ynl_parse_arg *yarg, ynl_parse_cb_t cb) +{ + return __ynl_sock_read_msgs(yarg, cb, 0); +} + static int ynl_recv_ack(struct ynl_sock *ys, int ret) { struct ynl_parse_arg yarg = { .ys = ys, }; @@ -797,18 +806,8 @@ int ynl_ntf_check(struct ynl_sock *ys) int err; do { - /* libmnl doesn't let us pass flags to the recv to make - * it non-blocking so we need to poll() or peek() :| - */ - struct pollfd pfd = { }; - - pfd.fd = ys->socket; - pfd.events = POLLIN; - err = poll(&pfd, 1, 1); - if (err < 1) - return err; - - err = ynl_sock_read_msgs(&yarg, ynl_ntf_trampoline); + err = __ynl_sock_read_msgs(&yarg, ynl_ntf_trampoline, + MSG_DONTWAIT); if (err < 0) return err; } while (err > 0);