/* * net busy poll support * Copyright(c) 2013 Intel Corporation. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, * version 2, as published by the Free Software Foundation. * * This program is distributed in the hope it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * * You should have received a copy of the GNU General Public License along with * this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. * * Author: Eliezer Tamir * * Contact Information: * e1000-devel Mailing List */ #ifndef _LINUX_NET_BUSY_POLL_H #define _LINUX_NET_BUSY_POLL_H #include #include #ifdef CONFIG_NET_RX_BUSY_POLL struct napi_struct; extern unsigned int sysctl_net_busy_read __read_mostly; extern unsigned int sysctl_net_busy_poll __read_mostly; /* return values from ndo_ll_poll */ #define LL_FLUSH_FAILED -1 #define LL_FLUSH_BUSY -2 static inline bool net_busy_loop_on(void) { return sysctl_net_busy_poll; } static inline u64 busy_loop_us_clock(void) { return local_clock() >> 10; } static inline unsigned long sk_busy_loop_end_time(struct sock *sk) { return busy_loop_us_clock() + ACCESS_ONCE(sk->sk_ll_usec); } /* in poll/select we use the global sysctl_net_ll_poll value */ static inline unsigned long busy_loop_end_time(void) { return busy_loop_us_clock() + ACCESS_ONCE(sysctl_net_busy_poll); } static inline bool sk_can_busy_loop(const struct sock *sk) { return sk->sk_ll_usec && sk->sk_napi_id && !signal_pending(current); } static inline bool busy_loop_timeout(unsigned long end_time) { unsigned long now = busy_loop_us_clock(); return time_after(now, end_time); } bool sk_busy_loop(struct sock *sk, int nonblock); /* used in the NIC receive handler to mark the skb */ static inline void skb_mark_napi_id(struct sk_buff *skb, struct napi_struct *napi) { skb->napi_id = napi->napi_id; } #else /* CONFIG_NET_RX_BUSY_POLL */ static inline unsigned long net_busy_loop_on(void) { return 0; } static inline unsigned long busy_loop_end_time(void) { return 0; } static inline bool sk_can_busy_loop(struct sock *sk) { return false; } static inline void skb_mark_napi_id(struct sk_buff *skb, struct napi_struct *napi) { } static inline bool busy_loop_timeout(unsigned long end_time) { return true; } static inline bool sk_busy_loop(struct sock *sk, int nonblock) { return false; } #endif /* CONFIG_NET_RX_BUSY_POLL */ /* used in the protocol hanlder to propagate the napi_id to the socket */ static inline void sk_mark_napi_id(struct sock *sk, const struct sk_buff *skb) { #ifdef CONFIG_NET_RX_BUSY_POLL sk->sk_napi_id = skb->napi_id; #endif } /* variant used for unconnected sockets */ static inline void sk_mark_napi_id_once(struct sock *sk, const struct sk_buff *skb) { #ifdef CONFIG_NET_RX_BUSY_POLL if (!sk->sk_napi_id) sk->sk_napi_id = skb->napi_id; #endif } #endif /* _LINUX_NET_BUSY_POLL_H */ /option>space:mode:
authorMichael S. Tsirkin <mst@redhat.com>2017-02-03 05:43:52 +0200
committerMichael S. Tsirkin <mst@redhat.com>2017-02-03 23:38:50 +0200
commit0d5415b489f68b58e1983a53793d25d53098ed4b (patch)
tree9509a05b5c480b84214714698cffb85943be8124
parent566cf877a1fcb6d6dc0126b076aad062054c2637 (diff)
Revert "vring: Force use of DMA API for ARM-based systems with legacy devices"
This reverts commit c7070619f3408d9a0dffbed9149e6f00479cf43b. This has been shown to regress on some ARM systems: by forcing on DMA API usage for ARM systems, we have inadvertently kicked open a hornets' nest in terms of cache-coherency. Namely that unless the virtio device is explicitly described as capable of coherent DMA by firmware, the DMA APIs on ARM and other DT-based platforms will assume it is non-coherent. This turns out to cause a big problem for the likes of QEMU and kvmtool, which generate virtio-mmio devices in their guest DTs but neglect to add the often-overlooked "dma-coherent" property; as a result, we end up with the guest making non-cacheable accesses to the vring, the host doing so cacheably, both talking past each other and things going horribly wrong. We are working on a safer work-around. Fixes: c7070619f340 ("vring: Force use of DMA API for ARM-based systems with legacy devices") Reported-by: Robin Murphy <robin.murphy@arm.com> Cc: <stable@vger.kernel.org> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Marc Zyngier <marc.zyngier@arm.com>
-rw-r--r--drivers/virtio/virtio_ring.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c