From patchwork Fri Apr 28 09:01:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Zhou X-Patchwork-Id: 756274 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 3wDntB3PJqz9s8S for ; Fri, 28 Apr 2017 19:03:46 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 3828EB7F; Fri, 28 Apr 2017 09:01:46 +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 991C6B56 for ; Fri, 28 Apr 2017 09:01:42 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id A684F15B for ; Fri, 28 Apr 2017 09:01:41 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id b23so595421pfc.0 for ; Fri, 28 Apr 2017 02:01:41 -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=f10V9u94adXmD/3fCBp4d59D6OIIrhJ84JqC5VPdUaE=; b=q86nd0a6dMHdVf/2HXc/+XDgK5IZu7j+ijRW+lRZ1RYLipBbnvWTpxGnuU+/vlijqn V5+Rbq2nmEQ8CmonObWfindG3Vg9TCi9oIU0rLt+I+L18Myww43VBoV+RvsdY7H/4s8s HbKNu8zRvU0SMy7Y4qiSk+brc/gQkTtMm3puxFpbG8arGirnd814IrGpIa8jRu5KAZoX fnD49YAjbactLVzzAxVanEAyDGWk8d+hfmLSvKP9PrLGSi+R0j95FvVlDW+HhOZXu8dZ dnyV6EBvnCZJqfYdki1z99qf2jIfPCr3UeD3wMzzI4wCs+eCQB6wpyo6LxlUk3eW+l7p EbDw== X-Gm-Message-State: AN3rC/4psms9ZTugj8Bb1G9NIjMGJNNxxSQYhgMuU53xf7/kFhhxOg+v PRAIAisIZOHwJ45P X-Received: by 10.84.141.3 with SMTP id 3mr6191554plu.8.1493370101132; Fri, 28 Apr 2017 02:01:41 -0700 (PDT) Received: from centos.hsd1.ca.comcast.net. ([2601:647:4280:45d0:d6be:d9ff:fe69:1f8d]) by smtp.gmail.com with ESMTPSA id s68sm9307944pfj.77.2017.04.28.02.01.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Apr 2017 02:01:40 -0700 (PDT) From: Andy Zhou To: dev@openvswitch.org Date: Fri, 28 Apr 2017 02:01:22 -0700 Message-Id: <1493370083-7385-4-git-send-email-azhou@ovn.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1493370083-7385-1-git-send-email-azhou@ovn.org> References: <1493370083-7385-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 meter v2 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 Acked-by: Jarno Rajahalme --- v1->v2: Fix test case 1128 failure. --- ofproto/ofproto-dpif-xlate.c | 14 ++++++++++++-- tests/ofproto-dpif.at | 14 ++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index d8c6a7ccb38c..f34413b9bc94 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -2850,8 +2850,14 @@ compose_sample_action(struct xlate_ctx *ctx, return 0; } - /* No need to generate sample action for 100% sampling rate. */ - bool is_sample = probability < UINT32_MAX; + /* 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; + + /* When meter action is not required, avoid generate sample action + * for 100% sampling rate. */ + bool is_sample = probability < UINT32_MAX || meter_id != UINT32_MAX; size_t sample_offset, actions_offset; if (is_sample) { sample_offset = nl_msg_start_nested(ctx->odp_actions, @@ -2862,6 +2868,10 @@ compose_sample_action(struct xlate_ctx *ctx, OVS_SAMPLE_ATTR_ACTIONS); } + 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 9f7c6beb0c58..22cb533b57bb 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -6490,6 +6490,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])