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 CF6C9C369AB for ; Thu, 24 Apr 2025 07:21:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 67FEE6B0083; Thu, 24 Apr 2025 03:21:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 62CBD6B0085; Thu, 24 Apr 2025 03:21:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 40D706B0088; Thu, 24 Apr 2025 03:21:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 1BB9A6B0083 for ; Thu, 24 Apr 2025 03:21:16 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C7A65C07FB for ; Thu, 24 Apr 2025 07:21:17 +0000 (UTC) X-FDA: 83368091394.27.CE7107F Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf25.hostedemail.com (Postfix) with ESMTP id D4A15A0006 for ; Thu, 24 Apr 2025 07:21:15 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=brhg7at5; spf=pass (imf25.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745479275; 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=41v4E7ga+ZFzPbByHXLYifyQZM5AuT/Tz2JN75Nn7jw=; b=LnRw96PzJZbDKTrEkKrepI8TUwbgAkK3Gz4GC8GIYzf/JRP64nrEz4gWtKzeD891dQEba0 tZvVKyn2tEW4z8rzqbKIrsPn/ieH2pBTe2pLxjw92SEIlvScjo5TluA1CPDVulxxjlp/Zd 6s4n23PCbaDLFhhCSEQ0ej9qhAUYXCY= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=brhg7at5; spf=pass (imf25.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745479275; a=rsa-sha256; cv=none; b=dyp7mHVW8PT1QmCkMU3GPFwaa3HogE2BmYnKwp/PB2aDlLkSkXmuA1JQZujJCo1OULTMlV vjubN8ZrAp5DDG+jYBXA3knWSni6B+NW6n0TUbywtF4B/0aWCR5A+efPtKiKxtlHla3yxe AmE3rolAFwmMmJskEEKwb7N9DYbrnWo= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-224100e9a5cso8334555ad.2 for ; Thu, 24 Apr 2025 00:21:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745479275; x=1746084075; 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=41v4E7ga+ZFzPbByHXLYifyQZM5AuT/Tz2JN75Nn7jw=; b=brhg7at5NEMQo7D2v405isn7YmIwENJ6RzCctO7YG5LV5wdl4HFSZIW6tX0VCGNece uAp97DSPJlgyFk9uUBzJ7QaxVLEcAbKWdS95WXsyDPluHXnWTCfoc/2gUF+B75M82eD5 RXHKzJpqEMclgN3lkKW+HFJc9V/NnhkQ8OthQr+QXvwoeTxJd2v1FmhAZihGO4+sldJy adnQPuaTGbY3dV69Dt0O5VHKiuCRO0WO8SrUmsXshXsgp7QNIIQv7v2/O7jevpCfFu9T Ub+cNRAUopWmBZsFzJMGD/Xt6mXoPnhEy5c7Ls6Usa7dhmffdRIL8by0+rXuvSOwTWKz S5BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745479275; x=1746084075; 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=41v4E7ga+ZFzPbByHXLYifyQZM5AuT/Tz2JN75Nn7jw=; b=kbpCF7OmTszzacNcHyVfl3HzKSpWhDkDZ/wm4N6tdVLXlml2/LBKnqvwJx1XBfreQT 4cdJJmLKFAawvgo2lPM2ErDbWTh2sWh50ULB57C7pmekfUJrOXT9ib2FWPCvK9YWJ0hp nMcz+nqZghhRvnMPxkBr9eoQukLLYTPovUj2H6V+xgoEuoRBMX3kYE/RHlazyb/WIfrq oI4pI7Ij25D3HG4JItAM/n27HvZlUmstRZBJnlQthBpYZHFdLo6y9phPJDI8pFHdPE1K kR8nYLXmX9bcWydtzlprjxp8ieuaoyCBKoomRB9H2dGyZZyEZi0Aymqad58xx6rD/YcG O5KQ== X-Forwarded-Encrypted: i=1; AJvYcCXQtTy9gZ8sm4/Rw8hqoyZ1hppJKfxE8ikkQqFmwn5btJCFxOrC+K56cO1uf4XfRdSKZfjTwYdpQg==@kvack.org X-Gm-Message-State: AOJu0YwfI/bodrjYSCg5f/CCvzkJ+p19cgEgEMpHwxzM1e9zr/Duc/SM YX6Hxd/l9KOM2Wx48bYAf25yZWgC0FANigq5F3vzDKc0O+vnHSHJ00dr9YAz2eU= X-Gm-Gg: ASbGncvs65P/fId1OoAYDnt2go7DQvF8ushR3dUitCweZ8eVQIjoWfFCZSV5MJj4rnG jQDfIh5E5vJzYhSdo/ZnfSdXq9DaRvokmabtGudTD4l6YxsNCRYWuy2KHZsHC9iCpO7aHtxZND+ zAUS5JfLgdiZeiTZuTvctIdbQ/ys8eF4giiEDt8JU7ldsA7fdHp3BPOaPtvxoE/wyPkjnwDc5dh 4IxmFleUa0EmZ+nBwewI28rCUS4A8TMDlDpyl3PPkSBc7LJ6ixNdIgA+MQ5GqhyjnaXozLcI+1L YE874bdwAwK7WP+SCNwOO9cXTBHy30MOWTZNPu4xm+QeJpc8jQS6UbsvySySbg== X-Google-Smtp-Source: AGHT+IG7mw5kM3A7JF7yXhsREItsbjvUMsakyfD3ulI1IpW0IVgA9l0SFzQdVfIWwOREJNL+l+daLg== X-Received: by 2002:a17:902:f693:b0:224:216e:3342 with SMTP id d9443c01a7336-22db3db5763mr22507105ad.43.1745479274622; Thu, 24 Apr 2025 00:21:14 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db52163d6sm6240765ad.214.2025.04.24.00.21.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 00:21:14 -0700 (PDT) From: Deepak Gupta Date: Thu, 24 Apr 2025 00:20:31 -0700 Subject: [PATCH v13 16/28] 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: <20250424-v5_user_cfi_series-v13-16-971437de586a@rivosinc.com> References: <20250424-v5_user_cfi_series-v13-0-971437de586a@rivosinc.com> In-Reply-To: <20250424-v5_user_cfi_series-v13-0-971437de586a@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-Stat-Signature: exstnb9biks4isx4fzry3nebhq83cfi9 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: D4A15A0006 X-Rspam-User: X-HE-Tag: 1745479275-234333 X-HE-Meta: U2FsdGVkX1/HLp2RAANzn83uxceCez8ff6FgXMeV3WDVMY4MDT8glyTDlUlr2lV0UQWtccQI8OdoU43nQ7GOdUlmPABXXBYKUusIQBI1GgjpMxO6TScN8v7cMMO6TuTIJhcXcOtpE3OzVVceuzIq4StgCfD7u9p7J7TzX1eka8U1m0ZfvMTMimQ+WB1zGiVsccfnn74mvp2Ttd4I7Ed8NBXvRoqj4ukps58qWKQQQv7ddQaWI3ZUV6RsWXrvizn+Mz4z6R56wuWcr7cZMj9zrOk83njCXUzPOmfSeeLplmimwhRNpc4yuXkQ/xlKAAmKfiCdi/G8Pp7I1GjEe6mk0E+iOUN/H/1+w6VXSm4yAFOn7Jvbk9hzQ3Kcy303Y5tpL+6+JTmF7eQRK1pM5XFNwbL+9MueKE5uICZDKzSKPdwbY2pl9cyylNO7cYbGFneGrc4vKpAmpFEd8DB24Vs+3jI9WmBj0MiwVS1+t0hPqeHxrmLzD/egqno56TvKejt90+3lb3+qnt0MoMV8zpcjjHb/Zyg9ItCI0YUM8QT3dplej3pepMS9Wp+/hj+lg7YRCBZyrWDK6i2Okfe+oGW2wTUxSLtILmXzOCI12pjZVWqHmCVmx+7nQ219NLP/1t3wrMtGklxVDQj4KT8v0qYN7qpTEVOTiH6IvFeYM4ScDy3G1ndragpsjuqzjp/DS8sSlQVe5kjZM0p5Oh/DtbJltCqlaD9DpfDlinNLNX9YPEXl/LtDloY/+nqS+3VA+luPwFlcNMLovWqAb0M5wiveBvKA/qklP5/jI8Uu8o6qjifatms3iesosFLkhiR2KR9tHJnw+iT36YReM6ZHxUb2xy1ALmqO+0E1z2JEgLGeB6cE/6gGqWBEvoHYTxikaRu8qJN3XrBgnOizNsK/Hv+Ly6N7fg6nj46oM4Cfd0CraNvTPgBNlYQvlBEEpeDLB2bYTNAc8P2gbbAP9rZxTrz GiDq853A qj1z+Vi7HpJu1INXouVB/fR3eCln4iaer22GX4pHSPSiV4YwrsA4IeTLIKi91Z4N+1de6jB9rcj9ioU9/h10CE+WcllHAWhRb3ARyM/Yh5xtEdnYKDALPq9Z+FJHdahG/v6pwPnhStkJAojhDvOlRrq1lK+FvYO/AvY6V97TFDSYhUmlcMEaVp0h/Plc6A98vHpN+iIbnPxknk2sVjiCw+fXyZf0YFbZRHaU4g88v3JT9kvkOuL1g+zyvCPCl1+CS6Efo4A8iuzcGcfSkY3BI0QYjan21RPHoNJYNlqp4XyRmARl4kONs1Lj2rtq990MgBRKqeBxQA7O0eiQ5evkpJtyL5ug8P9m5Wu9/seGYFfCWNoXX3CGAT1ivw5r/lnmH5FZFGbnT/L5OOBcOR4iwjdVyNbA7hBpXNM2iOZXd57KEj50AzlfhpioqiiMVbJuAp6SbG/9Uvd5DEqURTtEiBcZvCg== 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 94e905eea1de..80c70dccf09f 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) @@ -276,7 +283,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)); @@ -284,8 +292,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