From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2222CC369DC for ; Wed, 30 Apr 2025 00:25:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5A0236B00AF; Tue, 29 Apr 2025 20:25:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4A90D6B00B0; Tue, 29 Apr 2025 20:25:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F8C36B00B1; Tue, 29 Apr 2025 20:25:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 08E616B00AF for ; Tue, 29 Apr 2025 20:25:04 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 25DB81D0473 for ; Wed, 30 Apr 2025 00:17:20 +0000 (UTC) X-FDA: 83388795840.10.D851C06 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf22.hostedemail.com (Postfix) with ESMTP id 4A3B6C000B for ; Wed, 30 Apr 2025 00:17:18 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=0TxONepn; dmarc=none; spf=pass (imf22.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745972238; a=rsa-sha256; cv=none; b=sAwbKKB8PFn4gUR+1l1qqxCmP4f0Ac28x5o1c1tvcJ4Ys7+lACgxDRYuU94XPYMULaweuc J4TaDvZ8/sFNbIb4M3BdrBoTLUF5K2JBkI68foITz1FAbbQmJj2pV8P9p34iXNIMBSsCEA jVn+ehsrAGB48xJT9zEd7sXRw0sXms0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745972238; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+D4QltF1Nc7VEdA5n+UDPSlZueufWbEVbyRTdYC5Tzo=; b=LPiyXayovRobr4HMKRSV/V8EZXBnBjYq2ay4QZv5TaPIWsWgaHErNnf8GFA198YNhhIw4S UHwmqv+XRuUhTzdGNn8xezWRveoAu/WmsrlhnHDhsdieawu5FlQbOHEetnbwnerEhufIRM 4/a6gHzRLDjWu1m3fpNUMTQmF0Rdyvk= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=0TxONepn; dmarc=none; spf=pass (imf22.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2243803b776so111471835ad.0 for ; Tue, 29 Apr 2025 17:17:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745972237; x=1746577037; darn=kvack.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=+D4QltF1Nc7VEdA5n+UDPSlZueufWbEVbyRTdYC5Tzo=; b=0TxONepnSirtSMHVDeGML7I/YvYGDahdr6rFYwSLLZ4kvsVSfsRX83TqJf8rl5gsbh +0lgdm9EZk+Sbsu2Xzg8UukLmSp+vjEWbY0Y+nsReIpSStGvtOnmocbpfQZx0oIaqVGC XU9MMWRK0tIvybP7DZ+tkUk2TGThVbsNU+Qaci3juPiBPrisN2YC7vjO6jkGxMiIeash kbDyYOVYgCcqpnXfkCMr5bYhro6DO/033/CZLvFoJFMfZcDt+VCGPkioobyzybKyLTq5 vhrzajKuyp0JzYSFX3mARS2lVajcNBy2m0Ic+S/aNuET25QKdCVxxxL7YFZpSikkNB56 l8ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745972237; x=1746577037; 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=+D4QltF1Nc7VEdA5n+UDPSlZueufWbEVbyRTdYC5Tzo=; b=EYaQEIgRm5YW0OPY59DHw11UK5L03+pd2xSkKFQtQQb3+l34in0w783x7ToQ5TS397 mbjbOmnQIG1Zg5qsbD7QldvBaGd2eL0tVq0tJOLdtlFWk4o1fLqtzvNTJu3DgyD5PTax zhmosrX5qzcAx/LIdWRadtdga0zdPQJ9nnHeSHLZ/wAxVIWR1BleL2/3YARcBNig7DKN PBRjXTOMJnEoXjRu0qPmuyah/cWF2vB7XvJ9zPlOfjKKNkdLJBGYOTCxgOO9fPLgqH1i jb+CsMOOIrRDBhthzwl6QvhA+D7ndXZ4knVkIzS/m5YBvfmpIzfCcimOjTQ0M/xJ8N3m EnlA== X-Forwarded-Encrypted: i=1; AJvYcCV1/Jzsggdu7p6eYlEgP3oWqXmZC5JehfsX09JNUf1e11hndULHQ1H2h0KcbPzRNcYluqw0G5frTg==@kvack.org X-Gm-Message-State: AOJu0YzNOXQk6HMIe3Ta0GBZEqTC121/qFjoSaKI7v16Lgh8FvrZQ6NN bMl4RbAzuUlIf2cd8bKnFnQgrCIsF7/+cnZxqFiGHUUq2yEhuq4EevG62pq8yUc= X-Gm-Gg: ASbGncvG2vxvELjvouSiJswmiJERNmym8zuJnaLAC9MQmFQfx87t2EzvAslF9/qHIaH /1ro6+1Y7p4S0FSISGrqamrGUyVIvjr4gzDk0ujcxVIxyfEGLA+bXeeKUP50VXpEgkmgpqK/kHV R+O258BJofaVSBAKKJWmh/ns73ViD/SH/nY5fVM1iHBrLj663K52I9yUI5t25S1uzK2jBIUqzE+ YlbB1xVNBVIMFtp/KRyr9ZO3sa3LM85QcYpTXTe53lie4wUjv+8VNGtuTQLxFl73HLqGhFPjilU /IaMzLVDC9YlpyIu0mUT7isLU2FKGNwd90JuO/EmqggTEvsmYHc= X-Google-Smtp-Source: AGHT+IGJ68s9vGdd0svSWPThdUhsS/bQ3kW3JqCHkhIBs4F1LryKXRAG1dddO5sL0+BChf0uACTyDg== X-Received: by 2002:a17:903:1b0e:b0:223:6744:bfb9 with SMTP id d9443c01a7336-22df359c764mr20076665ad.41.1745972237169; Tue, 29 Apr 2025 17:17:17 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4d770d6sm109386035ad.17.2025.04.29.17.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 17:17:16 -0700 (PDT) From: Deepak Gupta Date: Tue, 29 Apr 2025 17:16:33 -0700 Subject: [PATCH v14 16/27] riscv: signal: abstract header saving for setup_sigcontext MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250429-v5_user_cfi_series-v14-16-5239410d012a@rivosinc.com> References: <20250429-v5_user_cfi_series-v14-0-5239410d012a@rivosinc.com> In-Reply-To: <20250429-v5_user_cfi_series-v14-0-5239410d012a@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, rust-for-linux@vger.kernel.org X-Mailer: b4 0.13.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 4A3B6C000B X-Stat-Signature: zkpjpqmtaof4find78jzrjtk9idckzp4 X-Rspam-User: X-HE-Tag: 1745972238-66399 X-HE-Meta: U2FsdGVkX19ArvJX8E8g+TSac4j3ioK8f/jOAZW0LHOcS/wt/ojoO+hxsgjVWVZ78056rvuMvfxv4CFflosfc7w6r9QuHpEoBQiMM1IpYNeuScAqmDTi/w2q9tTskx9E1csWHh7/LtfhZZ89SGIvKkg5dqwtqwGevWgn+C2ZIYzl3WjxEolzfpERr8mkenOkFpM6UohpeSdLnZiYR3LQYgYlAFDryW6YUL9zpIlb8if3PDBcitiB2KcAZXprW711KkXUKQKyywG1udPPRziYszuqwwOgRvhbVolrvA/281U/yY29tyY5iEQBlAvFB68QOsIMsCKuc8HhQQy5BT8SdECqAz1ghF3DKZTKGE/5Na7CDsZqYXNO1FCRJ3KrQtUBs7SjoApp8Mcm8S2Gic4CxdsqbOqDMCHbaifD5Hf4YpJ8LxkS12xOcHs9pTQml6mqufZ3CYUABUb+ozaE95fSKWcKSfUAmaffTPN04nqLuJZP3084nrMx1lBYsUiBEpqDg9ATPn9m8gWvvvAtI7XFW7Ef1qFJTePphEM+tEkO+rzAv26oTCXmvdk8GBEmsDfT4zwN9HQTx4Arq4Vp53ASthhj8sCRBqWNCLRAYvbgAIzWFZ5n6R+8+80iKx5Fkv99Dvf+h8/FfYizviGFzt+W2+iC+V95ouS/3eF8aMmV4F1WvatmYTG2un1e5uPEQiCc6pw0oU7De0YYsXTU/0vnj6lOGWrvBpmLh5osHwGVdTjW4NEyxqsVt63/FqSpe52P9Ko0N2eoySLRmUmT6ADIHFubguw7IrDA5CNQ2vM9pd/KUqfjhAtZlkh558hzAzNGQGWbeKQJRi1UazKAkTegU8+bE/Qc6m/qRGNJMu/plKIYLFFtiSAzzduhslpCE2WXGndNOngLprmiCqCuD/GeiZ86074r6wHWflQOP8AgwKKajNaMeSJHcxEQbDVxCKy2O9LltAh5at+w1HuPCtR O7jnvOEZ uFaOl2K1AN+LAmSLb1rZ0YqJFbnCjHSS3IOA/PbOt0ki+vIg7W5ce813CH+GAX9Ub5L5pTX+ijZAgk9xgny38WUl+BYt77dBltsmqNrSvRHkKRxeXp2ELtzu36y0l3SITF9XUiZBaKZkSuqfr68TAN1MmyHHaHr6xoavJnkNy4laBH0/0KlW/bp4hQRz1UxNUt/y1XFYT1/FD+Tk2pC13tpmfwgcFzfHo3V0iWBk2B3z0uG5L6WOxcuPLS/qe0BpCmFjok8JoFMk7K8mVvo5YfjzFP7GCE6dJN3a5QPcg2mAMKuXFBoaWWeDwlgMUPZW4FQt1QsVq39GQQ+4uuZtLvQKnmZ0NR4vbfOQdKoO11Lr+zPaPYEypjAZ5+V01LZofbugvV2WX/is0YgFMl7QQZsRorXK4TgI8KYZ+Ukf4csf6Jhsp9axlzfmLxKbjVyCzy4TsUTazga1hBE9IaNhBvuK6zw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Andy Chiu The function save_v_state() served two purposes. First, it saved extension context into the signal stack. Then, it constructed the extension header if there was no fault. The second part is independent of the extension itself. As a result, we can pull that part out, so future extensions may reuse it. This patch adds arch_ext_list and makes setup_sigcontext() go through all possible extensions' save() callback. The callback returns a positive value indicating the size of the successfully saved extension. Then the kernel proceeds to construct the header for that extension. The kernel skips an extension if it does not exist, or if the saving fails for some reasons. The error code is propagated out on the later case. This patch does not introduce any functional changes. Signed-off-by: Andy Chiu --- arch/riscv/include/asm/vector.h | 3 ++ arch/riscv/kernel/signal.c | 62 +++++++++++++++++++++++++++-------------- 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/arch/riscv/include/asm/vector.h b/arch/riscv/include/asm/vector.h index e8a83f55be2b..05390538ea8a 100644 --- a/arch/riscv/include/asm/vector.h +++ b/arch/riscv/include/asm/vector.h @@ -407,6 +407,9 @@ static inline bool riscv_v_vstate_ctrl_user_allowed(void) { return false; } #define riscv_v_thread_free(tsk) do {} while (0) #define riscv_v_setup_ctx_cache() do {} while (0) #define riscv_v_thread_alloc(tsk) do {} while (0) +#define get_cpu_vector_context() do {} while (0) +#define put_cpu_vector_context() do {} while (0) +#define riscv_v_vstate_set_restore(task, regs) do {} while (0) #endif /* CONFIG_RISCV_ISA_V */ diff --git a/arch/riscv/kernel/signal.c b/arch/riscv/kernel/signal.c index 08378fea3a11..a5e3d54fe54b 100644 --- a/arch/riscv/kernel/signal.c +++ b/arch/riscv/kernel/signal.c @@ -68,18 +68,19 @@ static long save_fp_state(struct pt_regs *regs, #define restore_fp_state(task, regs) (0) #endif -#ifdef CONFIG_RISCV_ISA_V - -static long save_v_state(struct pt_regs *regs, void __user **sc_vec) +static long save_v_state(struct pt_regs *regs, void __user *sc_vec) { - struct __riscv_ctx_hdr __user *hdr; struct __sc_riscv_v_state __user *state; void __user *datap; long err; - hdr = *sc_vec; - /* Place state to the user's signal context space after the hdr */ - state = (struct __sc_riscv_v_state __user *)(hdr + 1); + if (!IS_ENABLED(CONFIG_RISCV_ISA_V) || + !((has_vector() || has_xtheadvector()) && + riscv_v_vstate_query(regs))) + return 0; + + /* Place state to the user's signal context spac */ + state = (struct __sc_riscv_v_state __user *)sc_vec; /* Point datap right after the end of __sc_riscv_v_state */ datap = state + 1; @@ -97,15 +98,11 @@ static long save_v_state(struct pt_regs *regs, void __user **sc_vec) err |= __put_user((__force void *)datap, &state->v_state.datap); /* Copy the whole vector content to user space datap. */ err |= __copy_to_user(datap, current->thread.vstate.datap, riscv_v_vsize); - /* Copy magic to the user space after saving all vector conetext */ - err |= __put_user(RISCV_V_MAGIC, &hdr->magic); - err |= __put_user(riscv_v_sc_size, &hdr->size); if (unlikely(err)) - return err; + return -EFAULT; - /* Only progress the sv_vec if everything has done successfully */ - *sc_vec += riscv_v_sc_size; - return 0; + /* Only return the size if everything has done successfully */ + return riscv_v_sc_size; } /* @@ -142,10 +139,20 @@ static long __restore_v_state(struct pt_regs *regs, void __user *sc_vec) */ return copy_from_user(current->thread.vstate.datap, datap, riscv_v_vsize); } -#else -#define save_v_state(task, regs) (0) -#define __restore_v_state(task, regs) (0) -#endif + +struct arch_ext_priv { + __u32 magic; + long (*save)(struct pt_regs *regs, void __user *sc_vec); +}; + +struct arch_ext_priv arch_ext_list[] = { + { + .magic = RISCV_V_MAGIC, + .save = &save_v_state, + }, +}; + +const size_t nr_arch_exts = ARRAY_SIZE(arch_ext_list); static long restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) @@ -270,7 +277,8 @@ static long setup_sigcontext(struct rt_sigframe __user *frame, { struct sigcontext __user *sc = &frame->uc.uc_mcontext; struct __riscv_ctx_hdr __user *sc_ext_ptr = &sc->sc_extdesc.hdr; - long err; + struct arch_ext_priv *arch_ext; + long err, i, ext_size; /* sc_regs is structured the same as the start of pt_regs */ err = __copy_to_user(&sc->sc_regs, regs, sizeof(sc->sc_regs)); @@ -278,8 +286,20 @@ static long setup_sigcontext(struct rt_sigframe __user *frame, if (has_fpu()) err |= save_fp_state(regs, &sc->sc_fpregs); /* Save the vector state. */ - if ((has_vector() || has_xtheadvector()) && riscv_v_vstate_query(regs)) - err |= save_v_state(regs, (void __user **)&sc_ext_ptr); + for (i = 0; i < nr_arch_exts; i++) { + arch_ext = &arch_ext_list[i]; + if (!arch_ext->save) + continue; + + ext_size = arch_ext->save(regs, sc_ext_ptr + 1); + if (ext_size <= 0) { + err |= ext_size; + } else { + err |= __put_user(arch_ext->magic, &sc_ext_ptr->magic); + err |= __put_user(ext_size, &sc_ext_ptr->size); + sc_ext_ptr = (void *)sc_ext_ptr + ext_size; + } + } /* Write zero to fp-reserved space and check it on restore_sigcontext */ err |= __put_user(0, &sc->sc_extdesc.reserved); /* And put END __riscv_ctx_hdr at the end. */ -- 2.43.0