From: Peter Zijlstra <peterz@infradead.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Oskolkov <posk@posk.io>, Ingo Molnar <mingo@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
Dave Hansen <dave.hansen@linux.intel.com>,
Andy Lutomirski <luto@kernel.org>,
Linux Memory Management List <linux-mm@kvack.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-api@vger.kernel.org, Paul Turner <pjt@google.com>,
Ben Segall <bsegall@google.com>, Peter Oskolkov <posk@google.com>,
Andrei Vagin <avagin@google.com>, Jann Horn <jannh@google.com>,
Thierry Delisle <tdelisle@uwaterloo.ca>
Subject: Re: [PATCH v0.9.1 3/6] sched/umcg: implement UMCG syscalls
Date: Fri, 26 Nov 2021 23:07:29 +0100 [thread overview]
Message-ID: <YaFaoQsIBUmq1S/q@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <YaFY0KqfPhmZjK7n@hirez.programming.kicks-ass.net>
On Fri, Nov 26, 2021 at 10:59:44PM +0100, Peter Zijlstra wrote:
> That seems to loose the freezable crud.. then again, since we're
> interruptible, that shouldn't matter. Lemme go do that.
---
--- a/kernel/sched/umcg.c
+++ b/kernel/sched/umcg.c
@@ -52,7 +52,7 @@ static int umcg_pin_pages(void)
server = umcg_get_task(server_tid);
if (!server)
- return -EINVAL;
+ return -ESRCH;
if (pin_user_pages_fast((unsigned long)self, 1, 0,
&tsk->umcg_worker_page) != 1)
@@ -358,18 +358,10 @@ int umcg_wait(u64 timo)
{
struct task_struct *tsk = current;
struct umcg_task __user *self = tsk->umcg_task;
- struct hrtimer_sleeper timeout;
struct page *page = NULL;
u32 state;
int ret;
- if (timo) {
- hrtimer_init_sleeper_on_stack(&timeout, tsk->umcg_clock,
- HRTIMER_MODE_ABS);
- hrtimer_set_expires_range_ns(&timeout.timer, (s64)timo,
- tsk->timer_slack_ns);
- }
-
for (;;) {
set_current_state(TASK_INTERRUPTIBLE);
@@ -415,22 +407,16 @@ int umcg_wait(u64 timo)
break;
}
- if (timo)
- hrtimer_sleeper_start_expires(&timeout, HRTIMER_MODE_ABS);
-
- freezable_schedule();
-
- ret = -ETIMEDOUT;
- if (timo && !timeout.task)
+ if (!schedule_hrtimeout_range_clock(timo ? &timo : NULL,
+ tsk->timer_slack_ns,
+ HRTIMER_MODE_ABS,
+ tsk->umcg_clock)) {
+ ret = -ETIMEDOUT;
break;
+ }
}
__set_current_state(TASK_RUNNING);
- if (timo) {
- hrtimer_cancel(&timeout.timer);
- destroy_hrtimer_on_stack(&timeout.timer);
- }
-
return ret;
}
@@ -515,7 +501,8 @@ void umcg_notify_resume(struct pt_regs *
goto done;
if (state & UMCG_TF_PREEMPT) {
- umcg_pin_pages();
+ if (umcg_pin_pages())
+ goto die;
if (umcg_update_state(tsk, UMCG_TASK_RUNNING,
UMCG_TASK_RUNNABLE, &next_tid))
@@ -586,7 +573,9 @@ SYSCALL_DEFINE2(umcg_wait, u32, flags, u
tsk->flags &= ~PF_UMCG_WORKER;
/* see umcg_sys_{enter,exit}() */
- umcg_pin_pages();
+ ret = umcg_pin_pages();
+ if (ret)
+ return ret;
ret = umcg_update_state(tsk, UMCG_TASK_RUNNING, UMCG_TASK_RUNNABLE, &next_tid);
if (ret)
next prev parent reply other threads:[~2021-11-26 22:09 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-22 21:13 [PATCH v0.9.1 0/6] sched,mm,x86/uaccess: implement User Managed Concurrency Groups Peter Oskolkov
2021-11-22 21:13 ` [PATCH v0.9.1 1/6] sched/umcg: add WF_CURRENT_CPU and externise ttwu Peter Oskolkov
2021-11-22 21:13 ` [PATCH v0.9.1 2/6] mm, x86/uaccess: add userspace atomic helpers Peter Oskolkov
2021-11-24 14:31 ` Peter Zijlstra
2021-11-22 21:13 ` [PATCH v0.9.1 3/6] sched/umcg: implement UMCG syscalls Peter Oskolkov
2021-11-24 18:36 ` kernel test robot
2021-11-24 20:08 ` Peter Zijlstra
2021-11-24 21:32 ` Peter Zijlstra
2021-11-25 17:28 ` Peter Oskolkov
2021-11-26 17:09 ` Peter Zijlstra
2021-11-26 21:08 ` Thomas Gleixner
2021-11-26 21:59 ` Peter Zijlstra
2021-11-26 22:07 ` Peter Zijlstra [this message]
2021-11-27 0:45 ` Thomas Gleixner
2021-11-29 15:05 ` Peter Zijlstra
2021-11-26 22:16 ` Peter Zijlstra
2021-11-27 1:16 ` Thomas Gleixner
2021-11-29 15:07 ` Peter Zijlstra
2021-11-29 0:29 ` Peter Oskolkov
2021-11-29 16:41 ` Peter Zijlstra
2021-11-29 17:34 ` Peter Oskolkov
2021-11-29 21:08 ` Peter Zijlstra
2021-11-29 21:29 ` Peter Zijlstra
2021-11-29 23:38 ` Peter Oskolkov
2021-12-06 11:32 ` Peter Zijlstra
2021-12-06 12:04 ` Peter Zijlstra
2021-12-13 13:55 ` Peter Zijlstra
2021-12-06 11:47 ` Peter Zijlstra
2022-01-19 17:26 ` Peter Oskolkov
2022-01-20 11:07 ` Peter Zijlstra
2021-11-24 21:19 ` Peter Zijlstra
2021-11-26 21:11 ` Thomas Gleixner
2021-11-26 21:52 ` Peter Zijlstra
2021-11-29 22:07 ` Thomas Gleixner
2021-11-29 22:22 ` Peter Zijlstra
2021-11-24 21:41 ` Peter Zijlstra
2021-11-24 21:58 ` Peter Zijlstra
2021-11-24 22:18 ` Peter Zijlstra
2021-11-22 21:13 ` [PATCH v0.9.1 4/6] sched/umcg, lib/umcg: implement libumcg Peter Oskolkov
2021-11-22 21:13 ` [PATCH v0.9.1 5/6] sched/umcg: add Documentation/userspace-api/umcg.txt Peter Oskolkov
2021-11-22 21:13 ` [PATCH v0.9.1 6/6] sched/umcg, lib/umcg: add tools/lib/umcg/libumcg.txt Peter Oskolkov
2021-11-24 14:06 ` [PATCH v0.9.1 0/6] sched,mm,x86/uaccess: implement User Managed Concurrency Groups Peter Zijlstra
2021-11-24 16:28 ` Peter Oskolkov
2021-11-24 17:20 ` Peter Zijlstra
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=YaFaoQsIBUmq1S/q@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=avagin@google.com \
--cc=bsegall@google.com \
--cc=dave.hansen@linux.intel.com \
--cc=jannh@google.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=pjt@google.com \
--cc=posk@google.com \
--cc=posk@posk.io \
--cc=tdelisle@uwaterloo.ca \
--cc=tglx@linutronix.de \
/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).