From nobody Thu Dec 18 09:39:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACC5AC25B5E for ; Mon, 14 Aug 2023 06:08:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233629AbjHNGIP (ORCPT ); Mon, 14 Aug 2023 02:08:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233543AbjHNGHk (ORCPT ); Mon, 14 Aug 2023 02:07:40 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A786195; Sun, 13 Aug 2023 23:07:38 -0700 (PDT) Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37E5wBXR008406; Mon, 14 Aug 2023 06:07:24 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=6CpyXQhSSSWk/nIP5HWhHyxy6f44exKrqLOQXIG7O8Q=; b=QoHcffab71tgCpiqTbU1Ynb7llbm3Lb2ld98jkffsI/xvZMvbcKqFkSjm3LkrMXyTZ27 aV6nz3zuFX8oSQCr8FwCDkf0Guse5eIq78rnZLnf8Zt9g3Vr3r7kUlkfNBWilEX1+M/T fJYyfzJtWb4/HWY6cJw5w/iEqpbqsHaAZR8dwHGERKK3z7viuj2E/0R6k5wzP3u64Jh5 2b7dQz/D0eNzftJWTJHgFEF7EDJ6dezMCqX7OtqJPM6C2t/THbuenV9wcKKCuRSL0EoW wHS2ppVyJSzr/ujF/v2O3/+DB1QAiDcz/Pyfi6psuA+sF6Ruy6lBvKPyXITzPW6iSU1v oA== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3sfekc04dr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Aug 2023 06:07:23 +0000 Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 37E4jbQh003495; Mon, 14 Aug 2023 06:07:22 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3semds2543-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Aug 2023 06:07:22 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 37E67K4f39649626 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 06:07:21 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E35A92004D; Mon, 14 Aug 2023 06:07:20 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 649C62004B; Mon, 14 Aug 2023 06:07:20 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 14 Aug 2023 06:07:20 +0000 (GMT) Received: from bgray-lenovo-p15.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id A695C60556; Mon, 14 Aug 2023 16:07:17 +1000 (AEST) From: Benjamin Gray To: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linux-doc@vger.kernel.org, bpf@vger.kernel.org, linux-pm@vger.kernel.org Cc: abbotti@mev.co.uk, hsweeten@visionengravers.com, jan.kiszka@siemens.com, kbingham@kernel.org, mykolal@fb.com, Benjamin Gray Subject: [PATCH 1/8] ia64: fix Python string escapes Date: Mon, 14 Aug 2023 16:06:57 +1000 Message-ID: <20230814060704.79655-2-bgray@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230814060704.79655-1-bgray@linux.ibm.com> References: <20230814060704.79655-1-bgray@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: RXPMHj0ybyLNAjNFHy_26VoRczrTHjPz X-Proofpoint-ORIG-GUID: RXPMHj0ybyLNAjNFHy_26VoRczrTHjPz X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-13_24,2023-08-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 malwarescore=0 adultscore=0 suspectscore=0 spamscore=0 phishscore=0 mlxscore=0 clxscore=1011 bulkscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308140055 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Python 3.6 introduced a DeprecationWarning for invalid escape sequences. This is upgraded to a SyntaxWarning in Python 3.12, and will eventually be a syntax error. Fix these now to get ahead of it before it's an error. Signed-off-by: Benjamin Gray --- arch/ia64/scripts/unwcheck.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/ia64/scripts/unwcheck.py b/arch/ia64/scripts/unwcheck.py index 9581742f0db2..f66f4015891b 100644 --- a/arch/ia64/scripts/unwcheck.py +++ b/arch/ia64/scripts/unwcheck.py @@ -21,7 +21,7 @@ if len(sys.argv) !=3D 2: =20 readelf =3D os.getenv("READELF", "readelf") =20 -start_pattern =3D re.compile("<([^>]*)>: \[0x([0-9a-f]+)-0x([0-9a-f]+)\]") +start_pattern =3D re.compile("<([^>]*)>: \\[0x([0-9a-f]+)-0x([0-9a-f]+)\\]= ") rlen_pattern =3D re.compile(".*rlen=3D([0-9]+)") =20 def check_func (func, slots, rlen_sum): --=20 2.41.0 From nobody Thu Dec 18 09:39:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB1ADC25B5C for ; Mon, 14 Aug 2023 06:08:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233635AbjHNGIQ (ORCPT ); Mon, 14 Aug 2023 02:08:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233570AbjHNGHl (ORCPT ); Mon, 14 Aug 2023 02:07:41 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED89D10CE; Sun, 13 Aug 2023 23:07:39 -0700 (PDT) Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37E5wBcp008423; Mon, 14 Aug 2023 06:07:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=4buwukZ5Q5s/sczhLVm9BL/btmO7r3lPwlubrVtFnXA=; b=qQfnr+E58ivI+hFJYR9ebjzXXAhIj/10neBMkV+3nbOoVDqcX/XxtB2eC9XEhRx0TV6F yfDi5+YpZgIU9H4xMDFByx/XpH5QAzYcoNlIezptFSqnkK1l2SR3OdWBDZdltCfALPRB 6iXnlUlDUZhwLZL8Kkl2C+mtsnyO0QToab/VNw87adR0kI8RHXf76Uzold5/MiSnc2Q5 ryHAjrL11Di4Cc4KsJ0Z/0zoZIqs+J2xmCj8lxyD3Zt896omzdxQ1NY0F1bqWQygNTQb Z1k0CjvWLllQN27nXDKQTued+O8lvbqKfutGGYaOgn1dJbDIAXKTo1GtIZAuJRcclZ1M fA== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3sfekc04ff-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Aug 2023 06:07:25 +0000 Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 37E4CvM5007832; Mon, 14 Aug 2023 06:07:23 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3senwjsg1v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Aug 2023 06:07:23 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 37E67LKx43843858 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 06:07:21 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5B76520040; Mon, 14 Aug 2023 06:07:21 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 60C7A2004B; Mon, 14 Aug 2023 06:07:20 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 14 Aug 2023 06:07:20 +0000 (GMT) Received: from bgray-lenovo-p15.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id A9D4C603C2; Mon, 14 Aug 2023 16:07:17 +1000 (AEST) From: Benjamin Gray To: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linux-doc@vger.kernel.org, bpf@vger.kernel.org, linux-pm@vger.kernel.org Cc: abbotti@mev.co.uk, hsweeten@visionengravers.com, jan.kiszka@siemens.com, kbingham@kernel.org, mykolal@fb.com, Benjamin Gray Subject: [PATCH 2/8] Documentation/sphinx: fix Python string escapes Date: Mon, 14 Aug 2023 16:06:58 +1000 Message-ID: <20230814060704.79655-3-bgray@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230814060704.79655-1-bgray@linux.ibm.com> References: <20230814060704.79655-1-bgray@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: VRzP-0K8w31oeuVqJAmrHynY3iRijDCP X-Proofpoint-ORIG-GUID: VRzP-0K8w31oeuVqJAmrHynY3iRijDCP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-13_24,2023-08-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 malwarescore=0 adultscore=0 suspectscore=0 spamscore=0 phishscore=0 mlxscore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308140055 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Python 3.6 introduced a DeprecationWarning for invalid escape sequences. This is upgraded to a SyntaxWarning in Python 3.12, and will eventually be a syntax error. Fix these now to get ahead of it before it's an error. Signed-off-by: Benjamin Gray --- Documentation/sphinx/cdomain.py | 2 +- Documentation/sphinx/kernel_abi.py | 2 +- Documentation/sphinx/kernel_feat.py | 2 +- Documentation/sphinx/kerneldoc.py | 2 +- Documentation/sphinx/maintainers_include.py | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/sphinx/cdomain.py b/Documentation/sphinx/cdomain= .py index ca8ac9e59ded..dbdc74bd0772 100644 --- a/Documentation/sphinx/cdomain.py +++ b/Documentation/sphinx/cdomain.py @@ -93,7 +93,7 @@ def markup_ctype_refs(match): # RE_expr =3D re.compile(r':c:(expr|texpr):`([^\`]+)`') def markup_c_expr(match): - return '\ ``' + match.group(2) + '``\ ' + return '\\ ``' + match.group(2) + '``\\ ' =20 # # Parse Sphinx 3.x C markups, replacing them by backward-compatible ones diff --git a/Documentation/sphinx/kernel_abi.py b/Documentation/sphinx/kern= el_abi.py index b5feb5b1d905..b9f026f016fd 100644 --- a/Documentation/sphinx/kernel_abi.py +++ b/Documentation/sphinx/kernel_abi.py @@ -138,7 +138,7 @@ class KernelCmd(Directive): code_block +=3D "\n " + l lines =3D code_block + "\n\n" =20 - line_regex =3D re.compile("^\.\. LINENO (\S+)\#([0-9]+)$") + line_regex =3D re.compile("^\\.\\. LINENO (\\S+)\\#([0-9]+)$") ln =3D 0 n =3D 0 f =3D fname diff --git a/Documentation/sphinx/kernel_feat.py b/Documentation/sphinx/ker= nel_feat.py index 27b701ed3681..d17adc1a367a 100644 --- a/Documentation/sphinx/kernel_feat.py +++ b/Documentation/sphinx/kernel_feat.py @@ -104,7 +104,7 @@ class KernelFeat(Directive): =20 lines =3D self.runCmd(cmd, shell=3DTrue, cwd=3Dcwd, env=3Dshell_en= v) =20 - line_regex =3D re.compile("^\.\. FILE (\S+)$") + line_regex =3D re.compile("^\\.\\. FILE (\\S+)$") =20 out_lines =3D "" =20 diff --git a/Documentation/sphinx/kerneldoc.py b/Documentation/sphinx/kerne= ldoc.py index 9395892c7ba3..d6ec34ce2232 100644 --- a/Documentation/sphinx/kerneldoc.py +++ b/Documentation/sphinx/kerneldoc.py @@ -130,7 +130,7 @@ class KernelDocDirective(Directive): result =3D ViewList() =20 lineoffset =3D 0; - line_regex =3D re.compile("^\.\. LINENO ([0-9]+)$") + line_regex =3D re.compile("^\\.\\. LINENO ([0-9]+)$") for line in lines: match =3D line_regex.search(line) if match: diff --git a/Documentation/sphinx/maintainers_include.py b/Documentation/sp= hinx/maintainers_include.py index 328b3631a585..73be47963153 100755 --- a/Documentation/sphinx/maintainers_include.py +++ b/Documentation/sphinx/maintainers_include.py @@ -77,7 +77,7 @@ class MaintainersInclude(Include): line =3D line.rstrip() =20 # Linkify all non-wildcard refs to ReST files in Documentation= /. - pat =3D '(Documentation/([^\s\?\*]*)\.rst)' + pat =3D '(Documentation/([^\\s\\?\\*]*)\\.rst)' m =3D re.search(pat, line) if m: # maintainers.rst is in a subdirectory, so include "../". @@ -90,11 +90,11 @@ class MaintainersInclude(Include): output =3D "| %s" % (line.replace("\\", "\\\\")) # Look for and record field letter to field name mappings: # R: Designated *reviewer*: FullName - m =3D re.search("\s(\S):\s", line) + m =3D re.search("\\s(\\S):\\s", line) if m: field_letter =3D m.group(1) if field_letter and not field_letter in fields: - m =3D re.search("\*([^\*]+)\*", line) + m =3D re.search("\\*([^\\*]+)\\*", line) if m: fields[field_letter] =3D m.group(1) elif subsystems: @@ -112,7 +112,7 @@ class MaintainersInclude(Include): field_content =3D "" =20 # Collapse whitespace in subsystem name. - heading =3D re.sub("\s+", " ", line) + heading =3D re.sub("\\s+", " ", line) output =3D output + "%s\n%s" % (heading, "~" * len(hea= ding)) field_prev =3D "" else: --=20 2.41.0 From nobody Thu Dec 18 09:39:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E577EC25B5F for ; Mon, 14 Aug 2023 06:08:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233676AbjHNGIT (ORCPT ); Mon, 14 Aug 2023 02:08:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233546AbjHNGHk (ORCPT ); Mon, 14 Aug 2023 02:07:40 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B8321AA; Sun, 13 Aug 2023 23:07:38 -0700 (PDT) Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37E5wGo8008597; Mon, 14 Aug 2023 06:07:24 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=+m5E0ort8uLDB//je7UqdQDP2mIAZ9xlBWCe8OC2AK0=; b=C7SbOWCgovIxo4SwWmO292UXFHY3cLt1XtEFpjVwZ4uT7eomzSIZhy8pufaCw0PmqMKf Edb0w3w5+9PwEcc4rNHFX7mC7nqderF7wNnfMCZi9ck9DxAMdyF/vHyhlri3I8lGXN1/ aYLM7JO3ZM8zUDoBZz9P1PBh+BNsdN6gYcJSkaOMWaT7ldGxp6gr/udA1DGu+Pf3xYcb YPg4gEOW0bS4E4bF6pL0FFsVyD2wU2TOdduHLPO26c503EyCHoLK328vu89rDlgF0fBP yaASpF1CqBDlma6FfoA0UpJ3j5vlzTHRnfPRBhdB6/ThylCUNZAFlNt656zqKrZuYPhc yg== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3sfekc04f2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Aug 2023 06:07:24 +0000 Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 37E4jMsh003576; Mon, 14 Aug 2023 06:07:23 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3semds2542-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Aug 2023 06:07:23 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 37E67LN223855836 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 06:07:21 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E64B320043; Mon, 14 Aug 2023 06:07:20 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6640D2004D; Mon, 14 Aug 2023 06:07:20 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 14 Aug 2023 06:07:20 +0000 (GMT) Received: from bgray-lenovo-p15.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id AD16C60571; Mon, 14 Aug 2023 16:07:17 +1000 (AEST) From: Benjamin Gray To: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linux-doc@vger.kernel.org, bpf@vger.kernel.org, linux-pm@vger.kernel.org Cc: abbotti@mev.co.uk, hsweeten@visionengravers.com, jan.kiszka@siemens.com, kbingham@kernel.org, mykolal@fb.com, Benjamin Gray Subject: [PATCH 3/8] drivers/comedi: fix Python string escapes Date: Mon, 14 Aug 2023 16:06:59 +1000 Message-ID: <20230814060704.79655-4-bgray@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230814060704.79655-1-bgray@linux.ibm.com> References: <20230814060704.79655-1-bgray@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: MZdZaOUs75wAymN1BJng2lpBtFubrPHw X-Proofpoint-ORIG-GUID: MZdZaOUs75wAymN1BJng2lpBtFubrPHw X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-13_24,2023-08-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 malwarescore=0 adultscore=0 suspectscore=0 spamscore=0 phishscore=0 mlxscore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308140055 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Python 3.6 introduced a DeprecationWarning for invalid escape sequences. This is upgraded to a SyntaxWarning in Python 3.12, and will eventually be a syntax error. Fix these now to get ahead of it before it's an error. Signed-off-by: Benjamin Gray --- drivers/comedi/drivers/ni_routing/tools/convert_csv_to_c.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/comedi/drivers/ni_routing/tools/convert_csv_to_c.py b/= drivers/comedi/drivers/ni_routing/tools/convert_csv_to_c.py index 90378fb50580..3d124a887be9 100755 --- a/drivers/comedi/drivers/ni_routing/tools/convert_csv_to_c.py +++ b/drivers/comedi/drivers/ni_routing/tools/convert_csv_to_c.py @@ -44,7 +44,7 @@ def routedict_to_structinit_single(name, D, return_name= =3DFalse): =20 lines.append('\t\t[B({})] =3D {{'.format(D0_sig)) for D1_sig, value in D1: - if not re.match('[VIU]\([^)]*\)', value): + if not re.match('[VIU]\\([^)]*\\)', value): sys.stderr.write('Invalid register format: {}\n'.format(repr(value= ))) sys.stderr.write( 'Register values should be formatted with V(),I(),or U()\n') --=20 2.41.0 From nobody Thu Dec 18 09:39:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 822B3C16B13 for ; Mon, 14 Aug 2023 06:08:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233604AbjHNGIN (ORCPT ); Mon, 14 Aug 2023 02:08:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233620AbjHNGHp (ORCPT ); Mon, 14 Aug 2023 02:07:45 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C04DD10D0; Sun, 13 Aug 2023 23:07:43 -0700 (PDT) Received: from pps.filterd (m0353722.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37E63RkV005694; Mon, 14 Aug 2023 06:07:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=KCClE1Pg9KTc+d/BWRyMuSCzOTTnUY58PaLYLhLAO0M=; b=lSt01/R3eBZhJREChxdEVRzN/1ZzKiPAj7496FRMUXKxQiU7kskJRI8ypIrrX8pFKkOW 54XRomaixzqIawWBgmarqMkQJWqrsgC0wqEfoa4EFGaiIyEmZw5EFrpHfYQB5abWuf1s n/8Zdy3kpc1OQNamZWxHTFjFnhsU5+VbeW2zjCjz6iEORgaYfoKUrjnqkVZv2Ud9kxov k3jRcX8LSnZ8E2xPwY7ZqIySCYrAXxwsvv6LNfLORquQBD7pS0htnZQHZu+oPq2PDUJo JEjPn6f1yhFdde4EyB7jkLsgq0lKV+S1Fp7ENmT27NN2e7KV+6TD77uS3LQGra0+4QC3 gA== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3sfenqrf8u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Aug 2023 06:07:26 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 37E5Qeaw001085; Mon, 14 Aug 2023 06:07:23 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3semsxt0fk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Aug 2023 06:07:23 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 37E67LNp65339718 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 06:07:21 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 63B272004F; Mon, 14 Aug 2023 06:07:21 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 665CE20040; Mon, 14 Aug 2023 06:07:20 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 14 Aug 2023 06:07:20 +0000 (GMT) Received: from bgray-lenovo-p15.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id B03106058C; Mon, 14 Aug 2023 16:07:17 +1000 (AEST) From: Benjamin Gray To: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linux-doc@vger.kernel.org, bpf@vger.kernel.org, linux-pm@vger.kernel.org Cc: abbotti@mev.co.uk, hsweeten@visionengravers.com, jan.kiszka@siemens.com, kbingham@kernel.org, mykolal@fb.com, Benjamin Gray Subject: [PATCH 4/8] scripts: fix Python string escapes Date: Mon, 14 Aug 2023 16:07:00 +1000 Message-ID: <20230814060704.79655-5-bgray@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230814060704.79655-1-bgray@linux.ibm.com> References: <20230814060704.79655-1-bgray@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: MY4z4XD1yCu9hVbBz-meb3h3AUQKcBrt X-Proofpoint-ORIG-GUID: MY4z4XD1yCu9hVbBz-meb3h3AUQKcBrt X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-13_24,2023-08-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 impostorscore=0 mlxscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 phishscore=0 clxscore=1015 suspectscore=0 adultscore=0 lowpriorityscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308140055 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Python 3.6 introduced a DeprecationWarning for invalid escape sequences. This is upgraded to a SyntaxWarning in Python 3.12, and will eventually be a syntax error. Fix these now to get ahead of it before it's an error. Signed-off-by: Benjamin Gray --- scripts/bpf_doc.py | 56 ++++++++++----------- scripts/clang-tools/gen_compile_commands.py | 2 +- scripts/gdb/linux/symbols.py | 2 +- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/scripts/bpf_doc.py b/scripts/bpf_doc.py index eaae2ce78381..40a2643f94d2 100755 --- a/scripts/bpf_doc.py +++ b/scripts/bpf_doc.py @@ -59,9 +59,9 @@ class Helper(APIElement): Break down helper function protocol into smaller chunks: return ty= pe, name, distincts arguments. """ - arg_re =3D re.compile('((\w+ )*?(\w+|...))( (\**)(\w+))?$') + arg_re =3D re.compile('((\\w+ )*?(\\w+|...))( (\\**)(\\w+))?$') res =3D {} - proto_re =3D re.compile('(.+) (\**)(\w+)\(((([^,]+)(, )?){1,5})\)$= ') + proto_re =3D re.compile('(.+) (\\**)(\\w+)\\(((([^,]+)(, )?){1,5})= \\)$') =20 capture =3D proto_re.match(self.proto) res['ret_type'] =3D capture.group(1) @@ -114,11 +114,11 @@ class HeaderParser(object): return Helper(proto=3Dproto, desc=3Ddesc, ret=3Dret) =20 def parse_symbol(self): - p =3D re.compile(' \* ?(BPF\w+)$') + p =3D re.compile(' \\* ?(BPF\\w+)$') capture =3D p.match(self.line) if not capture: raise NoSyscallCommandFound - end_re =3D re.compile(' \* ?NOTES$') + end_re =3D re.compile(' \\* ?NOTES$') end =3D end_re.match(self.line) if end: raise NoSyscallCommandFound @@ -133,7 +133,7 @@ class HeaderParser(object): # - Same as above, with "const" and/or "struct" in front of type # - "..." (undefined number of arguments, for bpf_trace_printk()) # There is at least one term ("void"), and at most five arguments. - p =3D re.compile(' \* ?((.+) \**\w+\((((const )?(struct )?(\w+|\.\= .\.)( \**\w+)?)(, )?){1,5}\))$') + p =3D re.compile(' \\* ?((.+) \\**\\w+\\((((const )?(struct )?(\\w= +|\\.\\.\\.)( \\**\\w+)?)(, )?){1,5}\\))$') capture =3D p.match(self.line) if not capture: raise NoHelperFound @@ -141,7 +141,7 @@ class HeaderParser(object): return capture.group(1) =20 def parse_desc(self, proto): - p =3D re.compile(' \* ?(?:\t| {5,8})Description$') + p =3D re.compile(' \\* ?(?:\t| {5,8})Description$') capture =3D p.match(self.line) if not capture: raise Exception("No description section found for " + proto) @@ -154,7 +154,7 @@ class HeaderParser(object): if self.line =3D=3D ' *\n': desc +=3D '\n' else: - p =3D re.compile(' \* ?(?:\t| {5,8})(?:\t| {8})(.*)') + p =3D re.compile(' \\* ?(?:\t| {5,8})(?:\t| {8})(.*)') capture =3D p.match(self.line) if capture: desc_present =3D True @@ -167,7 +167,7 @@ class HeaderParser(object): return desc =20 def parse_ret(self, proto): - p =3D re.compile(' \* ?(?:\t| {5,8})Return$') + p =3D re.compile(' \\* ?(?:\t| {5,8})Return$') capture =3D p.match(self.line) if not capture: raise Exception("No return section found for " + proto) @@ -180,7 +180,7 @@ class HeaderParser(object): if self.line =3D=3D ' *\n': ret +=3D '\n' else: - p =3D re.compile(' \* ?(?:\t| {5,8})(?:\t| {8})(.*)') + p =3D re.compile(' \\* ?(?:\t| {5,8})(?:\t| {8})(.*)') capture =3D p.match(self.line) if capture: ret_present =3D True @@ -219,12 +219,12 @@ class HeaderParser(object): self.seek_to('enum bpf_cmd {', 'Could not find start of bpf_cmd enum', 0) # Searches for either one or more BPF\w+ enums - bpf_p =3D re.compile('\s*(BPF\w+)+') + bpf_p =3D re.compile('\\s*(BPF\\w+)+') # Searches for an enum entry assigned to another entry, # for e.g. BPF_PROG_RUN =3D BPF_PROG_TEST_RUN, which is # not documented hence should be skipped in check to # determine if the right number of syscalls are documented - assign_p =3D re.compile('\s*(BPF\w+)\s*=3D\s*(BPF\w+)') + assign_p =3D re.compile('\\s*(BPF\\w+)\\s*=3D\\s*(BPF\\w+)') bpf_cmd_str =3D '' while True: capture =3D assign_p.match(self.line) @@ -239,7 +239,7 @@ class HeaderParser(object): break self.line =3D self.reader.readline() # Find the number of occurences of BPF\w+ - self.enum_syscalls =3D re.findall('(BPF\w+)+', bpf_cmd_str) + self.enum_syscalls =3D re.findall('(BPF\\w+)+', bpf_cmd_str) =20 def parse_desc_helpers(self): self.seek_to(helpersDocStart, @@ -263,7 +263,7 @@ class HeaderParser(object): self.seek_to('#define ___BPF_FUNC_MAPPER(FN, ctx...)', 'Could not find start of eBPF helper definition list') # Searches for one FN(\w+) define or a backslash for newline - p =3D re.compile('\s*FN\((\w+), (\d+), ##ctx\)|\\\\') + p =3D re.compile('\\s*FN\\((\\w+), (\\d+), ##ctx\\)|\\\\') fn_defines_str =3D '' i =3D 0 while True: @@ -278,7 +278,7 @@ class HeaderParser(object): break self.line =3D self.reader.readline() # Find the number of occurences of FN(\w+) - self.define_unique_helpers =3D re.findall('FN\(\w+, \d+, ##ctx\)',= fn_defines_str) + self.define_unique_helpers =3D re.findall('FN\\(\\w+, \\d+, ##ctx\= \)', fn_defines_str) =20 def validate_helpers(self): last_helper =3D '' @@ -425,7 +425,7 @@ class PrinterRST(Printer): try: cmd =3D ['git', 'log', '-1', '--pretty=3Dformat:%cs', '--no-pa= tch', '-L', - '/{}/,/\*\//:include/uapi/linux/bpf.h'.format(delimiter= )] + '/{}/,/\\*\\//:include/uapi/linux/bpf.h'.format(delimit= er)] date =3D subprocess.run(cmd, cwd=3DlinuxRoot, capture_output=3DTrue, check=3DTrue) return date.stdout.decode().rstrip() @@ -516,7 +516,7 @@ as "Dual BSD/GPL", may be used). Some helper functions = are only accessible to programs that are compatible with the GNU Privacy License (GPL). =20 In order to use such helpers, the eBPF program must be loaded with the cor= rect -license string passed (via **attr**) to the **bpf**\ () system call, and t= his +license string passed (via **attr**) to the **bpf**\\ () system call, and = this generally translates into the C source code of the program containing a li= ne similar to the following: =20 @@ -550,7 +550,7 @@ may be interested in: * The bpftool utility can be used to probe the availability of helper func= tions on the system (as well as supported program and map types, and a number = of other parameters). To do so, run **bpftool feature probe** (see - **bpftool-feature**\ (8) for details). Add the **unprivileged** keyword = to + **bpftool-feature**\\ (8) for details). Add the **unprivileged** keyword= to list features available to unprivileged users. =20 Compatibility between helper functions and program types can generally be = found @@ -562,23 +562,23 @@ other functions, themselves allowing access to additi= onal helpers. The requirement for GPL license is also in those **struct bpf_func_proto**. =20 Compatibility between helper functions and map types can be found in the -**check_map_func_compatibility**\ () function in file *kernel/bpf/verifier= .c*. +**check_map_func_compatibility**\\ () function in file *kernel/bpf/verifie= r.c*. =20 Helper functions that invalidate the checks on **data** and **data_end** pointers for network processing are listed in function -**bpf_helper_changes_pkt_data**\ () in file *net/core/filter.c*. +**bpf_helper_changes_pkt_data**\\ () in file *net/core/filter.c*. =20 SEE ALSO =3D=3D=3D=3D=3D=3D=3D=3D =20 -**bpf**\ (2), -**bpftool**\ (8), -**cgroups**\ (7), -**ip**\ (8), -**perf_event_open**\ (2), -**sendmsg**\ (2), -**socket**\ (7), -**tc-bpf**\ (8)''' +**bpf**\\ (2), +**bpftool**\\ (8), +**cgroups**\\ (7), +**ip**\\ (8), +**perf_event_open**\\ (2), +**sendmsg**\\ (2), +**socket**\\ (7), +**tc-bpf**\\ (8)''' print(footer) =20 def print_proto(self, helper): @@ -598,7 +598,7 @@ SEE ALSO one_arg =3D '{}{}'.format(comma, a['type']) if a['name']: if a['star']: - one_arg +=3D ' {}**\ '.format(a['star'].replace('*', '= \\*')) + one_arg +=3D ' {}**\\ '.format(a['star'].replace('*', = '\\*')) else: one_arg +=3D '** ' one_arg +=3D '*{}*\\ **'.format(a['name']) diff --git a/scripts/clang-tools/gen_compile_commands.py b/scripts/clang-to= ols/gen_compile_commands.py index a84cc5737c2c..649a80005c83 100755 --- a/scripts/clang-tools/gen_compile_commands.py +++ b/scripts/clang-tools/gen_compile_commands.py @@ -170,7 +170,7 @@ def process_line(root_directory, command_prefix, file_p= ath): # escape the pound sign '#', either as '\#' or '$(pound)' (depending o= n the # kernel version). The compile_commands.json file is not interepreted # by Make, so this code replaces the escaped version with '#'. - prefix =3D command_prefix.replace('\#', '#').replace('$(pound)', '#') + prefix =3D command_prefix.replace('\\#', '#').replace('$(pound)', '#') =20 # Use os.path.abspath() to normalize the path resolving '.' and '..' . abs_path =3D os.path.abspath(os.path.join(root_directory, file_path)) diff --git a/scripts/gdb/linux/symbols.py b/scripts/gdb/linux/symbols.py index fdad3f32c747..bae7cbff187e 100644 --- a/scripts/gdb/linux/symbols.py +++ b/scripts/gdb/linux/symbols.py @@ -82,7 +82,7 @@ lx-symbols command.""" self.module_files_updated =3D True =20 def _get_module_file(self, module_name): - module_pattern =3D ".*/{0}\.ko(?:.debug)?$".format( + module_pattern =3D ".*/{0}\\.ko(?:.debug)?$".format( module_name.replace("_", r"[_\-]")) for name in self.module_files: if re.match(module_pattern, name) and os.path.exists(name): --=20 2.41.0 From nobody Thu Dec 18 09:39:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E3DCC19F4F for ; Mon, 14 Aug 2023 06:08:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233620AbjHNGIO (ORCPT ); Mon, 14 Aug 2023 02:08:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233592AbjHNGHm (ORCPT ); Mon, 14 Aug 2023 02:07:42 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3ABB13E; Sun, 13 Aug 2023 23:07:40 -0700 (PDT) Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37E5wCmj008513; Mon, 14 Aug 2023 06:07:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=JGHbwUDwCZJLL1E8eoR5git6klTdwxNmSfECAAz5V1E=; b=r34X1OCHrEgOz9K0r05KOymawtz024UgtSaEDUwhkBpHnS0VLqInOx3gbbTXWzr0TMwE BWAEHjSKE+K1ilU+IoMjqQY2ADE90ACOFki14mQzEsCwS2ZoUw+vYuXQLyh1rmlcnygP mYjdAVUpdeDXMO7lxjNbFEyH82IGvAFn9E8IYSWoBgGCdIGaNZcJapg8rKCDtjmei/fz ruZ6fDrzwbihWsBqaliKTGsBQDttLP5lsQAhaOMyH/NZscvu/WdZCMNOFQ8tQocWBrbx jH2WZxjQPSJW6/sVYpa++B79q0yp7LlUXTPRawnEVtg9viSasutJ2SIzikU2eG1fNr8B eA== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3sfekc04mv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Aug 2023 06:07:27 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 37E5Qeb0001085; Mon, 14 Aug 2023 06:07:26 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3semsxt0fy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Aug 2023 06:07:25 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 37E67NYM6947448 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 06:07:23 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BF6502006B; Mon, 14 Aug 2023 06:07:23 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C40A020043; Mon, 14 Aug 2023 06:07:22 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 14 Aug 2023 06:07:22 +0000 (GMT) Received: from bgray-lenovo-p15.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id B3CE56056F; Mon, 14 Aug 2023 16:07:17 +1000 (AEST) From: Benjamin Gray To: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linux-doc@vger.kernel.org, bpf@vger.kernel.org, linux-pm@vger.kernel.org Cc: abbotti@mev.co.uk, hsweeten@visionengravers.com, jan.kiszka@siemens.com, kbingham@kernel.org, mykolal@fb.com, Benjamin Gray Subject: [PATCH 5/8] tools/perf: fix Python string escapes Date: Mon, 14 Aug 2023 16:07:01 +1000 Message-ID: <20230814060704.79655-6-bgray@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230814060704.79655-1-bgray@linux.ibm.com> References: <20230814060704.79655-1-bgray@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: HrmY5_qpjsyApIPopT-sKiqX1VVbc-D7 X-Proofpoint-ORIG-GUID: HrmY5_qpjsyApIPopT-sKiqX1VVbc-D7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-13_24,2023-08-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 malwarescore=0 adultscore=0 suspectscore=0 spamscore=0 phishscore=0 mlxscore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308140055 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Python 3.6 introduced a DeprecationWarning for invalid escape sequences. This is upgraded to a SyntaxWarning in Python 3.12, and will eventually be a syntax error. Fix these now to get ahead of it before it's an error. Signed-off-by: Benjamin Gray --- tools/perf/pmu-events/jevents.py | 2 +- tools/perf/scripts/python/arm-cs-trace-disasm.py | 4 ++-- tools/perf/scripts/python/compaction-times.py | 2 +- tools/perf/scripts/python/exported-sql-viewer.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index 12e80bb7939b..87964bf32b62 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -83,7 +83,7 @@ def c_len(s: str) -> int: """Return the length of s a C string =20 This doesn't handle all escape characters properly. It first assumes - all \ are for escaping, it then adjusts as it will have over counted + all \\ are for escaping, it then adjusts as it will have over counted \\. The code uses \000 rather than \0 as a terminator as an adjacent number would be folded into a string of \0 (ie. "\0" + "5" doesn't equal a terminator followed by the number 5 but the escape of diff --git a/tools/perf/scripts/python/arm-cs-trace-disasm.py b/tools/perf/= scripts/python/arm-cs-trace-disasm.py index d59ff53f1d94..cbd866acef2f 100755 --- a/tools/perf/scripts/python/arm-cs-trace-disasm.py +++ b/tools/perf/scripts/python/arm-cs-trace-disasm.py @@ -45,8 +45,8 @@ parser =3D OptionParser(option_list=3Doption_list) # Initialize global dicts and regular expression disasm_cache =3D dict() cpu_data =3D dict() -disasm_re =3D re.compile("^\s*([0-9a-fA-F]+):") -disasm_func_re =3D re.compile("^\s*([0-9a-fA-F]+)\s.*:") +disasm_re =3D re.compile("^\\s*([0-9a-fA-F]+):") +disasm_func_re =3D re.compile("^\\s*([0-9a-fA-F]+)\\s.*:") cache_size =3D 64*1024 =20 glb_source_file_name =3D None diff --git a/tools/perf/scripts/python/compaction-times.py b/tools/perf/scr= ipts/python/compaction-times.py index 2560a042dc6f..b75d90ffb194 100644 --- a/tools/perf/scripts/python/compaction-times.py +++ b/tools/perf/scripts/python/compaction-times.py @@ -260,7 +260,7 @@ def pr_help(): =20 comm_re =3D None pid_re =3D None -pid_regex =3D "^(\d*)-(\d*)$|^(\d*)$" +pid_regex =3D "^(\\d*)-(\\d*)$|^(\\d*)$" =20 opt_proc =3D popt.DISP_DFL opt_disp =3D topt.DISP_ALL diff --git a/tools/perf/scripts/python/exported-sql-viewer.py b/tools/perf/= scripts/python/exported-sql-viewer.py index 13f2d8a81610..121cf61ba1b3 100755 --- a/tools/perf/scripts/python/exported-sql-viewer.py +++ b/tools/perf/scripts/python/exported-sql-viewer.py @@ -677,8 +677,8 @@ class CallGraphModelBase(TreeModel): # sqlite supports GLOB (text only) which uses * and ? and is case sen= sitive if not self.glb.dbref.is_sqlite3: # Escape % and _ - s =3D value.replace("%", "\%") - s =3D s.replace("_", "\_") + s =3D value.replace("%", "\\%") + s =3D s.replace("_", "\\_") # Translate * and ? into SQL LIKE pattern characters % and _ trans =3D string.maketrans("*?", "%_") match =3D " LIKE '" + str(s).translate(trans) + "'" --=20 2.41.0 From nobody Thu Dec 18 09:39:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0468C001E0 for ; Mon, 14 Aug 2023 06:10:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233664AbjHNGJm (ORCPT ); Mon, 14 Aug 2023 02:09:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233753AbjHNGJX (ORCPT ); Mon, 14 Aug 2023 02:09:23 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02C2F19B5; Sun, 13 Aug 2023 23:08:55 -0700 (PDT) Received: from pps.filterd (m0353722.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37E63R5h005710; Mon, 14 Aug 2023 06:08:49 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=+LEqgbgJrJJaX+HpQ83fqIFwJ69ofoMpd+GcuOiWZ9U=; b=TLRcDwZeasuwyWQRCrgVxPoq4CCsE83o0LYj97uXFZtwlgTDbwqq/drjAqYi0OAq3Goi gD9kpTiV9EvxMRoOPcyQLAvSPD+H3prM1XPjBjKZCPCLRsXHuBuk99HtHWnsJZVyCUQd gTq3WSukfUyemTwoCEIM5dSFjFVGjTFTvzx5nw5HGectFGxmoO3DbFLEWMV658uTZnMC oULA7QjFjKBFao+HUKdr9JbXP7Q0B5b7uN+Lajrtt9O8obogJ52djGOH0TKYfHb7Ew+C hMx6OL2jtxExMnAZXkMulKumX/dkV9IVz3xqZE8kc52yi9hHwRFjRHL50Qc2XZedP4m4 tg== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3sfenqrfc7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Aug 2023 06:08:48 +0000 Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 37E4x8N4013240; Mon, 14 Aug 2023 06:07:25 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3sepmj97cc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Aug 2023 06:07:25 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 37E67NrD2818690 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 06:07:23 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4ADA72004E; Mon, 14 Aug 2023 06:07:23 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C06572004B; Mon, 14 Aug 2023 06:07:22 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 14 Aug 2023 06:07:22 +0000 (GMT) Received: from bgray-lenovo-p15.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id B71006064A; Mon, 14 Aug 2023 16:07:17 +1000 (AEST) From: Benjamin Gray To: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linux-doc@vger.kernel.org, bpf@vger.kernel.org, linux-pm@vger.kernel.org Cc: abbotti@mev.co.uk, hsweeten@visionengravers.com, jan.kiszka@siemens.com, kbingham@kernel.org, mykolal@fb.com, Benjamin Gray Subject: [PATCH 6/8] tools/power: fix Python string escapes Date: Mon, 14 Aug 2023 16:07:02 +1000 Message-ID: <20230814060704.79655-7-bgray@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230814060704.79655-1-bgray@linux.ibm.com> References: <20230814060704.79655-1-bgray@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: hl6PiBnu7GQCT8PUV4NKLnXO2JONskZ5 X-Proofpoint-ORIG-GUID: hl6PiBnu7GQCT8PUV4NKLnXO2JONskZ5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-13_24,2023-08-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 impostorscore=0 mlxscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 phishscore=0 clxscore=1015 suspectscore=0 adultscore=0 lowpriorityscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308140055 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Python 3.6 introduced a DeprecationWarning for invalid escape sequences. This is upgraded to a SyntaxWarning in Python 3.12, and will eventually be a syntax error. Fix these now to get ahead of it before it's an error. Signed-off-by: Benjamin Gray --- tools/power/pm-graph/bootgraph.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/power/pm-graph/bootgraph.py b/tools/power/pm-graph/bootg= raph.py index f96f50e0c336..e983c4e71d77 100755 --- a/tools/power/pm-graph/bootgraph.py +++ b/tools/power/pm-graph/bootgraph.py @@ -77,12 +77,12 @@ class SystemValues(aslib.SystemValues): fp.close() self.testdir =3D datetime.now().strftime('boot-%y%m%d-%H%M%S') def kernelVersion(self, msg): - m =3D re.match('^[Ll]inux *[Vv]ersion *(?P\S*) .*', msg) + m =3D re.match('^[Ll]inux *[Vv]ersion *(?P\\S*) .*', msg) if m: return m.group('v') return 'unknown' def checkFtraceKernelVersion(self): - m =3D re.match('^(?P[0-9]*)\.(?P[0-9]*)\.(?P[0-9]*).*', self.ke= rnel) + m =3D re.match('^(?P[0-9]*)\\.(?P[0-9]*)\\.(?P[0-9]*).*', self.= kernel) if m: val =3D tuple(map(int, m.groups())) if val >=3D (4, 10, 0): @@ -324,7 +324,7 @@ def parseKernelLog(): idx =3D line.find('[') if idx > 1: line =3D line[idx:] - m =3D re.match('[ \t]*(\[ *)(?P[0-9\.]*)(\]) (?P.*)', line) + m =3D re.match('[ \t]*(\\[ *)(?P[0-9\\.]*)(\\]) (?P.*)', lin= e) if(not m): continue ktime =3D float(m.group('ktime')) @@ -336,20 +336,20 @@ def parseKernelLog(): if(not sysvals.stamp['kernel']): sysvals.stamp['kernel'] =3D sysvals.kernelVersion(msg) continue - m =3D re.match('.* setting system clock to (?P[0-9\-]*)[ A-Z](?P[0= -9:]*) UTC.*', msg) + m =3D re.match('.* setting system clock to (?P[0-9\\-]*)[ A-Z](?P[= 0-9:]*) UTC.*', msg) if(m): bt =3D datetime.strptime(m.group('d')+' '+m.group('t'), '%Y-%m-%d %H:%M= :%S') bt =3D bt - timedelta(seconds=3Dint(ktime)) data.boottime =3D bt.strftime('%Y-%m-%d_%H:%M:%S') sysvals.stamp['time'] =3D bt.strftime('%B %d %Y, %I:%M:%S %p') continue - m =3D re.match('^calling *(?P.*)\+.* @ (?P

