From patchwork Tue Dec 4 00:17:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 10710949 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 DFA581057 for ; Tue, 4 Dec 2018 00:17:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE8B92A9CA for ; Tue, 4 Dec 2018 00:17:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C27342AD1D; Tue, 4 Dec 2018 00:17:31 +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,FREEMAIL_FROM,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 8AEA72A9CA for ; Tue, 4 Dec 2018 00:17:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BD9C06B6BBA; Mon, 3 Dec 2018 19:17:28 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B89D36B6BBB; Mon, 3 Dec 2018 19:17:28 -0500 (EST) 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 A2C5F6B6BBE; Mon, 3 Dec 2018 19:17:28 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id 611566B6BBA for ; Mon, 3 Dec 2018 19:17:28 -0500 (EST) Received: by mail-pg1-f199.google.com with SMTP id s22so7863579pgv.8 for ; Mon, 03 Dec 2018 16:17:28 -0800 (PST) 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:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=XzA73EqE8Ltz+Bmvg4LIrynYRpRmJP+rG0bPVB2uNWI=; b=mGl3gAngrVm/P/yARUg32rcDJoafGaOiXqgGD92z4Ka3+Th8ZBX+Rsyn6UHeuE0WaT kkDRTVPHw4p6C8HVVEriG3dhpJXubdxJVkgfmNDJtZGFFpsb73ZjN7hZSAQ/Kz5rRduK hZbKQVhYZPNCQB076zIu8AOMfh57WsLyCSRFIQ7CbTSQNVy6NE9vFXWMiEqer7pp2Y7p Sc3NTI2OrsDO/V3aZQzW4ediSbdPu/uVNiSrdO1pmcepwFRw3vFp5ARHPGGUqXYv0SdH TT+laU2pe5j0ayINJ00tpp1xOQcLKLsVu6wWheIReYjVS8MqUztIMhojgIgRyK/Z1XRn /J7w== X-Gm-Message-State: AA+aEWbL3Sh1kxfw0JpnqsroTmENgwM/g1yUCJUxzzNoNc5Y4ZUCfCgN Mkwl8tx5Sz9C0XGY5mLVlsQSZUQ5vCp+HBG33yWsDuknfYmonoc3ggwY45+umJcfw8QzsAzVoXf fyeKFFSnLw4BchTXHqUtLMr+UboM7JydLOVmwxVPL9q8BjhLnQ8IiWpf5PF4ggqoWIX+3rmpiOI oeGaJTFIHuqrMpx3AEC0JaDsji2gbqvooWBA6uEfxMaJL9SbYh6H5+qezp+K/Ie/9Ernqe3Ua4R sJEfc1viaYsx8tZDCpnAt9GV3bzynD9/IN4hbKzjTQteJz06Ixf+poGAYIH1UTVwxif2UESFmS+ pUPU+Kp8oO658JfdZ2uqkw34gJA1p0+0Kmj6X45bBucH0kSjPBlSMrCuZaLqp/JcwE+GHZP6d4v Y X-Received: by 2002:a17:902:30a3:: with SMTP id v32mr12237362plb.26.1543882648044; Mon, 03 Dec 2018 16:17:28 -0800 (PST) X-Received: by 2002:a17:902:30a3:: with SMTP id v32mr12237326plb.26.1543882647233; Mon, 03 Dec 2018 16:17:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543882647; cv=none; d=google.com; s=arc-20160816; b=hcA/W8bXqOofxqD79js6lF4LxgO6292MkeiJ/FBNZvt19iIf4WN1P0wfR4YeXowuI1 Nbg7Dor2F/ho4qLUB6UgvAvPpvyIzLo0Xt33wZ28y4//UgDuwQy2WTz6HuTCIyib7Op5 3+e12ByH3Jhi2nYohELG+8TvcGayxoundyt8jXqRXIqOOei7asiwCGIl/ipSLUWai8AS k2/HB3RFcRf0sSPdRrFq6oVFX3aBsg7PCn9AjkMrqmL0jmbvyctyNtHows93tVjiNdsz CNP0+DPOhsqEB+/odZ44h8bkXyeg91iGFfpQdSpwtlEnqOHkeTlVpHd3TcCoZ+yWRp4o UcLg== 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:dkim-signature; bh=XzA73EqE8Ltz+Bmvg4LIrynYRpRmJP+rG0bPVB2uNWI=; b=HBRnAxnaVEyr0me8cNdgHS3Ilex9q1n+y4yVhmbsd+PJIGOl5O1P846yNrcZgCCwlw CBDL5QYRIUtvi4/lVOKA+NRKJPjzer6It6IHdQAOo6IbG6EexKxl3Ne4lARPvXeu8ojL IZ4B9DWRxW8VFHp7I/HUYAEkKHNfXeIKHhgYzpNhpYF/3eAYcizyWBQUoKuGKtTQ4tQC ZZD43WVTwtWKKEL8MLIxQhOyCwAuqjj4ITrswvGxoEyfx/spCojdiwIs3f82qsMbm3yJ JxAr6MQpUisHJt8EKC3scsBH1kIYpVOT87fftwDhfJNAmZbt88geXARgKFS/Ly2eiru9 R7mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=qRHptAnx; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id b35sor20239158plb.6.2018.12.03.16.17.27 for (Google Transport Security); Mon, 03 Dec 2018 16:17:27 -0800 (PST) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=qRHptAnx; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XzA73EqE8Ltz+Bmvg4LIrynYRpRmJP+rG0bPVB2uNWI=; b=qRHptAnxSmY0SV7pTLD0P+JxP2qf/CoGd2JSoAg8lb0oOJ8/vswldPL6YwN9D5Iy+g tGBjq3O4Oh+Ycz5WDc/ybZHNt1S7p2c4tt61hFDgBjIthRQF5bVJVeqwxnKCBHVhJpqI x5xT9PDGpZq260jDIC+mb35DFYhhoAiCwivBoyZlzK960q0eF939KalKQ6a733DgIP/A GcHRW6dFklUb1zfrM8dA0lqUdxFNJr90maY+jKBs9URiKnM24VGngAVb9N8gLajyNJGT l2eQ1DcWQTiFgb2cgO6+53eYfpDc5T3L6mXSLMxknbBRvpl5vcQNWZYq6y3nTczVmQX+ dfHQ== X-Google-Smtp-Source: AFSGD/XZ2IX9Gr12rMvn+Gle/ds7bHz6CGJlgl2qe1W1dmyW/pbSa/y0VamDlEIdGHq91r7QKb4qQw== X-Received: by 2002:a17:902:47aa:: with SMTP id r39mr17855076pld.219.1543882646874; Mon, 03 Dec 2018 16:17:26 -0800 (PST) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id y12sm21733332pfk.70.2018.12.03.16.17.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Dec 2018 16:17:26 -0800 (PST) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton , linux-mm@kvack.org Cc: Jan Kara , Tom Talpey , Al Viro , Christian Benvenuti , Christoph Hellwig , Christopher Lameter , Dan Williams , Dennis Dalessandro , Doug Ledford , Jason Gunthorpe , Jerome Glisse , Matthew Wilcox , Michal Hocko , Mike Marciniszyn , Ralph Campbell , LKML , linux-fsdevel@vger.kernel.org, John Hubbard Subject: [PATCH 1/2] mm: introduce put_user_page*(), placeholder versions Date: Mon, 3 Dec 2018 16:17:19 -0800 Message-Id: <20181204001720.26138-2-jhubbard@nvidia.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181204001720.26138-1-jhubbard@nvidia.com> References: <20181204001720.26138-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public 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 From: John Hubbard Introduces put_user_page(), which simply calls put_page(). This provides a way to update all get_user_pages*() callers, so that they call put_user_page(), instead of put_page(). Also introduces put_user_pages(), and a few dirty/locked variations, as a replacement for release_pages(), and also as a replacement for open-coded loops that release multiple pages. These may be used for subsequent performance improvements, via batching of pages to be released. This is the first step of fixing the problem described in [1]. The steps are: 1) (This patch): provide put_user_page*() routines, intended to be used for releasing pages that were pinned via get_user_pages*(). 2) Convert all of the call sites for get_user_pages*(), to invoke put_user_page*(), instead of put_page(). This involves dozens of call sites, and will take some time. 3) After (2) is complete, use get_user_pages*() and put_user_page*() to implement tracking of these pages. This tracking will be separate from the existing struct page refcounting. 4) Use the tracking and identification of these pages, to implement special handling (especially in writeback paths) when the pages are backed by a filesystem. Again, [1] provides details as to why that is desirable. [1] https://lwn.net/Articles/753027/ : "The Trouble with get_user_pages()" Reviewed-by: Jan Kara Cc: Matthew Wilcox Cc: Michal Hocko Cc: Christopher Lameter Cc: Jason Gunthorpe Cc: Dan Williams Cc: Jan Kara Cc: Al Viro Cc: Jerome Glisse Cc: Christoph Hellwig Cc: Ralph Campbell Signed-off-by: John Hubbard Signed-off-by: John Hubbard --- include/linux/mm.h | 20 ++++++++++++ mm/swap.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index 5411de93a363..09fbb2c81aba 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -963,6 +963,26 @@ static inline void put_page(struct page *page) __put_page(page); } +/* + * put_user_page() - release a page that had previously been acquired via + * a call to one of the get_user_pages*() functions. + * + * Pages that were pinned via get_user_pages*() must be released via + * either put_user_page(), or one of the put_user_pages*() routines + * below. This is so that eventually, pages that are pinned via + * get_user_pages*() can be separately tracked and uniquely handled. In + * particular, interactions with RDMA and filesystems need special + * handling. + */ +static inline void put_user_page(struct page *page) +{ + put_page(page); +} + +void put_user_pages_dirty(struct page **pages, unsigned long npages); +void put_user_pages_dirty_lock(struct page **pages, unsigned long npages); +void put_user_pages(struct page **pages, unsigned long npages); + #if defined(CONFIG_SPARSEMEM) && !defined(CONFIG_SPARSEMEM_VMEMMAP) #define SECTION_IN_PAGE_FLAGS #endif diff --git a/mm/swap.c b/mm/swap.c index aa483719922e..bb8c32595e5f 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -133,6 +133,86 @@ void put_pages_list(struct list_head *pages) } EXPORT_SYMBOL(put_pages_list); +typedef int (*set_dirty_func)(struct page *page); + +static void __put_user_pages_dirty(struct page **pages, + unsigned long npages, + set_dirty_func sdf) +{ + unsigned long index; + + for (index = 0; index < npages; index++) { + struct page *page = compound_head(pages[index]); + + if (!PageDirty(page)) + sdf(page); + + put_user_page(page); + } +} + +/* + * put_user_pages_dirty() - for each page in the @pages array, make + * that page (or its head page, if a compound page) dirty, if it was + * previously listed as clean. Then, release the page using + * put_user_page(). + * + * Please see the put_user_page() documentation for details. + * + * set_page_dirty(), which does not lock the page, is used here. + * Therefore, it is the caller's responsibility to ensure that this is + * safe. If not, then put_user_pages_dirty_lock() should be called instead. + * + * @pages: array of pages to be marked dirty and released. + * @npages: number of pages in the @pages array. + * + */ +void put_user_pages_dirty(struct page **pages, unsigned long npages) +{ + __put_user_pages_dirty(pages, npages, set_page_dirty); +} +EXPORT_SYMBOL(put_user_pages_dirty); + +/* + * put_user_pages_dirty_lock() - for each page in the @pages array, make + * that page (or its head page, if a compound page) dirty, if it was + * previously listed as clean. Then, release the page using + * put_user_page(). + * + * Please see the put_user_page() documentation for details. + * + * This is just like put_user_pages_dirty(), except that it invokes + * set_page_dirty_lock(), instead of set_page_dirty(). + * + * @pages: array of pages to be marked dirty and released. + * @npages: number of pages in the @pages array. + * + */ +void put_user_pages_dirty_lock(struct page **pages, unsigned long npages) +{ + __put_user_pages_dirty(pages, npages, set_page_dirty_lock); +} +EXPORT_SYMBOL(put_user_pages_dirty_lock); + +/* + * put_user_pages() - for each page in the @pages array, release the page + * using put_user_page(). + * + * Please see the put_user_page() documentation for details. + * + * @pages: array of pages to be marked dirty and released. + * @npages: number of pages in the @pages array. + * + */ +void put_user_pages(struct page **pages, unsigned long npages) +{ + unsigned long index; + + for (index = 0; index < npages; index++) + put_user_page(pages[index]); +} +EXPORT_SYMBOL(put_user_pages); + /* * get_kernel_pages() - pin kernel pages in memory * @kiov: An array of struct kvec structures