[ovs-dev] [PATCH] [PATCH v3][branch-2.4] dpif_probe_feature not suported in windows datapath

[Eitan Eliahu]

Acked-by: Eitan Eliahu <eliahue at vmware.com>
Thanks,
Eitan

-----Original Message-----
From: dev [mailto:dev-bounces at openvswitch.org] On Behalf Of Alin Serdean
Sent: Thursday, June 25, 2015 10:19 AM
To: dev at openvswitch.org
Subject: [ovs-dev] [PATCH] [PATCH v3][branch-2.4] dpif_probe_feature not suported in windows datapath

This patch disables features which are not currently supported in the windows datapath.

Unfortunately we have to do it in userspace because dpif_probe_feature is not treated accordingly in the windows the datapath.

I opened the issue to track the feature for later implementations:
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_openvswitch_ovs-2Dissues_issues_85&d=BQIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=CWsgHUxi6ExLXY798tmo3LJ4e3geGYp56lkcH-5cLCY&m=HJQhy35_OR1JNLBJwkqAnyF4JP3rIFj7afqs8puK-5Q&s=DQfR4oXdznIeaYj4XE1I8Np2yJchVsAJQbB2paQyOf8&e= 

Signed-off-by: Alin Gabriel Serdean <aserdean at cloudbasesolutions.com>
---
v3: Add Sign-off-by
v2: Rebase
---
---
 ofproto/ofproto-dpif.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 369e0b9..6cdaa32 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -1010,8 +1010,14 @@ check_recirc(struct dpif_backer *backer)
 
     ofpbuf_use_stack(&key, &keybuf, sizeof keybuf);
     odp_flow_key_from_flow(&key, &flow, NULL, 0, true);
+#ifdef _WIN32
+    /* XXX Force disable of datapath recirculation from userspace until the
+     * dpif_probe_feature is properly implemented in the windows datapath */
+    enable_recirc = false;
+#else
     enable_recirc = dpif_probe_feature(backer->dpif, "recirculation", &key,
                                        NULL);
+#endif
 
     if (enable_recirc) {
         VLOG_INFO("%s: Datapath supports recirculation", @@ -1045,7 +1051,13 @@ check_ufid(struct dpif_backer *backer)
     odp_flow_key_from_flow(&key, &flow, NULL, 0, true);
     dpif_flow_hash(backer->dpif, key.data, key.size, &ufid);
 
+#ifdef _WIN32
+    /* XXX Force disable of datapath recirculation from userspace until the
+     * dpif_probe_feature is properly implemented in the windows datapath */
+    enable_ufid = false;
+#else
     enable_ufid = dpif_probe_feature(backer->dpif, "UFID", &key, &ufid);
+#endif
 
     if (enable_ufid) {
         VLOG_INFO("%s: Datapath supports unique flow ids", @@ -1151,6 +1163,11 @@ check_max_mpls_depth(struct dpif_backer *backer)
 
         ofpbuf_use_stack(&key, &keybuf, sizeof keybuf);
         odp_flow_key_from_flow(&key, &flow, NULL, 0, false);
+#ifdef _WIN32
+        /* XXX Force disable of datapath recirculation from userspace until the
+         * dpif_probe_feature is properly implemented in the windows datapath */
+        break;
+#endif
         if (!dpif_probe_feature(backer->dpif, "MPLS", &key, NULL)) {
             break;
         }
--
1.9.5.msysgit.0
_______________________________________________
dev mailing list
dev at openvswitch.org
https://urldefense.proofpoint.com/v2/url?u=http-3A__openvswitch.org_mailman_listinfo_dev&d=BQIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=CWsgHUxi6ExLXY798tmo3LJ4e3geGYp56lkcH-5cLCY&m=HJQhy35_OR1JNLBJwkqAnyF4JP3rIFj7afqs8puK-5Q&s=qV4ezZ0iFbhztu1BiqvQsHBK0NjZa-WCQ0gQpUm4TvI&e=