From patchwork Thu Apr 30 11:00:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1280183 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=hemlock.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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=g9Qh3bfx; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49CXWR1wJDz9sSM for ; Thu, 30 Apr 2020 21:01:39 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0750888702; Thu, 30 Apr 2020 11:01:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id daASyDNxw-rP; Thu, 30 Apr 2020 11:01:34 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 85C90886D5; Thu, 30 Apr 2020 11:01:34 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6C6AEC088F; Thu, 30 Apr 2020 11:01:34 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5614AC016F for ; Thu, 30 Apr 2020 11:01:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4733387E8E for ; Thu, 30 Apr 2020 11:01:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2uNxpJIEqVGZ for ; Thu, 30 Apr 2020 11:01:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5DA8287E75 for ; Thu, 30 Apr 2020 11:01:28 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id p25so2702181pfn.11 for ; Thu, 30 Apr 2020 04:01:28 -0700 (PDT) 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=XtUA19iGSrpavX7puWpWRZjhVubzsjtZIKMZdkkTsQI=; b=g9Qh3bfxKi7Qv93fqX5hMMoGWyZastV8s3OaHIL8XRx9clBeS9SDnnb9rpcO1+gEOm lFrkjNc8/OwS4lDmdYOJXbkZpTjJjJRmYcPLd1UeCW7znNB8oOM1pLBqaIGxHDxdfe3r vJXaGR29DAwOG8WTME+gcCGFsCG533+LjW0yn3EYv67yIG6PaxzaAAJlqLLbBelk7XCA OyKHvsQ67d6b2rZSaNOmmxvHkwpDaX92HhvaDbi6whNlZonbthj6OnVdtVAIfdfWZXd0 uW1x0n/39PU5EMy+3vu2RJzkAu0gbN33b3/dlG1HuxNRjKFknWk2v0r3oIrVyg/9x0kP vrqA== 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=XtUA19iGSrpavX7puWpWRZjhVubzsjtZIKMZdkkTsQI=; b=iSfVYkPiS4HacBQfImCNxRbxI4iv1ID+2KyPddJkFubF7MRyKBDN0MYwaBQNn7Mi5r g6JR0gsVMId/b+MBNIy7rIb5qBAqz1sHQ7E2yDP9TEdzr98/zQzvk2W6uUqs6FeXt+tp 3xDfQRjaAMzWmdX03IMirk8ZPJKccyU94P2t2LVl6kc2Psx3BvpB334Q4o+8oeNPAVQd zq3/rTABxfO3JXJGUTHqRZCpPopb19AgV51jT6hzAoPRPC4dcYHx5dU0tpUNb2TkqBod zSVKf79AZ9XdRiyarEO+DLWhc+3N4ScB9l0K0lzQKnfhAey9LqQpgAakniJ5cR29Gtlr 7f1w== X-Gm-Message-State: AGi0PuZNtpJ6P4j6gTocc+0h+atM/f19xhkcyJwmibiGM3yTNAU0uYCg sSj5MrBJ+/LUGEEW0Wfdw9Y= X-Google-Smtp-Source: APiQypLtaH6n8kAbK1f7KC88UmvWJ0uKEzIHyj0wweYW+AoyK1ESUVh7HoAxNHtvfjBLMAWb63K0IQ== X-Received: by 2002:a63:1d08:: with SMTP id d8mr2708250pgd.306.1588244487873; Thu, 30 Apr 2020 04:01:27 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id 7sm3032725pga.15.2020.04.30.04.01.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2020 04:01:27 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: i.maximets@ovn.org, blp@ovn.org, azhou@ovn.org, u9012063@gmail.com, jarno@ovn.org Date: Thu, 30 Apr 2020 19:00:39 +0800 Message-Id: <1588244439-58766-5-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588244439-58766-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1584180230-89020-1-git-send-email-xiangxia.m.yue@gmail.com> <1588244439-58766-1-git-send-email-xiangxia.m.yue@gmail.com> Cc: dev@openvswitch.org Subject: [ovs-dev] [PATCH OVS 4/4] revert: dpif-netdev: includes microsecond delta in meter bucket 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 Use the pktgen-dpdk to test the commit 5c41c31ebd64 ("dpif-netdev: includes microsecond delta in meter bucket calculation"), it does't work as expected. And it broken the meter function (e.g. set rate 200Mbps, the rate watched was 400Mbps). To reproduce it: $ ovs-vsctl add-br br-int -- set bridge br-int datapath_type=netdev $ ovs-ofctl -O OpenFlow13 add-meter br-int "meter=100 kbps burst stats bands=type=drop rate=200000 burst_size=200000" $ ovs-ofctl -O OpenFlow13 add-flow br-int "in_port=dpdk0 action=meter:100,output:dpdk1" $ pktgen -l 1,3,5,7,9,11,13,15,17,19 -n 8 --socket-mem 4096 --file-prefix pg1 \ -w 0000:82:00.0 -w 0000:82:00.1 -- -T -P -m "[3/5/7/9/11/13/15].[0-1]" -f meter-test.pkt | meter-test.pkt: | set 0 count 0 | set 0 size 1500 | set 0 rate 100 | set 0 burst 64 | set 0 sport 1234 | set 0 dport 5678 | set 0 prime 1 | set 0 type ipv4 | set 0 proto udp | set 0 dst ip 1.1.1.2 | set 0 src ip 1.1.1.1/24 | set 0 dst mac ec:0d:9a:ab:54:0a | set 0 src mac ec:0d:9a:bf:df:bb | set 0 vlanid 0 | start 0 Cc: Ilya Maximets Cc: William Tu Cc: Jarno Rajahalme Cc: Ben Pfaff Cc: Andy Zhou Cc: Jiang Lidong Signed-off-by: Tonghao Zhang --- lib/dpif-netdev.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 104347d8b251..cf10b5a62423 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -5902,7 +5902,6 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, struct dp_packet *packet; long long int long_delta_t; /* msec */ uint32_t delta_t; /* msec */ - uint32_t delta_in_us; /* usec */ const size_t cnt = dp_packet_batch_size(packets_); uint32_t bytes, volume; int exceeded_band[NETDEV_MAX_BURST]; @@ -5933,9 +5932,6 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, Assuming that all racing threads received packets at the same time to avoid overflow. */ long_delta_t = 0; - delta_in_us = 0; - } else { - delta_in_us = (now - meter->used) % 1000; } /* Make sure delta_t will not be too large, so that bucket will not @@ -5971,7 +5967,6 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, /* Update band's bucket. */ band->bucket += (uint64_t)delta_t * band->up.rate; - band->bucket += delta_in_us * band->up.rate / 1000; if (band->bucket > band->up.burst_size) { band->bucket = band->up.burst_size; }