linux.git/net/rxrpc, branch v2.6.38

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2011-03-03T23:43:15+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
  MAINTAINERS: Add Andy Gospodarek as co-maintainer.
  r8169: disable ASPM
  RxRPC: Fix v1 keys
  AF_RXRPC: Handle receiving ACKALL packets
  cnic: Fix lost interrupt on bnx2x
  cnic: Prevent status block race conditions with hardware
  net: dcbnl: check correct ops in dcbnl_ieee_set()
  e1000e: disable broken PHY wakeup for ICH10 LOMs, use MAC wakeup instead
  igb: fix sparse warning
  e1000: fix sparse warning
  netfilter: nf_log: avoid oops in (un)bind with invalid nfproto values
  dccp: fix oops on Reset after close
  ipvs: fix dst_lock locking on dest update
  davinci_emac: Add Carrier Link OK check in Davinci RX Handler
  bnx2x: update driver version to 1.62.00-6
  bnx2x: properly calculate lro_mss
  bnx2x: perform statistics "action" before state transition.
  bnx2x: properly configure coefficients for MinBW algorithm (NPAR mode).
  bnx2x: Fix ethtool -t link test for MF (non-pmf) devices.
  bnx2x: Fix nvram test for single port devices.
  ...

AF_RXRPC: Handle receiving ACKALL packets

2011-03-03T06:18:52+00:00

The OpenAFS server is now sending ACKALL packets, so we need to handle them.
Otherwise we report a protocol error and abort.

Signed-off-by: David Howells 
Signed-off-by: David S. Miller

RxRPC: Allocate tokens with kzalloc to avoid oops in rxrpc_destroy

2011-02-25T19:12:37+00:00

With slab poisoning enabled, I see the following oops:

  Unable to handle kernel paging request for data at address 0x6b6b6b6b6b6b6b73
  ...
  NIP [c0000000006bc61c] .rxrpc_destroy+0x44/0x104
  LR [c0000000006bc618] .rxrpc_destroy+0x40/0x104
  Call Trace:
  [c0000000feb2bc00] [c0000000006bc618] .rxrpc_destroy+0x40/0x104 (unreliable)
  [c0000000feb2bc90] [c000000000349b2c] .key_cleanup+0x1a8/0x20c
  [c0000000feb2bd40] [c0000000000a2920] .process_one_work+0x2f4/0x4d0
  [c0000000feb2be00] [c0000000000a2d50] .worker_thread+0x254/0x468
  [c0000000feb2bec0] [c0000000000a868c] .kthread+0xbc/0xc8
  [c0000000feb2bf90] [c000000000020e00] .kernel_thread+0x54/0x70

We aren't initialising token->next, but the code in destroy_context relies
on the list being NULL terminated. Use kzalloc to zero out all the fields.

Signed-off-by: Anton Blanchard 
Signed-off-by: David Howells 
Signed-off-by: Linus Torvalds

rxrpc: rxrpc_workqueue isn't used during memory reclaim

2011-01-14T17:25:11+00:00

rxrpc_workqueue isn't depended upon while reclaiming memory.  Convert
to alloc_workqueue() without WQ_MEM_RECLAIM.

Signed-off-by: Tejun Heo 
Signed-off-by: David Howells 
Cc: linux-afs@lists.infradead.org
Signed-off-by: Linus Torvalds

Net: rxrpc: Makefile: Remove deprecated kbuild goal definitions

2010-11-22T16:16:15+00:00

Changed Makefile to use -y instead of -objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.

Signed-off-by: Tracey Dent 
Signed-off-by: David S. Miller

net: use the macros defined for the members of flowi

2010-11-17T20:27:45+00:00

Use the macros defined for the members of flowi to clean the code up.

Signed-off-by: Changli Gao 
Signed-off-by: David S. Miller

Add a dummy printk function for the maintenance of unused printks

2010-08-12T16:51:35+00:00

Add a dummy printk function for the maintenance of unused printks through gcc
format checking, and also so that side-effect checking is maintained too.

Signed-off-by: David Howells 
Signed-off-by: Linus Torvalds

RxRPC: Fix a potential deadlock between the call resend_timer and state_lock

2010-08-05T04:53:16+00:00

RxRPC can potentially deadlock as rxrpc_resend_time_expired() wants to get
call->state_lock so that it can alter the state of an RxRPC call.  However, its
caller (call_timer_fn()) has an apparent lock on the timer struct.

The problem is that rxrpc_resend_time_expired() isn't permitted to lock
call->state_lock as this could cause a deadlock against rxrpc_send_abort() as
that takes state_lock and then attempts to delete the resend timer by calling
del_timer_sync().

The deadlock can occur because del_timer_sync() will sit there forever waiting
for rxrpc_resend_time_expired() to return, but the latter may then wait for
call->state_lock, which rxrpc_send_abort() holds around del_timer_sync()...

This leads to a warning appearing in the kernel log that looks something like
the attached.

It should be sufficient to simply dispense with the locks.  It doesn't matter
if we set the resend timer expired event bit and queue the event processor
whilst we're changing state to one where the resend timer is irrelevant as the
event can just be ignored by the processor thereafter.

=======================================================
[ INFO: possible circular locking dependency detected ]
2.6.35-rc3-cachefs+ #115
-------------------------------------------------------
swapper/0 is trying to acquire lock:
 (&call->state_lock){++--..}, at: [] rxrpc_resend_time_expired+0x56/0x96 [af_rxrpc]

