From patchwork Sat Dec 26 09:31:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 561095 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5ED29140CA5 for ; Sat, 26 Dec 2015 20:33:51 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=g2dwZXSH; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751583AbbLZJcq (ORCPT ); Sat, 26 Dec 2015 04:32:46 -0500 Received: from mail-pf0-f181.google.com ([209.85.192.181]:33392 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751423AbbLZJbw (ORCPT ); Sat, 26 Dec 2015 04:31:52 -0500 Received: by mail-pf0-f181.google.com with SMTP id q63so53273204pfb.0; Sat, 26 Dec 2015 01:31:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PiM5LC8sex8XAsToiQUtArpXBabA50OK5AWM8ZYxobE=; b=g2dwZXSHXvJbfG2ZwF+uA5n+WbsauYg64+sWoNisIsjT3RWUtRuN4IcUt9EgqCJT0Z AmJu5vKDUDoyiFXRXz+SN0g14MW5qhFCbjXMhFzUlNQ/JtRev9qDWxQbZFvpE23g450d 27k55vMdIWATexyRDRAPxF4Xz96sDHbSgTG9nopuyjLiSlTFU5MTFmSsdzQBJh658pn+ E8UjYsPEe9PPZHgqlWzKH1mE8l1H+ZLM6TcxtVsqZCkufA9XpsJNJhLdgcWsQOHCpqpO G6ecs3+0gdjjiF1tcneMZfMY9zbyHr4PjWjsyvuI5O3TXkkGzp00BpxL0YcvsbJhFjkr BgNw== X-Received: by 10.98.87.144 with SMTP id i16mr40481098pfj.118.1451122311761; Sat, 26 Dec 2015 01:31:51 -0800 (PST) Received: from localhost (li814-15.members.linode.com. [106.185.52.15]) by smtp.gmail.com with ESMTPSA id e14sm69112954pap.24.2015.12.26.01.31.50 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Sat, 26 Dec 2015 01:31:51 -0800 (PST) From: Ming Lei To: linux-kernel@vger.kernel.org, Alexei Starovoitov Cc: "David S. Miller" , netdev@vger.kernel.org, Ming Lei Subject: [PATCH 2/3] bpf: hash: move select_bucket() out of htab's spinlock Date: Sat, 26 Dec 2015 17:31:33 +0800 Message-Id: <1451122294-16524-3-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1451122294-16524-1-git-send-email-tom.leiming@gmail.com> References: <1451122294-16524-1-git-send-email-tom.leiming@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The spinlock is just used for protecting the per-bucket hlist, so it isn't needed for selecting bucket. Signed-off-by: Ming Lei Acked-by: Daniel Borkmann --- kernel/bpf/hashtab.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c index 2615388..d857fcb 100644 --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c @@ -248,12 +248,11 @@ static int htab_map_update_elem(struct bpf_map *map, void *key, void *value, memcpy(l_new->key + round_up(key_size, 8), value, map->value_size); l_new->hash = htab_map_hash(l_new->key, key_size); + head = select_bucket(htab, l_new->hash); /* bpf_map_update_elem() can be called in_irq() */ raw_spin_lock_irqsave(&htab->lock, flags); - head = select_bucket(htab, l_new->hash); - l_old = lookup_elem_raw(head, l_new->hash, key, key_size); if (!l_old && unlikely(atomic_read(&htab->count) >= map->max_entries)) { @@ -310,11 +309,10 @@ static int htab_map_delete_elem(struct bpf_map *map, void *key) key_size = map->key_size; hash = htab_map_hash(key, key_size); + head = select_bucket(htab, hash); raw_spin_lock_irqsave(&htab->lock, flags); - head = select_bucket(htab, hash); - l = lookup_elem_raw(head, hash, key, key_size); if (l) {