| 1 | The following changes since commit 9c125d17e9402c232c46610802e5931b3639d77b: | 1 | The following changes since commit 8e9398e3b1a860b8c29c670c1b6c36afe8d87849: |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Merge tag 'pull-tcg-20220420' of https://gitlab.com/rth7680/qemu into staging (2022-04-20 16:43:11 -0700) | 3 | Merge tag 'pull-ppc-20220706' of https://gitlab.com/danielhb/qemu into staging (2022-07-07 06:21:05 +0530) |
| 4 | 4 | ||
| 5 | are available in the Git repository at: | 5 | are available in the Git repository at: |
| 6 | 6 | ||
| 7 | https://gitlab.com/stefanha/qemu.git tags/block-pull-request | 7 | https://gitlab.com/stefanha/qemu.git tags/block-pull-request |
| 8 | 8 | ||
| 9 | for you to fetch changes up to d45c83328feab2e4083991693160f0a417cfd9b0: | 9 | for you to fetch changes up to be6a166fde652589761cf70471bcde623e9bd72a: |
| 10 | 10 | ||
| 11 | virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option (2022-04-21 12:05:15 +0200) | 11 | block/io_uring: clarify that short reads can happen (2022-07-07 09:04:15 +0100) |
| 12 | 12 | ||
| 13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
| 14 | Pull request | 14 | Pull request |
| 15 | 15 | ||
| 16 | Small contrib/vhost-user-blk, contrib/vhost-user-scsi, and tools/virtiofsd | ||
| 17 | improvements. | ||
| 18 | |||
| 19 | ---------------------------------------------------------------- | 16 | ---------------------------------------------------------------- |
| 20 | 17 | ||
| 21 | Liu Yiding (1): | 18 | Dominique Martinet (1): |
| 22 | virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option | 19 | io_uring: fix short read slow path |
| 23 | |||
| 24 | Sakshi Kaushik (1): | ||
| 25 | Implements Backend Program conventions for vhost-user-scsi | ||
| 26 | 20 | ||
| 27 | Stefan Hajnoczi (1): | 21 | Stefan Hajnoczi (1): |
| 28 | contrib/vhost-user-blk: add missing GOptionEntry NULL terminator | 22 | block/io_uring: clarify that short reads can happen |
| 29 | 23 | ||
| 30 | docs/tools/virtiofsd.rst | 5 ++ | 24 | block/io_uring.c | 12 ++++-------- |
| 31 | contrib/vhost-user-blk/vhost-user-blk.c | 3 +- | 25 | 1 file changed, 4 insertions(+), 8 deletions(-) |
| 32 | contrib/vhost-user-scsi/vhost-user-scsi.c | 77 +++++++++++++++-------- | ||
| 33 | tools/virtiofsd/helper.c | 3 + | ||
| 34 | 4 files changed, 62 insertions(+), 26 deletions(-) | ||
| 35 | 26 | ||
| 36 | -- | 27 | -- |
| 37 | 2.35.1 | 28 | 2.36.1 | diff view generated by jsdifflib |
Deleted patch | |||
|---|---|---|---|
| 1 | From: Sakshi Kaushik <sakshikaushik717@gmail.com> | ||
| 2 | 1 | ||
| 3 | Signed-off-by: Sakshi Kaushik <sakshikaushik717@gmail.com> | ||
| 4 | Message-id: 20220406162410.8536-1-sakshikaushik717@gmail.com | ||
| 5 | |||
| 6 | [Name the iSCSI URL long option --iscsi-uri instead of --iscsi_uri for | ||
| 7 | consistency, fix --fd which was rejected due to an outdated | ||
| 8 | --socket-path check, and add missing entries[] terminator. | ||
| 9 | --Stefan] | ||
| 10 | |||
| 11 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | ||
| 12 | --- | ||
| 13 | contrib/vhost-user-scsi/vhost-user-scsi.c | 77 +++++++++++++++-------- | ||
| 14 | 1 file changed, 52 insertions(+), 25 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c | ||
| 17 | index XXXXXXX..XXXXXXX 100644 | ||
| 18 | --- a/contrib/vhost-user-scsi/vhost-user-scsi.c | ||
| 19 | +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c | ||
| 20 | @@ -XXX,XX +XXX,XX @@ fail: | ||
| 21 | |||
| 22 | /** vhost-user-scsi **/ | ||
| 23 | |||
| 24 | +static int opt_fdnum = -1; | ||
| 25 | +static char *opt_socket_path; | ||
| 26 | +static gboolean opt_print_caps; | ||
| 27 | +static char *iscsi_uri; | ||
| 28 | + | ||
| 29 | +static GOptionEntry entries[] = { | ||
| 30 | + { "print-capabilities", 'c', 0, G_OPTION_ARG_NONE, &opt_print_caps, | ||
| 31 | + "Print capabilities", NULL }, | ||
| 32 | + { "fd", 'f', 0, G_OPTION_ARG_INT, &opt_fdnum, | ||
| 33 | + "Use inherited fd socket", "FDNUM" }, | ||
| 34 | + { "iscsi-uri", 'i', 0, G_OPTION_ARG_FILENAME, &iscsi_uri, | ||
| 35 | + "iSCSI URI to connect to", "FDNUM" }, | ||
| 36 | + { "socket-path", 's', 0, G_OPTION_ARG_FILENAME, &opt_socket_path, | ||
| 37 | + "Use UNIX socket path", "PATH" }, | ||
| 38 | + { NULL, } | ||
| 39 | +}; | ||
| 40 | + | ||
| 41 | int main(int argc, char **argv) | ||
| 42 | { | ||
| 43 | VusDev *vdev_scsi = NULL; | ||
| 44 | - char *unix_fn = NULL; | ||
| 45 | - char *iscsi_uri = NULL; | ||
| 46 | - int lsock = -1, csock = -1, opt, err = EXIT_SUCCESS; | ||
| 47 | + int lsock = -1, csock = -1, err = EXIT_SUCCESS; | ||
| 48 | |||
| 49 | - while ((opt = getopt(argc, argv, "u:i:")) != -1) { | ||
| 50 | - switch (opt) { | ||
| 51 | - case 'h': | ||
| 52 | - goto help; | ||
| 53 | - case 'u': | ||
| 54 | - unix_fn = g_strdup(optarg); | ||
| 55 | - break; | ||
| 56 | - case 'i': | ||
| 57 | - iscsi_uri = g_strdup(optarg); | ||
| 58 | - break; | ||
| 59 | - default: | ||
| 60 | - goto help; | ||
| 61 | - } | ||
| 62 | + GError *error = NULL; | ||
| 63 | + GOptionContext *context; | ||
| 64 | + | ||
| 65 | + context = g_option_context_new(NULL); | ||
| 66 | + g_option_context_add_main_entries(context, entries, NULL); | ||
| 67 | + if (!g_option_context_parse(context, &argc, &argv, &error)) { | ||
| 68 | + g_printerr("Option parsing failed: %s\n", error->message); | ||
| 69 | + exit(EXIT_FAILURE); | ||
| 70 | + } | ||
| 71 | + | ||
| 72 | + if (opt_print_caps) { | ||
| 73 | + g_print("{\n"); | ||
| 74 | + g_print(" \"type\": \"scsi\"\n"); | ||
| 75 | + g_print("}\n"); | ||
| 76 | + goto out; | ||
| 77 | } | ||
| 78 | - if (!unix_fn || !iscsi_uri) { | ||
| 79 | + | ||
| 80 | + if (!iscsi_uri) { | ||
| 81 | goto help; | ||
| 82 | } | ||
| 83 | |||
| 84 | - lsock = unix_sock_new(unix_fn); | ||
| 85 | - if (lsock < 0) { | ||
| 86 | - goto err; | ||
| 87 | + if (opt_socket_path) { | ||
| 88 | + lsock = unix_sock_new(opt_socket_path); | ||
| 89 | + if (lsock < 0) { | ||
| 90 | + exit(EXIT_FAILURE); | ||
| 91 | + } | ||
| 92 | + } else if (opt_fdnum < 0) { | ||
| 93 | + g_print("%s\n", g_option_context_get_help(context, true, NULL)); | ||
| 94 | + exit(EXIT_FAILURE); | ||
| 95 | + } else { | ||
| 96 | + lsock = opt_fdnum; | ||
| 97 | } | ||
| 98 | |||
| 99 | csock = accept(lsock, NULL, NULL); | ||
| 100 | @@ -XXX,XX +XXX,XX @@ out: | ||
| 101 | if (vdev_scsi) { | ||
| 102 | g_main_loop_unref(vdev_scsi->loop); | ||
| 103 | g_free(vdev_scsi); | ||
| 104 | - unlink(unix_fn); | ||
| 105 | + unlink(opt_socket_path); | ||
| 106 | } | ||
| 107 | if (csock >= 0) { | ||
| 108 | close(csock); | ||
| 109 | @@ -XXX,XX +XXX,XX @@ out: | ||
| 110 | if (lsock >= 0) { | ||
| 111 | close(lsock); | ||
| 112 | } | ||
| 113 | - g_free(unix_fn); | ||
| 114 | + g_free(opt_socket_path); | ||
| 115 | g_free(iscsi_uri); | ||
| 116 | |||
| 117 | return err; | ||
| 118 | @@ -XXX,XX +XXX,XX @@ err: | ||
| 119 | goto out; | ||
| 120 | |||
| 121 | help: | ||
| 122 | - fprintf(stderr, "Usage: %s [ -u unix_sock_path -i iscsi_uri ] | [ -h ]\n", | ||
| 123 | + fprintf(stderr, "Usage: %s [ -s socket-path -i iscsi-uri -f fd -p print-capabilities ] | [ -h ]\n", | ||
| 124 | argv[0]); | ||
| 125 | - fprintf(stderr, " -u path to unix socket\n"); | ||
| 126 | - fprintf(stderr, " -i iscsi uri for lun 0\n"); | ||
| 127 | + fprintf(stderr, " -s, --socket-path=SOCKET_PATH path to unix socket\n"); | ||
| 128 | + fprintf(stderr, " -i, --iscsi-uri=ISCSI_URI iscsi uri for lun 0\n"); | ||
| 129 | + fprintf(stderr, " -f, --fd=FILE_DESCRIPTOR file-descriptor\n"); | ||
| 130 | + fprintf(stderr, " -p, --print-capabilities=PRINT_CAPABILITIES denotes print-capabilities\n"); | ||
| 131 | fprintf(stderr, " -h print help and quit\n"); | ||
| 132 | |||
| 133 | goto err; | ||
| 134 | -- | ||
| 135 | 2.35.1 | diff view generated by jsdifflib |
| 1 | From: Liu Yiding <liuyd.fnst@fujitsu.com> | 1 | From: Dominique Martinet <dominique.martinet@atmark-techno.com> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | virtiofsd has introduced killpriv_v2/no_killpriv_v2 for a while. Add | 3 | sqeq.off here is the offset to read within the disk image, so obviously |
| 4 | description of it to docs/helper. | 4 | not 'nread' (the amount we just read), but as the author meant to write |
| 5 | its current value incremented by the amount we just read. | ||
| 5 | 6 | ||
| 6 | Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> | 7 | Normally recent versions of linux will not issue short reads, |
| 7 | Message-Id: <20220421095151.2231099-1-liuyd.fnst@fujitsu.com> | 8 | but it can happen so we should fix this. |
| 8 | 9 | ||
| 9 | [Small documentation fixes: s/as client supports/as the client supports/ | 10 | This lead to weird image corruptions when short read happened |
| 10 | and s/. /. /. | ||
| 11 | --Stefan] | ||
| 12 | 11 | ||
| 12 | Fixes: 6663a0a33764 ("block/io_uring: implements interfaces for io_uring") | ||
| 13 | Link: https://lkml.kernel.org/r/YrrFGO4A1jS0GI0G@atmark-techno.com | ||
| 14 | Signed-off-by: Dominique Martinet <dominique.martinet@atmark-techno.com> | ||
| 15 | Message-Id: <20220630010137.2518851-1-dominique.martinet@atmark-techno.com> | ||
| 16 | Reviewed-by: Hanna Reitz <hreitz@redhat.com> | ||
| 17 | Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> | ||
| 13 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | 18 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> |
| 14 | --- | 19 | --- |
| 15 | docs/tools/virtiofsd.rst | 5 +++++ | 20 | block/io_uring.c | 4 ++-- |
| 16 | tools/virtiofsd/helper.c | 3 +++ | 21 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 17 | 2 files changed, 8 insertions(+) | ||
| 18 | 22 | ||
| 19 | diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst | 23 | diff --git a/block/io_uring.c b/block/io_uring.c |
| 20 | index XXXXXXX..XXXXXXX 100644 | 24 | index XXXXXXX..XXXXXXX 100644 |
| 21 | --- a/docs/tools/virtiofsd.rst | 25 | --- a/block/io_uring.c |
| 22 | +++ b/docs/tools/virtiofsd.rst | 26 | +++ b/block/io_uring.c |
| 23 | @@ -XXX,XX +XXX,XX @@ Options | 27 | @@ -XXX,XX +XXX,XX @@ static void luring_resubmit_short_read(LuringState *s, LuringAIOCB *luringcb, |
| 24 | label. Server will try to set that label on newly created file | 28 | trace_luring_resubmit_short_read(s, luringcb, nread); |
| 25 | atomically wherever possible. | 29 | |
| 26 | 30 | /* Update read position */ | |
| 27 | + * killpriv_v2|no_killpriv_v2 - | 31 | - luringcb->total_read = nread; |
| 28 | + Enable/disable ``FUSE_HANDLE_KILLPRIV_V2`` support. KILLPRIV_V2 is enabled | 32 | + luringcb->total_read += nread; |
| 29 | + by default as long as the client supports it. Enabling this option helps | 33 | remaining = luringcb->qiov->size - luringcb->total_read; |
| 30 | + with performance in write path. | 34 | |
| 31 | + | 35 | /* Shorten qiov */ |
| 32 | .. option:: --socket-path=PATH | 36 | @@ -XXX,XX +XXX,XX @@ static void luring_resubmit_short_read(LuringState *s, LuringAIOCB *luringcb, |
| 33 | 37 | remaining); | |
| 34 | Listen on vhost-user UNIX domain socket at PATH. | 38 | |
| 35 | diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c | 39 | /* Update sqe */ |
| 36 | index XXXXXXX..XXXXXXX 100644 | 40 | - luringcb->sqeq.off = nread; |
| 37 | --- a/tools/virtiofsd/helper.c | 41 | + luringcb->sqeq.off += nread; |
| 38 | +++ b/tools/virtiofsd/helper.c | 42 | luringcb->sqeq.addr = (__u64)(uintptr_t)luringcb->resubmit_qiov.iov; |
| 39 | @@ -XXX,XX +XXX,XX @@ void fuse_cmdline_help(void) | 43 | luringcb->sqeq.len = luringcb->resubmit_qiov.niov; |
| 40 | " -o announce_submounts Announce sub-mount points to the guest\n" | ||
| 41 | " -o posix_acl/no_posix_acl Enable/Disable posix_acl. (default: disabled)\n" | ||
| 42 | " -o security_label/no_security_label Enable/Disable security label. (default: disabled)\n" | ||
| 43 | + " -o killpriv_v2/no_killpriv_v2\n" | ||
| 44 | + " Enable/Disable FUSE_HANDLE_KILLPRIV_V2.\n" | ||
| 45 | + " (default: enabled as long as client supports it)\n" | ||
| 46 | ); | ||
| 47 | } | ||
| 48 | 44 | ||
| 49 | -- | 45 | -- |
| 50 | 2.35.1 | 46 | 2.36.1 | diff view generated by jsdifflib |
| 1 | The GLib documentation says "a NULL-terminated array of GOptionEntrys" | 1 | Jens Axboe has confirmed that short reads are rare but can happen: |
|---|---|---|---|
| 2 | so we'd better make sure there is a terminator that lets | 2 | https://lore.kernel.org/io-uring/YsU%2FCGkl9ZXUI+Tj@stefanha-x1.localdomain/T/#m729963dc577d709b709c191922e98ec79d7eef54 |
| 3 | g_option_context_add_main_entries() know when the end of the array has | ||
| 4 | been reached. | ||
| 5 | 3 | ||
| 4 | The luring_resubmit_short_read() comment claimed they were only due to a | ||
| 5 | specific io_uring bug that was fixed in Linux commit 9d93a3f5a0c | ||
| 6 | ("io_uring: punt short reads to async context"), which is wrong. | ||
| 7 | Dominique Martinet found that a btrfs bug also causes short reads. There | ||
| 8 | may be more kernel code paths that result in short reads. | ||
| 9 | |||
| 10 | Let's consider short reads fair game. | ||
| 11 | |||
| 12 | Cc: Dominique Martinet <dominique.martinet@atmark-techno.com> | ||
| 13 | Based-on: <20220630010137.2518851-1-dominique.martinet@atmark-techno.com> | ||
| 6 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | 14 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> |
| 7 | Reviewed-by: Michael S. Tsirkin <mst@redhat.com> | 15 | Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> |
| 8 | Message-id: 20220411150057.3009667-1-stefanha@redhat.com | 16 | Message-id: 20220706080341.1206476-1-stefanha@redhat.com |
| 9 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | 17 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> |
| 10 | --- | 18 | --- |
| 11 | contrib/vhost-user-blk/vhost-user-blk.c | 3 ++- | 19 | block/io_uring.c | 8 ++------ |
| 12 | 1 file changed, 2 insertions(+), 1 deletion(-) | 20 | 1 file changed, 2 insertions(+), 6 deletions(-) |
| 13 | 21 | ||
| 14 | diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c | 22 | diff --git a/block/io_uring.c b/block/io_uring.c |
| 15 | index XXXXXXX..XXXXXXX 100644 | 23 | index XXXXXXX..XXXXXXX 100644 |
| 16 | --- a/contrib/vhost-user-blk/vhost-user-blk.c | 24 | --- a/block/io_uring.c |
| 17 | +++ b/contrib/vhost-user-blk/vhost-user-blk.c | 25 | +++ b/block/io_uring.c |
| 18 | @@ -XXX,XX +XXX,XX @@ static GOptionEntry entries[] = { | 26 | @@ -XXX,XX +XXX,XX @@ static void luring_resubmit(LuringState *s, LuringAIOCB *luringcb) |
| 19 | {"blk-file", 'b', 0, G_OPTION_ARG_FILENAME, &opt_blk_file, | 27 | /** |
| 20 | "block device or file path", "PATH"}, | 28 | * luring_resubmit_short_read: |
| 21 | { "read-only", 'r', 0, G_OPTION_ARG_NONE, &opt_read_only, | 29 | * |
| 22 | - "Enable read-only", NULL } | 30 | - * Before Linux commit 9d93a3f5a0c ("io_uring: punt short reads to async |
| 23 | + "Enable read-only", NULL }, | 31 | - * context") a buffered I/O request with the start of the file range in the |
| 24 | + { NULL, }, | 32 | - * page cache could result in a short read. Applications need to resubmit the |
| 25 | }; | 33 | - * remaining read request. |
| 26 | 34 | - * | |
| 27 | int main(int argc, char **argv) | 35 | - * This is a slow path but recent kernels never take it. |
| 36 | + * Short reads are rare but may occur. The remaining read request needs to be | ||
| 37 | + * resubmitted. | ||
| 38 | */ | ||
| 39 | static void luring_resubmit_short_read(LuringState *s, LuringAIOCB *luringcb, | ||
| 40 | int nread) | ||
| 28 | -- | 41 | -- |
| 29 | 2.35.1 | 42 | 2.36.1 | diff view generated by jsdifflib |