From patchwork Fri Feb 28 11:32:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingfan Liu X-Patchwork-Id: 11412045 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 09F8013A4 for ; Fri, 28 Feb 2020 11:34:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CA8A8246A8 for ; Fri, 28 Feb 2020 11:34:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="k/JZQ00I" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA8A8246A8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1947B6B0006; Fri, 28 Feb 2020 06:34:58 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 16B116B0007; Fri, 28 Feb 2020 06:34:58 -0500 (EST) 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 059C76B0008; Fri, 28 Feb 2020 06:34:58 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0199.hostedemail.com [216.40.44.199]) by kanga.kvack.org (Postfix) with ESMTP id E2E1E6B0006 for ; Fri, 28 Feb 2020 06:34:57 -0500 (EST) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 9EE4B181AEF23 for ; Fri, 28 Feb 2020 11:34:57 +0000 (UTC) X-FDA: 76539329034.03.watch10_657c6604a063f X-Spam-Summary: 2,0,0,621baf663dcae07b,d41d8cd98f00b204,kernelfans@gmail.com,,RULES_HIT:41:69:355:379:541:800:960:973:988:989:1260:1345:1359:1431:1437:1535:1542:1711:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3352:3865:3866:3867:3868:4605:5007:6119:6261:6653:6742:7514:7901:7903:8634:9413:10004:11026:11473:11658:11914:12043:12114:12296:12297:12438:12517:12519:12555:12895:13846:14096:14181:14394:14687:14721:21080:21444:21451:21627:21666:21990:30012:30045:30054:30064,0,RBL:209.85.215.196:@gmail.com:.lbl8.mailshell.net-66.100.201.100 62.50.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: watch10_657c6604a063f X-Filterd-Recvd-Size: 5348 Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by imf14.hostedemail.com (Postfix) with ESMTP for ; Fri, 28 Feb 2020 11:34:57 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id u12so1366351pgb.10 for ; Fri, 28 Feb 2020 03:34:57 -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; bh=HJEEF+ZoXF3+Nd4diWecS36bLcljIlgCVbyfxnITy0g=; b=k/JZQ00IhfViLeK6G0njVXZ+whnThIG8lZANGkpgh80P/Y9DAoOPXtOjwaXFEvZlho oz9AlqAiMyxygoKt0ftGvwJtLrK7uIWroi+5Gq5I/wxXz3PzeGj1/EaDjmKcvABvVPcg MaBY6borR8Pn/mMueS/cgTmeyhF63ywAsnH963GgDtDlOD3UwHCtkYb6yTCWMbvd+GZg h0CPoJTu9VlPuuAVr0IKrhtCX4r5dLBgzUnHWkZRljK4KM+SYf4I55KsyP+iy92yTxcr 4rbE5aGfhTpQmaVltG2anr8eA8bM40vH4JqnfetYkYVtmCJ3w8+SBU7m6iKhkHqw4iM7 m1Yg== 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; bh=HJEEF+ZoXF3+Nd4diWecS36bLcljIlgCVbyfxnITy0g=; b=MFLEYO0sulkMSHgws7aa9P22owEcTmv0saHOc1l5DegcMMqlPACIDavOTs+C+dym7Q FVwsD9i6QjHNVsPZPet8P7sLI1V151u/N/w0PZdJHgzKPeaYAYF/V64CvYBAXOn2dDEL f3jHz9On3guvS54/cZ80PsUvZNi6njgCIYMwcR7hdLFukponh+F+bx9PfS9Jc7PVKYg/ FK1vwcCMa1Mf3T1qlB9C7VSv88ts9pJ8+r3U6MXYjq9n/5rhOVdVNJK02hoWxInARGAd JmYchiXBOMFWMdNTv7VzxmGUP47xTjVRSnrn4lUV5C3qa66k/nwMCWgPef4FGZpcIjR1 axng== X-Gm-Message-State: APjAAAU/GaEkayHQXb0GDb4D0a0HW6TKafzXlSC57gdcYB9ZeLd0pSBI ol7JvOA0m2nIqgCUdTt0zb+1Z+tfxQ== X-Google-Smtp-Source: APXvYqzjxd/Sq/oiTAGLmX1fGiq0C3UXJLMhVbet4cdnBwIB+rQQLDWwYP/Y2VJjq2wMVZgl16uJlA== X-Received: by 2002:a05:6a00:2ba:: with SMTP id q26mr2742501pfs.249.1582889696147; Fri, 28 Feb 2020 03:34:56 -0800 (PST) Received: from mylaptop.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id d14sm11402168pfq.117.2020.02.28.03.34.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Feb 2020 03:34:55 -0800 (PST) From: Pingfan Liu To: linux-mm@kvack.org Cc: Pingfan Liu , Ira Weiny , Andrew Morton , Mike Rapoport , Dan Williams , Matthew Wilcox , John Hubbard , "Aneesh Kumar K.V" , Keith Busch , Christoph Hellwig , Shuah Khan , linux-kernel@vger.kernel.org Subject: [PATCHv5 1/3] mm/gup: rename nr as nr_pinned in internal_get_user_pages_fast() Date: Fri, 28 Feb 2020 19:32:28 +0800 Message-Id: <1582889550-9101-2-git-send-email-kernelfans@gmail.com> X-Mailer: git-send-email 2.7.5 In-Reply-To: <1582889550-9101-1-git-send-email-kernelfans@gmail.com> References: <1582889550-9101-1-git-send-email-kernelfans@gmail.com> 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: To better reflect the held state of pages and make code self-explaining, rename nr as nr_pinned. Signed-off-by: Pingfan Liu Cc: Ira Weiny Cc: Andrew Morton Cc: Mike Rapoport Cc: Dan Williams Cc: Matthew Wilcox Cc: John Hubbard Cc: "Aneesh Kumar K.V" Cc: Keith Busch Cc: Christoph Hellwig Cc: Shuah Khan To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org --- mm/gup.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 1b521e0..cd8075e 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -2432,7 +2432,7 @@ static int internal_get_user_pages_fast(unsigned long start, int nr_pages, struct page **pages) { unsigned long addr, len, end; - int nr = 0, ret = 0; + int nr_pinned = 0, ret = 0; if (WARN_ON_ONCE(gup_flags & ~(FOLL_WRITE | FOLL_LONGTERM | FOLL_FORCE | FOLL_PIN))) @@ -2451,25 +2451,25 @@ static int internal_get_user_pages_fast(unsigned long start, int nr_pages, if (IS_ENABLED(CONFIG_HAVE_FAST_GUP) && gup_fast_permitted(start, end)) { local_irq_disable(); - gup_pgd_range(addr, end, gup_flags, pages, &nr); + gup_pgd_range(addr, end, gup_flags, pages, &nr_pinned); local_irq_enable(); - ret = nr; + ret = nr_pinned; } - if (nr < nr_pages) { + if (nr_pinned < nr_pages) { /* Try to get the remaining pages with get_user_pages */ - start += nr << PAGE_SHIFT; - pages += nr; + start += nr_pinned << PAGE_SHIFT; + pages += nr_pinned; - ret = __gup_longterm_unlocked(start, nr_pages - nr, + ret = __gup_longterm_unlocked(start, nr_pages - nr_pinned, gup_flags, pages); /* Have to be a bit careful with return values */ - if (nr > 0) { + if (nr_pinned > 0) { if (ret < 0) - ret = nr; + ret = nr_pinned; else - ret += nr; + ret += nr_pinned; } }