On Tue, Jun 06, 2023 at 11:21:59AM -0700, Song Liu wrote:
> On Mon, Jun 5, 2023 at 3:09 AM Mark Rutland <mark.rutland@xxxxxxx> wrote:
>
> [...]
>
> > > > > Can you give more detail on what parameters you need? If the only extra
> > > > > parameter is just "does this allocation need to live close to kernel
> > > > > text", that's not that big of a deal.
> > > >
> > > > My thinking was that we at least need the start + end for each caller. That
> > > > might be it, tbh.
> > >
> > > Do you mean that modules will have something like
> > >
> > > jit_text_alloc(size, MODULES_START, MODULES_END);
> > >
> > > and kprobes will have
> > >
> > > jit_text_alloc(size, KPROBES_START, KPROBES_END);
> > > ?
> >
> > Yes.
>
> How about we start with two APIs:
> jit_text_alloc(size);
> jit_text_alloc_range(size, start, end);
>
> AFAICT, arm64 is the only arch that requires the latter API. And TBH, I am
> not quite convinced it is needed.
Right now arm64 and riscv override bpf and kprobes allocations to use the
entire vmalloc address space, but having the ability to allocate generated
code outside of modules area may be useful for other architectures.
Still the start + end for the callers feels backwards to me because the
callers do not define the ranges, but rather the architectures, so we still
need a way for architectures to define how they want allocate memory for
the generated code.
> > > It sill can be achieved with a single jit_alloc_arch_params(), just by
> > > adding enum jit_type parameter to jit_text_alloc().
> >
> > That feels backwards to me; it centralizes a bunch of information about
> > distinct users to be able to shove that into a static array, when the callsites
> > can pass that information.
>
> I think we only two type of users: module and everything else (ftrace, kprobe,
> bpf stuff). The key differences are:
>
> 1. module uses text and data; while everything else only uses text.
> 2. module code is generated by the compiler, and thus has stronger
> requirements in address ranges; everything else are generated via some
> JIT or manual written assembly, so they are more flexible with address
> ranges (in JIT, we can avoid using instructions that requires a specific
> address range).
>
> The next question is, can we have the two types of users share the same
> address ranges? If not, we can reserve the preferred range for modules,
> and let everything else use the other range. I don't see reasons to further
> separate users in the "everything else" group.
I agree that we can define only two types: modules and everything else and
let the architectures define if they need different ranges for these two
types, or want the same range for everything.
With only two types we can have two API calls for alloc, and a single
structure that defines the ranges etc from the architecture side rather
than spread all over.
Like something along these lines:
struct execmem_range {
unsigned long start;
unsigned long end;
unsigned long fallback_start;
unsigned long fallback_end;
pgprot_t pgprot;
unsigned int alignment;
};
struct execmem_modules_range {
enum execmem_module_flags flags;
struct execmem_range text;
struct execmem_range data;
};
struct execmem_jit_range {
struct execmem_range text;
};
struct execmem_params {
struct execmem_modules_range modules;
struct execmem_jit_range jit;
};
struct execmem_params *execmem_arch_params(void);
void *execmem_text_alloc(size_t size);
void *execmem_data_alloc(size_t size);
void execmem_free(void *ptr);
void *jit_text_alloc(size_t size);
void jit_free(void *ptr);
Modules or anything that must live close to the kernel image can use
execmem_*_alloc() and the callers that don't generally care about relative
addressing will use jit_text_alloc(), presuming that arch will restrict jit
range if necessary, like e.g. below for arm64 jit can be anywhere in
vmalloc and for x86 and s390 it will share the modules range.
struct execmem_params arm64_execmem = {
.modules = {
.flags = KASAN,
.text = {
.start = MODULES_VADDR,
.end = MODULES_END,
.pgprot = PAGE_KERNEL_ROX,
.fallback_start = VMALLOC_START,
.fallback_start = VMALLOC_END,
},
},
.jit = {
.text = {
.start = VMALLOC_START,
.end = VMALLOC_END,
.pgprot = PAGE_KERNEL_ROX,
},
},
};
/* x86 and s390 */
struct execmem_params cisc_execmem = {
.modules = {
.flags = KASAN,
.text = {
.start = MODULES_VADDR,
.end = MODULES_END,
.pgprot = PAGE_KERNEL_ROX,
},
},
.jit_range = {}, /* impplies reusing .modules */
};
struct execmem_params default_execmem = {
.modules = {
.flags = KASAN,
.text = {
.start = VMALLOC_START,
.end = VMALLOC_END,
.pgprot = PAGE_KERNEL_EXEC,
},
},
};
--
Sincerely yours,
Mike.
