From patchwork Sun Feb 12 09:26:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 55888 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1826246wrn; Sun, 12 Feb 2023 01:08:28 -0800 (PST) X-Google-Smtp-Source: AK7set+HMuAxdtfXnqsqKOclRMxUAgqpPQYYAA3t9oRZAkbaMDbFvnP+HWpIU34BPTXTrf7x9ouP X-Received: by 2002:a05:6a20:440f:b0:bf:58d1:ce94 with SMTP id ce15-20020a056a20440f00b000bf58d1ce94mr14637148pzb.19.1676192908510; Sun, 12 Feb 2023 01:08:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676192908; cv=none; d=google.com; s=arc-20160816; b=jkvJ8aE3P7qq3gtDHFv8DMeW8YeE/fbxhseK/u67uH+tC0LVmbwSKWuhloyapYJNG5 h0qSaezzpPiwKJj+PBblEl0zzaWK6GxUi7NF/3cSPRZGe+P3aRmNvXtfUUx7dOWLKxo9 +2oqD2/aofYC87/gNOF9GbPE82Sm7suTtbN4cfZVnrtFvOxABNh/izgFWRv+I9pMhXx/ EGkaAh3aUeD+Vi0Gr2sU7WrS19mBjUvY/O152rN92Q1ChRRFlLZdh9FVjmKsiVRG+iwx oPdqEWnbDp8OKnrrD4qoHymPAJltCpl3dLDAFyL1MffctzETvllzBhBeMqRlJWB/l3RE eaGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=qVfsmGo54wCqIz6Tfx/jZZb1BoX7A7QNXgeI7dXwRXM=; b=ssM+BZkjPZYVl0WVyufeFANEGLmOUcab+hhLzR3zC/000Om80cMxvFrH0/kAS3ehJ8 w6oJ3caAftlYvTQv8B3K5yGztIHFy4t8OAxB2cAS3KbFLql8uLFbBc2d5C0IrAaTlgbS bRLI6ivu9dsT3zYoBVx8aWRCxv9W2hDWNHpmz3h7Xry6n9sY9wY34p7MvUomcaCkKjeW O1jFjppcnVXXA1+5DGF/AmmsReFCigr20sBTIrMQWj8/28HaYW3JYHD0nzEPdSH0YBO8 iSQD9a08jdXUGOALPCSqKi5OmME5IW/Q3PIEaSTQTkVBF4jp//ksBZWLbRlQi+UllyiP XPdw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q203-20020a632ad4000000b004fb838def15si2905553pgq.389.2023.02.12.01.08.16; Sun, 12 Feb 2023 01:08:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229615AbjBLJDP (ORCPT + 99 others); Sun, 12 Feb 2023 04:03:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229553AbjBLJDG (ORCPT ); Sun, 12 Feb 2023 04:03:06 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2FE41285E; Sun, 12 Feb 2023 01:03:02 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PF1hd1FHvz4f3jLp; Sun, 12 Feb 2023 17:02:57 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP3 (Coremail) with SMTP id _Ch0CgCHgR9Bq+hjpfqtDA--.47546S5; Sun, 12 Feb 2023 17:02:59 +0800 (CST) From: Yu Kuai To: hch@infradead.org, jack@suse.cz, axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH -next RFC 1/3] block: Revert "block: Do not reread partition table on exclusively open device" Date: Sun, 12 Feb 2023 17:26:39 +0800 Message-Id: <20230212092641.2394146-2-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230212092641.2394146-1-yukuai1@huaweicloud.com> References: <20230212092641.2394146-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: _Ch0CgCHgR9Bq+hjpfqtDA--.47546S5 X-Coremail-Antispam: 1UD129KBjvJXoWxWr13GF15KFyUCw4UAFykGrg_yoWrXw15pF y5AFZ0yrWUGrZ2gFy0ya1kZw1ftwsrt3yxArWxG34SqF9xAr9FkF9Yk3yUZryrJrZ7XF47 Zr15Xry0kFyxAFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9v14x267AKxVW5JVWrJwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jr4l82xGYIkIc2 x26xkF7I0E14v26r1I6r4UM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UM2 8EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JV W8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbec_DUUUUU== X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757615655243833074?= X-GMAIL-MSGID: =?utf-8?q?1757615655243833074?= From: Yu Kuai This reverts commit 36369f46e91785688a5f39d7a5590e3f07981316. This patch can't fix the problem in a corner case that device can be opened exclusively after the checking and before blkdev_get_by_dev(). We'll use a new solution to fix the problem in following patches, and the new solution doesn't need to change apis. Signed-off-by: Yu Kuai --- block/blk.h | 2 +- block/genhd.c | 7 ++----- block/ioctl.c | 13 ++++++------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/block/blk.h b/block/blk.h index 8900001946c7..a8ac9803fcb3 100644 --- a/block/blk.h +++ b/block/blk.h @@ -426,7 +426,7 @@ int bio_add_hw_page(struct request_queue *q, struct bio *bio, struct request_queue *blk_alloc_queue(int node_id); -int disk_scan_partitions(struct gendisk *disk, fmode_t mode, void *owner); +int disk_scan_partitions(struct gendisk *disk, fmode_t mode); int disk_alloc_events(struct gendisk *disk); void disk_add_events(struct gendisk *disk); diff --git a/block/genhd.c b/block/genhd.c index 52d71a94a809..075d8da284f5 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -356,7 +356,7 @@ void disk_uevent(struct gendisk *disk, enum kobject_action action) } EXPORT_SYMBOL_GPL(disk_uevent); -int disk_scan_partitions(struct gendisk *disk, fmode_t mode, void *owner) +int disk_scan_partitions(struct gendisk *disk, fmode_t mode) { struct block_device *bdev; @@ -366,9 +366,6 @@ int disk_scan_partitions(struct gendisk *disk, fmode_t mode, void *owner) return -EINVAL; if (disk->open_partitions) return -EBUSY; - /* Someone else has bdev exclusively open? */ - if (disk->part0->bd_holder && disk->part0->bd_holder != owner) - return -EBUSY; set_bit(GD_NEED_PART_SCAN, &disk->state); bdev = blkdev_get_by_dev(disk_devt(disk), mode, NULL); @@ -498,7 +495,7 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, bdev_add(disk->part0, ddev->devt); if (get_capacity(disk)) - disk_scan_partitions(disk, FMODE_READ, NULL); + disk_scan_partitions(disk, FMODE_READ); /* * Announce the disk and partitions after all partitions are diff --git a/block/ioctl.c b/block/ioctl.c index 96617512982e..6dd49d877584 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -467,10 +467,10 @@ static int blkdev_bszset(struct block_device *bdev, fmode_t mode, * user space. Note the separate arg/argp parameters that are needed * to deal with the compat_ptr() conversion. */ -static int blkdev_common_ioctl(struct file *file, fmode_t mode, unsigned cmd, - unsigned long arg, void __user *argp) +static int blkdev_common_ioctl(struct block_device *bdev, fmode_t mode, + unsigned int cmd, unsigned long arg, + void __user *argp) { - struct block_device *bdev = I_BDEV(file->f_mapping->host); unsigned int max_sectors; switch (cmd) { @@ -528,8 +528,7 @@ static int blkdev_common_ioctl(struct file *file, fmode_t mode, unsigned cmd, return -EACCES; if (bdev_is_partition(bdev)) return -EINVAL; - return disk_scan_partitions(bdev->bd_disk, mode & ~FMODE_EXCL, - file); + return disk_scan_partitions(bdev->bd_disk, mode & ~FMODE_EXCL); case BLKTRACESTART: case BLKTRACESTOP: case BLKTRACETEARDOWN: @@ -607,7 +606,7 @@ long blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) break; } - ret = blkdev_common_ioctl(file, mode, cmd, arg, argp); + ret = blkdev_common_ioctl(bdev, mode, cmd, arg, argp); if (ret != -ENOIOCTLCMD) return ret; @@ -676,7 +675,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) break; } - ret = blkdev_common_ioctl(file, mode, cmd, arg, argp); + ret = blkdev_common_ioctl(bdev, mode, cmd, arg, argp); if (ret == -ENOIOCTLCMD && disk->fops->compat_ioctl) ret = disk->fops->compat_ioctl(bdev, mode, cmd, arg); From patchwork Sun Feb 12 09:26:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 55890 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1842246wrn; Sun, 12 Feb 2023 02:05:55 -0800 (PST) X-Google-Smtp-Source: AK7set9gm4lAWS4UWaffA/ajsRw8YB/zLv91qtOwt2iuw0w69TpQ8QgiimqK3Rn/qS/a1CFnThRo X-Received: by 2002:a17:90a:5:b0:233:b416:7f85 with SMTP id 5-20020a17090a000500b00233b4167f85mr7587546pja.2.1676196355509; Sun, 12 Feb 2023 02:05:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676196355; cv=none; d=google.com; s=arc-20160816; b=qH2Jl46jhF01JzRnxDDTdyIT/UcJw6J6eWwrs92YgG0tm/eR19WB94T+df9vEOUv2h gmNv0RSqRFwM5l/kc98g5C6ecZbCRk2Atk9VL9LZ/sB+k/fpZGsf7bxpcKH41056Pkiq iMtDW3Bl+Aki8S56FH07wVmzMyny83f4Ah4YhN0R9GTGpUMiUeVBGV9JBjH0+j9PPd8V WgabCYGplSErJ5JuIlaXvV8X2E8usNsXCXYgAys/O0WeY5raJPppc7T+O9apSalmbtnB rQa1XtE6TSt/otEyc3LuLdJwY+9IUkwa3EWvoWPgLe/Pt648C7aFoouewwnce4jiZYko ew7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=V3icbjzL6oEf2gpk7/Lo2h1oJbJBgV3M/rGH4aaooPg=; b=DE1bJGEeBRhKWasagoX2xxXXjXdcqrF6apti8v0/R0EA05xmrplX/NOrxN5svdyvj8 ikH1h/vVW5AzeDaJ7SVJqYMe8QgezaCFnmaxLRBg8SvwT6fP3JvtA+AIDAGiY8TCIN/w XtL5LYQMiJTlLQVVOubyDY1Lmw8DGHd6g5K9/Y4bM7tQR2xkJSxrR5/kQM/19PEilHrg YREQuT+iasDfhW60OkyYhsC77R/vjWoQTR/sZNN6/tfxxAnBZz89Y/iwbRNjB0XDBRVf UKIpbA7pC/mSdoqerowkOE2sGECobdTn9gqqsIBmi5L3tuh32E8VbpEZUd8bYW+tHidP PbhQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f16-20020a17090a4a9000b0023234b27893si8965187pjh.26.2023.02.12.02.05.42; Sun, 12 Feb 2023 02:05:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229567AbjBLJDH (ORCPT + 99 others); Sun, 12 Feb 2023 04:03:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbjBLJDG (ORCPT ); Sun, 12 Feb 2023 04:03:06 -0500 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 049A312863; Sun, 12 Feb 2023 01:03:02 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PF1hd398cz4f3l6n; Sun, 12 Feb 2023 17:02:57 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP3 (Coremail) with SMTP id _Ch0CgCHgR9Bq+hjpfqtDA--.47546S6; Sun, 12 Feb 2023 17:02:59 +0800 (CST) From: Yu Kuai To: hch@infradead.org, jack@suse.cz, axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH -next RFC 2/3] block: factor out the setting of GD_NEED_PART_SCAN Date: Sun, 12 Feb 2023 17:26:40 +0800 Message-Id: <20230212092641.2394146-3-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230212092641.2394146-1-yukuai1@huaweicloud.com> References: <20230212092641.2394146-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: _Ch0CgCHgR9Bq+hjpfqtDA--.47546S6 X-Coremail-Antispam: 1UD129KBjvJXoW7Zw18CrWUKry7Cw45CFyDWrg_yoW8AFyfpr WDXFZ0yFWjgr13uFWjv3Z7W3yjkanFyrWIyrW7Gw10v3sxZrsIyF9ak3yDAr10yrZ3GrZ8 Wr45XFyFqFy8CFUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9v14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UM2 8EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JV W8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUjYiiDUUUUU== X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,KHOP_HELO_FCRDNS, MAY_BE_FORGED,SPF_HELO_NONE,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757619269509197798?= X-GMAIL-MSGID: =?utf-8?q?1757619269509197798?= From: Yu Kuai In order to prevent scan partition for a device that is opened exclusively by someone else, new conditions will be added to disk_scan_partitions() in the next patch. Hence if device is opened exclusively between bdev_add() and disk_scan_partitions(), the first partition scan will fail unexpected. This patch factor out the setting of GD_NEED_PART_SCAN to prevent the problem. Signed-off-by: Yu Kuai --- block/genhd.c | 2 +- block/ioctl.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/block/genhd.c b/block/genhd.c index 075d8da284f5..c0d1220bd798 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -367,7 +367,6 @@ int disk_scan_partitions(struct gendisk *disk, fmode_t mode) if (disk->open_partitions) return -EBUSY; - set_bit(GD_NEED_PART_SCAN, &disk->state); bdev = blkdev_get_by_dev(disk_devt(disk), mode, NULL); if (IS_ERR(bdev)) return PTR_ERR(bdev); @@ -493,6 +492,7 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, if (ret) goto out_unregister_bdi; + set_bit(GD_NEED_PART_SCAN, &disk->state); bdev_add(disk->part0, ddev->devt); if (get_capacity(disk)) disk_scan_partitions(disk, FMODE_READ); diff --git a/block/ioctl.c b/block/ioctl.c index 6dd49d877584..0eefcdb936a0 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -528,6 +528,7 @@ static int blkdev_common_ioctl(struct block_device *bdev, fmode_t mode, return -EACCES; if (bdev_is_partition(bdev)) return -EINVAL; + set_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state); return disk_scan_partitions(bdev->bd_disk, mode & ~FMODE_EXCL); case BLKTRACESTART: case BLKTRACESTOP: From patchwork Sun Feb 12 09:26:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 55887 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1826216wrn; Sun, 12 Feb 2023 01:08:22 -0800 (PST) X-Google-Smtp-Source: AK7set8B8Mfvs66J+8ojHzaE5zJEYxZpgWbRaqsx5PNeq59e9PuNM8Y3shWlXTLWJjR7c53PuweY X-Received: by 2002:aa7:984f:0:b0:590:7659:9c33 with SMTP id n15-20020aa7984f000000b0059076599c33mr18891947pfq.22.1676192902631; Sun, 12 Feb 2023 01:08:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676192902; cv=none; d=google.com; s=arc-20160816; b=c7X0HTCrQ1ff4stl2EosXxEFemSpCcMPObMVeyvTeo6UxGyDt8aaGIMZimQ5nZ7Qsx ObEADQEVGeQL6DC0MBfePdc8PFPTSroKmeX1tg9GyilTSkDYzw0TbbeOHZwVkuzrE2Uc rK0556rURtJxM/wd38Sfh/eD8qieb8MykZKNA6kdsJZVHsZLyWGO0ICODtzVBSRE5cw5 qJLnB5rDA4gJrNM+/jROwIa2Z3VJAWkFm5jfuXEneuwoZqEXLI0+phwM+TKanOyroHzS sziGrI/ftG6/rgrfTs+kgURD3HTfLKowP88bJxlm6+auv+qYXAfajWq9EcqnyHfIPE3o 8FDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=2n8NvLJvh0+v9eiBNxez8cUI9Qo7foMteHDiDeEcNWk=; b=PzHO6E7ii/tm39GVAVAYA3HUaTFvyTnuhibi+i2SuA+Mb/qqVY9fsdogtimg15LrrY Voa/RRMQKbFyDY0LKKdKhjb46dr53QeXpV6Iy1W7CLgTyUdrpkKa3EU1ntcA/jD3ZN7n PogQ1/fsDtf+P+DY36iRJm9xnHn4NeFkh9JcuQ30tkpO+V+Erli+LiO4wnAGOI+gUyoO tokMEBlPkR+QFyUZEUWC5A6bH/HMEcnFrwMcfjXbaGjg5jpXHmB8ELbdAR7KYGP1WSaW tMK2Hk2q0gA+5dw33s1LdkAsottVsASDKK4Pfflyp67UXcQI1LrjjsSZql4RM3/c81CK ISkw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a29-20020aa795bd000000b0059d1764718dsi8456975pfk.133.2023.02.12.01.08.09; Sun, 12 Feb 2023 01:08:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229605AbjBLJDK (ORCPT + 99 others); Sun, 12 Feb 2023 04:03:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229505AbjBLJDG (ORCPT ); Sun, 12 Feb 2023 04:03:06 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF08112862; Sun, 12 Feb 2023 01:03:02 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PF1hf0CyPz4f3jHr; Sun, 12 Feb 2023 17:02:58 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP3 (Coremail) with SMTP id _Ch0CgCHgR9Bq+hjpfqtDA--.47546S7; Sun, 12 Feb 2023 17:03:00 +0800 (CST) From: Yu Kuai To: hch@infradead.org, jack@suse.cz, axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH -next RFC 3/3] block: fix scan partition for exclusively open device again Date: Sun, 12 Feb 2023 17:26:41 +0800 Message-Id: <20230212092641.2394146-4-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230212092641.2394146-1-yukuai1@huaweicloud.com> References: <20230212092641.2394146-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: _Ch0CgCHgR9Bq+hjpfqtDA--.47546S7 X-Coremail-Antispam: 1UD129KBjvJXoWxZr18uFy7ArWfuF1DAF18Zrb_yoW5Xr17pF W5XFW5tryDKr93uFW0vFnrJw4Ykan7tw1xGryIkw1Iv3y3Jrs0kF9Yk395XrW8trWxWrWD Zr4UZFy09F1furJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9v14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JrWl82xGYIkIc2 x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UM2 8EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JV W8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbJ73DUUUUU== X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757615648877780242?= X-GMAIL-MSGID: =?utf-8?q?1757615648877780242?= From: Yu Kuai As explained in commit 36369f46e917 ("block: Do not reread partition table on exclusively open device"), reread partition on the device that is exclusively opened by someone else is problematic. This patch will make sure partition scan will only be proceed if current thread open the device exclusively, or the device is not opened exclusively, and in the later case, other scanners and exclusive openers will be blocked temporarily until partition scan is done. Fixes: 10c70d95c0f2 ("block: remove the bd_openers checks in blk_drop_partitions") Cc: Suggested-by: Jan Kara Signed-off-by: Yu Kuai --- block/genhd.c | 27 +++++++++++++++++++++++---- block/ioctl.c | 2 +- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/block/genhd.c b/block/genhd.c index c0d1220bd798..6ec10ffeb9cc 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -359,6 +359,7 @@ EXPORT_SYMBOL_GPL(disk_uevent); int disk_scan_partitions(struct gendisk *disk, fmode_t mode) { struct block_device *bdev; + int ret = 0; if (disk->flags & (GENHD_FL_NO_PART | GENHD_FL_HIDDEN)) return -EINVAL; @@ -367,11 +368,29 @@ int disk_scan_partitions(struct gendisk *disk, fmode_t mode) if (disk->open_partitions) return -EBUSY; - bdev = blkdev_get_by_dev(disk_devt(disk), mode, NULL); - if (IS_ERR(bdev)) - return PTR_ERR(bdev); + /* + * If the device is opened exclusively by current thread already, it's + * safe to scan partitons, otherwise, use bd_prepare_to_claim() to + * synchronize with other exclusivet openers and other partition + * scanners. + */ + if (!(mode & FMODE_EXCL)) { + ret = bd_prepare_to_claim(disk->part0, disk_scan_partitions); + if (ret) + return ret; + } + + bdev = blkdev_get_by_dev(disk_devt(disk), mode & ~FMODE_EXCL, NULL); + if (IS_ERR(bdev)) { + ret = PTR_ERR(bdev); + goto out; + } blkdev_put(bdev, mode); - return 0; + +out: + if (!(mode & FMODE_EXCL)) + bd_abort_claiming(disk->part0, disk_scan_partitions); + return ret; } /** diff --git a/block/ioctl.c b/block/ioctl.c index 0eefcdb936a0..3adfdb904dd0 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -529,7 +529,7 @@ static int blkdev_common_ioctl(struct block_device *bdev, fmode_t mode, if (bdev_is_partition(bdev)) return -EINVAL; set_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state); - return disk_scan_partitions(bdev->bd_disk, mode & ~FMODE_EXCL); + return disk_scan_partitions(bdev->bd_disk, mode); case BLKTRACESTART: case BLKTRACESTOP: case BLKTRACETEARDOWN: