[ovs-dev] [patch net-next RFC 11/12] sw_flow: add misc section to key with in_port_ifindex field

[Jiri Pirko]

Signed-off-by: Jiri Pirko <j...@resnulli.us>
---
 include/linux/sw_flow.h      |  3 +++
 net/core/switchdev.c         | 10 ++++++++++
 net/openvswitch/hw_offload.c | 23 +++++++++++++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/include/linux/sw_flow.h b/include/linux/sw_flow.h
index 079d065..e2ee54a 100644
--- a/include/linux/sw_flow.h
+++ b/include/linux/sw_flow.h
@@ -68,6 +68,9 @@ struct sw_flow_key {
                        } nd;
                } ipv6;
        };
+       struct {
+               u32     in_port_ifindex; /* Input switch port ifindex (or 0). */
+       } misc;
 } __aligned(BITS_PER_LONG/8); /* Ensure that we can do comparisons as longs. */
 
 struct sw_flow_key_range {
diff --git a/net/core/switchdev.c b/net/core/switchdev.c
index 4fad097..6d271a0 100644
--- a/net/core/switchdev.c
+++ b/net/core/switchdev.c
@@ -75,6 +75,14 @@ static void print_flow_key_ipv4(const char *prefix,
                 key->ipv4.arp.sha, key->ipv4.arp.tha);
 }
 
+static void print_flow_key_misc(const char *prefix,
+                               const struct sw_flow_key *key)
+{
+       pr_debug("%s misc  { in_port_ifindex %08x }\n",
+                prefix,
+                key->misc.in_port_ifindex);
+}
+
 static void print_flow_actions(struct sw_flow_actions *actions)
 {
        int i;
@@ -120,6 +128,8 @@ static void print_flow(const struct sw_flow *flow, struct 
net_device *dev,
        print_flow_key_ip(PREFIX_MASK, &flow->mask->key);
        print_flow_key_ipv4(PREFIX_NONE, &flow->key);
        print_flow_key_ipv4(PREFIX_MASK, &flow->mask->key);
+       print_flow_key_misc(PREFIX_NONE, &flow->key);
+       print_flow_key_misc(PREFIX_MASK, &flow->mask->key);
        print_flow_actions(flow->actions);
 }
 
diff --git a/net/openvswitch/hw_offload.c b/net/openvswitch/hw_offload.c
index edb8a68..ac3997d 100644
--- a/net/openvswitch/hw_offload.c
+++ b/net/openvswitch/hw_offload.c
@@ -82,6 +82,24 @@ errout:
        return err;
 }
 
+void ovs_hw_flow_adjust(struct datapath *dp, struct ovs_flow *flow)
+{
+       struct vport *vport;
+
+       flow->flow.key.misc.in_port_ifindex = 0;
+       flow->flow.mask->key.misc.in_port_ifindex = 0;
+       vport = ovs_vport_ovsl(dp, flow->flow.key.phy.in_port);
+       if (vport && vport->ops->type == OVS_VPORT_TYPE_NETDEV) {
+               struct net_device *dev;
+
+               dev = vport->ops->get_netdev(vport);
+               if (dev) {
+                       flow->flow.key.misc.in_port_ifindex = dev->ifindex;
+                       flow->flow.mask->key.misc.in_port_ifindex = 0xFFFFFFFF;
+               }
+       }
+}
+
 int ovs_hw_flow_insert(struct datapath *dp, struct ovs_flow *flow)
 {
        struct sw_flow_actions *actions;
@@ -92,6 +110,8 @@ int ovs_hw_flow_insert(struct datapath *dp, struct ovs_flow 
*flow)
        ASSERT_OVSL();
        BUG_ON(flow->flow.actions);
 
+       ovs_hw_flow_adjust(dp, flow);
+
        err = sw_flow_action_create(dp, &actions, flow->sf_acts);
        if (err)
                return err;
@@ -121,6 +141,9 @@ int ovs_hw_flow_remove(struct datapath *dp, struct ovs_flow 
*flow)
        int err = 0;
 
        ASSERT_OVSL();
+
+       ovs_hw_flow_adjust(dp, flow);
+
        list_for_each_entry(vport, &dp->swdev_rep_list, swdev_rep_list) {
                dev = vport->ops->get_netdev(vport);
                BUG_ON(!dev);
-- 
1.9.3

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev