kexec: use min_t/max_t to avoid 'if (foo == bar)' thing
Subsystems (3)
PATCH 1/1 kexec: use min_t/max_t to avoid 'if (foo == bar)' thing
This is just a tweak: using min_t/max_t to avoid `if (foo = bar)' thing.
--- kernel/kexec.c | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-)
kernel/kexec.c +5 -15
@@ -822,13 +822,8 @@ static int kimage_load_normal_segment(struct kimage *image,/* Start with a clear page */ clear_page (ptr); ptr += maddr & ~PAGE_MASK ; - mchunk =PAGE_SIZE - (maddr & ~PAGE_MASK ); -if (mchunk > mbytes) - mchunk = mbytes; - - uchunk = mchunk; -if (uchunk > ubytes) - uchunk = ubytes; + mchunk =min_t (size_t, mbytes,PAGE_SIZE - (maddr & ~PAGE_MASK )); + uchunk =min_t (size_t, ubytes, mchunk); result =copy_from_user (ptr, buf, uchunk);kunmap (page);
@@ -874,13 +869,9 @@ static int kimage_load_crash_segment(struct kimage *image, } ptr =kmap (page); ptr += maddr & ~PAGE_MASK ; - mchunk =PAGE_SIZE - (maddr & ~PAGE_MASK ); -if (mchunk > mbytes) - mchunk = mbytes; - - uchunk = mchunk; + mchunk =min_t (size_t, mbytes,PAGE_SIZE - (maddr & ~PAGE_MASK )); + uchunk =min_t (size_t, ubytes, mchunk);if (uchunk > ubytes) { - uchunk = ubytes;/* Zero the trailing part of the page */ memset (ptr + uchunk,0 , mchunk - uchunk); }
@@ -1461,8 +1452,7 @@ void vmcoreinfo_append_str(const char *fmt, ...) r =vsnprintf (buf,sizeof (buf), fmt, args);va_end (args); -if (r + vmcoreinfo_size > vmcoreinfo_max_size) - r = vmcoreinfo_max_size - vmcoreinfo_size; + r =min_t (size_t, r, vmcoreinfo_max_size - vmcoreinfo_size);memcpy (&vmcoreinfo_data[vmcoreinfo_size], buf, r);
Signature · 1 line
1.7.1
Quoted 1 line · Zhang Yanfei
This is just a tweak: using min_t/max_t to avoid `if (foo = bar)' thing.
- s/=/==/; s/[/]max_t//
But in any case the change is more than that.
I'd be happier with something like:
kexec: Use min_t to simplify logic
Quoted 29 lines
Cc "Eric W. Biederman" <[email protected]>Cc Andrew Morton <[email protected]>Cc Simon Horman <[email protected]>Signed-off-by Zhang Yanfei <[email protected]>--- kernel/kexec.c | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-)kernel/kexec.c +2
-7@@ -822,13 +822,8 @@ static int kimage_load_normal_segment(struct kimage *image,/* Start with a clear page */ clear_page (ptr); ptr += maddr & ~PAGE_MASK ; - mchunk =PAGE_SIZE - (maddr & ~PAGE_MASK ); -if (mchunk > mbytes) - mchunk = mbytes; - - uchunk = mchunk; -if (uchunk > ubytes) - uchunk = ubytes; + mchunk =min_t (size_t, mbytes,PAGE_SIZE - (maddr & ~PAGE_MASK )); + uchunk =min_t (size_t, ubytes, mchunk); result =copy_from_user (ptr, buf, uchunk);kunmap (page);
kernel/kexec.c static int kimage_load_crash_segment(struct kimage *image, · line 873
Quoted 10 lines
kernel/kexec.c +2
-5@@ -874,13 +869,9 @@ static int kimage_load_crash_segment(struct kimage *image, } ptr =kmap (page); ptr += maddr & ~PAGE_MASK ; - mchunk =PAGE_SIZE - (maddr & ~PAGE_MASK ); -if (mchunk > mbytes) - mchunk = mbytes; - - uchunk = mchunk; + mchunk =min_t (size_t, mbytes,PAGE_SIZE - (maddr & ~PAGE_MASK )); + uchunk =min_t (size_t, ubytes, mchunk);
The line above means that uchunk can now never be greater than ubytes.
kernel/kexec.c static int kimage_load_crash_segment(struct kimage *image, · line 874
Quoted 1 line
kernel/kexec.c +0
-0if (uchunk > ubytes) {
So the following seems more appropriate to me:
if (mchunk > uchunk) {Quoted 17 lines
kernel/kexec.c +1
-3- uchunk = ubytes;/* Zero the trailing part of the page */ memset (ptr + uchunk,0 , mchunk - uchunk); }@@ -1461,8 +1452,7 @@ void vmcoreinfo_append_str(const char *fmt, ...) r =vsnprintf (buf,sizeof (buf), fmt, args);va_end (args); -if (r + vmcoreinfo_size > vmcoreinfo_max_size) - r = vmcoreinfo_max_size - vmcoreinfo_size; + r =min_t (size_t, r, vmcoreinfo_max_size - vmcoreinfo_size);memcpy (&vmcoreinfo_data[vmcoreinfo_size], buf, r);Signature · 1 line
1.7.1
Quoted 10 lines · Simon Horman
Quoted 1 line · Zhang Yanfei
This is just a tweak: using min_t/max_t to avoid `if (foo = bar)' thing.
- s/=/==/; s/[/]max_t//
But in any case the change is more than that.
I'd be happier with something like:kexec: Use
min_tto simplify logic
Hmm, agreed.
Quoted 43 lines
Quoted 30 lines
Cc "Eric W. Biederman" <[email protected]>Cc Andrew Morton <[email protected]>Cc Simon Horman <[email protected]>Signed-off-by Zhang Yanfei <[email protected]>--- kernel/kexec.c | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-)kernel/kexec.c +2
-7@@ -822,13 +822,8 @@ static int kimage_load_normal_segment(struct kimage *image,/* Start with a clear page */ clear_page (ptr); ptr += maddr & ~PAGE_MASK ; - mchunk =PAGE_SIZE - (maddr & ~PAGE_MASK ); -if (mchunk > mbytes) - mchunk = mbytes; - - uchunk = mchunk; -if (uchunk > ubytes) - uchunk = ubytes; + mchunk =min_t (size_t, mbytes,PAGE_SIZE - (maddr & ~PAGE_MASK )); + uchunk =min_t (size_t, ubytes, mchunk); result =copy_from_user (ptr, buf, uchunk);kunmap (page);kernel/kexec.c static int kimage_load_crash_segment(struct kimage *image, · line 873
Quoted 10 lines
kernel/kexec.c +2
-5@@ -874,13 +869,9 @@ static int kimage_load_crash_segment(struct kimage *image, } ptr =kmap (page); ptr += maddr & ~PAGE_MASK ; - mchunk =PAGE_SIZE - (maddr & ~PAGE_MASK ); -if (mchunk > mbytes) - mchunk = mbytes; - - uchunk = mchunk; + mchunk =min_t (size_t, mbytes,PAGE_SIZE - (maddr & ~PAGE_MASK )); + uchunk =min_t (size_t, ubytes, mchunk);The line above means that uchunk can now never be greater than ubytes.
Quoted 5 lines
kernel/kexec.c static int kimage_load_crash_segment(struct kimage *image, · line 874
Quoted 1 line
kernel/kexec.c +0
-0if (uchunk > ubytes) {So the following seems more appropriate to me:
if (mchunk > uchunk) {
Oops, this is really a mistake. Thanks.
I will send the v2 patch.
Quoted 16 lines
Quoted 16 lines
kernel/kexec.c +1
-3- uchunk = ubytes;/* Zero the trailing part of the page */ memset (ptr + uchunk,0 , mchunk - uchunk); }@@ -1461,8 +1452,7 @@ void vmcoreinfo_append_str(const char *fmt, ...) r =vsnprintf (buf,sizeof (buf), fmt, args);va_end (args); -if (r + vmcoreinfo_size > vmcoreinfo_max_size) - r = vmcoreinfo_max_size - vmcoreinfo_size; + r =min_t (size_t, r, vmcoreinfo_max_size - vmcoreinfo_size);memcpy (&vmcoreinfo_data[vmcoreinfo_size], buf, r);
Quoted 8 lines
Quoted 3 lines
Signature · 1 line
1.7.1--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec