From: Josh Poimboeuf <jpoimboe@kernel.org>
To: Petr Mladek <pmladek@suse.com>
Cc: live-patching@vger.kernel.org, linux-kernel@vger.kernel.org,
Seth Forshee <sforshee@kernel.org>,
Peter Zijlstra <peterz@infradead.org>, Song Liu <song@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Joe Lawrence <joe.lawrence@redhat.com>,
Miroslav Benes <mbenes@suse.cz>, Jiri Kosina <jikos@kernel.org>,
Ingo Molnar <mingo@redhat.com>, Rik van Riel <riel@surriel.com>
Subject: [PATCH 0.5/3] livepatch: Convert stack entries array to percpu
Date: Mon, 13 Mar 2023 16:33:46 -0700 [thread overview]
Message-ID: <20230313233346.kayh4t2lpicjkpsv@treble> (raw)
In-Reply-To: <ZAH9baGIOVL4/OHM@alley>
On Fri, Mar 03, 2023 at 03:00:13PM +0100, Petr Mladek wrote:
> > MAX_STACK_ENTRIES is 100, which seems excessive. If we halved that, the
> > array would be "only" 400 bytes, which is *almost* reasonable to
> > allocate on the stack?
>
> It is just for the stack in the process context. Right?
>
> I think that I have never seen a stack with over 50 entries. And in
> the worst case, a bigger amount of entries would "just" result in
> a non-reliable stack which might be acceptable.
>
> It looks acceptable to me.
>
> > Alternatively we could have a percpu entries array... :-/
>
> That said, percpu entries would be fine as well. It sounds like
> a good price for the livepatching feature. I think that livepatching
> is used on big systems anyway.
>
> I slightly prefer the per-cpu solution.
Booting a kernel with PREEMPT+LOCKDEP gave me a high-water mark of 60+
stack entries, seen when probing a device. I decided not to mess with
MAX_STACK_ENTRIES, and instead just convert the entries to percpu. This
patch could be inserted at the beginning of the set.
---8<---
Subject: [PATCH 0.5/3] livepatch: Convert stack entries array to percpu
The entries array in klp_check_stack() is static local because it's too
big to be reasonably allocated on the stack. Serialized access is
enforced by the klp_mutex.
In preparation for calling klp_check_stack() without the mutex (from
cond_resched), convert it to a percpu variable.
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
kernel/livepatch/transition.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/kernel/livepatch/transition.c b/kernel/livepatch/transition.c
index f1b25ec581e0..135fc73e2e5d 100644
--- a/kernel/livepatch/transition.c
+++ b/kernel/livepatch/transition.c
@@ -14,6 +14,8 @@
#include "transition.h"
#define MAX_STACK_ENTRIES 100
+DEFINE_PER_CPU(unsigned long[MAX_STACK_ENTRIES], klp_stack_entries);
+
#define STACK_ERR_BUF_SIZE 128
#define SIGNALS_TIMEOUT 15
@@ -240,12 +242,15 @@ static int klp_check_stack_func(struct klp_func *func, unsigned long *entries,
*/
static int klp_check_stack(struct task_struct *task, const char **oldname)
{
- static unsigned long entries[MAX_STACK_ENTRIES];
+ unsigned long *entries = this_cpu_ptr(klp_stack_entries);
struct klp_object *obj;
struct klp_func *func;
int ret, nr_entries;
- ret = stack_trace_save_tsk_reliable(task, entries, ARRAY_SIZE(entries));
+ /* Protect 'klp_stack_entries' */
+ lockdep_assert_preemption_disabled();
+
+ ret = stack_trace_save_tsk_reliable(task, entries, MAX_STACK_ENTRIES);
if (ret < 0)
return -EINVAL;
nr_entries = ret;
--
2.39.2
next prev parent reply other threads:[~2023-03-13 23:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-24 16:49 [PATCH v3 0/3] livepatch,sched: Add livepatch task switching to cond_resched() Josh Poimboeuf
2023-02-24 16:49 ` [PATCH v3 1/3] livepatch: Skip task_call_func() for current task Josh Poimboeuf
2023-02-24 16:50 ` [PATCH v3 2/3] livepatch,sched: Add livepatch task switching to cond_resched() Josh Poimboeuf
2023-02-27 15:55 ` Petr Mladek
2023-02-28 16:56 ` Josh Poimboeuf
2023-03-03 14:00 ` Petr Mladek
2023-03-13 23:33 ` Josh Poimboeuf [this message]
2023-03-14 10:50 ` [PATCH 0.5/3] livepatch: Convert stack entries array to percpu Petr Mladek
2023-03-15 0:26 ` Josh Poimboeuf
2023-02-24 16:50 ` [PATCH v3 3/3] vhost: Fix livepatch timeouts in vhost_worker() Josh Poimboeuf
2023-02-28 16:39 ` [PATCH v3 0/3] livepatch,sched: Add livepatch task switching to cond_resched() Seth Forshee
2023-03-30 16:11 ` Miroslav Benes
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=20230313233346.kayh4t2lpicjkpsv@treble \
--to=jpoimboe@kernel.org \
--cc=jikos@kernel.org \
--cc=joe.lawrence@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=live-patching@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mbenes@suse.cz \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=riel@surriel.com \
--cc=sforshee@kernel.org \
--cc=song@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