Commits · 2f970d83576cf4938fd75551c465050f6a16c33c · Kirill Smelkov / linux

17 Jan, 2006 40 commits

[IPV4]: rt_cache_stat can be statically defined · 2f970d83

Eric Dumazet authored Jan 17, 2006

Using __get_cpu_var(obj) is slightly faster than per_cpu_ptr(obj, 
raw_smp_processor_id()).

1) Smaller code and memory use
For static and small objects, DEFINE_PER_CPU(type, object) is preferred over a 
alloc_percpu() : Better and smaller code to access them, and no extra memory 
(storing the pointer, and the percpu array of pointers)

x86_64 code before patch

mov    1237577(%rip),%rax        # ffffffff803e5990 <rt_cache_stat>
not    %rax  # part of per_cpu machinery
mov    %gs:0x3c,%edx # get cpu number
movslq %edx,%rdx # extend 32 bits cpu number to 64 bits
mov    (%rax,%rdx,8),%rax # get the pointer for this cpu
incl   0x38(%rax)

x86_64 code after patch

mov    $per_cpu__rt_cache_stat,%rdx
mov    %gs:0x48,%rax # get percpu data offset
incl   0x38(%rax,%rdx,1)

2) False sharing avoidance for SMP :
For a small NR_CPUS, the array of per cpu pointers allocated in alloc_percpu() 
can be <= 32 bytes. This let slab code gives a part of a cache line. If the 
other part of this 64 bytes (or 128 bytes) cache line is used by a mostly 
written object, we can have false sharing and expensive per_cpu_ptr() operations.

Size of rt_cache_stat is 64 bytes, so this patch is not a danger of a too big 
increase of bss (in UP mode) or static per_cpu data for SMP 
(PERCPU_ENOUGH_ROOM is currently 32768 bytes)
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2f970d83

[NET]: Make second arg to skb_reserved() signed. · 8243126c

David S. Miller authored Jan 17, 2006

Some subsystems, such as PPP, can send negative values
here.  It just happened to work correctly on 32-bit with
an unsigned value, but on 64-bit this explodes.

Figured out by Paul Mackerras based upon several PPP crash
reports.
Signed-off-by: David S. Miller <davem@davemloft.net>

8243126c

[NETFILTER]: ip_conntrack_proto_gre.c needs linux/interrupt.h · f09484ff
David S. Miller authored Jan 17, 2006
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
f09484ff

[TG3]: Refine nvram locking · ec41c7df

Michael Chan authored Jan 17, 2006

Add nvram lock count so that calls to tg3_nvram_lock()/unlock() can
be nested. Add error checking to all callers of tg3_nvram_lock()
where appropriate. To prevent nvram lock failures after halting the
firmware, it is also necessary to release firmware's nvram lock in
tg3_halt_cpu().

Update version to 3.48.

Based on David Miller's initial patch.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

ec41c7df

[NETFILTER] ip6tables: whitespace and indent cosmetic cleanup · f0daaa65

Yasuyuki Kozakai authored Jan 17, 2006

Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

f0daaa65

[NETFILTER] ip6tables: remove unused definitions · e0069cae

Yasuyuki Kozakai authored Jan 17, 2006

These definitions ware used for only internal use in kernel <= 2.6.13,
which had not introduced the unified parser of IPv6 extension header yet.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

e0069cae

[NETFILTER] Makefile cleanup · 6dd42af7

Yasuyuki Kozakai authored Jan 17, 2006

These are replaced with x_tables matches and no longer exist.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

6dd42af7

[NETFILTER] ip[6]t_policy: Fix compilation warnings · ccc91324

Benoit Boissinot authored Jan 17, 2006

ip[6]t_policy argument conversion slipped when merging with x_tables
Signed-off-by: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

ccc91324

[NET]: Fix whitespace issues in net/core/filter.c · e35bedf3

Kris Katterjohn authored Jan 17, 2006

This fixes some whitespace issues in net/core/filter.c
Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

e35bedf3

[PKT_SCHED] sch_prio: fix qdisc bands init · dd914b40

Amnon Aaronsohn authored Jan 17, 2006

Currently when PRIO is configured to use N bands, it lets the packets be
directed to any of the bands 0..N-1. However, PRIO attaches a fifo qdisc
only to the bands that appear in the priomap; the rest of the N bands
remain with a noop qdisc attached. This patch changes PRIO's behavior so
that it attaches a fifo qdisc to all of the N bands.
Signed-off-by: Amnon Aaronsohn <bla@cs.huji.ac.il>
Signed-off-by: David S. Miller <davem@davemloft.net>

dd914b40

[IPV6]: Preserve procfs IPV6 address output format · 9343e79a

YOSHIFUJI Hideaki authored Jan 17, 2006

Procfs always output IPV6 addresses without the colon
characters, and we cannot change that.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

9343e79a

Linux v2.6.16-rc1 · 2664b250
Linus Torvalds authored Jan 16, 2006

2664b250
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block · fb60a9fe
Linus Torvalds authored Jan 16, 2006

fb60a9fe
[PATCH] Remove unused code from rioctrl.c (Last for this batch of work) · f4caf160
Alan Cox authored Jan 16, 2006
```
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
```
f4caf160