From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 753E2C43381 for ; Wed, 13 Jan 2021 14:35:48 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F075023437 for ; Wed, 13 Jan 2021 14:35:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F075023437 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To: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:List-Owner; bh=/74b9LqsvXmLH2G4oIQ+JCWFN7SryWoY6m0N/KoFKrA=; b=nATQ9o2w8CVQfbHv7Xmh7W+Omv YVWVRA855Paawu9ek0mtdctle8U6eNl0NXBuCs8nsU9rm0/k4nz85TTEh/P5rSI5hq2pYOWL4I2DN 9Fhy4lYNfjmemvGA4+FU61VuLdff/DLC6FszecSjyFar/hbfC++yrOdmhkVUtTo0FJ1ziZeCYWyHt p0Lvc/k1tl74MEaP72dzYvkwI0EAx2enznIW/tC7SvteVUG5ubc6VWDIva+x+kmz7PXj//EbxASk8 6eFJwBPVk9QrCKa/DzH68yNb9qkLctrvXEPLbje0cZ+lv0V//ip1kW5V01VHjHVpQaJiM+pX2AWfd 81J5YWRA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzhEw-0000b6-VU; Wed, 13 Jan 2021 14:35:14 +0000 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzhEg-0000Xt-BO for linux-nvme@lists.infradead.org; Wed, 13 Jan 2021 14:35:02 +0000 Received: by mail-pg1-x52d.google.com with SMTP id i7so1601983pgc.8 for ; Wed, 13 Jan 2021 06:34:57 -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:in-reply-to:references; bh=sesLVgnwP7XNfVw93uzCMsBbwsNC3kfCmoQy7b5qpcU=; b=Al8dE884+Wrc0UtcjaEyhg6+sY/riXv3MPBpQSUXyVCsKo/DWWk5fTBIT7bGVv42NW ghzzdWQQTuTg+zvmVGt5GGGWHCPmiH61wePLhNE4TSHBIynRqHJJCpHmdqRM1mmAofI5 yzgEbOLVJU3q3rJbhPHV6CVVkFji31C4hlWEKCrzOcrNTrkkLxBQBJrR69ZktvuLKa2i blayoM+5CE4jsvH7V1Xv+AzXT4o3N+misMO8/aIacaC/6eRXXW86OZ55k6VxvNrgM9EJ wAi81rQz6KQSzZJnFvVjYzbxLgFNpcsA5O5a4lj82NV19Od2K0O0zghr+NM7pdN/nMwb O4bw== 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:in-reply-to :references; bh=sesLVgnwP7XNfVw93uzCMsBbwsNC3kfCmoQy7b5qpcU=; b=Zwhm/qajLT6Yi1ySC1np+3rf7agZFCAvY0im3wHPJRdU0nIrsKULy+rvrBOPzlYv2e NI3Jw9RjmOdbC9v7hQYoH12jWlufDH3ECKb6BCUl9anxjuLKIgw6VCe0mJQY+fficsQx 13fV5COJp8KbjC3wjJDqiWHynJ+qeVesMfMRriFFwHoetv/J61KeppJtFxhfbjVfuHti gPbl4blLJLhoxZI1aR3XskyttPkJK2baqlnmLQFUg+zXaxshsSOupl8Z5KEgGNO9XgxL nTdC30JRkRBTulTazE6liTiI8qriDZykhj4MgHwsGxhtV/F+axemh5iyumkyz64KGXIx 8vyQ== X-Gm-Message-State: AOAM531MKWglwi/tSXp77qCSmhxwHzX3r6sdejXkiOLEdguxDjWbvmNc PuMWpKbpwMpUDbmE+rz6LVw= X-Google-Smtp-Source: ABdhPJwoNupYnLwb/wY+pl4lhOoDXLr0wKJVFe7in+OkRGY/maIa1t6wRz7GDD9EwP6+10SAKB3QOA== X-Received: by 2002:a62:5b85:0:b029:19e:432a:2717 with SMTP id p127-20020a625b850000b029019e432a2717mr2430275pfb.73.1610548496073; Wed, 13 Jan 2021 06:34:56 -0800 (PST) Received: from localhost.localdomain ([211.108.35.36]) by smtp.gmail.com with ESMTPSA id c5sm3248265pjo.4.2021.01.13.06.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jan 2021 06:34:55 -0800 (PST) From: Minwoo Im To: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, linux-fsdevel@vger.kernel.org Subject: [PATCH V5 1/1] block: reject I/O for same fd if block size changed Date: Wed, 13 Jan 2021 23:34:32 +0900 Message-Id: <20210113143432.426-2-minwoo.im.dev@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210113143432.426-1-minwoo.im.dev@gmail.com> References: <20210113143432.426-1-minwoo.im.dev@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210113_093458_480460_C72AFC05 X-CRM114-Status: GOOD ( 24.80 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jens Axboe , Minwoo Im , Alexander Viro , Christoph Hellwig MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org This patch fixes I/O errors during BLKRRPART ioctl() behavior right after format operation that changed logical block size of the block device with a same file descriptor opened. This issue can be easily reproduced with a single format command in case of NVMe (logical block size 512B to 4096B). nvme format /dev/nvme0n1 --lbaf=1 --force This is because the application, nvme-cli format subcommand issues an admin command followed by BLKRRPART ioctl to re-read partition information without closing the file descriptor. If file descriptor stays opened, __blkdev_get() will not be invoked at all even logical block size has been changed. It will cause I/O errors with invalid Read operations during the BLKRRPART ioctl due to i_blkbits mismatch. The invalid operations in BLKRRPART happens with under-flowed Number of LBA(NLB) values 0xffff(65535) because i_blkbits is still set to 9 even the logical block size has been updated to 4096. The BLKRRPART will lead buffer_head to hold 512B data which is less than the logical lock size of the block device. The root cause, which is because i_blkbits of inode of the block device is not updated, can be solved easily by re-opening file descriptor again from application. But, that's just for application's business and kernel should reject invalid Read operations during the BLKRRPART ioctl. This patch rejects I/O from the path of add_partitions() to avoid issuing invalid Read operations to device. It sets a flag to request_queue in blk_queue_logical_block_size to minimize caller-side updates. Signed-off-by: Minwoo Im Reviewed-by: Christoph Hellwig --- block/blk-settings.c | 3 +++ block/partitions/core.c | 12 ++++++++++++ fs/block_dev.c | 8 ++++++++ include/linux/blkdev.h | 1 + 4 files changed, 24 insertions(+) diff --git a/block/blk-settings.c b/block/blk-settings.c index 43990b1d148b..48a6fc7bb5f5 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -329,6 +329,9 @@ void blk_queue_logical_block_size(struct request_queue *q, unsigned int size) { struct queue_limits *limits = &q->limits; + if (limits->logical_block_size != size) + blk_queue_flag_set(QUEUE_FLAG_LBSZ_CHANGED, q); + limits->logical_block_size = size; if (limits->physical_block_size < size) diff --git a/block/partitions/core.c b/block/partitions/core.c index e7d776db803b..6f175ea18ff3 100644 --- a/block/partitions/core.c +++ b/block/partitions/core.c @@ -612,12 +612,24 @@ static bool blk_add_partition(struct gendisk *disk, struct block_device *bdev, int blk_add_partitions(struct gendisk *disk, struct block_device *bdev) { + struct request_queue *q = bdev_get_queue(bdev); struct parsed_partitions *state; int ret = -EAGAIN, p, highest; if (!disk_part_scan_enabled(disk)) return 0; + /* + * Reject to check partition information if block size has been changed + * in the runtime. If block size of a block device has been changed, + * the file descriptor should be opened agian to update the blkbits. + */ + if (test_bit(QUEUE_FLAG_LBSZ_CHANGED, &q->queue_flags)) { + pr_warn("%s: rejecting checking partition. fd should be opened again.\n", + disk->disk_name); + return -EBADFD; + } + state = check_partition(disk, bdev); if (!state) return 0; diff --git a/fs/block_dev.c b/fs/block_dev.c index 3b8963e228a1..db5b0b75f0be 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -130,7 +130,15 @@ EXPORT_SYMBOL(truncate_bdev_range); static void set_init_blocksize(struct block_device *bdev) { + struct request_queue *q = bdev_get_queue(bdev); + bdev->bd_inode->i_blkbits = blksize_bits(bdev_logical_block_size(bdev)); + + /* + * Allow I/O commands for this block device. We can say that this + * block device has proper blkbits updated. + */ + blk_queue_flag_clear(QUEUE_FLAG_LBSZ_CHANGED, q); } int set_blocksize(struct block_device *bdev, int size) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 070de09425ad..6d0542434be6 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -625,6 +625,7 @@ struct request_queue { #define QUEUE_FLAG_RQ_ALLOC_TIME 27 /* record rq->alloc_time_ns */ #define QUEUE_FLAG_HCTX_ACTIVE 28 /* at least one blk-mq hctx is active */ #define QUEUE_FLAG_NOWAIT 29 /* device supports NOWAIT */ +#define QUEUE_FLAG_LBSZ_CHANGED 30 /* logical block size changed */ #define QUEUE_FLAG_MQ_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ (1 << QUEUE_FLAG_SAME_COMP) | \ -- 2.17.1 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme