From patchwork Mon Feb 26 03:42:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yaxiong Tian <13327272236@163.com> X-Patchwork-Id: 13571257 Received: from m15.mail.163.com (m15.mail.163.com [45.254.50.219]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3D3B11BC20; Mon, 26 Feb 2024 03:44:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.254.50.219 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708919054; cv=none; b=ONeK8sQrd7u2vvvt4yJfxM2oZ570L0yX+4s4b7TMJNoHQvF0wAw7du9xYNGOgVMzwNj9aVSfGg4OFAGyy+nTGgrlTrAgB2UXuQY0CkGUY0GoYrThkHtvxzSW7pqZBlggbaLfSw9+dMCNdgVzrWJ39Qq82sKUg+qoT9SuVLpSKwA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708919054; c=relaxed/simple; bh=Cs8RzTLxWjKHYVWlb2Iyv2mUBYHBeeXBS/PpihNFavM=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=Ocscg9yfUp6n6I+cKtnokpxBzmHRqWXAdoqF5Ubvwwt9JMqw/KE5VtNCmVDofCXWc1md0pM0dM+k0kllQ919UCLQ26536+KTGVhOcOnZ667EMntBAipOSamLV5d2SEnda3p/djoi3LXVX9K87tGJ5UR8AzvsZKTKxrPR5tmjsGU= 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=hsR4Bpa6; arc=none smtp.client-ip=45.254.50.219 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="hsR4Bpa6" 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=9Rybs8KInQJ0C057G0PgEOPSQr26naGjAXr4L52dsYQ=; b=hsR4Bpa64WuHdhOppQf/ln1Ev4029yuWV2XIgnQ1W3zAl1cWlJQ4FSUC1lV7j1 XfFR8Q6MTmES0s+fIoa0bPhoBXbdgyBGOmJEHiDcOZAtsncnoAaCaC8wTL/ZzfAX HM/pf0IZewdfcFAzsk5zUfzUguggqnOocP+W813h+ckJQ= Received: from tian-ThinkPad-X390.. (unknown [111.48.58.12]) by gzga-smtp-mta-g0-2 (Coremail) with SMTP id _____wD3X8+jCNxlq8t9Bw--.42406S2; Mon, 26 Feb 2024 11:42:28 +0800 (CST) From: Yaxiong Tian <13327272236@163.com> To: rafael@kernel.org, pavel@ucw.cz, len.brown@intel.com, keescook@chromium.org, tony.luck@intel.com, gpiccoli@igalia.com, akpm@linux-foundation.org, ardb@kernel.org, rppt@kernel.org, david@redhat.com, wangkefeng.wang@huawei.com, catalin.marinas@arm.com, will@kernel.org Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Yaxiong Tian , xiongxin Subject: [PATCH] PM: hibernate: Fix level3 translation fault in swsusp_save() Date: Mon, 26 Feb 2024 11:42:25 +0800 Message-Id: <20240226034225.48689-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: _____wD3X8+jCNxlq8t9Bw--.42406S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxAFWxXr4kJryftw47trWUJwb_yoWrKry8pF 4UGr1DGr4xAF1jyr4UtFyruw18Wr4jvanxXr1UJws7JF1UCw15Xr47KryUKF1Dtw43WFsF qrWDKa10ya1DGaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07b8lksUUUUU= X-CM-SenderInfo: jprtjjaxsxjjitw6il2tof0z/1tbiYQeQJWV4HPTFGgAAs5 From: Yaxiong Tian On ARM64 machines using UEFI, if the linear map is not set (can_set_direct_map() return false), 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. 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 saveable_page(). 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 --- kernel/power/snapshot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 0f12e0a97e43..a06e3b1869d2 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1400,7 +1400,7 @@ static struct page *saveable_page(struct zone *zone, unsigned long pfn) return NULL; if (PageReserved(page) - && (!kernel_page_present(page) || pfn_is_nosave(pfn))) + && (!kernel_page_present(page) || pfn_is_nosave(pfn) || !pfn_is_map_memory(pfn))) return NULL; if (page_is_guard(page))