From patchwork Fri Apr 16 13:58:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1467071 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=2DhBPP6p; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FMHrq6tkLz9sV5 for ; Fri, 16 Apr 2021 23:59:39 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 77EB5847DC; Fri, 16 Apr 2021 13:59:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jkh9oUzDsaDs; Fri, 16 Apr 2021 13:59:35 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTP id 023848445E; Fri, 16 Apr 2021 13:59:33 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C7031C000E; Fri, 16 Apr 2021 13:59:33 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4C3A7C000C for ; Fri, 16 Apr 2021 13:59:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 477F740394 for ; Fri, 16 Apr 2021 13:59:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=netronome-com.20150623.gappssmtp.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qzgQ9--bEyge for ; Fri, 16 Apr 2021 13:59:31 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by smtp2.osuosl.org (Postfix) with ESMTPS id A98494029A for ; Fri, 16 Apr 2021 13:59:30 +0000 (UTC) Received: by mail-ed1-x532.google.com with SMTP id z1so32399790edb.8 for ; Fri, 16 Apr 2021 06:59:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ycUd6cDfGjI5tGbL4CZ1Yw00V97RTNj6uEwN9NfyC2o=; b=2DhBPP6pAG0ag8G6caTCwA448ZF17dIfsg5UVNSc176blFM7XtaC8b4CObkCx9K9Zh GAgz+wwZDJB7TdiMK7zOk58cjSVacI+GUBQ0r1OYtJ69QZd1DvN44zy/AR7WVwmXMgrk pUS6p7qpnrPow7nPdtJQ4HXTpTB+bl7G0R4Q/vd3jV746DpeEB1nVoacU+yt4CqqT5Ce FD+7olau76w0KQ9YbOXgfzKQPnzvaHictNCQulYSzwoVfhJalO2WljMclALblGhN0xFd ic5YGTQ1845PPCWNR9zYG/eU9lKUM2dnnxJNd3Hn9yliGw3dbJybo6opiHHHEfVv2LJM FuNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ycUd6cDfGjI5tGbL4CZ1Yw00V97RTNj6uEwN9NfyC2o=; b=CqpXOuP81QV0MkwawjYIXp5021YpVvN5OHHDS9n4jcoYNSWDBiC+Qw1gMMhpfImf3n XcTvhKSMcKTiXZDfhD7JU7Ak/F8UrY3CXRRZ++pqH+4Ao2sY6dbTW9i/RxjRb0hJPZbO IYwt6epb/PPue0FIU9L3RfzpRSxQWIrQqTAQPy0Wp7BxWIdelk/7/RJ7UnDv+vURHZ/r /7Z0YK53y/83bwlCvS2h+568Zjb7JS0qKX0gy4iQNt7W1aXl56RxWzmKcfYu+BMxbJ/P E5VUcLbY1sdPt9F9WVIDMi7516QLzkHFDnR6EmqmJ41uHjmw8LP6MGM1lXOKNF7k3A12 17hQ== X-Gm-Message-State: AOAM531KPPSUeDRtO17yyDS3epo3Sa+kkeLQNjdq+eg0P5jYNfePg/7f NDpASn19yNol3dYwuBM/reaGBUHc5p/zOtuCgAu6yOo5OMfTrAvmgvwHHFAEBwUcolLtjeZFqvu 6aNrBjjFQpIxLjKfen5qKPTNoFOON5Llsg78MUby51IZcZLUvYtLxsyCGDDashYwHWeG9u6L5XQ == X-Google-Smtp-Source: ABdhPJyOHTvfQtZf/QeoPtkdU0+0X9D+A5GccfsfFrAS2j1bQRezvVT1q95pKxPR5+SJIF6sn83eRg== X-Received: by 2002:a05:6402:35d3:: with SMTP id z19mr9989866edc.143.1618581568090; Fri, 16 Apr 2021 06:59:28 -0700 (PDT) Received: from madeliefje.horms.nl ([2001:982:7ed1:403:9eeb:e8ff:fe0d:5b6a]) by smtp.gmail.com with ESMTPSA id d1sm4647487ede.31.2021.04.16.06.59.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 06:59:27 -0700 (PDT) From: Simon Horman To: dev@openvswitch.org Date: Fri, 16 Apr 2021 15:58:48 +0200 Message-Id: <20210416135849.13301-2-simon.horman@netronome.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210416135849.13301-1-simon.horman@netronome.com> References: <20210416135849.13301-1-simon.horman@netronome.com> MIME-Version: 1.0 Cc: Baowen Zheng , Yong Xu , oss-drivers@netronome.com, Simon Horman , Tianyu Yuan Subject: [ovs-dev] [PATCH 1/2] add port-based ingress policing based packet-per-second rate-limiting X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Yong Xu OVS has support for using policing to enforce a rate limit in kilobits per second. This is configured using OVSDB. f.e. $ ovs-vsctl set interface tap0 ingress_policing_rate=1000 $ ovs-vsctl set interface tap0 ingress_policing_burst=100 This patch adds a related feature, allowing policing to enforce a rate limit in kilo-packets per second. This is also configured using OVSDB. $ ovs-vsctl set interface tap0 ingress_policing_kpkts_rate=1000 $ ovs-vsctl set interface tap0 ingress_policing_kpkts_burst=100 The kilo-bit and kilo-packet rate limits may be used separately or in combination. Add separate action for BPS and PPS in netlink message. Revise code and change action result to pipe to allow traffic pipe into second action. This patch implements the feature for: * OVSDB (northbound API) * TC policer when used both with and without TC offload (kernel API) Signed-off-by: Yong Xu Signed-off-by: Simon Horman Signed-off-by: Baowen Zheng Signed-off-by: Louis Peens --- acinclude.m4 | 6 +-- include/linux/pkt_cls.h | 6 ++- lib/netdev-dpdk.c | 4 +- lib/netdev-linux-private.h | 4 +- lib/netdev-linux.c | 103 +++++++++++++++++++++++++------------ lib/netdev-provider.h | 11 ++-- lib/netdev.c | 15 +++--- lib/netdev.h | 3 +- vswitchd/bridge.c | 4 +- vswitchd/vswitch.ovsschema | 10 +++- vswitchd/vswitch.xml | 60 ++++++++++++++++++++- 11 files changed, 172 insertions(+), 54 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 15a54d636..18c52f63a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -209,10 +209,10 @@ dnl Configure Linux tc compat. AC_DEFUN([OVS_CHECK_LINUX_TC], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([#include ], [ - int x = TCA_FLOWER_KEY_CT_FLAGS_REPLY; + int x = TCA_POLICE_PKTRATE64; ])], - [AC_DEFINE([HAVE_TCA_FLOWER_KEY_CT_FLAGS_REPLY], [1], - [Define to 1 if TCA_FLOWER_KEY_CT_FLAGS_REPLY is available.])]) + [AC_DEFINE([HAVE_TCA_POLICE_PKTRATE64], [1], + [Define to 1 if TCA_POLICE_PKTRATE64 is available.])]) AC_CHECK_MEMBERS([struct tcf_t.firstuse], [], [], [#include ]) diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h index bc51a5767..ba82e690e 100644 --- a/include/linux/pkt_cls.h +++ b/include/linux/pkt_cls.h @@ -1,7 +1,7 @@ #ifndef __LINUX_PKT_CLS_WRAPPER_H #define __LINUX_PKT_CLS_WRAPPER_H 1 -#if defined(__KERNEL__) || defined(HAVE_TCA_FLOWER_KEY_CT_FLAGS_REPLY) +#if defined(__KERNEL__) || defined(HAVE_TCA_POLICE_PKTRATE64) #include_next #else @@ -104,6 +104,10 @@ enum { TCA_POLICE_RESULT, TCA_POLICE_TM, TCA_POLICE_PAD, + TCA_POLICE_RATE64, + TCA_POLICE_PEAKRATE64, + TCA_POLICE_PKTRATE64, + TCA_POLICE_PKTBURST64, __TCA_POLICE_MAX #define TCA_POLICE_RESULT TCA_POLICE_RESULT }; diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index 9d8096668..2b255f579 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -3389,7 +3389,9 @@ netdev_dpdk_policer_construct(uint32_t rate, uint32_t burst) static int netdev_dpdk_set_policing(struct netdev* netdev, uint32_t policer_rate, - uint32_t policer_burst) + uint32_t policer_burst, + uint32_t policer_kpkts_rate OVS_UNUSED, + uint32_t policer_kpkts_burst OVS_UNUSED) { struct netdev_dpdk *dev = netdev_dpdk_cast(netdev); struct ingress_policer *policer; diff --git a/lib/netdev-linux-private.h b/lib/netdev-linux-private.h index c7c515f70..deb015bdb 100644 --- a/lib/netdev-linux-private.h +++ b/lib/netdev-linux-private.h @@ -75,8 +75,10 @@ struct netdev_linux { int mtu; unsigned int ifi_flags; long long int carrier_resets; - uint32_t kbits_rate; /* Policing data. */ + uint32_t kbits_rate; /* Policing data - kbps */ uint32_t kbits_burst; + uint32_t kpkts_rate; /* Policing data - kpps */ + uint32_t kpkts_burst; int vport_stats_error; /* Cached error code from vport_get_stats(). 0 or an errno value. */ int netdev_mtu_error; /* Cached error code from SIOCGIFMTU diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index f87a20075..0eb51b55c 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -485,8 +485,10 @@ static struct tcmsg *netdev_linux_tc_make_request(const struct netdev *, int type, unsigned int flags, struct ofpbuf *); -static int tc_add_policer(struct netdev *, - uint32_t kbits_rate, uint32_t kbits_burst); + +static int tc_add_policer(struct netdev *, uint32_t kbits_rate, + uint32_t kbits_burst, uint32_t kpkts_rate, + uint32_t kpkts_burst); static int tc_parse_qdisc(const struct ofpbuf *, const char **kind, struct nlattr **options); @@ -547,6 +549,12 @@ is_tap_netdev(const struct netdev *netdev) return netdev_get_class(netdev) == &netdev_tap_class; } +enum { + OVS_TC_QOS_TYPE_BPS, + OVS_TC_QOS_TYPE_PPS, + OVS_TC_QOS_TYPE_MAX, +}; + static int netdev_linux_netnsid_update__(struct netdev_linux *netdev) { @@ -2593,24 +2601,50 @@ tc_matchall_fill_police(uint32_t kbits_rate, uint32_t kbits_burst) } static void -nl_msg_put_act_police(struct ofpbuf *request, struct tc_police police) +nl_msg_put_act_police(struct ofpbuf *request, struct tc_police police, + uint32_t kpkts_rate, uint32_t kpkts_burst) { - size_t offset; + size_t offset, act_offset; + uint32_t i = 0, prio = 0; - nl_msg_put_string(request, TCA_ACT_KIND, "police"); - offset = nl_msg_start_nested(request, TCA_ACT_OPTIONS); - nl_msg_put_unspec(request, TCA_POLICE_TBF, &police, sizeof police); - tc_put_rtab(request, TCA_POLICE_RATE, &police.rate); - nl_msg_put_u32(request, TCA_POLICE_RESULT, TC_ACT_UNSPEC); - nl_msg_end_nested(request, offset); + for (i = 0; i < OVS_TC_QOS_TYPE_MAX; i++) { + if (i == OVS_TC_QOS_TYPE_BPS && !police.rate.rate) { + continue; + } + if (i == OVS_TC_QOS_TYPE_PPS && !kpkts_rate) { + continue; + } + act_offset = nl_msg_start_nested(request, ++prio); + nl_msg_put_string(request, TCA_ACT_KIND, "police"); + offset = nl_msg_start_nested(request, TCA_ACT_OPTIONS); + if (i == OVS_TC_QOS_TYPE_BPS && police.rate.rate) { + tc_put_rtab(request, TCA_POLICE_RATE, &police.rate); + } else if (i == OVS_TC_QOS_TYPE_PPS && kpkts_rate) { + unsigned int pkt_burst_ticks, pps_rate; + /* for PPS, set rate as 0 to act as a single action */ + police.rate.rate = 0; + police.burst = 0; + police.rate.cell_log = 0; + pps_rate = kpkts_rate * 1000; + pkt_burst_ticks = tc_bytes_to_ticks(pps_rate, + MIN(UINT32_MAX / 1024, kpkts_burst) * 1024); + nl_msg_put_u64(request, TCA_POLICE_PKTRATE64, (uint64_t)pps_rate); + nl_msg_put_u64(request, TCA_POLICE_PKTBURST64, (uint64_t)pkt_burst_ticks); + } + nl_msg_put_unspec(request, TCA_POLICE_TBF, &police, sizeof police); + nl_msg_put_u32(request, TCA_POLICE_RESULT, TC_ACT_PIPE); + nl_msg_end_nested(request, offset); + nl_msg_end_nested(request, act_offset); + } } static int tc_add_matchall_policer(struct netdev *netdev, uint32_t kbits_rate, - uint32_t kbits_burst) + uint32_t kbits_burst, uint32_t kpkts_rate, + uint32_t kpkts_burst) { uint16_t eth_type = (OVS_FORCE uint16_t) htons(ETH_P_ALL); - size_t basic_offset, action_offset, inner_offset; + size_t basic_offset, action_offset; uint16_t prio = TC_RESERVED_PRIORITY_POLICE; int ifindex, err = 0; struct tc_police pol_act; @@ -2634,9 +2668,7 @@ tc_add_matchall_policer(struct netdev *netdev, uint32_t kbits_rate, nl_msg_put_string(&request, TCA_KIND, "matchall"); basic_offset = nl_msg_start_nested(&request, TCA_OPTIONS); action_offset = nl_msg_start_nested(&request, TCA_MATCHALL_ACT); - inner_offset = nl_msg_start_nested(&request, 1); - nl_msg_put_act_police(&request, pol_act); - nl_msg_end_nested(&request, inner_offset); + nl_msg_put_act_police(&request, pol_act, kpkts_rate, kpkts_burst); nl_msg_end_nested(&request, action_offset); nl_msg_end_nested(&request, basic_offset); @@ -2676,8 +2708,9 @@ tc_del_matchall_policer(struct netdev *netdev) /* Attempts to set input rate limiting (policing) policy. Returns 0 if * successful, otherwise a positive errno value. */ static int -netdev_linux_set_policing(struct netdev *netdev_, - uint32_t kbits_rate, uint32_t kbits_burst) +netdev_linux_set_policing(struct netdev *netdev_, uint32_t kbits_rate, + uint32_t kbits_burst, uint32_t kpkts_rate, + uint32_t kpkts_burst) { struct netdev_linux *netdev = netdev_linux_cast(netdev_); const char *netdev_name = netdev_get_name(netdev_); @@ -2688,6 +2721,10 @@ netdev_linux_set_policing(struct netdev *netdev_, : !kbits_burst ? 8000 /* Default to 8000 kbits if 0. */ : kbits_burst); /* Stick with user-specified value. */ + kpkts_burst = (!kpkts_rate ? 0 /* Force to 0 if no rate specified. */ + : !kpkts_burst ? 16 /* Default to 16000 packets if 0. */ + : kpkts_burst); /* Stick with user-specified value. */ + ovs_mutex_lock(&netdev->mutex); if (netdev_linux_netnsid_is_remote(netdev)) { error = EOPNOTSUPP; @@ -2697,7 +2734,9 @@ netdev_linux_set_policing(struct netdev *netdev_, if (netdev->cache_valid & VALID_POLICING) { error = netdev->netdev_policing_error; if (error || (netdev->kbits_rate == kbits_rate && - netdev->kbits_burst == kbits_burst)) { + netdev->kpkts_rate == kpkts_rate && + netdev->kbits_burst == kbits_burst && + netdev->kpkts_burst == kpkts_burst)) { /* Assume that settings haven't changed since we last set them. */ goto out; } @@ -2709,8 +2748,9 @@ netdev_linux_set_policing(struct netdev *netdev_, /* Use matchall for policing when offloadling ovs with tc-flower. */ if (netdev_is_flow_api_enabled()) { error = tc_del_matchall_policer(netdev_); - if (kbits_rate) { - error = tc_add_matchall_policer(netdev_, kbits_rate, kbits_burst); + if (kbits_rate || kpkts_rate) { + error = tc_add_matchall_policer(netdev_, kbits_rate, kbits_burst, + kpkts_rate, kpkts_burst); } ovs_mutex_unlock(&netdev->mutex); return error; @@ -2729,7 +2769,7 @@ netdev_linux_set_policing(struct netdev *netdev_, goto out; } - if (kbits_rate) { + if (kbits_rate || kpkts_rate) { error = tc_add_del_qdisc(ifindex, true, 0, TC_INGRESS); if (error) { VLOG_WARN_RL(&rl, "%s: adding policing qdisc failed: %s", @@ -2737,7 +2777,8 @@ netdev_linux_set_policing(struct netdev *netdev_, goto out; } - error = tc_add_policer(netdev_, kbits_rate, kbits_burst); + error = tc_add_policer(netdev_, kbits_rate, kbits_burst, + kpkts_rate, kpkts_burst); if (error){ VLOG_WARN_RL(&rl, "%s: adding policing action failed: %s", netdev_name, ovs_strerror(error)); @@ -2747,6 +2788,8 @@ netdev_linux_set_policing(struct netdev *netdev_, netdev->kbits_rate = kbits_rate; netdev->kbits_burst = kbits_burst; + netdev->kpkts_rate = kpkts_rate; + netdev->kpkts_burst = kpkts_burst; out: if (!error || error == ENODEV) { @@ -5523,7 +5566,7 @@ netdev_linux_tc_make_request(const struct netdev *netdev, int type, } /* Adds a policer to 'netdev' with a rate of 'kbits_rate' and a burst size - * of 'kbits_burst'. + * of 'kbits_burst', with a rate of 'kpkts_rate' and a burst size of 'kpkts_burst'. * * This function is equivalent to running: * /sbin/tc filter add dev parent ffff: protocol all prio 49 @@ -5536,14 +5579,13 @@ netdev_linux_tc_make_request(const struct netdev *netdev, int type, * Returns 0 if successful, otherwise a positive errno value. */ static int -tc_add_policer(struct netdev *netdev, - uint32_t kbits_rate, uint32_t kbits_burst) +tc_add_policer(struct netdev *netdev, uint32_t kbits_rate, + uint32_t kbits_burst, uint32_t kpkts_rate, uint32_t kpkts_burst) { + size_t basic_offset, police_offset; struct tc_police tc_police; struct ofpbuf request; struct tcmsg *tcmsg; - size_t basic_offset; - size_t police_offset; int error; int mtu = 65535; @@ -5561,7 +5603,6 @@ tc_add_policer(struct netdev *netdev, * tc's point of view. Whatever. */ tc_police.burst = tc_bytes_to_ticks( tc_police.rate.rate, MIN(UINT32_MAX / 1024, kbits_burst) * 1024 / 8); - tcmsg = netdev_linux_tc_make_request(netdev, RTM_NEWTFILTER, NLM_F_EXCL | NLM_F_CREATE, &request); if (!tcmsg) { @@ -5570,12 +5611,10 @@ tc_add_policer(struct netdev *netdev, tcmsg->tcm_parent = tc_make_handle(0xffff, 0); tcmsg->tcm_info = tc_make_handle(49, (OVS_FORCE uint16_t) htons(ETH_P_ALL)); - nl_msg_put_string(&request, TCA_KIND, "basic"); basic_offset = nl_msg_start_nested(&request, TCA_OPTIONS); - police_offset = nl_msg_start_nested(&request, TCA_BASIC_POLICE); - nl_msg_put_unspec(&request, TCA_POLICE_TBF, &tc_police, sizeof tc_police); - tc_put_rtab(&request, TCA_POLICE_RATE, &tc_police.rate); + police_offset = nl_msg_start_nested(&request, TCA_BASIC_ACT); + nl_msg_put_act_police(&request, tc_police, kpkts_rate, kpkts_burst); nl_msg_end_nested(&request, police_offset); nl_msg_end_nested(&request, basic_offset); diff --git a/lib/netdev-provider.h b/lib/netdev-provider.h index 73dce2fca..b5420947d 100644 --- a/lib/netdev-provider.h +++ b/lib/netdev-provider.h @@ -514,13 +514,16 @@ struct netdev_class { * NETDEV_PT_LEGACY_L2. */ enum netdev_pt_mode (*get_pt_mode)(const struct netdev *netdev); - /* Attempts to set input rate limiting (policing) policy, such that up to - * 'kbits_rate' kbps of traffic is accepted, with a maximum accumulative - * burst size of 'kbits' kb. + /* Attempts to set input rate limiting (policing) policy, such that: + * - up to 'kbits_rate' kbps of traffic is accepted, with a maximum + * accumulative burst size of 'kbits' kb; and + * - up to 'kpkts' kpps of traffic is accepted, with a maximum + * accumulative burst size of 'kpkts' kilo packets. * * This function may be set to null if policing is not supported. */ int (*set_policing)(struct netdev *netdev, unsigned int kbits_rate, - unsigned int kbits_burst); + unsigned int kbits_burst, unsigned int kpkts_rate, + unsigned int kpkts_burst); /* Adds to 'types' all of the forms of QoS supported by 'netdev', or leaves * it empty if 'netdev' does not support QoS. Any names added to 'types' diff --git a/lib/netdev.c b/lib/netdev.c index 91e91955c..8305f6c42 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -1619,17 +1619,20 @@ netdev_get_custom_stats(const struct netdev *netdev, return error; } - -/* Attempts to set input rate limiting (policing) policy, such that up to - * 'kbits_rate' kbps of traffic is accepted, with a maximum accumulative burst - * size of 'kbits' kb. */ +/* Attempts to set input rate limiting (policing) policy, such that: + * - up to 'kbits_rate' kbps of traffic is accepted, with a maximum + * accumulative burst size of 'kbits' kb; and + * - up to 'kpkts' kpps of traffic is accepted, with a maximum + * accumulative burst size of 'kpkts' kilo packets. + */ int netdev_set_policing(struct netdev *netdev, uint32_t kbits_rate, - uint32_t kbits_burst) + uint32_t kbits_burst, uint32_t kpkts_rate, + uint32_t kpkts_burst) { return (netdev->netdev_class->set_policing ? netdev->netdev_class->set_policing(netdev, - kbits_rate, kbits_burst) + kbits_rate, kbits_burst, kpkts_rate, kpkts_burst) : EOPNOTSUPP); } diff --git a/lib/netdev.h b/lib/netdev.h index b705a9e56..acf174927 100644 --- a/lib/netdev.h +++ b/lib/netdev.h @@ -289,7 +289,8 @@ struct netdev_queue_stats { }; int netdev_set_policing(struct netdev *, uint32_t kbits_rate, - uint32_t kbits_burst); + uint32_t kbits_burst, uint32_t kpkts_rate, + uint32_t kpkts_burst); int netdev_get_qos_types(const struct netdev *, struct sset *types); int netdev_get_qos_capabilities(const struct netdev *, diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 5ed7e8234..d1db675ff 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -4896,7 +4896,9 @@ iface_configure_qos(struct iface *iface, const struct ovsrec_qos *qos) netdev_set_policing(iface->netdev, MIN(UINT32_MAX, iface->cfg->ingress_policing_rate), - MIN(UINT32_MAX, iface->cfg->ingress_policing_burst)); + MIN(UINT32_MAX, iface->cfg->ingress_policing_burst), + MIN(UINT32_MAX, iface->cfg->ingress_policing_kpkts_rate), + MIN(UINT32_MAX, iface->cfg->ingress_policing_kpkts_burst)); ofpbuf_uninit(&queues_buf); } diff --git a/vswitchd/vswitch.ovsschema b/vswitchd/vswitch.ovsschema index 0666c8c76..4873cfde7 100644 --- a/vswitchd/vswitch.ovsschema +++ b/vswitchd/vswitch.ovsschema @@ -1,6 +1,6 @@ {"name": "Open_vSwitch", - "version": "8.2.0", - "cksum": "1076640191 26427", + "version": "8.3.0", + "cksum": "3781850481 26690", "tables": { "Open_vSwitch": { "columns": { @@ -242,6 +242,12 @@ "ingress_policing_burst": { "type": {"key": {"type": "integer", "minInteger": 0}}}, + "ingress_policing_kpkts_rate": { + "type": {"key": {"type": "integer", + "minInteger": 0}}}, + "ingress_policing_kpkts_burst": { + "type": {"key": {"type": "integer", + "minInteger": 0}}}, "mac_in_use": { "type": {"key": {"type": "string"}, "min": 0, "max": 1}, diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index 4597a215d..5343d656e 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -3654,8 +3654,18 @@ ovs-vsctl add-port br0 p0 -- set Interface p0 type=patch options:peer=p1 \ table="Queue"/> tables).

- Policing is currently implemented on Linux and OVS with DPDK. Both - implementations use a simple ``token bucket'' approach: + Policing settings can be set with byte rate or packet rate, and they + can be configured together, in which case they take effect together, + that means the smaller speed limit of them is in effect. +

+

+ Currently, byte rate policing is implemented on Linux and OVS with + DPDK, while packet rate policing is only implemented on Linux. Both + Linux and OVS DPDK implementations use a simple ``token bucket’’ + approach: +

+

+ Byte rate policing:

  • @@ -3673,6 +3683,26 @@ ovs-vsctl add-port br0 p0 -- set Interface p0 type=patch options:peer=p1 \ rate specified by .
+

+ Packet rate policing: +

+
    +
  • + The size of the bucket corresponds to . Initially the bucket is + full. +
    • +
  • + Whenever a packet is received, it will comsume one token from the + current bucket. If the token is available in the bucket, it's + removed and the packet is forwarded. Otherwise, the packet is + dropped. +
    • +
  • + Whenever it is not full, the bucket is refilled with tokens at the + rate specified by . +
    • +

Policing interacts badly with some network protocols, and especially with fragmented IP packets. Suppose that there is enough network @@ -3698,6 +3728,14 @@ ovs-vsctl add-port br0 p0 -- set Interface p0 type=patch options:peer=p1 \

+ +

+ Maximum rate for data received on this interface, in kpps. Data + received faster than this rate is dropped. Set to 0 + (the default) to disable policing. +

+ +

Maximum burst size for data received on this interface, in kb. The default burst size if set to 0 is 8000 kbit. This value @@ -3712,6 +3750,24 @@ ovs-vsctl add-port br0 p0 -- set Interface p0 type=patch options:peer=p1 \ closer to achieving the full rate.

+ + +

+ Maximum burst size for data received on this interface, in + kilo-packets. The default burst size if set to 0 is + 16 kilo-packets. This value has no effect if is 0.

+

+ Specifying a larger burst size lets the algorithm be more + forgiving, which is important for protocols like TCP that react + severely to dropped packets. The burst size should be at least + the size of the interface's MTU. Specifying a value that is + numerically at least as large as 80% of helps TCP come closer to + achieving the full rate. +

+ + From patchwork Fri Apr 16 13:58:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1467072 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=XRDJkIss; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FMHrv2jsVz9sPf for ; Fri, 16 Apr 2021 23:59:43 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C6E3F418C6; Fri, 16 Apr 2021 13:59:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZVFInCIhZvPk; Fri, 16 Apr 2021 13:59:39 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTP id 3D9B7418D2; Fri, 16 Apr 2021 13:59:36 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 009A1C0015; Fri, 16 Apr 2021 13:59:36 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id E732EC001A for ; Fri, 16 Apr 2021 13:59:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E3685418C5 for ; Fri, 16 Apr 2021 13:59:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L-Zct5JMbJ3a for ; Fri, 16 Apr 2021 13:59:31 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by smtp4.osuosl.org (Postfix) with ESMTPS id 153F6418A4 for ; Fri, 16 Apr 2021 13:59:30 +0000 (UTC) Received: by mail-ej1-x62f.google.com with SMTP id sd23so33644736ejb.12 for ; Fri, 16 Apr 2021 06:59:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4cIRRDcigsxa9w1h6OhvrGoGY5Yo5eOSmJ0WwyGrUGw=; b=XRDJkIss4V0VNaskfb7r3tUcqoIw8+VXnqC5hg6q46go0FY+kScArRQrHAnYXVE2Lp smCs5Nd1iBP8VAAru8ZyAWMFHb3QbkVED3JHT71ZDlyXupoAR4exGnGD+FPv3oRYkI3J Q+zlyYc9qoWH3dl/QG+L4EWP8DRoeV5LupZgg0HynrDzjLHc9rsBu+5oX8ux8xggmfuJ sHmUN1AifCJ3kKC70Z3nk5kZ4jjj31P2UrXJl9Iv5ZOSSO8NdFfuxi9AaOTUP23v6+VJ D7L7D1YT0h4pCcnTzjpomfCvVWpEr6+qfvHAt+y71tR+3SVXjsP8k3HCBDARrYXikSkV slwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4cIRRDcigsxa9w1h6OhvrGoGY5Yo5eOSmJ0WwyGrUGw=; b=am5Be0umzZ6/0i36dpFraPYycOM45OOer33KSziM4TYxRTJYB6MyLGxnfaWQlP5ean gJRCZ7aKqAZOdXFEGJgGSQBEI4x1XR/Hed98K2uwVp+N+EA80hrbL+9TB9XipHpg+NBT ca6IKsC8G4/yaz7lsFJn6QY6vpWQRFohSjBUFx35J1l/vLmhP+81raG0QpJ/K3MkumO4 Hi2TyPSPkLpUp/zpcUjIMgjD6or7Zo1h69LRsA6259jYAQiEuk62v1ReKcrDJxqJewtH fs4aj8nx+OPUyHsew8Sp8ZJiINS1ztb8Yfru1XjI++S+ewKwKT5NDi2oAAwY/enwY7d7 xClA== X-Gm-Message-State: AOAM533s6tUl57yjzSPmw/xZ8H8f04yJyhsOWBYKI6hKpEF+2/oMyGNl Z20P7I0JYOy4mTwMtLzhGvTKgE6N/IFoScdpCQIrQHLb8QPsl6zFEd01rkGgG+vLDGfQkThzQhv ZqzVbfy9MOc9WP8psSR7v2UbXZvhO0I1MUSzuuAI0ji6A6rxTqO/Km/Z9NAp3dGl+DlyHuhNYOg == X-Google-Smtp-Source: ABdhPJyBUZwjYKb7mUeb7+ib1P6GHL36pqt1F+FZD5QJBsTpu6RqCQRo5JOHSo0LLFFZ+HIt0+3u7Q== X-Received: by 2002:a17:906:53cd:: with SMTP id p13mr8447880ejo.379.1618581568912; Fri, 16 Apr 2021 06:59:28 -0700 (PDT) Received: from madeliefje.horms.nl ([2001:982:7ed1:403:9eeb:e8ff:fe0d:5b6a]) by smtp.gmail.com with ESMTPSA id d1sm4647487ede.31.2021.04.16.06.59.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 06:59:28 -0700 (PDT) From: Simon Horman To: dev@openvswitch.org Date: Fri, 16 Apr 2021 15:58:49 +0200 Message-Id: <20210416135849.13301-3-simon.horman@netronome.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210416135849.13301-1-simon.horman@netronome.com> References: <20210416135849.13301-1-simon.horman@netronome.com> MIME-Version: 1.0 Cc: Baowen Zheng , Yong Xu , oss-drivers@netronome.com, Simon Horman , Tianyu Yuan Subject: [ovs-dev] [PATCH 2/2] add test cases for ingress_policing_kpkts parameters X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Tianyu Yuan Exercise OVS setting of ingress_policing_kpkts parameters using ovs-vsctl and verify that the correct values are stored on OVSDB. Verify the ingress_policing parameters with tc command. Also check offload and non-offload in tc software datapath based on tc filter type (matchall and basic). Skip test of pps if OVS or kernel does not support pps rate limit. Example invocation: make check TESTSUITEFLAGS='-k ingress_policing_kpkts' make check-offloads TESTSUITEFLAGS='-k ingress_policing_kpkts' Signed-off-by: Tianyu Yuan Signed-off-by: Simon Horman Signed-off-by: Louis Peens --- tests/atlocal.in | 17 +++++++++-- tests/ovs-vsctl.at | 23 +++++++++++++++ tests/system-offloads-traffic.at | 50 ++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 3 deletions(-) diff --git a/tests/atlocal.in b/tests/atlocal.in index cfca7e192..1054298f4 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -175,9 +175,6 @@ find_command() # Set HAVE_NC find_command nc -# Set HAVE_TC -find_command tc - # Determine correct netcat option to quit on stdin EOF if nc --version 2>&1 | grep -q nmap.org; then # Nmap netcat @@ -187,6 +184,20 @@ else NC_EOF_OPT="-q 1 -w 5" fi +# Set HAVE_TC +find_command tc + +# When HAVE_TC=yes, check if the current tc supports adding pps filter +SUPPORT_TC_INGRESS_PPS="no" +if test $HAVE_TC="yes"; then + ip link add veth0 type veth peer name veth1 + tc qdisc add dev veth0 handle ffff: ingress + if tc filter add dev veth0 parent ffff: u32 match u32 0 0 police pkts_rate 100 pkts_burst 10; then + SUPPORT_TC_INGRESS_PPS="yes" + fi + ip link del veth0 +fi + # Set HAVE_TCPDUMP find_command tcpdump diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at index dccb11741..d6cd2c084 100644 --- a/tests/ovs-vsctl.at +++ b/tests/ovs-vsctl.at @@ -1687,3 +1687,26 @@ ingress_policing_rate: 100 ]) OVS_VSCTL_CLEANUP AT_CLEANUP + +dnl ---------------------------------------------------------------------- +AT_BANNER([set ingress policing(kpkts) test]) + +AT_SETUP([set ingress_policing_kpkts_rate and ingress_policing_kpkts_burst]) +AT_KEYWORDS([ingress_policing_kpkts]) +OVS_VSCTL_SETUP +AT_CHECK([RUN_OVS_VSCTL_TOGETHER( + [add-br a], + [add-port a a1], + [set interface a1 ingress_policing_kpkts_rate=100], + [set interface a1 ingress_policing_kpkts_burst=10], + [--columns=ingress_policing_kpkts_burst,ingress_policing_kpkts_rate list interface a1])], + [0], + [ + + + +ingress_policing_kpkts_burst: 10 +ingress_policing_kpkts_rate: 100 +]) +OVS_VSCTL_CLEANUP +AT_CLEANUP diff --git a/tests/system-offloads-traffic.at b/tests/system-offloads-traffic.at index c8e4c68fa..be63057bb 100644 --- a/tests/system-offloads-traffic.at +++ b/tests/system-offloads-traffic.at @@ -120,3 +120,53 @@ matchall ]) OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP + +AT_SETUP([offloads - set ingress_policing_kpkts_rate and ingress_policing_kpkts_burst - offloads disabled]) +AT_KEYWORDS([ingress_policing_kpkts]) +AT_SKIP_IF([test $SUPPORT_TC_INGRESS_PPS = "no"]) +OVS_TRAFFIC_VSWITCHD_START() +AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:hw-offload=false]) +AT_CHECK([ovs-ofctl add-flow br0 "actions=normal"]) +ADD_NAMESPACES(at_ns0) +ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24") +AT_CHECK([ovs-vsctl set interface ovs-p0 ingress_policing_kpkts_rate=100]) +AT_CHECK([ovs-vsctl set interface ovs-p0 ingress_policing_kpkts_burst=10]) +AT_CHECK([ovs-vsctl --columns=other_config list open], [0], [dnl +other_config : {hw-offload="false"} +]) +AT_CHECK([tc -o -s -d filter show dev ovs-p0 ingress | + sed -n 's/.*\(pkts_rate [[0-9]]*[[a-zA-Z]]* pkts_burst [[0-9]]*[[a-zA-Z]]*\).*/\1/; T; p; q'], + [0],[dnl +pkts_rate 100000 pkts_burst 10240 +]) +AT_CHECK([tc -s -d filter show dev ovs-p0 ingress | + sed -n 's/.*\(basic\).*/\1/; T; p; q'], [0], [dnl +basic +]) +OVS_TRAFFIC_VSWITCHD_STOP +AT_CLEANUP + +AT_SETUP([offloads - set ingress_policing_kpkts_rate and ingress_policing_kpkts_burst - offloads enabled]) +AT_KEYWORDS([ingress_policing_kpkts]) +AT_SKIP_IF([test $SUPPORT_TC_INGRESS_PPS = "no"]) +OVS_TRAFFIC_VSWITCHD_START() +AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:hw-offload=true]) +AT_CHECK([ovs-ofctl add-flow br0 "actions=normal"]) +ADD_NAMESPACES(at_ns0) +ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24") +AT_CHECK([ovs-vsctl set interface ovs-p0 ingress_policing_kpkts_rate=100]) +AT_CHECK([ovs-vsctl set interface ovs-p0 ingress_policing_kpkts_burst=10]) +AT_CHECK([ovs-vsctl --columns=other_config list open], [0], [dnl +other_config : {hw-offload="true"} +]) +AT_CHECK([tc -o -s -d filter show dev ovs-p0 ingress | + sed -n 's/.*\(pkts_rate [[0-9]]*[[a-zA-Z]]* pkts_burst [[0-9]]*[[a-zA-Z]]*\).*/\1/; T; p; q'], + [0],[dnl +pkts_rate 100000 pkts_burst 10240 +]) +AT_CHECK([tc -s -d filter show dev ovs-p0 ingress | + sed -n 's/.*\(matchall\).*/\1/; T; p; q'], [0], [dnl +matchall +]) +OVS_TRAFFIC_VSWITCHD_STOP +AT_CLEANUP