From patchwork Fri Apr 14 19:46:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Zhou X-Patchwork-Id: 750949 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.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 3w4Ssn2xv3z9s7c for ; Sat, 15 Apr 2017 05:49:33 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 7ACB7C54; Fri, 14 Apr 2017 19:46:58 +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 F2C60C49 for ; Fri, 14 Apr 2017 19:46:54 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id A6F32168 for ; Fri, 14 Apr 2017 19:46:54 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id a188so16406198pfa.2 for ; Fri, 14 Apr 2017 12:46:54 -0700 (PDT) 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:content-transfer-encoding; bh=mNwUjeQ5pYcgSegF+tGRREXrrq24atFoTkdGwIqj8v0=; b=NMyrTJcfVlF/AFeiiYN5jc0r5c+JpxOx4w09p5r9k0RzbiLQH+xXo/kx1rxxV0n87l hfPBnipMr1rSQG74sjkv+dbvfy2KB7dC/5MLQqxbXxV7lMlK1Dz1Bh245o0pWwPaMHQ1 f0LcyzK1EsMjPluoI811mKjHPQaDycxFNnx6ewD/XLAQWlHmkc6UL5e1Idq1ovdZv172 A1w+c+HH0UoduopyjHMk26xQwTlB08H9xQ0vJ99xeDUWvepM0BBCbqbCTB3oY57b1jML sJQsJPBFO6SP1RcBU3XSLqyEq2j6JbBzmVvBvbFajlHrwboK3xPKCxsY5l2nqHzaVlGe rY/A== X-Gm-Message-State: AN3rC/7WxxI6rmfMIf6Pw56bBvbXlDlnri7Hjv5z3SlpfNm9JfOs1vQR SAyZL1lqsOloiA== X-Received: by 10.99.173.77 with SMTP id y13mr8434207pgo.3.1492199214288; Fri, 14 Apr 2017 12:46:54 -0700 (PDT) Received: from centos.eng.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id p68sm4661584pfp.104.2017.04.14.12.46.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Apr 2017 12:46:53 -0700 (PDT) From: Andy Zhou To: dev@openvswitch.org Date: Fri, 14 Apr 2017 12:46:21 -0700 Message-Id: <1492199182-4479-5-git-send-email-azhou@ovn.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1492199182-4479-1-git-send-email-azhou@ovn.org> References: <1492199182-4479-1-git-send-email-azhou@ovn.org> X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [action upcall meters 4/5] ofproto: Meter sample action when configured. 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 When slowpath meter is configured, add meter action when translate sample action. Signed-off-by: Andy Zhou --- ofproto/ofproto-dpif-xlate.c | 9 +++++++++ tests/ofproto-dpif.at | 14 ++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index a24aef9a43a1..52e0d3f1b0bb 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -2861,6 +2861,15 @@ compose_sample_action(struct xlate_ctx *ctx, OVS_SAMPLE_ATTR_ACTIONS); } + /* If the slow path meter is configured by the controller, + * Insert a meter action before the user space action. */ + struct ofproto *ofproto = &ctx->xin->ofproto->up; + uint32_t meter_id = ofproto->slowpath_meter_id; + + if (meter_id != UINT32_MAX) { + nl_msg_put_u32(ctx->odp_actions, OVS_ACTION_ATTR_METER, meter_id); + } + odp_port_t odp_port = ofp_port_to_odp_port( ctx->xbridge, ctx->xin->flow.in_port.ofp_port); uint32_t pid = dpif_port_get_pid(ctx->xbridge->dpif, odp_port, diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 0c2ea384b422..3c3037b16548 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -6491,6 +6491,20 @@ flow-dump from non-dpdk interfaces: packets:2, bytes:68, used:0.001s, actions:userspace(pid=0,ipfix(output_port=4294967295)) ]) +AT_CHECK([ovs-appctl revalidator/purge]) +dnl +dnl Add a slowpath meter. The userspace action should be metered. +AT_CHECK([ovs-ofctl -O OpenFlow13 add-meter br0 'meter=slowpath pktps burst stats bands=type=drop rate=3 burst_size=1']) + +dnl Send some packets that should be sampled and metered. +for i in `seq 1 3`; do + AT_CHECK([ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800)']) +done +AT_CHECK([ovs-appctl dpctl/dump-flows | sed 's/.*\(packets:\)/\1/' | sed 's/used:[[0-9]].[[0-9]]*s/used:0.001s/'], [0], [dnl +flow-dump from non-dpdk interfaces: +packets:2, bytes:68, used:0.001s, actions:sample(sample=100.0%,actions(meter(0),userspace(pid=0,ipfix(output_port=4294967295)))) +]) + dnl Remove the IPFIX configuration. AT_CHECK([ovs-vsctl clear bridge br0 ipfix]) AT_CHECK([ovs-appctl revalidator/purge])