From patchwork Mon Jan 8 06:21:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 185817 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp855350dyq; Sun, 7 Jan 2024 22:22:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IEqwkb0ka5U2G23RZrKgNaGms6rNYXZQG0jW9qxnAg1J4mYkEMQFXQMt2ZBl4vYReKGRYoM X-Received: by 2002:ae9:ee11:0:b0:77f:e0:35b8 with SMTP id i17-20020ae9ee11000000b0077f00e035b8mr3237434qkg.154.1704694951403; Sun, 07 Jan 2024 22:22:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704694951; cv=none; d=google.com; s=arc-20160816; b=zwSMrijr1F33n/E5PfQ/5XYx/ljcxtDwXklUawhL3d2F1rSEdiyWqfggadOru3WjOe R6wwUhNGz5//bcRFhD4xGpmMiYMCZNY+bdfiowe9s1VA90YF99WDUGRSSWU/6IWDgdXa +7T1xQvsHKonHDX3YzK4OjAIhdhTJKA2z+34af7Hxxbx6b8pxWZ8DlQvsTb6m+9bQLD0 VJSU9bakobQaOfvG0H2xEJFHYfhTFm3qFtgyRMFwBthdcBCEVgOzKPPk0g3+xZaS6Afv j++CqU5vGhch+PNbBYtjlQQW7HWjvDEG6FZCD0/IGz/9XMXYID8thNWmDJ0C4jYe9+00 Enfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=rTagxW2qGB+SOLygMjXPo1Qtb5o4FGjhXHBVBibN0pU=; fh=e1JlwtUWRFbXk6Wk02UhhK0dSnd5ZqIT5IDANNgKwN8=; b=GitvTqm4Q65mXVVici2m/sP5EBeGl9z3xIuf9dYjD6i6iIFIOLOyyBheDsayRbuH7E jZR5opylBsvK+LpylE2mLEkU7s2HQDDJIQgVsMot7Z+HHGdrbcfOwOaokjUv88x7BvXm nPKVJOKP6qhEjK7CVECOVX2LN4owCN4WuHmbmP9RPlw89/dIuvMXJ+L2WSWVtEmsGzUC coJcduZUqgyo5609r2R5q7hxYsanrqqwOtgraUqhsf49wPyGDSNq+iFq/KZchREIZxdR FgoyRk5gBnDg9Mj2SbT4DICUuWPfXFFvnshtg1CRMgJjnN7dZ4gKi8yFoc31C7VvcG+p qucQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Ut+10Ooe; spf=pass (google.com: domain of linux-kernel+bounces-19096-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-19096-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id f5-20020a05620a280500b00781e7f6913bsi7390795qkp.316.2024.01.07.22.22.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 22:22:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-19096-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Ut+10Ooe; spf=pass (google.com: domain of linux-kernel+bounces-19096-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-19096-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 355011C216A1 for ; Mon, 8 Jan 2024 06:22:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7EE59B654; Mon, 8 Jan 2024 06:21:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="Ut+10Ooe" X-Original-To: linux-kernel@vger.kernel.org Received: from mail-oo1-f49.google.com (mail-oo1-f49.google.com [209.85.161.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 43FB979CD for ; Mon, 8 Jan 2024 06:21:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-oo1-f49.google.com with SMTP id 006d021491bc7-59821e6fd38so230305eaf.1 for ; Sun, 07 Jan 2024 22:21:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1704694911; x=1705299711; 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=rTagxW2qGB+SOLygMjXPo1Qtb5o4FGjhXHBVBibN0pU=; b=Ut+10OoeHFHsNusCYQ2BgY6Ks4st7F8UFjbQkeKSwLA4ArRiA75ibBVOGuhtxlXTok hDZ0syA/MyuqtQt/6CWpaD37fu/AgN+dsrFXqsI6E7zTloePgDJF4H4jFvx0Vt4V6CaL rFvbbvUnFFxfb2qaSCRNOUeZVPu8tJk5LpbwdbA3+6BYPYCj3TdIItJ1I5ANVEa4Q95m w3Pqom3BMDwMrAXAoNgngBhC/HxysQRKD3Sk/IqGF8KXPJMhG3km8E36d488q3zAhNqC 7Plno6OiBajCMqMHxvmBID9FFDjlAKmivVw75gAi+8qVtA4oPlHah/TEIT4111kgyHuJ GQnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704694911; x=1705299711; 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=rTagxW2qGB+SOLygMjXPo1Qtb5o4FGjhXHBVBibN0pU=; b=mTpKHrc2PwLYNbLRb8XFzV/BAO3r3+SP4/i+stb2hJUGek5VOixzSkHJaIcCjWMeJO ddwST11g4q0SgDkRQnZkviix8UuvvHyot5p+5qpahVc0T0HZXKl0U/qRNHLKmzDXS/9D zuFpADQ0lEl7li47gpi0X7c1cKvNvsNz+6s4MG/r8AorFND2TwEQe3xNlGNPc9aKhDIT TJgHY0egkbKutZwc0TqFmjGgIk3DenivlHmp7/ZMfpNFgr0LxL0qaeJMdLFLmGafRypn AKIwkf+j8EUmB2HDf4rKvvOEBrLpUzB9uhVffdq9IwO5DbDjt2hyCdtr0TuZvponFi9q tpUA== X-Gm-Message-State: AOJu0YwUD+3LW41OqaRw+gS9ZrZmCDElWBN+xUiP6aNRhM5xeLfxNop0 cAyZ0M9ENgXDI5JRFo2cTrWYE9LCK2wR6kNwJ3yDqBYSPho= X-Received: by 2002:a05:6871:341e:b0:1fa:f86b:8624 with SMTP id nh30-20020a056871341e00b001faf86b8624mr904328oac.19.1704694911244; Sun, 07 Jan 2024 22:21:51 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id i12-20020a9d53cc000000b006dba99e1835sm1274322oth.4.2024.01.07.22.21.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 22:21:50 -0800 (PST) From: Charlie Jenkins Date: Sun, 07 Jan 2024 22:21:45 -0800 Subject: [PATCH v4 1/2] riscv: Include riscv_set_icache_flush_ctx prctl Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240107-fencei-v4-1-d4cf2fb905d3@rivosinc.com> References: <20240107-fencei-v4-0-d4cf2fb905d3@rivosinc.com> In-Reply-To: <20240107-fencei-v4-0-d4cf2fb905d3@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Jonathan Corbet , Conor Dooley , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Atish Patra 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=1704694908; l=7194; i=charlie@rivosinc.com; s=20231120; h=from:subject:message-id; bh=44jA1SP4uAeWO8J8wsxBQ+ZD40NMHu45EJStFpvhUWw=; b=D7UBMh9ebhLewE4U2l7cKbc38/hZBpH6xpofpr+GzFrjeRWkPTAn7+VNKdzVmd8uEW+nIITMh tylX6iA10nEDdAPm3eerU9jJAkXoOSV9+UJ82fUbrUu5dM88k8NUmdj X-Developer-Key: i=charlie@rivosinc.com; a=ed25519; pk=t4RSWpMV1q5lf/NWIeR9z58bcje60/dbtxxmoSfBEcs= X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787502213149068720 X-GMAIL-MSGID: 1787502213149068720 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 | 56 ++++++++++++++++++++++++++++++++++++++ arch/riscv/mm/context.c | 8 ++++-- include/uapi/linux/prctl.h | 4 +++ kernel/sys.c | 6 ++++ 6 files changed, 79 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..f483b6090c27 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,58 @@ void __init riscv_init_cbo_blocksizes(void) if (cboz_block_size) riscv_cboz_block_size = cboz_block_size; } + +/** + * riscv_set_icache_flush_ctx() - Enable/disable icache flushing instructions in userspace. + * @ctx: Set the type of icache flushing instructions permitted/prohibited. + * + * * %PR_RISCV_CTX_SW_FENCEI_ON: Allow fence.i in userspace. + * + * * %PR_RISCV_CTX_SW_FENCEI_OFF: Disallow fence.i in userspace. When + * ``per_thread == 0``, this will effect all threads in a process. Therefore, + * caution must be taken -- only use this flag when you can guarantee that no + * thread in the process will emit fence.i from this point onward. + * + * @per_thread: When set to 0, will perform operation on process migration. When + * set to 1, will perform operation on thread migration. + * + * When (per_thread == 0), all threads in the process are permitted to emit + * icache flushing instructions. Whenever any thread in the process is migrated, + * the corresponding hart's icache will be guaranteed to be consistent with + * instruction memory. Note this does not enforce any guarantees outside of + * migration. If a thread modifies an instruction that another thread may attempt + * to execute, the other thread must still emit an icache flushing instruction + * before attempting to execute the potentially modified instruction. This must + * be performed by the userspace program. + * + * In per-thread context (eg. per_thread == 1), only the thread calling this + * function is permitted to emit icache flushing instructions. When the thread + * is migrated, the corresponding hart's icache will be guaranteed to be + * consistent with instruction memory. + * + * On kernels configured without SMP, this function is a nop as migrations + * across harts will not occur. + */ +int riscv_set_icache_flush_ctx(unsigned long ctx, unsigned long per_thread) +{ +#ifdef CONFIG_SMP + switch (ctx) { + case PR_RISCV_CTX_SW_FENCEI_ON: + if (per_thread) + current->thread.force_icache_flush = true; + else + current->mm->context.force_icache_flush = true; + break; + case PR_RISCV_CTX_SW_FENCEI_OFF: + if (per_thread) + current->thread.force_icache_flush = false; + else + current->mm->context.force_icache_flush = false; + break; + + default: + break; + } +#endif + return 0; +} diff --git a/arch/riscv/mm/context.c b/arch/riscv/mm/context.c index 217fd4de6134..0146c61be0ab 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 || + (task && task->thread.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..ec731dda5b8e 100644 --- a/include/uapi/linux/prctl.h +++ b/include/uapi/linux/prctl.h @@ -306,4 +306,8 @@ 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_ON 0 +# define PR_RISCV_CTX_SW_FENCEI_OFF 1 + #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 Mon Jan 8 06:21:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 185818 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp855406dyq; Sun, 7 Jan 2024 22:22:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IG8Yp5cNYS+sAMnHC4aK86+FPgW/5uylJjasZJIoJ45OMEhnPhD0Zj9WIeGFtVWOHaYHQzQ X-Received: by 2002:a17:903:41d2:b0:1d0:6b95:9bfe with SMTP id u18-20020a17090341d200b001d06b959bfemr1159668ple.1.1704694963986; Sun, 07 Jan 2024 22:22:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704694963; cv=none; d=google.com; s=arc-20160816; b=s/lqJm96+NOP7LUJqiAflqzYsSy+T8KgTbz884qkBgzfIcjzx5JRG0n3aHNPe2Xot2 ljyKexMvosbH6lyS9twBEu0dpuhyBPc3H8v6TeatgAAHF6eg4IA1qRgXzcoVIR0o6gts sU0AC/kZxOXnk8fhJU/EsYOG0gdUCXiwufsHpaEXVUViLJhCiXEGWB8wWQk0RR1ZSRd9 riKe8A7jp4W+NsmYY9ZlPy1hRw3wE4eoHBn3IDmhQtowpBFBY+2MzuUHZh6zqSMtWNo2 8sofykPAKz6LWW9TFRCqV4ztUzfXhwslDgHkfo8WAdt1qsMEL5TUrs0UbdIuacF+WHeM oHlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=7zIxoN+SgU88Z6qGdoK7DlJzsgAjm+cXBEiUMLpGQcU=; fh=e1JlwtUWRFbXk6Wk02UhhK0dSnd5ZqIT5IDANNgKwN8=; b=gGARUgvpYOViE/TfPhOMmQvOXWmRe9QI4JNOyJfYi/y//IS5deepq0+guxjIizDT2w NTnvUhj/2SaYJphMUs0YstqGSC2s5wSmpKyUsGSolvvor1ItH3WPoy26nJBkc2BsbqG9 nblbc1C77MtAMU+ukPg/W4skhndH9G3qoIo/M7iia7BuS0K67YTg97qIrKcvvNOsKP1L M5YWrgN+retjd5SYmx1MGHF9oW7yp69tGG0KONPdpImjR2CshnTEX2aONHaQNYS3NBHN rUsE6ScrAr9h9C0tUyAR7zH9ye1cz92cACoVd1FaMMHcwuBVCl8ILKWZ/R/A/mbvpH/5 UU1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=K2fhodUs; spf=pass (google.com: domain of linux-kernel+bounces-19098-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-19098-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id p2-20020a170902eac200b001d3fe0117dcsi5603233pld.54.2024.01.07.22.22.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 22:22:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-19098-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=K2fhodUs; spf=pass (google.com: domain of linux-kernel+bounces-19098-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-19098-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id BD7CA281C54 for ; Mon, 8 Jan 2024 06:22:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A232BBA57; Mon, 8 Jan 2024 06:21:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="K2fhodUs" X-Original-To: linux-kernel@vger.kernel.org Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 77E498473 for ; Mon, 8 Jan 2024 06:21:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-ot1-f52.google.com with SMTP id 46e09a7af769-6dc53fc4b0dso1155105a34.2 for ; Sun, 07 Jan 2024 22:21:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1704694912; x=1705299712; 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=7zIxoN+SgU88Z6qGdoK7DlJzsgAjm+cXBEiUMLpGQcU=; b=K2fhodUssilWIgz7HUJpifg0MUGRWZ3zKMQSdErBcmytWZOJ9OmYGmYINohiwcZCfe pTlAJMrOkXw9NcRYApsVYX0GgVps7kUI43ot5hxEC3Xwy9kLYG5iCY900phT84I3HPoD he66wcPQi+n1KQp+Ux52FqpumdrMwfm3hHF9LvqNKm1ZiSDnLOnOZDnbkqdfg9EPev3B b89h7T64yXaaUdQguJ3ICVdrt67d9oKubOauLZG7I4l5PlhsHvH8eGYn+I8ClxQiM705 SYzt7coeMQJ4d46tyBQEJHmRlRHP163TpxDI1nDYMyAjmQ+P+SaNLbbk0Zfn0EzgCSRI ueQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704694912; x=1705299712; 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=7zIxoN+SgU88Z6qGdoK7DlJzsgAjm+cXBEiUMLpGQcU=; b=um80RZjmkv4CySQulS/8axGV5GUiLcZ2K5qZeqD4Zn6l8dR/zMT/nZ4qbFGb+ddSYc LRywnrHyr6tnjugW0q53M3IXScwLb6EobP4BkDH1X6rZgRL5/oKEpnPZ2gY4MIc3Cyd4 kQCwkC98dXmJBvvLeu+QidlO+K9GXYbZY+unSSzgRze7zF9lQzxq1sSIYvDWI1tJ9lZw gI1V+xg5Z9Q8HAkHA6999Znj59JBCbI6ORR5MJexszOCrZpWIvROhRbkXx9J1SmpQku4 xoiKJlL0fn/yB+nlQV2mCG0hLnMbCs4a0wlH5ft6RzyeIzOEwlGrcCPvQmJw0rW2Rhm+ a/Fg== X-Gm-Message-State: AOJu0Yzg6l2cXferjrRzTdKuwqP9peCx75BoUD1xB+bcFq7GcCh7EQ94 8a0z0+aG3jodSsqfQYa/ThZjcPY3qTGkCA== X-Received: by 2002:a9d:7a85:0:b0:6db:95ba:c422 with SMTP id l5-20020a9d7a85000000b006db95bac422mr2004194otn.41.1704694912539; Sun, 07 Jan 2024 22:21:52 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id i12-20020a9d53cc000000b006dba99e1835sm1274322oth.4.2024.01.07.22.21.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 22:21:52 -0800 (PST) From: Charlie Jenkins Date: Sun, 07 Jan 2024 22:21:46 -0800 Subject: [PATCH v4 2/2] documentation: Document PR_RISCV_SET_ICACHE_FLUSH_CTX prctl Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240107-fencei-v4-2-d4cf2fb905d3@rivosinc.com> References: <20240107-fencei-v4-0-d4cf2fb905d3@rivosinc.com> In-Reply-To: <20240107-fencei-v4-0-d4cf2fb905d3@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Jonathan Corbet , Conor Dooley , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Atish Patra 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=1704694908; l=3764; i=charlie@rivosinc.com; s=20231120; h=from:subject:message-id; bh=somI31K4e1DNhLYi544ikiKSJVE5TPTc178CdwxSACE=; b=wOjyNp3Bafs5E4EAXPZDcY5CMZv7eGYP53YeKRTCExbTq0Ej9zlAWZ2834TSECygPHMj+NHYv 9lX1K2SdI/4Dy5Tn8rFusqYzrPJcIbPyqyeQcXJdQVXSC5NuhF6Mkt6 X-Developer-Key: i=charlie@rivosinc.com; a=ed25519; pk=t4RSWpMV1q5lf/NWIeR9z58bcje60/dbtxxmoSfBEcs= X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787502226539024021 X-GMAIL-MSGID: 1787502226539024021 Provide documentation that explains how to properly do CMODX in riscv. Signed-off-by: Charlie Jenkins --- Documentation/arch/riscv/cmodx.rst | 88 ++++++++++++++++++++++++++++++++++++++ Documentation/arch/riscv/index.rst | 1 + 2 files changed, 89 insertions(+) diff --git a/Documentation/arch/riscv/cmodx.rst b/Documentation/arch/riscv/cmodx.rst new file mode 100644 index 000000000000..71598850e131 --- /dev/null +++ b/Documentation/arch/riscv/cmodx.rst @@ -0,0 +1,88 @@ +.. 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 synchronization 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() and emit fence.i in +userspace. The syscall performs a one-off icache flushing operation. The prctl +changes the Linux ABI to allow userspace to emit icache flushing operations. + +1. prctl() Interface +--------------------- + +Call prctl() with ``PR_RISCV_SET_ICACHE_FLUSH_CTX`` as the first argument. The +remaining arguments will be delegated to the riscv_set_icache_flush_ctx +function detailed below. + +.. kernel-doc:: arch/riscv/mm/cacheflush.c + :identifiers: riscv_set_icache_flush_ctx + +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_ON, 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