Skip to contentSkip to conversation

Add ABI to the Documentation's admin guide

PATCH Superseded Mauro Carvalho Chehab 1 participant 5 messages Dec 2, 2016

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover Add ABI to the Documentation's admin guide

That's the second attempt to add support for the Kernel ABI at the Documentation's admin guide.

The previous approach was based on a generic extension that calls a random script.

This patch series gets rid of the generic script execution by hardcoding the extension to run a get_abi.pl script.

Such script parses the file contents at the ABI directory or its sub-directories and produce a ReST output.

Adding the ABI description is then a matter or just adding a kernel-abi tag inside a file, like:

.. kernel-abi:: $srctree/Documentation/ABI/

We could, instead, be doing:

abi-obsolete.rst file:
.. kernel-abi:: $srctree/Documentation/ABI/obsolete

abi-stable.rst file:
.. kernel-abi:: $srctree/Documentation/ABI/stable
...

In order to splitting the ABI contents on multiple files, reducing the size of the ABI output. Not sure what would be the best.

Markus Heiser (2):
doc-rst: customize RTD theme; literal-block
doc-rst: reST-directive kernel-cmd / include contentent from scripts

Mauro Carvalho Chehab (2):
scripts: add an script to parse the ABI files
doc-rst: add ABI documentation to the admin-guide book

 Documentation/admin-guide/abi.rst               |   5 +
 Documentation/admin-guide/index.rst             |   1 +
 Documentation/conf.py                           |   2 +-
 Documentation/sphinx-static/theme_overrides.css |   7 +
 Documentation/sphinx/kernel_abi.py              | 155 +++++++++++++++++
 scripts/get_abi.pl                              | 212 ++++++++++++++++++++++++
 6 files changed, 381 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/admin-guide/abi.rst
 create mode 100644 Documentation/sphinx/kernel_abi.py
 create mode 100755 scripts/get_abi.pl
Signature · 1 line
2.9.3
#1 lore raw

PATCH 1/4 doc-rst: customize RTD theme; literal-block

From: Markus Heiser <[email protected]>

From: Markus Heiser <[email protected]>

Format the literal-block like other code-block elements, with 12px and a line-high of 1.5.

---
 Documentation/sphinx-static/theme_overrides.css | 7 +++++++
 1 file changed, 7 insertions(+)
Documentation/sphinx-static/theme_overrides.css +7 -0
index d5764a4de5a2..7033d4c05e42 100644
@@ -69,4 +69,11 @@
     .rst-content tt.literal,.rst-content tt.literal,.rst-content code.literal {
         color: inherit;
     }
+
+    /* literal blocks (e.g. parsed-literal directive) */
+
+    pre.literal-block {
+        font-size: 12px;
+        line-height: 1.5;
+    }
 }
Signature · 1 line
2.9.3
#2 lore raw

PATCH 2/4 doc-rst: reST-directive kernel-cmd / include contentent from scripts

In reply to Mauro Carvalho Chehab

From: Markus Heiser <[email protected]>

From: Markus Heiser <[email protected]>

The ``kernel-cmd`` directive includes contend from the stdout of a command-line. With the ``kernel-cmd`` directive we can include the output of any (Perl or whatever) script. This is a more general solution for other workarounds like the "kernel_include + parseheaders" solution.

Overview of directive's argument and options.

.. code-block:: rst

.. kernel-cmd:: <command line>
:depends: <list of comma separated file names> :code-block: <language>
:debug:

The argument ``<command line>`` is required, it is a command line to be executed. The stdout stream of the command is captured and is inserted as reST content. The command line is executed in a system shell where the PATH environment is extended with the paths ::

    PATH=$(srctree)/scripts:$(srctree)/Documentation/sphinx:...

A very simple example, which includes the output as ``code-block``::

.. kernel-cmd:: ls -la $srctree
:code-block: sh

The ``code-block`` is optional, leaving it will include the output as pure (hopefully well) formated reST.

.. warning::

The kernel-cmd directive **executes** commands, whatever poses a risk (shell injection) in itself!

The command might depend on local installations, don't use commands which are not available in some OS (be clear about the dependencies).

---
 Documentation/conf.py              |   2 +-
 Documentation/sphinx/kernel_cmd.py | 205 +++++++++++++++++++++++++++++++++++++
 2 files changed, 206 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/sphinx/kernel_cmd.py
