From patchwork Sat Oct 6 02:49:49 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: 10629073 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 DC67F933 for ; Sat, 6 Oct 2018 02:50:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA23C29700 for ; Sat, 6 Oct 2018 02:50:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE3AB29705; Sat, 6 Oct 2018 02:50:05 +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 0D04029700 for ; Sat, 6 Oct 2018 02:50:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0C2CF6B0010; Fri, 5 Oct 2018 22:49:59 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 022DF6B0266; Fri, 5 Oct 2018 22:49:58 -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 E0A4B6B0269; Fri, 5 Oct 2018 22:49:58 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by kanga.kvack.org (Postfix) with ESMTP id 91DA56B0010 for ; Fri, 5 Oct 2018 22:49:58 -0400 (EDT) Received: by mail-pg1-f198.google.com with SMTP id k66-v6so8259721pga.21 for ; Fri, 05 Oct 2018 19:49:58 -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:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uUwnm4kbSwTNCFf1XsAa2XvUkJcu4GXb3EmOzDMkAJQ=; b=eVmn3i+1P7scirGsEO73DHzZTpXvRUAg5cG52Hy2QBLArF2utf8ZjvjHo22P7GJRwI n/6wnYSFW5WmIjuRx7SBySuuROcDqWbwLpgyZjkHeuHQq5m5c5E/kgav4rkAYtoYeKXP 6KpcxTIa+KOkhNuOSpjBd879dTYcbTatzyayTvti70d9aBVE2oN50WcjSagKTlEtH3vK J0tHIs9S1HwiMY5ud1rgQzUnj0zQ4sjI5XQ0kEo06OzAZ4O7jCxqY7NDTTDpF3o5zZIe 9lQK7ham/VtCF9BYMhZnw5YSt3tvKEzcrupHLvxMZruYmbYmwDPkvdEkcEnUB5lr+M+s DCJQ== X-Gm-Message-State: ABuFfogh2G1YHh1GNgVYHE4wEHLQ2NLFf8Z43iBqbMr9uLcTZJ03Vazb 1wN0VtHKX04egRc1m8yzkcIbaIPkN3z9dlK9me1ZzENoAt4m3QGYzqqy0H1pjvWrL8k14i9eMbV J/KPkkXnZkp867vZxzr+z/lDUVohtD5D8s0zk0yxfB2wAr1Q28rJp5lclCu7a1n0H1VueS0a4rT uh4xwTg428gsdGb/iFMXpK+GrYSFL2InOrimHqjrxLwisTc6omm0SA4xrAR8O36KzioNbtorbBU dvRWUVWoT0rq6Kzlj829djsNDNi5jGsg1TCJ8tW59miMsBlOC6C95oNg9/z3cpw7U08ibfNeT+Q C9m00tHdAyTK0UnUInrN0KTzXumWaOPqDURNUZr2mQlMcVONYcOP5W1/yns8hAkvfAxCgl6VnmR d X-Received: by 2002:a62:db46:: with SMTP id f67-v6mr14446666pfg.1.1538794198198; Fri, 05 Oct 2018 19:49:58 -0700 (PDT) X-Received: by 2002:a62:db46:: with SMTP id f67-v6mr14446628pfg.1.1538794197200; Fri, 05 Oct 2018 19:49:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538794197; cv=none; d=google.com; s=arc-20160816; b=V4aDqRrDBE9u5Lnf2rf0n9O89ltqqD+u0cSHRMnVUw/BwoNFjPLOIBYrw7CK0IpVg9 w7M+ots5eJGmmT67eoXd2S1WS8B2DQQVWwWRYqlLB/8eoR0aMEADYWZ85da+Vyw9o6ca 33JI5JF+bU+ZBi/rhthVEGUjS6sMl0L1LHR2U5KItKh+L2HvUH+26c06/ZhkDOUlYBHr zALi2/RhxK6IFuwIEkmfS/Nh3yKkXRqolbzQuWfeMjr8d/+pvWLNjx/VovX1fvj408md T7O+cjX8Uq0gtAUVEXX9mzn2BvP0tVBCQM3n1ch8kDs+4H+qDqjaEbHjYdGhu6RM8Mi1 IH6w== 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=uUwnm4kbSwTNCFf1XsAa2XvUkJcu4GXb3EmOzDMkAJQ=; b=05GUklqO0AhxPpOVlQmJZmHfO8XK+Y7hM9cN8vV36pIb2/SglUvhIHzX8PyKMwschl VpElyJ2fXCIpAkn9RZV0zJSU2fBrXenhKaOEGcoagN+DyGyuHTwDnHwONn+j5HP8buxg KnVgyVqBXc6OYE50Pl7vmY5WYAWU6XRmvtdZeKMVvEWAX+bHm+TIkXUyR/ufDrj7fmlk s0e0bBcdx8G6w9Vi7G9Mg5iJRMpQEe181QDP+TYaeZ2zNM9oENqpwclf3cEnvhX6uht5 847Ox6PhBZPyg5V561tC56HyNfNtkomRjKx/Zdq+8452GuxIQ8V3v2gwS6iVuEUUuyPs +6pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=mOmcA1XN; 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 x2-v6sor8287323plv.13.2018.10.05.19.49.57 for (Google Transport Security); Fri, 05 Oct 2018 19:49:57 -0700 (PDT) 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=mOmcA1XN; 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=uUwnm4kbSwTNCFf1XsAa2XvUkJcu4GXb3EmOzDMkAJQ=; b=mOmcA1XN8t1evyQg+zxt6VQX5tr+T/+3k+mBofpeoJQ42Co5AMLtI7FyYaj7vyAwdf nF+EmE2IfK8E55X/sPoGEmZoIJjtdUonEPfjJaxpazSFI+Vg5Lgne8uMk4f3Iwh/ARMP Jn1EGp0x3TZHXgCd/ziXujOujO7fF7MwkkeACk8p1VIdKVmEXVj7ep8jUiqvLuSQdMoe mzWHQdqumYVBr0S4uuM0OLGqqktlDUPAosQdVkEVVeFo2Oqc+Vh7I1X3dst2VYK4fU54 3r/HEhnGeRT+voNkDgdVkxzi91sjP+Lfeolfi85Z4T7cGtIEOR2YrMXQQIgFtX1hU6JG QgMA== X-Google-Smtp-Source: ACcGV62TSzqQ0UByqhGM7J2RN+F1Nr2lP54ugB0kUwX0mpyKhYKJp4wYlDW3qRuAKJlmgRPFAKtTLw== X-Received: by 2002:a17:902:158b:: with SMTP id m11-v6mr14091490pla.102.1538794196881; Fri, 05 Oct 2018 19:49:56 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id n63-v6sm3962785pfn.9.2018.10.05.19.49.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 19:49:55 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Matthew Wilcox , Michal Hocko , Christopher Lameter , Jason Gunthorpe , Dan Williams , Jan Kara Cc: linux-mm@kvack.org, LKML , linux-rdma , linux-fsdevel@vger.kernel.org, John Hubbard , Doug Ledford , Mike Marciniszyn , Dennis Dalessandro , Christian Benvenuti Subject: [PATCH v3 3/3] infiniband/mm: convert put_page() to put_user_page*() Date: Fri, 5 Oct 2018 19:49:49 -0700 Message-Id: <20181006024949.20691-4-jhubbard@nvidia.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181006024949.20691-1-jhubbard@nvidia.com> References: <20181006024949.20691-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 For code that retains pages via get_user_pages*(), release those pages via the new put_user_page(), or put_user_pages*(), instead of put_page() This prepares for eventually fixing the problem described in [1], and is following a plan listed in [2], [3], [4]. [1] https://lwn.net/Articles/753027/ : "The Trouble with get_user_pages()" [2] https://lkml.kernel.org/r/20180709080554.21931-1-jhubbard@nvidia.com Proposed steps for fixing get_user_pages() + DMA problems. [3]https://lkml.kernel.org/r/20180710082100.mkdwngdv5kkrcz6n@quack2.suse.cz Bounce buffers (otherwise [2] is not really viable). [4] https://lkml.kernel.org/r/20181003162115.GG24030@quack2.suse.cz Follow-up discussions. CC: Doug Ledford CC: Jason Gunthorpe CC: Mike Marciniszyn CC: Dennis Dalessandro CC: Christian Benvenuti CC: linux-rdma@vger.kernel.org CC: linux-kernel@vger.kernel.org CC: linux-mm@kvack.org Signed-off-by: John Hubbard Reviewed-by: Jan Kara Acked-by: Jason Gunthorpe --- drivers/infiniband/core/umem.c | 7 ++++--- drivers/infiniband/core/umem_odp.c | 2 +- drivers/infiniband/hw/hfi1/user_pages.c | 11 ++++------- drivers/infiniband/hw/mthca/mthca_memfree.c | 6 +++--- drivers/infiniband/hw/qib/qib_user_pages.c | 11 ++++------- drivers/infiniband/hw/qib/qib_user_sdma.c | 8 ++++---- drivers/infiniband/hw/usnic/usnic_uiom.c | 7 ++++--- 7 files changed, 24 insertions(+), 28 deletions(-) diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c index a41792dbae1f..7ab7a3a35eb4 100644 --- a/drivers/infiniband/core/umem.c +++ b/drivers/infiniband/core/umem.c @@ -58,9 +58,10 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int d for_each_sg(umem->sg_head.sgl, sg, umem->npages, i) { page = sg_page(sg); - if (!PageDirty(page) && umem->writable && dirty) - set_page_dirty_lock(page); - put_page(page); + if (umem->writable && dirty) + put_user_pages_dirty_lock(&page, 1); + else + put_user_page(page); } sg_free_table(&umem->sg_head); diff --git a/drivers/infiniband/core/umem_odp.c b/drivers/infiniband/core/umem_odp.c index 6ec748eccff7..6227b89cf05c 100644 --- a/drivers/infiniband/core/umem_odp.c +++ b/drivers/infiniband/core/umem_odp.c @@ -717,7 +717,7 @@ int ib_umem_odp_map_dma_pages(struct ib_umem *umem, u64 user_virt, u64 bcnt, ret = -EFAULT; break; } - put_page(local_page_list[j]); + put_user_page(local_page_list[j]); continue; } diff --git a/drivers/infiniband/hw/hfi1/user_pages.c b/drivers/infiniband/hw/hfi1/user_pages.c index e341e6dcc388..99ccc0483711 100644 --- a/drivers/infiniband/hw/hfi1/user_pages.c +++ b/drivers/infiniband/hw/hfi1/user_pages.c @@ -121,13 +121,10 @@ int hfi1_acquire_user_pages(struct mm_struct *mm, unsigned long vaddr, size_t np void hfi1_release_user_pages(struct mm_struct *mm, struct page **p, size_t npages, bool dirty) { - size_t i; - - for (i = 0; i < npages; i++) { - if (dirty) - set_page_dirty_lock(p[i]); - put_page(p[i]); - } + if (dirty) + put_user_pages_dirty_lock(p, npages); + else + put_user_pages(p, npages); if (mm) { /* during close after signal, mm can be NULL */ down_write(&mm->mmap_sem); diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c index cc9c0c8ccba3..b8b12effd009 100644 --- a/drivers/infiniband/hw/mthca/mthca_memfree.c +++ b/drivers/infiniband/hw/mthca/mthca_memfree.c @@ -481,7 +481,7 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar, ret = pci_map_sg(dev->pdev, &db_tab->page[i].mem, 1, PCI_DMA_TODEVICE); if (ret < 0) { - put_page(pages[0]); + put_user_page(pages[0]); goto out; } @@ -489,7 +489,7 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar, mthca_uarc_virt(dev, uar, i)); if (ret) { pci_unmap_sg(dev->pdev, &db_tab->page[i].mem, 1, PCI_DMA_TODEVICE); - put_page(sg_page(&db_tab->page[i].mem)); + put_user_page(sg_page(&db_tab->page[i].mem)); goto out; } @@ -555,7 +555,7 @@ void mthca_cleanup_user_db_tab(struct mthca_dev *dev, struct mthca_uar *uar, if (db_tab->page[i].uvirt) { mthca_UNMAP_ICM(dev, mthca_uarc_virt(dev, uar, i), 1); pci_unmap_sg(dev->pdev, &db_tab->page[i].mem, 1, PCI_DMA_TODEVICE); - put_page(sg_page(&db_tab->page[i].mem)); + put_user_page(sg_page(&db_tab->page[i].mem)); } } diff --git a/drivers/infiniband/hw/qib/qib_user_pages.c b/drivers/infiniband/hw/qib/qib_user_pages.c index 16543d5e80c3..1a5c64c8695f 100644 --- a/drivers/infiniband/hw/qib/qib_user_pages.c +++ b/drivers/infiniband/hw/qib/qib_user_pages.c @@ -40,13 +40,10 @@ static void __qib_release_user_pages(struct page **p, size_t num_pages, int dirty) { - size_t i; - - for (i = 0; i < num_pages; i++) { - if (dirty) - set_page_dirty_lock(p[i]); - put_page(p[i]); - } + if (dirty) + put_user_pages_dirty_lock(p, num_pages); + else + put_user_pages(p, num_pages); } /* diff --git a/drivers/infiniband/hw/qib/qib_user_sdma.c b/drivers/infiniband/hw/qib/qib_user_sdma.c index 926f3c8eba69..14f94d823907 100644 --- a/drivers/infiniband/hw/qib/qib_user_sdma.c +++ b/drivers/infiniband/hw/qib/qib_user_sdma.c @@ -266,7 +266,7 @@ static void qib_user_sdma_init_frag(struct qib_user_sdma_pkt *pkt, pkt->addr[i].length = len; pkt->addr[i].first_desc = first_desc; pkt->addr[i].last_desc = last_desc; - pkt->addr[i].put_page = put_page; + pkt->addr[i].put_page = put_user_page; pkt->addr[i].dma_mapped = dma_mapped; pkt->addr[i].page = page; pkt->addr[i].kvaddr = kvaddr; @@ -321,7 +321,7 @@ static int qib_user_sdma_page_to_frags(const struct qib_devdata *dd, * the caller can ignore this page. */ if (put) { - put_page(page); + put_user_page(page); } else { /* coalesce case */ kunmap(page); @@ -635,7 +635,7 @@ static void qib_user_sdma_free_pkt_frag(struct device *dev, kunmap(pkt->addr[i].page); if (pkt->addr[i].put_page) - put_page(pkt->addr[i].page); + put_user_page(pkt->addr[i].page); else __free_page(pkt->addr[i].page); } else if (pkt->addr[i].kvaddr) { @@ -710,7 +710,7 @@ static int qib_user_sdma_pin_pages(const struct qib_devdata *dd, /* if error, return all pages not managed by pkt */ free_pages: while (i < j) - put_page(pages[i++]); + put_user_page(pages[i++]); done: return ret; diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.c b/drivers/infiniband/hw/usnic/usnic_uiom.c index 9dd39daa602b..9e3615fd05f7 100644 --- a/drivers/infiniband/hw/usnic/usnic_uiom.c +++ b/drivers/infiniband/hw/usnic/usnic_uiom.c @@ -89,9 +89,10 @@ static void usnic_uiom_put_pages(struct list_head *chunk_list, int dirty) for_each_sg(chunk->page_list, sg, chunk->nents, i) { page = sg_page(sg); pa = sg_phys(sg); - if (!PageDirty(page) && dirty) - set_page_dirty_lock(page); - put_page(page); + if (dirty) + put_user_pages_dirty_lock(&page, 1); + else + put_user_page(page); usnic_dbg("pa: %pa\n", &pa); } kfree(chunk);