Skip to contentSkip to conversation

net: openvswitch: masks cache enhancements

PATCH Superseded Eelco Chaudron 3 participants 6 messages Jul 23, 2020 – Jul 24, 2020

Subsystems (3)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Eelco Chaudron

author maintainer
#0 lore raw

v2 cover net: openvswitch: masks cache enhancements

This patchset adds two enhancements to the Open vSwitch masks cache.

Changes in v2:
- Fix sparse warnings
- Fix netlink policy items reported by Florian Westphal

Eelco Chaudron (2):
net: openvswitch: add masks cache hit counter
net: openvswitch: make masks cache size configurable

 include/uapi/linux/openvswitch.h |    3 +
 net/openvswitch/datapath.c       |   19 ++++++-
 net/openvswitch/datapath.h       |    3 +
 net/openvswitch/flow_table.c     |  109 +++++++++++++++++++++++++++++++++-----
 net/openvswitch/flow_table.h     |   13 ++++-
 5 files changed, 128 insertions(+), 19 deletions(-)
author maintainer
#1 lore raw

PATCH v2 1/2 net: openvswitch: add masks cache hit counter

Add a counter that counts the number of masks cache hits, and export it through the megaflow netlink statistics.

---
 include/uapi/linux/openvswitch.h |    2 +-
 net/openvswitch/datapath.c       |    5 ++++-
 net/openvswitch/datapath.h       |    3 +++
 net/openvswitch/flow_table.c     |   19 ++++++++++++++-----
 net/openvswitch/flow_table.h     |    3 ++-
 5 files changed, 24 insertions(+), 8 deletions(-)
include/uapi/linux/openvswitch.h +1 -1
index 9b14519e74d9..7cb76e5ca7cf 100644
@@ -102,8 +102,8 @@ struct ovs_dp_megaflow_stats {
 	__u64 n_mask_hit;	 /* Number of masks used for flow lookups. */
 	__u32 n_masks;		 /* Number of masks for the datapath. */
 	__u32 pad0;		 /* Pad for future expension. */
+	__u64 n_cache_hit;       /* Number of cache matches for flow lookups. */
 	__u64 pad1;		 /* Pad for future expension. */
-	__u64 pad2;		 /* Pad for future expension. */
 };
 
 struct ovs_vport_stats {
net/openvswitch/datapath.c +4 -1
index 95805f0e27bd..a54df1fe3ec4 100644
@@ -225,13 +225,14 @@ void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key)
 	struct dp_stats_percpu *stats;
 	u64 *stats_counter;
 	u32 n_mask_hit;
+	u32 n_cache_hit;
 	int error;
 
 	stats = this_cpu_ptr(dp->stats_percpu);
 
 	/* Look up flow. */
 	flow = ovs_flow_tbl_lookup_stats(&dp->table, key, skb_get_hash(skb),
-					 &n_mask_hit);
+					 &n_mask_hit, &n_cache_hit);
 	if (unlikely(!flow)) {
 		struct dp_upcall_info upcall;
 
@@ -262,6 +263,7 @@ void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key)
 	u64_stats_update_begin(&stats->syncp);
 	(*stats_counter)++;
 	stats->n_mask_hit += n_mask_hit;
+	stats->n_cache_hit += n_cache_hit;
 	u64_stats_update_end(&stats->syncp);
 }
 
@@ -699,6 +701,7 @@ static void get_dp_stats(const struct datapath *dp, struct ovs_dp_stats *stats,
 		stats->n_missed += local_stats.n_missed;
 		stats->n_lost += local_stats.n_lost;
 		mega_stats->n_mask_hit += local_stats.n_mask_hit;
+		mega_stats->n_cache_hit += local_stats.n_cache_hit;
 	}
 }
 
net/openvswitch/datapath.h +3 -0
index 697a2354194b..86d78613edb4 100644
@@ -38,12 +38,15 @@
  * @n_mask_hit: Number of masks looked up for flow match.
  *   @n_mask_hit / (@n_hit + @n_missed)  will be the average masks looked
  *   up per packet.
+ * @n_cache_hit: The number of received packets that had their mask found using
+ * the mask cache.
  */
 struct dp_stats_percpu {
 	u64 n_hit;
 	u64 n_missed;
 	u64 n_lost;
 	u64 n_mask_hit;
+	u64 n_cache_hit;
 	struct u64_stats_sync syncp;
 };
 
