Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp782365pxb; Wed, 27 Jan 2021 23:09:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJzJROl9cuQ2rNbzKFkd8+kSuVztBCGKuZUDE/ubtWEeWJKalgvfiNrWfJwspYW3yWnnYBr6 X-Received: by 2002:a05:6402:2048:: with SMTP id bc8mr12425555edb.292.1611817795265; Wed, 27 Jan 2021 23:09:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611817795; cv=none; d=google.com; s=arc-20160816; b=DWRduEf1FSefPg3xuU5Laa2QfOhKW3cC2rWRBTbvYXddVhawjoqIbm+nFLOjhxZ8Qp UARkodn4ZX+PB6tfrE3EIAmxfAwaiZZ3gQsMJwjdNOkfxMquobdniLQZckyu4jNV68sr 95BlATnoC8U7AGlLOuBq1XyppdDjayxjl2utSHBGycPr7vb8ksZfcEWsFZYijvkogjPJ a5zmH1k5I4fHXMi92snh46Lct0gPhv2fgQeqYmcIU2Ef6X3JfgLdKTfPtv40xLXUdu9K Q98plnG922KnvItoWI1oXIkxbY148e2bSCFAplYPOd+5crmt2oGCbMYxvFdbFD1tdJ6e 91oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4D9LWaYYEO6XvVKPXeU5gxfohP3/nOnS5kH5caHsSPA=; b=FqjteLttqfJRBECNgHbrWWtQVBRSQ3f0+eHyDKy0J2+rr+9O+fAR7dnxDQ5c1RQWA+ stiLK9EKznMmz6Jwl6b6tH4ovoG/fmu1hoivXKmhsCaGO7ONql1LsZuiEqAL+imWp1oo v5b1tl0fgCIUfidQz4lmDR4dRnsh3yPYPzXLUe64D5BAdkdi0lFFQ96KcRk9t8xaqjaX Wm/ZkHEoNXZ8Qek8LyEHPTSFg+MuXzlAr6a8luz9m606iEYcOCXRlcE1gnG/LuJ0doPz nKuxLRogjTZ9Ectz07eupusKfQ/WC8Kjk7QhpcAnEsdhus544jbYMoHwxkYtK7lFi2M5 YnKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=bi5N6cNc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id jg4si2021710ejc.313.2021.01.27.23.09.31; Wed, 27 Jan 2021 23:09:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=bi5N6cNc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231478AbhA1HGA (ORCPT + 99 others); Thu, 28 Jan 2021 02:06:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231397AbhA1HFb (ORCPT ); Thu, 28 Jan 2021 02:05:31 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 086BEC0613ED; Wed, 27 Jan 2021 23:04:18 -0800 (PST) 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=4D9LWaYYEO6XvVKPXeU5gxfohP3/nOnS5kH5caHsSPA=; b=bi5N6cNcjOcScdIcerQfP0chRv RWpB9Q006pY4IrCNOS5VzrZXi0tQaNy/U+4SFe/2XNWdMU/NePRJKTQ1nWzTbUSWl0zjEQPX9GnZk twWLLqITzVSFI3YR9Bk0iMi2vHp5dLjnyxp+BpuZBQDlO1mn01UUfixDv2vVcJWnr2GDvBrbYR/cf CquH0WVFueQfhLmWp55j7JYuodsfhFGvf5O/WUC/K0NdSm5rh9F8U6x+BjJB28A+5cPUdzXJvOMzT kWtnZUS0PQffxcv0NEAduMzupHKG345bymnnN6PZj+672yPre7mo1WWu+HY7YWFGEICDiOfzowZPE QhjOEBrw==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l51Lh-00846U-1g; Thu, 28 Jan 2021 07:04:13 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH v3 05/25] mm: Add put_folio Date: Thu, 28 Jan 2021 07:03:44 +0000 Message-Id: <20210128070404.1922318-6-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210128070404.1922318-1-willy@infradead.org> References: <20210128070404.1922318-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If we know we have a folio, we can call put_folio() instead of put_page() and save the overhead of calling compound_head(). Also skips the devmap checks. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 7d787229dd40..873d649107ba 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1220,9 +1220,15 @@ static inline __must_check bool try_get_page(struct page *page) return true; } +static inline void put_folio(struct folio *folio) +{ + if (put_page_testzero(&folio->page)) + __put_page(&folio->page); +} + static inline void put_page(struct page *page) { - page = compound_head(page); + struct folio *folio = page_folio(page); /* * For devmap managed pages we need to catch refcount transition from @@ -1230,13 +1236,12 @@ static inline void put_page(struct page *page) * need to inform the device driver through callback. See * include/linux/memremap.h and HMM for details. */ - if (page_is_devmap_managed(page)) { - put_devmap_managed_page(page); + if (page_is_devmap_managed(&folio->page)) { + put_devmap_managed_page(&folio->page); return; } - if (put_page_testzero(page)) - __put_page(page); + put_folio(folio); } /* -- 2.29.2