From patchwork Sat Mar 14 10:03:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1254831 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.133; helo=hemlock.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=jCgBkCxM; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48fdSl1zKbz9sP7 for ; Sat, 14 Mar 2020 21:04:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BB41A8993F; Sat, 14 Mar 2020 10:04:04 +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 9+pb3cetxGy9; Sat, 14 Mar 2020 10:04:03 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id C3DC389960; Sat, 14 Mar 2020 10:04:03 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A945EC1D8D; Sat, 14 Mar 2020 10:04:03 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id B7295C0177 for ; Sat, 14 Mar 2020 10:04:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A374720509 for ; Sat, 14 Mar 2020 10:04:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9zeJMJak2j4G for ; Sat, 14 Mar 2020 10:04:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by silver.osuosl.org (Postfix) with ESMTPS id 1424E204D9 for ; Sat, 14 Mar 2020 10:03:59 +0000 (UTC) Received: by mail-pj1-f65.google.com with SMTP id l36so5430663pjb.3 for ; Sat, 14 Mar 2020 03:03:59 -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=Ljmf5PPRer3Rx5CW3QTn++wG0OxrHfaqxUiOatTOPM4=; b=jCgBkCxME6PlC8LI3CPvnFb8gY3gCCgivDh94xdatB8++rpPwoN+rEB0LSml55fRlo euHtQTYb8blrHRtwvYb0x8azZYbTPLwn+UyjXZa1l+RziRW+KOZkpgV8020xInqUlcKw G6lNync6rtBIw3WIL1UqPMXfrO7NQcqeLCucQOcJBIRnwXB6dLzRHjHSyVjxuUFUtFol V8904JxL0nobwxM5CLR6n7KcJlfEOp1piIS475E9Tx/e0xv4bug2ovOfAJaIQqh/8D8I yC1op3Jk16Gi9LnmoNXg5qsBg7ie1ZbV5lTVo4n6BsbYWLhmNdFucRBb5u7O2gnmZ2jU btHw== 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=Ljmf5PPRer3Rx5CW3QTn++wG0OxrHfaqxUiOatTOPM4=; b=nUhU5uIXnUJ7ZiW4BX1cif0scdH+HsIMTuhISg/YpZJnqDP10UTXX02zHKYBX0qJjI pPKiIEqfg7plvHOEHXt6UvnLKAVAc2Zk/fyII2GzDLmPW+DKuWwk2JePXUQgrDaRTOFv 0eQDmeSES17H058O6Fs09eHcqSM3KFnVPGlsW9mpBAuXyK/dBvSjpSM/1rwYvYBJT6uE UHxWqI465OT2CZf6K7eapB5XynRpNxD9p+ZQw/Q9t2HDZn+OCdciDZMOPMKFCjJiwClb w7Un1oGxspW7wtAruWsHE1zlvRw36KyeOROjPJZNnt1wpoh9NPb72Y5MkaQVDfqmNgEd wplw== X-Gm-Message-State: ANhLgQ2MQQJ0kaR4j8mGSuTacvLWp9HsPjT+tFtl3BTRoiCiiThJK9FI CLPNsF7p/UZKIPtvF4mjfomYw1Eb X-Google-Smtp-Source: ADFU+vtPdYsVKfNeq3Bifdgcc4zXYJPZOMoZFyehavbBEZQ/yYxBbW2S011A7w81/eMnFhgqquYBlA== X-Received: by 2002:a17:90a:8a97:: with SMTP id x23mr13995649pjn.151.1584180238469; Sat, 14 Mar 2020 03:03:58 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([219.143.129.147]) by smtp.gmail.com with ESMTPSA id c207sm20809671pfb.47.2020.03.14.03.03.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 14 Mar 2020 03:03:58 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: dev@openvswitch.org Date: Sat, 14 Mar 2020 18:03:50 +0800 Message-Id: <1584180230-89020-2-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 ovs 2/2] dpif-netdev: Add meter cache for performance 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 The cmap can address the meter capacity issue, but using cmap, there is 1% performance loss compared with previous array implementation. This patch add a meter cache in dp_netdev for fast lookup. With this patch, forwarding between p0 and p1, is 4,929,904 pps, the test method is same as first patch. Cc: Ben Pfaff Cc: Jarno Rajahalme Cc: Ilya Maximets Cc: Andy Zhou Signed-off-by: Tonghao Zhang --- lib/dpif-netdev.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 104 insertions(+), 4 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 5474d52..3553fae 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -103,6 +103,11 @@ enum { MAX_FLOWS = 65536 }; /* Maximum number of flows in flow table. */ #define METER_ENTRY_MAX (1 << 19) /* Maximum number of bands / meter. */ #define METER_BAND_MAX (8) +/* A typical server system will have 32K L1d-cache per core. + * Set the number of meter cache entries to 8192. */ +#define METER_CACHE_SHIFT (13) +#define METER_CACHE_MAX (1 << METER_CACHE_SHIFT) +#define METER_CACHE_MASK (METER_CACHE_MAX -1) COVERAGE_DEFINE(datapath_drop_meter); COVERAGE_DEFINE(datapath_drop_upcall_error); @@ -284,6 +289,8 @@ struct dp_meter_band { struct dp_meter { struct cmap_node node; struct ovs_mutex lock; + struct ovs_refcount ref_cnt; + atomic_bool dead; uint32_t id; uint16_t flags; uint16_t n_bands; @@ -298,6 +305,9 @@ struct dp_netdev_meter { struct cmap table OVS_GUARDED; struct ovs_mutex lock; /* Used for meter table. */ uint32_t hash_basis; + + OVS_ALIGNED_VAR(CACHE_LINE_SIZE) + OVSRCU_TYPE(struct dp_meter *) cache[METER_CACHE_MAX]; }; struct pmd_auto_lb { @@ -1526,6 +1536,84 @@ dp_meter_hash(uint32_t meter_id, uint32_t basis) return hash_bytes32(&meter_id, sizeof meter_id, basis); } +static bool +dp_meter_ref(struct dp_meter *meter) +{ + return ovs_refcount_try_ref_rcu(&meter->ref_cnt); +} + +static void +dp_meter_unref(struct dp_meter *meter) +{ + if (ovs_refcount_unref_relaxed(&meter->ref_cnt) == 1) { + ovsrcu_postpone(free, meter); + } +} + +static void +dp_meter_cache_init(struct dp_netdev_meter *dp_meter) +{ + int i; + + for (i = 0; i < METER_CACHE_MAX; i++) { + ovsrcu_init(&dp_meter->cache[i], NULL); + } +} + +static void +dp_meter_cache_destroy(struct dp_netdev_meter *dp_meter) +{ + struct dp_meter *meter; + int i; + + for (i = 0; i < METER_CACHE_MAX; i++) { + meter = ovsrcu_get(struct dp_meter *, &dp_meter->cache[i]); + + if (meter) { + dp_meter_unref(meter); + ovsrcu_set(&dp_meter->cache[i], NULL); + } + } +} + +static struct dp_meter * +dp_meter_cache_lookup(struct dp_netdev_meter *dp_meter, + uint32_t meter_id) +{ + uint32_t hash = meter_id % METER_CACHE_MASK; + struct dp_meter *meter; + bool dead; + + meter = ovsrcu_get(struct dp_meter *, &dp_meter->cache[hash]); + if (likely(meter && meter->id == meter_id)) { + atomic_read_relaxed(&meter->dead, &dead); + if (dead) { + return NULL; + } + + return meter; + } + + return NULL; +} + +static void +dp_meter_cache_insert(struct dp_netdev_meter *dp_meter, + struct dp_meter *meter) +{ + uint32_t hash = meter->id % METER_CACHE_MASK; + struct dp_meter *old; + + old = ovsrcu_get(struct dp_meter *, &dp_meter->cache[hash]); + if (old) { + dp_meter_unref(old); + } + + if (dp_meter_ref(meter)) { + ovsrcu_set(&dp_meter->cache[hash], meter); + } +} + static void dp_netdev_meter_init(struct dp_netdev *dp) { @@ -1537,6 +1625,8 @@ dp_netdev_meter_init(struct dp_netdev *dp) ovs_mutex_init(&dp_meter->lock); dp_meter->hash_basis = random_uint32(); + dp_meter_cache_init(dp_meter); + dp->meter = dp_meter; } @@ -1558,6 +1648,7 @@ dp_netdev_meter_destroy(struct dp_netdev *dp) ovs_mutex_unlock(&dp_meter->lock); ovs_mutex_destroy(&dp_meter->lock); + dp_meter_cache_destroy(dp_meter); free(dp_meter); } @@ -1586,6 +1677,8 @@ dp_meter_detach_free(struct dp_netdev_meter *dp_meter, uint32_t meter_id) if (meter) { cmap_remove(&dp_meter->table, &meter->node, dp_meter_hash(meter_id, dp_meter->hash_basis)); + + atomic_store_relaxed(&meter->dead, true); ovsrcu_postpone(free, meter); } } @@ -5791,10 +5884,16 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, return; } - meter = dp_meter_lookup(dp->meter, meter_id); - if (!meter) { - return; - } + meter = dp_meter_cache_lookup(dp->meter, meter_id); + if (unlikely(!meter)) { + /* Missed in cache, lookup in slow path. */ + meter = dp_meter_lookup(dp->meter, meter_id); + if (!meter) { + return; + } + + dp_meter_cache_insert(dp->meter, meter); + } /* Initialize as negative values. */ memset(exceeded_band, 0xff, cnt * sizeof *exceeded_band); @@ -5961,6 +6060,7 @@ dpif_netdev_meter_set(struct dpif *dpif, ofproto_meter_id meter_id, meter->used = time_usec(); meter->id = mid; ovs_mutex_init(&meter->lock); + atomic_store_relaxed(&meter->dead, false); /* set up bands */ for (i = 0; i < config->n_bands; ++i) {