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; From patchwork Fri Dec 1 07:21:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 172299 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp938278vqy; Thu, 30 Nov 2023 23:22:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IH65zVLr1Lkr6KCLlh3fpzGB7FMG1cqaVPyBFw0oBmkYKcKXHhss0Axmgy6eAEOBM06D8iQ X-Received: by 2002:a17:903:40ce:b0:1d0:4cb8:4510 with SMTP id t14-20020a17090340ce00b001d04cb84510mr2294690pld.50.1701415332507; Thu, 30 Nov 2023 23:22:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701415332; cv=none; d=google.com; s=arc-20160816; b=K4lL9QMUKiNlYfXyxv+unu/qPXsfk6lo7s0veYk6Uqom0ztIATMbPYbvNP/GQCkDxo 9cGKP/5OVhb2difcyrJXWF/Uzabm2H9IIiHqhRJASAEg89nroDwqD0b8p3nDNoruJgQF byhB5qI8m/1vVWmsB3LWiYCurECCly64A4DN3SQyqhmpu1AkmI4euHGus6cIoz070dm4 NGqr/zUuh5YBocyQdKMyw2bx4lnevVk2JOVE1LQoMg08RKXoNjnhAdOshQ1xCetIlefc 2t+nu5d45RLDhMaDlCTpIna1AMIZuH9ctaBGx2l+mxiOOZiDbqT7aJqLxtPDqo3GkSpv XUHw== 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=lx4pJqeLQkX2l7a2Uj8+Wz4Hfj2Aqr7p88PvDjFel2Y=; fh=eRK/vgshHLrkAEF1956meC+IMygpVH0xWMj1ryZyvTw=; b=JYxSXyuhcyrZ19vRbb6Jzb52sNkpmjCFcI1QVbXdHxmSSjlwcETJXVT+xfJV3ImAoK h+u/7jkDvIhYTPLchLW9XnslLdOc373ffF5z8DinYH+pO4nPmO79npwIobckP7diQ3+i UIq3WiihR/9wlNwXo3bBfZciqWxkOz/4BB+PeHtXHC/fA29efoVRocgGQwppJUJYf75H C6AFD9Ihz+PuJ681iyT8wt05vvqSosgG3deqJchCVVeYWZ8Gu1iz6DsUXwSsl942fYby Ox/4n7unXN2917nijkh8LK4G+T2tRrN2zH7Jhr8vPI/Vhe6+9NgaBO/M1HvdQ7s6AyuR 9jLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=mWuGAM1v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id iw3-20020a170903044300b001d058b0b7f6si364498plb.480.2023.11.30.23.22.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 23:22:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=mWuGAM1v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id 7525380DF9B2; Thu, 30 Nov 2023 23:22:09 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377743AbjLAHVm (ORCPT + 99 others); Fri, 1 Dec 2023 02:21:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377723AbjLAHVi (ORCPT ); Fri, 1 Dec 2023 02:21:38 -0500 Received: from mail-ot1-x332.google.com (mail-ot1-x332.google.com [IPv6:2607:f8b0:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91A94171B for ; Thu, 30 Nov 2023 23:21:44 -0800 (PST) Received: by mail-ot1-x332.google.com with SMTP id 46e09a7af769-6d7e56f6845so137963a34.0 for ; Thu, 30 Nov 2023 23:21:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1701415304; x=1702020104; 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=lx4pJqeLQkX2l7a2Uj8+Wz4Hfj2Aqr7p88PvDjFel2Y=; b=mWuGAM1vd2+xRH1c4JT24WoZleNOtHMdZrZMmF+mYnte5zuiYj0rIza5sRPTmbRVso 67XXLhjHSj/Iw2KnPO9Eff/RP8pzft/57GaZ1ZWdIPE/mB6UfLhUQGF+6INqmWrS2aBQ tGnPJOWdgCcntyJ85DKgOXtqr24KHKu5m1D36t5loNprLLYfNR9S57Lx8tQTMZWfJJxd YLkkQyHZ59jmcCqPplqwOYAYBDYD4onUgD9/Ls/e842s9aXm6AO1p5o07nlaMVFrfFcK f0eDc++ungNNmnL1DBsGBzb4XctP542AmyHxDpqhbm+GLCie9Gbt9tR9kcfT0YQvpry6 7aoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701415304; x=1702020104; 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=lx4pJqeLQkX2l7a2Uj8+Wz4Hfj2Aqr7p88PvDjFel2Y=; b=bap31DkKSS75JbBBkaWarwsShI0XqOMZ//yvKOQX5z9GMBv5hyBUjkwAXxKlsg4Z8B iLLclSqVfvbPrwKY25pd3Xi5Hq32EWwpmiAkm6OIqhU5Cog2LFnK33kLX/0dr/APjBw7 THaLXoPuZXY4mVT/Mg3pV8WB13h7XMs2yKJOlUMb45QXY9A0nTFtg1z7DOcFlESSWiCz xMdarSgdLQJlRGpr2cBxe/eoakhaoAzvE39gk5ExzS/LpoBiYCFNs/+IV9wq3TJP4I3i c3ZpzLldGd7HGmAcatBlT+iO8LpEtoZYnpbljQa1annDNf/DzGfefA4dRIITclpXeieL +Hbw== X-Gm-Message-State: AOJu0YxSyZaWh4bAkohZft8/2bwHmy84Fk5zAUf3cVOA+hTSa+RLME3F ENpQeJYGEM9r/aDRBqxvXdcuqw== X-Received: by 2002:a05:6830:150c:b0:6d6:4c92:1ad with SMTP id k12-20020a056830150c00b006d64c9201admr1969626otp.32.1701415303914; Thu, 30 Nov 2023 23:21:43 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 23:21:43 -0800 (PST) From: Charlie Jenkins Date: Thu, 30 Nov 2023 23:21:36 -0800 Subject: [PATCH v2 2/2] documentation: Document PR_RISCV_SET_ICACHE_FLUSH_CTX prctl MIME-Version: 1.0 Message-Id: <20231130-fencei-v2-2-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=4185; i=charlie@rivosinc.com; s=20231120; h=from:subject:message-id; bh=hE84m76gkQJA/iXGNtGqIi6V8ZB1KoiveuBHwIO+MBE=; b=90cANh8VzeUQk9JDEqGGsPwauGfJ6Mm0G/dna22vaYJocuBEYP+Hg5WpcF+z54R62WrCk1Mfs SpgzhUMflqNB+n5Nj8uLozaWjA+tq/gtSV/pMwLAtm8+uDSZ7w4nVJA 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 groat.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 (groat.vger.email [0.0.0.0]); Thu, 30 Nov 2023 23:22:09 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784063283813491440 X-GMAIL-MSGID: 1784063283813491440 Provide documentation that explains how to properly do CMODX in riscv. Signed-off-by: Charlie Jenkins --- Documentation/arch/riscv/cmodx.rst | 98 ++++++++++++++++++++++++++++++++++++++ Documentation/arch/riscv/index.rst | 1 + 2 files changed, 99 insertions(+) diff --git a/Documentation/arch/riscv/cmodx.rst b/Documentation/arch/riscv/cmodx.rst new file mode 100644 index 000000000000..20f327d85116 --- /dev/null +++ b/Documentation/arch/riscv/cmodx.rst @@ -0,0 +1,98 @@ +.. SPDX-License-Identifier: GPL-2.0 + +============================================================================== +Concurrent Modification and Execution of Instructions (CMODX) for RISC-V Linux +============================================================================== + +CMODX is a programming technique where a program executes instructions that were +modified by the program itself. Instruction storage and the instruction cache +(icache) is not guaranteed to be synchronized on RISC-V hardware. Therefore, the +program must enforce its own synchonization with the unprivileged fence.i +instruction. + +However, the default Linux ABI prohibits the use of fence.i in userspace +applications. At any point the scheduler may migrate a task onto a new hart. If +migration occurs after the userspace synchronized the icache and instruction +storage with fence.i, the icache will no longer be clean. This is due to the +behavior of fence.i only affecting the hart that it is called on. Thus, the hart +that the task has been migrated to, may not have synchronized instruction +storage and icache. + +There are two ways to solve this problem: use the riscv_flush_icache() syscall, +or use the ``PR_RISCV_SET_ICACHE_FLUSH_CTX`` prctl(). The syscall should be used +when the application very rarely needs to flush the icache. If the icache will +need to be flushed many times in the lifetime of the application, the prctl +should be used. + +The prctl informs the kernel that it must emit synchronizing instructions upon +task migration. The program itself must emit synchonizing instructions when +necessary as well. + +1. prctl() Interface +--------------------- + +Before the program emits their first icache flushing instruction, the program +must call this prctl(). + +* prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX, unsigned long ctx, unsigned long per_thread) + + Sets the icache flushing context. If per_thread is 0, context will be + applied per process, otherwise if per_thread is 1 context will be + per-thread. Any other number will have undefined behavior. + + * :c:macro:`PR_RISCV_CTX_SW_FENCEI`: Allow fence.i to be called in + userspace. + +Example usage: + +The following files are meant to be compiled and linked with each other. The +modify_instruction() function replaces an add with 0 with an add with one, +causing the instruction sequence in get_value() to change from returning a zero +to returning a one. + +cmodx.c:: + + #include + #include + + extern int get_value(); + extern void modify_instruction(); + + int main() + { + int value = get_value(); + printf("Value before cmodx: %d\n", value); + + // Call prctl before first fence.i is called inside modify_instruction + prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX, PR_RISCV_CTX_SW_FENCEI, 0); + modify_instruction(); + + value = get_value(); + printf("Value after cmodx: %d\n", value); + return 0; + } + +cmodx.S:: + + .option norvc + + .text + .global modify_instruction + modify_instruction: + lw a0, new_insn + lui a5,%hi(old_insn) + sw a0,%lo(old_insn)(a5) + fence.i + ret + + .section modifiable, "awx" + .global get_value + get_value: + li a0, 0 + old_insn: + addi a0, a0, 0 + ret + + .data + new_insn: + addi a0, a0, 1 diff --git a/Documentation/arch/riscv/index.rst b/Documentation/arch/riscv/index.rst index 4dab0cb4b900..eecf347ce849 100644 --- a/Documentation/arch/riscv/index.rst +++ b/Documentation/arch/riscv/index.rst @@ -13,6 +13,7 @@ RISC-V architecture patch-acceptance uabi vector + cmodx features