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 697F7C38142 for ; Wed, 1 Feb 2023 09:09:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F0A7B6B0071; Wed, 1 Feb 2023 04:09:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EBB9C6B0072; Wed, 1 Feb 2023 04:09:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D83466B0074; Wed, 1 Feb 2023 04:09:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id C4CC56B0071 for ; Wed, 1 Feb 2023 04:09:51 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 8DDA380D35 for ; Wed, 1 Feb 2023 09:09:51 +0000 (UTC) X-FDA: 80418150582.13.BCFDCD8 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf21.hostedemail.com (Postfix) with ESMTP id 698CF1C000A for ; Wed, 1 Feb 2023 09:09:49 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TdSve9pM; spf=pass (imf21.hostedemail.com: domain of david@redhat.com designates 170.10.129.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=1675242589; 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=0RRZfXa0Y7v0WArNWeRlQa28FjkOkpUn1yaUnYCjLFI=; b=CUguO5oIFAzoKCk2sRFUSCEIsSn4zxkKLbqP5SndFUrh7RFTZ2pc0oqSnjOYrKm2Zy1td8 T8oHKqgPpzDF8x5GCXg7VjzaOWit6m/L/OnU8J7yLzv5n6xVoSf0sfNpa8dbsBtwALhzyG 5xsCpnVl+oWO1UVBqDquExL/RD+4NBA= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TdSve9pM; spf=pass (imf21.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675242589; a=rsa-sha256; cv=none; b=1LNo8SKDbm4j6+ctWp9ex7myTjYy3HkNaqdr4LFNpwsieiE6QAjZZur6JcbjsMs+mFqNrK A1Z67zsJcHpAMRkZNlWfpW7g7ZyFq3uh57oF/jn9pA2LeoNGEaoJlXpOTMfU1Zn3jO439V 8D2jog8DmVisu+dkqlSvDPOLS6psgh8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675242588; 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=0RRZfXa0Y7v0WArNWeRlQa28FjkOkpUn1yaUnYCjLFI=; b=TdSve9pM5mUKt9urZTYKX+w2vMpeTeTxalLuO8NiH3rVP9jADfXMQCbX3RoQWtl8ya+sDC yxcH2KDQnh6v91sVYoDZ5TLMhzmZF+ZC6QuhdODxuj9/cofCXoB+sRuRtUxVRvW8TE2kbX fCnCY+qoVqQ2FkTJ3mjykV36/MnqA2E= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-43-kgHbo6YfM0q-ybukShB5xQ-1; Wed, 01 Feb 2023 04:09:47 -0500 X-MC-Unique: kgHbo6YfM0q-ybukShB5xQ-1 Received: by mail-wm1-f69.google.com with SMTP id l38-20020a05600c1d2600b003ddff4b9a40so679591wms.9 for ; Wed, 01 Feb 2023 01:09:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=0RRZfXa0Y7v0WArNWeRlQa28FjkOkpUn1yaUnYCjLFI=; b=fVqXrLotctLr70BbRtDlLsHZi+VunQt7s2d6zTFgqjs08BWaQJiWHN1q++Bm1xPqCa VDLqcaEkccpIE5jeikXTj4IB1+GcXvmYwCjJafX3xz/goJ99VaqHDnjpHQauihrvEEkP 9dxdipPGEu+I1W7kB8wZsRm250eAn53D/REMG8Hzg2mHOjDv5tzvNF1ZO9hX2FDTtKbS mzprC2TrVaGVRC8e6chctfl6tGZdOWJGOS6DVfgTs1JPieuqfo1eNNaWQYdH2KB43gcC xIFFc1iRJQL8gNxN36SObhrFeBmhuVAbLKJ1K4/uBpBB+/H4glF8/oR66G8Bm+XPQZvj 96EQ== X-Gm-Message-State: AO0yUKVQHUC3P7JlQ2yTdeZIknnttNpk+IVe3LWh8qVsNPrFbdztnbsi W98G9z0W00bnEd8UsTIsU8lCyRI5PgyV7zkZjgYN1dWNML1HokmSPRoV0fkRVoxDfpPUqk8dKqo w77feNyvErnE= X-Received: by 2002:a5d:5958:0:b0:2bc:1252:c907 with SMTP id e24-20020a5d5958000000b002bc1252c907mr1566785wri.49.1675242586396; Wed, 01 Feb 2023 01:09:46 -0800 (PST) X-Google-Smtp-Source: AK7set/PTyyiNFXUmfLc3LtqA2I112JcR5iZQOziBNiBV+rkircAs8Ixb4dL7oRtJAQntNiEAm/qhg== X-Received: by 2002:a5d:5958:0:b0:2bc:1252:c907 with SMTP id e24-20020a5d5958000000b002bc1252c907mr1566770wri.49.1675242586122; Wed, 01 Feb 2023 01:09:46 -0800 (PST) Received: from ?IPV6:2003:cb:c705:3100:e20e:4ace:6f25:6a79? (p200300cbc7053100e20e4ace6f256a79.dip0.t-ipconnect.de. [2003:cb:c705:3100:e20e:4ace:6f25:6a79]) by smtp.gmail.com with ESMTPSA id n15-20020a5d598f000000b002bdff778d87sm18369218wri.34.2023.02.01.01.09.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 01 Feb 2023 01:09:45 -0800 (PST) Message-ID: <9e304ddf-29f7-1260-f585-bbcaf9575f6a@redhat.com> Date: Wed, 1 Feb 2023 10:09:44 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: [RFC PATCH v2 4/5] mm: add do_set_pte_range() To: Yin Fengwei , willy@infradead.org, linux-mm@kvack.org Cc: dave.hansen@intel.com, tim.c.chen@intel.com, ying.huang@intel.com References: <20230201081737.2330141-1-fengwei.yin@intel.com> <20230201081737.2330141-5-fengwei.yin@intel.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20230201081737.2330141-5-fengwei.yin@intel.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-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: z61ddbnnhj6irw1zsw3ykmor1thdct16 X-Rspamd-Queue-Id: 698CF1C000A X-HE-Tag: 1675242589-691892 X-HE-Meta: U2FsdGVkX1+PRC4JOFoKoeK+EVjIBSMTmzsHwYWfjpGI97pju+RRozUB3EQriWTB6jTkukS2hhFigdAOdoR6ngDIzumJmqzKbHOL9IjCzR5EMabDPmPJS1rzfg1DMW4bcolQRjqbCIYU6Os93n1zVGl2jqTEcA170yjFgkX/bORTtv7WIMkAlX0ZY2IaZ/zlfgDa17L78bSV3+2IzvAicze8bkwPHr+dMaHXFGoq9cnSThTUL+KIZ2F1buxPqbF+N3fDpGYxrKdl0lwUl7617scQAhoR6jLCaRwlpnr7nY9jOHjoxWeI1bOaLWDTesshWyUlKvVV2Rg7zX/Cu0FnYQd459r7+2/dGGCkS60c1rvXY1GT8Fv1jatNu1mqqBAhBGjuju7iffPML0OmymIYFECHnU6L5ubxCk5WbmmH0GtwmnXrCj77+W6yJ/MrWy+gHJGTqg6FGo9yqOKpZE9fqgacD5Vek48aes6JgFNCf8nGT52KJNxTmOKktxSDmpm/qlVqsI0Pi9OWxjk80b4fY0uZLdMMoq0lBQpHfcry0Zumkt9yZgd8DwpeM+KXbro6WG9xnEQ2sQfceP/lFH0GRBRT8z3d9JgC4R+ZKm+miyNexp3HvVaDCVtB3KGPiL/CeLuJmRO9HQmN7y64Yt02xsR/DF51YmRfdeftTMkQGYQcC0F2/LdLA0esQMAuHE4rQNrhbaslXIyeOAdVKNJzSMl+X9OUIkqs7i1CQhjbA5uSzmijekNBVEwluety5AWfuSEctV+kJ3B/lsDKBwbJzO5chrP4Jq/vNpMXcC23zc/hbpfYsI7vOrCCzsKubE3QXLvxVjVDCanYkrhefaH8ifSCq0BA9VmGIUbXEeTBWtLH897mhvIr0lr8Ow3DVHZj0RDGRfqYRiarKHvKsZcHCbwSTdggOhdAtvFMEDNb5nxkcGX/Q8fPMhdP+l7TVWVCA8pl1EUdNBLKNvHVYAh W2TqgLGO b7ykg5ARuDcOHZfxoHkAzTovSiQ32LhzLtGaxO8FM9XHUeY4uSH1uqqtqpQOGm32IT7oADrJ00qG9sHvSlS1ye5cnbf+1oFTK/8t/QrE+jro3lfzhvH8OIKybLbGnCamyvq0LwDQLSTt5qeIYDbHEN4RUTJSQD47III+CGcKAOZ7JJbmmikcJlr/BrDoLfpXU33kzubo8Rkm8Cn71klALtqUEoUu1Bhw7CDtu77rRJPISlQYHzT2JtwmP5EEfN25gyd+ZpJ8J1c0+9vqwyYfqEhL0+BKyNpDnntT7ecPKNnMaxRRFFbpSFQFkHcDW/Xpg1MvifO3Wo6sxiUcLBslpx04RFBiEU9qXqB1aa7TWRq2pRmkGX/9Owglrj9ZfqjjXClG6dthaHjpHdUrQypvQTf+ByyPZlJhTBtYrvCKrmF8Z7bWUR/RW7F/QyJO1dw4PY6JtysLYA5v14Lpgq9rs9gRanA== 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 01.02.23 09:17, Yin Fengwei wrote: > do_set_pte_range() allows to setup page table entries for a > specific range. It calls page_add_file_rmap_range() to take > advantage of batched rmap update for large folio. > > Signed-off-by: Yin Fengwei > --- > include/linux/mm.h | 2 ++ > mm/filemap.c | 1 - > mm/memory.c | 60 ++++++++++++++++++++++++++++++++++++---------- > 3 files changed, 49 insertions(+), 14 deletions(-) > > diff --git a/include/linux/mm.h b/include/linux/mm.h > index d6f8f41514cc..96e08fcdce24 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -1162,6 +1162,8 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma) > > vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page); > void do_set_pte(struct vm_fault *vmf, struct page *page, unsigned long addr); > +void do_set_pte_range(struct vm_fault *vmf, struct folio *folio, > + unsigned long start, unsigned long addr, unsigned int nr); > > vm_fault_t finish_fault(struct vm_fault *vmf); > vm_fault_t finish_mkwrite_fault(struct vm_fault *vmf); > diff --git a/mm/filemap.c b/mm/filemap.c > index 9cc5edd8f998..95f634d11581 100644 > --- a/mm/filemap.c > +++ b/mm/filemap.c > @@ -3386,7 +3386,6 @@ static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, > > ref_count++; > do_set_pte(vmf, page, addr); > - update_mmu_cache(vma, addr, vmf->pte); > } while (vmf->pte++, page++, addr += PAGE_SIZE, ++count < nr_pages); > > /* > diff --git a/mm/memory.c b/mm/memory.c > index 51c04bb60724..7e41142e1e4f 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -4257,7 +4257,8 @@ vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page) > } > #endif > > -void do_set_pte(struct vm_fault *vmf, struct page *page, unsigned long addr) > +static void do_set_pte_entry(struct vm_fault *vmf, struct page *page, > + unsigned long addr) > { > struct vm_area_struct *vma = vmf->vma; > bool uffd_wp = pte_marker_uffd_wp(vmf->orig_pte); > @@ -4277,16 +4278,52 @@ void do_set_pte(struct vm_fault *vmf, struct page *page, unsigned long addr) > entry = maybe_mkwrite(pte_mkdirty(entry), vma); > if (unlikely(uffd_wp)) > entry = pte_mkuffd_wp(entry); > - /* copy-on-write page */ > - if (write && !(vma->vm_flags & VM_SHARED)) { > - inc_mm_counter(vma->vm_mm, MM_ANONPAGES); > - page_add_new_anon_rmap(page, vma, addr); > - lru_cache_add_inactive_or_unevictable(page, vma); > - } else { > - inc_mm_counter(vma->vm_mm, mm_counter_file(page)); > - page_add_file_rmap(page, vma, false); > - } > set_pte_at(vma->vm_mm, addr, vmf->pte, entry); > + > + /* no need to invalidate: a not-present page won't be cached */ > + update_mmu_cache(vma, addr, vmf->pte); > +} > + > +void do_set_pte_range(struct vm_fault *vmf, struct folio *folio, > + unsigned long start, unsigned long addr, unsigned int nr) > +{ > + unsigned int i = 0; > + struct page *page = folio_page(folio, start); > + struct vm_area_struct *vma = vmf->vma; > + bool cow = (vmf->flags & FAULT_FLAG_WRITE) && > + !(vma->vm_flags & VM_SHARED); > + > + /* > + * file page: batched update rmap, mm counter. > + * copy-on-write page: batched update mm counter. > + */ > + if (!cow) { > + page_add_file_rmap_range(folio, start, nr, vma, false); > + add_mm_counter(vma->vm_mm, mm_counter_file(page), nr); > + } else > + add_mm_counter(vma->vm_mm, MM_ANONPAGES, nr); > + > + do { > + if (cow) { > + page_add_new_anon_rmap(page, vma, addr); This doesn't work with anon pages the way you intended in this patch. Please leave anon pages out of the picture for now and make do_set_pte_range() only deal with !cow. -- Thanks, David / dhildenb