From nobody Fri Dec 19 13:05:05 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DCCFC4167B for ; Mon, 11 Dec 2023 09:44:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234620AbjLKJo1 (ORCPT ); Mon, 11 Dec 2023 04:44:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234589AbjLKJoZ (ORCPT ); Mon, 11 Dec 2023 04:44:25 -0500 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D022CE for ; Mon, 11 Dec 2023 01:44:31 -0800 (PST) Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-54dccf89cfdso5385384a12.0 for ; Mon, 11 Dec 2023 01:44:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702287870; x=1702892670; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qp+2/AFV5zmaxe9luf0MNfHGuX9N1n8phVhdPWTto6c=; b=PqGsMHqrjIbOG1jeGkSr5qWqzFYVWDDMX2+ZplyFD6V1BP1jeJixc6eJG8wanxalza CXiDQ3MfUJ9EAWTNColLMQPgdvHbWNX/O1K4KIG3EqHS91lfFYxvlAQuvkw3myANLlM3 +ojd0pcWPb0Uk2WrHFdEekbv3bg4U2xQxPaxpPruXY+zEcas+OP+r+YfKQSMt0484S6g IyP9i2L6jjQEo3HC0srDA2vZQWoyQ0Z1PB6cc2BE/KxbMXQKVsoRnx3vsfhCllXlJ7vn VXkirjB5gUuq0Fu1vE88MBFD0JntwDoDy69Aiks7/ee/a9zHigXa21jqUHeIbiRhqEQZ jwUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702287870; x=1702892670; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qp+2/AFV5zmaxe9luf0MNfHGuX9N1n8phVhdPWTto6c=; b=rs6GZM+xuL1pxP21uT3taGqAdf7mZe5SjYFEMVLnt5iZIiU66YTE2L1Pv4D7GA5BLX IYJmvn/Ll9JbI6+ztwbZ6aC5Atqfzeuo2zO8rWvsSWI4VcqHVs8MjlBMpUgd9j3FXPaE 4UQ/P/x/P2Wx7nk0D6D8mMJz7MBNFmAmstFdHlLJZ/G+WvqrKfCasQ1zCw0zzB1jfQIB YF7tXV99IOzry6ZMrNjIdp6JIvdnk/Ge/4alIcHwYYDXA7d/ZK+GBiMYjSue8YABDRoj CI/GoJT5KVrDXXr8ur5gxBaaYRkbjYGixdiQHjYH5w0zzgenJf1KI7rsfN/T+oHFmLG/ VC1A== X-Gm-Message-State: AOJu0YwHaAK39W8733Vi94mgztxBdIrXrV/xbu92N6butfOP3KHLtec2 rWUIuZHSenGLGTWg05RGsLY= X-Google-Smtp-Source: AGHT+IEaDoQFpPnxjlxeSUTzsAQavayOPPXdg/d408f0Mv7GQd3onKpiAY7YqVStGjAikZKqi4sBkw== X-Received: by 2002:a50:c908:0:b0:551:12f7:84e with SMTP id o8-20020a50c908000000b0055112f7084emr996214edh.28.1702287869354; Mon, 11 Dec 2023 01:44:29 -0800 (PST) Received: from andrea.wind3.hub ([31.189.124.152]) by smtp.gmail.com with ESMTPSA id if3-20020a0564025d8300b0054afcab0af2sm3463505edb.59.2023.12.11.01.44.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 01:44:28 -0800 (PST) From: Andrea Parri To: mathieu.desnoyers@efficios.com, paulmck@kernel.org, palmer@dabbelt.com, paul.walmsley@sifive.com, aou@eecs.berkeley.edu Cc: mmaas@google.com, hboehm@google.com, striker@us.ibm.com, charlie@rivosinc.com, rehn@rivosinc.com, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Andrea Parri Subject: [PATCH v2 1/4] membarrier: riscv: Add full memory barrier in switch_mm() Date: Mon, 11 Dec 2023 10:44:11 +0100 Message-Id: <20231211094414.8078-2-parri.andrea@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211094414.8078-1-parri.andrea@gmail.com> References: <20231211094414.8078-1-parri.andrea@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The membarrier system call requires a full memory barrier after storing to rq->curr, before going back to user-space. The barrier is only needed when switching between processes: the barrier is implied by mmdrop() when switching from kernel to userspace, and it's not needed when switching from userspace to kernel. Rely on the feature/mechanism ARCH_HAS_MEMBARRIER_CALLBACKS and on the primitive membarrier_arch_switch_mm(), already adopted by the PowerPC architecture, to insert the required barrier. Fixes: fab957c11efe2f ("RISC-V: Atomic and Locking Code") Signed-off-by: Andrea Parri Reported-by: Mathieu Desnoyers Reviewed-by: Mathieu Desnoyers --- MAINTAINERS | 2 +- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/membarrier.h | 29 +++++++++++++++++++++++++++++ arch/riscv/mm/context.c | 2 ++ kernel/sched/core.c | 5 +++-- 5 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 arch/riscv/include/asm/membarrier.h diff --git a/MAINTAINERS b/MAINTAINERS index e2c6187a3ac80..a9166d82ffced 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13807,7 +13807,7 @@ M: Mathieu Desnoyers M: "Paul E. McKenney" L: linux-kernel@vger.kernel.org S: Supported -F: arch/powerpc/include/asm/membarrier.h +F: arch/*/include/asm/membarrier.h F: include/uapi/linux/membarrier.h F: kernel/sched/membarrier.c =20 diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 95a2a06acc6a6..f7db95097caf1 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -27,6 +27,7 @@ config RISCV select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_KCOV + select ARCH_HAS_MEMBARRIER_CALLBACKS select ARCH_HAS_MMIOWB select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE select ARCH_HAS_PMEM_API diff --git a/arch/riscv/include/asm/membarrier.h b/arch/riscv/include/asm/m= embarrier.h new file mode 100644 index 0000000000000..4be218fa03b14 --- /dev/null +++ b/arch/riscv/include/asm/membarrier.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _ASM_RISCV_MEMBARRIER_H +#define _ASM_RISCV_MEMBARRIER_H + +static inline void membarrier_arch_switch_mm(struct mm_struct *prev, + struct mm_struct *next, + struct task_struct *tsk) +{ + /* + * Only need the full barrier when switching between processes. + * Barrier when switching from kernel to userspace is not + * required here, given that it is implied by mmdrop(). Barrier + * when switching from userspace to kernel is not needed after + * store to rq->curr. + */ + if (IS_ENABLED(CONFIG_SMP) && + likely(!(atomic_read(&next->membarrier_state) & + (MEMBARRIER_STATE_PRIVATE_EXPEDITED | + MEMBARRIER_STATE_GLOBAL_EXPEDITED)) || !prev)) + return; + + /* + * The membarrier system call requires a full memory barrier + * after storing to rq->curr, before going back to user-space. + */ + smp_mb(); +} + +#endif /* _ASM_RISCV_MEMBARRIER_H */ diff --git a/arch/riscv/mm/context.c b/arch/riscv/mm/context.c index 217fd4de61342..ba8eb3944687c 100644 --- a/arch/riscv/mm/context.c +++ b/arch/riscv/mm/context.c @@ -323,6 +323,8 @@ void switch_mm(struct mm_struct *prev, struct mm_struct= *next, if (unlikely(prev =3D=3D next)) return; =20 + membarrier_arch_switch_mm(prev, next, task); + /* * Mark the current MM context as inactive, and the next as * active. This is at least used by the icache flushing diff --git a/kernel/sched/core.c b/kernel/sched/core.c index a708d225c28e8..711dc753f7216 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6670,8 +6670,9 @@ static void __sched notrace __schedule(unsigned int s= ched_mode) * * Here are the schemes providing that barrier on the * various architectures: - * - mm ? switch_mm() : mmdrop() for x86, s390, sparc, PowerPC. - * switch_mm() rely on membarrier_arch_switch_mm() on PowerPC. + * - mm ? switch_mm() : mmdrop() for x86, s390, sparc, PowerPC, + * RISC-V. switch_mm() relies on membarrier_arch_switch_mm() + * on PowerPC and on RISC-V. * - finish_lock_switch() for weakly-ordered * architectures where spin_unlock is a full barrier, * - switch_to() for arm64 (weakly-ordered, spin_unlock --=20 2.34.1 From nobody Fri Dec 19 13:05:05 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C638C4167B for ; Mon, 11 Dec 2023 09:44:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234673AbjLKJoc (ORCPT ); Mon, 11 Dec 2023 04:44:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234619AbjLKJo1 (ORCPT ); Mon, 11 Dec 2023 04:44:27 -0500 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EBC5CE for ; Mon, 11 Dec 2023 01:44:33 -0800 (PST) Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-54da61eb366so5658441a12.3 for ; Mon, 11 Dec 2023 01:44:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702287872; x=1702892672; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mfT6yTigw0JL9rPQ3RLVTHss5/tTMRXlGfMsOm5hiBA=; b=LxX+NeJmku4hhfwrCuLd7Y4EmSUJY/rWF4dkOk0wtCBLRLkUdksgBUIQT/wywyFOiW Ikm6SeMjQX2C/WuocV9tTcrHLtlvFC+zCdsqHQVofwfmntMnxLXnjPhYlOsLJn7rQQ5J MQNXYs1+GQQ6yLePwB5ukueLn4vCbBJPjKTaMmZmRXRCQLLnYQfrIB9HQKxAvUouOAJx NERDYxemmIj9ObiiDjfRn4EluEb/Xlw5nAo5oB1ZkiOxzpriI0MZYTN+U7p0rn+pEhTj ogqsXa/+W2dnuzPl1qe6sM0nLLDS9xJo0Uxiv0TWK5Kn+AvHnk0Fnxx5gfL5vworcrCo emag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702287872; x=1702892672; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mfT6yTigw0JL9rPQ3RLVTHss5/tTMRXlGfMsOm5hiBA=; b=BH3tTKaQQnnmfJaJcqyXsh3njcIqqBBimppTZ4C0Z2T1koobDg1TrWSg+HJz8ujjsI ICQ9KcSc37boEnV21wKj6cw6xnxF0mKc4w+tpy5dJMWG0gVGFaDEbon4O7lzcKli15Z7 oai255l0CeHC+lYsBO2DcnSP4cquKIkF8gBd3TX38OJqzL/yPnuTAxFnN1JCvZ1DY9cr 4LcxCp0hTyHqBQpdOa41AqwmWhkspklAujITN+yFFqlnxpeW9iJpV2WKCQZqkZlywuLm kIKh/i0z/WF4BMFlCGHVx0yHfrnF40oXq3JTX1NOF3iVnhUqs3hXAc5gvYzcokSOKcly 6jmA== X-Gm-Message-State: AOJu0YzilyW7ffo4LQUXiO/t1Xj1UfUhkvGYe1FK/MhoQVoFqgC6U15D A5kRX4bq69GiZkhzkhageoQ= X-Google-Smtp-Source: AGHT+IGMxuKPrFTwj2zbLSblfgSfd44OwUT+BQyj3R0X1rt7fU+FpQfB/msMTDFYA5XJOFpr3giP2g== X-Received: by 2002:a50:fb8b:0:b0:54c:4837:93f7 with SMTP id e11-20020a50fb8b000000b0054c483793f7mr2864378edq.62.1702287871520; Mon, 11 Dec 2023 01:44:31 -0800 (PST) Received: from andrea.wind3.hub ([31.189.124.152]) by smtp.gmail.com with ESMTPSA id if3-20020a0564025d8300b0054afcab0af2sm3463505edb.59.2023.12.11.01.44.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 01:44:31 -0800 (PST) From: Andrea Parri To: mathieu.desnoyers@efficios.com, paulmck@kernel.org, palmer@dabbelt.com, paul.walmsley@sifive.com, aou@eecs.berkeley.edu Cc: mmaas@google.com, hboehm@google.com, striker@us.ibm.com, charlie@rivosinc.com, rehn@rivosinc.com, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Andrea Parri Subject: [PATCH v2 2/4] locking: Introduce prepare_sync_core_cmd() Date: Mon, 11 Dec 2023 10:44:12 +0100 Message-Id: <20231211094414.8078-3-parri.andrea@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211094414.8078-1-parri.andrea@gmail.com> References: <20231211094414.8078-1-parri.andrea@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Introduce an architecture function that architectures can use to set up ("prepare") SYNC_CORE commands. The function will be used by RISC-V to update its "deferred icache- flush" data structures (icache_stale_mask). Architectures defining prepare_sync_core_cmd() static inline need to select ARCH_HAS_PREPARE_SYNC_CORE_CMD. Suggested-by: Mathieu Desnoyers Signed-off-by: Andrea Parri Reviewed-by: Mathieu Desnoyers --- include/linux/sync_core.h | 16 +++++++++++++++- init/Kconfig | 3 +++ kernel/sched/membarrier.c | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/include/linux/sync_core.h b/include/linux/sync_core.h index 013da4b8b3272..67bb9794b8758 100644 --- a/include/linux/sync_core.h +++ b/include/linux/sync_core.h @@ -17,5 +17,19 @@ static inline void sync_core_before_usermode(void) } #endif =20 -#endif /* _LINUX_SYNC_CORE_H */ +#ifdef CONFIG_ARCH_HAS_PREPARE_SYNC_CORE_CMD +#include +#else +/* + * This is a dummy prepare_sync_core_cmd() implementation that can be used= on + * all architectures which provide unconditional core serializing instruct= ions + * in switch_mm(). + * If your architecture doesn't provide such core serializing instructions= in + * switch_mm(), you may need to write your own functions. + */ +static inline void prepare_sync_core_cmd(struct mm_struct *mm) +{ +} +#endif =20 +#endif /* _LINUX_SYNC_CORE_H */ diff --git a/init/Kconfig b/init/Kconfig index 9ffb103fc927b..87daf50838f02 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1972,6 +1972,9 @@ source "kernel/Kconfig.locks" config ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE bool =20 +config ARCH_HAS_PREPARE_SYNC_CORE_CMD + bool + config ARCH_HAS_SYNC_CORE_BEFORE_USERMODE bool =20 diff --git a/kernel/sched/membarrier.c b/kernel/sched/membarrier.c index 2ad881d07752c..58f801e013988 100644 --- a/kernel/sched/membarrier.c +++ b/kernel/sched/membarrier.c @@ -320,6 +320,7 @@ static int membarrier_private_expedited(int flags, int = cpu_id) MEMBARRIER_STATE_PRIVATE_EXPEDITED_SYNC_CORE_READY)) return -EPERM; ipi_func =3D ipi_sync_core; + prepare_sync_core_cmd(mm); } else if (flags =3D=3D MEMBARRIER_FLAG_RSEQ) { if (!IS_ENABLED(CONFIG_RSEQ)) return -EINVAL; --=20 2.34.1 From nobody Fri Dec 19 13:05:05 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39A5EC4167B for ; Mon, 11 Dec 2023 09:44:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234680AbjLKJof (ORCPT ); Mon, 11 Dec 2023 04:44:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234622AbjLKJoa (ORCPT ); Mon, 11 Dec 2023 04:44:30 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23D70F2 for ; Mon, 11 Dec 2023 01:44:36 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-54c5d041c23so5943464a12.2 for ; Mon, 11 Dec 2023 01:44:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702287874; x=1702892674; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EGt5t/kAxS1mkU99JyGnFu1ODAbdCKJM932jBFyIPCw=; b=TFQAoIA5kaXlornVednRGzuDG84+cOGWfuw0MsWFVyvlGOdncSA3NAwvI1J7bV14J4 zz6ZWceQMAez2sidmPK9q6fKXkEUTiI6af85EFfTHiQgheTIasIfsP+B+SIHACPuuttm 8pHy+03bL4NLd7kqk3d2C6CxLscOkESFaJHOHdPOyoZ1dXPUqhTmdNxwCh5xcpC1BP2J sxWZj5dKqxCMMWe620DBJxWTRvKtFSngB7PL1Sj1C3cvOn0ccE3xf+pVD2Y3YWgSeNim sf5mb9OjbKeSfSnF8OLwxbsRfyI8lI0UzvdyD47C1RBc+wqz3Lm84yvDtuUuoN7Pmyhy B7RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702287874; x=1702892674; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EGt5t/kAxS1mkU99JyGnFu1ODAbdCKJM932jBFyIPCw=; b=QWFLYXq4BKzyxcmnyH1tAwKGkuZjgAAPS73MucBfKcSKLozheC7YNMd/e0cuD4vHyz Zxcpsf7vfq9ysNK/5c4LIs0vVCmVCPHWYqeUbz7K1r0UCr1dB2yyMM/ktweAWFPch62i nRc8vunvlRKuiAax947FKm2apIRcDzQ+dRzMYhIwmofvQn17bfcT6Tgm1YthhsqRna+g bxGeUGVOB/nsWkhbRiBXCn5swiZN5Z5zmQXjbXbP6KShlNlJ8VUZ2sZXrGuuPDm9UPar 2VohB9QhIM4RzPmR/3YNGF5g4r6fao7fHceM6wkdDKFIWbecLNJDSczsmXaLXof9kb5H g9yw== X-Gm-Message-State: AOJu0Yxz6nx6Ub7nR5MUxKeklw9Qb7AqUJY8XiqwINCeg9sUQJLmeAp0 XbKDg9PWieViHqecaCUzjHY= X-Google-Smtp-Source: AGHT+IE3pzBUwNsGbb2VsHTBxI6r5mm1ppw958Piqi5Nb7wAbUVFDdXvSB1QAU+x6JNSWe35csvnSw== X-Received: by 2002:a50:cd47:0:b0:54c:9cf0:fb67 with SMTP id d7-20020a50cd47000000b0054c9cf0fb67mr1257371edj.48.1702287874167; Mon, 11 Dec 2023 01:44:34 -0800 (PST) Received: from andrea.wind3.hub ([31.189.124.152]) by smtp.gmail.com with ESMTPSA id if3-20020a0564025d8300b0054afcab0af2sm3463505edb.59.2023.12.11.01.44.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 01:44:33 -0800 (PST) From: Andrea Parri To: mathieu.desnoyers@efficios.com, paulmck@kernel.org, palmer@dabbelt.com, paul.walmsley@sifive.com, aou@eecs.berkeley.edu Cc: mmaas@google.com, hboehm@google.com, striker@us.ibm.com, charlie@rivosinc.com, rehn@rivosinc.com, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Andrea Parri Subject: [PATCH v2 3/4] membarrier: riscv: Provide core serializing command Date: Mon, 11 Dec 2023 10:44:13 +0100 Message-Id: <20231211094414.8078-4-parri.andrea@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211094414.8078-1-parri.andrea@gmail.com> References: <20231211094414.8078-1-parri.andrea@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" RISC-V uses xRET instructions on return from interrupt and to go back to user-space; the xRET instruction is not core serializing. Use FENCE.I for providing core serialization as follows: - by calling sync_core_before_usermode() on return from interrupt (cf. ipi_sync_core()), - via switch_mm() and sync_core_before_usermode() (respectively, for uthread->uthread and kthread->uthread transitions) to go back to user-space. On RISC-V, the serialization in switch_mm() is activated by resetting the icache_stale_mask of the mm at prepare_sync_core_cmd(). Suggested-by: Palmer Dabbelt Signed-off-by: Andrea Parri --- .../membarrier-sync-core/arch-support.txt | 18 +++++++++++- MAINTAINERS | 1 + arch/riscv/Kconfig | 3 ++ arch/riscv/include/asm/membarrier.h | 19 ++++++++++++ arch/riscv/include/asm/sync_core.h | 29 +++++++++++++++++++ 5 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 arch/riscv/include/asm/sync_core.h diff --git a/Documentation/features/sched/membarrier-sync-core/arch-support= .txt b/Documentation/features/sched/membarrier-sync-core/arch-support.txt index d96b778b87ed8..a163170fc0f48 100644 --- a/Documentation/features/sched/membarrier-sync-core/arch-support.txt +++ b/Documentation/features/sched/membarrier-sync-core/arch-support.txt @@ -10,6 +10,22 @@ # Rely on implicit context synchronization as a result of exception return # when returning from IPI handler, and when returning to user-space. # +# * riscv +# +# riscv uses xRET as return from interrupt and to return to user-space. +# +# Given that xRET is not core serializing, we rely on FENCE.I for providing +# core serialization: +# +# - by calling sync_core_before_usermode() on return from interrupt (cf. +# ipi_sync_core()), +# +# - via switch_mm() and sync_core_before_usermode() (respectively, for +# uthread->uthread and kthread->uthread transitions) to go back to +# user-space. +# +# The serialization in switch_mm() is activated by prepare_sync_core_cmd(= ). +# # * x86 # # x86-32 uses IRET as return from interrupt, which takes care of the IPI. @@ -43,7 +59,7 @@ | openrisc: | TODO | | parisc: | TODO | | powerpc: | ok | - | riscv: | TODO | + | riscv: | ok | | s390: | ok | | sh: | TODO | | sparc: | TODO | diff --git a/MAINTAINERS b/MAINTAINERS index a9166d82ffced..f6f1fdc76cf46 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13808,6 +13808,7 @@ M: "Paul E. McKenney" L: linux-kernel@vger.kernel.org S: Supported F: arch/*/include/asm/membarrier.h +F: arch/*/include/asm/sync_core.h F: include/uapi/linux/membarrier.h F: kernel/sched/membarrier.c =20 diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index f7db95097caf1..db7b1acd943e4 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -28,14 +28,17 @@ config RISCV select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_KCOV select ARCH_HAS_MEMBARRIER_CALLBACKS + select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_MMIOWB select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE select ARCH_HAS_PMEM_API + select ARCH_HAS_PREPARE_SYNC_CORE_CMD select ARCH_HAS_PTE_SPECIAL select ARCH_HAS_SET_DIRECT_MAP if MMU select ARCH_HAS_SET_MEMORY if MMU select ARCH_HAS_STRICT_KERNEL_RWX if MMU && !XIP_KERNEL select ARCH_HAS_STRICT_MODULE_RWX if MMU && !XIP_KERNEL + select ARCH_HAS_SYNC_CORE_BEFORE_USERMODE select ARCH_HAS_SYSCALL_WRAPPER select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAS_UBSAN_SANITIZE_ALL diff --git a/arch/riscv/include/asm/membarrier.h b/arch/riscv/include/asm/m= embarrier.h index 4be218fa03b14..a1071039c20ed 100644 --- a/arch/riscv/include/asm/membarrier.h +++ b/arch/riscv/include/asm/membarrier.h @@ -22,6 +22,25 @@ static inline void membarrier_arch_switch_mm(struct mm_s= truct *prev, /* * The membarrier system call requires a full memory barrier * after storing to rq->curr, before going back to user-space. + * + * The barrier is also needed for the SYNC_CORE command when + * switching between processes; in particular, on a transition + * from a thread belonging to another mm to a thread belonging + * to the mm for which a membarrier SYNC_CORE is done on CPU0: + * + * - [CPU0] sets all bits in the mm icache_stale_mask. + * + * - [CPU1] store to rq->curr (by the scheduler). + * + * - [CPU0] loads rq->curr within membarrier and observes + * cpu_rq(1)->curr->mm !=3D mm, so the IPI is skipped on + * CPU1; this means membarrier relies on switch_mm() to + * issue the sync-core. + * + * - [CPU1] switch_mm() loads icache_stale_mask; if the bit + * is zero, switch_mm() may incorrectly skip the sync-core. + * + * Matches the full barrier in membarrier_private_expedited(). */ smp_mb(); } diff --git a/arch/riscv/include/asm/sync_core.h b/arch/riscv/include/asm/sy= nc_core.h new file mode 100644 index 0000000000000..9153016da8f14 --- /dev/null +++ b/arch/riscv/include/asm/sync_core.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_RISCV_SYNC_CORE_H +#define _ASM_RISCV_SYNC_CORE_H + +/* + * RISC-V implements return to user-space through an xRET instruction, + * which is not core serializing. + */ +static inline void sync_core_before_usermode(void) +{ + asm volatile ("fence.i" ::: "memory"); +} + +#ifdef CONFIG_SMP +/* + * Ensure the next switch_mm() on every CPU issues a core serializing + * instruction for the given @mm. + */ +static inline void prepare_sync_core_cmd(struct mm_struct *mm) +{ + cpumask_setall(&mm->context.icache_stale_mask); +} +#else +static inline void prepare_sync_core_cmd(struct mm_struct *mm) +{ +} +#endif /* CONFIG_SMP */ + +#endif /* _ASM_RISCV_SYNC_CORE_H */ --=20 2.34.1 From nobody Fri Dec 19 13:05:05 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83997C4167B for ; Mon, 11 Dec 2023 09:44:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234686AbjLKJor (ORCPT ); Mon, 11 Dec 2023 04:44:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234679AbjLKJol (ORCPT ); Mon, 11 Dec 2023 04:44:41 -0500 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA1A211F for ; Mon, 11 Dec 2023 01:44:40 -0800 (PST) Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-54dccf89cfdso5385740a12.0 for ; Mon, 11 Dec 2023 01:44:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702287879; x=1702892679; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JrL6R0s9TI3vntjjPRtwaASPjZe5TnGAbwALAE/nUuU=; b=jZGpXf6Yf9lg/3vMgnX8sxCNCEbznYYAn6j5HXXw83XVo4GTHyPS5ZfBQ20/UG8jTl GqKIUfPxNNiEkAddA7XkNsnts1+h04G34o2h/ZT4hUSJs4SrVfzsWh9EkqW56ymMu96q 9aInNCR6V2TSTrsyx/nAsXyVHkTkz68GyOWy7rnvT+M9bYBDOtxS1wJ9Q5LrflXB+AH7 zZXzdg2WJ0ZJ+t3lmc9X4svURQTu3MRGk0wSHp0raJZlSZCIIHOJglKDEnK4JJJOLqVg v30r2rve2reZXi7+kUcrURYGdeewEalpEdP3zlqvT2v5lD9O3+Zvbq7f9VN69YQ+uiMw OuaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702287879; x=1702892679; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JrL6R0s9TI3vntjjPRtwaASPjZe5TnGAbwALAE/nUuU=; b=RyYPcGWmzsb3FkCQfApR2g7WGcDCuLp3IM+fDRQKobKz6TW/IQIcdwW+LUu2lfnH5A rrMFArwDpV6htFIq7tspBJlipVTa1WlmUQobW/NUX8I4ZjERg9YOzPVN1apw/2n/Npht /4vEQoxxEMDbcE8WHEJPH8EFo/SDGYO4hIfXxEmF3Py34Uxb10I1GgHJG8+PwtJ2cU+V PQdHeMgwb0cotA3igN91JN0SJKzZw3Ep4ZP4RxD9trnvUTXrTngYEnp0SOUVjCjU38Om 24/XdaNIXiN5myJHvObxlwvxWnw7tDuFVwnNzEMLKNu9ZK8UN/+4J+VoE/WhHKSNh0+z Z6iQ== X-Gm-Message-State: AOJu0YwjWog0WZuVSLrwPZjuaUJ8ivdXCbHPBQ81+ZG12djUzZ0WEIWd BzJBtZwJBGzfTqItpAf0tEM= X-Google-Smtp-Source: AGHT+IG5R0Nbgf4AZSChAr1lY64olZakZJEY1i/GFOLQjx+RMNL2fEXrQx8A8gceN8hc/P2o1l70Sg== X-Received: by 2002:a50:8dc7:0:b0:54c:4837:9a8d with SMTP id s7-20020a508dc7000000b0054c48379a8dmr2213085edh.52.1702287878685; Mon, 11 Dec 2023 01:44:38 -0800 (PST) Received: from andrea.wind3.hub ([31.189.124.152]) by smtp.gmail.com with ESMTPSA id if3-20020a0564025d8300b0054afcab0af2sm3463505edb.59.2023.12.11.01.44.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 01:44:38 -0800 (PST) From: Andrea Parri To: mathieu.desnoyers@efficios.com, paulmck@kernel.org, palmer@dabbelt.com, paul.walmsley@sifive.com, aou@eecs.berkeley.edu Cc: mmaas@google.com, hboehm@google.com, striker@us.ibm.com, charlie@rivosinc.com, rehn@rivosinc.com, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Andrea Parri Subject: [RFC PATCH 4/4] membarrier: Introduce Kconfig ARCH_HAS_MEMBARRIER Date: Mon, 11 Dec 2023 10:44:14 +0100 Message-Id: <20231211094414.8078-5-parri.andrea@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211094414.8078-1-parri.andrea@gmail.com> References: <20231211094414.8078-1-parri.andrea@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Architectures supporting the "private expedited" membarrier command must select the Kconfig to use the command. Document status and requirements for each architecture in a single file under Documentation/features. Suggested-by: Mathieu Desnoyers Signed-off-by: Andrea Parri --- The TODOs in the arch-support table below should really be interpreted as "I'm not sure/haven't checked" (the respective arch maintainers will be able to verify and amend such information). Based on the following inline comment in __schedule(): /* * The membarrier system call requires each architecture * to have a full memory barrier after updating * rq->curr, before returning to user-space. * * Here are the schemes providing that barrier on the * various architectures: * - mm ? switch_mm() : mmdrop() for x86, s390, sparc, PowerPC, * RISC-V. switch_mm() relies on membarrier_arch_switch_mm() * on PowerPC and on RISC-V. * - finish_lock_switch() for weakly-ordered * architectures where spin_unlock is a full barrier, * - switch_to() for arm64 (weakly-ordered, spin_unlock * is a RELEASE barrier), */ .../sched/membarrier/arch-support.txt | 50 +++++++++++++++++++ MAINTAINERS | 1 + arch/alpha/Kconfig | 1 + arch/arc/Kconfig | 1 + arch/arm/Kconfig | 1 + arch/arm64/Kconfig | 1 + arch/hexagon/Kconfig | 1 + arch/mips/Kconfig | 1 + arch/powerpc/Kconfig | 1 + arch/riscv/Kconfig | 1 + arch/s390/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/x86/Kconfig | 1 + init/Kconfig | 3 ++ kernel/sched/core.c | 4 +- kernel/sched/membarrier.c | 15 +++++- 16 files changed, 80 insertions(+), 4 deletions(-) create mode 100644 Documentation/features/sched/membarrier/arch-support.txt diff --git a/Documentation/features/sched/membarrier/arch-support.txt b/Doc= umentation/features/sched/membarrier/arch-support.txt new file mode 100644 index 0000000000000..95e65195e47c2 --- /dev/null +++ b/Documentation/features/sched/membarrier/arch-support.txt @@ -0,0 +1,50 @@ +# +# Feature name: membarrier +# Kconfig: ARCH_HAS_MEMBARRIER +# description: arch supports MEMBARRIER_CMD_PRIVATE_EXPEDITED +# +# Architecture requirements +# +# The membarrier() system call requires each architecture to have a full m= emory +# barrier after updating rq->curr, before returning to user-space. +# +# Here are the schemes providing that barrier on the various architectures: +# +# * alpha/arc/arm/hexagon/mips +# +# We rely on the full barrier implied by spin_unlock() in finish_lock_swit= ch(). +# +# * arm64 +# +# We rely on the full barrier implied by switch_to(). +# +# * powerpc/riscv/s390/sparc/x86 +# +# We rely on the full barrier implied by switch_mm(), if mm isn't NULL; we= rely +# on the full barrier implied by mmdrop(), otherwise. +# + ----------------------- + | arch |status| + ----------------------- + | alpha: | ok | + | arc: | ok | + | arm: | ok | + | arm64: | ok | + | csky: | TODO | + | hexagon: | ok | + | loongarch: | TODO | + | m68k: | TODO | + | microblaze: | TODO | + | mips: | ok | + | nios2: | TODO | + | openrisc: | TODO | + | parisc: | TODO | + | powerpc: | ok | + | riscv: | ok | + | s390: | ok | + | sh: | TODO | + | sparc: | ok | + | um: | TODO | + | x86: | ok | + | xtensa: | TODO | + ----------------------- diff --git a/MAINTAINERS b/MAINTAINERS index f6f1fdc76cf46..c5a053605cbc4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13807,6 +13807,7 @@ M: Mathieu Desnoyers M: "Paul E. McKenney" L: linux-kernel@vger.kernel.org S: Supported +F: Documentation/features/sched/membarrier*/ F: arch/*/include/asm/membarrier.h F: arch/*/include/asm/sync_core.h F: include/uapi/linux/membarrier.h diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index d6968d090d49a..f98d6cba0bd9a 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -24,6 +24,7 @@ config ALPHA select GENERIC_IRQ_SHOW select ARCH_WANT_IPC_PARSE_VERSION select ARCH_HAVE_NMI_SAFE_CMPXCHG + select ARCH_HAS_MEMBARRIER select AUDIT_ARCH select GENERIC_CPU_VULNERABILITIES select GENERIC_SMP_IDLE_THREAD diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 3162db540ee96..1d8a6ba98ae33 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -9,6 +9,7 @@ config ARC select ARCH_HAS_CACHE_LINE_SIZE select ARCH_HAS_DEBUG_VM_PGTABLE select ARCH_HAS_DMA_PREP_COHERENT + select ARCH_HAS_MEMBARRIER select ARCH_HAS_PTE_SPECIAL select ARCH_HAS_SETUP_DMA_OPS select ARCH_HAS_SYNC_DMA_FOR_CPU diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f8567e95f98be..700d1d9ff2f8b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -14,6 +14,7 @@ config ARM select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_KEEPINITRD select ARCH_HAS_KCOV + select ARCH_HAS_MEMBARRIER select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE select ARCH_HAS_PTE_SPECIAL if ARM_LPAE diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 7b071a00425d2..d21788e6920f6 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -31,6 +31,7 @@ config ARM64 select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_KCOV select ARCH_HAS_KEEPINITRD + select ARCH_HAS_MEMBARRIER select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig index a880ee067d2ec..c2b2713c01bbd 100644 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig @@ -5,6 +5,7 @@ comment "Linux Kernel Configuration for Hexagon" config HEXAGON def_bool y select ARCH_32BIT_OFF_T + select ARCH_HAS_MEMBARRIER select ARCH_HAS_SYNC_DMA_FOR_DEVICE select ARCH_NO_PREEMPT select DMA_GLOBAL_POOL diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 797ae590ebdba..4b65e73e34c16 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -16,6 +16,7 @@ config MIPS select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAS_UBSAN_SANITIZE_ALL select ARCH_HAS_GCOV_PROFILE_ALL + select ARCH_HAS_MEMBARRIER select ARCH_KEEP_MEMBLOCK select ARCH_USE_BUILTIN_BSWAP select ARCH_USE_CMPXCHG_LOCKREF if 64BIT diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 6f105ee4f3cf5..c13980eac3585 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -137,6 +137,7 @@ config PPC select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_HUGEPD if HUGETLB_PAGE select ARCH_HAS_KCOV + select ARCH_HAS_MEMBARRIER select ARCH_HAS_MEMBARRIER_CALLBACKS select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_MEMREMAP_COMPAT_ALIGN if PPC_64S_HASH_MMU diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index db7b1acd943e4..fd4c6a74ebd61 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -27,6 +27,7 @@ config RISCV select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_KCOV + select ARCH_HAS_MEMBARRIER select ARCH_HAS_MEMBARRIER_CALLBACKS select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_MMIOWB diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 3bec98d20283b..2e044d424fd4a 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -72,6 +72,7 @@ config S390 select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_KCOV + select ARCH_HAS_MEMBARRIER select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_MEM_ENCRYPT select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 49849790e66dc..40eb179c2416a 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -30,6 +30,7 @@ config SPARC select RTC_SYSTOHC select HAVE_ARCH_JUMP_LABEL if SPARC64 select GENERIC_IRQ_SHOW + select ARCH_HAS_MEMBARRIER select ARCH_WANT_IPC_PARSE_VERSION select GENERIC_PCI_IOMAP select HAS_IOPORT diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3762f41bb0929..83f63e00312ee 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -82,6 +82,7 @@ config X86 select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_KCOV if X86_64 select ARCH_HAS_MEM_ENCRYPT + select ARCH_HAS_MEMBARRIER select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE diff --git a/init/Kconfig b/init/Kconfig index 87daf50838f02..8114404b52b91 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1742,6 +1742,9 @@ config KALLSYMS_BASE_RELATIVE =20 # syscall, maps, verifier =20 +config ARCH_HAS_MEMBARRIER + bool + config ARCH_HAS_MEMBARRIER_CALLBACKS bool =20 diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 711dc753f7216..dff1c6df337f9 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6673,8 +6673,8 @@ static void __sched notrace __schedule(unsigned int s= ched_mode) * - mm ? switch_mm() : mmdrop() for x86, s390, sparc, PowerPC, * RISC-V. switch_mm() relies on membarrier_arch_switch_mm() * on PowerPC and on RISC-V. - * - finish_lock_switch() for weakly-ordered - * architectures where spin_unlock is a full barrier, + * - finish_lock_switch() for alpha, arc, arm, hexagon, mips + * where spin_unlock is a full barrier, * - switch_to() for arm64 (weakly-ordered, spin_unlock * is a RELEASE barrier), */ diff --git a/kernel/sched/membarrier.c b/kernel/sched/membarrier.c index 58f801e013988..248a38c9b261c 100644 --- a/kernel/sched/membarrier.c +++ b/kernel/sched/membarrier.c @@ -137,6 +137,14 @@ * Bitmask made from a "or" of all commands within enum membarrier_cmd, * except MEMBARRIER_CMD_QUERY. */ +#ifdef CONFIG_ARCH_HAS_MEMBARRIER +#define MEMBARRIER_PRIVATE_EXPEDITED_BITMASK \ + (MEMBARRIER_CMD_PRIVATE_EXPEDITED \ + | MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED) +#else +#define MEMBARRIER_PRIVATE_EXPEDITED_BITMASK 0 +#endif + #ifdef CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE #define MEMBARRIER_PRIVATE_EXPEDITED_SYNC_CORE_BITMASK \ (MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE \ @@ -156,8 +164,7 @@ #define MEMBARRIER_CMD_BITMASK \ (MEMBARRIER_CMD_GLOBAL | MEMBARRIER_CMD_GLOBAL_EXPEDITED \ | MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED \ - | MEMBARRIER_CMD_PRIVATE_EXPEDITED \ - | MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED \ + | MEMBARRIER_PRIVATE_EXPEDITED_BITMASK \ | MEMBARRIER_PRIVATE_EXPEDITED_SYNC_CORE_BITMASK \ | MEMBARRIER_PRIVATE_EXPEDITED_RSEQ_BITMASK \ | MEMBARRIER_CMD_GET_REGISTRATIONS) @@ -329,6 +336,8 @@ static int membarrier_private_expedited(int flags, int = cpu_id) return -EPERM; ipi_func =3D ipi_rseq; } else { + if (!IS_ENABLED(CONFIG_ARCH_HAS_MEMBARRIER)) + return -EINVAL; WARN_ON_ONCE(flags); if (!(atomic_read(&mm->membarrier_state) & MEMBARRIER_STATE_PRIVATE_EXPEDITED_READY)) @@ -519,6 +528,8 @@ static int membarrier_register_private_expedited(int fl= ags) ready_state =3D MEMBARRIER_STATE_PRIVATE_EXPEDITED_RSEQ_READY; } else { + if (!IS_ENABLED(CONFIG_ARCH_HAS_MEMBARRIER)) + return -EINVAL; WARN_ON_ONCE(flags); } =20 --=20 2.34.1