Commit 7eef7e30 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-6.13/dm-changes' of... 

Merge tag 'for-6.13/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull device mapper updates from Mikulas Patocka:

 - remove unused functions and variables

 - rate-limit error messages in syslog

 - fix typo

 - remove u64 alignment requirement for murmurhash

 - reset bi_ioprio to the default for dm-vdo

 - add support for get_unique_id

 - Add missing destroy_work_on_stack() to dm-thin

 - use kmalloc to allocate power-of-two sized buffers in bufio

* tag 'for-6.13/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm-verity: remove the unused "data_start" variable
  dm-bufio: use kmalloc to allocate power-of-two sized buffers
  dm thin: Add missing destroy_work_on_stack()
  dm: add support for get_unique_id
  dm vdo: fix function doc comment formatting
  dm vdo int-map: remove unused parameters
  dm-vdo: reset bi_ioprio to the default value when the bio is reset
  dm-vdo murmurhash: remove u64 alignment requirement
  dm: Fix typo in error message
  dm ioctl: rate limit a couple of ioctl based error messages
  dm vdo: Remove unused uds_compute_index_size
  dm vdo: Remove unused functions
  dm: zoned: Remove unused functions
  dm: Remove unused dm_table_bio_based
  dm: Remove unused dm_set_md_type
  dm cache: Remove unused functions in bio-prison-v1
  dm cache: Remove unused dm_cache_size
  dm cache: Remove unused dm_cache_dump
  dm cache: Remove unused btracker_nr_writebacks_queued
parents 0637a68b a573e404

drivers/md/dm-bio-prison-v1.c

+0 −35
Original line number Diff line number Diff line
@@ -198,15 +198,6 @@ int dm_bio_detain(struct dm_bio_prison *prison, 
}

EXPORT_SYMBOL_GPL(dm_bio_detain);



int dm_get_cell(struct dm_bio_prison *prison,

		struct dm_cell_key *key,

		struct dm_bio_prison_cell *cell_prealloc,

		struct dm_bio_prison_cell **cell_result)

{

	return bio_detain(prison, key, NULL, cell_prealloc, cell_result);

}

EXPORT_SYMBOL_GPL(dm_get_cell);



/*

 * @inmates must have been initialised prior to this call

 */
@@ -288,32 +279,6 @@ void dm_cell_visit_release(struct dm_bio_prison *prison, 
}

EXPORT_SYMBOL_GPL(dm_cell_visit_release);



static int __promote_or_release(struct rb_root *root,

				struct dm_bio_prison_cell *cell)

{

	if (bio_list_empty(&cell->bios)) {

		rb_erase(&cell->node, root);

		return 1;

	}



	cell->holder = bio_list_pop(&cell->bios);

	return 0;

}



int dm_cell_promote_or_release(struct dm_bio_prison *prison,

			       struct dm_bio_prison_cell *cell)

{

	int r;

	unsigned l = lock_nr(&cell->key, prison->num_locks);



	spin_lock_irq(&prison->regions[l].lock);

	r = __promote_or_release(&prison->regions[l].cell, cell);

	spin_unlock_irq(&prison->regions[l].lock);



	return r;

}

EXPORT_SYMBOL_GPL(dm_cell_promote_or_release);



/*----------------------------------------------------------------*/



#define DEFERRED_SET_SIZE 64

drivers/md/dm-bio-prison-v1.h

