From patchwork Fri Jun 29 19:13:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 937111 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HRGH1y7Gz9s2B for ; Sat, 30 Jun 2018 05:16:39 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 65ADDDC6; Fri, 29 Jun 2018 19:14:03 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 4DE56DB9 for ; Fri, 29 Jun 2018 19:14:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 50AA477E for ; Fri, 29 Jun 2018 19:14:01 +0000 (UTC) X-Originating-IP: 76.21.1.228 Received: from localhost.localdomain (unknown [76.21.1.228]) (Authenticated sender: jpettit@ovn.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 4E96AE000B for ; Fri, 29 Jun 2018 19:13:59 +0000 (UTC) From: Justin Pettit To: dev@openvswitch.org Date: Fri, 29 Jun 2018 12:13:52 -0700 Message-Id: <20180629191354.76641-4-jpettit@ovn.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629191354.76641-1-jpettit@ovn.org> References: <20180629191354.76641-1-jpettit@ovn.org> X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 4/6] ovn: Clarify the differences between QoS marking and metering. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org This also correct an error that indicated that the burst size is kbps, when it should be kb. Signed-off-by: Justin Pettit --- ovn/northd/ovn-northd.8.xml | 37 ++++++++++++++++++++----------------- ovn/ovn-nb.xml | 37 ++++++++++++++++++++++--------------- 2 files changed, 42 insertions(+), 32 deletions(-) diff --git a/ovn/northd/ovn-northd.8.xml b/ovn/northd/ovn-northd.8.xml index 4d0bab476f72..a9fe7d418f97 100644 --- a/ovn/northd/ovn-northd.8.xml +++ b/ovn/northd/ovn-northd.8.xml @@ -349,18 +349,20 @@ -

Ingress Table 7: from-lport QoS marking

+

Ingress Table 7: from-lport QoS Marking

Logical flows in this table closely reproduce those in the - QoS table in the OVN_Northbound database - for the from-lport direction. + QoS table with the action column set in + the OVN_Northbound database for the + from-lport direction.

  • - For every qos_rules for every logical switch a flow will be added at - priorities mentioned in the QoS table. + For every qos_rules entry in a logical switch with DSCP marking + enabled, a flow will be added at the priority mentioned in the + QoS table.
  • @@ -369,19 +371,20 @@
-

Ingress Table 8: from-lport QoS meter

+

Ingress Table 8: from-lport QoS Meter

Logical flows in this table closely reproduce those in the - QoS table bandwidth column in the - OVN_Northbound database for the from-lport - direction. + QoS table with the bandwidth column set + in the OVN_Northbound database for the + from-lport direction.

  • - For every qos_rules for every logical switch a flow will be added at - priorities mentioned in the QoS table. + For every qos_rules entry in a logical switch with metering + enabled, a flow will be added at the priorirty mentioned in the + QoS table.
  • @@ -920,18 +923,18 @@ output;
-

Egress Table 5: to-lport QoS marking

+

Egress Table 5: to-lport QoS Marking

- This is similar to ingress table QoS marking except for - to-lport qos rules. + This is similar to ingress table QoS marking except + they apply to to-lport QoS rules.

-

Egress Table 6: to-lport QoS meter

+

Egress Table 6: to-lport QoS Meter

- This is similar to ingress table QoS meter except for - to-lport qos rules. + This is similar to ingress table QoS meter except + they apply to to-lport QoS rules.

Egress Table 7: Stateful

diff --git a/ovn/ovn-nb.xml b/ovn/ovn-nb.xml index 6aed6102a56f..914469e482b7 100644 --- a/ovn/ovn-nb.xml +++ b/ovn/ovn-nb.xml @@ -122,7 +122,8 @@ - QOS marking rules that apply to packets within the logical switch. + QoS marking and metering rules that apply to packets within the + logical switch. @@ -1280,19 +1281,25 @@ - +

- Each row in this table represents one QOS rule for a logical switch - that points to it through its column. The column for the highest- - matching row in this table determines a packet's qos marking. If no row - matches, packets will not have any qos marking. + Each row in this table represents one QoS rule for a logical switch + that points to it through its column. + Two types of QoS are supported: DSCP marking and metering. A + with the highest- + will have QoS applied to it. If the column is + specified, then matching packets will have DSCP marking applied. + If the column is specified, then matching + packets will have metering applied. and + are not exclusive, so both marking and + metering by defined for the same QoS entry. If no row matches, + packets will not have any QoS applied.

- The QOS rule's priority. Rules with numerically higher priority - take precedence over those with lower. If two QOS rules with + The QoS rule's priority. Rules with numerically higher priority + take precedence over those with lower. If two QoS rules with the same priority both match, then the one actually applied to a packet is undefined.

@@ -1308,7 +1315,7 @@

- The packets that the QOS rules should match, in the same expression + The packets that the QoS rules should match, in the same expression language used for the column in the OVN Southbound database's table. The @@ -1319,7 +1326,7 @@ -

The action to be performed on the matched packet

+

When specified, matching flows will have DSCP marking applied.

  • dscp: The value of this action should be in the @@ -1330,16 +1337,16 @@

    - The bandwidth limit to be performed on the matched packet. - Currently only supported in the userspace by dpdk. + When specified, matching packets will have bandwidth metering + applied. Traffic over the limit will be dropped.

    • rate: The value of rate limit in kbps.
    • - burst: The value of burst rate limit in kbps. - This is optional and needs to specify the rate first. + burst: The value of burst rate limit in kilobits. + This is optional and needs to specify the rate.