From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A443C43381 for ; Sat, 2 Mar 2019 03:27:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2547F20840 for ; Sat, 2 Mar 2019 03:27:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mbSR1UNa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727830AbfCBD1f (ORCPT ); Fri, 1 Mar 2019 22:27:35 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:36987 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726412AbfCBD1d (ORCPT ); Fri, 1 Mar 2019 22:27:33 -0500 Received: by mail-pg1-f193.google.com with SMTP id q206so12355617pgq.4; Fri, 01 Mar 2019 19:27:32 -0800 (PST) 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=leaxPvy1d10f5W6h1jZANHHaMuetimQOji2p2Tbvgzs=; b=mbSR1UNapIwRC+fCHjf6h75XOW390JwACBb/7lMvP3BzO/AkNyzsGtkot9QZ9G9JDi z13H/ihcHnkfWqVqaw8/VNT6JRFUebEed5MfQQrvOpCLPEwrkdLVbKQwi1SJdS7Uxsww LifOUHa/yPLAkAxZCXcM+xotqcieiTcInAfKOhSjrFfGH7VCDvNmZUt9bFBgfIEOgb0t 3+WK6Did+cdpohTeSy2rk0aT5Ap/2HEVSjDQyAXdh3ZmvkgdzdVeU5tFAcps5U1cj2OI 9do0o5EK0P7jTJR+a9nTFsEWM/mPDPiv9wINswIG982u/dDV1GsUtolwnDC3une2tL6r /+5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=leaxPvy1d10f5W6h1jZANHHaMuetimQOji2p2Tbvgzs=; b=p194jKK0J8niwtqBRSmdaDNT+LFBQmsbHdhyhgltOy6tGcRDLtrdP1bVvaDFRw3t98 RWhDukkk1JtKi+wuYcIQOUbWMt4vjVlIt00P9M+IMKOdZMQTIheldlcozyTgRvGouIFG tRBPkWCkcPusHGWRyADVVJ21KevF5AZmrcv8OPPljhXYNpZ80ZTKHg/L5j4JjQRZNP8p pBvc2mrtDWMfUekTOD1KfREmmDnhwd7Iezdz+SJ6HTdSDeG+xGgZULMWKAIzJllb4hzv U4QDAJI3FJ9wI5BIBN4xhZ0f4A3DcYO/OHg11STR+RuOnYIamjMYcisJm9b4qkfGGi1H f/Nw== X-Gm-Message-State: APjAAAUodKLT19jZZV1JmeUCu2j16Dy4dGi2fVXd5yjcIqUyIVKdNQKC WhiKRnaH0+CHFniG37Slwww= X-Google-Smtp-Source: APXvYqwec0QG9bvbCYGlNaj+o05RSOIfNS7zXmMPVGDD4XkfdS/FRM7bq/V49Yad0E0UgIfZOhlOzQ== X-Received: by 2002:a63:9246:: with SMTP id s6mr8006076pgn.349.1551497251660; Fri, 01 Mar 2019 19:27:31 -0800 (PST) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id 63sm42312273pfy.110.2019.03.01.19.27.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Mar 2019 19:27:30 -0800 (PST) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: linux-mm@kvack.org Cc: Andrew Morton , LKML , John Hubbard , Ira Weiny , Jason Gunthorpe , Doug Ledford , linux-rdma@vger.kernel.org Subject: [PATCH] RDMA/umem: minor bug fix and cleanup in error handling paths Date: Fri, 1 Mar 2019 19:27:26 -0800 Message-Id: <20190302032726.11769-2-jhubbard@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190302032726.11769-1-jhubbard@nvidia.com> References: <20190302032726.11769-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: John Hubbard 1. Bug fix: the error handling release pages starting at the first page that experienced an error. 2. Refinement: release_pages() is better than put_page() in a loop. 3. Dead code removal: the check for (user_virt & ~page_mask) is checking for a condition that can never happen, because earlier: user_virt = user_virt & page_mask; ...so, remove that entire phrase. 4. Minor: As long as I'm here, shorten up a couple of long lines in the same function, without harming the ability to grep for the printed error message. Cc: Ira Weiny Cc: Jason Gunthorpe Cc: Andrew Morton Cc: Doug Ledford Cc: linux-rdma@vger.kernel.org Cc: linux-mm@kvack.org Signed-off-by: John Hubbard --- drivers/infiniband/core/umem_odp.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/infiniband/core/umem_odp.c b/drivers/infiniband/core/umem_odp.c index acb882f279cb..294bf6676947 100644 --- a/drivers/infiniband/core/umem_odp.c +++ b/drivers/infiniband/core/umem_odp.c @@ -648,25 +648,17 @@ int ib_umem_odp_map_dma_pages(struct ib_umem_odp *umem_odp, u64 user_virt, if (npages < 0) { if (npages != -EAGAIN) - pr_warn("fail to get %zu user pages with error %d\n", gup_num_pages, npages); + pr_warn("fail to get %zu user pages with error %d\n", + gup_num_pages, npages); else - pr_debug("fail to get %zu user pages with error %d\n", gup_num_pages, npages); + pr_debug("fail to get %zu user pages with error %d\n", + gup_num_pages, npages); break; } bcnt -= min_t(size_t, npages << PAGE_SHIFT, bcnt); mutex_lock(&umem_odp->umem_mutex); for (j = 0; j < npages; j++, user_virt += PAGE_SIZE) { - if (user_virt & ~page_mask) { - p += PAGE_SIZE; - if (page_to_phys(local_page_list[j]) != p) { - ret = -EFAULT; - break; - } - put_page(local_page_list[j]); - continue; - } - ret = ib_umem_odp_map_dma_single_page( umem_odp, k, local_page_list[j], access_mask, current_seq); @@ -684,9 +676,11 @@ int ib_umem_odp_map_dma_pages(struct ib_umem_odp *umem_odp, u64 user_virt, mutex_unlock(&umem_odp->umem_mutex); if (ret < 0) { - /* Release left over pages when handling errors. */ - for (++j; j < npages; ++j) - put_page(local_page_list[j]); + /* + * Release pages, starting at the the first page + * that experienced an error. + */ + release_pages(&local_page_list[j], npages - j); break; } } -- 2.21.0