From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84D78C4361A for ; Fri, 4 Dec 2020 19:36:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5205F22C9C for ; Fri, 4 Dec 2020 19:36:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730406AbgLDTgj (ORCPT ); Fri, 4 Dec 2020 14:36:39 -0500 Received: from mail.efficios.com ([167.114.26.124]:59922 "EHLO mail.efficios.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729721AbgLDTgj (ORCPT ); Fri, 4 Dec 2020 14:36:39 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.efficios.com (Postfix) with ESMTP id 3FBF42CDC09; Fri, 4 Dec 2020 14:35:58 -0500 (EST) Received: from mail.efficios.com ([127.0.0.1]) by localhost (mail03.efficios.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 6rMB51jRbXGC; Fri, 4 Dec 2020 14:35:57 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mail.efficios.com (Postfix) with ESMTP id D41532CDD85; Fri, 4 Dec 2020 14:35:57 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com D41532CDD85 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=default; t=1607110557; bh=jwmYw8U3h/Wa2AzZqAo41IYU4vTQxznKzzONce8TSgA=; h=Date:From:To:Message-ID:MIME-Version; b=JavCCmTYYsjZMxDWgKbMggBKekTcJEnF2+rvRMEKKBpIFApjQCb+QyRva7mxgB5Wy zoPjLQKwBET9t+FVb1RLupmRpZ2VpBG0PpU3FSpwCkCphEsxtcV4TepJBwYwlszmoY eExxJnp3M7jbdBrxFK9zF2QmYFh+YxFVhVUVIY7Ibn50Zh4Nz8Q6LFKzpRvHR68CDx qOzmgQOf/HRHgFl3lR70Zpslf04IbAeLE5RlDUvgX7db4jcYlyVtlIYzNMXpXyG9mP nDgFhFUrt/LHuhZnqJ/X243JHT9TaV/Lfv+aQ3luJzCjlUD1rZh0ipZcGojsS7Wf9q GtjcZAIOZH8Tw== X-Virus-Scanned: amavisd-new at efficios.com Received: from mail.efficios.com ([127.0.0.1]) by localhost (mail03.efficios.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 7Q5RQPLmJ-Hn; Fri, 4 Dec 2020 14:35:57 -0500 (EST) Received: from mail03.efficios.com (mail03.efficios.com [167.114.26.124]) by mail.efficios.com (Postfix) with ESMTP id C5D6E2CDD04; Fri, 4 Dec 2020 14:35:57 -0500 (EST) Date: Fri, 4 Dec 2020 14:35:57 -0500 (EST) From: Mathieu Desnoyers To: Andy Lutomirski Cc: x86 , linux-kernel , Nicholas Piggin , Arnd Bergmann , Anton Blanchard , stable Message-ID: <729218347.6370.1607110557680.JavaMail.zimbra@efficios.com> In-Reply-To: <250ded637696d490c69bef1877148db86066881c.1607058304.git.luto@kernel.org> References: <250ded637696d490c69bef1877148db86066881c.1607058304.git.luto@kernel.org> Subject: Re: [PATCH v3 4/4] membarrier: Execute SYNC_CORE on the calling thread MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [167.114.26.124] X-Mailer: Zimbra 8.8.15_GA_3980 (ZimbraWebClient - FF83 (Linux)/8.8.15_GA_3980) Thread-Topic: membarrier: Execute SYNC_CORE on the calling thread Thread-Index: Qq2Qbs3Hm65A4T6BZYHZClRs1qtt4A== Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org ----- On Dec 4, 2020, at 12:07 AM, Andy Lutomirski luto@kernel.org wrote: > membarrier()'s MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE is documented > as syncing the core on all sibling threads but not necessarily the > calling thread. This behavior is fundamentally buggy and cannot be used > safely. Suppose a user program has two threads. Thread A is on CPU 0 > and thread B is on CPU 1. Thread A modifies some text and calls > membarrier(MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE). Then thread B > executes the modified code. If, at any point after membarrier() decides > which CPUs to target, thread A could be preempted and replaced by thread > B on CPU 0. This could even happen on exit from the membarrier() > syscall. If this happens, thread B will end up running on CPU 0 without > having synced. > > In principle, this could be fixed by arranging for the scheduler to > sync_core_before_usermode() whenever switching between two threads in > the same mm if there is any possibility of a concurrent membarrier() > call, but this would have considerable overhead. Instead, make > membarrier() sync the calling CPU as well. > > As an optimization, this avoids an extra smp_mb() in the default > barrier-only mode. ^ we could also add to the commit message that it avoids doing rseq preempt on the caller as well. Other than that: Reviewed-by: Mathieu Desnoyers Thanks! Mathieu > > Cc: stable@vger.kernel.org > Signed-off-by: Andy Lutomirski > --- > kernel/sched/membarrier.c | 51 +++++++++++++++++++++++++-------------- > 1 file changed, 33 insertions(+), 18 deletions(-) > > diff --git a/kernel/sched/membarrier.c b/kernel/sched/membarrier.c > index 01538b31f27e..57266ab32ef9 100644 > --- a/kernel/sched/membarrier.c > +++ b/kernel/sched/membarrier.c > @@ -333,7 +333,8 @@ static int membarrier_private_expedited(int flags, int > cpu_id) > return -EPERM; > } > > - if (atomic_read(&mm->mm_users) == 1 || num_online_cpus() == 1) > + if (flags != MEMBARRIER_FLAG_SYNC_CORE && > + (atomic_read(&mm->mm_users) == 1 || num_online_cpus() == 1)) > return 0; > > /* > @@ -352,8 +353,6 @@ static int membarrier_private_expedited(int flags, int > cpu_id) > > if (cpu_id >= nr_cpu_ids || !cpu_online(cpu_id)) > goto out; > - if (cpu_id == raw_smp_processor_id()) > - goto out; > rcu_read_lock(); > p = rcu_dereference(cpu_rq(cpu_id)->curr); > if (!p || p->mm != mm) { > @@ -368,16 +367,6 @@ static int membarrier_private_expedited(int flags, int > cpu_id) > for_each_online_cpu(cpu) { > struct task_struct *p; > > - /* > - * Skipping the current CPU is OK even through we can be > - * migrated at any point. The current CPU, at the point > - * where we read raw_smp_processor_id(), is ensured to > - * be in program order with respect to the caller > - * thread. Therefore, we can skip this CPU from the > - * iteration. > - */ > - if (cpu == raw_smp_processor_id()) > - continue; > p = rcu_dereference(cpu_rq(cpu)->curr); > if (p && p->mm == mm) > __cpumask_set_cpu(cpu, tmpmask); > @@ -385,12 +374,38 @@ static int membarrier_private_expedited(int flags, int > cpu_id) > rcu_read_unlock(); > } > > - preempt_disable(); > - if (cpu_id >= 0) > + if (cpu_id >= 0) { > + /* > + * smp_call_function_single() will call ipi_func() if cpu_id > + * is the calling CPU. > + */ > smp_call_function_single(cpu_id, ipi_func, NULL, 1); > - else > - smp_call_function_many(tmpmask, ipi_func, NULL, 1); > - preempt_enable(); > + } else { > + /* > + * For regular membarrier, we can save a few cycles by > + * skipping the current cpu -- we're about to do smp_mb() > + * below, and if we migrate to a different cpu, this cpu > + * and the new cpu will execute a full barrier in the > + * scheduler. > + * > + * For CORE_SYNC, we do need a barrier on the current cpu -- > + * otherwise, if we are migrated and replaced by a different > + * task in the same mm just before, during, or after > + * membarrier, we will end up with some thread in the mm > + * running without a core sync. > + * > + * For RSEQ, don't rseq_preempt() the caller. User code > + * is not supposed to issue syscalls at all from inside an > + * rseq critical section. > + */ > + if (flags != MEMBARRIER_FLAG_SYNC_CORE) { > + preempt_disable(); > + smp_call_function_many(tmpmask, ipi_func, NULL, true); > + preempt_enable(); > + } else { > + on_each_cpu_mask(tmpmask, ipi_func, NULL, true); > + } > + } > > out: > if (cpu_id < 0) > -- > 2.28.0 -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com