From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) (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 52DC7378D9B for ; Wed, 14 Jan 2026 21:37:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768426668; cv=none; b=iwRpmbKE1WucsPhnXLgvoqt+ofCqlWlNWOabMsbxj6XfO2hFXnrZsdIET4t1fSSs3ciX1a7BytGBGOZmwZUwBr11SQmdekwRGolQ9QnTBc+ufZe0OxOJvcly4EBx1cMLiy/p9O/0BVPk2UHj6jKymXXlta5kAbrvWTnp78lK6mU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768426668; c=relaxed/simple; bh=R7GTFFfXsW/hexMTH2rCgun0nMW8P9e1Nnjtsj10A/c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QZqeRvE+mK4lBjSxbS5VXsb13nQyVhmiSNUCEqFjHIwQhOVGLpVr2cBpfM0bhvtkd41H8PbbDCSC4MnZkSe+RP2UxhYg8JG1jBhq7s/ofLc+sW1s8/TbPt6lfZJrSLYAArcSifIvbTKT74MovGaWEKZLb67cqNq8gFF6FdSnAXE= 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=nm/YD+T0; arc=none smtp.client-ip=209.85.210.43 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="nm/YD+T0" Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-7c76f65feb5so211526a34.0 for ; Wed, 14 Jan 2026 13:37:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768426661; x=1769031461; 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=s0It4v+QKYzMVVAEFprn518ODvuGudSilDEyQY60PAU=; b=nm/YD+T0hQhFTNXtp/2C6X7GS60Jub0vGc9g5DnZAIR0lKxB2R9KIkyAGquf3Q3obO Ahd1LPVprmEFFIBnqvfsDZBcCL2O/0SaX32/Yy/clA5lZFTqeQVkeR3qCXyFeakvBiKx UcC5XAfKzWcYnO5JoUpY3fz2UUZexHv1HJ0AA79Th3l7ZBmABMyWVcDbr4kVN3f0rrRl i1rfVdsXSt+0rou6r34LHJ8zZHWWnDQVHCotm6rn9AGNif1YqEQ+TQ7jIaKsky2DoyNf ZRyAXerZmkJa6TBdDTWLqzYdHcRF2na4IO9kAaa6xHOwj+sgBU9uOfRI3DkmgnPTcBRj QgUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768426661; x=1769031461; 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=s0It4v+QKYzMVVAEFprn518ODvuGudSilDEyQY60PAU=; b=cswmp/fg/RHDRbo5npG+KoXOqrOyXRYigY0xoBaEXytFN+K87/BC6UdcnaNkBCKMak vZVzI0aFNOsxoeDQS2wC0OXxIrLv6QLEkMRf3yVanyueAXvcFyTbtbtJHfz9S8b4+kn9 iuQAnCUyPfAV4XtkPeeWIzmZ7YHEC7mGjUxIZ6e5K/CIrCgc1z6PClNztx2MoJE9rtiS HY2YOcrsWn0BQsvNrEeUe5dmDbWDuHJuV+3YzkYkzfhehErHjzyKonDYgkbI/HbjyFH6 DND8KITILXhGbaEKUesS3KMfh3p1WhSNVnXl9gOi2rV72n5vb7Qh1BZSyfnxNuqOlMyt YWOQ== X-Forwarded-Encrypted: i=1; AJvYcCW4BOprEW9Xz/UM65mQfCOnB70jT2VVqsCJ0t2nTAN4k2Abs3szBA0RJbuXT4rD2HO38qIX7jCWVMg=@vger.kernel.org X-Gm-Message-State: AOJu0YxLKJqBsWfDg7wWwfOI/zXKqQqvqxbMW9t6o8DxoIDA+953SPVN /sjhnzKMHdQCQajslBdSt2vgJRiyr83YMv8aAeVTGMjVxQdfdMNXKEen X-Gm-Gg: AY/fxX5lW4UkApQc7ujOZGabXYOIPrhW7dqNJZEtpEUAdQvfJIyDD4PhCCed4trSUR4 vFh63KhR92nGyS5iv3s+ho1NvZ1p3ffXoNJXUOuIAEzUxKGPrLqanSfiLWgaYaEPC/m2SyiJvj6 idjk8NVbpY70K3DprjIIFge9yQxILP9BLm7DfSr9DZpltMNxysk/yuBAkZjREQpLQJfQ4mjFach fkNB5DoBweJTeo/vZ3In/pN2rqHl+hAxGAjQu3UVTfEepw/7M0VhA8PsChSRgvbFpnPvJaQ2lpb UZ/8Vg1TkbTbfrDEErEMOoZMS6Aequ6dowTK4w1H6LTkwVbewaEhHQ99Om3aLj2oS8HzvzBj/ig AY7SaWo/ddLD87+hK+eMfHQmPSE5N6DUX8ujikSdUemX2jF3H3zAjrACiS1HIVvQ10yY9i8r4bM kz4ytJ3kQDnMyDDCw13RI/lcyeWrS7O6WxZ6NfXehSre9S X-Received: by 2002:a05:6830:8118:b0:7c7:61e0:a4ee with SMTP id 46e09a7af769-7cfc8aa04cfmr2494300a34.11.1768426661010; Wed, 14 Jan 2026 13:37:41 -0800 (PST) Received: from localhost.localdomain ([2603:8080:1500:3d89:4c85:2962:e438:72c4]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7ce478d9f54sm19757067a34.23.2026.01.14.13.37.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 14 Jan 2026 13:37:40 -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 10/19] famfs_fuse: Update macro s/FUSE_IS_DAX/FUSE_IS_VIRTIO_DAX/ Date: Wed, 14 Jan 2026 15:31:57 -0600 Message-ID: <20260114213209.29453-11-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-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Virtio_fs now needs to determine if an inode is DAX && not famfs. This relaces the FUSE_IS_DAX() macro with FUSE_IS_VIRTIO_DAX(), in preparation for famfs in later commits. The dummy fuse_file_famfs() macro will be replaced with a working function. Reviewed-by: Joanne Koong Signed-off-by: John Groves --- fs/fuse/dir.c | 2 +- fs/fuse/file.c | 13 ++++++++----- fs/fuse/fuse_i.h | 9 ++++++++- fs/fuse/inode.c | 4 ++-- fs/fuse/iomode.c | 2 +- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 4b6b3d2758ff..1400c9d733ba 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -2153,7 +2153,7 @@ int fuse_do_setattr(struct mnt_idmap *idmap, struct dentry *dentry, is_truncate = true; } - if (FUSE_IS_DAX(inode) && is_truncate) { + if (FUSE_IS_VIRTIO_DAX(fi) && is_truncate) { filemap_invalidate_lock(mapping); fault_blocked = true; err = fuse_dax_break_layouts(inode, 0, -1); diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 01bc894e9c2b..093569033ed1 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -252,7 +252,7 @@ static int fuse_open(struct inode *inode, struct file *file) int err; bool is_truncate = (file->f_flags & O_TRUNC) && fc->atomic_o_trunc; bool is_wb_truncate = is_truncate && fc->writeback_cache; - bool dax_truncate = is_truncate && FUSE_IS_DAX(inode); + bool dax_truncate = is_truncate && FUSE_IS_VIRTIO_DAX(fi); if (fuse_is_bad(inode)) return -EIO; @@ -1812,11 +1812,12 @@ static ssize_t fuse_file_read_iter(struct kiocb *iocb, struct iov_iter *to) struct file *file = iocb->ki_filp; struct fuse_file *ff = file->private_data; struct inode *inode = file_inode(file); + struct fuse_inode *fi = get_fuse_inode(inode); if (fuse_is_bad(inode)) return -EIO; - if (FUSE_IS_DAX(inode)) + if (FUSE_IS_VIRTIO_DAX(fi)) return fuse_dax_read_iter(iocb, to); /* FOPEN_DIRECT_IO overrides FOPEN_PASSTHROUGH */ @@ -1833,11 +1834,12 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from) struct file *file = iocb->ki_filp; struct fuse_file *ff = file->private_data; struct inode *inode = file_inode(file); + struct fuse_inode *fi = get_fuse_inode(inode); if (fuse_is_bad(inode)) return -EIO; - if (FUSE_IS_DAX(inode)) + if (FUSE_IS_VIRTIO_DAX(fi)) return fuse_dax_write_iter(iocb, from); /* FOPEN_DIRECT_IO overrides FOPEN_PASSTHROUGH */ @@ -2370,10 +2372,11 @@ static int fuse_file_mmap(struct file *file, struct vm_area_struct *vma) struct fuse_file *ff = file->private_data; struct fuse_conn *fc = ff->fm->fc; struct inode *inode = file_inode(file); + struct fuse_inode *fi = get_fuse_inode(inode); int rc; /* DAX mmap is superior to direct_io mmap */ - if (FUSE_IS_DAX(inode)) + if (FUSE_IS_VIRTIO_DAX(fi)) return fuse_dax_mmap(file, vma); /* @@ -2934,7 +2937,7 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, .mode = mode }; int err; - bool block_faults = FUSE_IS_DAX(inode) && + bool block_faults = FUSE_IS_VIRTIO_DAX(fi) && (!(mode & FALLOC_FL_KEEP_SIZE) || (mode & (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_ZERO_RANGE))); diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 7f16049387d1..45e108dec771 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -1508,7 +1508,14 @@ void fuse_free_conn(struct fuse_conn *fc); /* dax.c */ -#define FUSE_IS_DAX(inode) (IS_ENABLED(CONFIG_FUSE_DAX) && IS_DAX(inode)) +static inline bool fuse_file_famfs(struct fuse_inode *fuse_inode) /* Will be superseded */ +{ + (void)fuse_inode; + return false; +} +#define FUSE_IS_VIRTIO_DAX(fuse_inode) (IS_ENABLED(CONFIG_FUSE_DAX) \ + && IS_DAX(&fuse_inode->inode) \ + && !fuse_file_famfs(fuse_inode)) ssize_t fuse_dax_read_iter(struct kiocb *iocb, struct iov_iter *to); ssize_t fuse_dax_write_iter(struct kiocb *iocb, struct iov_iter *from); diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 819e50d66622..ed667920997f 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -162,7 +162,7 @@ static void fuse_evict_inode(struct inode *inode) /* Will write inode on close/munmap and in all other dirtiers */ WARN_ON(inode_state_read_once(inode) & I_DIRTY_INODE); - if (FUSE_IS_DAX(inode)) + if (FUSE_IS_VIRTIO_DAX(fi)) dax_break_layout_final(inode); truncate_inode_pages_final(&inode->i_data); @@ -170,7 +170,7 @@ static void fuse_evict_inode(struct inode *inode) if (inode->i_sb->s_flags & SB_ACTIVE) { struct fuse_conn *fc = get_fuse_conn(inode); - if (FUSE_IS_DAX(inode)) + if (FUSE_IS_VIRTIO_DAX(fi)) fuse_dax_inode_cleanup(inode); if (fi->nlookup) { fuse_queue_forget(fc, fi->forget, fi->nodeid, diff --git a/fs/fuse/iomode.c b/fs/fuse/iomode.c index 3728933188f3..31ee7f3304c6 100644 --- a/fs/fuse/iomode.c +++ b/fs/fuse/iomode.c @@ -203,7 +203,7 @@ int fuse_file_io_open(struct file *file, struct inode *inode) * io modes are not relevant with DAX and with server that does not * implement open. */ - if (FUSE_IS_DAX(inode) || !ff->args) + if (FUSE_IS_VIRTIO_DAX(fi) || !ff->args) return 0; /* -- 2.52.0