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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A48DDC61D97 for ; Wed, 25 Jan 2023 20:41:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1zgi2TCQr1re1TldBfyccRKq4ztnj4QxQjfu3Oq1LMI=; b=J87+e3+H/SRsfc s1mU0aLpDf98zhu7PdhszVct29X/HPg/uKIhB0M3KPsFOcVFm1wIoccV07b58Zjd0YbKI/himsuJd aWQtpVFns5wLk90dZMVVi3h3QcneftNtZOupD/m3oj57xdkctnf5sAIaMe8opqHTmoVtmKNCnBxqC PmyJopugNXhJJ+s0spys+ksDDxKORTbCOYn3nuWmFTnzxh99Y/LAmkWiaTXx+yO1a03HglquRqT2x oAqMTcTLZ6c33KdwirY8YxEfC98BIsd+QzsrYu0n5iKfkxI6e3d6lGcHW/YnXnUEjpbaiey3p2gsK NNyAPLXmeytaIUedcPwQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKmad-008kmu-49; Wed, 25 Jan 2023 20:41:51 +0000 Received: from mail-yw1-x112e.google.com ([2607:f8b0:4864:20::112e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKj8A-0087ay-PB for linux-um@lists.infradead.org; Wed, 25 Jan 2023 17:00:21 +0000 Received: by mail-yw1-x112e.google.com with SMTP id 00721157ae682-4ff1fa82bbbso225882537b3.10 for ; Wed, 25 Jan 2023 09:00:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=L4MXGiF0uBNS4YdEO04YxfSu/PH3d6GEYxinGGkJ0l0=; b=W2wM+2B23DX4UFGjrNjz2QhZIRJJ0rJbNeAj16MEZr1nVm+y2drgVLMWhYKM+RXZwl LyA9Ln6ru3ELYSr9r7So/z16X90Zls60BXzg/QzJqLOLV/j0Tixqf16TWNyXZGnACB9E QkGJl1ScGfsTp7c4ttit0pgHNn4ey7S424sXU9dWBD5cTrLynb/1YBuhhrezEYSZhLSi 3eb09az3BMlgAYXh3d2+5Q7sC0FqvrC0NX040NYjkqv/h2gdKBNO3YpN4EQOf23xtORi NxWfmFe951E1Au7ZDRJqODWALmTWnaVbj7QqRA33jeb/AA79tsFrFPyzpW0c4v2lui2R IvJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=L4MXGiF0uBNS4YdEO04YxfSu/PH3d6GEYxinGGkJ0l0=; b=EovMnvmYYsCFp1Rp9ApqRYw6VoNm+ueet1ltAs3uyNP7YgAVW/lvHNuLpyPB4Sg3vF vE01cFhCMbbNb/10cyx2b58mNvWk8anxbL8nNHKEBlSRDindHN9oamwSTJI253u4wkhF U78eBSmUi+v7GjsVCvvFNZf/ApQYqYEp9691D7K2MKOeQWoeK+rsWloCciFcnQE+uTyS BWVZXinyBFIVk7KfZibatb8YD8w4f8IikQnvgGzsgmrk0nTdgBs/5pFec2v4EnssBVIj buImig2UcmR/TeMjd2233y7OF+mkwPp8FmhdWRN9f3XXOxfqghl5FX/stKyrE1hDHawN vKYA== X-Gm-Message-State: AFqh2krytraKk/t0KYKLghpHaWtC1yF4NYbOQxhZk1kEkMMUUE4HB0RL onton7cyHjI2/CW2a+RUrb75nb9Wm4fahZxupxtkew== X-Google-Smtp-Source: AMrXdXv6WFpwQ2RivVVjLGZIQcqOZe35ABaf7/kGtBR6QRxHke62z7D7Nf0zd78A9HxP1avFtZlnWBmbm7RD5GZUdQA= X-Received: by 2002:a0d:c0c7:0:b0:502:30d7:5fff with SMTP id b190-20020a0dc0c7000000b0050230d75fffmr2052050ywd.347.1674666013171; Wed, 25 Jan 2023 09:00:13 -0800 (PST) MIME-Version: 1.0 References: <20230125083851.27759-1-surenb@google.com> <20230125083851.27759-6-surenb@google.com> In-Reply-To: From: Suren Baghdasaryan Date: Wed, 25 Jan 2023 09:00:00 -0800 Message-ID: Subject: Re: [PATCH v2 5/6] mm: introduce mod_vm_flags_nolock and use it in untrack_pfn To: Michal Hocko Cc: akpm@linux-foundation.org, michel@lespinasse.org, jglisse@google.com, vbabka@suse.cz, hannes@cmpxchg.org, mgorman@techsingularity.net, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, peterz@infradead.org, ldufour@linux.ibm.com, paulmck@kernel.org, luto@kernel.org, songliubraving@fb.com, peterx@redhat.com, david@redhat.com, dhowells@redhat.com, hughd@google.com, bigeasy@linutronix.de, kent.overstreet@linux.dev, punit.agrawal@bytedance.com, lstoakes@gmail.com, peterjung1337@gmail.com, rientjes@google.com, axelrasmussen@google.com, joelaf@google.com, minchan@google.com, jannh@google.com, shakeelb@google.com, tatashin@google.com, edumazet@google.com, gthelen@google.com, gurua@google.com, arjunroy@google.com, soheil@google.com, hughlynch@google.com, leewalsh@google.com, posk@google.com, will@kernel.org, aneesh.kumar@linux.ibm.com, npiggin@gmail.com, chenhuacai@kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, richard@nod.at, anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net, qianweili@huawei.com, wangzhou1@hisilicon.com, herbert@gondor.apana.org.au, davem@davemloft.net, vkoul@kernel.org, airlied@gmail.com, daniel@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, l.stach@pengutronix.de, krzysztof.kozlowski@linaro.org, patrik.r.jakobsson@gmail.com, matthias.bgg@gmail.com, robdclark@gmail.com, quic_abhinavk@quicinc.com, dmitry.baryshkov@linaro.org, tomba@kernel.org, hjc@rock-chips.com, heiko@sntech.de, ray.huang@amd.com, kraxel@redhat.com, sre@kernel.org, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, tfiga@chromium.org, m.szyprowski@samsung.com, mchehab@kernel.org, dimitri.sivanich@hpe.com, zhangfei.gao@linaro.org, jejb@linux.ibm.com, martin.petersen@oracle.com, dgilbert@interlog.com, hdegoede@redhat.com, mst@redhat.com, jasowang@redhat.com, alex.williamson@redhat.com, deller@gmx.de, jayalk@intworks.biz, viro@zeniv.linux.org.uk, nico@fluxnic.net, xiang@kernel.org, chao@kernel.org, tytso@mit.edu, adilger.kernel@dilger.ca, miklos@szeredi.hu, mike.kravetz@oracle.com, muchun.song@linux.dev, bhe@redhat.com, andrii@kernel.org, yoshfuji@linux-ipv6.org, dsahern@kernel.org, kuba@kernel.org, pabeni@redhat.com, perex@perex.cz, tiwai@suse.com, haojian.zhuang@gmail.com, robert.jarzmik@free.fr, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, x86@kernel.org, linux-kernel@vger.kernel.org, linux-graphics-maintainer@vmware.com, linux-ia64@vger.kernel.org, linux-arch@vger.kernel.org, loongarch@lists.linux.dev, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-sgx@vger.kernel.org, linux-um@lists.infradead.org, linux-acpi@vger.kernel.org, linux-crypto@vger.kernel.org, nvdimm@lists.linux.dev, dmaengine@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, etnaviv@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-tegra@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-stm32@st-md-mailman.stormreply.com, linux-rdma@vger.kernel.org, linux-media@vger.kernel.org, linux-accelerators@lists.ozlabs.org, sparclinux@vger.kernel.org, linux-scsi@vger.kernel.org, linux-staging@lists.linux.dev, target-devel@vger.kernel.org, linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, devel@lists.orangefs.org, kexec@lists.infradead.org, linux-xfs@vger.kernel.org, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, kasan-dev@googlegroups.com, selinux@vger.kernel.org, alsa-devel@alsa-project.org, kernel-team@android.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230125_090014_898646_84394E38 X-CRM114-Status: GOOD ( 27.28 ) X-Mailman-Approved-At: Wed, 25 Jan 2023 12:41:47 -0800 X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-um" Errors-To: linux-um-bounces+linux-um=archiver.kernel.org@lists.infradead.org On Wed, Jan 25, 2023 at 1:42 AM Michal Hocko wrote: > > On Wed 25-01-23 00:38:50, Suren Baghdasaryan wrote: > > In cases when VMA flags are modified after VMA was isolated and mmap_lock > > was downgraded, flags modifications would result in an assertion because > > mmap write lock is not held. > > Introduce mod_vm_flags_nolock to be used in such situation. > > Pass a hint to untrack_pfn to conditionally use mod_vm_flags_nolock for > > flags modification and to avoid assertion. > > The changelog nor the documentation of mod_vm_flags_nolock > really explain when it is safe to use it. This is really important for > future potential users. True. I'll add clarification in the comments and in the changelog. Thanks! > > > Signed-off-by: Suren Baghdasaryan > > --- > > arch/x86/mm/pat/memtype.c | 10 +++++++--- > > include/linux/mm.h | 12 +++++++++--- > > include/linux/pgtable.h | 5 +++-- > > mm/memory.c | 13 +++++++------ > > mm/memremap.c | 4 ++-- > > mm/mmap.c | 16 ++++++++++------ > > 6 files changed, 38 insertions(+), 22 deletions(-) > > > > diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c > > index ae9645c900fa..d8adc0b42cf2 100644 > > --- a/arch/x86/mm/pat/memtype.c > > +++ b/arch/x86/mm/pat/memtype.c > > @@ -1046,7 +1046,7 @@ void track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot, pfn_t pfn) > > * can be for the entire vma (in which case pfn, size are zero). > > */ > > void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn, > > - unsigned long size) > > + unsigned long size, bool mm_wr_locked) > > { > > resource_size_t paddr; > > unsigned long prot; > > @@ -1065,8 +1065,12 @@ void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn, > > size = vma->vm_end - vma->vm_start; > > } > > free_pfn_range(paddr, size); > > - if (vma) > > - clear_vm_flags(vma, VM_PAT); > > + if (vma) { > > + if (mm_wr_locked) > > + clear_vm_flags(vma, VM_PAT); > > + else > > + mod_vm_flags_nolock(vma, 0, VM_PAT); > > + } > > } > > > > /* > > diff --git a/include/linux/mm.h b/include/linux/mm.h > > index 55335edd1373..48d49930c411 100644 > > --- a/include/linux/mm.h > > +++ b/include/linux/mm.h > > @@ -656,12 +656,18 @@ static inline void clear_vm_flags(struct vm_area_struct *vma, > > vma->vm_flags &= ~flags; > > } > > > > +static inline void mod_vm_flags_nolock(struct vm_area_struct *vma, > > + unsigned long set, unsigned long clear) > > +{ > > + vma->vm_flags |= set; > > + vma->vm_flags &= ~clear; > > +} > > + > > static inline void mod_vm_flags(struct vm_area_struct *vma, > > unsigned long set, unsigned long clear) > > { > > mmap_assert_write_locked(vma->vm_mm); > > - vma->vm_flags |= set; > > - vma->vm_flags &= ~clear; > > + mod_vm_flags_nolock(vma, set, clear); > > } > > > > static inline void vma_set_anonymous(struct vm_area_struct *vma) > > @@ -2087,7 +2093,7 @@ static inline void zap_vma_pages(struct vm_area_struct *vma) > > } > > void unmap_vmas(struct mmu_gather *tlb, struct maple_tree *mt, > > struct vm_area_struct *start_vma, unsigned long start, > > - unsigned long end); > > + unsigned long end, bool mm_wr_locked); > > > > struct mmu_notifier_range; > > > > diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h > > index 5fd45454c073..c63cd44777ec 100644 > > --- a/include/linux/pgtable.h > > +++ b/include/linux/pgtable.h > > @@ -1185,7 +1185,8 @@ static inline int track_pfn_copy(struct vm_area_struct *vma) > > * can be for the entire vma (in which case pfn, size are zero). > > */ > > static inline void untrack_pfn(struct vm_area_struct *vma, > > - unsigned long pfn, unsigned long size) > > + unsigned long pfn, unsigned long size, > > + bool mm_wr_locked) > > { > > } > > > > @@ -1203,7 +1204,7 @@ extern void track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot, > > pfn_t pfn); > > extern int track_pfn_copy(struct vm_area_struct *vma); > > extern void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn, > > - unsigned long size); > > + unsigned long size, bool mm_wr_locked); > > extern void untrack_pfn_moved(struct vm_area_struct *vma); > > #endif > > > > diff --git a/mm/memory.c b/mm/memory.c > > index d6902065e558..5b11b50e2c4a 100644 > > --- a/mm/memory.c > > +++ b/mm/memory.c > > @@ -1613,7 +1613,7 @@ void unmap_page_range(struct mmu_gather *tlb, > > static void unmap_single_vma(struct mmu_gather *tlb, > > struct vm_area_struct *vma, unsigned long start_addr, > > unsigned long end_addr, > > - struct zap_details *details) > > + struct zap_details *details, bool mm_wr_locked) > > { > > unsigned long start = max(vma->vm_start, start_addr); > > unsigned long end; > > @@ -1628,7 +1628,7 @@ static void unmap_single_vma(struct mmu_gather *tlb, > > uprobe_munmap(vma, start, end); > > > > if (unlikely(vma->vm_flags & VM_PFNMAP)) > > - untrack_pfn(vma, 0, 0); > > + untrack_pfn(vma, 0, 0, mm_wr_locked); > > > > if (start != end) { > > if (unlikely(is_vm_hugetlb_page(vma))) { > > @@ -1675,7 +1675,7 @@ static void unmap_single_vma(struct mmu_gather *tlb, > > */ > > void unmap_vmas(struct mmu_gather *tlb, struct maple_tree *mt, > > struct vm_area_struct *vma, unsigned long start_addr, > > - unsigned long end_addr) > > + unsigned long end_addr, bool mm_wr_locked) > > { > > struct mmu_notifier_range range; > > struct zap_details details = { > > @@ -1689,7 +1689,8 @@ void unmap_vmas(struct mmu_gather *tlb, struct maple_tree *mt, > > start_addr, end_addr); > > mmu_notifier_invalidate_range_start(&range); > > do { > > - unmap_single_vma(tlb, vma, start_addr, end_addr, &details); > > + unmap_single_vma(tlb, vma, start_addr, end_addr, &details, > > + mm_wr_locked); > > } while ((vma = mas_find(&mas, end_addr - 1)) != NULL); > > mmu_notifier_invalidate_range_end(&range); > > } > > @@ -1723,7 +1724,7 @@ void zap_page_range_single(struct vm_area_struct *vma, unsigned long address, > > * unmap 'address-end' not 'range.start-range.end' as range > > * could have been expanded for hugetlb pmd sharing. > > */ > > - unmap_single_vma(&tlb, vma, address, end, details); > > + unmap_single_vma(&tlb, vma, address, end, details, false); > > mmu_notifier_invalidate_range_end(&range); > > tlb_finish_mmu(&tlb); > > } > > @@ -2492,7 +2493,7 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr, > > > > err = remap_pfn_range_notrack(vma, addr, pfn, size, prot); > > if (err) > > - untrack_pfn(vma, pfn, PAGE_ALIGN(size)); > > + untrack_pfn(vma, pfn, PAGE_ALIGN(size), true); > > return err; > > } > > EXPORT_SYMBOL(remap_pfn_range); > > diff --git a/mm/memremap.c b/mm/memremap.c > > index 08cbf54fe037..2f88f43d4a01 100644 > > --- a/mm/memremap.c > > +++ b/mm/memremap.c > > @@ -129,7 +129,7 @@ static void pageunmap_range(struct dev_pagemap *pgmap, int range_id) > > } > > mem_hotplug_done(); > > > > - untrack_pfn(NULL, PHYS_PFN(range->start), range_len(range)); > > + untrack_pfn(NULL, PHYS_PFN(range->start), range_len(range), true); > > pgmap_array_delete(range); > > } > > > > @@ -276,7 +276,7 @@ static int pagemap_range(struct dev_pagemap *pgmap, struct mhp_params *params, > > if (!is_private) > > kasan_remove_zero_shadow(__va(range->start), range_len(range)); > > err_kasan: > > - untrack_pfn(NULL, PHYS_PFN(range->start), range_len(range)); > > + untrack_pfn(NULL, PHYS_PFN(range->start), range_len(range), true); > > err_pfn_remap: > > pgmap_array_delete(range); > > return error; > > diff --git a/mm/mmap.c b/mm/mmap.c > > index 2c6e9072e6a8..69d440997648 100644 > > --- a/mm/mmap.c > > +++ b/mm/mmap.c > > @@ -78,7 +78,7 @@ core_param(ignore_rlimit_data, ignore_rlimit_data, bool, 0644); > > static void unmap_region(struct mm_struct *mm, struct maple_tree *mt, > > struct vm_area_struct *vma, struct vm_area_struct *prev, > > struct vm_area_struct *next, unsigned long start, > > - unsigned long end); > > + unsigned long end, bool mm_wr_locked); > > > > static pgprot_t vm_pgprot_modify(pgprot_t oldprot, unsigned long vm_flags) > > { > > @@ -2136,14 +2136,14 @@ static inline void remove_mt(struct mm_struct *mm, struct ma_state *mas) > > static void unmap_region(struct mm_struct *mm, struct maple_tree *mt, > > struct vm_area_struct *vma, struct vm_area_struct *prev, > > struct vm_area_struct *next, > > - unsigned long start, unsigned long end) > > + unsigned long start, unsigned long end, bool mm_wr_locked) > > { > > struct mmu_gather tlb; > > > > lru_add_drain(); > > tlb_gather_mmu(&tlb, mm); > > update_hiwater_rss(mm); > > - unmap_vmas(&tlb, mt, vma, start, end); > > + unmap_vmas(&tlb, mt, vma, start, end, mm_wr_locked); > > free_pgtables(&tlb, mt, vma, prev ? prev->vm_end : FIRST_USER_ADDRESS, > > next ? next->vm_start : USER_PGTABLES_CEILING); > > tlb_finish_mmu(&tlb); > > @@ -2391,7 +2391,11 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, > > mmap_write_downgrade(mm); > > } > > > > - unmap_region(mm, &mt_detach, vma, prev, next, start, end); > > + /* > > + * We can free page tables without write-locking mmap_lock because VMAs > > + * were isolated before we downgraded mmap_lock. > > + */ > > + unmap_region(mm, &mt_detach, vma, prev, next, start, end, !downgrade); > > /* Statistics and freeing VMAs */ > > mas_set(&mas_detach, start); > > remove_mt(mm, &mas_detach); > > @@ -2704,7 +2708,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, > > > > /* Undo any partial mapping done by a device driver. */ > > unmap_region(mm, &mm->mm_mt, vma, prev, next, vma->vm_start, > > - vma->vm_end); > > + vma->vm_end, true); > > } > > if (file && (vm_flags & VM_SHARED)) > > mapping_unmap_writable(file->f_mapping); > > @@ -3031,7 +3035,7 @@ void exit_mmap(struct mm_struct *mm) > > tlb_gather_mmu_fullmm(&tlb, mm); > > /* update_hiwater_rss(mm) here? but nobody should be looking */ > > /* Use ULONG_MAX here to ensure all VMAs in the mm are unmapped */ > > - unmap_vmas(&tlb, &mm->mm_mt, vma, 0, ULONG_MAX); > > + unmap_vmas(&tlb, &mm->mm_mt, vma, 0, ULONG_MAX, false); > > mmap_read_unlock(mm); > > > > /* > > -- > > 2.39.1 > > -- > Michal Hocko > SUSE Labs _______________________________________________ linux-um mailing list linux-um@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-um