From patchwork Thu Aug 3 18:33:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130815 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1357481vqx; Thu, 3 Aug 2023 12:20:24 -0700 (PDT) X-Google-Smtp-Source: APBJJlFPfjZN0gtqrbEQSZWfm7D67DbxUJdd44oOjwdnxDWbY06fAcS50RBS/KVajqea8Fg6Ye4d X-Received: by 2002:a05:6512:3f0:b0:4f8:75cf:fdd7 with SMTP id n16-20020a05651203f000b004f875cffdd7mr6989074lfq.22.1691090424552; Thu, 03 Aug 2023 12:20:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691090424; cv=none; d=google.com; s=arc-20160816; b=ghiMYD1C35AcyRP5th9rqJWuzDoqWIAuo0n5GBF9oqjQ1rFRKLrSXIG85RuwctSolI 8M0VQHLkCQM8T97G/i+vzO65VKShgvRD9AfiHLjQYXqzLK7SzLjzxa2M2FE2LW8ETPgw SmsKX/kxop++h3ZrmqjNH6EhP2ogoOsWnYKvggKb5utfJ/ar+8IKVSYhIyv1GJOAJ9sf KDF/svNm7h/BuddTI9w86T9DDjXNG1Ry3dMFPDdDaqeYjxMrtZnAwDqyDkTzy61Lgj3j /So6dfc3u6bb1d38dusPytLQrc/N1Y8jG5SVnBVBxN5RrAKOybGsF+FL6NMKsCnDJywR 0S0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=HdaNpJZtd6cO8r1Py4Gy0b0c1PGcCQ+j1tVLlmOIZgc=; fh=y1YNzMTa0VBjj3s8pV4LY81EkGsSKa5rhSScGuGiy5w=; b=h3Ohhp4JROtFPevtMvRzh7V3cG11d4OQYu/HsNaQLLa90VRnDBKISRRY93lPpHN23i gDx/RnAMZIlQiz3DBZH3urUsfxpLrhJMZE+Yx9FYSyf6ygQZdLPNK8V0YPX8l0FXuDC3 nUiIfUkgpGd0hIGAfv7osfCIuKYQYG/xlyKuyrPn0barT2FXiyiIsn173ZCExkai7x8C pq6woXF0kRXUMARbr0uDiad5VRYn5Ja9FpWFh449wG6QJz3hv15TSWXrPa/BiIMY3jrm K28/t2/zb4+iXTP0EQAY6V3zUKOr+iN/owNwEH/Ita15xsiJNAb2EkpHgUF6aeup+WE/ tf2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kbZKyYea; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e25-20020a170906081900b0099bd06989ecsi326011ejd.522.2023.08.03.12.20.00; Thu, 03 Aug 2023 12:20:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kbZKyYea; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S232705AbjHCSo5 (ORCPT + 99 others); Thu, 3 Aug 2023 14:44:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234401AbjHCSop (ORCPT ); Thu, 3 Aug 2023 14:44:45 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25A5E2D71; Thu, 3 Aug 2023 11:44:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2FADD61D5F; Thu, 3 Aug 2023 18:42:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D220BC433C9; Thu, 3 Aug 2023 18:42:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691088139; bh=Q6O8ubzpvyVkC7Ej05HHTMDmMzaSvsK+JutbFIX5e0s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=kbZKyYeaOPPCdZwv7ubKCh30NYJEYWQwYEs4BlcmwX/AG14B7B6ct/NmSi0zbpqsx OVyotPmnROQN6BVOA3z8VZId3WESsSfGApoeqc+H7yJ/sHo5AiFx9k5QeyRfZt+EyF hlGi0RfK8daFyAL1olp5gPwXJavKRZ5KPaT451qbPWWSjaV37nLiMluN3KQojMhAQg ZCIgjjxr1vO+6suD9s6qPMcql75EfBIgE2Z+8/QjiuNUiU99XryURAkW1R200TDTaT pf91yjzszWJCzttRb+YnST1bQtYopbzyfT4MXlXvEloW8Ja3GM6hl/FpYVgaz6te20 AdlVJ3tGizmlA== From: Mark Brown Date: Thu, 03 Aug 2023 19:33:21 +0100 Subject: [PATCH 1/3] arm64/ptrace: Don't enable SVE when setting streaming SVE MIME-Version: 1.0 Message-Id: <20230803-arm64-fix-ptrace-ssve-no-sve-v1-1-49df214bfb3e@kernel.org> References: <20230803-arm64-fix-ptrace-ssve-no-sve-v1-0-49df214bfb3e@kernel.org> In-Reply-To: <20230803-arm64-fix-ptrace-ssve-no-sve-v1-0-49df214bfb3e@kernel.org> To: Oleg Nesterov , Catalin Marinas , Will Deacon Cc: David Spickett , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Brown , stable@vger.kernel.org X-Mailer: b4 0.13-dev-034f2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2249; i=broonie@kernel.org; h=from:subject:message-id; bh=Q6O8ubzpvyVkC7Ej05HHTMDmMzaSvsK+JutbFIX5e0s=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBky/UEmwKiFjTRvpTlHWMHkQ3ykgHly+u9CiYxdtUF dR5Ms1GJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZMv1BAAKCRAk1otyXVSH0FFnB/ oDTbLZARptJWnKqqaplgnHepLKSsvOpQBNaEbXDpncgv2gLndEkIFNdsoOtoTlVUZ913ZFKFS47HsY rnG7oslf0LQHCR9yaGudN08M//nV399/8H6ScITDlRnBzZ10LSiPQDTlO6GQuChG5hGYRCpxXIjAqA aT4TQHHiEuesDQhMN0TkwVvc6qcVCZY/dtUvtE3k7yrs7REHhQgaWtaBAxBWO9VGiKVFUjq3bPohsW xu28lbFnYprLSi0sWEdIya02W/YR+7lzsVcwqXyr44JRusdNUDN6j0/WbgTgjrMpeRAmkkYOeAwy7H V7tFlkiySYs7gDWDM3uzOHoPVxHjNu X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773236832882921933 X-GMAIL-MSGID: 1773236832882921933 Systems which implement SME without also implementing SVE are architecturally valid but were not initially supported by the kernel, unfortunately we missed one issue in the ptrace code. The SVE register setting code is shared between SVE and streaming mode SVE. When we set full SVE register state we currently enable TIF_SVE unconditionally, in the case where streaming SVE is being configured on a system that supports vanilla SVE this is not an issue since we always initialise enough state for both vector lengths but on a system which only support SME it will result in us attempting to restore the SVE vector length after having set streaming SVE registers. Fix this by making the enabling of SVE conditional on setting SVE vector state. If we set streaming SVE state and SVE was not already enabled this will result in a SVE access trap on next use of normal SVE, this will cause us to flush our register state but this is fine since the only way to trigger a SVE access trap would be to exit streaming mode which will cause the in register state to be flushed anyway. Fixes: e12310a0d30 ("arm64/sme: Implement ptrace support for streaming mode SVE registers") Signed-off-by: Mark Brown Cc: stable@vger.kernel.org --- arch/arm64/kernel/ptrace.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index d7f4f0d1ae12..8a85dcc66597 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -932,11 +932,13 @@ static int sve_set_common(struct task_struct *target, /* * Ensure target->thread.sve_state is up to date with target's * FPSIMD regs, so that a short copyin leaves trailing - * registers unmodified. Always enable SVE even if going into - * streaming mode. + * registers unmodified. Only enable SVE if we are + * configuring normal SVE, a system with streaming SVE may not + * have normal SVE. */ fpsimd_sync_to_sve(target); - set_tsk_thread_flag(target, TIF_SVE); + if (type == ARM64_VEC_SVE) + set_tsk_thread_flag(target, TIF_SVE); target->thread.fp_type = FP_STATE_SVE; BUILD_BUG_ON(SVE_PT_SVE_OFFSET != sizeof(header)); From patchwork Thu Aug 3 18:33:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130810 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1347854vqx; Thu, 3 Aug 2023 12:03:24 -0700 (PDT) X-Google-Smtp-Source: APBJJlEIJT2rtBs8Kpb6+puXyJ9H4f86F024NaZZnfAa7zjgfhi5eNrgx0DeMbrT82Dsu3sJF/LU X-Received: by 2002:a05:6358:338c:b0:134:c8ee:e451 with SMTP id i12-20020a056358338c00b00134c8eee451mr11364937rwd.13.1691089403828; Thu, 03 Aug 2023 12:03:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691089403; cv=none; d=google.com; s=arc-20160816; b=OI1Yxu/TA5AbZ7jyvmLhPygT1LniheNkQ6KX2mOqmo6Ed2K5qRc2oBGP/AKlL0kUNB eSfHD/m8ak1Ga0XABZ2EfR0GLTMLMIJWues4JcCvjZxtOeFMPXkYUTZNQ0e3sSrURkR+ slX60n/qzKBm4WwLJnobO7kh4jIqzkOjcNMj1ng3TCjQqoYALSIZakcEHtDJex8McXcv H/VIpaxDeZf5oQXzFhXUD2rrxa5iBxjdnOUYLXpByNOLQAXD5O8XQffglVRVVmgaaCZA XYkAMUL0q4c2BemE4XEXSHdPSYqTnwH2SxOi97S94ozudCkvaAeOQskhaWn8WS18bXxk 0OdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=/O84WG8D5jYtm97oG9/8VV2Wzq0wtzBQumgCL6OBXQo=; fh=y1YNzMTa0VBjj3s8pV4LY81EkGsSKa5rhSScGuGiy5w=; b=o/2PblvjzRFKgoh2uqZpI2wvZ9VBVSQTRDiYjcQWTjz4P7nDmoFR1XZQtgDvzdoAWf Gy5T34e3CpFqRfMHhB1Z1YfGsDRD3sFRV9lZfgDx+MrUVsgh40LMIyLfyQzYofVB24ui go7epvfhe8iFoB/tZCG6Vd7kabe39oIzZbM/OmUluc06LWDwXPAK1y3KPLofIXGRJp4u 1Kgw40OG3Sxc97azOTMt+rEjiDVQwMKWzKzrD4QPCpxlz/U2IB4+W/4gT/DM0YVuk7pn B+c/ckuaCh6amFMMYunucLMvg7pP2WiUtada9xE+Z1Y6Muxu9oE2geZ88JKtZ+dZqU1W Tu+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PLCPxIk+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w62-20020a638241000000b0055bbc6e2c6csi376975pgd.491.2023.08.03.12.03.00; Thu, 03 Aug 2023 12:03:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PLCPxIk+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S233747AbjHCSob (ORCPT + 99 others); Thu, 3 Aug 2023 14:44:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232525AbjHCSnu (ORCPT ); Thu, 3 Aug 2023 14:43:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 557DF3581; Thu, 3 Aug 2023 11:43:20 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6F67861E97; Thu, 3 Aug 2023 18:42:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D58CC433CB; Thu, 3 Aug 2023 18:42:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691088141; bh=VyfjNO5h5r77yO4Y1JW8iCxzkIDFIM1fWR/4Pr5RYRg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=PLCPxIk+rX4tVb1dQWIa7fuSns+Q05eQxvWW1pX9z4siJovRzdIkePyyZFfLatKwg OKjhAo4UeTFFBQl8ZqVXb+hivg4QBExi/Q1qkURhjOL8a9ElJiC1ouwgShjA1i2Fxf jmf/cvlP09V+cY6Jg0DdTJNPRW4GzRP7HwTgv5Cu8KKgRSDsPyEXnDRBwG5z86vwIs bg/NJCZ3hLg4KHoHshygIiVaCbkv2V2pkUBoTSkhzQ9rB+tTywray8lkcpbD2DaiEe X/LApfLG0zs7LmR2cjVTaQ6eu4oo0mRRWWLy/GIL2U1HZ/dTfw9FvKZq9OCLa7kONq aJmqThvOXaYcg== From: Mark Brown Date: Thu, 03 Aug 2023 19:33:22 +0100 Subject: [PATCH 2/3] arm64/fpsimd: Sync FPSIMD state with SVE for SME only systems MIME-Version: 1.0 Message-Id: <20230803-arm64-fix-ptrace-ssve-no-sve-v1-2-49df214bfb3e@kernel.org> References: <20230803-arm64-fix-ptrace-ssve-no-sve-v1-0-49df214bfb3e@kernel.org> In-Reply-To: <20230803-arm64-fix-ptrace-ssve-no-sve-v1-0-49df214bfb3e@kernel.org> To: Oleg Nesterov , Catalin Marinas , Will Deacon Cc: David Spickett , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Brown , stable@vger.kernel.org X-Mailer: b4 0.13-dev-034f2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1318; i=broonie@kernel.org; h=from:subject:message-id; bh=VyfjNO5h5r77yO4Y1JW8iCxzkIDFIM1fWR/4Pr5RYRg=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBky/UFuHsJ06H3Tw69T76dXRohdyF0xpCyyRI8oCC/ d5fJ7SeJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZMv1BQAKCRAk1otyXVSH0DwkB/ wLdg/UyqGcamMN1NStA3gnuq4KUFkBMnOgGe0MR/DTXqKb4z5c4AXSdU+WQZ8iFVP1nNFtpPERUinw 4ePvcXEwRCtiLVET0UOMyq8C06RslgakCPJJ6OgSXVXA18uKXsNjZVnLorkwhvNay5Xwxi39v1OX/k RhczmRj2zdB9EACANJtldzSkwNjt82ambXoCiQKkUKIXl/AHUOnlNc47v95rO5+Orn+spJUQW6adk9 SjKPRalND+QtLZvjmssYZWZZ95FxdBoVPz1iIosAzsfSRp63NMTXCypaergImIVq+q/079uw4cWLC+ d5oJfnBr7baCUCEDWA7aOHdSUOJrIK X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773235762535094613 X-GMAIL-MSGID: 1773235762535094613 Currently we guard FPSIMD/SVE state conversions with a check for the system supporting SVE but SME only systems may need to sync streaming mode SVE state so add a check for SME support too. These functions are only used by the ptrace code. Fixes: e12310a0d30 ("arm64/sme: Implement ptrace support for streaming mode SVE registers") Signed-off-by: Mark Brown Cc: stable@vger.kernel.org --- arch/arm64/kernel/fpsimd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index 520b681a07bb..b4afa0d147cc 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -679,7 +679,7 @@ static void fpsimd_to_sve(struct task_struct *task) void *sst = task->thread.sve_state; struct user_fpsimd_state const *fst = &task->thread.uw.fpsimd_state; - if (!system_supports_sve()) + if (!system_supports_sve() && !system_supports_sme()) return; vq = sve_vq_from_vl(thread_get_cur_vl(&task->thread)); @@ -705,7 +705,7 @@ static void sve_to_fpsimd(struct task_struct *task) unsigned int i; __uint128_t const *p; - if (!system_supports_sve()) + if (!system_supports_sve() && !system_supports_sme()) return; vl = thread_get_cur_vl(&task->thread); From patchwork Thu Aug 3 18:33:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130823 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1366149vqx; Thu, 3 Aug 2023 12:38:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlE6P17++r6VgS/9PrqOZzVP4JUT73yt0r45J7HvETfA9MRmmil4qqYkw5Kcpxl0Wh0L3dj8 X-Received: by 2002:a17:907:7851:b0:994:1880:dc32 with SMTP id lb17-20020a170907785100b009941880dc32mr10987587ejc.17.1691091520894; Thu, 03 Aug 2023 12:38:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691091520; cv=none; d=google.com; s=arc-20160816; b=OWbv+/7EtX6rhgUUSdTmFZKNqV6bDIZjmG9Rw80nkzSWsC2R12o/Wbciw8wjOhDX40 YHzALy4eGUw47YCV3eOamRPTD9Ll1xcXGPfLvX69h7qghUsf+WXUG/XKKrDmCdz4rqTT vACfFuV8Xgg3xrSjNLkDJ0TI6bszFOKomiKpvCRMg7pHPnDMP+q1J5Mv7wayNanaV3Nx tSLk7Vbz6rP2JqVadNWh68wl6VzUJTY/ZhiyGxTXpaIWHl4brePQHgDDKq+w6afDkXYz XnUgfrzouIVnNJkq1O+B+kDo371HiSof7UV/1YO0nzFTyXb1WaZKKg2uCC5tjeUzTMJd Wkdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=FOo27g6OGBz1yXIwui27KoT9Qrgl2/Es4a/C7ZFLmss=; fh=y1YNzMTa0VBjj3s8pV4LY81EkGsSKa5rhSScGuGiy5w=; b=wWz9MN2ZoXH+roObPinG0Nl0omcwZ6DMOIreVUgwV/Z6yZlxb72CyovGQujlVDzYj6 VyR5CEgaUVcxA3OX4eJ0PRoGXy+VfKNJbuHAtC2ldc1faKR7ypGMq/1lXc07kWu4zp4L clD1bhRe0pwMIiXR0gEP4AIrnu8+rW5F7rterL2pg5faYcaufwkTIJ9owJ81jdl9r9vH /icwdVpbUYpilUHxSqZR7lf+tMbs4rgPGoNryoqpUiWoAYkTbcYPUuaUdj0HgLrdmby/ aUUpQ0/w+2Pifshb4bPDCKoeiud3py8MchjwSsRP5pr7N9JWA6RWefY6uyU26FzVSYE/ 3xxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="iKhq/fj8"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s13-20020a170906a18d00b0099bd554e682si330541ejy.337.2023.08.03.12.38.16; Thu, 03 Aug 2023 12:38:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="iKhq/fj8"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S232083AbjHCSo1 (ORCPT + 99 others); Thu, 3 Aug 2023 14:44:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234018AbjHCSnj (ORCPT ); Thu, 3 Aug 2023 14:43:39 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85BC926B2; Thu, 3 Aug 2023 11:43:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7F64A61EAA; Thu, 3 Aug 2023 18:42:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E9D4C433CA; Thu, 3 Aug 2023 18:42:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691088143; bh=95Dt53hR2pyBz39OJo3JRDWSs/xQPgCW4Y8m1VN2MTo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=iKhq/fj8MaM0IEbTjBTPoJfjrkSC+hVn0SNJKfrodcO7wm+PSmBwo6mX9rS/4q+kH NGkaPQn3CV9peiWVaWBwzHzetYAdlJdIl1QwgHrQZ7KwHAcVYQP6c2KiEN9joGDv+a k5COH7hCFhp9SRu2HM++qTzRf6nNV9gXlOFtDmZYvYuRQv6a5x4YSpKCA3aS/5/Kdh G7v/O+d/MIuFI4f+/xM2jWRLO4DnV2WOVJUyvIPcSxvKuTHJA1HBwkCEbakQeA5mea ShpqaBq1fA6hXTCvv3Sn2TEJqIOFhhFNMP+9P5o/+NgSqLuVc4CKPzt0qoKNkzOzrs yyg+HG9Ip8H9Q== From: Mark Brown Date: Thu, 03 Aug 2023 19:33:23 +0100 Subject: [PATCH 3/3] arm64/fpsimd: Sync and zero pad FPSIMD state for streaming SVE MIME-Version: 1.0 Message-Id: <20230803-arm64-fix-ptrace-ssve-no-sve-v1-3-49df214bfb3e@kernel.org> References: <20230803-arm64-fix-ptrace-ssve-no-sve-v1-0-49df214bfb3e@kernel.org> In-Reply-To: <20230803-arm64-fix-ptrace-ssve-no-sve-v1-0-49df214bfb3e@kernel.org> To: Oleg Nesterov , Catalin Marinas , Will Deacon Cc: David Spickett , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Brown , stable@vger.kernel.org X-Mailer: b4 0.13-dev-034f2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1255; i=broonie@kernel.org; h=from:subject:message-id; bh=95Dt53hR2pyBz39OJo3JRDWSs/xQPgCW4Y8m1VN2MTo=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBky/UG59zUDvfiprOkSFdpvtR91Bq9XADckhG2g6Sc jiCzcImJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZMv1BgAKCRAk1otyXVSH0GTVB/ 9J8/zx7cdkXvm4pbhhG5E4Heen6fPAuF/GNuXHVhmgPYd/qRn9HZz93uR4OlhvCIkfOcMDsRWZVXZT XBjRbHU3zKf/+1X+diJZf22raEPYoYjwJK3EeRQkYjPMHz1DZQu1aPoposJKxxDDgNkzdRqNDSfFOp pxF2WiEK0O7hgXtI6r4Nx3OVHgw0oDATOC60HggBmXODZWQIzOpRvvFhgmBDm/F2mpje6VduU3dS/Y 6mUk3H4BLWwd64hpSiQfc70nAcG4BzcIoE0JItmKd4n2CZd4tVVqSs5AEdat3g61cwd1vYIyzZ92wB QcpSFIZpyStyDkPGwIe0m3j4ZOkhG2 X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773237982571456987 X-GMAIL-MSGID: 1773237982571456987 We have a function sve_sync_from_fpsimd_zeropad() which is used by the ptrace code to update the SVE state when the user writes to the the FPSIMD register set. Currently this checks that the task has SVE enabled but this will miss updates for tasks which have streaming SVE enabled if SVE has not been enabled for the thread, also do the conversion if the task has streaming SVE enabled. Fixes: e12310a0d30 ("arm64/sme: Implement ptrace support for streaming mode SVE registers") Signed-off-by: Mark Brown Cc: stable@vger.kernel.org --- arch/arm64/kernel/fpsimd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index b4afa0d147cc..8e8b853da616 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -835,7 +835,8 @@ void sve_sync_from_fpsimd_zeropad(struct task_struct *task) void *sst = task->thread.sve_state; struct user_fpsimd_state const *fst = &task->thread.uw.fpsimd_state; - if (!test_tsk_thread_flag(task, TIF_SVE)) + if (!test_tsk_thread_flag(task, TIF_SVE) && + !thread_sm_enabled(&task->thread)) return; vq = sve_vq_from_vl(thread_get_cur_vl(&task->thread));