Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dad38d3 authored by Matias Bjørling's avatar Matias Bjørling Committed by Jens Axboe
Browse files

null_blk: move shared definitions to header file 



Split the null_blk device driver, such that it can prepare for
zoned block interface support.

Signed-off-by: default avatarMatias Bjørling <matias.bjorling@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e9a83853

drivers/block/null_blk.c

+1 −75
Original line number Diff line number Diff line
@@ -7,14 +7,8 @@ 
#include <linux/moduleparam.h>

#include <linux/sched.h>

#include <linux/fs.h>

#include <linux/blkdev.h>

#include <linux/init.h>

#include <linux/slab.h>

#include <linux/blk-mq.h>

#include <linux/hrtimer.h>

#include <linux/configfs.h>

#include <linux/badblocks.h>

#include <linux/fault-inject.h>

#include "null_blk.h"



#define PAGE_SECTORS_SHIFT	(PAGE_SHIFT - SECTOR_SHIFT)

#define PAGE_SECTORS		(1 << PAGE_SECTORS_SHIFT)
@@ -35,28 +29,6 @@ static inline u64 mb_per_tick(int mbps) 
	return (1 << 20) / TICKS_PER_SEC * ((u64) mbps);

}



struct nullb_cmd {

	struct list_head list;

	struct llist_node ll_list;

	struct __call_single_data csd;

	struct request *rq;

	struct bio *bio;

	unsigned int tag;

	blk_status_t error;

	struct nullb_queue *nq;

	struct hrtimer timer;

};



struct nullb_queue {

	unsigned long *tag_map;

	wait_queue_head_t wait;

	unsigned int queue_depth;

	struct nullb_device *dev;

	unsigned int requeue_selection;



	struct nullb_cmd *cmds;

};



/*

 * Status flags for nullb_device.

 *
@@ -92,52 +64,6 @@ struct nullb_page { 
#define NULLB_PAGE_LOCK (MAP_SZ - 1)

#define NULLB_PAGE_FREE (MAP_SZ - 2)



struct nullb_device {

	struct nullb *nullb;

	struct config_item item;

	struct radix_tree_root data; /* data stored in the disk */

	struct radix_tree_root cache; /* disk cache data */

	unsigned long flags; /* device flags */

	unsigned int curr_cache;

	struct badblocks badblocks;



	unsigned long size; /* device size in MB */

	unsigned long completion_nsec; /* time in ns to complete a request */

	unsigned long cache_size; /* disk cache size in MB */

	unsigned int submit_queues; /* number of submission queues */

	unsigned int home_node; /* home node for the device */

	unsigned int queue_mode; /* block interface */

	unsigned int blocksize; /* block size */

	unsigned int irqmode; /* IRQ completion handler */

	unsigned int hw_queue_depth; /* queue depth */

	unsigned int index; /* index of the disk, only valid with a disk */

	unsigned int mbps; /* Bandwidth throttle cap (in MB/s) */

	bool blocking; /* blocking blk-mq device */

	bool use_per_node_hctx; /* use per-node allocation for hardware context */

	bool power; /* power on/off the device */

	bool memory_backed; /* if data is stored in memory */

	bool discard; /* if support discard */

};



struct nullb {

	struct nullb_device *dev;

	struct list_head list;

	unsigned int index;

	struct request_queue *q;

	struct gendisk *disk;

	struct blk_mq_tag_set *tag_set;

	struct blk_mq_tag_set __tag_set;

	unsigned int queue_depth;

	atomic_long_t cur_bytes;

	struct hrtimer bw_timer;

	unsigned long cache_flush_pos;

	spinlock_t lock;



	struct nullb_queue *queues;

	unsigned int nr_queues;

	char disk_name[DISK_NAME_LEN];

};



static LIST_HEAD(nullb_list);

static struct mutex lock;

static int null_major;

drivers/block/null_blk.h

0 → 100644
+80 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __BLK_NULL_BLK_H

#define __BLK_NULL_BLK_H



#include <linux/blkdev.h>

#include <linux/slab.h>

#include <linux/blk-mq.h>

#include <linux/hrtimer.h>

#include <linux/configfs.h>

#include <linux/badblocks.h>

#include <linux/fault-inject.h>



struct nullb_cmd {

	struct list_head list;

	struct llist_node ll_list;

	struct __call_single_data csd;

	struct request *rq;

	struct bio *bio;

	unsigned int tag;

	blk_status_t error;

	struct nullb_queue *nq;

	struct hrtimer timer;

};



struct nullb_queue {

	unsigned long *tag_map;

	wait_queue_head_t wait;

	unsigned int queue_depth;

	struct nullb_device *dev;

	unsigned int requeue_selection;



	struct nullb_cmd *cmds;

};



struct nullb_device {

	struct nullb *nullb;

	struct config_item item;

	struct radix_tree_root data; /* data stored in the disk */

	struct radix_tree_root cache; /* disk cache data */

	unsigned long flags; /* device flags */

	unsigned int curr_cache;

	struct badblocks badblocks;



	unsigned long size; /* device size in MB */

	unsigned long completion_nsec; /* time in ns to complete a request */

	unsigned long cache_size; /* disk cache size in MB */

	unsigned int submit_queues; /* number of submission queues */

	unsigned int home_node; /* home node for the device */

	unsigned int queue_mode; /* block interface */

	unsigned int blocksize; /* block size */

	unsigned int irqmode; /* IRQ completion handler */

	unsigned int hw_queue_depth; /* queue depth */

	unsigned int index; /* index of the disk, only valid with a disk */

	unsigned int mbps; /* Bandwidth throttle cap (in MB/s) */

	bool blocking; /* blocking blk-mq device */

	bool use_per_node_hctx; /* use per-node allocation for hardware context */

	bool power; /* power on/off the device */

	bool memory_backed; /* if data is stored in memory */

	bool discard; /* if support discard */

};



struct nullb {

	struct nullb_device *dev;

	struct list_head list;

	unsigned int index;

	struct request_queue *q;

	struct gendisk *disk;

	struct blk_mq_tag_set *tag_set;

	struct blk_mq_tag_set __tag_set;

	unsigned int queue_depth;

	atomic_long_t cur_bytes;

	struct hrtimer bw_timer;

	unsigned long cache_flush_pos;

	spinlock_t lock;



	struct nullb_queue *queues;

	unsigned int nr_queues;

	char disk_name[DISK_NAME_LEN];

};

#endif /* __NULL_BLK_H */