From patchwork Wed Mar 20 15:23:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 10862115 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 78DBA139A for ; Wed, 20 Mar 2019 15:23:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59A0828CD3 for ; Wed, 20 Mar 2019 15:23:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D00929661; Wed, 20 Mar 2019 15:23:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4233328CD3 for ; Wed, 20 Mar 2019 15:23:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 96CB56B0007; Wed, 20 Mar 2019 11:23:55 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8CD3C6B0008; Wed, 20 Mar 2019 11:23:55 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 744AA6B000C; Wed, 20 Mar 2019 11:23:55 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by kanga.kvack.org (Postfix) with ESMTP id 341736B0007 for ; Wed, 20 Mar 2019 11:23:55 -0400 (EDT) Received: by mail-pg1-f197.google.com with SMTP id j184so3004524pgd.7 for ; Wed, 20 Mar 2019 08:23:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=jvEto9PPWZ+DefVLvJIrEh89kUoGNu1x2THt/FLaKtM=; b=jP9A3B8YWsjSzwD8JuJ4shK12ZTQDEivUycn1lu30GKJfJ3c789RLDytpaY98RVWc0 sGaGd6FJaJO0bQHWTJlnCJ+7rtrnfkRmPS6abCRxS+oV8b6BxRYZePM4FjPG4vaaYcYW kq1rK/8D8PO9Yfsyn712KdzEUyg9pawnij2sfLJZNisR25+C7k+uH5J9Ms63kegbzadR HnSQKcdB0js678TeU0Wt/64y9LeCuB96YxoBk7GTNWTIjJjMXM8LLFJmQ8tnnt96A4sC oBbrnH44nZWd4fQq81WhT3Adk8Amjm5ZXVIgLQqHneumH3nBtRd6Ffi1VsWB0EPxqX5F N+EA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of thellstrom@vmware.com designates 208.91.0.190 as permitted sender) smtp.mailfrom=thellstrom@vmware.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vmware.com X-Gm-Message-State: APjAAAVgJPKPSn1eq+gv53y0Is4z9oWqiKQ6nDYGDOR9JodSETk3jX3o kV1w97eJcq2YbKrAqOZ+Wu8CTxQNZgGlcbzCP29iOEw+UOMkPWKGRu8YqbBJQofFmsMGhgKZBcF 0J32BBwZfG9MmZqSlXXWPqr0sbKWQFAg+ENdld+y50HLTxhf36ulnjIISA+G7CPO3lA== X-Received: by 2002:a65:60cb:: with SMTP id r11mr8087995pgv.143.1553095434686; Wed, 20 Mar 2019 08:23:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqwsIFMV7fxRjKOO4aBjjlGfsURgrMpewbOXK+DKLeRYVc6rV5yf3zFL5nor85bLqLf7upJm X-Received: by 2002:a65:60cb:: with SMTP id r11mr8087903pgv.143.1553095433525; Wed, 20 Mar 2019 08:23:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553095433; cv=none; d=google.com; s=arc-20160816; b=WgHJzCLT5F+1isLRhM+cIcUW5cyJ18ktnYsims/GanzYrYSaU/bhXl9GGmpeNSg+zD 19J9RQs7YM7+eJwVn5Fdn+YV+wVk5772YHunzyvrBL90o+813YQ14LP1HtYGiqlVJzsg 3nYoAJBF+pZGrmQeQX98mxSJYfVuHESZ/nYjhf67xEmBmszc71aue1rGfuR+TX/rCpPd TFntHX5WMU7hj6M3rPeWSZzucUxCBLEJWqusszzKh2Xb0EuFyDjkfggD6GPG0nou9HuD bQ1FuGnwoq3besSzzsnZEhpE7SQP+M0AB5oLVSX/fypaw6rqleLQSjpp9deQ+zHktoo1 tA7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=jvEto9PPWZ+DefVLvJIrEh89kUoGNu1x2THt/FLaKtM=; b=yx35ILHbfsAhQ5ek3K+b6FEVXpYoL5kdmxmNViEe8CO6TZxg4nYNspRWZ1J5KVcltF P72MI7Bt8YiDBgXRIoj9Fz3mN7x4YPidS2zpWeBnMshvK68X/IReMiT7RyYOdPEIWnTi d1J5MzOB+E6vBgJ6DuDWz/FgM9lq7B43e5oAHIaDnopCpjjt3Ino84H+xpuf4R+LPWZA JYhJrH/g+elRrv6WOtv2AC+fdZeSg0bweLtXZdePbMofJBHIdTqOk4BFSuYNpz/jRBfk sV5JD6nC2u72Uf5tRxy1bc70LPx6oeDWY8tJhzn6jH4BHGlakod3W3sodxFbr6t6HnOE dZ3w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of thellstrom@vmware.com designates 208.91.0.190 as permitted sender) smtp.mailfrom=thellstrom@vmware.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vmware.com Received: from EX13-EDG-OU-002.vmware.com (ex13-edg-ou-002.vmware.com. [208.91.0.190]) by mx.google.com with ESMTPS id j10si1792580pgp.463.2019.03.20.08.23.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Mar 2019 08:23:53 -0700 (PDT) Received-SPF: pass (google.com: domain of thellstrom@vmware.com designates 208.91.0.190 as permitted sender) client-ip=208.91.0.190; Authentication-Results: mx.google.com; spf=pass (google.com: domain of thellstrom@vmware.com designates 208.91.0.190 as permitted sender) smtp.mailfrom=thellstrom@vmware.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vmware.com Received: from sc9-mailhost3.vmware.com (10.113.161.73) by EX13-EDG-OU-002.vmware.com (10.113.208.156) with Microsoft SMTP Server id 15.0.1156.6; Wed, 20 Mar 2019 08:23:48 -0700 Received: from fedoratest.localdomain (unknown [10.30.24.114]) by sc9-mailhost3.vmware.com (Postfix) with ESMTP id 6F7FB4199D; Wed, 20 Mar 2019 08:23:49 -0700 (PDT) From: Thomas Hellstrom To: CC: , Thomas Hellstrom , Andrew Morton , Matthew Wilcox , Will Deacon , Peter Zijlstra , Rik van Riel , Minchan Kim , Michal Hocko , Huang Ying , Souptick Joarder , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , , Subject: [RFC PATCH 3/3] mm: Add write-protect and clean utilities for address space ranges Date: Wed, 20 Mar 2019 16:23:15 +0100 Message-ID: <20190320152315.82758-4-thellstrom@vmware.com> X-Mailer: git-send-email 2.19.0.rc1 In-Reply-To: <20190320152315.82758-1-thellstrom@vmware.com> References: <20190320152315.82758-1-thellstrom@vmware.com> MIME-Version: 1.0 Received-SPF: None (EX13-EDG-OU-002.vmware.com: thellstrom@vmware.com does not designate permitted sender hosts) 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: X-Virus-Scanned: ClamAV using ClamSMTP Add two utilities to a) write-protect and b) clean all ptes pointing into a range of an address space The utilities are intended to aid in tracking dirty pages (either driver-allocated system memory or pci device memory). The write-protect utility should be used in conjunction with page_mkwrite() and pfn_mkwrite() to trigger write page-faults on page accesses. Typically one would want to use this on sparse accesses into large memory regions. The clean utility should be used to utilize hardware dirtying functionality and avoid the overhead of page-faults, typically on large accesses into small memory regions. Cc: Andrew Morton Cc: Matthew Wilcox Cc: Will Deacon Cc: Peter Zijlstra Cc: Rik van Riel Cc: Minchan Kim Cc: Michal Hocko Cc: Huang Ying Cc: Souptick Joarder Cc: "Jérôme Glisse" Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Thomas Hellstrom --- include/linux/mm.h | 9 +- mm/Makefile | 2 +- mm/apply_as_range.c | 257 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 266 insertions(+), 2 deletions(-) create mode 100644 mm/apply_as_range.c diff --git a/include/linux/mm.h b/include/linux/mm.h index b7dd4ddd6efb..62f24dd0bfa0 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2642,7 +2642,14 @@ struct pfn_range_apply { }; extern int apply_to_pfn_range(struct pfn_range_apply *closure, unsigned long address, unsigned long size); - +unsigned long apply_as_wrprotect(struct address_space *mapping, + pgoff_t first_index, pgoff_t nr); +unsigned long apply_as_clean(struct address_space *mapping, + pgoff_t first_index, pgoff_t nr, + pgoff_t bitmap_pgoff, + unsigned long *bitmap, + pgoff_t *start, + pgoff_t *end); #ifdef CONFIG_PAGE_POISONING extern bool page_poisoning_enabled(void); extern void kernel_poison_pages(struct page *page, int numpages, int enable); diff --git a/mm/Makefile b/mm/Makefile index d210cc9d6f80..a94b78f12692 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ mm_init.o mmu_context.o percpu.o slab_common.o \ compaction.o vmacache.o \ interval_tree.o list_lru.o workingset.o \ - debug.o $(mmu-y) + debug.o apply_as_range.o $(mmu-y) obj-y += init-mm.o obj-y += memblock.o diff --git a/mm/apply_as_range.c b/mm/apply_as_range.c new file mode 100644 index 000000000000..9f03e272ebd0 --- /dev/null +++ b/mm/apply_as_range.c @@ -0,0 +1,257 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include + +/** + * struct apply_as - Closure structure for apply_as_range + * @base: struct pfn_range_apply we derive from + * @start: Address of first modified pte + * @end: Address of last modified pte + 1 + * @total: Total number of modified ptes + * @vma: Pointer to the struct vm_area_struct we're currently operating on + * @flush_cache: Whether to call a cache flush before modifying a pte + * @flush_tlb: Whether to flush the tlb after modifying a pte + */ +struct apply_as { + struct pfn_range_apply base; + unsigned long start, end; + unsigned long total; + const struct vm_area_struct *vma; + u32 flush_cache : 1; + u32 flush_tlb : 1; +}; + +/** + * apply_pt_wrprotect - Leaf pte callback to write-protect a pte + * @pte: Pointer to the pte + * @token: Page table token, see apply_to_pfn_range() + * @addr: The virtual page address + * @closure: Pointer to a struct pfn_range_apply embedded in a + * struct apply_as + * + * The function write-protects a pte and records the range in + * virtual address space of touched ptes for efficient TLB flushes. + * + * Return: Always zero. + */ +static int apply_pt_wrprotect(pte_t *pte, pgtable_t token, + unsigned long addr, + struct pfn_range_apply *closure) +{ + struct apply_as *aas = container_of(closure, typeof(*aas), base); + + if (pte_write(*pte)) { + set_pte_at(closure->mm, addr, pte, pte_wrprotect(*pte)); + aas->total++; + if (addr < aas->start) + aas->start = addr; + if (addr + PAGE_SIZE > aas->end) + aas->end = addr + PAGE_SIZE; + } + + return 0; +} + +/** + * struct apply_as_clean - Closure structure for apply_as_clean + * @base: struct apply_as we derive from + * @bitmap_pgoff: Address_space Page offset of the first bit in @bitmap + * @bitmap: Bitmap with one bit for each page offset in the address_space range + * covered. + * @start: Address_space page offset of first modified pte + * @end: Address_space page offset of last modified pte + */ +struct apply_as_clean { + struct apply_as base; + pgoff_t bitmap_pgoff; + unsigned long *bitmap; + pgoff_t start, end; +}; + +/** + * apply_pt_clean - Leaf pte callback to clean a pte + * @pte: Pointer to the pte + * @token: Page table token, see apply_to_pfn_range() + * @addr: The virtual page address + * @closure: Pointer to a struct pfn_range_apply embedded in a + * struct apply_as_clean + * + * The function cleans a pte and records the range in + * virtual address space of touched ptes for efficient TLB flushes. + * It also records dirty ptes in a bitmap representing page offsets + * in the address_space, as well as the first and last of the bits + * touched. + * + * Return: Always zero. + */ +static int apply_pt_clean(pte_t *pte, pgtable_t token, + unsigned long addr, + struct pfn_range_apply *closure) +{ + struct apply_as *aas = container_of(closure, typeof(*aas), base); + struct apply_as_clean *clean = container_of(aas, typeof(*clean), base); + + if (pte_dirty(*pte)) { + pgoff_t pgoff = ((addr - aas->vma->vm_start) >> PAGE_SHIFT) + + aas->vma->vm_pgoff - clean->bitmap_pgoff; + + set_pte_at(closure->mm, addr, pte, pte_mkclean(*pte)); + aas->total++; + if (addr < aas->start) + aas->start = addr; + if (addr + PAGE_SIZE > aas->end) + aas->end = addr + PAGE_SIZE; + + __set_bit(pgoff, clean->bitmap); + clean->start = min(clean->start, pgoff); + clean->end = max(clean->end, pgoff + 1); + } + + return 0; +} + +/** + * apply_as_range - Apply a pte callback to all PTEs pointing into a range + * of an address_space. + * @mapping: Pointer to the struct address_space + * @aas: Closure structure + * @first_index: First page offset in the address_space + * @nr: Number of incremental page offsets to cover + * + * Return: Number of ptes touched. Note that this number might be larger + * than @nr if there are overlapping vmas + */ +static unsigned long apply_as_range(struct address_space *mapping, + struct apply_as *aas, + pgoff_t first_index, pgoff_t nr) +{ + struct vm_area_struct *vma; + pgoff_t vba, vea, cba, cea; + unsigned long start_addr, end_addr; + + /* FIXME: Is a read lock sufficient here? */ + down_write(&mapping->i_mmap_rwsem); + vma_interval_tree_foreach(vma, &mapping->i_mmap, first_index, + first_index + nr - 1) { + aas->base.mm = vma->vm_mm; + + /* Clip to the vma */ + vba = vma->vm_pgoff; + vea = vba + vma_pages(vma); + cba = first_index; + cba = max(cba, vba); + cea = first_index + nr; + cea = min(cea, vea); + + /* Translate to virtual address */ + start_addr = ((cba - vba) << PAGE_SHIFT) + vma->vm_start; + end_addr = ((cea - vba) << PAGE_SHIFT) + vma->vm_start; + + /* + * TODO: Should caches be flushed individually on demand + * in the leaf-pte callbacks instead? That is, how + * costly are inter-core interrupts in an SMP system? + */ + if (aas->flush_cache) + flush_cache_range(vma, start_addr, end_addr); + aas->start = end_addr; + aas->end = start_addr; + aas->vma = vma; + + /* Should not error since aas->base.alloc == 0 */ + WARN_ON(apply_to_pfn_range(&aas->base, start_addr, + end_addr - start_addr)); + if (aas->flush_tlb && aas->end > aas->start) + flush_tlb_range(vma, aas->start, aas->end); + } + up_write(&mapping->i_mmap_rwsem); + + return aas->total; +} + +/** + * apply_as_wrprotect - Write-protect all ptes in an address_space range + * @mapping: The address_space we want to write protect + * @first_index: The first page offset in the range + * @nr: Number of incremental page offsets to cover + * + * Return: The number of ptes actually write-protected. Note that + * already write-protected ptes are not counted. + */ +unsigned long apply_as_wrprotect(struct address_space *mapping, + pgoff_t first_index, pgoff_t nr) +{ + struct apply_as aas = { + .base = { + .alloc = 0, + .ptefn = apply_pt_wrprotect, + }, + .total = 0, + .flush_cache = 1, + .flush_tlb = 1 + }; + + return apply_as_range(mapping, &aas, first_index, nr); +} +EXPORT_SYMBOL(apply_as_wrprotect); + +/** + * apply_as_clean - Clean all ptes in an address_space range + * @mapping: The address_space we want to clean + * @first_index: The first page offset in the range + * @nr: Number of incremental page offsets to cover + * @bitmap_pgoff: The page offset of the first bit in @bitmap + * @bitmap: Pointer to a bitmap of at least @nr bits. The bitmap needs to + * cover the whole range @first_index..@first_index + @nr. + * @start: Pointer to page offset of the first set bit in @bitmap, or if + * none set the value pointed to should be @bitmap_pgoff + @nr. The value + * is modified as new bits are set by the function. + * @end: Page offset of the last set bit in @bitmap + 1 or @bitmap_pgoff if + * none set. The value is modified as new bets are set by the function. + * + * Note: When this function returns there is no guarantee that a CPU has + * not already dirtied new ptes. However it will not clean any ptes not + * reported in the bitmap. + * + * If a caller needs to make sure all dirty ptes are picked up and none + * additional are added, it first needs to write-protect the address-space + * range and make sure new writers are blocked in page_mkwrite() or + * pfn_mkwrite(). And then after a TLB flush following the write-protection + * pick upp all dirty bits. + * + * Return: The number of dirty ptes actually cleaned. + */ +unsigned long apply_as_clean(struct address_space *mapping, + pgoff_t first_index, pgoff_t nr, + pgoff_t bitmap_pgoff, + unsigned long *bitmap, + pgoff_t *start, + pgoff_t *end) +{ + struct apply_as_clean clean = { + .base = { + .base = { + .alloc = 0, + .ptefn = apply_pt_clean, + }, + .total = 0, + .flush_cache = 0, + .flush_tlb = 1, + }, + .bitmap_pgoff = bitmap_pgoff, + .bitmap = bitmap, + .start = *start, + .end = *end, + }; + unsigned long ret = apply_as_range(mapping, &clean.base, first_index, + nr); + + *start = clean.start; + *end = clean.end; + return ret; +} +EXPORT_SYMBOL(apply_as_clean);