From patchwork Thu Jan 25 04:23:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 191832 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1414770dyi; Wed, 24 Jan 2024 20:24:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IFTQGG44ZY/7Dzs3eJBK5Aybd9ts+LPTLDk/JBDE8+DwjwDSV06PWikc1aRAyjp0flH+KDg X-Received: by 2002:a05:620a:1215:b0:783:b9c6:58a7 with SMTP id u21-20020a05620a121500b00783b9c658a7mr587788qkj.96.1706156647941; Wed, 24 Jan 2024 20:24:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706156647; cv=pass; d=google.com; s=arc-20160816; b=f7n1bm1td4aI1psLjES4jkxsNSMED3p8yVAUOBA+CRm2ZaPmyajsFyabMFaHA0Fgx7 3Oy+cYoNG+zyx0oCAkWLDbEnmehPWDt7/NTSKO4hsTWt4vIpj0j2ROemBkPphBV2I1vT QTu2k0Eys91l7M2dYK8OnXiLQ+mFYIiQufE9FlexevXy1DE225lcGbX79cS1qsuJ2FfD jZZJzpaX9nRJ92N/nJJS5yMZhqU+3jB+OyYtvvuCoBbXzTbg1tmB6uIvbJ1sF546Actz TG/R4gwqzFSFo6ltE312FW2EXJ7mz0pzNOPag2DyBXlWuOsmTHxkn8dfJcG1UpL/YMA/ ag9g== ARC-Message-Signature: i=2; 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=vLIM72Z2vNh3qI4rsxyZGnimCgUZb6UoqNYsK+L6u4g=; fh=/XXWyXb92ihsaKNKqSDb4nUFODn0XZjcGSlWepA+YcI=; b=GagALpDd5q8EDw8KUjpYnrTv2EEARIdGRtrx7OP161zgAEreOhY/TF8aEmz1K9UDRr jsrC2jeWaSY3cpoSIvl9HFGVCUkBeRxihH7lF1nfBErDfTYbqY9ozX217edPdK6EHT9H Axo2B6Z3LMyDx3Vony6wVgb/dS4TJATTQPFBJguckrrjRdJrZR0WJ5IMLyfFNvtRdxu1 Q7wgjbAynVn9Kc5rl5e5DVrMgJwFfuK48m510PgcrDTdKa4wiRxO7QwLo4GKg+sSoLcm C0IydfR4yEjp7nXuOKGNIa4NxCpPqr9+s7E2t+dQ3kpHd/BypokUFqqWV9LYYUdTAPLY rPWg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=upgKgTEl; arc=pass (i=1 spf=pass spfdomain=rivosinc.com dkim=pass dkdomain=rivosinc-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-37942-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37942-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 s7-20020a05620a254700b007835ba9b6d7si13171599qko.545.2024.01.24.20.24.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 20:24:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-37942-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=upgKgTEl; arc=pass (i=1 spf=pass spfdomain=rivosinc.com dkim=pass dkdomain=rivosinc-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-37942-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37942-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 A90E21C224AE for ; Thu, 25 Jan 2024 04:24:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 12FA5111B2; Thu, 25 Jan 2024 04:23:19 +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="upgKgTEl" Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) (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 5B1DC101E2 for ; Thu, 25 Jan 2024 04:23:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706156594; cv=none; b=KnHwUUpeisnKV+E0BHwl7qdrSyjvzC+Gh+s5cZq9D4zcTCKKkO+kFGdy61k/TkLRIKdPLSvd9NcxgYDnRkcDPk+bj2lvwF2JKP/W4jB7C7hkeMjrJPExXF2YwSKKM3jYxO2DkN7vKOSEaNNpD5TgjAWApBIPldxVSCpAodj+7FE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706156594; c=relaxed/simple; bh=Wrbc2b6m69dlcwU7PwTcVPKZs3y4yvoSAGZnA9SbZ+w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LhPWC2lHlIjVa3YkQOL+/If0nyWlCVrXiTGHrzFKAwp6imsMlGn3TuPRn12iVbX46UqjhEfoh7sxD67Yau1nztxAjT9QL3wvfPKB3nmBRev86eGqdLCLo56hs/XeQTpru/rCEAHs5sNht8dWmQ78eEd1VzOcLwfX01Pxp8rczJk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=upgKgTEl; arc=none smtp.client-ip=209.85.210.46 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-f46.google.com with SMTP id 46e09a7af769-6e0a64d94d1so3740498a34.3 for ; Wed, 24 Jan 2024 20:23:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1706156591; x=1706761391; 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=vLIM72Z2vNh3qI4rsxyZGnimCgUZb6UoqNYsK+L6u4g=; b=upgKgTElGMUBjpLfQ9dPyt4Yt4BPjAFJj0CWZHjFvBUpiKwq0oFsj0H5Os2PExDqtb 1ebklZ07dmH+xGuh9eVQ5/8Jbc9bs0iW/T6GqaqtFg8HCjhjfPzBK5ZEN2/niv0Hvz+a Oz9tujiUw8AxxRzgNjSli6LdRM0Eyl/ARGpEC5Iu2Dl14IIbm3DAlM8SRlJZty0hxkz7 Xfl0+z3LRbsLXg30siiL/4c5tzwssmyJG8BONlJy99lT9uFnLZ3fBMEKg14/5xp6wjAy 0GGbbKcVpgEPSysHUsvdBOG/GUvQ1agd8EWbUSJAufV1E3de8x5EGIbyESJIBFPaKCtn 7FVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706156591; x=1706761391; 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=vLIM72Z2vNh3qI4rsxyZGnimCgUZb6UoqNYsK+L6u4g=; b=b0BQNSp4Z4rIY3MLZqJ3Hu8IKF7CVYiXF3oYuwq0M7RNHAA71OpTbh+w8oWuwGtLVV K4l9J8fazY6KskLEPAFEFN1Gi5k6PFFGcmFUtuvaU/7eE3zuvIUfaS/4kEya743mohNI W2Pc64NgWYSH9rICWHvUJboaWGRHLfu04sA3mNy8Xvv0/8IGLHPUZf4pWRpjlhXt2NQy VXT3l8DRMgtbJbzcU7MedzpYFhgDWcGJ+uby36hKDln5l0smWiqNUXqjND41jXcw5QjG ik4WZiu4X2tfTx5FEalTP48VX5GkM/pB8/n3J0riZFBMC6AAzZBGEeisgJLxBP80fzq2 d1fQ== X-Gm-Message-State: AOJu0Yxc6vcoZsoKhE+Lsq4J/8J7aacATgOHnokjUDvknSQu+o8DfS66 rEJXCX3UB6fnYfmjVfCw0CsvlRCXI/va3H/puL/rk/j9AJE2LNBN52wI12j8kUg= X-Received: by 2002:a9d:67c5:0:b0:6e1:37b:5678 with SMTP id c5-20020a9d67c5000000b006e1037b5678mr263383otn.34.1706156591404; Wed, 24 Jan 2024 20:23:11 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id ko9-20020a056a00460900b006dab36287bfsm14549743pfb.207.2024.01.24.20.23.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 20:23:10 -0800 (PST) From: Charlie Jenkins Date: Wed, 24 Jan 2024 20:23:08 -0800 Subject: [PATCH v10 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: <20240124-fencei-v10-1-a25971f4301d@rivosinc.com> References: <20240124-fencei-v10-0-a25971f4301d@rivosinc.com> In-Reply-To: <20240124-fencei-v10-0-a25971f4301d@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Jonathan Corbet , Conor Dooley , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Atish Patra , Randy Dunlap , Alexandre Ghiti Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Charlie Jenkins , Atish Patra X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1706156588; l=9638; i=charlie@rivosinc.com; s=20231120; h=from:subject:message-id; bh=Wrbc2b6m69dlcwU7PwTcVPKZs3y4yvoSAGZnA9SbZ+w=; b=kyLw1DLApnIyBKT1LLGYGvjkOP+WNF2nzFLQiYvHqu4U+6xzKO/fSWEAG+F8eZ4l6jsGDUtH7 E86CXf4VcL2CkLkW3ngNOLpdl7nTEid24bCcbzWRI9juEJBJZJEPUnB X-Developer-Key: i=charlie@rivosinc.com; a=ed25519; pk=t4RSWpMV1q5lf/NWIeR9z58bcje60/dbtxxmoSfBEcs= X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789034912820062741 X-GMAIL-MSGID: 1789034912820062741 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 Reviewed-by: Atish Patra Reviewed-by: Alexandre Ghiti --- arch/riscv/include/asm/mmu.h | 2 ++ arch/riscv/include/asm/processor.h | 7 ++++ arch/riscv/include/asm/switch_to.h | 13 ++++++++ arch/riscv/mm/cacheflush.c | 67 ++++++++++++++++++++++++++++++++++++++ arch/riscv/mm/context.c | 13 ++++++-- include/uapi/linux/prctl.h | 6 ++++ kernel/sys.c | 6 ++++ 7 files changed, 111 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 a8509cc31ab2..816cdc2395f4 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -123,6 +123,10 @@ struct thread_struct { struct __riscv_v_ext_state vstate; unsigned long align_ctl; struct __riscv_v_ext_state kernel_vstate; +#ifdef CONFIG_SMP + bool force_icache_flush; + unsigned int prev_cpu; +#endif }; /* Whitelist the fstate from the task_struct for hardened usercopy */ @@ -184,6 +188,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/include/asm/switch_to.h b/arch/riscv/include/asm/switch_to.h index 7efdb0584d47..ac99ab64499c 100644 --- a/arch/riscv/include/asm/switch_to.h +++ b/arch/riscv/include/asm/switch_to.h @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -72,14 +73,26 @@ static __always_inline bool has_fpu(void) { return false; } extern struct task_struct *__switch_to(struct task_struct *, struct task_struct *); +static inline bool switch_to_should_flush_icache(struct task_struct *task) +{ + bool stale_mm = task->mm && (task->mm->context.force_icache_flush); + bool stale_thread = task->thread.force_icache_flush; + bool thread_migrated = smp_processor_id() != task->thread.prev_cpu; + + return thread_migrated && (stale_mm || stale_thread); +} + #define switch_to(prev, next, last) \ do { \ struct task_struct *__prev = (prev); \ struct task_struct *__next = (next); \ + __next->thread.prev_cpu = smp_processor_id(); \ if (has_fpu()) \ __switch_to_fpu(__prev, __next); \ if (has_vector()) \ __switch_to_vector(__prev, __next); \ + if (switch_to_should_flush_icache(__next)) \ + local_flush_icache_all(); \ ((last) = __switch_to(__prev, __next)); \ } while (0) diff --git a/arch/riscv/mm/cacheflush.c b/arch/riscv/mm/cacheflush.c index 55a34f2020a8..2d5e1575f6c1 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,69 @@ 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 in + * userspace. Supported values described below. + * + * Supported values for ctx: + * + * * %PR_RISCV_CTX_SW_FENCEI_ON: Allow fence.i in userspace. + * + * * %PR_RISCV_CTX_SW_FENCEI_OFF: Disallow fence.i in userspace. All threads in + * a process will be affected when ``scope == PR_RISCV_SCOPE_PER_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. + * + * @scope: Set scope of where icache flushing instructions are allowed to be + * emitted. Supported values described below. + * + * Supported values for scope: + * + * * %PR_RISCV_SCOPE_PER_PROCESS: Ensure the icache of any thread in this process + * is coherent with instruction storage upon + * migration. + * + * * %PR_RISCV_SCOPE_PER_THREAD: Ensure the icache of the current thread is + * coherent with instruction storage upon + * migration. + * + * When ``scope == PR_RISCV_SCOPE_PER_PROCESS``, 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 storage. 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. ``scope == PR_RISCV_SCOPE_PER_THREAD``), 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 storage. + * + * 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 scope) +{ +#ifdef CONFIG_SMP + switch (ctx) { + case PR_RISCV_CTX_SW_FENCEI_ON: + switch (scope) { + case PR_RISCV_SCOPE_PER_PROCESS: + current->mm->context.force_icache_flush = true; + break; + case PR_RISCV_SCOPE_PER_THREAD: + current->thread.force_icache_flush = true; + break; + default: + return -EINVAL; + } + } +#endif + return 0; +} diff --git a/arch/riscv/mm/context.c b/arch/riscv/mm/context.c index 217fd4de6134..5cabbc449080 100644 --- a/arch/riscv/mm/context.c +++ b/arch/riscv/mm/context.c @@ -15,6 +15,7 @@ #include #include #include +#include #ifdef CONFIG_MMU @@ -297,7 +298,8 @@ 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; @@ -309,7 +311,12 @@ static inline void flush_icache_deferred(struct mm_struct *mm, unsigned int cpu) * This pairs with a barrier in flush_icache_mm. */ smp_mb(); - local_flush_icache_all(); + + /* + * If cache will be flushed in switch_to, no need to flush here. + */ + if (!(task && switch_to_should_flush_icache(task))) + local_flush_icache_all(); } #endif @@ -332,5 +339,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..524d546d697b 100644 --- a/include/uapi/linux/prctl.h +++ b/include/uapi/linux/prctl.h @@ -306,4 +306,10 @@ 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 +# define PR_RISCV_SCOPE_PER_PROCESS 0 +# define PR_RISCV_SCOPE_PER_THREAD 1 + #endif /* _LINUX_PRCTL_H */ diff --git a/kernel/sys.c b/kernel/sys.c index e219fcfa112d..69afdd8b430f 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 @@ -2743,6 +2746,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 Thu Jan 25 04:23:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 191831 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1414732dyi; Wed, 24 Jan 2024 20:24:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IEH7zlTc8Fp48869fN5lOOKzhdNZdpIyYeCSj9/xRGp8xwg6n/aMVwA/WYXbnS+U9W9CaBD X-Received: by 2002:a17:902:8f97:b0:1d7:6faa:c1fa with SMTP id z23-20020a1709028f9700b001d76faac1famr334649plo.75.1706156642605; Wed, 24 Jan 2024 20:24:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706156642; cv=pass; d=google.com; s=arc-20160816; b=I+dkCesUqGslO8BVX7TbSczzM4SyaZgrXCxhY+F6aYctEXQR1siS4Q1RyFSf4QWMk0 +mo4wtKYVg3HNLVyJiqJM3xCJ+CO6Z2xVGdU0XlPnCDe2/PS/T9MtNrBRExPyLkKXkds /9H5bdIzn9Uwh3G1zGr0v8omsa4OGQ/XQVy9qSs1hq7dq2/f9zS5PRx1ugdtlY1+bluc Kx5z+M0T/GgrZ24uPzrEoJcZyd+Yvsdbtt7HMQSv0k2dchoRf+ggshCmJVDjaUmyjJZ0 CZYXZq3B4KElIqlq7TRu5Lko7uGGGE+ZD4C1Fl8a93OnVr3V+8cwE97/GNhIIhHzaXGr e1Ag== ARC-Message-Signature: i=2; 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=CK8ubEYcDvykwCMVvaVm7hDmlbmdtschWrNEGYNue+E=; fh=/XXWyXb92ihsaKNKqSDb4nUFODn0XZjcGSlWepA+YcI=; b=lxpIS8/wHwdzi+TDT4zsLMo+EKIgF9pPStkQRxgMLdY5kQ2HVkRKZssPMCVuUwTSNM Tru2gd39A7kl9X55qalMbYwV7wEEKyBTn0+Nz9FZrF+14wjPxyDtpaMWnyK1t8sBtVLg 73vqo37fe0BJS9XN30ZvKqvtzSAbwU5dzMz2of8PBjY8syFAqlhFK3jAkRkservg/K5O VtQhlFyTRKRCyKMs5D/cLWCm+HHkFA+Wk4gcbLJWhgr+TjN3wILx9bPUp8Dx/3F8DOD6 hOIlZyvSIpi1EhL7+BJ+C0bPhV7aWNpktKhc1TvqKkAt7uRIyXgVSp3DSrfiUZwCIcZW /1sQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=h7GPAiHu; arc=pass (i=1 spf=pass spfdomain=rivosinc.com dkim=pass dkdomain=rivosinc-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-37943-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37943-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id f6-20020a170902ab8600b001d7690fa954si4608021plr.223.2024.01.24.20.24.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 20:24:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-37943-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=h7GPAiHu; arc=pass (i=1 spf=pass spfdomain=rivosinc.com dkim=pass dkdomain=rivosinc-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-37943-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37943-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 58324287B8E for ; Thu, 25 Jan 2024 04:24:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5F48A111A9; Thu, 25 Jan 2024 04:23:18 +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="h7GPAiHu" Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 683E9107B6 for ; Thu, 25 Jan 2024 04:23:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706156594; cv=none; b=SLXKSme0Jr+Wf2+z2DGrj313dfbKjfDFI2A1gPyRXcezOtaO66rN2DswP8pB7PXqRf5R5Bkm8eLKeWZIwOW3qD0EgkpQIEPUiCU4HDrLmvptMVDWVD1+4BR4++RbmX0vxqPBhsBhj/wggJ6WnIIKrkVcr/CTP2+8S2pCjb7B1CQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706156594; c=relaxed/simple; bh=/bIGEHzKWZAAbhSw9Bpm0/wGOXPFjFzSm8DGgPpgj+8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=j96p1WGBQwEP13w87CeUJY7dr0PozhujHBdQC2FXWIPmSnDkDu6xQrf+UWn5F7sRkpZ1DtT3A45tsBUiaTo2MOwUL/rf154BMmrfRuxPXhCdg29x5VmwZSVRhm3h6TDBs547Mfljru6Mcvnw/MPkdvGCos345V+R4Ak83mGtLTw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=h7GPAiHu; arc=none smtp.client-ip=209.85.210.178 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-pf1-f178.google.com with SMTP id d2e1a72fcca58-6ddcfbc5a5fso124523b3a.2 for ; Wed, 24 Jan 2024 20:23:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1706156593; x=1706761393; 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=CK8ubEYcDvykwCMVvaVm7hDmlbmdtschWrNEGYNue+E=; b=h7GPAiHuaTpHONndoIkZGUtPofIEjE9y7c1BGnNpYC+idAKCriUL1fk+LqcMmgL5L4 3D6wp57EZ1LJbBO6JWHE5TnXTyfvW4ASGK/0aAdP2PISkwzX8kG67ZwMy1I2avjOyHCi wKnC/okAn+VDgqHcbntEUsON34ugcTYs2whV/IT9Ra5Ejd+n7n/mhIhog7DrXkRWcu3Z u7kUWe/a+Zc+y4HAWc2JE+ihuMgOpnNY1nZsskWrJWjvQ8e+w/B34g1mBBdGRXKt6nlR zwlIB4JAso/sCHXocOIx5SyE20twFmQ9bK3Wge0tDVU0aeWidE6u2IK/IB2rcp2qBO1+ tvuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706156593; x=1706761393; 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=CK8ubEYcDvykwCMVvaVm7hDmlbmdtschWrNEGYNue+E=; b=k6L2a8gauTlZkzhO5MdH5bhRRpo+t70OLfZbEOspc1xFCE7FXxDyhSfBDL5XGLFPq5 A0yrJAB0+inPVM+Wk1yEtAxpjfC/T6osVZsF8eMo4lWKB/ulE+a5/BJQ4Vio/ouXfEaL sMw4X/Z8GFp9c8h7jn20jF+LZW1npWLZx5wAU03fI/T7M6KZW09A9OTYYS88lAirakJ9 NDX5dQO9J6309MsFmo1PXsQYJb5m7BBUV736Lpae3Qsq7H+I2SXoD6cEpZPkRBpQEdrk WqztX4okTgm5Fv/R/gXKKaRyKFz4W7pk1CqpN+8TRrVrooxL5BopY2IXRGdM1c7iSDAs AQjg== X-Gm-Message-State: AOJu0Ywt/xeDz+9bJKP6Apwa58e6yyVOGK/kfRZeEeKTFObj/Sh5z+ZA sr6vr+e9bPmHA+4I7PHko7gmtbswSRjrfjHACUbW9NjZVHBBTI04mFV5YvFpktgLZq17dnIR5XT k X-Received: by 2002:a62:5e46:0:b0:6d9:ac49:4e36 with SMTP id s67-20020a625e46000000b006d9ac494e36mr240715pfb.68.1706156592719; Wed, 24 Jan 2024 20:23:12 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id ko9-20020a056a00460900b006dab36287bfsm14549743pfb.207.2024.01.24.20.23.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 20:23:12 -0800 (PST) From: Charlie Jenkins Date: Wed, 24 Jan 2024 20:23:09 -0800 Subject: [PATCH v10 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: <20240124-fencei-v10-2-a25971f4301d@rivosinc.com> References: <20240124-fencei-v10-0-a25971f4301d@rivosinc.com> In-Reply-To: <20240124-fencei-v10-0-a25971f4301d@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Jonathan Corbet , Conor Dooley , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Atish Patra , Randy Dunlap , Alexandre Ghiti Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Charlie Jenkins , Atish Patra X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1706156588; l=4389; i=charlie@rivosinc.com; s=20231120; h=from:subject:message-id; bh=/bIGEHzKWZAAbhSw9Bpm0/wGOXPFjFzSm8DGgPpgj+8=; b=8nd39leSJgLs2+elKTrJ95kIaaY5aY3jfw+V51ahKwhAF0kjRhP+syJrfXGka8Ue4mqYnRD8T /tR3VNLNInECWRfmUrpbWrqv21ojl5MkNzkfjR0C0nh/CuHH4cG3+3t X-Developer-Key: i=charlie@rivosinc.com; a=ed25519; pk=t4RSWpMV1q5lf/NWIeR9z58bcje60/dbtxxmoSfBEcs= X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789034907521744675 X-GMAIL-MSGID: 1789034907521744675 Provide documentation that explains how to properly do CMODX in riscv. Signed-off-by: Charlie Jenkins Reviewed-by: Atish Patra Reviewed-by: Alexandre Ghiti --- Documentation/arch/riscv/cmodx.rst | 96 ++++++++++++++++++++++++++++++++++++++ Documentation/arch/riscv/index.rst | 1 + 2 files changed, 97 insertions(+) diff --git a/Documentation/arch/riscv/cmodx.rst b/Documentation/arch/riscv/cmodx.rst new file mode 100644 index 000000000000..24aafa23a72b --- /dev/null +++ b/Documentation/arch/riscv/cmodx.rst @@ -0,0 +1,96 @@ +.. 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) are 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 on the new hart 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. + +As an aside, "deferred" icache flushes can sometimes be triggered in the kernel. +At the time of writing, this only occurs during the riscv_flush_icache() syscall +and when the kernel uses copy_to_user_page(). These deferred flushes happen only +when the memory map being used by a hart changes. If the prctl() context caused +an icache flush, this deferred icache flush will be skipped as it is redundant. +Therefore, there will be no additional flush when using the riscv_flush_icache() +syscall inside of the prctl() context. + +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, PR_RISCV_SCOPE_PER_PROCESS); + 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