Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1525726/?format=api
{ "id": 1525726, "url": "http://patchwork.ozlabs.org/api/patches/1525726/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openvswitch/patch/7bb0004b2c88f817fd7cf2bedc886cb4aa659cba.1631094144.git.grive@u256.net/", "project": { "id": 47, "url": "http://patchwork.ozlabs.org/api/projects/47/?format=api", "name": "Open vSwitch", "link_name": "openvswitch", "list_id": "ovs-dev.openvswitch.org", "list_email": "ovs-dev@openvswitch.org", "web_url": "http://openvswitch.org/", "scm_url": "git@github.com:openvswitch/ovs.git", "webscm_url": "https://github.com/openvswitch/ovs", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<7bb0004b2c88f817fd7cf2bedc886cb4aa659cba.1631094144.git.grive@u256.net>", "list_archive_url": null, "date": "2021-09-08T09:47:42", "name": "[ovs-dev,v5,18/27] dpif-netdev: Introduce tagged union of offload requests", "commit_ref": "d68d2ed466d48abc1120feb6e636b932f52b666b", "pull_url": null, "state": "accepted", "archived": false, "hash": "742da8ad87839243a4f3ebd9c95cba599b2969b3", "submitter": { "id": 78795, "url": "http://patchwork.ozlabs.org/api/people/78795/?format=api", "name": "Gaetan Rivet", "email": "grive@u256.net" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/openvswitch/patch/7bb0004b2c88f817fd7cf2bedc886cb4aa659cba.1631094144.git.grive@u256.net/mbox/", "series": [ { "id": 261424, "url": "http://patchwork.ozlabs.org/api/series/261424/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openvswitch/list/?series=261424", "date": "2021-09-08T09:47:24", "name": "dpif-netdev: Parallel offload processing", "version": 5, "mbox": "http://patchwork.ozlabs.org/series/261424/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1525726/comments/", "check": "success", "checks": "http://patchwork.ozlabs.org/api/patches/1525726/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<ovs-dev-bounces@openvswitch.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "ovs-dev@openvswitch.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "ovs-dev@lists.linuxfoundation.org" ], "Authentication-Results": [ "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=u256.net header.i=@u256.net header.a=rsa-sha256\n header.s=fm2 header.b=4QmHTtXm;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=messagingengine.com header.i=@messagingengine.com\n header.a=rsa-sha256 header.s=fm3 header.b=VN9Y2aMO;\n\tdkim-atps=neutral", "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org\n (client-ip=140.211.166.138; helo=smtp1.osuosl.org;\n envelope-from=ovs-dev-bounces@openvswitch.org; receiver=<UNKNOWN>)", "smtp2.osuosl.org (amavisd-new);\n dkim=pass (2048-bit key) header.d=u256.net header.b=\"4QmHTtXm\";\n dkim=pass (2048-bit key) header.d=messagingengine.com\n header.b=\"VN9Y2aMO\"" ], "Received": [ "from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 4H4HRV11gwz9t9b\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 8 Sep 2021 19:49:42 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id 4BDE983F2A;\n\tWed, 8 Sep 2021 09:49:40 +0000 (UTC)", "from smtp1.osuosl.org ([127.0.0.1])\n\tby localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id dWDT4yT1EwIw; Wed, 8 Sep 2021 09:49:39 +0000 (UTC)", "from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56])\n\tby smtp1.osuosl.org (Postfix) with ESMTPS id A49BD83AEB;\n\tWed, 8 Sep 2021 09:49:37 +0000 (UTC)", "from lf-lists.osuosl.org (localhost [127.0.0.1])\n\tby lists.linuxfoundation.org (Postfix) with ESMTP id 6E95AC0011;\n\tWed, 8 Sep 2021 09:49:37 +0000 (UTC)", "from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133])\n by lists.linuxfoundation.org (Postfix) with ESMTP id 17213C001C\n for <ovs-dev@openvswitch.org>; Wed, 8 Sep 2021 09:49:36 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp2.osuosl.org (Postfix) with ESMTP id D62A5406C3\n for <ovs-dev@openvswitch.org>; Wed, 8 Sep 2021 09:48:32 +0000 (UTC)", "from smtp2.osuosl.org ([127.0.0.1])\n by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id vN1nzgkBTaDs for <ovs-dev@openvswitch.org>;\n Wed, 8 Sep 2021 09:48:31 +0000 (UTC)", "from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com\n [64.147.123.19])\n by smtp2.osuosl.org (Postfix) with ESMTPS id 1131E4071D\n for <ovs-dev@openvswitch.org>; Wed, 8 Sep 2021 09:48:30 +0000 (UTC)", "from compute1.internal (compute1.nyi.internal [10.202.2.41])\n by mailout.west.internal (Postfix) with ESMTP id 715AE32009DF;\n Wed, 8 Sep 2021 05:48:30 -0400 (EDT)", "from mailfrontend2 ([10.202.2.163])\n by compute1.internal (MEProxy); Wed, 08 Sep 2021 05:48:30 -0400", "by mail.messagingengine.com (Postfix) with ESMTPA; Wed,\n 8 Sep 2021 05:48:29 -0400 (EDT)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "from auto-whitelisted by SQLgrey-1.8.0", "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/relaxed; d=u256.net; h=from\n :to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding; s=fm2; bh=ykBJIB+4ig7of\n 6KWSHeGmvZhJn5q/Fi4PfN0Fzxv90Q=; b=4QmHTtXmHHikj1ArTlb0LMicytRRg\n zU5AW6ta7cADALgOIeYWy0ZDGODOiKcUD/kHMQLzujgdDalS5/DuQ1nSqUZ2i9v6\n e7THdNqAjx1Kueot4DmpaNxi+0XSEPx3ogkMhwdM6NPJQpQskLB44xpL5vl9cTzo\n kwuOhOfqP/b5sQcrGzIniLg/lI6Skz6qMe93waTE5/z2sWfADGBMh3VXXQynD045\n znaRY1IcQz+BRDJjtQXo0TAT07i+CJTjN0lTqPrKDQ0Eprz3WFDYt3CECkhJMGNf\n 33sP6UcGz0+GK4cnqxsaDcmbXMrNaRwmo9pNVTEQx5a/Ap/yJ1rgHUmyA==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=\n messagingengine.com; h=cc:content-transfer-encoding:date:from\n :in-reply-to:message-id:mime-version:references:subject:to\n :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=\n fm3; bh=ykBJIB+4ig7of6KWSHeGmvZhJn5q/Fi4PfN0Fzxv90Q=; b=VN9Y2aMO\n yrA1VfcHTsd61YTzefV2PrsKtwo0W1ThBvXjjOD7JSIwb3vc2NRM9aK6kPXJnym/\n 7+n6TU2aZv5reMNa6ck6OS/d9klSF+jhEgOb6kRuLHT8GDGc5roP0hSlHzmiBwCo\n 0Vq49dbIYA37lC1d4uj6P/UkZPLMbwQ+nvVbzEBc5vijnarFP1mJ9oUp1UtpDsuX\n 0TEtmqEvH2sR9I9vd1tLZpqtwrBnQ4fec4IF6pw4QDd1/IcDqXCWbb3m9iHReydl\n 7Z+5MsjMn83qFS9nQC1KX63gAtzsa8as9wcyyVOHYaNbor1PvMmBfLKSq4pJ6LQy\n tR8GKRJ6uUmlXg==" ], "X-ME-Sender": "<xms:7YY4YQyWWuienWqhDPyaFkET9Aca374j3taX0-Xkhn3Qr_EVAcLqHw>\n <xme:7YY4YUTHZlRVrXfZqPNNIxQ1JKikM0AfoGZImeSf9epoFuLarwLYsaC0_pLzxKXHI\n YVs8gTGd3ogaLZnrYU>", "X-ME-Received": "\n <xmr:7YY4YSVI2uikuQNSW-JaVEIw70wNQsvrWBfurDs66GsuBczqRA7zjxQHsyyNJNfMBp40jw4_PVJNm7y0S1r61ZjO1Q>", "X-ME-Proxy-Cause": "\n gggruggvucftvghtrhhoucdtuddrgedvtddrudefjedgudekucetufdoteggodetrfdotf\n fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen\n uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne\n cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefirggvthgr\n nhcutfhivhgvthcuoehgrhhivhgvsehuvdehiedrnhgvtheqnecuggftrfgrthhtvghrnh\n ephefgveffkeetheetfeeifedvheelfeejfeehveduteejhfekuedtkeeiuedvteehnecu\n vehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehmrghilhhfrhhomhepghhrihhvvg\n esuhdvheeirdhnvght", "X-ME-Proxy": "<xmx:7oY4YehhwR65oFBmtnLfMMi8_6K4EqdZbIQM5mIZW1T8LpaRiAbS5Q>\n <xmx:7oY4YSDkcISIfLtDQbNLRyHKkOAyaVM-VbpHxdIcldLV-wqd5n6bmg>\n <xmx:7oY4YfJ9bF9YbZi8cDZfWs2LFnlKHI-JUaMQFSmGMcUbFyWCJzxOVw>\n <xmx:7oY4YdpkmCdbD6CnNzDkaU-r9GHo0Ao2N8uGxXKgkcLHbn7G4gIf9g>", "From": "Gaetan Rivet <grive@u256.net>", "To": "ovs-dev@openvswitch.org", "Date": "Wed, 8 Sep 2021 11:47:42 +0200", "Message-Id": "\n <7bb0004b2c88f817fd7cf2bedc886cb4aa659cba.1631094144.git.grive@u256.net>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<cover.1631094144.git.grive@u256.net>", "References": "<cover.1631094144.git.grive@u256.net>", "MIME-Version": "1.0", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>", "Subject": "[ovs-dev] [PATCH v5 18/27] dpif-netdev: Introduce tagged union of\n\toffload requests", "X-BeenThere": "ovs-dev@openvswitch.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "<ovs-dev.openvswitch.org>", "List-Unsubscribe": "<https://mail.openvswitch.org/mailman/options/ovs-dev>,\n <mailto:ovs-dev-request@openvswitch.org?subject=unsubscribe>", "List-Archive": "<http://mail.openvswitch.org/pipermail/ovs-dev/>", "List-Post": "<mailto:ovs-dev@openvswitch.org>", "List-Help": "<mailto:ovs-dev-request@openvswitch.org?subject=help>", "List-Subscribe": "<https://mail.openvswitch.org/mailman/listinfo/ovs-dev>,\n <mailto:ovs-dev-request@openvswitch.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "ovs-dev-bounces@openvswitch.org", "Sender": "\"dev\" <ovs-dev-bounces@openvswitch.org>" }, "content": "Offload requests are currently only supporting flow offloads.\nAs a pre-step before supporting an offload flush request,\nmodify the layout of an offload request item, to become a tagged union.\n\nFuture offload types won't be forced to re-use the full flow offload\nstructure, which consumes a lot of memory.\n\nSigned-off-by: Gaetan Rivet <grive@u256.net>\nReviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n lib/dpif-netdev.c | 137 ++++++++++++++++++++++++++++++++--------------\n 1 file changed, 96 insertions(+), 41 deletions(-)", "diff": "diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c\nindex 24ecaa0a8..e0052a65b 100644\n--- a/lib/dpif-netdev.c\n+++ b/lib/dpif-netdev.c\n@@ -333,13 +333,17 @@ enum rxq_cycles_counter_type {\n RXQ_N_CYCLES\n };\n \n+enum dp_offload_type {\n+ DP_OFFLOAD_FLOW,\n+};\n+\n enum {\n DP_NETDEV_FLOW_OFFLOAD_OP_ADD,\n DP_NETDEV_FLOW_OFFLOAD_OP_MOD,\n DP_NETDEV_FLOW_OFFLOAD_OP_DEL,\n };\n \n-struct dp_offload_thread_item {\n+struct dp_offload_flow_item {\n struct dp_netdev_pmd_thread *pmd;\n struct dp_netdev_flow *flow;\n int op;\n@@ -347,9 +351,17 @@ struct dp_offload_thread_item {\n struct nlattr *actions;\n size_t actions_len;\n odp_port_t orig_in_port; /* Originating in_port for tnl flows. */\n- long long int timestamp;\n+};\n+\n+union dp_offload_thread_data {\n+ struct dp_offload_flow_item flow;\n+};\n \n+struct dp_offload_thread_item {\n struct ovs_list node;\n+ enum dp_offload_type type;\n+ long long int timestamp;\n+ union dp_offload_thread_data data[0];\n };\n \n struct dp_offload_thread {\n@@ -2538,34 +2550,55 @@ dp_netdev_alloc_flow_offload(struct dp_netdev_pmd_thread *pmd,\n struct dp_netdev_flow *flow,\n int op)\n {\n- struct dp_offload_thread_item *offload;\n+ struct dp_offload_thread_item *item;\n+ struct dp_offload_flow_item *flow_offload;\n+\n+ item = xzalloc(sizeof *item + sizeof *flow_offload);\n+ flow_offload = &item->data->flow;\n+\n+ item->type = DP_OFFLOAD_FLOW;\n \n- offload = xzalloc(sizeof(*offload));\n- offload->pmd = pmd;\n- offload->flow = flow;\n- offload->op = op;\n+ flow_offload->pmd = pmd;\n+ flow_offload->flow = flow;\n+ flow_offload->op = op;\n \n dp_netdev_flow_ref(flow);\n dp_netdev_pmd_try_ref(pmd);\n \n- return offload;\n+ return item;\n }\n \n static void\n dp_netdev_free_flow_offload__(struct dp_offload_thread_item *offload)\n {\n- free(offload->actions);\n+ struct dp_offload_flow_item *flow_offload = &offload->data->flow;\n+\n+ free(flow_offload->actions);\n free(offload);\n }\n \n static void\n dp_netdev_free_flow_offload(struct dp_offload_thread_item *offload)\n {\n- dp_netdev_pmd_unref(offload->pmd);\n- dp_netdev_flow_unref(offload->flow);\n+ struct dp_offload_flow_item *flow_offload = &offload->data->flow;\n+\n+ dp_netdev_pmd_unref(flow_offload->pmd);\n+ dp_netdev_flow_unref(flow_offload->flow);\n ovsrcu_postpone(dp_netdev_free_flow_offload__, offload);\n }\n \n+static void\n+dp_netdev_free_offload(struct dp_offload_thread_item *offload)\n+{\n+ switch (offload->type) {\n+ case DP_OFFLOAD_FLOW:\n+ dp_netdev_free_flow_offload(offload);\n+ break;\n+ default:\n+ OVS_NOT_REACHED();\n+ };\n+}\n+\n static void\n dp_netdev_append_flow_offload(struct dp_offload_thread_item *offload)\n {\n@@ -2577,7 +2610,7 @@ dp_netdev_append_flow_offload(struct dp_offload_thread_item *offload)\n }\n \n static int\n-dp_netdev_flow_offload_del(struct dp_offload_thread_item *offload)\n+dp_netdev_flow_offload_del(struct dp_offload_flow_item *offload)\n {\n return mark_to_flow_disassociate(offload->pmd, offload->flow);\n }\n@@ -2594,7 +2627,7 @@ dp_netdev_flow_offload_del(struct dp_offload_thread_item *offload)\n * valid, thus only item 2 needed.\n */\n static int\n-dp_netdev_flow_offload_put(struct dp_offload_thread_item *offload)\n+dp_netdev_flow_offload_put(struct dp_offload_flow_item *offload)\n {\n struct dp_netdev_pmd_thread *pmd = offload->pmd;\n struct dp_netdev_flow *flow = offload->flow;\n@@ -2672,6 +2705,35 @@ err_free:\n return -1;\n }\n \n+static void\n+dp_offload_flow(struct dp_offload_thread_item *item)\n+{\n+ struct dp_offload_flow_item *flow_offload = &item->data->flow;\n+ const char *op;\n+ int ret;\n+\n+ switch (flow_offload->op) {\n+ case DP_NETDEV_FLOW_OFFLOAD_OP_ADD:\n+ op = \"add\";\n+ ret = dp_netdev_flow_offload_put(flow_offload);\n+ break;\n+ case DP_NETDEV_FLOW_OFFLOAD_OP_MOD:\n+ op = \"modify\";\n+ ret = dp_netdev_flow_offload_put(flow_offload);\n+ break;\n+ case DP_NETDEV_FLOW_OFFLOAD_OP_DEL:\n+ op = \"delete\";\n+ ret = dp_netdev_flow_offload_del(flow_offload);\n+ break;\n+ default:\n+ OVS_NOT_REACHED();\n+ }\n+\n+ VLOG_DBG(\"%s to %s netdev flow \"UUID_FMT,\n+ ret == 0 ? \"succeed\" : \"failed\", op,\n+ UUID_ARGS((struct uuid *) &flow_offload->flow->mega_ufid));\n+}\n+\n #define DP_NETDEV_OFFLOAD_QUIESCE_INTERVAL_US (10 * 1000) /* 10 ms */\n \n static void *\n@@ -2682,8 +2744,6 @@ dp_netdev_flow_offload_main(void *data OVS_UNUSED)\n long long int latency_us;\n long long int next_rcu;\n long long int now;\n- const char *op;\n- int ret;\n \n next_rcu = time_usec() + DP_NETDEV_OFFLOAD_QUIESCE_INTERVAL_US;\n for (;;) {\n@@ -2700,18 +2760,9 @@ dp_netdev_flow_offload_main(void *data OVS_UNUSED)\n offload = CONTAINER_OF(list, struct dp_offload_thread_item, node);\n ovs_mutex_unlock(&dp_offload_thread.mutex);\n \n- switch (offload->op) {\n- case DP_NETDEV_FLOW_OFFLOAD_OP_ADD:\n- op = \"add\";\n- ret = dp_netdev_flow_offload_put(offload);\n- break;\n- case DP_NETDEV_FLOW_OFFLOAD_OP_MOD:\n- op = \"modify\";\n- ret = dp_netdev_flow_offload_put(offload);\n- break;\n- case DP_NETDEV_FLOW_OFFLOAD_OP_DEL:\n- op = \"delete\";\n- ret = dp_netdev_flow_offload_del(offload);\n+ switch (offload->type) {\n+ case DP_OFFLOAD_FLOW:\n+ dp_offload_flow(offload);\n break;\n default:\n OVS_NOT_REACHED();\n@@ -2723,10 +2774,7 @@ dp_netdev_flow_offload_main(void *data OVS_UNUSED)\n mov_avg_cma_update(&dp_offload_thread.cma, latency_us);\n mov_avg_ema_update(&dp_offload_thread.ema, latency_us);\n \n- VLOG_DBG(\"%s to %s netdev flow \"UUID_FMT,\n- ret == 0 ? \"succeed\" : \"failed\", op,\n- UUID_ARGS((struct uuid *) &offload->flow->mega_ufid));\n- dp_netdev_free_flow_offload(offload);\n+ dp_netdev_free_offload(offload);\n \n /* Do RCU synchronization at fixed interval. */\n if (now > next_rcu) {\n@@ -2827,7 +2875,8 @@ queue_netdev_flow_put(struct dp_netdev_pmd_thread *pmd,\n const struct nlattr *actions, size_t actions_len,\n odp_port_t orig_in_port, int op)\n {\n- struct dp_offload_thread_item *offload;\n+ struct dp_offload_thread_item *item;\n+ struct dp_offload_flow_item *flow_offload;\n \n if (!netdev_is_flow_api_enabled()) {\n return;\n@@ -2839,15 +2888,21 @@ queue_netdev_flow_put(struct dp_netdev_pmd_thread *pmd,\n ovsthread_once_done(&offload_thread_once);\n }\n \n- offload = dp_netdev_alloc_flow_offload(pmd, flow, op);\n- offload->match = *match;\n- offload->actions = xmalloc(actions_len);\n- memcpy(offload->actions, actions, actions_len);\n- offload->actions_len = actions_len;\n- offload->orig_in_port = orig_in_port;\n-\n- offload->timestamp = pmd->ctx.now;\n- dp_netdev_append_flow_offload(offload);\n+ if (flow->mark != INVALID_FLOW_MARK) {\n+ op = DP_NETDEV_FLOW_OFFLOAD_OP_MOD;\n+ } else {\n+ op = DP_NETDEV_FLOW_OFFLOAD_OP_ADD;\n+ }\n+ item = dp_netdev_alloc_flow_offload(pmd, flow, op);\n+ flow_offload = &item->data->flow;\n+ flow_offload->match = *match;\n+ flow_offload->actions = xmalloc(actions_len);\n+ memcpy(flow_offload->actions, actions, actions_len);\n+ flow_offload->actions_len = actions_len;\n+ flow_offload->orig_in_port = orig_in_port;\n+\n+ item->timestamp = pmd->ctx.now;\n+ dp_netdev_append_flow_offload(item);\n }\n \n static void\n", "prefixes": [ "ovs-dev", "v5", "18/27" ] }