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.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 E5CBEC0044D for ; Mon, 16 Mar 2020 14:06:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A5B662071C for ; Mon, 16 Mar 2020 14:06:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="fjDx/i/V" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A5B662071C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 515726B0003; Mon, 16 Mar 2020 10:06:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C6C96B0005; Mon, 16 Mar 2020 10:06:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3B4FF6B0007; Mon, 16 Mar 2020 10:06:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0068.hostedemail.com [216.40.44.68]) by kanga.kvack.org (Postfix) with ESMTP id 1F30A6B0003 for ; Mon, 16 Mar 2020 10:06:33 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id B9BFE180AD815 for ; Mon, 16 Mar 2020 14:06:32 +0000 (UTC) X-FDA: 76601400624.26.pigs03_5636daee2d31a X-HE-Tag: pigs03_5636daee2d31a X-Filterd-Recvd-Size: 4124 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf31.hostedemail.com (Postfix) with ESMTP for ; Mon, 16 Mar 2020 14:06:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=JX+eR24QuHLQPCyTKY7ZpI4xZyUKsYI38qwfOQbKvNI=; b=fjDx/i/VG+kGGFHAXcGJvbSmta bTtg8kMFeVJRwt3mODr7Y+XlhEHYgY2vMAKUYhHIMDQHcPT1iXFmZVPV8ae2nPm3uKdeZk/s3FUIw 6QCLuHV9RDTy4ohBCdnbNT6lfzTERK+NukVFXUhZa3yJfP9eDqHvjek6XAj/xKQb5wOepwp+XbDm1 7vLF41wIFlP/gL/FmQB1A9YCzokUDj9VautAy1pgyoD7ebUiHeBUzkrSmJf0QPjJkVltkvAShI7xm E89ORNzzzDlsfZ5QBJjq3EGN+iwC9q2pzllZgjXZhZbAMXXeft5hP2tCr1xtetVdixH9D0zHb4l32 4AYcxMzA==; Received: from 089144202225.atnat0011.highway.a1.net ([89.144.202.225] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jDqNx-0004FB-5b; Mon, 16 Mar 2020 14:06:29 +0000 From: Christoph Hellwig To: Jason Gunthorpe Cc: Jerome Glisse , Ralph Campbell , linux-mm@kvack.org Subject: [PATCH 5/5] mm: merge hmm_vma_do_fault into into hmm_vma_walk_hole_ Date: Mon, 16 Mar 2020 14:53:10 +0100 Message-Id: <20200316135310.899364-6-hch@lst.de> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200316135310.899364-1-hch@lst.de> References: <20200316135310.899364-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html 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: There is no good reason for this split, as it just obsfucates the flow. Signed-off-by: Christoph Hellwig --- mm/hmm.c | 49 ++++++++++++++++--------------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/mm/hmm.c b/mm/hmm.c index 707edba850de..180e398170b0 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -33,32 +33,6 @@ struct hmm_vma_walk { unsigned int flags; }; =20 -static int hmm_vma_do_fault(struct mm_walk *walk, unsigned long addr, - bool write_fault, uint64_t *pfn) -{ - unsigned int flags =3D FAULT_FLAG_REMOTE; - struct hmm_vma_walk *hmm_vma_walk =3D walk->private; - struct hmm_range *range =3D hmm_vma_walk->range; - struct vm_area_struct *vma =3D walk->vma; - vm_fault_t ret; - - if (!vma) - goto err; - - if (write_fault) - flags |=3D FAULT_FLAG_WRITE; - - ret =3D handle_mm_fault(vma, addr, flags); - if (ret & VM_FAULT_ERROR) - goto err; - - return -EBUSY; - -err: - *pfn =3D range->values[HMM_PFN_ERROR]; - return -EFAULT; -} - static int hmm_pfns_fill(unsigned long addr, unsigned long end, struct hmm_range *range, enum hmm_pfn_value_e value) { @@ -90,25 +64,34 @@ static int hmm_vma_fault(unsigned long addr, unsigned= long end, { struct hmm_vma_walk *hmm_vma_walk =3D walk->private; struct hmm_range *range =3D hmm_vma_walk->range; + struct vm_area_struct *vma =3D walk->vma; uint64_t *pfns =3D range->pfns; unsigned long i =3D (addr - range->start) >> PAGE_SHIFT; + unsigned int fault_flags =3D FAULT_FLAG_REMOTE; =20 WARN_ON_ONCE(!fault && !write_fault); hmm_vma_walk->last =3D addr; =20 - if (write_fault && walk->vma && !(walk->vma->vm_flags & VM_WRITE)) - return -EPERM; + if (!vma) + goto out_error; + + if (write_fault) { + if (!(vma->vm_flags & VM_WRITE)) + return -EPERM; + fault_flags |=3D FAULT_FLAG_WRITE; + } =20 for (; addr < end; addr +=3D PAGE_SIZE, i++) { - int ret; - + if (handle_mm_fault(vma, addr, fault_flags) & VM_FAULT_ERROR) + goto out_error; pfns[i] =3D range->values[HMM_PFN_NONE]; - ret =3D hmm_vma_do_fault(walk, addr, write_fault, &pfns[i]); - if (ret !=3D -EBUSY) - return ret; } =20 return -EBUSY; + +out_error: + pfns[i] =3D range->values[HMM_PFN_ERROR]; + return -EFAULT; } =20 static inline void hmm_pte_need_fault(const struct hmm_vma_walk *hmm_vma= _walk, --=20 2.24.1