From patchwork Wed Feb 24 12:21:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1443837 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=HrVHl6V2; 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 4Dlw7l6R0Gz9sBy for ; Wed, 24 Feb 2021 23:23:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 47783430D2; Wed, 24 Feb 2021 12:23:46 +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 XeekrUYTCjv6; Wed, 24 Feb 2021 12:23:45 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTP id 733A2430D6; Wed, 24 Feb 2021 12:23:44 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5023CC000C; Wed, 24 Feb 2021 12:23:44 +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 DFE77C000A for ; Wed, 24 Feb 2021 12:23:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id BE9C683AE4 for ; Wed, 24 Feb 2021 12:23:42 +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 7EsPxQVVvqs4 for ; Wed, 24 Feb 2021 12:23:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by smtp1.osuosl.org (Postfix) with ESMTPS id DB970827C6 for ; Wed, 24 Feb 2021 12:23:41 +0000 (UTC) Received: by mail-qk1-f170.google.com with SMTP id 204so1816489qke.11 for ; Wed, 24 Feb 2021 04:23:41 -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=ogqpsSQhqj0T+/EB/y/P2XM6tjczN45biFX05GbqyP0=; b=HrVHl6V2gNKO75EseNivJ4u0fpXjzkKyp/ZV00ToYB0zr5sa23H+tkfi3P63eBXSJw Wuf7s6APphewLbDtzi+q70EBov0PmHu8jfRHVqAE2f5uYk5jy/mJxMcBiRziONLvLmH4 CYEwIS6FDA1VgVckxqXT8Wq2SmWKHyEyO+xQCuaWHz8F95+U3RkKtRUIQL3M7XojqLAe cZSqBB2qJN1oRw69uMBQs9RUxZAo+ti85pepykFPC1XTJ1Rx6do/xliYWPjntzAOeiE+ 2Mte5UB3sHVjsDv0VSjfJrq6XkhoKA7yK0lY6VF/zmS/8mohc+hN4J62QC33J9GsAyZ/ TUIw== 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=ogqpsSQhqj0T+/EB/y/P2XM6tjczN45biFX05GbqyP0=; b=piPTMBWtmmraxwstBBxDplRBSwawl04N+AGzgmyreTZO+VtM43Y2/vG10e8Sld9Bio MggsHX6MwxHILlEEJWjyXbNRRyXrZ/OKykNy+47MMdrn/u7I8eeL2JJpcFycAGWVlUiM TMCRh6jq7/6ydtTMafwWDM1OkSIatBasM1TJ1KAAewbAalvXZsyHL31k86gIzBwvJadi kCBcGw9upZA9MtXfDM3lR7EZHAS//QmRniCGVCqnija+rcKAP/6fjRnmaklVssAE78aU Ljk64eXG4VSLG0DOEJNJVhFj+l1aC1LJ47dA+hiNLJgjHplKJJPzTggISoiUgriKapb8 XmmQ== X-Gm-Message-State: AOAM530/uBr63EOyGi/IlDp72ZHjuZvMevlp6YwMa/X9YaBZxhumNtr4 FwfOjVCYX4Zvdjcex31Ck2U= X-Google-Smtp-Source: ABdhPJwuuCZ27i93+JpW8rcOSpJXQw9PdUU4OZwFi+f17yXLHt95B9KU9XlDXYXJ/baO4AxQbUOWgg== X-Received: by 2002:a37:991:: with SMTP id 139mr350780qkj.451.1614169420689; Wed, 24 Feb 2021 04:23:40 -0800 (PST) Received: from localhost.localdomain ([50.236.19.102]) by smtp.gmail.com with ESMTPSA id c63sm1377657qkf.8.2021.02.24.04.23.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Feb 2021 04:23:40 -0800 (PST) From: xiangxia.m.yue@gmail.com To: i.maximets@ovn.org, blp@ovn.org, pshelar@ovn.org, u9012063@gmail.com Date: Wed, 24 Feb 2021 20:21:48 +0800 Message-Id: <20210224122150.57551-2-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20210224122150.57551-1-xiangxia.m.yue@gmail.com> References: <20210224122150.57551-1-xiangxia.m.yue@gmail.com> Cc: dev@openvswitch.org Subject: [ovs-dev] [PATCH RESEND v2 1/3] 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" Before the patch, the buckets of meters was stored in its burst_size of ofputil_meter_band. It was overflow when we set the rate to 4294968. This patch don't change the public API and structure. This patch remove the "up" from dp_meter_band, and introduce the type, rate to datapath's meter bands. Then datapath don't depend upper layer. Signed-off-by: Tonghao Zhang --- lib/dpif-netdev.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 4381c618f1be..614f6fef6b77 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -279,8 +279,10 @@ 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) */ + uint16_t type; + uint32_t rate; + uint32_t burst_size; + uint64_t bucket; /* In 1/1000 packets (for PKTPS), or in bits (for KBPS) */ uint64_t packet_count; uint64_t byte_count; }; @@ -6203,12 +6205,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]; /* Update band's bucket. */ - band->bucket += delta_t * band->up.rate; - if (band->bucket > band->up.burst_size) { - band->bucket = band->up.burst_size; + max_bucket_size = band->rate * 1000ULL; + band->bucket += (uint64_t)delta_t * band->rate; + if (band->bucket > max_bucket_size) { + band->bucket = max_bucket_size; } /* Drain the bucket for all the packets, if possible. */ @@ -6226,8 +6230,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 +6250,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; } } @@ -6324,21 +6328,15 @@ 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].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].type = config->bands[i].type; + 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; /* 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].bucket / meter->bands[i].rate; if (band_max_delta_t > meter->max_delta_t) { meter->max_delta_t = band_max_delta_t; } From patchwork Wed Feb 24 12:21:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1443838 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.136; helo=smtp3.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=SB/TnFIZ; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (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 4Dlw7q1ttlz9sBy for ; Wed, 24 Feb 2021 23:23:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 87C7F6070C; Wed, 24 Feb 2021 12:23:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org 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 XMcjbiM89B9e; Wed, 24 Feb 2021 12:23:48 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTP id 7521C6F612; Wed, 24 Feb 2021 12:23:47 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4855EC0012; Wed, 24 Feb 2021 12:23: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 903F8C000A for ; Wed, 24 Feb 2021 12:23:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 88E836F62C for ; Wed, 24 Feb 2021 12:23:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org 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 VSu3iqNFDDck for ; Wed, 24 Feb 2021 12:23:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) by smtp3.osuosl.org (Postfix) with ESMTPS id D07C76F618 for ; Wed, 24 Feb 2021 12:23:45 +0000 (UTC) Received: by mail-qt1-f178.google.com with SMTP id d11so495852qtx.9 for ; Wed, 24 Feb 2021 04:23: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=DMiDIC1aM+zgl3MvhXAapUpy+QnoN8xht4aXgPI5Xis=; b=SB/TnFIZtMTnHI9OtmlG6pdHDV3Kun7HcoVAS1Xy6ovSLxoKwEjZPgNpI2ncaBQrUZ aosYuYxI2nmn+dKmq/g/Tawakox6cU8MnRsM/ACOB2n2Sg3EORRHSyks5pebv2CHkvWN fVK/XqY3MuavDkW0qyNwY8n13Dyxp40b/rEIJ1NRcpz2VD+Czjy8N6VcEIW0cgdV44pt IzbfZppO6Pe6TNu3Lf5DqSDHNnpj78wUk1zkekUSQkReVEJuV35CZ0TcwlVArtKF9i4x 1FOOi3x5dQrgHkz7abbQ7WsI6AC9eGGLgodpBfpvwRVi3dEFXfAybfYy7/fqaJSI9Iar PXTw== 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=DMiDIC1aM+zgl3MvhXAapUpy+QnoN8xht4aXgPI5Xis=; b=d2pgIm1hXfW9pqnxuVcinvYbhkfexVOQ+UHS9Q3ia1XpzE2RUXPpelvSnYllaKZgGa 36v1mi5KiT+Rw21zHQPoni5qmu0qmlfK1ikZvg/asaVysukFLxls66C3JGYZkxzct8Gs HPhkj56GkKzz2hmSokXu9ovtH0hxoA32AOrzt8lVY2evB0PO4fv/XGgLB0fDQodccQJK COU3UUM2YYobhhzsXYgAw/64eYupKwRrLwI3kkXcvYZ/ewRF/QadRx44OQjV3/kL5EWh YmZcV7wQyCqk1oasxzpzrg/AvEupH8yK6YeBNSXlejMkntWa0QhgNOspN90mPXo6jDBw PIuA== X-Gm-Message-State: AOAM532RtMievE+fe6PAAFJYWi/U1w41KnNLTo4ckuolLzBtD/vw6R5v PZwixSNi0ZxvdeyERJ9gvVg= X-Google-Smtp-Source: ABdhPJyu/yWyB+9Jj9S3OKOBoR+AP2k3lUz1vS24WkUpbeb4ZXmBR9/11Q3bFguJP3DML8cHe1VRwg== X-Received: by 2002:ac8:68b:: with SMTP id f11mr2686752qth.373.1614169424645; Wed, 24 Feb 2021 04:23:44 -0800 (PST) Received: from localhost.localdomain ([50.236.19.102]) by smtp.gmail.com with ESMTPSA id c63sm1377657qkf.8.2021.02.24.04.23.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Feb 2021 04:23:44 -0800 (PST) From: xiangxia.m.yue@gmail.com To: i.maximets@ovn.org, blp@ovn.org, pshelar@ovn.org, u9012063@gmail.com Date: Wed, 24 Feb 2021 20:21:49 +0800 Message-Id: <20210224122150.57551-3-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20210224122150.57551-1-xiangxia.m.yue@gmail.com> References: <20210224122150.57551-1-xiangxia.m.yue@gmail.com> Cc: dev@openvswitch.org Subject: [ovs-dev] [PATCH RESEND v2 2/3] 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 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' Signed-off-by: Tonghao Zhang --- lib/dpif-netdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 614f6fef6b77..94632b85b375 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -6209,7 +6209,7 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, band = &meter->bands[m]; /* Update band's bucket. */ - max_bucket_size = band->rate * 1000ULL; + max_bucket_size = (band->burst_size + band->rate) * 1000ULL; band->bucket += (uint64_t)delta_t * band->rate; if (band->bucket > max_bucket_size) { band->bucket = max_bucket_size; @@ -6332,7 +6332,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 From patchwork Wed Feb 24 12:21:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1443839 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=MrTvAbkO; 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 4Dlw7w687mz9sS8 for ; Wed, 24 Feb 2021 23:23:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 4DF23430E2; Wed, 24 Feb 2021 12:23:55 +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 w7P6rdndcBuW; Wed, 24 Feb 2021 12:23:54 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTP id 8A880430E1; Wed, 24 Feb 2021 12:23:53 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4F378C0013; Wed, 24 Feb 2021 12:23:53 +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 01F24C000A for ; Wed, 24 Feb 2021 12:23:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id EEC014EC45 for ; Wed, 24 Feb 2021 12:23:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com 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 9k4JovkdgIhu for ; Wed, 24 Feb 2021 12:23:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by smtp4.osuosl.org (Postfix) with ESMTPS id 9D90C4EC30 for ; Wed, 24 Feb 2021 12:23:49 +0000 (UTC) Received: by mail-qk1-f176.google.com with SMTP id b14so1896441qkk.0 for ; Wed, 24 Feb 2021 04:23:49 -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=z9Zev/t1xSicNxo/kHhQxQ1LaVtvm6Nkls3uulhzkbY=; b=MrTvAbkOkNz7yzlTImJZkyujvlBFry1vll6iNs7xa6WNojkeiQbbCcTpMFUhs9l4Xo 5rUj/4NInoyb3KH6DZJlM7IwJQTDKs9nMxnV3zy/H0yIJdrw9KPOhvi8vpoXtV1vgDiv dXJERlasXVzmGor/dxPQ1J1cGU7kHb1rutjeW3FGm/rakQx3d38CQj4ZLdoAC1c82AgF Ihs79GNdsE18zNB74V2FZU041BUWVj8MvtbHQIIHpv8CTH3oLV9OlebTo916ttWPHM1n wuMfghuwdnCOnN8la2uUJ0C1sULuy+2+/5qiMyMEv7goU60S0A77VSALh6dcOwFF9Pg+ JMIw== 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=z9Zev/t1xSicNxo/kHhQxQ1LaVtvm6Nkls3uulhzkbY=; b=lss2hNecOqq+jNUuTyckyddPs9wer2iKyvT5hKoxczhyIBFGlyeuzqqjVG4ETxuEUt g+l/8Nwx9LOUTyg7ZyZkhrAHYovY6o91YRUb8Z+Vhy6+KFPPHSJBUcwiF6oa3Cp747os Oz29xctwUDwBpLy0tbev92WWUiNSojSHlvhicMJU5oIIyzc7iSQMStrQ60n6zsKPZyoK 1xkd/IKIWA9fF2G6llpt1fnlFHNnB5xvaNXo0ZLhz4YelGFwxovTCvd9ysPgqbAb6Xiv 1sYmPSh49OfA+JWAn4/G5t6Wiedhxj2CyF/b4qx+avj210jMRUZC109zSaGtmseIUr+w OX9Q== X-Gm-Message-State: AOAM533iCmF7/j+PCMWZSnAOaEARQVUIeZMd9GE3rACfeVtPd8agBeNk ANc2H1HE0OyPfjizx5KnEfs= X-Google-Smtp-Source: ABdhPJw871s1mA/Hl6ubKyVA0+M4BHX8MMM+lZzy6Hn4tpi8lj5EtJ1fTX5Pkjl2Fw6A6MgvbbEc4w== X-Received: by 2002:a37:a47:: with SMTP id 68mr31016503qkk.2.1614169428323; Wed, 24 Feb 2021 04:23:48 -0800 (PST) Received: from localhost.localdomain ([50.236.19.102]) by smtp.gmail.com with ESMTPSA id c63sm1377657qkf.8.2021.02.24.04.23.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Feb 2021 04:23:47 -0800 (PST) From: xiangxia.m.yue@gmail.com To: i.maximets@ovn.org, blp@ovn.org, pshelar@ovn.org, u9012063@gmail.com Date: Wed, 24 Feb 2021 20:21:50 +0800 Message-Id: <20210224122150.57551-4-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20210224122150.57551-1-xiangxia.m.yue@gmail.com> References: <20210224122150.57551-1-xiangxia.m.yue@gmail.com> Cc: dev@openvswitch.org Subject: [ovs-dev] [PATCH RESEND v2 3/3] tests/dpif-netdev: Update dpif-netdev meter testcase. 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 buckets used was changed, and now dpif-netdev support burst_size, change the testcase. Signed-off-by: Tonghao Zhang --- tests/dpif-netdev.at | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/dpif-netdev.at b/tests/dpif-netdev.at index 2862a3c9b96d..3aa9c0cba518 100644 --- a/tests/dpif-netdev.at +++ b/tests/dpif-netdev.at @@ -282,7 +282,7 @@ OVS_VSWITCHD_START( AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) AT_CHECK([ovs-ofctl -O OpenFlow13 add-meter br0 'meter=1 pktps burst stats bands=type=drop rate=1 burst_size=1']) -AT_CHECK([ovs-ofctl -O OpenFlow13 add-meter br0 'meter=2 kbps burst stats bands=type=drop rate=1 burst_size=2']) +AT_CHECK([ovs-ofctl -O OpenFlow13 add-meter br0 'meter=2 kbps burst stats bands=type=drop rate=1 burst_size=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']) @@ -295,7 +295,7 @@ meter=1 pktps burst stats bands= type=drop rate=1 burst_size=1 meter=2 kbps burst stats bands= -type=drop rate=1 burst_size=2 +type=drop rate=1 burst_size=1 ]) ovs-appctl time/warp 5000 @@ -312,14 +312,14 @@ AT_CHECK([ovs-appctl netdev-dummy/receive p8 'in_port(8),packet_type(ns=0,id=0), 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 (== 2000 bits). 4 packets +# Meter 2 is measuring kbps, with burst size 1 ( = 2000bits). 4 packets # (240 bytes == 1920 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 +0: packet_count:3 byte_count:180 meter:2 flow_count:1 packet_in_count:5 byte_in_count:300 duration:0.0s bands: 0: packet_count:1 byte_count:60 @@ -343,13 +343,13 @@ 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 +# Meter 2 is measuring kbps, with burst size 1 (== 2000 bits). After 500ms # there should be space for 80 + 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:5 byte_count:300 @@ -360,7 +360,7 @@ ovs-appctl time/warp 5000 AT_CHECK([ ovs-appctl coverage/read-counter datapath_drop_meter ], [0], [dnl -14 +13 ]) AT_CHECK([cat ovs-vswitchd.log | filter_flow_install | strip_xout_keep_actions], [0], [dnl