Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752777AbcCKVNU (ORCPT ); Fri, 11 Mar 2016 16:13:20 -0500 Received: from mga01.intel.com ([192.55.52.88]:47859 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752559AbcCKVNJ (ORCPT ); Fri, 11 Mar 2016 16:13:09 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,321,1455004800"; d="scan'208";a="932015375" From: Matthew Wilcox To: Dan Williams Cc: Matthew Wilcox , linux-nvdimm@ml01.01.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, willy@linux.intel.com Subject: [PATCH 3/3] pfn_t: New functions pfn_t_add and pfn_t_cmp Date: Fri, 11 Mar 2016 16:13:04 -0500 Message-Id: <1457730784-9890-4-git-send-email-matthew.r.wilcox@intel.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457730784-9890-1-git-send-email-matthew.r.wilcox@intel.com> References: <1457730784-9890-1-git-send-email-matthew.r.wilcox@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1335 Lines: 43 When we find a huge PFN in the radix tree, we need to add the low bits of the index to it in order to find the PFN we are looking for. Since we want the result to stay in pfn_t form, create pfn_t_add(). We also need to compare PFNs, for example to determine if the PFN represents a zero page. At the moment, we only have use for comparing equality, but a general compare operation is no more code and may prove useful in the future. Signed-off-by: Matthew Wilcox --- include/linux/pfn_t.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/linux/pfn_t.h b/include/linux/pfn_t.h index 0ff4c4e..c3bb5fe 100644 --- a/include/linux/pfn_t.h +++ b/include/linux/pfn_t.h @@ -67,6 +67,22 @@ static inline unsigned long pfn_t_to_pfn(pfn_t pfn) return v >> PFN_FLAG_BITS; } +static inline __must_check pfn_t pfn_t_add(const pfn_t pfn, int val) +{ + pfn_t tmp = pfn; + if (tmp.val & PFN_HUGE) + tmp.val &= ~PFN_SIZE_MASK; + tmp.val &= ~PFN_SG_MASK; + tmp.val += val << PFN_FLAG_BITS; + return tmp; +} + +/* Like memcmp, returns <0 if a0 if b>a */ +static inline int pfn_t_cmp(pfn_t a, pfn_t b) +{ + return pfn_t_to_pfn(b) - pfn_t_to_pfn(a); +} + extern pfn_t phys_to_pfn_t(phys_addr_t addr, u64 flags); static inline bool pfn_t_has_page(pfn_t pfn) -- 2.7.0