From patchwork Fri Oct 11 14:00:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1175216 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VZbPnDR3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46qV920vlhz9sP3 for ; Sat, 12 Oct 2019 01:05:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728462AbfJKOFl (ORCPT ); Fri, 11 Oct 2019 10:05:41 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:39098 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728111AbfJKOFk (ORCPT ); Fri, 11 Oct 2019 10:05:40 -0400 Received: by mail-pg1-f193.google.com with SMTP id e1so5870350pgj.6 for ; Fri, 11 Oct 2019 07:05:40 -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=0Wr0xET2tvmbw9xhJaMx8nDwFsZfDudrDY3Pml6+4Ic=; b=VZbPnDR3KrnRzc2J9wfJIzXTclZPxCIrzru9lOgApi9KjCiwqLk8nl8XaSuDXLRvYe TPfNF2iehQarOGPyVAwBuctD20pM8q/oISwgMFCp8JEytI5RgDX3KBTML6yu0lo+y2cb L3lPLCc9O+vrmiwtwrOkMEHOMUmGrC6/F/55w1mDCZXf7WDbdC+4FE+JfJpDmteT2ZGQ HdbX1oRS85ITXZcQB7Cw7Zd3WghLhNitmdoxygY4k6TpwCsKfJTmBUQnv+/rtLhPxCQI U0tLHwwk216mUHwZFmcWX8uZekKAqd64EdWOJ9i2DOxBCSkh4Nm4PkhEQ7s4yQqMoIE7 LpIQ== 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=0Wr0xET2tvmbw9xhJaMx8nDwFsZfDudrDY3Pml6+4Ic=; b=m2CFUFN2TqsSTvHVcE8tpOZ5GPFdkKmzQy7Lz9I6JrQL6pM/ldBOMqZAiUKvoRYXFM sk+iKLp/cC6OOlKm5HIVUO4Se1sE3nSrdHUZDtXShRssAGE6wV9mYMZFi4pTK6Wycksv lgOiXCgFEVO0TEfZMxejb3MwYT3uNrkzWPRjsli4AJMKvwXtDGkBQPkq6iHEo7wIqGS1 dxhsNagsvXlZCoGCcbBrh7AMBCM/EetjS7tcWHcEjJB+3aem8DMB+hoYsQ9KtXpdGMXO ADvM9UHzZYFMknX2UG+gMEM/t06u2AZnhO7HFJNDxc+gfWl0uYI+h+C0xmlEQgiRg/d5 WeSg== X-Gm-Message-State: APjAAAX5pfXpcNg86zc+yHhlQmAaPZTFyqp3NsyXB2kCOB44D6eJ1iox ciD33RQMwCRGKsFAeHmh5GY= X-Google-Smtp-Source: APXvYqy9Jssw4tAxDKt9S/+ZYp1V/sZlN2uSvENsPDlWpZ5aMRaMqFwnLptHn7FR/hLMMEriroY+5Q== X-Received: by 2002:a65:5b05:: with SMTP id y5mr17440544pgq.48.1570802738322; Fri, 11 Oct 2019 07:05:38 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([219.143.130.165]) by smtp.gmail.com with ESMTPSA id p190sm11499392pfb.160.2019.10.11.07.05.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Oct 2019 07:05:37 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: gvrose8192@gmail.com, pshelar@ovn.org Cc: netdev@vger.kernel.org, dev@openvswitch.org, Tonghao Zhang Subject: [PATCH net-next v3 01/10] net: openvswitch: add flow-mask cache for performance Date: Fri, 11 Oct 2019 22:00:38 +0800 Message-Id: <1570802447-8019-2-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tonghao Zhang The idea of this optimization comes from a patch which is committed in 2014, openvswitch community. The author is Pravin B Shelar. In order to get high performance, I implement it again. Later patches will use it. Pravin B Shelar, says: | On every packet OVS needs to lookup flow-table with every | mask until it finds a match. The packet flow-key is first | masked with mask in the list and then the masked key is | looked up in flow-table. Therefore number of masks can | affect packet processing performance. Link: https://github.com/openvswitch/ovs/commit/5604935e4e1cbc16611d2d97f50b717aa31e8ec5 Signed-off-by: Tonghao Zhang --- net/openvswitch/datapath.c | 3 +- net/openvswitch/flow_table.c | 109 +++++++++++++++++++++++++++++++++++++------ net/openvswitch/flow_table.h | 11 ++++- 3 files changed, 107 insertions(+), 16 deletions(-) diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index f30e406..9fea7e1 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -227,7 +227,8 @@ void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key) stats = this_cpu_ptr(dp->stats_percpu); /* Look up flow. */ - flow = ovs_flow_tbl_lookup_stats(&dp->table, key, &n_mask_hit); + flow = ovs_flow_tbl_lookup_stats(&dp->table, key, skb_get_hash(skb), + &n_mask_hit); if (unlikely(!flow)) { struct dp_upcall_info upcall; diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index cf3582c..3d515c0 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -36,6 +36,10 @@ #define TBL_MIN_BUCKETS 1024 #define REHASH_INTERVAL (10 * 60 * HZ) +#define MC_HASH_SHIFT 8 +#define MC_HASH_ENTRIES (1u << MC_HASH_SHIFT) +#define MC_HASH_SEGS ((sizeof(uint32_t) * 8) / MC_HASH_SHIFT) + static struct kmem_cache *flow_cache; struct kmem_cache *flow_stats_cache __read_mostly; @@ -168,10 +172,15 @@ int ovs_flow_tbl_init(struct flow_table *table) { struct table_instance *ti, *ufid_ti; - ti = table_instance_alloc(TBL_MIN_BUCKETS); + table->mask_cache = __alloc_percpu(sizeof(struct mask_cache_entry) * + MC_HASH_ENTRIES, + __alignof__(struct mask_cache_entry)); + if (!table->mask_cache) + return -ENOMEM; + ti = table_instance_alloc(TBL_MIN_BUCKETS); if (!ti) - return -ENOMEM; + goto free_mask_cache; ufid_ti = table_instance_alloc(TBL_MIN_BUCKETS); if (!ufid_ti) @@ -187,6 +196,8 @@ int ovs_flow_tbl_init(struct flow_table *table) free_ti: __table_instance_destroy(ti); +free_mask_cache: + free_percpu(table->mask_cache); return -ENOMEM; } @@ -243,6 +254,7 @@ void ovs_flow_tbl_destroy(struct flow_table *table) struct table_instance *ti = rcu_dereference_raw(table->ti); struct table_instance *ufid_ti = rcu_dereference_raw(table->ufid_ti); + free_percpu(table->mask_cache); table_instance_destroy(ti, ufid_ti, false); } @@ -425,7 +437,8 @@ static bool ovs_flow_cmp_unmasked_key(const struct sw_flow *flow, static struct sw_flow *masked_flow_lookup(struct table_instance *ti, const struct sw_flow_key *unmasked, - const struct sw_flow_mask *mask) + const struct sw_flow_mask *mask, + u32 *n_mask_hit) { struct sw_flow *flow; struct hlist_head *head; @@ -435,6 +448,8 @@ static struct sw_flow *masked_flow_lookup(struct table_instance *ti, ovs_flow_mask_key(&masked_key, unmasked, false, mask); hash = flow_hash(&masked_key, &mask->range); head = find_bucket(ti, hash); + (*n_mask_hit)++; + hlist_for_each_entry_rcu(flow, head, flow_table.node[ti->node_ver]) { if (flow->mask == mask && flow->flow_table.hash == hash && flow_cmp_masked_key(flow, &masked_key, &mask->range)) @@ -443,30 +458,97 @@ static struct sw_flow *masked_flow_lookup(struct table_instance *ti, return NULL; } -struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl, - const struct sw_flow_key *key, - u32 *n_mask_hit) +static struct sw_flow *flow_lookup(struct flow_table *tbl, + struct table_instance *ti, + const struct sw_flow_key *key, + u32 *n_mask_hit) { - struct table_instance *ti = rcu_dereference_ovsl(tbl->ti); struct sw_flow_mask *mask; struct sw_flow *flow; - *n_mask_hit = 0; list_for_each_entry_rcu(mask, &tbl->mask_list, list) { - (*n_mask_hit)++; - flow = masked_flow_lookup(ti, key, mask); + flow = masked_flow_lookup(ti, key, mask, n_mask_hit); if (flow) /* Found */ return flow; } return NULL; } +/* + * mask_cache maps flow to probable mask. This cache is not tightly + * coupled cache, It means updates to mask list can result in inconsistent + * cache entry in mask cache. + * This is per cpu cache and is divided in MC_HASH_SEGS segments. + * In case of a hash collision the entry is hashed in next segment. + * */ +struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl, + const struct sw_flow_key *key, + u32 skb_hash, + u32 *n_mask_hit) +{ + struct table_instance *ti = rcu_dereference_ovsl(tbl->ti); + struct mask_cache_entry *entries, *ce, *del; + struct sw_flow *flow; + u32 hash = skb_hash; + int seg; + + *n_mask_hit = 0; + if (unlikely(!skb_hash)) + return flow_lookup(tbl, ti, key, n_mask_hit); + + del = NULL; + entries = this_cpu_ptr(tbl->mask_cache); + + for (seg = 0; seg < MC_HASH_SEGS; seg++) { + int index; + + index = hash & (MC_HASH_ENTRIES - 1); + ce = &entries[index]; + + if (ce->skb_hash == skb_hash) { + struct sw_flow_mask *mask; + int i; + + i = 0; + list_for_each_entry_rcu(mask, &tbl->mask_list, list) { + if (ce->mask_index == i++) { + flow = masked_flow_lookup(ti, key, mask, + n_mask_hit); + if (flow) /* Found */ + return flow; + + break; + } + } + + del = ce; + break; + } + + if (!del || (del->skb_hash && !ce->skb_hash)) { + del = ce; + } + + hash >>= MC_HASH_SHIFT; + } + + flow = flow_lookup(tbl, ti, key, n_mask_hit); + + if (flow) { + del->skb_hash = skb_hash; + del->mask_index = (*n_mask_hit - 1); + } + + return flow; +} + struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *tbl, const struct sw_flow_key *key) { + struct table_instance *ti = rcu_dereference_ovsl(tbl->ti); u32 __always_unused n_mask_hit; - return ovs_flow_tbl_lookup_stats(tbl, key, &n_mask_hit); + return flow_lookup(tbl, ti, key, &n_mask_hit); } struct sw_flow *ovs_flow_tbl_lookup_exact(struct flow_table *tbl, @@ -475,10 +557,11 @@ struct sw_flow *ovs_flow_tbl_lookup_exact(struct flow_table *tbl, struct table_instance *ti = rcu_dereference_ovsl(tbl->ti); struct sw_flow_mask *mask; struct sw_flow *flow; + u32 __always_unused n_mask_hit; /* Always called under ovs-mutex. */ list_for_each_entry(mask, &tbl->mask_list, list) { - flow = masked_flow_lookup(ti, match->key, mask); + flow = masked_flow_lookup(ti, match->key, mask, &n_mask_hit); if (flow && ovs_identifier_is_key(&flow->id) && ovs_flow_cmp_unmasked_key(flow, match)) return flow; @@ -631,7 +714,7 @@ static int flow_mask_insert(struct flow_table *tbl, struct sw_flow *flow, return -ENOMEM; mask->key = new->key; mask->range = new->range; - list_add_rcu(&mask->list, &tbl->mask_list); + list_add_tail_rcu(&mask->list, &tbl->mask_list); } else { BUG_ON(!mask->ref_count); mask->ref_count++; diff --git a/net/openvswitch/flow_table.h b/net/openvswitch/flow_table.h index bc52045..04b6b1c 100644 --- a/net/openvswitch/flow_table.h +++ b/net/openvswitch/flow_table.h @@ -22,6 +22,11 @@ #include "flow.h" +struct mask_cache_entry { + u32 skb_hash; + u32 mask_index; +}; + struct table_instance { struct hlist_head *buckets; unsigned int n_buckets; @@ -34,6 +39,7 @@ struct table_instance { struct flow_table { struct table_instance __rcu *ti; struct table_instance __rcu *ufid_ti; + struct mask_cache_entry __percpu *mask_cache; struct list_head mask_list; unsigned long last_rehash; unsigned int count; @@ -60,8 +66,9 @@ int ovs_flow_tbl_insert(struct flow_table *table, struct sw_flow *flow, struct sw_flow *ovs_flow_tbl_dump_next(struct table_instance *table, u32 *bucket, u32 *idx); struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *, - const struct sw_flow_key *, - u32 *n_mask_hit); + const struct sw_flow_key *, + u32 skb_hash, + u32 *n_mask_hit); struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *, const struct sw_flow_key *); struct sw_flow *ovs_flow_tbl_lookup_exact(struct flow_table *tbl, From patchwork Fri Oct 11 14:00:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1175217 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NnOc6Za5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46qV9465D4z9sP3 for ; Sat, 12 Oct 2019 01:05:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728477AbfJKOFo (ORCPT ); Fri, 11 Oct 2019 10:05:44 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:44223 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728111AbfJKOFn (ORCPT ); Fri, 11 Oct 2019 10:05:43 -0400 Received: by mail-pf1-f196.google.com with SMTP id q21so6145122pfn.11 for ; Fri, 11 Oct 2019 07:05:42 -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=gJaIl+RfFTmhef/KM/zWIGJ5ByyxZNmZJQ6mhNGsVZc=; b=NnOc6Za5brNvKeqWVNEp+VX7EPJMhkzTjyVyWrJsBYoNtTzZNPWCddqrLkvd/tzIzK fZawieru3Zjm+q3+6MDRUuL63ckmQ5N7yt7cvUGuHe36eD0+RDGCMzAIR1MYtFQChpea cvA1uAMcDYBDKYlQwpm9Wx3FYJG+3ljvbys039yojlf89+ppZTfcnMSCCDbebpEXOB7B r6ZAJcp8ywP9BBjMJ68YQ+FLKx1lsM61dPVi5+sy4PcMYS9QA+W826BjNDfKtvhuAQuR x0evmvzoiO6RDZHc4BGHuZJj5go4Kau+ajscKvzVktI456Cy/WDoHtObJVMhkvQ0LTZG mpYg== 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=gJaIl+RfFTmhef/KM/zWIGJ5ByyxZNmZJQ6mhNGsVZc=; b=UV52O84Ma5skq7AbOSPk46Pdn9rn50dNrFgGq77jkwtqnO++aKgAbx2GpR3yvzm9Ub oGWbuCX1roaZzSi/DHu9T0eFP6BvzBEXnJO+uLzcv8CoptuhTdkyNShYI5VzQPaSWev8 x49pAK2pi5UjaubrArJTLPmlD6BQCE+DOZgpGZpDV/uqLu/JwJlL7cnngpVNgf19viAi Ne75C7fdX4qZIV24DhEkOR9hXoEA/UtmSTkgjHNQQebjPZljInNGc1zzLFKOWSNVdCK9 hBdDxG6qpn+5js8K7Mk3zvOphzLrUAIlTL7SM6ZHrpIt1ptO3VJH3Ap7luKTXhJmW5Fn Aukw== X-Gm-Message-State: APjAAAWJIWQxblud6/7fTjWztCYcSTsIhOG/A9BcuvHupGZg+gFYSv92 scuV6A+ejBjOfIyTQyeMNh0= X-Google-Smtp-Source: APXvYqwxoCgdOrOrZDMdZj5o7hQ1RW9qrcKC9m58jJPn4mxAlTPSIjjcsN5Vn0OwRNDlxKiiuqpfNg== X-Received: by 2002:aa7:87d9:: with SMTP id i25mr17083174pfo.244.1570802741770; Fri, 11 Oct 2019 07:05:41 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([219.143.130.165]) by smtp.gmail.com with ESMTPSA id p190sm11499392pfb.160.2019.10.11.07.05.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Oct 2019 07:05:41 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: gvrose8192@gmail.com, pshelar@ovn.org Cc: netdev@vger.kernel.org, dev@openvswitch.org, Tonghao Zhang Subject: [PATCH net-next v3 02/10] net: openvswitch: convert mask list in mask array Date: Fri, 11 Oct 2019 22:00:39 +0800 Message-Id: <1570802447-8019-3-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tonghao Zhang Port the codes to linux upstream and with little changes. Pravin B Shelar, says: | mask caches index of mask in mask_list. On packet recv OVS | need to traverse mask-list to get cached mask. Therefore array | is better for retrieving cached mask. This also allows better | cache replacement algorithm by directly checking mask's existence. Link: https://github.com/openvswitch/ovs/commit/d49fc3ff53c65e4eca9cabd52ac63396746a7ef5 Signed-off-by: Tonghao Zhang --- net/openvswitch/flow.h | 1 - net/openvswitch/flow_table.c | 210 ++++++++++++++++++++++++++++++++----------- net/openvswitch/flow_table.h | 8 +- 3 files changed, 167 insertions(+), 52 deletions(-) diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h index b830d5f..8080518 100644 --- a/net/openvswitch/flow.h +++ b/net/openvswitch/flow.h @@ -166,7 +166,6 @@ struct sw_flow_key_range { struct sw_flow_mask { int ref_count; struct rcu_head rcu; - struct list_head list; struct sw_flow_key_range range; struct sw_flow_key key; }; diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index 3d515c0..aab7a27 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -34,6 +34,7 @@ #include #define TBL_MIN_BUCKETS 1024 +#define MASK_ARRAY_SIZE_MIN 16 #define REHASH_INTERVAL (10 * 60 * HZ) #define MC_HASH_SHIFT 8 @@ -168,9 +169,51 @@ static struct table_instance *table_instance_alloc(int new_size) return ti; } +static struct mask_array *tbl_mask_array_alloc(int size) +{ + struct mask_array *new; + + size = max(MASK_ARRAY_SIZE_MIN, size); + new = kzalloc(sizeof(struct mask_array) + + sizeof(struct sw_flow_mask *) * size, GFP_KERNEL); + if (!new) + return NULL; + + new->count = 0; + new->max = size; + + return new; +} + +static int tbl_mask_array_realloc(struct flow_table *tbl, int size) +{ + struct mask_array *old; + struct mask_array *new; + + new = tbl_mask_array_alloc(size); + if (!new) + return -ENOMEM; + + old = ovsl_dereference(tbl->mask_array); + if (old) { + int i; + + for (i = 0; i < old->max; i++) { + if (ovsl_dereference(old->masks[i])) + new->masks[new->count++] = old->masks[i]; + } + } + + rcu_assign_pointer(tbl->mask_array, new); + kfree_rcu(old, rcu); + + return 0; +} + int ovs_flow_tbl_init(struct flow_table *table) { struct table_instance *ti, *ufid_ti; + struct mask_array *ma; table->mask_cache = __alloc_percpu(sizeof(struct mask_cache_entry) * MC_HASH_ENTRIES, @@ -178,9 +221,13 @@ int ovs_flow_tbl_init(struct flow_table *table) if (!table->mask_cache) return -ENOMEM; + ma = tbl_mask_array_alloc(MASK_ARRAY_SIZE_MIN); + if (!ma) + goto free_mask_cache; + ti = table_instance_alloc(TBL_MIN_BUCKETS); if (!ti) - goto free_mask_cache; + goto free_mask_array; ufid_ti = table_instance_alloc(TBL_MIN_BUCKETS); if (!ufid_ti) @@ -188,7 +235,7 @@ int ovs_flow_tbl_init(struct flow_table *table) rcu_assign_pointer(table->ti, ti); rcu_assign_pointer(table->ufid_ti, ufid_ti); - INIT_LIST_HEAD(&table->mask_list); + rcu_assign_pointer(table->mask_array, ma); table->last_rehash = jiffies; table->count = 0; table->ufid_count = 0; @@ -196,6 +243,8 @@ int ovs_flow_tbl_init(struct flow_table *table) free_ti: __table_instance_destroy(ti); +free_mask_array: + kfree(ma); free_mask_cache: free_percpu(table->mask_cache); return -ENOMEM; @@ -255,6 +304,7 @@ void ovs_flow_tbl_destroy(struct flow_table *table) struct table_instance *ufid_ti = rcu_dereference_raw(table->ufid_ti); free_percpu(table->mask_cache); + kfree_rcu(table->mask_array, rcu); table_instance_destroy(ti, ufid_ti, false); } @@ -460,17 +510,27 @@ static struct sw_flow *masked_flow_lookup(struct table_instance *ti, static struct sw_flow *flow_lookup(struct flow_table *tbl, struct table_instance *ti, + struct mask_array *ma, const struct sw_flow_key *key, - u32 *n_mask_hit) + u32 *n_mask_hit, + u32 *index) { - struct sw_flow_mask *mask; struct sw_flow *flow; + int i; - list_for_each_entry_rcu(mask, &tbl->mask_list, list) { - flow = masked_flow_lookup(ti, key, mask, n_mask_hit); - if (flow) /* Found */ - return flow; + for (i = 0; i < ma->max; i++) { + struct sw_flow_mask *mask; + + mask = rcu_dereference_ovsl(ma->masks[i]); + if (mask) { + flow = masked_flow_lookup(ti, key, mask, n_mask_hit); + if (flow) { /* Found */ + *index = i; + return flow; + } + } } + return NULL; } @@ -486,6 +546,7 @@ struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl, u32 skb_hash, u32 *n_mask_hit) { + struct mask_array *ma = rcu_dereference_ovsl(tbl->mask_array); struct table_instance *ti = rcu_dereference_ovsl(tbl->ti); struct mask_cache_entry *entries, *ce, *del; struct sw_flow *flow; @@ -493,8 +554,11 @@ struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl, int seg; *n_mask_hit = 0; - if (unlikely(!skb_hash)) - return flow_lookup(tbl, ti, key, n_mask_hit); + if (unlikely(!skb_hash)) { + u32 __always_unused mask_index; + + return flow_lookup(tbl, ti, ma, key, n_mask_hit, &mask_index); + } del = NULL; entries = this_cpu_ptr(tbl->mask_cache); @@ -507,37 +571,33 @@ struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl, if (ce->skb_hash == skb_hash) { struct sw_flow_mask *mask; - int i; - - i = 0; - list_for_each_entry_rcu(mask, &tbl->mask_list, list) { - if (ce->mask_index == i++) { - flow = masked_flow_lookup(ti, key, mask, - n_mask_hit); - if (flow) /* Found */ - return flow; - - break; - } + struct sw_flow *flow; + + mask = rcu_dereference_ovsl(ma->masks[ce->mask_index]); + if (mask) { + flow = masked_flow_lookup(ti, key, mask, + n_mask_hit); + if (flow) /* Found */ + return flow; } del = ce; break; } - if (!del || (del->skb_hash && !ce->skb_hash)) { + if (!del || (del->skb_hash && !ce->skb_hash) || + (rcu_dereference_ovsl(ma->masks[del->mask_index]) && + !rcu_dereference_ovsl(ma->masks[ce->mask_index]))) { del = ce; } hash >>= MC_HASH_SHIFT; } - flow = flow_lookup(tbl, ti, key, n_mask_hit); + flow = flow_lookup(tbl, ti, ma, key, n_mask_hit, &del->mask_index); - if (flow) { + if (flow) del->skb_hash = skb_hash; - del->mask_index = (*n_mask_hit - 1); - } return flow; } @@ -546,26 +606,38 @@ struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *tbl, const struct sw_flow_key *key) { struct table_instance *ti = rcu_dereference_ovsl(tbl->ti); + struct mask_array *ma = rcu_dereference_ovsl(tbl->mask_array); + u32 __always_unused n_mask_hit; + u32 __always_unused index; - return flow_lookup(tbl, ti, key, &n_mask_hit); + return flow_lookup(tbl, ti, ma, key, &n_mask_hit, &index); } struct sw_flow *ovs_flow_tbl_lookup_exact(struct flow_table *tbl, const struct sw_flow_match *match) { - struct table_instance *ti = rcu_dereference_ovsl(tbl->ti); - struct sw_flow_mask *mask; - struct sw_flow *flow; - u32 __always_unused n_mask_hit; + struct mask_array *ma = ovsl_dereference(tbl->mask_array); + int i; /* Always called under ovs-mutex. */ - list_for_each_entry(mask, &tbl->mask_list, list) { + for (i = 0; i < ma->max; i++) { + struct table_instance *ti = rcu_dereference_ovsl(tbl->ti); + u32 __always_unused n_mask_hit; + struct sw_flow_mask *mask; + struct sw_flow *flow; + + mask = ovsl_dereference(ma->masks[i]); + if (!mask) + continue; + flow = masked_flow_lookup(ti, match->key, mask, &n_mask_hit); if (flow && ovs_identifier_is_key(&flow->id) && - ovs_flow_cmp_unmasked_key(flow, match)) + ovs_flow_cmp_unmasked_key(flow, match)) { return flow; + } } + return NULL; } @@ -611,13 +683,8 @@ struct sw_flow *ovs_flow_tbl_lookup_ufid(struct flow_table *tbl, int ovs_flow_tbl_num_masks(const struct flow_table *table) { - struct sw_flow_mask *mask; - int num = 0; - - list_for_each_entry(mask, &table->mask_list, list) - num++; - - return num; + struct mask_array *ma = rcu_dereference_ovsl(table->mask_array); + return ma->count; } static struct table_instance *table_instance_expand(struct table_instance *ti, @@ -638,8 +705,19 @@ static void flow_mask_remove(struct flow_table *tbl, struct sw_flow_mask *mask) mask->ref_count--; if (!mask->ref_count) { - list_del_rcu(&mask->list); - kfree_rcu(mask, rcu); + struct mask_array *ma; + int i; + + ma = ovsl_dereference(tbl->mask_array); + for (i = 0; i < ma->max; i++) { + if (mask == ovsl_dereference(ma->masks[i])) { + RCU_INIT_POINTER(ma->masks[i], NULL); + ma->count--; + kfree_rcu(mask, rcu); + return; + } + } + BUG(); } } } @@ -689,13 +767,16 @@ static bool mask_equal(const struct sw_flow_mask *a, static struct sw_flow_mask *flow_mask_find(const struct flow_table *tbl, const struct sw_flow_mask *mask) { - struct list_head *ml; + struct mask_array *ma; + int i; - list_for_each(ml, &tbl->mask_list) { - struct sw_flow_mask *m; - m = container_of(ml, struct sw_flow_mask, list); - if (mask_equal(mask, m)) - return m; + ma = ovsl_dereference(tbl->mask_array); + for (i = 0; i < ma->max; i++) { + struct sw_flow_mask *t; + t = ovsl_dereference(ma->masks[i]); + + if (t && mask_equal(mask, t)) + return t; } return NULL; @@ -706,15 +787,44 @@ static int flow_mask_insert(struct flow_table *tbl, struct sw_flow *flow, const struct sw_flow_mask *new) { struct sw_flow_mask *mask; + mask = flow_mask_find(tbl, new); if (!mask) { + struct mask_array *ma; + int i; + /* Allocate a new mask if none exsits. */ mask = mask_alloc(); if (!mask) return -ENOMEM; mask->key = new->key; mask->range = new->range; - list_add_tail_rcu(&mask->list, &tbl->mask_list); + + /* Add mask to mask-list. */ + ma = ovsl_dereference(tbl->mask_array); + if (ma->count >= ma->max) { + int err; + + err = tbl_mask_array_realloc(tbl, ma->max + + MASK_ARRAY_SIZE_MIN); + if (err) { + kfree(mask); + return err; + } + + ma = ovsl_dereference(tbl->mask_array); + } + + for (i = 0; i < ma->max; i++) { + const struct sw_flow_mask *t; + + t = ovsl_dereference(ma->masks[i]); + if (!t) { + rcu_assign_pointer(ma->masks[i], mask); + ma->count++; + break; + } + } } else { BUG_ON(!mask->ref_count); mask->ref_count++; diff --git a/net/openvswitch/flow_table.h b/net/openvswitch/flow_table.h index 04b6b1c..8a5cea6 100644 --- a/net/openvswitch/flow_table.h +++ b/net/openvswitch/flow_table.h @@ -27,6 +27,12 @@ struct mask_cache_entry { u32 mask_index; }; +struct mask_array { + struct rcu_head rcu; + int count, max; + struct sw_flow_mask __rcu *masks[]; +}; + struct table_instance { struct hlist_head *buckets; unsigned int n_buckets; @@ -40,7 +46,7 @@ struct flow_table { struct table_instance __rcu *ti; struct table_instance __rcu *ufid_ti; struct mask_cache_entry __percpu *mask_cache; - struct list_head mask_list; + struct mask_array __rcu *mask_array; unsigned long last_rehash; unsigned int count; unsigned int ufid_count; From patchwork Fri Oct 11 14:00:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1175218 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Df75eBTR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46qV9871LRz9sP3 for ; Sat, 12 Oct 2019 01:05:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728487AbfJKOFs (ORCPT ); Fri, 11 Oct 2019 10:05:48 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:41104 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728111AbfJKOFr (ORCPT ); Fri, 11 Oct 2019 10:05:47 -0400 Received: by mail-pf1-f193.google.com with SMTP id q7so6155441pfh.8 for ; Fri, 11 Oct 2019 07:05:47 -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=PSQ6n7rEGH9ybWq76aljx63raNUc8N3PNSc/VIn9XVQ=; b=Df75eBTRx6W/PuV5SSIrtAK/Zjfa5KbYvtvkf5Oo9XOBZrzUyOGxyBspGUQeI28pwd gi6SiuDYRnyJV6lOC3UipC70i0UVlMd6+LFRz4iKmHU1eBY5uYhpkUqpWZur2D2zsrHr tNB8nAcD2org0aXvBXhuCMzmAGckqrnmCOcl9AEkssRth0TvBKvjJtmEDufm0EufDJx1 RT60VcoDJgpPMqDU113RePbJCv7Uw2c5lyGrpP1C0LsrHipA4cENDJtaU24fnEWZPCOh WZyKqgPQhj7XIgUu9i9BUcu9mJihSV3fr4Y6yYxNjFZa2q5RzWxLcA9ytLjJIv0n2zRz j4cA== 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=PSQ6n7rEGH9ybWq76aljx63raNUc8N3PNSc/VIn9XVQ=; b=mqwp/8nezvyBwq8u0li9uKzcRo4Gh2DJuAQ0WGbMFPrkX69+StzPbR5qtncCYU7ocC S4SLOtGFcN7ttiROM9RT00ULEvSiO2OpgcbWrKeM6yjybpRu6JwK4BL61dt3sISOpzsp uwU08OBxDGzQEKhi23UdRcId/jt3kSZBeUi6UDKJNDmNC6Xbno+OrDHM1PcH/RSw88xU KBRA/kEV3vEkUd487RkVBlt+2/sHIDmEGj2RQtpmlhUZf22FQFRkJx2FgNeN/+5DZq5H QR5oWLll8dCDcAlS0fvjjATRthI52Ktd3wVatzvFaqLumTmCe65fAIiDLxZEccaN3AM5 WlKg== X-Gm-Message-State: APjAAAXMsIAMiigFZaC/Fz/xx5cHEQrTiV0RsEnYHvaJDOeNH/MTOBcd B3VwJDMLpORmvNFpVUq8l0E= X-Google-Smtp-Source: APXvYqwfsrayuLJyR0vUm6PlhbZqiBep+Vtj2hjQRV9pqQD+VNDSfMex03Kf/Q7nxnXVgHi1Z0gFiA== X-Received: by 2002:a62:e807:: with SMTP id c7mr16348368pfi.18.1570802746957; Fri, 11 Oct 2019 07:05:46 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([219.143.130.165]) by smtp.gmail.com with ESMTPSA id p190sm11499392pfb.160.2019.10.11.07.05.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Oct 2019 07:05:46 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: gvrose8192@gmail.com, pshelar@ovn.org Cc: netdev@vger.kernel.org, dev@openvswitch.org, Tonghao Zhang Subject: [PATCH net-next v3 03/10] net: openvswitch: shrink the mask array if necessary Date: Fri, 11 Oct 2019 22:00:40 +0800 Message-Id: <1570802447-8019-4-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tonghao Zhang When creating and inserting flow-mask, if there is no available flow-mask, we realloc the mask array. When removing flow-mask, if necessary, we shrink mask array. Signed-off-by: Tonghao Zhang --- net/openvswitch/flow_table.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index aab7a27..ff4c4b049 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -693,6 +693,23 @@ static struct table_instance *table_instance_expand(struct table_instance *ti, return table_instance_rehash(ti, ti->n_buckets * 2, ufid); } +static void tbl_mask_array_delete_mask(struct mask_array *ma, + struct sw_flow_mask *mask) +{ + int i; + + /* Remove the deleted mask pointers from the array */ + for (i = 0; i < ma->max; i++) { + if (mask == ovsl_dereference(ma->masks[i])) { + RCU_INIT_POINTER(ma->masks[i], NULL); + ma->count--; + kfree_rcu(mask, rcu); + return; + } + } + BUG(); +} + /* Remove 'mask' from the mask list, if it is not needed any more. */ static void flow_mask_remove(struct flow_table *tbl, struct sw_flow_mask *mask) { @@ -706,18 +723,14 @@ static void flow_mask_remove(struct flow_table *tbl, struct sw_flow_mask *mask) if (!mask->ref_count) { struct mask_array *ma; - int i; ma = ovsl_dereference(tbl->mask_array); - for (i = 0; i < ma->max; i++) { - if (mask == ovsl_dereference(ma->masks[i])) { - RCU_INIT_POINTER(ma->masks[i], NULL); - ma->count--; - kfree_rcu(mask, rcu); - return; - } - } - BUG(); + tbl_mask_array_delete_mask(ma, mask); + + /* Shrink the mask array if necessary. */ + if (ma->max >= (MASK_ARRAY_SIZE_MIN * 2) && + ma->count <= (ma->max / 3)) + tbl_mask_array_realloc(tbl, ma->max / 2); } } } From patchwork Fri Oct 11 14:00:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1175220 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="msS1+WQ7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46qV9G3682z9sNx for ; Sat, 12 Oct 2019 01:05:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728582AbfJKOFw (ORCPT ); Fri, 11 Oct 2019 10:05:52 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:38190 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728536AbfJKOFv (ORCPT ); Fri, 11 Oct 2019 10:05:51 -0400 Received: by mail-pg1-f193.google.com with SMTP id x10so5867002pgi.5 for ; Fri, 11 Oct 2019 07:05:51 -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=QE03MBHiq42pArEtShc+VYCmSluEXNyE+j/bDKF7iCQ=; b=msS1+WQ7U0xt3J6vBHj7gIfXQUvEDC8zr91FnbaKpBgyltis63JlbqCutoaqZ80o5a RbFzZHk3MUXAxnAQqaZL0NqTo652zoXcjt/7z7PDCzWzqpQqx0LY13sdl57Z7ojBCVop E6If3gpziGH4rKtksqhr8k3VaG8kJmZPzfc42ButnEnI3oRVeGleI6eYEND2tQukyo/P tTZErewbQ44+AW4aTibnUYpmdMfA6kqamrGWhr9jme2hgUfpzyw2VSW92djXg5PR/aa9 ewpLoi0UZ4kKaGNQA5xwAn+Q+ValwBr0GDqsCJB+rqscLSMrZeQPhgc9y+P/+Nz+xaDv ZMKQ== 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=QE03MBHiq42pArEtShc+VYCmSluEXNyE+j/bDKF7iCQ=; b=TVdZq8jtdI6pcC1GeAGcz77B8bXidNtkR/0wT7MwAHKEzjQ5kvkoN+oIVeK5awfknX ww6e3mzgx+5lb9IEA9t6nIr0wvo9jkF8rDsG7CM78BCtl/q4ihYpiPr3BmcEMFls5KEi o8uUA1Zrox5dpd6yQtIAYvk90pbXOnE/NERK4iyd2S/l2fNIMBV4ZCriBIzm5lyAW+mG TA/eOYEtCw/secHpYhLsMbbwECzPQ/0GuKvbZ4IAt9yMgVT6V4unfoWhyoE9NVUln+Th p99n+0YdQKjLfc9X/w0x4mF3YaBC2SxZDFTvFtFWy4mIlFOhTbnZMOZxbd/8Bg4++xx7 6Mag== X-Gm-Message-State: APjAAAWlZhUv4qyE4dfUds3qsj+ol9+W4B2ZY3oq2/mwjdPWMvW+Rc7n LE+/K5ZGRAIRMmJtWrdNnKGzChWO X-Google-Smtp-Source: APXvYqx5TDkXFTbw0GfCqGghPI9XQeI3G27uIRXTiR0GWOraEtpXmGGxAUj870wwDgkh/kYok3oTzw== X-Received: by 2002:a62:1646:: with SMTP id 67mr16727187pfw.128.1570802750868; Fri, 11 Oct 2019 07:05:50 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([219.143.130.165]) by smtp.gmail.com with ESMTPSA id p190sm11499392pfb.160.2019.10.11.07.05.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Oct 2019 07:05:50 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: gvrose8192@gmail.com, pshelar@ovn.org Cc: netdev@vger.kernel.org, dev@openvswitch.org, Tonghao Zhang Subject: [PATCH net-next v3 04/10] net: openvswitch: optimize flow mask cache hash collision Date: Fri, 11 Oct 2019 22:00:41 +0800 Message-Id: <1570802447-8019-5-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tonghao Zhang Port the codes to linux upstream and with little changes. Pravin B Shelar, says: | In case hash collision on mask cache, OVS does extra flow | lookup. Following patch avoid it. Link: https://github.com/openvswitch/ovs/commit/0e6efbe2712da03522532dc5e84806a96f6a0dd1 Signed-off-by: Tonghao Zhang --- net/openvswitch/flow_table.c | 95 ++++++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index ff4c4b049..4c82960 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -508,6 +508,9 @@ static struct sw_flow *masked_flow_lookup(struct table_instance *ti, return NULL; } +/* Flow lookup does full lookup on flow table. It starts with + * mask from index passed in *index. + */ static struct sw_flow *flow_lookup(struct flow_table *tbl, struct table_instance *ti, struct mask_array *ma, @@ -516,18 +519,31 @@ static struct sw_flow *flow_lookup(struct flow_table *tbl, u32 *index) { struct sw_flow *flow; + struct sw_flow_mask *mask; int i; - for (i = 0; i < ma->max; i++) { - struct sw_flow_mask *mask; - - mask = rcu_dereference_ovsl(ma->masks[i]); + if (*index < ma->max) { + mask = rcu_dereference_ovsl(ma->masks[*index]); if (mask) { flow = masked_flow_lookup(ti, key, mask, n_mask_hit); - if (flow) { /* Found */ - *index = i; + if (flow) return flow; - } + } + } + + for (i = 0; i < ma->max; i++) { + + if (i == *index) + continue; + + mask = rcu_dereference_ovsl(ma->masks[i]); + if (!mask) + continue; + + flow = masked_flow_lookup(ti, key, mask, n_mask_hit); + if (flow) { /* Found */ + *index = i; + return flow; } } @@ -546,58 +562,54 @@ struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl, u32 skb_hash, u32 *n_mask_hit) { - struct mask_array *ma = rcu_dereference_ovsl(tbl->mask_array); - struct table_instance *ti = rcu_dereference_ovsl(tbl->ti); - struct mask_cache_entry *entries, *ce, *del; + struct mask_array *ma = rcu_dereference(tbl->mask_array); + struct table_instance *ti = rcu_dereference(tbl->ti); + struct mask_cache_entry *entries, *ce; struct sw_flow *flow; - u32 hash = skb_hash; + u32 hash; int seg; *n_mask_hit = 0; if (unlikely(!skb_hash)) { - u32 __always_unused mask_index; + u32 mask_index = 0; return flow_lookup(tbl, ti, ma, key, n_mask_hit, &mask_index); } - del = NULL; + /* Pre and post recirulation flows usually have the same skb_hash + * value. To avoid hash collisions, rehash the 'skb_hash' with + * 'recirc_id'. */ + if (key->recirc_id) + skb_hash = jhash_1word(skb_hash, key->recirc_id); + + ce = NULL; + hash = skb_hash; entries = this_cpu_ptr(tbl->mask_cache); + /* Find the cache entry 'ce' to operate on. */ for (seg = 0; seg < MC_HASH_SEGS; seg++) { - int index; - - index = hash & (MC_HASH_ENTRIES - 1); - ce = &entries[index]; - - if (ce->skb_hash == skb_hash) { - struct sw_flow_mask *mask; - struct sw_flow *flow; - - mask = rcu_dereference_ovsl(ma->masks[ce->mask_index]); - if (mask) { - flow = masked_flow_lookup(ti, key, mask, - n_mask_hit); - if (flow) /* Found */ - return flow; - } - - del = ce; - break; + int index = hash & (MC_HASH_ENTRIES - 1); + struct mask_cache_entry *e; + + e = &entries[index]; + if (e->skb_hash == skb_hash) { + flow = flow_lookup(tbl, ti, ma, key, n_mask_hit, + &e->mask_index); + if (!flow) + e->skb_hash = 0; + return flow; } - if (!del || (del->skb_hash && !ce->skb_hash) || - (rcu_dereference_ovsl(ma->masks[del->mask_index]) && - !rcu_dereference_ovsl(ma->masks[ce->mask_index]))) { - del = ce; - } + if (!ce || e->skb_hash < ce->skb_hash) + ce = e; /* A better replacement cache candidate. */ hash >>= MC_HASH_SHIFT; } - flow = flow_lookup(tbl, ti, ma, key, n_mask_hit, &del->mask_index); - + /* Cache miss, do full lookup. */ + flow = flow_lookup(tbl, ti, ma, key, n_mask_hit, &ce->mask_index); if (flow) - del->skb_hash = skb_hash; + ce->skb_hash = skb_hash; return flow; } @@ -607,9 +619,8 @@ struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *tbl, { struct table_instance *ti = rcu_dereference_ovsl(tbl->ti); struct mask_array *ma = rcu_dereference_ovsl(tbl->mask_array); - u32 __always_unused n_mask_hit; - u32 __always_unused index; + u32 index = 0; return flow_lookup(tbl, ti, ma, key, &n_mask_hit, &index); } From patchwork Fri Oct 11 14:00:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1175221 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="onG8TmsR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46qV9M6CQzz9sP6 for ; Sat, 12 Oct 2019 01:05:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728637AbfJKOF6 (ORCPT ); Fri, 11 Oct 2019 10:05:58 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:42839 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728111AbfJKOF5 (ORCPT ); Fri, 11 Oct 2019 10:05:57 -0400 Received: by mail-pf1-f195.google.com with SMTP id q12so6158231pff.9 for ; Fri, 11 Oct 2019 07:05:56 -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=k6VOUEZ96dhYIwVnTLLj15fdMju/+qxjbjGxQUjAWK4=; b=onG8TmsRFTtvolXONroAGJudMBxXDc6x1p7275g3o+YXgtBXQGSj+N9lxRNWEIoNMf cnICpJFIIqJijyT6gutT2DC3+CkxMbP9Jbh/Pbfu58/Xm3GghaUkga34RYluVZNVeNjK 98F3HfdZ1HehC3seScGBjxcYp8/HrhzvzYU/bUcGloPFsQ6mV3HvJFumIZx8MIjgFqni MLxCTAZ7w8+uJ7vgrjPIf0FXzoO1IkBVTTXn+9pkUl2lXqG4mQevd46jNQkoQwov+zPB PRbHcv/SLXJMebxYhBEvRFURe+AqP0VKKo99INVKKKU4UO+9UKm2DpdjH8YdVtiC64Gw 6X3Q== 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=k6VOUEZ96dhYIwVnTLLj15fdMju/+qxjbjGxQUjAWK4=; b=jWyLhtxsDsNDBkViRgzLPkc4CpY+ev8YQXcDDwmvwT/0BdA6YXQE0QVACxoeYhGlLV NLiHlKCUMd5G/OfV2+BuE5k7+9pfDjO9ETY9WVGHfXhWWfbiGfjpnloBor1ow3FPzLEN /VBQBYZjnLhY/JwcleCLFKW4uLOjYIf9H5VAIB6wQLLKAUXx2Nn5DL0CP3ZCptp/rcuf a8a5Q7Mzi339Fhrjt9ofGUJ6SuiiM8E6lIHtxadlOKp8i5mnMNAXfH5LHNy4GDnN6Aaf E0vAWtPbi2FDqoktTsSaa0VLaYcEeKcZ29tO+Tr+Y4sDt4VL1kHA3DsVgOy/IDS/qHc2 dlyw== X-Gm-Message-State: APjAAAXiKlQZ+MsWtPxk3bGiTJ821dpMvSxLsQpmxwSRgErnnSK2u6D5 k2sWWDQ87NZ3MGAt748ngO8= X-Google-Smtp-Source: APXvYqwLr6oNOol7UJgKIF36hylQtr2Q/xV3ZL+8JSwQpFFVCrkWxPSc2i/AfqNIjA7vUsOTWpCoIA== X-Received: by 2002:a63:e00e:: with SMTP id e14mr17345820pgh.146.1570802755815; Fri, 11 Oct 2019 07:05:55 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([219.143.130.165]) by smtp.gmail.com with ESMTPSA id p190sm11499392pfb.160.2019.10.11.07.05.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Oct 2019 07:05:55 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: gvrose8192@gmail.com, pshelar@ovn.org Cc: netdev@vger.kernel.org, dev@openvswitch.org, Tonghao Zhang Subject: [PATCH net-next v3 05/10] net: openvswitch: optimize flow-mask looking up Date: Fri, 11 Oct 2019 22:00:42 +0800 Message-Id: <1570802447-8019-6-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tonghao Zhang The full looking up on flow table traverses all mask array. If mask-array is too large, the number of invalid flow-mask increase, performance will be drop. This patch optimizes mask-array operation: * Inserting, insert it [ma->count- 1] directly. * Removing, only change last and current mask point, and free current mask. * Looking up, full looking up will break if mask is NULL. The function which changes or gets *count* of struct mask_array, is protected by ovs_lock, but flow_lookup (not protected) should use *max* of struct mask_array. Functions protected by ovs_lock: * tbl_mask_array_del_mask * tbl_mask_array_add_mask * flow_mask_find * ovs_flow_tbl_lookup_exact * ovs_flow_tbl_num_masks Signed-off-by: Tonghao Zhang --- net/openvswitch/flow_table.c | 114 ++++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 56 deletions(-) diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index 4c82960..1b99f8e 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -198,10 +198,8 @@ static int tbl_mask_array_realloc(struct flow_table *tbl, int size) if (old) { int i; - for (i = 0; i < old->max; i++) { - if (ovsl_dereference(old->masks[i])) - new->masks[new->count++] = old->masks[i]; - } + for (i = 0; i < old->count; i++) + new->masks[new->count++] = old->masks[i]; } rcu_assign_pointer(tbl->mask_array, new); @@ -538,7 +536,7 @@ static struct sw_flow *flow_lookup(struct flow_table *tbl, mask = rcu_dereference_ovsl(ma->masks[i]); if (!mask) - continue; + break; flow = masked_flow_lookup(ti, key, mask, n_mask_hit); if (flow) { /* Found */ @@ -632,15 +630,13 @@ struct sw_flow *ovs_flow_tbl_lookup_exact(struct flow_table *tbl, int i; /* Always called under ovs-mutex. */ - for (i = 0; i < ma->max; i++) { + for (i = 0; i < ma->count; i++) { struct table_instance *ti = rcu_dereference_ovsl(tbl->ti); u32 __always_unused n_mask_hit; struct sw_flow_mask *mask; struct sw_flow *flow; mask = ovsl_dereference(ma->masks[i]); - if (!mask) - continue; flow = masked_flow_lookup(ti, match->key, mask, &n_mask_hit); if (flow && ovs_identifier_is_key(&flow->id) && @@ -704,21 +700,34 @@ static struct table_instance *table_instance_expand(struct table_instance *ti, return table_instance_rehash(ti, ti->n_buckets * 2, ufid); } -static void tbl_mask_array_delete_mask(struct mask_array *ma, - struct sw_flow_mask *mask) +static void tbl_mask_array_del_mask(struct flow_table *tbl, + struct sw_flow_mask *mask) { + struct mask_array *ma = ovsl_dereference(tbl->mask_array); int i; /* Remove the deleted mask pointers from the array */ - for (i = 0; i < ma->max; i++) { - if (mask == ovsl_dereference(ma->masks[i])) { - RCU_INIT_POINTER(ma->masks[i], NULL); - ma->count--; - kfree_rcu(mask, rcu); - return; - } + for (i = 0; i < ma->count; i++) { + if (mask == ovsl_dereference(ma->masks[i])) + goto found; } + BUG(); + return; + +found: + ma->count--; + smp_wmb(); + + rcu_assign_pointer(ma->masks[i], ma->masks[ma->count]); + RCU_INIT_POINTER(ma->masks[ma->count], NULL); + + kfree_rcu(mask, rcu); + + /* Shrink the mask array if necessary. */ + if (ma->max >= (MASK_ARRAY_SIZE_MIN * 2) && + ma->count <= (ma->max / 3)) + tbl_mask_array_realloc(tbl, ma->max / 2); } /* Remove 'mask' from the mask list, if it is not needed any more. */ @@ -732,17 +741,8 @@ static void flow_mask_remove(struct flow_table *tbl, struct sw_flow_mask *mask) BUG_ON(!mask->ref_count); mask->ref_count--; - if (!mask->ref_count) { - struct mask_array *ma; - - ma = ovsl_dereference(tbl->mask_array); - tbl_mask_array_delete_mask(ma, mask); - - /* Shrink the mask array if necessary. */ - if (ma->max >= (MASK_ARRAY_SIZE_MIN * 2) && - ma->count <= (ma->max / 3)) - tbl_mask_array_realloc(tbl, ma->max / 2); - } + if (!mask->ref_count) + tbl_mask_array_del_mask(tbl, mask); } } @@ -795,17 +795,42 @@ static struct sw_flow_mask *flow_mask_find(const struct flow_table *tbl, int i; ma = ovsl_dereference(tbl->mask_array); - for (i = 0; i < ma->max; i++) { + for (i = 0; i < ma->count; i++) { struct sw_flow_mask *t; t = ovsl_dereference(ma->masks[i]); - if (t && mask_equal(mask, t)) + if (mask_equal(mask, t)) return t; } return NULL; } +static int tbl_mask_array_add_mask(struct flow_table *tbl, + struct sw_flow_mask *new) +{ + struct mask_array *ma = ovsl_dereference(tbl->mask_array); + int err; + + if (ma->count >= ma->max) { + err = tbl_mask_array_realloc(tbl, ma->max + + MASK_ARRAY_SIZE_MIN); + if (err) + return err; + + ma = ovsl_dereference(tbl->mask_array); + } + + BUG_ON(ovsl_dereference(ma->masks[ma->count])); + + rcu_assign_pointer(ma->masks[ma->count], new); + + smp_wmb(); + ma->count++; + + return 0; +} + /* Add 'mask' into the mask list, if it is not already there. */ static int flow_mask_insert(struct flow_table *tbl, struct sw_flow *flow, const struct sw_flow_mask *new) @@ -814,9 +839,6 @@ static int flow_mask_insert(struct flow_table *tbl, struct sw_flow *flow, mask = flow_mask_find(tbl, new); if (!mask) { - struct mask_array *ma; - int i; - /* Allocate a new mask if none exsits. */ mask = mask_alloc(); if (!mask) @@ -825,29 +847,9 @@ static int flow_mask_insert(struct flow_table *tbl, struct sw_flow *flow, mask->range = new->range; /* Add mask to mask-list. */ - ma = ovsl_dereference(tbl->mask_array); - if (ma->count >= ma->max) { - int err; - - err = tbl_mask_array_realloc(tbl, ma->max + - MASK_ARRAY_SIZE_MIN); - if (err) { - kfree(mask); - return err; - } - - ma = ovsl_dereference(tbl->mask_array); - } - - for (i = 0; i < ma->max; i++) { - const struct sw_flow_mask *t; - - t = ovsl_dereference(ma->masks[i]); - if (!t) { - rcu_assign_pointer(ma->masks[i], mask); - ma->count++; - break; - } + if (tbl_mask_array_add_mask(tbl, mask)) { + kfree(mask); + return -ENOMEM; } } else { BUG_ON(!mask->ref_count); From patchwork Fri Oct 11 14:00:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1175222 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jQaT9cYI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46qV9P31p3z9sPF for ; Sat, 12 Oct 2019 01:06:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728645AbfJKOGA (ORCPT ); Fri, 11 Oct 2019 10:06:00 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:40443 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728111AbfJKOF7 (ORCPT ); Fri, 11 Oct 2019 10:05:59 -0400 Received: by mail-pg1-f196.google.com with SMTP id d26so5865023pgl.7 for ; Fri, 11 Oct 2019 07:05:58 -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=bbwVTMUAZQTJCANcvOXtOltf12CCuf2zm8x25zYgp2s=; b=jQaT9cYINMGp2NE1qxiK361UDjGr0NTof9MDMVy+Np1nNgWYKETlaaVwn53PgKEZVO 0OIMMnH3mRm51vMrY57zZ1GmKf4e97VMxxz4D74kV0IOCMTLiU/yupnLjKlfXZ0jGjir OliSD5ATvcli8FMxM2VNqV7siJVLPR7H5Grcdolp8SXeDysScOH6hrpiiKm9dTglXb0G Hmv1rYDLwTFMcB0NgJb8Y0XhRwKdrVrVyH7mPXXsn3BNO+jR93T8Dm9K6mXcjZWI4gwT lUcQPr+Smo8ZwNk8n+/eLFx8QtouOL1Xii0kouFcPZn5LM3h0dk48b5haerbSqW+8IeI /9jw== 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=bbwVTMUAZQTJCANcvOXtOltf12CCuf2zm8x25zYgp2s=; b=b04r5U5xOoXQVumAM2Y1BflR48RbAp+asS+ZzqP0RaqARetA7ltQQNxI+6HcW4/Q6V 53KZIbZvwx1+kXe1LrYs01A1qpuBRYe3gaFIJiHSeFQTd/pggHG5TbhqEK11NSIFLRwW Yl97/+SKC0QD1/KKix45BRTb0tGtPwIg9ClKlB7fMimYwoHNtgOnydh/v7P9SdrT/fNd Z2nFVZwmlqxPzcol1BJpiISqCWjCol8EEc4W3hRGpHnynG4qVsvQv9V/flynGYu8oqTa IwFB9XNuI5krPR4bFdTNpGdWdTgB0RHZsLYyolAe4LY0LSq0uUAtD6jWo6Rx9W79Oqql 0m4Q== X-Gm-Message-State: APjAAAX0a6ORU+Qn1nu8EinkHVgueBFEGslqx0MgcCTc+43z8b5tU4DK Z8WZSgRAHqhkvaoQMxl7j2U= X-Google-Smtp-Source: APXvYqwKEedgo7Bxb4cdznR2Ls/Y9bj5XzjZHYQR2OZc2clRp2Bac6FMzVtLFymV+29Fa7cPeAFTEw== X-Received: by 2002:a63:cf4a:: with SMTP id b10mr16313682pgj.86.1570802758624; Fri, 11 Oct 2019 07:05:58 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([219.143.130.165]) by smtp.gmail.com with ESMTPSA id p190sm11499392pfb.160.2019.10.11.07.05.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Oct 2019 07:05:58 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: gvrose8192@gmail.com, pshelar@ovn.org Cc: netdev@vger.kernel.org, dev@openvswitch.org, Tonghao Zhang Subject: [PATCH net-next v3 06/10] net: openvswitch: simplify the flow_hash Date: Fri, 11 Oct 2019 22:00:43 +0800 Message-Id: <1570802447-8019-7-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tonghao Zhang Simplify the code and remove the unnecessary BUILD_BUG_ON. Signed-off-by: Tonghao Zhang --- net/openvswitch/flow_table.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index 1b99f8e..7aba5b4 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -430,13 +430,9 @@ int ovs_flow_tbl_flush(struct flow_table *flow_table) static u32 flow_hash(const struct sw_flow_key *key, const struct sw_flow_key_range *range) { - int key_start = range->start; - int key_end = range->end; - const u32 *hash_key = (const u32 *)((const u8 *)key + key_start); - int hash_u32s = (key_end - key_start) >> 2; - + const u32 *hash_key = (const u32 *)((const u8 *)key + range->start); /* Make sure number of hash bytes are multiple of u32. */ - BUILD_BUG_ON(sizeof(long) % sizeof(u32)); + int hash_u32s = range_n_bytes(range) >> 2; return jhash2(hash_key, hash_u32s, 0); } From patchwork Fri Oct 11 14:00:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1175223 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="upYmFXQa"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46qV9V48Vhz9sPK for ; Sat, 12 Oct 2019 01:06:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728651AbfJKOGF (ORCPT ); Fri, 11 Oct 2019 10:06:05 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:39142 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728111AbfJKOGE (ORCPT ); Fri, 11 Oct 2019 10:06:04 -0400 Received: by mail-pg1-f194.google.com with SMTP id e1so5870915pgj.6 for ; Fri, 11 Oct 2019 07:06:03 -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=m3vdikZrS9thcV45JQ2U1HH0Gpvc7JWA1zVvm4cc2XY=; b=upYmFXQayW+LxIr84BeJxCP7HlHmidcVMZzTB/YucXhucZLKLB9EvXjNrBNZNtgYNc KY0fvLZ62TWZv0h+WeUZhPPiO7vKqTG3WiZZ+3aLo9SUJEb2XQJbhmvu2lpjYZ99/2qt 5XxbRpeC20k6pZ7q12hjipxxOEqy+tx4N0SxX19osVJ5q2PGaNulQWHIVLZY+Ot3zr5a w6pp65NQM1REDSJVSFBTIAclWr90UsTatQczTuoXN6jETHxtu1wSlm274gU/2ANqNv9Z 8H0XWZOAIYGBP305mFje/5QcNJGUKsDmuR0q04ihmg3VnUmRe0gQxLhtK9CIoBfppGqH guNw== 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=m3vdikZrS9thcV45JQ2U1HH0Gpvc7JWA1zVvm4cc2XY=; b=J46oiXCW/je//R1BmJLYZM3Sdk1WdJd6cmWVnfoK0djKtN5LlVJ2vyE7E3FFRbVsJR VhWKHZHmUs8s5Qvvfynpy/pSrRruqYVHsjSFj5NqgI0WirwFQDBYIGJe7yiLM/g8xD+8 hjPmvi3ULnClGZrEFA1sDnfTJCjrFn3YaUuFcydE/V7kxppMTZbN8ryV+KdmvzL/k8cd liFhLoSBFOCR2vUuvZEGwqS1ukCs1Yxru2o+iwAjqPqEGizc2I6f22lpaNzW4mlAbRg6 TSh2InyyICSxy1SoI/8EkKPpKHU1rpT7mXDG1wzvnUsjRM01RnPlKM5P3TfBa/1BV+ae N/jg== X-Gm-Message-State: APjAAAUm/HJBjRPwqo9Y3vIfDjEZU8WBx58ygUIzGZ7QUV1mOkja/Yg5 oj2DZXAHtI6/m8pHJ8vtTac= X-Google-Smtp-Source: APXvYqz0sar5a485HKdfFcuHCXRjKWXvJRpQ2VLPuulBOwzji8+QVJErVjrXj5LCQYdgMzkultyt7g== X-Received: by 2002:a17:90a:ba83:: with SMTP id t3mr16244485pjr.139.1570802762211; Fri, 11 Oct 2019 07:06:02 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([219.143.130.165]) by smtp.gmail.com with ESMTPSA id p190sm11499392pfb.160.2019.10.11.07.05.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Oct 2019 07:06:01 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: gvrose8192@gmail.com, pshelar@ovn.org Cc: netdev@vger.kernel.org, dev@openvswitch.org, Tonghao Zhang Subject: [PATCH net-next v3 07/10] net: openvswitch: add likely in flow_lookup Date: Fri, 11 Oct 2019 22:00:44 +0800 Message-Id: <1570802447-8019-8-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tonghao Zhang The most case *index < ma->count, and flow-mask is not NULL. We add un/likely for performance. Signed-off-by: Tonghao Zhang --- net/openvswitch/flow_table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index 7aba5b4..1fc6be2 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -516,7 +516,7 @@ static struct sw_flow *flow_lookup(struct flow_table *tbl, struct sw_flow_mask *mask; int i; - if (*index < ma->max) { + if (likely(*index < ma->count)) { mask = rcu_dereference_ovsl(ma->masks[*index]); if (mask) { flow = masked_flow_lookup(ti, key, mask, n_mask_hit); @@ -525,13 +525,13 @@ static struct sw_flow *flow_lookup(struct flow_table *tbl, } } - for (i = 0; i < ma->max; i++) { + for (i = 0; i < ma->count; i++) { if (i == *index) continue; mask = rcu_dereference_ovsl(ma->masks[i]); - if (!mask) + if (unlikely(!mask)) break; flow = masked_flow_lookup(ti, key, mask, n_mask_hit); From patchwork Fri Oct 11 14:00:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1175224 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XNrlUpRl"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46qV9Z6RSWz9sPF for ; Sat, 12 Oct 2019 01:06:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728671AbfJKOGH (ORCPT ); Fri, 11 Oct 2019 10:06:07 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:39645 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728111AbfJKOGH (ORCPT ); Fri, 11 Oct 2019 10:06:07 -0400 Received: by mail-pl1-f194.google.com with SMTP id s17so4522655plp.6 for ; Fri, 11 Oct 2019 07:06:06 -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=zlncg77ADu0xAcw2vtCSP/bdmGQFS+owGP7y9buZ2oo=; b=XNrlUpRldNYuMPajsX1IuRPts03eEc70J/gKHCs7BLn8fTVGI7qtbLpyDQqafwYXcB ADBvUOn3ZnDg5fJxwX3ftDeUMNUTc+kJiEmMd0FCuAe22ZTA8ScImx4eTBZVwj8PWgtY 0FRBL5X+GaxsoiN2zoV/6U3WULKJdhH5WTDIv6mCFg2PMvOgOVf+hLCELZeRFKjr5ZLs 5MlFQwYQsKNvEyB6NAtht2tLGvwCvG2sJ+0bppNwE6ncXSed0t731NW5spXQD6J3trhn DjcI3uZqTv/zyfl62kbsGtkamjUU0Q3hpjaADtXprKSS6j3csWVpZOIFUVwMK+jJ26GZ KYdg== 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=zlncg77ADu0xAcw2vtCSP/bdmGQFS+owGP7y9buZ2oo=; b=JbHV79Xy+Ff36m/Ir11NL5kE/8w7j62PkTFVRXb1pc8tzajqDNSfGb9hb8DjU1638G dh3l+tTo9LT87piLSr+brldKGp25/6afFAmZlQRep2LpnBapUbrAxMo+wFONMYjkJ6kL wXFMqiUb028GiMvCGwdmJ1UFEblPXSD77/Bpe6NO7oamMgp2gooeT+N04fHjbTJJ7Ou9 M0hk7Xp1/QzvIBG5+zw6CL0sY8kvdUB/ihDE7yYRXQT1M1zBZm7wdDNirxTj6ldxLM99 6kNfllK3OgDbXbgVLdBk5pXECrGy5oEImt33CM+2K/8hh8E0EXFr/8RBYrr6n/1p66VZ D20A== X-Gm-Message-State: APjAAAUDIaXhztZjPexz1X05pUNI109HmeTczH0Zfvb+dzFObMFlLJr5 6FlJnA4B2yFSR15IPPW6gWI= X-Google-Smtp-Source: APXvYqxyCS4MO4gaF667vO/TXWgHomaVa0gQYRgh++EfEFtPjTNMZk73bdl44ZhY3R/oD842OapTCw== X-Received: by 2002:a17:902:8b83:: with SMTP id ay3mr15031786plb.269.1570802766522; Fri, 11 Oct 2019 07:06:06 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([219.143.130.165]) by smtp.gmail.com with ESMTPSA id p190sm11499392pfb.160.2019.10.11.07.06.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Oct 2019 07:06:05 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: gvrose8192@gmail.com, pshelar@ovn.org Cc: netdev@vger.kernel.org, dev@openvswitch.org, Tonghao Zhang Subject: [PATCH net-next v3 08/10] net: openvswitch: fix possible memleak on destroy flow-table Date: Fri, 11 Oct 2019 22:00:45 +0800 Message-Id: <1570802447-8019-9-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tonghao Zhang When we destroy the flow tables which may contain the flow_mask, so release the flow mask struct. Signed-off-by: Tonghao Zhang --- net/openvswitch/flow_table.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index 1fc6be2..0317f1c 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -293,6 +293,18 @@ static void table_instance_destroy(struct table_instance *ti, } } +static void tbl_mask_array_destroy(struct flow_table *tbl) +{ + struct mask_array *ma = ovsl_dereference(tbl->mask_array); + int i; + + /* Free the flow-mask and kfree_rcu the NULL is allowed. */ + for (i = 0; i < ma->count; i++) + kfree_rcu(ma->masks[i], rcu); + + kfree_rcu(tbl->mask_array, rcu); +} + /* No need for locking this function is called from RCU callback or * error path. */ @@ -302,7 +314,7 @@ void ovs_flow_tbl_destroy(struct flow_table *table) struct table_instance *ufid_ti = rcu_dereference_raw(table->ufid_ti); free_percpu(table->mask_cache); - kfree_rcu(table->mask_array, rcu); + tbl_mask_array_destroy(table); table_instance_destroy(ti, ufid_ti, false); } From patchwork Fri Oct 11 14:00:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1175225 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NG8DKB8x"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46qV9f43SYz9sPK for ; Sat, 12 Oct 2019 01:06:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728685AbfJKOGM (ORCPT ); Fri, 11 Oct 2019 10:06:12 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:33347 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728268AbfJKOGM (ORCPT ); Fri, 11 Oct 2019 10:06:12 -0400 Received: by mail-pl1-f194.google.com with SMTP id d22so4538936pls.0 for ; Fri, 11 Oct 2019 07:06:10 -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=5h+mm5b4p4hFAu72NQVMEV1XO70kNtCw7rgNvqIUP0k=; b=NG8DKB8x9sU1H1Lw0+HKzEl28Kkt7xEQkk/CoZ3xqTBarv2sR/+tt9rRJu1/1SLmPm Squ7sgtdwzTn/HyI2kTrS9wU6RrUeLk0fld9MDHW57b2TN3PbfHwB0fCl+FnaOhl81HU ONZ3AktdMaJNtBazgDrFyE1NK72Yk+bahH5pNTc0MlQz1Ggj7a5sY6uNOB6o173iDRj0 wxPYniSVPH7x16jO3YefeRo8G/zIaFReVy984ZM1PsyXcBdlpnRoWgiWaK1tBbF8IeAH d6xJE72cyhKnn/JpNfiMTvMcn27QVkENOSNWAW40BaPSLEsfiTSiSFf3qMaVrRMaXPoy EzPQ== 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=5h+mm5b4p4hFAu72NQVMEV1XO70kNtCw7rgNvqIUP0k=; b=nxuYbMvGgzPMWg72b9yUBgiWkKtgIzjwRUoAy1PcdhA54o77zkfZI1p49rq7rJQ2zm J0EH+CmgzsCmbmTrfZ69oaXH2GZuphBqNSghcIkXGzr/DoijU3jS6spTWPbcL0scE3O1 CsmWbeXQymtEwg22ZFhXoMtThUjkS3M70ZqYzrqy7Z9/5NtgNCDsE2jy8lIOHOJbsISz IpPTWVG4IDCkkDx6OvUJYTZZLL676d5Ptc50C4xJfOVCijGAyTSK0B18KY+jz33RaqF8 zTSmI2b+U5oQyII/6hqGWQzz9sDNAR/GiW09+8mNzTSpqESejBLBQfkrZM5VbBX5hoFt THDg== X-Gm-Message-State: APjAAAVZCIpNMovaLn/56peZ7m9SJAvqAU1YM6BvEff3uev6WAIdLEeb ONWcqDCnoRbuwAb2iRYqy8k= X-Google-Smtp-Source: APXvYqxTvrl7XI01KCj9dwb+AZJcpTR03XXmdXoUz/KXypbnT1OxhfpptDwbDJx570IZnh53ZkCc+g== X-Received: by 2002:a17:902:bc48:: with SMTP id t8mr14858034plz.255.1570802768878; Fri, 11 Oct 2019 07:06:08 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([219.143.130.165]) by smtp.gmail.com with ESMTPSA id p190sm11499392pfb.160.2019.10.11.07.06.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Oct 2019 07:06:08 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: gvrose8192@gmail.com, pshelar@ovn.org Cc: netdev@vger.kernel.org, dev@openvswitch.org, Tonghao Zhang , Paul Blakey Subject: [PATCH net-next v3 09/10] net: openvswitch: don't unlock mutex when changing the user_features fails Date: Fri, 11 Oct 2019 22:00:46 +0800 Message-Id: <1570802447-8019-10-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tonghao Zhang Unlocking of a not locked mutex is not allowed. Other kernel thread may be in critical section while we unlock it because of setting user_feature fail. Fixes: 95a7233c4 ("net: openvswitch: Set OvS recirc_id from tc chain index") Cc: Paul Blakey Signed-off-by: Tonghao Zhang --- net/openvswitch/datapath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 9fea7e1..aeb76e4 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -1657,6 +1657,7 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) ovs_dp_reset_user_features(skb, info); } + ovs_unlock(); goto err_destroy_meters; } @@ -1673,7 +1674,6 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) return 0; err_destroy_meters: - ovs_unlock(); ovs_meters_exit(dp); err_destroy_ports_array: kfree(dp->ports); From patchwork Fri Oct 11 14:00:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1175226 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sp1veJA+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46qV9g3zLtz9sPk for ; Sat, 12 Oct 2019 01:06:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728690AbfJKOGO (ORCPT ); Fri, 11 Oct 2019 10:06:14 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:46770 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728268AbfJKOGN (ORCPT ); Fri, 11 Oct 2019 10:06:13 -0400 Received: by mail-pf1-f196.google.com with SMTP id q5so6142297pfg.13 for ; Fri, 11 Oct 2019 07:06:13 -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=WeIHfo7ERuyeIDHUmtZRg3+/ZYCLq8h78OdWyljKhqg=; b=sp1veJA+mXD8JGD9wuDcfPdbNoc54EaJTHUdzNIa/j+swNL0Z0jc064GHyojLwkMJG BUAeCcLyPVhzjP/JHFRuOrctZSpIHt+/NIiO5tN5+vqyMBSJKEmZoc3w06yRYFuBnNXL p2YlvtvpRHWIB8f9H/WsQnw9Z0wnWYkb0nNa62V42MdBwvNtXI4Zqs81lNDhtoSOC/J4 w44WappuWIykvLd8XuTlJWFNo1CG1ej2AZm0A4w5e/QrAsgbEBlMz4JIZeqiLvqty1cO QjAP373+PIj7ZPavK+RRjkNGD9HC3WOdlA3D/liTnLVCdwWL7wvdIXrTY8vun9Z2PPsn lDdw== 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=WeIHfo7ERuyeIDHUmtZRg3+/ZYCLq8h78OdWyljKhqg=; b=nhYaKNyR4S41L8P5V3KSwm1tUo+3JEBk8bVvhRwHjBrViQia7JKS6mQuXCX2Z963P8 I0zB7hQi2onz03wujXLQ7h9+gO08wne4h6phfmhFwXNgsdByJ6ckz/hl7S1OjBsOTZvx Slime1scfygtiUjp/LPWJo8p7/sFzSmcWiIEH4Bmkcyei3XzI9moIG2cbUPLsjaEL3Li 8M0Ud3iM47/HjfylH0cAy967SRM5pMWayBZi73Vdtt5obrJanfb4Car6JmQEltb3UzgX WII4vkS9carxF6qk3xyNdfEBBlNffXwKJDo8LiW5jGz3VXcZ8qzkZbpe0kD2iCzdxpFy 8TUw== X-Gm-Message-State: APjAAAU+y28dTdwXXtqR2iwcM3wpCxQMjhIUEedA3j2HKhIoO3WWR9E4 n1UCEoAiWTOI0VCaDRqtMs5vJthX X-Google-Smtp-Source: APXvYqzb0RCBkbNmZFKkIs91ecTurctwtoqKptYLisEuGXhr3dxldX5GxwhuA2d0UbPm1f6oMSnDYQ== X-Received: by 2002:a17:90a:80ca:: with SMTP id k10mr17651402pjw.88.1570802771794; Fri, 11 Oct 2019 07:06:11 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([219.143.130.165]) by smtp.gmail.com with ESMTPSA id p190sm11499392pfb.160.2019.10.11.07.06.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Oct 2019 07:06:11 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: gvrose8192@gmail.com, pshelar@ovn.org Cc: netdev@vger.kernel.org, dev@openvswitch.org, Tonghao Zhang Subject: [PATCH net-next v3 10/10] net: openvswitch: simplify the ovs_dp_cmd_new Date: Fri, 11 Oct 2019 22:00:47 +0800 Message-Id: <1570802447-8019-11-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1570802447-8019-1-git-send-email-xiangxia.m.yue@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tonghao Zhang use the specified functions to init resource. Signed-off-by: Tonghao Zhang --- net/openvswitch/datapath.c | 60 +++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index aeb76e4..4d48e48 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -1576,6 +1576,31 @@ static int ovs_dp_change(struct datapath *dp, struct nlattr *a[]) return 0; } +static int ovs_dp_stats_init(struct datapath *dp) +{ + dp->stats_percpu = netdev_alloc_pcpu_stats(struct dp_stats_percpu); + if (!dp->stats_percpu) + return -ENOMEM; + + return 0; +} + +static int ovs_dp_vport_init(struct datapath *dp) +{ + int i; + + dp->ports = kmalloc_array(DP_VPORT_HASH_BUCKETS, + sizeof(struct hlist_head), + GFP_KERNEL); + if (!dp->ports) + return -ENOMEM; + + for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++) + INIT_HLIST_HEAD(&dp->ports[i]); + + return 0; +} + static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) { struct nlattr **a = info->attrs; @@ -1584,7 +1609,7 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) struct datapath *dp; struct vport *vport; struct ovs_net *ovs_net; - int err, i; + int err; err = -EINVAL; if (!a[OVS_DP_ATTR_NAME] || !a[OVS_DP_ATTR_UPCALL_PID]) @@ -1597,35 +1622,26 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) err = -ENOMEM; dp = kzalloc(sizeof(*dp), GFP_KERNEL); if (dp == NULL) - goto err_free_reply; + goto err_destroy_reply; ovs_dp_set_net(dp, sock_net(skb->sk)); /* Allocate table. */ err = ovs_flow_tbl_init(&dp->table); if (err) - goto err_free_dp; + goto err_destroy_dp; - dp->stats_percpu = netdev_alloc_pcpu_stats(struct dp_stats_percpu); - if (!dp->stats_percpu) { - err = -ENOMEM; + err = ovs_dp_stats_init(dp); + if (err) goto err_destroy_table; - } - dp->ports = kmalloc_array(DP_VPORT_HASH_BUCKETS, - sizeof(struct hlist_head), - GFP_KERNEL); - if (!dp->ports) { - err = -ENOMEM; - goto err_destroy_percpu; - } - - for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++) - INIT_HLIST_HEAD(&dp->ports[i]); + err = ovs_dp_vport_init(dp); + if (err) + goto err_destroy_stats; err = ovs_meters_init(dp); if (err) - goto err_destroy_ports_array; + goto err_destroy_ports; /* Set up our datapath device. */ parms.name = nla_data(a[OVS_DP_ATTR_NAME]); @@ -1675,15 +1691,15 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) err_destroy_meters: ovs_meters_exit(dp); -err_destroy_ports_array: +err_destroy_ports: kfree(dp->ports); -err_destroy_percpu: +err_destroy_stats: free_percpu(dp->stats_percpu); err_destroy_table: ovs_flow_tbl_destroy(&dp->table); -err_free_dp: +err_destroy_dp: kfree(dp); -err_free_reply: +err_destroy_reply: kfree_skb(reply); err: return err;