+0 −24
Original line number Diff line number Diff line
@@ -72,17 +72,6 @@ struct dm_bio_prison_cell *dm_bio_prison_alloc_cell(struct dm_bio_prison *prison 
void dm_bio_prison_free_cell(struct dm_bio_prison *prison,

			     struct dm_bio_prison_cell *cell);



/*

 * Creates, or retrieves a cell that overlaps the given key.

 *

 * Returns 1 if pre-existing cell returned, zero if new cell created using

 * @cell_prealloc.

 */

int dm_get_cell(struct dm_bio_prison *prison,

		struct dm_cell_key *key,

		struct dm_bio_prison_cell *cell_prealloc,

		struct dm_bio_prison_cell **cell_result);



/*

 * Returns false if key is beyond BIO_PRISON_MAX_RANGE or spans a boundary.

 */
@@ -117,19 +106,6 @@ void dm_cell_visit_release(struct dm_bio_prison *prison, 
			   void (*visit_fn)(void *, struct dm_bio_prison_cell *),

			   void *context, struct dm_bio_prison_cell *cell);



/*

 * Rather than always releasing the prisoners in a cell, the client may

 * want to promote one of them to be the new holder.  There is a race here

 * though between releasing an empty cell, and other threads adding new

 * inmates.  So this function makes the decision with its lock held.

 *

 * This function can have two outcomes:

 * i) An inmate is promoted to be the holder of the cell (return value of 0).

 * ii) The cell has no inmate for promotion and is released (return value of 1).

 */

int dm_cell_promote_or_release(struct dm_bio_prison *prison,

			       struct dm_bio_prison_cell *cell);



/*----------------------------------------------------------------*/



/*

drivers/md/dm-bufio.c

+20 −5
Original line number Diff line number Diff line
@@ -318,9 +318,10 @@ static struct lru_entry *lru_evict(struct lru *lru, le_predicate pred, void *con 
 */

enum data_mode {

	DATA_MODE_SLAB = 0,

	DATA_MODE_GET_FREE_PAGES = 1,

	DATA_MODE_VMALLOC = 2,

	DATA_MODE_LIMIT = 3

	DATA_MODE_KMALLOC = 1,

	DATA_MODE_GET_FREE_PAGES = 2,

	DATA_MODE_VMALLOC = 3,

	DATA_MODE_LIMIT = 4

};



struct dm_buffer {
@@ -1062,6 +1063,7 @@ static unsigned long dm_bufio_retain_bytes = DM_BUFIO_DEFAULT_RETAIN_BYTES; 


static unsigned long dm_bufio_peak_allocated;

static unsigned long dm_bufio_allocated_kmem_cache;

static unsigned long dm_bufio_allocated_kmalloc;

static unsigned long dm_bufio_allocated_get_free_pages;

static unsigned long dm_bufio_allocated_vmalloc;

static unsigned long dm_bufio_current_allocated;
@@ -1104,6 +1106,7 @@ static void adjust_total_allocated(struct dm_buffer *b, bool unlink) 


	static unsigned long * const class_ptr[DATA_MODE_LIMIT] = {

		&dm_bufio_allocated_kmem_cache,

		&dm_bufio_allocated_kmalloc,

		&dm_bufio_allocated_get_free_pages,

		&dm_bufio_allocated_vmalloc,

	};
@@ -1181,6 +1184,11 @@ static void *alloc_buffer_data(struct dm_bufio_client *c, gfp_t gfp_mask, 
		return kmem_cache_alloc(c->slab_cache, gfp_mask);

	}



	if (unlikely(c->block_size < PAGE_SIZE)) {

		*data_mode = DATA_MODE_KMALLOC;

		return kmalloc(c->block_size, gfp_mask | __GFP_RECLAIMABLE);

	}



	if (c->block_size <= KMALLOC_MAX_SIZE &&

	    gfp_mask & __GFP_NORETRY) {

		*data_mode = DATA_MODE_GET_FREE_PAGES;
@@ -1204,6 +1212,10 @@ static void free_buffer_data(struct dm_bufio_client *c, 
		kmem_cache_free(c->slab_cache, data);

		break;



	case DATA_MODE_KMALLOC:

		kfree(data);

		break;



	case DATA_MODE_GET_FREE_PAGES:

		free_pages((unsigned long)data,

			   c->sectors_per_block_bits - (PAGE_SHIFT - SECTOR_SHIFT));
@@ -2519,8 +2531,7 @@ struct dm_bufio_client *dm_bufio_client_create(struct block_device *bdev, unsign 
		goto bad_dm_io;

	}



	if (block_size <= KMALLOC_MAX_SIZE &&

	    (block_size < PAGE_SIZE || !is_power_of_2(block_size))) {

	if (block_size <= KMALLOC_MAX_SIZE && !is_power_of_2(block_size)) {

		unsigned int align = min(1U << __ffs(block_size), (unsigned int)PAGE_SIZE);



		snprintf(slab_name, sizeof(slab_name), "dm_bufio_cache-%u-%u",
@@ -2902,6 +2913,7 @@ static int __init dm_bufio_init(void) 
	__u64 mem;



	dm_bufio_allocated_kmem_cache = 0;

	dm_bufio_allocated_kmalloc = 0;

	dm_bufio_allocated_get_free_pages = 0;

	dm_bufio_allocated_vmalloc = 0;

	dm_bufio_current_allocated = 0;
@@ -2990,6 +3002,9 @@ MODULE_PARM_DESC(peak_allocated_bytes, "Tracks the maximum allocated memory"); 
module_param_named(allocated_kmem_cache_bytes, dm_bufio_allocated_kmem_cache, ulong, 0444);

MODULE_PARM_DESC(allocated_kmem_cache_bytes, "Memory allocated with kmem_cache_alloc");



module_param_named(allocated_kmalloc_bytes, dm_bufio_allocated_kmalloc, ulong, 0444);

MODULE_PARM_DESC(allocated_kmalloc_bytes, "Memory allocated with kmalloc_alloc");



module_param_named(allocated_get_free_pages_bytes, dm_bufio_allocated_get_free_pages, ulong, 0444);

MODULE_PARM_DESC(allocated_get_free_pages_bytes, "Memory allocated with get_free_pages");

drivers/md/dm-cache-background-tracker.c

+0 −6
Original line number Diff line number Diff line
@@ -143,12 +143,6 @@ static void update_stats(struct background_tracker *b, struct policy_work *w, in 
	}

}



unsigned int btracker_nr_writebacks_queued(struct background_tracker *b)

{

	return atomic_read(&b->pending_writebacks);

}

EXPORT_SYMBOL_GPL(btracker_nr_writebacks_queued);



unsigned int btracker_nr_demotions_queued(struct background_tracker *b)

{

	return atomic_read(&b->pending_demotes);

drivers/md/dm-cache-background-tracker.h

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ struct background_tracker *btracker_create(unsigned int max_work); 
 */

void btracker_destroy(struct background_tracker *b);



unsigned int btracker_nr_writebacks_queued(struct background_tracker *b);

unsigned int btracker_nr_demotions_queued(struct background_tracker *b);



/*