From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934641AbXEVSXk (ORCPT ); Tue, 22 May 2007 14:23:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761148AbXEVSX1 (ORCPT ); Tue, 22 May 2007 14:23:27 -0400 Received: from mga01.intel.com ([192.55.52.88]:6471 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934316AbXEVSXZ (ORCPT ); Tue, 22 May 2007 14:23:25 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.14,567,1170662400"; d="scan'208";a="248502969" Date: Tue, 22 May 2007 11:20:22 -0700 From: Fenghua Yu To: akpm@linux-foundation.org, suresh.b.siddha@intel.com, clameter@sgi.com, kiran@scalex86.org, rmk@arm.linux.org.uk, linux-kernel@vger.kernel.org Cc: fenghua.yu@intel.com Subject: [PATCH 2/2] Use the new percpu interface for shared data -- version 3 Message-ID: <20070522182022.GA27317@linux-os.sc.intel.com> References: <1162040333.1178030136225.JavaMail.was6@nci57003d.marriott.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1162040333.1178030136225.JavaMail.was6@nci57003d.marriott.com> User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Currently most of the per cpu data, which is accessed by different cpus, has a ____cacheline_aligned_in_smp attribute. Move all this data to the new per cpu shared data section: .data.percpu.shared_aligned. This will seperate the percpu data which is referenced frequently by other cpus from the local only percpu data. Signed-off-by: Fenghua Yu Acked-by: Suresh Siddha --- arch/i386/kernel/init_task.c | 2 +- arch/i386/kernel/irq.c | 2 +- arch/ia64/kernel/smp.c | 2 +- arch/x86_64/kernel/init_task.c | 2 +- kernel/sched.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff -Nurp linux-2.6.22-rc1-mm1.0/arch/i386/kernel/init_task.c linux-2.6.22-rc1-mm1.1/arch/i386/kernel/init_task.c --- linux-2.6.22-rc1-mm1.0/arch/i386/kernel/init_task.c 2007-04-25 20:08:32.000000000 -0700 +++ linux-2.6.22-rc1-mm1.1/arch/i386/kernel/init_task.c 2007-05-18 15:40:08.000000000 -0700 @@ -42,5 +42,5 @@ EXPORT_SYMBOL(init_task); * per-CPU TSS segments. Threads are completely 'soft' on Linux, * no more per-task TSS's. */ -DEFINE_PER_CPU(struct tss_struct, init_tss) ____cacheline_internodealigned_in_smp = INIT_TSS; +DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS; diff -Nurp linux-2.6.22-rc1-mm1.0/arch/i386/kernel/irq.c linux-2.6.22-rc1-mm1.1/arch/i386/kernel/irq.c --- linux-2.6.22-rc1-mm1.0/arch/i386/kernel/irq.c 2007-05-18 15:37:16.000000000 -0700 +++ linux-2.6.22-rc1-mm1.1/arch/i386/kernel/irq.c 2007-05-18 15:40:08.000000000 -0700 @@ -21,7 +21,7 @@ #include #include -DEFINE_PER_CPU(irq_cpustat_t, irq_stat) ____cacheline_internodealigned_in_smp; +DEFINE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat); EXPORT_PER_CPU_SYMBOL(irq_stat); DEFINE_PER_CPU(struct pt_regs *, irq_regs); diff -Nurp linux-2.6.22-rc1-mm1.0/arch/ia64/kernel/smp.c linux-2.6.22-rc1-mm1.1/arch/ia64/kernel/smp.c --- linux-2.6.22-rc1-mm1.0/arch/ia64/kernel/smp.c 2007-05-18 15:38:09.000000000 -0700 +++ linux-2.6.22-rc1-mm1.1/arch/ia64/kernel/smp.c 2007-05-18 15:40:08.000000000 -0700 @@ -82,7 +82,7 @@ static volatile struct call_data_struct #define IPI_KDUMP_CPU_STOP 3 /* This needs to be cacheline aligned because it is written to by *other* CPUs. */ -static DEFINE_PER_CPU(u64, ipi_operation) ____cacheline_aligned; +static DEFINE_PER_CPU_SHARED_ALIGNED(u64, ipi_operation); extern void cpu_halt (void); diff -Nurp linux-2.6.22-rc1-mm1.0/arch/x86_64/kernel/init_task.c linux-2.6.22-rc1-mm1.1/arch/x86_64/kernel/init_task.c --- linux-2.6.22-rc1-mm1.0/arch/x86_64/kernel/init_task.c 2007-04-25 20:08:32.000000000 -0700 +++ linux-2.6.22-rc1-mm1.1/arch/x86_64/kernel/init_task.c 2007-05-18 15:40:08.000000000 -0700 @@ -44,7 +44,7 @@ EXPORT_SYMBOL(init_task); * section. Since TSS's are completely CPU-local, we want them * on exact cacheline boundaries, to eliminate cacheline ping-pong. */ -DEFINE_PER_CPU(struct tss_struct, init_tss) ____cacheline_internodealigned_in_smp = INIT_TSS; +DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS; /* Copies of the original ist values from the tss are only accessed during * debugging, no special alignment required. diff -Nurp linux-2.6.22-rc1-mm1.0/kernel/sched.c linux-2.6.22-rc1-mm1.1/kernel/sched.c --- linux-2.6.22-rc1-mm1.0/kernel/sched.c 2007-05-18 15:38:10.000000000 -0700 +++ linux-2.6.22-rc1-mm1.1/kernel/sched.c 2007-05-18 15:40:08.000000000 -0700 @@ -305,7 +305,7 @@ struct rq { struct lock_class_key rq_lock_key; }; -static DEFINE_PER_CPU(struct rq, runqueues) ____cacheline_aligned_in_smp; +static DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); static DEFINE_MUTEX(sched_hotcpu_mutex); static inline int cpu_of(struct rq *rq)