From: "Jan Beulich" Subject: [PATCH] x86/APIC: reduce self-IPI related code Date: Tue, 09 Sep 2014 16:49:25 +0100 Message-ID: <540F3DA50200007800032CE3@mail.emea.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part87B2D195.0__=" Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRNfe-0000KH-Cu for xen-devel@lists.xenproject.org; Tue, 09 Sep 2014 15:49:30 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel Cc: Keir Fraser List-Id: xen-devel@lists.xenproject.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part87B2D195.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline send_IPI_self_{phys,flat}() were identical and send_IPI_self_x2apic() was misplaced and pointlessly (implictly) had a non-x2APIC code path. Signed-off-by: Jan Beulich --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -92,6 +92,11 @@ static unsigned int cpu_mask_to_apicid_x return dest; } =20 +static void send_IPI_self_x2apic(uint8_t vector) +{ + apic_wrmsr(APIC_SELF_IPI, vector); +} + static void send_IPI_mask_x2apic_phys(const cpumask_t *cpumask, int = vector) { unsigned int cpu; --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -124,21 +124,11 @@ static void __default_send_IPI_shortcut( apic_write_around(APIC_ICR, cfg); } =20 -void send_IPI_self_flat(int vector) +void send_IPI_self_legacy(uint8_t vector) { __default_send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL= ); } =20 -void send_IPI_self_phys(int vector) -{ - __default_send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL= ); -} - -void send_IPI_self_x2apic(int vector) -{ - apic_write(APIC_SELF_IPI, vector); =20 -} - void send_IPI_mask_flat(const cpumask_t *cpumask, int vector) { unsigned long mask =3D cpumask_bits(cpumask)[0]; --- a/xen/include/asm-x86/genapic.h +++ b/xen/include/asm-x86/genapic.h @@ -37,7 +37,7 @@ struct genapic {=20 const cpumask_t *(*vector_allocation_cpumask)(int cpu); unsigned int (*cpu_mask_to_apicid)(const cpumask_t *cpumask); void (*send_IPI_mask)(const cpumask_t *mask, int vector); - void (*send_IPI_self)(int vector); + void (*send_IPI_self)(uint8_t vector); }; =20 #define APICFUNC(x) .x =3D x @@ -52,12 +52,12 @@ extern const struct genapic *genapic; extern const struct genapic apic_default; =20 const cpumask_t *target_cpus_all(void); +void send_IPI_self_legacy(uint8_t vector); =20 void init_apic_ldr_flat(void); void clustered_apic_check_flat(void); unsigned int cpu_mask_to_apicid_flat(const cpumask_t *cpumask); void send_IPI_mask_flat(const cpumask_t *mask, int vector); -void send_IPI_self_flat(int vector); const cpumask_t *vector_allocation_cpumask_flat(int cpu); #define GENAPIC_FLAT \ .int_delivery_mode =3D dest_LowestPrio, \ @@ -68,13 +68,12 @@ const cpumask_t *vector_allocation_cpuma .vector_allocation_cpumask =3D vector_allocation_cpumask_flat, \ .cpu_mask_to_apicid =3D cpu_mask_to_apicid_flat, \ .send_IPI_mask =3D send_IPI_mask_flat, \ - .send_IPI_self =3D send_IPI_self_flat + .send_IPI_self =3D send_IPI_self_legacy =20 void init_apic_ldr_phys(void); void clustered_apic_check_phys(void); unsigned int cpu_mask_to_apicid_phys(const cpumask_t *cpumask); void send_IPI_mask_phys(const cpumask_t *mask, int vector); -void send_IPI_self_phys(int vector); const cpumask_t *vector_allocation_cpumask_phys(int cpu); #define GENAPIC_PHYS \ .int_delivery_mode =3D dest_Fixed, \ @@ -85,8 +84,6 @@ const cpumask_t *vector_allocation_cpuma .vector_allocation_cpumask =3D vector_allocation_cpumask_phys, \ .cpu_mask_to_apicid =3D cpu_mask_to_apicid_phys, \ .send_IPI_mask =3D send_IPI_mask_phys, \ - .send_IPI_self =3D send_IPI_self_phys - -void send_IPI_self_x2apic(int vector); + .send_IPI_self =3D send_IPI_self_legacy =20 #endif --=__Part87B2D195.0__= Content-Type: text/plain; name="x86-self-IPI.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="x86-self-IPI.patch" x86/APIC: reduce self-IPI related code=0A=0Asend_IPI_self_{phys,flat}() = were identical and send_IPI_self_x2apic()=0Awas misplaced and pointlessly = (implictly) had a non-x2APIC code path.=0A=0ASigned-off-by: Jan Beulich = =0A=0A--- a/xen/arch/x86/genapic/x2apic.c=0A+++ = b/xen/arch/x86/genapic/x2apic.c=0A@@ -92,6 +92,11 @@ static unsigned int = cpu_mask_to_apicid_x=0A return dest;=0A }=0A =0A+static void send_IPI_s= elf_x2apic(uint8_t vector)=0A+{=0A+ apic_wrmsr(APIC_SELF_IPI, = vector);=0A+}=0A+=0A static void send_IPI_mask_x2apic_phys(const cpumask_t = *cpumask, int vector)=0A {=0A unsigned int cpu;=0A--- a/xen/arch/x86/sm= p.c=0A+++ b/xen/arch/x86/smp.c=0A@@ -124,21 +124,11 @@ static void = __default_send_IPI_shortcut(=0A apic_write_around(APIC_ICR, cfg);=0A = }=0A =0A-void send_IPI_self_flat(int vector)=0A+void send_IPI_self_legacy(u= int8_t vector)=0A {=0A __default_send_IPI_shortcut(APIC_DEST_SELF, = vector, APIC_DEST_PHYSICAL);=0A }=0A =0A-void send_IPI_self_phys(int = vector)=0A-{=0A- __default_send_IPI_shortcut(APIC_DEST_SELF, vector, = APIC_DEST_PHYSICAL);=0A-}=0A-=0A-void send_IPI_self_x2apic(int vector)=0A-{= =0A- apic_write(APIC_SELF_IPI, vector); =0A-}=0A-=0A void send_IPI_ma= sk_flat(const cpumask_t *cpumask, int vector)=0A {=0A unsigned long = mask =3D cpumask_bits(cpumask)[0];=0A--- a/xen/include/asm-x86/genapic.h=0A= +++ b/xen/include/asm-x86/genapic.h=0A@@ -37,7 +37,7 @@ struct genapic { = =0A const cpumask_t *(*vector_allocation_cpumask)(int cpu);=0A = unsigned int (*cpu_mask_to_apicid)(const cpumask_t *cpumask);=0A = void (*send_IPI_mask)(const cpumask_t *mask, int vector);=0A- void = (*send_IPI_self)(int vector);=0A+ void (*send_IPI_self)(uint8_t = vector);=0A };=0A =0A #define APICFUNC(x) .x =3D x=0A@@ -52,12 +52,12 @@ = extern const struct genapic *genapic;=0A extern const struct genapic = apic_default;=0A =0A const cpumask_t *target_cpus_all(void);=0A+void = send_IPI_self_legacy(uint8_t vector);=0A =0A void init_apic_ldr_flat(void);= =0A void clustered_apic_check_flat(void);=0A unsigned int cpu_mask_to_apici= d_flat(const cpumask_t *cpumask);=0A void send_IPI_mask_flat(const = cpumask_t *mask, int vector);=0A-void send_IPI_self_flat(int vector);=0A = const cpumask_t *vector_allocation_cpumask_flat(int cpu);=0A #define = GENAPIC_FLAT \=0A .int_delivery_mode =3D dest_LowestPrio, \=0A@@ = -68,13 +68,12 @@ const cpumask_t *vector_allocation_cpuma=0A .vector_all= ocation_cpumask =3D vector_allocation_cpumask_flat, \=0A .cpu_mask_t= o_apicid =3D cpu_mask_to_apicid_flat, \=0A .send_IPI_mask =3D = send_IPI_mask_flat, \=0A- .send_IPI_self =3D send_IPI_self_flat=0A+ = .send_IPI_self =3D send_IPI_self_legacy=0A =0A void init_apic_ldr_phys(void= );=0A void clustered_apic_check_phys(void);=0A unsigned int cpu_mask_to_api= cid_phys(const cpumask_t *cpumask);=0A void send_IPI_mask_phys(const = cpumask_t *mask, int vector);=0A-void send_IPI_self_phys(int vector);=0A = const cpumask_t *vector_allocation_cpumask_phys(int cpu);=0A #define = GENAPIC_PHYS \=0A .int_delivery_mode =3D dest_Fixed, \=0A@@ -85,8 = +84,6 @@ const cpumask_t *vector_allocation_cpuma=0A .vector_allocation_= cpumask =3D vector_allocation_cpumask_phys, \=0A .cpu_mask_to_apicid= =3D cpu_mask_to_apicid_phys, \=0A .send_IPI_mask =3D send_IPI_mask_ph= ys, \=0A- .send_IPI_self =3D send_IPI_self_phys=0A-=0A-void = send_IPI_self_x2apic(int vector);=0A+ .send_IPI_self =3D send_IPI_self_le= gacy=0A =0A #endif=0A --=__Part87B2D195.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part87B2D195.0__=--