xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH, v2] x86: fix off-by-one in nr_irqs_gsi calculation
@ 2012-07-27  6:39 Jan Beulich
  2012-07-27  6:44 ` Joe Jin
  2012-07-27  8:01 ` Keir Fraser
  0 siblings, 2 replies; 4+ messages in thread
From: Jan Beulich @ 2012-07-27  6:39 UTC (permalink / raw)
  To: xen-devel; +Cc: joe.jin

[-- Attachment #1: Type: text/plain, Size: 517 bytes --]

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;




[-- Attachment #2: x86-nr_irqs_gsi.patch --]
[-- Type: text/plain, Size: 561 bytes --]

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;

[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH, v2] x86: fix off-by-one in nr_irqs_gsi calculation
  2012-07-27  6:39 [PATCH, v2] x86: fix off-by-one in nr_irqs_gsi calculation Jan Beulich
@ 2012-07-27  6:44 ` Joe Jin
  2012-07-27  8:01 ` Keir Fraser
  1 sibling, 0 replies; 4+ messages in thread
From: Joe Jin @ 2012-07-27  6:44 UTC (permalink / raw)
  To: Jan Beulich; +Cc: xen-devel

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;
> 
> 
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH, v2] x86: fix off-by-one in nr_irqs_gsi calculation
  2012-07-27  6:39 [PATCH, v2] x86: fix off-by-one in nr_irqs_gsi calculation Jan Beulich
  2012-07-27  6:44 ` Joe Jin
@ 2012-07-27  8:01 ` Keir Fraser
  2012-07-30  7:53   ` Jan Beulich
  1 sibling, 1 reply; 4+ messages in thread
From: Keir Fraser @ 2012-07-27  8:01 UTC (permalink / raw)
  To: Jan Beulich, xen-devel; +Cc: joe.jin

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH, v2] x86: fix off-by-one in nr_irqs_gsi calculation
  2012-07-27  8:01 ` Keir Fraser
@ 2012-07-30  7:53   ` Jan Beulich
  0 siblings, 0 replies; 4+ messages in thread
From: Jan Beulich @ 2012-07-30  7:53 UTC (permalink / raw)
  To: Keir Fraser; +Cc: joe.jin, xen-devel

>>> 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 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-07-30  7:53 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-27  6:39 [PATCH, v2] x86: fix off-by-one in nr_irqs_gsi calculation Jan Beulich
2012-07-27  6:44 ` Joe Jin
2012-07-27  8:01 ` Keir Fraser
2012-07-30  7:53   ` Jan Beulich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).