From patchwork Tue Nov 29 11:22:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A . Shutemov" X-Patchwork-Id: 9451715 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 0BE1C60710 for ; Tue, 29 Nov 2016 11:34:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5C09281D2 for ; Tue, 29 Nov 2016 11:34:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D9F7A28236; Tue, 29 Nov 2016 11:34:54 +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 75EAE281D2 for ; Tue, 29 Nov 2016 11:34:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933738AbcK2Lew (ORCPT ); Tue, 29 Nov 2016 06:34:52 -0500 Received: from mga06.intel.com ([134.134.136.31]:21031 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757104AbcK2LXd (ORCPT ); Tue, 29 Nov 2016 06:23:33 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP; 29 Nov 2016 03:23:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,568,1473145200"; d="scan'208";a="1065622643" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 29 Nov 2016 03:23:27 -0800 Received: by black.fi.intel.com (Postfix, from userid 1000) id 94A232CF; Tue, 29 Nov 2016 13:23:12 +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: [PATCHv5 14/36] thp: introduce hpage_size() and hpage_mask() Date: Tue, 29 Nov 2016 14:22:42 +0300 Message-Id: <20161129112304.90056-15-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161129112304.90056-1-kirill.shutemov@linux.intel.com> References: <20161129112304.90056-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