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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 324C0C53209 for ; Mon, 27 Jul 2026 16:36:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1gp3O3BWWSeBzzuvNyeMddyx6G6KARHXl6ynwOEdEmY=; b=K3xEpHf0ENE9C0YWPXQ8WHImaY JlYNYO0sLwJBHv2vZO+qqyQ/B8nNj04R7NITWCpLEiiUr9uHVlouZZA6uBK70zfdAfeJqfPZcx5Rk nTPhsHUyB40Mn5sC9HC5RtIKwU0mlZ7B0wRVEGRubo+ilB7ZrsI2U27T+fadz2liYqeMFGszVhQrD Uz0VG4dhkDSv5ZC/8812Q8s87xA8YqZllLPbpvXrLOueCQgqJiPh8ApLU3MKmrwm7O7df+qeEpJLF HYtCKvwnxJ2ILIL+xvzZDB7qRpUWekJV6CLQnnhUQGP4XwraOth0zFYJyetmIg/dz6WGX9m2kI+R7 UbRBCJTQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1woOIt-00000003MiN-0qYa; Mon, 27 Jul 2026 16:35:47 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1woOIY-00000003MSR-4ADR for linux-arm-kernel@lists.infradead.org; Mon, 27 Jul 2026 16:35:28 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A6A401756; Mon, 27 Jul 2026 09:35:21 -0700 (PDT) Received: from login2.euhpc2.arm.com (login2.euhpc2.arm.com [10.58.100.22]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C45F43F86F; Mon, 27 Jul 2026 09:35:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1785170125; bh=bysQl1WcZIg2+dJdg0rX18Yrd1hJJmrjumw5xUq2uf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GLb48kt9CSvr7n7syYfv3vagles3m+UHDmNMgyYYXMdGgbCCgJO/0U5m/RDZIxZjk YTPwFlTMAkX5H5CVYpA7hx+Ygve4v0DXEYY64mSv/OR3M38VSVhjWd8mBtunf44Blu 8B6tmaXwA2AO+WTORr6TB3NHRBt4m+YYDsQYXUNo= From: Vladimir Murzin To: linux-arm-kernel@lists.infradead.org Cc: mark.rutland@arm.com, maz@kernel.org, will@kernel.org, catalin.marinas@arm.com, ruanjinjie@huawei.com, liaochang1@huawei.com Subject: [RFC PATCH v2 04/45] arm64: hibernate: Restore DAIF state on error Date: Mon, 27 Jul 2026 17:34:12 +0100 Message-Id: <20260727163453.7969-5-vladimir.murzin@arm.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20260727163453.7969-1-vladimir.murzin@arm.com> References: <20260727163453.7969-1-vladimir.murzin@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260727_093527_135241_14B22D30 X-CRM114-Status: GOOD ( 10.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Sashiko AI has reported that if swsusp_mte_save_tags() for some reason fails we return from swsusp_arch_suspend() with DAIF being masked - that is not what we'd expect. Restore the saved DAIF state before returning from the error path. Fixes: ee11f332af96 ("arm64: mte: Save tags when hibernating") Signed-off-by: Vladimir Murzin --- arch/arm64/kernel/hibernate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c index 1eb1c1074c5b..7bf117427777 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -348,8 +348,10 @@ int swsusp_arch_suspend(void) crash_prepare_suspend(); ret = swsusp_mte_save_tags(); - if (ret) + if (ret) { + local_daif_restore(flags); return ret; + } sleep_cpu = smp_processor_id(); ret = swsusp_save(); -- 2.34.1