Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/810334/?format=api
{ "id": 810334, "url": "http://patchwork.ozlabs.org/api/patches/810334/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openvswitch/patch/20170905235304.4016-1-kumaranand@vmware.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": "<20170905235304.4016-1-kumaranand@vmware.com>", "list_archive_url": null, "date": "2017-09-05T23:53:04", "name": "[ovs-dev] datapath-windows: Increment ct packet counters based on ct_state.", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ff5ed0edce055573e358cab37396fc9742265a7d", "submitter": { "id": 69801, "url": "http://patchwork.ozlabs.org/api/people/69801/?format=api", "name": "Anand Kumar", "email": "kumaranand@vmware.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/openvswitch/patch/20170905235304.4016-1-kumaranand@vmware.com/mbox/", "series": [ { "id": 1670, "url": "http://patchwork.ozlabs.org/api/series/1670/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openvswitch/list/?series=1670", "date": "2017-09-05T23:53:04", "name": "[ovs-dev] datapath-windows: Increment ct packet counters based on ct_state.", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/1670/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/810334/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/810334/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 3xn3Sd4KS0z9t2W\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 6 Sep 2017 09:53:20 +1000 (AEST)", "from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 37DE6A88;\n\tTue, 5 Sep 2017 23:53:17 +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 01D0394B\n\tfor <dev@openvswitch.org>; Tue, 5 Sep 2017 23:53:16 +0000 (UTC)", "from EX13-EDG-OU-001.vmware.com (ex13-edg-ou-001.vmware.com\n\t[208.91.0.189])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id 6B7F0463\n\tfor <dev@openvswitch.org>; Tue, 5 Sep 2017 23:53:15 +0000 (UTC)", "from sc9-mailhost2.vmware.com (10.113.161.72) by\n\tEX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP\n\tServer id 15.0.1156.6; Tue, 5 Sep 2017 16:53:07 -0700", "from localhost.localdomain (htb-1s-eng-dhcp106.eng.vmware.com\n\t[10.33.78.106])\n\tby sc9-mailhost2.vmware.com (Postfix) with ESMTP id 9AF1AB0030;\n\tTue, 5 Sep 2017 16:53:14 -0700 (PDT)" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "From": "Anand Kumar <kumaranand@vmware.com>", "To": "<dev@openvswitch.org>", "Date": "Tue, 5 Sep 2017 16:53:04 -0700", "Message-ID": "<20170905235304.4016-1-kumaranand@vmware.com>", "X-Mailer": "git-send-email 2.9.3.windows.1", "MIME-Version": "1.0", "Received-SPF": "None (EX13-EDG-OU-001.vmware.com: kumaranand@vmware.com does\n\tnot designate permitted sender hosts)", "X-Spam-Status": "No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED,\n\tRP_MATCHES_RCVD autolearn=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] [PATCH] datapath-windows: Increment ct packet counters\n\tbased on ct_state.", "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>", "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": "For a given packet, packet counters in conntrack should be accounted only\nonce, even if the packet is processed multiple times by conntrack.\n\nWhen a packet is processed by conntrack, ct_state flag is set to\nOVS_CS_F_TRACKED. Use this state to identify if a packet has been\nprocessed previously by conntrack.\n\nAlso update the ct packet counters when ct entry is created.\n\nWith this patch, the conntrack's packet counters behavior is similar\nto linux\n\nSigned-off-by: Anand Kumar <kumaranand@vmware.com>\n---\n datapath-windows/ovsext/Conntrack.c | 34 +++++++++++++++++++++-------------\n 1 file changed, 21 insertions(+), 13 deletions(-)", "diff": "diff --git a/datapath-windows/ovsext/Conntrack.c b/datapath-windows/ovsext/Conntrack.c\nindex 8bcda05..0adb6d5 100644\n--- a/datapath-windows/ovsext/Conntrack.c\n+++ b/datapath-windows/ovsext/Conntrack.c\n@@ -169,6 +169,18 @@ OvsPostCtEventEntry(POVS_CT_ENTRY entry, UINT8 type)\n OvsPostCtEvent(&ctEventEntry);\n }\n \n+static __inline VOID\n+OvsCtIncrementCounters(POVS_CT_ENTRY entry, BOOLEAN reply, PNET_BUFFER_LIST nbl)\n+{\n+ if (reply) {\n+ entry->rev_key.byteCount+= OvsPacketLenNBL(nbl);\n+ entry->rev_key.packetCount++;\n+ } else {\n+ entry->key.byteCount += OvsPacketLenNBL(nbl);\n+ entry->key.packetCount++;\n+ }\n+}\n+\n static __inline BOOLEAN\n OvsCtAddEntry(POVS_CT_ENTRY entry, OvsConntrackKeyLookupCtx *ctx,\n PNAT_ACTION_INFO natInfo, UINT64 now)\n@@ -287,6 +299,9 @@ OvsCtEntryCreate(OvsForwardingContext *fwdCtx,\n }\n \n OvsCtUpdateFlowKey(key, state, ctx->key.zone, 0, NULL);\n+ if (entry) {\n+ OvsCtIncrementCounters(entry, ctx->reply, curNbl);\n+ }\n return entry;\n }\n \n@@ -382,18 +397,6 @@ OvsCtKeyAreSame(OVS_CT_KEY ctxKey, OVS_CT_KEY entryKey)\n (ctxKey.zone == entryKey.zone));\n }\n \n-static __inline VOID\n-OvsCtIncrementCounters(POVS_CT_ENTRY entry, BOOLEAN reply, PNET_BUFFER_LIST nbl)\n-{\n- if (reply) {\n- entry->rev_key.byteCount+= OvsPacketLenNBL(nbl);\n- entry->rev_key.packetCount++;\n- } else {\n- entry->key.byteCount += OvsPacketLenNBL(nbl);\n- entry->key.packetCount++;\n- }\n-}\n-\n POVS_CT_ENTRY\n OvsCtLookup(OvsConntrackKeyLookupCtx *ctx)\n {\n@@ -730,6 +733,12 @@ OvsCtExecute_(OvsForwardingContext *fwdCtx,\n NdisReleaseRWLock(ovsConntrackLockObj, &lockState);\n OVS_LOG_ERROR(\"Conntrack Limit hit: %lu\", ctTotalEntries);\n return NDIS_STATUS_RESOURCES;\n+\n+ /* Increment the counters soon after the lookup, since we set ct.state\n+ * to OVS_CS_F_TRACKED after processing the ct entry.\n+ */\n+ if (entry && (!(key->ct.state & OVS_CS_F_TRACKED))) {\n+ OvsCtIncrementCounters(entry, ctx.reply, curNbl);\n }\n \n if (!entry) {\n@@ -740,7 +749,6 @@ OvsCtExecute_(OvsForwardingContext *fwdCtx,\n &entryCreated);\n } else {\n /* Process the entry and update CT flags */\n- OvsCtIncrementCounters(entry, ctx.reply, curNbl);\n entry = OvsProcessConntrackEntry(fwdCtx, layers->l4Offset, &ctx, key,\n zone, natInfo, commit, currentTime,\n &entryCreated);\n", "prefixes": [ "ovs-dev" ] }