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 CED35C3DA4A for ; Fri, 9 Aug 2024 17:33:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 50BF56B0089; Fri, 9 Aug 2024 13:33:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4BB7C6B0098; Fri, 9 Aug 2024 13:33:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 35D0F6B009E; Fri, 9 Aug 2024 13:33:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 164816B0089 for ; Fri, 9 Aug 2024 13:33:04 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 85DDE120DDE for ; Fri, 9 Aug 2024 17:33:03 +0000 (UTC) X-FDA: 82433402646.08.A7B22E3 Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by imf21.hostedemail.com (Postfix) with ESMTP id A4AD41C000A for ; Fri, 9 Aug 2024 17:33:01 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=VE3uKK9i; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf21.hostedemail.com: domain of vdonnefort@google.com designates 209.85.218.42 as permitted sender) smtp.mailfrom=vdonnefort@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723224732; a=rsa-sha256; cv=none; b=Tz890BsBtfq8/zVyUdbBOGbniKHYeF7vBuQC4SZ2ckGYCKu1uyPyqvo6kUuCkmmNGrbc2j wyImmRys9jG1y7ibxY1gFA+qmT/dDQ7d1frJ/usKTHxenLfJUPIoy+esROIsGbM2JxY4Ty Aik2aEtoggqVNj5HLVdQZs3OITHS9OA= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=VE3uKK9i; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf21.hostedemail.com: domain of vdonnefort@google.com designates 209.85.218.42 as permitted sender) smtp.mailfrom=vdonnefort@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723224732; 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=ereUzNK4DWvTNzQWOYCjmYPYZhGEXynrCwHRHEGdXSA=; b=1kFuzy8s0LzTB/SY18W9Hv8WvbYuegR/pfowzGNH+jSmKLPbQMdnMGSW5T97D7xvOz9964 86NsSf9w202ZP4TMghkT5OA0FyS/mPZqOsZ6Dy6BOg6rkj+VIsNxZFyx9WPetG+BM93GAJ KTDd78uBkgEfK3xlI51eqFsqRtrGOPo= Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-a7b2dbd81e3so306848366b.1 for ; Fri, 09 Aug 2024 10:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1723224780; x=1723829580; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=ereUzNK4DWvTNzQWOYCjmYPYZhGEXynrCwHRHEGdXSA=; b=VE3uKK9i1BLEu9M+UlKOR7BB6lMrHFRKtrdVtC08MTBTIFr36x3Wn82UTGpCGSlLiM qLd8NJTKVzAol2R+npNhlPRSieuvQ/8LtRwDwF57h6X75dCYYXSR5rlPnCGsL6UfXOY+ Sy0juJ1rV85mzh+jRnYBoMTO50ieGg2W51NvYKDViMkvtrppUlCW5AsO+cZ9WAjcMDU2 3vlmiA4mHe7pE5geoYSIs9YHqJFZ6VGLAGQD31dWpQshKuaa4PiYPgLu1xUSeEe3HNbQ G0pemruUXNgfryuR81MOCmFxtb5C7thPlZHgTAUb2XucoYRpR9qmAbWLIS/GeUQiPqPA HT7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723224780; x=1723829580; 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=ereUzNK4DWvTNzQWOYCjmYPYZhGEXynrCwHRHEGdXSA=; b=IB9RPPZiEc/1vpekyoYwUTEF6n55af50+SUVPZ4AUTkHqekdBTQA4/QojyAZV0Dmpg CQp+FQrlQP6BvJ0qDY3P4ZF4oPrPtkRDhLBGKPtmkb+JpEpG4UpBL0mEkAuyjz9lnqCk WqD+/OhQCx72U/3btQmCeLYji5ZMm2U9p/LygiXBFhLv2BAKSzoP5jXr7K1gbgRKjvfz SfqtUz1kAuZoOMyzaCEnLpAojjXp+ET2ig1RqOh/pmXsjocFuxxRR/Ku3aZgNimls6xj KUlhqgEJ7yxNvrLifBoepE6iTHhUzybuM/U9yX9FyeZAcByBbgTSez0AWNGsKJuNdU9+ Rt5w== X-Forwarded-Encrypted: i=1; AJvYcCWDWF8lMKeBU6lxipVgN4WS5A0YxU2Us/YKX9E2YTimRLeJEB7Fztw7UZHKjXkjeMlO8lEP0fsinyEyx93u2WFDXXE= X-Gm-Message-State: AOJu0YzEODt0yqVWH0U5Jz+XPpKUScWSPf0nSG5MAZtmUHXsXoYwzqIs wlyhk1Z5ohj9YkKhRLA49cUJTn7OXu7s6PokJkbmguc3UrVpSkzr9+0V8MA8PA== X-Google-Smtp-Source: AGHT+IHFg5ZujV87Lfz0/UJ1zhNH6C90AvUFHjbvuKyFoGTnYvm4K3OoNMdP/d9n94ARppYJWiagMQ== X-Received: by 2002:a17:907:e6d9:b0:a77:dafb:2bf9 with SMTP id a640c23a62f3a-a80aa65cf46mr193394466b.49.1723224779425; Fri, 09 Aug 2024 10:32:59 -0700 (PDT) Received: from google.com (203.75.199.104.bc.googleusercontent.com. [104.199.75.203]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7dc9ec8884sm858359766b.193.2024.08.09.10.32.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Aug 2024 10:32:59 -0700 (PDT) Date: Fri, 9 Aug 2024 18:32:55 +0100 From: Vincent Donnefort To: David Hildenbrand Cc: g@google.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrew Morton , "Matthew Wilcox (Oracle)" , Hugh Dickins , Ryan Roberts , Yin Fengwei , Mike Kravetz , Muchun Song , Peter Xu , surenb@google.com Subject: Re: [PATCH v2 08/40] mm/memory: page_add_file_rmap() -> folio_add_file_rmap_[pte|pmd]() Message-ID: References: <20231220224504.646757-1-david@redhat.com> <20231220224504.646757-9-david@redhat.com> <341acdcc-1745-436b-a3c7-26916b675175@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <341acdcc-1745-436b-a3c7-26916b675175@redhat.com> X-Rspamd-Queue-Id: A4AD41C000A X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: undc4g3759mewwzz7es4g1uzkfpwwr65 X-HE-Tag: 1723224781-557907 X-HE-Meta: U2FsdGVkX185SZQNuH0UJQOI4wfqc5uqZQ9BHzI04ssgO+KJP9+HxucjSa2FuA1RsYlRs+EKRR9eVcUQIcu1BYXu4NXX0ryfc8UvG3Mejgu/N50eDcBWNJj1Y8YPCi4fbiMtotXOMhA11RCfh0AvIJ9mw25Oz9UzQ6+3gdSfHZuaFT6+X66EREWzg4rAfaBMrHc595PaOElrPaLg+lS+wdw8gha0f51fMAoxN97TwesP341uYQR8xVIZelE7DuklWMbEcY9VaKsOALypuMOMtcgm+g6cYAXkbLVtrcOcDSd1BzuxGnnsXt4nTzFoajG5zN5bkfIW+UG4ErUuyeBkXUDkQ/CH1A7WHu4VpHaHRWPVo1zbHp7sqB7RtfwBvxiJaTkVC7gpY7ygJxlZ3tAzTp1sjZ/GiyFl39h1tTUlO16WACOSy+o8sLBEOxBftFEGgigLNTDaj6jVYlWUmueObbPbCar1cOXBDdAjdBcpeZvRQd5nHoiisC4hq+VvgqIJKQrT6yEICDaeqAUldkI+VSppjJmS8KLQsf0o9yFOBsXyNjwwWag3O540lW+LzMT+Mktqr0WYyFHfby6Hxs5ewq27C//jdw072x8de3rTZst1Vs4o3GMI5GojfhyYU8TC0T0wWGpbzqK4Iay0eqef44CkpCGpCemOkrlby8fVRIuX/8So3TQwwyjK6stkgjduOMs+fg+1w8iP1YKgRmwCCfCO3iNTfXf/Qa+SwT2LqgBPQWyxkM6YCd01nB+1t08lTdwarOIGGiMlIun2Fzmx1Tp2pX3m3RNZyLBiu8U7wH/gZtuwtPOTv9n+T2/2IjYpc3JFlTTd8GKjs76G9IDeWN9panfnoBXYvkIxXfy2c75ghXnNznP5DtP8nR+O5QzXIgqpjnP0fgTh9BoUm0whSvvTLJ/B8C8D9eqvdK5fqXSvqslnCazuEGnJs5Di7SaxyUn4KaqeHDNcfzERJqW eW/w4Kpr fmtdZik2p5ApdylGVvMkumuvnXOoubUGOwV85+ErIleJNEl2a24wnhwuDNbovJZy3J+AhT8DgUhRS2CLGX2QbboPCX1X7ATfJrYjpk+yCutprhhpI7A9In1aPEKQPmqhoPvYNxBAi/BrHvMno2ihnoqrcv039ykeFWW/IJS6kp9xxOvwqlne59l2vBB9JtyyRKTOOkMjHBBCORmbHvpPUJ2o9D3kRVmb8kvpNd/mUcZM370jdFkA4z5sxnqhNxI31XEXJ3qNB8U5KZP/P6B2QxXKU+/6/ZJDT7QEo1UqC3m11P4PCDcbt+6VM8LTGyJpzWietexHMazKAWkn/P9u80wfkhtD26yUWh4hr6xYcKw1jETeI2cKDnaRt5n++++9igdSUC4fPmnucGrVAr8ybwO81YD8LEBqrh+MBxCwTPKjKSvtAnA7Z0bff89WuB+0Mlkex92fvvwIwutl+3ttsaUY+9LvMWLs7ItM72J05tIORJDW5yC/VlVLjtdN/OtlWCFZS 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 Fri, Aug 09, 2024 at 07:27:27PM +0200, David Hildenbrand wrote: > On 09.08.24 19:13, Vincent Donnefort wrote: > > Hi, > > > > Sorry, reviving this thread as I have ran into something weird: > > > > On Wed, Dec 20, 2023 at 11:44:32PM +0100, David Hildenbrand wrote: > > > Let's convert insert_page_into_pte_locked() and do_set_pmd(). While at it, > > > perform some folio conversion. > > > > > > Reviewed-by: Yin Fengwei > > > Reviewed-by: Ryan Roberts > > > Signed-off-by: David Hildenbrand > > > --- > > > mm/memory.c | 14 ++++++++------ > > > 1 file changed, 8 insertions(+), 6 deletions(-) > > > > > > diff --git a/mm/memory.c b/mm/memory.c > > > index 7f957e5a84311..c77d3952d261f 100644 > > > --- a/mm/memory.c > > > +++ b/mm/memory.c > > > > [...] > > > > > vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page) > > > { > > > + struct folio *folio = page_folio(page); > > > struct vm_area_struct *vma = vmf->vma; > > > bool write = vmf->flags & FAULT_FLAG_WRITE; > > > unsigned long haddr = vmf->address & HPAGE_PMD_MASK; > > > @@ -4418,8 +4421,7 @@ vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page) > > > if (!thp_vma_suitable_order(vma, haddr, PMD_ORDER)) > > > return ret; > > > - page = compound_head(page); > > > - if (compound_order(page) != HPAGE_PMD_ORDER) > > > + if (page != &folio->page || folio_order(folio) != HPAGE_PMD_ORDER) > > > return ret; > > > > Is this `page != &folio->page` expected? I believe this check wasn't there > > before as we had `page = compound_head()`. > > > > It breaks the installation of a PMD level mapping for shmem when the fault > > address is in the middle of this block. In its fault path, shmem sets > > > > vmf->page = folio_file_page(folio, vmf->pgoff) > > > > which fails this test above. > > Already fixed? :) > > commit ab1ffc86cb5bec1c92387b9811d9036512f8f4eb (tag: > mm-hotfixes-stable-2024-06-26-17-28) > Author: Andrew Bresticker > Date: Tue Jun 11 08:32:16 2024 -0700 > > mm/memory: don't require head page for do_set_pmd() > Duh of course I haven't looked anything recent enough, my bad! Thanks for your quick answer! > > -- > Cheers, > > David / dhildenb >