From patchwork Wed Jul 26 12:12:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 126338 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp380984vqo; Wed, 26 Jul 2023 05:56:24 -0700 (PDT) X-Google-Smtp-Source: APBJJlEh+rarHd5g3eJJSRhT5D6KpgpAvnxEQfH2JWeTFQmmVmOFPJHli119AnAZSjE6eVsHhbao X-Received: by 2002:a17:906:cc57:b0:99b:4525:e06c with SMTP id mm23-20020a170906cc5700b0099b4525e06cmr1619965ejb.55.1690376184066; Wed, 26 Jul 2023 05:56:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690376184; cv=none; d=google.com; s=arc-20160816; b=jE9CVUGz1PtWbQ+WuZm/pIaqnjKm9hCqumHCj/ZA+9z0mc91vWpfSt8l03hubzF3+n ZztLBvgROaphm7uUhe+Bp6phEblkSVNZnyLWBtmLqY1TD7AlgCWD2UcSLVjUOH7cXhiR 79SXYURq9KQy/ySAgI2US96DE5dImr6dbTVMoFzWfsUcDNBM7X5fpcW9OuBtWUFV0NT6 vtzKhwYVYjXOAX39/yjLAZnghTr2FFgGrfhECntD78wvuJ4jAAr+becvDUDmCUiQR1Bo apV+LTZg2IMYggXZJYq8hgEVxNZZ7hlqa3mMIToKVMjSqpbBI8EkW4PgHcSl34wn0OGG ElmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=qFl0ujyU7Owxl/YZYv7mlcOfhztVGAhkTLy/gkuCPlM=; fh=mmnYMrzza9qIhc2+Z15/1GoW7mAEAg13yyzBwpaiwtk=; b=nWV49wVUOuLuZZ9Fa4esL/Jt4zTQrzTQF5kwIKBahaXalXd7GjM5rWdNkCMd0TFkLf WQWQGmqRSCHaZmjK5rr6d8g4MOrqESXX6TccnovfYRqDRkIoUNa3/6VooIvESN6ZS0k7 nYA26uN0EPt3pnGkU5Dg0jGgPkKy4DldEm9zBy28wg5npMGPPf9JAtnSVd6SI3QEJ+vJ xsPcQHIBOdcGgHEfUroTLMNjsdd10ukjYeVDcB2fq7THe7cQb8Ft6+OgvfX6gcEAgbRO 4W4EOT+2hU9RuMH488jV6qMbr/b648ixocfosnNZKWZjxQMXwbikhw+j3J8zFyy6X6gG O2yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=grI3BXVf; 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 qu6-20020a170907110600b0098e4aef0789si9838449ejb.613.2023.07.26.05.56.00; Wed, 26 Jul 2023 05:56: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=grI3BXVf; 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 S232632AbjGZMMw (ORCPT + 99 others); Wed, 26 Jul 2023 08:12:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230305AbjGZMMv (ORCPT ); Wed, 26 Jul 2023 08:12:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBF2D10F6 for ; Wed, 26 Jul 2023 05:12:50 -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 59B4561ACC for ; Wed, 26 Jul 2023 12:12:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D3B2C433C7; Wed, 26 Jul 2023 12:12:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690373569; bh=wrRT7NFd9Bvr4h7xBlJXhSHiN/+ljJthxlmIl+sdp2k=; h=From:Date:Subject:To:Cc:From; b=grI3BXVfYuZj5jhxCge8NKby94n2FQl3YTK24XIbikbudu53Q4eYR14zRZbcXd34B 84nHSdlLomsuo6wD+OTYdlc2V56iGiQiBjQWuRgd0s/K/oHn5UFDTTUROW0mFMCsNG G5YIz/9YeK81A7z2JX6DhPBkrQcD1XqV/vVBRGf2Hju0FkbP5+zlctqAoHT07mUY+m ME0lTHj0C4tqJ+eWKw5bxXAWr7Z3pu7JYTj/0Tjz5XwzHrLtj+pJlKDXDjk7RkKzl2 AtgK1DUvs2IQg10ck/uGiLWJV+7iQc+LpKoW4sqwzW+ccmUS9fB1Y7aW76FNwvbi8U ldVTMRIf5GPcw== From: Mark Brown Date: Wed, 26 Jul 2023 13:12:26 +0100 Subject: [PATCH] arm64/sme: Set new vector length before reallocating MIME-Version: 1.0 Message-Id: <20230726-arm64-fix-sme-fix-v1-1-7752ec58af27@kernel.org> X-B4-Tracking: v=1; b=H4sIAKkNwWQC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDI2MDcyMz3cSiXDMT3bTMCt3i3FQwnWJgZGJmaGxqkGpgpgTUV1CUChQGmxk dW1sLANpoOjBjAAAA To: Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-099c9 X-Developer-Signature: v=1; a=openpgp-sha256; l=1953; i=broonie@kernel.org; h=from:subject:message-id; bh=wrRT7NFd9Bvr4h7xBlJXhSHiN/+ljJthxlmIl+sdp2k=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBkwQ28nT3oB11vx/d16fqseVTVUqaRsgrKAtmNy 7sVPEzG89eJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZMENvAAKCRAk1otyXVSH 0I6iCACDyTJUice6NN3V4UbafqIBKJvRShR9TOXwtyNBAMs9qbt8MFZmV55YzspCkfwf5l8Dhth vGDCx5PDl8FrsctTwa8RtjLos6eNCUFcuMHoQRJ9vRURjIjccUSdzRxwYmAjj8uneKEaixZvx2L Mx5R2lwmC21SbxNo3Ocgil663++UgQvvJ77LW2qY7ZfPumBTF3mydC6E7tf5c8P1CLmwIGBPbDq rv9vy7dkmX1t7UnGxRCfumZOYMfXDSUa/7hq3x8E1lwDtjGPAtALRsC5Gz3JoONVFANgzRBEdv1 3Jwy8wLbX5SD9YOK/z3q+jKhWd6FkQUfDs1Ew9VpulouyAjA 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: 1772487897512197003 X-GMAIL-MSGID: 1772487897512197003 As part of fixing the allocation of the buffer for SVE state when changing SME vector length we introduced an immediate reallocation of the SVE state, this is also done when changing the SVE vector length for consistency. Unfortunately this reallocation is done prior to writing the new vector length to the task struct, meaning the allocation is done with the old vector length and can lead to memory corruption due to an undersized buffer being used. Move the update of the vector length before the allocation to ensure that the new vector length is taken into account. For some reason this isn't triggering any problems when running tests on the arm64 fixes branch (even after repeated tries) but is triggering issues very often after merge into mainline. Fixes: d4d5be94a878 ("arm64/fpsimd: Ensure SME storage is allocated after SVE VL changes") Signed-off-by: Mark Brown --- arch/arm64/kernel/fpsimd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- base-commit: d4d5be94a87872421ea2569044092535aff0b886 change-id: 20230726-arm64-fix-sme-fix-d02461350e06 Best regards, diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index 89d54a5242d1..c19092642920 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -917,6 +917,8 @@ int vec_set_vector_length(struct task_struct *task, enum vec_type type, if (task == current) put_cpu_fpsimd_context(); + task_set_vl(task, type, vl); + /* * Free the changed states if they are not in use, SME will be * reallocated to the correct size on next use and we just @@ -931,8 +933,6 @@ int vec_set_vector_length(struct task_struct *task, enum vec_type type, if (free_sme) sme_free(task); - task_set_vl(task, type, vl); - out: update_tsk_thread_flag(task, vec_vl_inherit_flag(type), flags & PR_SVE_VL_INHERIT);