From patchwork Thu Jan 26 11:57:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A . Shutemov" X-Patchwork-Id: 9539005 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F1EA9601D7 for ; Thu, 26 Jan 2017 12:01:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB87720700 for ; Thu, 26 Jan 2017 12:01:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DFF8727D13; Thu, 26 Jan 2017 12:01:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 701FB20700 for ; Thu, 26 Jan 2017 12:01:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753626AbdAZL71 (ORCPT ); Thu, 26 Jan 2017 06:59:27 -0500 Received: from mga04.intel.com ([192.55.52.120]:56705 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753588AbdAZL7Z (ORCPT ); Thu, 26 Jan 2017 06:59:25 -0500 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP; 26 Jan 2017 03:59:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,289,1477983600"; d="scan'208";a="813549961" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 26 Jan 2017 03:59:11 -0800 Received: by black.fi.intel.com (Postfix, from userid 1000) id C1B29374; Thu, 26 Jan 2017 13:58:25 +0200 (EET) From: "Kirill A. Shutemov" To: "Theodore Ts'o" , Andreas Dilger , Jan Kara , Andrew Morton Cc: Alexander Viro , Hugh Dickins , Andrea Arcangeli , Dave Hansen , Vlastimil Babka , Matthew Wilcox , Ross Zwisler , linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv6 14/37] thp: introduce hpage_size() and hpage_mask() Date: Thu, 26 Jan 2017 14:57:56 +0300 Message-Id: <20170126115819.58875-15-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170126115819.58875-1-kirill.shutemov@linux.intel.com> References: <20170126115819.58875-1-kirill.shutemov@linux.intel.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Introduce new helpers which return size/mask of the page: HPAGE_PMD_SIZE/HPAGE_PMD_MASK if the page is PageTransHuge() and PAGE_SIZE/PAGE_MASK otherwise. Signed-off-by: Kirill A. Shutemov --- include/linux/huge_mm.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 97e478d6b690..e5c9c26d2439 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -142,6 +142,20 @@ static inline int hpage_nr_pages(struct page *page) return 1; } +static inline int hpage_size(struct page *page) +{ + if (unlikely(PageTransHuge(page))) + return HPAGE_PMD_SIZE; + return PAGE_SIZE; +} + +static inline unsigned long hpage_mask(struct page *page) +{ + if (unlikely(PageTransHuge(page))) + return HPAGE_PMD_MASK; + return PAGE_MASK; +} + extern int do_huge_pmd_numa_page(struct vm_fault *vmf, pmd_t orig_pmd); extern struct page *huge_zero_page; @@ -167,6 +181,8 @@ void mm_put_huge_zero_page(struct mm_struct *mm); #define HPAGE_PMD_SIZE ({ BUILD_BUG(); 0; }) #define hpage_nr_pages(x) 1 +#define hpage_size(x) PAGE_SIZE +#define hpage_mask(x) PAGE_MASK #define transparent_hugepage_enabled(__vma) 0