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.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham 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 AD907C10DCE for ; Thu, 12 Mar 2020 10:29:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 67CC22071B for ; Thu, 12 Mar 2020 10:29:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 67CC22071B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id F20786B0006; Thu, 12 Mar 2020 06:29:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EAAF46B0007; Thu, 12 Mar 2020 06:29:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D98D76B0008; Thu, 12 Mar 2020 06:29:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0171.hostedemail.com [216.40.44.171]) by kanga.kvack.org (Postfix) with ESMTP id BDC1F6B0006 for ; Thu, 12 Mar 2020 06:29:08 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 939D0824805A for ; Thu, 12 Mar 2020 10:29:08 +0000 (UTC) X-FDA: 76586337576.17.brain56_89ff0139cbb21 X-HE-Tag: brain56_89ff0139cbb21 X-Filterd-Recvd-Size: 4909 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Thu, 12 Mar 2020 10:29:08 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6521031B; Thu, 12 Mar 2020 03:29:07 -0700 (PDT) Received: from e112269-lin.cambridge.arm.com (e112269-lin.cambridge.arm.com [10.1.195.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CD5873F67D; Thu, 12 Mar 2020 03:29:05 -0700 (PDT) From: Steven Price To: Jason Gunthorpe , Jerome Glisse , Ralph Campbell , Felix.Kuehling@amd.com Cc: Philip Yang , John Hubbard , amd-gfx@lists.freedesktop.org, linux-mm@kvack.org, Jason Gunthorpe , dri-devel@lists.freedesktop.org, Christoph Hellwig , Steven Price Subject: [PATCH] mm/hmm: Simplify hmm_vma_walk_pud slightly Date: Thu, 12 Mar 2020 10:28:13 +0000 Message-Id: <20200312102813.56699-1-steven.price@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <5bd778fa-51e5-3e0c-d9bb-b38539b03c8d@arm.com> References: <5bd778fa-51e5-3e0c-d9bb-b38539b03c8d@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: By refactoring to deal with the !pud_huge(pud) || !pud_devmap(pud) condition early it's possible to remove the 'ret' variable and remove a level of indentation from half the function making the code easier to read. No functional change. Signed-off-by: Steven Price --- Thanks to Jason's changes there were only two code paths left using the out_unlock label so it seemed like a good opportunity to refactor. --- mm/hmm.c | 69 ++++++++++++++++++++++++++------------------------------ 1 file changed, 32 insertions(+), 37 deletions(-) diff --git a/mm/hmm.c b/mm/hmm.c index ca33d086bdc1..0117c86426d1 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -466,8 +466,10 @@ static int hmm_vma_walk_pud(pud_t *pudp, unsigned lo= ng start, unsigned long end, struct hmm_range *range =3D hmm_vma_walk->range; unsigned long addr =3D start; pud_t pud; - int ret =3D 0; spinlock_t *ptl =3D pud_trans_huge_lock(pudp, walk->vma); + unsigned long i, npages, pfn; + uint64_t *pfns, cpu_flags; + bool fault, write_fault; =20 if (!ptl) return 0; @@ -481,50 +483,43 @@ static int hmm_vma_walk_pud(pud_t *pudp, unsigned l= ong start, unsigned long end, return hmm_vma_walk_hole(start, end, -1, walk); } =20 - if (pud_huge(pud) && pud_devmap(pud)) { - unsigned long i, npages, pfn; - uint64_t *pfns, cpu_flags; - bool fault, write_fault; + if (!pud_huge(pud) || !pud_devmap(pud)) { + /* Ask for the PUD to be split */ + walk->action =3D ACTION_SUBTREE; + spin_unlock(ptl); + return 0; + } =20 - if (!pud_present(pud)) { - spin_unlock(ptl); - return hmm_vma_walk_hole(start, end, -1, walk); - } + if (!pud_present(pud)) { + spin_unlock(ptl); + return hmm_vma_walk_hole(start, end, -1, walk); + } =20 - i =3D (addr - range->start) >> PAGE_SHIFT; - npages =3D (end - addr) >> PAGE_SHIFT; - pfns =3D &range->pfns[i]; + i =3D (addr - range->start) >> PAGE_SHIFT; + npages =3D (end - addr) >> PAGE_SHIFT; + pfns =3D &range->pfns[i]; =20 - cpu_flags =3D pud_to_hmm_pfn_flags(range, pud); - hmm_range_need_fault(hmm_vma_walk, pfns, npages, - cpu_flags, &fault, &write_fault); - if (fault || write_fault) { - spin_unlock(ptl); - return hmm_vma_walk_hole_(addr, end, fault, write_fault, - walk); - } + cpu_flags =3D pud_to_hmm_pfn_flags(range, pud); + hmm_range_need_fault(hmm_vma_walk, pfns, npages, + cpu_flags, &fault, &write_fault); + if (fault || write_fault) { + spin_unlock(ptl); + return hmm_vma_walk_hole_(addr, end, fault, write_fault, walk); + } =20 - pfn =3D pud_pfn(pud) + ((addr & ~PUD_MASK) >> PAGE_SHIFT); - for (i =3D 0; i < npages; ++i, ++pfn) { - hmm_vma_walk->pgmap =3D get_dev_pagemap(pfn, - hmm_vma_walk->pgmap); - if (unlikely(!hmm_vma_walk->pgmap)) { - ret =3D -EBUSY; - goto out_unlock; - } - pfns[i] =3D hmm_device_entry_from_pfn(range, pfn) | - cpu_flags; + pfn =3D pud_pfn(pud) + ((addr & ~PUD_MASK) >> PAGE_SHIFT); + for (i =3D 0; i < npages; ++i, ++pfn) { + hmm_vma_walk->pgmap =3D get_dev_pagemap(pfn, hmm_vma_walk->pgmap); + if (unlikely(!hmm_vma_walk->pgmap)) { + spin_unlock(ptl); + return -EBUSY; } - hmm_vma_walk->last =3D end; - goto out_unlock; + pfns[i] =3D hmm_device_entry_from_pfn(range, pfn) | cpu_flags; } + hmm_vma_walk->last =3D end; =20 - /* Ask for the PUD to be split */ - walk->action =3D ACTION_SUBTREE; - -out_unlock: spin_unlock(ptl); - return ret; + return 0; } #else #define hmm_vma_walk_pud NULL --=20 2.20.1