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 D74CEC6FD1F for ; Tue, 2 Apr 2024 16:26:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5A8656B0085; Tue, 2 Apr 2024 12:26:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 530D76B0088; Tue, 2 Apr 2024 12:26:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3841E6B0089; Tue, 2 Apr 2024 12:26:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 168536B0085 for ; Tue, 2 Apr 2024 12:26:43 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id CBA3CA0373 for ; Tue, 2 Apr 2024 16:26:42 +0000 (UTC) X-FDA: 81965120244.08.052F684 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 74C4D1A001C for ; Tue, 2 Apr 2024 16:26:40 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JXR91Plu; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712075200; 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=ENr1d4J10g4AeYqK+mGTUPf5WJo1f2Wjr9/tCwk5nqA=; b=5LPbpkI89Cxbf0Epx/GF5eb5mRAi3PlRZ1qXuTe5OdqIJHWDYyLxq63Y1i+L2Xjl++Ihli kJWsqrNWK/oY07yRLUwiOwrGpBm4FrrA42iLVmqiuoN525ZqaQIzdqCWTWIA9hVpq5KJEd NiWr4mKkVFgkjl/wKWMYwg8oSb7geUc= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JXR91Plu; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712075200; a=rsa-sha256; cv=none; b=ljZAxfil2jdLr1bBmz4C67+9WLnhq550w0seNftg9Zkeq8A3ZNANnRywgubAw2Xx8F6ygC rOXfi2ipoPcCI7y7LjX9vGBmuanFzEo3M24rARb5fFPNtFvFx21iy6VkNPSM1ggJ0F4bFU 1tauzi0ibmTNwLcfF7m1JMMwrebhU88= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712075199; 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=ENr1d4J10g4AeYqK+mGTUPf5WJo1f2Wjr9/tCwk5nqA=; b=JXR91PluXO4eRiddYCAhIr6RAyWye9ZX9SfDimdVcblUQ0xlbqXoLE4W7k5zPXm57sO3x9 WFjtXNW/2UqUq6Ea91fc73Rd7GCXL4zMRawhhmVvOKbuOkxDJvcgVEcSuf7UsBmKq6A9zY 9WkxFQbdqr3NOU2eQU0y2DFK4cfyvQ0= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-369-2Np7iNYcOOaMidkyizzQfg-1; Tue, 02 Apr 2024 12:26:38 -0400 X-MC-Unique: 2Np7iNYcOOaMidkyizzQfg-1 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-699133268a7so1782786d6.1 for ; Tue, 02 Apr 2024 09:26:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712075198; x=1712679998; 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=ENr1d4J10g4AeYqK+mGTUPf5WJo1f2Wjr9/tCwk5nqA=; b=MgZuB9B4hHlFeHggk8hGW6gA6BT5qEquOmxx85kqF/tvZrBKimINS6awINK4wSmFxz 4qP3sTgiDVzTHiqsyBT3vOLmgG8UIEsuh2rwPyjxGjzOBptADapeTgEm6QWpDbQ513FF bSN0425dNrA87SIRz7jBporGWJGVdpICe3M6wVjxSBggYuaniDWiTJ5YniDpY/HjqSVk gLSNBcRbOP+6yDZPDQu08QQZJ8Rr1hc8J5RcBP06+eeinNQwL7wV1pdV+yK7gHt8ZGku 55uoMziS+C5J+G6CzJTueFOubz39edU8uOnKccAY+PT77KTSPq+3ZXSoLJ3FH0cGZYtS RnSA== X-Forwarded-Encrypted: i=1; AJvYcCUqCyG/FzZBqW/VQOGJSRcGNwrsevgE587lq7CZ9mUFQ0fSvGinGdOuUG0RxU+4V5OCKM802wG23wHd0lvU5n43FdQ= X-Gm-Message-State: AOJu0YwCZnm+0bEJnLJ4IAfAtgRLeHm5czutVWSYBzyvfx7CdbOkgCWd ZBbvtTvEye1E4x1egaeFUAbiUxLdif6VsRH+8jYx8iuL1x13XDeDO+7u1sqnHkGozDmtXa0uTIZ UsftkB4Ylu25ujATmueTd0JdwTmPuBS29np4K4QnKtlExotTZ X-Received: by 2002:ad4:5147:0:b0:696:ad00:7de6 with SMTP id g7-20020ad45147000000b00696ad007de6mr12744639qvq.2.1712075197419; Tue, 02 Apr 2024 09:26:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IESe1Q6chdggjLB702GYNKewIqqFGfYxT9Lhpeqe+bZtyFyRZXCf05tliTOOT6BQYbzd2WBdg== X-Received: by 2002:ad4:5147:0:b0:696:ad00:7de6 with SMTP id g7-20020ad45147000000b00696ad007de6mr12744591qvq.2.1712075196681; Tue, 02 Apr 2024 09:26:36 -0700 (PDT) Received: from x1n ([99.254.121.117]) by smtp.gmail.com with ESMTPSA id qm18-20020a056214569200b0068ff8bda6c7sm5656973qvb.92.2024.04.02.09.26.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 09:26:36 -0700 (PDT) Date: Tue, 2 Apr 2024 12:26:03 -0400 From: Peter Xu To: Ryan Roberts Cc: Matthew Wilcox , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yang Shi , "Kirill A . Shutemov" , Mike Kravetz , John Hubbard , Michael Ellerman , Andrew Jones , Muchun Song , linux-riscv@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, Christophe Leroy , Andrew Morton , Christoph Hellwig , Lorenzo Stoakes , Rik van Riel , linux-arm-kernel@lists.infradead.org, Andrea Arcangeli , "Aneesh Kumar K . V" , Vlastimil Babka , James Houghton , Jason Gunthorpe , Mike Rapoport , Axel Rasmussen Subject: Re: [PATCH v4 13/13] mm/gup: Handle hugetlb in the generic follow_page_mask code Message-ID: References: <20240327152332.950956-1-peterx@redhat.com> <20240327152332.950956-14-peterx@redhat.com> <5d9dd9a7-e544-4741-944c-469b79c2c649@redhat.com> <3f670f03-ee97-4368-94ca-e8d18a1b1a69@arm.com> MIME-Version: 1.0 In-Reply-To: <3f670f03-ee97-4368-94ca-e8d18a1b1a69@arm.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 74C4D1A001C X-Stat-Signature: bkx8uguu9s9jg18p9asc1te3yt1n8x3g X-Rspam-User: X-HE-Tag: 1712075200-834601 X-HE-Meta: U2FsdGVkX18vbQda5oOwhopeqvojZODKMuNz5ZrGclcvsQzTmzEj/+5wYYa7yLyADSEJwWwnlmJJEx5Y2mFZYU+X+3mAsWzUWTClbxGvxJ2SvDeU7kSgV/2c8auaNW1ud+KN3lmr41qu72JlDGHr2jkLoHvBof+2Lm8FhC84Tqq5lEUQ/PWWxdLbtxmHVtvZlQlZxHYXuxyySUQ+I2IiAFI0LsT6dig68/1VC6dlpm8KXqtQk71a0inSTl9OQ6CdhcwiaAoMX+IUDrtSBTmE+w+jPpiYNw3BMnabxhWYM0k5zrbZ0B/A3UlrmN1Cd3B9GYqw82OvNRDE+FIkXC+fsTg7ipFbZyf1iPTFzmgM7crTYDw5ipW4FGF7a17PqEFQ2hEXAIv1iE4YW2wx8jApie/U8n3CiAKpfyinOcnfqiDT3x3d2jggi2iZlZH1hmmIuh7q+206Iw0FSIq7v+SFQ+M11JOJ74R4bDw2gRxg55UNeJyl7VeZfZpd1IQq2ZzwIdvYjUcnkgAGAEsch8zGOaWh3jKxcfnREkKbCPwQsGZ9qwXll5rXxtrclwENMDOrx55wZaueE88UkaGAYqcgaaJNwVgprsuYVB0deCp8K9oFGTl4a/lhWLiVGyD675SEMwQ4Cafkfu8rN3ojekACj1sSoa7eVjOEsmzs5JLDBnmY5sTAowcpj5HP/QmEEbTbT7JpXmzbmrCWjsjoEKMzfLCpTnoxCivg7UluT2TzCom/lIXEd2r+8b+LIZQ6AnFpvmBz9gvCyuO5BWZXDTCJ+w4gEZjoZ56V5F/BKAHEa4Ai34Xca9xOddJ8UbGf8KADSPwy+9+w6RAbSsQY0QnHd/6/204giJ1gqjE6fIP4tQAiZ8nacMc8+MnqEObOYXl2fWt2Ca3VDqoCQWILnd7sojlPqeGQW4xBBiarvWW3+YzSn+2IcY2sAGiMn/BMAo+CvACQlFy8Rx1LBRB8nhR mg2tJZVu W2lzvAFBIFyXYZxz7Mnh7BM7ZaO57OvmWlCTG8w3TehxN5J3jgXurvF2TZam9zbutNj+Fq73VBLq+Xc0osEot9GpICWLrkMIepSOkRVe9xua53hl7LZx6zAbw3pYbm+8zlC0Hl55oYslfcAUrd0EIyLcgMY/I/OODSU61QSfp3e6IQpL9BwoBH2c9duyZWJ9739+XFRaWoFtBrRV8zdcJsTSvNOqOhBkrB6FDDwCIHrx5LDoISS3iG2FrMhy1FnLxpOcEf4M1oO24mBNoUTn3Xe2QQT4LrdSriLWQ0AuoTnS7wx/PmNH1o5IgJa+3Nh3YLiWywJMG5AuR+oZwPy2UyMYdN/2ZgPe2xP73ZivVLGiAl2uHsz/hp0rUDsL6pc3DfNoHNHufv0tVt0ZgTm7+szWFlh1Q3pvw06bP 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: List-Subscribe: List-Unsubscribe: On Tue, Apr 02, 2024 at 05:18:36PM +0100, Ryan Roberts wrote: > On 02/04/2024 17:00, Matthew Wilcox wrote: > > On Tue, Apr 02, 2024 at 05:26:28PM +0200, David Hildenbrand wrote: > >>> The oops trigger is at mm/gup.c:778: > >>> VM_BUG_ON_PAGE(!PageHead(page) && !is_zone_device_page(page), page); > >>> > >>> So 2M passed ok, and its failing for 32M, which is cont-pmd. I'm guessing you're trying to iterate 2M into a cont-pmd folio and ending up with an unexpected tail page? > >> > >> I assume we find the expected tail page, it's just that the check > >> > >> VM_BUG_ON_PAGE(!PageHead(page) && !is_zone_device_page(page), page); > >> > >> Doesn't make sense with hugetlb folios. We might have a tail page mapped in > >> a cont-pmd entry. As soon as we call follow_huge_pmd() on "not the first > >> cont-pmd entry", we trigger this check. > >> > >> Likely this sanity check must also allow for hugetlb folios. Or we should > >> just remove it completely. > >> > >> In the past, we wanted to make sure that we never get tail pages of THP from > >> PMD entries, because something would currently be broken (we don't support > >> THP > PMD). > > > > That was a practical limitation on my part. We have various parts of > > the MM which assume that pmd_page() returns a head page and until we > > get all of those fixed, adding support for folios larger than PMD_SIZE > > was only going to cause trouble for no significant wins. > > > > I agree with you we should get rid of this assertion entirely. We should > > fix all the places which assume that pmd_page() returns a head page, > > but that may take some time. > > > > As an example, filemap_map_pmd() has: > > > > if (pmd_none(*vmf->pmd) && folio_test_pmd_mappable(folio)) { > > struct page *page = folio_file_page(folio, start); > > vm_fault_t ret = do_set_pmd(vmf, page); > > > > and then do_set_pmd() has: > > > > if (page != &folio->page || folio_order(folio) != HPAGE_PMD_ORDER) > > return ret; > > > > so we'd simply refuse to use a PMD to map a folio larger than PMD_SIZE. > > There's a lot of work to be done to make this work generally (not to > > mention figuring out how to handle mapcount for such folios ;-). Hmm, I think it means there're more work than I was thinking... but that's okay, let's move one step at a time.. > > > > This particular case seems straightforward though. Just remove the > > assertion. > > Removing the assertion gets me further, but then I end up with this: > > [ 9.748422] kernel BUG at include/linux/page-flags.h:1098! > [ 9.748897] Internal error: Oops - BUG: 00000000f2000800 [#1] PREEMPT SMP > [ 9.749590] Modules linked in: > [ 9.749867] CPU: 2 PID: 1155 Comm: gup_longterm Not tainted 6.9.0-rc2-00210-g910ff1a347e4-dirty #12 > [ 9.750682] Hardware name: linux,dummy-virt (DT) > [ 9.751095] pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) > [ 9.751729] pc : follow_page_mask+0x730/0x850 > [ 9.752152] lr : follow_page_mask+0x730/0x850 > [ 9.752573] sp : ffff8000898f3aa0 > [ 9.752882] x29: ffff8000898f3aa0 x28: fffffdffc52b91a8 x27: 0000000000000001 > [ 9.753543] x26: ffff00014ae46d08 x25: 00003c0005d88000 x24: fffffdffc5d88000 > [ 9.754221] x23: ffffc1ffc0000000 x22: 0000000000080101 x21: ffff8000898f3ba8 > [ 9.754875] x20: 0000fffff4200000 x19: ffff0001a3d64450 x18: 0000000000000010 > [ 9.755567] x17: 2864616548656761 x16: 5021202626202965 x15: 6761702865677548 > [ 9.756254] x14: 6567615028454741 x13: 2929656761702864 x12: 6165486567615021 > [ 9.756953] x11: 2026262029656761 x10: ffffaaac08f1d6e0 x9 : ffffaaac0612f090 > [ 9.757671] x8 : 00000000ffffefff x7 : ffffaaac08f1d6e0 x6 : 0000000000000000 > [ 9.758356] x5 : ffff00017ffb9cc8 x4 : 0000000000000fff x3 : 0000000000000000 > [ 9.758983] x2 : 0000000000000000 x1 : ffff000189ecb480 x0 : 0000000000000046 > [ 9.759663] Call trace: > [ 9.759901] follow_page_mask+0x730/0x850 > [ 9.760293] __get_user_pages+0xf4/0x3e8 > [ 9.760683] __gup_longterm_locked+0x204/0xa70 > [ 9.761110] pin_user_pages+0x88/0xc0 > [ 9.761486] gup_test_ioctl+0x860/0xc40 > [ 9.761866] __arm64_sys_ioctl+0xb0/0x100 > [ 9.762254] invoke_syscall+0x50/0x128 > [ 9.762630] el0_svc_common.constprop.0+0x48/0xf8 > [ 9.763104] do_el0_svc+0x28/0x40 > [ 9.763413] el0_svc+0x34/0xe0 > [ 9.763699] el0t_64_sync_handler+0x13c/0x158 > [ 9.764139] el0t_64_sync+0x190/0x198 > [ 9.764465] Code: aa1803e0 d000d8e1 911d6021 97fff4c9 (d4210000) > [ 9.765053] ---[ end trace 0000000000000000 ]--- > [ 9.765520] note: gup_longterm[1155] exited with irqs disabled > [ 9.766146] note: gup_longterm[1155] exited with preempt_count 2 > [ 9.767366] ------------[ cut here ]------------ > [ 9.768062] WARNING: CPU: 2 PID: 0 at kernel/context_tracking.c:128 ct_kernel_exit.constprop.0+0x108/0x120 > [ 9.769146] Modules linked in: > [ 9.769429] CPU: 2 PID: 0 Comm: swapper/2 Tainted: G D 6.9.0-rc2-00210-g910ff1a347e4-dirty #12 > [ 9.770338] Hardware name: linux,dummy-virt (DT) > [ 9.770837] pstate: 204003c5 (nzCv DAIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--) > [ 9.771615] pc : ct_kernel_exit.constprop.0+0x108/0x120 > [ 9.772150] lr : ct_idle_enter+0x10/0x20 > [ 9.772539] sp : ffff8000801b3dc0 > [ 9.772913] x29: ffff8000801b3dc0 x28: 0000000000000000 x27: 0000000000000000 > [ 9.773769] x26: 0000000000000000 x25: ffff00014149e900 x24: 0000000000000000 > [ 9.774526] x23: 0000000000000000 x22: ffffaaac08e99d48 x21: ffffaaac08385730 > [ 9.775255] x20: ffffaaac08e99c28 x19: ffff00017ffc8da0 x18: 0000fffff5ffffff > [ 9.775924] x17: 0000000000000000 x16: 1fffe0002a57c9e1 x15: 0000000000000001 > [ 9.776619] x14: ffffffffffffffff x13: 0000000000000000 x12: ffffaaac07a06968 > [ 9.777246] x11: 000000ae44c42eec x10: 0000000000000ad0 x9 : ffffaaac06189230 > [ 9.777942] x8 : ffff00014149f430 x7 : 02c9acb509db422c x6 : 000000001015a9f0 > [ 9.778635] x5 : 4000000000000002 x4 : ffff555577c46000 x3 : ffff8000801b3dc0 > [ 9.779671] x2 : ffffaaac08382da0 x1 : 4000000000000000 x0 : ffffaaac08382da0 > [ 9.780703] Call trace: > [ 9.781150] ct_kernel_exit.constprop.0+0x108/0x120 > [ 9.781949] ct_idle_enter+0x10/0x20 > [ 9.782246] default_idle_call+0x3c/0x160 > [ 9.782624] do_idle+0x21c/0x280 > [ 9.782945] cpu_startup_entry+0x3c/0x50 > [ 9.783268] secondary_start_kernel+0x140/0x168 > [ 9.783818] __secondary_switched+0xb8/0xc0 > [ 9.784163] ---[ end trace 0000000000000000 ]--- > > > Which is caused by this: > > static __always_inline int PageAnonExclusive(const struct page *page) > { > VM_BUG_ON_PGFLAGS(!PageAnon(page), page); > VM_BUG_ON_PGFLAGS(PageHuge(page) && !PageHead(page), page); <<<< > return test_bit(PG_anon_exclusive, &PF_ANY(page, 1)->flags); > } > > Which is called from can_follow_write_pmd(), called just after the assert I just commented out. > > > It's triggered by this test: > > # [RUN] R/W longterm GUP pin in MAP_PRIVATE file mapping ... with memfd hugetlb (32768 kB) > > Which is the first MAP_PRIVATE test for cont-pmd mapped hugetlb. (All MAP_SHARED tests are passing). > > > Looks like can_follow_write_pmd() returns early for VM_SHARED mappings. > > I don't think we only keep the PAE flag in the head page for hugetlb pages? So we can't just remove this assert? > > I tried just commenting it out and get assert further down follow_huge_pmd(): > > VM_BUG_ON_PAGE((flags & FOLL_PIN) && PageAnon(page) && > !PageAnonExclusive(page), page); I just replied in another email; we can try the two patches I attached, or we can wait until I do some tests (but will be mostly unavailable this afternoon). Thanks, -- Peter Xu