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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93571ECAAD5 for ; Fri, 2 Sep 2022 19:47:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ED7CC800F3; Fri, 2 Sep 2022 15:47:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E13CC800F1; Fri, 2 Sep 2022 15:47:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C63C2800F3; Fri, 2 Sep 2022 15:47:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B8B4A800F1 for ; Fri, 2 Sep 2022 15:47:01 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 8E7B2A1228 for ; Fri, 2 Sep 2022 19:47:01 +0000 (UTC) X-FDA: 79868178642.12.5843949 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf16.hostedemail.com (Postfix) with ESMTP id 25A1918004E for ; Fri, 2 Sep 2022 19:47:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=xdYsV4qprpXif04fQYKo4IaOxe4qBke54s/dI1MnI7k=; b=eRLEM7H0IR6nF0u6QqJP6NbUSn 0oQfkoS99QOiNOzo+1o7F/1L88ouegJNK4TnVqXSWSQJyfuzNQ2bHivb7XhKZibiNhmdcDdfB0PP3 bze6t1/PtMhhWBoQ9KjvvXQng/cor9+urgFtvZY2g2OAXsvW68PVCAM0IFhedkVDgXtBa7+p8krbm R9upNAY1s5/4cw/Y7KMpJqi8ilNOovr/em01VekOgjz69DZWs032fq3nUiSrClYEtVv1XhTFPC2lG jQTu4MYJN72AADmo0QvG0KfpdYH/BcamHZ4zfiw2GXBihFSa1fMnvou9io/Q3LncyyeTxWh3/6VzA ti2pf8zQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd3-007IeS-8h; Fri, 02 Sep 2022 19:47:01 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 32/57] userfaultfd: Convert mcontinue_atomic_pte() to use a folio Date: Fri, 2 Sep 2022 20:46:28 +0100 Message-Id: <20220902194653.1739778-33-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220902194653.1739778-1-willy@infradead.org> References: <20220902194653.1739778-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662148021; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xdYsV4qprpXif04fQYKo4IaOxe4qBke54s/dI1MnI7k=; b=VsPc2PweW10ueugP8gQAECYaf877+oEiFd2njqHkCr8NWZDMCPVZTw2RsBw4N4CQvnILA0 EsDiFLlqbgaruagwSH0ozuWg3QWLBSlGNXnA9peUg++nLS6UZWkTxbBr4L7Hea1CRX0Nov OZAzG/PFvEGTAZJynDnq9/eHSmnJUgI= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=eRLEM7H0; dmarc=none; spf=none (imf16.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662148021; a=rsa-sha256; cv=none; b=1QdoGUEGqmf8Nmy5hyhWMyVHyc3I+yKRZtyAiHxffJoyhMyCxY+kXak8kpzxgtbjm4+D3V wbeOXRAIYMavBxFGlViJiRfdjgBPgl/2YVIoOh4rxcrXpyswoPOZj7gL7S3z6AgdzhD8pq xzaGrUweQVBmeu681Ja5T3YkBim5L8o= X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 25A1918004E Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=eRLEM7H0; dmarc=none; spf=none (imf16.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Stat-Signature: 4memm4sd85au5hdos7a8b44w83csop7h X-HE-Tag: 1662148021-523934 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: shmem_getpage() is being replaced by shmem_get_folio() so use a folio throughout this function. Saves several calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/userfaultfd.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 7327b2573f7c..9c035be2148b 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -243,20 +243,22 @@ static int mcontinue_atomic_pte(struct mm_struct *dst_mm, { struct inode *inode = file_inode(dst_vma->vm_file); pgoff_t pgoff = linear_page_index(dst_vma, dst_addr); + struct folio *folio; struct page *page; int ret; - ret = shmem_getpage(inode, pgoff, &page, SGP_NOALLOC); - /* Our caller expects us to return -EFAULT if we failed to find page. */ + ret = shmem_get_folio(inode, pgoff, &folio, SGP_NOALLOC); + /* Our caller expects us to return -EFAULT if we failed to find folio */ if (ret == -ENOENT) ret = -EFAULT; if (ret) goto out; - if (!page) { + if (!folio) { ret = -EFAULT; goto out; } + page = folio_file_page(folio, pgoff); if (PageHWPoison(page)) { ret = -EIO; goto out_release; @@ -267,13 +269,13 @@ static int mcontinue_atomic_pte(struct mm_struct *dst_mm, if (ret) goto out_release; - unlock_page(page); + folio_unlock(folio); ret = 0; out: return ret; out_release: - unlock_page(page); - put_page(page); + folio_unlock(folio); + folio_put(folio); goto out; } -- 2.35.1