From: Ross Zwisler Subject: Re: [PATCH v5 15/17] dax: add struct iomap based DAX PMD support Date: Mon, 10 Oct 2016 16:06:19 -0600 Message-ID: <20161010220619.GB22793@linux.intel.com> References: <1475874544-24842-1-git-send-email-ross.zwisler@linux.intel.com> <1475874544-24842-16-git-send-email-ross.zwisler@linux.intel.com> <20161010155917.GA19978@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Theodore Ts'o , Matthew Wilcox , Dave Chinner , linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-xfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, Andreas Dilger , Alexander Viro , Jan Kara , linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-ext4-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Andrew Morton To: Christoph Hellwig Return-path: Content-Disposition: inline In-Reply-To: <20161010155917.GA19978-jcswGhMUV9g@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org Sender: "Linux-nvdimm" List-Id: linux-ext4.vger.kernel.org On Mon, Oct 10, 2016 at 05:59:17PM +0200, Christoph Hellwig wrote: > On Fri, Oct 07, 2016 at 03:09:02PM -0600, Ross Zwisler wrote: > > - if (RADIX_DAX_TYPE(entry) == RADIX_DAX_PMD) > > + if ((unsigned long)entry & RADIX_DAX_PMD) > > Please introduce a proper inline helper that mask all the possible type > bits out of the radix tree entry, and use them wherever you do the > open cast. Sure, will do. > > restart: > > spin_lock_irq(&mapping->tree_lock); > > entry = get_unlocked_mapping_entry(mapping, index, &slot); > > + > > + if (entry) { > > + if (size_flag & RADIX_DAX_PMD) { > > + if (!radix_tree_exceptional_entry(entry) || > > + !((unsigned long)entry & RADIX_DAX_PMD)) { > > + entry = ERR_PTR(-EEXIST); > > + goto out_unlock; > > + } > > + } else { /* trying to grab a PTE entry */ > > + if (radix_tree_exceptional_entry(entry) && > > + ((unsigned long)entry & RADIX_DAX_PMD) && > > + ((unsigned long)entry & > > + (RADIX_DAX_HZP|RADIX_DAX_EMPTY))) { > > And when we do these cases N times next to each other we should > have a local variable the valid flag bits of entry. Okay, will fix.