From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (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 526FB315D2A for ; Wed, 7 Jan 2026 12:22:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767788533; cv=none; b=JGBZ6b7D0OoNFjjBYewhBgP7UyqHqnGPUoX60AKPdjoQGNk/X5paQc/oXbqLT1dtOKKv8O3a8W5rR4ABdf0vNyZBcs6EhO4fKsFT7ntbPmVkVrQt9RaywgCcnT+8lMFUYFPpwMcN34xHnwYyZ1qaN2bmVZmgERQm3+6rRS0eVdY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767788533; c=relaxed/simple; bh=3CiuJ9GUNB8dHXwYaiEw9pTUZWAu5nwh20o/SFV5c2M=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kVJZDagu/nKUvPXTEulNYn6LiQoGhtnOLAieg6zkVcFpdZQZM7Q7DXKMbGlOmwubnNyUUin4gvHJc+VwM2pRzYDPXTLZ7lIKDvx4a06AnxSLKUjdWXUGeUg19yPqiLsLSNkyNqwPOsnKqlZZCb2hthxD1vRGzrjXNodRmlVwEiA= 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=Vbd1RHUq; arc=none smtp.client-ip=209.85.221.44 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="Vbd1RHUq" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-42fb0fc5aa9so918973f8f.1 for ; Wed, 07 Jan 2026 04:22:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767788530; x=1768393330; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=sDEXlpAjXWmF8DqaMuG3FZG7sNZbQ7rzz4RGJ32dXeU=; b=Vbd1RHUqWOefRp4Nld77jMm3NsnvaX+g2+fplpZWy/y+XeKxR0N0IVtyhWzBOBKqPx 29aOZiKkF3fPg9WQXEkQLhAJWDHYxDSJ0WIhOga4dt+J4onJ0hVX3DpkwrllAe2v9AnT 3X5HjKmpB2jxyY3sSOx6sS8eryB53bgdUKD9GymJjmMst2tXd2ct1sKlkqbLN2K5jCwb hfUGslrXevAcX9F2f/WJ5tjn9SlJcSLWW3CvECZueBM69tlbIbVZdFppI4JWBc4Bj8/q iDsrtiXBWGTvAnZllEqX4nIjouFrpmsm8XaJXcc8XbPnlIsGMW2JsSzTPR9Z594me3FP iIUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767788530; x=1768393330; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=sDEXlpAjXWmF8DqaMuG3FZG7sNZbQ7rzz4RGJ32dXeU=; b=RBHwUj6e969Lllfo/GTbwZ2MhvFmTSaGLxOYwzCgL54tNJFipFN/ZvIutuOetZK8I5 GTRMlmSIThCNnIidrXEwMfISkTKSodZk/rCfFn3Eo12rf2PHUziXixKayA558RXd3hCd ziDbXCBxF5BXGS4KiYNOlWjnZKRm2BfdCArwll9BMZjx4MSZqXF0izvWhj3LeDad60PQ 5q6/mVSAs2jpp0JFwvrn67kRCIDBVwEUIvLLAjvZytFF6YzDI7MZ2TDr7TOtkJfsiyf2 Q9peNFTbnNF5y6rDubTSuy1BLcM01JaCkmexbDiylOn6nzc4YgoLM0gL2ohSYbj1DR51 Rubg== X-Forwarded-Encrypted: i=1; AJvYcCVL229Wc+EArpreHJcO0jkgOT+HJZuJtvODvwVcCA3+rkeAijoJt+x+JNa559qYe7jryPF0xkUgRuc=@vger.kernel.org X-Gm-Message-State: AOJu0YzRxRFrYggL0XdOSCXy78cWfv/4C563NJ+gOVaFCYs/gMcHEPtT nRaUHdirYXGotkrKN7OPpMwoXXKJ1AlcnWBEvidDXQg2dc0O9sa0J1EZ X-Gm-Gg: AY/fxX683DLbbG3hHrd+7wjAJVAcU7LY71pdzdjv8rKUe13/cTS60V7CkWGcnYGbOwx pjeyVZdflm1bcRIPA7sc/Iz26pNaXoQd/lJccHERP48a2CcO9NlupSiKiAW+kfeWdzRXZuj4J9E LqwbOPNGOzASvJjr8PQKIvS6J+Czx01rFq4bCIOufDX71YB4pxB9kjJT+eUYEPkVFbj4OozJv0U NrLgHKTNBzrO9Zew+NQZ9oqKN4ZyZa/09Z7i3JYdd7S3VBon0EQE+SHPF4+LQLGtrjMXv2dg+IK biq8gWlyOT/tnHyCkhrPDavZw+Pn0mChFCPeL+kLyhQMiyYWCLkavfpxTI3XBJ0qDggW3z6CjUA lRerNr99Iz+cv2IeDti+ScAQDYV5YolUcnkgD7YASE0k8nrTMPuPqpK/+4uG3xR29LE73QNz6++ 28WDWuOnJD1I028871rz8uCIIP5Z0Y X-Google-Smtp-Source: AGHT+IGRnzL62245dTo+sps7KvmZ9F7isQ7MnPn/pLoGbW3g06d0gN5VN7/bSVntp703dmpTeDeSHw== X-Received: by 2002:a05:6000:288b:b0:431:16d:63d7 with SMTP id ffacd0b85a97d-432c37615a2mr2896263f8f.47.1767788529639; Wed, 07 Jan 2026 04:22:09 -0800 (PST) Received: from imac.lan ([2a02:8010:60a0:0:bc70:fb0c:12b6:3a41]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-432bd0e16f4sm10417107f8f.11.2026.01.07.04.22.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 04:22:09 -0800 (PST) From: Donald Hunter To: Donald Hunter , Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , "Matthieu Baerts (NGI0)" , Gal Pressman , Jan Stancek , Hangbin Liu , Nimrod Oren , netdev@vger.kernel.org, Jonathan Corbet , =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= , Mauro Carvalho Chehab , Jacob Keller , Ruben Wauters , linux-doc@vger.kernel.org Subject: [PATCH net-next v1 06/13] tools: ynl: fix pylint global variable related warnings Date: Wed, 7 Jan 2026 12:21:36 +0000 Message-ID: <20260107122143.93810-7-donald.hunter@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260107122143.93810-1-donald.hunter@gmail.com> References: <20260107122143.93810-1-donald.hunter@gmail.com> Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Refactor to avoid using global variables to fix the following pylint issues: - invalid-name - global-statement - global-variable-not-assigned Signed-off-by: Donald Hunter --- tools/net/ynl/pyynl/lib/nlspec.py | 16 +++++++--------- tools/net/ynl/pyynl/lib/ynl.py | 24 ++++++++++-------------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/tools/net/ynl/pyynl/lib/nlspec.py b/tools/net/ynl/pyynl/lib/nlspec.py index f3173146b64b..5cc10e654ed6 100644 --- a/tools/net/ynl/pyynl/lib/nlspec.py +++ b/tools/net/ynl/pyynl/lib/nlspec.py @@ -13,10 +13,6 @@ import os import yaml as pyyaml -# To be loaded dynamically as needed -jsonschema = None - - class SpecException(Exception): """Netlink spec exception. """ @@ -439,6 +435,10 @@ class SpecFamily(SpecElement): mcast_groups dict of all multicast groups (index by name) kernel_family dict of kernel family attributes """ + + # To be loaded dynamically as needed + jsonschema = None + def __init__(self, spec_path, schema_path=None, exclude_ops=None): with open(spec_path, "r", encoding='utf-8') as stream: prefix = '# SPDX-License-Identifier: ' @@ -463,15 +463,13 @@ class SpecFamily(SpecElement): if schema_path is None: schema_path = os.path.dirname(os.path.dirname(spec_path)) + f'/{self.proto}.yaml' if schema_path: - global jsonschema - with open(schema_path, "r", encoding='utf-8') as stream: schema = pyyaml.safe_load(stream) - if jsonschema is None: - jsonschema = importlib.import_module("jsonschema") + if self.jsonschema is None: + self.jsonschema = importlib.import_module("jsonschema") - jsonschema.validate(self.yaml, schema) + self.jsonschema.validate(self.yaml, schema) self.attr_sets = collections.OrderedDict() self.sub_msgs = collections.OrderedDict() diff --git a/tools/net/ynl/pyynl/lib/ynl.py b/tools/net/ynl/pyynl/lib/ynl.py index 2ad954f885f3..0b7dd2a3c76d 100644 --- a/tools/net/ynl/pyynl/lib/ynl.py +++ b/tools/net/ynl/pyynl/lib/ynl.py @@ -320,9 +320,6 @@ class NlMsgs: yield from self.msgs -genl_family_name_to_id = None - - def _genl_msg(nl_type, nl_flags, genl_cmd, genl_version, seq=None): # we prepend length in _genl_msg_finalize() if seq is None: @@ -338,6 +335,8 @@ def _genl_msg_finalize(msg): # pylint: disable=too-many-nested-blocks def _genl_load_families(): + genl_family_name_to_id = {} + with socket.socket(socket.AF_NETLINK, socket.SOCK_RAW, Netlink.NETLINK_GENERIC) as sock: sock.setsockopt(Netlink.SOL_NETLINK, Netlink.NETLINK_CAP_ACK, 1) @@ -348,18 +347,14 @@ def _genl_load_families(): sock.send(msg, 0) - global genl_family_name_to_id - genl_family_name_to_id = dict() - while True: reply = sock.recv(128 * 1024) nms = NlMsgs(reply) for nl_msg in nms: if nl_msg.error: - print("Netlink error:", nl_msg.error) - return + raise YnlException(f"Netlink error: {nl_msg.error}") if nl_msg.done: - return + return genl_family_name_to_id gm = GenlMsg(nl_msg) fam = {} @@ -439,15 +434,16 @@ class NetlinkProtocol: class GenlProtocol(NetlinkProtocol): + genl_family_name_to_id = None + def __init__(self, family_name): super().__init__(family_name, Netlink.NETLINK_GENERIC) - global genl_family_name_to_id - if genl_family_name_to_id is None: - _genl_load_families() + if self.genl_family_name_to_id is None: + self.genl_family_name_to_id = _genl_load_families() - self.genl_family = genl_family_name_to_id[family_name] - self.family_id = genl_family_name_to_id[family_name]['id'] + self.genl_family = self.genl_family_name_to_id[family_name] + self.family_id = self.genl_family_name_to_id[family_name]['id'] def message(self, flags, command, version, seq=None): nlmsg = self._message(self.family_id, flags, seq) -- 2.52.0