From patchwork Sun Feb 28 05:09:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: NeilBrown X-Patchwork-Id: 8445411 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4DDD99F372 for ; Sun, 28 Feb 2016 05:18:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6876D2024D for ; Sun, 28 Feb 2016 05:18:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 828C32022D for ; Sun, 28 Feb 2016 05:18:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756809AbcB1FSL (ORCPT ); Sun, 28 Feb 2016 00:18:11 -0500 Received: from mx2.suse.de ([195.135.220.15]:60691 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753304AbcB1FSK (ORCPT ); Sun, 28 Feb 2016 00:18:10 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id B55A0AB5D; Sun, 28 Feb 2016 05:18:06 +0000 (UTC) From: NeilBrown To: Ross Zwisler , Matthew Wilcox , Andrew Morton , Jan Kara Date: Sun, 28 Feb 2016 16:09:29 +1100 Subject: [PATCH 2/3] radix-tree: make 'indirect' bit available to exception entries. Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Message-ID: <145663616977.3865.9772784012366988314.stgit@notabene> In-Reply-To: <145663588892.3865.9987439671424028216.stgit@notabene> References: <145663588892.3865.9987439671424028216.stgit@notabene> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A pointer to a radix_tree_node will always have the 'exception' bit cleared, so if the exception bit is set the value cannot be an indirect pointer. Thus it is safe to make the 'indirect bit' available to store extra information in exception entries. This patch adds a 'PTR_MASK' and a value is only treated as an indirect (pointer) entry the 2 ls-bits are '01'. The change in radix-tree.c ensures the stored value still looks like an indirect pointer, and saves a load as well. We could swap the two bits and so keep all the exectional bits contigious. But I have other plans for that bit.... Signed-off-by: NeilBrown --- include/linux/radix-tree.h | 11 +++++++++-- lib/radix-tree.c | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h index 968150ab8a1c..450c12b546b7 100644 --- a/include/linux/radix-tree.h +++ b/include/linux/radix-tree.h @@ -40,8 +40,13 @@ * Indirect pointer in fact is also used to tag the last pointer of a node * when it is shrunk, before we rcu free the node. See shrink code for * details. + * + * To allow an exception entry to only lose one bit, we ignore + * the INDIRECT bit when the exception bit is set. So an entry is + * indirect if the least significant 2 bits are 01. */ #define RADIX_TREE_INDIRECT_PTR 1 +#define RADIX_TREE_INDIRECT_MASK 3 /* * A common use of the radix tree is to store pointers to struct pages; * but shmem/tmpfs needs also to store swap entries in the same tree: @@ -53,7 +58,8 @@ static inline int radix_tree_is_indirect_ptr(void *ptr) { - return (int)((unsigned long)ptr & RADIX_TREE_INDIRECT_PTR); + return ((unsigned long)ptr & RADIX_TREE_INDIRECT_MASK) + == RADIX_TREE_INDIRECT_PTR; } /*** radix-tree API starts here ***/ @@ -221,7 +227,8 @@ static inline void *radix_tree_deref_slot_protected(void **pslot, */ static inline int radix_tree_deref_retry(void *arg) { - return unlikely((unsigned long)arg & RADIX_TREE_INDIRECT_PTR); + return unlikely(((unsigned long)arg & RADIX_TREE_INDIRECT_MASK) + == RADIX_TREE_INDIRECT_PTR); } /** diff --git a/lib/radix-tree.c b/lib/radix-tree.c index 6b79e9026e24..37d4643ab5c0 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c @@ -1305,7 +1305,7 @@ static inline void radix_tree_shrink(struct radix_tree_root *root) * to force callers to retry. */ if (root->height == 0) - *((unsigned long *)&to_free->slots[0]) |= + *((unsigned long *)&to_free->slots[0]) = RADIX_TREE_INDIRECT_PTR; radix_tree_node_free(to_free);