From: xiangxia.m.yue@gmail.com
To: pshelar@ovn.org, azhou@ovn.org, blp@ovn.org, u9012063@gmail.com
Cc: netdev@vger.kernel.org, dev@openvswitch.org,
Tonghao Zhang <xiangxia.m.yue@gmail.com>
Subject: [PATCH net-next v2 2/5] net: openvswitch: set max limitation to meters
Date: Thu, 16 Apr 2020 18:17:00 +0800 [thread overview]
Message-ID: <1587032223-49460-3-git-send-email-xiangxia.m.yue@gmail.com> (raw)
In-Reply-To: <1587032223-49460-1-git-send-email-xiangxia.m.yue@gmail.com>
From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
Don't allow user to create meter unlimitedly,
which may cause to consume a large amount of kernel memory.
The 200,000 meters may be fine in general case.
Cc: Pravin B Shelar <pshelar@ovn.org>
Cc: Andy Zhou <azhou@ovn.org>
Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
---
net/openvswitch/meter.c | 21 +++++++++++++++------
net/openvswitch/meter.h | 1 +
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
index 494a0014ecd8..1b6776f9c109 100644
--- a/net/openvswitch/meter.c
+++ b/net/openvswitch/meter.c
@@ -137,6 +137,7 @@ static int attach_meter(struct dp_meter_table *tbl, struct dp_meter *meter)
{
struct dp_meter_instance *ti = rcu_dereference_ovsl(tbl->ti);
u32 hash = meter_hash(ti, meter->id);
+ int err;
/*
* In generally, slot selected should be empty, because
@@ -148,16 +149,24 @@ static int attach_meter(struct dp_meter_table *tbl, struct dp_meter *meter)
dp_meter_instance_insert(ti, meter);
/* That function is thread-safe. */
- if (++tbl->count >= ti->n_meters)
- if (dp_meter_instance_realloc(tbl, ti->n_meters * 2))
- goto expand_err;
+ tbl->count++;
+ if (tbl->count > DP_METER_NUM_MAX) {
+ err = -EFBIG;
+ goto attach_err;
+ }
+
+ if (tbl->count >= ti->n_meters &&
+ dp_meter_instance_realloc(tbl, ti->n_meters * 2)) {
+ err = -ENOMEM;
+ goto attach_err;
+ }
return 0;
-expand_err:
+attach_err:
dp_meter_instance_remove(ti, meter);
tbl->count--;
- return -ENOMEM;
+ return err;
}
static void detach_meter(struct dp_meter_table *tbl, struct dp_meter *meter)
@@ -264,7 +273,7 @@ static int ovs_meter_cmd_features(struct sk_buff *skb, struct genl_info *info)
if (IS_ERR(reply))
return PTR_ERR(reply);
- if (nla_put_u32(reply, OVS_METER_ATTR_MAX_METERS, U32_MAX) ||
+ if (nla_put_u32(reply, OVS_METER_ATTR_MAX_METERS, DP_METER_NUM_MAX) ||
nla_put_u32(reply, OVS_METER_ATTR_MAX_BANDS, DP_MAX_BANDS))
goto nla_put_failure;
diff --git a/net/openvswitch/meter.h b/net/openvswitch/meter.h
index d91940383bbe..cdfc6b9dbd42 100644
--- a/net/openvswitch/meter.h
+++ b/net/openvswitch/meter.h
@@ -19,6 +19,7 @@ struct datapath;
#define DP_MAX_BANDS 1
#define DP_METER_ARRAY_SIZE_MIN (1ULL << 10)
+#define DP_METER_NUM_MAX (200000ULL)
struct dp_meter_band {
u32 type;
--
2.23.0
next prev parent reply other threads:[~2020-04-18 17:25 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 13:10 [PATCH net-next v1 1/3] net: openvswitch: expand the meters number supported xiangxia.m.yue
2020-03-23 13:10 ` [PATCH net-next v1 2/3] net: openvswitch: set max limitation to meters xiangxia.m.yue
2020-03-23 13:10 ` [PATCH net-next v1 3/3] net: openvswitch: remove the unnecessary check xiangxia.m.yue
2020-03-29 16:46 ` [PATCH net-next v1 1/3] net: openvswitch: expand the meters number supported Pravin Shelar
2020-03-30 0:34 ` Tonghao Zhang
2020-03-31 3:57 ` Pravin Shelar
2020-04-01 10:50 ` Tonghao Zhang
2020-04-01 21:12 ` Pravin Shelar
2020-04-08 15:09 ` [ovs-dev] " William Tu
2020-04-08 15:59 ` Tonghao Zhang
2020-04-08 16:01 ` Tonghao Zhang
2020-04-09 21:41 ` William Tu
2020-04-09 23:29 ` Tonghao Zhang
2020-04-11 8:14 ` Pravin Shelar
2020-04-16 10:16 ` [PATCH net-next v2 0/5] expand meter tables and fix bug xiangxia.m.yue
2020-04-16 10:16 ` [PATCH net-next v2 1/5] net: openvswitch: expand the meters supported number xiangxia.m.yue
2020-04-19 17:29 ` Pravin Shelar
2020-04-20 0:23 ` Tonghao Zhang
2020-04-20 21:43 ` Pravin Shelar
2020-04-16 10:17 ` xiangxia.m.yue [this message]
2020-04-19 17:30 ` [PATCH net-next v2 2/5] net: openvswitch: set max limitation to meters Pravin Shelar
2020-04-20 0:28 ` Tonghao Zhang
2020-04-20 21:44 ` Pravin Shelar
2020-04-16 10:17 ` [PATCH net-next v2 3/5] net: openvswitch: remove the unnecessary check xiangxia.m.yue
2020-04-16 10:17 ` [PATCH net-next v2 4/5] net: openvswitch: make EINVAL return value more obvious xiangxia.m.yue
2020-04-16 10:17 ` [PATCH net-next v2 5/5] net: openvswitch: use u64 for meter bucket xiangxia.m.yue
2020-04-18 22:39 ` [PATCH net-next v2 0/5] expand meter tables and fix bug David Miller
2020-04-22 17:08 ` [PATCH net-next v3 " xiangxia.m.yue
2020-04-22 17:08 ` [PATCH net-next v3 1/5] net: openvswitch: expand the meters supported number xiangxia.m.yue
2020-04-23 3:54 ` Pravin Shelar
2020-04-22 17:08 ` [PATCH net-next v3 2/5] net: openvswitch: set max limitation to meters xiangxia.m.yue
2020-04-23 3:54 ` Pravin Shelar
2020-04-22 17:08 ` [PATCH net-next v3 3/5] net: openvswitch: remove the unnecessary check xiangxia.m.yue
2020-04-23 3:54 ` Pravin Shelar
2020-04-22 17:08 ` [PATCH net-next v3 4/5] net: openvswitch: make EINVAL return value more obvious xiangxia.m.yue
2020-04-23 3:54 ` Pravin Shelar
2020-04-22 17:09 ` [PATCH net-next v3 5/5] net: openvswitch: use u64 for meter bucket xiangxia.m.yue
2020-04-23 3:54 ` Pravin Shelar
2020-04-23 19:45 ` [PATCH net-next v3 0/5] expand meter tables and fix bug David Miller
2020-04-23 19:49 ` David Miller
2020-04-23 22:56 ` Tonghao Zhang
2020-04-24 0:08 ` [PATCH net-next v4 " xiangxia.m.yue
2020-04-24 0:08 ` [PATCH net-next v4 1/5] net: openvswitch: expand the meters supported number xiangxia.m.yue
2020-04-24 0:08 ` [PATCH net-next v4 2/5] net: openvswitch: set max limitation to meters xiangxia.m.yue
2020-04-24 0:08 ` [PATCH net-next v4 3/5] net: openvswitch: remove the unnecessary check xiangxia.m.yue
2020-04-24 0:08 ` [PATCH net-next v4 4/5] net: openvswitch: make EINVAL return value more obvious xiangxia.m.yue
2020-04-24 0:08 ` [PATCH net-next v4 5/5] net: openvswitch: use u64 for meter bucket xiangxia.m.yue
2020-04-24 1:29 ` [PATCH net-next v4 0/5] expand meter tables and fix bug David Miller
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=1587032223-49460-3-git-send-email-xiangxia.m.yue@gmail.com \
--to=xiangxia.m.yue@gmail.com \
--cc=azhou@ovn.org \
--cc=blp@ovn.org \
--cc=dev@openvswitch.org \
--cc=netdev@vger.kernel.org \
--cc=pshelar@ovn.org \
--cc=u9012063@gmail.com \
/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).