mirror of
https://github.com/torvalds/linux.git
synced 2026-06-07 14:04:54 +02:00
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmHya+IACgkQONu9yGCS
aT7k/RAAqdd8bNhAiO6iDpvZbQtxq9jepx4KCkcd+gsYvSvePEnBQHaTaavfCK/7
+taWsc2i6Hwc1Z4oVfUiU02cCsqMJJXqb0nfJaavE5cZspbTc7QeS0zv9BkzSKUZ
+DxXWyjzeJquI7EbdU0n7inb0iwvBxmTGNIg2j1pPi81Q7XnpjmDsSvuoftRQ0AN
DGYefowWL1VcfsZRfhEudnpxWC/DjOdB8zD34SgXxKat6/O8YG4T5pM2BOUlKtOW
QcXFhpG6gU0XqmI3QQDvAESujOQxzC1u3AwIOHYJ/tlFYsUJXjiZIEVnMqPYGpNl
fXS8xcNSeo6fipXWkzsc489Tteq9H+bfm8sBG0jhExRnyGckkihJDhRFZ9yBrzo/
1PtUdUIJ4d5fUmdZp7gxucncFyIYFsyJm/5nsYmObP794oStPGKsH8llhp/PcEFF
ua1+Gy2WW2f6BOaDVFmt+jWZRMa/3oZnFhe8/FPRsAjGOj+q/+V6bsksGDYupsrM
x8/QQI6OVlnOZsrdpX7zkW46qLov0J0bO9cANTm7kcRaesrkikFKqiIF2uIW2OU6
W0tZZf0Jy/gSLEljkZ3SuMHCmldWKm/KxMYSjnQ3Y34QvOLYPNAZGF78rbV3s8/0
otGR3ra5TKCz1kxuDaE1FqZXxpPQidXbF4QUoaRIaPwA1k5NvLY=
=ktJL
-----END PGP SIGNATURE-----
Merge 5.10.94 into android12-5.10-lts
Changes in 5.10.94
KVM: VMX: switch blocked_vcpu_on_cpu_lock to raw spinlock
HID: uhid: Fix worker destroying device without any protection
HID: wacom: Reset expected and received contact counts at the same time
HID: wacom: Ignore the confidence flag when a touch is removed
HID: wacom: Avoid using stale array indicies to read contact count
f2fs: fix to do sanity check in is_alive()
nfc: llcp: fix NULL error pointer dereference on sendmsg() after failed bind()
mtd: rawnand: gpmi: Add ERR007117 protection for nfc_apply_timings
mtd: rawnand: gpmi: Remove explicit default gpmi clock setting for i.MX6
mtd: Fixed breaking list in __mtd_del_partition.
mtd: rawnand: davinci: Don't calculate ECC when reading page
mtd: rawnand: davinci: Avoid duplicated page read
mtd: rawnand: davinci: Rewrite function description
x86/gpu: Reserve stolen memory for first integrated Intel GPU
tools/nolibc: x86-64: Fix startup code bug
tools/nolibc: i386: fix initial stack alignment
tools/nolibc: fix incorrect truncation of exit code
rtc: cmos: take rtc_lock while reading from CMOS
media: v4l2-ioctl.c: readbuffers depends on V4L2_CAP_READWRITE
media: flexcop-usb: fix control-message timeouts
media: mceusb: fix control-message timeouts
media: em28xx: fix control-message timeouts
media: cpia2: fix control-message timeouts
media: s2255: fix control-message timeouts
media: dib0700: fix undefined behavior in tuner shutdown
media: redrat3: fix control-message timeouts
media: pvrusb2: fix control-message timeouts
media: stk1160: fix control-message timeouts
media: cec-pin: fix interrupt en/disable handling
can: softing_cs: softingcs_probe(): fix memleak on registration failure
iio: adc: ti-adc081c: Partial revert of removal of ACPI IDs
lkdtm: Fix content of section containing lkdtm_rodata_do_nothing()
iommu/io-pgtable-arm-v7s: Add error handle for page table allocation failure
gpu: host1x: Add back arm_iommu_detach_device()
dma_fence_array: Fix PENDING_ERROR leak in dma_fence_array_signaled()
PCI: Add function 1 DMA alias quirk for Marvell 88SE9125 SATA controller
mm_zone: add function to check if managed dma zone exists
dma/pool: create dma atomic pool only if dma zone has managed pages
mm/page_alloc.c: do not warn allocation failure on zone DMA if no managed pages
shmem: fix a race between shmem_unused_huge_shrink and shmem_evict_inode
drm/ttm: Put BO in its memory manager's lru list
Bluetooth: L2CAP: Fix not initializing sk_peer_pid
drm/bridge: display-connector: fix an uninitialized pointer in probe()
drm: fix null-ptr-deref in drm_dev_init_release()
drm/panel: kingdisplay-kd097d04: Delete panel on attach() failure
drm/panel: innolux-p079zca: Delete panel on attach() failure
drm/rockchip: dsi: Fix unbalanced clock on probe error
drm/rockchip: dsi: Hold pm-runtime across bind/unbind
drm/rockchip: dsi: Disable PLL clock on bind error
drm/rockchip: dsi: Reconfigure hardware on resume()
Bluetooth: cmtp: fix possible panic when cmtp_init_sockets() fails
clk: bcm-2835: Pick the closest clock rate
clk: bcm-2835: Remove rounding up the dividers
drm/vc4: hdmi: Set a default HSM rate
wcn36xx: ensure pairing of init_scan/finish_scan and start_scan/end_scan
wcn36xx: Indicate beacon not connection loss on MISSED_BEACON_IND
wcn36xx: Fix DMA channel enable/disable cycle
wcn36xx: Release DMA channel descriptor allocations
wcn36xx: Put DXE block into reset before freeing memory
wcn36xx: populate band before determining rate on RX
wcn36xx: fix RX BD rate mapping for 5GHz legacy rates
ath11k: Send PPDU_STATS_CFG with proper pdev mask to firmware
mtd: hyperbus: rpc-if: Check return value of rpcif_sw_init()
media: videobuf2: Fix the size printk format
media: atomisp: add missing media_device_cleanup() in atomisp_unregister_entities()
media: atomisp: fix punit_ddr_dvfs_enable() argument for mrfld_power up case
media: atomisp: fix inverted logic in buffers_needed()
media: atomisp: do not use err var when checking port validity for ISP2400
media: atomisp: fix inverted error check for ia_css_mipi_is_source_port_valid()
media: atomisp: fix ifdefs in sh_css.c
media: staging: media: atomisp: pci: Balance braces around conditional statements in file atomisp_cmd.c
media: atomisp: add NULL check for asd obtained from atomisp_video_pipe
media: atomisp: fix enum formats logic
media: atomisp: fix uninitialized bug in gmin_get_pmic_id_and_addr()
media: aspeed: fix mode-detect always time out at 2nd run
media: em28xx: fix memory leak in em28xx_init_dev
media: aspeed: Update signal status immediately to ensure sane hw state
arm64: dts: amlogic: meson-g12: Fix GPU operating point table node name
arm64: dts: amlogic: Fix SPI NOR flash node name for ODROID N2/N2+
arm64: dts: meson-gxbb-wetek: fix HDMI in early boot
arm64: dts: meson-gxbb-wetek: fix missing GPIO binding
fs: dlm: use sk->sk_socket instead of con->sock
fs: dlm: don't call kernel_getpeername() in error_report()
memory: renesas-rpc-if: Return error in case devm_ioremap_resource() fails
Bluetooth: stop proccessing malicious adv data
ath11k: Fix ETSI regd with weather radar overlap
ath11k: clear the keys properly via DISABLE_KEY
ath11k: reset RSN/WPA present state for open BSS
tee: fix put order in teedev_close_context()
fs: dlm: fix build with CONFIG_IPV6 disabled
drm/vboxvideo: fix a NULL vs IS_ERR() check
arm64: dts: renesas: cat875: Add rx/tx delays
media: dmxdev: fix UAF when dvb_register_device() fails
crypto: qce - fix uaf on qce_ahash_register_one
crypto: qce - fix uaf on qce_skcipher_register_one
mtd: hyperbus: rpc-if: fix bug in rpcif_hb_remove
ARM: dts: stm32: fix dtbs_check warning on ili9341 dts binding on stm32f429 disco
crypto: qat - fix spelling mistake: "messge" -> "message"
crypto: qat - remove unnecessary collision prevention step in PFVF
crypto: qat - make pfvf send message direction agnostic
crypto: qat - fix undetected PFVF timeout in ACK loop
ath11k: Use host CE parameters for CE interrupts configuration
arm64: dts: ti: k3-j721e: correct cache-sets info
tty: serial: atmel: Check return code of dmaengine_submit()
tty: serial: atmel: Call dma_async_issue_pending()
mfd: atmel-flexcom: Remove #ifdef CONFIG_PM_SLEEP
mfd: atmel-flexcom: Use .resume_noirq
media: rcar-csi2: Correct the selection of hsfreqrange
media: imx-pxp: Initialize the spinlock prior to using it
media: si470x-i2c: fix possible memory leak in si470x_i2c_probe()
media: mtk-vcodec: call v4l2_m2m_ctx_release first when file is released
media: coda: fix CODA960 JPEG encoder buffer overflow
media: venus: pm_helpers: Control core power domain manually
media: venus: core, venc, vdec: Fix probe dependency error
media: venus: core: Fix a potential NULL pointer dereference in an error handling path
media: venus: core: Fix a resource leak in the error handling path of 'venus_probe()'
thermal/drivers/imx: Implement runtime PM support
netfilter: bridge: add support for pppoe filtering
arm64: dts: qcom: msm8916: fix MMC controller aliases
cgroup: Trace event cgroup id fields should be u64
ACPI: EC: Rework flushing of EC work while suspended to idle
thermal/drivers/imx8mm: Enable ADC when enabling monitor
drm/amdgpu: Fix a NULL pointer dereference in amdgpu_connector_lcd_native_mode()
drm/radeon/radeon_kms: Fix a NULL pointer dereference in radeon_driver_open_kms()
arm64: dts: ti: k3-j7200: Fix the L2 cache sets
arm64: dts: ti: k3-j721e: Fix the L2 cache sets
arm64: dts: ti: k3-j7200: Correct the d-cache-sets info
tty: serial: uartlite: allow 64 bit address
serial: amba-pl011: do not request memory region twice
floppy: Fix hang in watchdog when disk is ejected
staging: rtl8192e: return error code from rtllib_softmac_init()
staging: rtl8192e: rtllib_module: fix error handle case in alloc_rtllib()
Bluetooth: btmtksdio: fix resume failure
sched/fair: Fix detection of per-CPU kthreads waking a task
sched/fair: Fix per-CPU kthread and wakee stacking for asym CPU capacity
bpf: Adjust BTF log size limit.
bpf: Disallow BPF_LOG_KERNEL log level for bpf(BPF_BTF_LOAD)
bpf: Remove config check to enable bpf support for branch records
arm64: lib: Annotate {clear, copy}_page() as position-independent
arm64: clear_page() shouldn't use DC ZVA when DCZID_EL0.DZP == 1
media: dib8000: Fix a memleak in dib8000_init()
media: saa7146: mxb: Fix a NULL pointer dereference in mxb_attach()
media: si2157: Fix "warm" tuner state detection
wireless: iwlwifi: Fix a double free in iwl_txq_dyn_alloc_dma
sched/rt: Try to restart rt period timer when rt runtime exceeded
drm/msm/dp: displayPort driver need algorithm rational
rcu/exp: Mark current CPU as exp-QS in IPI loop second pass
mwifiex: Fix possible ABBA deadlock
xfrm: fix a small bug in xfrm_sa_len()
x86/uaccess: Move variable into switch case statement
selftests: clone3: clone3: add case CLONE3_ARGS_NO_TEST
selftests: harness: avoid false negatives if test has no ASSERTs
crypto: stm32 - Fix last sparse warning in stm32_cryp_check_ctr_counter
crypto: stm32/cryp - fix CTR counter carry
crypto: stm32/cryp - fix xts and race condition in crypto_engine requests
crypto: stm32/cryp - check early input data
crypto: stm32/cryp - fix double pm exit
crypto: stm32/cryp - fix lrw chaining mode
crypto: stm32/cryp - fix bugs and crash in tests
crypto: stm32 - Revert broken pm_runtime_resume_and_get changes
ath11k: Fix deleting uninitialized kernel timer during fragment cache flush
ARM: dts: gemini: NAS4220-B: fis-index-block with 128 KiB sectors
media: dw2102: Fix use after free
media: msi001: fix possible null-ptr-deref in msi001_probe()
media: coda/imx-vdoa: Handle dma_set_coherent_mask error codes
ath11k: Fix a NULL pointer dereference in ath11k_mac_op_hw_scan()
arm64: dts: qcom: c630: Fix soundcard setup
arm64: dts: qcom: ipq6018: Fix gpio-ranges property
drm/msm/dpu: fix safe status debugfs file
drm/bridge: ti-sn65dsi86: Set max register for regmap
drm/tegra: vic: Fix DMA API misuse
media: hantro: Fix probe func error path
xfrm: interface with if_id 0 should return error
xfrm: state and policy should fail if XFRMA_IF_ID 0
ARM: 9159/1: decompressor: Avoid UNPREDICTABLE NOP encoding
usb: ftdi-elan: fix memory leak on device disconnect
arm64: dts: marvell: cn9130: add GPIO and SPI aliases
arm64: dts: marvell: cn9130: enable CP0 GPIO controllers
ARM: dts: armada-38x: Add generic compatible to UART nodes
iwlwifi: mvm: fix 32-bit build in FTM
iwlwifi: mvm: test roc running status bits before removing the sta
mmc: meson-mx-sdhc: add IRQ check
mmc: meson-mx-sdio: add IRQ check
selinux: fix potential memleak in selinux_add_opt()
um: fix ndelay/udelay defines
um: virtio_uml: Fix time-travel external time propagation
Bluetooth: L2CAP: Fix using wrong mode
bpftool: Enable line buffering for stdout
backlight: qcom-wled: Validate enabled string indices in DT
backlight: qcom-wled: Pass number of elements to read to read_u32_array
backlight: qcom-wled: Fix off-by-one maximum with default num_strings
backlight: qcom-wled: Override default length with qcom,enabled-strings
backlight: qcom-wled: Use cpu_to_le16 macro to perform conversion
backlight: qcom-wled: Respect enabled-strings in set_brightness
software node: fix wrong node passed to find nargs_prop
Bluetooth: hci_qca: Stop IBS timer during BT OFF
x86/boot/compressed: Move CLANG_FLAGS to beginning of KBUILD_CFLAGS
hwmon: (mr75203) fix wrong power-up delay value
x86/mce/inject: Avoid out-of-bounds write when setting flags
ACPI: scan: Create platform device for BCM4752 and LNV4752 ACPI nodes
pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in __nonstatic_find_io_region()
pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in nonstatic_find_mem_region()
power: reset: mt6397: Check for null res pointer
netfilter: ipt_CLUSTERIP: fix refcount leak in clusterip_tg_check()
bpf: Don't promote bogus looking registers after null check.
bpf: Fix SO_RCVBUF/SO_SNDBUF handling in _bpf_setsockopt().
netfilter: nft_set_pipapo: allocate pcpu scratch maps on clone
ppp: ensure minimum packet size in ppp_write()
rocker: fix a sleeping in atomic bug
staging: greybus: audio: Check null pointer
fsl/fman: Check for null pointer after calling devm_ioremap
Bluetooth: hci_bcm: Check for error irq
Bluetooth: hci_qca: Fix NULL vs IS_ERR_OR_NULL check in qca_serdev_probe
usb: dwc3: qcom: Fix NULL vs IS_ERR checking in dwc3_qcom_probe
HID: hid-uclogic-params: Invalid parameter check in uclogic_params_init
HID: hid-uclogic-params: Invalid parameter check in uclogic_params_get_str_desc
HID: hid-uclogic-params: Invalid parameter check in uclogic_params_huion_init
HID: hid-uclogic-params: Invalid parameter check in uclogic_params_frame_init_v1_buttonpad
debugfs: lockdown: Allow reading debugfs files that are not world readable
net/mlx5e: Fix page DMA map/unmap attributes
net/mlx5e: Don't block routes with nexthop objects in SW
Revert "net/mlx5e: Block offload of outer header csum for UDP tunnels"
net/mlx5: Set command entry semaphore up once got index free
lib/mpi: Add the return value check of kcalloc()
Bluetooth: L2CAP: uninitialized variables in l2cap_sock_setsockopt()
spi: spi-meson-spifc: Add missing pm_runtime_disable() in meson_spifc_probe
ax25: uninitialized variable in ax25_setsockopt()
netrom: fix api breakage in nr_setsockopt()
regmap: Call regmap_debugfs_exit() prior to _init()
can: mcp251xfd: add missing newline to printed strings
tpm: add request_locality before write TPM_INT_ENABLE
tpm_tis: Fix an error handling path in 'tpm_tis_core_init()'
can: softing: softing_startstop(): fix set but not used variable warning
can: xilinx_can: xcan_probe(): check for error irq
pcmcia: fix setting of kthread task states
iwlwifi: mvm: Use div_s64 instead of do_div in iwl_mvm_ftm_rtt_smoothing()
net: mcs7830: handle usb read errors properly
ext4: avoid trim error on fs with small groups
ALSA: jack: Add missing rwsem around snd_ctl_remove() calls
ALSA: PCM: Add missing rwsem around snd_ctl_remove() calls
ALSA: hda: Add missing rwsem around snd_ctl_remove() calls
RDMA/bnxt_re: Scan the whole bitmap when checking if "disabling RCFW with pending cmd-bit"
RDMA/hns: Validate the pkey index
scsi: pm80xx: Update WARN_ON check in pm8001_mpi_build_cmd()
clk: imx8mn: Fix imx8mn_clko1_sels
powerpc/prom_init: Fix improper check of prom_getprop()
ASoC: uniphier: drop selecting non-existing SND_SOC_UNIPHIER_AIO_DMA
dt-bindings: thermal: Fix definition of cooling-maps contribution property
powerpc/64s: Convert some cpu_setup() and cpu_restore() functions to C
powerpc/perf: MMCR0 control for PMU registers under PMCC=00
powerpc/perf: move perf irq/nmi handling details into traps.c
powerpc/irq: Add helper to set regs->softe
powerpc/perf: Fix PMU callbacks to clear pending PMI before resetting an overflown PMC
powerpc/32s: Fix shift-out-of-bounds in KASAN init
clocksource: Reduce clocksource-skew threshold
clocksource: Avoid accidental unstable marking of clocksources
ALSA: oss: fix compile error when OSS_DEBUG is enabled
ALSA: usb-audio: Drop superfluous '0' in Presonus Studio 1810c's ID
char/mwave: Adjust io port register size
binder: fix handling of error during copy
openrisc: Add clone3 ABI wrapper
iommu/io-pgtable-arm: Fix table descriptor paddr formatting
scsi: ufs: Fix race conditions related to driver data
RDMA/qedr: Fix reporting max_{send/recv}_wr attrs
PCI/MSI: Fix pci_irq_vector()/pci_irq_get_affinity()
powerpc/powermac: Add additional missing lockdep_register_key()
RDMA/core: Let ib_find_gid() continue search even after empty entry
RDMA/cma: Let cma_resolve_ib_dev() continue search even after empty entry
ASoC: rt5663: Handle device_property_read_u32_array error codes
of: unittest: fix warning on PowerPC frame size warning
of: unittest: 64 bit dma address test requires arch support
clk: stm32: Fix ltdc's clock turn off by clk_disable_unused() after system enter shell
mips: add SYS_HAS_CPU_MIPS64_R5 config for MIPS Release 5 support
mips: fix Kconfig reference to PHYS_ADDR_T_64BIT
dmaengine: pxa/mmp: stop referencing config->slave_id
iommu/amd: Remove iommu_init_ga()
iommu/amd: Restore GA log/tail pointer on host resume
ASoC: Intel: catpt: Test dmaengine_submit() result before moving on
iommu/iova: Fix race between FQ timeout and teardown
scsi: block: pm: Always set request queue runtime active in blk_post_runtime_resume()
phy: uniphier-usb3ss: fix unintended writing zeros to PHY register
ASoC: mediatek: Check for error clk pointer
ASoC: samsung: idma: Check of ioremap return value
misc: lattice-ecp3-config: Fix task hung when firmware load failed
counter: stm32-lptimer-cnt: remove iio counter abi
arm64: tegra: Fix Tegra194 HDA {clock,reset}-names ordering
arm64: tegra: Remove non existent Tegra194 reset
mips: lantiq: add support for clk_set_parent()
mips: bcm63xx: add support for clk_set_parent()
powerpc/xive: Add missing null check after calling kmalloc
ASoC: fsl_mqs: fix MODULE_ALIAS
RDMA/cxgb4: Set queue pair state when being queried
ASoC: fsl_asrc: refine the check of available clock divider
clk: bm1880: remove kfrees on static allocations
of: base: Fix phandle argument length mismatch error message
ARM: dts: omap3-n900: Fix lp5523 for multi color
Bluetooth: Fix debugfs entry leak in hci_register_dev()
fs: dlm: filter user dlm messages for kernel locks
drm/lima: fix warning when CONFIG_DEBUG_SG=y & CONFIG_DMA_API_DEBUG=y
selftests/bpf: Fix bpf_object leak in skb_ctx selftest
ar5523: Fix null-ptr-deref with unexpected WDCMSG_TARGET_START reply
drm/bridge: dw-hdmi: handle ELD when DRM_BRIDGE_ATTACH_NO_CONNECTOR
drm/nouveau/pmu/gm200-: avoid touching PMU outside of DEVINIT/PREOS/ACR
media: atomisp: fix try_fmt logic
media: atomisp: set per-device's default mode
media: atomisp-ov2680: Fix ov2680_set_fmt() clobbering the exposure
ARM: shmobile: rcar-gen2: Add missing of_node_put()
batman-adv: allow netlink usage in unprivileged containers
media: atomisp: handle errors at sh_css_create_isp_params()
ath11k: Fix crash caused by uninitialized TX ring
usb: gadget: f_fs: Use stream_open() for endpoint files
drm: panel-orientation-quirks: Add quirk for the Lenovo Yoga Book X91F/L
HID: apple: Do not reset quirks when the Fn key is not found
media: b2c2: Add missing check in flexcop_pci_isr:
EDAC/synopsys: Use the quirk for version instead of ddr version
ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART
drm/amd/display: check top_pipe_to_program pointer
drm/amdgpu/display: set vblank_disable_immediate for DC
soc: ti: pruss: fix referenced node in error message
mlxsw: pci: Add shutdown method in PCI driver
drm/bridge: megachips: Ensure both bridges are probed before registration
tty: serial: imx: disable UCR4_OREN in .stop_rx() instead of .shutdown()
gpiolib: acpi: Do not set the IRQ type if the IRQ is already in use
HSI: core: Fix return freed object in hsi_new_client
crypto: jitter - consider 32 LSB for APT
mwifiex: Fix skb_over_panic in mwifiex_usb_recv()
rsi: Fix use-after-free in rsi_rx_done_handler()
rsi: Fix out-of-bounds read in rsi_read_pkt()
ath11k: Avoid NULL ptr access during mgmt tx cleanup
media: venus: avoid calling core_clk_setrate() concurrently during concurrent video sessions
ACPI / x86: Drop PWM2 device on Lenovo Yoga Book from always present table
ACPI: Change acpi_device_always_present() into acpi_device_override_status()
ACPI / x86: Allow specifying acpi_device_override_status() quirks by path
ACPI / x86: Add not-present quirk for the PCI0.SDHB.BRC1 device on the GPD win
arm64: dts: ti: j7200-main: Fix 'dtbs_check' serdes_ln_ctrl node
usb: uhci: add aspeed ast2600 uhci support
floppy: Add max size check for user space request
x86/mm: Flush global TLB when switching to trampoline page-table
drm: rcar-du: Fix CRTC timings when CMM is used
media: uvcvideo: Increase UVC_CTRL_CONTROL_TIMEOUT to 5 seconds.
media: rcar-vin: Update format alignment constraints
media: saa7146: hexium_orion: Fix a NULL pointer dereference in hexium_attach()
media: m920x: don't use stack on USB reads
thunderbolt: Runtime PM activate both ends of the device link
iwlwifi: mvm: synchronize with FW after multicast commands
iwlwifi: mvm: avoid clearing a just saved session protection id
ath11k: avoid deadlock by change ieee80211_queue_work for regd_update_work
ath10k: Fix tx hanging
net-sysfs: update the queue counts in the unregistration path
net: phy: prefer 1000baseT over 1000baseKX
gpio: aspeed: Convert aspeed_gpio.lock to raw_spinlock
selftests/ftrace: make kprobe profile testcase description unique
ath11k: Avoid false DEADLOCK warning reported by lockdep
x86/mce: Allow instrumentation during task work queueing
x86/mce: Mark mce_panic() noinstr
x86/mce: Mark mce_end() noinstr
x86/mce: Mark mce_read_aux() noinstr
net: bonding: debug: avoid printing debug logs when bond is not notifying peers
bpf: Do not WARN in bpf_warn_invalid_xdp_action()
HID: quirks: Allow inverting the absolute X/Y values
media: igorplugusb: receiver overflow should be reported
media: saa7146: hexium_gemini: Fix a NULL pointer dereference in hexium_attach()
mmc: core: Fixup storing of OCR for MMC_QUIRK_NONSTD_SDIO
audit: ensure userspace is penalized the same as the kernel when under pressure
arm64: dts: ls1028a-qds: move rtc node to the correct i2c bus
arm64: tegra: Adjust length of CCPLEX cluster MMIO region
PM: runtime: Add safety net to supplier device release
cpufreq: Fix initialization of min and max frequency QoS requests
usb: hub: Add delay for SuperSpeed hub resume to let links transit to U0
ath9k: Fix out-of-bound memcpy in ath9k_hif_usb_rx_stream
rtw88: 8822c: update rx settings to prevent potential hw deadlock
PM: AVS: qcom-cpr: Use div64_ul instead of do_div
iwlwifi: fix leaks/bad data after failed firmware load
iwlwifi: remove module loading failure message
iwlwifi: mvm: Fix calculation of frame length
iwlwifi: pcie: make sure prph_info is set when treating wakeup IRQ
um: registers: Rename function names to avoid conflicts and build problems
ath11k: Fix napi related hang
Bluetooth: vhci: Set HCI_QUIRK_VALID_LE_STATES
xfrm: rate limit SA mapping change message to user space
drm/etnaviv: consider completed fence seqno in hang check
jffs2: GC deadlock reading a page that is used in jffs2_write_begin()
ACPICA: actypes.h: Expand the ACPI_ACCESS_ definitions
ACPICA: Utilities: Avoid deleting the same object twice in a row
ACPICA: Executer: Fix the REFCLASS_REFOF case in acpi_ex_opcode_1A_0T_1R()
ACPICA: Fix wrong interpretation of PCC address
ACPICA: Hardware: Do not flush CPU cache when entering S4 and S5
drm/amdgpu: fixup bad vram size on gmc v8
amdgpu/pm: Make sysfs pm attributes as read-only for VFs
ACPI: battery: Add the ThinkPad "Not Charging" quirk
btrfs: remove BUG_ON() in find_parent_nodes()
btrfs: remove BUG_ON(!eie) in find_parent_nodes
net: mdio: Demote probed message to debug print
mac80211: allow non-standard VHT MCS-10/11
dm btree: add a defensive bounds check to insert_at()
dm space map common: add bounds check to sm_ll_lookup_bitmap()
mlxsw: pci: Avoid flow control for EMAD packets
net: phy: marvell: configure RGMII delays for 88E1118
net: gemini: allow any RGMII interface mode
regulator: qcom_smd: Align probe function with rpmh-regulator
serial: pl010: Drop CR register reset on set_termios
serial: core: Keep mctrl register state and cached copy in sync
random: do not throw away excess input to crng_fast_load
parisc: Avoid calling faulthandler_disabled() twice
x86/kbuild: Enable CONFIG_KALLSYMS_ALL=y in the defconfigs
powerpc/6xx: add missing of_node_put
powerpc/powernv: add missing of_node_put
powerpc/cell: add missing of_node_put
powerpc/btext: add missing of_node_put
powerpc/watchdog: Fix missed watchdog reset due to memory ordering race
i2c: i801: Don't silently correct invalid transfer size
powerpc/smp: Move setup_profiling_timer() under CONFIG_PROFILING
i2c: mpc: Correct I2C reset procedure
clk: meson: gxbb: Fix the SDM_EN bit for MPLL0 on GXBB
powerpc/powermac: Add missing lockdep_register_key()
KVM: PPC: Book3S: Suppress warnings when allocating too big memory slots
KVM: PPC: Book3S: Suppress failed alloc warning in H_COPY_TOFROM_GUEST
w1: Misuse of get_user()/put_user() reported by sparse
nvmem: core: set size for sysfs bin file
dm: fix alloc_dax error handling in alloc_dev
scsi: lpfc: Trigger SLI4 firmware dump before doing driver cleanup
ALSA: seq: Set upper limit of processed events
MIPS: Loongson64: Use three arguments for slti
powerpc/40x: Map 32Mbytes of memory at startup
selftests/powerpc/spectre_v2: Return skip code when miss_percent is high
powerpc: handle kdump appropriately with crash_kexec_post_notifiers option
powerpc/fadump: Fix inaccurate CPU state info in vmcore generated with panic
udf: Fix error handling in udf_new_inode()
MIPS: OCTEON: add put_device() after of_find_device_by_node()
irqchip/gic-v4: Disable redistributors' view of the VPE table at boot time
i2c: designware-pci: Fix to change data types of hcnt and lcnt parameters
MIPS: Octeon: Fix build errors using clang
scsi: sr: Don't use GFP_DMA
ASoC: mediatek: mt8173: fix device_node leak
ASoC: mediatek: mt8183: fix device_node leak
phy: mediatek: Fix missing check in mtk_mipi_tx_probe
rpmsg: core: Clean up resources on announce_create failure.
crypto: omap-aes - Fix broken pm_runtime_and_get() usage
crypto: stm32/crc32 - Fix kernel BUG triggered in probe()
crypto: caam - replace this_cpu_ptr with raw_cpu_ptr
ubifs: Error path in ubifs_remount_rw() seems to wrongly free write buffers
tpm: fix NPE on probe for missing device
spi: uniphier: Fix a bug that doesn't point to private data correctly
xen/gntdev: fix unmap notification order
fuse: Pass correct lend value to filemap_write_and_wait_range()
serial: Fix incorrect rs485 polarity on uart open
cputime, cpuacct: Include guest time in user time in cpuacct.stat
tracing/kprobes: 'nmissed' not showed correctly for kretprobe
iwlwifi: mvm: Increase the scan timeout guard to 30 seconds
s390/mm: fix 2KB pgtable release race
device property: Fix fwnode_graph_devcon_match() fwnode leak
drm/etnaviv: limit submit sizes
drm/nouveau/kms/nv04: use vzalloc for nv04_display
drm/bridge: analogix_dp: Make PSR-exit block less
parisc: Fix lpa and lpa_user defines
powerpc/64s/radix: Fix huge vmap false positive
PCI: xgene: Fix IB window setup
PCI: pciehp: Use down_read/write_nested(reset_lock) to fix lockdep errors
PCI: pci-bridge-emul: Make expansion ROM Base Address register read-only
PCI: pci-bridge-emul: Properly mark reserved PCIe bits in PCI config space
PCI: pci-bridge-emul: Fix definitions of reserved bits
PCI: pci-bridge-emul: Correctly set PCIe capabilities
PCI: pci-bridge-emul: Set PCI_STATUS_CAP_LIST for PCIe device
xfrm: fix policy lookup for ipv6 gre packets
btrfs: fix deadlock between quota enable and other quota operations
btrfs: check the root node for uptodate before returning it
btrfs: respect the max size in the header when activating swap file
ext4: make sure to reset inode lockdep class when quota enabling fails
ext4: make sure quota gets properly shutdown on error
ext4: fix a possible ABBA deadlock due to busy PA
ext4: initialize err_blk before calling __ext4_get_inode_loc
ext4: fix fast commit may miss tracking range for FALLOC_FL_ZERO_RANGE
ext4: set csum seed in tmp inode while migrating to extents
ext4: Fix BUG_ON in ext4_bread when write quota data
ext4: use ext4_ext_remove_space() for fast commit replay delete range
ext4: fast commit may miss tracking unwritten range during ftruncate
ext4: destroy ext4_fc_dentry_cachep kmemcache on module removal
ext4: fix null-ptr-deref in '__ext4_journal_ensure_credits'
ext4: don't use the orphan list when migrating an inode
drm/radeon: fix error handling in radeon_driver_open_kms
of: base: Improve argument length mismatch error
firmware: Update Kconfig help text for Google firmware
can: mcp251xfd: mcp251xfd_tef_obj_read(): fix typo in error message
media: rcar-csi2: Optimize the selection PHTW register
drm/vc4: hdmi: Make sure the device is powered with CEC
media: correct MEDIA_TEST_SUPPORT help text
Documentation: dmaengine: Correctly describe dmatest with channel unset
Documentation: ACPI: Fix data node reference documentation
Documentation: refer to config RANDOMIZE_BASE for kernel address-space randomization
Documentation: fix firewire.rst ABI file path error
Bluetooth: hci_sync: Fix not setting adv set duration
scsi: core: Show SCMD_LAST in text form
dmaengine: uniphier-xdmac: Fix type of address variables
RDMA/hns: Modify the mapping attribute of doorbell to device
RDMA/rxe: Fix a typo in opcode name
dmaengine: stm32-mdma: fix STM32_MDMA_CTBR_TSEL_MASK
Revert "net/mlx5: Add retry mechanism to the command entry index allocation"
powerpc/cell: Fix clang -Wimplicit-fallthrough warning
powerpc/fsl/dts: Enable WA for erratum A-009885 on fman3l MDIO buses
block: Fix fsync always failed if once failed
bpftool: Remove inclusion of utilities.mak from Makefiles
xdp: check prog type before updating BPF link
perf evsel: Override attr->sample_period for non-libpfm4 events
ipv4: update fib_info_cnt under spinlock protection
ipv4: avoid quadratic behavior in netns dismantle
net/fsl: xgmac_mdio: Add workaround for erratum A-009885
net/fsl: xgmac_mdio: Fix incorrect iounmap when removing module
parisc: pdc_stable: Fix memory leak in pdcs_register_pathentries
f2fs: compress: fix potential deadlock of compress file
f2fs: fix to reserve space for IO align feature
af_unix: annote lockless accesses to unix_tot_inflight & gc_in_progress
clk: Emit a stern warning with writable debugfs enabled
clk: si5341: Fix clock HW provider cleanup
net/smc: Fix hung_task when removing SMC-R devices
net: axienet: increase reset timeout
net: axienet: Wait for PhyRstCmplt after core reset
net: axienet: reset core on initialization prior to MDIO access
net: axienet: add missing memory barriers
net: axienet: limit minimum TX ring size
net: axienet: Fix TX ring slot available check
net: axienet: fix number of TX ring slots for available check
net: axienet: fix for TX busy handling
net: axienet: increase default TX ring size to 128
HID: vivaldi: fix handling devices not using numbered reports
rtc: pxa: fix null pointer dereference
vdpa/mlx5: Fix wrong configuration of virtio_version_1_0
virtio_ring: mark ring unused on error
taskstats: Cleanup the use of task->exit_code
inet: frags: annotate races around fqdir->dead and fqdir->high_thresh
netns: add schedule point in ops_exit_list()
xfrm: Don't accidentally set RTO_ONLINK in decode_session4()
gre: Don't accidentally set RTO_ONLINK in gre_fill_metadata_dst()
libcxgb: Don't accidentally set RTO_ONLINK in cxgb_find_route()
perf script: Fix hex dump character output
dmaengine: at_xdmac: Don't start transactions at tx_submit level
dmaengine: at_xdmac: Start transfer for cyclic channels in issue_pending
dmaengine: at_xdmac: Print debug message after realeasing the lock
dmaengine: at_xdmac: Fix concurrency over xfers_list
dmaengine: at_xdmac: Fix lld view setting
dmaengine: at_xdmac: Fix at_xdmac_lld struct definition
perf probe: Fix ppc64 'perf probe add events failed' case
devlink: Remove misleading internal_flags from health reporter dump
arm64: dts: qcom: msm8996: drop not documented adreno properties
net: bonding: fix bond_xmit_broadcast return value error bug
net_sched: restore "mpu xxx" handling
bcmgenet: add WOL IRQ check
net: ethernet: mtk_eth_soc: fix error checking in mtk_mac_config()
net: sfp: fix high power modules without diagnostic monitoring
net: mscc: ocelot: fix using match before it is set
dt-bindings: display: meson-dw-hdmi: add missing sound-name-prefix property
dt-bindings: display: meson-vpu: Add missing amlogic,canvas property
dt-bindings: watchdog: Require samsung,syscon-phandle for Exynos7
scripts/dtc: dtx_diff: remove broken example from help text
lib82596: Fix IRQ check in sni_82596_probe
mm/hmm.c: allow VM_MIXEDMAP to work with hmm_range_fault
lib/test_meminit: destroy cache in kmem_cache_alloc_bulk() test
mtd: nand: bbt: Fix corner case in bad block table handling
ath10k: Fix the MTU size on QCA9377 SDIO
scripts: sphinx-pre-install: add required ctex dependency
scripts: sphinx-pre-install: Fix ctex support on Debian
Linux 5.10.94
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I857f2417c899508815a1ba13d1285fd400a1f133
1347 lines
34 KiB
C
1347 lines
34 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __NET_SCHED_GENERIC_H
|
|
#define __NET_SCHED_GENERIC_H
|
|
|
|
#include <linux/netdevice.h>
|
|
#include <linux/types.h>
|
|
#include <linux/rcupdate.h>
|
|
#include <linux/pkt_sched.h>
|
|
#include <linux/pkt_cls.h>
|
|
#include <linux/percpu.h>
|
|
#include <linux/dynamic_queue_limits.h>
|
|
#include <linux/list.h>
|
|
#include <linux/refcount.h>
|
|
#include <linux/workqueue.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/rwsem.h>
|
|
#include <linux/atomic.h>
|
|
#include <linux/hashtable.h>
|
|
#include <linux/android_kabi.h>
|
|
#include <net/gen_stats.h>
|
|
#include <net/rtnetlink.h>
|
|
#include <net/flow_offload.h>
|
|
|
|
struct Qdisc_ops;
|
|
struct qdisc_walker;
|
|
struct tcf_walker;
|
|
struct module;
|
|
struct bpf_flow_keys;
|
|
|
|
struct qdisc_rate_table {
|
|
struct tc_ratespec rate;
|
|
u32 data[256];
|
|
struct qdisc_rate_table *next;
|
|
int refcnt;
|
|
};
|
|
|
|
enum qdisc_state_t {
|
|
__QDISC_STATE_SCHED,
|
|
__QDISC_STATE_DEACTIVATED,
|
|
__QDISC_STATE_MISSED,
|
|
};
|
|
|
|
struct qdisc_size_table {
|
|
struct rcu_head rcu;
|
|
struct list_head list;
|
|
struct tc_sizespec szopts;
|
|
int refcnt;
|
|
u16 data[];
|
|
};
|
|
|
|
/* similar to sk_buff_head, but skb->prev pointer is undefined. */
|
|
struct qdisc_skb_head {
|
|
struct sk_buff *head;
|
|
struct sk_buff *tail;
|
|
__u32 qlen;
|
|
spinlock_t lock;
|
|
};
|
|
|
|
struct Qdisc {
|
|
int (*enqueue)(struct sk_buff *skb,
|
|
struct Qdisc *sch,
|
|
struct sk_buff **to_free);
|
|
struct sk_buff * (*dequeue)(struct Qdisc *sch);
|
|
unsigned int flags;
|
|
#define TCQ_F_BUILTIN 1
|
|
#define TCQ_F_INGRESS 2
|
|
#define TCQ_F_CAN_BYPASS 4
|
|
#define TCQ_F_MQROOT 8
|
|
#define TCQ_F_ONETXQUEUE 0x10 /* dequeue_skb() can assume all skbs are for
|
|
* q->dev_queue : It can test
|
|
* netif_xmit_frozen_or_stopped() before
|
|
* dequeueing next packet.
|
|
* Its true for MQ/MQPRIO slaves, or non
|
|
* multiqueue device.
|
|
*/
|
|
#define TCQ_F_WARN_NONWC (1 << 16)
|
|
#define TCQ_F_CPUSTATS 0x20 /* run using percpu statistics */
|
|
#define TCQ_F_NOPARENT 0x40 /* root of its hierarchy :
|
|
* qdisc_tree_decrease_qlen() should stop.
|
|
*/
|
|
#define TCQ_F_INVISIBLE 0x80 /* invisible by default in dump */
|
|
#define TCQ_F_NOLOCK 0x100 /* qdisc does not require locking */
|
|
#define TCQ_F_OFFLOADED 0x200 /* qdisc is offloaded to HW */
|
|
u32 limit;
|
|
const struct Qdisc_ops *ops;
|
|
struct qdisc_size_table __rcu *stab;
|
|
struct hlist_node hash;
|
|
u32 handle;
|
|
u32 parent;
|
|
|
|
struct netdev_queue *dev_queue;
|
|
|
|
struct net_rate_estimator __rcu *rate_est;
|
|
struct gnet_stats_basic_cpu __percpu *cpu_bstats;
|
|
struct gnet_stats_queue __percpu *cpu_qstats;
|
|
int pad;
|
|
refcount_t refcnt;
|
|
|
|
/*
|
|
* For performance sake on SMP, we put highly modified fields at the end
|
|
*/
|
|
struct sk_buff_head gso_skb ____cacheline_aligned_in_smp;
|
|
struct qdisc_skb_head q;
|
|
struct gnet_stats_basic_packed bstats;
|
|
seqcount_t running;
|
|
struct gnet_stats_queue qstats;
|
|
unsigned long state;
|
|
struct Qdisc *next_sched;
|
|
struct sk_buff_head skb_bad_txq;
|
|
|
|
spinlock_t busylock ____cacheline_aligned_in_smp;
|
|
spinlock_t seqlock;
|
|
|
|
/* for NOLOCK qdisc, true if there are no enqueued skbs */
|
|
bool empty;
|
|
struct rcu_head rcu;
|
|
|
|
ANDROID_KABI_RESERVE(1);
|
|
|
|
/* private data */
|
|
long privdata[] ____cacheline_aligned;
|
|
};
|
|
|
|
static inline void qdisc_refcount_inc(struct Qdisc *qdisc)
|
|
{
|
|
if (qdisc->flags & TCQ_F_BUILTIN)
|
|
return;
|
|
refcount_inc(&qdisc->refcnt);
|
|
}
|
|
|
|
/* Intended to be used by unlocked users, when concurrent qdisc release is
|
|
* possible.
|
|
*/
|
|
|
|
static inline struct Qdisc *qdisc_refcount_inc_nz(struct Qdisc *qdisc)
|
|
{
|
|
if (qdisc->flags & TCQ_F_BUILTIN)
|
|
return qdisc;
|
|
if (refcount_inc_not_zero(&qdisc->refcnt))
|
|
return qdisc;
|
|
return NULL;
|
|
}
|
|
|
|
static inline bool qdisc_is_running(struct Qdisc *qdisc)
|
|
{
|
|
if (qdisc->flags & TCQ_F_NOLOCK)
|
|
return spin_is_locked(&qdisc->seqlock);
|
|
return (raw_read_seqcount(&qdisc->running) & 1) ? true : false;
|
|
}
|
|
|
|
static inline bool qdisc_is_percpu_stats(const struct Qdisc *q)
|
|
{
|
|
return q->flags & TCQ_F_CPUSTATS;
|
|
}
|
|
|
|
static inline bool qdisc_is_empty(const struct Qdisc *qdisc)
|
|
{
|
|
if (qdisc_is_percpu_stats(qdisc))
|
|
return READ_ONCE(qdisc->empty);
|
|
return !READ_ONCE(qdisc->q.qlen);
|
|
}
|
|
|
|
static inline bool qdisc_run_begin(struct Qdisc *qdisc)
|
|
{
|
|
if (qdisc->flags & TCQ_F_NOLOCK) {
|
|
if (spin_trylock(&qdisc->seqlock))
|
|
goto nolock_empty;
|
|
|
|
/* Paired with smp_mb__after_atomic() to make sure
|
|
* STATE_MISSED checking is synchronized with clearing
|
|
* in pfifo_fast_dequeue().
|
|
*/
|
|
smp_mb__before_atomic();
|
|
|
|
/* If the MISSED flag is set, it means other thread has
|
|
* set the MISSED flag before second spin_trylock(), so
|
|
* we can return false here to avoid multi cpus doing
|
|
* the set_bit() and second spin_trylock() concurrently.
|
|
*/
|
|
if (test_bit(__QDISC_STATE_MISSED, &qdisc->state))
|
|
return false;
|
|
|
|
/* Set the MISSED flag before the second spin_trylock(),
|
|
* if the second spin_trylock() return false, it means
|
|
* other cpu holding the lock will do dequeuing for us
|
|
* or it will see the MISSED flag set after releasing
|
|
* lock and reschedule the net_tx_action() to do the
|
|
* dequeuing.
|
|
*/
|
|
set_bit(__QDISC_STATE_MISSED, &qdisc->state);
|
|
|
|
/* spin_trylock() only has load-acquire semantic, so use
|
|
* smp_mb__after_atomic() to ensure STATE_MISSED is set
|
|
* before doing the second spin_trylock().
|
|
*/
|
|
smp_mb__after_atomic();
|
|
|
|
/* Retry again in case other CPU may not see the new flag
|
|
* after it releases the lock at the end of qdisc_run_end().
|
|
*/
|
|
if (!spin_trylock(&qdisc->seqlock))
|
|
return false;
|
|
|
|
nolock_empty:
|
|
WRITE_ONCE(qdisc->empty, false);
|
|
} else if (qdisc_is_running(qdisc)) {
|
|
return false;
|
|
}
|
|
/* Variant of write_seqcount_begin() telling lockdep a trylock
|
|
* was attempted.
|
|
*/
|
|
raw_write_seqcount_begin(&qdisc->running);
|
|
seqcount_acquire(&qdisc->running.dep_map, 0, 1, _RET_IP_);
|
|
return true;
|
|
}
|
|
|
|
static inline void qdisc_run_end(struct Qdisc *qdisc)
|
|
{
|
|
write_seqcount_end(&qdisc->running);
|
|
if (qdisc->flags & TCQ_F_NOLOCK) {
|
|
spin_unlock(&qdisc->seqlock);
|
|
|
|
if (unlikely(test_bit(__QDISC_STATE_MISSED,
|
|
&qdisc->state))) {
|
|
clear_bit(__QDISC_STATE_MISSED, &qdisc->state);
|
|
__netif_schedule(qdisc);
|
|
}
|
|
}
|
|
}
|
|
|
|
static inline bool qdisc_may_bulk(const struct Qdisc *qdisc)
|
|
{
|
|
return qdisc->flags & TCQ_F_ONETXQUEUE;
|
|
}
|
|
|
|
static inline int qdisc_avail_bulklimit(const struct netdev_queue *txq)
|
|
{
|
|
#ifdef CONFIG_BQL
|
|
/* Non-BQL migrated drivers will return 0, too. */
|
|
return dql_avail(&txq->dql);
|
|
#else
|
|
return 0;
|
|
#endif
|
|
}
|
|
|
|
struct Qdisc_class_ops {
|
|
unsigned int flags;
|
|
/* Child qdisc manipulation */
|
|
struct netdev_queue * (*select_queue)(struct Qdisc *, struct tcmsg *);
|
|
int (*graft)(struct Qdisc *, unsigned long cl,
|
|
struct Qdisc *, struct Qdisc **,
|
|
struct netlink_ext_ack *extack);
|
|
struct Qdisc * (*leaf)(struct Qdisc *, unsigned long cl);
|
|
void (*qlen_notify)(struct Qdisc *, unsigned long);
|
|
|
|
/* Class manipulation routines */
|
|
unsigned long (*find)(struct Qdisc *, u32 classid);
|
|
int (*change)(struct Qdisc *, u32, u32,
|
|
struct nlattr **, unsigned long *,
|
|
struct netlink_ext_ack *);
|
|
int (*delete)(struct Qdisc *, unsigned long);
|
|
void (*walk)(struct Qdisc *, struct qdisc_walker * arg);
|
|
|
|
/* Filter manipulation */
|
|
struct tcf_block * (*tcf_block)(struct Qdisc *sch,
|
|
unsigned long arg,
|
|
struct netlink_ext_ack *extack);
|
|
unsigned long (*bind_tcf)(struct Qdisc *, unsigned long,
|
|
u32 classid);
|
|
void (*unbind_tcf)(struct Qdisc *, unsigned long);
|
|
|
|
/* rtnetlink specific */
|
|
int (*dump)(struct Qdisc *, unsigned long,
|
|
struct sk_buff *skb, struct tcmsg*);
|
|
int (*dump_stats)(struct Qdisc *, unsigned long,
|
|
struct gnet_dump *);
|
|
|
|
ANDROID_KABI_RESERVE(1);
|
|
};
|
|
|
|
/* Qdisc_class_ops flag values */
|
|
|
|
/* Implements API that doesn't require rtnl lock */
|
|
enum qdisc_class_ops_flags {
|
|
QDISC_CLASS_OPS_DOIT_UNLOCKED = 1,
|
|
};
|
|
|
|
struct Qdisc_ops {
|
|
struct Qdisc_ops *next;
|
|
const struct Qdisc_class_ops *cl_ops;
|
|
char id[IFNAMSIZ];
|
|
int priv_size;
|
|
unsigned int static_flags;
|
|
|
|
int (*enqueue)(struct sk_buff *skb,
|
|
struct Qdisc *sch,
|
|
struct sk_buff **to_free);
|
|
struct sk_buff * (*dequeue)(struct Qdisc *);
|
|
struct sk_buff * (*peek)(struct Qdisc *);
|
|
|
|
int (*init)(struct Qdisc *sch, struct nlattr *arg,
|
|
struct netlink_ext_ack *extack);
|
|
void (*reset)(struct Qdisc *);
|
|
void (*destroy)(struct Qdisc *);
|
|
int (*change)(struct Qdisc *sch,
|
|
struct nlattr *arg,
|
|
struct netlink_ext_ack *extack);
|
|
void (*attach)(struct Qdisc *sch);
|
|
int (*change_tx_queue_len)(struct Qdisc *, unsigned int);
|
|
|
|
int (*dump)(struct Qdisc *, struct sk_buff *);
|
|
int (*dump_stats)(struct Qdisc *, struct gnet_dump *);
|
|
|
|
void (*ingress_block_set)(struct Qdisc *sch,
|
|
u32 block_index);
|
|
void (*egress_block_set)(struct Qdisc *sch,
|
|
u32 block_index);
|
|
u32 (*ingress_block_get)(struct Qdisc *sch);
|
|
u32 (*egress_block_get)(struct Qdisc *sch);
|
|
|
|
struct module *owner;
|
|
|
|
ANDROID_KABI_RESERVE(1);
|
|
};
|
|
|
|
|
|
struct tcf_result {
|
|
union {
|
|
struct {
|
|
unsigned long class;
|
|
u32 classid;
|
|
};
|
|
const struct tcf_proto *goto_tp;
|
|
|
|
/* used in the skb_tc_reinsert function */
|
|
struct {
|
|
bool ingress;
|
|
struct gnet_stats_queue *qstats;
|
|
};
|
|
};
|
|
};
|
|
|
|
struct tcf_chain;
|
|
|
|
struct tcf_proto_ops {
|
|
struct list_head head;
|
|
char kind[IFNAMSIZ];
|
|
|
|
int (*classify)(struct sk_buff *,
|
|
const struct tcf_proto *,
|
|
struct tcf_result *);
|
|
int (*init)(struct tcf_proto*);
|
|
void (*destroy)(struct tcf_proto *tp, bool rtnl_held,
|
|
struct netlink_ext_ack *extack);
|
|
|
|
void* (*get)(struct tcf_proto*, u32 handle);
|
|
void (*put)(struct tcf_proto *tp, void *f);
|
|
int (*change)(struct net *net, struct sk_buff *,
|
|
struct tcf_proto*, unsigned long,
|
|
u32 handle, struct nlattr **,
|
|
void **, bool, bool,
|
|
struct netlink_ext_ack *);
|
|
int (*delete)(struct tcf_proto *tp, void *arg,
|
|
bool *last, bool rtnl_held,
|
|
struct netlink_ext_ack *);
|
|
bool (*delete_empty)(struct tcf_proto *tp);
|
|
void (*walk)(struct tcf_proto *tp,
|
|
struct tcf_walker *arg, bool rtnl_held);
|
|
int (*reoffload)(struct tcf_proto *tp, bool add,
|
|
flow_setup_cb_t *cb, void *cb_priv,
|
|
struct netlink_ext_ack *extack);
|
|
void (*hw_add)(struct tcf_proto *tp,
|
|
void *type_data);
|
|
void (*hw_del)(struct tcf_proto *tp,
|
|
void *type_data);
|
|
void (*bind_class)(void *, u32, unsigned long,
|
|
void *, unsigned long);
|
|
void * (*tmplt_create)(struct net *net,
|
|
struct tcf_chain *chain,
|
|
struct nlattr **tca,
|
|
struct netlink_ext_ack *extack);
|
|
void (*tmplt_destroy)(void *tmplt_priv);
|
|
|
|
/* rtnetlink specific */
|
|
int (*dump)(struct net*, struct tcf_proto*, void *,
|
|
struct sk_buff *skb, struct tcmsg*,
|
|
bool);
|
|
int (*terse_dump)(struct net *net,
|
|
struct tcf_proto *tp, void *fh,
|
|
struct sk_buff *skb,
|
|
struct tcmsg *t, bool rtnl_held);
|
|
int (*tmplt_dump)(struct sk_buff *skb,
|
|
struct net *net,
|
|
void *tmplt_priv);
|
|
|
|
struct module *owner;
|
|
int flags;
|
|
};
|
|
|
|
/* Classifiers setting TCF_PROTO_OPS_DOIT_UNLOCKED in tcf_proto_ops->flags
|
|
* are expected to implement tcf_proto_ops->delete_empty(), otherwise race
|
|
* conditions can occur when filters are inserted/deleted simultaneously.
|
|
*/
|
|
enum tcf_proto_ops_flags {
|
|
TCF_PROTO_OPS_DOIT_UNLOCKED = 1,
|
|
};
|
|
|
|
struct tcf_proto {
|
|
/* Fast access part */
|
|
struct tcf_proto __rcu *next;
|
|
void __rcu *root;
|
|
|
|
/* called under RCU BH lock*/
|
|
int (*classify)(struct sk_buff *,
|
|
const struct tcf_proto *,
|
|
struct tcf_result *);
|
|
__be16 protocol;
|
|
|
|
/* All the rest */
|
|
u32 prio;
|
|
void *data;
|
|
const struct tcf_proto_ops *ops;
|
|
struct tcf_chain *chain;
|
|
/* Lock protects tcf_proto shared state and can be used by unlocked
|
|
* classifiers to protect their private data.
|
|
*/
|
|
spinlock_t lock;
|
|
bool deleting;
|
|
refcount_t refcnt;
|
|
struct rcu_head rcu;
|
|
struct hlist_node destroy_ht_node;
|
|
};
|
|
|
|
struct qdisc_skb_cb {
|
|
struct {
|
|
unsigned int pkt_len;
|
|
u16 slave_dev_queue_mapping;
|
|
u16 tc_classid;
|
|
};
|
|
#define QDISC_CB_PRIV_LEN 20
|
|
unsigned char data[QDISC_CB_PRIV_LEN];
|
|
u16 mru;
|
|
};
|
|
|
|
typedef void tcf_chain_head_change_t(struct tcf_proto *tp_head, void *priv);
|
|
|
|
struct tcf_chain {
|
|
/* Protects filter_chain. */
|
|
struct mutex filter_chain_lock;
|
|
struct tcf_proto __rcu *filter_chain;
|
|
struct list_head list;
|
|
struct tcf_block *block;
|
|
u32 index; /* chain index */
|
|
unsigned int refcnt;
|
|
unsigned int action_refcnt;
|
|
bool explicitly_created;
|
|
bool flushing;
|
|
const struct tcf_proto_ops *tmplt_ops;
|
|
void *tmplt_priv;
|
|
struct rcu_head rcu;
|
|
};
|
|
|
|
struct tcf_block {
|
|
/* Lock protects tcf_block and lifetime-management data of chains
|
|
* attached to the block (refcnt, action_refcnt, explicitly_created).
|
|
*/
|
|
struct mutex lock;
|
|
struct list_head chain_list;
|
|
u32 index; /* block index for shared blocks */
|
|
u32 classid; /* which class this block belongs to */
|
|
refcount_t refcnt;
|
|
struct net *net;
|
|
struct Qdisc *q;
|
|
struct rw_semaphore cb_lock; /* protects cb_list and offload counters */
|
|
struct flow_block flow_block;
|
|
struct list_head owner_list;
|
|
bool keep_dst;
|
|
atomic_t offloadcnt; /* Number of oddloaded filters */
|
|
unsigned int nooffloaddevcnt; /* Number of devs unable to do offload */
|
|
unsigned int lockeddevcnt; /* Number of devs that require rtnl lock. */
|
|
struct {
|
|
struct tcf_chain *chain;
|
|
struct list_head filter_chain_list;
|
|
} chain0;
|
|
struct rcu_head rcu;
|
|
DECLARE_HASHTABLE(proto_destroy_ht, 7);
|
|
struct mutex proto_destroy_lock; /* Lock for proto_destroy hashtable. */
|
|
};
|
|
|
|
#ifdef CONFIG_PROVE_LOCKING
|
|
static inline bool lockdep_tcf_chain_is_locked(struct tcf_chain *chain)
|
|
{
|
|
return lockdep_is_held(&chain->filter_chain_lock);
|
|
}
|
|
|
|
static inline bool lockdep_tcf_proto_is_locked(struct tcf_proto *tp)
|
|
{
|
|
return lockdep_is_held(&tp->lock);
|
|
}
|
|
#else
|
|
static inline bool lockdep_tcf_chain_is_locked(struct tcf_block *chain)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
static inline bool lockdep_tcf_proto_is_locked(struct tcf_proto *tp)
|
|
{
|
|
return true;
|
|
}
|
|
#endif /* #ifdef CONFIG_PROVE_LOCKING */
|
|
|
|
#define tcf_chain_dereference(p, chain) \
|
|
rcu_dereference_protected(p, lockdep_tcf_chain_is_locked(chain))
|
|
|
|
#define tcf_proto_dereference(p, tp) \
|
|
rcu_dereference_protected(p, lockdep_tcf_proto_is_locked(tp))
|
|
|
|
static inline void qdisc_cb_private_validate(const struct sk_buff *skb, int sz)
|
|
{
|
|
struct qdisc_skb_cb *qcb;
|
|
|
|
BUILD_BUG_ON(sizeof(skb->cb) < sizeof(*qcb));
|
|
BUILD_BUG_ON(sizeof(qcb->data) < sz);
|
|
}
|
|
|
|
static inline int qdisc_qlen_cpu(const struct Qdisc *q)
|
|
{
|
|
return this_cpu_ptr(q->cpu_qstats)->qlen;
|
|
}
|
|
|
|
static inline int qdisc_qlen(const struct Qdisc *q)
|
|
{
|
|
return q->q.qlen;
|
|
}
|
|
|
|
static inline int qdisc_qlen_sum(const struct Qdisc *q)
|
|
{
|
|
__u32 qlen = q->qstats.qlen;
|
|
int i;
|
|
|
|
if (qdisc_is_percpu_stats(q)) {
|
|
for_each_possible_cpu(i)
|
|
qlen += per_cpu_ptr(q->cpu_qstats, i)->qlen;
|
|
} else {
|
|
qlen += q->q.qlen;
|
|
}
|
|
|
|
return qlen;
|
|
}
|
|
|
|
static inline struct qdisc_skb_cb *qdisc_skb_cb(const struct sk_buff *skb)
|
|
{
|
|
return (struct qdisc_skb_cb *)skb->cb;
|
|
}
|
|
|
|
static inline spinlock_t *qdisc_lock(struct Qdisc *qdisc)
|
|
{
|
|
return &qdisc->q.lock;
|
|
}
|
|
|
|
static inline struct Qdisc *qdisc_root(const struct Qdisc *qdisc)
|
|
{
|
|
struct Qdisc *q = rcu_dereference_rtnl(qdisc->dev_queue->qdisc);
|
|
|
|
return q;
|
|
}
|
|
|
|
static inline struct Qdisc *qdisc_root_bh(const struct Qdisc *qdisc)
|
|
{
|
|
return rcu_dereference_bh(qdisc->dev_queue->qdisc);
|
|
}
|
|
|
|
static inline struct Qdisc *qdisc_root_sleeping(const struct Qdisc *qdisc)
|
|
{
|
|
return qdisc->dev_queue->qdisc_sleeping;
|
|
}
|
|
|
|
/* The qdisc root lock is a mechanism by which to top level
|
|
* of a qdisc tree can be locked from any qdisc node in the
|
|
* forest. This allows changing the configuration of some
|
|
* aspect of the qdisc tree while blocking out asynchronous
|
|
* qdisc access in the packet processing paths.
|
|
*
|
|
* It is only legal to do this when the root will not change
|
|
* on us. Otherwise we'll potentially lock the wrong qdisc
|
|
* root. This is enforced by holding the RTNL semaphore, which
|
|
* all users of this lock accessor must do.
|
|
*/
|
|
static inline spinlock_t *qdisc_root_lock(const struct Qdisc *qdisc)
|
|
{
|
|
struct Qdisc *root = qdisc_root(qdisc);
|
|
|
|
ASSERT_RTNL();
|
|
return qdisc_lock(root);
|
|
}
|
|
|
|
static inline spinlock_t *qdisc_root_sleeping_lock(const struct Qdisc *qdisc)
|
|
{
|
|
struct Qdisc *root = qdisc_root_sleeping(qdisc);
|
|
|
|
ASSERT_RTNL();
|
|
return qdisc_lock(root);
|
|
}
|
|
|
|
static inline seqcount_t *qdisc_root_sleeping_running(const struct Qdisc *qdisc)
|
|
{
|
|
struct Qdisc *root = qdisc_root_sleeping(qdisc);
|
|
|
|
ASSERT_RTNL();
|
|
return &root->running;
|
|
}
|
|
|
|
static inline struct net_device *qdisc_dev(const struct Qdisc *qdisc)
|
|
{
|
|
return qdisc->dev_queue->dev;
|
|
}
|
|
|
|
static inline void sch_tree_lock(const struct Qdisc *q)
|
|
{
|
|
spin_lock_bh(qdisc_root_sleeping_lock(q));
|
|
}
|
|
|
|
static inline void sch_tree_unlock(const struct Qdisc *q)
|
|
{
|
|
spin_unlock_bh(qdisc_root_sleeping_lock(q));
|
|
}
|
|
|
|
extern struct Qdisc noop_qdisc;
|
|
extern struct Qdisc_ops noop_qdisc_ops;
|
|
extern struct Qdisc_ops pfifo_fast_ops;
|
|
extern struct Qdisc_ops mq_qdisc_ops;
|
|
extern struct Qdisc_ops noqueue_qdisc_ops;
|
|
extern const struct Qdisc_ops *default_qdisc_ops;
|
|
static inline const struct Qdisc_ops *
|
|
get_default_qdisc_ops(const struct net_device *dev, int ntx)
|
|
{
|
|
return ntx < dev->real_num_tx_queues ?
|
|
default_qdisc_ops : &pfifo_fast_ops;
|
|
}
|
|
|
|
struct Qdisc_class_common {
|
|
u32 classid;
|
|
struct hlist_node hnode;
|
|
};
|
|
|
|
struct Qdisc_class_hash {
|
|
struct hlist_head *hash;
|
|
unsigned int hashsize;
|
|
unsigned int hashmask;
|
|
unsigned int hashelems;
|
|
};
|
|
|
|
static inline unsigned int qdisc_class_hash(u32 id, u32 mask)
|
|
{
|
|
id ^= id >> 8;
|
|
id ^= id >> 4;
|
|
return id & mask;
|
|
}
|
|
|
|
static inline struct Qdisc_class_common *
|
|
qdisc_class_find(const struct Qdisc_class_hash *hash, u32 id)
|
|
{
|
|
struct Qdisc_class_common *cl;
|
|
unsigned int h;
|
|
|
|
if (!id)
|
|
return NULL;
|
|
|
|
h = qdisc_class_hash(id, hash->hashmask);
|
|
hlist_for_each_entry(cl, &hash->hash[h], hnode) {
|
|
if (cl->classid == id)
|
|
return cl;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
static inline int tc_classid_to_hwtc(struct net_device *dev, u32 classid)
|
|
{
|
|
u32 hwtc = TC_H_MIN(classid) - TC_H_MIN_PRIORITY;
|
|
|
|
return (hwtc < netdev_get_num_tc(dev)) ? hwtc : -EINVAL;
|
|
}
|
|
|
|
int qdisc_class_hash_init(struct Qdisc_class_hash *);
|
|
void qdisc_class_hash_insert(struct Qdisc_class_hash *,
|
|
struct Qdisc_class_common *);
|
|
void qdisc_class_hash_remove(struct Qdisc_class_hash *,
|
|
struct Qdisc_class_common *);
|
|
void qdisc_class_hash_grow(struct Qdisc *, struct Qdisc_class_hash *);
|
|
void qdisc_class_hash_destroy(struct Qdisc_class_hash *);
|
|
|
|
int dev_qdisc_change_tx_queue_len(struct net_device *dev);
|
|
void dev_init_scheduler(struct net_device *dev);
|
|
void dev_shutdown(struct net_device *dev);
|
|
void dev_activate(struct net_device *dev);
|
|
void dev_deactivate(struct net_device *dev);
|
|
void dev_deactivate_many(struct list_head *head);
|
|
struct Qdisc *dev_graft_qdisc(struct netdev_queue *dev_queue,
|
|
struct Qdisc *qdisc);
|
|
void qdisc_reset(struct Qdisc *qdisc);
|
|
void qdisc_put(struct Qdisc *qdisc);
|
|
void qdisc_put_unlocked(struct Qdisc *qdisc);
|
|
void qdisc_tree_reduce_backlog(struct Qdisc *qdisc, int n, int len);
|
|
#ifdef CONFIG_NET_SCHED
|
|
int qdisc_offload_dump_helper(struct Qdisc *q, enum tc_setup_type type,
|
|
void *type_data);
|
|
void qdisc_offload_graft_helper(struct net_device *dev, struct Qdisc *sch,
|
|
struct Qdisc *new, struct Qdisc *old,
|
|
enum tc_setup_type type, void *type_data,
|
|
struct netlink_ext_ack *extack);
|
|
#else
|
|
static inline int
|
|
qdisc_offload_dump_helper(struct Qdisc *q, enum tc_setup_type type,
|
|
void *type_data)
|
|
{
|
|
q->flags &= ~TCQ_F_OFFLOADED;
|
|
return 0;
|
|
}
|
|
|
|
static inline void
|
|
qdisc_offload_graft_helper(struct net_device *dev, struct Qdisc *sch,
|
|
struct Qdisc *new, struct Qdisc *old,
|
|
enum tc_setup_type type, void *type_data,
|
|
struct netlink_ext_ack *extack)
|
|
{
|
|
}
|
|
#endif
|
|
struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
|
|
const struct Qdisc_ops *ops,
|
|
struct netlink_ext_ack *extack);
|
|
void qdisc_free(struct Qdisc *qdisc);
|
|
struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue,
|
|
const struct Qdisc_ops *ops, u32 parentid,
|
|
struct netlink_ext_ack *extack);
|
|
void __qdisc_calculate_pkt_len(struct sk_buff *skb,
|
|
const struct qdisc_size_table *stab);
|
|
int skb_do_redirect(struct sk_buff *);
|
|
|
|
static inline bool skb_at_tc_ingress(const struct sk_buff *skb)
|
|
{
|
|
#ifdef CONFIG_NET_CLS_ACT
|
|
return skb->tc_at_ingress;
|
|
#else
|
|
return false;
|
|
#endif
|
|
}
|
|
|
|
static inline bool skb_skip_tc_classify(struct sk_buff *skb)
|
|
{
|
|
#ifdef CONFIG_NET_CLS_ACT
|
|
if (skb->tc_skip_classify) {
|
|
skb->tc_skip_classify = 0;
|
|
return true;
|
|
}
|
|
#endif
|
|
return false;
|
|
}
|
|
|
|
/* Reset all TX qdiscs greater than index of a device. */
|
|
static inline void qdisc_reset_all_tx_gt(struct net_device *dev, unsigned int i)
|
|
{
|
|
struct Qdisc *qdisc;
|
|
|
|
for (; i < dev->num_tx_queues; i++) {
|
|
qdisc = rtnl_dereference(netdev_get_tx_queue(dev, i)->qdisc);
|
|
if (qdisc) {
|
|
spin_lock_bh(qdisc_lock(qdisc));
|
|
qdisc_reset(qdisc);
|
|
spin_unlock_bh(qdisc_lock(qdisc));
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Are all TX queues of the device empty? */
|
|
static inline bool qdisc_all_tx_empty(const struct net_device *dev)
|
|
{
|
|
unsigned int i;
|
|
|
|
rcu_read_lock();
|
|
for (i = 0; i < dev->num_tx_queues; i++) {
|
|
struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
|
|
const struct Qdisc *q = rcu_dereference(txq->qdisc);
|
|
|
|
if (!qdisc_is_empty(q)) {
|
|
rcu_read_unlock();
|
|
return false;
|
|
}
|
|
}
|
|
rcu_read_unlock();
|
|
return true;
|
|
}
|
|
|
|
/* Are any of the TX qdiscs changing? */
|
|
static inline bool qdisc_tx_changing(const struct net_device *dev)
|
|
{
|
|
unsigned int i;
|
|
|
|
for (i = 0; i < dev->num_tx_queues; i++) {
|
|
struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
|
|
if (rcu_access_pointer(txq->qdisc) != txq->qdisc_sleeping)
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/* Is the device using the noop qdisc on all queues? */
|
|
static inline bool qdisc_tx_is_noop(const struct net_device *dev)
|
|
{
|
|
unsigned int i;
|
|
|
|
for (i = 0; i < dev->num_tx_queues; i++) {
|
|
struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
|
|
if (rcu_access_pointer(txq->qdisc) != &noop_qdisc)
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
static inline unsigned int qdisc_pkt_len(const struct sk_buff *skb)
|
|
{
|
|
return qdisc_skb_cb(skb)->pkt_len;
|
|
}
|
|
|
|
/* additional qdisc xmit flags (NET_XMIT_MASK in linux/netdevice.h) */
|
|
enum net_xmit_qdisc_t {
|
|
__NET_XMIT_STOLEN = 0x00010000,
|
|
__NET_XMIT_BYPASS = 0x00020000,
|
|
};
|
|
|
|
#ifdef CONFIG_NET_CLS_ACT
|
|
#define net_xmit_drop_count(e) ((e) & __NET_XMIT_STOLEN ? 0 : 1)
|
|
#else
|
|
#define net_xmit_drop_count(e) (1)
|
|
#endif
|
|
|
|
static inline void qdisc_calculate_pkt_len(struct sk_buff *skb,
|
|
const struct Qdisc *sch)
|
|
{
|
|
#ifdef CONFIG_NET_SCHED
|
|
struct qdisc_size_table *stab = rcu_dereference_bh(sch->stab);
|
|
|
|
if (stab)
|
|
__qdisc_calculate_pkt_len(skb, stab);
|
|
#endif
|
|
}
|
|
|
|
static inline int qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch,
|
|
struct sk_buff **to_free)
|
|
{
|
|
qdisc_calculate_pkt_len(skb, sch);
|
|
return sch->enqueue(skb, sch, to_free);
|
|
}
|
|
|
|
static inline void _bstats_update(struct gnet_stats_basic_packed *bstats,
|
|
__u64 bytes, __u32 packets)
|
|
{
|
|
bstats->bytes += bytes;
|
|
bstats->packets += packets;
|
|
}
|
|
|
|
static inline void bstats_update(struct gnet_stats_basic_packed *bstats,
|
|
const struct sk_buff *skb)
|
|
{
|
|
_bstats_update(bstats,
|
|
qdisc_pkt_len(skb),
|
|
skb_is_gso(skb) ? skb_shinfo(skb)->gso_segs : 1);
|
|
}
|
|
|
|
static inline void _bstats_cpu_update(struct gnet_stats_basic_cpu *bstats,
|
|
__u64 bytes, __u32 packets)
|
|
{
|
|
u64_stats_update_begin(&bstats->syncp);
|
|
_bstats_update(&bstats->bstats, bytes, packets);
|
|
u64_stats_update_end(&bstats->syncp);
|
|
}
|
|
|
|
static inline void bstats_cpu_update(struct gnet_stats_basic_cpu *bstats,
|
|
const struct sk_buff *skb)
|
|
{
|
|
u64_stats_update_begin(&bstats->syncp);
|
|
bstats_update(&bstats->bstats, skb);
|
|
u64_stats_update_end(&bstats->syncp);
|
|
}
|
|
|
|
static inline void qdisc_bstats_cpu_update(struct Qdisc *sch,
|
|
const struct sk_buff *skb)
|
|
{
|
|
bstats_cpu_update(this_cpu_ptr(sch->cpu_bstats), skb);
|
|
}
|
|
|
|
static inline void qdisc_bstats_update(struct Qdisc *sch,
|
|
const struct sk_buff *skb)
|
|
{
|
|
bstats_update(&sch->bstats, skb);
|
|
}
|
|
|
|
static inline void qdisc_qstats_backlog_dec(struct Qdisc *sch,
|
|
const struct sk_buff *skb)
|
|
{
|
|
sch->qstats.backlog -= qdisc_pkt_len(skb);
|
|
}
|
|
|
|
static inline void qdisc_qstats_cpu_backlog_dec(struct Qdisc *sch,
|
|
const struct sk_buff *skb)
|
|
{
|
|
this_cpu_sub(sch->cpu_qstats->backlog, qdisc_pkt_len(skb));
|
|
}
|
|
|
|
static inline void qdisc_qstats_backlog_inc(struct Qdisc *sch,
|
|
const struct sk_buff *skb)
|
|
{
|
|
sch->qstats.backlog += qdisc_pkt_len(skb);
|
|
}
|
|
|
|
static inline void qdisc_qstats_cpu_backlog_inc(struct Qdisc *sch,
|
|
const struct sk_buff *skb)
|
|
{
|
|
this_cpu_add(sch->cpu_qstats->backlog, qdisc_pkt_len(skb));
|
|
}
|
|
|
|
static inline void qdisc_qstats_cpu_qlen_inc(struct Qdisc *sch)
|
|
{
|
|
this_cpu_inc(sch->cpu_qstats->qlen);
|
|
}
|
|
|
|
static inline void qdisc_qstats_cpu_qlen_dec(struct Qdisc *sch)
|
|
{
|
|
this_cpu_dec(sch->cpu_qstats->qlen);
|
|
}
|
|
|
|
static inline void qdisc_qstats_cpu_requeues_inc(struct Qdisc *sch)
|
|
{
|
|
this_cpu_inc(sch->cpu_qstats->requeues);
|
|
}
|
|
|
|
static inline void __qdisc_qstats_drop(struct Qdisc *sch, int count)
|
|
{
|
|
sch->qstats.drops += count;
|
|
}
|
|
|
|
static inline void qstats_drop_inc(struct gnet_stats_queue *qstats)
|
|
{
|
|
qstats->drops++;
|
|
}
|
|
|
|
static inline void qstats_overlimit_inc(struct gnet_stats_queue *qstats)
|
|
{
|
|
qstats->overlimits++;
|
|
}
|
|
|
|
static inline void qdisc_qstats_drop(struct Qdisc *sch)
|
|
{
|
|
qstats_drop_inc(&sch->qstats);
|
|
}
|
|
|
|
static inline void qdisc_qstats_cpu_drop(struct Qdisc *sch)
|
|
{
|
|
this_cpu_inc(sch->cpu_qstats->drops);
|
|
}
|
|
|
|
static inline void qdisc_qstats_overlimit(struct Qdisc *sch)
|
|
{
|
|
sch->qstats.overlimits++;
|
|
}
|
|
|
|
static inline int qdisc_qstats_copy(struct gnet_dump *d, struct Qdisc *sch)
|
|
{
|
|
__u32 qlen = qdisc_qlen_sum(sch);
|
|
|
|
return gnet_stats_copy_queue(d, sch->cpu_qstats, &sch->qstats, qlen);
|
|
}
|
|
|
|
static inline void qdisc_qstats_qlen_backlog(struct Qdisc *sch, __u32 *qlen,
|
|
__u32 *backlog)
|
|
{
|
|
struct gnet_stats_queue qstats = { 0 };
|
|
__u32 len = qdisc_qlen_sum(sch);
|
|
|
|
__gnet_stats_copy_queue(&qstats, sch->cpu_qstats, &sch->qstats, len);
|
|
*qlen = qstats.qlen;
|
|
*backlog = qstats.backlog;
|
|
}
|
|
|
|
static inline void qdisc_tree_flush_backlog(struct Qdisc *sch)
|
|
{
|
|
__u32 qlen, backlog;
|
|
|
|
qdisc_qstats_qlen_backlog(sch, &qlen, &backlog);
|
|
qdisc_tree_reduce_backlog(sch, qlen, backlog);
|
|
}
|
|
|
|
static inline void qdisc_purge_queue(struct Qdisc *sch)
|
|
{
|
|
__u32 qlen, backlog;
|
|
|
|
qdisc_qstats_qlen_backlog(sch, &qlen, &backlog);
|
|
qdisc_reset(sch);
|
|
qdisc_tree_reduce_backlog(sch, qlen, backlog);
|
|
}
|
|
|
|
static inline void qdisc_skb_head_init(struct qdisc_skb_head *qh)
|
|
{
|
|
qh->head = NULL;
|
|
qh->tail = NULL;
|
|
qh->qlen = 0;
|
|
}
|
|
|
|
static inline void __qdisc_enqueue_tail(struct sk_buff *skb,
|
|
struct qdisc_skb_head *qh)
|
|
{
|
|
struct sk_buff *last = qh->tail;
|
|
|
|
if (last) {
|
|
skb->next = NULL;
|
|
last->next = skb;
|
|
qh->tail = skb;
|
|
} else {
|
|
qh->tail = skb;
|
|
qh->head = skb;
|
|
}
|
|
qh->qlen++;
|
|
}
|
|
|
|
static inline int qdisc_enqueue_tail(struct sk_buff *skb, struct Qdisc *sch)
|
|
{
|
|
__qdisc_enqueue_tail(skb, &sch->q);
|
|
qdisc_qstats_backlog_inc(sch, skb);
|
|
return NET_XMIT_SUCCESS;
|
|
}
|
|
|
|
static inline void __qdisc_enqueue_head(struct sk_buff *skb,
|
|
struct qdisc_skb_head *qh)
|
|
{
|
|
skb->next = qh->head;
|
|
|
|
if (!qh->head)
|
|
qh->tail = skb;
|
|
qh->head = skb;
|
|
qh->qlen++;
|
|
}
|
|
|
|
static inline struct sk_buff *__qdisc_dequeue_head(struct qdisc_skb_head *qh)
|
|
{
|
|
struct sk_buff *skb = qh->head;
|
|
|
|
if (likely(skb != NULL)) {
|
|
qh->head = skb->next;
|
|
qh->qlen--;
|
|
if (qh->head == NULL)
|
|
qh->tail = NULL;
|
|
skb->next = NULL;
|
|
}
|
|
|
|
return skb;
|
|
}
|
|
|
|
static inline struct sk_buff *qdisc_dequeue_head(struct Qdisc *sch)
|
|
{
|
|
struct sk_buff *skb = __qdisc_dequeue_head(&sch->q);
|
|
|
|
if (likely(skb != NULL)) {
|
|
qdisc_qstats_backlog_dec(sch, skb);
|
|
qdisc_bstats_update(sch, skb);
|
|
}
|
|
|
|
return skb;
|
|
}
|
|
|
|
/* Instead of calling kfree_skb() while root qdisc lock is held,
|
|
* queue the skb for future freeing at end of __dev_xmit_skb()
|
|
*/
|
|
static inline void __qdisc_drop(struct sk_buff *skb, struct sk_buff **to_free)
|
|
{
|
|
skb->next = *to_free;
|
|
*to_free = skb;
|
|
}
|
|
|
|
static inline void __qdisc_drop_all(struct sk_buff *skb,
|
|
struct sk_buff **to_free)
|
|
{
|
|
if (skb->prev)
|
|
skb->prev->next = *to_free;
|
|
else
|
|
skb->next = *to_free;
|
|
*to_free = skb;
|
|
}
|
|
|
|
static inline unsigned int __qdisc_queue_drop_head(struct Qdisc *sch,
|
|
struct qdisc_skb_head *qh,
|
|
struct sk_buff **to_free)
|
|
{
|
|
struct sk_buff *skb = __qdisc_dequeue_head(qh);
|
|
|
|
if (likely(skb != NULL)) {
|
|
unsigned int len = qdisc_pkt_len(skb);
|
|
|
|
qdisc_qstats_backlog_dec(sch, skb);
|
|
__qdisc_drop(skb, to_free);
|
|
return len;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static inline struct sk_buff *qdisc_peek_head(struct Qdisc *sch)
|
|
{
|
|
const struct qdisc_skb_head *qh = &sch->q;
|
|
|
|
return qh->head;
|
|
}
|
|
|
|
/* generic pseudo peek method for non-work-conserving qdisc */
|
|
static inline struct sk_buff *qdisc_peek_dequeued(struct Qdisc *sch)
|
|
{
|
|
struct sk_buff *skb = skb_peek(&sch->gso_skb);
|
|
|
|
/* we can reuse ->gso_skb because peek isn't called for root qdiscs */
|
|
if (!skb) {
|
|
skb = sch->dequeue(sch);
|
|
|
|
if (skb) {
|
|
__skb_queue_head(&sch->gso_skb, skb);
|
|
/* it's still part of the queue */
|
|
qdisc_qstats_backlog_inc(sch, skb);
|
|
sch->q.qlen++;
|
|
}
|
|
}
|
|
|
|
return skb;
|
|
}
|
|
|
|
static inline void qdisc_update_stats_at_dequeue(struct Qdisc *sch,
|
|
struct sk_buff *skb)
|
|
{
|
|
if (qdisc_is_percpu_stats(sch)) {
|
|
qdisc_qstats_cpu_backlog_dec(sch, skb);
|
|
qdisc_bstats_cpu_update(sch, skb);
|
|
qdisc_qstats_cpu_qlen_dec(sch);
|
|
} else {
|
|
qdisc_qstats_backlog_dec(sch, skb);
|
|
qdisc_bstats_update(sch, skb);
|
|
sch->q.qlen--;
|
|
}
|
|
}
|
|
|
|
static inline void qdisc_update_stats_at_enqueue(struct Qdisc *sch,
|
|
unsigned int pkt_len)
|
|
{
|
|
if (qdisc_is_percpu_stats(sch)) {
|
|
qdisc_qstats_cpu_qlen_inc(sch);
|
|
this_cpu_add(sch->cpu_qstats->backlog, pkt_len);
|
|
} else {
|
|
sch->qstats.backlog += pkt_len;
|
|
sch->q.qlen++;
|
|
}
|
|
}
|
|
|
|
/* use instead of qdisc->dequeue() for all qdiscs queried with ->peek() */
|
|
static inline struct sk_buff *qdisc_dequeue_peeked(struct Qdisc *sch)
|
|
{
|
|
struct sk_buff *skb = skb_peek(&sch->gso_skb);
|
|
|
|
if (skb) {
|
|
skb = __skb_dequeue(&sch->gso_skb);
|
|
if (qdisc_is_percpu_stats(sch)) {
|
|
qdisc_qstats_cpu_backlog_dec(sch, skb);
|
|
qdisc_qstats_cpu_qlen_dec(sch);
|
|
} else {
|
|
qdisc_qstats_backlog_dec(sch, skb);
|
|
sch->q.qlen--;
|
|
}
|
|
} else {
|
|
skb = sch->dequeue(sch);
|
|
}
|
|
|
|
return skb;
|
|
}
|
|
|
|
static inline void __qdisc_reset_queue(struct qdisc_skb_head *qh)
|
|
{
|
|
/*
|
|
* We do not know the backlog in bytes of this list, it
|
|
* is up to the caller to correct it
|
|
*/
|
|
ASSERT_RTNL();
|
|
if (qh->qlen) {
|
|
rtnl_kfree_skbs(qh->head, qh->tail);
|
|
|
|
qh->head = NULL;
|
|
qh->tail = NULL;
|
|
qh->qlen = 0;
|
|
}
|
|
}
|
|
|
|
static inline void qdisc_reset_queue(struct Qdisc *sch)
|
|
{
|
|
__qdisc_reset_queue(&sch->q);
|
|
sch->qstats.backlog = 0;
|
|
}
|
|
|
|
static inline struct Qdisc *qdisc_replace(struct Qdisc *sch, struct Qdisc *new,
|
|
struct Qdisc **pold)
|
|
{
|
|
struct Qdisc *old;
|
|
|
|
sch_tree_lock(sch);
|
|
old = *pold;
|
|
*pold = new;
|
|
if (old != NULL)
|
|
qdisc_purge_queue(old);
|
|
sch_tree_unlock(sch);
|
|
|
|
return old;
|
|
}
|
|
|
|
static inline void rtnl_qdisc_drop(struct sk_buff *skb, struct Qdisc *sch)
|
|
{
|
|
rtnl_kfree_skbs(skb, skb);
|
|
qdisc_qstats_drop(sch);
|
|
}
|
|
|
|
static inline int qdisc_drop_cpu(struct sk_buff *skb, struct Qdisc *sch,
|
|
struct sk_buff **to_free)
|
|
{
|
|
__qdisc_drop(skb, to_free);
|
|
qdisc_qstats_cpu_drop(sch);
|
|
|
|
return NET_XMIT_DROP;
|
|
}
|
|
|
|
static inline int qdisc_drop(struct sk_buff *skb, struct Qdisc *sch,
|
|
struct sk_buff **to_free)
|
|
{
|
|
__qdisc_drop(skb, to_free);
|
|
qdisc_qstats_drop(sch);
|
|
|
|
return NET_XMIT_DROP;
|
|
}
|
|
|
|
static inline int qdisc_drop_all(struct sk_buff *skb, struct Qdisc *sch,
|
|
struct sk_buff **to_free)
|
|
{
|
|
__qdisc_drop_all(skb, to_free);
|
|
qdisc_qstats_drop(sch);
|
|
|
|
return NET_XMIT_DROP;
|
|
}
|
|
|
|
/* Length to Time (L2T) lookup in a qdisc_rate_table, to determine how
|
|
long it will take to send a packet given its size.
|
|
*/
|
|
static inline u32 qdisc_l2t(struct qdisc_rate_table* rtab, unsigned int pktlen)
|
|
{
|
|
int slot = pktlen + rtab->rate.cell_align + rtab->rate.overhead;
|
|
if (slot < 0)
|
|
slot = 0;
|
|
slot >>= rtab->rate.cell_log;
|
|
if (slot > 255)
|
|
return rtab->data[255]*(slot >> 8) + rtab->data[slot & 0xFF];
|
|
return rtab->data[slot];
|
|
}
|
|
|
|
struct psched_ratecfg {
|
|
u64 rate_bytes_ps; /* bytes per second */
|
|
u32 mult;
|
|
u16 overhead;
|
|
u16 mpu;
|
|
u8 linklayer;
|
|
u8 shift;
|
|
};
|
|
|
|
static inline u64 psched_l2t_ns(const struct psched_ratecfg *r,
|
|
unsigned int len)
|
|
{
|
|
len += r->overhead;
|
|
|
|
if (len < r->mpu)
|
|
len = r->mpu;
|
|
|
|
if (unlikely(r->linklayer == TC_LINKLAYER_ATM))
|
|
return ((u64)(DIV_ROUND_UP(len,48)*53) * r->mult) >> r->shift;
|
|
|
|
return ((u64)len * r->mult) >> r->shift;
|
|
}
|
|
|
|
void psched_ratecfg_precompute(struct psched_ratecfg *r,
|
|
const struct tc_ratespec *conf,
|
|
u64 rate64);
|
|
|
|
static inline void psched_ratecfg_getrate(struct tc_ratespec *res,
|
|
const struct psched_ratecfg *r)
|
|
{
|
|
memset(res, 0, sizeof(*res));
|
|
|
|
/* legacy struct tc_ratespec has a 32bit @rate field
|
|
* Qdisc using 64bit rate should add new attributes
|
|
* in order to maintain compatibility.
|
|
*/
|
|
res->rate = min_t(u64, r->rate_bytes_ps, ~0U);
|
|
|
|
res->overhead = r->overhead;
|
|
res->mpu = r->mpu;
|
|
res->linklayer = (r->linklayer & TC_LINKLAYER_MASK);
|
|
}
|
|
|
|
/* Mini Qdisc serves for specific needs of ingress/clsact Qdisc.
|
|
* The fast path only needs to access filter list and to update stats
|
|
*/
|
|
struct mini_Qdisc {
|
|
struct tcf_proto *filter_list;
|
|
struct tcf_block *block;
|
|
struct gnet_stats_basic_cpu __percpu *cpu_bstats;
|
|
struct gnet_stats_queue __percpu *cpu_qstats;
|
|
struct rcu_head rcu;
|
|
};
|
|
|
|
static inline void mini_qdisc_bstats_cpu_update(struct mini_Qdisc *miniq,
|
|
const struct sk_buff *skb)
|
|
{
|
|
bstats_cpu_update(this_cpu_ptr(miniq->cpu_bstats), skb);
|
|
}
|
|
|
|
static inline void mini_qdisc_qstats_cpu_drop(struct mini_Qdisc *miniq)
|
|
{
|
|
this_cpu_inc(miniq->cpu_qstats->drops);
|
|
}
|
|
|
|
struct mini_Qdisc_pair {
|
|
struct mini_Qdisc miniq1;
|
|
struct mini_Qdisc miniq2;
|
|
struct mini_Qdisc __rcu **p_miniq;
|
|
};
|
|
|
|
void mini_qdisc_pair_swap(struct mini_Qdisc_pair *miniqp,
|
|
struct tcf_proto *tp_head);
|
|
void mini_qdisc_pair_init(struct mini_Qdisc_pair *miniqp, struct Qdisc *qdisc,
|
|
struct mini_Qdisc __rcu **p_miniq);
|
|
void mini_qdisc_pair_block_init(struct mini_Qdisc_pair *miniqp,
|
|
struct tcf_block *block);
|
|
|
|
static inline int skb_tc_reinsert(struct sk_buff *skb, struct tcf_result *res)
|
|
{
|
|
return res->ingress ? netif_receive_skb(skb) : dev_queue_xmit(skb);
|
|
}
|
|
|
|
#endif
|