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,