Jan Beulich
2012-Jul-27 06:39 UTC
[PATCH, v2] x86: fix off-by-one in nr_irqs_gsi calculation
highest_gsi() returns the last valid GSI, not a count. Signed-off-by: Jan Beulich <jbeulich@suse.com> --- v2: Retain the (debatable) use of max() here. --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2531,7 +2531,7 @@ void __init init_ioapic_mappings(void) } } - nr_irqs_gsi = max(nr_irqs_gsi, highest_gsi()); + nr_irqs_gsi = max(nr_irqs_gsi, highest_gsi() + 1); if ( max_gsi_irqs == 0 ) max_gsi_irqs = nr_irqs ? nr_irqs / 8 : PAGE_SIZE; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
Joe Jin
2012-Jul-27 06:44 UTC
Re: [PATCH, v2] x86: fix off-by-one in nr_irqs_gsi calculation
Acked! Thanks Jan! On 07/27/12 14:39, Jan Beulich wrote:> highest_gsi() returns the last valid GSI, not a count. > > Signed-off-by: Jan Beulich <jbeulich@suse.com> > > --- > v2: Retain the (debatable) use of max() here. > > --- a/xen/arch/x86/io_apic.c > +++ b/xen/arch/x86/io_apic.c > @@ -2531,7 +2531,7 @@ void __init init_ioapic_mappings(void) > } > } > > - nr_irqs_gsi = max(nr_irqs_gsi, highest_gsi()); > + nr_irqs_gsi = max(nr_irqs_gsi, highest_gsi() + 1); > > if ( max_gsi_irqs == 0 ) > max_gsi_irqs = nr_irqs ? nr_irqs / 8 : PAGE_SIZE; > > >
Keir Fraser
2012-Jul-27 08:01 UTC
Re: [PATCH, v2] x86: fix off-by-one in nr_irqs_gsi calculation
On 27/07/2012 07:39, "Jan Beulich" <JBeulich@suse.com> wrote:> highest_gsi() returns the last valid GSI, not a count. > > Signed-off-by: Jan Beulich <jbeulich@suse.com>Acked-by: Keir Fraser <keir@xen.org>> --- > v2: Retain the (debatable) use of max() here. > > --- a/xen/arch/x86/io_apic.c > +++ b/xen/arch/x86/io_apic.c > @@ -2531,7 +2531,7 @@ void __init init_ioapic_mappings(void) > } > } > > - nr_irqs_gsi = max(nr_irqs_gsi, highest_gsi()); > + nr_irqs_gsi = max(nr_irqs_gsi, highest_gsi() + 1); > > if ( max_gsi_irqs == 0 ) > max_gsi_irqs = nr_irqs ? nr_irqs / 8 : PAGE_SIZE; > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel
Jan Beulich
2012-Jul-30 07:53 UTC
Re: [PATCH, v2] x86: fix off-by-one in nr_irqs_gsi calculation
>>> On 27.07.12 at 10:01, Keir Fraser <keir@xen.org> wrote: > On 27/07/2012 07:39, "Jan Beulich" <JBeulich@suse.com> wrote: > >> highest_gsi() returns the last valid GSI, not a count. >> >> Signed-off-by: Jan Beulich <jbeulich@suse.com> > > Acked-by: Keir Fraser <keir@xen.org>Could you please also put this into 4.x-testing? Thanks, Jan>> --- >> v2: Retain the (debatable) use of max() here. >> >> --- a/xen/arch/x86/io_apic.c >> +++ b/xen/arch/x86/io_apic.c >> @@ -2531,7 +2531,7 @@ void __init init_ioapic_mappings(void) >> } >> } >> >> - nr_irqs_gsi = max(nr_irqs_gsi, highest_gsi()); >> + nr_irqs_gsi = max(nr_irqs_gsi, highest_gsi() + 1); >> >> if ( max_gsi_irqs == 0 ) >> max_gsi_irqs = nr_irqs ? nr_irqs / 8 : PAGE_SIZE; >> >> >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel