Received-SPF: pass (google.com: domain of linux-kernel+bounces-22258-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Message-ID: <96578fb7568a8c2a318c850e6979bbf8f58cc249.camel@suse.com>
Subject: Re: [PATCH v1 1/5] livepatch: Create and include UAPI headers
From: Marcos Paulo de Souza <mpdesouza@suse.com>
To: Lukas Hruska <lhruska@suse.cz>, Petr Mladek <pmladek@suse.com>, Miroslav
	Benes <mbenes@suse.cz>, Josh Poimboeuf <jpoimboe@kernel.org>
Cc: Joe Lawrence <joe.lawrence@redhat.com>, live-patching@vger.kernel.org, 
	linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, Josh Poimboeuf
	 <jpoimboe@redhat.com>
Date: Wed, 10 Jan 2024 10:38:52 -0300
In-Reply-To: <20231106162513.17556-2-lhruska@suse.cz>
References: <20231106162513.17556-1-lhruska@suse.cz>
	 <20231106162513.17556-2-lhruska@suse.cz>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.50.1 
Precedence: bulk
MIME-Version: 1.0

On Mon, 2023-11-06 at 17:25 +0100, Lukas Hruska wrote:
> From: Josh Poimboeuf <jpoimboe@redhat.com>
>=20
> Define klp prefixes in include/uapi/linux/livepatch.h, and use them
> for
> replacing hard-coded values in kernel/livepatch/core.c.
>=20
> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
> Signed-off-by: Lukas Hruska <lhruska@suse.cz>

Reviewed-by: Marcos Paulo de Souza <mpdesouza@suse.com>

> ---
> =C2=A0MAINTAINERS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 1 +
> =C2=A0include/uapi/linux/livepatch.h | 15 +++++++++++++++
> =C2=A0kernel/livepatch/core.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=
=C2=A0 5 +++--
> =C2=A03 files changed, 19 insertions(+), 2 deletions(-)
> =C2=A0create mode 100644 include/uapi/linux/livepatch.h
>=20
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 4cc6bf79fdd8..11a2d84c1277 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -12130,6 +12130,7 @@ F:	Documentation/ABI/testing/sysfs-
> kernel-livepatch
> =C2=A0F:	Documentation/livepatch/
> =C2=A0F:	arch/powerpc/include/asm/livepatch.h
> =C2=A0F:	include/linux/livepatch.h
> +F:	include/uapi/linux/livepatch.h
> =C2=A0F:	kernel/livepatch/
> =C2=A0F:	kernel/module/livepatch.c
> =C2=A0F:	lib/livepatch/
> diff --git a/include/uapi/linux/livepatch.h
> b/include/uapi/linux/livepatch.h
> new file mode 100644
> index 000000000000..e19430918a07
> --- /dev/null
> +++ b/include/uapi/linux/livepatch.h
> @@ -0,0 +1,15 @@
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> +
> +/*
> + * livepatch.h - Kernel Live Patching Core
> + *
> + * Copyright (C) 2016 Josh Poimboeuf <jpoimboe@redhat.com>
> + */
> +
> +#ifndef _UAPI_LIVEPATCH_H
> +#define _UAPI_LIVEPATCH_H
> +
> +#define KLP_RELA_PREFIX		".klp.rela."
> +#define KLP_SYM_PREFIX		".klp.sym."
> +
> +#endif /* _UAPI_LIVEPATCH_H */
> diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
> index 61328328c474..622f1916a5c8 100644
> --- a/kernel/livepatch/core.c
> +++ b/kernel/livepatch/core.c
> @@ -20,6 +20,7 @@
> =C2=A0#include <linux/completion.h>
> =C2=A0#include <linux/memory.h>
> =C2=A0#include <linux/rcupdate.h>
> +#include <uapi/linux/livepatch.h>
> =C2=A0#include <asm/cacheflush.h>
> =C2=A0#include "core.h"
> =C2=A0#include "patch.h"
> @@ -226,7 +227,7 @@ static int klp_resolve_symbols(Elf_Shdr *sechdrs,
> const char *strtab,
> =C2=A0
> =C2=A0		/* Format: .klp.sym.sym_objname.sym_name,sympos */
> =C2=A0		cnt =3D sscanf(strtab + sym->st_name,
> -			=C2=A0=C2=A0=C2=A0=C2=A0 ".klp.sym.%55[^.].%511[^,],%lu",
> +			=C2=A0=C2=A0=C2=A0=C2=A0 KLP_SYM_PREFIX "%55[^.].%511[^,],%lu",
> =C2=A0			=C2=A0=C2=A0=C2=A0=C2=A0 sym_objname, sym_name, &sympos);
> =C2=A0		if (cnt !=3D 3) {
> =C2=A0			pr_err("symbol %s has an incorrectly
> formatted name\n",
> @@ -305,7 +306,7 @@ static int klp_write_section_relocs(struct module
> *pmod, Elf_Shdr *sechdrs,
> =C2=A0	 * See comment in klp_resolve_symbols() for an explanation
> =C2=A0	 * of the selected field width value.
> =C2=A0	 */
> -	cnt =3D sscanf(shstrtab + sec->sh_name, ".klp.rela.%55[^.]",
> +	cnt =3D sscanf(shstrtab + sec->sh_name, KLP_RELA_PREFIX
> "%55[^.]",
> =C2=A0		=C2=A0=C2=A0=C2=A0=C2=A0 sec_objname);
> =C2=A0	if (cnt !=3D 1) {
> =C2=A0		pr_err("section %s has an incorrectly formatted
> name\n",