[0-9]*)', msg) + m =3D re.match('^calling *(?P.*)\\+.* @ (?P

[0-9]*)', msg) if(m): func =3D m.group('f') pid =3D int(m.group('p')) devtemp[func] =3D (ktime, pid) continue - m =3D re.match('^initcall *(?P.*)\+.* returned (?P.*) after (?P= .*) usecs', msg) + m =3D re.match('^initcall *(?P.*)\\+.* returned (?P.*) after (?P.*) usecs', msg) if(m): data.valid =3D True data.end =3D ktime --=20 2.41.0 From nobody Thu Dec 18 09:39:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7988C0729B for ; Mon, 14 Aug 2023 06:08:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233558AbjHNGIH (ORCPT ); Mon, 14 Aug 2023 02:08:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233554AbjHNGHk (ORCPT ); Mon, 14 Aug 2023 02:07:40 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3824130; Sun, 13 Aug 2023 23:07:39 -0700 (PDT) Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37E5wDIA008544; Mon, 14 Aug 2023 06:07:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=RakeFN8xdX8Q8mJzFizh+TfMadxF+rWy8YJcONZPKd8=; b=qlLINEA/LIhOGERVCv4wD5gbiy5cLRUg0qDIOYITL/nqa0oo0oMxRWO/uSorpBIdQYq6 ZPNgmLyC6D7loUN95NH+UtuxcslSurDJl9nVsG6zkUd2LCqpeB9u8brzM/gYKKcovmBe OcARaawfEoN+qJEjBZn23QpQa732A8le4F7ya9Bmgb4ibfhrKLq+Ymc3YUgQirhzu/3r IYCtpZgjEaXLuPm9N+bv0WPaz6cVsx3RTD4rz/wKTutVJbMQ3pgul0W/wK5PnZVsoJfV RhW4usk64BxMx+yLPES7FDIM+D96ZqQOqK9OZaINRezg6ahsZ977rIkZqH2cfRupBa+d /Q== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3sfekc04ny-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Aug 2023 06:07:29 +0000 Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 37E5KPEF018831; Mon, 14 Aug 2023 06:07:26 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 3seq4111ct-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Aug 2023 06:07:26 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 37E67Nli15270542 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 06:07:24 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BD3BF2004E; Mon, 14 Aug 2023 06:07:23 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C09D82004D; Mon, 14 Aug 2023 06:07:22 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 14 Aug 2023 06:07:22 +0000 (GMT) Received: from bgray-lenovo-p15.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id BA40B6064E; Mon, 14 Aug 2023 16:07:17 +1000 (AEST) From: Benjamin Gray To: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linux-doc@vger.kernel.org, bpf@vger.kernel.org, linux-pm@vger.kernel.org Cc: abbotti@mev.co.uk, hsweeten@visionengravers.com, jan.kiszka@siemens.com, kbingham@kernel.org, mykolal@fb.com, Benjamin Gray Subject: [PATCH 7/8] selftests/bpf: fix Python string escapes Date: Mon, 14 Aug 2023 16:07:03 +1000 Message-ID: <20230814060704.79655-8-bgray@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230814060704.79655-1-bgray@linux.ibm.com> References: <20230814060704.79655-1-bgray@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Fbc1edc-jH_FGc-4Wk-eSSGZXYc1ES_k X-Proofpoint-ORIG-GUID: Fbc1edc-jH_FGc-4Wk-eSSGZXYc1ES_k X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-13_24,2023-08-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 malwarescore=0 adultscore=0 suspectscore=0 spamscore=0 phishscore=0 mlxscore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308140055 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Python 3.6 introduced a DeprecationWarning for invalid escape sequences. This is upgraded to a SyntaxWarning in Python 3.12, and will eventually be a syntax error. Fix these now to get ahead of it before it's an error. Signed-off-by: Benjamin Gray --- .../selftests/bpf/test_bpftool_synctypes.py | 18 +++++++++--------- tools/testing/selftests/bpf/test_offload.py | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/bpf/test_bpftool_synctypes.py b/tools/= testing/selftests/bpf/test_bpftool_synctypes.py index 0cfece7ff4f8..b21bc1a35bf4 100755 --- a/tools/testing/selftests/bpf/test_bpftool_synctypes.py +++ b/tools/testing/selftests/bpf/test_bpftool_synctypes.py @@ -80,7 +80,7 @@ class ArrayParser(BlockParser): Parse a block and return data as a dictionary. Items to extract mu= st be on separate lines in the file. """ - pattern =3D re.compile('\[(BPF_\w*)\]\s*=3D (true|false),?$') + pattern =3D re.compile('\\[(BPF_\\w*)\\]\\s*=3D (true|false),?$') entries =3D set() while True: line =3D self.reader.readline() @@ -178,7 +178,7 @@ class FileExtractor(object): @enum_name: name of the enum to parse """ start_marker =3D re.compile(f'enum {enum_name} {{\n') - pattern =3D re.compile('^\s*(BPF_\w+),?(\s+/\*.*\*/)?$') + pattern =3D re.compile('^\\s*(BPF_\\w+),?(\\s+/\\*.*\\*/)?$') end_marker =3D re.compile('^};') parser =3D BlockParser(self.reader) parser.search_block(start_marker) @@ -227,7 +227,7 @@ class FileExtractor(object): @block_name: name of the blog to parse, 'TYPE' in the example """ start_marker =3D re.compile(f'\*{block_name}\* :=3D {{') - pattern =3D re.compile('\*\*([\w/-]+)\*\*') + pattern =3D re.compile('\\*\\*([\\w/-]+)\\*\\*') end_marker =3D re.compile('}\n') return self.__get_description_list(start_marker, pattern, end_mark= er) =20 @@ -246,7 +246,7 @@ class FileExtractor(object): @block_name: name of the blog to parse, 'TYPE' in the example """ start_marker =3D re.compile(f'"\s*{block_name} :=3D {{') - pattern =3D re.compile('([\w/]+) [|}]') + pattern =3D re.compile('([\\w/]+) [|}]') end_marker =3D re.compile('}') return self.__get_description_list(start_marker, pattern, end_mark= er) =20 @@ -265,7 +265,7 @@ class FileExtractor(object): @macro: macro starting the block, 'HELP_SPEC_OPTIONS' in the examp= le """ start_marker =3D re.compile(f'"\s*{macro}\s*" [|}}]') - pattern =3D re.compile('([\w-]+) ?(?:\||}[ }\]])') + pattern =3D re.compile('([\\w-]+) ?(?:\\||}[ }\\]])') end_marker =3D re.compile('}\\\\n') return self.__get_description_list(start_marker, pattern, end_mark= er) =20 @@ -284,7 +284,7 @@ class FileExtractor(object): @block_name: name of the blog to parse, 'TYPE' in the example """ start_marker =3D re.compile(f'local {block_name}=3D\'') - pattern =3D re.compile('(?:.*=3D\')?([\w/]+)') + pattern =3D re.compile('(?:.*=3D\')?([\\w/]+)') end_marker =3D re.compile('\'$') return self.__get_description_list(start_marker, pattern, end_mark= er) =20 @@ -316,7 +316,7 @@ class MainHeaderFileExtractor(SourceFileExtractor): {'-p', '-d', '--pretty', '--debug', '--json', '-j'} """ start_marker =3D re.compile(f'"OPTIONS :=3D') - pattern =3D re.compile('([\w-]+) ?(?:\||}[ }\]"])') + pattern =3D re.compile('([\\w-]+) ?(?:\\||}[ }\\]"])') end_marker =3D re.compile('#define') =20 parser =3D InlineListParser(self.reader) @@ -338,8 +338,8 @@ class ManSubstitutionsExtractor(SourceFileExtractor): =20 {'-p', '-d', '--pretty', '--debug', '--json', '-j'} """ - start_marker =3D re.compile('\|COMMON_OPTIONS\| replace:: {') - pattern =3D re.compile('\*\*([\w/-]+)\*\*') + start_marker =3D re.compile('\\|COMMON_OPTIONS\\| replace:: {') + pattern =3D re.compile('\\*\\*([\\w/-]+)\\*\\*') end_marker =3D re.compile('}$') =20 parser =3D InlineListParser(self.reader) diff --git a/tools/testing/selftests/bpf/test_offload.py b/tools/testing/se= lftests/bpf/test_offload.py index 40cba8d368d9..f7cee0d1d36e 100755 --- a/tools/testing/selftests/bpf/test_offload.py +++ b/tools/testing/selftests/bpf/test_offload.py @@ -429,7 +429,7 @@ class NetdevSim: def __init__(self, nsimdev, port_index, ifname): # In case udev renamed the netdev to according to new schema, # check if the name matches the port_index. - nsimnamere =3D re.compile("eni\d+np(\d+)") + nsimnamere =3D re.compile("eni\\d+np(\\d+)") match =3D nsimnamere.match(ifname) if match and int(match.groups()[0]) !=3D port_index + 1: raise Exception("netdevice name mismatches the expected one") --=20 2.41.0 From nobody Thu Dec 18 09:39:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD990C04FDF for ; Mon, 14 Aug 2023 06:17:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233142AbjHNGQu (ORCPT ); Mon, 14 Aug 2023 02:16:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230072AbjHNGQc (ORCPT ); Mon, 14 Aug 2023 02:16:32 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02503F4; Sun, 13 Aug 2023 23:16:31 -0700 (PDT) Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37E6Bkb0022430; Mon, 14 Aug 2023 06:15:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=Z4fU+YYJUASo5wHESwfoB5sizpj1SLIP29KWGgkn9p4=; b=ZPGpBSRRsNQxbfXUWXytkgZrJ5puMr/YQbuBo+/jSurFUpKLtg/etEjz9yAmMYAAfQE6 eCbslPsNPoQSZif2h+3C1AHCSkYWao3s9tqN1hkW7oaXGeV+3driaG4hXAH3j2ekU+FT vZzZwNy+ULyTpBmEgB2RWW4EBGopQ8n0RkoW8xFa9tqWTFdT2y8T9i7vBHYlsJ4yDP/Q pMJRL5J0GM8ukZRHhW10f+X4u63xjFiY3s3nIIcqukdtZhZ2A/l6wemZA7BIrYuWb7Zi psuZquyiGAvbti6n+4JFda3MZnK4jS2tstcuZHUtcbKonQCIBsopnEKJg6ZQVCRdEzEv pw== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3sfek2g7kk-10 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Aug 2023 06:15:33 +0000 Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 37E4vifS013413; Mon, 14 Aug 2023 06:07:25 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3sepmj97ca-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Aug 2023 06:07:25 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 37E67NI936897134 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 06:07:23 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 58B5C2004F; Mon, 14 Aug 2023 06:07:23 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CCA0D2004E; Mon, 14 Aug 2023 06:07:22 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 14 Aug 2023 06:07:22 +0000 (GMT) Received: from bgray-lenovo-p15.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id BDE9A60648; Mon, 14 Aug 2023 16:07:17 +1000 (AEST) From: Benjamin Gray To: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linux-doc@vger.kernel.org, bpf@vger.kernel.org, linux-pm@vger.kernel.org Cc: abbotti@mev.co.uk, hsweeten@visionengravers.com, jan.kiszka@siemens.com, kbingham@kernel.org, mykolal@fb.com, Benjamin Gray Subject: [PATCH 8/8] selftests/bpf: fix Python string escapes in f-strings Date: Mon, 14 Aug 2023 16:07:04 +1000 Message-ID: <20230814060704.79655-9-bgray@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230814060704.79655-1-bgray@linux.ibm.com> References: <20230814060704.79655-1-bgray@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: FPckdZT2o3A_ZwQtcMaL8l2LrUWOqdaj X-Proofpoint-ORIG-GUID: FPckdZT2o3A_ZwQtcMaL8l2LrUWOqdaj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-13_24,2023-08-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 lowpriorityscore=0 mlxlogscore=999 spamscore=0 mlxscore=0 phishscore=0 bulkscore=0 impostorscore=0 malwarescore=0 priorityscore=1501 clxscore=1015 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308140055 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Python 3.6 introduced a DeprecationWarning for invalid escape sequences. This is upgraded to a SyntaxWarning in Python 3.12, and will eventually be a syntax error. Fix these now to get ahead of it before it's an error. Signed-off-by: Benjamin Gray --- tools/testing/selftests/bpf/test_bpftool_synctypes.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/bpf/test_bpftool_synctypes.py b/tools/= testing/selftests/bpf/test_bpftool_synctypes.py index b21bc1a35bf4..a93144b3b2b0 100755 --- a/tools/testing/selftests/bpf/test_bpftool_synctypes.py +++ b/tools/testing/selftests/bpf/test_bpftool_synctypes.py @@ -66,7 +66,7 @@ class ArrayParser(BlockParser): =20 def __init__(self, reader, array_name): self.array_name =3D array_name - self.start_marker =3D re.compile(f'(static )?const bool {self.arra= y_name}\[.*\] =3D {{\n') + self.start_marker =3D re.compile(f'(static )?const bool {self.arra= y_name}\\[.*\\] =3D {{\n') super().__init__(reader) =20 def search_block(self): @@ -226,7 +226,7 @@ class FileExtractor(object): =20 @block_name: name of the blog to parse, 'TYPE' in the example """ - start_marker =3D re.compile(f'\*{block_name}\* :=3D {{') + start_marker =3D re.compile(f'\\*{block_name}\\* :=3D {{') pattern =3D re.compile('\\*\\*([\\w/-]+)\\*\\*') end_marker =3D re.compile('}\n') return self.__get_description_list(start_marker, pattern, end_mark= er) @@ -245,7 +245,7 @@ class FileExtractor(object): =20 @block_name: name of the blog to parse, 'TYPE' in the example """ - start_marker =3D re.compile(f'"\s*{block_name} :=3D {{') + start_marker =3D re.compile(f'"\\s*{block_name} :=3D {{') pattern =3D re.compile('([\\w/]+) [|}]') end_marker =3D re.compile('}') return self.__get_description_list(start_marker, pattern, end_mark= er) @@ -264,7 +264,7 @@ class FileExtractor(object): =20 @macro: macro starting the block, 'HELP_SPEC_OPTIONS' in the examp= le """ - start_marker =3D re.compile(f'"\s*{macro}\s*" [|}}]') + start_marker =3D re.compile(f'"\\s*{macro}\\s*" [|}}]') pattern =3D re.compile('([\\w-]+) ?(?:\\||}[ }\\]])') end_marker =3D re.compile('}\\\\n') return self.__get_description_list(start_marker, pattern, end_mark= er) --=20 2.41.0