From patchwork Mon Jul 2 00:56: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: 10500277 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7204260545 for ; Mon, 2 Jul 2018 00:57:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60AE428736 for ; Mon, 2 Jul 2018 00:57:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54D1A2876C; Mon, 2 Jul 2018 00:57:42 +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 C717428737 for ; Mon, 2 Jul 2018 00:57:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6C8306B0005; Sun, 1 Jul 2018 20:57:38 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6256D6B0006; Sun, 1 Jul 2018 20:57:38 -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 47D296B0008; Sun, 1 Jul 2018 20:57:38 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ot0-f199.google.com (mail-ot0-f199.google.com [74.125.82.199]) by kanga.kvack.org (Postfix) with ESMTP id 166166B0005 for ; Sun, 1 Jul 2018 20:57:38 -0400 (EDT) Received: by mail-ot0-f199.google.com with SMTP id e21-v6so398794oti.22 for ; Sun, 01 Jul 2018 17:57:38 -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; bh=QznxYmIJyvjPvcW2d5RmodQzyafpankCZbir/u4uwqA=; b=s9MQZkTzqN+GE+6fUUZT5QGBQHKcHYKOztc91mQMX8FsnNaq45rhVtQLbMmdEdNjAv mnkOiENCafaVaJhzNfJr+96dv2Jto5bwABLsmqDDTDyXxFQNk7pHmON2/OwytOB5V1UL lKFXQN7WCAjVI5mxE4gEznZi4Fg4c6bHBSuXTBBQcRYPOKmdlpwq9cW+6Kop/aaAGjln lYZGvK6i5glmuzgEiSMdsdpqMLgtu0Bc4BJNGqrsc2IM4Xg5Q5mCtIpRifEMvrtj9gkK r4wuvs2P035Q/Tvk+SBgl/I+8qruYNzEF87W0IDtAfT8qOPSlauqUqhQDQeC1qrqupYJ 8NWw== X-Gm-Message-State: APt69E1qY+SE3WPsQSHY3IGoJdnunmbFIJBUB7Zca67GkmZsR4JlOfyD 9wN5ThQHN3GfNyu+E0mnjJ8P1mEbtg6Z6EX3ZmvVX345Olzg0Oq/5iCnB9qfaI0rNvXZibyYB2H Sl6QmB5GMxOEXKz7GKnsx0bZqnws2/YT1eWnGu+OFoHCcQ7CFJCyvxn/x3pX4+wfBacFWXFYyrP 4ARozRSB8XJVWNwadDUAYxZ9HLAJcdUxYWSLXAYBTFHWZYL3i1tvbUbWtycyGmESpww6M7tVVQ8 vGDo5c/TnQIG9ZcInR7/hBJEGI5dNIqKRag3VhLSIOx67RX/fpSE/Z5+DyCFAkiwIqot3K/sQ2R QKo4oxd1RBt8hxPe7HxE56qGn/Ob+DkapwdDCmlTy5CfFbFv5IsQo/V4mFE9C3S5V0AAXt9zl4M F X-Received: by 2002:aca:4914:: with SMTP id w20-v6mr1969922oia.5.1530493057805; Sun, 01 Jul 2018 17:57:37 -0700 (PDT) X-Received: by 2002:aca:4914:: with SMTP id w20-v6mr1969889oia.5.1530493057039; Sun, 01 Jul 2018 17:57:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530493057; cv=none; d=google.com; s=arc-20160816; b=w1BjzdrvORshvU6aXJx3/VMocKkzsIYXu+m9F+fUkXA1UmYc+QAOvYCOWefQAvGSMm 1SxtS83BP8Fl65QRPLXbHO8Dxc0s/DFvCL9ufWd9Vtj7iXGoo165wuHCV52yCA0HZRok iiRbepq1oxVqpu7LpKr7t1Ifw8hob4IEADHt2q3BYeqQbK9aC68ClpndqNL2H72hmhrm Hn9EizjtTengy2Vq+1bo7+8kykNFHlbZBKtPPOYmkKBR8cko8QXGmLRyuUjYrCDjH6+i vqRWAp9Xm+zJVEyED5wSK57oq9P2Vcx/lIyF4X8sJ20N/uXRuHXQozkkWHMCJRBJiiJz EqeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=QznxYmIJyvjPvcW2d5RmodQzyafpankCZbir/u4uwqA=; b=oZkhCXPWrVHjGzXhHAe1fF8uRXp35//kFXvGrfozPu64GrsiBHVN8b/DP6cy+0kZgm euqOkMOkXQH0kZhwbgnk6aQqZRRGqmzlpisPxcD0IapwOXOG2l8lebIwFbIL8H4Fe3B8 GZ954JRSAdSIup/TDwtLzZCLfB44L3vBJ66nyjNj73qx2JseE6LaL+5p1oKAL2REpnDC N+/kpvEYGPAW14RdiYKSNJPe0KWzLs58yZc9dn50JYdYgsdIKPUj1on5U0k6XtmnfP7j 5GJwqu55UGOeXpNWyK9k2cdgVxjDe8nqxAp7gMmHHQG8NQH/pOW2ItaEZILDsDOXbBSU pOmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hWfbcYK9; 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 t17-v6sor6295826oih.125.2018.07.01.17.57.36 for (Google Transport Security); Sun, 01 Jul 2018 17:57:37 -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=hWfbcYK9; 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; bh=QznxYmIJyvjPvcW2d5RmodQzyafpankCZbir/u4uwqA=; b=hWfbcYK90ZFSVF7CPhjJqkZJkFXYwIcrJsA8qSWx2d9D2WE42OFwjIogQ+dK61wWbz xi/AtqTf8nmYTn8f4pqy1+JBT30ww2wcnqYTu7eoVodIDpP+TZWHMDT/FXyzAdefpARV 5wQ1/0qZSWRw1YXfRjuAYtPIP8mBPfCYXh9NniKCeKHWyoogjOa2DT1w3EGp+AmrXlIE tFdlxKXMGne9l3mStfbdMZcPA83e1TKDEI6I2zpnkP4B7lNJWDAafslxzJ2yQAlAJicU uHj4bIKxemEsq6ZHHBFYSOJGobVExjGEmoZwNYQjTYvhWRKx/E4U+Fr7z2FOvKzaxXmq 9mjw== X-Google-Smtp-Source: AAOMgpcQ8Y1bpOxRFXxcg5s3ok3Rqo7VC9R76sdBKKGJFLAcKfEcH4yxfhnFde/pthu9PzWlDeYRew== X-Received: by 2002:aca:7517:: with SMTP id q23-v6mr12490591oic.352.1530493056827; Sun, 01 Jul 2018 17:57:36 -0700 (PDT) Received: from sandstorm.nvidia.com ([2600:1700:43b0:3120:feaa:14ff:fe9e:34cb]) by smtp.gmail.com with ESMTPSA id v6-v6sm4111672oix.30.2018.07.01.17.57.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Jul 2018 17:57:35 -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/6] mm: get_user_pages: consolidate error handling Date: Sun, 1 Jul 2018 17:56:49 -0700 Message-Id: <20180702005654.20369-2-jhubbard@nvidia.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180702005654.20369-1-jhubbard@nvidia.com> References: <20180702005654.20369-1-jhubbard@nvidia.com> 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. Signed-off-by: John Hubbard Reviewed-by: Jan Kara --- mm/gup.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index b70d7ba7cc13..73f0b3316fa7 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,