From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 323AD2E4269 for ; Tue, 8 Jul 2025 16:06:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751990801; cv=none; b=qSsQbmwOhw11OJaaHWwCeunZ+vbmQvcykUi7+zN2jUTEQBNnxzpBOdpgrazrEDHpFqjK8yX17GpAuJJO0qpIpYs1veHu+lRntr17xzkBAwcuIOw2DkoqyC+HfYD9VTyWpzICHfDIZQcfckDcOWD0jzwUXxf7TDnrrogphfMV+LY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751990801; c=relaxed/simple; bh=xn0xvSIiBlKY6vzRNtueWH89cTh1QCzuoPEgg3rnpfk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=etDQkYKi2JS8ka0motql2zbq+4x+cnCC3JyEur95LxXjA714RF5+cBLjRiAbcYkIcWkab3vGGE0K5ii5/LJ06fY5z4jHCthveX+IXgD/D1KkoUzn6Hx4O3TiDcjG0eFJP8LaSDWeHMZ/2qjWwrsos6oOslcpwE8kHsoBu5h0yIs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kYrMLXyk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kYrMLXyk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2970C4CEED; Tue, 8 Jul 2025 16:06:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751990800; bh=xn0xvSIiBlKY6vzRNtueWH89cTh1QCzuoPEgg3rnpfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kYrMLXyk01SN1mZ/lvhkSmjP1Fh0pmKIYFojdMk0wru02UYlEV/oCwWsZXhNgyWsC P2eLsZI5JiaptJ9oL1YmFDVLfQDJBsSp4E3hxhRdn/gs9596oN5XwORYAaFfVzoG0q aSNl1sy+SDXl8MbmdzrkdyFI47j8cgn72kBOh8U0Nnahdb9quV9wXHUkDognL9VkpJ crNHYm9zdkc65yvLyDzRSn0AgK5CMGG9Sc3WO4t0Z6f29r7Uf7iOhZ5/rrjDeu28+z rscZ11TPmbwjfQFVSZPCeQb4kFnVjH/oiGO8v+FGmKa6iteRNRjIduUNi6TCu3ZVY+ Mm4II51PNJ0Fg== From: Mike Snitzer To: Chuck Lever , Jeff Layton , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org, linus-fsdevel@vger.kernel.org, linux-mm@kvack.org, snitzer@kernel.org Subject: [RFC PATCH v2 3/8] NFSD: filecache: add STATX_DIOALIGN and STATX_DIO_READ_ALIGN support Date: Tue, 8 Jul 2025 12:06:14 -0400 Message-ID: <20250708160619.64800-4-snitzer@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20250708160619.64800-1-snitzer@kernel.org> References: <20250708160619.64800-1-snitzer@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use STATX_DIOALIGN and STATX_DIO_READ_ALIGN to get and store DIO alignment attributes from underlying filesystem in associated nfsd_file. This is done when the nfsd_file is first opened for a regular file. Signed-off-by: Mike Snitzer --- fs/nfsd/filecache.c | 32 ++++++++++++++++++++++++++++++++ fs/nfsd/filecache.h | 4 ++++ fs/nfsd/nfsfh.c | 4 ++++ 3 files changed, 40 insertions(+) diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c index 905034fd8c34..e8a9336b42f5 100644 --- a/fs/nfsd/filecache.c +++ b/fs/nfsd/filecache.c @@ -231,6 +231,9 @@ nfsd_file_alloc(struct net *net, struct inode *inode, unsigned char need, refcount_set(&nf->nf_ref, 1); nf->nf_may = need; nf->nf_mark = NULL; + nf->nf_dio_mem_align = 0; + nf->nf_dio_offset_align = 0; + nf->nf_dio_read_offset_align = 0; return nf; } @@ -1064,6 +1067,33 @@ nfsd_file_is_cached(struct inode *inode) return ret; } +static __be32 +nfsd_file_getattr(const struct svc_fh *fhp, struct nfsd_file *nf) +{ + struct inode *inode = file_inode(nf->nf_file); + struct kstat stat; + __be32 status; + + /* Currently only need to get DIO alignment info for regular files */ + if (!S_ISREG(inode->i_mode)) + return nfs_ok; + + status = fh_getattr(fhp, &stat); + if (status != nfs_ok) + return status; + + if (stat.result_mask & STATX_DIOALIGN) { + nf->nf_dio_mem_align = stat.dio_mem_align; + nf->nf_dio_offset_align = stat.dio_offset_align; + } + if (stat.result_mask & STATX_DIO_READ_ALIGN) + nf->nf_dio_read_offset_align = stat.dio_read_offset_align; + else + nf->nf_dio_read_offset_align = nf->nf_dio_offset_align; + + return status; +} + static __be32 nfsd_file_do_acquire(struct svc_rqst *rqstp, struct net *net, struct svc_cred *cred, @@ -1182,6 +1212,8 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct net *net, } status = nfserrno(ret); trace_nfsd_file_open(nf, status); + if (status == nfs_ok) + status = nfsd_file_getattr(fhp, nf); } } else status = nfserr_jukebox; diff --git a/fs/nfsd/filecache.h b/fs/nfsd/filecache.h index cd02f91aaef1..d41428ce8a11 100644 --- a/fs/nfsd/filecache.h +++ b/fs/nfsd/filecache.h @@ -54,6 +54,10 @@ struct nfsd_file { struct list_head nf_gc; struct rcu_head nf_rcu; ktime_t nf_birthtime; + + u32 nf_dio_mem_align; + u32 nf_dio_offset_align; + u32 nf_dio_read_offset_align; }; int nfsd_file_cache_init(void); diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index f4a3cc9e31e0..bdba2ba828a6 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -677,8 +677,12 @@ __be32 fh_getattr(const struct svc_fh *fhp, struct kstat *stat) .mnt = fhp->fh_export->ex_path.mnt, .dentry = fhp->fh_dentry, }; + struct inode *inode = d_inode(p.dentry); u32 request_mask = STATX_BASIC_STATS; + if (S_ISREG(inode->i_mode)) + request_mask |= (STATX_DIOALIGN | STATX_DIO_READ_ALIGN); + if (fhp->fh_maxsize == NFS4_FHSIZE) request_mask |= (STATX_BTIME | STATX_CHANGE_COOKIE); -- 2.44.0