History

PM: hibernate: Use atomic64_t for compressed_size variable

`compressed_size` can overflow, showing nonsensical values. Change from `atomic_t` to `atomic64_t` to prevent overflow.

Mario Limonciello (AMD) committed 1 year ago

Commit 66ededc1 parent 62b9ca11 file · +5 −5Browse files

Unified · Split

kernel/power/swap.c+5−5
@@ -635,7 +635,7 @@ struct cmp_data { · 634 unmodified lines
635};635};
636 636
637/* Indicates the image size after compression */637/* Indicates the image size after compression */
638static atomic_t compressed_size = ATOMIC_INIT(0);638static atomic64_t compressed_size = ATOMIC_INIT(0);
639 639
640/*640/*
641 * Compression function that runs in its own thread.641 * Compression function that runs in its own thread.
@@ -664,7 +664,7 @@ static int compress_threadfn(void *data) · 22 unmodified lines
664 d->ret = crypto_acomp_compress(d->cr);664 d->ret = crypto_acomp_compress(d->cr);
665 d->cmp_len = d->cr->dlen;665 d->cmp_len = d->cr->dlen;
666 666
667 atomic_set(&compressed_size, atomic_read(&compressed_size) + d->cmp_len);667 atomic64_add(d->cmp_len, &compressed_size);
668 atomic_set_release(&d->stop, 1);668 atomic_set_release(&d->stop, 1);
669 wake_up(&d->done);669 wake_up(&d->done);
670 }670 }
@@ -696,7 +696,7 @@ static int save_compressed_image(struct swap_map_handle *handle, · 25 unmodified lines
696 696
697 hib_init_batch(&hb);697 hib_init_batch(&hb);
698 698
699 atomic_set(&compressed_size, 0);699 atomic64_set(&compressed_size, 0);
700 700
701 /*701 /*
702 * We'll limit the number of threads for compression to limit memory702 * We'll limit the number of threads for compression to limit memory
@@ -879,8 +879,8 @@ out_finish: · 176 unmodified lines
879 ret = err2;879 ret = err2;
880 if (!ret) {880 if (!ret) {
881 swsusp_show_speed(start, stop, nr_to_write, "Wrote");881 swsusp_show_speed(start, stop, nr_to_write, "Wrote");
882 pr_info("Image size after compression: %d kbytes\n",882 pr_info("Image size after compression: %lld kbytes\n",
883 (atomic_read(&compressed_size) / 1024));883 (atomic64_read(&compressed_size) / 1024));
884 pr_info("Image saving done\n");884 pr_info("Image saving done\n");
885 } else {885 } else {
886 pr_err("Image saving failed: %d\n", ret);886 pr_err("Image saving failed: %d\n", ret);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t