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 5F47CC00140 for ; Mon, 8 Aug 2022 19:35:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8542F8E000B; Mon, 8 Aug 2022 15:35:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 78F898E0003; Mon, 8 Aug 2022 15:35:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5BB8A8E000B; Mon, 8 Aug 2022 15:35:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 44CFF8E0003 for ; Mon, 8 Aug 2022 15:35:32 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2A0371A0944 for ; Mon, 8 Aug 2022 19:35:32 +0000 (UTC) X-FDA: 79777429704.27.03D9AFC Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf21.hostedemail.com (Postfix) with ESMTP id B81B11C018F for ; Mon, 8 Aug 2022 19:35:31 +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=f9YAhEtoiQZH7wQXDCCvyo8IXQQUIYKAUUwcaMyCAKI=; b=rpfSjgs89aXZPDwRfXQuVO+ezl 3v6gN6HyNokt8c8G1+kUrsqh3aM5gQ+NTbz623+N1lgX8MuGxEGD7h2am0TIx7S00bWtJUqCbLyWY FFHsRN7u6Qpv8IEMumQwoabxs/730JGsCHdxXoujZshSMg4eMmDtduhAUNZXWGimQShHkeekjsMgt heOXlT6A+3BcPnsgybyi3vBAe4GQ09Q6hWMkSyOWkGUpv9jVkoj8liWTCPsXHSc3e1To1JWFFxJUV Tfki+VhZsmCchVtUJTGWnVMNKEOfZFsFMalYHwmeOQNEoby/On3ZhDYe9KqMF4yDwKMef0ve+QkT0 480un1aA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8XA-00EAye-GE; Mon, 08 Aug 2022 19:35:28 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 35/59] userfaultfd: Convert mcontinue_atomic_pte() to use a folio Date: Mon, 8 Aug 2022 20:34:03 +0100 Message-Id: <20220808193430.3378317-36-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808193430.3378317-1-willy@infradead.org> References: <20220808193430.3378317-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=1659987331; 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=f9YAhEtoiQZH7wQXDCCvyo8IXQQUIYKAUUwcaMyCAKI=; b=TgqxPdnefPWe/t0jhYcVRnMxJyTXiUGd+xqX/0RTCilHpyFhoroxxN0NRFSYwCcaCY41gY zn5GLsmbjMWqobLFSoH3JkGin944ebgO4YZ3HTbOgs84RXqNWMSl/ohCI1ouP2lx8xf6l5 WFw8Ge3B/KanN29zx23WxQxcfXFCQ6o= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=rpfSjgs8; dmarc=none; spf=none (imf21.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=1659987331; a=rsa-sha256; cv=none; b=yxvIqBwUy5//ocJ3rGvjH/nkB+et7/ekG6r0PJfFc6ZMLsM9g6VIBiug/kBkok+Sr6HCUt F9UZO0ICgIIXoL4lEK8fQh7FvCIdAyY4WWR9ksRYiVxqD8TtUli/rvJZcoerLRqpFbH6nF lPSKZR3xpAUsvGcgYTIpMPF6ntZWigw= X-Rspamd-Queue-Id: B81B11C018F X-Rspamd-Server: rspam03 X-Rspam-User: Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=rpfSjgs8; dmarc=none; spf=none (imf21.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Stat-Signature: m9ouxqqbifrd6e4grgsu9xacic44533q X-HE-Tag: 1659987331-250880 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 07d3befc80e4..823f2da7aba5 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