From patchwork Thu Mar 21 13:22:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 10863527 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 4E9A96C2 for ; Thu, 21 Mar 2019 13:22:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3106C2A1D2 for ; Thu, 21 Mar 2019 13:22:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 249222A1ED; Thu, 21 Mar 2019 13:22:41 +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 9DB922A1D2 for ; Thu, 21 Mar 2019 13:22:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A48EE6B0005; Thu, 21 Mar 2019 09:22:38 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 9F7AF6B0007; Thu, 21 Mar 2019 09:22:38 -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 897B56B0008; Thu, 21 Mar 2019 09:22:38 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) by kanga.kvack.org (Postfix) with ESMTP id 696EE6B0005 for ; Thu, 21 Mar 2019 09:22:38 -0400 (EDT) Received: by mail-io1-f69.google.com with SMTP id k5so5099125ioh.13 for ; Thu, 21 Mar 2019 06:22:38 -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=evBEIq9R7Zyav+BEQnsIq594pdJQbHyzsBjcA5BVIVM=; b=FlYyrk3zsq0oYLglxMzWTI0Wp0Gkst0RASF+B1QAMI1kTZhlswnmegSy62WC8/ZaNV 06Trnw2i4AgvzofHkcWBx/bw6BiUwnAfNfNCJ7M2wIBMpkd5/cIwencDJX2f16z53hgY kjOfTAFT4lADaKiK5zh2ERz8RGgSq3ooI3g46Bl63HUSsWdrnPXnR10aP+u2aS2CFIz9 c8Pv9E2KcGrHIJ39tP4MdOC0POBth4ZBQiAcAv7vZM7h3fjizWhGG4xtQCgZbZzb54UZ 5OBA/D07M/A5Dpqy0c51vDap9mvBV7FIgEaGnCv7L287oQtXrMM5rFZet1HUkvE7eoDy Sfyg== X-Gm-Message-State: APjAAAWoTwupni7nQO+wmWHr4WDc6yT3rg1LLbmU1oI4iNZsyPlZV5Fg vIiMHWB5Ltu8eeTAul35VcAFxBhot2IBNyZ1+S5RPv8kaD6d12QAO1g5LSiJooYn2leDrOEnkHi K8kjchyWPKOn80cpKgLZtEdNkXpxHudj3BzJmaw7hjnFmSs9CHYVY7VW9esWZu91hSQ== X-Received: by 2002:a5d:9159:: with SMTP id y25mr2699334ioq.146.1553174558171; Thu, 21 Mar 2019 06:22:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqyaFmqEYZoXz6NfIMmyqhHPrQT7BllmiqMWpBOZRExXUrziiGOtSbIPwBfP1Z4WccZtLJ0A X-Received: by 2002:a5d:9159:: with SMTP id y25mr2699252ioq.146.1553174557143; Thu, 21 Mar 2019 06:22:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553174557; cv=none; d=google.com; s=arc-20160816; b=JZpx72Xka8TeloHnFPyxVOpPgfQChJiNPyPvt4UByjWA2KUrQGvKDn9M9bHxirKmht NxlQMW5wwiDJPe8TpnYFrmcjTyON/D5mXGKsJN5p7Z0qVE2LCf5KRzbJv/b0dxvmqXy9 Jx2W7/IIlEDfQ88lu4XX0iY3E9YKpaPdkQy99bOF/RPYqpUjoKhB084V8hQrFOsCjM47 BBLXGFQqL5Pg5Is/vFYzARLf1e4x2q8D6UuMjm2AAajQYrD/Wj8Dzj+AjO98TrjRR7Do 3ChTUF5GwR/dGrTehf1iZeBomexWi2lNAuTSPMjqajsbm+GHxIiX/tAqtuprLDEJvjfh d0HQ== 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=evBEIq9R7Zyav+BEQnsIq594pdJQbHyzsBjcA5BVIVM=; b=doZ4w2v7beLpoT8LQeA5feT+qR97Dqofq5H1uDObye1itiP3YxZpF9qZKw5rtAilz0 flUE0bFxp6HD5cz7RNwh/fgahEDuYQRt3+0OIxya0W7odMg4s3R46aoW+tOgpRNDo03x ExeNb3n/fZIn7mmreoumo0ijpbnmG7eyoOZixbnBF9oT6XGcs6QxOVlCHvI1UwTIXLvN 9s19X7LLTikfA8jXQ+cyEqwn5cfpDD0DHb9RB73pn7Rm2tLcZAyF4sOAWz113RoKBsde /3SydN0S9fHDkYKE+2nY1b5P++x1UoTIZtd1O3ggHQg2tCcC9Zr3nRivQgbEDVOIOGpu SI1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@vmware.com header.s=selector1 header.b=RUwBe3MV; spf=pass (google.com: domain of thellstrom@vmware.com designates 40.107.76.54 as permitted sender) smtp.mailfrom=thellstrom@vmware.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vmware.com Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-eopbgr760054.outbound.protection.outlook.com. [40.107.76.54]) by mx.google.com with ESMTPS id x5si2363883iof.64.2019.03.21.06.22.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Mar 2019 06:22:37 -0700 (PDT) Received-SPF: pass (google.com: domain of thellstrom@vmware.com designates 40.107.76.54 as permitted sender) client-ip=40.107.76.54; Authentication-Results: mx.google.com; dkim=pass header.i=@vmware.com header.s=selector1 header.b=RUwBe3MV; spf=pass (google.com: domain of thellstrom@vmware.com designates 40.107.76.54 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=evBEIq9R7Zyav+BEQnsIq594pdJQbHyzsBjcA5BVIVM=; b=RUwBe3MVyEk8YrgBQkdtOcdZfy1U9Gr3+zULuL/M1p7Cpu4ZV3TpI8jhocKJnPCSZuHU0TCR2ksu1uRkMrD4N2Wq/TnGr6he23ABWYG2N+lu0gy+InuiLCgZ7HKZSV0pfBJOuzfimD/HNelBB+5S2hSCSHdK6MlN2w8gH3qvfXU= Received: from MN2PR05MB6141.namprd05.prod.outlook.com (20.178.241.217) by MN2PR05MB6095.namprd05.prod.outlook.com (20.178.243.30) 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:29 +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:29 +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 1/3] mm: Allow the [page|pfn]_mkwrite callbacks to drop the mmap_sem Thread-Topic: [RFC PATCH RESEND 1/3] mm: Allow the [page|pfn]_mkwrite callbacks to drop the mmap_sem Thread-Index: AQHU3+kixa6QVuIp90qsvOxWc92GAQ== Date: Thu, 21 Mar 2019 13:22:29 +0000 Message-ID: <20190321132140.114878-2-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: f8833622-1aa9-4e42-cce7-08d6ae004434 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020);SRVR:MN2PR05MB6095; x-ms-traffictypediagnostic: MN2PR05MB6095: 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)(39860400002)(136003)(366004)(376002)(346002)(396003)(189003)(199004)(186003)(66574012)(86362001)(1076003)(71200400001)(68736007)(66066001)(71190400001)(26005)(476003)(11346002)(2616005)(6506007)(386003)(97736004)(486006)(256004)(110136005)(25786009)(7416002)(54906003)(14444005)(446003)(102836004)(305945005)(76176011)(316002)(6436002)(7736002)(2906002)(36756003)(52116002)(6486002)(14454004)(6636002)(3846002)(6116002)(105586002)(6512007)(106356001)(50226002)(5660300002)(53936002)(99286004)(8676002)(8936002)(4326008)(81156014)(2501003)(81166006)(478600001);DIR:OUT;SFP:1101;SCL:1;SRVR:MN2PR05MB6095;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: hQ4P8jjvw7j9PnvCLnLqF/GNKKgk7ETWks3+0uciBAf1mPomnGmHbw7v9jFigYR9ioF3fURfupWC8oH0dst3H1CkE5iukc1CxJVGUNooDfjPemidP1ysWVubhMHYYiYrl7vkdU0kXWf61qv7m2kWgTsInJX3935wMScSiBRKOQnM6TE1Kr8DjOUuJGKupuiefNYfdQQSbCZ/WOU6DgHUnMQe5aU4WYyEBCxs6f/3e09nE4n+4qSROtu66rG21uI/2hycZtfEwMHBxiTT+nKHf0zIwAZv10CI433yczyCkpogKAa91j4xl4Rl3cvDhTGfzLSOcKKnJqNE+5SmSg5rNPB906pmt0HnHP/1IraL6muJfLbXunbaBdkppsNE9GHIreBs5m/MdrkjOBSsvVUiZNaytemNjBzUCpzSl2QLA60= Content-ID: <14C50C164779244686F1CE797E991428@namprd05.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8833622-1aa9-4e42-cce7-08d6ae004434 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Mar 2019 13:22:29.4293 (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: MN2PR05MB6095 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 Driver fault callbacks are allowed to drop the mmap_sem when expecting long hardware waits to avoid blocking other mm users. Allow the mkwrite callbacks to do the same by returning early on VM_FAULT_RETRY. In particular we want to be able to drop the mmap_sem when waiting for a reservation object lock on a GPU buffer object. These locks may be held while waiting for the GPU. 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 --- mm/memory.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index a52663c0612d..dcd80313cf10 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2144,7 +2144,7 @@ static vm_fault_t do_page_mkwrite(struct vm_fault *vmf) ret = vmf->vma->vm_ops->page_mkwrite(vmf); /* Restore original flags so that caller is not surprised */ vmf->flags = old_flags; - if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE))) + if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_RETRY | VM_FAULT_NOPAGE))) return ret; if (unlikely(!(ret & VM_FAULT_LOCKED))) { lock_page(page); @@ -2419,7 +2419,7 @@ static vm_fault_t wp_pfn_shared(struct vm_fault *vmf) pte_unmap_unlock(vmf->pte, vmf->ptl); vmf->flags |= FAULT_FLAG_MKWRITE; ret = vma->vm_ops->pfn_mkwrite(vmf); - if (ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)) + if (ret & (VM_FAULT_ERROR | VM_FAULT_RETRY | VM_FAULT_NOPAGE)) return ret; return finish_mkwrite_fault(vmf); } @@ -2440,7 +2440,8 @@ static vm_fault_t wp_page_shared(struct vm_fault *vmf) pte_unmap_unlock(vmf->pte, vmf->ptl); tmp = do_page_mkwrite(vmf); if (unlikely(!tmp || (tmp & - (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) { + (VM_FAULT_ERROR | VM_FAULT_RETRY | + VM_FAULT_NOPAGE)))) { put_page(vmf->page); return tmp; } @@ -3472,7 +3473,8 @@ static vm_fault_t do_shared_fault(struct vm_fault *vmf) unlock_page(vmf->page); tmp = do_page_mkwrite(vmf); if (unlikely(!tmp || - (tmp & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) { + (tmp & (VM_FAULT_ERROR | VM_FAULT_RETRY | + VM_FAULT_NOPAGE)))) { put_page(vmf->page); return tmp; } 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); /* From patchwork Thu Mar 21 13:22:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 10863535 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 0C3131669 for ; Thu, 21 Mar 2019 13:22:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC3BD2A1F3 for ; Thu, 21 Mar 2019 13:22:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CFD612A1F2; Thu, 21 Mar 2019 13:22:53 +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 BFB382A1D0 for ; Thu, 21 Mar 2019 13:22:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7D5C96B0008; Thu, 21 Mar 2019 09:22:51 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 784056B000A; Thu, 21 Mar 2019 09:22:51 -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 6011D6B000C; Thu, 21 Mar 2019 09:22:51 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) by kanga.kvack.org (Postfix) with ESMTP id 3AF7A6B0008 for ; Thu, 21 Mar 2019 09:22:51 -0400 (EDT) Received: by mail-io1-f72.google.com with SMTP id 186so5037817iox.15 for ; Thu, 21 Mar 2019 06:22:51 -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=bv10d+zYN4Uc8FgH16BSutqBeEzX25Lc323lcQX+yaE=; b=JzwvW9Pzs+Ej0oxCFmcz2QJb9GkJewJD66TfhLLV47XLjU5YSoIXynak6Zt9ZFEEca Jz8RsFtS+nwEGBLYlFej+QBDbtxpcA4fdRLsmn5Yz/Wcro1bVYuFwJaA8OhwsDz1Zzg5 vYm9GW1EgiuEses1WHJhDz2v3aDLaAYK/V6sLoNqMlhlClJ/Xbh0W0KgWkcvk1jWIpXr BXDXd3OtYSToGgqXhyRMMJoxKSbcPxW0FyGvJBD1lCV6H8hf7I9pnDP91LVZKi+XLDnr aWOrM/iPCWy6qMp9RrEwHL/tv+Hvtq2TdRKYph+zkxO0vYY7F8EuicKnedbgtTK2TtjN vr2Q== X-Gm-Message-State: APjAAAURPY+o+2bmSsLBjrbcgfnFxkF2rPcxWlBX7wmhOa7OZmGJwFj/ KoFS72MZIYSue4cHQRyS+9TxGm5vfZJP+zM80eP9zvEU4ka3Jq7x82s8cttFU7xk0m0k6TfkNYM s81+ihe1oD7o1z46l2p9W7f1x8N4jVWG/FU+X9Dw8Ca5EKTqmjWeaJy311h0DbqrJ4Q== X-Received: by 2002:a24:618d:: with SMTP id s135mr3014289itc.101.1553174570857; Thu, 21 Mar 2019 06:22:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqxYUVCTQwGksIeVm7qBL2JGBJ7U4AxVzYQW6POwYhVQEPI9W+ZcQQujjdC/vFUUqy//cQxe X-Received: by 2002:a24:618d:: with SMTP id s135mr3014210itc.101.1553174569827; Thu, 21 Mar 2019 06:22:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553174569; cv=none; d=google.com; s=arc-20160816; b=m4STi0T9V27BHqdU7AHz0YSblINRQIXGRlcx5oNSVoWxIzWfZ5qdCs9kCSlSaTVvcL dvZBmqj8wE88UbaAZpmR1FnUEZrlfJfihd39GsAAzh9Y3bdjeUT3zBJxa+kYvjh1zGX/ jTb6AV1VgGvTHnqtKqqJyE+DSB7np4DkYxscSHDbe1Hcae3Y9k2k1VQNOJTjRyI3Pu/Z QRJOzQR6wZwDgFdqLVjxw5yx0SftzAqwmOVStm5glnaLcdiV0c3Me4a8PnejM1tn2V9q 2Fwpc6cDxU/Dpxl9Kj5ZAPgXd+qZla16igLF8lKSqpj90CbZ+jJCzNZFVxbgYaMlhuL0 iS9A== 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=bv10d+zYN4Uc8FgH16BSutqBeEzX25Lc323lcQX+yaE=; b=CKDwvLBknoKLxby69kO+lC5rS6/3f7DpvTl69Gtq28O2frrZ7DmVPmdKjJttaR5t9W S74sZtUq3TWJstkASVy5hvn/jqNVO+6y842vG8fSH59KdvNY7Fkkczhze6UHfUtDY/Gj sZJcFrKhiJyxKxp+y3yo5NbiTj6Ljlh7GpwHXYhLu5ek2nYAES1AN1qInDNxJDSAKFvl gVLuTDiCF98UCFEnm/I7Uh8a7Ssdr6jeas8uY+D6th5q2dmVKcc2NL+R2l73x9wZqK63 ZmS4scENGVGyi7VeXpRP9DurnJDD/Qs8qwSJ1izbgvX+zNpn+TqO43UnjdJ26gqVcVsp zruQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@vmware.com header.s=selector1 header.b=UclUda3G; spf=pass (google.com: domain of thellstrom@vmware.com designates 40.107.79.81 as permitted sender) smtp.mailfrom=thellstrom@vmware.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vmware.com Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-eopbgr790081.outbound.protection.outlook.com. [40.107.79.81]) by mx.google.com with ESMTPS id r202si2392860itc.0.2019.03.21.06.22.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Mar 2019 06:22:49 -0700 (PDT) Received-SPF: pass (google.com: domain of thellstrom@vmware.com designates 40.107.79.81 as permitted sender) client-ip=40.107.79.81; Authentication-Results: mx.google.com; dkim=pass header.i=@vmware.com header.s=selector1 header.b=UclUda3G; spf=pass (google.com: domain of thellstrom@vmware.com designates 40.107.79.81 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=bv10d+zYN4Uc8FgH16BSutqBeEzX25Lc323lcQX+yaE=; b=UclUda3GgVrDFg3cdTW2XhVsVE3wpY8MjBBV9XKKx4liHykVtSLST7XBJkXK97i4GZLkgT5v/sAbXWrdZO6gYvStYkdkewzrfUO3/vyXKu6GYL+WDTByJHPGQKvAFdiyXK2G+4yXGF3+bZj2yPByQV0MikyyEikhtPnWgOV/qy4= Received: from MN2PR05MB6141.namprd05.prod.outlook.com (20.178.241.217) by MN2PR05MB6095.namprd05.prod.outlook.com (20.178.243.30) 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:42 +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:42 +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 3/3] mm: Add write-protect and clean utilities for address space ranges Thread-Topic: [RFC PATCH RESEND 3/3] mm: Add write-protect and clean utilities for address space ranges Thread-Index: AQHU3+kpdiIu5v4jJEe8gBEI8TXDiw== Date: Thu, 21 Mar 2019 13:22:41 +0000 Message-ID: <20190321132140.114878-4-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: e3ff9442-6ee0-4ea6-6ef0-08d6ae004b9e x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020);SRVR:MN2PR05MB6095; x-ms-traffictypediagnostic: MN2PR05MB6095: 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)(39860400002)(136003)(366004)(376002)(346002)(396003)(189003)(199004)(186003)(66574012)(86362001)(1076003)(71200400001)(68736007)(66066001)(30864003)(71190400001)(26005)(476003)(11346002)(2616005)(6506007)(386003)(97736004)(486006)(256004)(110136005)(25786009)(7416002)(54906003)(14444005)(446003)(102836004)(305945005)(76176011)(316002)(6436002)(7736002)(2906002)(36756003)(52116002)(6486002)(14454004)(6636002)(3846002)(6116002)(105586002)(6512007)(106356001)(50226002)(5660300002)(53936002)(99286004)(8676002)(8936002)(4326008)(81156014)(2501003)(81166006)(478600001);DIR:OUT;SFP:1101;SCL:1;SRVR:MN2PR05MB6095;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: nIvcoL+ocylfIN4dsFkE1sWgK7vgl8nNfDZUgNPHatrQSBIZiKyt095+/3MTE0O/VGpYl4FmV8ExEIU9BNORmxdutBuCeKpVmsT40JJzoH0fGUF+2jD1bA5nSKQ8dOnlsE2qTiOAxpgNZmpheEnootbkUmN0MRzT071foq9ADIpk/iff8y4Tp7njT62VrQRkHnm71VTyfRH91lRc04cRf7nFRWmgHpCsUmhYKQNtbBkkuJ54NyFLM1iQwrNTk+DBH1OHDqRYTWVIjjATSmZ7U1kO5SL6BsH2mU7oEH4Oo/QXRJat0VUNAAkxiydjwart9EAz3v/E/DRje77zn21Xva3qEH+2fiH7fl9EcI/+13ONvoSNpCjcsEAS2ft0VGiaQKfacT82TiVPAMjbJP8NZgwiWH32T8F2O9Zk+S2lvMk= Content-ID: MIME-Version: 1.0 X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3ff9442-6ee0-4ea6-6ef0-08d6ae004b9e X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Mar 2019 13:22:41.8346 (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: MN2PR05MB6095 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);