Magnus Karlsson 9ad0375ed2 xsk: Fix race in SKB mode transmit with shared cq ... commit f09ced4053bc0a2094a12b60b646114c966ef4c6 upstream. Fix a race when multiple sockets are simultaneously calling sendto() when the completion ring is shared in the SKB case. This is the case when you share the same netdev and queue id through the XDP_SHARED_UMEM bind flag. The problem is that multiple processes can be in xsk_generic_xmit() and call the backpressure mechanism in xskq_prod_reserve(xs->pool->cq). As this is a shared resource in this specific scenario, a race might occur since the rings are single-producer single-consumer. Fix this by moving the tx_completion_lock from the socket to the pool as the pool is shared between the sockets that share the completion ring. (The pool is not shared when this is not the case.) And then protect the accesses to xskq_prod_reserve() with this lock. The tx_completion_lock is renamed cq_lock to better reflect that it protects accesses to the potentially shared completion ring. Fixes: 35fcde7f8d ("xsk: support for Tx") Reported-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Björn Töpel <bjorn.topel@intel.com> Link: https://lore.kernel.org/bpf/20201218134525.13119-2-magnus.karlsson@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2021-01-17 14:17:05 +01:00
..
9p	net: 9p: drop duplicate word in comment	2020-07-15 20:34:11 -07:00
bluetooth	Bluetooth: L2CAP: Fix calling sk_filter on non-socket based channel	2020-09-25 20:21:55 +02:00
caif	net: caif: Remove unused caif SPI driver	2020-09-29 14:02:53 -07:00
iucv
netfilter	netfilter: nft_dynset: fix timeouts later than 23 days	2020-12-08 20:42:11 +01:00
netns	can: remove obsolete version strings	2020-10-12 10:06:39 +02:00
nfc
phonet
sctp	net: sctp: Fix IPv6 ancestor_size calc in sctp_copy_descendant	2020-09-20 14:15:12 -07:00
tc_act	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-10-15 12:43:21 -07:00
6lowpan.h
act_api.h	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
addrconf.h	ipv6: some fixes for ipv6_dev_find()	2020-08-18 15:58:53 -07:00
af_ieee802154.h
af_rxrpc.h	rxrpc: Make rxrpc_kernel_get_srtt() indicate validity	2020-08-20 18:21:28 +01:00
af_unix.h
af_vsock.h
ah.h
arp.h
atmclip.h
ax25.h
ax88796.h
bareudp.h	bareudp: Reverted support to enable & disable rx metadata collection	2020-07-21 18:30:47 -07:00
bond_3ad.h
bond_alb.h
bond_options.h
bonding.h	bonding: fix feature flag setting at init time	2020-12-08 11:26:08 -08:00
bpf_sk_storage.h	bpf: Change bpf_sk_storage_*() to accept ARG_PTR_TO_BTF_ID_SOCK_COMMON	2020-09-25 13:58:01 -07:00
busy_poll.h
calipso.h
cfg80211-wext.h
cfg80211.h	mac80211: fix kernel-doc markups	2020-10-30 10:06:09 +01:00
cfg802154.h
checksum.h	saner calling conventions for csum_and_copy_..._user()	2020-08-20 15:45:15 -04:00
cipso_ipv4.h	cipso: Remove unused inline functions	2020-07-15 07:45:24 -07:00
cls_cgroup.h
codel_impl.h
codel_qdisc.h
codel.h
compat.h	net: simplify cBPF setsockopt compat handling	2020-07-19 18:16:40 -07:00
datalink.h
dcbevent.h
dcbnl.h
devlink.h	devlink: Add enable_remote_dev_reset generic parameter	2020-10-09 12:06:53 -07:00
dn_dev.h
dn_fib.h
dn_neigh.h
dn_nsp.h
dn_route.h
dn.h
dsa.h	net: dsa: propagate switchdev vlan_filtering prepare phase to drivers	2020-10-05 05:56:48 -07:00
dsfield.h
dst_cache.h
dst_metadata.h
dst_ops.h
dst.h	net: clean up codestyle	2020-08-31 12:33:34 -07:00
erspan.h
esp.h
espintcp.h
ethoc.h
failover.h
fib_notifier.h
fib_rules.h	fib: use indirect call wrappers in the most common fib_rules_ops	2020-07-28 17:42:31 -07:00
firewire.h
flow_dissector.h	net/flow_dissector: add packet hash dissection	2020-07-24 15:23:31 -07:00
flow_offload.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next	2020-08-05 20:13:21 -07:00
flow.h	ipv4: Initialize flowi4_multipath_hash in data path	2020-09-14 14:54:56 -07:00
fou.h
fq_impl.h	net/fq_impl: use skb_get_hash instead of skb_get_hash_perturb	2020-07-31 09:24:24 +02:00
fq.h	net/fq_impl: use skb_get_hash instead of skb_get_hash_perturb	2020-07-31 09:24:24 +02:00
garp.h
gen_stats.h
genetlink.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-10-05 18:40:01 -07:00
geneve.h
gre.h
gro_cells.h
gtp.h
gue.h
hwbm.h
icmp.h
ieee80211_radiotap.h	mac80211: add radiotap flag to prevent sequence number overwrite	2020-07-31 09:27:00 +02:00
ieee802154_netdev.h
if_inet6.h
ife.h
ila.h
inet_common.h
inet_connection_sock.h	tcp: add exponential backoff in __tcp_send_ack()	2020-09-30 14:21:30 -07:00
inet_ecn.h	inet_ecn: Fix endianness of checksum update when setting ECT(1)	2020-12-01 17:16:54 -08:00
inet_frag.h
inet_hashtables.h	tcp: fix race condition when creating child sockets from syncookies	2020-11-23 16:32:33 -08:00
inet_sock.h	inet: remove inet_sk_copy_descendant()	2020-08-26 07:33:19 -07:00
inet_timewait_sock.h
inet6_connection_sock.h
inet6_hashtables.h
inetpeer.h
ip_fib.h
ip_tunnels.h	ip_tunnels: Set tunnel option flag when tunnel metadata is present	2020-11-13 16:58:10 -08:00
ip_vs.h	ipvs: remove dependency on ip6_tables	2020-08-31 23:06:51 +02:00
ip.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-10-05 18:40:01 -07:00
ip6_checksum.h
ip6_fib.h	net: ip6_fib.h: drop duplicate word in comment	2020-07-15 20:34:11 -07:00
ip6_route.h
ip6_tunnel.h
ipcomp.h
ipconfig.h
ipv6_frag.h	ipv6: Remove dependency of ipv6_frag_thdr_truncated on ipv6 module	2020-11-19 10:49:50 -08:00
ipv6_stubs.h	ipv6: add ipv6_fragment hook in ipv6_stub	2020-08-31 12:26:39 -07:00
ipv6.h	ipv6: Remove dependency of ipv6_frag_thdr_truncated on ipv6 module	2020-11-19 10:49:50 -08:00
ipx.h
iw_handler.h
kcm.h
l3mdev.h
lag.h
lapb.h
lib80211.h
llc_c_ac.h
llc_c_ev.h
llc_c_st.h
llc_conn.h
llc_if.h
llc_pdu.h
llc_s_ac.h
llc_s_ev.h
llc_s_st.h
llc_sap.h
llc.h
lwtunnel.h
mac80211.h	mac80211: fix kernel-doc markups	2020-10-30 10:06:09 +01:00
mac802154.h
macsec.h
mip6.h
mld.h
mpls_iptunnel.h
mpls.h
mptcp.h	net: tcp: drop unused function argument from mptcp_incoming_options	2020-09-24 20:17:01 -07:00
mrp.h
ncsi.h
ndisc.h	ipv6: ndisc: adjust ndisc_ifinfo_sysctl_change prototype	2020-08-24 06:40:07 -07:00
neighbour.h	net: Exempt multicast addresses from five-second neighbor lifetime	2020-11-13 14:24:39 -08:00
net_failover.h
net_namespace.h	bpf, net: Rework cookie generator as per-cpu one	2020-09-30 11:50:35 -07:00
net_ratelimit.h
netevent.h
netlabel.h
netlink.h	netlink: export policy in extended ACK	2020-10-09 20:22:32 -07:00
netprio_cgroup.h
netrom.h
nexthop.h	nexthop: Remove NEXTHOP_EVENT_ADD	2020-09-15 16:31:11 -07:00
nl802154.h
nsh.h
p8022.h
page_pool.h
pie.h
ping.h
pkt_cls.h	net: sched: Do not drop root lock in tcf_qevent_handle()	2020-07-16 16:48:34 -07:00
pkt_sched.h	net/sched: get rid of qdisc->padded	2020-10-09 08:08:08 -07:00
pptp.h
protocol.h
psample.h
psnap.h
raw.h
rawv6.h
red.h	net: sched: prevent invalid Scell_log shift count	2021-01-12 20:18:12 +01:00
regulatory.h	net/wireless: regulatory.h: drop duplicate word in comment	2020-07-31 09:24:23 +02:00
request_sock.h	tcp: bpf: Optionally store mac header in TCP_SAVE_SYN	2020-08-24 14:35:00 -07:00
rose.h
route.h
rpl.h
rsi_91x.h
rtnetlink.h
rtnh.h
sch_generic.h	net/sched: get rid of qdisc->padded	2020-10-09 08:08:08 -07:00
scm.h
secure_seq.h
seg6_hmac.h
seg6_local.h
seg6.h
slhc_vj.h
smc.h	net/smc: introduce CHID callback for ISM devices	2020-09-28 15:19:03 -07:00
snmp.h
sock_reuseport.h
sock.h	mptcp: add sk_stop_timer_sync helper	2020-09-24 19:58:34 -07:00
Space.h
stp.h
strparser.h
switchdev.h	bridge: Add SWITCHDEV_FDB_FLUSH_TO_BRIDGE notifier	2020-09-15 13:21:47 -07:00
tcp_states.h
tcp.h	bpf: tcp: Do not limit cb_flags when creating child sk from listen sk	2020-10-02 11:34:48 -07:00
timewait_sock.h
tipc.h
tls_toe.h
tls.h	net/tls: Protect from calling tls_dev_del for TLS RX twice	2020-11-25 17:31:06 -08:00
transp_v6.h
tso.h
tun_proto.h
udp_tunnel.h	udp_tunnel: add the ability to share port tables	2020-09-28 12:50:12 -07:00
udp.h	net/udp: switch udp_lib_setsockopt to sockptr_t	2020-07-24 15:41:54 -07:00
udplite.h
vsock_addr.h
vxlan.h	net: sched: only keep the available bits when setting vxlan md->gbp	2020-09-14 16:49:39 -07:00
wext.h
wimax.h	net: wimax: fix duplicate words in comments	2020-07-15 20:34:02 -07:00
x25.h
x25device.h
xdp_priv.h
xdp_sock_drv.h	xsk: i40e: ice: ixgbe: mlx5: Test for dma_need_sync earlier for better performance	2020-08-31 21:15:04 +02:00
xdp_sock.h	xsk: Fix race in SKB mode transmit with shared cq	2021-01-17 14:17:05 +01:00
xdp.h	xdp: Remove the xdp_attachment_flags_ok() callback	2020-12-09 16:27:42 +01:00
xfrm.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-10-05 18:40:01 -07:00
xsk_buff_pool.h	xsk: Fix race in SKB mode transmit with shared cq	2021-01-17 14:17:05 +01:00