From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE1CF36C5A1 for ; Wed, 14 Jan 2026 21:36:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768426569; cv=none; b=q0zFXOsNxsrJyTDw/AnthHl6/uF09b8PTaQeEuaJb5D4Oqu5+GA1KU39M63DunA68gOgx8VgqFMsYoGWmU5PXb0XMm46S/CgcaKl2AkA2G/FTj08EQNB9dR+e7IyYM8pZNzcyrsuVnX22t1DrFn4QbWcpfVGWKQBIGtyvi8kkk0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768426569; c=relaxed/simple; bh=RJs5dBBAWuOxqEEVBB1HCtYboJ+JS3oCwl7NKWs84IM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AlO/hmB3Y5Q4X90g5Le8zEnFijGC1Km4bVfj/Mc8T2aphhDOhMkB/I9NJoUpmxxJPYFA1grfP9HujenoT4C8XKue84IAO8fG6RU/wgzDFrGxJa81loe79pLBA4q2rivGnqeiOgQ1Q+20+pJdf2gmX090vT3UXWRdMnDVYjjoHgI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=Groves.net; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KUA2yd3S; arc=none smtp.client-ip=209.85.210.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=Groves.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KUA2yd3S" Received: by mail-ot1-f45.google.com with SMTP id 46e09a7af769-7cfd53a8c31so112889a34.1 for ; Wed, 14 Jan 2026 13:36:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768426562; x=1769031362; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=BHr6a06dT/VqhW8Rq+1vjbEURwj0h9cjtIZdXyvuQJA=; b=KUA2yd3Sy/4pN0SwaHe/Tc1SVJTmAE2s5qNTCn10qsOKrR1OcqQ6PV7RH9T99njJpC Dw9XlFS3SbzSYgud6nMrAwzAeQQU3JB05ZoZxBOGxGQWdFh0Gor7Dm8XEbheySdLtLPV 0b+DlcceYvx7Ehgsu0SYru2z+7+9cTJNeOTCldpvNScWmAWs98aKsSgJ4pojBv67ke1T o9Ez2nSzDVQuPx+qSbXbfe+heAS9oKaDK2coUCw3hG4cpI8qpW+Y7aSLTWYAPm/PCplr Lr/uJfqZDHrbVnaHKvWMpCiTbR4ca6zZ/4N2Jsr/tDt6Bwn2WeCrXkRwYStGCnlu9CGE pFpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768426562; x=1769031362; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BHr6a06dT/VqhW8Rq+1vjbEURwj0h9cjtIZdXyvuQJA=; b=tOpmOE9PWkytGrMf61xZ0LihfqsAc6FuBRqJY4B/n6uKPPS3kPTIVgI/tENG1wdj8L 9ZYB8A70lqmNBjc9hG4r7SzfMKtB0eSkePqVpGqNv3gGDnYBLNItbvmHyna2Y0cW+p/k L8TK+jQKB7QBp+wd9ufE7QNZjm5J/1VyZzRtTvJjw9cOwUblbzZPuGNk4RwrXu2M+U8r tG8A2jUMBxPVzTd99/wcj4G7ogtAlkU6GJERaWOaPCH+ULPPpMz114nkhb7zlpix2LoA +X3RehebhToi4PVuvhZ2FsL5RWKyUe72B/V4qeDttA/lvFNdhzn/HTpP0kJyX/B+uMAI VS2g== X-Forwarded-Encrypted: i=1; AJvYcCX8K+nq6pUx8dBS8r8gszkMpsmtoln0RT7OFnWcZfIqvoJzC+1uYH9Qmle+Uvdqk4g8CpSvFkb7UibL6l4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5WXgKTXgkKWW6XJQ+Nf77Vq8DhCxIWLXO0OaA6aMraVut4JKs cOJ6B1HsYXgJr2P6Rge0msq5yfJEwkpZZJLOS8X7uR5msSSP1XPSoz3k X-Gm-Gg: AY/fxX7mT4MMdZj7otJ0W/Q0gEoBvAcUbeSjJaj+HxHTgq8PJK8weFWvYYjKj7sHeoQ FO1A5LjTjIAbp5lp2g43O1L3GXonUE3PZSMDOCK8mazjMmZ0+XtCeE3NyiTPwOowBIf4G30I67m F0els4l5VsekT2GD3go1nONR7euHuO2eXLPJVFpSDvVrrxoA4e007Vf+0dyXQ9w64evnSmJ6UF7 Wy6xhhu/Ynkw4hDiWoot8Z549uwg2KqsgIZHrjOpvUFxLiS4AY8NBPyNxfmpNIcaJHNacQk4Dx+ RzJwyElGhHlRLJm7XzLMZIGb13ms00hc8xGJNg4VmuJVn2nJvMVp4rAmFyb72QGb0FOH1ZLvrE9 A/pEDJuEVV50OpLnTm9S4x1/g//PeiudWnHykLJe3/cVggZ4Pe2CbgcdXAIbGo6Ifcdj8VnRdJC ZBaaZTvwdxEFK+285L5Qf7lMCpnAG3M7IT+rVUZ2jEXOl9 X-Received: by 2002:a05:6830:3c06:b0:7c7:7f85:d19 with SMTP id 46e09a7af769-7cfd46192a9mr560960a34.8.1768426562527; Wed, 14 Jan 2026 13:36:02 -0800 (PST) Received: from localhost.localdomain ([2603:8080:1500:3d89:4c85:2962:e438:72c4]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7ce4781c43asm18703055a34.7.2026.01.14.13.36.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 14 Jan 2026 13:36:02 -0800 (PST) Sender: John Groves From: John Groves X-Google-Original-From: John Groves To: John Groves , Miklos Szeredi , Dan Williams , Bernd Schubert , Alison Schofield Cc: John Groves , Jonathan Corbet , Vishal Verma , Dave Jiang , Matthew Wilcox , Jan Kara , Alexander Viro , David Hildenbrand , Christian Brauner , "Darrick J . Wong" , Randy Dunlap , Jeff Layton , Amir Goldstein , Jonathan Cameron , Stefan Hajnoczi , Joanne Koong , Josef Bacik , Bagas Sanjaya , James Morse , Fuad Tabba , Sean Christopherson , Shivank Garg , Ackerley Tng , Gregory Price , Aravind Ramesh , Ajay Joshi , venkataravis@micron.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH V4 07/19] dax: Add fs_dax_get() func to prepare dax for fs-dax usage Date: Wed, 14 Jan 2026 15:31:54 -0600 Message-ID: <20260114213209.29453-8-john@groves.net> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260114213209.29453-1-john@groves.net> References: <20260114153133.29420.compound@groves.net> <20260114213209.29453-1-john@groves.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The fs_dax_get() function should be called by fs-dax file systems after opening a fsdev dax device. This adds holder_operations, which provides a memory failure callback path and effects exclusivity between callers of fs_dax_get(). fs_dax_get() is specific to fsdev_dax, so it checks the driver type (which required touching bus.[ch]). fs_dax_get() fails if fsdev_dax is not bound to the memory. This function serves the same role as fs_dax_get_by_bdev(), which dax file systems call after opening the pmem block device. This can't be located in fsdev.c because struct dax_device is opaque there. This will be called by fs/fuse/famfs.c in a subsequent commit. Signed-off-by: John Groves --- drivers/dax/bus.c | 2 -- drivers/dax/bus.h | 2 ++ drivers/dax/super.c | 58 ++++++++++++++++++++++++++++++++++++++++++++- include/linux/dax.h | 20 ++++++++++------ 4 files changed, 72 insertions(+), 10 deletions(-) diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c index e79daf825b52..01402d5103ef 100644 --- a/drivers/dax/bus.c +++ b/drivers/dax/bus.c @@ -39,8 +39,6 @@ static int dax_bus_uevent(const struct device *dev, struct kobj_uevent_env *env) return add_uevent_var(env, "MODALIAS=" DAX_DEVICE_MODALIAS_FMT, 0); } -#define to_dax_drv(__drv) container_of_const(__drv, struct dax_device_driver, drv) - static struct dax_id *__dax_match_id(const struct dax_device_driver *dax_drv, const char *dev_name) { diff --git a/drivers/dax/bus.h b/drivers/dax/bus.h index 880bdf7e72d7..dc6f112ac4a4 100644 --- a/drivers/dax/bus.h +++ b/drivers/dax/bus.h @@ -42,6 +42,8 @@ struct dax_device_driver { void (*remove)(struct dev_dax *dev); }; +#define to_dax_drv(__drv) container_of_const(__drv, struct dax_device_driver, drv) + int __dax_driver_register(struct dax_device_driver *dax_drv, struct module *module, const char *mod_name); #define dax_driver_register(driver) \ diff --git a/drivers/dax/super.c b/drivers/dax/super.c index ba0b4cd18a77..00c330ef437c 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c @@ -14,6 +14,7 @@ #include #include #include "dax-private.h" +#include "bus.h" /** * struct dax_device - anchor object for dax services @@ -111,6 +112,10 @@ struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev, u64 *start_off, } EXPORT_SYMBOL_GPL(fs_dax_get_by_bdev); +#endif /* CONFIG_BLOCK && CONFIG_FS_DAX */ + +#if IS_ENABLED(CONFIG_FS_DAX) + void fs_put_dax(struct dax_device *dax_dev, void *holder) { if (dax_dev && holder && @@ -119,7 +124,58 @@ void fs_put_dax(struct dax_device *dax_dev, void *holder) put_dax(dax_dev); } EXPORT_SYMBOL_GPL(fs_put_dax); -#endif /* CONFIG_BLOCK && CONFIG_FS_DAX */ + +/** + * fs_dax_get() - get ownership of a devdax via holder/holder_ops + * + * fs-dax file systems call this function to prepare to use a devdax device for + * fsdax. This is like fs_dax_get_by_bdev(), but the caller already has struct + * dev_dax (and there is no bdev). The holder makes this exclusive. + * + * @dax_dev: dev to be prepared for fs-dax usage + * @holder: filesystem or mapped device inside the dax_device + * @hops: operations for the inner holder + * + * Returns: 0 on success, <0 on failure + */ +int fs_dax_get(struct dax_device *dax_dev, void *holder, + const struct dax_holder_operations *hops) +{ + struct dev_dax *dev_dax; + struct dax_device_driver *dax_drv; + int id; + + id = dax_read_lock(); + if (!dax_dev || !dax_alive(dax_dev) || !igrab(&dax_dev->inode)) { + dax_read_unlock(id); + return -ENODEV; + } + dax_read_unlock(id); + + /* Verify the device is bound to fsdev_dax driver */ + dev_dax = dax_get_private(dax_dev); + if (!dev_dax || !dev_dax->dev.driver) { + iput(&dax_dev->inode); + return -ENODEV; + } + + dax_drv = to_dax_drv(dev_dax->dev.driver); + if (dax_drv->type != DAXDRV_FSDEV_TYPE) { + iput(&dax_dev->inode); + return -EOPNOTSUPP; + } + + if (cmpxchg(&dax_dev->holder_data, NULL, holder)) { + iput(&dax_dev->inode); + return -EBUSY; + } + + dax_dev->holder_ops = hops; + + return 0; +} +EXPORT_SYMBOL_GPL(fs_dax_get); +#endif /* CONFIG_FS_DAX */ enum dax_device_flags { /* !alive + rcu grace period == no new operations / mappings */ diff --git a/include/linux/dax.h b/include/linux/dax.h index 5aaaca135737..6897c5736543 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -52,9 +52,6 @@ struct dax_holder_operations { #if IS_ENABLED(CONFIG_DAX) struct dax_device *alloc_dax(void *private, const struct dax_operations *ops); -#if IS_ENABLED(CONFIG_DEV_DAX_FS) -struct dax_device *inode_dax(struct inode *inode); -#endif void *dax_holder(struct dax_device *dax_dev); void put_dax(struct dax_device *dax_dev); void kill_dax(struct dax_device *dax_dev); @@ -134,7 +131,6 @@ int dax_add_host(struct dax_device *dax_dev, struct gendisk *disk); void dax_remove_host(struct gendisk *disk); struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev, u64 *start_off, void *holder, const struct dax_holder_operations *ops); -void fs_put_dax(struct dax_device *dax_dev, void *holder); #else static inline int dax_add_host(struct dax_device *dax_dev, struct gendisk *disk) { @@ -149,12 +145,13 @@ static inline struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev, { return NULL; } -static inline void fs_put_dax(struct dax_device *dax_dev, void *holder) -{ -} #endif /* CONFIG_BLOCK && CONFIG_FS_DAX */ #if IS_ENABLED(CONFIG_FS_DAX) +void fs_put_dax(struct dax_device *dax_dev, void *holder); +int fs_dax_get(struct dax_device *dax_dev, void *holder, + const struct dax_holder_operations *hops); +struct dax_device *inode_dax(struct inode *inode); int dax_writeback_mapping_range(struct address_space *mapping, struct dax_device *dax_dev, struct writeback_control *wbc); int dax_folio_reset_order(struct folio *folio); @@ -168,6 +165,15 @@ dax_entry_t dax_lock_mapping_entry(struct address_space *mapping, void dax_unlock_mapping_entry(struct address_space *mapping, unsigned long index, dax_entry_t cookie); #else +static inline void fs_put_dax(struct dax_device *dax_dev, void *holder) +{ +} + +static inline int fs_dax_get(struct dax_device *dax_dev, void *holder, + const struct dax_holder_operations *hops) +{ + return -EOPNOTSUPP; +} static inline struct page *dax_layout_busy_page(struct address_space *mapping) { return NULL; -- 2.52.0