From: xiangxia.m.yue@gmail.com
To: gvrose8192@gmail.com, pshelar@ovn.org
Cc: netdev@vger.kernel.org, dev@openvswitch.org,
Tonghao Zhang <xiangxia.m.yue@gmail.com>
Subject: [PATCH net-next v3 03/10] net: openvswitch: shrink the mask array if necessary
Date: Fri, 11 Oct 2019 22:00:40 +0800 [thread overview]
Message-ID: <1570802447-8019-4-git-send-email-xiangxia.m.yue@gmail.com> (raw)
In-Reply-To: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com>
From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
When creating and inserting flow-mask, if there is no available
flow-mask, we realloc the mask array. When removing flow-mask,
if necessary, we shrink mask array.
Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
---
net/openvswitch/flow_table.c | 33 +++++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c
index aab7a27..ff4c4b049 100644
--- a/net/openvswitch/flow_table.c
+++ b/net/openvswitch/flow_table.c
@@ -693,6 +693,23 @@ static struct table_instance *table_instance_expand(struct table_instance *ti,
return table_instance_rehash(ti, ti->n_buckets * 2, ufid);
}
+static void tbl_mask_array_delete_mask(struct mask_array *ma,
+ struct sw_flow_mask *mask)
+{
+ int i;
+
+ /* Remove the deleted mask pointers from the array */
+ for (i = 0; i < ma->max; i++) {
+ if (mask == ovsl_dereference(ma->masks[i])) {
+ RCU_INIT_POINTER(ma->masks[i], NULL);
+ ma->count--;
+ kfree_rcu(mask, rcu);
+ return;
+ }
+ }
+ BUG();
+}
+
/* Remove 'mask' from the mask list, if it is not needed any more. */
static void flow_mask_remove(struct flow_table *tbl, struct sw_flow_mask *mask)
{
@@ -706,18 +723,14 @@ static void flow_mask_remove(struct flow_table *tbl, struct sw_flow_mask *mask)
if (!mask->ref_count) {
struct mask_array *ma;
- int i;
ma = ovsl_dereference(tbl->mask_array);
- for (i = 0; i < ma->max; i++) {
- if (mask == ovsl_dereference(ma->masks[i])) {
- RCU_INIT_POINTER(ma->masks[i], NULL);
- ma->count--;
- kfree_rcu(mask, rcu);
- return;
- }
- }
- BUG();
+ tbl_mask_array_delete_mask(ma, mask);
+
+ /* Shrink the mask array if necessary. */
+ if (ma->max >= (MASK_ARRAY_SIZE_MIN * 2) &&
+ ma->count <= (ma->max / 3))
+ tbl_mask_array_realloc(tbl, ma->max / 2);
}
}
}
--
1.8.3.1
next prev parent reply other threads:[~2019-10-11 14:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-11 14:00 [PATCH net-next v3 00/10] optimize openvswitch flow looking up xiangxia.m.yue
2019-10-11 14:00 ` [PATCH net-next v3 01/10] net: openvswitch: add flow-mask cache for performance xiangxia.m.yue
2019-10-11 14:00 ` [PATCH net-next v3 02/10] net: openvswitch: convert mask list in mask array xiangxia.m.yue
2019-10-13 10:58 ` kbuild test robot
2019-10-11 14:00 ` xiangxia.m.yue [this message]
2019-10-11 14:00 ` [PATCH net-next v3 04/10] net: openvswitch: optimize flow mask cache hash collision xiangxia.m.yue
2019-10-11 14:00 ` [PATCH net-next v3 05/10] net: openvswitch: optimize flow-mask looking up xiangxia.m.yue
2019-10-14 7:02 ` Pravin Shelar
2019-10-11 14:00 ` [PATCH net-next v3 06/10] net: openvswitch: simplify the flow_hash xiangxia.m.yue
2019-10-11 14:00 ` [PATCH net-next v3 07/10] net: openvswitch: add likely in flow_lookup xiangxia.m.yue
2019-10-11 14:00 ` [PATCH net-next v3 08/10] net: openvswitch: fix possible memleak on destroy flow-table xiangxia.m.yue
2019-10-11 14:00 ` [PATCH net-next v3 09/10] net: openvswitch: don't unlock mutex when changing the user_features fails xiangxia.m.yue
2019-10-11 14:00 ` [PATCH net-next v3 10/10] net: openvswitch: simplify the ovs_dp_cmd_new xiangxia.m.yue
2019-10-15 20:01 ` [PATCH net-next v3 00/10] optimize openvswitch flow looking up Gregory Rose
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1570802447-8019-4-git-send-email-xiangxia.m.yue@gmail.com \
--to=xiangxia.m.yue@gmail.com \
--cc=dev@openvswitch.org \
--cc=gvrose8192@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pshelar@ovn.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).