lkml.org 
[lkml]   [2019]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] kernel-doc: Let backtick and backslash escape percent sign
On Mon, Apr 08, 2019 at 04:03:14PM -0600, Jonathan Corbet wrote:
> On Fri, 5 Apr 2019 14:18:20 -0700
> Sean Christopherson <sean.j.christopherson@intel.com> wrote:
>
> > There are a handful of instances where kernel doc comments want an
> > actual '%' in the final output, e.g. vsnprintf() wants to display "%n"
> > and "%p" to document format specifiers, and assembly functions that use
> > a custom call ABI may want to document their register usage, e.g. %eax.
> >
> > Because kernel-doc unconditionally interprets '%' followed by a word
> > character as a constant definition, i.e. %CONST, it's impossible to get
> > an actual '%\w' when kernel-doc is used to translate comments into rst
> > format. Treat backtick and backlash as escaping '%', the former to
> > handle '%' in a ``LITERAL``, and the latter to allow '%' when using
> > standard formatting.
>
> So I'm sympathetic toward the goal; we want this stuff to format properly.
> But I'm less convinced about this specific solution. Starting with the
> details:
>
> > -my $type_constant2 = '\%([-_\w]+)';
> > +my $type_constant2 = '(^|[^\`\\\])\%([-_\w]+)';
>
> This only escapes the % if it occurs *immediately* after the backtick, so
> something like ``foo %p`` will still get processed incorrectly. Somebody
> will surely run into that at some point and waste a bunch of time trying to
> figure out what's going on.

Argh, yeah.

> Also, believe it or not, I don't think you have enough backslashes; that
> inner expression, I believe, should be:
>
> [^\`\\\\]
>
> Gosh Perl regexes are fun... This highlights the danger of adding
> functionality that isn't exercised anywhere; I don't think it works here.

I honestly just added backslashes until it did work (for unmerged docs).
But Perl isn't exactly my strong suit, so it's entirely possible it worked
by sheer dumb luck.

>
> Now to more general considerations. Willy's suggestion of using %% instead
> makes some sense, though it may lead to pushback from the "no extra markup
> ever" contingent. It should be more straightforward to implement
> correctly.

I considered %% as well. I basically did a mental coin flip between %% and \%.

> I have to wonder if the % thing is actually buying us much, honestly. It's
> another form of markup that kind of duplicates the Sphinx notation, and
> we've kind of agreed that most of the time, we don't want to clutter our
> text with ``explicit markup`` like that. I'm curious what people think:
> might the best solution be to just make %const do nothing special, with the
> idea of phasing it out?

Along those lines, what about adding flags into the kernel-doc directive
to opt-out of specific markup? That would allow removing the old markup
on a case-by-case basis instead of having to do a tree-wide change. And
once we've reached critical mass the flag can be removed (in theory).

E.g.

.. kernel-doc:: arch/x86/kernel/cpu/sgx/driver/ioctl.c
:noconsts:
:functions: sgx_ioc_create_enclave
sgx_ioc_enclave_add_page
sgx_ioc_enclave_init

.. kernel-doc:: arch/x86/include/uapi/asm/sgx.h
:noconsts:
:nosymbols: sgx_enclave_exception


Another alternative would be to version the kernel-doc directive. But that
lacks the granularity of opting out of specific markup, and would probably
lead to endless discussion on what exactly should be in "v2" or whatever,
and inevitably a v3, v4, etc...

E.g.:

.. kernel-doc-v2:: arch/x86/kernel/cpu/sgx/driver/ioctl.c
:functions: sgx_ioc_create_enclave
sgx_ioc_enclave_add_page
sgx_ioc_enclave_init

.. kernel-doc-v2:: arch/x86/include/uapi/asm/sgx.h
:nosymbols: sgx_enclave_exception

\
 
 \ /
  Last update: 2019-04-09 16:40    [W:0.081 / U:10.748 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site