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 43789EB64D7 for ; Tue, 20 Jun 2023 15:24:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DAC588D0005; Tue, 20 Jun 2023 11:24:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D35238D0001; Tue, 20 Jun 2023 11:24:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BD5F38D0005; Tue, 20 Jun 2023 11:24:13 -0400 (EDT) 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 AA17E8D0001 for ; Tue, 20 Jun 2023 11:24:13 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 2D3F6121237 for ; Tue, 20 Jun 2023 15:24:13 +0000 (UTC) X-FDA: 80923497186.25.E1CED3E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf05.hostedemail.com (Postfix) with ESMTP id B9AB4100007 for ; Tue, 20 Jun 2023 15:24:09 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SQeVPJMI; spf=pass (imf05.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@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=1687274650; 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=8L1z0Wqyx26HGhyycMO2j7Hbz2K4sdr/Xuz4e1iXzyM=; b=4i3uElhdLQhlEuQq2tHM+iA8IYXqQ7foHWIhklDMga62uCzeX1xncgIiFQQD2q4wSnRpbV aVWvNt4Jp7mC2BTQR0s8ImoyRuI5Vp707WZ5dmbgccODw8fvnC+DX+FhWJtR0hn0/+4McC mPsg6oUfhuPlAFmRiqmdNOD5fjV8p0s= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687274650; a=rsa-sha256; cv=none; b=BG79yCuspFSBd9J5D2Eh3+cRz+csd+SPhHe86vVvX/Gz4srfTfWecaSKp9IiHmly9X8TvR xclDykHm7+dC4KdXfRhVxEL+MVyPtvMsBEolL4GQi3/lKDyq0pN8IztgIAU7WbOKqsQolO g6FAx1EXsYVKmMAXh1j+jjv8DUBg4Kw= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SQeVPJMI; spf=pass (imf05.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687274645; 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; bh=8L1z0Wqyx26HGhyycMO2j7Hbz2K4sdr/Xuz4e1iXzyM=; b=SQeVPJMIRaaQSlTjZtDpSw4p7JEMQ/3VLi5CUTInZtfnqS9923BEf5wgsOgEtzRXPCrP7x IHjAD+WNkpBtunFKud3NRHlEOxkDjGCfdaN7LsqO+/w4+RoIaBzUqxgXs8g7paLUGVR6bn JB/KItO4pwW8LFu1qOmE2BDG5Wblkrs= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-356-RhSF4RAaNueboYPw-Ze1GA-1; Tue, 20 Jun 2023 11:23:20 -0400 X-MC-Unique: RhSF4RAaNueboYPw-Ze1GA-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3127d83b31cso410876f8f.1 for ; Tue, 20 Jun 2023 08:23:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687274591; x=1689866591; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8L1z0Wqyx26HGhyycMO2j7Hbz2K4sdr/Xuz4e1iXzyM=; b=H20qAI81w+OouhwTDK7RFNLBoBmak+pWXVq0uaN9b8tGZTlv4Wxb+G6JkBXbv5uKFk c7I69RAYTr5hqWjM31KbmZeR/hjX+rIZhfN/b0hqtmxkNsJ+b+eA1VvUW1vpS8/Gh8Gl be/mL9r+OcQK5Th2VRCFsQz93pdl9KQBfMpPqXgkMqWplnHcdT9opDZSdI/uxDtOmUIr 4joVfvKWhu7VfYwvfAKj6WJX8wI9o18QKK0XHSiVy4XjpL/EcdyN4xTmZ9IrF8NJSU0a PE4i4dO7nK3a1LaO/3fFjGEmht4WyEOO7mEQ+IbVYdOtLr0FWCgxRc0EGeHyqGcTP8Ji I8og== X-Gm-Message-State: AC+VfDwwKF5cgYzBMjVxZXzoEpqQXSRTzYLUmdVxzoFQTjTZwrvVz2Hm XfWxjmsjsTKaCUVwTo83epDALJxioxlqK/Q7oKcn2TrVwuM37yvSz6YNwAVuWRhYZW6DmrjLPDo 7vyia/4aI4/Q= X-Received: by 2002:a5d:43c2:0:b0:311:1cd8:b97a with SMTP id v2-20020a5d43c2000000b003111cd8b97amr8317356wrr.47.1687274591220; Tue, 20 Jun 2023 08:23:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Ehs5Fiel37p+ImJ7RiGKTf2LxRLyh21P1eDQ/5tasNmWuOmkixCQq8AEkISpidQTelMdy5w== X-Received: by 2002:a5d:43c2:0:b0:311:1cd8:b97a with SMTP id v2-20020a5d43c2000000b003111cd8b97amr8317335wrr.47.1687274590816; Tue, 20 Jun 2023 08:23:10 -0700 (PDT) Received: from [192.168.3.108] (p4ff23bc9.dip0.t-ipconnect.de. [79.242.59.201]) by smtp.gmail.com with ESMTPSA id o19-20020a05600c511300b003f8fe1933e4sm15580121wms.3.2023.06.20.08.23.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 20 Jun 2023 08:23:10 -0700 (PDT) Message-ID: Date: Tue, 20 Jun 2023 17:23:09 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH v2 3/8] mm/hugetlb: Add page_mask for hugetlb_follow_page_mask() To: Peter Xu , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrea Arcangeli , Mike Rapoport , Matthew Wilcox , Vlastimil Babka , John Hubbard , "Kirill A . Shutemov" , James Houghton , Andrew Morton , Lorenzo Stoakes , Hugh Dickins , Mike Kravetz , Jason Gunthorpe References: <20230619231044.112894-1-peterx@redhat.com> <20230619231044.112894-4-peterx@redhat.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20230619231044.112894-4-peterx@redhat.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: B9AB4100007 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: c4kmkgebno8btssxcs84fwbjfihxuja1 X-HE-Tag: 1687274649-187739 X-HE-Meta: U2FsdGVkX18kADXvkCNiGpZZmXH61yCu6k8GB4vETBX4Ikj4VxpmKkmCKkDGqYXeXMk/Ve5rGonrdR0KgEGArQFlWe5GmVc3nrYLgiIlTiCGHb7AKufSqMjdu+iUaaRONbceS7SoCYCmIjxNeaekCj4NRG5FJ7zcY5BIUpqP50XQoCaTk//cS9CW60XHuRo9mbPlnN2EkHx5/TBEV/cD8eV0yHSOyxaAzeOEjw5c7ct0zJIjh5P3BAECBvNG7NTXA+hDeE1qeNVDuw+e1sCOqXGO2kjjuptl6UDhkj6lavUJwlchPKpkz+bO/5MQMIkfrTfXXfDn9J0oaKRD5hLJ+Ufn63FdhMNwsXmClrLDn/XNHSq2lR+I7ulR5D88dCsqXvCvjsr4BSJPQfd502qrSbre+XWpWKp5Qd2zCayXb4wylRHtCDkmsvSp0VOGqmBUwBmjVMVkDG40/IeIzS/cXuWl5nlUBZy9zrloNYvQ1uhyKtYMIh1wGNchIyfIVEMc/ca582hBOFUdmF/Jv2brDk2TopYAkVPaIrntpiuO1KgpvPWSq348ZuPjyLyQ7PwG0gzMO7kkeTOFFhlfmkTEPW13GMvySRSzvHktE5nI1eZH7+q633zW4DTgXvNiLmyW4zRSSmpPLjao6yYnsutjd9+PagVuEY/JMVPF0iPLLfRRYlsEw/KlhvnSLoAsOwinPBKKSuhY5XHm1/Q67ODPzk1d/V1GnxuKI9Nv+8dU86y5pFHCvVTySXPsf1Dk18opfBBoZorl/iIrUuneT5dpeijAbKQXWpQZdYo0Tr79KycIWmoaGblG+Z1bKiYySSvaXJrcR20yXG+LHbM4HSJ6Ptal9chYJcLnqJT/7PKoFRWPFKRKhdVkqDdX8iaYATAoEPzao3fx2+k+PUVkIrsvyN0aOfrqpnBAcXZfgcVQrtjnimqn3lgRDQO2Z1plnG+DEUtzo8hL34nOigoID3j NvTAkH7S sLGnU5FoHHNuzjk308C1OxZ+4IkkJUJedT8JSrpZkY5YXh+ojNCTmb2ukbohib1DXN61XrlJaBLdegRRuZNZ3lCZVdOo1rs88NKPWzJIW0nyfSLChpYx+vS7F68FL6PfYJzRGPf7QdTGPW+LwJU2UxMCDUnSIM0B7vSP3ecb7SylcXhNn3B21tcgajFrB+Y5swpRasH38SOb/oatp3BvziBoKsK4jtv6lk0hxldQovfbpaUdmsGfbvbMce/rXxwyeohSK6XPaHKD/jDp0YZM58IAV8slipH4BDoCQWABZ+4j5NLN3yQIjTPqh4hiBFvYlNp5YYXrakNsJM77HJRXDz2tCCmqRZMfQxTxc2LgGljKIxr0VzBApeMziGIQHvqBA/0XzRb7WZMX0byoi4oLAh9y61g01lgTX8H7SCzOmc4n4bjpeitILoCFZgyn0CyD7amFi/V+7Q+W3v5uxC80efkRX8XjMG5f9KEXc 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 20.06.23 01:10, Peter Xu wrote: > follow_page() doesn't need it, but we'll start to need it when unifying gup > for hugetlb. > > Signed-off-by: Peter Xu > --- > include/linux/hugetlb.h | 8 +++++--- > mm/gup.c | 3 ++- > mm/hugetlb.c | 5 ++++- > 3 files changed, 11 insertions(+), 5 deletions(-) > > diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h > index beb7c63d2871..2e2d89e79d6c 100644 > --- a/include/linux/hugetlb.h > +++ b/include/linux/hugetlb.h > @@ -131,7 +131,8 @@ int move_hugetlb_page_tables(struct vm_area_struct *vma, > int copy_hugetlb_page_range(struct mm_struct *, struct mm_struct *, > struct vm_area_struct *, struct vm_area_struct *); > struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma, > - unsigned long address, unsigned int flags); > + unsigned long address, unsigned int flags, > + unsigned int *page_mask); > long follow_hugetlb_page(struct mm_struct *, struct vm_area_struct *, > struct page **, unsigned long *, unsigned long *, > long, unsigned int, int *); > @@ -297,8 +298,9 @@ static inline void adjust_range_if_pmd_sharing_possible( > { > } > > -static inline struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma, > - unsigned long address, unsigned int flags) > +static inline struct page *hugetlb_follow_page_mask( > + struct vm_area_struct *vma, unsigned long address, unsigned int flags, > + unsigned int *page_mask) > { > BUILD_BUG(); /* should never be compiled in if !CONFIG_HUGETLB_PAGE*/ > } > diff --git a/mm/gup.c b/mm/gup.c > index abcd841d94b7..9fc9271cba8d 100644 > --- a/mm/gup.c > +++ b/mm/gup.c > @@ -780,7 +780,8 @@ static struct page *follow_page_mask(struct vm_area_struct *vma, > * Ordinary GUP uses follow_hugetlb_page for hugetlb processing. > */ > if (is_vm_hugetlb_page(vma)) > - return hugetlb_follow_page_mask(vma, address, flags); > + return hugetlb_follow_page_mask(vma, address, flags, > + &ctx->page_mask); > > pgd = pgd_offset(mm, address); > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 9a6918c4250a..fbf6a09c0ec4 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -6454,7 +6454,8 @@ static inline bool __follow_hugetlb_must_fault(struct vm_area_struct *vma, > } > > struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma, > - unsigned long address, unsigned int flags) > + unsigned long address, unsigned int flags, > + unsigned int *page_mask) > { > struct hstate *h = hstate_vma(vma); > struct mm_struct *mm = vma->vm_mm; > @@ -6499,6 +6500,8 @@ struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma, > page = NULL; > goto out; > } > + > + *page_mask = ~huge_page_mask(h) >> PAGE_SHIFT; As discussed, can be simplified. But can be done on top (or not at all, but it is confusing code). Reviewed-by: David Hildenbrand -- Cheers, David / dhildenb