From patchwork Fri Apr 28 09:01:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Zhou X-Patchwork-Id: 756272 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 3wDnrl10D9z9s89 for ; Fri, 28 Apr 2017 19:02:31 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 4B2A3B6B; Fri, 28 Apr 2017 09:01:44 +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 C8D9AB0B for ; Fri, 28 Apr 2017 09:01:40 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D001215B for ; Fri, 28 Apr 2017 09:01:39 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id v20so1938049pgn.0 for ; Fri, 28 Apr 2017 02:01:39 -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=3/9h2p5HRF4rI+MFYRIzIhUs+MeHQ29iD2PuIaO+/tc=; b=FCPHy1Gf23Amwdfjjj6QVfgmKerdIQvCC4amiu8sCkPrXMEvH+BCVEqN0/7FhEb6uW YPY/0o0hKWKQT5bhTpeTDThdc5Ctl183JuuQfA1yZ7xvroFpHqffsfqjp7YizwejJFDQ 6xntyFCuWS+9cT/i2iOCiMNvPJEsUPBsW79kDNIccNxL7tm45VxhqbBI8EwKFlcobjhU LRrcyaOjbsno6Lbn/6h2VQ4Z+fP9Lg0i4o2dyk6LFXPCvXpi06K5Rd/HlQDa80jtzPZC 1TYvht2DDGSpxL6n4x39naKjtCq39OdDHELb+Lzxjm205xoRbPd+s6fjV7RQJV60a61C MZOA== X-Gm-Message-State: AN3rC/6/97s4pfOVpQJJeBIZW1ZEr/cAjKFVY9ir8J9Rmtw8tPuV9BVk tvsC7VgRJoo3lw== X-Received: by 10.84.134.35 with SMTP id 32mr13297496plg.178.1493370099370; Fri, 28 Apr 2017 02:01:39 -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.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Apr 2017 02:01:38 -0700 (PDT) From: Andy Zhou To: dev@openvswitch.org Date: Fri, 28 Apr 2017 02:01:20 -0700 Message-Id: <1493370083-7385-2-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 2/5] ofproto-dpif: Add 'meter_ids' to backer 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 Add 'meter_ids', an id-pool object to manage datapath meter id, i.e. provider_meter_id. Currently, only userspace datapath supports meter, and it implements the provider_meter_id management. Moving this function to 'backer' allows other datapath implementation to share the same logic. Signed-off-by: Andy Zhou Acked-by: Jarno Rajahalme --- v1-v2: fix typos --- lib/dpif-netdev.c | 24 ------------------------ ofproto/ofproto-dpif.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- ofproto/ofproto-dpif.h | 4 ++++ 3 files changed, 46 insertions(+), 26 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index b3a080628d2b..f4de737e3751 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -260,7 +260,6 @@ struct dp_netdev { /* Meters. */ struct ovs_mutex meter_locks[N_METER_LOCKS]; struct dp_meter *meters[MAX_METERS]; /* Meter bands. */ - uint32_t meter_free; /* Next free meter. */ /* Protects access to ofproto-dpif-upcall interface during revalidator * thread synchronization. */ @@ -3896,9 +3895,6 @@ dpif_netdev_meter_set(struct dpif *dpif, ofproto_meter_id *meter_id, struct dp_meter *meter; int i; - if (mid == UINT32_MAX) { - mid = dp->meter_free; - } if (mid >= MAX_METERS) { return EFBIG; /* Meter_id out of range. */ } @@ -3958,21 +3954,6 @@ dpif_netdev_meter_set(struct dpif *dpif, ofproto_meter_id *meter_id, dp->meters[mid] = meter; meter_unlock(dp, mid); - meter_id->uint32 = mid; /* Store on success. */ - - /* Find next free meter */ - if (dp->meter_free == mid) { /* Now taken. */ - do { - if (++mid >= MAX_METERS) { /* Wrap around */ - mid = 0; - } - if (mid == dp->meter_free) { /* Full circle */ - mid = MAX_METERS; - break; - } - } while (dp->meters[mid]); - dp->meter_free = mid; /* Next free meter or MAX_METERS */ - } return 0; } return ENOMEM; @@ -4027,11 +4008,6 @@ dpif_netdev_meter_del(struct dpif *dpif, meter_lock(dp, meter_id); dp_delete_meter(dp, meter_id); meter_unlock(dp, meter_id); - - /* Keep free meter index as low as possible */ - if (meter_id < dp->meter_free) { - dp->meter_free = meter_id; - } } return error; } diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index c73c2738c91c..30f18b302a77 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -662,6 +662,7 @@ close_dpif_backer(struct dpif_backer *backer) free(backer->type); free(backer->dp_version_string); dpif_close(backer->dpif); + id_pool_destroy(backer->meter_ids); free(backer); } @@ -787,6 +788,15 @@ open_dpif_backer(const char *type, struct dpif_backer **backerp) = check_variable_length_userdata(backer); backer->dp_version_string = dpif_get_dp_version(backer->dpif); + /* Manage Datapath meter IDs if supported. */ + struct ofputil_meter_features features; + dpif_meter_get_features(backer->dpif, &features); + if (features.max_meters) { + backer->meter_ids = id_pool_create(0, features.max_meters); + } else { + backer->meter_ids = NULL; + } + return error; } @@ -5439,6 +5449,17 @@ meter_set(struct ofproto *ofproto_, ofproto_meter_id *meter_id, { struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofproto_); + /* Provider ID unknown. Use backer to allocate a new DP meter */ + if (meter_id->uint32 == UINT32_MAX) { + if (!ofproto->backer->meter_ids) { + return EFBIG; /* Datapath does not support meter. */ + } + + if(!id_pool_alloc_id(ofproto->backer->meter_ids, &meter_id->uint32)) { + return ENOMEM; /* Can't allocate a DP meter. */ + } + } + switch (dpif_meter_set(ofproto->backer->dpif, meter_id, config)) { case 0: return 0; @@ -5468,12 +5489,31 @@ meter_get(const struct ofproto *ofproto_, ofproto_meter_id meter_id, return OFPERR_OFPMMFC_UNKNOWN_METER; } +struct free_meter_id_args { + struct ofproto_dpif *ofproto; + ofproto_meter_id meter_id; +}; + +static void +free_meter_id(struct free_meter_id_args *args) +{ + struct ofproto_dpif *ofproto = args->ofproto; + + dpif_meter_del(ofproto->backer->dpif, args->meter_id, NULL, 0); + id_pool_free_id(ofproto->backer->meter_ids, args->meter_id.uint32); + free(args); +} + static void meter_del(struct ofproto *ofproto_, ofproto_meter_id meter_id) { - struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofproto_); + struct free_meter_id_args *arg = xmalloc(sizeof *arg); - dpif_meter_del(ofproto->backer->dpif, meter_id, NULL, 0); + /* The 'meter_id' may still be in use the xlate code. + * Only safe to delete after RCU grace period. */ + arg->ofproto = ofproto_dpif_cast(ofproto_); + arg->meter_id = meter_id; + ovsrcu_postpone(free_meter_id, arg); } const struct ofproto_class ofproto_dpif_class = { diff --git a/ofproto/ofproto-dpif.h b/ofproto/ofproto-dpif.h index 81a0bdfdad10..d14ab62ae195 100644 --- a/ofproto/ofproto-dpif.h +++ b/ofproto/ofproto-dpif.h @@ -51,6 +51,7 @@ #include "hmapx.h" #include "odp-util.h" #include "openvswitch/ofp-util.h" +#include "id-pool.h" #include "ovs-thread.h" #include "ofproto-provider.h" #include "util.h" @@ -221,6 +222,9 @@ struct dpif_backer { bool recv_set_enable; /* Enables or disables receiving packets. */ + /* Meter. */ + struct id_pool *meter_ids; /* Datapath meter allocation. */ + /* Version string of the datapath stored in OVSDB. */ char *dp_version_string;