Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/808435/?format=api
{ "id": 808435, "url": "http://patchwork.ozlabs.org/api/patches/808435/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openvswitch/patch/1504215666-4120-1-git-send-email-zhouhan@gmail.com/", "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": "<1504215666-4120-1-git-send-email-zhouhan@gmail.com>", "list_archive_url": null, "date": "2017-08-31T21:41:06", "name": "[ovs-dev,v2] ovn-controller: support configurable acl log file rate limit", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "85475b852b4b08ae47ba40b1a7be1193c287c80b", "submitter": { "id": 67381, "url": "http://patchwork.ozlabs.org/api/people/67381/?format=api", "name": "Han Zhou", "email": "zhouhan@gmail.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/openvswitch/patch/1504215666-4120-1-git-send-email-zhouhan@gmail.com/mbox/", "series": [ { "id": 912, "url": "http://patchwork.ozlabs.org/api/series/912/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openvswitch/list/?series=912", "date": "2017-08-31T21:41:06", "name": "[ovs-dev,v2] ovn-controller: support configurable acl log file rate limit", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/912/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/808435/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/808435/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<ovs-dev-bounces@openvswitch.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "dev@openvswitch.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "ovs-dev@mail.linuxfoundation.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=openvswitch.org\n\t(client-ip=140.211.169.12; helo=mail.linuxfoundation.org;\n\tenvelope-from=ovs-dev-bounces@openvswitch.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"RBLerYxE\"; dkim-atps=neutral" ], "Received": [ "from mail.linuxfoundation.org (mail.linuxfoundation.org\n\t[140.211.169.12])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjwmd15DVz9s81\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 1 Sep 2017 07:41:21 +1000 (AEST)", "from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 29B55C33;\n\tThu, 31 Aug 2017 21:41:19 +0000 (UTC)", "from smtp1.linuxfoundation.org (smtp1.linux-foundation.org\n\t[172.17.192.35])\n\tby mail.linuxfoundation.org (Postfix) with ESMTPS id 898DDBFA\n\tfor <dev@openvswitch.org>; Thu, 31 Aug 2017 21:41:18 +0000 (UTC)", "from mail-pg0-f49.google.com (mail-pg0-f49.google.com\n\t[74.125.83.49])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id F02991B3\n\tfor <dev@openvswitch.org>; Thu, 31 Aug 2017 21:41:17 +0000 (UTC)", "by mail-pg0-f49.google.com with SMTP id b8so2447706pgn.5\n\tfor <dev@openvswitch.org>; Thu, 31 Aug 2017 14:41:17 -0700 (PDT)", "from localhost.localdomain.localdomain ([216.113.160.70])\n\tby smtp.gmail.com with ESMTPSA id\n\ti187sm784948pfe.67.2017.08.31.14.41.16\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 31 Aug 2017 14:41:16 -0700 (PDT)" ], "X-Greylist": "whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id;\n\tbh=1tGNkyNxggWFG9KcbzAGhPzSBPd/K4YGIGrWX8k3CWI=;\n\tb=RBLerYxEUkMZ89Z8ywlgZlgls4f5K+xsglrHMaDDfEcr+VY5iY3uJQVLg81i855uun\n\tyZ08Xr9lvvzJqn0k72uzR2lb/qBa5xN5/MWsSRapWqP8kjTyqWxVCHomMUM2Yy6n9k+j\n\t0LHL2zDNlJUXYx1XRJmTRDPwcmltTqAnDmcGKSxC2f1Ju2Uii/D0c6gOeqEUjw67Kx1K\n\ts3kpz3GMTarFUaQu0woOZCk6nap2K3cWKXLqGJmQdGISftpw895ex9yAtnx87bmI1Wtq\n\tsrTTuykwGMQS6u0kA44yJHmhFTskj1a8/PxfSIyLPrezf/YTjAMq1eFt03vjmYfJkXDS\n\tAtnQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id;\n\tbh=1tGNkyNxggWFG9KcbzAGhPzSBPd/K4YGIGrWX8k3CWI=;\n\tb=j/o7eHZztyf6IX5YrSlceHX4cKtOVdSEWB/qS6Sp7/kryLeLOi0P7CQjQxYYQTwdja\n\twRDCDLJbqlGmqMvMFNDdK3fdW/Wx5EjSdTrA+4hLh/LCCedtaXKTQfu6mcIJFUKHbxdg\n\t1mrzZtf1GESpzI9A7MAvKCjYRWviwgvAtzunjSmrb17FDp76Tf6kC1RR3tvtQ8H4AHNL\n\tM2OZCWF/BKka3by2u4R4Sa2zMHpk2kuo6lp9dftRDUoAIxQZDd610G41e09ZAFDVmcDi\n\tu2DfEJxHkAAPP/5CnkZaPhOZURHCi3mf8AYGydLohVLuWZzcjE6phLfnNbTijVLDJ0tA\n\totog==", "X-Gm-Message-State": "AHYfb5hu7pR9a9oFjrvsaWF+GeJhVIMy8JgOaYgaCO9tS4cJzaJIjAd3\n\t3SU0Qs+BzLJjJxum", "X-Google-Smtp-Source": "ADKCNb65dNVoG7OQgFe1NUfLUQwrixMQAPW2wjJUriUFHf64A6UM7yt/i0+qROzrz0Fcx+7XNyyQ3w==", "X-Received": "by 10.98.2.210 with SMTP id 201mr3838178pfc.151.1504215677304;\n\tThu, 31 Aug 2017 14:41:17 -0700 (PDT)", "From": "Han Zhou <zhouhan@gmail.com>", "To": "dev@openvswitch.org", "Date": "Thu, 31 Aug 2017 14:41:06 -0700", "Message-Id": "<1504215666-4120-1-git-send-email-zhouhan@gmail.com>", "X-Mailer": "git-send-email 2.1.0", "X-Spam-Status": "No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,\n\tDKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE autolearn=disabled\n\tversion=3.3.1", "X-Spam-Checker-Version": "SpamAssassin 3.3.1 (2010-03-16) on\n\tsmtp1.linux-foundation.org", "Subject": "[ovs-dev] [PATCH v2] ovn-controller: support configurable acl log\n\tfile rate limit", "X-BeenThere": "ovs-dev@openvswitch.org", "X-Mailman-Version": "2.1.12", "Precedence": "list", "List-Id": "<ovs-dev.openvswitch.org>", "List-Unsubscribe": "<https://mail.openvswitch.org/mailman/options/ovs-dev>,\n\t<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\t<mailto:ovs-dev-request@openvswitch.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Sender": "ovs-dev-bounces@openvswitch.org", "Errors-To": "ovs-dev-bounces@openvswitch.org" }, "content": "Add parameters in local Open_vSwitch DB external-ids for rate-\nlimiting the log file writing:\n ovn-acl-log-rl-rate\n ovn-acl-log-rl-burst\n\nNote: this has nothing to do with packet-in rate-limiting.\nSigned-off-by: Han Zhou <zhouhan@gmail.com>\n---\nv1->v2: add documentation for the configurations.\n\n ovn/controller/ovn-controller.8.xml | 10 ++++++++++\n ovn/controller/pinctrl.c | 2 ++\n ovn/lib/acl-log.c | 28 +++++++++++++++++++++++++++-\n ovn/lib/acl-log.h | 3 +++\n tests/automake.mk | 3 ++-\n 5 files changed, 44 insertions(+), 2 deletions(-)", "diff": "diff --git a/ovn/controller/ovn-controller.8.xml b/ovn/controller/ovn-controller.8.xml\nindex 5641abc..5a6dcb4 100644\n--- a/ovn/controller/ovn-controller.8.xml\n+++ b/ovn/controller/ovn-controller.8.xml\n@@ -151,6 +151,16 @@\n network interface card, enabling encapsulation checksum may incur\n performance loss. In such cases, encapsulation checksums can be disabled.\n </dd>\n+\n+ <dt><code>external_ids:ovn-acl-log-rl-rate</code></dt>\n+ <dd>\n+ ACL log rate-limiting rate (per minute) of writing acl logs to file.\n+ </dd>\n+\n+ <dt><code>external_ids:ovn-acl-log-rl-burst</code></dt>\n+ <dd>\n+ ACL log rate-limiting burst of writing acl logs to file.\n+ </dd>\n </dl>\n \n <p>\ndiff --git a/ovn/controller/pinctrl.c b/ovn/controller/pinctrl.c\nindex 469a355..33828ac 100644\n--- a/ovn/controller/pinctrl.c\n+++ b/ovn/controller/pinctrl.c\n@@ -1043,6 +1043,8 @@ pinctrl_run(struct controller_ctx *ctx,\n flush_put_mac_bindings();\n }\n \n+ update_acl_log_rl(ctx);\n+\n /* Process a limited number of messages per call. */\n for (int i = 0; i < 50; i++) {\n struct ofpbuf *msg = rconn_recv(swconn);\ndiff --git a/ovn/lib/acl-log.c b/ovn/lib/acl-log.c\nindex f47b0af..e33fe7f 100644\n--- a/ovn/lib/acl-log.c\n+++ b/ovn/lib/acl-log.c\n@@ -15,16 +15,23 @@\n */\n \n #include <config.h>\n+#include \"ovn/controller/ovn-controller.h\"\n #include \"ovn/lib/acl-log.h\"\n #include <string.h>\n #include \"flow.h\"\n #include \"openvswitch/json.h\"\n #include \"openvswitch/ofpbuf.h\"\n #include \"openvswitch/vlog.h\"\n+#include \"lib/vswitch-idl.h\"\n \n \n VLOG_DEFINE_THIS_MODULE(acl_log);\n \n+#define DEFAULT_RL_RATE 6000\n+#define DEFAULT_RL_BURST 1000\n+static struct vlog_rate_limit acl_log_rl =\n+ VLOG_RATE_LIMIT_INIT(DEFAULT_RL_RATE, DEFAULT_RL_BURST);\n+\n const char *\n log_verdict_to_string(uint8_t verdict)\n {\n@@ -99,7 +106,26 @@ handle_acl_log(const struct flow *headers, struct ofpbuf *userdata)\n log_severity_to_string(lph->severity));\n flow_format(&ds, headers, NULL);\n \n- VLOG_INFO(\"%s\", ds_cstr(&ds));\n+ VLOG_INFO_RL(&acl_log_rl, \"%s\", ds_cstr(&ds));\n ds_destroy(&ds);\n free(name);\n }\n+\n+/* Update the rate limit settings for acl logging. */\n+void\n+update_acl_log_rl(struct controller_ctx *ctx)\n+{\n+ const struct ovsrec_open_vswitch *cfg\n+ = ovsrec_open_vswitch_first(ctx->ovs_idl);\n+ unsigned int rl_rate = (cfg ? smap_get_int(&cfg->external_ids,\n+ \"ovn-acl-log-rl-rate\",\n+ DEFAULT_RL_RATE)\n+ : DEFAULT_RL_RATE);\n+ unsigned int rl_burst = (cfg ? smap_get_int(&cfg->external_ids,\n+ \"ovn-acl-log-rl-burst\",\n+ DEFAULT_RL_BURST)\n+ : DEFAULT_RL_BURST);\n+ token_bucket_set(&acl_log_rl.token_bucket, rl_rate,\n+ OVS_SAT_MUL(rl_burst, VLOG_MSG_TOKENS));\n+}\n+\ndiff --git a/ovn/lib/acl-log.h b/ovn/lib/acl-log.h\nindex 55dc75b..8197353 100644\n--- a/ovn/lib/acl-log.h\n+++ b/ovn/lib/acl-log.h\n@@ -19,6 +19,7 @@\n \n #include <stdint.h>\n #include \"openvswitch/types.h\"\n+#include \"ovn/controller/ovn-controller.h\"\n \n struct ofpbuf;\n struct flow;\n@@ -51,4 +52,6 @@ uint8_t log_severity_from_string(const char *name);\n \n void handle_acl_log(const struct flow *headers, struct ofpbuf *userdata);\n \n+void\n+update_acl_log_rl(struct controller_ctx *ctx);\n #endif /* ovn/lib/acl-log.h */\ndiff --git a/tests/automake.mk b/tests/automake.mk\nindex 156b40f..d3bd7fd 100644\n--- a/tests/automake.mk\n+++ b/tests/automake.mk\n@@ -368,7 +368,8 @@ tests_ovstest_SOURCES += \\\n \ttests/test-netlink-conntrack.c\n endif\n \n-tests_ovstest_LDADD = lib/libopenvswitch.la ovn/lib/libovn.la\n+tests_ovstest_LDADD = ovn/lib/libovn.la lib/libopenvswitch.la\n+\n dist_check_SCRIPTS = tests/flowgen.pl\n \n noinst_PROGRAMS += tests/test-strtok_r\n", "prefixes": [ "ovs-dev", "v2" ] }