Documentation/conf.py +1 -1
index 1ac958c0333d..515d6149f04e 100644
@@ -34,7 +34,7 @@ from load_config import loadConfig
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain']
+extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', 'kernel_cmd']
 
 # The name of the math extension changed on Sphinx 1.4
 if major == 1 and minor > 3:
Documentation/sphinx/kernel_cmd.py new file +205 -0

205 lines not on this page · raw message

Signature · 1 line
2.9.3
#3 lore raw

PATCH 3/4 scripts: add an script to parse the ABI files

In reply to Mauro Carvalho Chehab

Add a script to parse the Documentation/ABI files and produce an output with all entries inside an ABI (sub)directory.

Right now, it outputs its contents on ReST format. It shouldn't be hard to make it produce other kind of outputs, since the ABI file parser is implemented in separate than the output generator.

---
 scripts/get_abi.pl | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 212 insertions(+)
 create mode 100755 scripts/get_abi.pl
scripts/get_abi.pl new file +212 -0
new file mode 100755
index 000000000000..f7c9944a833c
@@ -0,0 +1,212 @@
+#!/usr/bin/perl
+
+use strict;
+use Pod::Usage;
+use Getopt::Long;
+use File::Find;
+use Fcntl ':mode';
+
+my $help;
+my $man;
+my $debug;
+
+GetOptions(
+	"debug|d+" => \$debug,
+	'help|?' => \$help,
+	man => \$man
+) or pod2usage(2);
+
+pod2usage(1) if $help;
+pod2usage(-exitstatus => 0, -verbose => 2) if $man;
+
+pod2usage(2) if (scalar @ARGV != 1);
+
+my ($prefix) = @ARGV;
+
+require Data::Dumper if ($debug);
+
+my %data;
+
+#
+# Displays an error message, printing file name and line
+#
+sub parse_error($$$$) {
+	my ($file, $ln, $msg, $data) = @_;
+
+	print STDERR "file $file#$ln: $msg at\n\t$data";
+}
+
+#
+# Parse an ABI file, storing its contents at %data
+#
+sub parse_abi {
+	my $file = $File::Find::name;
+
+	my $mode = (stat($file))[2];
+	return if ($mode & S_IFDIR);
+	return if ($file =~ m,/README,);
+
+	my $name = $file;
+	$name =~ s,.*/,,;
+
+	my $type = $file;
+	$type =~ s,.*/(.*)/.*,$1,;
+
+	my $what;
+	my $new_what;
+	my $tag;
+	my $ln;
+
+	print STDERR "Opening $file\n" if ($debug > 1);
+	open IN, $file;
+	while(<IN>) {
+		$ln++;
+		if (m/^(\S+):\s*(.*)/i) {
+			my $new_tag = lc($1);
+			my $content = $2;
+
+			if (!($new_tag =~ m/(what|date|kernelversion|contact|description|users)/)) {
+				if ($tag eq "description") {
+					$data{$what}->{$tag} .= "\n$content";;
+					$data{$what}->{$tag} =~ s/\n+$//;
+					next;
+				} else {
+					parse_error($file, $ln, "tag '$tag' is invalid", $_);
+				}
+			}
+
+			if ($new_tag =~ m/what/) {
+				if ($tag =~ m/what/) {
+					$what .= ", " . $content;
+				} else {
+					$what = $content;
+					$new_what = 1;
+				}
+				$tag = $new_tag;
+				next;
+			}
+
+			$tag = $new_tag;
+
+			if ($new_what) {
+				$new_what = 0;
+
+				$data{$what}->{type} = $type;
+				$data{$what}->{file} = $name;
+				print STDERR "\twhat: $what\n" if ($debug > 1);
+			}
+
+			if (!$what) {
+				parse_error($file, $ln, "'What:' should come first:", $_);
+				next;
+			}
+			$data{$what}->{$tag} = $content;
+			next;
+		}
+
+		# Silently ignore any headers before the database
+		next if (!$tag);
+
+		if (m/^\s*(.*)/) {
+			$data{$what}->{$tag} .= "\n$1";
+			$data{$what}->{$tag} =~ s/\n+$//;
+			next;
+		}
+
+		# Everything else is error
+		parse_error($file, $ln, "Unexpected line:", $_);
+	}
+	close IN;
+}
+
+# Outputs the output on ReST format
+sub output_rest {
+	foreach my $what (sort keys %data) {
+		my $type = $data{$what}->{type};
+		my $file = $data{$what}->{file};
+
+		my $w = $what;
+		$w =~ s/([\(\)\_\-\*\=\^\~\\])/\\$1/g;
+
+		print "$w\n\n";
+		print "- defined on file $file (type: $type)\n\n::\n\n";
+
+		my $desc = $data{$what}->{description};
+		$desc =~ s/^\s+//;
+
+		# Remove title markups from the description, as they won't work
+		$desc =~ s/\n[\-\*\=\^\~]+\n/\n/g;
+
+		# put everything inside a code block
+		$desc =~ s/\n/\n /g;
+
+
+		if (!($desc =~ /^\s*$/)) {
+			print " $desc\n\n";
+		} else {
+			print " DESCRIPTION MISSING\n\n";
+		}
+	}
+}
+
+#
+# Parses all ABI files located at $prefix dir
+#
+find({wanted =>\&parse_abi, no_chdir => 1}, $prefix);
+
+print STDERR Data::Dumper->Dump([\%data], [qw(*data)]) if ($debug);
+
+#
+# Outputs an ReST file with the ABI contents
+#
+output_rest
+
+
+__END__
+
+=head1 NAME
+
+abi_book.pl - parse the Linux ABI files and produce a ReST book.
+
+=head1 SYNOPSIS
+
+B<abi_book.pl> [--debug] <ABI_DIR>]
+
+=head1 OPTIONS
+
+=over 8
+
+=item B<--debug>
+
+Put the script in verbose mode, useful for debugging. Can be called multiple
+times, to increase verbosity.
+
+=item B<--help>
+
+Prints a brief help message and exits.
+
+=item B<--man>
+
+Prints the manual page and exits.
+
+=back
+
+=head1 DESCRIPTION
+
+Parse the Linux ABI files from ABI DIR (usually located at Documentation/ABI)
+and produce a ReST book containing the Linux ABI.
+
+=head1 BUGS
+
+Report bugs to Mauro Carvalho Chehab <[email protected]>
+
+=head1 COPYRIGHT
+
+Copyright (c) 2016 by Mauro Carvalho Chehab <[email protected]>.
+
+License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>.
+
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+
+=cut
Signature · 1 line
2.9.3
#4 lore raw

