Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/122852/?format=api
{ "id": 122852, "url": "http://patchwork.dpdk.org/api/patches/122852/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230201111411.1509520-3-david.marchand@redhat.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230201111411.1509520-3-david.marchand@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230201111411.1509520-3-david.marchand@redhat.com", "date": "2023-02-01T11:14:04", "name": "[v5,2/9] vhost: simplify need reply handling", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "0f2ea88656b7afdc5ba15733c70844afe6732d3b", "submitter": { "id": 1173, "url": "http://patchwork.dpdk.org/api/people/1173/?format=api", "name": "David Marchand", "email": "david.marchand@redhat.com" }, "delegate": { "id": 1, "url": "http://patchwork.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230201111411.1509520-3-david.marchand@redhat.com/mbox/", "series": [ { "id": 26733, "url": "http://patchwork.dpdk.org/api/series/26733/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=26733", "date": "2023-02-01T11:14:02", "name": "Lock annotations", "version": 5, "mbox": "http://patchwork.dpdk.org/series/26733/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/122852/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/122852/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 8B02741B9E;\n\tWed, 1 Feb 2023 12:16:02 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 7D5C742D2F;\n\tWed, 1 Feb 2023 12:15:59 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.133.124])\n by mails.dpdk.org (Postfix) with ESMTP id 8A1754021F\n for <dev@dpdk.org>; Wed, 1 Feb 2023 12:15:58 +0100 (CET)", "from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-424-cHfkQShcMxel06olZaT3Uw-1; Wed, 01 Feb 2023 06:15:55 -0500", "from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com\n [10.11.54.1])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7F6FE185A794;\n Wed, 1 Feb 2023 11:15:54 +0000 (UTC)", "from dmarchan.redhat.com (ovpn-192-67.brq.redhat.com [10.40.192.67])\n by smtp.corp.redhat.com (Postfix) with ESMTP id EE79040C2064;\n Wed, 1 Feb 2023 11:15:52 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1675250158;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=7rNO8ph1JTx0wd0ozpKa/1xAtMzUnjXUCwWYGR5eows=;\n b=VzEOBCCLe6v8iKSkToDOGjiSgQV6mm80tTqmfbkeq/xyoz9e+o1fCEnNoBE0VfngBLYPqt\n l3xfHeSwbbZ3gAkThT69c9R0FnwPdpVWaigIkFF2EAr7naIZQOqIe2zYQlTS5yrxTcLH/N\n jSd6oAaUuL+s0y2BMe07jKrqPOY8zos=", "X-MC-Unique": "cHfkQShcMxel06olZaT3Uw-1", "From": "David Marchand <david.marchand@redhat.com>", "To": "dev@dpdk.org", "Cc": "maxime.coquelin@redhat.com, stephen@networkplumber.org,\n chenbo.xia@intel.com, jiayu.hu@intel.com, yuanx.wang@intel.com,\n xuan.ding@intel.com, mb@smartsharesystems.com", "Subject": "[PATCH v5 2/9] vhost: simplify need reply handling", "Date": "Wed, 1 Feb 2023 12:14:04 +0100", "Message-Id": "<20230201111411.1509520-3-david.marchand@redhat.com>", "In-Reply-To": "<20230201111411.1509520-1-david.marchand@redhat.com>", "References": "<20220328121758.26632-1-david.marchand@redhat.com>\n <20230201111411.1509520-1-david.marchand@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.1 on 10.11.54.1", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Dedicate send_vhost_slave_message() helper to the case when no reply is\nneeded.\n\nAdd a send_vhost_slave_message_process_reply() helper for the opposite.\nThis new helper merges both send_vhost_slave_message() and the code\npreviously in process_slave_message_reply().\nThe slave_req_lock lock is then only handled in this helper which will\nmake lock checks trivial.\n\nSigned-off-by: David Marchand <david.marchand@redhat.com>\nAcked-by: Morten Brørup <mb@smartsharesystems.com>\nReviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n lib/vhost/vhost_user.c | 119 ++++++++++++++++++-----------------------\n 1 file changed, 51 insertions(+), 68 deletions(-)", "diff": "diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c\nindex 9902ae9944..3f6c5df900 100644\n--- a/lib/vhost/vhost_user.c\n+++ b/lib/vhost/vhost_user.c\n@@ -2868,18 +2868,46 @@ send_vhost_reply(struct virtio_net *dev, int sockfd, struct vhu_msg_context *ctx\n }\n \n static int\n-send_vhost_slave_message(struct virtio_net *dev,\n-\t\tstruct vhu_msg_context *ctx)\n+send_vhost_slave_message(struct virtio_net *dev, struct vhu_msg_context *ctx)\n+{\n+\treturn send_vhost_message(dev, dev->slave_req_fd, ctx);\n+}\n+\n+static int\n+send_vhost_slave_message_process_reply(struct virtio_net *dev, struct vhu_msg_context *ctx)\n {\n+\tstruct vhu_msg_context msg_reply;\n \tint ret;\n \n-\tif (ctx->msg.flags & VHOST_USER_NEED_REPLY)\n-\t\trte_spinlock_lock(&dev->slave_req_lock);\n+\trte_spinlock_lock(&dev->slave_req_lock);\n+\tret = send_vhost_slave_message(dev, ctx);\n+\tif (ret < 0) {\n+\t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"failed to send config change (%d)\\n\", ret);\n+\t\tgoto out;\n+\t}\n \n-\tret = send_vhost_message(dev, dev->slave_req_fd, ctx);\n-\tif (ret < 0 && (ctx->msg.flags & VHOST_USER_NEED_REPLY))\n-\t\trte_spinlock_unlock(&dev->slave_req_lock);\n+\tret = read_vhost_message(dev, dev->slave_req_fd, &msg_reply);\n+\tif (ret <= 0) {\n+\t\tif (ret < 0)\n+\t\t\tVHOST_LOG_CONFIG(dev->ifname, ERR,\n+\t\t\t\t\"vhost read slave message reply failed\\n\");\n+\t\telse\n+\t\t\tVHOST_LOG_CONFIG(dev->ifname, INFO, \"vhost peer closed\\n\");\n+\t\tret = -1;\n+\t\tgoto out;\n+\t}\n+\n+\tif (msg_reply.msg.request.slave != ctx->msg.request.slave) {\n+\t\tVHOST_LOG_CONFIG(dev->ifname, ERR,\n+\t\t\t\"received unexpected msg type (%u), expected %u\\n\",\n+\t\t\tmsg_reply.msg.request.slave, ctx->msg.request.slave);\n+\t\tret = -1;\n+\t\tgoto out;\n+\t}\n \n+\tret = msg_reply.msg.payload.u64 ? -1 : 0;\n+out:\n+\trte_spinlock_unlock(&dev->slave_req_lock);\n \treturn ret;\n }\n \n@@ -3203,42 +3231,6 @@ vhost_user_msg_handler(int vid, int fd)\n \treturn ret;\n }\n \n-static int process_slave_message_reply(struct virtio_net *dev,\n-\t\t\t\t const struct vhu_msg_context *ctx)\n-{\n-\tstruct vhu_msg_context msg_reply;\n-\tint ret;\n-\n-\tif ((ctx->msg.flags & VHOST_USER_NEED_REPLY) == 0)\n-\t\treturn 0;\n-\n-\tret = read_vhost_message(dev, dev->slave_req_fd, &msg_reply);\n-\tif (ret <= 0) {\n-\t\tif (ret < 0)\n-\t\t\tVHOST_LOG_CONFIG(dev->ifname, ERR,\n-\t\t\t\t\"vhost read slave message reply failed\\n\");\n-\t\telse\n-\t\t\tVHOST_LOG_CONFIG(dev->ifname, INFO, \"vhost peer closed\\n\");\n-\t\tret = -1;\n-\t\tgoto out;\n-\t}\n-\n-\tret = 0;\n-\tif (msg_reply.msg.request.slave != ctx->msg.request.slave) {\n-\t\tVHOST_LOG_CONFIG(dev->ifname, ERR,\n-\t\t\t\"received unexpected msg type (%u), expected %u\\n\",\n-\t\t\tmsg_reply.msg.request.slave, ctx->msg.request.slave);\n-\t\tret = -1;\n-\t\tgoto out;\n-\t}\n-\n-\tret = msg_reply.msg.payload.u64 ? -1 : 0;\n-\n-out:\n-\trte_spinlock_unlock(&dev->slave_req_lock);\n-\treturn ret;\n-}\n-\n int\n vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm)\n {\n@@ -3267,10 +3259,9 @@ vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm)\n \treturn 0;\n }\n \n-static int\n-vhost_user_slave_config_change(struct virtio_net *dev, bool need_reply)\n+int\n+rte_vhost_slave_config_change(int vid, bool need_reply)\n {\n-\tint ret;\n \tstruct vhu_msg_context ctx = {\n \t\t.msg = {\n \t\t\t.request.slave = VHOST_USER_SLAVE_CONFIG_CHANGE_MSG,\n@@ -3278,29 +3269,23 @@ vhost_user_slave_config_change(struct virtio_net *dev, bool need_reply)\n \t\t\t.size = 0,\n \t\t}\n \t};\n-\n-\tif (need_reply)\n-\t\tctx.msg.flags |= VHOST_USER_NEED_REPLY;\n-\n-\tret = send_vhost_slave_message(dev, &ctx);\n-\tif (ret < 0) {\n-\t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"failed to send config change (%d)\\n\", ret);\n-\t\treturn ret;\n-\t}\n-\n-\treturn process_slave_message_reply(dev, &ctx);\n-}\n-\n-int\n-rte_vhost_slave_config_change(int vid, bool need_reply)\n-{\n \tstruct virtio_net *dev;\n+\tint ret;\n \n \tdev = get_device(vid);\n \tif (!dev)\n \t\treturn -ENODEV;\n \n-\treturn vhost_user_slave_config_change(dev, need_reply);\n+\tif (!need_reply) {\n+\t\tret = send_vhost_slave_message(dev, &ctx);\n+\t} else {\n+\t\tctx.msg.flags |= VHOST_USER_NEED_REPLY;\n+\t\tret = send_vhost_slave_message_process_reply(dev, &ctx);\n+\t}\n+\n+\tif (ret < 0)\n+\t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"failed to send config change (%d)\\n\", ret);\n+\treturn ret;\n }\n \n static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev,\n@@ -3329,13 +3314,11 @@ static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev,\n \t\tctx.fd_num = 1;\n \t}\n \n-\tret = send_vhost_slave_message(dev, &ctx);\n-\tif (ret < 0) {\n+\tret = send_vhost_slave_message_process_reply(dev, &ctx);\n+\tif (ret < 0)\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"failed to set host notifier (%d)\\n\", ret);\n-\t\treturn ret;\n-\t}\n \n-\treturn process_slave_message_reply(dev, &ctx);\n+\treturn ret;\n }\n \n int rte_vhost_host_notifier_ctrl(int vid, uint16_t qid, bool enable)\n", "prefixes": [ "v5", "2/9" ] }