net/openvswitch/flow_table.c +14 -5
index af22c9ee28dd..a5912ea05352 100644
@@ -667,6 +667,7 @@ static struct sw_flow *flow_lookup(struct flow_table *tbl,
 				   struct mask_array *ma,
 				   const struct sw_flow_key *key,
 				   u32 *n_mask_hit,
+				   u32 *n_cache_hit,
 				   u32 *index)
 {
 	u64 *usage_counters = this_cpu_ptr(ma->masks_usage_cntr);
@@ -682,6 +683,7 @@ static struct sw_flow *flow_lookup(struct flow_table *tbl,
 				u64_stats_update_begin(&ma->syncp);
 				usage_counters[*index]++;
 				u64_stats_update_end(&ma->syncp);
+				(*n_cache_hit)++;
 				return flow;
 			}
 		}
@@ -719,7 +721,8 @@ static struct sw_flow *flow_lookup(struct flow_table *tbl,
 struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl,
 					  const struct sw_flow_key *key,
 					  u32 skb_hash,
-					  u32 *n_mask_hit)
+					  u32 *n_mask_hit,
+					  u32 *n_cache_hit)
 {
 	struct mask_array *ma = rcu_dereference(tbl->mask_array);
 	struct table_instance *ti = rcu_dereference(tbl->ti);
@@ -729,10 +732,13 @@ struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl,
 	int seg;
 
 	*n_mask_hit = 0;
+	*n_cache_hit = 0;
 	if (unlikely(!skb_hash)) {
 		u32 mask_index = 0;
+		u32 cache = 0;
 
-		return flow_lookup(tbl, ti, ma, key, n_mask_hit, &mask_index);
+		return flow_lookup(tbl, ti, ma, key, n_mask_hit, &cache,
+				   &mask_index);
 	}
 
 	/* Pre and post recirulation flows usually have the same skb_hash
@@ -753,7 +759,7 @@ struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl,
 		e = &entries[index];
 		if (e->skb_hash == skb_hash) {
 			flow = flow_lookup(tbl, ti, ma, key, n_mask_hit,
-					   &e->mask_index);
+					   n_cache_hit, &e->mask_index);
 			if (!flow)
 				e->skb_hash = 0;
 			return flow;
@@ -766,10 +772,12 @@ struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl,
 	}
 
 	/* Cache miss, do full lookup. */
-	flow = flow_lookup(tbl, ti, ma, key, n_mask_hit, &ce->mask_index);
+	flow = flow_lookup(tbl, ti, ma, key, n_mask_hit, n_cache_hit,
+			   &ce->mask_index);
 	if (flow)
 		ce->skb_hash = skb_hash;
 
+	*n_cache_hit = 0;
 	return flow;
 }
 
@@ -779,9 +787,10 @@ struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *tbl,
 	struct table_instance *ti = rcu_dereference_ovsl(tbl->ti);
 	struct mask_array *ma = rcu_dereference_ovsl(tbl->mask_array);
 	u32 __always_unused n_mask_hit;
+	u32 __always_unused n_cache_hit;
 	u32 index = 0;
 
