From: Peter Zijlstra <peterz@infradead.org>
To: Daniel Bristot de Oliveira <bristot@redhat.com>
Cc: linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
"Steven Rostedt (VMware)" <rostedt@goodmis.org>,
Jiri Kosina <jkosina@suse.cz>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Chris von Recklinghausen <crecklin@redhat.com>,
Jason Baron <jbaron@akamai.com>, Scott Wood <swood@redhat.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
Clark Williams <williams@redhat.com>,
x86@kernel.org
Subject: Re: [PATCH V5 7/7] x86/jump_label: Batch jump label updates
Date: Mon, 15 Apr 2019 13:54:58 +0200 [thread overview]
Message-ID: <20190415115458.GM11158@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <725010896650bc040743b0479b103f5f6d28b404.1554106794.git.bristot@redhat.com>
On Mon, Apr 01, 2019 at 10:58:19AM +0200, Daniel Bristot de Oliveira wrote:
> diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
> index 8aa65fbbd764..ab75b222a7e2 100644
> --- a/arch/x86/kernel/jump_label.c
> +++ b/arch/x86/kernel/jump_label.c
> @@ -15,6 +15,7 @@
> #include <asm/kprobes.h>
> #include <asm/alternative.h>
> #include <asm/text-patching.h>
> +#include <linux/slab.h>
>
> union jump_code_union {
> char code[JUMP_LABEL_NOP_SIZE];
> @@ -111,6 +112,93 @@ void arch_jump_label_transform(struct jump_entry *entry,
> mutex_unlock(&text_mutex);
> }
>
> +unsigned int entry_vector_max_elem __read_mostly;
> +struct text_patch_loc *entry_vector;
> +unsigned int entry_vector_nr_elem;
> +
> +void arch_jump_label_init(void)
> +{
> + entry_vector = (void *) __get_free_page(GFP_KERNEL);
> +
> + if (WARN_ON_ONCE(!entry_vector))
> + return;
> +
> + entry_vector_max_elem = PAGE_SIZE / sizeof(struct text_patch_loc);
> + return;
> +}
> +
> +int arch_jump_label_transform_queue(struct jump_entry *entry,
> + enum jump_label_type type)
> +{
> + struct text_patch_loc *tp;
> + void *entry_code;
> +
> + /*
> + * Batch mode disabled before being able to allocate memory:
> + * Fallback to the non-batching mode.
> + */
> + if (unlikely(!entry_vector_max_elem)) {
> + if (!slab_is_available() || early_boot_irqs_disabled)
See, the thing is, you never use slab, so that slab check is completely
wrong.
> + goto fallback;
> +
> + arch_jump_label_init();
> + }
> +
> + /*
> + * No more space in the vector, tell upper layer to apply
> + * the queue before continuing.
> + */
> + if (entry_vector_nr_elem == entry_vector_max_elem)
> + return -ENOSPC;
> +
> + tp = &entry_vector[entry_vector_nr_elem];
> +
> + entry_code = (void *)jump_entry_code(entry);
> +
> + /*
> + * The int3 handler will do a bsearch in the queue, so we need entries
> + * to be sorted. We can survive an unsorted list by rejecting the entry,
> + * forcing the generic jump_label code to apply the queue. Warning once,
> + * to raise the attention to the case of an unsorted entry that is
> + * better not happen, because, in the worst case we will perform in the
> + * same way as we do without batching - with some more overhead.
> + */
> + if (entry_vector_nr_elem > 0) {
> + int prev_idx = entry_vector_nr_elem - 1;
> + struct text_patch_loc *prev_tp = &entry_vector[prev_idx];
> +
> + if (WARN_ON_ONCE(prev_tp->addr > entry_code))
> + return -EINVAL;
> + }
> +
> + __jump_label_set_jump_code(entry, type,
> + (union jump_code_union *) &tp->opcode, 0);
> +
> + tp->addr = entry_code;
> + tp->detour = entry_code + JUMP_LABEL_NOP_SIZE;
> + tp->len = JUMP_LABEL_NOP_SIZE;
> +
> + entry_vector_nr_elem++;
> +
> + return 0;
> +
> +fallback:
> + arch_jump_label_transform(entry, type);
> + return 0;
> +}
So how about we do something like:
+static struct bp_patching_desc {
+ int nr_entries;
+ struct text_patch_loc vec[PAGE_SIZE / sizeof(struct text_patch_loc)];
+} bp_patching;
and call it a day?
Then we have static storage, no allocation, no fail paths.
Also note that I removed that whole in_progress thing, as that is
completely redudant vs !!nr_entries.
next prev parent reply other threads:[~2019-04-15 11:55 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-01 8:58 [PATCH V5 0/7] x86/jump_label: Bound IPIs sent when updating a static key Daniel Bristot de Oliveira
2019-04-01 8:58 ` [PATCH V5 1/7] jump_label: Add for_each_label_entry helper Daniel Bristot de Oliveira
2019-04-15 10:51 ` Peter Zijlstra
2019-04-15 11:29 ` Daniel Bristot de Oliveira
2019-04-01 8:58 ` [PATCH V5 2/7] jump_label: Add a jump_label_can_update() helper Daniel Bristot de Oliveira
2019-04-01 8:58 ` [PATCH V5 3/7] x86/jump_label: Add a __jump_label_set_jump_code() helper Daniel Bristot de Oliveira
2019-04-01 8:58 ` [PATCH V5 4/7] jump_label: Sort entries of the same key by the code Daniel Bristot de Oliveira
2019-04-15 10:55 ` Peter Zijlstra
2019-04-15 11:33 ` Daniel Bristot de Oliveira
2019-04-01 8:58 ` [PATCH V5 5/7] x86/alternative: Batch of patch operations Daniel Bristot de Oliveira
2019-04-15 11:35 ` Peter Zijlstra
2019-04-01 8:58 ` [PATCH V5 6/7] jump_label: Batch updates if arch supports it Daniel Bristot de Oliveira
2019-04-15 11:50 ` Peter Zijlstra
2019-04-01 8:58 ` [PATCH V5 7/7] x86/jump_label: Batch jump label updates Daniel Bristot de Oliveira
2019-04-15 11:54 ` Peter Zijlstra [this message]
2019-04-15 12:15 ` Daniel Bristot de Oliveira
2019-05-02 20:18 ` Daniel Bristot de Oliveira
2019-04-15 9:52 ` [PATCH V5 0/7] x86/jump_label: Bound IPIs sent when updating a static key Daniel Bristot de Oliveira
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190415115458.GM11158@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=bp@alien8.de \
--cc=bristot@redhat.com \
--cc=crecklin@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=jbaron@akamai.com \
--cc=jkosina@suse.cz \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=mtosatti@redhat.com \
--cc=rostedt@goodmis.org \
--cc=swood@redhat.com \
--cc=tglx@linutronix.de \
--cc=williams@redhat.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).