From patchwork Tue Feb 27 07:54:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yaxiong Tian <13327272236@163.com> X-Patchwork-Id: 13573324 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.5]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 712B854F8F; Tue, 27 Feb 2024 07:55:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709020544; cv=none; b=bBx5n3pIi6dm9rAttAwwb0hi+XZG06fsIHoc0qU2bhDWbBu5qJQ7ZKC68T699PJmQcHGfqo0FQnzy8JOBVNuKmKG9jpVTJozxAb/GjhmJUOZxg/SbC+YzujFgIh83gD/iBkdEU7jQJq3lpjTnNhjFhcCpBqt9XBONLvyltQlFF0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709020544; c=relaxed/simple; bh=6ty8jdgljvLLv+9lW6qx0Ubbos6P6g7D6VDL1Ga3ZLY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=evW3I0ezZtTzNiELV8u47rnepQ0iNttasN90AJuXJ80l32ajFDzuR5PQoDaJSDzHan9MFngxJEzNURpAbV5oPdJjSY8VZALRW+D5vDKk7vmXfbcNPK9vFPYuUNlGk/hRgm8VUs0jSTFhqw15Mf0QN7ianAHtJHhhS4eb5CzU/GY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=IhXDmQzO; arc=none smtp.client-ip=220.197.31.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="IhXDmQzO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version: Content-Type; bh=YDOiH1n9soPl5lTH/spvm77AU3J5FjRMrdB1n8tcR+c=; b=IhXDmQzOWJ85+z2vuEnjot6GjhjYnbYl8pefGskbHZfpNRD9/qTXMLIgarf9WW 6mQ5Lcx4DNlWL7+TuGOj5TnlVz63HEL/fVn/ciLIfYysROZQcSdhIH+eFoG4zplo yAQ0xQ6ye36Q8pEgZws7A71bPXIcykeRGd4J104W3dCdU= Received: from tian-ThinkPad-X390.. (unknown [175.2.16.90]) by gzga-smtp-mta-g1-0 (Coremail) with SMTP id _____wDnj9BGld1l+Sw5AA--.10604S2; Tue, 27 Feb 2024 15:54:47 +0800 (CST) From: Yaxiong Tian <13327272236@163.com> To: catalin.marinas@arm.com, will@kernel.org, keescook@chromium.org, tony.luck@intel.com, gpiccoli@igalia.com, tianyaxiong@kylinos.cn, songshuaishuai@tinylab.org, xiongxin@kylinos.cn, rppt@kernel.org, wangkefeng.wang@huawei.com, akpm@linux-foundation.org, ardb@kernel.org, david@redhat.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH v2] arm64: hibernate: Fix level3 translation fault in swsusp_save() Date: Tue, 27 Feb 2024 15:54:44 +0800 Message-Id: <20240227075444.173057-1-13327272236@163.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: _____wDnj9BGld1l+Sw5AA--.10604S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxtFy8uFWrWr48XF43Cr1kAFb_yoW7WFWrpF WUGr1kGr4xCF1jyr4UAFy5uw1kGw40vanxJr1UJan7JF1UCr15Xr4UKry7KFyDtw4fXrs7 trWDKw40yF1DGaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jtDGOUUUUU= X-CM-SenderInfo: jprtjjaxsxjjitw6il2tof0z/1tbiRQiRJWXAkomvGgAAsy From: Yaxiong Tian On ARM64 machines using UEFI, if can_set_direct_map() return false by setting some CONFIGS in kernel build,such as NO CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT、NO CONFIG_RODATA_FULL_DEFAULT_ENABLED. swsusp_save() will fail due to can't finding the map table under the nomap memory. such as: [ 48.532162] Unable to handle kernel paging request at virtual address ffffff8000000000 [ 48.532162] Mem abort info: [ 48.532162] ESR = 0x0000000096000007 [ 48.532162] EC = 0x25: DABT (current EL), IL = 32 bits [ 48.532162] SET = 0, FnV = 0 [ 48.532162] EA = 0, S1PTW = 0 [ 48.532162] FSC = 0x07: level 3 translation fault [ 48.532162] Data abort info: [ 48.532162] ISV = 0, ISS = 0x00000007, ISS2 = 0x00000000 [ 48.532162] CM = 0, WnR = 0, TnD = 0, TagAccess = 0 [ 48.532162] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 [ 48.532162] swapper pgtable: 4k pages, 39-bit VAs, pgdp=00000000eeb0b000 [ 48.532162] [ffffff8000000000] pgd=180000217fff9803, p4d=180000217fff9803, pud=180000217fff9803, pmd=180000217fff8803, pte=0000000000000000 [ 48.532162] Internal error: Oops: 0000000096000007 [#1] SMP [ 48.532162] Internal error: Oops: 0000000096000007 [#1] SMP [ 48.532162] Modules linked in: xt_multiport ipt_REJECT nf_reject_ipv4 xt_conntrack nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 libcrc32c iptable_filter bpfilter rfkill at803x snd_hda_codec_hdmi snd_hda_intel snd_intel_dspcfg dwmac_generic stmmac_platform snd_hda_codec stmmac joydev pcs_xpcs snd_hda_core phylink ppdev lp parport ramoops reed_solomon ip_tables x_tables nls_iso8859_1 vfat multipath linear amdgpu amdxcp drm_exec gpu_sched drm_buddy hid_generic usbhid hid radeon video drm_suballoc_helper drm_ttm_helper ttm i2c_algo_bit drm_display_helper cec drm_kms_helper drm [ 48.532162] CPU: 0 PID: 3663 Comm: systemd-sleep Not tainted 6.6.2+ #76 [ 48.532162] Source Version: 4e22ed63a0a48e7a7cff9b98b7806d8d4add7dc0 [ 48.532162] Hardware name: Greatwall GW-XXXXXX-XXX/GW-XXXXXX-XXX, BIOS KunLun BIOS V4.0 01/19/2021 [ 48.532162] pstate: 600003c5 (nZCv DAIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 48.532162] pc : swsusp_save+0x280/0x538 [ 48.532162] lr : swsusp_save+0x280/0x538 [ 48.532162] sp : ffffffa034a3fa40 [ 48.532162] x29: ffffffa034a3fa40 x28: ffffff8000001000 x27: 0000000000000000 [ 48.532162] x26: ffffff8001400000 x25: ffffffc08113e248 x24: 0000000000000000 [ 48.532162] x23: 0000000000080000 x22: ffffffc08113e280 x21: 00000000000c69f2 [ 48.532162] x20: ffffff8000000000 x19: ffffffc081ae2500 x18: 0000000000000000 [ 48.532162] x17: 6666662074736420 x16: 3030303030303030 x15: 3038666666666666 [ 48.532162] x14: 0000000000000b69 x13: ffffff9f89088530 x12: 00000000ffffffea [ 48.532162] x11: 00000000ffff7fff x10: 00000000ffff7fff x9 : ffffffc08193f0d0 [ 48.532162] x8 : 00000000000bffe8 x7 : c0000000ffff7fff x6 : 0000000000000001 [ 48.532162] x5 : ffffffa0fff09dc8 x4 : 0000000000000000 x3 : 0000000000000027 [ 48.532162] x2 : 0000000000000000 x1 : 0000000000000000 x0 : 000000000000004e [ 48.532162] Call trace: [ 48.532162] swsusp_save+0x280/0x538 [ 48.532162] swsusp_arch_suspend+0x148/0x190 [ 48.532162] hibernation_snapshot+0x240/0x39c [ 48.532162] hibernate+0xc4/0x378 [ 48.532162] state_store+0xf0/0x10c [ 48.532162] kobj_attr_store+0x14/0x24 QEMU ARM64 using UEFI also has the problem by setting can_set_direct_map() return false. This is because in swsusp_save()->copy_data_pages()->page_is_saveable(), kernel_page_present() presumes that a page is present when can_set_direct_map() returns false even for NOMAP ranges.So NOMAP pages will saved in after,and then cause level3 translation fault in this pages. Since the NOMAP regions are now marked as PageReserved(), pfn walkers and the rest of core mm will treat them as unusable memory. So this regions should not saved in hibernation. This problem may cause by changes to pfn_valid() logic in commit a7d9f306ba70 ("arm64: drop pfn_valid_within() and simplify pfn_valid()"). So to fix it, we add !pfn_is_map_memory() check in arm64::pfn_is_nosave(). It make such regisons don't save in hibernation. Fixes: a7d9f306ba70 ("arm64: drop pfn_valid_within() and simplify pfn_valid()") Co-developed-by: xiongxin Signed-off-by: xiongxin Signed-off-by: Yaxiong Tian --- v1->v2: move !pfn_is_map_memory() check from page_is_saveable() to arm64::pfn_is_nosave() --- arch/arm64/kernel/hibernate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c index 02870beb271e..d90005de1d26 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -94,7 +94,7 @@ int pfn_is_nosave(unsigned long pfn) unsigned long nosave_end_pfn = sym_to_pfn(&__nosave_end - 1); return ((pfn >= nosave_begin_pfn) && (pfn <= nosave_end_pfn)) || - crash_is_nosave(pfn); + crash_is_nosave(pfn) || !pfn_is_map_memory(pfn); } void notrace save_processor_state(void)