but task is already holding lock:
 (&call->resend_timer){+.-...}, at: [] run_timer_softirq+0x182/0x2a5

which lock already depends on the new lock.

the existing dependency chain (in reverse order) is:

-> #1 (&call->resend_timer){+.-...}:
       [] __lock_acquire+0x889/0x8fa
       [] lock_acquire+0x57/0x6d
       [] del_timer_sync+0x3c/0x86
       [] rxrpc_send_abort+0x50/0x97 [af_rxrpc]
       [] rxrpc_kernel_abort_call+0xa1/0xdd [af_rxrpc]
       [] afs_deliver_to_call+0x129/0x368 [kafs]
       [] afs_process_async_call+0x54/0xff [kafs]
       [] worker_thread+0x1ef/0x2e2
       [] kthread+0x7a/0x82
       [] kernel_thread_helper+0x4/0x10

-> #0 (&call->state_lock){++--..}:
       [] validate_chain+0x727/0xd23
       [] __lock_acquire+0x889/0x8fa
       [] lock_acquire+0x57/0x6d
       [] _raw_read_lock_bh+0x34/0x43
       [] rxrpc_resend_time_expired+0x56/0x96 [af_rxrpc]
       [] run_timer_softirq+0x1f3/0x2a5
       [] __do_softirq+0xa2/0x13e
       [] call_softirq+0x1c/0x28
       [] do_softirq+0x38/0x80
       [] irq_exit+0x45/0x47
       [] smp_apic_timer_interrupt+0x88/0x96
       [] apic_timer_interrupt+0x13/0x20
       [] cpu_idle+0x4d/0x83
       [] start_secondary+0x1bd/0x1c1

other info that might help us debug this:

1 lock held by swapper/0:
 #0:  (&call->resend_timer){+.-...}, at: [] run_timer_softirq+0x182/0x2a5

stack backtrace:
Pid: 0, comm: swapper Not tainted 2.6.35-rc3-cachefs+ #115
Call Trace:
   [] print_circular_bug+0xae/0xbd
 [] validate_chain+0x727/0xd23
 [] __lock_acquire+0x889/0x8fa
 [] ? mark_lock+0x42f/0x51f
 [] lock_acquire+0x57/0x6d
 [] ? rxrpc_resend_time_expired+0x56/0x96 [af_rxrpc]
 [] _raw_read_lock_bh+0x34/0x43
 [] ? rxrpc_resend_time_expired+0x56/0x96 [af_rxrpc]
 [] rxrpc_resend_time_expired+0x56/0x96 [af_rxrpc]
 [] run_timer_softirq+0x1f3/0x2a5
 [] ? run_timer_softirq+0x182/0x2a5
 [] ? rxrpc_resend_time_expired+0x0/0x96 [af_rxrpc]
 [] ? __do_softirq+0x69/0x13e
 [] __do_softirq+0xa2/0x13e
 [] call_softirq+0x1c/0x28
 [] do_softirq+0x38/0x80
 [] irq_exit+0x45/0x47
 [] smp_apic_timer_interrupt+0x88/0x96
 [] apic_timer_interrupt+0x13/0x20
   [] ? __atomic_notifier_call_chain+0x0/0x86
 [] ? mwait_idle+0x6e/0x78
 [] ? mwait_idle+0x65/0x78
 [] cpu_idle+0x4d/0x83
 [] start_secondary+0x1bd/0x1c1

Signed-off-by: David Howells 
Signed-off-by: David S. Miller

net-next: remove useless union keyword

2010-06-11T06:31:35+00:00

remove useless union keyword in rtable, rt6_info and dn_route.

Since there is only one member in a union, the union keyword isn't useful.

Signed-off-by: Changli Gao 
Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

net: sock_def_readable() and friends RCU conversion

2010-05-01T22:00:15+00:00

sk_callback_lock rwlock actually protects sk->sk_sleep pointer, so we
need two atomic operations (and associated dirtying) per incoming
packet.

RCU conversion is pretty much needed :

1) Add a new structure, called "struct socket_wq" to hold all fields
that will need rcu_read_lock() protection (currently: a
wait_queue_head_t and a struct fasync_struct pointer).

[Future patch will add a list anchor for wakeup coalescing]

2) Attach one of such structure to each "struct socket" created in
sock_alloc_inode().

3) Respect RCU grace period when freeing a "struct socket_wq"

4) Change sk_sleep pointer in "struct sock" by sk_wq, pointer to "struct
socket_wq"

5) Change sk_sleep() function to use new sk->sk_wq instead of
sk->sk_sleep

6) Change sk_has_sleeper() to wq_has_sleeper() that must be used inside
a rcu_read_lock() section.

7) Change all sk_has_sleeper() callers to :
  - Use rcu_read_lock() instead of read_lock(&sk->sk_callback_lock)
  - Use wq_has_sleeper() to eventually wakeup tasks.
  - Use rcu_read_unlock() instead of read_unlock(&sk->sk_callback_lock)

8) sock_wake_async() is modified to use rcu protection as well.

9) Exceptions :
  macvtap, drivers/net/tun.c, af_unix use integrated "struct socket_wq"
instead of dynamically allocated ones. They dont need rcu freeing.

Some cleanups or followups are probably needed, (possible
sk_callback_lock conversion to a spinlock for example...).

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller