From: "tip-bot2 for Josh Poimboeuf" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Josh Poimboeuf <jpoimboe@kernel.org>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: sched/core] livepatch: Convert stack entries array to percpu
Date: Wed, 22 Mar 2023 22:48:51 -0000 [thread overview]
Message-ID: <167952533158.5837.17769419178497550655.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20230313233346.kayh4t2lpicjkpsv@treble>
The following commit has been merged into the sched/core branch of tip:
Commit-ID: e92606fa172f63a26054885b9715be86c643229d
Gitweb: https://git.kernel.org/tip/e92606fa172f63a26054885b9715be86c643229d
Author: Josh Poimboeuf <jpoimboe@kernel.org>
AuthorDate: Mon, 13 Mar 2023 16:33:46 -07:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 22 Mar 2023 17:09:28 +01:00
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>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20230313233346.kayh4t2lpicjkpsv@treble
---
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 f1b25ec..135fc73 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;
next prev parent reply other threads:[~2023-03-22 22:49 UTC|newest]
Thread overview: 16+ 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-03-22 22:48 ` [tip: sched/core] " tip-bot2 for 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 ` [PATCH 0.5/3] livepatch: Convert stack entries array to percpu Josh Poimboeuf
2023-03-14 10:50 ` Petr Mladek
2023-03-15 0:26 ` Josh Poimboeuf
2023-03-22 22:48 ` tip-bot2 for Josh Poimboeuf [this message]
2023-03-22 22:48 ` [tip: sched/core] livepatch,sched: Add livepatch task switching to cond_resched() tip-bot2 for Josh Poimboeuf
2023-02-24 16:50 ` [PATCH v3 3/3] vhost: Fix livepatch timeouts in vhost_worker() Josh Poimboeuf
2023-03-22 22:48 ` [tip: sched/core] " tip-bot2 for 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=167952533158.5837.17769419178497550655.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=jpoimboe@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--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
all inboxes | Powered by JetHome®