PATCH 4/4 doc-rst: add ABI documentation to the admin-guide book

In reply to Mauro Carvalho Chehab

As we don't want a generic Sphinx extension to execute commands, change the one proposed to Markus to call the abi_book.pl script.

Use a script to parse the Documentation/ABI directory and output it at the admin-guide.

---
 Documentation/admin-guide/abi.rst                  |  5 ++
 Documentation/admin-guide/index.rst                |  1 +
 Documentation/conf.py                              |  2 +-
 .../sphinx/{kernel_cmd.py => kernel_abi.py}        | 78 ++++------------------
 4 files changed, 21 insertions(+), 65 deletions(-)
 create mode 100644 Documentation/admin-guide/abi.rst
 rename Documentation/sphinx/{kernel_cmd.py => kernel_abi.py} (59%)
Documentation/admin-guide/abi.rst new file +5 -0
new file mode 100644
index 000000000000..27c9657fbd4e
@@ -0,0 +1,5 @@
+=====================
+Linux ABI description
+=====================
+
+.. kernel-abi:: $srctree/Documentation/ABI/
Documentation/admin-guide/index.rst +1 -0
index a2a72b749861..cf11a1b5fda9 100644
@@ -14,6 +14,7 @@ etc.
    :maxdepth: 1
 
    README
+   abi
    kernel-parameters
    devices
 
Documentation/conf.py +1 -1
index 515d6149f04e..2626ac1bc5f4 100644
@@ -34,7 +34,7 @@ from load_config import loadConfig
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', 'kernel_cmd']
+extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', 'kernel_abi']
 
 # The name of the math extension changed on Sphinx 1.4
 if major == 1 and minor > 3:
Documentation/sphinx/kernel_abi.py renamed from Documentation/sphinx/kernel_cmd.py +14 -64

144 lines not on this page · raw message

Signature · 1 line
2.9.3