-	return flow_lookup(tbl, ti, ma, key, &n_mask_hit, &index);
+	return flow_lookup(tbl, ti, ma, key, &n_mask_hit, &n_cache_hit, &index);
 }
 
 struct sw_flow *ovs_flow_tbl_lookup_exact(struct flow_table *tbl,
net/openvswitch/flow_table.h +2 -1
index 1f664b050e3b..325e939371d8 100644
@@ -82,7 +82,8 @@ struct sw_flow *ovs_flow_tbl_dump_next(struct table_instance *table,
 struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *,
 					  const struct sw_flow_key *,
 					  u32 skb_hash,
-					  u32 *n_mask_hit);
+					  u32 *n_mask_hit,
+					  u32 *n_cache_hit);
 struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *,
 				    const struct sw_flow_key *);
 struct sw_flow *ovs_flow_tbl_lookup_exact(struct flow_table *tbl,
Reviewed-by on v2 1/2
#2 lore raw

Re: [ovs-dev] [PATCH net-next v2 1/2] net: openvswitch: add masks cache hit counter

Quoted 6 lines · Eelco Chaudron

Add a counter that counts the number of masks cache hits, and export it through the megaflow netlink statistics.

LGTM

Quoted 173 lines
---
 include/uapi/linux/openvswitch.h |    2 +-
 net/openvswitch/datapath.c       |    5 ++++-
 net/openvswitch/datapath.h       |    3 +++
 net/openvswitch/flow_table.c     |   19 ++++++++++++++-----
 net/openvswitch/flow_table.h     |    3 ++-
 5 files changed, 24 insertions(+), 8 deletions(-)
include/uapi/linux/openvswitch.h +1 -1
index 9b14519e74d9..7cb76e5ca7cf 100644
@@ -102,8 +102,8 @@ struct ovs_dp_megaflow_stats {
        __u64 n_mask_hit;        /* Number of masks used for flow lookups. */
        __u32 n_masks;           /* Number of masks for the datapath. */
        __u32 pad0;              /* Pad for future expension. */
+       __u64 n_cache_hit;       /* Number of cache matches for flow lookups. */
        __u64 pad1;              /* Pad for future expension. */
-       __u64 pad2;              /* Pad for future expension. */
 };
 
 struct ovs_vport_stats {
net/openvswitch/datapath.c +4 -1
index 95805f0e27bd..a54df1fe3ec4 100644
@@ -225,13 +225,14 @@ void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key)
        struct dp_stats_percpu *stats;
        u64 *stats_counter;
        u32 n_mask_hit;
+       u32 n_cache_hit;
        int error;
 
        stats = this_cpu_ptr(dp->stats_percpu);
 
        /* Look up flow. */
        flow = ovs_flow_tbl_lookup_stats(&dp->table, key, skb_get_hash(skb),
-                                        &n_mask_hit);
+                                        &n_mask_hit, &n_cache_hit);
        if (unlikely(!flow)) {
                struct dp_upcall_info upcall;
 
@@ -262,6 +263,7 @@ void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key)
        u64_stats_update_begin(&stats->syncp);
        (*stats_counter)++;
        stats->n_mask_hit += n_mask_hit;
+       stats->n_cache_hit += n_cache_hit;
        u64_stats_update_end(&stats->syncp);
 }
 
@@ -699,6 +701,7 @@ static void get_dp_stats(const struct datapath *dp, struct ovs_dp_stats *stats,
                stats->n_missed += local_stats.n_missed;
                stats->n_lost += local_stats.n_lost;
                mega_stats->n_mask_hit += local_stats.n_mask_hit;
+               mega_stats->n_cache_hit += local_stats.n_cache_hit;
        }
 }
 
net/openvswitch/datapath.h +3 -0
index 697a2354194b..86d78613edb4 100644
@@ -38,12 +38,15 @@
  * @n_mask_hit: Number of masks looked up for flow match.
  *   @n_mask_hit / (@n_hit + @n_missed)  will be the average masks looked
  *   up per packet.
+ * @n_cache_hit: The number of received packets that had their mask found using
+ * the mask cache.
  */
 struct dp_stats_percpu {
        u64 n_hit;
        u64 n_missed;
        u64 n_lost;
        u64 n_mask_hit;
+       u64 n_cache_hit;
        struct u64_stats_sync syncp;
 };
 
net/openvswitch/flow_table.c +14 -5
index af22c9ee28dd..a5912ea05352 100644
@@ -667,6 +667,7 @@ static struct sw_flow *flow_lookup(struct flow_table *tbl,
                                   struct mask_array *ma,
                                   const struct sw_flow_key *key,
                                   u32 *n_mask_hit,
+                                  u32 *n_cache_hit,
                                   u32 *index)
 {
        u64 *usage_counters = this_cpu_ptr(ma->masks_usage_cntr);
@@ -682,6 +683,7 @@ static struct sw_flow *flow_lookup(struct flow_table *tbl,
                                u64_stats_update_begin(&ma->syncp);
                                usage_counters[*index]++;
                                u64_stats_update_end(&ma->syncp);
+                               (*n_cache_hit)++;
                                return flow;
                        }
                }
