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 AA7E9C27C75 for ; Tue, 11 Jun 2024 14:46:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 314B16B009F; Tue, 11 Jun 2024 10:46:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2C4956B00A0; Tue, 11 Jun 2024 10:46:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 13DCF6B00A2; Tue, 11 Jun 2024 10:46:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id E900F6B009F for ; Tue, 11 Jun 2024 10:46:17 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 7E33380C22 for ; Tue, 11 Jun 2024 14:46:17 +0000 (UTC) X-FDA: 82218883194.22.C957156 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf23.hostedemail.com (Postfix) with ESMTP id 2EE4D140016 for ; Tue, 11 Jun 2024 14:46:15 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ACbBUxMh; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf23.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718117175; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Jce3pdkqdZlrremKxwghUc29odD6rN0pClyz6qq6WC0=; b=hNIMO2RMRHRtaXAh4tQT//d/G0CcYHso5to1u9R3ivF8Z+zJB/Lm946Ifo+Tj6sKVTbSkr VCIR9WIR8A0EO2FTMJi1GgC66bamV4BSw6ucFd2uT6BGoQyfBBe/P11deQItCAE7YC4RXk 7NwG22aKOa9anCxxDacBW67q6yxBU0c= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ACbBUxMh; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf23.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718117175; a=rsa-sha256; cv=none; b=IAEGyekNRMzjgbaCuTLlpIQWrzH4ubW3aDaXZvXhz7D7la8ziVsvxtjm1C5pvCL8z+ES/Y +lk42O64XXOkEJX14cHIYFHl3kGS4XyI10QmxoUsInbc63rqDl9OpETPDeOKhqgeiGqty5 Bgm2yvcg4dqVSwZeNJ1xXgUsij6P/es= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718117174; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=Jce3pdkqdZlrremKxwghUc29odD6rN0pClyz6qq6WC0=; b=ACbBUxMh2fkNvJ+g38pT73IDDJqxFx/pHAzDFiOY3lYT2TorcmPiCTkfFMlZlrfyBLDmP8 yL+1S8Den6AqJ2dxeGn3jXI005n6eWZ8ATijlj37rx2/JFUodyRSD4aSzkdZWQgxi1WKZm OtKkDkr5ahxriiTv2+4WJ0rPue3ctvg= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-339-xz1MB2lHNfyyyP-9H4xbxg-1; Tue, 11 Jun 2024 10:46:04 -0400 X-MC-Unique: xz1MB2lHNfyyyP-9H4xbxg-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-421f3b7b27eso18216215e9.1 for ; Tue, 11 Jun 2024 07:46:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718117162; x=1718721962; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=Jce3pdkqdZlrremKxwghUc29odD6rN0pClyz6qq6WC0=; b=dr04qtqccegUNF+I05s3NTnldQe96KncfnVpmbNR/7WBb8RHKiyopqSc2XsVI+AJNR MBIHY0pOrmxNHSLub/an9qFw2O0T09aXVCmMMzn3Jj7dO7tlBrzxI1r/kbGgDf4IsTvE D/kmY2ae9dO5SUCjot7cssxxEi2LBCgXw9i7XW3RmCwRUg6le8ecrFDmoYaIWQpZKWkC V/WY4A//q9pCdd0h355yCxbLn/8AXWgJ6ts/H73MjF8U0sMSugt/kjQhhCwrRssYjugE qgwJ8513ydwmMm/iLKEnEshk4bgA18JSqV9kUIYD/WIoROSTlQIWpKQPV3zOScayN7nW N06A== X-Gm-Message-State: AOJu0YwBWnlDdE3+mRR0XrcsNKJaesFz/Cy5uoYHgM86u/TAkptoSgvo ciVvW+GM2yWQE4uNIirZZv322Sh0lw3KsKxqdO6xMuEnAe3ComrWEdjldueHDX9J3vTIcrds017 AZCXKhKAuQSc+ThYnI2CfKYmHzq2XuM4BhwuF/m/Qp6UG/PWp X-Received: by 2002:adf:e385:0:b0:35f:1b08:8b9b with SMTP id ffacd0b85a97d-35f1b088cefmr7253026f8f.34.1718117162548; Tue, 11 Jun 2024 07:46:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IECp8jAMekTi1TiI9P/squ83h89VUg7WD+tZRwORo4P4MPUGAvcLMBRnI/9kmj6Oou9/jx21A== X-Received: by 2002:adf:e385:0:b0:35f:1b08:8b9b with SMTP id ffacd0b85a97d-35f1b088cefmr7253006f8f.34.1718117162079; Tue, 11 Jun 2024 07:46:02 -0700 (PDT) Received: from ?IPV6:2003:cb:c748:ba00:1c00:48ea:7b5a:c12b? (p200300cbc748ba001c0048ea7b5ac12b.dip0.t-ipconnect.de. [2003:cb:c748:ba00:1c00:48ea:7b5a:c12b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35f1c423932sm8262043f8f.114.2024.06.11.07.46.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 11 Jun 2024 07:46:01 -0700 (PDT) Message-ID: <6b5392f5-209d-4d3e-b5c3-ba875bf8416d@redhat.com> Date: Tue, 11 Jun 2024 16:46:00 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm/memory: Pass head page to do_set_pmd() To: Andrew Bresticker , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Matthew Wilcox References: <20240611141849.2788693-1-abrestic@rivosinc.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20240611141849.2788693-1-abrestic@rivosinc.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 2EE4D140016 X-Stat-Signature: 1yioar9jphthibig885ms5dmph5b9or4 X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1718117175-954801 X-HE-Meta: U2FsdGVkX1/JZH80AFYwHtxthLxVoVWJ5xjyKWrOVonGS7zYiLMdBbdTCMzRXWC+TywYED+UESvYOmCZ1RheiA5EVTWEgWlwC4nGWd1MAHGmAihVIimnFDBQZWiTQWsubnt0b0h/fqJmECu50EKpwTF148n/De0AVNqvXKLK4so+Tb/8gdMoLYywOSzvognRpRp48mx+4BjlbDi91es5Rm7uqSouHPePocsCyhfKIVlsJGmyu0K8Qr8dMuawEcR1hEVlXm6WGi+NR2BktFo5Gn5dIvDJTo7UuUVgPaTc6MCq4ZoitxjBTeQ9eFJiggS0LdpJImzFh2sZT75mGzFXR7Z0ic0b4IuYd4jBta0gt0O341I1kr25dSRBE7o94u0oMcYT2SpjXTDn59bL/G4MZzrT8eYr2auyqeB77ljjaY6e8NFnj5stJfhoEfWNK7YCNT435ntFYvZTMugrH3g+nz75fccSjggx07UgPoEqVoW3vgRD4irc2ZfVP8ZvdMcEuB5L84bKu3T/ercVLefid2GSRT3O4RwsvFus8PNfyvqm4dxmXLfAkxrmg5aISanOF504ekAQEl8N5MyV6TMNm7LLAbdNcus3nZKyXrhoWohIBq76IFS35g7h0QLm5h07sXTxTSoCGyQixVWZnaJziJFnMa1tF4eIBZrTI28u1l+oHO6HtQuC3feD0m57JJwZ9Z4VMYwcNSHp36Bry2zmtQgZLg/urZlfRSMR5F9xgsSYHoyoWgNYeYnliWYGK2qOCGgsK8eB1Q2NXIgiZps+ZPtATulaz8Jo7mZKqyHS6epf7sEcUPlUCtcyKRIPNfxF9pWtX1nVVxPZMvg3IVUfwPtHSFHzZDiLe+slmMZcuiTNrlm2wyCgoIMr/q6sg9VTigBB9deY2tnw0ZNcN6Zli7X1q+8lJxZfL3rT1daJF00RG3Vn2sThdn395hM1S6plrNG9JaZRqHy/GKIQ4U+ I1dDB/Kr xS/082zvQJ7fNqtTfWVbyDDq/d/5bfOfSBpbedaRXw6/PtwfoA2Q3oZSW1/tFkgUSpz+IOYoTSg6xM6aLbJ+ZX2yO1K7ikHZAFQ7x1uDDLuXxAscip76giM+rNpybLD/e/R+Q7BzexJMSLyyXJj1YXiJhpEiw+/wOvRAydk70U39LvMs/BIgLM/KTeDYa33xTiwwP//xPp1KtVqKb6u4nZeVOyMAguImVUtohEyl3am55B95iu/0XuYfESV9ZDc/5T8UV/+sXjETRCc+Afnq+HkDPK2UXGogUTdmaIEq72flnav9M5b5PBL1wNN0bKeF9uYq4vb6BpVFLqkPReUaWrlsjLu9mYq+WAmHkH4Yrxp1IPYg+FO5fxU3ZbLcapDBKf5HSYliV7Hlt1w5T4Do812o6NUVi2yvrIvOmlYBrPx/kCwMhiRdnI8pB8uz2DPXJnqxzvpBOFZYgm93y4e39DbtWZLkedddjXNUgYHxfXwiQq2Hl6WKFxAay6sqwl2CA6laP5znx3Wm21uT36DXX227WvE+HyBEf4AtWJKFMdcqGsv7/z1TX8fI8UFcm5N2F1baB 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 11.06.24 16:18, Andrew Bresticker wrote: > The requirement that the head page be passed to do_set_pmd() was added > in commit ef37b2ea08ac ("mm/memory: page_add_file_rmap() -> > folio_add_file_rmap_[pte|pmd]()") and prevents pmd-mapping in the > finish_fault() path if vmf->page is anything but the head page for an > otherwise suitable vma and pmd-sized page. Have finish_fault() pass in > the head page instead. > > Fixes: ef37b2ea08ac ("mm/memory: page_add_file_rmap() -> folio_add_file_rmap_[pte|pmd]()") > Signed-off-by: Andrew Bresticker > --- > mm/memory.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/memory.c b/mm/memory.c > index 0f47a533014e..f13b953b507c 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -4764,7 +4764,7 @@ vm_fault_t finish_fault(struct vm_fault *vmf) > > if (pmd_none(*vmf->pmd)) { > if (PageTransCompound(page)) { > - ret = do_set_pmd(vmf, page); > + ret = do_set_pmd(vmf, compound_head(page)); > if (ret != VM_FAULT_FALLBACK) > return ret; > } That certainly makes the "page != &folio->page" check happy. It is *likely* incorrect if we would ever have folios > PMD size (which we don't have on that path yet). I assume that the thp_vma_suitable_order() check would detect any kind of "different placement of the folio in virtual address space", where we could mess up. Question is: should we instead drop the "page != &folio->page" check that I added? I think I added that check because I saw the "compound_order(page)" check and assumed it would return 0 for tail pages, but missed that we get the compound head first. -- Cheers, David / dhildenb