Skip to content

Commit 01aa2f7

Browse files
jcfaraccojcfaracco
committed
Merge: dm: sync with upstream v6.14
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/685 JIRA: https://issues.redhat.com/browse/RHEL-84777 JIRA: https://issues.redhat.com/browse/RHEL-59337 Tested: lvm2-testsuite and cryptsetup tests Upstream Status: kernel/git/torvalds/linux.git Pull in various dm changes from upstream. Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Approved-by: Matthew Sakai <msakai@redhat.com> Approved-by: Heinz Mauelshagen <heinzm@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Julio Faracco <jfaracco@redhat.com>
2 parents ce07a50 + 5ac437f commit 01aa2f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+288
-399
lines changed

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

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -198,15 +198,6 @@ int dm_bio_detain(struct dm_bio_prison *prison,
198198
}
199199
EXPORT_SYMBOL_GPL(dm_bio_detain);
200200

201-
int dm_get_cell(struct dm_bio_prison *prison,
202-
struct dm_cell_key *key,
203-
struct dm_bio_prison_cell *cell_prealloc,
204-
struct dm_bio_prison_cell **cell_result)
205-
{
206-
return bio_detain(prison, key, NULL, cell_prealloc, cell_result);
207-
}
208-
EXPORT_SYMBOL_GPL(dm_get_cell);
209-
210201
/*
211202
* @inmates must have been initialised prior to this call
212203
*/
@@ -288,32 +279,6 @@ void dm_cell_visit_release(struct dm_bio_prison *prison,
288279
}
289280
EXPORT_SYMBOL_GPL(dm_cell_visit_release);
290281

291-
static int __promote_or_release(struct rb_root *root,
292-
struct dm_bio_prison_cell *cell)
293-
{
294-
if (bio_list_empty(&cell->bios)) {
295-
rb_erase(&cell->node, root);
296-
return 1;
297-
}
298-
299-
cell->holder = bio_list_pop(&cell->bios);
300-
return 0;
301-
}
302-
303-
int dm_cell_promote_or_release(struct dm_bio_prison *prison,
304-
struct dm_bio_prison_cell *cell)
305-
{
306-
int r;
307-
unsigned l = lock_nr(&cell->key, prison->num_locks);
308-
309-
spin_lock_irq(&prison->regions[l].lock);
310-
r = __promote_or_release(&prison->regions[l].cell, cell);
311-
spin_unlock_irq(&prison->regions[l].lock);
312-
313-
return r;
314-
}
315-
EXPORT_SYMBOL_GPL(dm_cell_promote_or_release);
316-
317282
/*----------------------------------------------------------------*/
318283

