Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/815412/?format=api
{ "id": 815412, "url": "http://patchwork.ozlabs.org/api/1.2/patches/815412/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919102434.21147-5-pbonzini@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/1.2/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170919102434.21147-5-pbonzini@redhat.com>", "list_archive_url": null, "date": "2017-09-19T10:24:34", "name": "[4/4] scsi: add persistent reservation manager using qemu-pr-helper", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "dccb5d7ad883998f1c3d5040f6e920c1f3ba6219", "submitter": { "id": 2701, "url": "http://patchwork.ozlabs.org/api/1.2/people/2701/?format=api", "name": "Paolo Bonzini", "email": "pbonzini@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919102434.21147-5-pbonzini@redhat.com/mbox/", "series": [ { "id": 3827, "url": "http://patchwork.ozlabs.org/api/1.2/series/3827/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3827", "date": "2017-09-19T10:24:30", "name": "scsi, block: introduce persistent reservation managers", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/3827/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/815412/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/815412/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=pbonzini@redhat.com" ], "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxJx53qhGz9s7h\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 19 Sep 2017 20:28:09 +1000 (AEST)", "from localhost ([::1]:41295 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1duFl9-0006ad-Kp\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 06:28:07 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:45358)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <pbonzini@redhat.com>) id 1duFi1-0004BN-6X\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 06:24:55 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <pbonzini@redhat.com>) id 1duFhz-0004f7-Nl\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 06:24:53 -0400", "from mx1.redhat.com ([209.132.183.28]:60956)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <pbonzini@redhat.com>)\n\tid 1duFhq-0004Y5-Ig; Tue, 19 Sep 2017 06:24:42 -0400", "from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id A498E5AFED;\n\tTue, 19 Sep 2017 10:24:41 +0000 (UTC)", "from donizetti.redhat.com (ovpn-117-61.ams2.redhat.com\n\t[10.36.117.61])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id D9F165D6A4;\n\tTue, 19 Sep 2017 10:24:40 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com A498E5AFED", "From": "Paolo Bonzini <pbonzini@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Tue, 19 Sep 2017 12:24:34 +0200", "Message-Id": "<20170919102434.21147-5-pbonzini@redhat.com>", "In-Reply-To": "<20170919102434.21147-1-pbonzini@redhat.com>", "References": "<20170919102434.21147-1-pbonzini@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.15", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tTue, 19 Sep 2017 10:24:41 +0000 (UTC)", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]", "X-Received-From": "209.132.183.28", "Subject": "[Qemu-devel] [PATCH 4/4] scsi: add persistent reservation manager\n\tusing qemu-pr-helper", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "qemu-block@nongnu.org", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "This adds a concrete subclass of pr-manager that talks to qemu-pr-helper.\n\nSigned-off-by: Paolo Bonzini <pbonzini@redhat.com>\n---\nv1->v2: fixed string property double-free\n fixed/cleaned up error handling\n handle buffer underrun\n\n scsi/Makefile.objs | 2 +-\n scsi/pr-manager-helper.c | 302 +++++++++++++++++++++++++++++++++++++++++++++++\n 2 files changed, 303 insertions(+), 1 deletion(-)\n create mode 100644 scsi/pr-manager-helper.c", "diff": "diff --git a/scsi/Makefile.objs b/scsi/Makefile.objs\nindex 5496d2ae6a..4d25e476cf 100644\n--- a/scsi/Makefile.objs\n+++ b/scsi/Makefile.objs\n@@ -1,3 +1,3 @@\n block-obj-y += utils.o\n \n-block-obj-$(CONFIG_LINUX) += pr-manager.o\n+block-obj-$(CONFIG_LINUX) += pr-manager.o pr-manager-helper.o\ndiff --git a/scsi/pr-manager-helper.c b/scsi/pr-manager-helper.c\nnew file mode 100644\nindex 0000000000..063fd35dee\n--- /dev/null\n+++ b/scsi/pr-manager-helper.c\n@@ -0,0 +1,302 @@\n+/*\n+ * Persistent reservation manager that talks to qemu-pr-helper\n+ *\n+ * Copyright (c) 2017 Red Hat, Inc.\n+ *\n+ * Author: Paolo Bonzini <pbonzini@redhat.com>\n+ *\n+ * This code is licensed under the LGPL v2.1 or later.\n+ *\n+ */\n+\n+#include \"qemu/osdep.h\"\n+#include \"qapi/error.h\"\n+#include \"scsi/constants.h\"\n+#include \"scsi/pr-manager.h\"\n+#include \"scsi/utils.h\"\n+#include \"io/channel.h\"\n+#include \"io/channel-socket.h\"\n+#include \"pr-helper.h\"\n+\n+#include <scsi/sg.h>\n+\n+#define PR_MAX_RECONNECT_ATTEMPTS 5\n+\n+#define TYPE_PR_MANAGER_HELPER \"pr-manager-helper\"\n+\n+#define PR_MANAGER_HELPER(obj) \\\n+ OBJECT_CHECK(PRManagerHelper, (obj), \\\n+ TYPE_PR_MANAGER_HELPER)\n+\n+typedef struct PRManagerHelper {\n+ /* <private> */\n+ PRManager parent;\n+\n+ char *path;\n+\n+ QemuMutex lock;\n+ QIOChannel *ioc;\n+} PRManagerHelper;\n+\n+/* Called with lock held. */\n+static int pr_manager_helper_read(PRManagerHelper *pr_mgr,\n+ void *buf, int sz, Error **errp)\n+{\n+ ssize_t r = qio_channel_read_all(pr_mgr->ioc, buf, sz, errp);\n+\n+ if (r < 0) {\n+ object_unref(OBJECT(pr_mgr->ioc));\n+ pr_mgr->ioc = NULL;\n+ return -EINVAL;\n+ }\n+\n+ return 0;\n+}\n+\n+/* Called with lock held. */\n+static int pr_manager_helper_write(PRManagerHelper *pr_mgr,\n+ int fd,\n+ const void *buf, int sz, Error **errp)\n+{\n+ size_t nfds = (fd != -1);\n+ while (sz > 0) {\n+ struct iovec iov;\n+ ssize_t n_written;\n+\n+ iov.iov_base = (void *)buf;\n+ iov.iov_len = sz;\n+ n_written = qio_channel_writev_full(QIO_CHANNEL(pr_mgr->ioc), &iov, 1,\n+ nfds ? &fd : NULL, nfds, errp);\n+\n+ if (n_written <= 0) {\n+ assert(n_written != QIO_CHANNEL_ERR_BLOCK);\n+ object_unref(OBJECT(pr_mgr->ioc));\n+ return n_written < 0 ? -EINVAL : 0;\n+ }\n+\n+ nfds = 0;\n+ buf += n_written;\n+ sz -= n_written;\n+ }\n+\n+ return 0;\n+}\n+\n+/* Called with lock held. */\n+static int pr_manager_helper_initialize(PRManagerHelper *pr_mgr,\n+ Error **errp)\n+{\n+ char *path = g_strdup(pr_mgr->path);\n+ SocketAddress saddr = {\n+ .type = SOCKET_ADDRESS_TYPE_UNIX,\n+ .u.q_unix.path = path\n+ };\n+ QIOChannelSocket *sioc = qio_channel_socket_new();\n+ Error *local_err = NULL;\n+\n+ uint32_t flags;\n+ int r;\n+\n+ assert(!pr_mgr->ioc);\n+ qio_channel_set_name(QIO_CHANNEL(sioc), \"pr-manager-helper\");\n+ qio_channel_socket_connect_sync(sioc,\n+ &saddr,\n+ &local_err);\n+ g_free(path);\n+ if (local_err) {\n+ object_unref(OBJECT(sioc));\n+ error_propagate(errp, local_err);\n+ return -ENOTCONN;\n+ }\n+\n+ qio_channel_set_delay(QIO_CHANNEL(sioc), false);\n+ pr_mgr->ioc = QIO_CHANNEL(sioc);\n+\n+ /* A simple feature negotation protocol, even though there is\n+ * no optional feature right now.\n+ */\n+ r = pr_manager_helper_read(pr_mgr, &flags, sizeof(flags), errp);\n+ if (r < 0) {\n+ goto out_close;\n+ }\n+\n+ flags = 0;\n+ r = pr_manager_helper_write(pr_mgr, -1, &flags, sizeof(flags), errp);\n+ if (r < 0) {\n+ goto out_close;\n+ }\n+\n+ return 0;\n+\n+out_close:\n+ object_unref(OBJECT(pr_mgr->ioc));\n+ pr_mgr->ioc = NULL;\n+ return r;\n+}\n+\n+static int pr_manager_helper_run(PRManager *p,\n+ int fd, struct sg_io_hdr *io_hdr)\n+{\n+ PRManagerHelper *pr_mgr = PR_MANAGER_HELPER(p);\n+\n+ uint32_t len;\n+ PRHelperResponse resp;\n+ int ret;\n+ int expected_dir;\n+ int attempts;\n+ uint8_t cdb[PR_HELPER_CDB_SIZE] = { 0 };\n+\n+ if (!io_hdr->cmd_len || io_hdr->cmd_len > PR_HELPER_CDB_SIZE) {\n+ return -EINVAL;\n+ }\n+\n+ memcpy(cdb, io_hdr->cmdp, io_hdr->cmd_len);\n+ assert(cdb[0] == PERSISTENT_RESERVE_OUT || cdb[0] == PERSISTENT_RESERVE_IN);\n+ expected_dir =\n+ (cdb[0] == PERSISTENT_RESERVE_OUT ? SG_DXFER_TO_DEV : SG_DXFER_FROM_DEV);\n+ if (io_hdr->dxfer_direction != expected_dir) {\n+ return -EINVAL;\n+ }\n+\n+ len = scsi_cdb_xfer(cdb);\n+ if (io_hdr->dxfer_len < len || len > PR_HELPER_DATA_SIZE) {\n+ return -EINVAL;\n+ }\n+\n+ qemu_mutex_lock(&pr_mgr->lock);\n+\n+ /* Try to reconnect while sending the CDB. */\n+ for (attempts = 0; attempts < PR_MAX_RECONNECT_ATTEMPTS; attempts++) {\n+ if (!pr_mgr->ioc) {\n+ ret = pr_manager_helper_initialize(pr_mgr, NULL);\n+ if (ret < 0) {\n+ qemu_mutex_unlock(&pr_mgr->lock);\n+ g_usleep(G_USEC_PER_SEC);\n+ qemu_mutex_lock(&pr_mgr->lock);\n+ continue;\n+ }\n+ }\n+\n+ ret = pr_manager_helper_write(pr_mgr, fd, cdb, ARRAY_SIZE(cdb), NULL);\n+ if (ret >= 0) {\n+ break;\n+ }\n+ }\n+ if (ret < 0) {\n+ goto out;\n+ }\n+\n+ /* After sending the CDB, any communications failure causes the\n+ * command to fail. The failure is transient, retrying the command\n+ * will invoke pr_manager_helper_initialize again.\n+ */\n+ if (expected_dir == SG_DXFER_TO_DEV) {\n+ io_hdr->resid = io_hdr->dxfer_len - len;\n+ ret = pr_manager_helper_write(pr_mgr, -1, io_hdr->dxferp, len, NULL);\n+ if (ret < 0) {\n+ goto out;\n+ }\n+ }\n+ ret = pr_manager_helper_read(pr_mgr, &resp, sizeof(resp), NULL);\n+ if (ret < 0) {\n+ goto out;\n+ }\n+\n+ resp.result = be32_to_cpu(resp.result);\n+ resp.sz = be32_to_cpu(resp.sz);\n+ if (io_hdr->dxfer_direction == SG_DXFER_FROM_DEV) {\n+ assert(resp.sz <= io_hdr->dxfer_len);\n+ ret = pr_manager_helper_read(pr_mgr, io_hdr->dxferp, resp.sz, NULL);\n+ if (ret < 0) {\n+ goto out;\n+ }\n+ io_hdr->resid = io_hdr->dxfer_len - resp.sz;\n+ } else {\n+ assert(resp.sz == 0);\n+ }\n+\n+ io_hdr->status = resp.result;\n+ if (resp.result == CHECK_CONDITION) {\n+ io_hdr->driver_status = SG_ERR_DRIVER_SENSE;\n+ io_hdr->sb_len_wr = MIN(io_hdr->mx_sb_len, PR_HELPER_SENSE_SIZE);\n+ memcpy(io_hdr->sbp, resp.sense, io_hdr->sb_len_wr);\n+ }\n+\n+out:\n+ if (ret < 0) {\n+ int sense_len = scsi_build_sense(io_hdr->sbp,\n+ SENSE_CODE(LUN_COMM_FAILURE));\n+ io_hdr->driver_status = SG_ERR_DRIVER_SENSE;\n+ io_hdr->sb_len_wr = MIN(io_hdr->mx_sb_len, sense_len);\n+ io_hdr->status = CHECK_CONDITION;\n+ }\n+ qemu_mutex_unlock(&pr_mgr->lock);\n+ return ret;\n+}\n+\n+static void pr_manager_helper_complete(UserCreatable *uc, Error **errp)\n+{\n+ PRManagerHelper *pr_mgr = PR_MANAGER_HELPER(uc);\n+\n+ qemu_mutex_lock(&pr_mgr->lock);\n+ pr_manager_helper_initialize(pr_mgr, errp);\n+ qemu_mutex_unlock(&pr_mgr->lock);\n+}\n+\n+static char *get_path(Object *obj, Error **errp)\n+{\n+ PRManagerHelper *pr_mgr = PR_MANAGER_HELPER(obj);\n+\n+ return g_strdup(pr_mgr->path);\n+}\n+\n+static void set_path(Object *obj, const char *str, Error **errp)\n+{\n+ PRManagerHelper *pr_mgr = PR_MANAGER_HELPER(obj);\n+\n+ g_free(pr_mgr->path);\n+ pr_mgr->path = g_strdup(str);\n+}\n+\n+static void pr_manager_helper_instance_finalize(Object *obj)\n+{\n+ PRManagerHelper *pr_mgr = PR_MANAGER_HELPER(obj);\n+\n+ object_unref(OBJECT(pr_mgr->ioc));\n+ qemu_mutex_destroy(&pr_mgr->lock);\n+}\n+\n+static void pr_manager_helper_instance_init(Object *obj)\n+{\n+ PRManagerHelper *pr_mgr = PR_MANAGER_HELPER(obj);\n+\n+ qemu_mutex_init(&pr_mgr->lock);\n+}\n+\n+static void pr_manager_helper_class_init(ObjectClass *klass,\n+ void *class_data G_GNUC_UNUSED)\n+{\n+ PRManagerClass *prmgr_klass = PR_MANAGER_CLASS(klass);\n+ UserCreatableClass *uc_klass = USER_CREATABLE_CLASS(klass);\n+\n+ object_class_property_add_str(klass, \"path\", get_path, set_path,\n+ &error_abort);\n+ uc_klass->complete = pr_manager_helper_complete;\n+ prmgr_klass->run = pr_manager_helper_run;\n+}\n+\n+static const TypeInfo pr_manager_helper_info = {\n+ .parent = TYPE_PR_MANAGER,\n+ .name = TYPE_PR_MANAGER_HELPER,\n+ .instance_size = sizeof(PRManagerHelper),\n+ .instance_init = pr_manager_helper_instance_init,\n+ .instance_finalize = pr_manager_helper_instance_finalize,\n+ .class_init = pr_manager_helper_class_init,\n+};\n+\n+static void pr_manager_helper_register_types(void)\n+{\n+ type_register_static(&pr_manager_helper_info);\n+}\n+\n+type_init(pr_manager_helper_register_types);\n", "prefixes": [ "4/4" ] }