microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

dm ingerity: pass size to dm_integrity_alloc_page_list() 

Pass size to dm_integrity_alloc_page_list().  This is needed so
following commits can pass a size that is different from
ic->journal_pages.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
Mikulas Patocka 2019-04-29 14:57:20 +02:00 коммит произвёл Mike Snitzer
Родитель 981e8a980d
Коммит d5027e0345
1 изменённых файлов: 15 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

30
drivers/md/dm-integrity.c
Просмотреть файл

@ -2677,37 +2677,37 @@ static void dm_integrity_set(struct dm_target *ti, struct dm_integrity_c *ic)
blk_queue_max_integrity_segments(disk->queue, UINT_MAX); blk_queue_max_integrity_segments(disk->queue, UINT_MAX);
} }
static void dm_integrity_free_page_list(struct dm_integrity_c *ic, struct page_list *pl) static void dm_integrity_free_page_list(struct page_list *pl)
{ {
unsigned i; unsigned i;
if (!pl) if (!pl)
return; return;
for (i = 0; i < ic->journal_pages; i++) for (i = 0; pl[i].page; i++)
if (pl[i].page) __free_page(pl[i].page);
__free_page(pl[i].page);
kvfree(pl); kvfree(pl);
} }
static struct page_list *dm_integrity_alloc_page_list(struct dm_integrity_c *ic) static struct page_list *dm_integrity_alloc_page_list(unsigned n_pages)
{ {
size_t page_list_desc_size = ic->journal_pages * sizeof(struct page_list);
struct page_list *pl; struct page_list *pl;
unsigned i; unsigned i;
pl = kvmalloc(page_list_desc_size, GFP_KERNEL | __GFP_ZERO); pl = kvmalloc_array(n_pages + 1, sizeof(struct page_list), GFP_KERNEL | __GFP_ZERO);
if (!pl) if (!pl)
return NULL; return NULL;
for (i = 0; i < ic->journal_pages; i++) { for (i = 0; i < n_pages; i++) {
pl[i].page = alloc_page(GFP_KERNEL); pl[i].page = alloc_page(GFP_KERNEL);
if (!pl[i].page) { if (!pl[i].page) {
dm_integrity_free_page_list(ic, pl); dm_integrity_free_page_list(pl);
return NULL; return NULL;
} }
if (i) if (i)
pl[i - 1].next = &pl[i]; pl[i - 1].next = &pl[i];
} }
pl[i].page = NULL;
pl[i].next = NULL;
return pl; return pl;
} }
@ -2860,7 +2860,7 @@ static int create_journal(struct dm_integrity_c *ic, char **error)
} }
ic->journal_pages = journal_pages; ic->journal_pages = journal_pages;
ic->journal = dm_integrity_alloc_page_list(ic); ic->journal = dm_integrity_alloc_page_list(ic->journal_pages);
if (!ic->journal) { if (!ic->journal) {
*error = "Could not allocate memory for journal"; *error = "Could not allocate memory for journal";
r = -ENOMEM; r = -ENOMEM;
@ -2892,7 +2892,7 @@ static int create_journal(struct dm_integrity_c *ic, char **error)
DEBUG_print("cipher %s, block size %u iv size %u\n", DEBUG_print("cipher %s, block size %u iv size %u\n",
ic->journal_crypt_alg.alg_string, blocksize, ivsize); ic->journal_crypt_alg.alg_string, blocksize, ivsize);
ic->journal_io = dm_integrity_alloc_page_list(ic); ic->journal_io = dm_integrity_alloc_page_list(ic->journal_pages);
if (!ic->journal_io) { if (!ic->journal_io) {
*error = "Could not allocate memory for journal io"; *error = "Could not allocate memory for journal io";
r = -ENOMEM; r = -ENOMEM;
@ -2916,7 +2916,7 @@ static int create_journal(struct dm_integrity_c *ic, char **error)
goto bad; goto bad;
} }
ic->journal_xor = dm_integrity_alloc_page_list(ic); ic->journal_xor = dm_integrity_alloc_page_list(ic->journal_pages);
if (!ic->journal_xor) { if (!ic->journal_xor) {
*error = "Could not allocate memory for journal xor"; *error = "Could not allocate memory for journal xor";
r = -ENOMEM; r = -ENOMEM;
@ -3573,9 +3573,9 @@ static void dm_integrity_dtr(struct dm_target *ti)
dm_put_device(ti, ic->dev); dm_put_device(ti, ic->dev);
if (ic->meta_dev) if (ic->meta_dev)
dm_put_device(ti, ic->meta_dev); dm_put_device(ti, ic->meta_dev);
dm_integrity_free_page_list(ic, ic->journal); dm_integrity_free_page_list(ic->journal);
dm_integrity_free_page_list(ic, ic->journal_io); dm_integrity_free_page_list(ic->journal_io);
dm_integrity_free_page_list(ic, ic->journal_xor); dm_integrity_free_page_list(ic->journal_xor);
if (ic->journal_scatterlist) if (ic->journal_scatterlist)
dm_integrity_free_journal_scatterlist(ic, ic->journal_scatterlist); dm_integrity_free_journal_scatterlist(ic, ic->journal_scatterlist);
if (ic->journal_io_scatterlist) if (ic->journal_io_scatterlist)