From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 15564BA46 for ; Tue, 11 Jun 2024 14:48:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718117314; cv=none; b=QjKmaXfyJnlrJ+ZMHTZanBonrAIIzi3djxLpMGv3ucg+yJrKBH/+QULXILiHYVWjYmTYvKdDBlnoMztkBG8sH6tBRamA40+tqnyUbohgYE/xd6dxrtH3yjc3cSV1jwevcdlGJJCNSUxxr8xDPxRtKqCeXUABOVjFYuZP1EwK86U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718117314; c=relaxed/simple; bh=jhyNACNPRUWx2tghyuR8xlNvy0aSgKLXF1MAPp4fdvM=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=uK9Ab8GyutEyqAwkpycS8sQVIDrgnOiPm3jt7RkYrl5DqTROCQoUPGnGCY8J+4G9/0VDTFovb2iaL+a8/r5zdp0q9LvGbQCGionbrE2Ay4YmNn+yrI0bmD9CH1hk5aWgazs2U0JKBxW6d4aI5ZuOUDhEl6mini7zL46E3aMehnM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=i9bGQMz7; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="i9bGQMz7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718117311; 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=i2uRwoxp5l/Wre5aLzxGzreEj4zthWtwQnVtLKDb6n8=; b=i9bGQMz7GRX3DgqCnKY8HoFIH348KQm5KbPD497f/HD9xXkbfbMUKBJSgG35G2DW/IQuWh sQdUP0w6bmXCNJb3+bnmOc7CJdjxl38ZhbGpsac037VZoUhtVysOpdgOgWUN8sZzrV6fvw MU3YNbkFP6nbirH5upqHYZ2GIHXRrT0= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-2-CI46vg9gOja8AmaaM76rMg-1; Tue, 11 Jun 2024 10:48:30 -0400 X-MC-Unique: CI46vg9gOja8AmaaM76rMg-1 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-35f1f8d48b3so1359118f8f.0 for ; Tue, 11 Jun 2024 07:48:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718117309; x=1718722109; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:from:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=i2uRwoxp5l/Wre5aLzxGzreEj4zthWtwQnVtLKDb6n8=; b=HmU2cligTRdNsIjWqCKfW9OV/NQWmsQemL6LY+gXS4jpNXpw1JkMTE9ONPQ6z92qBz S85DTmQkhREXWGk/7i3Iy2ejB0yCgZdmSqSQcOC1pm/vnj3LQma1glm5eazjQRbLvDJ4 5kFgVd3FWcT3MkR3qHpBkW56Nn/EWu4XqhH6imr3w1JRL7AG6vQNdiHpdiPeAMqDTx0d bWvuEet27DMhLQiYW9olLsGYUixbjKqTd3FW2Tk9QVXY8CbkrdQn2NHeHE2Fie6wfX+8 ZncAP3nIlU6pJC6LTQ2FfEbWJOV2oKNp879MzYO/rPo+1WJui7mpK5+ADTv4rOCypTqa /kIA== X-Forwarded-Encrypted: i=1; AJvYcCUHvWe0lW4DLP8CsTltcpqlO6OtnZvtqX2Lt6s1AOLSebjjso4YYZdLCyDYZ9iBq18+S26YXlErHKxBPGYQljkkRgkzV7nUZJvhikRt X-Gm-Message-State: AOJu0Yzf5b87O42iaXLlB/ASQk06X2OjHZHNn/rVUp7LOaAra+GEw62R ywRnnIq/a+8qKZ6CiTvvNCFxVfcuujNZ25+67sWMEGsWwK5MQrfP6HBrhSHN4lzq3ftgB8mpDSv lyy4kj35PcAOWmbz1LmsMp8V1FaPlZgivrqwN5Dor2Dx4GI7hKejqwD7eq/8asQ== X-Received: by 2002:a05:6000:e81:b0:35f:1c34:adfc with SMTP id ffacd0b85a97d-35f1c34bddamr4674528f8f.67.1718117309161; Tue, 11 Jun 2024 07:48:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF5+M/IoNfKR9uTSnu3yR3X1G6f4YEsmSCSrTZUaYnR22BkEsPMtg1jNl6DUma5+1+g+WxhyQ== X-Received: by 2002:a05:6000:e81:b0:35f:1c34:adfc with SMTP id ffacd0b85a97d-35f1c34bddamr4674507f8f.67.1718117308689; Tue, 11 Jun 2024 07:48:28 -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-35f0d512556sm10557911f8f.29.2024.06.11.07.48.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 11 Jun 2024 07:48:28 -0700 (PDT) Message-ID: Date: Tue, 11 Jun 2024 16:48:27 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm/memory: Pass head page to do_set_pmd() From: David Hildenbrand To: Andrew Bresticker , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Matthew Wilcox References: <20240611141849.2788693-1-abrestic@rivosinc.com> <6b5392f5-209d-4d3e-b5c3-ba875bf8416d@redhat.com> Content-Language: en-US Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <6b5392f5-209d-4d3e-b5c3-ba875bf8416d@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11.06.24 16:46, David Hildenbrand wrote: > 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? To be precise, the something like following: diff --git a/mm/memory.c b/mm/memory.c index 5e633c9c27a8b..76f48dc5899cd 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4699,8 +4699,9 @@ vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page) if (!thp_vma_suitable_order(vma, haddr, PMD_ORDER)) return ret; - if (page != &folio->page || folio_order(folio) != HPAGE_PMD_ORDER) + if (folio_order(folio) != HPAGE_PMD_ORDER) return ret; + page = &folio->page; /* * Just backoff if any subpage of a THP is corrupted otherwise -- Cheers, David / dhildenb