From patchwork Fri Oct 5 04:02:23 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: 10627307 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 66508112B for ; Fri, 5 Oct 2018 04:02:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55EF22963B for ; Fri, 5 Oct 2018 04:02:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4991D2964B; Fri, 5 Oct 2018 04:02:35 +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 B3F462963B for ; Fri, 5 Oct 2018 04:02:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EAE756B000C; Fri, 5 Oct 2018 00:02:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E5CAC6B000D; Fri, 5 Oct 2018 00:02:31 -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 CD9586B000E; Fri, 5 Oct 2018 00:02:31 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id 8AEDA6B000C for ; Fri, 5 Oct 2018 00:02:31 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id e24-v6so5888324pga.16 for ; Thu, 04 Oct 2018 21:02:31 -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=FQ4h/LPHosKAF6yBLvdW7SHE3lFOUnwjIbjs3D9x94ZoiD5o+HobEtnOSDXL7SreU6 kiVz31YByJYb0gVSJlsZMXMcUX/u+eo6uzQ3ftrrLxc3JleJSJk8xnmru5HDhiJfJ/g+ Bnxsq5RxZ+xmSJrxHg4vcROfMok+CM5LoG6ihtQDzK/5DqhorYaTIkq9kQYIvNR6UYtE ufSR9vsdZRMjMO8eSwi9jP/VaO0M5KiSiOBO74QbazZm6257m/Pst2x41m/MBvSOOPd5 9Nr07ccVSF1fiOzDKcveWtKYylcA/NXND3QRvPo8AWbtVAirreAETwbGEfKi1wwImPVp ieaA== X-Gm-Message-State: ABuFfoi6AbMkIICioZZxyd+hhSAmbCWcz68W8TuUYE3dqGkpIjvw9AfD ipApWap/tOMbdwRShlX3Ex0QdreZt+35sKQiSMFM3UOWE3xzTXEumckECDTAyeAH/719wRe5y+b 0zDT07KnckfrQgHyTYTQ8Y9nPvJy8WWWUBH8QByDuASCRnGZoFXx9w6JyNMZtN0GL19+Db+q4nb Tv7U+csVD5XduzVkUwXLzWFOaZMHJyDXs9RrBSkk6J83uX7sI6KQOfqRhSv6qHu25H8NRQySH8Q MBfovGqB/iIVXgYUi1papeewd8y5cSg/tu1OZYpFxPwRejYZBV8ch7p2HUE7URrHUjHNc2QU00d qmXTKGr1fUBK/GGHoFHfZASKvGtV1X/KbC1Y5pW82EhE3XfsBSjQTtcaXdJ3saxlMDK1KEBlYWI 9 X-Received: by 2002:a62:56c1:: with SMTP id h62-v6mr9933311pfj.107.1538712151227; Thu, 04 Oct 2018 21:02:31 -0700 (PDT) X-Received: by 2002:a62:56c1:: with SMTP id h62-v6mr9933261pfj.107.1538712150434; Thu, 04 Oct 2018 21:02:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538712150; cv=none; d=google.com; s=arc-20160816; b=znalLLIbQZG4A0MVcIROTI7rAAhi29irGNJFHd01TPM/lf9bqSZ0jJBj94IT5/Jdnf W1gYlK1SoNC24CJhx5YAVt/6jdzFKLtcOkbzjnlFWitg2I+U8Wu1PboTao9EYHEgZ7hD sYhTdljTG8pb0w+DDz/b5ZFYR3qhe4bRZ44li82xomTXjiSOJXat4Kj6vNONUWP58IyR 8IAwWr/zbgyMUVll0KoJovfblrrsTauvU4Z1P6jCuTFNSUpjOar7gJm87E7+W0jdRz6b 8pS+hvtvJvQRkWt6EyGjwBuIwQjA8WU2PdFpiFTDP8wHowCRyiVvAv8JkNSDTakftkvO UeFw== 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=e/9NeVavLI+85ztldRU41ww+XKkZSFoWZq1jkhKwav4gAYz/4oKgvhA7eyzyaHIuBb HKrCG5tn08UEn/cw4yO9dQVFEL52XwdCc/DZVQxNFo+HvLBvznkGdBYq6mRvihmL0gCS BBu9Rj41oSOi9gWlZa9B6KjoJA1gwHvbTxugPnDotXy5zP0wdvEmY1yn9k+V5/Kvyxgu aFRpvFl0+4Bhpix3Otaqd9sadMyWB1u1CFgSGpGBMM+t1R7xQmn2e90qimuk9izMRz8Y 4ETbjRHaAGYK4V19hsu6Hf0axW1EIPpQ6jID1Jv76BnTD6x86jRMbvUTOVSZ5BYif9pg poWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=jnBPsSfK; 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 h194-v6sor5414140pfe.64.2018.10.04.21.02.30 for (Google Transport Security); Thu, 04 Oct 2018 21:02:30 -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=jnBPsSfK; 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=jnBPsSfK5fSXGwduKnZGAGaMGRRYua4ihkiQF/kSRjRfwYA7Nki2njxBsluBQp1a2N zJoaFzdL6stH9ZpgKFPj3ZAgP+bbvg0sGgjF2xk4+CTaXJU6EYIzpO14aVEeJNm21Ez6 rgn2EBLW6zUyMoGUFhRmQquZsjsA4YOr2ZgVH/rUGJ0CHEGDXEQujR26l2PawuGebxWo 9634LJicJryqBps2Ker4hPLHAIFzDZEOcp4X0IHkcbpB2nkg0LO/dOc+G/0UlqKJDh7w O88lGtgflHTsV4BLHfZNYEdINT3cQAYIVuodOJ7bMRiEa1jlVruRwEqlmf/+9PIbrPlo bhTw== X-Google-Smtp-Source: ACcGV63oi1zgzhFKtBbotOp0wxv3Zx7L4Yb5NK6heXq7C8ZXXTl2TMHDg76/I8sW8MkGluw2iX8tEg== X-Received: by 2002:a62:4799:: with SMTP id p25-v6mr9886156pfi.197.1538712150072; Thu, 04 Oct 2018 21:02:30 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id c2-v6sm8787899pfo.107.2018.10.04.21.02.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Oct 2018 21:02:29 -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 v2 1/3] mm: get_user_pages: consolidate error handling Date: Thu, 4 Oct 2018 21:02:23 -0700 Message-Id: <20181005040225.14292-2-jhubbard@nvidia.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181005040225.14292-1-jhubbard@nvidia.com> References: <20181005040225.14292-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,