From: Hannes Reinecke <hare@suse.de>
To: Matthew Wilcox <willy@infradead.org>
Cc: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Christoph Hellwig <hch@lst.de>,
Luis Chamberlain <mcgrof@kernel.org>,
Hannes Reinecke <hare@suse.de>
Subject: [PATCH 5/7] brd: make logical sector size configurable
Date: Wed, 14 Jun 2023 13:46:35 +0200 [thread overview]
Message-ID: <20230614114637.89759-6-hare@suse.de> (raw)
In-Reply-To: <20230614114637.89759-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 | 38 ++++++++++++++++++++++++++++++--------
1 file changed, 30 insertions(+), 8 deletions(-)
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 2ebb5532a204..a9f3c6591e75 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -45,9 +45,11 @@ 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)
+#define BRD_SECTOR_SHIFT(b) ((b)->brd_sector_shift - (b)->brd_logical_sector_shift)
static pgoff_t brd_sector_index(struct brd_device *brd, sector_t sector)
{
@@ -61,7 +63,7 @@ static int brd_sector_offset(struct brd_device *brd, sector_t sector)
{
unsigned int rd_sector_mask = (1 << BRD_SECTOR_SHIFT(brd)) - 1;
- return ((unsigned int)sector & rd_sector_mask) << SECTOR_SHIFT;
+ return ((unsigned int)sector & rd_sector_mask) << brd->brd_logical_sector_shift;
}
/*
@@ -152,7 +154,7 @@ static int copy_to_brd_setup(struct brd_device *brd, sector_t sector, size_t n,
if (ret)
return ret;
if (copy < n) {
- sector += copy >> SECTOR_SHIFT;
+ sector += copy >> brd->brd_logical_sector_shift;
ret = brd_insert_folio(brd, sector, gfp);
}
return ret;
@@ -180,7 +182,7 @@ static void copy_to_brd(struct brd_device *brd, const void *src,
if (copy < n) {
src += copy;
- sector += copy >> SECTOR_SHIFT;
+ sector += copy >> brd->brd_logical_sector_shift;
copy = n - copy;
folio = brd_lookup_folio(brd, sector);
BUG_ON(!folio);
@@ -214,7 +216,7 @@ static void copy_from_brd(void *dst, struct brd_device *brd,
if (copy < n) {
dst += copy;
- sector += copy >> SECTOR_SHIFT;
+ sector += copy >> brd->brd_logical_sector_shift;
copy = n - copy;
folio = brd_lookup_folio(brd, sector);
if (folio) {
@@ -273,8 +275,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);
@@ -286,7 +288,7 @@ static void brd_submit_bio(struct bio *bio)
bio_io_error(bio);
return;
}
- sector += len >> SECTOR_SHIFT;
+ sector += len >> brd->brd_logical_sector_shift;
}
bio_endio(bio);
@@ -316,6 +318,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");
@@ -373,6 +379,21 @@ static int brd_alloc(int i)
}
brd->brd_sector_size = rd_blksize;
+ brd->brd_logical_sector_shift = ilog2(rd_logical_blksize);
+ if ((1ULL << brd->brd_sector_shift) != rd_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_size = rd_logical_blksize;
+
xa_init(&brd->brd_folios);
snprintf(buf, DISK_NAME_LEN, "ram%d", i);
@@ -393,6 +414,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, 1ULL << (MAX_ORDER + PAGE_SECTORS_SHIFT));
/* Tell the block layer that this is not a rotational device */
--
2.35.3
next prev parent reply other threads:[~2023-06-14 11:47 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-14 11:46 [PATCH 0/7] RFC: high-order folio support for I/O Hannes Reinecke
2023-06-14 11:46 ` [PATCH 1/7] brd: use XArray instead of radix-tree to index backing pages Hannes Reinecke
2023-06-14 12:45 ` Matthew Wilcox
2023-06-14 12:50 ` Pankaj Raghav
2023-06-14 13:03 ` Hannes Reinecke
2023-06-14 11:46 ` [PATCH 2/7] brd: convert to folios Hannes Reinecke
2023-06-14 13:45 ` Matthew Wilcox
2023-06-14 13:50 ` Hannes Reinecke
2023-06-14 11:46 ` [PATCH 3/7] brd: abstract page_size conventions Hannes Reinecke
2023-06-14 11:46 ` [PATCH 4/7] brd: make sector size configurable Hannes Reinecke
2023-06-14 12:55 ` Matthew Wilcox
2023-06-14 13:02 ` Hannes Reinecke
2023-06-15 2:17 ` Dave Chinner
2023-06-15 5:55 ` Christoph Hellwig
2023-06-15 6:33 ` Hannes Reinecke
2023-06-15 6:23 ` Hannes Reinecke
2023-06-14 11:46 ` Hannes Reinecke [this message]
2023-06-14 11:46 ` [PATCH 6/7] mm/filemap: allocate folios with mapping blocksize Hannes Reinecke
[not found] ` <CGME20230619080901eucas1p224e67aa31866d2ad8d259b2209c2db67@eucas1p2.samsung.com>
2023-06-19 8:08 ` Pankaj Raghav
2023-06-19 8:42 ` Hannes Reinecke
2023-06-19 22:57 ` Dave Chinner
2023-06-20 0:00 ` Matthew Wilcox
2023-06-20 5:57 ` Hannes Reinecke
2023-06-14 11:46 ` [PATCH 7/7] mm/readahead: align readahead down to " Hannes Reinecke
2023-06-14 13:17 ` [PATCH 0/7] RFC: high-order folio support for I/O Hannes Reinecke
2023-06-14 13:53 ` Matthew Wilcox
2023-06-14 15:06 ` Hannes Reinecke
2023-06-14 15:35 ` Hannes Reinecke
2023-06-14 17:46 ` Matthew Wilcox
2023-06-14 23:53 ` Dave Chinner
2023-06-15 6:21 ` Hannes Reinecke
2023-06-15 8:51 ` Dave Chinner
2023-06-16 16:06 ` Kent Overstreet
2023-06-15 3:44 ` Dave Chinner
2023-06-14 13:48 ` [PATCH 1/2] highmem: Add memcpy_to_folio() Matthew Wilcox (Oracle)
2023-06-14 18:38 ` kernel test robot
2023-06-14 19:30 ` kernel test robot
2023-06-15 5:58 ` Christoph Hellwig
2023-06-15 12:16 ` Matthew Wilcox
2023-06-14 13:48 ` [PATCH 2/2] highmem: Add memcpy_from_folio() Matthew Wilcox (Oracle)
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=20230614114637.89759-6-hare@suse.de \
--to=hare@suse.de \
--cc=akpm@linux-foundation.org \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=mcgrof@kernel.org \
--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).