[PATCH] fix smp generic helper voyager breakage - Kernel

This is a discussion on [PATCH] fix smp generic helper voyager breakage - Kernel ; >From c3029f2bac04e387a1eb6aa2967310d61e9f2561 Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Wed, 29 Oct 2008 14:53:06 -0500 Subject: [VOYAGER] fix generic smp helpers non compile commit 3d4422332711ef48ef0f132f1fcbfcbd56c7f3d1 Author: Jens Axboe Date: Thu Jun 26 11:21:34 2008 +0200 Add generic helpers ...

+ Reply to Thread
Results 1 to 10 of 10

Thread: [PATCH] fix smp generic helper voyager breakage

  1. [PATCH] fix smp generic helper voyager breakage

    >From c3029f2bac04e387a1eb6aa2967310d61e9f2561 Mon Sep 17 00:00:00 2001
    From: James Bottomley
    Date: Wed, 29 Oct 2008 14:53:06 -0500
    Subject: [VOYAGER] fix generic smp helpers non compile

    commit 3d4422332711ef48ef0f132f1fcbfcbd56c7f3d1
    Author: Jens Axboe
    Date: Thu Jun 26 11:21:34 2008 +0200

    Add generic helpers for arch IPI function calls

    didn't wire up the voyager smp call function correctly, so do that
    here. Also make CONFIG_USE_GENERIC_SMP_HELPERS a def_bool y again,
    since we now use the generic helpers for every x86 architecture.

    Signed-off-by: James Bottomley
    ---
    arch/x86/Kconfig | 4 +++-
    arch/x86/mach-voyager/voyager_smp.c | 16 ++++++++++++++--
    2 files changed, 17 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
    index 4e529cc..7e971cc 100644
    --- a/arch/x86/Kconfig
    +++ b/arch/x86/Kconfig
    @@ -167,9 +167,11 @@ config GENERIC_PENDING_IRQ
    config X86_SMP
    bool
    depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)
    - select USE_GENERIC_SMP_HELPERS
    default y

    +config USE_GENERIC_SMP_HELPERS
    + def_bool y
    +
    config X86_32_SMP
    def_bool y
    depends on X86_32 && SMP
    diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
    index 9cd327a..63ed72b 100644
    --- a/arch/x86/mach-voyager/voyager_smp.c
    +++ b/arch/x86/mach-voyager/voyager_smp.c
    @@ -7,6 +7,7 @@
    * This file provides all the same external entries as smp.c but uses
    * the voyager hal to provide the functionality
    */
    +#include
    #include
    #include
    #include
    @@ -1783,6 +1784,17 @@ void __init smp_setup_processor_id(void)
    x86_write_percpu(cpu_number, hard_smp_processor_id());
    }

    +static void voyager_send_call_func(cpumask_t callmask)
    +{
    + __u32 mask = cpus_addr(callmask)[0] & ~(1 << smp_processor_id());
    + send_CPI(mask, VIC_CALL_FUNCTION_CPI);
    +}
    +
    +static void voyager_send_call_func_single(int cpu)
    +{
    + send_CPI(1 << cpu, VIC_CALL_FUNCTION_SINGLE_CPI);
    +}
    +
    struct smp_ops smp_ops = {
    .smp_prepare_boot_cpu = voyager_smp_prepare_boot_cpu,
    .smp_prepare_cpus = voyager_smp_prepare_cpus,
    @@ -1792,6 +1804,6 @@ struct smp_ops smp_ops = {
    .smp_send_stop = voyager_smp_send_stop,
    .smp_send_reschedule = voyager_smp_send_reschedule,

    - .send_call_func_ipi = native_send_call_func_ipi,
    - .send_call_func_single_ipi = native_send_call_func_single_ipi,
    + .send_call_func_ipi = voyager_send_call_func,
    + .send_call_func_single_ipi = voyager_send_call_func_single,
    };
    --
    1.5.6.5



    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  2. Re: [PATCH] fix smp generic helper voyager breakage


    * James Bottomley wrote:

    > >From c3029f2bac04e387a1eb6aa2967310d61e9f2561 Mon Sep 17 00:00:00 2001

    > From: James Bottomley
    > Date: Wed, 29 Oct 2008 14:53:06 -0500
    > Subject: [VOYAGER] fix generic smp helpers non compile
    >
    > commit 3d4422332711ef48ef0f132f1fcbfcbd56c7f3d1
    > Author: Jens Axboe
    > Date: Thu Jun 26 11:21:34 2008 +0200
    >
    > Add generic helpers for arch IPI function calls
    >
    > didn't wire up the voyager smp call function correctly, so do that
    > here. Also make CONFIG_USE_GENERIC_SMP_HELPERS a def_bool y again,
    > since we now use the generic helpers for every x86 architecture.
    >
    > Signed-off-by: James Bottomley
    > ---
    > arch/x86/Kconfig | 4 +++-
    > arch/x86/mach-voyager/voyager_smp.c | 16 ++++++++++++++--
    > 2 files changed, 17 insertions(+), 3 deletions(-)


    applied to tip/x86/urgent, thanks James!

    Ingo
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  3. Re: [PATCH] fix smp generic helper voyager breakage


    * James Bottomley wrote:

    > +++ b/arch/x86/Kconfig
    > @@ -167,9 +167,11 @@ config GENERIC_PENDING_IRQ
    > config X86_SMP
    > bool
    > depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)
    > - select USE_GENERIC_SMP_HELPERS
    > default y
    >
    > +config USE_GENERIC_SMP_HELPERS
    > + def_bool y
    > +


    uhm, that's a bogus change - USE_GENERIC_SMP_HELPERS must not be set
    on UP. This will break all UP compilations, on all x86 UP boxes:

    kernel/softirq.c: In function '__try_remote_softirq':
    kernel/softirq.c:522: error: implicit declaration of function '__smp_call_function_single'

    so i've removed your patch for now.

    Ingo
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  4. Re: [PATCH] fix smp generic helper voyager breakage

    On Thu, 2008-10-30 at 22:54 +0100, Ingo Molnar wrote:
    > * James Bottomley wrote:
    >
    > > +++ b/arch/x86/Kconfig
    > > @@ -167,9 +167,11 @@ config GENERIC_PENDING_IRQ
    > > config X86_SMP
    > > bool
    > > depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)
    > > - select USE_GENERIC_SMP_HELPERS
    > > default y
    > >
    > > +config USE_GENERIC_SMP_HELPERS
    > > + def_bool y
    > > +

    >
    > uhm, that's a bogus change - USE_GENERIC_SMP_HELPERS must not be set
    > on UP. This will break all UP compilations, on all x86 UP boxes:


    Heh, that would be one thing I don't build in my test rig.

    > kernel/softirq.c: In function '__try_remote_softirq':
    > kernel/softirq.c:522: error: implicit declaration of function '__smp_call_function_single'
    >
    > so i've removed your patch for now.


    OK, I'll update it ... I assume it should depend on CONFIG_SMP then?

    James


    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  5. Re: [PATCH] fix smp generic helper voyager breakage


    * James Bottomley wrote:

    > On Thu, 2008-10-30 at 22:54 +0100, Ingo Molnar wrote:
    > > * James Bottomley wrote:
    > >
    > > > +++ b/arch/x86/Kconfig
    > > > @@ -167,9 +167,11 @@ config GENERIC_PENDING_IRQ
    > > > config X86_SMP
    > > > bool
    > > > depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)
    > > > - select USE_GENERIC_SMP_HELPERS
    > > > default y
    > > >
    > > > +config USE_GENERIC_SMP_HELPERS
    > > > + def_bool y
    > > > +

    > >
    > > uhm, that's a bogus change - USE_GENERIC_SMP_HELPERS must not be set
    > > on UP. This will break all UP compilations, on all x86 UP boxes:

    >
    > Heh, that would be one thing I don't build in my test rig.


    lets put it this way: that change, when put in my test rig, already
    broke more x86 boxes than there are working Voyager test-boxes in
    existence ;-) [it broke the build on three of them]

    > > kernel/softirq.c: In function '__try_remote_softirq':
    > > kernel/softirq.c:522: error: implicit declaration of function '__smp_call_function_single'
    > >
    > > so i've removed your patch for now.

    >
    > OK, I'll update it ... I assume it should depend on CONFIG_SMP then?


    correct.

    Ingo
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  6. Re: [PATCH] fix smp generic helper voyager breakage

    From: James Bottomley
    Date: Wed, 29 Oct 2008 14:53:06 -0500
    Subject: [VOYAGER] fix generic smp helpers non compile

    commit 3d4422332711ef48ef0f132f1fcbfcbd56c7f3d1
    Author: Jens Axboe
    Date: Thu Jun 26 11:21:34 2008 +0200

    Add generic helpers for arch IPI function calls

    didn't wire up the voyager smp call function correctly, so do that
    here. Also make CONFIG_USE_GENERIC_SMP_HELPERS a def_bool y again,
    since we now use the generic helpers for every x86 architecture.

    Signed-off-by: James Bottomley
    ---
    arch/x86/Kconfig | 5 ++++-
    arch/x86/mach-voyager/voyager_smp.c | 16 ++++++++++++++--
    2 files changed, 18 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
    index c307439..09fc0c1 100644
    --- a/arch/x86/Kconfig
    +++ b/arch/x86/Kconfig
    @@ -167,9 +167,12 @@ config GENERIC_PENDING_IRQ
    config X86_SMP
    bool
    depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)
    - select USE_GENERIC_SMP_HELPERS
    default y

    +config USE_GENERIC_SMP_HELPERS
    + def_bool y
    + depends on SMP
    +
    config X86_32_SMP
    def_bool y
    depends on X86_32 && SMP
    diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
    index 0e33165..5214500 100644
    --- a/arch/x86/mach-voyager/voyager_smp.c
    +++ b/arch/x86/mach-voyager/voyager_smp.c
    @@ -7,6 +7,7 @@
    * This file provides all the same external entries as smp.c but uses
    * the voyager hal to provide the functionality
    */
    +#include
    #include
    #include
    #include
    @@ -1790,6 +1791,17 @@ void __init smp_setup_processor_id(void)
    x86_write_percpu(cpu_number, hard_smp_processor_id());
    }

    +static void voyager_send_call_func(cpumask_t callmask)
    +{
    + __u32 mask = cpus_addr(callmask)[0] & ~(1 << smp_processor_id());
    + send_CPI(mask, VIC_CALL_FUNCTION_CPI);
    +}
    +
    +static void voyager_send_call_func_single(int cpu)
    +{
    + send_CPI(1 << cpu, VIC_CALL_FUNCTION_SINGLE_CPI);
    +}
    +
    struct smp_ops smp_ops = {
    .smp_prepare_boot_cpu = voyager_smp_prepare_boot_cpu,
    .smp_prepare_cpus = voyager_smp_prepare_cpus,
    @@ -1799,6 +1811,6 @@ struct smp_ops smp_ops = {
    .smp_send_stop = voyager_smp_send_stop,
    .smp_send_reschedule = voyager_smp_send_reschedule,

    - .send_call_func_ipi = native_send_call_func_ipi,
    - .send_call_func_single_ipi = native_send_call_func_single_ipi,
    + .send_call_func_ipi = voyager_send_call_func,
    + .send_call_func_single_ipi = voyager_send_call_func_single,
    };
    --
    1.5.6.5



    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  7. Re: [PATCH] fix smp generic helper voyager breakage


    * James Bottomley wrote:

    > From: James Bottomley
    > Date: Wed, 29 Oct 2008 14:53:06 -0500
    > Subject: [VOYAGER] fix generic smp helpers non compile


    hm, i reported a bug to you with this patch on Oct 30.

    > commit 3d4422332711ef48ef0f132f1fcbfcbd56c7f3d1
    > Author: Jens Axboe
    > Date: Thu Jun 26 11:21:34 2008 +0200
    >
    > Add generic helpers for arch IPI function calls
    >
    > didn't wire up the voyager smp call function correctly, so do that
    > here. Also make CONFIG_USE_GENERIC_SMP_HELPERS a def_bool y again,
    > since we now use the generic helpers for every x86 architecture.
    >
    > Signed-off-by: James Bottomley
    > ---
    > arch/x86/Kconfig | 5 ++++-
    > arch/x86/mach-voyager/voyager_smp.c | 16 ++++++++++++++--
    > 2 files changed, 18 insertions(+), 3 deletions(-)


    no indication in the changelog whether that bug i reported got fixed -
    did it? (i suspect it did, but not sure)

    Ingo
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  8. Re: [PATCH] fix smp generic helper voyager breakage

    On Mon, Nov 10, 2008 at 1:35 AM, Ingo Molnar wrote:
    >
    > * James Bottomley wrote:
    >
    >> From: James Bottomley
    >> Date: Wed, 29 Oct 2008 14:53:06 -0500
    >> Subject: [VOYAGER] fix generic smp helpers non compile

    >
    > hm, i reported a bug to you with this patch on Oct 30.
    >
    >> commit 3d4422332711ef48ef0f132f1fcbfcbd56c7f3d1
    >> Author: Jens Axboe
    >> Date: Thu Jun 26 11:21:34 2008 +0200
    >>
    >> Add generic helpers for arch IPI function calls
    >>
    >> didn't wire up the voyager smp call function correctly, so do that
    >> here. Also make CONFIG_USE_GENERIC_SMP_HELPERS a def_bool y again,
    >> since we now use the generic helpers for every x86 architecture.
    >>
    >> Signed-off-by: James Bottomley
    >> ---
    >> arch/x86/Kconfig | 5 ++++-
    >> arch/x86/mach-voyager/voyager_smp.c | 16 ++++++++++++++--
    >> 2 files changed, 18 insertions(+), 3 deletions(-)

    >
    > no indication in the changelog whether that bug i reported got fixed -
    > did it? (i suspect it did, but not sure)


    should fix some voyager_smp.c compliing...

    YH
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  9. Re: [PATCH] fix smp generic helper voyager breakage

    On Mon, 2008-11-10 at 10:35 +0100, Ingo Molnar wrote:
    > * James Bottomley wrote:
    >
    > > From: James Bottomley
    > > Date: Wed, 29 Oct 2008 14:53:06 -0500
    > > Subject: [VOYAGER] fix generic smp helpers non compile

    >
    > hm, i reported a bug to you with this patch on Oct 30.
    >
    > > commit 3d4422332711ef48ef0f132f1fcbfcbd56c7f3d1
    > > Author: Jens Axboe
    > > Date: Thu Jun 26 11:21:34 2008 +0200
    > >
    > > Add generic helpers for arch IPI function calls
    > >
    > > didn't wire up the voyager smp call function correctly, so do that
    > > here. Also make CONFIG_USE_GENERIC_SMP_HELPERS a def_bool y again,
    > > since we now use the generic helpers for every x86 architecture.
    > >
    > > Signed-off-by: James Bottomley
    > > ---
    > > arch/x86/Kconfig | 5 ++++-
    > > arch/x86/mach-voyager/voyager_smp.c | 16 ++++++++++++++--
    > > 2 files changed, 18 insertions(+), 3 deletions(-)

    >
    > no indication in the changelog whether that bug i reported got fixed -
    > did it? (i suspect it did, but not sure)


    Yes ... that would be why this was a reply to the discussion email with
    the report.

    James


    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  10. Re: [PATCH] fix smp generic helper voyager breakage


    * James Bottomley wrote:

    > From: James Bottomley
    > Date: Wed, 29 Oct 2008 14:53:06 -0500
    > Subject: [VOYAGER] fix generic smp helpers non compile
    >
    > commit 3d4422332711ef48ef0f132f1fcbfcbd56c7f3d1
    > Author: Jens Axboe
    > Date: Thu Jun 26 11:21:34 2008 +0200
    >
    > Add generic helpers for arch IPI function calls
    >
    > didn't wire up the voyager smp call function correctly, so do that
    > here. Also make CONFIG_USE_GENERIC_SMP_HELPERS a def_bool y again,
    > since we now use the generic helpers for every x86 architecture.
    >
    > Signed-off-by: James Bottomley
    > ---
    > arch/x86/Kconfig | 5 ++++-
    > arch/x86/mach-voyager/voyager_smp.c | 16 ++++++++++++++--
    > 2 files changed, 18 insertions(+), 3 deletions(-)


    applied to tip/x86/urgent, thanks James!

    Ingo
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

+ Reply to Thread