From nobody Mon Sep 16 18:57:31 2024 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 0D29B481AB for ; Tue, 12 Mar 2024 23:53:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710287626; cv=none; b=AOqve+bwVOSojQBBYgXwvXPl4KR2ZlodyiJcup958eDvNTtrSAjOM/epIM2noCi05xrHbfaW3fSlsqThTxoRIsCoZO0B02CK1p2MaK9CLdBuD+uILIp8B3zS3TAvs30/39qPUXQoxCaIQkux0Of+CaDkTL6aCdBjWtR5IqP/+Bw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710287626; c=relaxed/simple; bh=kzrpE3Jf/ixYwB6jIjCMuZiuZ4uucOwZGOq0f8reVWQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Zqom0VgqhFGVIS5a9pJL7535PRwjytAWwZ20/aOZrX5ZU+BhYEALEgrAXjuYYgGYnTexc6Ox8e15jD96KRX1RaB6rIoXH1gFBtZDNuu3haOus+/8hUcecY88s5F4jQMwevlIB/we4BK7/AktjGV29PyzfqIvGkeQ/qZVvyQS7xA= 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=1woHkUG0; arc=none smtp.client-ip=209.85.214.173 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 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="1woHkUG0" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1dd878da011so21002005ad.2 for ; Tue, 12 Mar 2024 16:53:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1710287624; x=1710892424; 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=TXYFACIdPWJdwy+Yl+k20SzAykOCyOjeDPUfEzEnCdk=; b=1woHkUG05Nkc8dc4j9FeFIJHST02NbSttNuLuttqP4qO3X/NJLSTJtovGkpj3Pjzn+ O4AHzrLLCsz+fyllf9iM+YRY/Up9hg635QnH37t6Yg5yPZPCRYEl5oJfiBCvs2p5I212 Lwc8Dx/cIpd6/i0o3VXVPe3kbVhFSg+kfoUFzWPN45xYGI1wQY7Z8cqtFmamECDAW2jO BBoMYlmX/er4vze+/p2K3lriFQrpPHxQ/037BXCx28aqrEP9FwFxRXV35OIIoBKFcC0M hlYIu7oY3hm6iwgxUkvOCotKvLyuoQIZK5nWjLsHLzmOLIXfq1XQs/3j5M/cYNA2OviO 7skA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710287624; x=1710892424; 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=TXYFACIdPWJdwy+Yl+k20SzAykOCyOjeDPUfEzEnCdk=; b=SKZO6+qc2zhK8QIkZ+4NFz7MRXQBaAY3DYji5jELsLFVQnPAlGgQ12an274SYUu26b V02WAPOZVkGp3qNcbz/jf5IkgbIA/dkNTfnaK1bF2AFa4p43onurQAmZ+H6zHccBWwAA Bc+bzJRde/yVHnRIiOE7+V3I/IAcLTO9MBiiwOeRhWtgeDH/r3IDk7KbratsmRWb+bNa tzUA5z/d6NWwOx58UmaD9tYS/353g6ZH9Bj2ZnetaIcPf2gUXBuZsjkdeMKLkEEm3GHq PZ0Z7Hh0oZVhmZV5bxHjjtVHEl3j7/zXQgQWumY7wJ/fdBwB98cqNIi9zCFQeVuWnKRT 2XwA== X-Forwarded-Encrypted: i=1; AJvYcCWQ1Y2s8hnoof+pu0WxSB6dnTTpaMIe3h3v6MRcFmxjrQ999Qm/dyn9SfhbmC13SkGDTAQWKjdyiRQnEts80bs84+UTRnFsA2rLJ116 X-Gm-Message-State: AOJu0YwZPisMqY6c97OXHbsSdnnT9wGv0PmhzRjgZ7GFaIkKOXwwVcOf 2UurMsidYWXAwByyBLcZaXGhvmtqD+LD+DCNHUs+uGoG889wH74OHHf7AQkPHhE8aoLbIswD8X6 q X-Google-Smtp-Source: AGHT+IH0SfMIDZtbDgW+D7kbou1UQHEhchAClAhNSOZvw6/dDwtvlbI2nHGNgmwsKXGf11eS2MPl9w== X-Received: by 2002:a17:902:cec2:b0:1dd:6174:c646 with SMTP id d2-20020a170902cec200b001dd6174c646mr3163048plg.8.1710287624279; Tue, 12 Mar 2024 16:53:44 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id h9-20020a170902f7c900b001dcad9cbf8bsm7282844plw.239.2024.03.12.16.53.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 16:53:43 -0700 (PDT) From: Charlie Jenkins Date: Tue, 12 Mar 2024 16:53:40 -0700 Subject: [PATCH v13 1/4] riscv: Remove unnecessary irqflags processor.h include Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240312-fencei-v13-1-4b6bdc2bbf32@rivosinc.com> References: <20240312-fencei-v13-0-4b6bdc2bbf32@rivosinc.com> In-Reply-To: <20240312-fencei-v13-0-4b6bdc2bbf32@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Jonathan Corbet , Conor Dooley , =?utf-8?q?Cl=C3=A9ment_L=C3=A9ger?= , Atish Patra , Randy Dunlap , Alexandre Ghiti , Samuel Holland 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=1710287621; l=659; i=charlie@rivosinc.com; s=20231120; h=from:subject:message-id; bh=kzrpE3Jf/ixYwB6jIjCMuZiuZ4uucOwZGOq0f8reVWQ=; b=JdUmv9KuobgRo10PoWynjhbDzqMEbIcDakiliqU/bWiH/yeoVaClcS5c6gI0xUpubRXXVWRFH vfEzAOtdC8OBOMPEPNikt9gJbUM6yqYKdtTdzPyRLqTmxVZE5W122JX X-Developer-Key: i=charlie@rivosinc.com; a=ed25519; pk=t4RSWpMV1q5lf/NWIeR9z58bcje60/dbtxxmoSfBEcs= This include is not used and can lead to circular dependencies. Signed-off-by: Charlie Jenkins Reviewed-by: Samuel Holland --- arch/riscv/include/asm/irqflags.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/riscv/include/asm/irqflags.h b/arch/riscv/include/asm/irq= flags.h index 08d4d6a5b7e9..6fd8cbfcfcc7 100644 --- a/arch/riscv/include/asm/irqflags.h +++ b/arch/riscv/include/asm/irqflags.h @@ -7,7 +7,6 @@ #ifndef _ASM_RISCV_IRQFLAGS_H #define _ASM_RISCV_IRQFLAGS_H =20 -#include #include =20 /* read interrupt enabled status */ --=20 2.43.2 From nobody Mon Sep 16 18:57:31 2024 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 20C31482F4 for ; Tue, 12 Mar 2024 23:53:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710287628; cv=none; b=syFMZsuAz2W409ArKVHZMw2HuJUGwRxwAUn8SNyP32Ym1usUHLP94aR5NWsIjRtIs05+E+TDBD2CGHwtQWWJGtf/57zDbVJkqrDyK8yTG4jWjDy0lEb0FDivYaJQ+6hguHBRwYitAjrDP8P7l9Uf/M+o3aumbyep2Egc7zlCUFE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710287628; c=relaxed/simple; bh=bPMWuHBVidRCQkFVpmuHBX4Sc3WAPY7g8gK9PzERpuY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VCb/pMqEm0t7+1jkR5u4IOYsshXONbRvvgTLJ9Qyd1NMsaQqhTvWXNEjVrjJYizDYnNcqK2Nl6OGKkOU8eVsqjG+qArRJUEsCUBMHfUQh0lc6JtLleb3byOnZ/FU9uaftmZjRcCpv50Ba0LySeHOz21MmywxqK/0BR0dDHCTUyk= 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=S0vjrBBJ; arc=none smtp.client-ip=209.85.214.171 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 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="S0vjrBBJ" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1dd8d586126so3984765ad.0 for ; Tue, 12 Mar 2024 16:53:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1710287625; x=1710892425; 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=JDs5jJiwefD5cp1JHl1YzkvSBJNf6t62DgRH44oyTg4=; b=S0vjrBBJn+d9kbupFoVyqeGffZlHkMbg9sTwUwJaDd+XiJWXtrx1M8iyztffbBTxcp zogv0/HETZB9+ecV1QrQIglISU2fasKny9eqQ6ohxJb20RQxNm2zWhb4XtR7UnFi01fc DI+qtiuQlDA/KyKLbECXOmcx6sYDYbOobWDSiTBQ3851AroLSfR2RI67caXltFj4vlTm 6erT4fvF9t3kbiPI/Vl6bYqgcUQmAPUAAzYkse1NYOFkSMKbI5+s3SS5qBT+BnwCqdUi GbAtE/TO2xa/bXXBCZkkBkkh7wJGlE9hhSxE1GWjacyrZyZJxL8kH8XcGffXq41tMezW +Ufg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710287625; x=1710892425; 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=JDs5jJiwefD5cp1JHl1YzkvSBJNf6t62DgRH44oyTg4=; b=PtmXULubpEOxW4xib77Cw0XZWFObtlke8/MolKoBL3shCS3xjS2sXB9L6La3j/K8O4 wTiuU2qBnEUWKmNFDOXWrE1AVtrSUbW5kPrSfqlt+Upsu2SZHirtXNeR2QfNw4sIPwaD UbODPIGbigf0T9czzih6KBgCjXtNOLfrm9mPhtmrWY1WrIli+XzkQZDCQKyMUFRN4Kl+ RCtXb/q5uI4lpvm6hp+qCwjF02kERg+DU/2ud555mdU0j6E8tljPLA04q/NIy0im/ow2 puDV5Ksk89VXZDvrgE5df7ofTzFezJOtFkLN+niIYklWa9h0gRR8dXF3uBmgDTwz4A+Q zVag== X-Forwarded-Encrypted: i=1; AJvYcCXNe8d/vuxa9Bj6V2Bh9rTu5nhLe0GsiTBuPkPA/05l9rl5i8aRSSVF+OIrZpGBmR5vd/VjdNJa2N2FgWHJOtfgsYnb5TPrS3+j+K2p X-Gm-Message-State: AOJu0YxCmKb4Docbe2ZsZg3zOIvRbyM0lZCwo7HqrXbrPgdmgHD7ufkv ZaEqDg5MXmOc2001pWCm4qSyOYhouNP6tUJloPb6vZnD7fYU4iOPRYQr8ITlfoU= X-Google-Smtp-Source: AGHT+IEZxFddJ5NHERzedf2RtnqyZKDQTP5bX3sBa03SK/f20P2yWSUg0iH/VPgRC5fq5b8mtnn17w== X-Received: by 2002:a17:902:ecd2:b0:1d8:f129:a0bc with SMTP id a18-20020a170902ecd200b001d8f129a0bcmr6362778plh.13.1710287625625; Tue, 12 Mar 2024 16:53:45 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id h9-20020a170902f7c900b001dcad9cbf8bsm7282844plw.239.2024.03.12.16.53.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 16:53:44 -0700 (PDT) From: Charlie Jenkins Date: Tue, 12 Mar 2024 16:53:41 -0700 Subject: [PATCH v13 2/4] 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240312-fencei-v13-2-4b6bdc2bbf32@rivosinc.com> References: <20240312-fencei-v13-0-4b6bdc2bbf32@rivosinc.com> In-Reply-To: <20240312-fencei-v13-0-4b6bdc2bbf32@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Jonathan Corbet , Conor Dooley , =?utf-8?q?Cl=C3=A9ment_L=C3=A9ger?= , Atish Patra , Randy Dunlap , Alexandre Ghiti , Samuel Holland Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Charlie Jenkins , Atish Patra , Alexandre Ghiti X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1710287621; l=11349; i=charlie@rivosinc.com; s=20231120; h=from:subject:message-id; bh=bPMWuHBVidRCQkFVpmuHBX4Sc3WAPY7g8gK9PzERpuY=; b=N5FgfruthBOoAEkL/FveG1Y29jZQlU3mPda/HRFAR0/9ZRArrkwUOn0HWq+WOHjFEEA+zoWuE eenyY1M0tn1BdFThfgnRLJeblj51R1T5WXu+CFTZ7JWJjzbpbGhbYyN X-Developer-Key: i=charlie@rivosinc.com; a=ed25519; pk=t4RSWpMV1q5lf/NWIeR9z58bcje60/dbtxxmoSfBEcs= 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 Reviewed-by: Samuel Holland --- arch/riscv/include/asm/mmu.h | 2 + arch/riscv/include/asm/processor.h | 10 ++++ arch/riscv/include/asm/switch_to.h | 23 ++++++++ arch/riscv/mm/cacheflush.c | 111 +++++++++++++++++++++++++++++++++= ++++ arch/riscv/mm/context.c | 19 ++++--- include/uapi/linux/prctl.h | 6 ++ kernel/sys.c | 6 ++ 7 files changed, 169 insertions(+), 8 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/pr= ocessor.h index a8509cc31ab2..cca62013c3c0 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -69,6 +69,7 @@ #endif =20 #ifndef __ASSEMBLY__ +#include =20 struct task_struct; struct pt_regs; @@ -123,6 +124,12 @@ struct thread_struct { struct __riscv_v_ext_state vstate; unsigned long align_ctl; struct __riscv_v_ext_state kernel_vstate; +#ifdef CONFIG_SMP + /* Flush the icache on migration */ + bool force_icache_flush; + /* A forced icache flush is not needed if migrating to the previous cpu. = */ + unsigned int prev_cpu; +#endif }; =20 /* Whitelist the fstate from the task_struct for hardened usercopy */ @@ -184,6 +191,9 @@ extern int set_unalign_ctl(struct task_struct *tsk, uns= igned int val); #define GET_UNALIGN_CTL(tsk, addr) get_unalign_ctl((tsk), (addr)) #define SET_UNALIGN_CTL(tsk, val) set_unalign_ctl((tsk), (val)) =20 +#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__ */ =20 #endif /* _ASM_RISCV_PROCESSOR_H */ diff --git a/arch/riscv/include/asm/switch_to.h b/arch/riscv/include/asm/sw= itch_to.h index 7efdb0584d47..7594df37cc9f 100644 --- a/arch/riscv/include/asm/switch_to.h +++ b/arch/riscv/include/asm/switch_to.h @@ -8,6 +8,7 @@ =20 #include #include +#include #include #include #include @@ -72,14 +73,36 @@ static __always_inline bool has_fpu(void) { return fals= e; } extern struct task_struct *__switch_to(struct task_struct *, struct task_struct *); =20 +static inline bool switch_to_should_flush_icache(struct task_struct *task) +{ +#ifdef CONFIG_SMP + bool stale_mm =3D task->mm && task->mm->context.force_icache_flush; + bool stale_thread =3D task->thread.force_icache_flush; + bool thread_migrated =3D smp_processor_id() !=3D task->thread.prev_cpu; + + return thread_migrated && (stale_mm || stale_thread); +#else + return false; +#endif +} + +#ifdef CONFIG_SMP +#define __set_prev_cpu(thread) ((thread).prev_cpu =3D smp_processor_id()) +#else +#define __set_prev_cpu(thread) +#endif + #define switch_to(prev, next, last) \ do { \ struct task_struct *__prev =3D (prev); \ struct task_struct *__next =3D (next); \ + __set_prev_cpu(__prev->thread); \ 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) =3D __switch_to(__prev, __next)); \ } while (0) =20 diff --git a/arch/riscv/mm/cacheflush.c b/arch/riscv/mm/cacheflush.c index 55a34f2020a8..9b74861000ae 100644 --- a/arch/riscv/mm/cacheflush.c +++ b/arch/riscv/mm/cacheflush.c @@ -5,6 +5,7 @@ =20 #include #include +#include #include #include =20 @@ -152,3 +153,113 @@ void __init riscv_init_cbo_blocksizes(void) if (cboz_block_size) riscv_cboz_block_size =3D cboz_block_size; } + +static void set_icache_stale_mask(void) +{ + cpumask_t *mask; + bool stale_cpu; + + /* + * Mark every other hart's icache as needing a flush for + * this MM. Maintain the previous value of the current + * cpu to handle the case when this function is called + * concurrently on different harts. + */ + mask =3D ¤t->mm->context.icache_stale_mask; + stale_cpu =3D cpumask_test_cpu(smp_processor_id(), mask); + + cpumask_setall(mask); + assign_bit(cpumask_check(smp_processor_id()), cpumask_bits(mask), stale_c= pu); +} + +/** + * riscv_set_icache_flush_ctx() - Enable/disable icache flushing instructi= ons 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 user space. + * + * * %PR_RISCV_CTX_SW_FENCEI_OFF: Disallow fence.i in user space. All thre= ads in + * a process will be affected when ``scope =3D=3D PR_RISCV_SCOPE_PER_PRO= CESS``. + * Therefore, caution must be taken; use this flag only when you can gua= rantee + * that no thread in the process will emit fence.i from this point onwar= d. + * + * @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 =3D=3D PR_RISCV_SCOPE_PER_PROCESS``, all threads in the pr= ocess 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. This does not enforce any guarante= es + * outside of migration. If a thread modifies an instruction that another = thread + * may attempt to execute, the other thread must still emit an icache flus= hing + * instruction before attempting to execute the potentially modified + * instruction. This must be performed by the user-space program. + * + * In per-thread context (eg. ``scope =3D=3D 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 ica= che + * 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 =3D true; + break; + case PR_RISCV_SCOPE_PER_THREAD: + current->thread.force_icache_flush =3D true; + break; + default: + return -EINVAL; + } + break; + case PR_RISCV_CTX_SW_FENCEI_OFF: + switch (scope) { + case PR_RISCV_SCOPE_PER_PROCESS: + current->mm->context.force_icache_flush =3D false; + + set_icache_stale_mask(); + break; + case PR_RISCV_SCOPE_PER_THREAD: + current->thread.force_icache_flush =3D false; + + set_icache_stale_mask(); + break; + default: + return -EINVAL; + } + break; + default: + return -EINVAL; + } + return 0; +#else + switch (ctx) { + case PR_RISCV_CTX_SW_FENCEI_ON: + case PR_RISCV_CTX_SW_FENCEI_OFF: + return 0; + default: + return -EINVAL; + } +#endif +} diff --git a/arch/riscv/mm/context.c b/arch/riscv/mm/context.c index 217fd4de6134..beef30f42d5c 100644 --- a/arch/riscv/mm/context.c +++ b/arch/riscv/mm/context.c @@ -15,6 +15,7 @@ #include #include #include +#include =20 #ifdef CONFIG_MMU =20 @@ -297,21 +298,23 @@ 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 in= t cpu) +static inline void flush_icache_deferred(struct mm_struct *mm, unsigned in= t cpu, + struct task_struct *task) { #ifdef CONFIG_SMP - cpumask_t *mask =3D &mm->context.icache_stale_mask; - - if (cpumask_test_cpu(cpu, mask)) { - cpumask_clear_cpu(cpu, mask); + if (cpumask_test_and_clear_cpu(cpu, &mm->context.icache_stale_mask)) { /* * Ensure the remote hart's writes are visible to this hart. * This pairs with a barrier in flush_icache_mm. */ smp_mb(); - local_flush_icache_all(); - } =20 + /* + * 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 } =20 @@ -332,5 +335,5 @@ void switch_mm(struct mm_struct *prev, struct mm_struct= *next, =20 set_mm(prev, next, cpu); =20 - 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 =20 +#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 =20 /* * this is where the system-wide overflow UID and GID are defined, for @@ -2743,6 +2746,9 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, ar= g2, unsigned long, arg3, case PR_RISCV_V_GET_CONTROL: error =3D RISCV_V_GET_CONTROL(); break; + case PR_RISCV_SET_ICACHE_FLUSH_CTX: + error =3D RISCV_SET_ICACHE_FLUSH_CTX(arg2, arg3); + break; default: error =3D -EINVAL; break; --=20 2.43.2 From nobody Mon Sep 16 18:57:31 2024 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 A0B0A4E1C4 for ; Tue, 12 Mar 2024 23:53:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710287629; cv=none; b=M0GAKLHdNnkX+RyAXAeV83YrHpAktcemcOnKOEkUau1PF10uawmcDbg0ptNRfX2cBqfVGxAiJxHrBpeF/NFmbjz5BNNpeQW54MiisiHGzUm+7LneNYnL1vShSJ7uJWA8vcCZvRVZNF3x23C6eF8JPyggzUwcJleWalPw+StOd2s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710287629; c=relaxed/simple; bh=VhbTJ9D/d65WnO+JrY1SIvIOPQdT9MHfEzWOw+OIGSo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dJGkBm/GtQjQgPAQVmQHZ9oJPWqAeR8hYMBwJ6bGLqqvsmxpTHhxwcrLKz8WHGvlxhvVaaPRyNam5xeszQc+Utr/jgwAsqMo2b/yih7EdIAXFGei3RboGHeIf+t4l2sjPRDYKsFF/Hmcru2pm4zO7rkAz60XTZtPqybIGjSEUh8= 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=sVJNUsyJ; arc=none smtp.client-ip=209.85.214.177 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 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="sVJNUsyJ" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1ddcec424a6so71895ad.2 for ; Tue, 12 Mar 2024 16:53:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1710287627; x=1710892427; 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=Xy5TOqSKX3DblYxEOD5MVVtHMk7JBMIm4GkKJlZsbS8=; b=sVJNUsyJ5goUle0ZXUpqeoFbNEn9YwoaklklZNk53B3oHOiNFnMp2gLAnKHEKQxzHd kONetzMkvVSzvdlJMDEhUkjkA8xeTMZ6T+yQDKcHYhYGaRAkLR/chWtbulxn0tFA7cp7 ORGG90zqBcP5L8qrglXqZcaO1rYHcRsnvkOoxk/HBqyY9BN/iuR9USrv4Wjqx2f9isAa AGVYG+B1RLEvNVXHJh3QWlJgT/UCu9E/Ch2c7QQedpCMMjsHI+/HuxPlaXq4yoyr0M2z MHjC84DWLRF0ZgqxXGBq6i6NBjeUw8A1fvl2rRQ1C26Q2x9jYQ9AahkWbUefpccqxASw Duzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710287627; x=1710892427; 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=Xy5TOqSKX3DblYxEOD5MVVtHMk7JBMIm4GkKJlZsbS8=; b=g1MTea2NhPJ5FCTdee8jtCIFcVxClXchtoisaGISL08ccRNrAO3YyJEgojVsAZhNRO To0alDlwWrW312Oc7QGuGKPdb4szDS1RDsi5nQJ7No4a4yLnyohkgjI+xCt9xE0F+LHh wbzW4SVWMnv8yEnDUb58FY7a/HeRV9S/6H1p2/STRVdFd3KhlgbCRsDRSv83AQoRKaQe caqMMwpkAHt2gMVO5sDVmrLGxJHPCSDGQupUXoXo5O7cZo4nSbKHQBCa34sOn2uDMNhM 3/7106Ibc9hgrf0EpD8tbbJjZHo46ctQQYsYLv8EkuUAOS2TeJjtl3UdXSXvU2hOBt+H 63lQ== X-Forwarded-Encrypted: i=1; AJvYcCWqBVIDiF963wlWFyjXM62rd0Hh4FFZXkZA2eJKoIMcq3Ko1Rt9vOXOxLWnufvE17lMAHQAU4/oFFOp6v+02pqSdoNI+W1piA3oKqOp X-Gm-Message-State: AOJu0YxSmH6ZUY7nufR+v8RUmDlVx3OGMqGN7TFoYGP2Jgig14dTwzud OAevjD5+7/HrTa0LuDK9u41rwrIxVrHw+ofBis9PkKliCmOWJS1m0RDcZ/BqRQY= X-Google-Smtp-Source: AGHT+IGOuq44oY+SA4/K6Jk2+JXY0tCiJaFcX1Kd9JQD8qXjj735tLLLMG623VHrrnU0hXZIrtQRgA== X-Received: by 2002:a17:902:ecc4:b0:1dc:df18:c5c0 with SMTP id a4-20020a170902ecc400b001dcdf18c5c0mr11755148plh.0.1710287626915; Tue, 12 Mar 2024 16:53:46 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id h9-20020a170902f7c900b001dcad9cbf8bsm7282844plw.239.2024.03.12.16.53.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 16:53:46 -0700 (PDT) From: Charlie Jenkins Date: Tue, 12 Mar 2024 16:53:42 -0700 Subject: [PATCH v13 3/4] 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240312-fencei-v13-3-4b6bdc2bbf32@rivosinc.com> References: <20240312-fencei-v13-0-4b6bdc2bbf32@rivosinc.com> In-Reply-To: <20240312-fencei-v13-0-4b6bdc2bbf32@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Jonathan Corbet , Conor Dooley , =?utf-8?q?Cl=C3=A9ment_L=C3=A9ger?= , Atish Patra , Randy Dunlap , Alexandre Ghiti , Samuel Holland Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Charlie Jenkins , Atish Patra , Alexandre Ghiti X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1710287621; l=4601; i=charlie@rivosinc.com; s=20231120; h=from:subject:message-id; bh=VhbTJ9D/d65WnO+JrY1SIvIOPQdT9MHfEzWOw+OIGSo=; b=cZs4wpLQVtK7aTyxMXY6Q9lLyWJ4tLsVLAH4e9c1IqQElmGi36HzjYpFtCMt0IsozfaaDWWOb QEJZI4fNKu1AxAOBDJtLa+UZHCwjpFVve7bojE9mGLUn6bjOh1cblBo X-Developer-Key: i=charlie@rivosinc.com; a=ed25519; pk=t4RSWpMV1q5lf/NWIeR9z58bcje60/dbtxxmoSfBEcs= 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 | 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..1c0ca06b6c97 --- /dev/null +++ b/Documentation/arch/riscv/cmodx.rst @@ -0,0 +1,98 @@ +.. SPDX-License-Identifier: GPL-2.0 + +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D +Concurrent Modification and Execution of Instructions (CMODX) for RISC-V L= inux +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D + +CMODX is a programming technique where a program executes instructions tha= t were +modified by the program itself. Instruction storage and the instruction ca= che +(icache) are not guaranteed to be synchronized on RISC-V hardware. Therefo= re, 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 har= t. If +migration occurs after the userspace synchronized the icache and instructi= on +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 calle= d 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() sys= call, +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 p= rctl +changes the Linux ABI to allow userspace to emit icache flushing operation= s. + +As an aside, "deferred" icache flushes can sometimes be triggered in the k= ernel. +At the time of writing, this only occurs during the riscv_flush_icache() s= yscall +and when the kernel uses copy_to_user_page(). These deferred flushes happe= n only +when the memory map being used by a hart changes. If the prctl() context c= aused +an icache flush, this deferred icache flush will be skipped as it is redun= dant. +Therefore, there will be no additional flush when using the riscv_flush_ic= ache() +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. T= he +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 =3D 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(); + // Call prctl after final fence.i is called in process + prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX_OFF, PR_RISCV_CTX_SW_FENCEI, PR_RISC= V_SCOPE_PER_PROCESS); + + value =3D 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 =20 features =20 --=20 2.43.2 From nobody Mon Sep 16 18:57:31 2024 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) (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 D009750A8F for ; Tue, 12 Mar 2024 23:53:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710287630; cv=none; b=M+ZK6q/DwNfm7xIJSgiq5A4E1HykohOSDEXqvceJ6fbPWYvGs50pDUaUoOdjc3QJJ8pFnzogfGv5lhioaObhuZQf8oxA7rliahmd1oGay8IflhbZA397KCukzxbJja+YsGUo3ahkItmMxOjNYBgGE/3JkjetYeKmeD4Ri/Wrh0g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710287630; c=relaxed/simple; bh=6GJ6p7yMdN+ouzHCZ+tS6sWbsz3sQSlgY1DwzMvWuUA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YmQZg6B0YGEjMBXpPTDrHtaQytvlmLb5Scb1S+kmhW3ywTEtREXYTz65TioeNDDAy62h6QvWI5H34QFMcYELhXvf+6iU2wP19B3+K08ob1UOrOteXqoMxkH8WXP1hfMY64R2hg1hiL4z0M0YJPdoKEOXFl+PFjXJRhRvdHwNY9k= 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=kpcjM1NY; arc=none smtp.client-ip=209.85.215.170 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 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="kpcjM1NY" Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-5ca29c131ebso4907622a12.0 for ; Tue, 12 Mar 2024 16:53:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1710287628; x=1710892428; 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=7WqC9EYNMp24I0Ah4fci0KUqmT8EqoN79+NZmIklXBM=; b=kpcjM1NYWJfzoyhcm33MAO1RHEFYP9BGkke/bgGTwNbKOGRr0gXG4KrNh1RM9yFkGp nVnHcePmY7aywF7UscF7cuLJtBWWuZK13HRyGbBzLEXr4icJa4rVaED7CfJJxGfeSPEL 13V89pVcVuyQHn3sQI8KKA7UqVfMp2H7lGoGDRR+TOIIcT9uPY2mWMCn2nqAZgGz2gfK udNSrujjE5yacYYquALQ1ubntfZKsIJAZ8Cnk/CUE8fXqxeEDpYrYxScyigUwrDwUTI1 9VV2ADveMauBMBjnomQF7GrLFFGDuztBlYwQyPagbjDLkw3mpqputMRVD3mRBLL/8ZxP dNJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710287628; x=1710892428; 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=7WqC9EYNMp24I0Ah4fci0KUqmT8EqoN79+NZmIklXBM=; b=Nq8NKwii7bCuXPT+N6c9YN+KtQtNHknZBXV6wx6c/Q5mexpxFMN5dWoL8fBFKWN/4a YLjInpJiTgMCVXKihr+7Cu9HK1HrqfoXbx7CD83EWwR2+KrQd9U/ARKL5T875tg41ewE znwjZ14SRYTlai4t8Cv3BEwzDsj9Xf09TnN1ELm8xOjTL8kSGobKtXI0hzMmxSo3Xzd7 sQHo9zWC7OOjAs5RDpj6ybX9IsxJULxnLEqjPU82dZ5Qav/xowM8oHFDHjhsVILGbUMv QTKw0x5mVPKTe6IvEjIdwaK4yUJYlaIczqzXR6S07/6SyGNvZtmtHjFe0wBYYR9LNuls e8Cw== X-Forwarded-Encrypted: i=1; AJvYcCVTJ/tZlW3Cn14qfriA51kdw2SlSnok3mrWwtqcbty2Ty1JRroMc8vbgHqJh1anGGKa1t8CPp94Wr8VfAsJNmaMgjFv3FDOr5DxIz70 X-Gm-Message-State: AOJu0Yz53e285/d/FsPn7BRiLOSDXl23PG0YgkDCsLle0LIIxUsbdajl UijshsfYWcFfw2Y5dUTLHX1H41ZkLtrpFm2G6vFwMBOiqd993r5rTnKMqyanvFs= X-Google-Smtp-Source: AGHT+IFRA+vdCvsszXe61z0lN9iAK9Z/ra0D6gklHZ2jxM8IZjGafc+k8Vt3GmhS14d8pl67aEwWWg== X-Received: by 2002:a17:902:ea0e:b0:1dc:ce6e:bf06 with SMTP id s14-20020a170902ea0e00b001dcce6ebf06mr13980467plg.0.1710287628171; Tue, 12 Mar 2024 16:53:48 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id h9-20020a170902f7c900b001dcad9cbf8bsm7282844plw.239.2024.03.12.16.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 16:53:47 -0700 (PDT) From: Charlie Jenkins Date: Tue, 12 Mar 2024 16:53:43 -0700 Subject: [PATCH v13 4/4] cpumask: Add assign cpu Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240312-fencei-v13-4-4b6bdc2bbf32@rivosinc.com> References: <20240312-fencei-v13-0-4b6bdc2bbf32@rivosinc.com> In-Reply-To: <20240312-fencei-v13-0-4b6bdc2bbf32@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Jonathan Corbet , Conor Dooley , =?utf-8?q?Cl=C3=A9ment_L=C3=A9ger?= , Atish Patra , Randy Dunlap , Alexandre Ghiti , Samuel Holland 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=1710287621; l=1674; i=charlie@rivosinc.com; s=20231120; h=from:subject:message-id; bh=6GJ6p7yMdN+ouzHCZ+tS6sWbsz3sQSlgY1DwzMvWuUA=; b=VgSJhrp/XA7/5Nj4l4UWBqCdsrn4rRXnIv9+QzM7vEeIgZHPzHCs2KUaHtvu93Hal0LPGPw1M 73ATSwpKcf4AF3ewBvQne6ZnvAPUXPu0x9vXxZvQMNWILesdQgSr+Or X-Developer-Key: i=charlie@rivosinc.com; a=ed25519; pk=t4RSWpMV1q5lf/NWIeR9z58bcje60/dbtxxmoSfBEcs= Standardize an assign_cpu function for cpumasks. Signed-off-by: Charlie Jenkins --- arch/riscv/mm/cacheflush.c | 2 +- include/linux/cpumask.h | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/riscv/mm/cacheflush.c b/arch/riscv/mm/cacheflush.c index 9b74861000ae..0927df96c0e9 100644 --- a/arch/riscv/mm/cacheflush.c +++ b/arch/riscv/mm/cacheflush.c @@ -169,7 +169,7 @@ static void set_icache_stale_mask(void) stale_cpu =3D cpumask_test_cpu(smp_processor_id(), mask); =20 cpumask_setall(mask); - assign_bit(cpumask_check(smp_processor_id()), cpumask_bits(mask), stale_c= pu); + cpumask_assign_cpu(smp_processor_id(), mask, stale_cpu); } =20 /** diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h index cfb545841a2c..1b85e09c4ba5 100644 --- a/include/linux/cpumask.h +++ b/include/linux/cpumask.h @@ -492,6 +492,22 @@ static __always_inline void __cpumask_clear_cpu(int cp= u, struct cpumask *dstp) __clear_bit(cpumask_check(cpu), cpumask_bits(dstp)); } =20 +/** + * cpumask_assign_cpu - assign a cpu in a cpumask + * @cpu: cpu number (< nr_cpu_ids) + * @dstp: the cpumask pointer + * @bool: the value to assign + */ +static __always_inline void cpumask_assign_cpu(int cpu, struct cpumask *ds= tp, bool value) +{ + assign_bit(cpumask_check(cpu), cpumask_bits(dstp), value); +} + +static __always_inline void __cpumask_assign_cpu(int cpu, struct cpumask *= dstp, bool value) +{ + __assign_bit(cpumask_check(cpu), cpumask_bits(dstp), value); +} + /** * cpumask_test_cpu - test for a cpu in a cpumask * @cpu: cpu number (< nr_cpu_ids) --=20 2.43.2