@@ -719,7 +721,8 @@ static struct sw_flow *flow_lookup(struct flow_table *tbl,
 struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl,
                                          const struct sw_flow_key *key,
                                          u32 skb_hash,
-                                         u32 *n_mask_hit)
+                                         u32 *n_mask_hit,
+                                         u32 *n_cache_hit)
 {
        struct mask_array *ma = rcu_dereference(tbl->mask_array);
        struct table_instance *ti = rcu_dereference(tbl->ti);
@@ -729,10 +732,13 @@ struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl,
        int seg;
 
        *n_mask_hit = 0;
+       *n_cache_hit = 0;
        if (unlikely(!skb_hash)) {
                u32 mask_index = 0;
+               u32 cache = 0;
 
-               return flow_lookup(tbl, ti, ma, key, n_mask_hit, &mask_index);
+               return flow_lookup(tbl, ti, ma, key, n_mask_hit, &cache,
+                                  &mask_index);
        }
 
        /* Pre and post recirulation flows usually have the same skb_hash
@@ -753,7 +759,7 @@ struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl,
                e = &entries[index];
                if (e->skb_hash == skb_hash) {
                        flow = flow_lookup(tbl, ti, ma, key, n_mask_hit,
-                                          &e->mask_index);
+                                          n_cache_hit, &e->mask_index);
                        if (!flow)
                                e->skb_hash = 0;
                        return flow;
@@ -766,10 +772,12 @@ struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl,
        }
 
        /* Cache miss, do full lookup. */
-       flow = flow_lookup(tbl, ti, ma, key, n_mask_hit, &ce->mask_index);
+       flow = flow_lookup(tbl, ti, ma, key, n_mask_hit, n_cache_hit,
+                          &ce->mask_index);
        if (flow)
                ce->skb_hash = skb_hash;
 
+       *n_cache_hit = 0;
        return flow;
 }
 
@@ -779,9 +787,10 @@ struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *tbl,
        struct table_instance *ti = rcu_dereference_ovsl(tbl->ti);
        struct mask_array *ma = rcu_dereference_ovsl(tbl->mask_array);
        u32 __always_unused n_mask_hit;
+       u32 __always_unused n_cache_hit;
        u32 index = 0;
 
-       return flow_lookup(tbl, ti, ma, key, &n_mask_hit, &index);
+       return flow_lookup(tbl, ti, ma, key, &n_mask_hit, &n_cache_hit, &index);
 }
 
 struct sw_flow *ovs_flow_tbl_lookup_exact(struct flow_table *tbl,
net/openvswitch/flow_table.h +2 -1
index 1f664b050e3b..325e939371d8 100644
@@ -82,7 +82,8 @@ struct sw_flow *ovs_flow_tbl_dump_next(struct table_instance *table,
 struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *,
                                          const struct sw_flow_key *,
                                          u32 skb_hash,
-                                         u32 *n_mask_hit);
+                                         u32 *n_mask_hit,
+                                         u32 *n_cache_hit);
 struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *,
                                    const struct sw_flow_key *);
 struct sw_flow *ovs_flow_tbl_lookup_exact(struct flow_table *tbl,
Quoted 4 lines

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

--
Best regards, Tonghao

author maintainer
#3 lore raw

PATCH v2 2/2 net: openvswitch: make masks cache size configurable

In reply to Eelco Chaudron

This patch makes the masks cache size configurable, or with a size of 0, disable it.

---
 include/uapi/linux/openvswitch.h |    1 
 net/openvswitch/datapath.c       |   14 ++++++
 net/openvswitch/flow_table.c     |   90 ++++++++++++++++++++++++++++++++++----
 net/openvswitch/flow_table.h     |   10 ++++
 4 files changed, 104 insertions(+), 11 deletions(-)
include/uapi/linux/openvswitch.h +1 -0
index 7cb76e5ca7cf..8300cc29dec8 100644
@@ -86,6 +86,7 @@ enum ovs_datapath_attr {
 	OVS_DP_ATTR_MEGAFLOW_STATS,	/* struct ovs_dp_megaflow_stats */
 	OVS_DP_ATTR_USER_FEATURES,	/* OVS_DP_F_*  */
 	OVS_DP_ATTR_PAD,
+	OVS_DP_ATTR_MASKS_CACHE_SIZE,
 	__OVS_DP_ATTR_MAX
 };
 
net/openvswitch/datapath.c +14 -0
index a54df1fe3ec4..114b2ddb8037 100644
@@ -1498,6 +1498,7 @@ static size_t ovs_dp_cmd_msg_size(void)
 	msgsize += nla_total_size_64bit(sizeof(struct ovs_dp_stats));
 	msgsize += nla_total_size_64bit(sizeof(struct ovs_dp_megaflow_stats));
 	msgsize += nla_total_size(sizeof(u32)); /* OVS_DP_ATTR_USER_FEATURES */
+	msgsize += nla_total_size(sizeof(u32)); /* OVS_DP_ATTR_MASKS_CACHE_SIZE */
 
 	return msgsize;
 }
