Linux kernel stable tree https://git.rulkc.org/pub/scm/linux/kernel/git/stable/linux-stable.git/atom?h=linux-2.6.35.y 2010-07-01T16:25:40+00:00 2010-07-01T16:25:40+00:00 Michael S. Tsirkin mst@redhat.com 2010-07-01T15:40:12+00:00 urn:sha1:7b3384fc30633738ae4eaf8e1bc6ce70470ced80 patch 'break out of polling loop on error' caused a minor performance regression on my machine: recover that performance by adding a bunch of unlikely annotations in the error handling. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> 2010-06-27T08:52:25+00:00 Michael S. Tsirkin mst@redhat.com 2010-06-24T13:59:59+00:00 urn:sha1:d5675bd204efd87a174eeea592de23c4c4e7f908 When ring parsing fails, we currently handle this as ring empty condition. This means that we enable kicks and recheck ring empty: if this not empty, we re-start polling which of course will fail again. Instead, let's return a negative error code and stop polling. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> 2010-05-28T17:18:40+00:00 Linus Torvalds torvalds@linux-foundation.org 2010-05-28T17:18:40+00:00 urn:sha1:72da3bc0cb3e82bd95f278a0c5c988e506e56d13 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (22 commits) netlink: bug fix: wrong size was calculated for vfinfo list blob netlink: bug fix: don't overrun skbs on vf_port dump xt_tee: use skb_dst_drop() netdev/fec: fix ifconfig eth0 down hang issue cnic: Fix context memory init. on 5709. drivers/net: Eliminate a NULL pointer dereference drivers/net/hamradio: Eliminate a NULL pointer dereference be2net: Patch removes redundant while statement in loop. ipv6: Add GSO support on forwarding path net: fix __neigh_event_send() vhost: fix the memory leak which will happen when memory_access_ok fails vhost-net: fix to check the return value of copy_to/from_user() correctly vhost: fix to check the return value of copy_to/from_user() correctly vhost: Fix host panic if ioctl called with wrong index net: fix lock_sock_bh/unlock_sock_bh net/iucv: Add missing spin_unlock net: ll_temac: fix checksum offload logic net: ll_temac: fix interrupt bug when interrupt 0 is used sctp: dubious bitfields in sctp_transport ipmr: off by one in __ipmr_fill_mroute() ... 2010-05-27T10:55:17+00:00 Takuya Yoshikawa yoshikawa.takuya@oss.ntt.co.jp 2010-05-27T10:03:56+00:00 urn:sha1:a02c37891a9b2d7ce93f9d09455b4f67c4c23b95 We need to free newmem when vhost_set_memory() fails to complete. Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> 2010-05-27T10:54:59+00:00 Takuya Yoshikawa yoshikawa.takuya@oss.ntt.co.jp 2010-05-27T09:58:03+00:00 urn:sha1:7ad9c9d27048547e96e4e3a13b5780ec6f81bb9f copy_to/from_user() returns the number of bytes that could not be copied. So we need to check if it is not zero, and in that case, we should return the error number -EFAULT rather than directly return the return value from copy_to/from_user(). Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> 2010-05-27T09:19:02+00:00 Krishna Kumar krkumar2@in.ibm.com 2010-05-25T05:40:36+00:00 urn:sha1:0f3d9a17469d71ba1bab79c07c8eecb9e26e60af Missed a boundary value check in vhost_set_vring. The host panics if idx == nvqs is used in ioctl commands in vhost_virtqueue_init. Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> 2010-05-25T15:07:02+00:00 Alexey Dobriyan adobriyan@gmail.com 2010-05-24T21:33:03+00:00 urn:sha1:4be929be34f9bdeffa40d815d32d7d60d2c7f03b - C99 knows about USHRT_MAX/SHRT_MAX/SHRT_MIN, not USHORT_MAX/SHORT_MAX/SHORT_MIN. - Make SHRT_MIN of type s16, not int, for consistency. [akpm@linux-foundation.org: fix drivers/dma/timb_dma.c] [akpm@linux-foundation.org: fix security/keys/keyring.c] Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Acked-by: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 2010-05-17T05:26:58+00:00 David S. Miller davem@davemloft.net 2010-05-17T05:26:58+00:00 urn:sha1:6811d58fc148c393f80a9f5a9db49d7e75cdc546 Conflicts: include/linux/if_link.h 2010-05-12T15:04:04+00:00 Michael S. Tsirkin mst@redhat.com 2010-05-11T16:44:17+00:00 urn:sha1:0d4993563bde70bc7c7718686bc5c5c089733001 According to memory-barriers.txt, an smp memory barrier in guest should always be paired with an smp memory barrier in host, and I quote "a lack of appropriate pairing is almost certainly an error". In case of vhost, failure to flush out used index update before looking at the interrupt disable flag could result in missed interrupts, resulting in networking hang under stress. This might happen when flags read bypasses used index write. So we see interrupts disabled and do not interrupt, at the same time guest writes flags value to enable interrupt, reads an old used index value, thinks that used ring is empty and waits for interrupt. Note: the barrier we pair with here is in drivers/virtio/virtio_ring.c, function vring_enable_cb. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Juan Quintela <quintela@redhat.com> 2010-04-15T05:52:46+00:00 David S. Miller davem@davemloft.net 2010-04-15T05:52:46+00:00 urn:sha1:fea069152614cdeefba4b2bf80afcddb9c217fc8