From patchwork Sat Oct 6 02:49:47 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: 10629063 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 0AE5115A6 for ; Sat, 6 Oct 2018 02:50:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EBD8529700 for ; Sat, 6 Oct 2018 02:49:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF5D929705; Sat, 6 Oct 2018 02:49:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-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 688DD29700 for ; Sat, 6 Oct 2018 02:49:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA4116B000C; Fri, 5 Oct 2018 22:49:55 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E30286B000D; Fri, 5 Oct 2018 22:49:55 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BE3756B000E; Fri, 5 Oct 2018 22:49:55 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id 74EE36B000C for ; Fri, 5 Oct 2018 22:49:55 -0400 (EDT) Received: by mail-pf1-f197.google.com with SMTP id r67-v6so11240886pfd.21 for ; Fri, 05 Oct 2018 19:49:55 -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=FVIsmZsD2UYUIajD9wCWvufUKrPcgTlr9PeHswP0yEs=; b=Gt9PNkRh0f1CpN0l1aFf+wCTiVdI7DpiqGAvolwYNQVIpT2coxvQI3IXJtcYrwXRtq F1WZBjZFnvK/zdIEstT3wzEhca9VM9f8qlPkvWVLmlkdp06TIiTXlptLgDpYId01bmYQ 8qX8dGQUHZFUT17tgmhMlLIBkAoNCmcGk40xOvxmqZcjFouDJDY9HSP04TUwFqdphM1/ DMmgvc1OCLhul0j+W2ERE30k2fmhAnIQjJrJFpCKdfQYlIgyiCSG1mef1C5o9avB0sc+ CxlXdEd29S2QmvMpOhbmTodPTg/upQbjG4MZ+A6/PWvF+3zU6gxe9Ibh6Npoj1pbJfxx AaRg== X-Gm-Message-State: ABuFfojx+MqVqyR9e9nk4ipUwBstP1Mz7Jcp7+hNSR2CPZli6GF6Tdym GnV5Dl3gbt4EmXeD/wiBibwYrh5/R9GncLBiaCQurmrlMgoZrDGnBp0RzY/HdlcBtosRxO6kfUl JfsUsIufLjLLfaA/6L3IAlDezBJ9h17BhyPDGXI3dFI+5nzjpmtY744RqoRXP0xr6PoauQqb2p7 TUb7cc+Sep4x0Qf+f4vS2D/S3iua9UmUpivWJlIht6PysgeDpyN+lK72OGKX5w2HRv2mgXHkEb3 UMhjdyG+RYqk6mVtSAkgRgTNvPQkKDKVF44DyVms0s9PcLAjDLMjpSvk6eUSVa1DsTXMbLfTiMO zvYjlNfr9jorvIEq/rXsK2nnqm//q6pke2i/TJRL+/moklJhlDKMBRL7aHpugcCaXdEXkG99YTo J X-Received: by 2002:a17:902:4d45:: with SMTP id o5-v6mr13810383plh.42.1538794195164; Fri, 05 Oct 2018 19:49:55 -0700 (PDT) X-Received: by 2002:a17:902:4d45:: with SMTP id o5-v6mr13810341plh.42.1538794194120; Fri, 05 Oct 2018 19:49:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538794194; cv=none; d=google.com; s=arc-20160816; b=XQCVRLbu/u7MaEsCM0Q21iWIuZ9yhIZud9t58OPOdtIgHNts2/0Hg7bOPXFLh8ajLA U4jgPnYTbpRQqdxEJjxreYJu5jg+RGLMYWv/JwV34VcNq70SqPkJkJ0qlJb1c9WpX2cv 7DYPdCegSAhswIj/oPk9UJV17mO4tFltsRtsy9kq/ZuWm0JlfbA/QRZzezEujRXoAeRb 54egn+YRUXZ6yXWYDhR4rUQDFV8NJ+8O96eZgJGhtZmW7HuMq5/1Havp2MDTfOuCAUm5 0S4oPXHnmo6RFCkmo+zqzGh6/GYbImuk5khjHgildPFKEPe7V2qsHaUAWRlkxXiRcb7C Tjqg== 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=FVIsmZsD2UYUIajD9wCWvufUKrPcgTlr9PeHswP0yEs=; b=Ue31qPgTSg72JcxnwhU4/NMDElwhc7da807/vVQ9ste2h+s7LBByk8zKUWQOGdH6r6 /QGZW5hjhwTK370T3IijCmAelqoerUO/bUsIGgoVwg08HS2JHVqcXcw35TvOkoa8GyCg jTfpbQW4enVKmZeWmYg8qjZE13X5XURZ+RbM2X4RHf0lQ5lPUx4M1CJsBohAn7Lez7s3 XovCnYzzy4mIvipH5tN6YhHQlfIEawmpxtIcEYUV+kgTsddvYQxm8uQro0og/VE1+IVl hs9x9aroizAFCPuJsoOJ1N/svclNhcG1DE0/1z1fyMncxMESmJwSaq7FeejljR2VxnGM lEpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TtFCbeUQ; 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 x6-v6sor8277410plr.44.2018.10.05.19.49.54 for (Google Transport Security); Fri, 05 Oct 2018 19:49:54 -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=TtFCbeUQ; 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=FVIsmZsD2UYUIajD9wCWvufUKrPcgTlr9PeHswP0yEs=; b=TtFCbeUQABKwJQNsY1ARZNCx4FpkA64f1mZStu96EEXotHAt9mhWVKYMxISGgZIuAy e9XH9h3UlTqIpFJMnHvv/F8ZM3YpgWBol0G9MgMTvKLfdMDQz8waroBAE9BLt5i93eVi unxz3ToLsqxZShV8nWoWz6xE75lLYMtfFYZa6ryBouDtkU2CFbENDu0gwAipIPucI4/f f0dfgBXLY34NZf5lVhC7Qpdg5v8kHXASNVpHN+Fzx8XoIQ0xnffM0N42BrjnGZSmJbKE YHf+gQbLgTWl94iN98FCxVLbs7fd8BDOird5jcNZ0YsgMma0hW3XG/ZtLeo0SFW8+VQ9 z43Q== X-Google-Smtp-Source: ACcGV62BmgctjFnuEzcUrQCVuDXjZsdW3sOw7lJYocd8SSwA0nJNtMPSF930/XkeU2sheSeUcgT72w== X-Received: by 2002:a17:902:a618:: with SMTP id u24-v6mr14096438plq.77.1538794193757; Fri, 05 Oct 2018 19:49:53 -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.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 19:49:52 -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 Subject: [PATCH v3 1/3] mm: get_user_pages: consolidate error handling Date: Fri, 5 Oct 2018 19:49:47 -0700 Message-Id: <20181006024949.20691-2-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 An upcoming patch requires a way to operate on each page that any of the get_user_pages_*() variants returns. In preparation for that, consolidate the error handling for __get_user_pages(). This provides a single location (the "out:" label) for operating on the collected set of pages that are about to be returned. As long every use of the "ret" variable is being edited, rename "ret" --> "err", so that its name matches its true role. This also gets rid of two shadowed variable declarations, as a tiny beneficial a side effect. Reviewed-by: Jan Kara Signed-off-by: John Hubbard --- mm/gup.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 1abc8b4afff6..05ee7c18e59a 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -660,6 +660,7 @@ static long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, struct vm_area_struct **vmas, int *nonblocking) { long i = 0; + int err = 0; unsigned int page_mask; struct vm_area_struct *vma = NULL; @@ -685,18 +686,19 @@ static long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, if (!vma || start >= vma->vm_end) { vma = find_extend_vma(mm, start); if (!vma && in_gate_area(mm, start)) { - int ret; - ret = get_gate_page(mm, start & PAGE_MASK, + err = get_gate_page(mm, start & PAGE_MASK, gup_flags, &vma, pages ? &pages[i] : NULL); - if (ret) - return i ? : ret; + if (err) + goto out; page_mask = 0; goto next_page; } - if (!vma || check_vma_flags(vma, gup_flags)) - return i ? : -EFAULT; + if (!vma || check_vma_flags(vma, gup_flags)) { + err = -EFAULT; + goto out; + } if (is_vm_hugetlb_page(vma)) { i = follow_hugetlb_page(mm, vma, pages, vmas, &start, &nr_pages, i, @@ -709,23 +711,25 @@ static long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, * If we have a pending SIGKILL, don't keep faulting pages and * potentially allocating memory. */ - if (unlikely(fatal_signal_pending(current))) - return i ? i : -ERESTARTSYS; + if (unlikely(fatal_signal_pending(current))) { + err = -ERESTARTSYS; + goto out; + } cond_resched(); page = follow_page_mask(vma, start, foll_flags, &page_mask); if (!page) { - int ret; - ret = faultin_page(tsk, vma, start, &foll_flags, + err = faultin_page(tsk, vma, start, &foll_flags, nonblocking); - switch (ret) { + switch (err) { case 0: goto retry; case -EFAULT: case -ENOMEM: case -EHWPOISON: - return i ? i : ret; + goto out; case -EBUSY: - return i; + err = 0; + goto out; case -ENOENT: goto next_page; } @@ -737,7 +741,8 @@ static long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, */ goto next_page; } else if (IS_ERR(page)) { - return i ? i : PTR_ERR(page); + err = PTR_ERR(page); + goto out; } if (pages) { pages[i] = page; @@ -757,7 +762,9 @@ static long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, start += page_increm * PAGE_SIZE; nr_pages -= page_increm; } while (nr_pages); - return i; + +out: + return i ? i : err; } static bool vma_permits_fault(struct vm_area_struct *vma, From patchwork Sat Oct 6 02:49:48 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: 10629069 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 093BC15A6 for ; Sat, 6 Oct 2018 02:50:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9F3829700 for ; Sat, 6 Oct 2018 02:50:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD55F2970B; Sat, 6 Oct 2018 02:50:02 +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 4A62A29700 for ; Sat, 6 Oct 2018 02:50:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3D0D26B000E; Fri, 5 Oct 2018 22:49:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 32FC56B0010; Fri, 5 Oct 2018 22:49:57 -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 184906B0266; Fri, 5 Oct 2018 22:49:57 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by kanga.kvack.org (Postfix) with ESMTP id D5FAE6B000E for ; Fri, 5 Oct 2018 22:49:56 -0400 (EDT) Received: by mail-pf1-f199.google.com with SMTP id v9-v6so11275790pff.4 for ; Fri, 05 Oct 2018 19:49:56 -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=01DDUSyuajCXizBTsypEqSwY2/MJLvR3TICruWaqIVc=; b=OPGBzkJ9xFII0NJKg8wzH6f2zAhVlZcu1qnIGEvDelUnG7NrHB5mmatzeFrWZu21uK rTHPqFe91vgQCn82zzAc78CsevFO76VtQGmHwnG3KrHcCGfRZ3O1aibhmA9lE12acJlr wgNpfshCp3ihyQxCKamXp8ruSCkdQ6Nf4/I20IGiUesaZA+/Nj16B8QUC6AoOWWP+MhI cp50bjdyLj/HNDRhDLQdYP/5ILksQx6oCdtWJ96+HvM4ZqPMTxnxcCfudtpkJJZLH35j VaNXOuSMSVZ8PHCLTBKMDlU1xHj5GPeicB3/i35U+R20CQ09WGQZ1vL0SJqomq9NC6oh 7mWA== X-Gm-Message-State: ABuFfojGQ/plfcI5WA3vqJfvYaBY2WAU18KXLhitchd/Gc1SaTE0jIpU ZLmC4HXFVSpr0fugsXxuXGDG7RZj6NGD+Ew9O4cT+0BpB9VEi0+nYiTtZvX87+/f3w9kuUcbMBv HXO7Y9CPzp9bt9ybRbo8pAo6IpI5nw5QWCXCUa1J4C7pP+D7NGSWEUwnXCuYWdgSosPjQ/Rr9zr Hl7O9nIcxbTEGaRm7lskKzF7DP/4zb8mnKksgU8s+GmQczxNY25fXfwg8JzNLG3Hstg2xkus4Il buQUt/otThdgDuPqQAb2e5FeFG4JykqyrVJvOmBQEABlXcC2eF9uqZDpnm3J+KT+5KYbvcIMeka WnGFEn9x+Ju+lEmeVXMMG9D8E1WooP9HP+2/N5SCm5dISlKeOiAwRZdBap0dGI3ZNe1DCQ6kZo7 r X-Received: by 2002:a17:902:1026:: with SMTP id b35-v6mr14382170pla.283.1538794196543; Fri, 05 Oct 2018 19:49:56 -0700 (PDT) X-Received: by 2002:a17:902:1026:: with SMTP id b35-v6mr14382141pla.283.1538794195672; Fri, 05 Oct 2018 19:49:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538794195; cv=none; d=google.com; s=arc-20160816; b=seLkDRS5uxkydiaXuf+BRyiBT8du+Gs00hqGoRIl5lTbl5vgYFcQX8i+FjkgFz53kP R6AyHvIkRzDglxeQq1gGENHuDmC4fYfodzvkDcAamwTpxtHGza7cAyxeHw7/tSy8ZQxd zOCUB8bU5jRU/tdP3pKN0uuaqsBPCF3p6w1TqnMRT+qR9loedVZ3U4+26nOPl5ICXHT6 EkSTjHbayh1K2Ns41CWKinHky88ngtFw+7BwEA5HJM7+OF8UUY0nqterfsydyeaEBTRG Rgnw6HJUFW4nK+VJZdb0Kny70ob4ktwsOtBQi7GMdSunreZchwSHtbJgqWyiofF1y/3S dSLw== 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=01DDUSyuajCXizBTsypEqSwY2/MJLvR3TICruWaqIVc=; b=XjOutSWaPnXH1ETukNtKgs4xrDXO2q3ljsYT+X+iNzFwyjRrVwGsAcwtGa09lqJS5j zF/GNxAKFDx4HoXFLffDF3xAzi4apDjior35EW1OOkTLkmo9Ej9ut/vEziJNKRzYOYV/ +Ay/GO0fA2xAX5Ki2F5L8Ri/XNMIPyuv+2jNZDicaKvxpm+O+0VCb/PKmBWcDFEIunmm phMrfNcfA7f1W3CtDl1ajOdY53cTJCm8CZh/sGpJAClYwwuqHNtbpPjZtfBYfgL5knby ja37T+r2kxI5hEbNpwa+wEzepVoVpQonY+5hqGVF7hvqFTsG0Hvo2ZxdDZ1UbmP2+nCo nJLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=gZT62M2H; 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 b38-v6sor6977298plb.21.2018.10.05.19.49.55 for (Google Transport Security); Fri, 05 Oct 2018 19:49:55 -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=gZT62M2H; 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=01DDUSyuajCXizBTsypEqSwY2/MJLvR3TICruWaqIVc=; b=gZT62M2H6Q36uwqP8UJt98SnxUmEe0yrjAmJ2xll4EC9dRr78DoAkNM4Bsvi+vH0ug yGvv//ICP4M0GjxzxoA9O/8lCppksEoFyonWiBtBpHDx4apadIU56gbXr6qwB9+SgNM5 oeAK+/uFC2WaE9hVjy8f5GLT+X3NwJBMIJA2KTrzh2Z/C2m7PQH3OJlrD+VPM8lZsq0e SPC5HneuopMYVZxZzzJ2DfZXllsm3L6UGySg0xVB/BLB6EcewLjyFfBDT2hZhMsHZuiM Ig2I60+7M9LHpPByDDeqPTx9cDPFzkJM4mAnJZfgruICN+xh2KZsYmZlqj9j5e9M66Q6 mwcw== X-Google-Smtp-Source: ACcGV61qFbcFaNDprDERpWbkRlyDNawmPGj+nXn0xCRdARDugWyI37vkT6XxOYW+se4JH8oMqeQVSA== X-Received: by 2002:a17:902:6b06:: with SMTP id o6-v6mr13810554plk.6.1538794195317; Fri, 05 Oct 2018 19:49:55 -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.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 19:49:54 -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 , Al Viro , Jerome Glisse , Christoph Hellwig , Ralph Campbell Subject: [PATCH v3 2/3] mm: introduce put_user_page*(), placeholder versions Date: Fri, 5 Oct 2018 19:49:48 -0700 Message-Id: <20181006024949.20691-3-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 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 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: 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 Reviewed-by: Jan Kara --- include/linux/mm.h | 48 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 0416a7204be3..305b206e6851 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -137,6 +137,8 @@ extern int overcommit_ratio_handler(struct ctl_table *, int, void __user *, size_t *, loff_t *); extern int overcommit_kbytes_handler(struct ctl_table *, int, void __user *, size_t *, loff_t *); +int set_page_dirty(struct page *page); +int set_page_dirty_lock(struct page *page); #define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n)) @@ -943,6 +945,50 @@ static inline void put_page(struct page *page) __put_page(page); } +/* Pages that were pinned via get_user_pages*() should be released via + * either put_user_page(), or one of the put_user_pages*() routines + * below. + */ +static inline void put_user_page(struct page *page) +{ + put_page(page); +} + +static inline void put_user_pages_dirty(struct page **pages, + unsigned long npages) +{ + unsigned long index; + + for (index = 0; index < npages; index++) { + if (!PageDirty(pages[index])) + set_page_dirty(pages[index]); + + put_user_page(pages[index]); + } +} + +static inline void put_user_pages_dirty_lock(struct page **pages, + unsigned long npages) +{ + unsigned long index; + + for (index = 0; index < npages; index++) { + if (!PageDirty(pages[index])) + set_page_dirty_lock(pages[index]); + + put_user_page(pages[index]); + } +} + +static inline void put_user_pages(struct page **pages, + unsigned long npages) +{ + unsigned long index; + + for (index = 0; index < npages; index++) + put_user_page(pages[index]); +} + #if defined(CONFIG_SPARSEMEM) && !defined(CONFIG_SPARSEMEM_VMEMMAP) #define SECTION_IN_PAGE_FLAGS #endif @@ -1534,8 +1580,6 @@ int redirty_page_for_writepage(struct writeback_control *wbc, void account_page_dirtied(struct page *page, struct address_space *mapping); void account_page_cleaned(struct page *page, struct address_space *mapping, struct bdi_writeback *wb); -int set_page_dirty(struct page *page); -int set_page_dirty_lock(struct page *page); void __cancel_dirty_page(struct page *page); static inline void cancel_dirty_page(struct page *page) { 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);