linux-stable.git/net/core/skbuff.c, branch v3.1

net: copy userspace buffers on device forwarding

2011-09-15T18:49:44+00:00

dev_forward_skb loops an skb back into host networking
stack which might hang on the memory indefinitely.
In particular, this can happen in macvtap in bridged mode.
Copy the userspace fragments to avoid blocking the
sender in that case.

As this patch makes skb_copy_ubufs extern now,
I also added some documentation and made it clear
the SKBTX_DEV_ZEROCOPY flag automatically instead
of doing it in all callers. This can be made into a separate
patch if people feel it's worth it.

Signed-off-by: Michael S. Tsirkin 
Signed-off-by: David S. Miller

net: add kerneldoc to skb_copy_bits()

2011-08-02T01:03:06+00:00

Since skb_copy_bits() is called from assembly, add a fat comment to make
clear we should think twice before changing its prototype.

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

skbuff: fix error handling in pskb_copy()

2011-07-21T21:47:54+00:00

There are two problems:
1) "n" was allocated with alloc_skb() so we should free it with
   kfree_skb() instead of regular kfree().
2) We return the freed pointer instead of NULL.

Signed-off-by: Dan Carpenter 
Reviewed-by: Eric Dumazet 
Signed-off-by: David S. Miller

skbuff: clear tx zero-copy flag

2011-07-09T09:55:27+00:00

This patch clears tx zero-copy flag as needed.

Signed-off-by: Shirley Ma 
Signed-off-by: David S. Miller

skbuff: skb supports zero-copy buffers

2011-07-07T11:41:13+00:00

This patch adds userspace buffers support in skb shared info. A new
struct skb_ubuf_info is needed to maintain the userspace buffers
argument and index, a callback is used to notify userspace to release
the buffers once lower device has done DMA (Last reference to that skb
has gone).

If there is any userspace apps to reference these userspace buffers,
then these userspaces buffers will be copied into kernel. This way we
can prevent userspace apps from holding these userspace buffers too long.

Use destructor_arg to point to the userspace buffer info; a new tx flags
SKBTX_DEV_ZEROCOPY is added for zero-copy buffer check.

Signed-off-by: Shirley Ma 
Signed-off-by: David S. Miller

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

2011-05-20T20:43:21+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.

sanitize usage

2011-05-20T19:50:29+00:00

Commit e66eed651fd1 ("list: remove prefetching from regular list
iterators") removed the include of prefetch.h from list.h, which
uncovered several cases that had apparently relied on that rather
obscure header file dependency.

So this fixes things up a bit, using

   grep -L linux/prefetch.h $(git grep -l '[^a-z_]prefetchw*(' -- '*.[ch]')
   grep -L 'prefetchw*(' $(git grep -l 'linux/prefetch.h' -- '*.[ch]')

to guide us in finding files that either need 
inclusion, or have it despite not needing it.

There are more of them around (mostly network drivers), but this gets
many core ones.

Reported-by: Stephen Rothwell 
Signed-off-by: Linus Torvalds

net: add skb_dst_force() in sock_queue_err_skb()

2011-05-18T06:21:31+00:00

Commit 7fee226ad239 (add a noref bit on skb dst) forgot to use
skb_dst_force() on packets queued in sk_error_queue

This triggers following warning, for applications using IP_CMSG_PKTINFO
receiving one error status


------------[ cut here ]------------
WARNING: at include/linux/skbuff.h:457 ip_cmsg_recv_pktinfo+0xa6/0xb0()
Hardware name: 2669UYD
Modules linked in: isofs vboxnetadp vboxnetflt nfsd ebtable_nat ebtables
lib80211_crypt_ccmp uinput xcbc hdaps tp_smapi thinkpad_ec radeonfb fb_ddc
radeon ttm drm_kms_helper drm ipw2200 intel_agp intel_gtt libipw i2c_algo_bit
i2c_i801 agpgart rng_core cfbfillrect cfbcopyarea cfbimgblt video raid10 raid1
raid0 linear md_mod vboxdrv
Pid: 4697, comm: miredo Not tainted 2.6.39-rc6-00569-g5895198-dirty #22
Call Trace:
 [] ? printk+0x1d/0x1f
 [] warn_slowpath_common+0x72/0xa0
 [] ? ip_cmsg_recv_pktinfo+0xa6/0xb0
 [] ? ip_cmsg_recv_pktinfo+0xa6/0xb0
 [] warn_slowpath_null+0x20/0x30
 [] ip_cmsg_recv_pktinfo+0xa6/0xb0
 [] ip_cmsg_recv+0x127/0x260
 [] ? skb_dequeue+0x4d/0x70
 [] ? skb_copy_datagram_iovec+0x53/0x300
 [] ? sub_preempt_count+0x24/0x50
 [] ip_recv_error+0x23d/0x270
 [] udp_recvmsg+0x264/0x2b0
 [] inet_recvmsg+0xd9/0x130
 [] sock_recvmsg+0xf2/0x120
 [] ? might_fault+0x4b/0xa0
 [] ? verify_iovec+0x4c/0xc0
 [] ? sock_recvmsg_nosec+0x100/0x100
 [] __sys_recvmsg+0x114/0x1e0
 [] ? __lock_acquire+0x365/0x780
 [] ? fget_light+0xa6/0x3e0
 [] ? fget_light+0xbf/0x3e0
 [] ? fget_light+0x2e/0x3e0
 [] sys_recvmsg+0x39/0x60

Close bug https://bugzilla.kernel.org/show_bug.cgi?id=34622


Reported-by: Witold Baryluk 
Signed-off-by: Eric Dumazet 
CC: Stephen Hemminger 
Signed-off-by: David S. Miller

Fix common misspellings

2011-03-31T14:26:23+00:00

Fixes generated by 'codespell' and manually reviewed.

Signed-off-by: Lucas De Marchi

net: introduce rx_handler results and logic around that

2011-03-16T19:53:54+00:00

This patch allows rx_handlers to better signalize what to do next to
it's caller. That makes skb->deliver_no_wcard no longer needed.

kernel-doc for rx_handler_result is taken from Nicolas' patch.

Signed-off-by: Jiri Pirko 
Reviewed-by: Nicolas de Pesloüan 
Signed-off-by: David S. Miller