From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751698AbdKVVLG (ORCPT ); Wed, 22 Nov 2017 16:11:06 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:39306 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751876AbdKVVIU (ORCPT ); Wed, 22 Nov 2017 16:08:20 -0500 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Matthew Wilcox Subject: [PATCH 55/62] firewire: Remove call to idr_preload Date: Wed, 22 Nov 2017 13:07:32 -0800 Message-Id: <20171122210739.29916-56-willy@infradead.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171122210739.29916-1-willy@infradead.org> References: <20171122210739.29916-1-willy@infradead.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthew Wilcox core-cdev uses a spinlock to protect several elements, including the IDR. Rather than reusing the IDR's spinlock for all of this, preallocate the necessary memory by allocating a NULL pointer and then replace it with the resource pointer once we have the spinlock. Signed-off-by: Matthew Wilcox --- drivers/firewire/core-cdev.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index a301fcf46e88..52c22c39744e 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c @@ -486,28 +486,24 @@ static int ioctl_get_info(struct client *client, union ioctl_arg *arg) static int add_client_resource(struct client *client, struct client_resource *resource, gfp_t gfp_mask) { - bool preload = gfpflags_allow_blocking(gfp_mask); unsigned long flags; int ret; - if (preload) - idr_preload(gfp_mask); - spin_lock_irqsave(&client->lock, flags); + ret = idr_alloc(&client->resource_idr, NULL, 0, 0, gfp_mask); + if (ret < 0) + return ret; - if (client->in_shutdown) + spin_lock_irqsave(&client->lock, flags); + if (client->in_shutdown) { + idr_remove(&client->resource_idr, ret); ret = -ECANCELED; - else - ret = idr_alloc(&client->resource_idr, resource, 0, 0, - GFP_NOWAIT); - if (ret >= 0) { + } else { + idr_replace(&client->resource_idr, resource, ret); resource->handle = ret; client_get(client); schedule_if_iso_resource(resource); } - spin_unlock_irqrestore(&client->lock, flags); - if (preload) - idr_preload_end(); return ret < 0 ? ret : 0; } -- 2.15.0