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 A75D8CF042B for ; Tue, 8 Oct 2024 22:39:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C78226B00B9; Tue, 8 Oct 2024 18:38:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C249F6B00BA; Tue, 8 Oct 2024 18:38:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A9D096B00BB; Tue, 8 Oct 2024 18:38:52 -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 86C706B00B9 for ; Tue, 8 Oct 2024 18:38:52 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E393F140D47 for ; Tue, 8 Oct 2024 22:38:50 +0000 (UTC) X-FDA: 82651901304.03.68A3490 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by imf25.hostedemail.com (Postfix) with ESMTP id 4D4B4A000A for ; Tue, 8 Oct 2024 22:38:50 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=UX28OeQp; spf=pass (imf25.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.175 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=1728426994; 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=ktGiW9xDXTg+EugQzK6XNlnuaeQzDVGAh9/x4DoNqSE=; b=CBz9g/zcoNMamUpb1jy9Vc7PztpithmC+oradGxZ4369dzZpbdaRUGRLNCXVF0MLBKOHwR YW8GvvzbCe7vDSnqvN1Iv/WVWXZNsCrrbr0/hd202qKvcECp80Danl18XqFcOuFx1bVjh+ HrbXYh7+aJGfiamEQbmvEMKWE5Cn3x4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728426994; a=rsa-sha256; cv=none; b=xZmLmzyySHnU71rmdyOkZo3rjD1woDK2agAc3qQ9jMQnb0Mrz50UP71AwAb2l1tCHy+27B FJ228K08gy5AMdH4e7PQwhfnYt8kPVnb4TLqMgy07o7tguCN9z4ct0uSzf+GuMFBkbPSW7 dx5NndZNSkFKaNqRDupxKg+7+f6QbO0= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=UX28OeQp; spf=pass (imf25.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-71e038f3835so2292655b3a.0 for ; Tue, 08 Oct 2024 15:38:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1728427129; x=1729031929; 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=ktGiW9xDXTg+EugQzK6XNlnuaeQzDVGAh9/x4DoNqSE=; b=UX28OeQpyo6sMT//R7K6JRfdckGfunlHa212L33kZNqdG8cuK4Z+zDn2RtlaMFaFQT Mr6SDi/9hINBFoZuN6/crTZsPLuK2q6eslSEz1UnepEoDxrpzOQEIqtrORWOfODaaHej ZeYBRNt/w5mede0tM344YQuccHAKgsFTVbo1wZLk5Jm7LIuCvI4F9O87MWXdGVr4G164 cUHY2d4f5ngU5nmAnhCFxgf4hUwVH4qrWYXKmHPqXMdnDETCVxCFS2+NAm3HAhqcZstO /bV9OtV4TGs0JPzIGex06YzyzyYjyDl/e1esIsqjJSZY4OsJjCD5EHvE7yNR9GlQSq4h 8mGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728427129; x=1729031929; 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=ktGiW9xDXTg+EugQzK6XNlnuaeQzDVGAh9/x4DoNqSE=; b=Rki0c3QjtjkVGbwj8IDAiNfrfHxjtCqFamGe//o8Xi1hd6WNRU1gKbfY6mmDOg2Ot4 iPhyYberpmI6rXPT9MW8JXnhsUMdB6JJnWriM4vm8Ou8nJio8/uZ6b12yvJhDzw9DYG7 lHY5z6ohQV6qptYDWOd7s8SaYlkUoC4RJPuUGB2uOAGmYdRT+YBbXaO8yhaMbFKnBM28 dmOXpHtqgP/Jij2FpVeQFN50XB7Dns7Dwy6FcsNneLlXS13UDwX9zXlNdP0ckRZOKkaX 0A4ubMBIOXLRBkafyK8+Ee5TKDZHhl06f0eYdOmYrGpq+XkvVDs9CoPsGRcTf+ee4Oi1 IN/g== X-Forwarded-Encrypted: i=1; AJvYcCVqmM3IzNh1gQUEx4II89muh+vLrfZzY2RA8ic8Pc3PGHNVrrbeq6QBcop6xw8t/MmHlW7mDOSXhQ==@kvack.org X-Gm-Message-State: AOJu0YxhB6cW036nT3eRdi9a2biMnv/lurSEQx7Np9loQ7nIsO5C78Oh g3X5Dn7To3t6lEwHxKEPlSKOYdDJm4IPupshHthvpClxkAePiNUfqUXodcjGCEY= X-Google-Smtp-Source: AGHT+IFbq9QIJjJjQDHcirR6qnZcfNmFS1LzJegIAUAS6YpdNUb2o9k5do2wAMds8jeC3sH1edL3Vw== X-Received: by 2002:a05:6a00:22c6:b0:71d:fb83:62ef with SMTP id d2e1a72fcca58-71e1db88990mr606368b3a.14.1728427129165; Tue, 08 Oct 2024 15:38:49 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0ccc4b2sm6591270b3a.45.2024.10.08.15.38.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 15:38:48 -0700 (PDT) From: Deepak Gupta Date: Tue, 08 Oct 2024 15:37:04 -0700 Subject: [PATCH v6 22/33] 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: <20241008-v5_user_cfi_series-v6-22-60d9fe073f37@rivosinc.com> References: <20241008-v5_user_cfi_series-v6-0-60d9fe073f37@rivosinc.com> In-Reply-To: <20241008-v5_user_cfi_series-v6-0-60d9fe073f37@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 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, Deepak Gupta , Andy Chiu X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 4D4B4A000A X-Stat-Signature: 5ys8yh9attj4umz7adt8s8g8odio7d39 X-HE-Tag: 1728427130-804139 X-HE-Meta: U2FsdGVkX19SEDxRqLdjtajP1w6hJhwmHT2gUvnNGgJoS753gZXVINGWgEEIbhLqPfSC4NcFsYlJoI5xVGOmycBZB3jpEIQykbKiwB1q2CeIG0NFrlGyThzbsXfWCbqjD5ZZnmY/Raa1edmYO6RTZ2JEaBe10/IpA6Y9PpJHDVuaqvRPUsDe+je6V5CoMrWJPZ0XvtKTKIobkWiT8aD/VFC8HyRyylVQfSAhx6xIMPdKm8kLcBCMZJYTjsOPtz9Gjsa6x+RqLsdYpF972+wz4jTE+CYXoxa0WWd+k13PEMVeevr2EATBr7rEZwdCTxWeYw5cuPglCWijf+m1QmeDZONcNKi+pbz5ACTbU57kINxOypB4bdwYilZanEqxkKth28Ibqz6inWD2h9vIPpP5usEtawpYmA5xSzUH4zlEMUMqL3Vv757y+njVYZCagCN8xeZxLx4EqiJhcLmeQhRXPGzyjHvdAzxbQ25c0CWxKdKVX9f26AaYdbmT03aINTeSala//eK4ngdAUDtNyoI0m/GkEIvB6D9p0/Pnxm6gsZkKKPmAY9iMfeEIWQI1vkGNiQIWA34CDEC3AvB6Dmu4qqmXk81n2sB0UKDDHrz9UeuQj6KcYfQQUS7eUlpk8HMa2Z5qysb621Zc2A0QmswbWXXERvBWwdAiYzpe60JxtLuOvFf9pAhlXv19O8A9g5316m/QDGPhIH3Vb51cGhUhWbGk+VlUFaPYNpuUgxwtxNFRaHDiU4sM90OaSnr01YScQ7lH+JSh/i/qzsNznvWi4FnUQMGzsgc17K4Rp89iWEaYPXmKDo/5rRbIbQP5Htq79rvq59cUtOR7NunMHCegq7Kb51wman6O+r8YUZHrPlIOrNEFjmf9Z7QHFxAxSquxIHbZFGVuBM7q6dAxtZ9r4FfFJHuwPb8PedVeehj8vU3NWv08KA6ecFeiRpi2w9IozR0muphK5nLPIICtDaR 1uHGiieA 62hcwg/c8mqTsqTS2q3TLUPMP8QGocbANIRHP7uY2/KTf1jJdsy71W3abM6Rb5skTMYE1Munkuc69x5c4K+uQZwOGi3YO1pb4UtH1QQf+CsMnR4rESPPu2ACKfGGgmiVf+YbFBEZ9wF0YfGjOgRXT5uZk/hTIF7LbVZey1ZqpaKUpJ0fFwqwbCc5hKRv+MydlkVNUUW1a3Xoi8aHYGQ48zeP1ygp7MwEZJXBA+kxhxAh65qluzpGqrQJW2LmC+4Qg91Pw0bNSxgunV6DCBbnvnUeqcTDVxyVheaoFN0attq7gV9gnGUsOhP96J7bitq1XqGAeTsNefJE0Ky7UqfGlOGpmiRGTkuxva7+Ukjx94z1fdDNnF3TnmcWV4IUVYPh/qWEqCoJcBeG8bO68GTxMRNRHMLANaAW/HdVzClT64YhHWblFmS5iPwQP14+yIDazUIw3tmIb0fVdp5c4Sshyd3jpDKR2TxKXTaaYrz0qVPKea2hc1UJrnVtTGCRCWUo57Za0 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 | 60 ++++++++++++++++++++++++++--------------- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/arch/riscv/include/asm/vector.h b/arch/riscv/include/asm/vector.h index be7d309cca8a..2d2ec6ca3abb 100644 --- a/arch/riscv/include/asm/vector.h +++ b/arch/riscv/include/asm/vector.h @@ -281,6 +281,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 dcd282419456..014ac1024b85 100644 --- a/arch/riscv/kernel/signal.c +++ b/arch/riscv/kernel/signal.c @@ -68,18 +68,18 @@ 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() && 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 +97,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 +138,19 @@ 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 +281,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 +290,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() && 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.45.0