From: Hannes Reinecke <hare@suse.de>
To: Matthew Wilcox <willy@infradead.org>
Cc: Luis Chamberlain <mcgrof@kernel.org>,
Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>,
Pankaj Raghav <p.raghav@samsung.com>,
linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Hannes Reinecke <hare@suse.de>
Subject: [PATCH 16/18] brd: make logical sector size configurable
Date: Mon, 18 Sep 2023 13:05:08 +0200 [thread overview]
Message-ID: <20230918110510.66470-17-hare@suse.de> (raw)
In-Reply-To: <20230918110510.66470-1-hare@suse.de>
Add a module option 'rd_logical_blksize' to allow the user to change
the logical sector size of the RAM disks.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/block/brd.c | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 0c5f3dbbb77c..e2e364255902 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -45,6 +45,8 @@ struct brd_device {
u64 brd_nr_folios;
unsigned int brd_sector_shift;
unsigned int brd_sector_size;
+ unsigned int brd_logical_sector_shift;
+ unsigned int brd_logical_sector_size;
};
#define BRD_SECTOR_SHIFT(b) ((b)->brd_sector_shift - SECTOR_SHIFT)
@@ -242,8 +244,8 @@ static void brd_submit_bio(struct bio *bio)
int err;
/* Don't support un-aligned buffer */
- WARN_ON_ONCE((iter.offset & (SECTOR_SIZE - 1)) ||
- (len & (SECTOR_SIZE - 1)));
+ WARN_ON_ONCE((iter.offset & (brd->brd_logical_sector_size - 1)) ||
+ (len & (brd->brd_logical_sector_size - 1)));
err = brd_do_folio(brd, iter.folio, len, iter.offset,
bio->bi_opf, sector);
@@ -285,6 +287,10 @@ static unsigned int rd_blksize = PAGE_SIZE;
module_param(rd_blksize, uint, 0444);
MODULE_PARM_DESC(rd_blksize, "Blocksize of each RAM disk in bytes.");
+static unsigned int rd_logical_blksize = SECTOR_SIZE;
+module_param(rd_logical_blksize, uint, 0444);
+MODULE_PARM_DESC(rd_logical_blksize, "Logical blocksize of each RAM disk in bytes.");
+
MODULE_LICENSE("GPL");
MODULE_ALIAS_BLOCKDEV_MAJOR(RAMDISK_MAJOR);
MODULE_ALIAS("rd");
@@ -342,6 +348,21 @@ static int brd_alloc(int i)
brd->brd_sector_shift = ilog2(rd_blksize);
brd->brd_sector_size = rd_blksize;
+ if (!is_power_of_2(rd_logical_blksize)) {
+ pr_err("rd_logical_blksize %d is not supported\n",
+ rd_logical_blksize);
+ err = -EINVAL;
+ goto out_free_dev;
+ }
+ if (rd_logical_blksize > rd_blksize) {
+ pr_err("rd_logical_blksize %d larger than rd_blksize %d\n",
+ rd_logical_blksize, rd_blksize);
+ err = -EINVAL;
+ goto out_free_dev;
+ }
+ brd->brd_logical_sector_shift = ilog2(rd_logical_blksize);
+ brd->brd_logical_sector_size = rd_logical_blksize;
+
xa_init(&brd->brd_folios);
snprintf(buf, DISK_NAME_LEN, "ram%d", i);
@@ -362,6 +383,7 @@ static int brd_alloc(int i)
set_capacity(disk, rd_size * 2);
blk_queue_physical_block_size(disk->queue, rd_blksize);
+ blk_queue_logical_block_size(disk->queue, rd_logical_blksize);
blk_queue_max_hw_sectors(disk->queue, rd_max_sectors);
/* Tell the block layer that this is not a rotational device */
--
2.35.3
next prev parent reply other threads:[~2023-09-18 11:06 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-18 11:04 [RFC PATCH 00/18] block: update buffer_head for Large-block I/O Hannes Reinecke
2023-09-18 11:04 ` [PATCH 01/18] mm/readahead: rework loop in page_cache_ra_unbounded() Hannes Reinecke
[not found] ` <CGME20230920115645eucas1p1c8ed9bf515c4532b3e6995f8078a863b@eucas1p1.samsung.com>
2023-09-20 11:56 ` Pankaj Raghav
2023-09-20 14:13 ` Hannes Reinecke
2023-09-21 9:06 ` Pankaj Raghav
2023-09-20 14:18 ` Matthew Wilcox
2023-09-18 11:04 ` [PATCH 02/18] fs/mpage: use blocks_per_folio instead of blocks_per_page Hannes Reinecke
2023-09-18 13:15 ` Matthew Wilcox
2023-09-18 17:45 ` Hannes Reinecke
2023-09-18 11:04 ` [PATCH 03/18] block/buffer_head: introduce block_{index_to_sector,sector_to_index} Hannes Reinecke
2023-09-18 16:36 ` Matthew Wilcox
2023-09-18 17:42 ` Hannes Reinecke
2023-09-18 21:01 ` Matthew Wilcox
2023-09-18 11:04 ` [PATCH 04/18] fs/buffer.c: use accessor function to translate page index to sectors Hannes Reinecke
2023-10-20 19:37 ` Matthew Wilcox
2023-10-21 5:08 ` Matthew Wilcox
2023-10-23 5:03 ` Hannes Reinecke
2023-09-18 11:04 ` [PATCH 05/18] fs/mpage: " Hannes Reinecke
2023-09-18 11:04 ` [PATCH 06/18] fs: Allow fine-grained control of folio sizes Hannes Reinecke
2023-09-18 11:04 ` [PATCH 07/18] mm/filemap: allocate folios with mapping order preference Hannes Reinecke
2023-09-18 13:41 ` Matthew Wilcox
2023-09-18 17:34 ` Hannes Reinecke
2023-09-18 11:05 ` [PATCH 08/18] mm/readahead: " Hannes Reinecke
2023-09-18 13:11 ` kernel test robot
2023-09-18 20:46 ` kernel test robot
2023-09-18 11:05 ` [PATCH 09/18] fs/buffer: use mapping order in grow_dev_page() Hannes Reinecke
2023-09-18 14:00 ` Matthew Wilcox
2023-09-18 17:38 ` Hannes Reinecke
2023-09-18 11:05 ` [PATCH 10/18] block/bdev: lift restrictions on supported blocksize Hannes Reinecke
2023-09-18 11:05 ` [PATCH 11/18] block/bdev: enable large folio support for large logical block sizes Hannes Reinecke
2023-09-18 11:05 ` [PATCH 12/18] brd: convert to folios Hannes Reinecke
2023-09-18 11:05 ` [PATCH 13/18] brd: abstract page_size conventions Hannes Reinecke
2023-09-18 11:05 ` [PATCH 14/18] brd: use memcpy_{to,from}_folio() Hannes Reinecke
2023-09-18 11:05 ` [PATCH 15/18] brd: make sector size configurable Hannes Reinecke
2023-09-18 11:05 ` Hannes Reinecke [this message]
2023-09-18 11:05 ` [PATCH 17/18] xfs: remove check for block sizes smaller than PAGE_SIZE Hannes Reinecke
2023-09-20 2:13 ` Dave Chinner
2023-09-18 11:05 ` [PATCH 18/18] nvme: enable logical block size > PAGE_SIZE Hannes Reinecke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230918110510.66470-17-hare@suse.de \
--to=hare@suse.de \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=p.raghav@samsung.com \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).