From patchwork Mon Dec 28 12:55:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 561295 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 53AD0140C5D for ; Mon, 28 Dec 2015 23:57:08 +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=vJzqlNoI; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752529AbbL1M4v (ORCPT ); Mon, 28 Dec 2015 07:56:51 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:33321 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752336AbbL1M4Q (ORCPT ); Mon, 28 Dec 2015 07:56:16 -0500 Received: by mail-pa0-f46.google.com with SMTP id cy9so109992502pac.0; Mon, 28 Dec 2015 04:56:16 -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=jvnlO94KP3u5xltZmrYAEMkFPhO+DXOosGba3LzmN7E=; b=vJzqlNoIoUCxvBaEH3IN6FxFxvSC34HJ4LohWUqnHF3yYInIirmkRvBSilJLf1GvZH B1CjgK/20RMIdSkKdfwSNbXSA6Xvn9yyQxyMMr+NK1cwO1qHu2f91B3jS2N4bPdTRGhl XIGPmwPowo745GKlonpBd9XdfwGd6jjNS0jWXuXDcB49rpnG94d0OcDSCuPQ4GEgHw/4 lPCoWTY3Fp+ycdUFkI34EwG2PWyJjA0jNZ3jcweaf26rdT56/HYk8O4GajYaFq86+rJk IFFWpTshlTdxGc7oL7HNN8q/YnW1NCekszl/Jr2Razy0m0aSziO33WW8vygkd7rBwHzi /Qig== X-Received: by 10.66.234.226 with SMTP id uh2mr76450711pac.6.1451307375772; Mon, 28 Dec 2015 04:56:15 -0800 (PST) Received: from localhost (li814-15.members.linode.com. [106.185.52.15]) by smtp.gmail.com with ESMTPSA id y84sm35743054pfi.93.2015.12.28.04.56.14 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 28 Dec 2015 04:56:15 -0800 (PST) From: Ming Lei To: linux-kernel@vger.kernel.org, Alexei Starovoitov Cc: "David S. Miller" , netdev@vger.kernel.org, Daniel Borkmann , Ming Lei Subject: [PATCH v1 2/3] bpf: hash: move select_bucket() out of htab's spinlock Date: Mon, 28 Dec 2015 20:55:25 +0800 Message-Id: <1451307326-12807-3-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1451307326-12807-1-git-send-email-tom.leiming@gmail.com> References: <1451307326-12807-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. Acked-by: Daniel Borkmann Signed-off-by: Ming Lei --- 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) {