| Message ID | 5577aef8-1d5a-ca95-ff0a-9c7b5977e5bf@linux.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f1dbc1c5c70d0d4c60b5d467ba941fba167c12f6 |
| Headers | show |
| Series | [v2] Fix display of Maximum Memory | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (20862247a368dbb75d6e97d82345999adaacf3cc) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 16 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
Le 15/01/2020 à 15:53, Michael Bringmann a écrit : > Correct overflow problem in calculation+display of Maximum Memory > value to syscfg where 32bits is insufficient. > > Signed-off-by: Michael Bringmann <mwb@linux.ibm.com> Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr> > --- > arch/powerpc/platforms/pseries/lparcfg.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/powerpc/platforms/pseries/lparcfg.c b/arch/powerpc/platforms/pseries/lparcfg.c > index e33e8bc..f00411c 100644 > --- a/arch/powerpc/platforms/pseries/lparcfg.c > +++ b/arch/powerpc/platforms/pseries/lparcfg.c > @@ -433,12 +433,12 @@ static void parse_em_data(struct seq_file *m) > > static void maxmem_data(struct seq_file *m) > { > - unsigned long maxmem = 0; > + u64 maxmem = 0; > > - maxmem += drmem_info->n_lmbs * drmem_info->lmb_size; > - maxmem += hugetlb_total_pages() * PAGE_SIZE; > + maxmem += (u64)drmem_info->n_lmbs * drmem_info->lmb_size; > + maxmem += (u64)hugetlb_total_pages() * PAGE_SIZE; > > - seq_printf(m, "MaxMem=%ld\n", maxmem); > + seq_printf(m, "MaxMem=%llu\n", maxmem); > } > > static int pseries_lparcfg_data(struct seq_file *m, void *v) >
On 1/15/20 6:53 AM, Michael Bringmann wrote: > Correct overflow problem in calculation+display of Maximum Memory > value to syscfg where 32bits is insufficient. > Probably needs the following Fixes tag: Fixes: 772b039fd9a7 ("powerpc/pseries: Export maximum memory value") otherwise, Reviewed-by: Tyrel Datwyler <tyreld@linux.ibm.com> > Signed-off-by: Michael Bringmann <mwb@linux.ibm.com> > --- > arch/powerpc/platforms/pseries/lparcfg.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/powerpc/platforms/pseries/lparcfg.c b/arch/powerpc/platforms/pseries/lparcfg.c > index e33e8bc..f00411c 100644 > --- a/arch/powerpc/platforms/pseries/lparcfg.c > +++ b/arch/powerpc/platforms/pseries/lparcfg.c > @@ -433,12 +433,12 @@ static void parse_em_data(struct seq_file *m) > > static void maxmem_data(struct seq_file *m) > { > - unsigned long maxmem = 0; > + u64 maxmem = 0; > > - maxmem += drmem_info->n_lmbs * drmem_info->lmb_size; > - maxmem += hugetlb_total_pages() * PAGE_SIZE; > + maxmem += (u64)drmem_info->n_lmbs * drmem_info->lmb_size; > + maxmem += (u64)hugetlb_total_pages() * PAGE_SIZE; > > - seq_printf(m, "MaxMem=%ld\n", maxmem); > + seq_printf(m, "MaxMem=%llu\n", maxmem); > } > > static int pseries_lparcfg_data(struct seq_file *m, void *v) >
Michael Bringmann <mwb@linux.ibm.com> writes: > Correct overflow problem in calculation+display of Maximum Memory > value to syscfg where 32bits is insufficient. > > Signed-off-by: Michael Bringmann <mwb@linux.ibm.com> > --- > arch/powerpc/platforms/pseries/lparcfg.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/powerpc/platforms/pseries/lparcfg.c b/arch/powerpc/platforms/pseries/lparcfg.c > index e33e8bc..f00411c 100644 > --- a/arch/powerpc/platforms/pseries/lparcfg.c > +++ b/arch/powerpc/platforms/pseries/lparcfg.c > @@ -433,12 +433,12 @@ static void parse_em_data(struct seq_file *m) > > static void maxmem_data(struct seq_file *m) > { > - unsigned long maxmem = 0; > + u64 maxmem = 0; This is 64-bit only code, so u64 == unsigned long. > - maxmem += drmem_info->n_lmbs * drmem_info->lmb_size; > - maxmem += hugetlb_total_pages() * PAGE_SIZE; > + maxmem += (u64)drmem_info->n_lmbs * drmem_info->lmb_size; The only problem AFAICS is n_lmbs is int and lmb_size is u32, so this multiplication will overflow. > + maxmem += (u64)hugetlb_total_pages() * PAGE_SIZE; hugetlb_total_pages() already returns unsigned long. > - seq_printf(m, "MaxMem=%ld\n", maxmem); > + seq_printf(m, "MaxMem=%llu\n", maxmem); > } This should be sufficient? diff --git a/arch/powerpc/platforms/pseries/lparcfg.c b/arch/powerpc/platforms/pseries/lparcfg.c index e33e8bc4b69b..38c306551f76 100644 --- a/arch/powerpc/platforms/pseries/lparcfg.c +++ b/arch/powerpc/platforms/pseries/lparcfg.c @@ -435,10 +435,10 @@ static void maxmem_data(struct seq_file *m) { unsigned long maxmem = 0; - maxmem += drmem_info->n_lmbs * drmem_info->lmb_size; + maxmem += (unsigned long)drmem_info->n_lmbs * drmem_info->lmb_size; maxmem += hugetlb_total_pages() * PAGE_SIZE; - seq_printf(m, "MaxMem=%ld\n", maxmem); + seq_printf(m, "MaxMem=%lu\n", maxmem); } static int pseries_lparcfg_data(struct seq_file *m, void *v) cheers
On 1/15/20 11:53 PM, Michael Ellerman wrote: > Michael Bringmann <mwb@linux.ibm.com> writes: >> Correct overflow problem in calculation+display of Maximum Memory >> value to syscfg where 32bits is insufficient. >> >> Signed-off-by: Michael Bringmann <mwb@linux.ibm.com> >> --- >> arch/powerpc/platforms/pseries/lparcfg.c | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/arch/powerpc/platforms/pseries/lparcfg.c b/arch/powerpc/platforms/pseries/lparcfg.c >> index e33e8bc..f00411c 100644 >> --- a/arch/powerpc/platforms/pseries/lparcfg.c >> +++ b/arch/powerpc/platforms/pseries/lparcfg.c >> @@ -433,12 +433,12 @@ static void parse_em_data(struct seq_file *m) >> >> static void maxmem_data(struct seq_file *m) >> { >> - unsigned long maxmem = 0; >> + u64 maxmem = 0; > > This is 64-bit only code, so u64 == unsigned long. > >> - maxmem += drmem_info->n_lmbs * drmem_info->lmb_size; >> - maxmem += hugetlb_total_pages() * PAGE_SIZE; >> + maxmem += (u64)drmem_info->n_lmbs * drmem_info->lmb_size; > > The only problem AFAICS is n_lmbs is int and lmb_size is u32, so this > multiplication will overflow. > >> + maxmem += (u64)hugetlb_total_pages() * PAGE_SIZE; > > hugetlb_total_pages() already returns unsigned long. > >> - seq_printf(m, "MaxMem=%ld\n", maxmem); >> + seq_printf(m, "MaxMem=%llu\n", maxmem); >> } > > This should be sufficient? > > diff --git a/arch/powerpc/platforms/pseries/lparcfg.c b/arch/powerpc/platforms/pseries/lparcfg.c > index e33e8bc4b69b..38c306551f76 100644 > --- a/arch/powerpc/platforms/pseries/lparcfg.c > +++ b/arch/powerpc/platforms/pseries/lparcfg.c > @@ -435,10 +435,10 @@ static void maxmem_data(struct seq_file *m) > { > unsigned long maxmem = 0; > > - maxmem += drmem_info->n_lmbs * drmem_info->lmb_size; > + maxmem += (unsigned long)drmem_info->n_lmbs * drmem_info->lmb_size; > maxmem += hugetlb_total_pages() * PAGE_SIZE; > > - seq_printf(m, "MaxMem=%ld\n", maxmem); > + seq_printf(m, "MaxMem=%lu\n", maxmem); > } > > static int pseries_lparcfg_data(struct seq_file *m, void *v) > > > cheers > Trying it out.
On Wed, 2020-01-15 at 14:53:59 UTC, Michael Bringmann wrote: > Correct overflow problem in calculation+display of Maximum Memory > value to syscfg where 32bits is insufficient. > > Signed-off-by: Michael Bringmann <mwb@linux.ibm.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/f1dbc1c5c70d0d4c60b5d467ba941fba167c12f6 cheers
diff --git a/arch/powerpc/platforms/pseries/lparcfg.c b/arch/powerpc/platforms/pseries/lparcfg.c index e33e8bc..f00411c 100644 --- a/arch/powerpc/platforms/pseries/lparcfg.c +++ b/arch/powerpc/platforms/pseries/lparcfg.c @@ -433,12 +433,12 @@ static void parse_em_data(struct seq_file *m) static void maxmem_data(struct seq_file *m) { - unsigned long maxmem = 0; + u64 maxmem = 0; - maxmem += drmem_info->n_lmbs * drmem_info->lmb_size; - maxmem += hugetlb_total_pages() * PAGE_SIZE; + maxmem += (u64)drmem_info->n_lmbs * drmem_info->lmb_size; + maxmem += (u64)hugetlb_total_pages() * PAGE_SIZE; - seq_printf(m, "MaxMem=%ld\n", maxmem); + seq_printf(m, "MaxMem=%llu\n", maxmem); } static int pseries_lparcfg_data(struct seq_file *m, void *v)
Correct overflow problem in calculation+display of Maximum Memory value to syscfg where 32bits is insufficient. Signed-off-by: Michael Bringmann <mwb@linux.ibm.com> --- arch/powerpc/platforms/pseries/lparcfg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)