Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp741998pxb; Tue, 14 Sep 2021 07:48:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBQMnNkEVsSyh5dkW5vYxcjI2ScOt6o109eP5HexnMy0CmX/OPBLCjxndiku+c7IEwUJcd X-Received: by 2002:a17:906:30d6:: with SMTP id b22mr20002196ejb.442.1631630938711; Tue, 14 Sep 2021 07:48:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631630938; cv=none; d=google.com; s=arc-20160816; b=Z9h0h3p9raJkIL+YAddV/kTkuV3vX3SQR3Yk4kMj/lzBQypyn8llK/gELwndYR+8b5 y/z7OHQaWPTJMLt/ajCc51k4q9bSQWImf6UWLIHX8DzEEobnFTclJdrNenZPXMNfz/Mx wSXLza7PGRF/WvpWbGl/9iTBFtSgoISh+o51Xtyr5hqOjHSzIfPAoXRssUnM+J1jFPxI v8qIP/XovPHlIqhhGxig6Ji/zc1O14iocwFlCPTWAx7Z6IiGedt5IAs27bXew9g9UqHv bPqmyPI2MU1wKUUae7pySM1a5HBwoN3FfLkyWHCtUZ9NkmQvLSst4fnkkoxJgOlc6gSb kjHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UzOusVlQ8iEUqe5UAkP99vBqZCwS16pvs00Ugjm5jps=; b=A1CPQIggFKUDHL4ZfRzlzFQLcDjc3uzma+/L2ymAnisc0StqqaV2hIDmeNZeVq3+hO ctCI/k+j9AUWrQFtfOd5LQ+zr03vve6BtFTAz21rcGWXASD8mFZ8IlxoulEPQLF2rGt2 TJGubV08HW347ugzrGPwMHhJXHqbNjFSZNfllH4UANyuegpv5STPzzXDMLkHHG+Kv5Ta O92h4Mj7qlauR3vU4mUIyZEef4MsZbODfJpAaRSbiD81hNcl1CC8mWNkIVhmh+eDN89g SEgdRODf4jGoWmHNL6rQJ+L6fn53fZMSbb6XgQ97M3tlAItFbQgYUHMOjwsLNvZ3LQvm 5T1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OZJUmsjI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hc43si3722337ejc.87.2021.09.14.07.48.34; Tue, 14 Sep 2021 07:48:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OZJUmsjI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234819AbhINOsK (ORCPT + 99 others); Tue, 14 Sep 2021 10:48:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:40392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233765AbhINOrf (ORCPT ); Tue, 14 Sep 2021 10:47:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3FFC0610D1; Tue, 14 Sep 2021 14:46:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631630763; bh=yPVj/TLUfPdYhJzwxlxmy/axd14g5lu4vc5IYvyimUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OZJUmsjIhbYe7/++tP4dqtegInr1C+Fp8djVfeVHtRMlU0EZtkzj330b6N2ckx+dK XhIcV4mZPgNXcR51BowI9Dv/u9JngzRMypqvZVVWBwoRIyodv+nZH7z59crEKI/vP+ DWOA2/HYg78yVnBfbnpi0liFmLhdEyOiXsJtXLj2HqQT16Sc7pPca3omfudWlPHbAY nWMUvqZw4qCkHgbmLee0DpDEtnqlBHsFI1iPneXW77CS8o2X/mNXUHbayauhv7ZU1a nYCHwRkzSzF44lCCgTHFtPCK85UtIaANx+oMyZf+X1efwqKAaFVuPpZ/1mCY3U7HSx RRUI/oeVe4pDw== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1mQ9hB-000KzE-ED; Tue, 14 Sep 2021 16:46:01 +0200 From: Mauro Carvalho Chehab To: Greg Kroah-Hartman , Linux Doc Mailing List Cc: Mauro Carvalho Chehab , "Jonathan Corbet" , linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] scripts: get_abi.pl: detect softlinks Date: Tue, 14 Sep 2021 16:45:56 +0200 Message-Id: <265d2fa703ed6eca4da02fc332a2dcb7347a7ed1.1631629987.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: Mauro Carvalho Chehab Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The way sysfs works is that the same leave may be present under /sys/devices, /sys/bus and /sys/class, etc, linked via soft symlinks. To make it harder to parse, the ABI definition usually refers only to one of those locations. So, improve the logic in order to retrieve the symlinks. Signed-off-by: Mauro Carvalho Chehab --- scripts/get_abi.pl | 207 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 165 insertions(+), 42 deletions(-) diff --git a/scripts/get_abi.pl b/scripts/get_abi.pl index ded6dd8b9f71..8bde9944ee12 100755 --- a/scripts/get_abi.pl +++ b/scripts/get_abi.pl @@ -8,8 +8,10 @@ use Pod::Usage; use Getopt::Long; use File::Find; use Fcntl ':mode'; +use Cwd 'abs_path'; my $help = 0; +my $hint = 0; my $man = 0; my $debug = 0; my $enable_lineno = 0; @@ -28,6 +30,7 @@ GetOptions( "rst-source!" => \$description_is_rst, "dir=s" => \$prefix, 'help|?' => \$help, + "show-hints" => \$hint, man => \$man ) or pod2usage(2); @@ -526,7 +529,7 @@ sub search_symbols { } # Exclude /sys/kernel/debug and /sys/kernel/tracing from the search path -sub skip_debugfs { +sub dont_parse_special_attributes { if (($File::Find::dir =~ m,^/sys/kernel,)) { return grep {!/(debug|tracing)/ } @_; } @@ -539,64 +542,178 @@ sub skip_debugfs { } my %leaf; +my %aliases; +my @files; -my $escape_symbols = qr { ([\x01-\x08\x0e-\x1f\x21-\x29\x2b-\x2d\x3a-\x40\x7b-\xff]) }x; +my $escape_symbols = qr { ([\x01-\x08\x0e-\x1f\x21-\x29\x2b-\x2d\x3a-\x40\x7b-\xfe]) }x; sub parse_existing_sysfs { my $file = $File::Find::name; + my $mode = (lstat($file))[2]; + my $abs_file = abs_path($file); - my $mode = (stat($file))[2]; - return if ($mode & S_IFDIR); - - my $leave = $file; - $leave =~ s,.*/,,; - - if (defined($leaf{$leave})) { - # FIXME: need to check if the path makes sense - my $what = $leaf{$leave}; - - $what =~ s/,/ /g; - - $what =~ s/\<[^\>]+\>/.*/g; - $what =~ s/\{[^\}]+\}/.*/g; - $what =~ s/\[[^\]]+\]/.*/g; - $what =~ s,/\.\.\./,/.*/,g; - $what =~ s,/\*/,/.*/,g; - - $what =~ s/\s+/ /g; - - # Escape all other symbols - $what =~ s/$escape_symbols/\\$1/g; - - foreach my $i (split / /,$what) { - if ($file =~ m#^$i$#) { -# print "$file: $i: OK!\n"; - return; - } - } - - print "$file: $leave is defined at $what\n"; - + if (S_ISLNK($mode)) { + $aliases{$file} = $abs_file; return; } - print "$file not found.\n"; + return if (S_ISDIR($mode)); + + # Trivial: file is defined exactly the same way at ABI What: + return if (defined($data{$file})); + return if (defined($data{$abs_file})); + + push @files, $abs_file; +} + +sub check_undefined_symbols { + foreach my $file (sort @files) { + + # sysfs-module is special, as its definitions are inside + # a text. For now, just ignore them. + next if ($file =~ m#^/sys/module/#); + + # Ignore cgroup and firmware + next if ($file =~ m#^/sys/(fs/cgroup|firmware)/#); + + my $defined = 0; + my $exact = 0; + my $whats = ""; + + my $leave = $file; + $leave =~ s,.*/,,; + + my $path = $file; + $path =~ s,(.*/).*,$1,; + + if (defined($leaf{$leave})) { + my $what = $leaf{$leave}; + $whats .= " $what" if (!($whats =~ m/$what/)); + + foreach my $w (split / /, $what) { + if ($file =~ m#^$w$#) { + $exact = 1; + last; + } + } + # Check for aliases + # + # TODO: this algorithm is O(w * n²). It can be + # improved in the future in order to handle it + # faster, by changing parse_existing_sysfs to + # store the sysfs inside a tree, at the expense + # on making the code less readable and/or using some + # additional perl library. + foreach my $a (keys %aliases) { + my $new = $aliases{$a}; + my $len = length($new); + + if (substr($file, 0, $len) eq $new) { + my $newf = $a . substr($file, $len); + + foreach my $w (split / /, $what) { + if ($newf =~ m#^$w$#) { + $exact = 1; + last; + } + } + } + } + + $defined++; + } + next if ($exact); + + # Ignore some sysfs nodes + next if ($file =~ m#/(sections|notes)/#); + + # Would need to check at + # Documentation/admin-guide/kernel-parameters.txt, but this + # is not easily parseable. + next if ($file =~ m#/parameters/#); + + if ($hint && $defined) { + print "$leave at $path might be one of:$whats\n"; + next; + } + print "$file not found.\n"; + } } sub undefined_symbols { + find({ + wanted =>\&parse_existing_sysfs, + preprocess =>\&dont_parse_special_attributes, + no_chdir => 1 + }, $sysfs_prefix); + foreach my $w (sort keys %data) { foreach my $what (split /\xac /,$w) { + next if (!($what =~ m/^$sysfs_prefix/)); + + # Convert what into regular expressions + + $what =~ s,/\.\.\./,/*/,g; + $what =~ s,\*,.*,g; + + # Temporarily change [0-9]+ type of patterns + $what =~ s/\[0\-9\]\+/\xff/g; + + # Temporarily change [\d+-\d+] type of patterns + $what =~ s/\[0\-\d+\]/\xff/g; + $what =~ s/\[(\d+)\]/\xf4$1\xf5/g; + + # Temporarily change [0-9] type of patterns + $what =~ s/\[(\d)\-(\d)\]/\xf4$1-$2\xf5/g; + + # Handle multiple option patterns + $what =~ s/[\{\<\[]([\w_]+)(?:[,|]+([\w_]+)){1,}[\}\>\]]/($1|$2)/g; + + # Handle wildcards + $what =~ s/\<[^\>]+\>/.*/g; + $what =~ s/\{[^\}]+\}/.*/g; + $what =~ s/\[[^\]]+\]/.*/g; + + $what =~ s/[XYZ]/.*/g; + + # Recover [0-9] type of patterns + $what =~ s/\xf4/[/g; + $what =~ s/\xf5/]/g; + + # Remove duplicated spaces + $what =~ s/\s+/ /g; + + # Special case: this ABI has a parenthesis on it + $what =~ s/sqrt\(x^2\+y^2\+z^2\)/sqrt\(x^2\+y^2\+z^2\)/; + + # Special case: drop comparition as in: + # What: foo = + # (this happens on a few IIO definitions) + $what =~ s,\s*\=.*$,,; + my $leave = $what; $leave =~ s,.*/,,; - if (defined($leaf{$leave})) { - $leaf{$leave} .= " " . $what; - } else { - $leaf{$leave} = $what; + next if ($leave =~ m/^\.\*/ || $leave eq ""); + + # Escape all other symbols + $what =~ s/$escape_symbols/\\$1/g; + $what =~ s/\\\\/\\/g; + $what =~ s/\\([\[\]\(\)\|])/$1/g; + $what =~ s/(\d+)\\(-\d+)/$1$2/g; + + $leave =~ s/[\(\)]//g; + + foreach my $l (split /\|/, $leave) { + if (defined($leaf{$l})) { + next if ($leaf{$l} =~ m/$what/); + $leaf{$l} .= " " . $what; + } else { + $leaf{$l} = $what; + } } } } - - find({wanted =>\&parse_existing_sysfs, preprocess =>\&skip_debugfs, no_chdir => 1}, $sysfs_prefix); + check_undefined_symbols; } # Ensure that the prefix will always end with a slash @@ -646,7 +763,8 @@ abi_book.pl - parse the Linux ABI files and produce a ReST book. =head1 SYNOPSIS B [--debug] [--enable-lineno] [--man] [--help] - [--(no-)rst-source] [--dir=] [] + [--(no-)rst-source] [--dir=] [--show-hints] + [] Where can be: @@ -688,6 +806,11 @@ Enable output of #define LINENO lines. Put the script in verbose mode, useful for debugging. Can be called multiple times, to increase verbosity. +=item B<--show-hints> + +Show hints about possible definitions for the missing ABI symbols. +Used only when B. + =item B<--help> Prints a brief help message and exits. -- 2.31.1