From: Eric Sandeen <sandeen@sandeen.net> To: linux-xfs <linux-xfs@vger.kernel.org> Subject: [PATCH V4] libxfs: use FALLOC_FL_ZERO_RANGE in libxfs_device_zero Date: Tue, 25 Feb 2020 10:13:55 -0800 Message-ID: <1c7c39f7-91a7-be85-5906-e55180a91a5f@sandeen.net> (raw) In-Reply-To: <4bc3be27-b09d-a708-f053-6f7240642667@sandeen.net> I had a request from someone who cared about mkfs speed over a slower network block device to look into using faster zeroing methods, particularly for the log, during mkfs. Using FALLOC_FL_ZERO_RANGE is faster in this case than writing a bunch of zeros across a wire. Signed-off-by: Eric Sandeen <sandeen@redhat.com> --- V2: Clean up all the nasty stuff I'd flung out there as a wild first cut, thanks Dave. V3: make len_bytes a size_t; leave "end_offset" where it is for the loop use. It's a bit odd but ... just don't mess with it for now, one patch one change. V4: Use EOPNOTSUPP not EOPNOTSUP (same on linux anyway but meh) I ignored(tm) darrick's suggestion to make libxfs_device_zero accept a longer length, for now - no callers need anything bigger at this time. diff --git a/include/builddefs.in b/include/builddefs.in index 4700b527..1dd27f76 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -144,6 +144,9 @@ endif ifeq ($(HAVE_GETFSMAP),yes) PCFLAGS+= -DHAVE_GETFSMAP endif +ifeq ($(HAVE_FALLOCATE),yes) +PCFLAGS += -DHAVE_FALLOCATE +endif LIBICU_LIBS = @libicu_LIBS@ LIBICU_CFLAGS = @libicu_CFLAGS@ diff --git a/include/linux.h b/include/linux.h index 8f3c32b0..8d5c4584 100644 --- a/include/linux.h +++ b/include/linux.h @@ -20,6 +20,10 @@ #include <stdio.h> #include <asm/types.h> #include <mntent.h> +#include <fcntl.h> +#if defined(HAVE_FALLOCATE) +#include <linux/falloc.h> +#endif #ifdef OVERRIDE_SYSTEM_FSXATTR # define fsxattr sys_fsxattr #endif @@ -164,6 +168,24 @@ static inline void platform_mntent_close(struct mntent_cursor * cursor) endmntent(cursor->mtabp); } +#if defined(FALLOC_FL_ZERO_RANGE) +static inline int +platform_zero_range( + int fd, + xfs_off_t start, + size_t len) +{ + int ret; + + ret = fallocate(fd, FALLOC_FL_ZERO_RANGE, start, len); + if (!ret) + return 0; + return -errno; +} +#else +#define platform_zero_range(fd, s, l) (-EOPNOTSUPP) +#endif + /* * Check whether we have to define FS_IOC_FS[GS]ETXATTR ourselves. These * are a copy of the definitions moved to linux/uapi/fs.h in the 4.5 kernel, diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c index 0d9d7202..e2d9d790 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c @@ -61,8 +61,18 @@ libxfs_device_zero(struct xfs_buftarg *btp, xfs_daddr_t start, uint len) { xfs_off_t start_offset, end_offset, offset; ssize_t zsize, bytes; + size_t len_bytes; char *z; - int fd; + int error, fd; + + fd = libxfs_device_to_fd(btp->dev); + start_offset = LIBXFS_BBTOOFF64(start); + + /* try to use special zeroing methods, fall back to writes if needed */ + len_bytes = LIBXFS_BBTOOFF64(len); + error = platform_zero_range(fd, start_offset, len_bytes); + if (!error) + return 0; zsize = min(BDSTRAT_SIZE, BBTOB(len)); if ((z = memalign(libxfs_device_alignment(), zsize)) == NULL) { @@ -73,9 +83,6 @@ libxfs_device_zero(struct xfs_buftarg *btp, xfs_daddr_t start, uint len) } memset(z, 0, zsize); - fd = libxfs_device_to_fd(btp->dev); - start_offset = LIBXFS_BBTOOFF64(start); - if ((lseek(fd, start_offset, SEEK_SET)) < 0) { fprintf(stderr, _("%s: %s seek to offset %llu failed: %s\n"), progname, __FUNCTION__,
next prev parent reply index Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-13 21:12 [PATCH, RFC] " Eric Sandeen 2020-02-13 23:48 ` Dave Chinner 2020-02-13 23:57 ` Eric Sandeen 2020-02-14 0:25 ` Dave Chinner 2020-02-14 1:05 ` [PATCH V2] " Eric Sandeen 2020-02-14 1:34 ` Dave Chinner 2020-02-14 1:43 ` Eric Sandeen 2020-02-22 3:22 ` [PATCH V3] " Eric Sandeen 2020-02-22 7:24 ` Darrick J. Wong 2020-02-22 15:23 ` Eric Sandeen 2020-02-25 18:13 ` Eric Sandeen [this message] 2020-02-25 18:46 ` [PATCH V4] " Christoph Hellwig 2020-02-25 19:16 ` Darrick J. Wong 2020-02-25 23:33 ` Eric Sandeen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1c7c39f7-91a7-be85-5906-e55180a91a5f@sandeen.net \ --to=sandeen@sandeen.net \ --cc=linux-xfs@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-XFS Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-xfs/0 linux-xfs/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-xfs linux-xfs/ https://lore.kernel.org/linux-xfs \ linux-xfs@vger.kernel.org public-inbox-index linux-xfs Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-xfs AGPL code for this site: git clone https://public-inbox.org/public-inbox.git