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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5D74C47089 for ; Mon, 5 Dec 2022 22:22:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 41B998E0002; Mon, 5 Dec 2022 17:22:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3CC258E0001; Mon, 5 Dec 2022 17:22:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 26D668E0002; Mon, 5 Dec 2022 17:22:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 17CE28E0001 for ; Mon, 5 Dec 2022 17:22:03 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id E46B9AB057 for ; Mon, 5 Dec 2022 22:22:02 +0000 (UTC) X-FDA: 80209676484.21.4097185 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf18.hostedemail.com (Postfix) with ESMTP id D1A0C1C0009 for ; Mon, 5 Dec 2022 22:21:58 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=QZFTdFSm; spf=pass (imf18.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670278922; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xfuY/rftNe12LtQECmQkDZxRLOhvVmVx/6clwTxrx+Y=; b=JZ5s8Tl2M6WnUQrCFm57jszvJruoB6l1xaiezJm4/hBFCwckLZR6ZKRZ7SJKqgZwFNPk68 E/yGupSf2agci+G6Rt5VjXs8sH4G8SCbYrACAPuk0m6GppImpj2B4d5HCguGpJxZ7+/+TA 0vnVmM8IKca/27fiAeYyLcN7QON1CdE= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=QZFTdFSm; spf=pass (imf18.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670278922; a=rsa-sha256; cv=none; b=mure6TVHpDdKAVcuWSUsKLuq48EguMWv5k3GCg2TVv8/NdD57V9REaAw4BRhg8xjAtJM0F ZWIW9NSj+0pvnZEyaLUFOlGRrB4jvuYbocWN0icUZamiyZqhV67AMTa4Bnv0QEoYzxkcuf KCgPGaOlnm0AH8Fh9aD/G5z0GNKe/pg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670278918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xfuY/rftNe12LtQECmQkDZxRLOhvVmVx/6clwTxrx+Y=; b=QZFTdFSmmfQpwe9c19IAkC8LWrljWbbZMgv/f1+MBI+Z+bumu2EaKhshQB+65m2LVL4BmL UnE6X21Y/nPEUebITrzNUrAuWbhL/A9eD0TuOKbtijKFo7yNKYgybRIWWXJplX991UDpAR rFE1vXgdTZvrnsYQ6N5wldeQssnaZ58= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-651-Afrrzw3FPU6gQg5VCDsJ2A-1; Mon, 05 Dec 2022 17:21:49 -0500 X-MC-Unique: Afrrzw3FPU6gQg5VCDsJ2A-1 Received: by mail-qk1-f197.google.com with SMTP id bq13-20020a05620a468d00b006fa5a75759aso19023391qkb.13 for ; Mon, 05 Dec 2022 14:21:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=xfuY/rftNe12LtQECmQkDZxRLOhvVmVx/6clwTxrx+Y=; b=nbN6fIJdmARGD1UoZwjkzLb6Gsqw6E3lxUj7nib07zEBhFY+BnFUiw4FLcwmkyvgtO /crqiHtAQ0EDH3S0BJsln/gAzOA5GvFD9khLciCzHUsIjVeNH+UnuCeG4C+mzNrcQtZu kVvgaviuUd0rRofa/bRpeOhU6gF8zKCbZrSEuJyB3PuNNcSjfx+l6NoNgogWQj0/Moe5 NWvJKgbEsNvq8Uxgaf7uE+WNdxWKqXUemiiXJVSadVxVDwrYgeV3tpdd4TeonpokKWat Tydh9KJanlhEG2EZoebc3f5YgHO0aum1ByCgmgoGV2+5r60/c00dbTiRfGJtaojLtlGn a9iw== X-Gm-Message-State: ANoB5pkYuwi002SS6DDmYwzI5aMbj+un0xEYpW6P+aC2eSVpJFtv+Wsp +CiqOTRP29dLHAmPwbBEbaoLeEnyO3WLxjM8/Bhsf74BhNd/JWn1CLqDDTP4rz03NeoG1QVi2bS fq0DFnLX8MjM= X-Received: by 2002:a05:6214:87:b0:4c6:9068:140c with SMTP id n7-20020a056214008700b004c69068140cmr19239848qvr.69.1670278909095; Mon, 05 Dec 2022 14:21:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf4aKpyCwst6MnI3xhHA5hmk7opswlzxFx6usMu37ZCFLQnIOH3aQG7ORASOLZTPIok+Bgs/PA== X-Received: by 2002:a05:6214:87:b0:4c6:9068:140c with SMTP id n7-20020a056214008700b004c69068140cmr19239829qvr.69.1670278908826; Mon, 05 Dec 2022 14:21:48 -0800 (PST) Received: from x1n (bras-base-aurron9127w-grc-46-70-31-27-79.dsl.bell.ca. [70.31.27.79]) by smtp.gmail.com with ESMTPSA id d16-20020a05620a241000b006fa43e139b5sm4991915qkn.59.2022.12.05.14.21.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 14:21:48 -0800 (PST) Date: Mon, 5 Dec 2022 17:21:47 -0500 From: Peter Xu To: David Hildenbrand Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrew Morton , Yang Shi , Hugh Dickins , Andrea Arcangeli Subject: Re: [PATCH v1] mm/swap: fix SWP_PFN_BITS with CONFIG_PHYS_ADDR_T_64BIT on 32bit Message-ID: References: <20221205150857.167583-1-david@redhat.com> MIME-Version: 1.0 In-Reply-To: <20221205150857.167583-1-david@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: D1A0C1C0009 X-Stat-Signature: g5f5y14crpds9g98uzc3g63ypxij7fxb X-Spamd-Result: default: False [-1.40 / 9.00]; BAYES_HAM(-6.00)[100.00%]; SORBS_IRL_BL(3.00)[209.85.222.197:received]; SUBJECT_HAS_UNDERSCORES(1.00)[]; MID_RHS_NOT_FQDN(0.50)[]; RCVD_NO_TLS_LAST(0.10)[]; MIME_GOOD(-0.10)[text/plain]; BAD_REP_POLICIES(0.10)[]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; R_DKIM_ALLOW(0.00)[redhat.com:s=mimecast20190719]; R_SPF_ALLOW(0.00)[+ip4:170.10.129.0/24]; DMARC_POLICY_ALLOW(0.00)[redhat.com,none]; TO_MATCH_ENVRCPT_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[linux-mm@kvack.org]; DKIM_TRACE(0.00)[redhat.com:+]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; RCVD_COUNT_THREE(0.00)[4]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspam-User: X-HE-Tag: 1670278918-383007 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, Dec 05, 2022 at 04:08:57PM +0100, David Hildenbrand wrote: > We use "unsigned long" to store a PFN in the kernel and phys_addr_t to > store a physical address. > > On a 64bit system, both are 64bit wide. However, on a 32bit system, the > latter might be 64bit wide. This is, for example, the case on x86 with > PAE: phys_addr_t and PTEs are 64bit wide, while "unsigned long" only > spans 32bit. > > The current definition of SWP_PFN_BITS without MAX_PHYSMEM_BITS misses > that case, and assumes that the maximum PFN is limited by a 32bit > phys_addr_t. This implies, that SWP_PFN_BITS will currently only be able to > cover 4 GiB - 1 on any 32bit system, which is wrong. We can end up > masking off valid PFN bits from the swap offset. > > Ideally, we'd use something like "sizeof(phys_addr_t) * 8 - PAGE_SHIFT", > however, we might exceed SWP_TYPE_SHIFT and make the BUILD_BUG_ON() in > is_pfn_swap_entry() unhappy. Note that swp_entry_t is effectively an > unsigned long. > > Consequently, simply rely on SWP_TYPE_SHIFT in case we're on 32bit and > CONFIG_PHYS_ADDR_T_64BIT is defined. > > For example, on an 8 GiB x86 PAE system, we currently fail removing > migration entries (remove_migration_ptes()) that target PFNs above > 4 GiB, because mm/page_vma_mapped.c:check_pte() will fail to identify a > PFN match as swp_offset_pfn() wrongly masks off valid PFN bits. > > With THP, split_huge_page_to_list()->...->remap_page() will leave migration > entries in place and continue to unlock the page, which is wrong. Later, > when we stumble over these migration entries (e.g., via > /proc/self/pagemap), pfn_swap_entry_to_page() will BUG_ON() because these > migration entries shouldn't exist anymore and the page was unlocked. > > [ 33.067591] kernel BUG at include/linux/swapops.h:497! > [ 33.067597] invalid opcode: 0000 [#1] PREEMPT SMP NOPTI > [ 33.067602] CPU: 3 PID: 742 Comm: cow Tainted: G E 6.1.0-rc8+ #16 > [ 33.067605] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.0-1.fc36 04/01/2014 > [ 33.067606] EIP: pagemap_pmd_range+0x644/0x650 > [ 33.067612] Code: 00 00 00 00 66 90 89 ce b9 00 f0 ff ff e9 ff fb ... > [ 33.067615] EAX: ee394000 EBX: 00000002 ECX: ee394000 EDX: 00000000 > [ 33.067617] ESI: c1b0ded4 EDI: 00024a00 EBP: c1b0ddb4 ESP: c1b0dd68 > [ 33.067619] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 EFLAGS: 00010246 > [ 33.067624] CR0: 80050033 CR2: b7a00000 CR3: 01bbbd20 CR4: 00350ef0 > [ 33.067625] Call Trace: > [ 33.067628] ? madvise_free_pte_range+0x720/0x720 > [ 33.067632] ? smaps_pte_range+0x4b0/0x4b0 > [ 33.067634] walk_pgd_range+0x325/0x720 > [ 33.067637] ? mt_find+0x1d6/0x3a0 > [ 33.067641] ? mt_find+0x1d6/0x3a0 > [ 33.067643] __walk_page_range+0x164/0x170 > [ 33.067646] walk_page_range+0xf9/0x170 > [ 33.067648] ? __kmem_cache_alloc_node+0x2a8/0x340 > [ 33.067653] pagemap_read+0x124/0x280 > [ 33.067658] ? default_llseek+0x101/0x160 > [ 33.067662] ? smaps_account+0x1d0/0x1d0 > [ 33.067664] vfs_read+0x90/0x290 > [ 33.067667] ? do_madvise.part.0+0x24b/0x390 > [ 33.067669] ? debug_smp_processor_id+0x12/0x20 > [ 33.067673] ksys_pread64+0x58/0x90 > [ 33.067675] __ia32_sys_ia32_pread64+0x1b/0x20 > [ 33.067680] __do_fast_syscall_32+0x4c/0xc0 > [ 33.067683] do_fast_syscall_32+0x29/0x60 > [ 33.067686] do_SYSENTER_32+0x15/0x20 > [ 33.067689] entry_SYSENTER_32+0x98/0xf1 > > Fixes: 0d206b5d2e0d ("mm/swap: add swp_offset_pfn() to fetch PFN from swap entry") > Cc: Andrew Morton > Cc: Peter Xu > Cc: Yang Shi > Cc: Hugh Dickins > Cc: Andrea Arcangeli > Signed-off-by: David Hildenbrand Thanks for debugging this one. > --- > > This makes my x86 PAE case work as expected again. Only cross compiled > on other architectures. IIUC it's not about PAE but !SPARSEMEM, as PAE actually has it defined when with sparsemem: #ifdef CONFIG_X86_32 # ifdef CONFIG_X86_PAE # define SECTION_SIZE_BITS 29 # define MAX_PHYSMEM_BITS 36 # else # define SECTION_SIZE_BITS 26 # define MAX_PHYSMEM_BITS 32 # endif #else /* CONFIG_X86_32 */ # define SECTION_SIZE_BITS 27 /* matt - 128 is convenient right now */ # define MAX_PHYSMEM_BITS (pgtable_l5_enabled() ? 52 : 46) #endif One trivial comment below. > > --- > include/linux/swapops.h | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/include/linux/swapops.h b/include/linux/swapops.h > index 86b95ccb81bb..4bb7a20f3fa5 100644 > --- a/include/linux/swapops.h > +++ b/include/linux/swapops.h > @@ -32,11 +32,13 @@ > * store PFN, we only need SWP_PFN_BITS bits. Each of the pfn swap entries > * can use the extra bits to store other information besides PFN. > */ > -#ifdef MAX_PHYSMEM_BITS > +#if defined(MAX_PHYSMEM_BITS) > #define SWP_PFN_BITS (MAX_PHYSMEM_BITS - PAGE_SHIFT) > -#else /* MAX_PHYSMEM_BITS */ > +#elif !defined(CONFIG_64BIT) && defined(CONFIG_PHYS_ADDR_T_64BIT) > +#define SWP_PFN_BITS SWP_TYPE_SHIFT Can we add a comment showing where SWP_TYPE_SHIFT comes from? It should be a min value comes from either the limitation of phys address width, or from definition of swp_entry_t (which is unsigned long). Or I'd rather make this then the code explains better on itself, and the change should be smaller too: #ifdef MAX_PHYSMEM_BITS #define SWP_PFN_BITS (MAX_PHYSMEM_BITS - PAGE_SHIFT) #else /* MAX_PHYSMEM_BITS */ -#define SWP_PFN_BITS (BITS_PER_LONG - PAGE_SHIFT) +#define SWP_PFN_BITS MIN((sizeof(phys_addr_t) * 8) - \ + PAGE_SHIFT, SWP_TYPE_SHIFT) #endif /* MAX_PHYSMEM_BITS */ #define SWP_PFN_MASK (BIT(SWP_PFN_BITS) - 1) What do you think? > +#else > #define SWP_PFN_BITS (BITS_PER_LONG - PAGE_SHIFT) > -#endif /* MAX_PHYSMEM_BITS */ > +#endif /* defined(MAX_PHYSMEM_BITS) */ > #define SWP_PFN_MASK (BIT(SWP_PFN_BITS) - 1) > > /** > > base-commit: 76dcd734eca23168cb008912c0f69ff408905235 > -- > 2.38.1 > -- Peter Xu