block: refactor duplicated macros
Subsystems (15)
PATCH v2 1/1 block: refactor duplicated macros
The macros PAGE_SECTORS, PAGE_SECTORS_SHIFT and SECTOR_MASK are defined several times in different flavours across the whole tree. Define them just once in a common header.
Signed-off-by Matteo Croce <[email protected]>
---
v2:
As Dan Williams suggested:
#define PAGE_SECTORS_MASK (~(PAGE_SECTORS - 1))
block/blk-lib.c | 2 +- drivers/block/brd.c | 3 --- drivers/block/null_blk_main.c | 14 +++++--------- drivers/block/zram/zram_drv.c | 8 ++++---- drivers/block/zram/zram_drv.h | 2 -- drivers/dax/super.c | 2 +- drivers/md/bcache/util.h | 2 -- drivers/md/dm-bufio.c | 6 +++--- drivers/md/dm-integrity.c | 10 +++++----- drivers/md/md.c | 4 ++-- drivers/md/raid1.c | 2 +- drivers/mmc/core/host.c | 3 ++- drivers/scsi/xen-scsifront.c | 4 ++-- fs/iomap/buffered-io.c | 2 +- fs/nfs/blocklayout/blocklayout.h | 2 -- include/linux/blkdev.h | 4 ++++ include/linux/device-mapper.h | 1 - 17 files changed, 31 insertions(+), 40 deletions(-)
block/blk-lib.c +1 -1
@@ -260,7 +260,7 @@ static int __blkdev_issue_write_zeroes(struct block_device *bdev,*/ static unsigned int __blkdev_sectors_to_bio_pages (sector_t nr_sects) { -sector_t pages =DIV_ROUND_UP_SECTOR_T (nr_sects,PAGE_SIZE /512 ); +sector_t pages =DIV_ROUND_UP_SECTOR_T (nr_sects,PAGE_SECTORS );return min (pages, (sector_t )BIO_MAX_PAGES ); }
drivers/block/brd.c +0 -3
@@ -25,9 +25,6 @@#include <linux/uaccess.h> -#define PAGE_SECTORS_SHIFT (PAGE_SHIFT - SECTOR_SHIFT) -#define PAGE_SECTORS (1 << PAGE_SECTORS_SHIFT) -/* * Each block ramdisk device has a radix_tree brd_pages of pages that stores * the pages containing the block device's contents. A brd page's ->index is
drivers/block/null_blk_main.c +5 -9
@@ -11,10 +11,6 @@#include <linux/init.h> #include "null_blk.h" -#define PAGE_SECTORS_SHIFT (PAGE_SHIFT - SECTOR_SHIFT) -#define PAGE_SECTORS (1 << PAGE_SECTORS_SHIFT) -#define SECTOR_MASK (PAGE_SECTORS - 1) -#define FREE_BATCH 16#define TICKS_PER_SEC 50ULL
@@ -721,7 +717,7 @@ static void null_free_sector(struct nullb *nullb, sector_t sector, root = is_cache ? &nullb->dev->cache : &nullb->dev->data; idx = sector >>PAGE_SECTORS_SHIFT ; - sector_bit = (sector &SECTOR_MASK ); + sector_bit = (sector &PAGE_SECTORS_MASK ); t_page =radix_tree_lookup (root, idx);if (t_page) {
@@ -792,7 +788,7 @@ static struct nullb_page *__null_lookup_page(struct nullb *nullb,struct radix_tree_root *root; idx = sector >>PAGE_SECTORS_SHIFT ; - sector_bit = (sector &SECTOR_MASK ); + sector_bit = (sector &PAGE_SECTORS_MASK ); root = is_cache ? &nullb->dev->cache : &nullb->dev->data; t_page =radix_tree_lookup (root, idx);
@@ -967,7 +963,7 @@ static int copy_to_nullb(struct nullb *nullb, struct page *source,if (null_cache_active (nullb) && !is_fua)null_make_cache_space (nullb,PAGE_SIZE ); - offset = (sector &SECTOR_MASK ) <<SECTOR_SHIFT ; + offset = (sector &PAGE_SECTORS_MASK ) <<SECTOR_SHIFT ; t_page =null_insert_page (nullb, sector, !null_cache_active (nullb) || is_fua);if (!t_page)
@@ -979,7 +975,7 @@ static int copy_to_nullb(struct nullb *nullb, struct page *source,kunmap_atomic (dst);kunmap_atomic (src); -__set_bit (sector &SECTOR_MASK , t_page->bitmap); +__set_bit (sector &PAGE_SECTORS_MASK , t_page->bitmap);if (is_fua)null_free_sector (nullb, sector, true);
@@ -1001,7 +997,7 @@ static int copy_from_nullb(struct nullb *nullb, struct page *dest,while (count < n) { temp =min_t (size_t, nullb->dev->blocksize, n - count); - offset = (sector &SECTOR_MASK ) <<SECTOR_SHIFT ; + offset = (sector &PAGE_SECTORS_MASK ) <<SECTOR_SHIFT ; t_page =null_lookup_page (nullb, sector, false, !null_cache_active (nullb));
drivers/block/zram/zram_drv.c +4 -4
@@ -1548,9 +1548,9 @@ static void __zram_make_request(struct zram *zram, struct bio *bio)struct bio_vec bvec;struct bvec_iter iter; - index = bio->bi_iter.bi_sector >>SECTORS_PER_PAGE_SHIFT ; + index = bio->bi_iter.bi_sector >>PAGE_SECTORS_SHIFT ; offset = (bio->bi_iter.bi_sector & - (SECTORS_PER_PAGE -1 )) <<SECTOR_SHIFT ; +PAGE_SECTORS_MASK ) <<SECTOR_SHIFT ;switch (bio_op (bio)) {case REQ_OP_DISCARD :
@@ -1643,8 +1643,8 @@ static int zram_rw_page(struct block_device *bdev, sector_t sector, goto out; } - index = sector >>SECTORS_PER_PAGE_SHIFT ; - offset = (sector & (SECTORS_PER_PAGE -1 )) <<SECTOR_SHIFT ; + index = sector >>PAGE_SECTORS_SHIFT ; + offset = (sector &PAGE_SECTORS_MASK ) <<SECTOR_SHIFT ; bv.bv_page = page; bv.bv_len =PAGE_SIZE ;
drivers/block/zram/zram_drv.h +0 -2
@@ -21,8 +21,6 @@#include "zcomp.h" -#define SECTORS_PER_PAGE_SHIFT (PAGE_SHIFT - SECTOR_SHIFT) -#define SECTORS_PER_PAGE (1 << SECTORS_PER_PAGE_SHIFT)#define ZRAM_LOGICAL_BLOCK_SHIFT 12#define ZRAM_LOGICAL_BLOCK_SIZE (1 << ZRAM_LOGICAL_BLOCK_SHIFT)#define ZRAM_SECTOR_PER_LOGICAL_BLOCK \
drivers/dax/super.c +1 -1
@@ -92,7 +92,7 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev,return false; } - last_page =PFN_DOWN ((start + sectors -1 ) *512 ) *PAGE_SIZE /512 ; + last_page =PFN_DOWN ((start + sectors -1 ) *512 ) *PAGE_SECTORS ; err =bdev_dax_pgoff (bdev, last_page,PAGE_SIZE , &pgoff_end);if (err) { pr_debug("%s: error: unaligned partition for dax\n",
drivers/md/bcache/util.h +0 -2
@@ -15,8 +15,6 @@#include "closure.h" -#define PAGE_SECTORS (PAGE_SIZE / 512) -struct closure ;#ifdef CONFIG_BCACHE_DEBUG
drivers/md/dm-bufio.c +3 -3
@@ -384,7 +384,7 @@ static void *alloc_buffer_data(struct dm_bufio_client *c, gfp_t gfp_mask, gfp_mask & __GFP_NORETRY) { *data_mode =DATA_MODE_GET_FREE_PAGES ;return (void *)__get_free_pages (gfp_mask, - c->sectors_per_block_bits - (PAGE_SHIFT -SECTOR_SHIFT )); + c->sectors_per_block_bits -PAGE_SECTORS_SHIFT ); } *data_mode =DATA_MODE_VMALLOC ;
@@ -422,7 +422,7 @@ static void free_buffer_data(struct dm_bufio_client *c,case DATA_MODE_GET_FREE_PAGES :free_pages ((unsigned long )data, - c->sectors_per_block_bits - (PAGE_SHIFT -SECTOR_SHIFT )); + c->sectors_per_block_bits -PAGE_SECTORS_SHIFT );break ;case DATA_MODE_VMALLOC :
@@ -597,7 +597,7 @@ static void use_bio(struct dm_buffer *b, int rw, sector_t sector,unsigned vec_size, len; vec_size = b->c->block_size >>PAGE_SHIFT ; -if (unlikely (b->c->sectors_per_block_bits <PAGE_SHIFT -SECTOR_SHIFT )) +if (unlikely (b->c->sectors_per_block_bits <PAGE_SECTORS_SHIFT )) vec_size +=2 ; bio =bio_kmalloc (GFP_NOWAIT | __GFP_NORETRY | __GFP_NOWARN, vec_size);
drivers/md/dm-integrity.c +5 -5
@@ -652,7 +652,7 @@ static void page_list_location(struct dm_integrity_c *ic, unsigned section, unsi sector = section * ic->journal_section_sectors + offset; - *pl_index = sector >> (PAGE_SHIFT -SECTOR_SHIFT ); + *pl_index = sector >>PAGE_SECTORS_SHIFT ; *pl_offset = (sector <<SECTOR_SHIFT ) & (PAGE_SIZE -1 ); }
@@ -951,7 +951,7 @@ static void rw_journal_sectors(struct dm_integrity_c *ic, int op, int op_flags,return ; } - pl_index = sector >> (PAGE_SHIFT -SECTOR_SHIFT ); + pl_index = sector >>PAGE_SECTORS_SHIFT ; pl_offset = (sector <<SECTOR_SHIFT ) & (PAGE_SIZE -1 ); io_req.bi_op = op;
@@ -1072,7 +1072,7 @@ static void copy_from_journal(struct dm_integrity_c *ic, unsigned section, unsig sector = section * ic->journal_section_sectors +JOURNAL_BLOCK_SECTORS + offset; - pl_index = sector >> (PAGE_SHIFT -SECTOR_SHIFT ); + pl_index = sector >>PAGE_SECTORS_SHIFT ; pl_offset = (sector <<SECTOR_SHIFT ) & (PAGE_SIZE -1 ); io_req.bi_op =REQ_OP_WRITE ;
@@ -3343,7 +3343,7 @@ static int create_journal(struct dm_integrity_c *ic, char **error) ic->commit_ids[3 ] =cpu_to_le64 (0x4444444444444444ULL ); journal_pages =roundup ((__u64 )ic->journal_sections * ic->journal_section_sectors, -PAGE_SIZE >>SECTOR_SHIFT ) >> (PAGE_SHIFT -SECTOR_SHIFT ); +PAGE_SIZE >>SECTOR_SHIFT ) >>PAGE_SECTORS_SHIFT ; journal_desc_size = journal_pages *sizeof (struct page_list );if (journal_pages >=totalram_pages () -totalhigh_pages () || journal_desc_size >ULONG_MAX ) { *error ="Journal doesn't fit into memory" ;
@@ -4075,7 +4075,7 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned argc, char **argv)spin_lock_init (&bbs->bio_queue_lock); sector = i * (BITMAP_BLOCK_SIZE >>SECTOR_SHIFT ); - pl_index = sector >> (PAGE_SHIFT -SECTOR_SHIFT ); + pl_index = sector >>PAGE_SECTORS_SHIFT ; pl_offset = (sector <<SECTOR_SHIFT ) & (PAGE_SIZE -1 ); bbs->bitmap =lowmem_page_address (ic->journal[pl_index].page) + pl_offset;
drivers/md/md.c +2 -2
@@ -1734,7 +1734,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor___le64 *bbp;int i;int sectors =le16_to_cpu (sb->bblog_size); -if (sectors > (PAGE_SIZE /512 )) +if (sectors >PAGE_SECTORS )return -EINVAL ; offset =le32_to_cpu (sb->bblog_offset);if (offset ==0 )
@@ -8733,7 +8733,7 @@ void md_do_sync(struct md_thread *thread)/* * Tune reconstruction: */ - window =32 * (PAGE_SIZE /512 ); + window =32 *PAGE_SECTORS ;pr_debug ("md: using %dk window, over a total of %lluk.\n" , window/2 , (unsigned long long )max_sectors/2 );
drivers/md/raid1.c +1 -1
@@ -2129,7 +2129,7 @@ static void process_checks(struct r1bio *r1_bio)int vcnt;/* Fix variable parts of all bios */ - vcnt = (r1_bio->sectors +PAGE_SIZE /512 -1 ) >> (PAGE_SHIFT -9 ); + vcnt = (r1_bio->sectors +PAGE_SECTORS -1 ) >> (PAGE_SHIFT -9 );for (i =0 ; i < conf->raid_disks *2 ; i++) {blk_status_t status;struct bio *b = r1_bio->bios[i];
drivers/mmc/core/host.c +2 -1
@@ -18,6 +18,7 @@#include <linux/export.h> #include <linux/leds.h> #include <linux/slab.h> +#include <linux/blkdev.h> #include <linux/mmc/host.h> #include <linux/mmc/card.h>
@@ -427,7 +428,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) host->max_req_size =PAGE_SIZE ; host->max_blk_size =512 ; - host->max_blk_count =PAGE_SIZE /512 ; + host->max_blk_count =PAGE_SECTORS ; host->fixed_drv_type = -EINVAL ; host->ios.power_delay_ms =10 ;
drivers/scsi/xen-scsifront.c +2 -2
@@ -852,7 +852,7 @@ static int scsifront_probe(struct xenbus_device *dev, host->max_id =VSCSIIF_MAX_TARGET ; host->max_channel =0 ; host->max_lun =VSCSIIF_MAX_LUN ; - host->max_sectors = (host->sg_tablesize -1 ) *PAGE_SIZE /512 ; + host->max_sectors = (host->sg_tablesize -1 ) *PAGE_SECTORS ; host->max_cmd_len =VSCSIIF_MAX_COMMAND_SIZE ; err =scsi_add_host (host, &dev->dev);
@@ -1073,7 +1073,7 @@ static void scsifront_read_backend_params(struct xenbus_device *dev, host->sg_tablesize, nr_segs); host->sg_tablesize = nr_segs; - host->max_sectors = (nr_segs -1 ) *PAGE_SIZE /512 ; + host->max_sectors = (nr_segs -1 ) *PAGE_SECTORS ; } static void scsifront_backend_changed(struct xenbus_device *dev,
fs/iomap/buffered-io.c +1 -1
@@ -29,7 +29,7 @@ struct iomap_page {atomic_t read_count;atomic_t write_count;spinlock_t uptodate_lock; -DECLARE_BITMAP (uptodate,PAGE_SIZE /512 ); +DECLARE_BITMAP (uptodate,PAGE_SECTORS ); };static inline struct iomap_page *to_iomap_page (struct page *page)
fs/nfs/blocklayout/blocklayout.h +0 -2
@@ -40,8 +40,6 @@#include "../pnfs.h" #include "../netns.h" -#define PAGE_CACHE_SECTORS (PAGE_SIZE >> SECTOR_SHIFT) -#define PAGE_CACHE_SECTOR_SHIFT (PAGE_SHIFT - SECTOR_SHIFT)#define SECTOR_SIZE (1 << SECTOR_SHIFT)struct pnfs_block_dev ;
include/linux/blkdev.h +4 -0
@@ -910,6 +910,10 @@ static inline struct request_queue *bdev_get_queue(struct block_device *bdev)#define SECTOR_SIZE (1 << SECTOR_SHIFT)#endif +#define PAGE_SECTORS_SHIFT (PAGE_SHIFT - SECTOR_SHIFT) +#define PAGE_SECTORS (1 << PAGE_SECTORS_SHIFT) +#define PAGE_SECTORS_MASK (~(PAGE_SECTORS - 1)) +/* * blk_rq_pos() : the current sector * blk_rq_bytes() : bytes left in the entire request
include/linux/device-mapper.h +0 -1
@@ -141,7 +141,6 @@ typedef long (*dm_dax_direct_access_fn) (struct dm_target *ti, pgoff_t pgoff, long nr_pages, void **kaddr, pfn_t *pfn);typedef size_t (*dm_dax_copy_iter_fn )(struct dm_target *ti,pgoff_t pgoff,void *addr,size_t bytes,struct iov_iter *i); -#define PAGE_SECTORS (PAGE_SIZE / 512)void dm_error (const char *message);
Signature · 1 line
2.24.1
drivers/md/raid1.c static void process_checks(struct r1bio *r1_bio) · line 2132
Quoted 7 lines · Matteo Croce
+++
b/drivers/md/raid1.cdrivers/md/raid1.c +1
-1@@ -2129,7 +2129,7 @@ static void process_checks(struct r1bio *r1_bio)int vcnt;/* Fix variable parts of all bios */ - vcnt = (r1_bio->sectors +PAGE_SIZE /512 -1 ) >> (PAGE_SHIFT -9 ); + vcnt = (r1_bio->sectors +PAGE_SECTORS -1 ) >> (PAGE_SHIFT -9 );
Maybe replace "PAGE_SHIFT - 9" with "PAGE_SECTORS_SHIFT" too.
Thanks,
Guoqing
Quoted 8 lines · Guoqing Jiang
Quoted 4 lines · Matteo Croce
+++
b/drivers/md/raid1.cdrivers/md/raid1.c +0
-0@@ -2129,7 +2129,7 @@ static void process_checks(struct r1bio *r1_bio)int vcnt;
Quoted 9 lines
drivers/md/raid1.c static void process_checks(struct r1bio *r1_bio) · line 2132
Quoted 3 lines
drivers/md/raid1.c +1
-1/* Fix variable parts of all bios */ - vcnt = (r1_bio->sectors +PAGE_SIZE /512 -1 ) >> (PAGE_SHIFT -9 ); + vcnt = (r1_bio->sectors +PAGE_SECTORS -1 ) >> (PAGE_SHIFT -9 );Maybe replace "
PAGE_SHIFT- 9" with "PAGE_SECTORS_SHIFT" too.Thanks,
Guoqing
Wow, there are a lot of them!
$ git grep -c 'PAGE_SHIFT - 9' arch/ia64/include/asm/pgtable.h:2 block/blk-settings.c:2 block/partition-generic.c:1 drivers/md/dm-table.c:1 drivers/md/raid1.c:1 drivers/md/raid10.c:1 drivers/md/raid5-cache.c:5 drivers/md/raid5.h:1 drivers/nvme/host/fc.c:1 drivers/nvme/target/loop.c:1 fs/erofs/internal.h:1 fs/ext2/dir.c:1 fs/libfs.c:1 fs/nilfs2/dir.c:1 mm/page_io.c:2 mm/swapfile.c:6
Signature · 2 lines
Matteo Croce per aspera ad upstream