lib/test_hmm: reduce stack usage
PATCH 1/1 lib/test_hmm: reduce stack usage
From: Arnd Bergmann <[email protected]>
The various test ioctl handlers use arrays of 64 integers that add up to 1KiB of stack data, which in turn leads to exceeding the warning limit in some configurations:
lib/test_hmm.c:935:12: error: stack frame size (1408) exceeds limit (1280) in 'dmirror_migrate_to_device' [-Werror,-Wframe-larger-than]
Use half the size for these arrays, in order to stay under the warning limits. The code can already deal with arbitrary lengths, but this may be a little less efficient.
--- lib/test_hmm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
lib/test_hmm.c +7 -7
@@ -330,7 +330,7 @@ static int dmirror_fault(struct dmirror *dmirror, unsigned long start, {struct mm_struct *mm = dmirror->notifier.mm;unsigned long addr; -unsigned long pfns[64 ]; +unsigned long pfns[32 ];struct hmm_range range = { .notifier = &dmirror->notifier, .hmm_pfns = pfns,
@@ -879,8 +879,8 @@ static int dmirror_migrate_to_system(struct dmirror *dmirror,unsigned long size = cmd->npages <<PAGE_SHIFT ;struct mm_struct *mm = dmirror->notifier.mm;struct vm_area_struct *vma; -unsigned long src_pfns[64 ] = {0 }; -unsigned long dst_pfns[64 ] = {0 }; +unsigned long src_pfns[32 ] = {0 }; +unsigned long dst_pfns[32 ] = {0 };struct migrate_vma args = {0 };unsigned long next;int ret;
@@ -939,8 +939,8 @@ static int dmirror_migrate_to_device(struct dmirror *dmirror,unsigned long size = cmd->npages <<PAGE_SHIFT ;struct mm_struct *mm = dmirror->notifier.mm;struct vm_area_struct *vma; -unsigned long src_pfns[64 ] = {0 }; -unsigned long dst_pfns[64 ] = {0 }; +unsigned long src_pfns[32 ] = {0 }; +unsigned long dst_pfns[32 ] = {0 };struct dmirror_bounce bounce;struct migrate_vma args = {0 };unsigned long next;
@@ -1144,8 +1144,8 @@ static int dmirror_snapshot(struct dmirror *dmirror,unsigned long size = cmd->npages <<PAGE_SHIFT ;unsigned long addr;unsigned long next; -unsigned long pfns[64 ]; -unsigned char perm[64 ]; +unsigned long pfns[32 ]; +unsigned char perm[32 ];char __user *uptr;struct hmm_range range = { .hmm_pfns = pfns,
Signature · 1 line
2.39.5
Quoted 53 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The various test ioctl handlers use arrays of 64 integers that add up to 1KiB of stack data, which in turn leads to exceeding the warning limit in some configurations:
lib/test_hmm.c:935:12: error: stack frame size (1408) exceeds limit (1280) in 'dmirror_migrate_to_device' [-Werror,-Wframe-larger-than]Use half the size for these arrays, in order to stay under the warning limits. The code can already deal with arbitrary lengths, but this may be a little less efficient.
Signed-off-by Arnd Bergmann <[email protected]>--- lib/test_hmm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)lib/test_hmm.c +5
-5@@ -330,7 +330,7 @@ static int dmirror_fault(struct dmirror *dmirror, unsigned long start, {struct mm_struct *mm = dmirror->notifier.mm;unsigned long addr; -unsigned long pfns[64 ]; +unsigned long pfns[32 ];struct hmm_range range = { .notifier = &dmirror->notifier, .hmm_pfns = pfns,@@ -879,8 +879,8 @@ static int dmirror_migrate_to_system(struct dmirror *dmirror,unsigned long size = cmd->npages <<PAGE_SHIFT ;struct mm_struct *mm = dmirror->notifier.mm;struct vm_area_struct *vma; -unsigned long src_pfns[64 ] = {0 }; -unsigned long dst_pfns[64 ] = {0 }; +unsigned long src_pfns[32 ] = {0 }; +unsigned long dst_pfns[32 ] = {0 };struct migrate_vma args = {0 };unsigned long next;int ret;@@ -939,8 +939,8 @@ static int dmirror_migrate_to_device(struct dmirror *dmirror,unsigned long size = cmd->npages <<PAGE_SHIFT ;struct mm_struct *mm = dmirror->notifier.mm;struct vm_area_struct *vma; -unsigned long src_pfns[64 ] = {0 }; -unsigned long dst_pfns[64 ] = {0 }; +unsigned long src_pfns[32 ] = {0 }; +unsigned long dst_pfns[32 ] = {0 };struct dmirror_bounce bounce;struct migrate_vma args = {0 };unsigned long next;
lib/test_hmm.c static int dmirror_snapshot(struct dmirror *dmirror, · line 1151
Quoted 10 lines
lib/test_hmm.c +2
-2@@ -1144,8 +1144,8 @@ static int dmirror_snapshot(struct dmirror *dmirror,unsigned long size = cmd->npages <<PAGE_SHIFT ;unsigned long addr;unsigned long next; -unsigned long pfns[64 ]; -unsigned char perm[64 ]; +unsigned long pfns[32 ]; +unsigned char perm[32 ];char __user *uptr;struct hmm_range range = { .hmm_pfns = pfns,
Should we just add a define for the common value (now 32)?
TEST_HMM_NR_PFN or sth like that.
Signature · 3 lines
Cheers, David / dhildenb