From patchwork Thu Sep 30 18:11:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 514951 Delivered-To: patch@linaro.org Received: by 2002:a02:606e:0:0:0:0:0 with SMTP id d46csp36994jaf; Thu, 30 Sep 2021 11:16:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNTa7KeN0Ndx2IdLaF5w8kARLtDAD22jDHNjcN1HFMpVq6AwiA0FLkZdqgKRj7i9n1IXaW X-Received: by 2002:a50:d802:: with SMTP id o2mr8422213edj.331.1633025807519; Thu, 30 Sep 2021 11:16:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633025807; cv=none; d=google.com; s=arc-20160816; b=pgjn+PMaSL9QbUEe946F1hFV3YjC9rWHJc4mdNlmYbfw4j46WHmaHL9vXInu4oJ4wl GfKPFich/LckmgUWdx/BAv/+Iax/lUmJz6UQDqTUEsV2DAN+WAzhg18aIFJOI4DYf2AX SO/bEgWuJGXc7oPxpXLyPOs99nvTNGtXBdrJROTxMd5bph648g7iIidtURrXBGSHpNfh QuNhWbNWI30Hc9BQMwlyodFTFGk+U7YLsUDQRJnVyy+7+d//WsRiGm5w/PRl3YV8VLmV 6IQTW2x7S3+IF/soeiyAuxqG8vPx0Sx8ylYt0nzlfNyc3qvcAae9NarwhIW0alXc5a8d xm5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3g6/jMX8+4wSxOS+XKLZcpV82u7btKyT0TWEVPLW+TA=; b=z/5rVX0pt0Sl9fmUUoWAAeboZITHYYGpIf9WjWvGqLUYFeGpCTt5t+ApN0QZ7YeS6w FlXzkA7rFmK9YydIb/wIeBFcDQdYqpurCQDEEPmT/NEpNzh9jeJJbaIYJdmCJ9NCPpaH Gzgnao7/1rl5EjR7bptQEAH/pYJCuJcPR4fh5Yijqw+f77FQro3DL1hhXPFfvE2fjaRB iP6qwvKv4HzMz9GEtNcY2whuwEsXKQJHfhzXDV6VpjdYBnsK0rbSmptn+H7rU2ElxZ0o 5Wlm9UTJBa3w6M1QE1mh++1Ki8Y++vXVrQeasGCrx9D9su9PtQUXh+8FREQyvEb2zd8F JSOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GGiJLGqR; spf=pass (google.com: domain of linux-kselftest-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kselftest-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t5si4335628edj.607.2021.09.30.11.16.47; Thu, 30 Sep 2021 11:16:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kselftest-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GGiJLGqR; spf=pass (google.com: domain of linux-kselftest-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kselftest-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353367AbhI3SS3 (ORCPT + 5 others); Thu, 30 Sep 2021 14:18:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:57222 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353361AbhI3SS3 (ORCPT ); Thu, 30 Sep 2021 14:18:29 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D7FD06140F; Thu, 30 Sep 2021 18:16:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1633025806; bh=qWRs0aDyFPM8qjeruqE51Lzmb2iPqjfdm03+P3KgnMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GGiJLGqR+Qt8GMyczKDEZK5EEf5Mlp9RWE1YMS/+k95MK8xRsKEgqRYuJcqXlfeot hdQb5Fs+Ibsl7Iefps/7QwEno7voX+lSy3yx2W/zYkk8aWs0KrBPxc8fPaeRupdXWU 3AjaaMxRV6rrKZTCJAAVBx5gnHYMgmVphuEh09ufxz5UxfijUfQsz0mNjcbBNckx2D urIS5MPXqmDM8VAPWzJNnA86jNK2sZhyYvS6jrDPFl2JnXmhrwnI2Zdo7zr+tU7SLv tPNuRQeULSfBJKeR6PUrXzJJKjgKbjwpXycDbnLHV2zB3EAbGfaJwt2dL92mqCI6Tq MEeTFpGkLb56g== From: Mark Brown To: Catalin Marinas , Will Deacon , Shuah Khan , Shuah Khan Cc: Alan Hayward , Luis Machado , Salil Akerkar , Basant Kumar Dwivedi , Szabolcs Nagy , linux-arm-kernel@lists.infradead.org, linux-kselftest@vger.kernel.org, Mark Brown Subject: [PATCH v1 25/38] arm64/sme: Implement streaming SVE signal handling Date: Thu, 30 Sep 2021 19:11:31 +0100 Message-Id: <20210930181144.10029-26-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210930181144.10029-1-broonie@kernel.org> References: <20210930181144.10029-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=6926; h=from:subject; bh=qWRs0aDyFPM8qjeruqE51Lzmb2iPqjfdm03+P3KgnMs=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBhVf3VgvaFdbfIXxoAb3yTR47DEJaLcZm4F51dtr1y PvMrYy+JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYVX91QAKCRAk1otyXVSH0AHyB/ sHs72lyCBBTXgG64RqMFIdYryMBFV7Z4TuqZ0MyCwDbzWVJLepniuz59JXrtD5fLAeSTxBAnx5dby2 jdsYner6OF6UQ59o9Fwb5iX8de7QnKjWgQKarS16RdbQqWyDiWMsZB3eiJKG2c/71VPve/rMTFmR10 xKReiI4t8aswGF1f0CDTSvIJ0D5rTrX0EIC9g/gS1fhYTdC+jIuXwwgMQw1IksIt53yy+0R8KoohMv C2gLRAt8zzycf63dyeb2R3z6xLWCxlG63Kq4OVtaEpbAKrOx/nw+OzEH5s/2OW4zgQrGNsR6z+11eR 57Uw9WHDeOA8icgxRSRxDn0UDzRBSl X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org When in streaming mode we have the same set of SVE registers as we do in regular SVE mode with the exception of FFR and the use of the SME vector length. Provide signal handling for these registers by taking one of the reserved words in the SVE signal context as a flags field and defining a flag with a flag which is set for streaming mode. When the flag is set the vector length is set to the streaming mode vector length and we save and restore streaming mode data. We support entering or leaving streaming mode based on the value of the flag but do not support changing the vector length, this is not currently supported SVE signal handling. We could instead allocate a separate record in the signal frame for the streaming mode SVE context but this inflates the size of the maximal signal frame required and adds complication when validating signal frames from userspace, especially given the current structure of the code. Any implementation of support for streaming mode vectors in signals will have some potential for causing issues for applications that attempt to handle SVE vectors in signals, use streaming mode but do not understand streaming mode in their signal handling code, it is hard to identify a case that is clearly better than any other - they all have cases where they could cause unexpected register corruption or faults. Signed-off-by: Mark Brown --- arch/arm64/include/uapi/asm/sigcontext.h | 16 ++++++-- arch/arm64/kernel/signal.c | 48 ++++++++++++++++++------ 2 files changed, 50 insertions(+), 14 deletions(-) -- 2.20.1 diff --git a/arch/arm64/include/uapi/asm/sigcontext.h b/arch/arm64/include/uapi/asm/sigcontext.h index 0c796c795dbe..3a3366d4fbc2 100644 --- a/arch/arm64/include/uapi/asm/sigcontext.h +++ b/arch/arm64/include/uapi/asm/sigcontext.h @@ -134,9 +134,12 @@ struct extra_context { struct sve_context { struct _aarch64_ctx head; __u16 vl; - __u16 __reserved[3]; + __u16 flags; + __u16 __reserved[2]; }; +#define SVE_SIG_FLAG_SM 0x1 /* Context describes streaming mode */ + #endif /* !__ASSEMBLY__ */ #include @@ -186,9 +189,16 @@ struct sve_context { * sve_context.vl must equal the thread's current vector length when * doing a sigreturn. * + * On systems with support for SME the SVE register state may reflect either + * streaming or non-streaming mode. In streaming mode the streaming mode + * vector length will be used and the flag SVE_SIG_FLAG_SM will be set in + * the flags field. It is permitted to enter or leave streaming mode in + * a signal return, applications should take care to ensure that any difference + * in vector length between the two modes is handled, including any resixing + * and movement of context blocks. * - * Note: for all these macros, the "vq" argument denotes the SVE - * vector length in quadwords (i.e., units of 128 bits). + * Note: for all these macros, the "vq" argument denotes the vector length + * in quadwords (i.e., units of 128 bits). * * The correct way to obtain vq is to use sve_vq_from_vl(vl). The * result is valid if and only if sve_vl_valid(vl) is true. This is diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 8f6372b44b65..fea0e1d30449 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -227,11 +227,17 @@ static int preserve_sve_context(struct sve_context __user *ctx) { int err = 0; u16 reserved[ARRAY_SIZE(ctx->__reserved)]; + u16 flags = 0; unsigned int vl = task_get_sve_vl(current); unsigned int vq = 0; - if (test_thread_flag(TIF_SVE)) + if (thread_sm_enabled(¤t->thread)) { + vl = task_get_sme_vl(current); vq = sve_vq_from_vl(vl); + flags |= SVE_SIG_FLAG_SM; + } else if (test_thread_flag(TIF_SVE)) { + vq = sve_vq_from_vl(vl); + } memset(reserved, 0, sizeof(reserved)); @@ -239,6 +245,7 @@ static int preserve_sve_context(struct sve_context __user *ctx) __put_user_error(round_up(SVE_SIG_CONTEXT_SIZE(vq), 16), &ctx->head.size, err); __put_user_error(vl, &ctx->vl, err); + __put_user_error(flags, &ctx->flags, err); BUILD_BUG_ON(sizeof(ctx->__reserved) != sizeof(reserved)); err |= __copy_to_user(&ctx->__reserved, reserved, sizeof(reserved)); @@ -259,18 +266,28 @@ static int preserve_sve_context(struct sve_context __user *ctx) static int restore_sve_fpsimd_context(struct user_ctxs *user) { int err; - unsigned int vq; + unsigned int vl, vq; struct user_fpsimd_state fpsimd; struct sve_context sve; if (__copy_from_user(&sve, user->sve, sizeof(sve))) return -EFAULT; - if (sve.vl != task_get_sve_vl(current)) + if (sve.flags & SVE_SIG_FLAG_SM) { + if (!system_supports_sme()) + return -EINVAL; + + vl = task_get_sme_vl(current); + } else { + vl = task_get_sve_vl(current); + } + + if (sve.vl != vl) return -EINVAL; if (sve.head.size <= sizeof(*user->sve)) { clear_thread_flag(TIF_SVE); + current->thread.svcr &= ~SYS_SVCR_EL0_SM_MASK; goto fpsimd_only; } @@ -302,7 +319,10 @@ static int restore_sve_fpsimd_context(struct user_ctxs *user) if (err) return -EFAULT; - set_thread_flag(TIF_SVE); + if (sve.flags & SVE_SIG_FLAG_SM) + current->thread.svcr |= SYS_SVCR_EL0_SM_MASK; + else + set_thread_flag(TIF_SVE); fpsimd_only: /* copy the FP and status/control registers */ @@ -394,7 +414,7 @@ static int parse_user_sigframe(struct user_ctxs *user, break; case SVE_MAGIC: - if (!system_supports_sve()) + if (!system_supports_sve() && !system_supports_sme()) goto invalid; if (user->sve) @@ -593,11 +613,16 @@ static int setup_sigframe_layout(struct rt_sigframe_user_layout *user, if (system_supports_sve()) { unsigned int vq = 0; - if (add_all || test_thread_flag(TIF_SVE)) { - int vl = sve_max_vl(); + if (add_all || test_thread_flag(TIF_SVE) || + thread_sm_enabled(¤t->thread)) { + int vl = max(sve_max_vl(), sme_max_vl()); - if (!add_all) - vl = task_get_sve_vl(current); + if (!add_all) { + if (thread_sm_enabled(¤t->thread)) + vl = task_get_sme_vl(current); + else + vl = task_get_sve_vl(current); + } vq = sve_vq_from_vl(vl); } @@ -648,8 +673,9 @@ static int setup_sigframe(struct rt_sigframe_user_layout *user, __put_user_error(current->thread.fault_code, &esr_ctx->esr, err); } - /* Scalable Vector Extension state, if present */ - if (system_supports_sve() && err == 0 && user->sve_offset) { + /* Scalable Vector Extension state (including streaming), if present */ + if ((system_supports_sve() || system_supports_sme()) && + err == 0 && user->sve_offset) { struct sve_context __user *sve_ctx = apply_user_offset(user, user->sve_offset); err |= preserve_sve_context(sve_ctx);