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 9CF09C25B08 for ; Mon, 8 Aug 2022 19:35:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8F5B68E000A; Mon, 8 Aug 2022 15:35:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 78C768E0009; Mon, 8 Aug 2022 15:35:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 40E928E000B; Mon, 8 Aug 2022 15:35:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 1BA638E0001 for ; Mon, 8 Aug 2022 15:35:30 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id EEB29160146 for ; Mon, 8 Aug 2022 19:35:29 +0000 (UTC) X-FDA: 79777429578.23.FC7C63C Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf29.hostedemail.com (Postfix) with ESMTP id 90086120156 for ; Mon, 8 Aug 2022 19:35:29 +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=epuyNg9S7J8yV/mFDJ3WzX6EqgqxvHf8/oT33SymrtM=; b=IhJwxJ4XvNBKu9fSekCU3r/aZa mEi2/zN6hud5K8Fn8WPhg+6lw2pSJCNUTBtk3h3fUHfyp2haJh+D1XT8+6tfNxAcMzN2dQXN6Hoy/ FUM7VfMcZtXu6QH18I4g/w7Zhs5mG3aSMS1RyxrWDnYM2DGI7wGF0/KAVdByelN6ntTOe6pE3muAw AVBf66zBKDkUcH11SttCl2oWWNa0z3ILc/AEBIqPs8l2ITcNH8Wu/TmPHos1NFzjRDe7RdM9yC8X4 O41TX+w7qdYTv98c1YvWFH8KDtpv8XkDweeiMchONjeSke3PFtPUJDUeIFwKj4RAQZMvM4unmlERq 3MRWMBDw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8XA-00EAyM-2Q; 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 33/59] shmem: Convert shmem_get_link() to use a folio Date: Mon, 8 Aug 2022 20:34:01 +0100 Message-Id: <20220808193430.3378317-34-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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659987329; a=rsa-sha256; cv=none; b=Vh1m2IDFn7mUiPnPQGjGGIla5dbJwd0Fo33lHPgXhZTAE53oTvainKZzNkiL4gvoGn0zT5 KbY8TRI+SBCshI5lMTcyHpo8shVYhGMvNZ/eXkk+uyOHDSKeTZetrQ8FS7pHcgRjX0RFtL VptCUY54/nEVIgqwQmzK8UwYx6bgg30= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=IhJwxJ4X; spf=none (imf29.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659987329; 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=epuyNg9S7J8yV/mFDJ3WzX6EqgqxvHf8/oT33SymrtM=; b=nUkmYwY8zk8Bd2s0HAAuptGqEsFUIkWjvasJ2iMq43tL4GI1wS9qtOvA1ArS0mL80xiHhi ANcb5qZ/65d7py8vxdP8agNSuMM9kfCytSGcuGlyCvrnV7ub1C35oX34zharcSUz0wyAxp Fv4kT/MxpPBchTdbfLi/uej/fLTi1R8= X-Rspamd-Queue-Id: 90086120156 X-Rspam-User: X-Rspamd-Server: rspam11 Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=IhJwxJ4X; spf=none (imf29.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Stat-Signature: 9418fsrph1mxre6noxwwqbmfb3su6hpu X-HE-Tag: 1659987329-942884 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: Symlinks will never use a large folio, but using the folio API removes a lot of unnecessary folio->page->folio conversions. Signed-off-by: Matthew Wilcox (Oracle) --- mm/shmem.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 9af2292e257b..128970a74aa2 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3126,40 +3126,41 @@ static int shmem_symlink(struct user_namespace *mnt_userns, struct inode *dir, static void shmem_put_link(void *arg) { - mark_page_accessed(arg); - put_page(arg); + folio_mark_accessed(arg); + folio_put(arg); } static const char *shmem_get_link(struct dentry *dentry, struct inode *inode, struct delayed_call *done) { - struct page *page = NULL; + struct folio *folio = NULL; int error; + if (!dentry) { - page = find_get_page(inode->i_mapping, 0); - if (!page) + folio = filemap_get_folio(inode->i_mapping, 0); + if (!folio) return ERR_PTR(-ECHILD); - if (PageHWPoison(page) || - !PageUptodate(page)) { - put_page(page); + if (PageHWPoison(&folio->page) || + !folio_test_uptodate(folio)) { + folio_put(folio); return ERR_PTR(-ECHILD); } } else { - error = shmem_getpage(inode, 0, &page, SGP_READ); + error = shmem_get_folio(inode, 0, &folio, SGP_READ); if (error) return ERR_PTR(error); - if (!page) + if (!folio) return ERR_PTR(-ECHILD); - if (PageHWPoison(page)) { - unlock_page(page); - put_page(page); + if (PageHWPoison(&folio->page)) { + folio_unlock(folio); + folio_put(folio); return ERR_PTR(-ECHILD); } - unlock_page(page); + folio_unlock(folio); } - set_delayed_call(done, shmem_put_link, page); - return page_address(page); + set_delayed_call(done, shmem_put_link, folio); + return folio_address(folio); } #ifdef CONFIG_TMPFS_XATTR -- 2.35.1