linux-kernel - Re: [PATCH 04/12] drm/xe: xe_gen_wa_oob: fix program_invocation_short

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <qdirhnr5fhey4zyraeymvyy3zkglg33fgjiigmsn34nwcuoir4@bxcnqgolwakw>
Date: Wed, 7 Aug 2024 06:25:53 -0500
From: Lucas De Marchi <lucas.demarchi@...el.com>
To: Daniel Gomez <da.gomez@...sung.com>
CC: Masahiro Yamada <masahiroy@...nel.org>, Nathan Chancellor
	<nathan@...nel.org>, Nicolas Schier <nicolas@...sle.eu>, Thomas
 Hellström <thomas.hellstrom@...ux.intel.com>, Rodrigo Vivi
	<rodrigo.vivi@...el.com>, Maarten Lankhorst
	<maarten.lankhorst@...ux.intel.com>, Maxime Ripard <mripard@...nel.org>,
	Thomas Zimmermann <tzimmermann@...e.de>, David Airlie <airlied@...il.com>,
	Daniel Vetter <daniel@...ll.ch>, William Hubbs <w.d.hubbs@...il.com>, "Chris
 Brannon" <chris@...-brannons.com>, Kirk Reiser <kirk@...sers.ca>, "Samuel
 Thibault" <samuel.thibault@...-lyon.org>, Paul Moore <paul@...l-moore.com>,
	Stephen Smalley <stephen.smalley.work@...il.com>, Ondrej Mosnacek
	<omosnace@...hat.com>, Catalin Marinas <catalin.marinas@....com>, Will Deacon
	<will@...nel.org>, Marc Zyngier <maz@...nel.org>, Oliver Upton
	<oliver.upton@...ux.dev>, James Morse <james.morse@....com>, Suzuki K Poulose
	<suzuki.poulose@....com>, Zenghui Yu <yuzenghui@...wei.com>, "Greg
 Kroah-Hartman" <gregkh@...uxfoundation.org>, Jiri Slaby
	<jirislaby@...nel.org>, Nick Desaulniers <ndesaulniers@...gle.com>, "Bill
 Wendling" <morbo@...gle.com>, Justin Stitt <justinstitt@...gle.com>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"linux-kbuild@...r.kernel.org" <linux-kbuild@...r.kernel.org>,
	"intel-xe@...ts.freedesktop.org" <intel-xe@...ts.freedesktop.org>,
	"dri-devel@...ts.freedesktop.org" <dri-devel@...ts.freedesktop.org>,
	"speakup@...ux-speakup.org" <speakup@...ux-speakup.org>,
	"selinux@...r.kernel.org" <selinux@...r.kernel.org>,
	"linux-arm-kernel@...ts.infradead.org"
	<linux-arm-kernel@...ts.infradead.org>, "kvmarm@...ts.linux.dev"
	<kvmarm@...ts.linux.dev>, "linux-serial@...r.kernel.org"
	<linux-serial@...r.kernel.org>, "llvm@...ts.linux.dev"
	<llvm@...ts.linux.dev>, Finn Behrens <me@...enk.dev>, "Daniel Gomez
 (Samsung)" <d+samsung@...ces.com>, "gost.dev@...sung.com"
	<gost.dev@...sung.com>
Subject: Re: [PATCH 04/12] drm/xe: xe_gen_wa_oob: fix
 program_invocation_short_name for macos

