* [Qemu-devel] [PATCH] gluster: add support for PREALLOC_MODE_FALLOC @ 2017-05-15 19:11 Niels de Vos 2017-05-16 15:42 ` Jeff Cody 2017-05-18 9:54 ` [Qemu-devel] [PATCH v2] " Niels de Vos 0 siblings, 2 replies; 8+ messages in thread From: Niels de Vos @ 2017-05-15 19:11 UTC (permalink / raw) To: Jeff Cody, Kevin Wolf, qemu-block; +Cc: qemu-devel, Niels de Vos Add missing support for "preallocation=falloc" to the Gluster block driver. This change bases its logic on that of block/file-posix.c and removed the gluster_supports_zerofill() function in favour of an #ifdef check in an easy to read switch-statement. Reported-by: Satheesaran Sundaramoorthi <sasundar@redhat.com> URL: https://bugzilla.redhat.com/1450759 Signed-off-by: Niels de Vos <ndevos@redhat.com> --- block/gluster.c | 61 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index 7c76cd0..566166f 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -965,11 +965,6 @@ static coroutine_fn int qemu_gluster_co_pwrite_zeroes(BlockDriverState *bs, return acb.ret; } -static inline bool gluster_supports_zerofill(void) -{ - return 1; -} - static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset, int64_t size) { @@ -977,11 +972,6 @@ static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset, } #else -static inline bool gluster_supports_zerofill(void) -{ - return 0; -} - static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset, int64_t size) { @@ -996,9 +986,10 @@ static int qemu_gluster_create(const char *filename, struct glfs *glfs; struct glfs_fd *fd; int ret = 0; - int prealloc = 0; + PreallocMode prealloc; int64_t total_size = 0; char *tmp = NULL; + Error *local_err = NULL; gconf = g_new0(BlockdevOptionsGluster, 1); gconf->debug = qemu_opt_get_number_del(opts, GLUSTER_OPT_DEBUG, @@ -1026,13 +1017,12 @@ static int qemu_gluster_create(const char *filename, BDRV_SECTOR_SIZE); tmp = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); - if (!tmp || !strcmp(tmp, "off")) { - prealloc = 0; - } else if (!strcmp(tmp, "full") && gluster_supports_zerofill()) { - prealloc = 1; - } else { - error_setg(errp, "Invalid preallocation mode: '%s'" - " or GlusterFS doesn't support zerofill API", tmp); + prealloc = qapi_enum_parse(PreallocMode_lookup, tmp, + PREALLOC_MODE__MAX, PREALLOC_MODE_OFF, + &local_err); + g_free(tmp); + if (local_err) { + error_propagate(errp, local_err); ret = -EINVAL; goto out; } @@ -1041,21 +1031,46 @@ static int qemu_gluster_create(const char *filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR); if (!fd) { ret = -errno; - } else { + goto out; + } + + switch (prealloc) { + case PREALLOC_MODE_FALLOC: + if (!glfs_fallocate(fd, 0, 0, total_size)) { + error_setg(errp, "Could not preallocate data for the new file"); + ret = -errno; + } + break; +#ifdef CONFIG_GLUSTERFS_ZEROFILL + case PREALLOC_MODE_FULL: if (!glfs_ftruncate(fd, total_size)) { - if (prealloc && qemu_gluster_zerofill(fd, 0, total_size)) { + if (qemu_gluster_zerofill(fd, 0, total_size)) { + error_setg(errp, "Could not zerofill the new file"); ret = -errno; } } else { + error_setg(errp, "Could not resize file"); ret = -errno; } - - if (glfs_close(fd) != 0) { + break; +#endif /* CONFIG_GLUSTERFS_ZEROFILL */ + case PREALLOC_MODE_OFF: + if (glfs_ftruncate(fd, total_size) != 0) { ret = -errno; + error_setg(errp, "Could not resize file"); } + break; + default: + ret = -EINVAL; + error_setg(errp, "Unsupported preallocation mode: %s", + PreallocMode_lookup[prealloc]); + break; + } + + if (glfs_close(fd) != 0) { + ret = -errno; } out: - g_free(tmp); qapi_free_BlockdevOptionsGluster(gconf); glfs_clear_preopened(glfs); return ret; -- 2.9.3 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH] gluster: add support for PREALLOC_MODE_FALLOC 2017-05-15 19:11 [Qemu-devel] [PATCH] gluster: add support for PREALLOC_MODE_FALLOC Niels de Vos @ 2017-05-16 15:42 ` Jeff Cody 2017-05-17 12:35 ` Niels de Vos 2017-05-18 9:54 ` [Qemu-devel] [PATCH v2] " Niels de Vos 1 sibling, 1 reply; 8+ messages in thread From: Jeff Cody @ 2017-05-16 15:42 UTC (permalink / raw) To: Niels de Vos; +Cc: Kevin Wolf, qemu-block, qemu-devel On Mon, May 15, 2017 at 09:11:36PM +0200, Niels de Vos wrote: > Add missing support for "preallocation=falloc" to the Gluster block > driver. This change bases its logic on that of block/file-posix.c and > removed the gluster_supports_zerofill() function in favour of an #ifdef > check in an easy to read switch-statement. > > Reported-by: Satheesaran Sundaramoorthi <sasundar@redhat.com> > URL: https://bugzilla.redhat.com/1450759 > Signed-off-by: Niels de Vos <ndevos@redhat.com> > --- > block/gluster.c | 61 +++++++++++++++++++++++++++++++++++---------------------- > 1 file changed, 38 insertions(+), 23 deletions(-) > > diff --git a/block/gluster.c b/block/gluster.c > index 7c76cd0..566166f 100644 > --- a/block/gluster.c > +++ b/block/gluster.c > @@ -965,11 +965,6 @@ static coroutine_fn int qemu_gluster_co_pwrite_zeroes(BlockDriverState *bs, > return acb.ret; > } > > -static inline bool gluster_supports_zerofill(void) > -{ > - return 1; > -} > - > static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset, > int64_t size) > { > @@ -977,11 +972,6 @@ static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset, > } > > #else > -static inline bool gluster_supports_zerofill(void) > -{ > - return 0; > -} > - > static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset, > int64_t size) > { > @@ -996,9 +986,10 @@ static int qemu_gluster_create(const char *filename, > struct glfs *glfs; > struct glfs_fd *fd; > int ret = 0; > - int prealloc = 0; > + PreallocMode prealloc; > int64_t total_size = 0; > char *tmp = NULL; > + Error *local_err = NULL; > > gconf = g_new0(BlockdevOptionsGluster, 1); > gconf->debug = qemu_opt_get_number_del(opts, GLUSTER_OPT_DEBUG, > @@ -1026,13 +1017,12 @@ static int qemu_gluster_create(const char *filename, > BDRV_SECTOR_SIZE); > > tmp = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); > - if (!tmp || !strcmp(tmp, "off")) { > - prealloc = 0; > - } else if (!strcmp(tmp, "full") && gluster_supports_zerofill()) { > - prealloc = 1; > - } else { > - error_setg(errp, "Invalid preallocation mode: '%s'" > - " or GlusterFS doesn't support zerofill API", tmp); > + prealloc = qapi_enum_parse(PreallocMode_lookup, tmp, > + PREALLOC_MODE__MAX, PREALLOC_MODE_OFF, > + &local_err); > + g_free(tmp); > + if (local_err) { > + error_propagate(errp, local_err); > ret = -EINVAL; > goto out; > } > @@ -1041,21 +1031,46 @@ static int qemu_gluster_create(const char *filename, > O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR); > if (!fd) { > ret = -errno; > - } else { > + goto out; > + } > + > + switch (prealloc) { > + case PREALLOC_MODE_FALLOC: > + if (!glfs_fallocate(fd, 0, 0, total_size)) { > + error_setg(errp, "Could not preallocate data for the new file"); > + ret = -errno; > + } Both glfs_fallocate() and glfs_zerofill() are from the same release version, right? I think we need a CONFIG_GLUSTER_FALLOC around the PREALLOC_MODE_FALLOC case, just like CONFIG_GLUSTERFS_ZEROFILL. > + break; > +#ifdef CONFIG_GLUSTERFS_ZEROFILL > + case PREALLOC_MODE_FULL: > if (!glfs_ftruncate(fd, total_size)) { > - if (prealloc && qemu_gluster_zerofill(fd, 0, total_size)) { > + if (qemu_gluster_zerofill(fd, 0, total_size)) { If using the CONFIG_GLUSTER_ZEROFILL here, then please get rid of the qemu_gluster_zerofill() wrapper, which is in place for the same reason as this ifdef. We can just call glfs_zerofill() here directly. > + error_setg(errp, "Could not zerofill the new file"); > ret = -errno; > } > } else { > + error_setg(errp, "Could not resize file"); > ret = -errno; > } > - > - if (glfs_close(fd) != 0) { > + break; > +#endif /* CONFIG_GLUSTERFS_ZEROFILL */ > + case PREALLOC_MODE_OFF: > + if (glfs_ftruncate(fd, total_size) != 0) { > ret = -errno; > + error_setg(errp, "Could not resize file"); > } > + break; > + default: > + ret = -EINVAL; > + error_setg(errp, "Unsupported preallocation mode: %s", > + PreallocMode_lookup[prealloc]); > + break; > + } > + > + if (glfs_close(fd) != 0) { > + ret = -errno; > } > out: > - g_free(tmp); > qapi_free_BlockdevOptionsGluster(gconf); > glfs_clear_preopened(glfs); A question that doesn't have to do with this patch: is it safe to call glfs_clear_preopened(NULL)? -Jeff ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH] gluster: add support for PREALLOC_MODE_FALLOC 2017-05-16 15:42 ` Jeff Cody @ 2017-05-17 12:35 ` Niels de Vos 0 siblings, 0 replies; 8+ messages in thread From: Niels de Vos @ 2017-05-17 12:35 UTC (permalink / raw) To: Jeff Cody; +Cc: Kevin Wolf, qemu-block, qemu-devel On Tue, May 16, 2017 at 11:42:37AM -0400, Jeff Cody wrote: > On Mon, May 15, 2017 at 09:11:36PM +0200, Niels de Vos wrote: > > Add missing support for "preallocation=falloc" to the Gluster block > > driver. This change bases its logic on that of block/file-posix.c and > > removed the gluster_supports_zerofill() function in favour of an #ifdef > > check in an easy to read switch-statement. > > > > Reported-by: Satheesaran Sundaramoorthi <sasundar@redhat.com> > > URL: https://bugzilla.redhat.com/1450759 > > Signed-off-by: Niels de Vos <ndevos@redhat.com> > > --- > > block/gluster.c | 61 +++++++++++++++++++++++++++++++++++---------------------- > > 1 file changed, 38 insertions(+), 23 deletions(-) > > > > diff --git a/block/gluster.c b/block/gluster.c > > index 7c76cd0..566166f 100644 > > --- a/block/gluster.c > > +++ b/block/gluster.c > > @@ -965,11 +965,6 @@ static coroutine_fn int qemu_gluster_co_pwrite_zeroes(BlockDriverState *bs, > > return acb.ret; > > } > > > > -static inline bool gluster_supports_zerofill(void) > > -{ > > - return 1; > > -} > > - > > static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset, > > int64_t size) > > { > > @@ -977,11 +972,6 @@ static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset, > > } > > > > #else > > -static inline bool gluster_supports_zerofill(void) > > -{ > > - return 0; > > -} > > - > > static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset, > > int64_t size) > > { > > @@ -996,9 +986,10 @@ static int qemu_gluster_create(const char *filename, > > struct glfs *glfs; > > struct glfs_fd *fd; > > int ret = 0; > > - int prealloc = 0; > > + PreallocMode prealloc; > > int64_t total_size = 0; > > char *tmp = NULL; > > + Error *local_err = NULL; > > > > gconf = g_new0(BlockdevOptionsGluster, 1); > > gconf->debug = qemu_opt_get_number_del(opts, GLUSTER_OPT_DEBUG, > > @@ -1026,13 +1017,12 @@ static int qemu_gluster_create(const char *filename, > > BDRV_SECTOR_SIZE); > > > > tmp = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); > > - if (!tmp || !strcmp(tmp, "off")) { > > - prealloc = 0; > > - } else if (!strcmp(tmp, "full") && gluster_supports_zerofill()) { > > - prealloc = 1; > > - } else { > > - error_setg(errp, "Invalid preallocation mode: '%s'" > > - " or GlusterFS doesn't support zerofill API", tmp); > > + prealloc = qapi_enum_parse(PreallocMode_lookup, tmp, > > + PREALLOC_MODE__MAX, PREALLOC_MODE_OFF, > > + &local_err); > > + g_free(tmp); > > + if (local_err) { > > + error_propagate(errp, local_err); > > ret = -EINVAL; > > goto out; > > } > > @@ -1041,21 +1031,46 @@ static int qemu_gluster_create(const char *filename, > > O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR); > > if (!fd) { > > ret = -errno; > > - } else { > > + goto out; > > + } > > + > > + switch (prealloc) { > > + case PREALLOC_MODE_FALLOC: > > + if (!glfs_fallocate(fd, 0, 0, total_size)) { > > + error_setg(errp, "Could not preallocate data for the new file"); > > + ret = -errno; > > + } > > Both glfs_fallocate() and glfs_zerofill() are from the same release version, > right? I think we need a CONFIG_GLUSTER_FALLOC around the > PREALLOC_MODE_FALLOC case, just like CONFIG_GLUSTERFS_ZEROFILL. Yes, both were added at the same GlusterFS release. I'll add the check in ./configure and #ifdef it. > > + break; > > +#ifdef CONFIG_GLUSTERFS_ZEROFILL > > + case PREALLOC_MODE_FULL: > > if (!glfs_ftruncate(fd, total_size)) { > > - if (prealloc && qemu_gluster_zerofill(fd, 0, total_size)) { > > + if (qemu_gluster_zerofill(fd, 0, total_size)) { > > If using the CONFIG_GLUSTER_ZEROFILL here, then please get rid of the > qemu_gluster_zerofill() wrapper, which is in place for the same reason as > this ifdef. We can just call glfs_zerofill() here directly. Right, will do! > > + error_setg(errp, "Could not zerofill the new file"); > > ret = -errno; > > } > > } else { > > + error_setg(errp, "Could not resize file"); > > ret = -errno; > > } > > - > > - if (glfs_close(fd) != 0) { > > + break; > > +#endif /* CONFIG_GLUSTERFS_ZEROFILL */ > > + case PREALLOC_MODE_OFF: > > + if (glfs_ftruncate(fd, total_size) != 0) { > > ret = -errno; > > + error_setg(errp, "Could not resize file"); > > } > > + break; > > + default: > > + ret = -EINVAL; > > + error_setg(errp, "Unsupported preallocation mode: %s", > > + PreallocMode_lookup[prealloc]); > > + break; > > + } > > + > > + if (glfs_close(fd) != 0) { > > + ret = -errno; > > } > > out: > > - g_free(tmp); > > qapi_free_BlockdevOptionsGluster(gconf); > > glfs_clear_preopened(glfs); > > A question that doesn't have to do with this patch: is it safe to call > glfs_clear_preopened(NULL)? glfs_clear_preopened() actually is a function that has its implementation in block/gluster.c. Yes, it can accept NULL and will return immediately. Thanks, Niels ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH v2] gluster: add support for PREALLOC_MODE_FALLOC 2017-05-15 19:11 [Qemu-devel] [PATCH] gluster: add support for PREALLOC_MODE_FALLOC Niels de Vos 2017-05-16 15:42 ` Jeff Cody @ 2017-05-18 9:54 ` Niels de Vos 2017-05-18 14:30 ` Eric Blake 2017-05-18 17:54 ` Jeff Cody 1 sibling, 2 replies; 8+ messages in thread From: Niels de Vos @ 2017-05-18 9:54 UTC (permalink / raw) To: Jeff Cody, Kevin Wolf, qemu-block; +Cc: qemu-devel, Niels de Vos Add missing support for "preallocation=falloc" to the Gluster block driver. This change bases its logic on that of block/file-posix.c and removed the gluster_supports_zerofill() and qemu_gluster_zerofill() functiond in favour of #ifdef checks in an easy to read switch-statement. Both glfs_zerofill() and glfs_fallocate() have been introduced with GlusterFS 3.5.0 (pkg-config glusterfs-api = 6). A #define for the availability of glfs_fallocate() has been added to ./configure. Reported-by: Satheesaran Sundaramoorthi <sasundar@redhat.com> URL: https://bugzilla.redhat.com/1450759 Signed-off-by: Niels de Vos <ndevos@redhat.com> --- v2 changes requested by Jeff Cody: - add CONFIG_GLUSTERFS_FALLOCATE - remove unneeded wrapper qemu_gluster_zerofill() block/gluster.c | 76 ++++++++++++++++++++++++++++++--------------------------- configure | 6 +++++ 2 files changed, 46 insertions(+), 36 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index 7c76cd0..0610183 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -964,29 +964,6 @@ static coroutine_fn int qemu_gluster_co_pwrite_zeroes(BlockDriverState *bs, qemu_coroutine_yield(); return acb.ret; } - -static inline bool gluster_supports_zerofill(void) -{ - return 1; -} - -static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset, - int64_t size) -{ - return glfs_zerofill(fd, offset, size); -} - -#else -static inline bool gluster_supports_zerofill(void) -{ - return 0; -} - -static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset, - int64_t size) -{ - return 0; -} #endif static int qemu_gluster_create(const char *filename, @@ -996,9 +973,10 @@ static int qemu_gluster_create(const char *filename, struct glfs *glfs; struct glfs_fd *fd; int ret = 0; - int prealloc = 0; + PreallocMode prealloc; int64_t total_size = 0; char *tmp = NULL; + Error *local_err = NULL; gconf = g_new0(BlockdevOptionsGluster, 1); gconf->debug = qemu_opt_get_number_del(opts, GLUSTER_OPT_DEBUG, @@ -1026,13 +1004,12 @@ static int qemu_gluster_create(const char *filename, BDRV_SECTOR_SIZE); tmp = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); - if (!tmp || !strcmp(tmp, "off")) { - prealloc = 0; - } else if (!strcmp(tmp, "full") && gluster_supports_zerofill()) { - prealloc = 1; - } else { - error_setg(errp, "Invalid preallocation mode: '%s'" - " or GlusterFS doesn't support zerofill API", tmp); + prealloc = qapi_enum_parse(PreallocMode_lookup, tmp, + PREALLOC_MODE__MAX, PREALLOC_MODE_OFF, + &local_err); + g_free(tmp); + if (local_err) { + error_propagate(errp, local_err); ret = -EINVAL; goto out; } @@ -1041,21 +1018,48 @@ static int qemu_gluster_create(const char *filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR); if (!fd) { ret = -errno; - } else { + goto out; + } + + switch (prealloc) { +#ifdef CONFIG_GLUSTERFS_FALLOCATE + case PREALLOC_MODE_FALLOC: + if (!glfs_fallocate(fd, 0, 0, total_size)) { + error_setg(errp, "Could not preallocate data for the new file"); + ret = -errno; + } + break; +#endif /* CONFIG_GLUSTERFS_FALLOCATE */ +#ifdef CONFIG_GLUSTERFS_ZEROFILL + case PREALLOC_MODE_FULL: if (!glfs_ftruncate(fd, total_size)) { - if (prealloc && qemu_gluster_zerofill(fd, 0, total_size)) { + if (glfs_zerofill(fd, 0, total_size)) { + error_setg(errp, "Could not zerofill the new file"); ret = -errno; } } else { + error_setg(errp, "Could not resize file"); ret = -errno; } - - if (glfs_close(fd) != 0) { + break; +#endif /* CONFIG_GLUSTERFS_ZEROFILL */ + case PREALLOC_MODE_OFF: + if (glfs_ftruncate(fd, total_size) != 0) { ret = -errno; + error_setg(errp, "Could not resize file"); } + break; + default: + ret = -EINVAL; + error_setg(errp, "Unsupported preallocation mode: %s", + PreallocMode_lookup[prealloc]); + break; + } + + if (glfs_close(fd) != 0) { + ret = -errno; } out: - g_free(tmp); qapi_free_BlockdevOptionsGluster(gconf); glfs_clear_preopened(glfs); return ret; diff --git a/configure b/configure index 7c020c0..8b8291e 100755 --- a/configure +++ b/configure @@ -300,6 +300,7 @@ seccomp="" glusterfs="" glusterfs_xlator_opt="no" glusterfs_discard="no" +glusterfs_fallocate="no" glusterfs_zerofill="no" gtk="" gtkabi="" @@ -3576,6 +3577,7 @@ if test "$glusterfs" != "no" ; then glusterfs_discard="yes" fi if $pkg_config --atleast-version=6 glusterfs-api; then + glusterfs_fallocate="yes" glusterfs_zerofill="yes" fi else @@ -5780,6 +5782,10 @@ if test "$glusterfs_discard" = "yes" ; then echo "CONFIG_GLUSTERFS_DISCARD=y" >> $config_host_mak fi +if test "$glusterfs_fallocate" = "yes" ; then + echo "CONFIG_GLUSTERFS_FALLOCATE=y" >> $config_host_mak +fi + if test "$glusterfs_zerofill" = "yes" ; then echo "CONFIG_GLUSTERFS_ZEROFILL=y" >> $config_host_mak fi -- 2.9.3 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH v2] gluster: add support for PREALLOC_MODE_FALLOC 2017-05-18 9:54 ` [Qemu-devel] [PATCH v2] " Niels de Vos @ 2017-05-18 14:30 ` Eric Blake 2017-05-18 15:21 ` Niels de Vos 2017-05-18 17:54 ` Jeff Cody 1 sibling, 1 reply; 8+ messages in thread From: Eric Blake @ 2017-05-18 14:30 UTC (permalink / raw) To: Niels de Vos, Jeff Cody, Kevin Wolf, qemu-block; +Cc: qemu-devel [-- Attachment #1: Type: text/plain, Size: 1138 bytes --] On 05/18/2017 04:54 AM, Niels de Vos wrote: > Add missing support for "preallocation=falloc" to the Gluster block > driver. This change bases its logic on that of block/file-posix.c and > removed the gluster_supports_zerofill() and qemu_gluster_zerofill() > functiond in favour of #ifdef checks in an easy to read s/functiond/functions/ > switch-statement. > > Both glfs_zerofill() and glfs_fallocate() have been introduced with > GlusterFS 3.5.0 (pkg-config glusterfs-api = 6). A #define for the > availability of glfs_fallocate() has been added to ./configure. > > Reported-by: Satheesaran Sundaramoorthi <sasundar@redhat.com> > URL: https://bugzilla.redhat.com/1450759 > Signed-off-by: Niels de Vos <ndevos@redhat.com> > --- > v2 changes requested by Jeff Cody: > - add CONFIG_GLUSTERFS_FALLOCATE > - remove unneeded wrapper qemu_gluster_zerofill() The automated tools prefer that v2 patches are sent as a new top-level thread, rather than buried in-reply-to the v1 thread. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 604 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH v2] gluster: add support for PREALLOC_MODE_FALLOC 2017-05-18 14:30 ` Eric Blake @ 2017-05-18 15:21 ` Niels de Vos 0 siblings, 0 replies; 8+ messages in thread From: Niels de Vos @ 2017-05-18 15:21 UTC (permalink / raw) To: Eric Blake; +Cc: Jeff Cody, Kevin Wolf, qemu-block, qemu-devel On Thu, May 18, 2017 at 09:30:53AM -0500, Eric Blake wrote: > On 05/18/2017 04:54 AM, Niels de Vos wrote: > > Add missing support for "preallocation=falloc" to the Gluster block > > driver. This change bases its logic on that of block/file-posix.c and > > removed the gluster_supports_zerofill() and qemu_gluster_zerofill() > > functiond in favour of #ifdef checks in an easy to read > > s/functiond/functions/ > > > switch-statement. > > > > Both glfs_zerofill() and glfs_fallocate() have been introduced with > > GlusterFS 3.5.0 (pkg-config glusterfs-api = 6). A #define for the > > availability of glfs_fallocate() has been added to ./configure. > > > > Reported-by: Satheesaran Sundaramoorthi <sasundar@redhat.com> > > URL: https://bugzilla.redhat.com/1450759 > > Signed-off-by: Niels de Vos <ndevos@redhat.com> > > --- > > v2 changes requested by Jeff Cody: > > - add CONFIG_GLUSTERFS_FALLOCATE > > - remove unneeded wrapper qemu_gluster_zerofill() > > The automated tools prefer that v2 patches are sent as a new top-level > thread, rather than buried in-reply-to the v1 thread. Ok, I'm happy to resend it with the typo corrected if that helps. Niels ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH v2] gluster: add support for PREALLOC_MODE_FALLOC 2017-05-18 9:54 ` [Qemu-devel] [PATCH v2] " Niels de Vos 2017-05-18 14:30 ` Eric Blake @ 2017-05-18 17:54 ` Jeff Cody 2017-05-18 19:21 ` Niels de Vos 1 sibling, 1 reply; 8+ messages in thread From: Jeff Cody @ 2017-05-18 17:54 UTC (permalink / raw) To: Niels de Vos; +Cc: Kevin Wolf, qemu-block, qemu-devel On Thu, May 18, 2017 at 11:54:22AM +0200, Niels de Vos wrote: > Add missing support for "preallocation=falloc" to the Gluster block > driver. This change bases its logic on that of block/file-posix.c and > removed the gluster_supports_zerofill() and qemu_gluster_zerofill() > functiond in favour of #ifdef checks in an easy to read > switch-statement. > > Both glfs_zerofill() and glfs_fallocate() have been introduced with > GlusterFS 3.5.0 (pkg-config glusterfs-api = 6). A #define for the > availability of glfs_fallocate() has been added to ./configure. > > Reported-by: Satheesaran Sundaramoorthi <sasundar@redhat.com> > URL: https://bugzilla.redhat.com/1450759 > Signed-off-by: Niels de Vos <ndevos@redhat.com> > --- > v2 changes requested by Jeff Cody: > - add CONFIG_GLUSTERFS_FALLOCATE > - remove unneeded wrapper qemu_gluster_zerofill() > > block/gluster.c | 76 ++++++++++++++++++++++++++++++--------------------------- > configure | 6 +++++ > 2 files changed, 46 insertions(+), 36 deletions(-) > > diff --git a/block/gluster.c b/block/gluster.c > index 7c76cd0..0610183 100644 > --- a/block/gluster.c > +++ b/block/gluster.c > @@ -964,29 +964,6 @@ static coroutine_fn int qemu_gluster_co_pwrite_zeroes(BlockDriverState *bs, > qemu_coroutine_yield(); > return acb.ret; > } > - > -static inline bool gluster_supports_zerofill(void) > -{ > - return 1; > -} > - > -static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset, > - int64_t size) > -{ > - return glfs_zerofill(fd, offset, size); > -} > - > -#else > -static inline bool gluster_supports_zerofill(void) > -{ > - return 0; > -} > - > -static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset, > - int64_t size) > -{ > - return 0; > -} > #endif > > static int qemu_gluster_create(const char *filename, > @@ -996,9 +973,10 @@ static int qemu_gluster_create(const char *filename, > struct glfs *glfs; > struct glfs_fd *fd; > int ret = 0; > - int prealloc = 0; > + PreallocMode prealloc; > int64_t total_size = 0; > char *tmp = NULL; > + Error *local_err = NULL; > > gconf = g_new0(BlockdevOptionsGluster, 1); > gconf->debug = qemu_opt_get_number_del(opts, GLUSTER_OPT_DEBUG, > @@ -1026,13 +1004,12 @@ static int qemu_gluster_create(const char *filename, > BDRV_SECTOR_SIZE); > > tmp = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); > - if (!tmp || !strcmp(tmp, "off")) { > - prealloc = 0; > - } else if (!strcmp(tmp, "full") && gluster_supports_zerofill()) { > - prealloc = 1; > - } else { > - error_setg(errp, "Invalid preallocation mode: '%s'" > - " or GlusterFS doesn't support zerofill API", tmp); > + prealloc = qapi_enum_parse(PreallocMode_lookup, tmp, > + PREALLOC_MODE__MAX, PREALLOC_MODE_OFF, > + &local_err); > + g_free(tmp); > + if (local_err) { > + error_propagate(errp, local_err); > ret = -EINVAL; > goto out; > } > @@ -1041,21 +1018,48 @@ static int qemu_gluster_create(const char *filename, > O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR); > if (!fd) { > ret = -errno; > - } else { > + goto out; > + } > + > + switch (prealloc) { > +#ifdef CONFIG_GLUSTERFS_FALLOCATE > + case PREALLOC_MODE_FALLOC: > + if (!glfs_fallocate(fd, 0, 0, total_size)) { Does glfs_fallocate() return 0 on failure? Both posix and linux versions of fallocate() return 0 on success. > + error_setg(errp, "Could not preallocate data for the new file"); > + ret = -errno; > + } > + break; > +#endif /* CONFIG_GLUSTERFS_FALLOCATE */ > +#ifdef CONFIG_GLUSTERFS_ZEROFILL > + case PREALLOC_MODE_FULL: > if (!glfs_ftruncate(fd, total_size)) { > - if (prealloc && qemu_gluster_zerofill(fd, 0, total_size)) { > + if (glfs_zerofill(fd, 0, total_size)) { > + error_setg(errp, "Could not zerofill the new file"); > ret = -errno; > } > } else { > + error_setg(errp, "Could not resize file"); > ret = -errno; > } > - > - if (glfs_close(fd) != 0) { > + break; > +#endif /* CONFIG_GLUSTERFS_ZEROFILL */ > + case PREALLOC_MODE_OFF: > + if (glfs_ftruncate(fd, total_size) != 0) { > ret = -errno; > + error_setg(errp, "Could not resize file"); > } > + break; > + default: > + ret = -EINVAL; > + error_setg(errp, "Unsupported preallocation mode: %s", > + PreallocMode_lookup[prealloc]); > + break; > + } > + > + if (glfs_close(fd) != 0) { > + ret = -errno; > } > out: > - g_free(tmp); > qapi_free_BlockdevOptionsGluster(gconf); > glfs_clear_preopened(glfs); > return ret; > diff --git a/configure b/configure > index 7c020c0..8b8291e 100755 > --- a/configure > +++ b/configure > @@ -300,6 +300,7 @@ seccomp="" > glusterfs="" > glusterfs_xlator_opt="no" > glusterfs_discard="no" > +glusterfs_fallocate="no" > glusterfs_zerofill="no" > gtk="" > gtkabi="" > @@ -3576,6 +3577,7 @@ if test "$glusterfs" != "no" ; then > glusterfs_discard="yes" > fi > if $pkg_config --atleast-version=6 glusterfs-api; then > + glusterfs_fallocate="yes" > glusterfs_zerofill="yes" > fi > else > @@ -5780,6 +5782,10 @@ if test "$glusterfs_discard" = "yes" ; then > echo "CONFIG_GLUSTERFS_DISCARD=y" >> $config_host_mak > fi > > +if test "$glusterfs_fallocate" = "yes" ; then > + echo "CONFIG_GLUSTERFS_FALLOCATE=y" >> $config_host_mak > +fi > + > if test "$glusterfs_zerofill" = "yes" ; then > echo "CONFIG_GLUSTERFS_ZEROFILL=y" >> $config_host_mak > fi > -- > 2.9.3 > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH v2] gluster: add support for PREALLOC_MODE_FALLOC 2017-05-18 17:54 ` Jeff Cody @ 2017-05-18 19:21 ` Niels de Vos 0 siblings, 0 replies; 8+ messages in thread From: Niels de Vos @ 2017-05-18 19:21 UTC (permalink / raw) To: Jeff Cody; +Cc: Kevin Wolf, qemu-block, qemu-devel On Thu, May 18, 2017 at 01:54:36PM -0400, Jeff Cody wrote: > On Thu, May 18, 2017 at 11:54:22AM +0200, Niels de Vos wrote: > > Add missing support for "preallocation=falloc" to the Gluster block > > driver. This change bases its logic on that of block/file-posix.c and > > removed the gluster_supports_zerofill() and qemu_gluster_zerofill() > > functiond in favour of #ifdef checks in an easy to read > > switch-statement. > > > > Both glfs_zerofill() and glfs_fallocate() have been introduced with > > GlusterFS 3.5.0 (pkg-config glusterfs-api = 6). A #define for the > > availability of glfs_fallocate() has been added to ./configure. > > > > Reported-by: Satheesaran Sundaramoorthi <sasundar@redhat.com> > > URL: https://bugzilla.redhat.com/1450759 > > Signed-off-by: Niels de Vos <ndevos@redhat.com> > > --- > > v2 changes requested by Jeff Cody: > > - add CONFIG_GLUSTERFS_FALLOCATE > > - remove unneeded wrapper qemu_gluster_zerofill() > > > > block/gluster.c | 76 ++++++++++++++++++++++++++++++--------------------------- > > configure | 6 +++++ > > 2 files changed, 46 insertions(+), 36 deletions(-) > > > > diff --git a/block/gluster.c b/block/gluster.c > > index 7c76cd0..0610183 100644 > > --- a/block/gluster.c > > +++ b/block/gluster.c > > @@ -964,29 +964,6 @@ static coroutine_fn int qemu_gluster_co_pwrite_zeroes(BlockDriverState *bs, > > qemu_coroutine_yield(); > > return acb.ret; > > } > > - > > -static inline bool gluster_supports_zerofill(void) > > -{ > > - return 1; > > -} > > - > > -static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset, > > - int64_t size) > > -{ > > - return glfs_zerofill(fd, offset, size); > > -} > > - > > -#else > > -static inline bool gluster_supports_zerofill(void) > > -{ > > - return 0; > > -} > > - > > -static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset, > > - int64_t size) > > -{ > > - return 0; > > -} > > #endif > > > > static int qemu_gluster_create(const char *filename, > > @@ -996,9 +973,10 @@ static int qemu_gluster_create(const char *filename, > > struct glfs *glfs; > > struct glfs_fd *fd; > > int ret = 0; > > - int prealloc = 0; > > + PreallocMode prealloc; > > int64_t total_size = 0; > > char *tmp = NULL; > > + Error *local_err = NULL; > > > > gconf = g_new0(BlockdevOptionsGluster, 1); > > gconf->debug = qemu_opt_get_number_del(opts, GLUSTER_OPT_DEBUG, > > @@ -1026,13 +1004,12 @@ static int qemu_gluster_create(const char *filename, > > BDRV_SECTOR_SIZE); > > > > tmp = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); > > - if (!tmp || !strcmp(tmp, "off")) { > > - prealloc = 0; > > - } else if (!strcmp(tmp, "full") && gluster_supports_zerofill()) { > > - prealloc = 1; > > - } else { > > - error_setg(errp, "Invalid preallocation mode: '%s'" > > - " or GlusterFS doesn't support zerofill API", tmp); > > + prealloc = qapi_enum_parse(PreallocMode_lookup, tmp, > > + PREALLOC_MODE__MAX, PREALLOC_MODE_OFF, > > + &local_err); > > + g_free(tmp); > > + if (local_err) { > > + error_propagate(errp, local_err); > > ret = -EINVAL; > > goto out; > > } > > @@ -1041,21 +1018,48 @@ static int qemu_gluster_create(const char *filename, > > O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR); > > if (!fd) { > > ret = -errno; > > - } else { > > + goto out; > > + } > > + > > + switch (prealloc) { > > +#ifdef CONFIG_GLUSTERFS_FALLOCATE > > + case PREALLOC_MODE_FALLOC: > > + if (!glfs_fallocate(fd, 0, 0, total_size)) { > > Does glfs_fallocate() return 0 on failure? Both posix and linux versions of > fallocate() return 0 on success. No, it should return 0 on success. This is a copy/paste error from the glfs_ftruncate() below, and that if/else structure is a little different. I did not notice the error message during my testing though... Will check it again tomorrow. Thanks, Niels > > > + error_setg(errp, "Could not preallocate data for the new file"); > > + ret = -errno; > > + } > > + break; > > +#endif /* CONFIG_GLUSTERFS_FALLOCATE */ > > +#ifdef CONFIG_GLUSTERFS_ZEROFILL > > + case PREALLOC_MODE_FULL: > > if (!glfs_ftruncate(fd, total_size)) { > > - if (prealloc && qemu_gluster_zerofill(fd, 0, total_size)) { > > + if (glfs_zerofill(fd, 0, total_size)) { > > + error_setg(errp, "Could not zerofill the new file"); > > ret = -errno; > > } > > } else { > > + error_setg(errp, "Could not resize file"); > > ret = -errno; > > } > > - > > - if (glfs_close(fd) != 0) { > > + break; > > +#endif /* CONFIG_GLUSTERFS_ZEROFILL */ > > + case PREALLOC_MODE_OFF: > > + if (glfs_ftruncate(fd, total_size) != 0) { > > ret = -errno; > > + error_setg(errp, "Could not resize file"); > > } > > + break; > > + default: > > + ret = -EINVAL; > > + error_setg(errp, "Unsupported preallocation mode: %s", > > + PreallocMode_lookup[prealloc]); > > + break; > > + } > > + > > + if (glfs_close(fd) != 0) { > > + ret = -errno; > > } > > out: > > - g_free(tmp); > > qapi_free_BlockdevOptionsGluster(gconf); > > glfs_clear_preopened(glfs); > > return ret; > > diff --git a/configure b/configure > > index 7c020c0..8b8291e 100755 > > --- a/configure > > +++ b/configure > > @@ -300,6 +300,7 @@ seccomp="" > > glusterfs="" > > glusterfs_xlator_opt="no" > > glusterfs_discard="no" > > +glusterfs_fallocate="no" > > glusterfs_zerofill="no" > > gtk="" > > gtkabi="" > > @@ -3576,6 +3577,7 @@ if test "$glusterfs" != "no" ; then > > glusterfs_discard="yes" > > fi > > if $pkg_config --atleast-version=6 glusterfs-api; then > > + glusterfs_fallocate="yes" > > glusterfs_zerofill="yes" > > fi > > else > > @@ -5780,6 +5782,10 @@ if test "$glusterfs_discard" = "yes" ; then > > echo "CONFIG_GLUSTERFS_DISCARD=y" >> $config_host_mak > > fi > > > > +if test "$glusterfs_fallocate" = "yes" ; then > > + echo "CONFIG_GLUSTERFS_FALLOCATE=y" >> $config_host_mak > > +fi > > + > > if test "$glusterfs_zerofill" = "yes" ; then > > echo "CONFIG_GLUSTERFS_ZEROFILL=y" >> $config_host_mak > > fi > > -- > > 2.9.3 > > ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-05-18 19:21 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-05-15 19:11 [Qemu-devel] [PATCH] gluster: add support for PREALLOC_MODE_FALLOC Niels de Vos 2017-05-16 15:42 ` Jeff Cody 2017-05-17 12:35 ` Niels de Vos 2017-05-18 9:54 ` [Qemu-devel] [PATCH v2] " Niels de Vos 2017-05-18 14:30 ` Eric Blake 2017-05-18 15:21 ` Niels de Vos 2017-05-18 17:54 ` Jeff Cody 2017-05-18 19:21 ` Niels de Vos
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).