From patchwork Tue Dec 15 11:21:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 556928 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 5B2011402D6 for ; Tue, 15 Dec 2015 22:22: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=E2pvZvQH; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965153AbbLOLVi (ORCPT ); Tue, 15 Dec 2015 06:21:38 -0500 Received: from mail-qg0-f52.google.com ([209.85.192.52]:33731 "EHLO mail-qg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965147AbbLOLVf (ORCPT ); Tue, 15 Dec 2015 06:21:35 -0500 Received: by mail-qg0-f52.google.com with SMTP id v16so3700415qge.0; Tue, 15 Dec 2015 03:21:35 -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=E2pvZvQHZLPOrZKMtkIA29OVozfb0XDcF/Bzvyfpd7ddkcf6TngWzhUHawZLTC1e28 p6z3bF0rW+7rpWAQkFBPNVh+0bfM1holJqMwuXbejGYxc9tZwLW2N0aYdqYTJ43DSBzw krcRle4NYzKmlx/lTxbf2qVJqGWkEY/BefO96A779qUzeNaR0oBM9/deSZiTeA7pSN1R +XB+P6x7yNgKphHR8miYtlRahgYkn/mVY5do76vW26LlkgJ3UgyNFkIwCcgPwU+Z5K/F zUPyiRzkfID9dpujHtu9oNLOl/VB7wx4IharDXpiEt0TzA9urWIuikLwEe2OKrpStieZ bX2w== X-Received: by 10.140.219.136 with SMTP id p130mr43120078qhb.80.1450178495084; Tue, 15 Dec 2015 03:21:35 -0800 (PST) Received: from localhost (56.34.213.162.lcy-01.canonistack.canonical.com. [162.213.34.56]) by smtp.gmail.com with ESMTPSA id 81sm277138qhx.15.2015.12.15.03.21.33 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 15 Dec 2015 03:21:33 -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 3/6] bpf: hash: move select_bucket() out of htab's spinlock Date: Tue, 15 Dec 2015 19:21:01 +0800 Message-Id: <1450178464-27721-4-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450178464-27721-1-git-send-email-tom.leiming@gmail.com> References: <1450178464-27721-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 --- 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) {