c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 19:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

zfs_file: implement zfs_file_deallocate for FreeBSD 14

Browse Source 
FreeBSD 14 gained a `VOP_DEALLOCATE` VFS operation and a `fspacectl`
syscall to use it. At minimum, these zero the given region, and if the
underlying filesystem supports it, can make the region sparse. We can
use this to get TRIM-like behaviour for file vdevs.

Sponsored-by: https://despairlabs.com/sponsor/
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Closes #16496
This commit is contained in:
Rob Norris 2024-09-01 12:34:17 +10:00 committed by Brian Behlendorf
parent fa330646b9
commit f245541e24
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libzpool/kernel.c
View File

@ -1380,6 +1380,12 @@ zfs_file_deallocate(zfs_file_t *fp, loff_t offset, loff_t len)
#if defined(__linux__) #if defined(__linux__)
rc = fallocate(fp->f_fd, rc = fallocate(fp->f_fd,
FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, offset, len); FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, offset, len);
#elif defined(__FreeBSD__) && (__FreeBSD_version >= 1400029)
struct spacectl_range rqsr = {
.r_offset = offset,
.r_len = len,
};
rc = fspacectl(fp->f_fd, SPACECTL_DEALLOC, &rqsr, 0, &rqsr);
#else #else
(void) fp, (void) offset, (void) len; (void) fp, (void) offset, (void) len;
rc = EOPNOTSUPP; rc = EOPNOTSUPP;

14
module/os/freebsd/zfs/zfs_file_os.c
View File

@ -295,8 +295,20 @@ zfs_file_fsync(zfs_file_t *fp, int flags)
int int
zfs_file_deallocate(zfs_file_t *fp, loff_t offset, loff_t len) zfs_file_deallocate(zfs_file_t *fp, loff_t offset, loff_t len)
{ {
int rc;
#if __FreeBSD_version >= 1400029
struct thread *td;
td = curthread;
rc = fo_fspacectl(fp, SPACECTL_DEALLOC, &offset, &len, 0,
td->td_ucred, td);
#else
(void) fp, (void) offset, (void) len; (void) fp, (void) offset, (void) len;
return (SET_ERROR(EOPNOTSUPP)); rc = EOPNOTSUPP;
#endif
if (rc)
return (SET_ERROR(rc));
return (0);
} }
zfs_file_t * zfs_file_t *