From patchwork Fri Dec 1 07:21:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 172298 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp938165vqy; Thu, 30 Nov 2023 23:21:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IG4ZQeYQxy9MYmswNmQ66tUFQFQY3seHEjlBFxrtgkcCTX0UEiAWjNM6JjBOHaoO4T0DTbc X-Received: by 2002:a05:6a00:1ca3:b0:692:b6e8:ce88 with SMTP id y35-20020a056a001ca300b00692b6e8ce88mr25735908pfw.17.1701415316042; Thu, 30 Nov 2023 23:21:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701415316; cv=none; d=google.com; s=arc-20160816; b=gprTAuVt4laSnlE0Rql2bG3EVdQCdMdh3GAWFlPCs7zvhl3UR2ntGOd/FNyyM7P/E1 DnKK5rlHcSz12g5676wsBl1cvisWXeL8uYA49Sl8G7Kqw4mSDu7lWeLRdGffg3It8TFJ m4ShDJNO2GT+xCL57WueH5lKF3lsHN/6UvkP8SlozjvtAo/QYyB1uTKrGoNXse53uP1Z 8zL9gep9gWtN+zhlyaIlYjTxj8Ja6BPdD3yHFwimHSAjygOU8qToFB4JMs9MRFhFJ4xh NnQ7NOpxjxAthGP38JYULCcOlllmdWFcSdgKWT+9431ZYZsWPdrACxpu8FVJl0P6soMw 6iJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=01vsWcEoRsZ8jN9se+rvMnn0SZYxGQ5PaoOtj11FSJg=; fh=eRK/vgshHLrkAEF1956meC+IMygpVH0xWMj1ryZyvTw=; b=dYQGNi+Lg6ct39uA/HnLkJdyRhamdZHba4QSXp78dv5KCbo4+JJpnWWT1HJWHIBKZa Cx9gN5XYNj6vZ860U3BMBDohe9vCMysfcPtaoF1+EfIZkMi0zGcb0UKxdGZtVZomQHqn MXih5hopJGKMNuk2V8R07+CP7HO1UiEiWnQpM5ZZIfRoacjfjGyKD7oS7LUDcR1+XA7L DcAuSfvuDU8ua/6WqBcvPKwjVj5+FLBOJ9B8Q2qwcYt2Rd4OLgZZeMRrGbErhe+bCO1H VxG2EYWH4cARYmfbnDIlNJL1mKVgodcTULPKOcncvwNfHii55hhYfIjJOLFXqIQ5UZhE uxSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=LVw27cEu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id y18-20020a056a00191200b006cd904d87ddsi2913208pfi.44.2023.11.30.23.21.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 23:21:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=LVw27cEu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 2EACC80873DF; Thu, 30 Nov 2023 23:21:51 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377728AbjLAHVj (ORCPT + 99 others); Fri, 1 Dec 2023 02:21:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232366AbjLAHVh (ORCPT ); Fri, 1 Dec 2023 02:21:37 -0500 Received: from mail-oa1-x36.google.com (mail-oa1-x36.google.com [IPv6:2001:4860:4864:20::36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 638CE170D for ; Thu, 30 Nov 2023 23:21:43 -0800 (PST) Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-1fa37df6da8so102346fac.2 for ; Thu, 30 Nov 2023 23:21:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1701415302; x=1702020102; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=01vsWcEoRsZ8jN9se+rvMnn0SZYxGQ5PaoOtj11FSJg=; b=LVw27cEuBwUJxJngrncVU6on/z83ZKtzM8UUrou51ywMBzt1gA4Qt1HhWnIeXyCQSr j+NGACCxkyb29DfeLn64v2rsPMtIrYatD4Jy1HQJyDrbF6OkZHJjDjHYicrZCSD64EaT 0byZu5+KqMCS28q+djzRZKXydmVs62+U1tT7xNkNxOsp1ua+7RX3hLcqkyNwnmjljt7K RoyttV3Ybgh3ZGSIzJZQVM9oSWhCv6xTzSljUceZz18o7slE4drx/ieYecpp4GwtWOiZ j5Phf9iX0XHs1eABjgrnL5h74tlNWsi90rB5vGtqqb7VhSrmmOyTIs3rDVy+BKylIFi/ NiaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701415302; x=1702020102; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=01vsWcEoRsZ8jN9se+rvMnn0SZYxGQ5PaoOtj11FSJg=; b=Ag4zAI4qVernXwLZmraLta/bUO9z6+IdfLW0IyrDnRYUlpnHurCzED78j2EVJ9mGmv WrJAtzCIMDv+qp5AtWm1xhwSEkLfO/XAvZUJxxXGgQRUaZyFA6i/0Gn3imIFiHQpHeY0 3qwFv8B3C73xO4vX518k8xopTB5tH7tb2y26oaExGuPy1tRFlfXfEnkdwnFETkV3hkKQ Oc0v3J2PP5Q0Z0VzZtdu0pjUZo3+k7nPpu5ryoVG0l2P75ovSEx/jv3HqrVVMYbtYL3/ kJLkCe2WazXUeR3b0bxOgaN2l4sHoI2jAO3yZCCzcL1eE8HKs70nYIPTuJ61Epgb2TfM N3jg== X-Gm-Message-State: AOJu0YzP7zzUOwpxDQU/yGmOHSI/d1hI22Y/KXNXeVbstnl4vg8Vnyhb x5tNsHQf9Jw03kl/NXmNcXDm5w== X-Received: by 2002:a05:6870:9f08:b0:1fa:1738:85dd with SMTP id xl8-20020a0568709f0800b001fa173885ddmr25882226oab.57.1701415302677; Thu, 30 Nov 2023 23:21:42 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id v23-20020a0568301bd700b006d7f8da1b57sm412662ota.62.2023.11.30.23.21.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 23:21:42 -0800 (PST) From: Charlie Jenkins Date: Thu, 30 Nov 2023 23:21:35 -0800 Subject: [PATCH v2 1/2] riscv: Include riscv_set_icache_flush_ctx prctl MIME-Version: 1.0 Message-Id: <20231130-fencei-v2-1-2cb623ab1b1f@rivosinc.com> References: <20231130-fencei-v2-0-2cb623ab1b1f@rivosinc.com> In-Reply-To: <20231130-fencei-v2-0-2cb623ab1b1f@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Jonathan Corbet , Conor Dooley Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Charlie Jenkins X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1701415300; l=6120; i=charlie@rivosinc.com; s=20231120; h=from:subject:message-id; bh=29lD1s3MiibMkD22p96wvCky0NuEdcDTMl8SkeAuDnk=; b=4T9JKi8+qGT7WUOONWkYSL4OzrVZoOIhdWH1IQ3P02CHNb0LQmt2gEDZonkOIYom89ag3dtkd y1gOCeN6FDyDbPCi2zVzdPSpLCzzxLnTfxNPZczdYRZ1r3/eEyQJBnV X-Developer-Key: i=charlie@rivosinc.com; a=ed25519; pk=t4RSWpMV1q5lf/NWIeR9z58bcje60/dbtxxmoSfBEcs= X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 30 Nov 2023 23:21:51 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784063266578190382 X-GMAIL-MSGID: 1784063266578190382 Support new prctl with key PR_RISCV_SET_ICACHE_FLUSH_CTX to enable optimization of cross modifying code. This prctl enables userspace code to use icache flushing instructions such as fence.i with the guarantee that the icache will continue to be clean after thread migration. Signed-off-by: Charlie Jenkins --- arch/riscv/include/asm/mmu.h | 2 ++ arch/riscv/include/asm/processor.h | 6 ++++++ arch/riscv/mm/cacheflush.c | 37 +++++++++++++++++++++++++++++++++++++ arch/riscv/mm/context.c | 8 +++++--- include/uapi/linux/prctl.h | 3 +++ kernel/sys.c | 6 ++++++ 6 files changed, 59 insertions(+), 3 deletions(-) diff --git a/arch/riscv/include/asm/mmu.h b/arch/riscv/include/asm/mmu.h index 355504b37f8e..60be458e94da 100644 --- a/arch/riscv/include/asm/mmu.h +++ b/arch/riscv/include/asm/mmu.h @@ -19,6 +19,8 @@ typedef struct { #ifdef CONFIG_SMP /* A local icache flush is needed before user execution can resume. */ cpumask_t icache_stale_mask; + /* Force local icache flush on all migrations. */ + bool force_icache_flush; #endif #ifdef CONFIG_BINFMT_ELF_FDPIC unsigned long exec_fdpic_loadmap; diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h index f19f861cda54..7eda6c75e0f2 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -84,6 +84,9 @@ struct thread_struct { unsigned long vstate_ctrl; struct __riscv_v_ext_state vstate; unsigned long align_ctl; +#ifdef CONFIG_SMP + bool force_icache_flush; +#endif }; /* Whitelist the fstate from the task_struct for hardened usercopy */ @@ -145,6 +148,9 @@ extern int set_unalign_ctl(struct task_struct *tsk, unsigned int val); #define GET_UNALIGN_CTL(tsk, addr) get_unalign_ctl((tsk), (addr)) #define SET_UNALIGN_CTL(tsk, val) set_unalign_ctl((tsk), (val)) +#define RISCV_SET_ICACHE_FLUSH_CTX(arg1, arg2) riscv_set_icache_flush_ctx(arg1, arg2) +extern int riscv_set_icache_flush_ctx(unsigned long ctx, unsigned long per_thread); + #endif /* __ASSEMBLY__ */ #endif /* _ASM_RISCV_PROCESSOR_H */ diff --git a/arch/riscv/mm/cacheflush.c b/arch/riscv/mm/cacheflush.c index 55a34f2020a8..3b2bf8256a10 100644 --- a/arch/riscv/mm/cacheflush.c +++ b/arch/riscv/mm/cacheflush.c @@ -5,6 +5,7 @@ #include #include +#include #include #include @@ -152,3 +153,39 @@ void __init riscv_init_cbo_blocksizes(void) if (cboz_block_size) riscv_cboz_block_size = cboz_block_size; } + +/** + * riscv_set_icache_flush_ctx() - Enable userspace to emit icache flushing instructions. + * @ctx: Sets the type of context + * - PR_RISCV_CTX_SW_FENCEI: Allow fence.i in userspace. Another fence.i will + * emitted on thread/process migration. + * @per_thread: When set to 0, will use the default behavior of setting the + * icache flush context per process. When set to 1, will use a per thread + * context. + * + * When in per-process context, there may be multiple threads using the same mm. + * Therefore, the icache can never be assumed clean when. Multiple threads in + * the process may modify instructions in the mm concurrently. + * + * In per-thread context, it can be assumed that all modifications to + * instructions in memory will be performed by this thread. When the thread is + * migrated the icache will be flushed. + * + */ +int riscv_set_icache_flush_ctx(unsigned long ctx, unsigned long per_thread) +{ +#ifdef CONFIG_SMP + switch (ctx) { + case PR_RISCV_CTX_SW_FENCEI: + if (per_thread) + current->thread.force_icache_flush = true; + else + current->mm->context.force_icache_flush = true; + break; + + default: + break; + } +#endif + return 0; +} diff --git a/arch/riscv/mm/context.c b/arch/riscv/mm/context.c index 217fd4de6134..a394b146e78a 100644 --- a/arch/riscv/mm/context.c +++ b/arch/riscv/mm/context.c @@ -297,12 +297,14 @@ static inline void set_mm(struct mm_struct *prev, * * The "cpu" argument must be the current local CPU number. */ -static inline void flush_icache_deferred(struct mm_struct *mm, unsigned int cpu) +static inline void flush_icache_deferred(struct mm_struct *mm, unsigned int cpu, + struct task_struct *task) { #ifdef CONFIG_SMP cpumask_t *mask = &mm->context.icache_stale_mask; - if (cpumask_test_cpu(cpu, mask)) { + if (cpumask_test_cpu(cpu, mask) || mm->context.force_icache_flush || + mm->context.force_icache_flush) { cpumask_clear_cpu(cpu, mask); /* * Ensure the remote hart's writes are visible to this hart. @@ -332,5 +334,5 @@ void switch_mm(struct mm_struct *prev, struct mm_struct *next, set_mm(prev, next, cpu); - flush_icache_deferred(next, cpu); + flush_icache_deferred(next, cpu, task); } diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h index 370ed14b1ae0..472801ea78cc 100644 --- a/include/uapi/linux/prctl.h +++ b/include/uapi/linux/prctl.h @@ -306,4 +306,7 @@ struct prctl_mm_map { # define PR_RISCV_V_VSTATE_CTRL_NEXT_MASK 0xc # define PR_RISCV_V_VSTATE_CTRL_MASK 0x1f +#define PR_RISCV_SET_ICACHE_FLUSH_CTX 71 +# define PR_RISCV_CTX_SW_FENCEI 0 + #endif /* _LINUX_PRCTL_H */ diff --git a/kernel/sys.c b/kernel/sys.c index 420d9cb9cc8e..e806a8a67c36 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -146,6 +146,9 @@ #ifndef RISCV_V_GET_CONTROL # define RISCV_V_GET_CONTROL() (-EINVAL) #endif +#ifndef RISCV_SET_ICACHE_FLUSH_CTX +# define RISCV_SET_ICACHE_FLUSH_CTX(a, b) (-EINVAL) +#endif /* * this is where the system-wide overflow UID and GID are defined, for @@ -2739,6 +2742,9 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, case PR_RISCV_V_GET_CONTROL: error = RISCV_V_GET_CONTROL(); break; + case PR_RISCV_SET_ICACHE_FLUSH_CTX: + error = RISCV_SET_ICACHE_FLUSH_CTX(arg2, arg3); + break; default: error = -EINVAL; break;