@@ -1535,6 +1536,10 @@ static int ovs_dp_cmd_fill_info(struct datapath *dp, struct sk_buff *skb,
 	if (nla_put_u32(skb, OVS_DP_ATTR_USER_FEATURES, dp->user_features))
 		goto nla_put_failure;
 
+	if (nla_put_u32(skb, OVS_DP_ATTR_MASKS_CACHE_SIZE,
+			ovs_flow_tbl_masks_cache_size(&dp->table)))
+		goto nla_put_failure;
+
 	genlmsg_end(skb, ovs_header);
 	return 0;
 
@@ -1599,6 +1604,13 @@ static int ovs_dp_change(struct datapath *dp, struct nlattr *a[])
 #endif
 	}
 
+	if (a[OVS_DP_ATTR_MASKS_CACHE_SIZE]) {
+		u32 cache_size;
+
+		cache_size = nla_get_u32(a[OVS_DP_ATTR_MASKS_CACHE_SIZE]);
+		ovs_flow_tbl_masks_cache_resize(&dp->table, cache_size);
+	}
+
 	dp->user_features = user_features;
 
 	if (dp->user_features & OVS_DP_F_TC_RECIRC_SHARING)
@@ -1894,6 +1906,8 @@ static const struct nla_policy datapath_policy[OVS_DP_ATTR_MAX + 1] = {
 	[OVS_DP_ATTR_NAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
 	[OVS_DP_ATTR_UPCALL_PID] = { .type = NLA_U32 },
 	[OVS_DP_ATTR_USER_FEATURES] = { .type = NLA_U32 },
+	[OVS_DP_ATTR_MASKS_CACHE_SIZE] =  NLA_POLICY_RANGE(NLA_U32, 0,
+		PCPU_MIN_UNIT_SIZE / sizeof(struct mask_cache_entry)),
 };
 
 static const struct genl_ops dp_datapath_genl_ops[] = {
net/openvswitch/flow_table.c +80 -10

153 lines not on this page · raw message

net/openvswitch/flow_table.h +9 -1
index 325e939371d8..f2dba952db2f 100644
@@ -27,6 +27,12 @@ struct mask_cache_entry {
 	u32 mask_index;
 };
 
+struct mask_cache {
+	struct rcu_head rcu;
+	u32 cache_size;  /* Must be ^2 value. */
+	struct mask_cache_entry __percpu *mask_cache;
+};
+
 struct mask_count {
 	int index;
 	u64 counter;
@@ -53,7 +59,7 @@ struct table_instance {
 struct flow_table {
 	struct table_instance __rcu *ti;
 	struct table_instance __rcu *ufid_ti;
-	struct mask_cache_entry __percpu *mask_cache;
+	struct mask_cache __rcu *mask_cache;
 	struct mask_array __rcu *mask_array;
 	unsigned long last_rehash;
 	unsigned int count;
@@ -77,6 +83,8 @@ int ovs_flow_tbl_insert(struct flow_table *table, struct sw_flow *flow,
 			const struct sw_flow_mask *mask);
 void ovs_flow_tbl_remove(struct flow_table *table, struct sw_flow *flow);
 int  ovs_flow_tbl_num_masks(const struct flow_table *table);
+u32  ovs_flow_tbl_masks_cache_size(const struct flow_table *table);
+void ovs_flow_tbl_masks_cache_resize(struct flow_table *table, u32 size);
 struct sw_flow *ovs_flow_tbl_dump_next(struct table_instance *table,
 				       u32 *bucket, u32 *idx);
 struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *,
maintainer
#4 lore raw

Re: [PATCH net-next v2 2/2] net: openvswitch: make masks cache size configurable

net/openvswitch/flow_table.c static void flow_mask_remove(struct flow_table *tbl, struct sw_flow_mask *mask) · line 366

Quoted 1 line · On Thu, 23 Jul 2020 14:58:31 +0200 Eelco Chaudron wrote:
net/openvswitch/flow_table.c +1 -0
+	if ((size & (size - 1)) != 0 ||

is_power_of_2() ?

net/openvswitch/flow_table.c static void flow_mask_remove(struct flow_table *tbl, struct sw_flow_mask *mask) · line 377

Quoted 7 lines
net/openvswitch/flow_table.c +6 -0
+	    (size * sizeof(struct mask_cache_entry)) > PCPU_MIN_UNIT_SIZE)
+		return NULL;
 
+	new->cache_size = size;
+	if (new->cache_size > 0) {
+		cache = __alloc_percpu(sizeof(struct mask_cache_entry) *
+				       new->cache_size,

array_size() ?

Review

Quoted 2 lines
(quoted diff) +2 -0
+				       __alignof__(struct mask_cache_entry));
+

No need for the new line here

net/openvswitch/flow_table.c static void flow_mask_remove(struct flow_table *tbl, struct sw_flow_mask *mask)

Quoted 7 lines
net/openvswitch/flow_table.c +6 -0
+		if (!cache) {
+			kfree(new);
+			return NULL;
+		}
+	}
 
+	if (size == mc->cache_size || (size & (size - 1)) != 0)

why check "is power of 2" twice?

net/openvswitch/flow_table.c void ovs_flow_tbl_destroy(struct flow_table *table) · line 522

Quoted 9 lines
net/openvswitch/flow_table.c +1 -1
@@ -454,7 +516,7 @@ void ovs_flow_tbl_destroy(struct flow_table *table)
 	struct table_instance *ti = rcu_dereference_raw(table->ti);
 	struct table_instance *ufid_ti = rcu_dereference_raw(table->ufid_ti);
 
-	free_percpu(table->mask_cache);
+	call_rcu(&table->mask_cache->rcu, mask_cache_rcu_cb);
 	call_rcu(&table->mask_array->rcu, mask_array_rcu_cb);
 	table_instance_destroy(table, ti, ufid_ti, false);
 }

This adds a new warning :(

net/openvswitch/flow_table.c:519:24: warning: incorrect type in argument 1 (different address spaces)
net/openvswitch/flow_table.c:519:24: expected struct callback_head *head
net/openvswitch/flow_table.c:519:24: got struct callback_head [noderef] __rcu *

author maintainer
#5 lore raw

Re: [PATCH net-next v2 2/2] net: openvswitch: make masks cache size configurable

Quoted 4 lines · Jakub Kicinski

net/openvswitch/flow_table.c static void flow_mask_remove(struct flow_table *tbl, struct sw_flow_mask *mask) · line 366

Quoted 1 line · On Thu, 23 Jul 2020 14:58:31 +0200 Eelco Chaudron wrote:
net/openvswitch/flow_table.c +1 -0
+	if ((size & (size - 1)) != 0 ||

is_power_of_2() ?

Was not aware of this macro, will replace…

Quoted 10 lines

net/openvswitch/flow_table.c static void flow_mask_remove(struct flow_table *tbl, struct sw_flow_mask *mask) · line 377

Quoted 8 lines
net/openvswitch/flow_table.c +6 -0
+	    (size * sizeof(struct mask_cache_entry)) > PCPU_MIN_UNIT_SIZE)
+		return NULL;
 
+	new->cache_size = size;
+	if (new->cache_size > 0) {
+		cache = __alloc_percpu(sizeof(struct mask_cache_entry) *
+				       new->cache_size,

array_size() ?

Will change to:

		cache = __alloc_percpu(array_size(
					       sizeof(struct mask_cache_entry),
					       new->cache_size),
				       __alignof__(struct mask_cache_entry));
		if (!cache) {
Quoted 5 lines

Review

Quoted 3 lines
(quoted diff) +2 -0
+				       __alignof__(struct mask_cache_entry));
+

No need for the new line here

Will remove

Quoted 9 lines

net/openvswitch/flow_table.c static void flow_mask_remove(struct flow_table *tbl, struct sw_flow_mask *mask)

Quoted 7 lines
net/openvswitch/flow_table.c +6 -0
+		if (!cache) {
+			kfree(new);
+			return NULL;
+		}
+	}
 
+	if (size == mc->cache_size || (size & (size - 1)) != 0)

why check "is power of 2" twice?

Will remove as it will always call tbl_mask_cache_alloc() which has the check above.

Quoted 15 lines
Quoted 10 lines
net/openvswitch/flow_table.c +1 -1
@@ -454,7 +516,7 @@ void ovs_flow_tbl_destroy(struct flow_table 
 *table)
 	struct table_instance *ti = rcu_dereference_raw(table->ti);
 	struct table_instance *ufid_ti = 
 rcu_dereference_raw(table->ufid_ti);
 
-	free_percpu(table->mask_cache);
+	call_rcu(&table->mask_cache->rcu, mask_cache_rcu_cb);
 	call_rcu(&table->mask_array->rcu, mask_array_rcu_cb);
Quoted 2 lines

table_instance_destroy(table, ti, ufid_ti, false);
}

This adds a new warning :(

Quoted 3 lines

net/openvswitch/flow_table.c:519:24: warning: incorrect type in argument 1 (different address spaces)
net/openvswitch/flow_table.c:519:24: expected struct callback_head *head
net/openvswitch/flow_table.c:519:24: got struct callback_head [noderef] __rcu *

:( Yes my diff with older did not work… Sure I’ve fixed them all now :)

Will sent out a V3 after some testing…