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 4DE1CC3ABB6 for ; Fri, 2 May 2025 23:31:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A13756B0095; Fri, 2 May 2025 19:31:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 94E676B00BA; Fri, 2 May 2025 19:31:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7513E6B00BC; Fri, 2 May 2025 19:31:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 5538B6B00BA for ; Fri, 2 May 2025 19:31:31 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4390C1A0946 for ; Fri, 2 May 2025 23:31:32 +0000 (UTC) X-FDA: 83399566824.27.00994DF Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf12.hostedemail.com (Postfix) with ESMTP id 5BD3E4000C for ; Fri, 2 May 2025 23:31:30 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Q7lFXJSC; dmarc=none; spf=pass (imf12.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746228690; a=rsa-sha256; cv=none; b=pq7QGpuurqA9zRPK9YW07/GcQCozPVl11SPKGZbVM2tl8KTLJ2BvLhhLajMjF+n2WcLPF6 6zzSDghajbI63FJnk5tsCl8LyuSrkdCLUVel4NX7emN9qOzBExRsx7NGUMAsyYGGZsRUJW C4NzI64Pl6Zly80jMlrp4K5p/Iv+y+M= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Q7lFXJSC; dmarc=none; spf=pass (imf12.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746228690; 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=cjVm07TvHB8i+4vTj0N5afrPt1wne1+C0SvG1ceLNgcCXJH7ikd+nC2ntTMpjt35TeuVO8 VFafFSJM6gUx3eE1jObSRERPz7oGHVxpH/cAh0XY870am0nPDvWzg9IhSwExtbGMVk+vix R96G+iIyyMu9n39n+vkL/7ZVUxpXlJ8= Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-224100e9a5cso37003895ad.2 for ; Fri, 02 May 2025 16:31:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1746228689; x=1746833489; 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=Q7lFXJSCjoG8gXiVpO+3+M/VY0LzUtEFRZKwy9fREHEoswDLz6JCJunlLqAgWdOntG qbSGi7Kd/9Z6ABBODx9uk+VePtDE9IbT/7ovRo6dQiSqaOWifmdDDPk8yVD8eCPEQUEc j3IjVKZiTLyAN71s8ngOErXsO6VA+MV7oshhmaYMkpPMtErHNLnsolojqzBNzsIE7+3K dUQPlCxBV0aA1iphB75CoFTJdAoCR5NBRCFh5ly5ERNwqh2ZbW0WeubO9/tIHecVpUC8 k06aor36DD7wEFbby8ETg0DhPBGCFjwWX4WNo36ydcTJfP8b6X6nUwqB5fj0rPJspRYp my5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746228689; x=1746833489; 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=cmTNBv+AqpRD2Dwj4PhP9PrIebCdSJ5bPPoR9MCJCP7XBDTPsaODS7KDHKSN+JaJQH tpW5hdG/X4ThdFHf6r7mIVR6cUBk7EUfW/HTXAOSOhveDAOGP4FZAZsKs/PYsOcAWMM8 aTB1k899tvRpZmW9IHhQoZjvpg70oyEafwwTv4swQGvY3OrJ0jDzVO3JrGlxrxsX2A5Y 2iwa7Bsfrv+2FI3PUliuOGpvv3f36+GFNMjQ+RKMa2dbDqNV8rCualhmARF0KWOnjE0t tvERMuOr1VrgCZAHM//EpV6h5Vb06QHUEeP4KfzE9DFPcnhmKxo1UdeW3bplDyqXRuTY wRbw== X-Forwarded-Encrypted: i=1; AJvYcCVuOD0gPk56U6UQY6DjJv/SPrPgURLjobA6xO8KW3kmtIAj/8gZU66X1LODcyKe37ZxXXwBvnYlsw==@kvack.org X-Gm-Message-State: AOJu0YzG0gEWSjlbc3WBz+HEqO8Zg6hgUTA1wG4/iQOn+ZuE1nt8yai2 yBbuHs1d1S7nNdg01L7fVrjDCV7kS8ziCsfgk8+StlUrFm3Tx1f12izVWTRa1CI= X-Gm-Gg: ASbGncu6GymbYAwIx+MXS4UCYlr0AfBhpWo1Z+eAxh5IhnG1PtUGBX8braXObbv0l3k 9ZR0btgiM6JtVIMsUdPPvC+TfT1Pc9zdlZ32+6wRPjm/FuW2afr91pv6RW3VGyLb7S3qBKaCiQL oaONcwr+d1d6Q6GmgdQbiOgzvmZvJ+4FTtdlJkJlTE+PWQvl9C7YJjVlAVEtdHcr5iGQd6ffYYo zusKTnT3JpGq0l+EDeeEEtXMq/n4+vyfpFR2oK5NiKbRGuiRHpwPMZi2RAKVa3VqB1ZZBf5swsy whkWfrF0/Eh7p0oe7tpqamuyB08CipiCaw5PMTSBeemteKVUfvI= X-Google-Smtp-Source: AGHT+IGJ4hbkDrcvbzQ2C6CLIKfva5ov3ozZSff7DpG2Wz7f5TDK43zIBF2nqUREgeUFBJoDkj7ZjA== X-Received: by 2002:a17:903:228d:b0:224:721:ed9 with SMTP id d9443c01a7336-22e103aa1e0mr81004905ad.44.1746228689166; Fri, 02 May 2025 16:31:29 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e15228ff2sm13367055ad.180.2025.05.02.16.31.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 May 2025 16:31:28 -0700 (PDT) From: Deepak Gupta Date: Fri, 02 May 2025 16:30:47 -0700 Subject: [PATCH v15 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: <20250502-v5_user_cfi_series-v15-16-914966471885@rivosinc.com> References: <20250502-v5_user_cfi_series-v15-0-914966471885@rivosinc.com> In-Reply-To: <20250502-v5_user_cfi_series-v15-0-914966471885@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-Queue-Id: 5BD3E4000C X-Stat-Signature: 87sea8wfdwh5xyz45ptcaywknc965db5 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1746228690-454852 X-HE-Meta: U2FsdGVkX19rDAVAlq51no/WgInW2ZMtCeSwTEH/aO+Kj0umDoNhY13twHxQvNFA14xzRCAWETNZXcg9z/UIooplN6hkxnKxzKCDbk4vnN2VmNpJRCZDCP+G7Ptai5c5jsGoBQAGkEkXNB/C4MGDtUnTPPIEQKHeVWAjO/j0iKn9TNv8d2MEpvmY4IptenlziGg8Od9JYQ58ysKCJMfEKo/SeRiYwMVQG5IeBbg2EqV5B61gEqgA5v3ibbMt1dBddZLY8ASmf1eVKgmFMYa+rNIQ7TUY4tpjqTodI1rclmcLmDOaXl1g23tDO5nsMx4/Oik8WRSQ/pJ/zM6hITXlV2ZKaB/mnHwZ5arW3kanppQVxnjNdFud/jo4MqvfUhqaZIy6TbcreXit6RiekPujxjmOaqWt3LvFquG9SdO7val8kSQfGZifER2CPRdZgltfj9bru3TSRajJsAy7nkdEySMt6AYRjFtBg8Fdn1EnMv5PcF7hS2qPY6uG+PkbCOhloUnaad53gqlgmFtpje/Pvc9yFHsheKZmd/ugnkD84/KIMpimSzAUCQ1eahK42/UFqW4XLpg0Y6ykiZ+3yAlHL/q67GLZEnaLaHfE8b7V3xkbVQ4MQT/s0XeEreF1N4gdDcal0VvXA8uMOr7qXLvWHT/GllnFVlBhjmZzvOMPshuRMAOAJRPtmwfqUMg8k1QV7M+he39VwChr4jatSeMQPZyNjbxwFYv9OxFYyy3USB/M5c2EnqtriFHQ2qG77dn8sOpOOZD9Iuj3/53zNcvR41hE/c6hMGVnsTgToRSTcm7aOu+xtrqxENy783oLM12EDtx7ngmSxh6HRG6alw1mXiSCg9jnvj0Lt+gOCdFvgmPA1z0rxfJwYfS9AhGG5qz2NAjQtuW5vXILbJr9YzBPK9+3XxdApuaocceJKGNNeT3zTUn8IxH2rIuzvCoKp5FMOTure9VvKECFRXePSIN j0huDzON ieD9Q2289ZfeOdEogO6hpH3ht79Oz8CJOkMZ473fMeyM3wCSwq3rsE/AlvzEz5biujiVdm1uPHSGGonUSlxylKYtGYVl9n9hmRkwaGTLH+meayRU7+2EE1lE+XlzaJ5fu/OHagbb3AeM2aURZ2FoGHEibhWJuc6qpvnUr8fc77WJKCm8crQ1ifctja7NClsbOlmZMRde1fgC+kOeZl1mbf+ujR8qjN/cCc3NcGwbxWxdP5jxWzi8Uzauwqt+fZH8oXS2+vZa/M6piWh8VyPW/9A2wmd9bzknVkhw9COSSENGuK1CQbwQuAe3BPO8Xpwl5iIz4ZqSs/wcMy5Y1uhuTwZ7hVD8fkzfhHFoB8Y2vKWcllJq6iS+in12ytDW67LcQupOeloH6mmN6ufplYBIetlvPytbXMLTBuYD6KCq01X23mrnXkTQx2e84jZ0x/dZW09N0IlMmhvQuIwgyVki30m2OIzK+r3Ff9YTH 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