From patchwork Fri Nov 20 09:24:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 1403540 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=linutronix.de header.i=@linutronix.de header.a=rsa-sha256 header.s=2020 header.b=Yi6nX2m7; dkim=pass header.d=linutronix.de header.i=@linutronix.de header.a=ed25519-sha256 header.s=2020e header.b=0cT/CpDh; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Ccrjd6KRdz9sTc for ; Fri, 20 Nov 2020 20:24:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727284AbgKTJYc (ORCPT ); Fri, 20 Nov 2020 04:24:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725801AbgKTJYa (ORCPT ); Fri, 20 Nov 2020 04:24:30 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5D0EC0613CF; Fri, 20 Nov 2020 01:24:30 -0800 (PST) From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1605864268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=evkJle6KQ9RlDyKInI5DtbsECAQK8KNp1Yio1JQMV00=; b=Yi6nX2m7fbZRrygQjLRv5tbqGP81pIzZWcXojuCrSe17eOzUdkoNkBNW4kUD7PZkXwS/Vs agg1szSQdGlMnQx/lwZueN+BUciAU8epGOyUcwhstybg9obJgR7GUJz/pKeCI/hRn4+of6 IQaNhIPwEQbEFgVoHGrIusCfQMak7o6Mt1Gr5gMMN28FUxH1hgZHgc2Oh4RtJ6omnMT8o4 Gnr+O796UplowgglDamd9lzsdvtf0QaXZtB230sKhXgWzDJmdDnaVn3jpdCaog5b/6t8CN GA5zH0geW2+6MSv9bXeJ9m5vaw739sQ0PbY4iW2IvQ639XLBHxmVPinssBRpwA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1605864268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=evkJle6KQ9RlDyKInI5DtbsECAQK8KNp1Yio1JQMV00=; b=0cT/CpDhQeZhbJmJTE8TevQNJ5tx/nGAYTShn7Z0lJbaM4l2FjMxiyxwa46NqxkAjTJ9B2 B3Klg8UZLVejiDAQ== To: linux-ide@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "David S. Miller" , Jens Axboe , Andrew Morton , tglx@linutronix.de, Sebastian Andrzej Siewior Subject: [PATCH v2 1/2] ide/Falcon: Remove in_interrupt() usage. Date: Fri, 20 Nov 2020 10:24:20 +0100 Message-Id: <20201120092421.1023428-2-bigeasy@linutronix.de> In-Reply-To: <20201120092421.1023428-1-bigeasy@linutronix.de> References: <20201120092421.1023428-1-bigeasy@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org falconide_get_lock() is called by ide_lock_host() and its caller (ide_issue_rq()) has already a might_sleep() check. stdma_lock() has wait_event() which also has a might_sleep() check. Remove the in_interrupt() check. Cc: "David S. Miller" Cc: linux-ide@vger.kernel.org Signed-off-by: Sebastian Andrzej Siewior Acked-by: Jens Axboe --- drivers/ide/falconide.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.c index dbeb2605e5f6e..77af4c1a3f38c 100644 --- a/drivers/ide/falconide.c +++ b/drivers/ide/falconide.c @@ -51,8 +51,6 @@ static void falconide_release_lock(void) static void falconide_get_lock(irq_handler_t handler, void *data) { if (falconide_intr_lock == 0) { - if (in_interrupt() > 0) - panic("Falcon IDE hasn't ST-DMA lock in interrupt"); stdma_lock(handler, data); falconide_intr_lock = 1; } From patchwork Fri Nov 20 09:24:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 1403539 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=linutronix.de header.i=@linutronix.de header.a=rsa-sha256 header.s=2020 header.b=QdQkoXLd; dkim=pass header.d=linutronix.de header.i=@linutronix.de header.a=ed25519-sha256 header.s=2020e header.b=BLdvAgn5; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Ccrjd2Jsjz9sTL for ; Fri, 20 Nov 2020 20:24:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726445AbgKTJYc (ORCPT ); Fri, 20 Nov 2020 04:24:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727206AbgKTJYa (ORCPT ); Fri, 20 Nov 2020 04:24:30 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADD98C0617A7; Fri, 20 Nov 2020 01:24:30 -0800 (PST) From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1605864269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UZK1ZQAJK0YFuKDRqLDBqeq+cdk+V8TA2LiKuEK4hA0=; b=QdQkoXLdDw+CnWlsb27giYSPgEhQFYBU94hVTEYcpN0n0dmiidPjZoWh63+U2VzjCLqHzQ T0DZsru432UHNUEEUcQ3k4d4IVDEZezwL2tO6L1sRZRb/YX9BXW2A9X7pCuMbUYA1zm3gg 9ydjex1VHwCWLW41kt+UqdMVdug1YhZDAetRAI0zLh/oyx1+1mcwEFJDsJGhIDEia4P6DF d/vKLu3H1gCGirmVF6+eFS0l5LAfWyTlMcmt0gEIaDAIWIQeFku3uCj685VAF3TAZ+iCpT yAwu7W+JIpEEHWEZTHb5hjxjQkV77tGO7nghEJtl6jVKEUUsglO0ps83SrGOTw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1605864269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UZK1ZQAJK0YFuKDRqLDBqeq+cdk+V8TA2LiKuEK4hA0=; b=BLdvAgn5pWIEsv2E4BTGgH03VHGCL2Cvir0i273ARp5LtnySylOtzxGwCxWBjqk5Umme6J +qZiuTdqJ3iczMDQ== To: linux-ide@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "David S. Miller" , Jens Axboe , Andrew Morton , tglx@linutronix.de, Sebastian Andrzej Siewior Subject: [PATCH v2 2/2] ide: Remove BUG_ON(in_interrupt() || irqs_disabled()) from ide_unregister() Date: Fri, 20 Nov 2020 10:24:21 +0100 Message-Id: <20201120092421.1023428-3-bigeasy@linutronix.de> In-Reply-To: <20201120092421.1023428-1-bigeasy@linutronix.de> References: <20201120092421.1023428-1-bigeasy@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Both BUG_ON() were introduced in commit 4015c949fb465 ("[PATCH] update ide core") when ide_unregister() was extended with semaphore based locking. Both checks won't complain about disabled preemption which is also wrong. The might_sleep() in today's mutex_lock() will complain about the missuses. Remove the BUG_ON() statements. Cc: "David S. Miller" Cc: linux-ide@vger.kernel.org Signed-off-by: Sebastian Andrzej Siewior Acked-by: Jens Axboe --- drivers/ide/ide-probe.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 1c1567bb51942..aefd74c0d8628 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -1539,9 +1539,6 @@ EXPORT_SYMBOL_GPL(ide_port_unregister_devices); static void ide_unregister(ide_hwif_t *hwif) { - BUG_ON(in_interrupt()); - BUG_ON(irqs_disabled()); - mutex_lock(&ide_cfg_mtx); if (hwif->present) {