From patchwork Wed Nov 13 12:57:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Liang X-Patchwork-Id: 13873654 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 125B3200C84; Wed, 13 Nov 2024 12:57:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731502667; cv=none; b=YVd1Gkjzot/vLNXNWIJ09ot3J5UZ3Q8gm1cX8Xv7xM353OYVso4db3Y2MB6+/WUEOqAQtx50gEzsEfmzvFOiYI1RvWNGPD02XwnN0Zn8ToVsxRv1mFqQg5CPjgsSTUzcGRKqC/sCGrOHVQrZ8QNeIWmObD/3NVOHx2xbu45cBJc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731502667; c=relaxed/simple; bh=Z9LWtAm1B8O3T0XTKvOdS5SDy0kIbhN/IsSC65Nbxck=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DgufzkDUhGSjjHSYj/mbO96yDLoksKX1bzBk8rr26pESpxXkZ1ZjBQGmwhaVFJ3jQ8Cd9zY08V0VeSi5uOIUmlgCJowAYTd+idDp/nCD0IWrVMjE/u6kUDtwjFb15EVHl+V6BdkzPxFQTMokPvVeEhBns/fv/1x0dtydOrNmXE0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fhK+J5Y8; arc=none smtp.client-ip=209.85.216.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fhK+J5Y8" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2e9b55b83d2so4231199a91.3; Wed, 13 Nov 2024 04:57:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731502665; x=1732107465; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9sIZI/WV8nhbNfyJEUDND2yz+m6sbgKmtk/cQXv5cxc=; b=fhK+J5Y8/EiEmuPa0qT6wzs6M8bQR6h74+N40FfnNwCmCYLz+cEgwvazekBgL6Wq5d 1VAwO3nXQwCNFBdb6u8pxZ+RtkxpnRyqE9o/GGd+b7TwhVHX/OCNHeNoJJ7W6EbkOKZA RvfSHqcIxfscclZzOWH2fPdbV7CIq6103dC85GH+7yTM+31NcdYnrdzrp/S0INlkoQdI ZG+xsvc2BrdIgfYG7sZmIxRBdONeUToeEz7nps97PSQQkFKjYLjcKdPYWlKxexWU21lJ eJkOI9XehvUWmzOfdaKMMMLwdrOeCONXi6uthrUV/2+lagRECcDyBztnDgH0G5LwpLNT gyiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731502665; x=1732107465; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9sIZI/WV8nhbNfyJEUDND2yz+m6sbgKmtk/cQXv5cxc=; b=cWIogLeIFquGvSF6y8TdUHm7XfHUlVZ3Ubz5TUAZ5Lto+h45J7CS/up3o5uZHW9zsb bHXb9e8ANT0FUx/pQzSz5XZOCdYlisNf17PyhNpEaoPqD1+denDtiB8+z9TZI2ejSeuu HZGke8xX7FI7kl66eFwuEiov4k7PFZcjmOUxZp/Xz8Pa31BZCS0WD/S/LLgZBURy62Yk zIIBaVGwGvIP5uratSRAeqQ/0wbjOU+v5yFGyP5H5L6bAeG0aA2kUt4kjj3P6Ir+9SzL nxzW0VDbzwjpWbvmhnGFEDcDZdhh/3DtO3FYocgp9j/+xHb2j553yArpBrJ8VHb9rMhk sKwA== X-Forwarded-Encrypted: i=1; AJvYcCUDxMTppP+XXTyVzgVM4XJLykPY02noMnpK5/gv2vNqHun5Acqvzl4ZLXaFYnZdQAErgJXCDHAn6gd1AQ==@vger.kernel.org, AJvYcCV16rE9vio/MtIJZT1S9uVu4UAiZxPwY4wgF5iEzaumvLAi85Ddzn9gf/MSU2K5G8jR351Nx6bJuvIbRMGSFB86@vger.kernel.org, AJvYcCVDDoJgY+k75ltlB1uxbVXW372uhPhwulMql7EF9XMc95I3TChOLdyMQX49RWXga1N6eMxXAWjOJTkB@vger.kernel.org, AJvYcCVZOirenAKQA4oqmbeOdDAnNq/ySjywg/xHrTixgElXybnpIfXHRHZVbcDfeY9gCNpbd48=@vger.kernel.org, AJvYcCVyDk8Fole7wH4rccQ6CnD0cdSy+Xdpur3U6Rw8qE073yQ7ncf72PdeQ6EkynEn8RcEdz3afSFl2QudiCPrepY=@vger.kernel.org, AJvYcCWANScriY7eN4mGPjJjoBgiJ/F+r+3NiIiuQalVfOlv+WY68pnS4378eNHLdOnurYmdFTCgpUcmxG2Dng==@vger.kernel.org, AJvYcCWKP7SIOrUdD+golYHUVFureC9bYmYXuNQgwKny6J83mTH7bQzy2g1kEQx9IuICBORtPyhZnz/6YxKs@vger.kernel.org, AJvYcCXG9dLSkQchbi8FIVm9dPvaP9KpXQKmlb5VQ5HS8Qxi0lgo8rSc8k8ZfFrsMOce6/8aHeSFwnyInciENHKI@vger.kernel.org X-Gm-Message-State: AOJu0YwEbna+O74DKA0zfCxcLK6tWiPj9JkAXRdNlr2+/syHNvMC8NUn URQCLFtNocQgNPvmAMZDr+WA0Xx+p2J0BbELfq+XdKqW0STuoK5xfhondMNJbK0= X-Google-Smtp-Source: AGHT+IFBBLW/otzoU3VQWNkQ98rdfNz5WHNkXJFNuYVXzuqAWCzWf4F656wLCdVO3Ph+9deaw1I3JA== X-Received: by 2002:a17:90b:48c8:b0:2e2:c40c:6e8a with SMTP id 98e67ed59e1d1-2e9f2d5da7amr2684315a91.26.1731502664731; Wed, 13 Nov 2024 04:57:44 -0800 (PST) Received: from nova-ws.. ([103.167.140.11]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e9f3f8ed0esm1398632a91.40.2024.11.13.04.57.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Nov 2024 04:57:44 -0800 (PST) From: Xiao Liang To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, Kuniyuki Iwashima , Jakub Kicinski , Donald Hunter Cc: "David S. Miller" , David Ahern , Eric Dumazet , Paolo Abeni , Ido Schimmel , Andrew Lunn , Simon Horman , Shuah Khan , Jiri Pirko , Hangbin Liu , linux-rdma@vger.kernel.org, linux-can@vger.kernel.org, osmocom-net-gprs@lists.osmocom.org, bpf@vger.kernel.org, linux-ppp@vger.kernel.org, wireguard@lists.zx2c4.com, linux-wireless@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, bridge@lists.linux.dev, linux-wpan@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v3 1/6] Revert "tools/net/ynl: improve async notification handling" Date: Wed, 13 Nov 2024 20:57:10 +0800 Message-ID: <20241113125715.150201-2-shaw.leon@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241113125715.150201-1-shaw.leon@gmail.com> References: <20241113125715.150201-1-shaw.leon@gmail.com> Precedence: bulk X-Mailing-List: linux-wpan@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Donald Hunter This reverts commit 1bf70e6c3a5346966c25e0a1ff492945b25d3f80. This modification to check_ntf() is being reverted so that its behaviour remains equivalent to ynl_ntf_check() in the C YNL. Instead a new poll_ntf() will be added in a separate patch. Signed-off-by: Donald Hunter --- tools/net/ynl/cli.py | 10 +++----- tools/net/ynl/lib/ynl.py | 49 ++++++++++++++++------------------------ 2 files changed, 23 insertions(+), 36 deletions(-) diff --git a/tools/net/ynl/cli.py b/tools/net/ynl/cli.py index 9e95016b85b3..b8481f401376 100755 --- a/tools/net/ynl/cli.py +++ b/tools/net/ynl/cli.py @@ -5,7 +5,6 @@ import argparse import json import pprint import time -import signal from lib import YnlFamily, Netlink, NlError @@ -18,8 +17,6 @@ class YnlEncoder(json.JSONEncoder): return list(obj) return json.JSONEncoder.default(self, obj) -def handle_timeout(sig, frame): - exit(0) def main(): description = """ @@ -84,8 +81,7 @@ def main(): ynl.ntf_subscribe(args.ntf) if args.sleep: - signal.signal(signal.SIGALRM, handle_timeout) - signal.alarm(args.sleep) + time.sleep(args.sleep) if args.list_ops: for op_name, op in ynl.ops.items(): @@ -110,8 +106,8 @@ def main(): exit(1) if args.ntf: - for msg in ynl.check_ntf(): - output(msg) + ynl.check_ntf() + output(ynl.async_msg_queue) if __name__ == "__main__": diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py index 92f85698c50e..c22c22bf2cb7 100644 --- a/tools/net/ynl/lib/ynl.py +++ b/tools/net/ynl/lib/ynl.py @@ -12,8 +12,6 @@ import sys import yaml import ipaddress import uuid -import queue -import time from .nlspec import SpecFamily @@ -491,7 +489,7 @@ class YnlFamily(SpecFamily): self.sock.setsockopt(Netlink.SOL_NETLINK, Netlink.NETLINK_GET_STRICT_CHK, 1) self.async_msg_ids = set() - self.async_msg_queue = queue.Queue() + self.async_msg_queue = [] for msg in self.msgs.values(): if msg.is_async: @@ -905,39 +903,32 @@ class YnlFamily(SpecFamily): msg['name'] = op['name'] msg['msg'] = attrs - self.async_msg_queue.put(msg) + self.async_msg_queue.append(msg) - def check_ntf(self, interval=0.1): + def check_ntf(self): while True: try: reply = self.sock.recv(self._recv_size, socket.MSG_DONTWAIT) - nms = NlMsgs(reply) - self._recv_dbg_print(reply, nms) - for nl_msg in nms: - if nl_msg.error: - print("Netlink error in ntf!?", os.strerror(-nl_msg.error)) - print(nl_msg) - continue - if nl_msg.done: - print("Netlink done while checking for ntf!?") - continue + except BlockingIOError: + return - decoded = self.nlproto.decode(self, nl_msg, None) - if decoded.cmd() not in self.async_msg_ids: - print("Unexpected msg id while checking for ntf", decoded) - continue + nms = NlMsgs(reply) + self._recv_dbg_print(reply, nms) + for nl_msg in nms: + if nl_msg.error: + print("Netlink error in ntf!?", os.strerror(-nl_msg.error)) + print(nl_msg) + continue + if nl_msg.done: + print("Netlink done while checking for ntf!?") + continue - self.handle_ntf(decoded) - except BlockingIOError: - pass + decoded = self.nlproto.decode(self, nl_msg, None) + if decoded.cmd() not in self.async_msg_ids: + print("Unexpected msg id done while checking for ntf", decoded) + continue - try: - yield self.async_msg_queue.get_nowait() - except queue.Empty: - try: - time.sleep(interval) - except KeyboardInterrupt: - return + self.handle_ntf(decoded) def operation_do_attributes(self, name): """