From: Jason Gunthorpe <jgg@nvidia.com>
To: Jonathan Corbet <corbet@lwn.net>,
linux-doc@vger.kernel.org, Bagas Sanjaya <bagasdotme@gmail.com>,
Randy Dunlap <rdunlap@infradead.org>
Subject: [PATCH] scripts/kernel-doc: support EXPORT_SYMBOL_NS_GPL() with -export
Date: Tue, 8 Nov 2022 11:02:35 -0400 [thread overview]
Message-ID: <0-v1-c80e152ce63b+12-kdoc_export_ns_jgg@nvidia.com> (raw)
Parse EXPORT_SYMBOL_NS_GPL() in addition to EXPORT_SYMBOL_GPL() for use
with the -export flag.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
---
scripts/kernel-doc | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
The new iommufd kdocs need this because they are using:
.. kernel-doc:: drivers/iommu/iommufd/device.c
:export:
And also symbol namespaces for those functions.
I'd like to send it through the iommufd tree with an ack, thanks
(I don't know perl at all so happy to replace this with something more elegant)
Thanks,
Jason
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index aea04365bc69d3..48e3feca31701a 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -256,6 +256,7 @@ my $doc_inline_sect = '\s*\*\s*(@\s*[\w][\w\.]*\s*):(.*)';
my $doc_inline_end = '^\s*\*/\s*$';
my $doc_inline_oneline = '^\s*/\*\*\s*(@[\w\s]+):\s*(.*)\s*\*/\s*$';
my $export_symbol = '^\s*EXPORT_SYMBOL(_GPL)?\s*\(\s*(\w+)\s*\)\s*;';
+my $export_symbol_ns = '^\s*EXPORT_SYMBOL_NS(_GPL)?\s*\(\s*(\w+)\s*,\s*\w+\)\s*;';
my $function_pointer = qr{([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)};
my $attribute = qr{__attribute__\s*\(\([a-z0-9,_\*\s\(\)]*\)\)}i;
@@ -1948,6 +1949,10 @@ sub process_export_file($) {
next if (defined($nosymbol_table{$2}));
$function_table{$2} = 1;
}
+ if (/$export_symbol_ns/) {
+ next if (defined($nosymbol_table{$2}));
+ $function_table{$2} = 1;
+ }
}
close(IN);
@@ -2419,12 +2424,12 @@ found on PATH.
=item -export
Only output documentation for the symbols that have been exported using
-EXPORT_SYMBOL() or EXPORT_SYMBOL_GPL() in any input FILE or -export-file FILE.
+EXPORT_SYMBOL() and related macros in any input FILE or -export-file FILE.
=item -internal
Only output documentation for the symbols that have NOT been exported using
-EXPORT_SYMBOL() or EXPORT_SYMBOL_GPL() in any input FILE or -export-file FILE.
+EXPORT_SYMBOL() and related macros in any input FILE or -export-file FILE.
=item -function NAME
@@ -2451,8 +2456,7 @@ Do not output DOC: sections.
=item -export-file FILE
-Specify an additional FILE in which to look for EXPORT_SYMBOL() and
-EXPORT_SYMBOL_GPL().
+Specify an additional FILE in which to look for EXPORT_SYMBOL information.
To be used with -export or -internal.
base-commit: a21945d88e38b5772958161b3a5ee4e2adaa1f61
--
2.38.1
next reply other threads:[~2022-11-08 15:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-08 15:02 Jason Gunthorpe [this message]
2022-11-08 15:25 ` [PATCH] scripts/kernel-doc: support EXPORT_SYMBOL_NS_GPL() with -export Matthew Wilcox
2022-11-08 16:21 ` Jason Gunthorpe
2022-11-08 17:13 ` Matthew Wilcox
2022-11-08 17:24 ` Jason Gunthorpe
2022-11-09 8:24 ` Bagas Sanjaya
2022-11-09 14:28 ` Jonathan Corbet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0-v1-c80e152ce63b+12-kdoc_export_ns_jgg@nvidia.com \
--to=jgg@nvidia.com \
--cc=bagasdotme@gmail.com \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=rdunlap@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).