From patchwork Wed Mar 3 14:46:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1446757 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=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=kypxqVLo; 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 4DrM242djdz9sRf for ; Thu, 4 Mar 2021 04:49:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 06B444B478; Wed, 3 Mar 2021 17:49:14 +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 USXRBrRjxrUn; Wed, 3 Mar 2021 17:49:13 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTP id 16F464AEF5; Wed, 3 Mar 2021 17:49:12 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id F28CFC000A; Wed, 3 Mar 2021 17:49:11 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 74387C0001 for ; Wed, 3 Mar 2021 17:49:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 70BA040132 for ; Wed, 3 Mar 2021 17:49:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.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 oxU2h-PI4x30 for ; Wed, 3 Mar 2021 17:49:05 +0000 (UTC) X-Greylist: delayed 01:05:42 by SQLgrey-1.8.0 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by smtp2.osuosl.org (Postfix) with ESMTPS id CD97B4013C for ; Wed, 3 Mar 2021 17:49:05 +0000 (UTC) Received: by mail-oi1-x231.google.com with SMTP id w65so3317081oie.7 for ; Wed, 03 Mar 2021 09:49:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+BTtiPrjmllThI18dREYG9sa1xBS/BkzFyD0ez8br3E=; b=kypxqVLomhuoxY3UXbq3zwDhE0F6rnPRrCOp0SvFhOwDyTUyrpOU58SPi7FvBzWYe3 W2jq1xzUsDxDXvw0P0cstR+5IAfSeQWMLT8GR/rFB1ehAVfk4SN/X3ZHxoEn0fWxERd0 gK2FZcemwwx89T/bEHwT5LSzQwAr3ELxebA1eVg12UgFGsJ1zi4i74sX4SS5x5+5CByx bDWhd9PxcI411zeRv2rJVtaKaazWvVofeuxHJeO9sXz/5wH7vJJuiQwX+BlT933l2PFz uGkuZZ+0hboqwmwv6/1jbyJBDaldP/gaPcugqZ77bzLyPwWLyYxpuCjo+WmnQU0b5+qf vKmw== 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; bh=+BTtiPrjmllThI18dREYG9sa1xBS/BkzFyD0ez8br3E=; b=uH+XxAOCaLNGOY91kV0yPtb3htvlZoiC98amJwjVjdXQG2zT/GAkHRAfVwaeYpkr+F e1sfIa2iXuQta9brlE5zGHThARqnycYmW9NFEWy2DjLl0YCNQdYE/FUsqLoHymvsNV+S PIbUSWp6NVeQjwWra9FBC26i8dM9OQM6XywtQpDYINh7rrRqnGSSq/wh9FTz2H/l+2lb 1fbUowJ2iEN7iuUs7aFp8KQh06fyPvStHmpb5mj7wtdBY15YSy3nISICYAg55kjMfe9o R+NNE2H4Fd2X9+c71Zj6d3IBdWavyFMKaRnyS3bQh7R8UVBZt09UAWogdMbo25wdo5VA 0BWQ== X-Gm-Message-State: AOAM533nRxRjjzE+J8FSy/5oXzqt5tBW0VEeR87EsK3yOgk/Wi1zvryb 9LwWSppEVvZ5XNblRgVWSx+yPS+NLN1CKA== X-Google-Smtp-Source: ABdhPJw2wwzc67ce0qVt9RAR1IwoqYcCmQb2IEicPJeb/cEKgpCqE33PgoVFFswqEXU/uuWqBptyIQ== X-Received: by 2002:a17:90a:8b16:: with SMTP id y22mr4754854pjn.191.1614782997915; Wed, 03 Mar 2021 06:49:57 -0800 (PST) Received: from localhost.localdomain ([106.39.151.89]) by smtp.gmail.com with ESMTPSA id i10sm27767499pgo.75.2021.03.03.06.49.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Mar 2021 06:49:57 -0800 (PST) From: xiangxia.m.yue@gmail.com To: i.maximets@ovn.org, blp@ovn.org, u9012063@gmail.com, horms@ovn.org Date: Wed, 3 Mar 2021 22:46:55 +0800 Message-Id: <20210303144658.47858-2-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20210303144658.47858-1-xiangxia.m.yue@gmail.com> References: <20210303144658.47858-1-xiangxia.m.yue@gmail.com> Cc: dev@openvswitch.org Subject: [ovs-dev] [PATCH RESEND ovs v3 1/4] dpif-netdev: Fix the meter buckets overflow. 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: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Tonghao Zhang When setting the meter rate to 4.3+Gbps, there is an overflow, the meters don't work as expected. $ ovs-ofctl -O OpenFlow13 add-meter br-int "meter=1 kbps stats bands=type=drop rate=4294968" It was overflow when we set the rate to 4294968, because "burst_size" in the ofputil_meter_band is uint32_t type. This patch remove the "up" in the dp_meter_band struction, and introduce "rate", "burst_size" and "bucket" (uint64_t) to userspace datapath's meter band. This patch don't change the public API and structure. Signed-off-by: Tonghao Zhang --- lib/dpif-netdev.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 4381c618f1be..78f3eef5381b 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -279,8 +279,9 @@ static bool dpcls_lookup(struct dpcls *cls, ( 1 << OFPMBT13_DROP ) struct dp_meter_band { - struct ofputil_meter_band up; /* type, prec_level, pad, rate, burst_size */ - uint32_t bucket; /* In 1/1000 packets (for PKTPS), or in bits (for KBPS) */ + uint32_t rate; + uint64_t bucket; /* In 1/1000 packets (for PKTPS), or in bits (for KBPS) */ + uint64_t burst_size; uint64_t packet_count; uint64_t byte_count; }; @@ -6206,9 +6207,9 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, band = &meter->bands[m]; /* Update band's bucket. */ - band->bucket += delta_t * band->up.rate; - if (band->bucket > band->up.burst_size) { - band->bucket = band->up.burst_size; + band->bucket += (uint64_t) delta_t * band->rate; + if (band->bucket > band->burst_size) { + band->bucket = band->burst_size; } /* Drain the bucket for all the packets, if possible. */ @@ -6226,8 +6227,8 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, * (Only one band will be fired by a packet, and that * can be different for each packet.) */ for (int i = band_exceeded_pkt; i < cnt; i++) { - if (band->up.rate > exceeded_rate[i]) { - exceeded_rate[i] = band->up.rate; + if (band->rate > exceeded_rate[i]) { + exceeded_rate[i] = band->rate; exceeded_band[i] = m; } } @@ -6246,8 +6247,8 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, /* Update the exceeding band for the exceeding packet. * (Only one band will be fired by a packet, and that * can be different for each packet.) */ - if (band->up.rate > exceeded_rate[i]) { - exceeded_rate[i] = band->up.rate; + if (band->rate > exceeded_rate[i]) { + exceeded_rate[i] = band->rate; exceeded_band[i] = m; } } @@ -6329,16 +6330,13 @@ dpif_netdev_meter_set(struct dpif *dpif, ofproto_meter_id meter_id, config->bands[i].burst_size = config->bands[i].rate; } - meter->bands[i].up = config->bands[i]; - /* Convert burst size to the bucket units: */ - /* pkts => 1/1000 packets, kilobits => bits. */ - meter->bands[i].up.burst_size *= 1000; - /* Initialize bucket to empty. */ meter->bands[i].bucket = 0; + meter->bands[i].rate = config->bands[i].rate; + meter->bands[i].burst_size = config->bands[i].burst_size * 1000ULL; /* Figure out max delta_t that is enough to fill any bucket. */ band_max_delta_t - = meter->bands[i].up.burst_size / meter->bands[i].up.rate; + = meter->bands[i].burst_size / meter->bands[i].rate; if (band_max_delta_t > meter->max_delta_t) { meter->max_delta_t = band_max_delta_t; } From patchwork Wed Mar 3 14:46:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1446839 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=140.211.166.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=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=VZuwT0fc; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.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 4DrQFl1wgsz9sS8 for ; Thu, 4 Mar 2021 07:14:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id ACE7582D12; Wed, 3 Mar 2021 20:14:33 +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 9OHL-vHM6i0J; Wed, 3 Mar 2021 20:14:32 +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 C93CA82BFD; Wed, 3 Mar 2021 20:14:31 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9ACA0C000B; Wed, 3 Mar 2021 20:14:31 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id B1DD0C0001 for ; Wed, 3 Mar 2021 20:14:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 870DA82A27 for ; Wed, 3 Mar 2021 20:14:29 +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 nFtbT62nz5HC for ; Wed, 3 Mar 2021 20:14:28 +0000 (UTC) X-Greylist: delayed 12:09:49 by SQLgrey-1.8.0 Received: from mail-vs1-xe35.google.com (mail-vs1-xe35.google.com [IPv6:2607:f8b0:4864:20::e35]) by smtp1.osuosl.org (Postfix) with ESMTPS id 9F2B582A0E for ; Wed, 3 Mar 2021 20:14:28 +0000 (UTC) Received: by mail-vs1-xe35.google.com with SMTP id b189so7364101vsd.0 for ; Wed, 03 Mar 2021 12:14:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dhXmN72LoHAwpZpM3H7CMUsvKATAR523VGrvgrg7vB8=; b=VZuwT0fcE6kccs3C6hcEfURfgu2X2MzycdPuicQHjbh4zVHAEV2y337fCSZLtnzUtm UewIl3X1sz2vieTqUbpGMYeXPCsase0s8sSvpRdoGgU9RtEHGSIXU6ctH1Uncb2c3OWM Zb4tarO5OCOR6B5K6VrlF7ZEiEPIHvXCmu/OybtRYo6jm3SoAQ0ziuuup78pac0zGzYL yyPSbHMu8/s7nknt6Hf7BEWjkWYfAEfSXn/ZAW1Yan5u0qnBlp8QXxGOn+0HIhBHWsdH oSH4mnc0Gcs0k1EJexJ+rKBT3Ds/aPeoNF/LJ23HXjssJu0pKf404W7+j0aLYBSeWZhf 88Zg== 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; bh=dhXmN72LoHAwpZpM3H7CMUsvKATAR523VGrvgrg7vB8=; b=D6N23k4cjKeiycHwu8Q9h6jqcpIXE+P1yShK76dUN6RWQtHoGUMeHhZH0WR40shHr2 xgLLQRj5VwmNAhGQJGG+n4H95dG5EaGN45zk4LtK8CCOKPV8ThbCWUTpgezRFNYjg09q vCS3dyZxp9rEBceujQrxjz1b4YuEh1ie5bjGoL+PBDMTcC9kQlguZDXpLs+sCshYKq9X ANx9LUeqok0eYBL5Qh0XRS2jlHSxYgvWTyNUI9/X04RVuXXXoeXyqGZe7QcNO21589SU YH8GQVlH9Gx41nlgPgh+JxxtBoY76wP5L6Dv3XqFV5EEJSOeuupnZaUgR6SRi0ATcenY Ipiw== X-Gm-Message-State: AOAM532r6CpGVv3BUMrtwy6QBuvTkKl5tz5sNkspoZxxk/Xk90IN5Peh ceWqyia+FTW20+W8Rgp+gKDQErOL9k/F/g== X-Google-Smtp-Source: ABdhPJy0ZsFlTc/0lXbNaxm153mIvSO6BOnpK9zp4DOpOiT232PHl7D5fHjFGVWLNvOsmxHqdrpO1A== X-Received: by 2002:aa7:9711:0:b029:1ee:b2c7:ecfe with SMTP id a17-20020aa797110000b02901eeb2c7ecfemr3339953pfg.58.1614783004283; Wed, 03 Mar 2021 06:50:04 -0800 (PST) Received: from localhost.localdomain ([106.39.151.89]) by smtp.gmail.com with ESMTPSA id i10sm27767499pgo.75.2021.03.03.06.49.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Mar 2021 06:50:03 -0800 (PST) From: xiangxia.m.yue@gmail.com To: i.maximets@ovn.org, blp@ovn.org, u9012063@gmail.com, horms@ovn.org Date: Wed, 3 Mar 2021 22:46:56 +0800 Message-Id: <20210303144658.47858-3-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20210303144658.47858-1-xiangxia.m.yue@gmail.com> References: <20210303144658.47858-1-xiangxia.m.yue@gmail.com> Cc: dev@openvswitch.org Subject: [ovs-dev] [PATCH RESEND ovs v3 2/4] dpif-netdev: Refactor the buckets calculation. 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: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Tonghao Zhang The way that "burst_size" was used as total buckets is very strange. If user set the "burst_size" too smaller while "rate" larger, that may affect the meter normal work. This patch refactor the buckets calculation, and start with a full buckets. Signed-off-by: Tonghao Zhang --- lib/dpif-netdev.c | 17 ++++++++++------- tests/dpif-netdev.at | 14 +++++++------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 78f3eef5381b..77df376a26bc 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -280,8 +280,8 @@ static bool dpcls_lookup(struct dpcls *cls, struct dp_meter_band { uint32_t rate; + uint32_t burst_size; uint64_t bucket; /* In 1/1000 packets (for PKTPS), or in bits (for KBPS) */ - uint64_t burst_size; uint64_t packet_count; uint64_t byte_count; }; @@ -6204,12 +6204,14 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, /* Update all bands and find the one hit with the highest rate for each * packet (if any). */ for (int m = 0; m < meter->n_bands; ++m) { - band = &meter->bands[m]; + uint64_t max_bucket_size; + band = &meter->bands[m]; + max_bucket_size = band->rate * 1000ULL; /* Update band's bucket. */ band->bucket += (uint64_t) delta_t * band->rate; - if (band->bucket > band->burst_size) { - band->bucket = band->burst_size; + if (band->bucket > max_bucket_size) { + band->bucket = max_bucket_size; } /* Drain the bucket for all the packets, if possible. */ @@ -6330,13 +6332,14 @@ dpif_netdev_meter_set(struct dpif *dpif, ofproto_meter_id meter_id, config->bands[i].burst_size = config->bands[i].rate; } - meter->bands[i].bucket = 0; meter->bands[i].rate = config->bands[i].rate; - meter->bands[i].burst_size = config->bands[i].burst_size * 1000ULL; + meter->bands[i].burst_size = config->bands[i].burst_size; + /* Start with a full bucket. */ + meter->bands[i].bucket = meter->bands[i].rate * 1000ULL; /* Figure out max delta_t that is enough to fill any bucket. */ band_max_delta_t - = meter->bands[i].burst_size / meter->bands[i].rate; + = meter->bands[i].bucket / meter->bands[i].rate; if (band_max_delta_t > meter->max_delta_t) { meter->max_delta_t = band_max_delta_t; } diff --git a/tests/dpif-netdev.at b/tests/dpif-netdev.at index 2862a3c9b96d..a30d026cabe1 100644 --- a/tests/dpif-netdev.at +++ b/tests/dpif-netdev.at @@ -314,15 +314,15 @@ sleep 1 # wait for forwarders process packets # Meter 1 is measuring packets, allowing one packet per second with # bursts of one packet, so 4 out of 5 packets should hit the drop # band. -# Meter 2 is measuring kbps, with burst size 2 (== 2000 bits). 4 packets -# (240 bytes == 1920 bits) pass, but the last packet should hit the drop band. +# Meter 2 is measuring kbps, with burst size 2 (== 1000 bits). 2 packets +# (120 bytes == 960 bits) pass, but the last packet should hit the drop band. AT_CHECK([ovs-ofctl -O OpenFlow13 meter-stats br0 | strip_timers], [0], [dnl OFPST_METER reply (OF1.3) (xid=0x2): meter:1 flow_count:1 packet_in_count:5 byte_in_count:300 duration:0.0s bands: 0: packet_count:4 byte_count:240 meter:2 flow_count:1 packet_in_count:5 byte_in_count:300 duration:0.0s bands: -0: packet_count:1 byte_count:60 +0: packet_count:3 byte_count:180 ]) # Advance time by 1/2 second @@ -343,8 +343,8 @@ sleep 1 # wait for forwarders process packets # Meter 1 is measuring packets, allowing one packet per second with # bursts of one packet, so all 5 of the new packets should hit the drop # band. -# Meter 2 is measuring kbps, with burst size 2 (== 2000 bits). After 500ms -# there should be space for 80 + 500 bits, so one new 60 byte (480 bit) packet +# Meter 2 is measuring kbps, with burst size 2 (== 1000 bits). After 500ms +# there should be space for 40 + 500 bits, so one new 60 byte (480 bit) packet # should pass, remaining 4 should hit the drop band. AT_CHECK([ovs-ofctl -O OpenFlow13 meter-stats br0 | strip_timers], [0], [dnl OFPST_METER reply (OF1.3) (xid=0x2): @@ -352,7 +352,7 @@ meter:1 flow_count:1 packet_in_count:10 byte_in_count:600 duration:0.0s bands: 0: packet_count:9 byte_count:540 meter:2 flow_count:1 packet_in_count:10 byte_in_count:600 duration:0.0s bands: -0: packet_count:5 byte_count:300 +0: packet_count:7 byte_count:420 ]) ovs-appctl time/warp 5000 @@ -360,7 +360,7 @@ ovs-appctl time/warp 5000 AT_CHECK([ ovs-appctl coverage/read-counter datapath_drop_meter ], [0], [dnl -14 +16 ]) AT_CHECK([cat ovs-vswitchd.log | filter_flow_install | strip_xout_keep_actions], [0], [dnl From patchwork Wed Mar 3 14:46:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1446718 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=140.211.166.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=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=DOAYYx3I; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.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 4DrJW55Fxpz9sPf for ; Thu, 4 Mar 2021 02:55:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B46584A5B0; Wed, 3 Mar 2021 15:55:43 +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 aiNyalmbVQ97; Wed, 3 Mar 2021 15:55:42 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTP id 9891F49E7A; Wed, 3 Mar 2021 15:55:41 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 59636C000A; Wed, 3 Mar 2021 15:55:41 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6C773C0001 for ; Wed, 3 Mar 2021 15:55:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 53562836F6 for ; Wed, 3 Mar 2021 15:55:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com 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 8FUJ8thh1jdd for ; Wed, 3 Mar 2021 15:55:39 +0000 (UTC) X-Greylist: delayed 06:24:41 by SQLgrey-1.8.0 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by smtp1.osuosl.org (Postfix) with ESMTPS id 3E7EA8367B for ; Wed, 3 Mar 2021 15:55:39 +0000 (UTC) Received: by mail-pf1-x433.google.com with SMTP id i10so7396015pfk.4 for ; Wed, 03 Mar 2021 07:55:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OUokXIaRxFDF2L/nf2gwrFai72OXUdxdDTjYIOXIcT8=; b=DOAYYx3I0LXaugPSQSNsttWJVp0m43QY2BKwQBdXfQtlthCKiK4HqrYN9qRUkAzUsQ Q8TQ6Is+31xzhUnksL24zQxlLFxarSctf3cODvSryg5hdnMfGXnKk5PGLr6jvZD2KLwI 4XoPrHt2bY3HiSCKnK18RWgGtXItGQTw7BIT0G3WyWfd+xauO3yUJ2yoTT7/h0IdZ4z4 ekU2H8uodQ2ev/gqMB/Bb8YRWCkHVOdz7wsIEkDZ43gitl12yBJe7TnCXr/IxTsIjA/2 ttWGbGN/hz4si6y6KWnszYXSu/C9W9NzkQV2ZbTxcUiXwue6Jv9TVEsqa/nyqhuRdICO CTag== 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; bh=OUokXIaRxFDF2L/nf2gwrFai72OXUdxdDTjYIOXIcT8=; b=FfJ4icJSaNqEO2k4jmh8peFEbVFTUJusYNg0RZBBPV/8nRZfJ7D/teH/kmWKis16pY bNw5tDkk35uXevgzN0dA2NRho8B8tfDnBkP2FnsVwGuSMvFx/ZmPCSYW2xiyXhKaK3T4 CugKfsdqT0O9bJBxgvqBtDmzgpLxViIh4TfPU1Hj0h9Sa4YdSsTyTellbtFyrT41mM6x 24NMoXyvGT+Szka2Q3htDg8dUPnvGSDX8ygLnk/ddBbTMMl6kzF2yvQp4IyE5cEslp2i v57xgKcsaB6Wd8ELkt4iHlmsSHTpOotQ83XcgYJ+RtAkkpVW+C+zCdGorjymQ+BGCRp6 c6mQ== X-Gm-Message-State: AOAM532QESxTP6VECClZS3qZhcPnjNGnOWX6rvWgW6JYgOcTkHTx/Y6z gY3TSlrhMVRBRBHW0SuTzSUsGB8WBBAYsQ== X-Google-Smtp-Source: ABdhPJzVsNG2zYcKoU9E/Nf98pgBUXcrAvYrdLQFsEBKKZDOJmdaG87llFzIJyNgwAaWvbIhk5sJnQ== X-Received: by 2002:a05:6a00:22d6:b029:1cb:35ac:d8e0 with SMTP id f22-20020a056a0022d6b02901cb35acd8e0mr8287590pfj.17.1614783010311; Wed, 03 Mar 2021 06:50:10 -0800 (PST) Received: from localhost.localdomain ([106.39.151.89]) by smtp.gmail.com with ESMTPSA id i10sm27767499pgo.75.2021.03.03.06.50.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Mar 2021 06:50:09 -0800 (PST) From: xiangxia.m.yue@gmail.com To: i.maximets@ovn.org, blp@ovn.org, u9012063@gmail.com, horms@ovn.org Date: Wed, 3 Mar 2021 22:46:57 +0800 Message-Id: <20210303144658.47858-4-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20210303144658.47858-1-xiangxia.m.yue@gmail.com> References: <20210303144658.47858-1-xiangxia.m.yue@gmail.com> Cc: dev@openvswitch.org Subject: [ovs-dev] [PATCH RESEND ovs v3 3/4] dpif-netdev: Add the burst size to buckets. 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: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Tonghao Zhang For now, the meter of the userspace datapath, don't include the bucket burst size to total buckets. This patch includes it now. $ ovs-ofctl -O OpenFlow13 add-meter br0 'meter=1 pktps burst stats bands=type=drop rate=10000 burst_size=2000' OvS linux kernel module do that in the same way. Signed-off-by: Tonghao Zhang --- lib/dpif-netdev.c | 5 ++-- tests/dpif-netdev.at | 63 ++++++++++++++++++++++---------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 77df376a26bc..e53ed31b906c 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -6207,7 +6207,7 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, uint64_t max_bucket_size; band = &meter->bands[m]; - max_bucket_size = band->rate * 1000ULL; + max_bucket_size = (band->rate + band->burst_size) * 1000ULL; /* Update band's bucket. */ band->bucket += (uint64_t) delta_t * band->rate; if (band->bucket > max_bucket_size) { @@ -6335,7 +6335,8 @@ dpif_netdev_meter_set(struct dpif *dpif, ofproto_meter_id meter_id, meter->bands[i].rate = config->bands[i].rate; meter->bands[i].burst_size = config->bands[i].burst_size; /* Start with a full bucket. */ - meter->bands[i].bucket = meter->bands[i].rate * 1000ULL; + meter->bands[i].bucket = + (meter->bands[i].burst_size + meter->bands[i].rate) * 1000ULL; /* Figure out max delta_t that is enough to fill any bucket. */ band_max_delta_t diff --git a/tests/dpif-netdev.at b/tests/dpif-netdev.at index a30d026cabe1..b2ff69a01ee6 100644 --- a/tests/dpif-netdev.at +++ b/tests/dpif-netdev.at @@ -299,60 +299,59 @@ type=drop rate=1 burst_size=2 ]) ovs-appctl time/warp 5000 -AT_CHECK([ovs-appctl netdev-dummy/receive p7 'in_port(7),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p7 'in_port(7),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p7 'in_port(7),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p7 'in_port(7),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p7 'in_port(7),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p8 'in_port(8),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p8 'in_port(8),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p8 'in_port(8),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p8 'in_port(8),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p8 'in_port(8),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) +for i in `seq 1 7`; do + AT_CHECK([ovs-appctl netdev-dummy/receive p7 \ + 'in_port(7),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) +done + +for i in `seq 1 5`; do + AT_CHECK([ovs-appctl netdev-dummy/receive p8 \ + 'in_port(8),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) +done + sleep 1 # wait for forwarders process packets # Meter 1 is measuring packets, allowing one packet per second with -# bursts of one packet, so 4 out of 5 packets should hit the drop +# bursts of one packet, so 3 out of 5 packets should hit the drop # band. -# Meter 2 is measuring kbps, with burst size 2 (== 1000 bits). 2 packets -# (120 bytes == 960 bits) pass, but the last packet should hit the drop band. +# Meter 2 is measuring kbps, with burst size 2 (== 3000 bits). 6 packets +# (360 bytes == 2880 bits) pass, but the last packet should hit the drop band. AT_CHECK([ovs-ofctl -O OpenFlow13 meter-stats br0 | strip_timers], [0], [dnl OFPST_METER reply (OF1.3) (xid=0x2): meter:1 flow_count:1 packet_in_count:5 byte_in_count:300 duration:0.0s bands: -0: packet_count:4 byte_count:240 - -meter:2 flow_count:1 packet_in_count:5 byte_in_count:300 duration:0.0s bands: 0: packet_count:3 byte_count:180 + +meter:2 flow_count:1 packet_in_count:7 byte_in_count:420 duration:0.0s bands: +0: packet_count:1 byte_count:60 ]) # Advance time by 1/2 second ovs-appctl time/warp 500 -AT_CHECK([ovs-appctl netdev-dummy/receive p7 'in_port(7),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p7 'in_port(7),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p7 'in_port(7),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p7 'in_port(7),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p7 'in_port(7),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p8 'in_port(8),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p8 'in_port(8),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p8 'in_port(8),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p8 'in_port(8),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) -AT_CHECK([ovs-appctl netdev-dummy/receive p8 'in_port(8),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) +for i in `seq 1 5`; do + AT_CHECK([ovs-appctl netdev-dummy/receive p7 \ + 'in_port(7),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) + + AT_CHECK([ovs-appctl netdev-dummy/receive p8 \ + 'in_port(8),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) + +done + sleep 1 # wait for forwarders process packets # Meter 1 is measuring packets, allowing one packet per second with # bursts of one packet, so all 5 of the new packets should hit the drop # band. -# Meter 2 is measuring kbps, with burst size 2 (== 1000 bits). After 500ms -# there should be space for 40 + 500 bits, so one new 60 byte (480 bit) packet +# Meter 2 is measuring kbps, with burst size 2 (== 3000 bits). After 500ms +# there should be space for 120 + 500 bits, so one new 60 byte (480 bit) packet # should pass, remaining 4 should hit the drop band. AT_CHECK([ovs-ofctl -O OpenFlow13 meter-stats br0 | strip_timers], [0], [dnl OFPST_METER reply (OF1.3) (xid=0x2): meter:1 flow_count:1 packet_in_count:10 byte_in_count:600 duration:0.0s bands: -0: packet_count:9 byte_count:540 +0: packet_count:8 byte_count:480 -meter:2 flow_count:1 packet_in_count:10 byte_in_count:600 duration:0.0s bands: -0: packet_count:7 byte_count:420 +meter:2 flow_count:1 packet_in_count:12 byte_in_count:720 duration:0.0s bands: +0: packet_count:5 byte_count:300 ]) ovs-appctl time/warp 5000 @@ -360,7 +359,7 @@ ovs-appctl time/warp 5000 AT_CHECK([ ovs-appctl coverage/read-counter datapath_drop_meter ], [0], [dnl -16 +13 ]) AT_CHECK([cat ovs-vswitchd.log | filter_flow_install | strip_xout_keep_actions], [0], [dnl From patchwork Wed Mar 3 14:46:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1446692 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=140.211.166.133; helo=smtp2.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=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ii5Nxj/R; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (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 4DrHC92wJ2z9sCD for ; Thu, 4 Mar 2021 01:56:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 046D9400F5; Wed, 3 Mar 2021 14:56:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org 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 aIObbSccBw_i; Wed, 3 Mar 2021 14:56:49 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTP id 22A7D400E9; Wed, 3 Mar 2021 14:56:48 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id E3877C000B; Wed, 3 Mar 2021 14:56:47 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0FD34C0001 for ; Wed, 3 Mar 2021 14:56:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id EE60C6FAE1 for ; Wed, 3 Mar 2021 14:56:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tFcgJ9UXwfyY for ; Wed, 3 Mar 2021 14:56:46 +0000 (UTC) X-Greylist: delayed 09:13:02 by SQLgrey-1.8.0 Received: from mail-qv1-xf35.google.com (mail-qv1-xf35.google.com [IPv6:2607:f8b0:4864:20::f35]) by smtp3.osuosl.org (Postfix) with ESMTPS id 049F8605A3 for ; Wed, 3 Mar 2021 14:56:45 +0000 (UTC) Received: by mail-qv1-xf35.google.com with SMTP id n4so9490785qvl.4 for ; Wed, 03 Mar 2021 06:56:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JvLcO64VJ9OqdMtE+ZVolC1c1BOTMHAE8b0S+xffW3s=; b=ii5Nxj/RepwLK7GDB/oYZEUdQOS0xcYf8P9PKdgCFo6175IMliKDp21TDV5MZ6Uah0 izqkHI9sRzKF7yjK6LZIAWbFmd+di1FTmFJULq501ARapDKzUTBnyC1ntafx/agEWGK9 RW6LlF71V0TLjvkvRSwcKeJi3p6BeMmCm0x1y4D2szmhBAmpAM51nPCse55HUF0xVWTZ tmYiVZg8DnM+tWaU9N2gi2KTW3ep37d11UOidaaZURDliB+3WJwMHwWWin6K5iHrf9gF GHo87kFULaJxTB7Ew/6o6kkDQQ/21coGpgBmhdKFH27hhFEGdY6p7snJxmF2jrrmiJg3 fMBA== 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; bh=JvLcO64VJ9OqdMtE+ZVolC1c1BOTMHAE8b0S+xffW3s=; b=G4Q9130IXuR6qUwiQLdxibqzjTC+G/JZQ1y/XubYqMXC6o8UqVGqycU5mGaJk2dpWr FmF5uTOVFp69aa96sJyTYhELio3qG4XBXDGuo/jLuCEEZpPiRPWHso3BALcISsIASQbU k//t3+D7yZUHxd5ndyj0W+2jSMjBteYoJPA7YwXZBmEH/zRHxRrl6lA3ybpQzVH4geGv GhJt42pUQEsXK7ZKIVIqyg+SPAd+HFXkEEwZbJ9g3KGjo4rruUaaT1fnM5/64d53C4SQ qdRtb2mkexyobb02SH1DO9sTRy8qgKy2sz02aXXIhH9Rw11hVANk7ub3I7zLs4trOFN/ OsLg== X-Gm-Message-State: AOAM530dod140oVxs1x7Gwa15LXZDLDOSt5w/OwbLXkhQ/LtBwnf6rlY YHYQ3I6r5pOh/FkuOETlUqw/0BulN1R/vw== X-Google-Smtp-Source: ABdhPJwcNTo1jMTQ8qmUyKA/Z+sDfbLNNMfpVb2h9lO9wXYVIFlqd2LuRr48qTPs/iV6RzyBuYfGgQ== X-Received: by 2002:a17:902:d202:b029:e4:55cd:dde8 with SMTP id t2-20020a170902d202b02900e455cddde8mr3037921ply.51.1614783017050; Wed, 03 Mar 2021 06:50:17 -0800 (PST) Received: from localhost.localdomain ([106.39.151.89]) by smtp.gmail.com with ESMTPSA id i10sm27767499pgo.75.2021.03.03.06.50.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Mar 2021 06:50:16 -0800 (PST) From: xiangxia.m.yue@gmail.com To: i.maximets@ovn.org, blp@ovn.org, u9012063@gmail.com, horms@ovn.org Date: Wed, 3 Mar 2021 22:46:58 +0800 Message-Id: <20210303144658.47858-5-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20210303144658.47858-1-xiangxia.m.yue@gmail.com> References: <20210303144658.47858-1-xiangxia.m.yue@gmail.com> Cc: dev@openvswitch.org Subject: [ovs-dev] [PATCH RESEND ovs v3 4/4] dpif: Don't set "burst_size" to "rate" if not specified. 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: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Tonghao Zhang If user don't set the meter "burst_size", when creating them. OvS will set "brust_size" to "rate", and there will be a double "rate" as burst rate. For example: $ ovs-ofctl -O OpenFlow13 add-meter br0 'meter=1 pktps stats bands=type=drop rate=1000000' The rate expected is 1Gbps, but burst rate is 2Gbps while we don't use "burst_size". Signed-off-by: Tonghao Zhang --- lib/dpif-netdev.c | 5 --- lib/dpif-netlink.c | 2 +- tests/dpif-netdev.at | 103 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 6 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index e53ed31b906c..e0a44abebda6 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -6327,11 +6327,6 @@ dpif_netdev_meter_set(struct dpif *dpif, ofproto_meter_id meter_id, for (i = 0; i < config->n_bands; ++i) { uint32_t band_max_delta_t; - /* Set burst size to a workable value if none specified. */ - if (config->bands[i].burst_size == 0) { - config->bands[i].burst_size = config->bands[i].rate; - } - meter->bands[i].rate = config->bands[i].rate; meter->bands[i].burst_size = config->bands[i].burst_size; /* Start with a full bucket. */ diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c index ceb56c6851c6..f3db0c6802b9 100644 --- a/lib/dpif-netlink.c +++ b/lib/dpif-netlink.c @@ -3761,7 +3761,7 @@ dpif_netlink_meter_set__(struct dpif *dpif_, ofproto_meter_id meter_id, nl_msg_put_u32(&buf, OVS_BAND_ATTR_RATE, band->rate); nl_msg_put_u32(&buf, OVS_BAND_ATTR_BURST, config->flags & OFPMF13_BURST ? - band->burst_size : band->rate); + band->burst_size : 0); nl_msg_end_nested(&buf, band_offset); } nl_msg_end_nested(&buf, bands_offset); diff --git a/tests/dpif-netdev.at b/tests/dpif-netdev.at index b2ff69a01ee6..b18297983007 100644 --- a/tests/dpif-netdev.at +++ b/tests/dpif-netdev.at @@ -372,6 +372,109 @@ recirc_id(0),in_port(8),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(frag=no), a OVS_VSWITCHD_STOP AT_CLEANUP +AT_SETUP([dpif-netdev - meters without burst_size]) +# Create br0 with interfaces p1 and p7 +# and br1 with interfaces p2 and p8 +# with p1 and p2 connected via unix domain socket +OVS_VSWITCHD_START( + [add-port br0 p1 -- set interface p1 type=dummy options:pstream=punix:$OVS_RUNDIR/p0.sock ofport_request=1 -- \ + add-port br0 p7 -- set interface p7 ofport_request=7 type=dummy -- \ + add-br br1 -- \ + set bridge br1 other-config:hwaddr=aa:66:aa:66:00:00 -- \ + set bridge br1 datapath-type=dummy other-config:datapath-id=1234 \ + fail-mode=secure -- \ + add-port br1 p2 -- set interface p2 type=dummy options:stream=unix:$OVS_RUNDIR/p0.sock ofport_request=2 -- \ + add-port br1 p8 -- set interface p8 ofport_request=8 type=dummy --]) +AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) + +AT_CHECK([ovs-ofctl -O OpenFlow13 add-meter br0 'meter=1 pktps stats bands=type=drop rate=1']) +AT_CHECK([ovs-ofctl -O OpenFlow13 add-meter br0 'meter=2 kbps stats bands=type=drop rate=1']) +AT_CHECK([ovs-ofctl -O OpenFlow13 add-flow br0 'in_port=1 action=meter:1,7']) +AT_CHECK([ovs-ofctl -O OpenFlow13 add-flow br0 'in_port=7 action=meter:2,1']) +AT_CHECK([ovs-ofctl add-flow br1 'in_port=2 action=8']) +AT_CHECK([ovs-ofctl add-flow br1 'in_port=8 action=2']) +ovs-appctl time/stop + +AT_CHECK([ovs-ofctl -O OpenFlow13 dump-meters br0], [0], [dnl +OFPST_METER_CONFIG reply (OF1.3) (xid=0x2): +meter=1 pktps stats bands= +type=drop rate=1 + +meter=2 kbps stats bands= +type=drop rate=1 +]) + +ovs-appctl time/warp 5000 +for i in `seq 1 5`; do + AT_CHECK([ovs-appctl netdev-dummy/receive p7 \ + 'in_port(7),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) + AT_CHECK([ovs-appctl netdev-dummy/receive p8 \ + 'in_port(8),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) +done + +sleep 1 # wait for forwarders process packets + +# Meter 1 is measuring packets, allowing one packet per second, +# so 4 out of 5 packets should hit the drop band. +# +# Meter 2 is measuring kbps (== 1000 bits). 2 packets +# (120 bytes == 960 bits) pass, but the last 3 packets should hit the drop band. +AT_CHECK([ovs-ofctl -O OpenFlow13 meter-stats br0 | strip_timers], [0], [dnl +OFPST_METER reply (OF1.3) (xid=0x2): +meter:1 flow_count:1 packet_in_count:5 byte_in_count:300 duration:0.0s bands: +0: packet_count:4 byte_count:240 + +meter:2 flow_count:1 packet_in_count:5 byte_in_count:300 duration:0.0s bands: +0: packet_count:3 byte_count:180 +]) + +# Advance time by 1/2 second +ovs-appctl time/warp 500 + +for i in `seq 1 5`; do + AT_CHECK([ovs-appctl netdev-dummy/receive p7 \ + 'in_port(7),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) + + AT_CHECK([ovs-appctl netdev-dummy/receive p8 \ + 'in_port(8),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.3,dst=10.0.0.4,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' --len 60]) + +done + +sleep 1 # wait for forwarders process packets + +# Meter 1 is measuring packets, allowing one packet per second with +# bursts of one packet, so all 5 of the new packets should hit the drop +# band. +# Meter 2 is measuring kbps (== 1000 bits). After 500ms +# there should be space for 40 + 500 bits, so one new 60 byte (480 bit) packet +# should pass, remaining 4 should hit the drop band. +AT_CHECK([ovs-ofctl -O OpenFlow13 meter-stats br0 | strip_timers], [0], [dnl +OFPST_METER reply (OF1.3) (xid=0x2): +meter:1 flow_count:1 packet_in_count:10 byte_in_count:600 duration:0.0s bands: +0: packet_count:9 byte_count:540 + +meter:2 flow_count:1 packet_in_count:10 byte_in_count:600 duration:0.0s bands: +0: packet_count:7 byte_count:420 +]) + +ovs-appctl time/warp 5000 + +AT_CHECK([ +ovs-appctl coverage/read-counter datapath_drop_meter +], [0], [dnl +16 +]) + +AT_CHECK([cat ovs-vswitchd.log | filter_flow_install | strip_xout_keep_actions], [0], [dnl +recirc_id(0),in_port(1),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(frag=no), actions:meter(0),7 +recirc_id(0),in_port(2),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(frag=no), actions:8 +recirc_id(0),in_port(7),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(frag=no), actions:meter(1),1 +recirc_id(0),in_port(8),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(frag=no), actions:2 +]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + m4_define([DPIF_NETDEV_FLOW_HW_OFFLOAD], [AT_SETUP([dpif-netdev - partial hw offload - $1]) OVS_VSWITCHD_START(