From patchwork Fri Mar 14 21:39:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017503 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 6129FC28B2F for ; Fri, 14 Mar 2025 21:40:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 18198280021; Fri, 14 Mar 2025 17:40:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 10ADF28001D; Fri, 14 Mar 2025 17:40:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E78D8280021; Fri, 14 Mar 2025 17:40:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id BF30F28001D for ; Fri, 14 Mar 2025 17:40:10 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 0B1ACB8EDB for ; Fri, 14 Mar 2025 21:40:12 +0000 (UTC) X-FDA: 83221475064.04.0C8FA43 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf03.hostedemail.com (Postfix) with ESMTP id 1A87120011 for ; Fri, 14 Mar 2025 21:40:09 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=KH6cbUnd; spf=pass (imf03.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.172 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=1741988410; 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=N78rd5bu5L3Nb7UCylb6NhXzPkib+ej1wIZfC16ALRg=; b=prqwnMhjskxAywrKsb3lpT2AAkw2mKmv96mfj6Q3cX2iisFRkYn5qLlpN6WGZgeyxnh3QP 8UjpEKvlwSVE6gsHLs/CyBUg9pywcuCtE/9kQLApd4HdJd7GIoAbP5xUQrJfsJO4fq9+DL GDRMIgE8I8IftCQpCs0yryOPPizQAnA= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=KH6cbUnd; spf=pass (imf03.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988410; a=rsa-sha256; cv=none; b=CXp8VXdZqjWNm4vp8gtff8p+DhoKgZmNBRtHijgZ6rdb7jEbmi1acaiSRHFFe3AJlmWeeA 8yGuPVJK6ztjlHNl/0EFz3D+HV1Ahi5J51b8ZFaULnZRmM0kRJ1WIONkrPKS/lE/Lxa3y/ /EUofr603zOftleGQ9/kKxSpfr2zHK4= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-22401f4d35aso50705185ad.2 for ; Fri, 14 Mar 2025 14:40:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988409; x=1742593209; 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=N78rd5bu5L3Nb7UCylb6NhXzPkib+ej1wIZfC16ALRg=; b=KH6cbUnd00LQcJqWfBVX+6HPCqQ1w24ZFNf61so0uKG1RxRCwkkl8JmrkjHiLhoiTK je3ADLI980gGpdzw+sX8UaKVrdW6uucG1zcAuAYLRVkJILpgTFsR8CaelHrqhOBVUT/4 ZbD7Fob+uH0atILqmI0BwgyDuYqJEo8z4X2IKz/xVtnlM/Ba4Lm4yG0VOLaJwjXNJs3u e40tMjHD21b+QekW2zNJ2RROH7xeszwYgL3Uw59aA80n/0fvSIdzmNvWbBJAKYciyfbU wvl0P/cniXdXsAR8Mkx2CJUzHm425vyb32KBc7Lkju2XH8qV+kkNYu91eB1oIHhUU1iN mHjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988409; x=1742593209; 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=N78rd5bu5L3Nb7UCylb6NhXzPkib+ej1wIZfC16ALRg=; b=sUyCqDfTocbBsv9Kv0aM+IjBxVaie1uU5g+SA3nJkUQOpse6nZnhV4pTjfCkqe2+sF 0i7Z1ZVyvNFAdhzeEUq2TJJFL1T7wf7HPUMEQ0eBIgTK9m48J9dDX4Y/rfg8FooPXw8Y BDAOSARb2QNhFJBWIShuIBnSOcMhfM8ztnp6yR8tBNXi3AdO4pB7lgXYVZO3K9o3B33k 5v8fYBbSdxM3NuAXbjeT+0AjOrTMCrLb8gr7MP49LOPs6sVWufBAkfy+XrmPzEbTSzbY fg864ydQU5M9jh+x00WEg5dsxisQWAbDMRBh5a4MK/sbLvVhj7S+OfxfFZq6pBEgo9wZ xLyQ== X-Forwarded-Encrypted: i=1; AJvYcCU7BzucfDwRAKReHNqoPXfBhuYW+r6rgWWNpiVHBCVLZayqlvzqp2h525uJRLv4q+ygA4I0QYb69Q==@kvack.org X-Gm-Message-State: AOJu0YyW4FIU8ndRO8PWzpRdcDbruSzZy6G3vZocobsDZcugZ84zdpQQ OlwPvimSTDmagkIgOlmYsB+CVyQX8Z2KKrQ8z5LWLO5tMCTYZMJHCq0aNQZs6m8= X-Gm-Gg: ASbGnct/MDdwzW7GmccdIozeczBAjut7CDzzXzcPRuXK1qsqJ6HGWFuSIj3WwJXps8v JGFNzZzPszUzl3uwfAXSSjETagXFuB6uBUgzn84vW9ppQP3znkPFt3E5+BaPyJLg1qDOvDnro2O pPEXDuhlE3wTNc1Hne/euk2TmWbKQ67PqvxpQ3Ym3OVzUxzEOCzUUz8WRzAVT1JaTWi6Wm+wNYN 9lu9sl25N1a+N1Go36LoMWeFUIzFnq6tpCyUz9qT7pTawmWiwhWJQXXbJ+bwpdNQmHgk5sf7/9X hAXnQT4hirlE9meeECy3dGBZod3rJCrKtBjKvAlkJDsz5ftYnwa0/tQ= X-Google-Smtp-Source: AGHT+IFSKd+2xICbPyI9jv8e0eee8m28O0Z2xE2zkf1BJxJdHUC0s7Oxq9dFc7HadAqrreCNrCxPSg== X-Received: by 2002:a17:902:f712:b0:223:42ca:10ef with SMTP id d9443c01a7336-225e0b09816mr52846915ad.43.1741988408934; Fri, 14 Mar 2025 14:40:08 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:08 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:35 -0700 Subject: [PATCH v12 16/28] riscv: signal: abstract header saving for setup_sigcontext MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-16-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@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 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 X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 1A87120011 X-Stat-Signature: kpmtawui9s9t4biyw8ggj4cw3cc9xfey X-HE-Tag: 1741988409-84534 X-HE-Meta: U2FsdGVkX1+A8WcEhz0nsPdf0rAPf1okvBZNomInrZaP8iJzzbHe6rEriCwviy/Nmx5z5ZXwrsAfCyac4bdS7qFWVimeXQXUPdIiZ0r1L+UzLjd0+bioi8hBf3cA6FLR6oatAslKo1vYZYqSHYGc3+Rp5vr+3SIApr8Fdk54uLwqxrJtsJueyvpbvtG+/eVWYUnwcc6xA9EzqtaHwCuV+DwwvjkWSp/lGv7AIeM5ftQgxpkfNi3QN/QQ2wpmYF/TvG34ApPfeizCqePfwYatfFBYwv1Xnpq8wdfYRG/lIAkhkcXbw7w6mgT4rJfxlwKq9SX5Xrb5MvhwDpXuc642CS27YkLJquizawP2YxcqKHA8w6TiyyC+U7F1Qsg7Jv15b51aTjwcLB6BQ1Iul5YFn+D1VBJjQkrB8N4gDX3U6D54ZTCaL5BRBrVTeCVuEVp2WWhDr40xRtzGXcbERM7BnhH41wppE3kb+ZqpwgbhhTgW1qISIdR6JWgT57QjL17OmRF2E60Xw+iWbJzUiJ1WWWRCvw08IP150FlZCwd1r3zJmIewXuM+22SQo89UfWtHF70OEQpIjYRmeF4S+dp9zjOhgo2Os+mg52RA8ZNbkVnkdVpwy9jtRWF1QG7kASJZJuuvz906bEG2yXLyNJhApqqHDmQXs0UcF8zthhkWeGOSVU3VuzL7687JkmFTHnT3Jb0AO/luMqokYXvg6cEqf6ysrNbc7XAV7uml/5yNXdopUcCvKgAXVLofJDVIOat3hYY40wlWTu4kDVVMNTeueFLpaJUUiibB5LYizQE4Waic/G82wP2oHY01dPVtYaOGwgeUovmR9iQ7XSN6Y/IZOdwTifW665IXnke3Urqzb+VFhatEpF9GFzkTQE6Z4lavDWgKiVCyJC5QFOTRI67JVJ7rTC79yl5Y5tREO/Dk8LjaQzQj62GFBg0Dw2nyJyJSJg9JeHTFrUMiZy5fmlT lPbHDP8k m4aEq27BLoZSu3/AbnqtV/V+aK2Ry5gGGjYGZrAqrulau0bdTIs/4R/wfIHkYeth7j135lI5pKz+ua9h6INn8AbUI/kQguFdRzi/h+E8B+wey/+50ldwAOQr2D6itpBRaHXe5uDndEZlgACgsUGWuQxZP14VgqocunmtYbKSnEjAyZl3RkoJ0f+w0E3o2axnlrUcXDuMQpDJa8Ez3cIAmeJb2kAv3QX40/7VMrOn38NzncIZbnJyAMXjEXPXDybHo4HV+6u7H6YTlDkCjDiJWWjGiLldlIJ0X0eotEM2xUO4whpxVx6KbzehKaWLSh2ZkuiFdsO1Knj19JUrt2Sy0cnzRq8yn84t2F8m1pWsofH5XvWEge/CS9EvuLHuqxKnvqF7GR7Yoy8H+CkpHtcLrYoxYkMtsIX1jD0WiqssRi2WA+MsphVZzBshUKaS3Pe4uZGVa3ofedCJ4+HS1kQWY/hpOsDUPy3sa8gi3 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. */