319284
#define DEFERRED_SET_SIZE 64

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,6 @@ struct dm_bio_prison_cell *dm_bio_prison_alloc_cell(struct dm_bio_prison *prison
7272
void dm_bio_prison_free_cell(struct dm_bio_prison *prison,
7373
struct dm_bio_prison_cell *cell);
7474

75-
/*
76-
* Creates, or retrieves a cell that overlaps the given key.
77-
*
78-
* Returns 1 if pre-existing cell returned, zero if new cell created using
79-
* @cell_prealloc.
80-
*/
81-
int dm_get_cell(struct dm_bio_prison *prison,
82-
struct dm_cell_key *key,
83-
struct dm_bio_prison_cell *cell_prealloc,
84-
struct dm_bio_prison_cell **cell_result);
85-
8675
/*
8776
* Returns false if key is beyond BIO_PRISON_MAX_RANGE or spans a boundary.
8877
*/
@@ -117,19 +106,6 @@ void dm_cell_visit_release(struct dm_bio_prison *prison,
117106
void (*visit_fn)(void *, struct dm_bio_prison_cell *),
118107
void *context, struct dm_bio_prison_cell *cell);
119108

120-
/*
121-
* Rather than always releasing the prisoners in a cell, the client may
122-
* want to promote one of them to be the new holder. There is a race here
123-
* though between releasing an empty cell, and other threads adding new
124-
* inmates. So this function makes the decision with its lock held.
125-
*
126-
* This function can have two outcomes:
127-
* i) An inmate is promoted to be the holder of the cell (return value of 0).
128-
* ii) The cell has no inmate for promotion and is released (return value of 1).
129-
*/
130-
int dm_cell_promote_or_release(struct dm_bio_prison *prison,
131-
struct dm_bio_prison_cell *cell);
132-
133109
/*----------------------------------------------------------------*/
134110

135111
/*

‎drivers/md/dm-bufio.c‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,10 @@ static struct lru_entry *lru_evict(struct lru *lru, le_predicate pred, void *con
318318
*/
319319
enum data_mode {
320320
DATA_MODE_SLAB = 0,
321-
DATA_MODE_GET_FREE_PAGES = 1,
322-
DATA_MODE_VMALLOC = 2,
323-
DATA_MODE_LIMIT = 3
321+
DATA_MODE_KMALLOC = 1,
322+
DATA_MODE_GET_FREE_PAGES = 2,
323+
DATA_MODE_VMALLOC = 3,
324+
DATA_MODE_LIMIT = 4
324325
};
325326

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

10631064
static unsigned long dm_bufio_peak_allocated;
10641065
static unsigned long dm_bufio_allocated_kmem_cache;
1066+
static unsigned long dm_bufio_allocated_kmalloc;
10651067
static unsigned long dm_bufio_allocated_get_free_pages;
10661068
static unsigned long dm_bufio_allocated_vmalloc;
10671069
static unsigned long dm_bufio_current_allocated;
@@ -1104,6 +1106,7 @@ static void adjust_total_allocated(struct dm_buffer *b, bool unlink)
11041106

11051107
static unsigned long * const class_ptr[DATA_MODE_LIMIT] = {
11061108
&dm_bufio_allocated_kmem_cache,
1109+
&dm_bufio_allocated_kmalloc,
11071110
&dm_bufio_allocated_get_free_pages,
11081111
&dm_bufio_allocated_vmalloc,
11091112
};
@@ -1181,6 +1184,11 @@ static void *alloc_buffer_data(struct dm_bufio_client *c, gfp_t gfp_mask,
11811184
return kmem_cache_alloc(c->slab_cache, gfp_mask);
11821185
}
11831186

1187+
if (unlikely(c->block_size < PAGE_SIZE)) {
1188+
*data_mode = DATA_MODE_KMALLOC;
1189+
return kmalloc(c->block_size, gfp_mask | __GFP_RECLAIMABLE);
1190+
}
1191+
11841192
if (c->block_size <= KMALLOC_MAX_SIZE &&
11851193
gfp_mask & __GFP_NORETRY) {
11861194
*data_mode = DATA_MODE_GET_FREE_PAGES;
@@ -1204,6 +1212,10 @@ static void free_buffer_data(struct dm_bufio_client *c,
12041212
kmem_cache_free(c->slab_cache, data);
12051213
break;
12061214

1215+
case DATA_MODE_KMALLOC:
1216+
kfree(data);
1217+
break;
1218+
12071219
case DATA_MODE_GET_FREE_PAGES:
12081220
free_pages((unsigned long)data,
12091221
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
25192531
goto bad_dm_io;
25202532
}
25212533

2522-
if (block_size <= KMALLOC_MAX_SIZE &&
2523-
(block_size < PAGE_SIZE || !is_power_of_2(block_size))) {
2534+
if (block_size <= KMALLOC_MAX_SIZE && !is_power_of_2(block_size)) {
25242535
unsigned int align = min(1U << __ffs(block_size), (unsigned int)PAGE_SIZE);
25252536

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

29042915
dm_bufio_allocated_kmem_cache = 0;
2916+
dm_bufio_allocated_kmalloc = 0;
29052917
dm_bufio_allocated_get_free_pages = 0;
29062918
dm_bufio_allocated_vmalloc = 0;
29072919
dm_bufio_current_allocated = 0;
@@ -2990,6 +3002,9 @@ MODULE_PARM_DESC(peak_allocated_bytes, "Tracks the maximum allocated memory");
29903002
module_param_named(allocated_kmem_cache_bytes, dm_bufio_allocated_kmem_cache, ulong, 0444);
29913003
MODULE_PARM_DESC(allocated_kmem_cache_bytes, "Memory allocated with kmem_cache_alloc");
29923004

3005+
module_param_named(allocated_kmalloc_bytes, dm_bufio_allocated_kmalloc, ulong, 0444);
3006+
MODULE_PARM_DESC(allocated_kmalloc_bytes, "Memory allocated with kmalloc_alloc");
3007+
29933008
module_param_named(allocated_get_free_pages_bytes, dm_bufio_allocated_get_free_pages, ulong, 0444);
29943009
MODULE_PARM_DESC(allocated_get_free_pages_bytes, "Memory allocated with get_free_pages");
29953010

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,6 @@ static void update_stats(struct background_tracker *b, struct policy_work *w, in
143143
}
144144
}
145145

146-
unsigned int btracker_nr_writebacks_queued(struct background_tracker *b)
147-
{
148-
return atomic_read(&b->pending_writebacks);
149-
}
150-
EXPORT_SYMBOL_GPL(btracker_nr_writebacks_queued);
151-
152146
unsigned int btracker_nr_demotions_queued(struct background_tracker *b)
153147
{
154148
return atomic_read(&b->pending_demotes);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ struct background_tracker *btracker_create(unsigned int max_work);
5050
*/
5151
void btracker_destroy(struct background_tracker *b);
5252

53-
unsigned int btracker_nr_writebacks_queued(struct background_tracker *b);
5453
unsigned int btracker_nr_demotions_queued(struct background_tracker *b);
5554

5655
/*

‎drivers/md/dm-cache-metadata.c‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,15 +1218,6 @@ int dm_cache_load_discards(struct dm_cache_metadata *cmd,
12181218
return r;
12191219
}
12201220

1221-
int dm_cache_size(struct dm_cache_metadata *cmd, dm_cblock_t *result)
1222-
{
1223-
READ_LOCK(cmd);
1224-
*result = cmd->cache_blocks;
1225-
READ_UNLOCK(cmd);
1226-
1227-
return 0;
1228-
}
1229-
12301221
static int __remove(struct dm_cache_metadata *cmd, dm_cblock_t cblock)
12311222
{
12321223
int r;
@@ -1507,30 +1498,6 @@ int dm_cache_load_mappings(struct dm_cache_metadata *cmd,
15071498
return r;
15081499
}
15091500

1510-
static int __dump_mapping(void *context, uint64_t cblock, void *leaf)
1511-
{
1512-
__le64 value;
1513-
dm_oblock_t oblock;
1514-
unsigned int flags;
1515-
1516-
memcpy(&value, leaf, sizeof(value));
1517-
unpack_value(value, &oblock, &flags);
1518-
1519-
return 0;
1520-
}
1521-
1522-
static int __dump_mappings(struct dm_cache_metadata *cmd)
1523-
{
1524-
return dm_array_walk(&cmd->info, cmd->root, __dump_mapping, NULL);
1525-
}
1526-
1527-
void dm_cache_dump(struct dm_cache_metadata *cmd)
1528-
{
1529-
READ_LOCK_VOID(cmd);
1530-
__dump_mappings(cmd);
1531-
READ_UNLOCK(cmd);
1532-
}
1533-
15341501
int dm_cache_changed_this_transaction(struct dm_cache_metadata *cmd)
15351502
{
15361503
int r;

‎drivers/md/dm-cache-metadata.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ void dm_cache_metadata_close(struct dm_cache_metadata *cmd);
7171
* origin blocks to map to.
7272
*/
7373
int dm_cache_resize(struct dm_cache_metadata *cmd, dm_cblock_t new_cache_size);
74-
int dm_cache_size(struct dm_cache_metadata *cmd, dm_cblock_t *result);
7574

7675
int dm_cache_discard_bitset_resize(struct dm_cache_metadata *cmd,
7776
sector_t discard_block_size,
@@ -123,8 +122,6 @@ int dm_cache_get_free_metadata_block_count(struct dm_cache_metadata *cmd,
123122
int dm_cache_get_metadata_dev_size(struct dm_cache_metadata *cmd,
124123
dm_block_t *result);
125124

126-
void dm_cache_dump(struct dm_cache_metadata *cmd);
127-
128125
/*
129126
* The policy is invited to save a 32bit hint value for every cblock (eg,
130127
* for a hit count). These are stored against the policy name. If

0 commit comments

Comments
 (0)