Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/807959/?format=api
{ "id": 807959, "url": "http://patchwork.ozlabs.org/api/patches/807959/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openvswitch/patch/1504133508-95409-1-git-send-email-jpettit@ovn.org/", "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": "<1504133508-95409-1-git-send-email-jpettit@ovn.org>", "list_archive_url": null, "date": "2017-08-30T22:51:48", "name": "[ovs-dev,branch-2.7] Revert \"ofproto-dpif-xlate: Fixes for propagating state of conntrack.\"", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f94d3bd0683c646ce4a453d4acd970524830bb78", "submitter": { "id": 67602, "url": "http://patchwork.ozlabs.org/api/people/67602/?format=api", "name": "Justin Pettit", "email": "jpettit@ovn.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/openvswitch/patch/1504133508-95409-1-git-send-email-jpettit@ovn.org/mbox/", "series": [ { "id": 717, "url": "http://patchwork.ozlabs.org/api/series/717/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openvswitch/list/?series=717", "date": "2017-08-30T22:51:48", "name": "[ovs-dev,branch-2.7] Revert \"ofproto-dpif-xlate: Fixes for propagating state of conntrack.\"", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/717/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/807959/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/807959/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>)", "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 3xjLNZ5dcBz9s65\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 31 Aug 2017 08:51:58 +1000 (AEST)", "from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 622BFB00;\n\tWed, 30 Aug 2017 22:51:55 +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 01248481\n\tfor <dev@openvswitch.org>; Wed, 30 Aug 2017 22:51:54 +0000 (UTC)", "from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id 5FEA71D7\n\tfor <dev@openvswitch.org>; Wed, 30 Aug 2017 22:51:52 +0000 (UTC)", "from localhost.localdomain (unknown [209.66.79.214])\n\t(Authenticated sender: jpettit@ovn.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id DA26441C080\n\tfor <dev@openvswitch.org>; Thu, 31 Aug 2017 00:51:50 +0200 (CEST)" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Originating-IP": "209.66.79.214", "From": "Justin Pettit <jpettit@ovn.org>", "To": "dev@openvswitch.org", "Date": "Wed, 30 Aug 2017 15:51:48 -0700", "Message-Id": "<1504133508-95409-1-git-send-email-jpettit@ovn.org>", "X-Mailer": "git-send-email 2.7.4", "X-Spam-Status": "No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW\n\tautolearn=disabled version=3.3.1", "X-Spam-Checker-Version": "SpamAssassin 3.3.1 (2010-03-16) on\n\tsmtp1.linux-foundation.org", "Subject": "[ovs-dev] [branch-2.7] Revert \"ofproto-dpif-xlate: Fixes for\n\tpropagating state of conntrack.\"", "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": "This reverts commit 8294d78ab124ec6f4b51c621e9baf7f29b287bb9.\n\nThis patch was mistakenly backported to branch-2.7. The change breaks\nthe OpenFlow API, which is not appropriate for a maintenance release.\n\nSigned-off-by: Justin Pettit <jpettit@ovn.org>\nReported-by: Russell Bryant <russell@ovn.org>\n---\n ofproto/ofproto-dpif-xlate.c | 10 ++++------\n tests/ofproto-dpif.at | 6 +++---\n 2 files changed, 7 insertions(+), 9 deletions(-)", "diff": "diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c\nindex 7724a10d1d28..646a7bca3979 100644\n--- a/ofproto/ofproto-dpif-xlate.c\n+++ b/ofproto/ofproto-dpif-xlate.c\n@@ -4863,9 +4863,9 @@ put_ct_nat(struct xlate_ctx *ctx)\n static void\n compose_conntrack_action(struct xlate_ctx *ctx, struct ofpact_conntrack *ofc)\n {\n- ovs_u128 old_ct_label = ctx->xin->flow.ct_label;\n+ ovs_u128 old_ct_label = ctx->base_flow.ct_label;\n ovs_u128 old_ct_label_mask = ctx->wc->masks.ct_label;\n- uint32_t old_ct_mark = ctx->xin->flow.ct_mark;\n+ uint32_t old_ct_mark = ctx->base_flow.ct_mark;\n uint32_t old_ct_mark_mask = ctx->wc->masks.ct_mark;\n size_t ct_offset;\n uint16_t zone;\n@@ -4900,9 +4900,9 @@ compose_conntrack_action(struct xlate_ctx *ctx, struct ofpact_conntrack *ofc)\n \n /* Restore the original ct fields in the key. These should only be exposed\n * after recirculation to another table. */\n- ctx->xin->flow.ct_mark = old_ct_mark;\n+ ctx->base_flow.ct_mark = old_ct_mark;\n ctx->wc->masks.ct_mark = old_ct_mark_mask;\n- ctx->xin->flow.ct_label = old_ct_label;\n+ ctx->base_flow.ct_label = old_ct_label;\n ctx->wc->masks.ct_label = old_ct_label_mask;\n \n if (ofc->recirc_table == NX_CT_RECIRC_NONE) {\n@@ -4913,7 +4913,6 @@ compose_conntrack_action(struct xlate_ctx *ctx, struct ofpact_conntrack *ofc)\n /* Use ct_* fields from datapath during recirculation upcall. */\n ctx->conntracked = true;\n compose_recirculate_and_fork(ctx, ofc->recirc_table);\n- ctx->conntracked = false;\n }\n }\n \n@@ -5788,7 +5787,6 @@ xlate_actions(struct xlate_in *xin, struct xlate_out *xout)\n xlate_report(&ctx, OFT_THAW,\n \"Resuming from table %\"PRIu8, ctx.table_id);\n \n- ctx.conntracked = state->conntracked;\n if (!state->conntracked) {\n clear_conntrack(&ctx);\n }\ndiff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at\nindex 907e1759235e..0a9a40d2ff0f 100644\n--- a/tests/ofproto-dpif.at\n+++ b/tests/ofproto-dpif.at\n@@ -8908,13 +8908,13 @@ OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit])\n \n dnl Check this output.\n AT_CHECK([cat ofctl_monitor.log], [0], [dnl\n-NXT_PACKET_IN (xid=0x0): cookie=0x0 total_len=42 in_port=1 (via action) data_len=42 (unbuffered)\n+NXT_PACKET_IN (xid=0x0): cookie=0x0 total_len=42 ct_mark=0x1,in_port=1 (via action) data_len=42 (unbuffered)\n udp,vlan_tci=0x0000,dl_src=50:54:00:00:00:09,dl_dst=50:54:00:00:00:0a,nw_src=10.1.1.1,nw_dst=10.1.1.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=1,tp_dst=2 udp_csum:e9d6\n dnl\n-NXT_PACKET_IN (xid=0x0): cookie=0x0 total_len=42 in_port=1 (via action) data_len=42 (unbuffered)\n+NXT_PACKET_IN (xid=0x0): cookie=0x0 total_len=42 ct_mark=0x3,in_port=1 (via action) data_len=42 (unbuffered)\n udp,vlan_tci=0x0000,dl_src=50:54:00:00:00:09,dl_dst=50:54:00:00:00:0a,nw_src=10.1.1.1,nw_dst=10.1.1.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=3,tp_dst=4 udp_csum:e9d2\n dnl\n-NXT_PACKET_IN (xid=0x0): cookie=0x0 total_len=42 in_port=1 (via action) data_len=42 (unbuffered)\n+NXT_PACKET_IN (xid=0x0): cookie=0x0 total_len=42 ct_mark=0x5,in_port=1 (via action) data_len=42 (unbuffered)\n udp,vlan_tci=0x0000,dl_src=50:54:00:00:00:09,dl_dst=50:54:00:00:00:0a,nw_src=10.1.1.1,nw_dst=10.1.1.2,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=5,tp_dst=6 udp_csum:e9ce\n dnl\n NXT_PACKET_IN (xid=0x0): table_id=1 cookie=0x0 total_len=42 ct_state=est|rpl|trk,ct_mark=0x1,in_port=2 (via action) data_len=42 (unbuffered)\n", "prefixes": [ "ovs-dev", "branch-2.7" ] }