linux-kernel - Re: [PATCH 10/11] x86/io

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <AANLkTikBHcRkgvzCi3jRLiRHLSPT93Gm1Kkwx35fXBeA@mail.gmail.com>
Date:	Thu, 25 Nov 2010 13:04:28 -0800
From:	Yinghai Lu <yinghai@...nel.org>
To:	Sebastian Andrzej Siewior <bigeasy@...utronix.de>
Cc:	linux-kernel@...r.kernel.org, sodaville@...utronix.de,
	x86@...nel.org, Dirk Brandewie <dirk.brandewie@...il.com>
Subject: Re: [PATCH 10/11] x86/io_apic: add simply id set

On Thu, Nov 25, 2010 at 9:40 AM, Sebastian Andrzej Siewior
<bigeasy@...utronix.de> wrote:
> This one goes through the registered IO-APICs and sets the id which the
> core code is using.
>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@...utronix.de>
> CC: x86@...nel.org
> Signed-off-by: Dirk Brandewie <dirk.brandewie@...il.com>
> ---
>  arch/x86/include/asm/io_apic.h |    1 +
>  arch/x86/kernel/apic/io_apic.c |   44 ++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 45 insertions(+), 0 deletions(-)
>
> diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
> index dc1169f..c920657 100644
> --- a/arch/x86/include/asm/io_apic.h
> +++ b/arch/x86/include/asm/io_apic.h
> @@ -170,6 +170,7 @@ extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
>
>  extern int get_nr_irqs_gsi(void);
>  extern void setup_ioapic_ids_from_mpc(void);
> +void setup_ioapic_ids_from_apicid(void);
>
>  struct mp_ioapic_gsi{
>        u32 gsi_base;
> diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
> index 27a5709..74cfe9b 100644
> --- a/arch/x86/kernel/apic/io_apic.c
> +++ b/arch/x86/kernel/apic/io_apic.c
> @@ -2047,6 +2047,50 @@ void __init setup_ioapic_ids_from_mpc(void)
>                        apic_printk(APIC_VERBOSE, " ok.\n");
>        }
>  }
> +/*
> + * We assume here that the ids in mp_ioapics are correct but not yet
> + * written to the ioapic. While doing so we verify that those ids are
> + * unique.
> + */
> +static __initdata DECLARE_BITMAP(apic_id_mask, MAX_APICS);
> +void __init setup_ioapic_ids_from_apicid(void)
> +{
> +       union IO_APIC_reg_00 reg_00;
> +       int apic_id;
> +       unsigned long flags;
> +
> +       for (apic_id = 0; apic_id < nr_ioapics; apic_id++) {
> +
> +               if (mp_ioapics[apic_id].apicid > MAX_APICS) {
> +                       WARN_ON(1);
> +                       continue;
> +               }
> +
> +               if (test_bit(mp_ioapics[apic_id].apicid, apic_id_mask)) {
> +                       WARN_ON(1);
> +                       continue;
> +               }
> +
> +               set_bit(mp_ioapics[apic_id].apicid, apic_id_mask);
> +
> +               raw_spin_lock_irqsave(&ioapic_lock, flags);
> +               reg_00.raw = io_apic_read(apic_id, 0);
> +               raw_spin_unlock_irqrestore(&ioapic_lock, flags);
> +
> +               if (reg_00.bits.ID == mp_ioapics[apic_id].apicid)
> +                       continue;
> +
> +               reg_00.bits.ID = mp_ioapics[apic_id].apicid;
> +               raw_spin_lock_irqsave(&ioapic_lock, flags);
> +               io_apic_write(apic_id, 0, reg_00.raw);
> +               reg_00.raw = io_apic_read(apic_id, 0);
> +               raw_spin_unlock_irqrestore(&ioapic_lock, flags);
> +
> +               if (reg_00.bits.ID != mp_ioapics[apic_id].apicid)
> +                       printk(KERN_ERR "Could not update id of IOAPIC %d\n",
> +                                       mp_ioapics[apic_id].apicid);
> +       }
> +}
>  #endif
>
>  int no_timer_check __initdata;

can you update and split setup_ioapic_ids_from_mpc() for your using?

Thanks

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