From patchwork Sun Mar 15 06:43:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1254968 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.138; helo=whitealder.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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=hBiZbBMU; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48g90J0bn7z9sR4 for ; Sun, 15 Mar 2020 17:44:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7EC4088A47; Sun, 15 Mar 2020 06:44:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9BjNHcwXjyY1; Sun, 15 Mar 2020 06:44:40 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id D36A688565; Sun, 15 Mar 2020 06:44:40 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id B6EDBC1D7C; Sun, 15 Mar 2020 06:44:40 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 37C74C013E for ; Sun, 15 Mar 2020 06:44:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 23DA189932 for ; Sun, 15 Mar 2020 06:44:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id w-8pW6Jnb3jw for ; Sun, 15 Mar 2020 06:44:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by hemlock.osuosl.org (Postfix) with ESMTPS id 07D2A8992A for ; Sun, 15 Mar 2020 06:44:39 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id t24so7661293pgj.7 for ; Sat, 14 Mar 2020 23:44:39 -0700 (PDT) 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=OJS/aJ+dBM80P6txwpXv8nqFWlwVutCrS71oISE9V20=; b=hBiZbBMU95mkBk16Rinf9j+wAhnipsC//DAF3Ntx+jj/v4ppsFBIXDWDZkLqYklMhi +bRDYkvtOgUo6rywcGPQJN/50CJAlx7Vb4GudaOY9GJrqrwYBn7kZaFndCfXt18w6iUX bw3B8f+hQSc9Lcn8rBsH2oVylD+a5/NUma4ZumcdQvr+QbI9Zgm9arhQTpq0j1HEesqx oUcBcTkJ8QcJ5eqENyHZmOKZx/xxd6dB9ssSSMTL+cT4FxQX7xxFzqvZwagHGDJqWk12 7Tt/BwH7IaLiUECzldEVxdtsizgv8E+G61gosL6VU4u0eMri2OUgGKv1gerar6FUmjsM 5iow== 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=OJS/aJ+dBM80P6txwpXv8nqFWlwVutCrS71oISE9V20=; b=D74oJAqz0XMPc/Hn1PC3M7iHSWXRjDfVLmR85zjf7iBmWcNSjW0RRwBraddfroUPWh YTDjNiTjmycBXhfYpc8ZaRgSh4lhzLUjgJ/+p+WBZTWHBEiyZOHKBLgqEed8NZaffM1s l3KG22DioQeiqX6HHzyJDleKV5hk2GDS8KZaTmHPTZpYgReoKrEogtCguxNGEEwfDRLC zzLyzUuGxMOrMCjJnfmi89HuP49FLlavK62MVrHiu+6H9dXcQv1HYRUCyNfOe29R91l2 v4nd7u4bTHWksC74Jgej/Jic/6H9DlMjg4w9lQZIexHOlVYnSsJ64dNcryKUEiJ8t3ga SgYg== X-Gm-Message-State: ANhLgQ02wzfhHew6wuf5Qd+O7AwFjq3IibB2IVPc09NBvUfEfwaewAas g/e/fIUTCtVkMSlY0ONJxVXps40Klgs= X-Google-Smtp-Source: ADFU+vt3b9tjxtfiqd/k1O//GFnCiU//B6KE4/AmaUQRYlokHURHiO29Raoyjh/FDagPSQZau52ofA== X-Received: by 2002:a63:7147:: with SMTP id b7mr20951397pgn.144.1584254678164; Sat, 14 Mar 2020 23:44:38 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([219.143.129.147]) by smtp.gmail.com with ESMTPSA id f8sm6731974pfd.57.2020.03.14.23.44.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 14 Mar 2020 23:44:37 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: dev@openvswitch.org Date: Sun, 15 Mar 2020 14:43:20 +0800 Message-Id: <1584254601-7321-1-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1584180230-89020-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1584180230-89020-1-git-send-email-xiangxia.m.yue@gmail.com> Cc: Ilya Maximets Subject: [ovs-dev] [PATCH v2 1/2] dpif-netdev: Expand the meter capacity using cmap 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, ovs-vswitchd use the array of the dp_meter struct to store meter's data, and at most, there are only 65536 (defined by MAX_METERS) meters that can be used. But in some case, for example, in the edge gateway, we should use 200,000+, at least, meters for IP address bandwidth limitation. Every one IP address will use two meters for its rx and tx path[1]. In other way, ovs-vswitchd should support meter-offload (rte_mtr_xxx api introduced by dpdk.), but there are more than 65536 meters in the hardware, such as Mellanox ConnectX-6. This patch use cmap to manage the meter, instead of the array. * Insertion performance, ovs-ofctl add-meter 1000+ meters, the cmap takes abount 4000ms, as same as previous implementation. * Lookup performance in datapath, we add 1000+ meter which rate is 10G (the NIC cards are 10Gb, so netdev-datapath will not drop the packets.), and a flow which only forwarding the packets from p0 to p1, with meter action[2]. On other server, the pktgen-dpdk will generate 64B packets to p0. The forwarding performance is 4,814,400 pps. Without this path, 4,935,584 pps. There are about 1% performance loss. For addressing this issue, next patch add a meter cache. [1]. $ in_port=p0,ip,ip_dst=1.1.1.x action=meter:n,output:p1 $ in_port=p1,ip,ip_src=1.1.1.x action=meter:m,output:p0 [2]. $ in_port=p0 action=meter:100,output:p1 Cc: Ben Pfaff Cc: Jarno Rajahalme Cc: Ilya Maximets Cc: Andy Zhou Signed-off-by: Tonghao Zhang --- lib/dpif-netdev.c | 199 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 130 insertions(+), 69 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index d393aab..5474d52 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -98,9 +98,11 @@ DEFINE_STATIC_PER_THREAD_DATA(uint32_t, recirc_depth, 0) /* Configuration parameters. */ enum { MAX_FLOWS = 65536 }; /* Maximum number of flows in flow table. */ -enum { MAX_METERS = 65536 }; /* Maximum number of meters. */ -enum { MAX_BANDS = 8 }; /* Maximum number of bands / meter. */ -enum { N_METER_LOCKS = 64 }; /* Maximum number of meters. */ + +/* Maximum number of meters in the table. */ +#define METER_ENTRY_MAX (1 << 19) +/* Maximum number of bands / meter. */ +#define METER_BAND_MAX (8) COVERAGE_DEFINE(datapath_drop_meter); COVERAGE_DEFINE(datapath_drop_upcall_error); @@ -280,6 +282,9 @@ struct dp_meter_band { }; struct dp_meter { + struct cmap_node node; + struct ovs_mutex lock; + uint32_t id; uint16_t flags; uint16_t n_bands; uint32_t max_delta_t; @@ -289,6 +294,12 @@ struct dp_meter { struct dp_meter_band bands[]; }; +struct dp_netdev_meter { + struct cmap table OVS_GUARDED; + struct ovs_mutex lock; /* Used for meter table. */ + uint32_t hash_basis; +}; + struct pmd_auto_lb { bool auto_lb_requested; /* Auto load balancing requested by user. */ bool is_enabled; /* Current status of Auto load balancing. */ @@ -329,8 +340,7 @@ struct dp_netdev { atomic_uint32_t tx_flush_interval; /* Meters. */ - struct ovs_mutex meter_locks[N_METER_LOCKS]; - struct dp_meter *meters[MAX_METERS]; /* Meter bands. */ + struct dp_netdev_meter *meter; /* Probability of EMC insertions is a factor of 'emc_insert_min'.*/ OVS_ALIGNED_VAR(CACHE_LINE_SIZE) atomic_uint32_t emc_insert_min; @@ -378,19 +388,6 @@ struct dp_netdev { struct pmd_auto_lb pmd_alb; }; -static void meter_lock(const struct dp_netdev *dp, uint32_t meter_id) - OVS_ACQUIRES(dp->meter_locks[meter_id % N_METER_LOCKS]) -{ - ovs_mutex_lock(&dp->meter_locks[meter_id % N_METER_LOCKS]); -} - -static void meter_unlock(const struct dp_netdev *dp, uint32_t meter_id) - OVS_RELEASES(dp->meter_locks[meter_id % N_METER_LOCKS]) -{ - ovs_mutex_unlock(&dp->meter_locks[meter_id % N_METER_LOCKS]); -} - - static struct dp_netdev_port *dp_netdev_lookup_port(const struct dp_netdev *dp, odp_port_t) OVS_REQUIRES(dp->port_mutex); @@ -1523,6 +1520,84 @@ choose_port(struct dp_netdev *dp, const char *name) return ODPP_NONE; } +static uint32_t +dp_meter_hash(uint32_t meter_id, uint32_t basis) +{ + return hash_bytes32(&meter_id, sizeof meter_id, basis); +} + +static void +dp_netdev_meter_init(struct dp_netdev *dp) +{ + struct dp_netdev_meter *dp_meter; + + dp_meter = xmalloc(sizeof *dp_meter); + + cmap_init(&dp_meter->table); + ovs_mutex_init(&dp_meter->lock); + dp_meter->hash_basis = random_uint32(); + + dp->meter = dp_meter; +} + +static void +dp_netdev_meter_destroy(struct dp_netdev *dp) +{ + struct dp_netdev_meter *dp_meter = dp->meter; + struct dp_meter *meter; + + ovs_mutex_lock(&dp_meter->lock); + CMAP_FOR_EACH (meter, node, &dp_meter->table) { + cmap_remove(&dp_meter->table, &meter->node, + dp_meter_hash(meter->id, dp_meter->hash_basis)); + + ovsrcu_postpone(free, meter); + } + + cmap_destroy(&dp_meter->table); + ovs_mutex_unlock(&dp_meter->lock); + + ovs_mutex_destroy(&dp_meter->lock); + free(dp_meter); +} + +static struct dp_meter* +dp_meter_lookup(struct dp_netdev_meter *dp_meter, uint32_t meter_id) +{ + uint32_t hash = dp_meter_hash(meter_id, dp_meter->hash_basis); + struct dp_meter *meter; + + CMAP_FOR_EACH_WITH_HASH (meter, node, hash, &dp_meter->table) { + if (meter->id == meter_id) { + return meter; + } + } + + return NULL; +} + +static void +dp_meter_detach_free(struct dp_netdev_meter *dp_meter, uint32_t meter_id) + OVS_REQUIRES(dp_meter->lock) +{ + struct dp_meter *meter; + + meter = dp_meter_lookup(dp_meter, meter_id); + if (meter) { + cmap_remove(&dp_meter->table, &meter->node, + dp_meter_hash(meter_id, dp_meter->hash_basis)); + ovsrcu_postpone(free, meter); + } +} + +static void +dp_meter_attach(struct dp_netdev_meter *dp_meter, struct dp_meter *meter) + OVS_REQUIRES(dp_meter->lock) +{ + cmap_insert(&dp_meter->table, &meter->node, + dp_meter_hash(meter->id, dp_meter->hash_basis)); +} + static int create_dp_netdev(const char *name, const struct dpif_class *class, struct dp_netdev **dpp) @@ -1556,9 +1631,8 @@ create_dp_netdev(const char *name, const struct dpif_class *class, dp->reconfigure_seq = seq_create(); dp->last_reconfigure_seq = seq_read(dp->reconfigure_seq); - for (int i = 0; i < N_METER_LOCKS; ++i) { - ovs_mutex_init_adaptive(&dp->meter_locks[i]); - } + /* Init meter resource. */ + dp_netdev_meter_init(dp); /* Disable upcalls by default. */ dp_netdev_disable_upcall(dp); @@ -1647,16 +1721,6 @@ dp_netdev_destroy_upcall_lock(struct dp_netdev *dp) fat_rwlock_destroy(&dp->upcall_rwlock); } -static void -dp_delete_meter(struct dp_netdev *dp, uint32_t meter_id) - OVS_REQUIRES(dp->meter_locks[meter_id % N_METER_LOCKS]) -{ - if (dp->meters[meter_id]) { - free(dp->meters[meter_id]); - dp->meters[meter_id] = NULL; - } -} - /* Requires dp_netdev_mutex so that we can't get a new reference to 'dp' * through the 'dp_netdevs' shash while freeing 'dp'. */ static void @@ -1694,16 +1758,7 @@ dp_netdev_free(struct dp_netdev *dp) /* Upcalls must be disabled at this point */ dp_netdev_destroy_upcall_lock(dp); - int i; - - for (i = 0; i < MAX_METERS; ++i) { - meter_lock(dp, i); - dp_delete_meter(dp, i); - meter_unlock(dp, i); - } - for (i = 0; i < N_METER_LOCKS; ++i) { - ovs_mutex_destroy(&dp->meter_locks[i]); - } + dp_netdev_meter_destroy(dp); free(dp->pmd_cmask); free(CONST_CAST(char *, dp->name)); @@ -5708,10 +5763,10 @@ static void dpif_netdev_meter_get_features(const struct dpif * dpif OVS_UNUSED, struct ofputil_meter_features *features) { - features->max_meters = MAX_METERS; + features->max_meters = METER_ENTRY_MAX; features->band_types = DP_SUPPORTED_METER_BAND_TYPES; features->capabilities = DP_SUPPORTED_METER_FLAGS_MASK; - features->max_bands = MAX_BANDS; + features->max_bands = METER_BAND_MAX; features->max_color = 0; } @@ -5732,14 +5787,13 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, uint32_t exceeded_rate[NETDEV_MAX_BURST]; int exceeded_pkt = cnt; /* First packet that exceeded a band rate. */ - if (meter_id >= MAX_METERS) { + if (meter_id >= METER_ENTRY_MAX) { return; } - meter_lock(dp, meter_id); - meter = dp->meters[meter_id]; + meter = dp_meter_lookup(dp->meter, meter_id); if (!meter) { - goto out; + return; } /* Initialize as negative values. */ @@ -5747,6 +5801,7 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, /* Initialize as zeroes. */ memset(exceeded_rate, 0, cnt * sizeof *exceeded_rate); + ovs_mutex_lock(&meter->lock); /* All packets will hit the meter at the same time. */ long_delta_t = now / 1000 - meter->used / 1000; /* msec */ @@ -5860,8 +5915,8 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, dp_packet_batch_refill(packets_, packet, j); } } - out: - meter_unlock(dp, meter_id); + + ovs_mutex_unlock(&meter->lock); } /* Meter set/get/del processing is still single-threaded. */ @@ -5870,11 +5925,12 @@ dpif_netdev_meter_set(struct dpif *dpif, ofproto_meter_id meter_id, struct ofputil_meter_config *config) { struct dp_netdev *dp = get_dp_netdev(dpif); + struct dp_netdev_meter *dp_meter = dp->meter; uint32_t mid = meter_id.uint32; struct dp_meter *meter; int i; - if (mid >= MAX_METERS) { + if (mid >= METER_ENTRY_MAX) { return EFBIG; /* Meter_id out of range. */ } @@ -5882,7 +5938,7 @@ dpif_netdev_meter_set(struct dpif *dpif, ofproto_meter_id meter_id, return EBADF; /* Unsupported flags set */ } - if (config->n_bands > MAX_BANDS) { + if (config->n_bands > METER_BAND_MAX) { return EINVAL; } @@ -5903,6 +5959,8 @@ dpif_netdev_meter_set(struct dpif *dpif, ofproto_meter_id meter_id, meter->n_bands = config->n_bands; meter->max_delta_t = 0; meter->used = time_usec(); + meter->id = mid; + ovs_mutex_init(&meter->lock); /* set up bands */ for (i = 0; i < config->n_bands; ++i) { @@ -5928,10 +5986,12 @@ dpif_netdev_meter_set(struct dpif *dpif, ofproto_meter_id meter_id, } } - meter_lock(dp, mid); - dp_delete_meter(dp, mid); /* Free existing meter, if any */ - dp->meters[mid] = meter; - meter_unlock(dp, mid); + ovs_mutex_lock(&dp_meter->lock); + + dp_meter_detach_free(dp_meter, mid); /* Free existing meter, if any */ + dp_meter_attach(dp_meter, meter); + + ovs_mutex_unlock(&dp_meter->lock); return 0; } @@ -5941,22 +6001,23 @@ dpif_netdev_meter_get(const struct dpif *dpif, ofproto_meter_id meter_id_, struct ofputil_meter_stats *stats, uint16_t n_bands) { - const struct dp_netdev *dp = get_dp_netdev(dpif); + struct dp_netdev *dp = get_dp_netdev(dpif); uint32_t meter_id = meter_id_.uint32; - int retval = 0; + const struct dp_meter *meter; - if (meter_id >= MAX_METERS) { + if (meter_id >= METER_ENTRY_MAX) { return EFBIG; } - meter_lock(dp, meter_id); - const struct dp_meter *meter = dp->meters[meter_id]; + meter = dp_meter_lookup(dp->meter, meter_id); if (!meter) { - retval = ENOENT; - goto done; + return ENOENT; } + if (stats) { - int i = 0; + int i; + + ovs_mutex_lock(&meter->lock); stats->packet_in_count = meter->packet_count; stats->byte_in_count = meter->byte_count; @@ -5966,12 +6027,11 @@ dpif_netdev_meter_get(const struct dpif *dpif, stats->bands[i].byte_count = meter->bands[i].byte_count; } + ovs_mutex_unlock(&meter->lock); stats->n_bands = i; } -done: - meter_unlock(dp, meter_id); - return retval; + return 0; } static int @@ -5980,15 +6040,16 @@ dpif_netdev_meter_del(struct dpif *dpif, struct ofputil_meter_stats *stats, uint16_t n_bands) { struct dp_netdev *dp = get_dp_netdev(dpif); + struct dp_netdev_meter *dp_meter = dp->meter; int error; error = dpif_netdev_meter_get(dpif, meter_id_, stats, n_bands); if (!error) { uint32_t meter_id = meter_id_.uint32; - meter_lock(dp, meter_id); - dp_delete_meter(dp, meter_id); - meter_unlock(dp, meter_id); + ovs_mutex_lock(&dp_meter->lock); + dp_meter_detach_free(dp_meter, meter_id); + ovs_mutex_unlock(&dp_meter->lock); } return error; }