* [PATCH] Fix more per-cpu typos
@ 2006-08-01 23:23 Alexey Dobriyan
2006-08-02 3:02 ` Andi Kleen
0 siblings, 1 reply; 3+ messages in thread
From: Alexey Dobriyan @ 2006-08-01 23:23 UTC (permalink / raw)
To: netdev, Andi Kleen; +Cc: Andrew Morton
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
arch/x86_64/kernel/smp.c | 2 +-
include/net/netdma.h | 2 +-
net/core/dev.c | 4 ++--
net/ipv4/tcp.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
--- a/arch/x86_64/kernel/smp.c
+++ b/arch/x86_64/kernel/smp.c
@@ -203,7 +203,7 @@ int __cpuinit init_smp_flush(void)
{
int i;
for_each_cpu_mask(i, cpu_possible_map) {
- spin_lock_init(&per_cpu(flush_state.tlbstate_lock, i));
+ spin_lock_init(&per_cpu(flush_state, i).tlbstate_lock);
}
return 0;
}
--- a/include/net/netdma.h
+++ b/include/net/netdma.h
@@ -29,7 +29,7 @@ static inline struct dma_chan *get_softn
{
struct dma_chan *chan;
rcu_read_lock();
- chan = rcu_dereference(__get_cpu_var(softnet_data.net_dma));
+ chan = rcu_dereference(__get_cpu_var(softnet_data).net_dma);
if (chan)
dma_chan_get(chan);
rcu_read_unlock();
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3433,7 +3433,7 @@ static void net_dma_rebalance(void)
if (net_dma_count == 0) {
for_each_online_cpu(cpu)
- rcu_assign_pointer(per_cpu(softnet_data.net_dma, cpu), NULL);
+ rcu_assign_pointer(per_cpu(softnet_data, cpu).net_dma, NULL);
unlock_cpu_hotplug();
return;
}
@@ -3447,7 +3447,7 @@ static void net_dma_rebalance(void)
+ (i < (num_online_cpus() % net_dma_count) ? 1 : 0));
while(n) {
- per_cpu(softnet_data.net_dma, cpu) = chan;
+ per_cpu(softnet_data, cpu).net_dma = chan;
cpu = next_cpu(cpu, cpu_online_map);
n--;
}
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1132,7 +1132,7 @@ #ifdef CONFIG_NET_DMA
tp->ucopy.dma_chan = NULL;
preempt_disable();
if ((len > sysctl_tcp_dma_copybreak) && !(flags & MSG_PEEK) &&
- !sysctl_tcp_low_latency && __get_cpu_var(softnet_data.net_dma)) {
+ !sysctl_tcp_low_latency && __get_cpu_var(softnet_data).net_dma) {
preempt_enable_no_resched();
tp->ucopy.pinned_list = dma_pin_iovec_pages(msg->msg_iov, len);
} else
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Fix more per-cpu typos
2006-08-01 23:23 [PATCH] Fix more per-cpu typos Alexey Dobriyan
@ 2006-08-02 3:02 ` Andi Kleen
2006-08-02 15:26 ` Alexey Dobriyan
0 siblings, 1 reply; 3+ messages in thread
From: Andi Kleen @ 2006-08-02 3:02 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: netdev, Andrew Morton
> --- a/arch/x86_64/kernel/smp.c
> +++ b/arch/x86_64/kernel/smp.c
> @@ -203,7 +203,7 @@ int __cpuinit init_smp_flush(void)
> {
> int i;
> for_each_cpu_mask(i, cpu_possible_map) {
> - spin_lock_init(&per_cpu(flush_state.tlbstate_lock, i));
> + spin_lock_init(&per_cpu(flush_state, i).tlbstate_lock);
What advantage does this have over the earlier form?
In general this should be split up into three patches.
-Andi
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Fix more per-cpu typos
2006-08-02 3:02 ` Andi Kleen
@ 2006-08-02 15:26 ` Alexey Dobriyan
0 siblings, 0 replies; 3+ messages in thread
From: Alexey Dobriyan @ 2006-08-02 15:26 UTC (permalink / raw)
To: Andi Kleen; +Cc: netdev, Andrew Morton
On Wed, Aug 02, 2006 at 05:02:11AM +0200, Andi Kleen wrote:
> > --- a/arch/x86_64/kernel/smp.c
> > +++ b/arch/x86_64/kernel/smp.c
> > @@ -203,7 +203,7 @@ int __cpuinit init_smp_flush(void)
> > {
> > int i;
> > for_each_cpu_mask(i, cpu_possible_map) {
> > - spin_lock_init(&per_cpu(flush_state.tlbstate_lock, i));
> > + spin_lock_init(&per_cpu(flush_state, i).tlbstate_lock);
>
> What advantage does this have over the earlier form?
I've grepped tree after seeing "[PATCH] fix vmstat per cpu usage"¹.
Rationale mentioned in that thread are
1) invalid asm on s390
2) it only works because per-cpu macros are very simple
> In general this should be split up into three patches.
Yep, I see Andrew splitted them.
¹ http://marc.theaimsgroup.com/?l=linux-kernel&m=115445399826223&w=2
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-08-02 15:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-08-01 23:23 [PATCH] Fix more per-cpu typos Alexey Dobriyan
2006-08-02 3:02 ` Andi Kleen
2006-08-02 15:26 ` Alexey Dobriyan
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).