On Wed, Aug 07, 2024 at 08:13:51AM GMT, Daniel Gomez wrote:
>On Tue, Aug 06, 2024 at 08:50:09PM GMT, Lucas De Marchi wrote:
>> On Wed, Aug 07, 2024 at 01:09:18AM GMT, Daniel Gomez via B4 Relay wrote:
>> > From: Daniel Gomez <da.gomez@...sung.com>
>> >
>> > Use getprogname() [1] instead of program_invocation_short_name() [2]
>> > for macOS hosts.
>> >
>> > [1]:
>> > https://www.gnu.org/software/gnulib/manual/html_node/
>> > program_005finvocation_005fshort_005fname.html
>> >
>> > [2]:
>> > https://developer.apple.com/library/archive/documentation/System/
>> > Conceptual/ManPages_iPhoneOS/man3/getprogname.3.html
>> >
>> > Fixes build error for macOS hosts:
>> >
>> > drivers/gpu/drm/xe/xe_gen_wa_oob.c:34:3: error: use of
>> > undeclared identifier 'program_invocation_short_name'    34 |
>> > program_invocation_short_name);       |                 ^ 1 error
>> > generated.
>> >
>> > Signed-off-by: Daniel Gomez <da.gomez@...sung.com>
>> > ---
>> > drivers/gpu/drm/xe/xe_gen_wa_oob.c | 8 +++++++-
>> > 1 file changed, 7 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/drivers/gpu/drm/xe/xe_gen_wa_oob.c b/drivers/gpu/drm/xe/xe_gen_wa_oob.c
>> > index 904cf47925aa..079b8870c461 100644
>> > --- a/drivers/gpu/drm/xe/xe_gen_wa_oob.c
>> > +++ b/drivers/gpu/drm/xe/xe_gen_wa_oob.c
>> > @@ -9,6 +9,12 @@
>> > #include <stdbool.h>
>> > #include <stdio.h>
>> > #include <string.h>
>> > +#define PROG_INV_NAME program_invocation_short_name
>> > +
>> > +#ifdef __APPLE__
>> > +#include <stdlib.h>
>> > +#define PROG_INV_NAME getprogname()
>> > +#endif
>> >
>> > #define HEADER \
>> > 	"// SPDX-License-Identifier: MIT\n" \
>> > @@ -31,7 +37,7 @@
>> > static void print_usage(FILE *f)
>> > {
>> > 	fprintf(f, "usage: %s <input-rule-file> <generated-c-source-file> <generated-c-header-file>\n",
>> > -		program_invocation_short_name);
>> > +		PROG_INV_NAME);
>>
>> instead of doing that, can we a) include stdlib.h unconditionally and b)
>> add here a
>> `static const char *program_invocation_short_name = getprogname()` so we
>> don't need to change the common case and just handle the "build on
>> macos" as a compat layer?
>
>Does this align with your suggestion (v1 diff)?

yes, just a nit that in xe we keep the includes sorted alphabetically,
so the stdlib.h include should move up one line. Other than that,

// Reviewed-by: Lucas De Marchi <lucas.demarchi@...el.com>

... assuming the rest of the series and idea about building the kernel
on macOS is not pushed back.

Lucas De Marchi


>
>Note that static cannot be use here.
>
>diff --git a/drivers/gpu/drm/xe/xe_gen_wa_oob.c b/drivers/gpu/drm/xe/xe_gen_wa_oob.c
>index 079b8870c461..b3add20ccb01 100644
>--- a/drivers/gpu/drm/xe/xe_gen_wa_oob.c
>+++ b/drivers/gpu/drm/xe/xe_gen_wa_oob.c
>@@ -9,12 +9,7 @@
> #include <stdbool.h>
> #include <stdio.h>
> #include <string.h>
>-#define PROG_INV_NAME program_invocation_short_name
>-
>-#ifdef __APPLE__
> #include <stdlib.h>
>-#define PROG_INV_NAME getprogname()
>-#endif
>
> #define HEADER \
>        "// SPDX-License-Identifier: MIT\n" \
>@@ -36,8 +31,11 @@
>
> static void print_usage(FILE *f)
> {
>+#ifdef __APPLE__
>+       const char *program_invocation_short_name = getprogname();
>+#endif
>        fprintf(f, "usage: %s <input-rule-file> <generated-c-source-file> <generated-c-header-file>\n",
>-               PROG_INV_NAME);
>+               program_invocation_short_name);
> }
>
> static void print_parse_error(const char *err_msg, const char *line,
>
>>
>> Lucas De Marchi
>>
>> > }
>> >
>> > static void print_parse_error(const char *err_msg, const char *line,
>> >
>> > --
>> > Git-146)
>> >
>> >