Daniel Borkmann
1f211a1b92
net, sched: add clsact qdisc ...
This work adds a generalization of the ingress qdisc as a qdisc holding
only classifiers. The clsact qdisc works on ingress, but also on egress.
In both cases, it's execution happens without taking the qdisc lock, and
the main difference for the egress part compared to prior version of [1]
is that this can be applied with _any_ underlying real egress qdisc (also
classless ones).
Besides solving the use-case of [1], that is, allowing for more programmability
on assigning skb->priority for the mqprio case that is supported by most
popular 10G+ NICs, it also opens up a lot more flexibility for other tc
applications. The main work on classification can already be done at clsact
egress time if the use-case allows and state stored for later retrieval
f.e. again in skb->priority with major/minors (which is checked by most
classful qdiscs before consulting tc_classify()) and/or in other skb fields
like skb->tc_index for some light-weight post-processing to get to the
eventual classid in case of a classful qdisc. Another use case is that
the clsact egress part allows to have a central egress counterpart to
the ingress classifiers, so that classifiers can easily share state (e.g.
in cls_bpf via eBPF maps) for ingress and egress.
Currently, default setups like mq + pfifo_fast would require for this to
use, for example, prio qdisc instead (to get a tc_classify() run) and to
duplicate the egress classifier for each queue. With clsact, it allows
for leaving the setup as is, it can additionally assign skb->priority to
put the skb in one of pfifo_fast's bands and it can share state with maps.
Moreover, we can access the skb's dst entry (f.e. to retrieve tclassid)
w/o the need to perform a skb_dst_force() to hold on to it any longer. In
lwt case, we can also use this facility to setup dst metadata via cls_bpf
(bpf_skb_set_tunnel_key()) without needing a real egress qdisc just for
that (case of IFF_NO_QUEUE devices, for example).
The realization can be done without any changes to the scheduler core
framework. All it takes is that we have two a-priori defined minors/child
classes, where we can mux between ingress and egress classifier list
(dev->ingress_cl_list and dev->egress_cl_list, latter stored close to
dev->_tx to avoid extra cacheline miss for moderate loads). The egress
part is a bit similar modelled to handle_ing() and patched to a noop in
case the functionality is not used. Both handlers are now called
sch_handle_ingress() and sch_handle_egress(), code sharing among the two
doesn't seem practical as there are various minor differences in both
paths, so that making them conditional in a single handler would rather
slow things down.
Full compatibility to ingress qdisc is provided as well. Since both
piggyback on TC_H_CLSACT, only one of them (ingress/clsact) can exist
per netdevice, and thus ingress qdisc specific behaviour can be retained
for user space. This means, either a user does 'tc qdisc add dev foo ingress'
and configures ingress qdisc as usual, or the 'tc qdisc add dev foo clsact'
alternative, where both, ingress and egress classifier can be configured
as in the below example. ingress qdisc supports attaching classifier to any
minor number whereas clsact has two fixed minors for muxing between the
lists, therefore to not break user space setups, they are better done as
two separate qdiscs.
I decided to extend the sch_ingress module with clsact functionality so
that commonly used code can be reused, the module is being aliased with
sch_clsact so that it can be auto-loaded properly. Alternative would have been
to add a flag when initializing ingress to alter its behaviour plus aliasing
to a different name (as it's more than just ingress). However, the first would
end up, based on the flag, choosing the new/old behaviour by calling different
function implementations to handle each anyway, the latter would require to
register ingress qdisc once again under different alias. So, this really begs
to provide a minimal, cleaner approach to have Qdisc_ops and Qdisc_class_ops
by its own that share callbacks used by both.
Example, adding qdisc:
# tc qdisc add dev foo clsact
# tc qdisc show dev foo
qdisc mq 0: root
qdisc pfifo_fast 0: parent :1 bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1
qdisc pfifo_fast 0: parent :2 bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1
qdisc pfifo_fast 0: parent :3 bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1
qdisc pfifo_fast 0: parent :4 bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1
qdisc clsact ffff: parent ffff:fff1
Adding filters (deleting, etc works analogous by specifying ingress/egress):
# tc filter add dev foo ingress bpf da obj bar.o sec ingress
# tc filter add dev foo egress bpf da obj bar.o sec egress
# tc filter show dev foo ingress
filter protocol all pref 49152 bpf
filter protocol all pref 49152 bpf handle 0x1 bar.o:[ingress] direct-action
# tc filter show dev foo egress
filter protocol all pref 49152 bpf
filter protocol all pref 49152 bpf handle 0x1 bar.o:[egress] direct-action
A 'tc filter show dev foo' or 'tc filter show dev foo parent ffff:' will
show an empty list for clsact. Either using the parent names (ingress/egress)
or specifying the full major/minor will then show the related filter lists.
Prior work on a mqprio prequeue() facility [1] was done mainly by John Fastabend.
[1] http://patchwork.ozlabs.org/patch/512949/
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-01-10 22:13:15 -05:00
libceph: add nocephx_sign_messages option
2015-11-02 23:37:46 +01:00
irqchip/gic-v3: Add missing struct device_node declaration
2015-12-10 19:13:26 +01:00
platform/chrome: Branch for v4.4
2015-11-13 21:53:18 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
net/mlx5_core: Introduce access function to read internal timer
2016-01-05 14:11:50 -05:00
mmc: mmc: extend the mmc_send_tuning()
2015-10-27 10:38:41 +01:00
netfilter: nfnetlink: pass down netns pointer to commit() and abort() callbacks
2015-12-28 18:43:15 +01:00
drivers/pinctrl: Add the concept of an "init" state
2015-10-27 11:24:23 +01:00
NFC 4.5 pull request
2016-01-04 21:48:15 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
netcp: try to reduce type confusion in descriptors
2015-12-11 19:34:39 -05:00
ARM: SoC cleanups for v4.4
2015-11-10 14:48:36 -08:00
ssb: pick SoC invariants code from MIPS BCM47xx arch
2015-12-16 16:36:25 +02:00
Mainly smaller bugfixes and cleanup. We're still finding some bugs from
2015-11-11 20:11:28 -08:00
net: cdc_ncm: avoid changing RX/TX buffers on MTU changes
2015-12-23 22:52:08 -05:00
Merge branches 'acpica', 'acpi-video' and 'device-properties'
2015-12-04 14:01:17 +01:00
atomic: remove all traces of READ_ONCE_CTRL() and atomic*_read_ctrl()
2015-11-03 17:22:17 -08:00
audit: audit_string_contains_control can be boolean
2015-11-04 08:23:51 -05:00
Merge branch 'for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2015-11-05 14:51:32 -08:00
bitops.h: correctly handle rol32 with 0 byte shift
2015-12-09 10:35:16 -08:00
blkcg: fix incorrect read/write sync/async stat accounting
2015-10-27 15:04:56 +09:00
block: add block polling support
2015-11-07 10:40:47 -07:00
block: don't hardcode blk_qc_t -> tag mask
2015-11-11 09:37:34 -07:00
block: add blk_start_queue_async()
2015-12-28 13:07:07 -07:00
bpf: fix clearing on persistent program array maps
2015-11-25 12:14:09 -05:00
net: phy: bcm7xxx: Add entry for Broadcom BCM7435
2015-11-25 11:35:14 -05:00
vfs: remove unused wrapper block_page_mkwrite()
2015-11-11 02:19:33 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
clk: Add clk_hw_is_enabled() for use by clk providers
2015-10-26 12:36:55 -07:00
mm, compaction: distinguish contended status in tracepoints
2015-11-05 19:34:48 -08:00
include/linux/compiler-gcc.h: improve __visible documentation
2015-11-06 17:50:42 -08:00
compiler.h: add support for function attribute assume_aligned
2015-11-05 19:34:48 -08:00
configfs: allow dynamic group creation
2015-11-20 16:17:32 -08:00
context_tracking: avoid irq_save/irq_restore on guest entry and exit
2015-11-10 12:06:23 +01:00
cpufreq: use last policy after online for drivers with ->setpolicy
2015-12-02 23:50:33 +01:00
mm, page_alloc: remove unnecessary taking of a seqlock when cpusets are disabled
2015-11-06 17:50:42 -08:00
thermal: devfreq_cooling: use a thermal_cooling_device for register and unregister
2015-11-02 13:14:44 -08:00
dm: refactor ioctl handling
2015-10-31 19:05:59 -04:00
dma-mapping: tidy up dma_parms default handling
2015-11-06 17:50:42 -08:00
net: dns_resolver: convert time_t to time64_t
2015-11-18 16:27:46 -05:00
driver core update for 4.4-rc1
2015-11-04 21:50:37 -08:00
efi: Use correct type for struct efi_memory_map::phys_map
2015-10-28 12:28:06 +01:00
ses: fix additional element traversal bug
2015-12-11 11:05:57 -08:00
net: Add eth_platform_get_mac_address() helper.
2016-01-06 16:31:56 -05:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2015-11-10 09:33:06 -08:00
vfs: Fix pathological performance case for __alloc_fd()
2015-10-31 16:12:10 -07:00
dma-buf/fence: add fence_is_later()
2015-10-30 01:47:27 -04:00
bpf: cleanup bpf_prog_run_{save,clear}_cb helpers
2016-01-08 21:40:34 -05:00
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-11-11 09:45:24 -08:00
tracing: Rename max_stack_lock to stack_trace_max_lock
2015-11-03 14:50:15 -05:00
Power management and ACPI updates for v4.4-rc1
2015-11-04 18:10:13 -08:00
mm: fix up sparse warning in gfpflags_allow_blocking
2015-11-20 16:17:32 -08:00
net: move napi_hash[] into read mostly section
2015-11-18 16:17:42 -05:00
WAN: HDLC: Call notifiers before and after changing device type
2015-12-05 17:41:42 -05:00
HID: hid-input: allow input_configured callback return errors
2015-11-05 09:51:50 -08:00
kmap_atomic_to_page() has no users, remove it
2015-11-09 15:11:24 -08:00
mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status
2015-11-05 19:34:48 -08:00
mm: make compound_head() robust
2015-11-06 17:50:42 -08:00
drivers/hv: share Hyper-V SynIC constants with userspace
2015-11-04 16:24:33 +01:00
ppp: remove PPPOX_ZOMBIE socket state
2015-11-20 11:31:26 -05:00
team: fill-up LAG changeupper info struct and pass it along
2015-12-03 11:49:26 -05:00
net: Eliminate NETIF_F_GEN_CSUM and NETIF_F_V[46]_CSUM
2015-12-15 16:50:20 -05:00
net: diag: Support SOCK_DESTROY for inet sockets.
2015-12-15 23:26:51 -05:00
Merge branch 'for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2015-11-05 14:51:32 -08:00
iommu/vt-d: Expose struct svm_dev_ops without CONFIG_INTEL_IOMMU_SVM
2015-10-27 08:36:08 +09:00
iommu-common: Fix error code used in iommu_tbl_range_{alloc,free}().
2015-11-04 11:30:57 -08:00
ipv6: add complete rcu protection around np->opt
2015-12-02 23:37:16 -05:00
Document that IRQ_NONE should be returned when IRQ not actually handled
2015-10-30 10:13:26 +01:00
treewide: Remove old email address
2015-11-23 09:44:58 +01:00
include/linux/kdev_t.h: old/new_valid_dev() can return bool
2015-11-09 15:11:24 -08:00
remove abs64()
2015-11-09 15:11:24 -08:00
kernfs: implement kernfs_walk_and_get()
2015-11-20 15:55:52 -05:00
mm: kmemleak: mark kmemleak_init prototype as __init
2015-12-12 10:15:34 -08:00
kref: Remove kref_put_spinlock_irqsave()
2015-11-28 19:33:29 -08:00
KVM: Provide function for VCPU lookup by id
2015-11-19 14:25:32 +01:00
libata-eh.c: Introduce new ata port flag for controller which lockup on read log page
2015-12-07 10:25:57 -05:00
lightnvm: replace req queue with nvmdev for lld
2015-12-07 09:14:19 -07:00
treewide: Remove old email address
2015-11-23 09:44:58 +01:00
phy: marvell: Add support for 88E1540 PHY
2015-11-17 15:25:43 -05:00
KVM: x86: Replace call-back set_tsc_khz() with a common function
2015-11-10 12:06:16 +01:00
mdio: Abstract device_remove() and device_free()
2016-01-07 14:31:27 -05:00
mm/memblock: make memblock_remove_range() static
2015-11-05 19:34:48 -08:00
Merge branch 'akpm' (patches from Andrew)
2015-11-05 23:10:54 -08:00
Input: add userio module
2015-10-27 18:55:31 -07:00
mm: use 'unsigned int' for page order
2015-11-06 17:50:42 -08:00
mm: use 'unsigned int' for compound_dtor/compound_order on 64BIT
2015-11-06 17:50:42 -08:00
include/linux/mmdebug.h: should include linux/bug.h
2015-12-18 14:25:40 -08:00
include/linux/mmzone.h: reflow comment
2015-11-06 17:50:42 -08:00
sound updates for 4.4-rc1
2015-11-06 11:04:07 -08:00
module: export param_free_charp()
2015-11-06 17:50:42 -08:00
net: ipmr: move struct mr_table and VIF_EXISTS to mroute.h
2015-11-30 15:26:22 -05:00
PCI changes for the v4.4 merge window:
2015-11-06 11:29:53 -08:00
net: fix sock_wake_async() rcu protection
2015-12-01 15:45:05 -05:00
net: Eliminate NETIF_F_GEN_CSUM and NETIF_F_V[46]_CSUM
2015-12-15 16:50:20 -05:00
net, sched: add clsact qdisc
2016-01-10 22:13:15 -05:00
netfilter: ingress: fix wrong input interface on hook
2015-11-06 19:33:12 +01:00
netlink: add a start callback for starting a netlink dump
2015-12-15 23:25:20 -05:00
nfs: use sliding delay when LAYOUTGET gets NFS4ERR_DELAY
2015-11-23 21:57:44 -05:00
kernel/watchdog.c: perform all-CPU backtrace in case of hard lockup
2015-11-05 19:34:48 -08:00
of: Provide static inline function for of_translate_address if needed
2015-11-10 17:27:12 -06:00
of: Provide static inline function for of_translate_address if needed
2015-11-10 17:27:12 -06:00
dmaengine: of_dma: Correct return code for of_dma_request_slave_channel in case !CONFIG_OF
2015-11-16 09:03:21 +05:30
of/irq: move of_msi_map_rid declaration to the correct ifdef section
2015-12-09 09:23:28 -06:00
More power management and ACPI updates for v4.4-rc1
2015-11-12 11:50:33 -08:00
ARM: OMAP1: fix incorrect INT_DMA_LCD
2015-10-28 10:05:58 -07:00
mm: make compound_head() robust
2015-11-06 17:50:42 -08:00
mm: page_counter: let page_counter_try_charge() return bool
2015-11-05 19:34:48 -08:00
mm: use 'unsigned int' for page order
2015-11-06 17:50:42 -08:00
mm, fs: introduce mapping_gfp_constraint()
2015-11-06 17:50:42 -08:00
ARM/PCI: Move align_resource function pointer to pci_host_bridge structure
2015-11-25 13:23:38 -06:00
pci_ids: add Netronome Systems vendor
2015-12-03 14:17:51 -05:00
perf/core: Robustify the perf_cgroup_from_task() RCU checks
2015-11-23 09:21:03 +01:00
mdio: Add support for mdio drivers.
2016-01-07 14:31:27 -05:00
net: ipmr: move pimsm_enabled to pim.h and rename
2015-11-30 15:26:22 -05:00
PM / Domains: Merge measurements for PM QoS device latencies
2015-10-28 04:33:04 +01:00
device property: ACPI: Remove unused DMA APIs
2015-11-07 01:29:22 +01:00
treewide: Remove old email address
2015-11-23 09:44:58 +01:00
ptp: Change ptp_class to a proper bitmask
2015-11-03 11:08:22 -05:00
pwm: Set enable state properly on failed call to enable
2015-11-10 13:06:16 +01:00
spi: pxa2xx: Add support for Intel Broxton
2015-10-30 11:18:05 +09:00
rbtree: clarify documentation of rbtree_postorder_for_each_entry_safe()
2015-11-06 17:50:42 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
ring_buffer: ring_buffer_empty{cpu}() can return boolean
2015-11-02 14:23:38 -05:00
net, sched: add clsact qdisc
2016-01-10 22:13:15 -05:00
libnvdimm for 4.4:
2015-11-10 12:07:22 -08:00
scpi: hide get_scpi_ops in module from built-in code
2015-11-19 16:22:43 +01:00
seccomp, ptrace: add support for dumping seccomp filters
2015-10-27 19:55:13 -07:00
sh_eth: remove EDMAC_BIG_ENDIAN
2016-01-04 16:11:11 -05:00
kernel/signal.c: unexport sigsuspend()
2015-11-20 16:17:32 -08:00
bpf: add skb_postpush_rcsum and fix dev_forward_skb occasions
2016-01-10 17:54:28 -05:00
slab/slub: adjust kmem_cache_alloc_bulk API
2015-11-22 11:58:44 -08:00
net: diag: Add the ability to destroy a socket.
2015-12-15 23:26:51 -05:00
kernel: remove stop_machine() Kconfig dependency
2015-12-12 10:15:34 -08:00
arm64: fix building without CONFIG_UID16
2015-11-25 15:49:13 +00:00
platform/chrome: Branch for v4.4
2015-11-13 21:53:18 -08:00
tcp: fix req->saved_syn race
2015-11-05 14:36:09 -05:00
thermal: fix thermal_zone_bind_cooling_device prototype
2015-11-23 15:34:34 -08:00
memcg: punt high overage reclaim to return-to-userland path
2015-11-05 19:34:48 -08:00
tracepoints: Fix documentation of RCU lockdep checks
2015-11-02 17:52:49 -05:00
tty: audit: Fix audit source
2015-11-20 16:19:54 -08:00
arm64: fix building without CONFIG_UID16
2015-11-25 15:49:13 +00:00
uaccess: reimplement probe_kernel_address() using probe_kernel_read()
2015-11-05 19:34:48 -08:00
treewide: Remove old email address
2015-11-23 09:44:58 +01:00
Revert: "vfio: Include No-IOMMU mode"
2015-12-04 08:38:42 -07:00
vga_switcheroo: Drop client power state VGA_SWITCHEROO_INIT
2015-11-05 11:07:36 +10:00
include/linux/vm_event_item.h: change HIGHMEM_ZONE macro definition
2015-11-05 19:34:48 -08:00
mm: get rid of 'vmalloc_info' from /proc/meminfo
2015-11-01 17:09:15 -08:00
mm/vmstat: fix overflow in mod_zone_page_state()
2015-12-29 17:45:49 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
watchdog: include: add units for timeout values in kerneldoc
2015-11-03 20:46:26 +01:00
9p: xattr simplifications
2015-11-13 20:34:33 -05:00
mm: zsmalloc: constify struct zs_pool name
2015-11-06 17:50:42 -08:00
mm: zsmalloc: constify struct zs_pool name
2015-11-06 17:50:42 -08:00
include/linux/zutil.h: fix usage example of zlib_adler32()
2015-11-06 17:50:42 -08:00
