From patchwork Thu Mar 21 13:22:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 10863531 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 DB2A91669 for ; Thu, 21 Mar 2019 13:22:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BEC0328EE2 for ; Thu, 21 Mar 2019 13:22:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB1962A1E8; Thu, 21 Mar 2019 13:22:46 +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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable 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 DE1B72A1E3 for ; Thu, 21 Mar 2019 13:22:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 89BC86B0007; Thu, 21 Mar 2019 09:22:44 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 820536B0008; Thu, 21 Mar 2019 09:22:44 -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 69BB16B000A; Thu, 21 Mar 2019 09:22:44 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) by kanga.kvack.org (Postfix) with ESMTP id 2EB736B0007 for ; Thu, 21 Mar 2019 09:22:44 -0400 (EDT) Received: by mail-ot1-f72.google.com with SMTP id i5so3022446otl.12 for ; Thu, 21 Mar 2019 06:22:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:thread-topic :thread-index:date:message-id:references:in-reply-to:accept-language :content-language:content-id:content-transfer-encoding:mime-version; bh=aHxe+E/Z0s1p4D8dULNFBtqHBTq0rFqXyAKCJilD0UA=; b=E6CYHx2ypHq3d4C924drkuoYwukKAX9DDgUr5TxfXknt2ueJDjM1sKzrTt/kEWCeJP WACbwszwI9SVBnRGldiJrAM+b/ihyBzIRO4BBqacFyi4fZX0HgQhg7yWXeBBdTto0tzE 52oRu1DRHqQ3gJSjp6Bi1hjthTgO/Oxgvsief1OCWTW7UhvehSm+31TiK6KSDi1oSbkY S/Jyvfn5PknenRbFqV1cQzrrIYJwVYQOa0FKds+HdyM4Wgp/LxD/vS/yxamWw278tXM3 5Lo1b9x8+sDX75ROZKpCVJfMcTiCFcC3cAr9YEn4T30cbn9JpTQygPr4EFxwmzMMkLDP ftQQ== X-Gm-Message-State: APjAAAWOWoGwuRcvheiHOKoY+NFsVPPKQSba/V+OQ7Hn5nCskb4S/oU9 P+7pa5vL98QQYawSokFA/1bM2rgKAM3ip2ElvSbJAgJ33vIvtLHVSinRNojwv15JLovd+pBKQYW 0nnvzGdAZl5QuDZ+jbcyy8pp8UH8l8FtfZMpKJWgJ+qCpjjrEKgFDgqPywzgxW/jV1A== X-Received: by 2002:a9d:70c3:: with SMTP id w3mr2576848otj.226.1553174563747; Thu, 21 Mar 2019 06:22:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqyjLyO9HSBt+dFXw8jicPyDVQZ2xQILKY7BxPWTlWfMlvSw0mKxaZiNv/ZJk266tXhOQhve X-Received: by 2002:a9d:70c3:: with SMTP id w3mr2576793otj.226.1553174562953; Thu, 21 Mar 2019 06:22:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553174562; cv=none; d=google.com; s=arc-20160816; b=mDbU+UmtiPlnYbjNgylXci75jgEqJ7fO1bdVoVYFeYnjImXG9n1UDvDnNZhOFPXHJg ToRGari9CHa0sxnDslPzQ0a4Cw5F7xJs2c0uNiYnKSKD6FVlYtspDhB5qa2SrNlr10qe If7hUH7oBCAG2iECwMJbLdNlF/60r85BOc/0Jc5uGms4HsZCZauVRv7JWPfI7Ykt5mF9 UmnzygGODKYuCFnBCtCl/Mi5YDBlh0RGmuMrXy9FKNZQ5C2zEnT5kkV0e4MchtNRPeyf lSZK97TzEt6w0MB1TIr6kdmecifatYJ3Ku5m/CqalLfv4CkxnAqH7gbp4RCM9Qdot0kc P4dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-id:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature; bh=aHxe+E/Z0s1p4D8dULNFBtqHBTq0rFqXyAKCJilD0UA=; b=jpmen/i/ImLO+lu+3ZuWvMY8RYJX4bM9FYBYT4cZzSC6Pjb7l5MJ1V6sadDgDj5xYX oP3dSO+/ys+Ku1J+F1Wr0hzbNY6vw+FZfZRrIBSvEbEXTtuFzJ3cjRCBj88u408tiC/D 7eR0NvucRz5+TIlPiPNrP/MJM894teWnukrcFY4CfbyplXH1rqzcBJxhCEv5WCE8Iui6 lzWGkZKFUWb5v7QLhOSeGnugbTrk1S4bQDZTNivuBNJylr8qml0Wj6mgIYypQ8OX3pyx nYwjAM6njO9+zM3C4psCZzwOkV1PPhf+BeJBOIgmvh4IqIW33B8Xz7yWelNj4taDUWLA ynRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@vmware.com header.s=selector1 header.b=jq9Q7Asb; spf=pass (google.com: domain of thellstrom@vmware.com designates 40.107.78.44 as permitted sender) smtp.mailfrom=thellstrom@vmware.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vmware.com Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-eopbgr780044.outbound.protection.outlook.com. [40.107.78.44]) by mx.google.com with ESMTPS id g11si2179243otr.138.2019.03.21.06.22.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Mar 2019 06:22:42 -0700 (PDT) Received-SPF: pass (google.com: domain of thellstrom@vmware.com designates 40.107.78.44 as permitted sender) client-ip=40.107.78.44; Authentication-Results: mx.google.com; dkim=pass header.i=@vmware.com header.s=selector1 header.b=jq9Q7Asb; spf=pass (google.com: domain of thellstrom@vmware.com designates 40.107.78.44 as permitted sender) smtp.mailfrom=thellstrom@vmware.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vmware.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aHxe+E/Z0s1p4D8dULNFBtqHBTq0rFqXyAKCJilD0UA=; b=jq9Q7Asb4huOMOaI9xN/atlS4MLA5f2UKllUdAUIQlHhZ4X8oCmEDYHeWHZ0Jdm69vdxSRJCFupd491OIJ2q/aVWCYN/o9vb76V2WCtuq5NfyC8E1HaIhhEwW+QOiRuBmNcsNKKShGLiFIQtnfTUR74SbNdIwdHc8JlU1hyPsUM= Received: from MN2PR05MB6141.namprd05.prod.outlook.com (20.178.241.217) by MN2PR05MB6621.namprd05.prod.outlook.com (20.178.247.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1730.15; Thu, 21 Mar 2019 13:22:35 +0000 Received: from MN2PR05MB6141.namprd05.prod.outlook.com ([fe80::91e:292d:e304:78ad]) by MN2PR05MB6141.namprd05.prod.outlook.com ([fe80::91e:292d:e304:78ad%6]) with mapi id 15.20.1750.010; Thu, 21 Mar 2019 13:22:35 +0000 From: Thomas Hellstrom To: "dri-devel@lists.freedesktop.org" , Linux-graphics-maintainer 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?= , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" Subject: [RFC PATCH RESEND 2/3] mm: Add an apply_to_pfn_range interface Thread-Topic: [RFC PATCH RESEND 2/3] mm: Add an apply_to_pfn_range interface Thread-Index: AQHU3+kl9xNhc0w2DU+KAotZ5mJTVw== Date: Thu, 21 Mar 2019 13:22:35 +0000 Message-ID: <20190321132140.114878-3-thellstrom@vmware.com> References: <20190321132140.114878-1-thellstrom@vmware.com> In-Reply-To: <20190321132140.114878-1-thellstrom@vmware.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR01CA0039.prod.exchangelabs.com (2603:10b6:a03:94::16) To MN2PR05MB6141.namprd05.prod.outlook.com (2603:10b6:208:c7::25) authentication-results: spf=none (sender IP is ) smtp.mailfrom=thellstrom@vmware.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.19.0.rc1 x-originating-ip: [208.91.2.1] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 77a15709-cc6e-436d-4e32-08d6ae0047cb x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020);SRVR:MN2PR05MB6621; x-ms-traffictypediagnostic: MN2PR05MB6621: x-ld-processed: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0,ExtAddr x-microsoft-antispam-prvs: x-forefront-prvs: 0983EAD6B2 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(136003)(39860400002)(346002)(376002)(396003)(189003)(199004)(6636002)(105586002)(316002)(110136005)(36756003)(54906003)(2501003)(66066001)(11346002)(446003)(478600001)(486006)(14454004)(2616005)(476003)(102836004)(76176011)(386003)(6506007)(68736007)(186003)(52116002)(26005)(106356001)(25786009)(81156014)(53936002)(8676002)(7416002)(97736004)(5660300002)(6512007)(6116002)(3846002)(8936002)(2906002)(66574012)(1076003)(86362001)(256004)(99286004)(14444005)(6486002)(50226002)(305945005)(81166006)(7736002)(71200400001)(4326008)(71190400001)(6436002);DIR:OUT;SFP:1101;SCL:1;SRVR:MN2PR05MB6621;H:MN2PR05MB6141.namprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: vmware.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: /1gnCwNc6RWrD+n+G/RQODsiTRzHVjEsw5dcQuuPB4GPBzdFcpqbh4ZrA2V7uA/i/YHwPog1saCIJJFrI/KoLyPAsz1jotD1z8t+whpTnKdFsrUcOoKwU1LkLgqWdsqf/A9uup/AQ+xUUZ8v9Tk8O5ReXuNMniJj/aGseptQdIaTU1cjYdRT2tXpIueFkAJ7jTHKxM1IIEXtRO/uzKga+irUpxgIbqJ+8BV8sBkN2E+bbzeqPAjjt0B325x3CkTUkSzVO9PBsweHly2OGZpT1dOe0EVnmPna9JJ0AQK0uqttahKoEsEHt3P4gVgHVhGB+bW3qLAJfQNnfXScqWLp503irtvx2LBB7/rV2ceW9/6tDix6NmchZBTH/SZAKwuUTCtZaa10utXam+q6JQlx7jW+4jFeik38wz1E9IasJqE= Content-ID: <33383462AE9B364691F45CF7AF35D031@namprd05.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77a15709-cc6e-436d-4e32-08d6ae0047cb X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Mar 2019 13:22:35.5339 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR05MB6621 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 This is basically apply_to_page_range with added functionality: Allocating missing parts of the page table becomes optional, which means that the function can be guaranteed not to error if allocation is disabled. Also passing of the closure struct and callback function becomes different and more in line with how things are done elsewhere. Finally we keep apply_to_page_range as a wrapper around apply_to_pfn_range 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 | 10 ++++ mm/memory.c | 121 +++++++++++++++++++++++++++++++++------------ 2 files changed, 99 insertions(+), 32 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 80bb6408fe73..b7dd4ddd6efb 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2632,6 +2632,16 @@ typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr, extern int apply_to_page_range(struct mm_struct *mm, unsigned long address, unsigned long size, pte_fn_t fn, void *data); +struct pfn_range_apply; +typedef int (*pter_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr, + struct pfn_range_apply *closure); +struct pfn_range_apply { + struct mm_struct *mm; + pter_fn_t ptefn; + unsigned int alloc; +}; +extern int apply_to_pfn_range(struct pfn_range_apply *closure, + unsigned long address, unsigned long size); #ifdef CONFIG_PAGE_POISONING extern bool page_poisoning_enabled(void); diff --git a/mm/memory.c b/mm/memory.c index dcd80313cf10..0feb7191c2d2 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1938,18 +1938,17 @@ int vm_iomap_memory(struct vm_area_struct *vma, phys_addr_t start, unsigned long } EXPORT_SYMBOL(vm_iomap_memory); -static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd, - unsigned long addr, unsigned long end, - pte_fn_t fn, void *data) +static int apply_to_pte_range(struct pfn_range_apply *closure, pmd_t *pmd, + unsigned long addr, unsigned long end) { pte_t *pte; int err; pgtable_t token; spinlock_t *uninitialized_var(ptl); - pte = (mm == &init_mm) ? + pte = (closure->mm == &init_mm) ? pte_alloc_kernel(pmd, addr) : - pte_alloc_map_lock(mm, pmd, addr, &ptl); + pte_alloc_map_lock(closure->mm, pmd, addr, &ptl); if (!pte) return -ENOMEM; @@ -1960,86 +1959,103 @@ static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd, token = pmd_pgtable(*pmd); do { - err = fn(pte++, token, addr, data); + err = closure->ptefn(pte++, token, addr, closure); if (err) break; } while (addr += PAGE_SIZE, addr != end); arch_leave_lazy_mmu_mode(); - if (mm != &init_mm) + if (closure->mm != &init_mm) pte_unmap_unlock(pte-1, ptl); return err; } -static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud, - unsigned long addr, unsigned long end, - pte_fn_t fn, void *data) +static int apply_to_pmd_range(struct pfn_range_apply *closure, pud_t *pud, + unsigned long addr, unsigned long end) { pmd_t *pmd; unsigned long next; - int err; + int err = 0; BUG_ON(pud_huge(*pud)); - pmd = pmd_alloc(mm, pud, addr); + pmd = pmd_alloc(closure->mm, pud, addr); if (!pmd) return -ENOMEM; + do { next = pmd_addr_end(addr, end); - err = apply_to_pte_range(mm, pmd, addr, next, fn, data); + if (!closure->alloc && pmd_none_or_clear_bad(pmd)) + continue; + err = apply_to_pte_range(closure, pmd, addr, next); if (err) break; } while (pmd++, addr = next, addr != end); return err; } -static int apply_to_pud_range(struct mm_struct *mm, p4d_t *p4d, - unsigned long addr, unsigned long end, - pte_fn_t fn, void *data) +static int apply_to_pud_range(struct pfn_range_apply *closure, p4d_t *p4d, + unsigned long addr, unsigned long end) { pud_t *pud; unsigned long next; - int err; + int err = 0; - pud = pud_alloc(mm, p4d, addr); + pud = pud_alloc(closure->mm, p4d, addr); if (!pud) return -ENOMEM; + do { next = pud_addr_end(addr, end); - err = apply_to_pmd_range(mm, pud, addr, next, fn, data); + if (!closure->alloc && pud_none_or_clear_bad(pud)) + continue; + err = apply_to_pmd_range(closure, pud, addr, next); if (err) break; } while (pud++, addr = next, addr != end); return err; } -static int apply_to_p4d_range(struct mm_struct *mm, pgd_t *pgd, - unsigned long addr, unsigned long end, - pte_fn_t fn, void *data) +static int apply_to_p4d_range(struct pfn_range_apply *closure, pgd_t *pgd, + unsigned long addr, unsigned long end) { p4d_t *p4d; unsigned long next; - int err; + int err = 0; - p4d = p4d_alloc(mm, pgd, addr); + p4d = p4d_alloc(closure->mm, pgd, addr); if (!p4d) return -ENOMEM; + do { next = p4d_addr_end(addr, end); - err = apply_to_pud_range(mm, p4d, addr, next, fn, data); + if (!closure->alloc && p4d_none_or_clear_bad(p4d)) + continue; + err = apply_to_pud_range(closure, p4d, addr, next); if (err) break; } while (p4d++, addr = next, addr != end); return err; } -/* - * Scan a region of virtual memory, filling in page tables as necessary - * and calling a provided function on each leaf page table. +/** + * apply_to_pfn_range - Scan a region of virtual memory, calling a provided + * function on each leaf page table entry + * @closure: Details about how to scan and what function to apply + * @addr: Start virtual address + * @size: Size of the region + * + * If @closure->alloc is set to 1, the function will fill in the page table + * as necessary. Otherwise it will skip non-present parts. + * + * Returns: Zero on success. If the provided function returns a non-zero status, + * the page table walk will terminate and that status will be returned. + * If @closure->alloc is set to 1, then this function may also return memory + * allocation errors arising from allocating page table memory. */ -int apply_to_page_range(struct mm_struct *mm, unsigned long addr, - unsigned long size, pte_fn_t fn, void *data) +int apply_to_pfn_range(struct pfn_range_apply *closure, + unsigned long addr, unsigned long size) { pgd_t *pgd; unsigned long next; @@ -2049,16 +2065,57 @@ int apply_to_page_range(struct mm_struct *mm, unsigned long addr, if (WARN_ON(addr >= end)) return -EINVAL; - pgd = pgd_offset(mm, addr); + pgd = pgd_offset(closure->mm, addr); do { next = pgd_addr_end(addr, end); - err = apply_to_p4d_range(mm, pgd, addr, next, fn, data); + if (!closure->alloc && pgd_none_or_clear_bad(pgd)) + continue; + err = apply_to_p4d_range(closure, pgd, addr, next); if (err) break; } while (pgd++, addr = next, addr != end); return err; } +EXPORT_SYMBOL_GPL(apply_to_pfn_range); + +struct page_range_apply { + struct pfn_range_apply pter; + pte_fn_t fn; + void *data; +}; + +/* + * Callback wrapper to enable use of apply_to_pfn_range for + * the apply_to_page_range interface + */ +static int apply_to_page_range_wrapper(pte_t *pte, pgtable_t token, + unsigned long addr, + struct pfn_range_apply *pter) +{ + struct page_range_apply *pra = + container_of(pter, typeof(*pra), pter); + + return pra->fn(pte, token, addr, pra->data); +} + +/* + * Scan a region of virtual memory, filling in page tables as necessary + * and calling a provided function on each leaf page table. + */ +int apply_to_page_range(struct mm_struct *mm, unsigned long addr, + unsigned long size, pte_fn_t fn, void *data) +{ + struct page_range_apply pra = { + .pter = {.mm = mm, + .alloc = 1, + .ptefn = apply_to_page_range_wrapper }, + .fn = fn, + .data = data + }; + + return apply_to_pfn_range(&pra.pter, addr, size); +} EXPORT_SYMBOL_GPL(apply_to_page_range); /*