From patchwork Wed Jan 3 02:26:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bradley Bolen X-Patchwork-Id: 854844 X-Patchwork-Delegate: richard@nod.at Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dsP/NQ7J"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hz2BXX7r"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBFDf5bwpz9s7c for ; Wed, 3 Jan 2018 13:26:42 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=2npGuZG/TpU37CMEWhgH21otlycEERbApwJ/3sVhOC4=; b=dsP /NQ7JZy2UzGtos2Ing4uaaOGoirLX9T0eh1F1h4jxi5Q1Cto27I+o4jWqGbEwu9oRx49NU6ajJV1k +rz/8ZwsD5fvURnN4SorY/rcLzJ8/YlafjIqFwd5Z4XfCMPmVDfBy1wXHrfOrEXkdR7QmvMRLGhrQ SaCn7OJtlIdj2V2ngSVDshJCflgyjydQTM1CF9aSgb/JMiQ0wTvxF0NzyoClN8ldvVXvvzUVvFg2A xM9EKmwjT+MXZFlgsXNiQJNpg/ba+D/cwYmWpBCLt7E9na/RJzznDsOPMLaudANuei+uSWyNS8hj7 tSfAyKrWip+KpsFr1ZEwVGGkQHQmI1w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eWYlG-00048N-1Q; Wed, 03 Jan 2018 02:26:34 +0000 Received: from mail-yb0-x244.google.com ([2607:f8b0:4002:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eWYlB-00047V-Pw for linux-mtd@lists.infradead.org; Wed, 03 Jan 2018 02:26:31 +0000 Received: by mail-yb0-x244.google.com with SMTP id q3so114363ybg.9 for ; Tue, 02 Jan 2018 18:26:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=p/jhFE8ngcygLHv75/5CqK2mrcymdo4G24hcmAqS9gE=; b=hz2BXX7rVovPBafPwnHv/cvxhEfcI3sXcyU2NQrwfsbYALZ/lNMJMCRmHTjlA70Fcy u3weDIqYblBUZslTF2GmgtayU0jMJ58arGAm0XSc6vsOepa52y6v1nEzJZhiYS2Ei9iU kIu0P03NvEmT9fwXdiWKVuct1BBtbv2FjI5Tfeue/O7flz2g2aaxurEXEpmzf4/WS8Fb j3K2du/jtGhqvK1LeJvfvP4jkKzaE26cViTGufgisZCBj2XQr8ucaPv4IgNmgI8/Y6wT twvmtcU+Lt0u0ngvnSQc1qSHEyy0wrVDh+HngmeYuEUQlnRAsL8DN1B3OeScrqNIW9TH ypVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=p/jhFE8ngcygLHv75/5CqK2mrcymdo4G24hcmAqS9gE=; b=jSA+Kp2Gq2/sxftZ7tDEiJcf4t6KuRgU5AVg8yeg6cLNsi805qMDpvtGsog2sQdsMV /FIIn8p6XmyU9vCYmgQTiAEc2YgfqpqkpRy94UMe2Rs+ysTYNZ44Y7cunqwKcugpuVZw kRHUIoAU/Km5YcZATk6Lr4jG2l2qarBkbCt6/CaGCvJ7EZYWwEloWTd/2su8JOIis21u RzP2vXcruwE07XNHFbIeGf/ZJsitOAE9cv+4IDNrLoI9lA9i4GD+rZH/XUb7BgrLBf6Z V6c5oX42xVPJSh8hN4bEG6Eea2Vj8YzQlvk0SXIAFcTa1Xv9y+GAqtcubhg62IpU7/Uo 46hw== X-Gm-Message-State: AKGB3mIAaemwDQR0lBdz5boUJn0GO/f0ZEgWdPntnTcwSEg1mIkpsWwA SgZ+AQSxRraPsZgDYEIu/ABP4eaK X-Google-Smtp-Source: ACJfBot0LyANgjXLkaXWzmJUUjX6Ot4xoDp41nvp+oKqsPDArjiHSMuGP8uoCeIFRzErlFAmPObNAQ== X-Received: by 10.37.134.129 with SMTP id z1mr47747ybk.46.1514946378002; Tue, 02 Jan 2018 18:26:18 -0800 (PST) Received: from localhost.localdomain (h24.183.89.75.dynamic.ip.windstream.net. [75.89.183.24]) by smtp.gmail.com with ESMTPSA id i68sm8455ywg.62.2018.01.02.18.26.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Jan 2018 18:26:17 -0800 (PST) From: Bradley Bolen To: linux-mtd@lists.infradead.org Subject: [PATCH] UBI: block: Must use a mutex when using idr_alloc/idr_remove Date: Tue, 2 Jan 2018 21:26:09 -0500 Message-Id: <1514946369-3674-1-git-send-email-bradleybolen@gmail.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180102_182629_954100_6BDD778D X-CRM114-Status: UNSURE ( 8.53 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:4002:c09:0:0:0:244 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (bradleybolen[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: boris.brezillon@free-electrons.com, dedekind1@gmail.com, richard@nod.at, marek.vasut@gmail.com, Bradley Bolen , cyrille.pitchen@wedev4u.fr, computersforpeace@gmail.com, dwmw2@infradead.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This fixes a race condition where running ubiblock on multiple volumes simultaneously produces the following splat. kernel BUG at kernel-source/fs/sysfs/group.c:113! Internal error: Oops - BUG: 0 [#1] PREEMPT SMP ARM [] (internal_create_group) from [] (sysfs_create_group+0x20/0x24) [] (sysfs_create_group) from [] (blk_trace_init_sysfs+0x18/0x20) [] (blk_trace_init_sysfs) from [] (blk_register_queue+0x6c/0x154) [] (blk_register_queue) from [] (device_add_disk+0x2c8/0x450) [] (device_add_disk) from [] (ubiblock_create+0x254/0x2e4) [] (ubiblock_create) from [] (vol_cdev_ioctl+0x3e0/0x564) [] (vol_cdev_ioctl) from [] (vfs_ioctl+0x30/0x44) [] (vfs_ioctl) from [] (do_vfs_ioctl+0x694/0x798) [] (do_vfs_ioctl) from [] (SyS_ioctl+0x44/0x6c) [] (SyS_ioctl) from [] (ret_fast_syscall+0x0/0x34) Signed-off-by: Bradley Bolen Reviewed-by: Boris Brezillon --- drivers/mtd/ubi/block.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c index b210fdb..1c12370 100644 --- a/drivers/mtd/ubi/block.c +++ b/drivers/mtd/ubi/block.c @@ -390,7 +390,9 @@ int ubiblock_create(struct ubi_volume_info *vi) gd->fops = &ubiblock_ops; gd->major = ubiblock_major; + mutex_lock(&devices_mutex); gd->first_minor = idr_alloc(&ubiblock_minor_idr, dev, 0, 0, GFP_KERNEL); + mutex_unlock(&devices_mutex); if (gd->first_minor < 0) { dev_err(disk_to_dev(gd), "block: dynamic minor allocation failed"); @@ -452,7 +454,9 @@ int ubiblock_create(struct ubi_volume_info *vi) out_free_tags: blk_mq_free_tag_set(&dev->tag_set); out_remove_minor: + mutex_lock(&devices_mutex); idr_remove(&ubiblock_minor_idr, gd->first_minor); + mutex_unlock(&devices_mutex); out_put_disk: put_disk(dev->gd); out_free_dev: @@ -471,7 +475,9 @@ static void ubiblock_cleanup(struct ubiblock *dev) blk_cleanup_queue(dev->rq); blk_mq_free_tag_set(&dev->tag_set); dev_info(disk_to_dev(dev->gd), "released"); + mutex_lock(&devices_mutex); idr_remove(&ubiblock_minor_idr, dev->gd->first_minor); + mutex_unlock(&devices_mutex); put_disk(dev->gd); }