mirror of
https://github.com/torvalds/linux.git
synced 2026-09-14 16:10:02 +02:00
72f2b4516f
The zero-copy Tx batch parser stops when it encounters an invalid
descriptor. If this happens after one or more continuation descriptors,
the Tx consumer can be advanced past fragments that are neither submitted
to the driver nor returned to userspace through the completion ring.
A similar problem occurs when a packet exceeds xdp_zc_max_segs. The
descriptors consumed up to the limit are released without completion, and
the remaining continuation descriptors can subsequently be interpreted
as the beginning of another packet.
Parse Tx batches in packet units and distinguish descriptors belonging to
complete valid packets from descriptors consumed while draining an
invalid or oversized packet. Return the former to the driver and append
the latter to the CQ address area so userspace can reclaim their UMEM
frames.
Treat a standalone invalid descriptor as a one-descriptor reclaim-only
packet. Advancing the Tx-ring consumer releases the ring slot, but does
not by itself return ownership of the referenced UMEM frame to userspace.
Once draining starts, continue until the packet's end-of-packet
descriptor is consumed. Preserve the drain state on the socket when EOP
has not yet been supplied, so draining can continue during a later call.
Leave incomplete but otherwise valid packets on the Tx ring.
Shared-UMEM pools using multi-buffer Tx also need packet-framed parsing.
Walk their Tx sockets one packet at a time, preserving the existing
per-socket fairness scheme, instead of using the legacy one-descriptor
fallback. Keep that fallback for shared pools that do not use
multi-buffer Tx. Since the drain state is maintained per socket and both
the singular and shared paths can resume an interrupted drain, changing
the socket list from singular to shared requires no special bind-time
transition.
CQ entries are positional, and drivers may complete only part of the Tx
work returned by xsk_tx_peek_release_desc_batch(). Therefore, reclaim-only
entries cannot be published immediately when earlier driver-visible
descriptors are still outstanding.
Track the number of driver-visible CQ entries preceding the reclaim
entries. Let xsk_tx_completed() publish partial hardware Tx completions,
and publish the reclaim entries only after every earlier Tx descriptor
has completed. Complete a reclaim-only batch immediately when there is no
driver-visible work in front of it, and prevent another Tx batch from
being appended while reclaim entries remain pending.
Also cap batch processing by the size of the pool's temporary descriptor
array, as Tx rings belonging to sockets sharing a UMEM may have different
sizes.
This ensures that every invalid Tx descriptor consumed by the ZC batch
path is either submitted to the driver as part of a valid packet or
returned to userspace without violating CQ completion ordering.
Reviewed-by: Jason Xing <kernelxing@tencent.com>
Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Acked-by: Stanislav Fomichev <sdf@fomichev.me>
Fixes:
|
||
|---|---|---|
| .. | ||
| device_drivers | ||
| devlink | ||
| diagnostic | ||
| dsa | ||
| mac80211_hwsim | ||
| net_cachelines | ||
| pse-pd | ||
| xfrm | ||
| 6lowpan.rst | ||
| af_xdp.rst | ||
| alias.rst | ||
| arcnet-hardware.rst | ||
| arcnet.rst | ||
| atm.rst | ||
| bareudp.rst | ||
| batman-adv.rst | ||
| bonding.rst | ||
| bridge.rst | ||
| can_ucan_protocol.rst | ||
| can.rst | ||
| cdc_mbim.rst | ||
| checksum-offloads.rst | ||
| dctcp.rst | ||
| devmem.rst | ||
| dns_resolver.rst | ||
| driver.rst | ||
| eql.rst | ||
| ethtool-netlink.rst | ||
| failover.rst | ||
| fib_trie.rst | ||
| filter.rst | ||
| gen_stats.rst | ||
| generic_netlink.rst | ||
| generic-hdlc.rst | ||
| gtp.rst | ||
| ieee802154.rst | ||
| ila.rst | ||
| index.rst | ||
| ioam6-sysctl.rst | ||
| iou-zcrx.rst | ||
| ip_dynaddr.rst | ||
| ip-sysctl.rst | ||
| ipsec.rst | ||
| ipv6.rst | ||
| ipvlan.rst | ||
| ipvs-sysctl.rst | ||
| iso15765-2.rst | ||
| j1939.rst | ||
| kapi.rst | ||
| kcm.rst | ||
| l2tp.rst | ||
| lapb-module.rst | ||
| mac80211-auth-assoc-deauth.txt | ||
| mac80211-injection.rst | ||
| mctp.rst | ||
| mpls-sysctl.rst | ||
| mptcp-sysctl.rst | ||
| mptcp.rst | ||
| msg_zerocopy.rst | ||
| multi-pf-netdev.rst | ||
| multiqueue.rst | ||
| napi.rst | ||
| net_dim.rst | ||
| net_failover.rst | ||
| netconsole.rst | ||
| netdev-features.rst | ||
| netdevices.rst | ||
| netfilter-sysctl.rst | ||
| netif-msg.rst | ||
| netmem.rst | ||
| nexthop-group-resilient.rst | ||
| nf_conntrack-sysctl.rst | ||
| nf_flowtable.rst | ||
| nfc.rst | ||
| oa-tc6-framework.rst | ||
| openvswitch.rst | ||
| operstates.rst | ||
| packet_mmap.rst | ||
| page_pool.rst | ||
| phonet.rst | ||
| phy-link-topology.rst | ||
| phy-port.rst | ||
| phy.rst | ||
| pktgen.rst | ||
| plip.rst | ||
| ppp_generic.rst | ||
| proc_net_tcp.rst | ||
| psp.rst | ||
| radiotap-headers.rst | ||
| rds.rst | ||
| regulatory.rst | ||
| representors.rst | ||
| rxrpc.rst | ||
| scaling.rst | ||
| sctp.rst | ||
| secid.rst | ||
| seg6-sysctl.rst | ||
| segmentation-offloads.rst | ||
| sfp-phylink.rst | ||
| skbuff.rst | ||
| smc-sysctl.rst | ||
| snmp_counter.rst | ||
| sriov.rst | ||
| statistics.rst | ||
| strparser.rst | ||
| switchdev.rst | ||
| sysfs-tagging.rst | ||
| tc-actions-env-rules.rst | ||
| tc-queue-filters.rst | ||
| tcp_ao.rst | ||
| tcp-thin.rst | ||
| team.rst | ||
| timestamping.rst | ||
| tipc.rst | ||
| tls-handshake.rst | ||
| tls-offload-layers.svg | ||
| tls-offload-reorder-bad.svg | ||
| tls-offload-reorder-good.svg | ||
| tls-offload.rst | ||
| tls.rst | ||
| tproxy.rst | ||
| tuntap.rst | ||
| udplite.rst | ||
| vrf.rst | ||
| vxlan.rst | ||
| x25-iface.rst | ||
| x25.rst | ||
| xdp-rx-metadata.rst | ||
| xsk-tx-metadata.rst | ||
