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(