0cc34620e8
* refs/heads/tmp-204dd19: UPSTREAM: driver core: Avoid deferred probe due to fw_devlink_pause/resume() UPSTREAM: driver core: Rename dev_links_info.defer_sync to defer_hook UPSTREAM: driver core: Don't do deferred probe in parallel with kernel_init thread Restore sdcardfs feature Revert rpmh and usb changes Linux 4.19.136 regmap: debugfs: check count when read regmap file rtnetlink: Fix memory(net_device) leak when ->newlink fails udp: Improve load balancing for SO_REUSEPORT. udp: Copy has_conns in reuseport_grow(). sctp: shrink stream outq when fails to do addstream reconf sctp: shrink stream outq only when new outcnt < old outcnt AX.25: Prevent integer overflows in connect and sendmsg tcp: allow at most one TLP probe per flight rxrpc: Fix sendmsg() returning EPIPE due to recvmsg() returning ENODATA qrtr: orphan socket in qrtr_release() net: udp: Fix wrong clean up for IS_UDPLITE macro net-sysfs: add a newline when printing 'tx_timeout' by sysfs ip6_gre: fix null-ptr-deref in ip6gre_init_net() drivers/net/wan/x25_asy: Fix to make it work dev: Defer free of skbs in flush_backlog AX.25: Prevent out-of-bounds read in ax25_sendmsg() AX.25: Fix out-of-bounds read in ax25_connect() Linux 4.19.135 ath9k: Fix regression with Atheros 9271 ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb dm integrity: fix integrity recalculation that is improperly skipped ASoC: qcom: Drop HAS_DMA dependency to fix link failure ASoC: rt5670: Add new gpio1_is_ext_spk_en quirk and enable it on the Lenovo Miix 2 10 x86, vmlinux.lds: Page-align end of ..page_aligned sections parisc: Add atomic64_set_release() define to avoid CPU soft lockups drm/amd/powerplay: fix a crash when overclocking Vega M drm/amdgpu: Fix NULL dereference in dpm sysfs handlers io-mapping: indicate mapping failure mm: memcg/slab: fix memory leak at non-root kmem_cache destroy mm: memcg/slab: synchronize access to kmem_cache dying flag using a spinlock mm/memcg: fix refcount error while moving and swapping Makefile: Fix GCC_TOOLCHAIN_DIR prefix for Clang cross compilation vt: Reject zero-sized screen buffer size. fbdev: Detect integer underflow at "struct fbcon_ops"->clear_margins. serial: 8250_mtk: Fix high-speed baud rates clamping serial: 8250: fix null-ptr-deref in serial8250_start_tx() staging: comedi: addi_apci_1564: check INSN_CONFIG_DIGITAL_TRIG shift staging: comedi: addi_apci_1500: check INSN_CONFIG_DIGITAL_TRIG shift staging: comedi: ni_6527: fix INSN_CONFIG_DIGITAL_TRIG support staging: comedi: addi_apci_1032: check INSN_CONFIG_DIGITAL_TRIG shift staging: wlan-ng: properly check endpoint types Revert "cifs: Fix the target file was deleted when rename failed." usb: xhci: Fix ASM2142/ASM3142 DMA addressing usb: xhci-mtk: fix the failure of bandwidth allocation binder: Don't use mmput() from shrinker function. RISC-V: Upgrade smp_mb__after_spinlock() to iorw,iorw x86: math-emu: Fix up 'cmp' insn for clang ias arm64: Use test_tsk_thread_flag() for checking TIF_SINGLESTEP hwmon: (scmi) Fix potential buffer overflow in scmi_hwmon_probe() hwmon: (adm1275) Make sure we are reading enough data for different chips usb: gadget: udc: gr_udc: fix memleak on error handling path in gr_ep_init() Input: synaptics - enable InterTouch for ThinkPad X1E 1st gen dmaengine: ioat setting ioat timeout as module parameter hwmon: (aspeed-pwm-tacho) Avoid possible buffer overflow regmap: dev_get_regmap_match(): fix string comparison spi: mediatek: use correct SPI_CFG2_REG MACRO Input: add `SW_MACHINE_COVER` dmaengine: tegra210-adma: Fix runtime PM imbalance on error HID: apple: Disable Fn-key key-re-mapping on clone keyboards HID: steam: fixes race in handling device list. HID: alps: support devices with report id 2 HID: i2c-hid: add Mediacom FlexBook edge13 to descriptor override scripts/gdb: fix lx-symbols 'gdb.error' while loading modules scripts/decode_stacktrace: strip basepath from all paths serial: exar: Fix GPIO configuration for Sealevel cards based on XR17V35X bonding: check return value of register_netdevice() in bond_newlink() i2c: rcar: always clear ICSAR to avoid side effects net: ethernet: ave: Fix error returns in ave_init ipvs: fix the connection sync failed in some cases qed: suppress "don't support RoCE & iWARP" flooding on HW init mlxsw: destroy workqueue when trap_register in mlxsw_emad_init bonding: check error value of register_netdevice() immediately net: smc91x: Fix possible memory leak in smc_drv_probe() drm: sun4i: hdmi: Fix inverted HPD result ieee802154: fix one possible memleak in adf7242_probe net: dp83640: fix SIOCSHWTSTAMP to update the struct with actual configuration ax88172a: fix ax88172a_unbind() failures hippi: Fix a size used in a 'pci_free_consistent()' in an error handling path fpga: dfl: fix bug in port reset handshake bnxt_en: Fix race when modifying pause settings. btrfs: fix page leaks after failure to lock page for delalloc btrfs: fix mount failure caused by race with umount btrfs: fix double free on ulist after backref resolution failure ASoC: rt5670: Correct RT5670_LDO_SEL_MASK ALSA: info: Drop WARN_ON() from buffer NULL sanity check uprobes: Change handle_swbp() to send SIGTRAP with si_code=SI_KERNEL, to fix GDB regression IB/umem: fix reference count leak in ib_umem_odp_get() tipc: clean up skb list lock handling on send path spi: spi-fsl-dspi: Exit the ISR with IRQ_NONE when it's not ours SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct IO compeletion") irqdomain/treewide: Keep firmware node unconditionally allocated fuse: fix weird page warning drivers/firmware/psci: Fix memory leakage in alloc_init_cpu_groups() drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout net: sky2: initialize return of gm_phy_read drivers/net/wan/lapbether: Fixed the value of hard_header_len xtensa: update *pos in cpuinfo_op.next xtensa: fix __sync_fetch_and_{and,or}_4 declarations scsi: scsi_transport_spi: Fix function pointer check mac80211: allow rx of mesh eapol frames with default rx key pinctrl: amd: fix npins for uart0 in kerncz_groups gpio: arizona: put pm_runtime in case of failure gpio: arizona: handle pm_runtime_get_sync failure case soc: qcom: rpmh: Dirt can only make you dirtier, not cleaner ANDROID: build: update ABI definitions ANDROID: update the kernel release format for GKI ANDROID: Incremental fs: magic number compatible 32-bit ANDROID: kbuild: don't merge .*..compoundliteral in modules ANDROID: GKI: preserve ABI for struct sock_cgroup_data Revert "genetlink: remove genl_bind" Revert "arm64/alternatives: use subsections for replacement sequences" Linux 4.19.134 spi: sprd: switch the sequence of setting WDG_LOAD_LOW and _HIGH rxrpc: Fix trace string libceph: don't omit recovery_deletes in target_copy() printk: queue wake_up_klogd irq_work only if per-CPU areas are ready genirq/affinity: Handle affinity setting on inactive interrupts correctly sched/fair: handle case of task_h_load() returning 0 sched: Fix unreliable rseq cpu_id for new tasks arm64: compat: Ensure upper 32 bits of x0 are zero on syscall return arm64: ptrace: Consistently use pseudo-singlestep exceptions arm64: ptrace: Override SPSR.SS when single-stepping is enabled thermal/drivers/cpufreq_cooling: Fix wrong frequency converted from power misc: atmel-ssc: lock with mutex instead of spinlock dmaengine: fsl-edma: Fix NULL pointer exception in fsl_edma_tx_handler intel_th: Fix a NULL dereference when hub driver is not loaded intel_th: pci: Add Emmitsburg PCH support intel_th: pci: Add Tiger Lake PCH-H support intel_th: pci: Add Jasper Lake CPU support powerpc/book3s64/pkeys: Fix pkey_access_permitted() for execute disable pkey hwmon: (emc2103) fix unable to change fan pwm1_enable attribute riscv: use 16KB kernel stack on 64-bit MIPS: Fix build for LTS kernel caused by backporting lpj adjustment timer: Fix wheel index calculation on last level timer: Prevent base->clk from moving backward uio_pdrv_genirq: fix use without device tree and no interrupt Input: i8042 - add Lenovo XiaoXin Air 12 to i8042 nomux list mei: bus: don't clean driver pointer Revert "zram: convert remaining CLASS_ATTR() to CLASS_ATTR_RO()" fuse: Fix parameter for FS_IOC_{GET,SET}FLAGS ovl: fix unneeded call to ovl_change_flags() ovl: relax WARN_ON() when decoding lower directory file handle ovl: inode reference leak in ovl_is_inuse true case. serial: mxs-auart: add missed iounmap() in probe failure and remove virtio: virtio_console: add missing MODULE_DEVICE_TABLE() for rproc serial virt: vbox: Fix guest capabilities mask check virt: vbox: Fix VBGL_IOCTL_VMMDEV_REQUEST_BIG and _LOG req numbers to match upstream USB: serial: option: add Quectel EG95 LTE modem USB: serial: option: add GosunCn GM500 series USB: serial: ch341: add new Product ID for CH340 USB: serial: cypress_m8: enable Simply Automated UPB PIM USB: serial: iuu_phoenix: fix memory corruption usb: gadget: function: fix missing spinlock in f_uac1_legacy usb: chipidea: core: add wakeup support for extcon usb: dwc2: Fix shutdown callback in platform USB: c67x00: fix use after free in c67x00_giveback_urb ALSA: hda/realtek - Enable Speaker for ASUS UX533 and UX534 ALSA: hda/realtek - change to suitable link model for ASUS platform ALSA: usb-audio: Fix race against the error recovery URB submission ALSA: line6: Sync the pending work cancel at disconnection ALSA: line6: Perform sanity check for each URB creation HID: quirks: Ignore Simply Automated UPB PIM HID: quirks: Always poll Obins Anne Pro 2 keyboard HID: magicmouse: do not set up autorepeat slimbus: core: Fix mismatch in of_node_get/put mtd: rawnand: oxnas: Release all devices in the _remove() path mtd: rawnand: oxnas: Unregister all devices on error mtd: rawnand: oxnas: Keep track of registered devices mtd: rawnand: brcmnand: fix CS0 layout mtd: rawnand: timings: Fix default tR_max and tCCS_min timings mtd: rawnand: marvell: Fix probe error path mtd: rawnand: marvell: Use nand_cleanup() when the device is not yet registered soc: qcom: rpmh-rsc: Allow using free WAKE TCS for active request soc: qcom: rpmh-rsc: Clear active mode configuration for wake TCS soc: qcom: rpmh: Invalidate SLEEP and WAKE TCSes before flushing new data soc: qcom: rpmh: Update dirty flag only when data changes perf stat: Zero all the 'ena' and 'run' array slot stats for interval mode apparmor: ensure that dfa state tables have entries copy_xstate_to_kernel: Fix typo which caused GDB regression regmap: debugfs: Don't sleep while atomic for fast_io regmaps ARM: dts: socfpga: Align L2 cache-controller nodename with dtschema Revert "thermal: mediatek: fix register index error" staging: comedi: verify array index is correct before using it usb: gadget: udc: atmel: fix uninitialized read in debug printk spi: spi-sun6i: sun6i_spi_transfer_one(): fix setting of clock rate arm64: dts: meson: add missing gxl rng clock phy: sun4i-usb: fix dereference of pointer phy0 before it is null checked iio:health:afe4404 Fix timestamp alignment and prevent data leak. ALSA: usb-audio: Add registration quirk for Kingston HyperX Cloud Flight S ACPI: video: Use native backlight on Acer TravelMate 5735Z Input: mms114 - add extra compatible for mms345l ALSA: usb-audio: Add registration quirk for Kingston HyperX Cloud Alpha S ACPI: video: Use native backlight on Acer Aspire 5783z ALSA: usb-audio: Rewrite registration quirk handling mmc: sdhci: do not enable card detect interrupt for gpio cd type doc: dt: bindings: usb: dwc3: Update entries for disabling SS instances in park mode ALSA: usb-audio: Create a registration quirk for Kingston HyperX Amp (0951:16d8) scsi: sr: remove references to BLK_DEV_SR_VENDOR, leave it enabled ARM: at91: pm: add quirk for sam9x60's ulp1 HID: quirks: Remove ITE 8595 entry from hid_have_special_driver net: sfp: add some quirks for GPON modules net: sfp: add support for module quirks Revert "usb/ehci-platform: Set PM runtime as active on resume" Revert "usb/xhci-plat: Set PM runtime as active on resume" Revert "usb/ohci-platform: Fix a warning when hibernating" of: of_mdio: Correct loop scanning logic net: dsa: bcm_sf2: Fix node reference count spi: spi-fsl-dspi: Fix lockup if device is shutdown during SPI transfer spi: fix initial SPI_SR value in spi-fsl-dspi iio:health:afe4403 Fix timestamp alignment and prevent data leak. iio:pressure:ms5611 Fix buffer element alignment iio:humidity:hts221 Fix alignment and data leak issues iio: pressure: zpa2326: handle pm_runtime_get_sync failure iio: mma8452: Add missed iio_device_unregister() call in mma8452_probe() iio: magnetometer: ak8974: Fix runtime PM imbalance on error iio:humidity:hdc100x Fix alignment and data leak issues iio:magnetometer:ak8974: Fix alignment and data leak issues arm64/alternatives: don't patch up internal branches i2c: eg20t: Load module automatically if ID matches gfs2: read-only mounts should grab the sd_freeze_gl glock tpm_tis: extra chip->ops check on error path in tpm_tis_core_init arm64/alternatives: use subsections for replacement sequences m68k: mm: fix node memblock init m68k: nommu: register start of the memory with memblock drm/exynos: fix ref count leak in mic_pre_enable drm/msm: fix potential memleak in error branch vlan: consolidate VLAN parsing code and limit max parsing depth sched: consistently handle layer3 header accesses in the presence of VLANs cgroup: Fix sock_cgroup_data on big-endian. cgroup: fix cgroup_sk_alloc() for sk_clone_lock() tcp: md5: allow changing MD5 keys in all socket states tcp: md5: refine tcp_md5_do_add()/tcp_md5_hash_key() barriers tcp: md5: do not send silly options in SYNCOOKIES tcp: md5: add missing memory barriers in tcp_md5_do_add()/tcp_md5_hash_key() tcp: make sure listeners don't initialize congestion-control state tcp: fix SO_RCVLOWAT possible hangs under high mem pressure net: usb: qmi_wwan: add support for Quectel EG95 LTE modem net_sched: fix a memory leak in atm_tc_init() net: Added pointer check for dst->ops->neigh_lookup in dst_neigh_lookup_skb llc: make sure applications use ARPHRD_ETHER l2tp: remove skb_dst_set() from l2tp_xmit_skb() ipv4: fill fl4_icmp_{type,code} in ping_v4_sendmsg genetlink: remove genl_bind net: rmnet: fix lower interface leak perf: Make perf able to build with latest libbfd UPSTREAM: media: v4l2-ctrl: Add H264 profile and levels UPSTREAM: media: v4l2-ctrl: Add control for h.264 chroma qp offset ANDROID: GKI: ASoC: compress: revert some code to avoid race condition ANDROID: GKI: Update the ABI xml representation. ANDROID: GKI: kernel: tick-sched: Add an API for wakeup callbacks ANDROID: ASoC: Compress: Check and set pcm_new driver op Revert "ANDROID: GKI: arm64: gki_defconfig: Disable CONFIG_ARM64_TAGGED_ADDR_ABI" ANDROID: arm64: configs: enabe CONFIG_TMPFS Revert "ALSA: compress: fix partial_drain completion state" ANDROID: GKI: enable CONFIG_EXT4_FS_POSIX_ACL. ANDROID: GKI: set CONFIG_STATIC_USERMODEHELPER_PATH Linux 4.19.133 s390/mm: fix huge pte soft dirty copying ARC: elf: use right ELF_ARCH ARC: entry: fix potential EFA clobber when TIF_SYSCALL_TRACE dm: use noio when sending kobject event drm/radeon: fix double free btrfs: fix fatal extent_buffer readahead vs releasepage race Revert "ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb" bpf: Check correct cred for CAP_SYSLOG in bpf_dump_raw_ok() kprobes: Do not expose probe addresses to non-CAP_SYSLOG module: Do not expose section addresses to non-CAP_SYSLOG module: Refactor section attr into bin attribute kernel: module: Use struct_size() helper kallsyms: Refactor kallsyms_show_value() to take cred KVM: x86: Mark CR4.TSD as being possibly owned by the guest KVM: x86: Inject #GP if guest attempts to toggle CR4.LA57 in 64-bit mode KVM: x86: bit 8 of non-leaf PDPEs is not reserved KVM: arm64: Stop clobbering x0 for HVC_SOFT_RESTART KVM: arm64: Fix definition of PAGE_HYP_DEVICE ALSA: usb-audio: add quirk for MacroSilicon MS2109 ALSA: hda - let hs_mic be picked ahead of hp_mic ALSA: opl3: fix infoleak in opl3 mlxsw: spectrum_router: Remove inappropriate usage of WARN_ON() net: macb: mark device wake capable when "magic-packet" property present bnxt_en: fix NULL dereference in case SR-IOV configuration fails cxgb4: fix all-mask IP address comparison nbd: Fix memory leak in nbd_add_socket arm64: kgdb: Fix single-step exception handling oops ALSA: compress: fix partial_drain completion state net: hns3: fix use-after-free when doing self test smsc95xx: avoid memory leak in smsc95xx_bind smsc95xx: check return value of smsc95xx_reset net: cxgb4: fix return error value in t4_prep_fw drm/mediatek: Check plane visibility in atomic_update net: qrtr: Fix an out of bounds read qrtr_endpoint_post() x86/entry: Increase entry_stack size to a full page nvme-rdma: assign completion vector correctly block: release bip in a right way in error path usb: dwc3: pci: Fix reference count leak in dwc3_pci_resume_work scsi: mptscsih: Fix read sense data size ARM: imx6: add missing put_device() call in imx6q_suspend_init() cifs: update ctime and mtime during truncate s390/kasan: fix early pgm check handler execution drm: panel-orientation-quirks: Use generic orientation-data for Acer S1003 drm: panel-orientation-quirks: Add quirk for Asus T101HA panel i40e: protect ring accesses with READ- and WRITE_ONCE ixgbe: protect ring accesses with READ- and WRITE_ONCE spi: spidev: fix a potential use-after-free in spidev_release() spi: spidev: fix a race between spidev_release and spidev_remove gpu: host1x: Detach driver on unregister drm/tegra: hub: Do not enable orphaned window group ARM: dts: omap4-droid4: Fix spi configuration and increase rate regmap: fix alignment issue spi: spi-fsl-dspi: Fix external abort on interrupt in resume or exit paths spi: spi-fsl-dspi: use IRQF_SHARED mode to request IRQ spi: spi-fsl-dspi: Fix lockup if device is removed during SPI transfer spi: spi-fsl-dspi: Adding shutdown hook KVM: s390: reduce number of IO pins to 1 ANDROID: GKI: update abi based on padding fields being added ANDROID: GKI: USB: Gadget: add Android ABI padding to struct usb_gadget ANDROID: GKI: sound/usb/card.h: add Android ABI padding to struct snd_usb_endpoint ANDROID: fscrypt: fix DUN contiguity with inline encryption + IV_INO_LBLK_32 policies ANDROID: f2fs: add back compress inode check Linux 4.19.132 efi: Make it possible to disable efivar_ssdt entirely dm zoned: assign max_io_len correctly irqchip/gic: Atomically update affinity MIPS: Add missing EHB in mtc0 -> mfc0 sequence for DSPen cifs: Fix the target file was deleted when rename failed. SMB3: Honor lease disabling for multiuser mounts SMB3: Honor persistent/resilient handle flags for multiuser mounts SMB3: Honor 'seal' flag for multiuser mounts Revert "ALSA: usb-audio: Improve frames size computation" nfsd: apply umask on fs without ACL support i2c: mlxcpld: check correct size of maximum RECV_LEN packet i2c: algo-pca: Add 0x78 as SCL stuck low status for PCA9665 nvme: fix a crash in nvme_mpath_add_disk SMB3: Honor 'posix' flag for multiuser mounts virtio-blk: free vblk-vqs in error path of virtblk_probe() drm: sun4i: hdmi: Remove extra HPD polling hwmon: (acpi_power_meter) Fix potential memory leak in acpi_power_meter_add() hwmon: (max6697) Make sure the OVERT mask is set correctly cxgb4: fix SGE queue dump destination buffer context cxgb4: use correct type for all-mask IP address comparison cxgb4: parse TC-U32 key values and masks natively cxgb4: use unaligned conversion for fetching timestamp drm/msm/dpu: fix error return code in dpu_encoder_init crypto: af_alg - fix use-after-free in af_alg_accept() due to bh_lock_sock() kgdb: Avoid suspicious RCU usage warning nvme-multipath: fix deadlock between ana_work and scan_work nvme-multipath: set bdi capabilities once s390/debug: avoid kernel warning on too large number of pages usb: usbtest: fix missing kfree(dev->buf) in usbtest_disconnect mm/slub: fix stack overruns with SLUB_STATS mm/slub.c: fix corrupted freechain in deactivate_slab() usbnet: smsc95xx: Fix use-after-free after removal EDAC/amd64: Read back the scrub rate PCI register on F15h mm: fix swap cache node allocation mask btrfs: fix a block group ref counter leak after failure to remove block group ANDROID: Update ABI representation for libabigail update ANDROID: Update the ABI representation ANDROID: Update the ABI xml representation ANDROID: GKI: fix ABI diffs caused by GPU heap and pool vmstat additions ANDROID: sched: consider stune boost margin when computing energy ANDROID: GKI: move abi files to android/ ANDROID: GKI: drop unneeded "_whitelist" off of symbol filenames UPSTREAM: binder: fix null deref of proc->context ANDROID: cpufreq: schedutil: maintain raw cache when next_f is not changed UPSTREAM: net: bpf: Make bpf_ktime_get_ns() available to non GPL programs UPSTREAM: usb: musb: mediatek: add reset FADDR to zero in reset interrupt handle ANDROID: GKI: scripts: Makefile: update the lz4 command (#2) ANDROID: Update the ABI xml representation Revert "drm/dsi: Fix byte order of DCS set/get brightness" Linux 4.19.131 Revert "tty: hvc: Fix data abort due to race in hvc_open" xfs: add agf freeblocks verify in xfs_agf_verify dm writecache: add cond_resched to loop in persistent_memory_claim() dm writecache: correct uncommitted_block when discarding uncommitted entry NFSv4 fix CLOSE not waiting for direct IO compeletion pNFS/flexfiles: Fix list corruption if the mirror count changes SUNRPC: Properly set the @subbuf parameter of xdr_buf_subsegment() sunrpc: fixed rollback in rpc_gssd_dummy_populate() Staging: rtl8723bs: prevent buffer overflow in update_sta_support_rate() drm/radeon: fix fb_div check in ni_init_smc_spll_table() drm: rcar-du: Fix build error ring-buffer: Zero out time extend if it is nested and not absolute tracing: Fix event trigger to accept redundant spaces arm64: perf: Report the PC value in REGS_ABI_32 mode ocfs2: fix panic on nfs server over ocfs2 ocfs2: fix value of OCFS2_INVALID_SLOT ocfs2: load global_inode_alloc ocfs2: avoid inode removal while nfsd is accessing it mm/slab: use memzero_explicit() in kzfree() btrfs: fix failure of RWF_NOWAIT write into prealloc extent beyond eof btrfs: fix data block group relocation failure due to concurrent scrub x86/asm/64: Align start of __clear_user() loop to 16-bytes KVM: nVMX: Plumb L2 GPA through to PML emulation KVM: X86: Fix MSR range of APIC registers in X2APIC mode erofs: fix partially uninitialized misuse in z_erofs_onlinepage_fixup ACPI: sysfs: Fix pm_profile_attr type ALSA: hda/realtek - Add quirk for MSI GE63 laptop ALSA: hda: Add NVIDIA codec IDs 9a & 9d through a0 to patch table RISC-V: Don't allow write+exec only page mapping request in mmap blktrace: break out of blktrace setup on concurrent calls kbuild: improve cc-option to clean up all temporary files arm64: sve: Fix build failure when ARM64_SVE=y and SYSCTL=n s390/vdso: fix vDSO clock_getres() s390/ptrace: fix setting syscall number net: alx: fix race condition in alx_remove ibmvnic: Harden device login requests hwrng: ks-sa - Fix runtime PM imbalance on error riscv/atomic: Fix sign extension for RV64I drm/amd/display: Use kfree() to free rgb_user in calculate_user_regamma_ramp() ata/libata: Fix usage of page address by page_address in ata_scsi_mode_select_xlat function sata_rcar: handle pm_runtime_get_sync failure cases sched/core: Fix PI boosting between RT and DEADLINE tasks sched/deadline: Initialize ->dl_boosted i2c: core: check returned size of emulated smbus block read i2c: fsi: Fix the port number field in status register net: bcmgenet: use hardware padding of runt frames netfilter: ipset: fix unaligned atomic access usb: gadget: udc: Potential Oops in error handling code ARM: imx5: add missing put_device() call in imx_suspend_alloc_ocram() cxgb4: move handling L2T ARP failures to caller net: qed: fix excessive QM ILT lines consumption net: qed: fix NVMe login fails over VFs net: qed: fix left elements count calculation RDMA/mad: Fix possible memory leak in ib_mad_post_receive_mads() ASoC: rockchip: Fix a reference count leak. RDMA/cma: Protect bind_list and listen_list while finding matching cm id RDMA/qedr: Fix KASAN: use-after-free in ucma_event_handler+0x532 rxrpc: Fix handling of rwind from an ACK packet ARM: dts: NSP: Correct FA2 mailbox node regmap: Fix memory leak from regmap_register_patch x86/resctrl: Fix a NULL vs IS_ERR() static checker warning in rdt_cdp_peer_get() ARM: dts: Fix duovero smsc interrupt for suspend ASoC: fsl_ssi: Fix bclk calculation for mono channel regualtor: pfuze100: correct sw1a/sw2 on pfuze3000 efi/esrt: Fix reference count leak in esre_create_sysfs_entry. ASoC: q6asm: handle EOS correctly xfrm: Fix double ESP trailer insertion in IPsec crypto offload. cifs/smb3: Fix data inconsistent when zero file range cifs/smb3: Fix data inconsistent when punch hole IB/mad: Fix use after free when destroying MAD agent loop: replace kill_bdev with invalidate_bdev cdc-acm: Add DISABLE_ECHO quirk for Microchip/SMSC chip xhci: Return if xHCI doesn't support LPM xhci: Fix enumeration issue when setting max packet size for FS devices. xhci: Fix incorrect EP_STATE_MASK scsi: zfcp: Fix panic on ERP timeout for previously dismissed ERP action ALSA: usb-audio: Fix OOB access of mixer element list ALSA: usb-audio: add quirk for Samsung USBC Headset (AKG) ALSA: usb-audio: add quirk for Denon DCD-1500RE usb: typec: tcpci_rt1711h: avoid screaming irq causing boot hangs usb: host: ehci-exynos: Fix error check in exynos_ehci_probe() xhci: Poll for U0 after disabling USB2 LPM usb: host: xhci-mtk: avoid runtime suspend when removing hcd USB: ehci: reopen solution for Synopsys HC bug usb: add USB_QUIRK_DELAY_INIT for Logitech C922 usb: dwc2: Postponed gadget registration to the udc class driver USB: ohci-sm501: Add missed iounmap() in remove net: core: reduce recursion limit value net: Do not clear the sock TX queue in sk_set_socket() net: Fix the arp error in some cases sch_cake: don't call diffserv parsing code when it is not needed tcp_cubic: fix spurious HYSTART_DELAY exit upon drop in min RTT sch_cake: fix a few style nits sch_cake: don't try to reallocate or unshare skb unconditionally ip_tunnel: fix use-after-free in ip_tunnel_lookup() net: phy: Check harder for errors in get_phy_id() ip6_gre: fix use-after-free in ip6gre_tunnel_lookup() tg3: driver sleeps indefinitely when EEH errors exceed eeh_max_freezes tcp: grow window for OOO packets only for SACK flows tcp: don't ignore ECN CWR on pure ACK sctp: Don't advertise IPv4 addresses if ipv6only is set on the socket rxrpc: Fix notification call on completion of discarded calls rocker: fix incorrect error handling in dma_rings_init net: usb: ax88179_178a: fix packet alignment padding net: increment xmit_recursion level in dev_direct_xmit() net: use correct this_cpu primitive in dev_recursion_level net: place xmit recursion in softnet data net: fix memleak in register_netdevice() net: bridge: enfore alignment for ethernet address mld: fix memory leak in ipv6_mc_destroy_dev() ibmveth: Fix max MTU limit apparmor: don't try to replace stale label in ptraceme check ALSA: hda/realtek - Enable micmute LED on and HP system ALSA: hda/realtek: Enable mute LED on an HP system ALSA: hda/realtek - Enable the headset of ASUS B9450FA with ALC294 fix a braino in "sparc32: fix register window handling in genregs32_[gs]et()" i2c: tegra: Fix Maximum transfer size i2c: tegra: Add missing kerneldoc for some fields i2c: tegra: Cleanup kerneldoc comments EDAC/amd64: Add Family 17h Model 30h PCI IDs net: sched: export __netdev_watchdog_up() net: bcmgenet: remove HFB_CTRL access mtd: rawnand: marvell: Fix the condition on a return code fanotify: fix ignore mask logic for events on child and on dir block/bio-integrity: don't free 'buf' if bio_integrity_add_page() failed net: be more gentle about silly gso requests coming from user ANDROID: lib/vdso: do not update timespec if clock_getres() fails Revert "ANDROID: fscrypt: add key removal notifier chain" ANDROID: update the ABI xml and qcom whitelist ANDROID: fs: export vfs_{read|write} ANDROID: GKI: update abi definitions now that sdcardfs is gone Revert "ANDROID: sdcardfs: Enable modular sdcardfs" Revert "ANDROID: vfs: Add setattr2 for filesystems with per mount permissions" Revert "ANDROID: vfs: fix export symbol type" Revert "ANDROID: vfs: Add permission2 for filesystems with per mount permissions" Revert "ANDROID: vfs: fix export symbol types" Revert "ANDROID: vfs: add d_canonical_path for stacked filesystem support" Revert "ANDROID: fs: Restore vfs_path_lookup() export" ANDROID: sdcardfs: remove sdcardfs from system Revert "ALSA: usb-audio: Improve frames size computation" ANDROID: Makefile: append BUILD_NUMBER to version string when defined ANDROID: GKI: Update ABI for incremental fs ANDROID: GKI: Update cuttlefish whitelist ANDROID: GKI: Disable INCREMENTAL_FS on x86 too ANDROID: cpufreq: schedutil: drop cache when update skipped due to rate limit Linux 4.19.130 KVM: x86/mmu: Set mmio_value to '0' if reserved #PF can't be generated kvm: x86: Fix reserved bits related calculation errors caused by MKTME kvm: x86: Move kvm_set_mmio_spte_mask() from x86.c to mmu.c md: add feature flag MD_FEATURE_RAID0_LAYOUT Revert "dpaa_eth: fix usage as DSA master, try 3" net: core: device_rename: Use rwsem instead of a seqcount sched/rt, net: Use CONFIG_PREEMPTION.patch kretprobe: Prevent triggering kretprobe from within kprobe_flush_task net: octeon: mgmt: Repair filling of RX ring e1000e: Do not wake up the system via WOL if device wakeup is disabled kprobes: Fix to protect kick_kprobe_optimizer() by kprobe_mutex crypto: algboss - don't wait during notifier callback crypto: algif_skcipher - Cap recv SG list at ctx->used drm/i915/icl+: Fix hotplug interrupt disabling after storm detection drm/i915: Whitelist context-local timestamp in the gen9 cmdparser s390: fix syscall_get_error for compat processes mtd: rawnand: tmio: Fix the probe error path mtd: rawnand: mtk: Fix the probe error path mtd: rawnand: plat_nand: Fix the probe error path mtd: rawnand: socrates: Fix the probe error path mtd: rawnand: oxnas: Fix the probe error path mtd: rawnand: oxnas: Add of_node_put() mtd: rawnand: orion: Fix the probe error path mtd: rawnand: xway: Fix the probe error path mtd: rawnand: sharpsl: Fix the probe error path mtd: rawnand: diskonchip: Fix the probe error path mtd: rawnand: Pass a nand_chip object to nand_release() mtd: rawnand: Pass a nand_chip object to nand_scan() block: nr_sects_write(): Disable preemption on seqcount write x86/boot/compressed: Relax sed symbol type regex for LLVM ld.lld drm/dp_mst: Increase ACT retry timeout to 3s ext4: avoid race conditions when remounting with options that change dax ext4: fix partial cluster initialization when splitting extent selinux: fix double free drm/amdgpu: Replace invalid device ID with a valid device ID drm/qxl: Use correct notify port address when creating cursor ring drm/dp_mst: Reformat drm_dp_check_act_status() a bit drm: encoder_slave: fix refcouting error for modules libata: Use per port sync for detach arm64: hw_breakpoint: Don't invoke overflow handler on uaccess watchpoints block: Fix use-after-free in blkdev_get() afs: afs_write_end() should change i_size under the right lock afs: Fix non-setting of mtime when writing into mmap bcache: fix potential deadlock problem in btree_gc_coalesce ext4: stop overwrite the errcode in ext4_setup_super perf report: Fix NULL pointer dereference in hists__fprintf_nr_sample_events() usb/ehci-platform: Set PM runtime as active on resume usb: host: ehci-platform: add a quirk to avoid stuck usb/xhci-plat: Set PM runtime as active on resume xdp: Fix xsk_generic_xmit errno net/filter: Permit reading NET in load_bytes_relative when MAC not set x86/idt: Keep spurious entries unset in system_vectors scsi: acornscsi: Fix an error handling path in acornscsi_probe() drm/sun4i: hdmi ddc clk: Fix size of m divider ASoC: rt5645: Add platform-data for Asus T101HA ASoC: Intel: bytcr_rt5640: Add quirk for Toshiba Encore WT10-A tablet ASoC: core: only convert non DPCM link to DPCM link afs: Fix memory leak in afs_put_sysnames() selftests/net: in timestamping, strncpy needs to preserve null byte drivers/perf: hisi: Fix wrong value for all counters enable NTB: ntb_test: Fix bug when counting remote files NTB: perf: Fix race condition when run with ntb_test NTB: perf: Fix support for hardware that doesn't have port numbers NTB: perf: Don't require one more memory window than number of peers NTB: Revert the change to use the NTB device dev for DMA allocations NTB: ntb_tool: reading the link file should not end in a NULL byte ntb_tool: pass correct struct device to dma_alloc_coherent ntb_perf: pass correct struct device to dma_alloc_coherent gfs2: fix use-after-free on transaction ail lists blktrace: fix endianness for blk_log_remap() blktrace: fix endianness in get_pdu_int() blktrace: use errno instead of bi_status selftests/vm/pkeys: fix alloc_random_pkey() to make it really random elfnote: mark all .note sections SHF_ALLOC include/linux/bitops.h: avoid clang shift-count-overflow warnings lib/zlib: remove outdated and incorrect pre-increment optimization geneve: change from tx_error to tx_dropped on missing metadata crypto: omap-sham - add proper load balancing support for multicore pinctrl: freescale: imx: Fix an error handling path in 'imx_pinctrl_probe()' pinctrl: imxl: Fix an error handling path in 'imx1_pinctrl_core_probe()' scsi: ufs: Don't update urgent bkops level when toggling auto bkops scsi: iscsi: Fix reference count leak in iscsi_boot_create_kobj gfs2: Allow lock_nolock mount to specify jid=X openrisc: Fix issue with argument clobbering for clone/fork rxrpc: Adjust /proc/net/rxrpc/calls to display call->debug_id not user_ID vfio/mdev: Fix reference count leak in add_mdev_supported_type ASoC: fsl_asrc_dma: Fix dma_chan leak when config DMA channel failed extcon: adc-jack: Fix an error handling path in 'adc_jack_probe()' powerpc/4xx: Don't unmap NULL mbase of: Fix a refcounting bug in __of_attach_node_sysfs() NFSv4.1 fix rpc_call_done assignment for BIND_CONN_TO_SESSION net: sunrpc: Fix off-by-one issues in 'rpc_ntop6' clk: sprd: return correct type of value for _sprd_pll_recalc_rate KVM: PPC: Book3S HV: Ignore kmemleak false positives scsi: ufs-qcom: Fix scheduling while atomic issue clk: bcm2835: Fix return type of bcm2835_register_gate scsi: target: tcmu: Fix a use after free in tcmu_check_expired_queue_cmd() ASoC: fix incomplete error-handling in img_i2s_in_probe. x86/apic: Make TSC deadline timer detection message visible RDMA/iw_cxgb4: cleanup device debugfs entries on ULD remove usb: gadget: Fix issue with config_ep_by_speed function usb: gadget: fix potential double-free in m66592_probe. usb: gadget: lpc32xx_udc: don't dereference ep pointer before null check USB: gadget: udc: s3c2410_udc: Remove pointless NULL check in s3c2410_udc_nuke usb: dwc2: gadget: move gadget resume after the core is in L0 state watchdog: da9062: No need to ping manually before setting timeout IB/cma: Fix ports memory leak in cma_configfs PCI: dwc: Fix inner MSI IRQ domain registration PCI/PTM: Inherit Switch Downstream Port PTM settings from Upstream Port dm zoned: return NULL if dmz_get_zone_for_reclaim() fails to find a zone powerpc/64s/pgtable: fix an undefined behaviour arm64: tegra: Fix ethernet phy-mode for Jetson Xavier scsi: target: tcmu: Userspace must not complete queued commands clk: samsung: exynos5433: Add IGNORE_UNUSED flag to sclk_i2s1 fpga: dfl: afu: Corrected error handling levels tty: n_gsm: Fix bogus i++ in gsm_data_kick USB: host: ehci-mxc: Add error handling in ehci_mxc_drv_probe() ASoC: Intel: bytcr_rt5640: Add quirk for Toshiba Encore WT8-A tablet drm/msm/mdp5: Fix mdp5_init error path for failed mdp5_kms allocation usb/ohci-platform: Fix a warning when hibernating vfio-pci: Mask cap zero powerpc/ps3: Fix kexec shutdown hang powerpc/pseries/ras: Fix FWNMI_VALID off by one ipmi: use vzalloc instead of kmalloc for user creation HID: Add quirks for Trust Panora Graphic Tablet tty: n_gsm: Fix waking up upper tty layer when room available tty: n_gsm: Fix SOF skipping powerpc/64: Don't initialise init_task->thread.regs PCI: Fix pci_register_host_bridge() device_register() error handling clk: ti: composite: fix memory leak dlm: remove BUG() before panic() pinctrl: rockchip: fix memleak in rockchip_dt_node_to_map scsi: mpt3sas: Fix double free warnings power: supply: smb347-charger: IRQSTAT_D is volatile power: supply: lp8788: Fix an error handling path in 'lp8788_charger_probe()' scsi: qla2xxx: Fix warning after FC target reset PCI/ASPM: Allow ASPM on links to PCIe-to-PCI/PCI-X Bridges PCI: rcar: Fix incorrect programming of OB windows drivers: base: Fix NULL pointer exception in __platform_driver_probe() if a driver developer is foolish serial: amba-pl011: Make sure we initialize the port.lock spinlock i2c: pxa: fix i2c_pxa_scream_blue_murder() debug output PCI: v3-semi: Fix a memory leak in v3_pci_probe() error handling paths staging: sm750fb: add missing case while setting FB_VISUAL usb: dwc3: gadget: Properly handle failed kick_transfer thermal/drivers/ti-soc-thermal: Avoid dereferencing ERR_PTR slimbus: ngd: get drvdata from correct device tty: hvc: Fix data abort due to race in hvc_open s390/qdio: put thinint indicator after early error ALSA: usb-audio: Fix racy list management in output queue ALSA: usb-audio: Improve frames size computation staging: gasket: Fix mapping refcnt leak when register/store fails staging: gasket: Fix mapping refcnt leak when put attribute fails firmware: qcom_scm: fix bogous abuse of dma-direct internals pinctrl: rza1: Fix wrong array assignment of rza1l_swio_entries scsi: qedf: Fix crash when MFW calls for protocol stats while function is still probing gpio: dwapb: Append MODULE_ALIAS for platform driver ARM: dts: sun8i-h2-plus-bananapi-m2-zero: Fix led polarity scsi: qedi: Do not flush offload work if ARP not resolved arm64: dts: mt8173: fix unit name warnings staging: greybus: fix a missing-check bug in gb_lights_light_config() x86/purgatory: Disable various profiling and sanitizing options apparmor: fix nnp subset test for unconfined scsi: ibmvscsi: Don't send host info in adapter info MAD after LPM scsi: sr: Fix sr_probe() missing deallocate of device minor ASoC: meson: add missing free_irq() in error path apparmor: check/put label on apparmor_sk_clone_security() apparmor: fix introspection of of task mode for unconfined tasks mksysmap: Fix the mismatch of '.L' symbols in System.map NTB: Fix the default port and peer numbers for legacy drivers NTB: ntb_pingpong: Choose doorbells based on port number yam: fix possible memory leak in yam_init_driver pwm: img: Call pm_runtime_put() in pm_runtime_get_sync() failed case powerpc/crashkernel: Take "mem=" option into account PCI: vmd: Filter resource type bits from shadow register nfsd: Fix svc_xprt refcnt leak when setup callback client failed powerpc/perf/hv-24x7: Fix inconsistent output values incase multiple hv-24x7 events run clk: clk-flexgen: fix clock-critical handling scsi: lpfc: Fix lpfc_nodelist leak when processing unsolicited event mfd: wm8994: Fix driver operation if loaded as modules gpio: dwapb: Call acpi_gpiochip_free_interrupts() on GPIO chip de-registration m68k/PCI: Fix a memory leak in an error handling path RDMA/mlx5: Add init2init as a modify command vfio/pci: fix memory leaks in alloc_perm_bits() ps3disk: use the default segment boundary PCI: aardvark: Don't blindly enable ASPM L0s and don't write to read-only register dm mpath: switch paths in dm_blk_ioctl() code path serial: 8250: Fix max baud limit in generic 8250 port usblp: poison URBs upon disconnect clk: samsung: Mark top ISP and CAM clocks on Exynos542x as critical i2c: pxa: clear all master action bits in i2c_pxa_stop_message() f2fs: report delalloc reserve as non-free in statfs for project quota iio: bmp280: fix compensation of humidity scsi: qla2xxx: Fix issue with adapter's stopping state PCI: Allow pci_resize_resource() for devices on root bus ALSA: isa/wavefront: prevent out of bounds write in ioctl ALSA: hda/realtek - Introduce polarity for micmute LED GPIO scsi: qedi: Check for buffer overflow in qedi_set_path() ARM: integrator: Add some Kconfig selections ASoC: davinci-mcasp: Fix dma_chan refcnt leak when getting dma type backlight: lp855x: Ensure regulators are disabled on probe failure clk: qcom: msm8916: Fix the address location of pll->config_reg remoteproc: Fix IDR initialisation in rproc_alloc() iio: pressure: bmp280: Tolerate IRQ before registering i2c: piix4: Detect secondary SMBus controller on AMD AM4 chipsets ASoC: tegra: tegra_wm8903: Support nvidia, headset property clk: sunxi: Fix incorrect usage of round_down() power: supply: bq24257_charger: Replace depends on REGMAP_I2C with select ANDROID: ext4: Optimize match for casefolded encrypted dirs ANDROID: ext4: Handle casefolding with encryption ANDROID: extcon: Remove redundant EXPORT_SYMBOL_GPL ANDROID: update the ABI xml representation ANDROID: GKI: cfg80211: add ABI changes for CONFIG_NL80211_TESTMODE ANDROID: gki_defconfig: x86: Enable KERNEL_LZ4 ANDROID: GKI: scripts: Makefile: update the lz4 command FROMLIST: f2fs: fix use-after-free when accessing bio->bi_crypt_context UPSTREAM: fdt: Update CRC check for rng-seed ANDROID: GKI: Update ABI for incremental fs ANDROID: GKI: Update whitelist and defconfig for incfs ANDROID: Use depmod from the hermetic toolchain Linux 4.19.129 perf symbols: Fix debuginfo search for Ubuntu perf probe: Check address correctness by map instead of _etext perf probe: Fix to check blacklist address correctly perf probe: Do not show the skipped events w1: omap-hdq: cleanup to add missing newline for some dev_dbg mtd: rawnand: pasemi: Fix the probe error path mtd: rawnand: brcmnand: fix hamming oob layout sunrpc: clean up properly in gss_mech_unregister() sunrpc: svcauth_gss_register_pseudoflavor must reject duplicate registrations. kbuild: force to build vmlinux if CONFIG_MODVERSION=y powerpc/64s: Save FSCR to init_task.thread.fscr after feature init powerpc/64s: Don't let DT CPU features set FSCR_DSCR drivers/macintosh: Fix memleak in windfarm_pm112 driver ARM: dts: s5pv210: Set keep-power-in-suspend for SDHCI1 on Aries ARM: dts: at91: sama5d2_ptc_ek: fix vbus pin ARM: dts: exynos: Fix GPIO polarity for thr GalaxyS3 CM36651 sensor's bus ARM: tegra: Correct PL310 Auxiliary Control Register initialization kernel/cpu_pm: Fix uninitted local in cpu_pm alpha: fix memory barriers so that they conform to the specification dm crypt: avoid truncating the logical block size sparc64: fix misuses of access_process_vm() in genregs32_[sg]et() sparc32: fix register window handling in genregs32_[gs]et() gnss: sirf: fix error return code in sirf_probe() pinctrl: samsung: Save/restore eint_mask over suspend for EINT_TYPE GPIOs pinctrl: samsung: Correct setting of eint wakeup mask on s5pv210 power: vexpress: add suppress_bind_attrs to true igb: Report speed and duplex as unknown when device is runtime suspended media: ov5640: fix use of destroyed mutex b43_legacy: Fix connection problem with WPA3 b43: Fix connection problem with WPA3 b43legacy: Fix case where channel status is corrupted Bluetooth: hci_bcm: fix freeing not-requested IRQ media: go7007: fix a miss of snd_card_free carl9170: remove P2P_GO support e1000e: Relax condition to trigger reset for ME workaround e1000e: Disable TSO for buffer overrun workaround PCI: Program MPS for RCiEP devices ima: Call ima_calc_boot_aggregate() in ima_eventdigest_init() btrfs: fix wrong file range cleanup after an error filling dealloc range btrfs: fix error handling when submitting direct I/O bio PCI: Generalize multi-function power dependency device links PCI: Unify ACS quirk desired vs provided checking PCI: Make ACS quirk implementations more uniform serial: 8250_pci: Move Pericom IDs to pci_ids.h PCI: Add Loongson vendor ID x86/amd_nb: Add Family 19h PCI IDs PCI: vmd: Add device id for VMD device 8086:9A0B PCI: Add Amazon's Annapurna Labs vendor ID PCI: Add Genesys Logic, Inc. Vendor ID ALSA: lx6464es - add support for LX6464ESe pci express variant x86/amd_nb: Add PCI device IDs for family 17h, model 70h PCI: mediatek: Add controller support for MT7629 PCI: Enable NVIDIA HDA controllers PCI: Add NVIDIA GPU multi-function power dependencies PCI: Add Synopsys endpoint EDDA Device ID misc: pci_endpoint_test: Add support to test PCI EP in AM654x misc: pci_endpoint_test: Add the layerscape EP device support PCI: Move Rohm Vendor ID to generic list PCI: Move Synopsys HAPS platform device IDs PCI: add USR vendor id and use it in r8169 and w6692 driver x86/amd_nb: Add PCI device IDs for family 17h, model 30h hwmon/k10temp, x86/amd_nb: Consolidate shared device IDs pci:ipmi: Move IPMI PCI class id defines to pci_ids.h PCI: Remove unused NFP32xx IDs PCI: Add ACS quirk for Intel Root Complex Integrated Endpoints PCI: Add ACS quirk for iProc PAXB PCI: Avoid FLR for AMD Starship USB 3.0 PCI: Avoid FLR for AMD Matisse HD Audio & USB 3.0 PCI: Avoid Pericom USB controller OHCI/EHCI PME# defect ext4: fix race between ext4_sync_parent() and rename() ext4: fix error pointer dereference ext4: fix EXT_MAX_EXTENT/INDEX to check for zeroed eh_max evm: Fix possible memory leak in evm_calc_hmac_or_hash() ima: Directly assign the ima_default_policy pointer to ima_rules ima: Fix ima digest hash table key calculation mm: initialize deferred pages with interrupts enabled mm: thp: make the THP mapcount atomic against __split_huge_pmd_locked() btrfs: send: emit file capabilities after chown btrfs: include non-missing as a qualifier for the latest_bdev string.h: fix incompatibility between FORTIFY_SOURCE and KASAN platform/x86: intel-vbtn: Only blacklist SW_TABLET_MODE on the 9 / "Laptop" chasis-type platform/x86: intel-hid: Add a quirk to support HP Spectre X2 (2015) platform/x86: hp-wmi: Convert simple_strtoul() to kstrtou32() cpuidle: Fix three reference count leaks spi: dw: Return any value retrieved from the dma_transfer callback mmc: sdhci-esdhc-imx: fix the mask for tuning start point ixgbe: fix signed-integer-overflow warning mmc: via-sdmmc: Respect the cmd->busy_timeout from the mmc core staging: greybus: sdio: Respect the cmd->busy_timeout from the mmc core mmc: sdhci-msm: Set SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 quirk bcache: fix refcount underflow in bcache_device_free() MIPS: Fix IRQ tracing when call handle_fpe() and handle_msa_fpe() PCI: Don't disable decoding when mmio_always_on is set macvlan: Skip loopback packets in RX handler btrfs: qgroup: mark qgroup inconsistent if we're inherting snapshot to a new qgroup m68k: mac: Don't call via_flush_cache() on Mac IIfx x86/mm: Stop printing BRK addresses crypto: stm32/crc32 - fix multi-instance crypto: stm32/crc32 - fix run-time self test issue. crypto: stm32/crc32 - fix ext4 chksum BUG_ON() mips: Add udelay lpj numbers adjustment mips: MAAR: Use more precise address mask x86/boot: Correct relocation destination on old linkers mwifiex: Fix memory corruption in dump_station rtlwifi: Fix a double free in _rtl_usb_tx_urb_setup() net/mlx5e: IPoIB, Drop multicast packets that this interface sent veth: Adjust hard_start offset on redirect XDP frames md: don't flush workqueue unconditionally in md_open mt76: avoid rx reorder buffer overflow net: qed*: Reduce RX and TX default ring count when running inside kdump kernel wcn36xx: Fix error handling path in 'wcn36xx_probe()' ath10k: Remove msdu from idr when management pkt send fails nvme: refine the Qemu Identify CNS quirk platform/x86: intel-vbtn: Also handle tablet-mode switch on "Detachable" and "Portable" chassis-types platform/x86: intel-vbtn: Do not advertise switches to userspace if they are not there platform/x86: intel-vbtn: Split keymap into buttons and switches parts platform/x86: intel-vbtn: Use acpi_evaluate_integer() xfs: fix duplicate verification from xfs_qm_dqflush() xfs: reset buffer write failure state on successful completion kgdb: Fix spurious true from in_dbg_master() mips: cm: Fix an invalid error code of INTVN_*_ERR MIPS: Truncate link address into 32bit for 32bit kernel Crypto/chcr: fix for ccm(aes) failed test xfs: clean up the error handling in xfs_swap_extents powerpc/spufs: fix copy_to_user while atomic net: allwinner: Fix use correct return type for ndo_start_xmit() media: cec: silence shift wrapping warning in __cec_s_log_addrs() net: lpc-enet: fix error return code in lpc_mii_init() drivers/perf: hisi: Fix typo in events attribute array sched/core: Fix illegal RCU from offline CPUs exit: Move preemption fixup up, move blocking operations down lib/mpi: Fix 64-bit MIPS build with Clang net: bcmgenet: set Rx mode before starting netif selftests/bpf: Fix memory leak in extract_build_id() netfilter: nft_nat: return EOPNOTSUPP if type or flags are not supported audit: fix a net reference leak in audit_list_rules_send() Bluetooth: btbcm: Add 2 missing models to subver tables MIPS: Make sparse_init() using top-down allocation media: platform: fcp: Set appropriate DMA parameters media: dvb: return -EREMOTEIO on i2c transfer failure. audit: fix a net reference leak in audit_send_reply() dt-bindings: display: mediatek: control dpi pins mode to avoid leakage e1000: Distribute switch variables for initialization tools api fs: Make xxx__mountpoint() more scalable brcmfmac: fix wrong location to get firmware feature staging: android: ion: use vmap instead of vm_map_ram net: vmxnet3: fix possible buffer overflow caused by bad DMA value in vmxnet3_get_rss() x86/kvm/hyper-v: Explicitly align hcall param for kvm_hyperv_exit spi: dw: Fix Rx-only DMA transfers mmc: meson-mx-sdio: trigger a soft reset after a timeout or CRC error batman-adv: Revert "disable ethtool link speed detection when auto negotiation off" ARM: 8978/1: mm: make act_mm() respect THREAD_SIZE btrfs: do not ignore error from btrfs_next_leaf() when inserting checksums clocksource: dw_apb_timer_of: Fix missing clockevent timers clocksource: dw_apb_timer: Make CPU-affiliation being optional spi: dw: Enable interrupts in accordance with DMA xfer mode kgdb: Prevent infinite recursive entries to the debugger kgdb: Disable WARN_CONSOLE_UNLOCKED for all kgdb Bluetooth: Add SCO fallback for invalid LMP parameters error MIPS: Loongson: Build ATI Radeon GPU driver as module ixgbe: Fix XDP redirect on archs with PAGE_SIZE above 4K arm64: insn: Fix two bugs in encoding 32-bit logical immediates spi: dw: Zero DMA Tx and Rx configurations on stack arm64: cacheflush: Fix KGDB trap detection efi/libstub/x86: Work around LLVM ELF quirk build regression net: ena: fix error returning in ena_com_get_hash_function() net: atlantic: make hw_get_regs optional spi: pxa2xx: Apply CS clk quirk to BXT objtool: Ignore empty alternatives media: si2157: Better check for running tuner in init crypto: ccp -- don't "select" CONFIG_DMADEVICES drm: bridge: adv7511: Extend list of audio sample rates ACPI: GED: use correct trigger type field in _Exx / _Lxx handling KVM: arm64: Synchronize sysreg state on injecting an AArch32 exception xen/pvcalls-back: test for errors when calling backend_connect() mmc: sdio: Fix potential NULL pointer error in mmc_sdio_init_card() ARM: dts: at91: sama5d2_ptc_ek: fix sdmmc0 node description mmc: sdhci-msm: Clear tuning done flag while hs400 tuning agp/intel: Reinforce the barrier after GTT updates perf: Add cond_resched() to task_function_call() fat: don't allow to mount if the FAT length == 0 mm/slub: fix a memory leak in sysfs_slab_add() drm/vkms: Hold gem object while still in-use Smack: slab-out-of-bounds in vsscanf ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb ath9x: Fix stack-out-of-bounds Write in ath9k_hif_usb_rx_cb ath9k: Fix use-after-free Write in ath9k_htc_rx_msg ath9k: Fix use-after-free Read in ath9k_wmi_ctrl_rx scsi: megaraid_sas: TM command refire leads to controller firmware crash KVM: arm64: Make vcpu_cp1x() work on Big Endian hosts KVM: MIPS: Fix VPN2_MASK definition for variable cpu_vmbits KVM: MIPS: Define KVM_ENTRYHI_ASID to cpu_asid_mask(&boot_cpu_data) KVM: nVMX: Consult only the "basic" exit reason when routing nested exit KVM: nSVM: leave ASID aside in copy_vmcb_control_area KVM: nSVM: fix condition for filtering async PF video: fbdev: w100fb: Fix a potential double free. proc: Use new_inode not new_inode_pseudo ovl: initialize error in ovl_copy_xattr selftests/net: in rxtimestamp getopt_long needs terminating null entry crypto: virtio: Fix dest length calculation in __virtio_crypto_skcipher_do_req() crypto: virtio: Fix src/dst scatterlist calculation in __virtio_crypto_skcipher_do_req() crypto: virtio: Fix use-after-free in virtio_crypto_skcipher_finalize_req() spi: pxa2xx: Fix runtime PM ref imbalance on probe error spi: pxa2xx: Balance runtime PM enable/disable on error spi: bcm2835: Fix controller unregister order spi: pxa2xx: Fix controller unregister order spi: Fix controller unregister order spi: No need to assign dummy value in spi_unregister_controller() x86/speculation: PR_SPEC_FORCE_DISABLE enforcement for indirect branches. x86/speculation: Avoid force-disabling IBPB based on STIBP and enhanced IBRS. x86/speculation: Add support for STIBP always-on preferred mode x86/speculation: Change misspelled STIPB to STIBP KVM: x86: only do L1TF workaround on affected processors KVM: x86/mmu: Consolidate "is MMIO SPTE" code kvm: x86: Fix L1TF mitigation for shadow MMU KVM: x86: Fix APIC page invalidation race x86/{mce,mm}: Unmap the entire page if the whole page is affected and poisoned ALSA: pcm: disallow linking stream to itself crypto: cavium/nitrox - Fix 'nitrox_get_first_device()' when ndevlist is fully iterated PM: runtime: clk: Fix clk_pm_runtime_get() error path spi: bcm-qspi: when tx/rx buffer is NULL set to 0 spi: bcm2835aux: Fix controller unregister order spi: dw: Fix controller unregister order nilfs2: fix null pointer dereference at nilfs_segctor_do_construct() cgroup, blkcg: Prepare some symbols for module and !CONFIG_CGROUP usages ACPI: PM: Avoid using power resources if there are none for D0 ACPI: GED: add support for _Exx / _Lxx handler methods ACPI: CPPC: Fix reference count leak in acpi_cppc_processor_probe() ACPI: sysfs: Fix reference count leak in acpi_sysfs_add_hotplug_profile() ALSA: usb-audio: Add vendor, product and profile name for HP Thunderbolt Dock ALSA: usb-audio: Fix inconsistent card PM state after resume ALSA: hda/realtek - add a pintbl quirk for several Lenovo machines ALSA: es1688: Add the missed snd_card_free() efi/efivars: Add missing kobject_put() in sysfs entry creation error path x86/reboot/quirks: Add MacBook6,1 reboot quirk x86/speculation: Prevent rogue cross-process SSBD shutdown x86/PCI: Mark Intel C620 MROMs as having non-compliant BARs x86_64: Fix jiffies ODR violation btrfs: tree-checker: Check level for leaves and nodes aio: fix async fsync creds mm: add kvfree_sensitive() for freeing sensitive data objects perf probe: Accept the instance number of kretprobe event x86/cpu/amd: Make erratum #1054 a legacy erratum RDMA/uverbs: Make the event_queue fds return POLLERR when disassociated ath9k_htc: Silence undersized packet warnings powerpc/xive: Clear the page tables for the ESB IO mapping drivers/net/ibmvnic: Update VNIC protocol version reporting Input: synaptics - add a second working PNP_ID for Lenovo T470s sched/fair: Don't NUMA balance for kthreads ARM: 8977/1: ptrace: Fix mask for thumb breakpoint hook Input: mms114 - fix handling of mms345l crypto: talitos - fix ECB and CBC algs ivsize btrfs: Detect unbalanced tree with empty leaf before crashing btree operations btrfs: merge btrfs_find_device and find_device lib: Reduce user_access_begin() boundaries in strncpy_from_user() and strnlen_user() x86: uaccess: Inhibit speculation past access_ok() in user_access_begin() arch/openrisc: Fix issues with access_ok() Fix 'acccess_ok()' on alpha and SH make 'user_access_begin()' do 'access_ok()' selftests: bpf: fix use of undeclared RET_IF macro tun: correct header offsets in napi frags mode vxlan: Avoid infinite loop when suppressing NS messages with invalid options bridge: Avoid infinite loop when suppressing NS messages with invalid options net_failover: fixed rollback in net_failover_open() ipv6: fix IPV6_ADDRFORM operation logic writeback: Drop I_DIRTY_TIME_EXPIRE writeback: Fix sync livelock due to b_dirty_time processing writeback: Avoid skipping inode writeback writeback: Protect inode->i_io_list with inode->i_lock Revert "writeback: Avoid skipping inode writeback" ANDROID: gki_defconfig: increase vbus_draw to 500mA fscrypt: remove stale definition fs-verity: remove unnecessary extern keywords fs-verity: fix all kerneldoc warnings fscrypt: add support for IV_INO_LBLK_32 policies fscrypt: make test_dummy_encryption use v2 by default fscrypt: support test_dummy_encryption=v2 fscrypt: add fscrypt_add_test_dummy_key() linux/parser.h: add include guards fscrypt: remove unnecessary extern keywords fscrypt: name all function parameters fscrypt: fix all kerneldoc warnings ANDROID: Update the ABI ANDROID: GKI: power: power-supply: Add POWER_SUPPLY_PROP_CHARGER_STATUS property ANDROID: GKI: add dev to usb_gsi_request ANDROID: GKI: dma-buf: add dent_count to dma_buf ANDROID: Update the ABI xml and whitelist ANDROID: GKI: update whitelist ANDROID: extcon: Export symbol of `extcon_get_edev_name` ANDROID: kbuild: merge more sections with LTO UPSTREAM: timekeeping/vsyscall: Update VDSO data unconditionally ANDROID: GKI: Revert "genetlink: disallow subscribing to unknown mcast groups" BACKPORT: usb: musb: Add support for MediaTek musb controller UPSTREAM: usb: musb: Add musb_clearb/w() interface UPSTREAM: usb: musb: Add noirq type of dma create interface UPSTREAM: usb: musb: Add get/set toggle hooks UPSTREAM: dt-bindings: usb: musb: Add support for MediaTek musb controller FROMGIT: driver core: Remove unnecessary is_fwnode_dev variable in device_add() FROMGIT: driver core: Remove check in driver_deferred_probe_force_trigger() FROMGIT: of: platform: Batch fwnode parsing when adding all top level devices FROMGIT: BACKPORT: driver core: fw_devlink: Add support for batching fwnode parsing BACKPORT: driver core: Look for waiting consumers only for a fwnode's primary device BACKPORT: driver core: Add device links from fwnode only for the primary device Linux 4.19.128 Revert "net/mlx5: Annotate mutex destroy for root ns" uprobes: ensure that uprobe->offset and ->ref_ctr_offset are properly aligned x86/speculation: Add Ivy Bridge to affected list x86/speculation: Add SRBDS vulnerability and mitigation documentation x86/speculation: Add Special Register Buffer Data Sampling (SRBDS) mitigation x86/cpu: Add 'table' argument to cpu_matches() x86/cpu: Add a steppings field to struct x86_cpu_id nvmem: qfprom: remove incorrect write support CDC-ACM: heed quirk also in error handling staging: rtl8712: Fix IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK tty: hvc_console, fix crashes on parallel open/close vt: keyboard: avoid signed integer overflow in k_ascii usb: musb: Fix runtime PM imbalance on error usb: musb: start session in resume for host port iio: vcnl4000: Fix i2c swapped word reading. USB: serial: option: add Telit LE910C1-EUX compositions USB: serial: usb_wwan: do not resubmit rx urb on fatal errors USB: serial: qcserial: add DW5816e QDL support net: check untrusted gso_size at kernel entry vsock: fix timeout in vsock_accept() NFC: st21nfca: add missed kfree_skb() in an error path net: usb: qmi_wwan: add Telit LE910C1-EUX composition l2tp: do not use inet_hash()/inet_unhash() l2tp: add sk_family checks to l2tp_validate_socket devinet: fix memleak in inetdev_init() Revert "ANDROID: Remove default y on BRIDGE_IGMP_SNOOPING" ANDROID: Update the ABI xml and whitelist ANDROID: GKI: update whitelist ANDROID: arch: arm64: vdso: export the symbols for time() ANDROID: Incremental fs: Remove dependency on PKCS7_MESSAGE_PARSER ANDROID: dm-bow: Add block_size option f2fs: attach IO flags to the missing cases f2fs: add node_io_flag for bio flags likewise data_io_flag f2fs: remove unused parameter of f2fs_put_rpages_mapping() f2fs: handle readonly filesystem in f2fs_ioc_shutdown() f2fs: avoid utf8_strncasecmp() with unstable name f2fs: don't return vmalloc() memory from f2fs_kmalloc() ANDROID: GKI: set CONFIG_BLK_DEV_LOOP_MIN_COUNT to 16 ANDROID: Incremental fs: Cache successful hash calculations ANDROID: Incremental fs: Fix four error-path bugs Linux 4.19.127 net: smsc911x: Fix runtime PM imbalance on error net: ethernet: stmmac: Enable interface clocks on probe for IPQ806x net/ethernet/freescale: rework quiesce/activate for ucc_geth null_blk: return error for invalid zone size s390/mm: fix set_huge_pte_at() for empty ptes drm/edid: Add Oculus Rift S to non-desktop list net: bmac: Fix read of MAC address from ROM x86/mmiotrace: Use cpumask_available() for cpumask_var_t variables i2c: altera: Fix race between xfer_msg and isr thread evm: Fix RCU list related warnings ARC: [plat-eznps]: Restrict to CONFIG_ISA_ARCOMPACT ARC: Fix ICCM & DCCM runtime size checks s390/ftrace: save traced function caller spi: dw: use "smp_mb()" to avoid sending spi data error powerpc/powernv: Avoid re-registration of imc debugfs directory scsi: hisi_sas: Check sas_port before using it drm/i915: fix port checks for MST support on gen >= 11 airo: Fix read overflows sending packets net: dsa: mt7530: set CPU port to fallback mode scsi: ufs: Release clock if DMA map fails mmc: fix compilation of user API kernel/relay.c: handle alloc_percpu returning NULL in relay_open p54usb: add AirVasT USB stick device-id HID: i2c-hid: add Schneider SCL142ALM to descriptor override HID: sony: Fix for broken buttons on DS3 USB dongles mm: Fix mremap not considering huge pmd devmap libnvdimm: Fix endian conversion issues Revert "cgroup: Add memory barriers to plug cgroup_rstat_updated() race window" f2fs: fix retry logic in f2fs_write_cache_pages() ANDROID: Update ABI representation Linux 4.19.126 mm/vmalloc.c: don't dereference possible NULL pointer in __vunmap() netfilter: nf_conntrack_pptp: fix compilation warning with W=1 build bonding: Fix reference count leak in bond_sysfs_slave_add. crypto: chelsio/chtls: properly set tp->lsndtime qlcnic: fix missing release in qlcnic_83xx_interrupt_test. xsk: Add overflow check for u64 division, stored into u32 bnxt_en: Fix accumulation of bp->net_stats_prev. esp6: get the right proto for transport mode in esp6_gso_encap netfilter: nf_conntrack_pptp: prevent buffer overflows in debug code netfilter: nfnetlink_cthelper: unbreak userspace helper support netfilter: ipset: Fix subcounter update skip netfilter: nft_reject_bridge: enable reject with bridge vlan ip_vti: receive ipip packet by calling ip_tunnel_rcv vti4: eliminated some duplicate code. xfrm: fix error in comment xfrm: fix a NULL-ptr deref in xfrm_local_error xfrm: fix a warning in xfrm_policy_insert_list xfrm interface: fix oops when deleting a x-netns interface xfrm: call xfrm_output_gso when inner_protocol is set in xfrm_output xfrm: allow to accept packets with ipv6 NEXTHDR_HOP in xfrm_input copy_xstate_to_kernel(): don't leave parts of destination uninitialized x86/dma: Fix max PFN arithmetic overflow on 32 bit systems mac80211: mesh: fix discovery timer re-arming issue / crash RDMA/core: Fix double destruction of uobject mmc: core: Fix recursive locking issue in CQE recovery path parisc: Fix kernel panic in mem_init() iommu: Fix reference count leak in iommu_group_alloc. include/asm-generic/topology.h: guard cpumask_of_node() macro argument fs/binfmt_elf.c: allocate initialized memory in fill_thread_core_info() mm: remove VM_BUG_ON(PageSlab()) from page_mapcount() IB/ipoib: Fix double free of skb in case of multicast traffic in CM mode libceph: ignore pool overlay and cache logic on redirects ALSA: hda/realtek - Add new codec supported for ALC287 ALSA: usb-audio: Quirks for Gigabyte TRX40 Aorus Master onboard audio exec: Always set cap_ambient in cap_bprm_set_creds ALSA: usb-audio: mixer: volume quirk for ESS Technology Asus USB DAC ALSA: hda/realtek - Add a model for Thinkpad T570 without DAC workaround ALSA: hwdep: fix a left shifting 1 by 31 UB bug RDMA/pvrdma: Fix missing pci disable in pvrdma_pci_probe() mmc: block: Fix use-after-free issue for rpmb ARM: dts: bcm: HR2: Fix PPI interrupt types ARM: dts: bcm2835-rpi-zero-w: Fix led polarity ARM: dts/imx6q-bx50v3: Set display interface clock parents IB/qib: Call kobject_put() when kobject_init_and_add() fails gpio: exar: Fix bad handling for ida_simple_get error path ARM: uaccess: fix DACR mismatch with nested exceptions ARM: uaccess: integrate uaccess_save and uaccess_restore ARM: uaccess: consolidate uaccess asm to asm/uaccess-asm.h ARM: 8843/1: use unified assembler in headers ARM: 8970/1: decompressor: increase tag size Input: synaptics-rmi4 - fix error return code in rmi_driver_probe() Input: synaptics-rmi4 - really fix attn_data use-after-free Input: i8042 - add ThinkPad S230u to i8042 reset list Input: dlink-dir685-touchkeys - fix a typo in driver name Input: xpad - add custom init packet for Xbox One S controllers Input: evdev - call input_flush_device() on release(), not flush() Input: usbtouchscreen - add support for BonXeon TP samples: bpf: Fix build error cifs: Fix null pointer check in cifs_read riscv: stacktrace: Fix undefined reference to `walk_stackframe' IB/i40iw: Remove bogus call to netdev_master_upper_dev_get() net: freescale: select CONFIG_FIXED_PHY where needed usb: gadget: legacy: fix redundant initialization warnings usb: dwc3: pci: Enable extcon driver for Intel Merrifield cachefiles: Fix race between read_waiter and read_copier involving op->to_do gfs2: move privileged user check to gfs2_quota_lock_check net: microchip: encx24j600: add missed kthread_stop ALSA: usb-audio: add mapping for ASRock TRX40 Creator gpio: tegra: mask GPIO IRQs during IRQ shutdown ARM: dts: rockchip: fix pinctrl sub nodename for spi in rk322x.dtsi ARM: dts: rockchip: swap clock-names of gpu nodes arm64: dts: rockchip: swap interrupts interrupt-names rk3399 gpu node arm64: dts: rockchip: fix status for &gmac2phy in rk3328-evb.dts ARM: dts: rockchip: fix phy nodename for rk3228-evb mlxsw: spectrum: Fix use-after-free of split/unsplit/type_set in case reload fails net/mlx4_core: fix a memory leak bug. net: sun: fix missing release regions in cas_init_one(). net/mlx5: Annotate mutex destroy for root ns net/mlx5e: Update netdev txq on completions during closure sctp: Start shutdown on association restart if in SHUTDOWN-SENT state and socket is closed sctp: Don't add the shutdown timer if its already been added r8152: support additional Microsoft Surface Ethernet Adapter variant net sched: fix reporting the first-time use timestamp net: revert "net: get rid of an signed integer overflow in ip_idents_reserve()" net: qrtr: Fix passing invalid reference to qrtr_local_enqueue() net/mlx5: Add command entry handling completion net: ipip: fix wrong address family in init error path net: inet_csk: Fix so_reuseport bind-address cache in tb->fast* __netif_receive_skb_core: pass skb by reference net: dsa: mt7530: fix roaming from DSA user ports dpaa_eth: fix usage as DSA master, try 3 ax25: fix setsockopt(SO_BINDTODEVICE) ANDROID: modules: fix lockprove warning FROMGIT: USB: dummy-hcd: use configurable endpoint naming scheme UPSTREAM: usb: raw-gadget: fix null-ptr-deref when reenabling endpoints UPSTREAM: usb: raw-gadget: documentation updates UPSTREAM: usb: raw-gadget: support stalling/halting/wedging endpoints UPSTREAM: usb: raw-gadget: fix gadget endpoint selection UPSTREAM: usb: raw-gadget: improve uapi headers comments UPSTREAM: usb: raw-gadget: fix return value of ep read ioctls UPSTREAM: usb: raw-gadget: fix raw_event_queue_fetch locking UPSTREAM: usb: raw-gadget: Fix copy_to/from_user() checks f2fs: fix wrong discard space f2fs: compress: don't compress any datas after cp stop f2fs: remove unneeded return value of __insert_discard_tree() f2fs: fix wrong value of tracepoint parameter f2fs: protect new segment allocation in expand_inode_data f2fs: code cleanup by removing ifdef macro surrounding writeback: Avoid skipping inode writeback ANDROID: GKI: Update the ABI ANDROID: GKI: update whitelist ANDROID: GKI: support mm_event for FS/IO/UFS path ANDROID: net: bpf: permit redirect from ingress L3 to egress L2 devices at near max mtu FROMGIT: driver core: Update device link status correctly for SYNC_STATE_ONLY links UPSTREAM: driver core: Fix handling of SYNC_STATE_ONLY + STATELESS device links BACKPORT: driver core: Fix SYNC_STATE_ONLY device link implementation ANDROID: Bulk update the ABI xml and qcom whitelist Revert "ANDROID: Incremental fs: Avoid continually recalculating hashes" f2fs: avoid inifinite loop to wait for flushing node pages at cp_error f2fs: compress: fix zstd data corruption f2fs: add compressed/gc data read IO stat f2fs: fix potential use-after-free issue f2fs: compress: don't handle non-compressed data in workqueue f2fs: remove redundant assignment to variable err f2fs: refactor resize_fs to avoid meta updates in progress f2fs: use round_up to enhance calculation f2fs: introduce F2FS_IOC_RESERVE_COMPRESS_BLOCKS f2fs: Avoid double lock for cp_rwsem during checkpoint f2fs: report delalloc reserve as non-free in statfs for project quota f2fs: Fix wrong stub helper update_sit_info f2fs: compress: let lz4 compressor handle output buffer budget properly f2fs: remove blk_plugging in block_operations f2fs: introduce F2FS_IOC_RELEASE_COMPRESS_BLOCKS f2fs: shrink spinlock coverage f2fs: correctly fix the parent inode number during fsync() f2fs: introduce mempool for {,de}compress intermediate page allocation f2fs: introduce f2fs_bmap_compress() f2fs: support fiemap on compressed inode f2fs: support partial truncation on compressed inode f2fs: remove redundant compress inode check f2fs: use strcmp() in parse_options() f2fs: Use the correct style for SPDX License Identifier Conflicts: Documentation/devicetree/bindings Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt Documentation/devicetree/bindings/usb/dwc3.txt drivers/media/v4l2-core/v4l2-ctrls.c drivers/mmc/core/queue.c drivers/mmc/host/sdhci-msm.c drivers/scsi/ufs/ufs-qcom.c drivers/slimbus/qcom-ngd-ctrl.c drivers/usb/gadget/composite.c fs/crypto/keyring.c fs/f2fs/data.c include/linux/fs.h include/linux/usb/gadget.h include/uapi/linux/v4l2-controls.h kernel/sched/cpufreq_schedutil.c kernel/sched/fair.c kernel/time/tick-sched.c mm/vmalloc.c net/netlink/genetlink.c net/qrtr/qrtr.c sound/core/compress_offload.c sound/soc/soc-compress.c Fixed errors: drivers/scsi/ufs/ufshcd.c drivers/soc/qcom/rq_stats.c Change-Id: I06ea6a6c3f239045e2947f27af617aa6f523bfdb Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
3568 lines
83 KiB
C
3568 lines
83 KiB
C
/*
|
|
* TUN - Universal TUN/TAP device driver.
|
|
* Copyright (C) 1999-2002 Maxim Krasnyansky <maxk@qualcomm.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* $Id: tun.c,v 1.15 2002/03/01 02:44:24 maxk Exp $
|
|
*/
|
|
|
|
/*
|
|
* Changes:
|
|
*
|
|
* Mike Kershaw <dragorn@kismetwireless.net> 2005/08/14
|
|
* Add TUNSETLINK ioctl to set the link encapsulation
|
|
*
|
|
* Mark Smith <markzzzsmith@yahoo.com.au>
|
|
* Use eth_random_addr() for tap MAC address.
|
|
*
|
|
* Harald Roelle <harald.roelle@ifi.lmu.de> 2004/04/20
|
|
* Fixes in packet dropping, queue length setting and queue wakeup.
|
|
* Increased default tx queue length.
|
|
* Added ethtool API.
|
|
* Minor cleanups
|
|
*
|
|
* Daniel Podlejski <underley@underley.eu.org>
|
|
* Modifications for 2.3.99-pre5 kernel.
|
|
*/
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
#define DRV_NAME "tun"
|
|
#define DRV_VERSION "1.6"
|
|
#define DRV_DESCRIPTION "Universal TUN/TAP device driver"
|
|
#define DRV_COPYRIGHT "(C) 1999-2004 Max Krasnyansky <maxk@qualcomm.com>"
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/sched/signal.h>
|
|
#include <linux/major.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/poll.h>
|
|
#include <linux/fcntl.h>
|
|
#include <linux/init.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/miscdevice.h>
|
|
#include <linux/ethtool.h>
|
|
#include <linux/rtnetlink.h>
|
|
#include <linux/compat.h>
|
|
#include <linux/if.h>
|
|
#include <linux/if_arp.h>
|
|
#include <linux/if_ether.h>
|
|
#include <linux/if_tun.h>
|
|
#include <linux/if_vlan.h>
|
|
#include <linux/crc32.h>
|
|
#include <linux/nsproxy.h>
|
|
#include <linux/virtio_net.h>
|
|
#include <linux/rcupdate.h>
|
|
#include <net/net_namespace.h>
|
|
#include <net/netns/generic.h>
|
|
#include <net/rtnetlink.h>
|
|
#include <net/sock.h>
|
|
#include <net/xdp.h>
|
|
#include <linux/seq_file.h>
|
|
#include <linux/uio.h>
|
|
#include <linux/skb_array.h>
|
|
#include <linux/bpf.h>
|
|
#include <linux/bpf_trace.h>
|
|
#include <linux/mutex.h>
|
|
|
|
#include <linux/uaccess.h>
|
|
#include <linux/proc_fs.h>
|
|
|
|
static void tun_default_link_ksettings(struct net_device *dev,
|
|
struct ethtool_link_ksettings *cmd);
|
|
|
|
/* Uncomment to enable debugging */
|
|
/* #define TUN_DEBUG 1 */
|
|
|
|
#ifdef TUN_DEBUG
|
|
static int debug;
|
|
|
|
#define tun_debug(level, tun, fmt, args...) \
|
|
do { \
|
|
if (tun->debug) \
|
|
netdev_printk(level, tun->dev, fmt, ##args); \
|
|
} while (0)
|
|
#define DBG1(level, fmt, args...) \
|
|
do { \
|
|
if (debug == 2) \
|
|
printk(level fmt, ##args); \
|
|
} while (0)
|
|
#else
|
|
#define tun_debug(level, tun, fmt, args...) \
|
|
do { \
|
|
if (0) \
|
|
netdev_printk(level, tun->dev, fmt, ##args); \
|
|
} while (0)
|
|
#define DBG1(level, fmt, args...) \
|
|
do { \
|
|
if (0) \
|
|
printk(level fmt, ##args); \
|
|
} while (0)
|
|
#endif
|
|
|
|
#define TUN_HEADROOM 256
|
|
#define TUN_RX_PAD (NET_IP_ALIGN + NET_SKB_PAD)
|
|
|
|
/* TUN device flags */
|
|
|
|
/* IFF_ATTACH_QUEUE is never stored in device flags,
|
|
* overload it to mean fasync when stored there.
|
|
*/
|
|
#define TUN_FASYNC IFF_ATTACH_QUEUE
|
|
/* High bits in flags field are unused. */
|
|
#define TUN_VNET_LE 0x80000000
|
|
#define TUN_VNET_BE 0x40000000
|
|
|
|
#define TUN_FEATURES (IFF_NO_PI | IFF_ONE_QUEUE | IFF_VNET_HDR | \
|
|
IFF_MULTI_QUEUE | IFF_NAPI | IFF_NAPI_FRAGS)
|
|
|
|
#define GOODCOPY_LEN 128
|
|
|
|
#define FLT_EXACT_COUNT 8
|
|
struct tap_filter {
|
|
unsigned int count; /* Number of addrs. Zero means disabled */
|
|
u32 mask[2]; /* Mask of the hashed addrs */
|
|
unsigned char addr[FLT_EXACT_COUNT][ETH_ALEN];
|
|
};
|
|
|
|
/* MAX_TAP_QUEUES 256 is chosen to allow rx/tx queues to be equal
|
|
* to max number of VCPUs in guest. */
|
|
#define MAX_TAP_QUEUES 256
|
|
#define MAX_TAP_FLOWS 4096
|
|
|
|
#define TUN_FLOW_EXPIRE (3 * HZ)
|
|
|
|
struct tun_pcpu_stats {
|
|
u64 rx_packets;
|
|
u64 rx_bytes;
|
|
u64 tx_packets;
|
|
u64 tx_bytes;
|
|
struct u64_stats_sync syncp;
|
|
u32 rx_dropped;
|
|
u32 tx_dropped;
|
|
u32 rx_frame_errors;
|
|
};
|
|
|
|
/* A tun_file connects an open character device to a tuntap netdevice. It
|
|
* also contains all socket related structures (except sock_fprog and tap_filter)
|
|
* to serve as one transmit queue for tuntap device. The sock_fprog and
|
|
* tap_filter were kept in tun_struct since they were used for filtering for the
|
|
* netdevice not for a specific queue (at least I didn't see the requirement for
|
|
* this).
|
|
*
|
|
* RCU usage:
|
|
* The tun_file and tun_struct are loosely coupled, the pointer from one to the
|
|
* other can only be read while rcu_read_lock or rtnl_lock is held.
|
|
*/
|
|
struct tun_file {
|
|
struct sock sk;
|
|
struct socket socket;
|
|
struct socket_wq wq;
|
|
struct tun_struct __rcu *tun;
|
|
struct fasync_struct *fasync;
|
|
/* only used for fasnyc */
|
|
unsigned int flags;
|
|
union {
|
|
u16 queue_index;
|
|
unsigned int ifindex;
|
|
};
|
|
struct napi_struct napi;
|
|
bool napi_enabled;
|
|
bool napi_frags_enabled;
|
|
struct mutex napi_mutex; /* Protects access to the above napi */
|
|
struct list_head next;
|
|
struct tun_struct *detached;
|
|
struct ptr_ring tx_ring;
|
|
struct xdp_rxq_info xdp_rxq;
|
|
};
|
|
|
|
struct tun_flow_entry {
|
|
struct hlist_node hash_link;
|
|
struct rcu_head rcu;
|
|
struct tun_struct *tun;
|
|
|
|
u32 rxhash;
|
|
u32 rps_rxhash;
|
|
int queue_index;
|
|
unsigned long updated;
|
|
};
|
|
|
|
#define TUN_NUM_FLOW_ENTRIES 1024
|
|
#define TUN_MASK_FLOW_ENTRIES (TUN_NUM_FLOW_ENTRIES - 1)
|
|
|
|
struct tun_prog {
|
|
struct rcu_head rcu;
|
|
struct bpf_prog *prog;
|
|
};
|
|
|
|
/* Since the socket were moved to tun_file, to preserve the behavior of persist
|
|
* device, socket filter, sndbuf and vnet header size were restore when the
|
|
* file were attached to a persist device.
|
|
*/
|
|
struct tun_struct {
|
|
struct tun_file __rcu *tfiles[MAX_TAP_QUEUES];
|
|
unsigned int numqueues;
|
|
unsigned int flags;
|
|
kuid_t owner;
|
|
kgid_t group;
|
|
|
|
struct net_device *dev;
|
|
netdev_features_t set_features;
|
|
#define TUN_USER_FEATURES (NETIF_F_HW_CSUM|NETIF_F_TSO_ECN|NETIF_F_TSO| \
|
|
NETIF_F_TSO6)
|
|
|
|
int align;
|
|
int vnet_hdr_sz;
|
|
int sndbuf;
|
|
struct tap_filter txflt;
|
|
struct sock_fprog fprog;
|
|
/* protected by rtnl lock */
|
|
bool filter_attached;
|
|
#ifdef TUN_DEBUG
|
|
int debug;
|
|
#endif
|
|
spinlock_t lock;
|
|
struct hlist_head flows[TUN_NUM_FLOW_ENTRIES];
|
|
struct timer_list flow_gc_timer;
|
|
unsigned long ageing_time;
|
|
unsigned int numdisabled;
|
|
struct list_head disabled;
|
|
void *security;
|
|
u32 flow_count;
|
|
u32 rx_batched;
|
|
struct tun_pcpu_stats __percpu *pcpu_stats;
|
|
struct bpf_prog __rcu *xdp_prog;
|
|
struct tun_prog __rcu *steering_prog;
|
|
struct tun_prog __rcu *filter_prog;
|
|
struct ethtool_link_ksettings link_ksettings;
|
|
};
|
|
|
|
struct veth {
|
|
__be16 h_vlan_proto;
|
|
__be16 h_vlan_TCI;
|
|
};
|
|
|
|
bool tun_is_xdp_frame(void *ptr)
|
|
{
|
|
return (unsigned long)ptr & TUN_XDP_FLAG;
|
|
}
|
|
EXPORT_SYMBOL(tun_is_xdp_frame);
|
|
|
|
void *tun_xdp_to_ptr(void *ptr)
|
|
{
|
|
return (void *)((unsigned long)ptr | TUN_XDP_FLAG);
|
|
}
|
|
EXPORT_SYMBOL(tun_xdp_to_ptr);
|
|
|
|
void *tun_ptr_to_xdp(void *ptr)
|
|
{
|
|
return (void *)((unsigned long)ptr & ~TUN_XDP_FLAG);
|
|
}
|
|
EXPORT_SYMBOL(tun_ptr_to_xdp);
|
|
|
|
static int tun_napi_receive(struct napi_struct *napi, int budget)
|
|
{
|
|
struct tun_file *tfile = container_of(napi, struct tun_file, napi);
|
|
struct sk_buff_head *queue = &tfile->sk.sk_write_queue;
|
|
struct sk_buff_head process_queue;
|
|
struct sk_buff *skb;
|
|
int received = 0;
|
|
|
|
__skb_queue_head_init(&process_queue);
|
|
|
|
spin_lock(&queue->lock);
|
|
skb_queue_splice_tail_init(queue, &process_queue);
|
|
spin_unlock(&queue->lock);
|
|
|
|
while (received < budget && (skb = __skb_dequeue(&process_queue))) {
|
|
napi_gro_receive(napi, skb);
|
|
++received;
|
|
}
|
|
|
|
if (!skb_queue_empty(&process_queue)) {
|
|
spin_lock(&queue->lock);
|
|
skb_queue_splice(&process_queue, queue);
|
|
spin_unlock(&queue->lock);
|
|
}
|
|
|
|
return received;
|
|
}
|
|
|
|
static int tun_napi_poll(struct napi_struct *napi, int budget)
|
|
{
|
|
unsigned int received;
|
|
|
|
received = tun_napi_receive(napi, budget);
|
|
|
|
if (received < budget)
|
|
napi_complete_done(napi, received);
|
|
|
|
return received;
|
|
}
|
|
|
|
static void tun_napi_init(struct tun_struct *tun, struct tun_file *tfile,
|
|
bool napi_en, bool napi_frags)
|
|
{
|
|
tfile->napi_enabled = napi_en;
|
|
tfile->napi_frags_enabled = napi_en && napi_frags;
|
|
if (napi_en) {
|
|
netif_tx_napi_add(tun->dev, &tfile->napi, tun_napi_poll,
|
|
NAPI_POLL_WEIGHT);
|
|
napi_enable(&tfile->napi);
|
|
}
|
|
}
|
|
|
|
static void tun_napi_disable(struct tun_file *tfile)
|
|
{
|
|
if (tfile->napi_enabled)
|
|
napi_disable(&tfile->napi);
|
|
}
|
|
|
|
static void tun_napi_del(struct tun_file *tfile)
|
|
{
|
|
if (tfile->napi_enabled)
|
|
netif_napi_del(&tfile->napi);
|
|
}
|
|
|
|
static bool tun_napi_frags_enabled(const struct tun_file *tfile)
|
|
{
|
|
return tfile->napi_frags_enabled;
|
|
}
|
|
|
|
#ifdef CONFIG_TUN_VNET_CROSS_LE
|
|
static inline bool tun_legacy_is_little_endian(struct tun_struct *tun)
|
|
{
|
|
return tun->flags & TUN_VNET_BE ? false :
|
|
virtio_legacy_is_little_endian();
|
|
}
|
|
|
|
static long tun_get_vnet_be(struct tun_struct *tun, int __user *argp)
|
|
{
|
|
int be = !!(tun->flags & TUN_VNET_BE);
|
|
|
|
if (put_user(be, argp))
|
|
return -EFAULT;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static long tun_set_vnet_be(struct tun_struct *tun, int __user *argp)
|
|
{
|
|
int be;
|
|
|
|
if (get_user(be, argp))
|
|
return -EFAULT;
|
|
|
|
if (be)
|
|
tun->flags |= TUN_VNET_BE;
|
|
else
|
|
tun->flags &= ~TUN_VNET_BE;
|
|
|
|
return 0;
|
|
}
|
|
#else
|
|
static inline bool tun_legacy_is_little_endian(struct tun_struct *tun)
|
|
{
|
|
return virtio_legacy_is_little_endian();
|
|
}
|
|
|
|
static long tun_get_vnet_be(struct tun_struct *tun, int __user *argp)
|
|
{
|
|
return -EINVAL;
|
|
}
|
|
|
|
static long tun_set_vnet_be(struct tun_struct *tun, int __user *argp)
|
|
{
|
|
return -EINVAL;
|
|
}
|
|
#endif /* CONFIG_TUN_VNET_CROSS_LE */
|
|
|
|
static inline bool tun_is_little_endian(struct tun_struct *tun)
|
|
{
|
|
return tun->flags & TUN_VNET_LE ||
|
|
tun_legacy_is_little_endian(tun);
|
|
}
|
|
|
|
static inline u16 tun16_to_cpu(struct tun_struct *tun, __virtio16 val)
|
|
{
|
|
return __virtio16_to_cpu(tun_is_little_endian(tun), val);
|
|
}
|
|
|
|
static inline __virtio16 cpu_to_tun16(struct tun_struct *tun, u16 val)
|
|
{
|
|
return __cpu_to_virtio16(tun_is_little_endian(tun), val);
|
|
}
|
|
|
|
static inline u32 tun_hashfn(u32 rxhash)
|
|
{
|
|
return rxhash & TUN_MASK_FLOW_ENTRIES;
|
|
}
|
|
|
|
static struct tun_flow_entry *tun_flow_find(struct hlist_head *head, u32 rxhash)
|
|
{
|
|
struct tun_flow_entry *e;
|
|
|
|
hlist_for_each_entry_rcu(e, head, hash_link) {
|
|
if (e->rxhash == rxhash)
|
|
return e;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
static struct tun_flow_entry *tun_flow_create(struct tun_struct *tun,
|
|
struct hlist_head *head,
|
|
u32 rxhash, u16 queue_index)
|
|
{
|
|
struct tun_flow_entry *e = kmalloc(sizeof(*e), GFP_ATOMIC);
|
|
|
|
if (e) {
|
|
tun_debug(KERN_INFO, tun, "create flow: hash %u index %u\n",
|
|
rxhash, queue_index);
|
|
e->updated = jiffies;
|
|
e->rxhash = rxhash;
|
|
e->rps_rxhash = 0;
|
|
e->queue_index = queue_index;
|
|
e->tun = tun;
|
|
hlist_add_head_rcu(&e->hash_link, head);
|
|
++tun->flow_count;
|
|
}
|
|
return e;
|
|
}
|
|
|
|
static void tun_flow_delete(struct tun_struct *tun, struct tun_flow_entry *e)
|
|
{
|
|
tun_debug(KERN_INFO, tun, "delete flow: hash %u index %u\n",
|
|
e->rxhash, e->queue_index);
|
|
hlist_del_rcu(&e->hash_link);
|
|
kfree_rcu(e, rcu);
|
|
--tun->flow_count;
|
|
}
|
|
|
|
static void tun_flow_flush(struct tun_struct *tun)
|
|
{
|
|
int i;
|
|
|
|
spin_lock_bh(&tun->lock);
|
|
for (i = 0; i < TUN_NUM_FLOW_ENTRIES; i++) {
|
|
struct tun_flow_entry *e;
|
|
struct hlist_node *n;
|
|
|
|
hlist_for_each_entry_safe(e, n, &tun->flows[i], hash_link)
|
|
tun_flow_delete(tun, e);
|
|
}
|
|
spin_unlock_bh(&tun->lock);
|
|
}
|
|
|
|
static void tun_flow_delete_by_queue(struct tun_struct *tun, u16 queue_index)
|
|
{
|
|
int i;
|
|
|
|
spin_lock_bh(&tun->lock);
|
|
for (i = 0; i < TUN_NUM_FLOW_ENTRIES; i++) {
|
|
struct tun_flow_entry *e;
|
|
struct hlist_node *n;
|
|
|
|
hlist_for_each_entry_safe(e, n, &tun->flows[i], hash_link) {
|
|
if (e->queue_index == queue_index)
|
|
tun_flow_delete(tun, e);
|
|
}
|
|
}
|
|
spin_unlock_bh(&tun->lock);
|
|
}
|
|
|
|
static void tun_flow_cleanup(struct timer_list *t)
|
|
{
|
|
struct tun_struct *tun = from_timer(tun, t, flow_gc_timer);
|
|
unsigned long delay = tun->ageing_time;
|
|
unsigned long next_timer = jiffies + delay;
|
|
unsigned long count = 0;
|
|
int i;
|
|
|
|
tun_debug(KERN_INFO, tun, "tun_flow_cleanup\n");
|
|
|
|
spin_lock(&tun->lock);
|
|
for (i = 0; i < TUN_NUM_FLOW_ENTRIES; i++) {
|
|
struct tun_flow_entry *e;
|
|
struct hlist_node *n;
|
|
|
|
hlist_for_each_entry_safe(e, n, &tun->flows[i], hash_link) {
|
|
unsigned long this_timer;
|
|
|
|
this_timer = e->updated + delay;
|
|
if (time_before_eq(this_timer, jiffies)) {
|
|
tun_flow_delete(tun, e);
|
|
continue;
|
|
}
|
|
count++;
|
|
if (time_before(this_timer, next_timer))
|
|
next_timer = this_timer;
|
|
}
|
|
}
|
|
|
|
if (count)
|
|
mod_timer(&tun->flow_gc_timer, round_jiffies_up(next_timer));
|
|
spin_unlock(&tun->lock);
|
|
}
|
|
|
|
static void tun_flow_update(struct tun_struct *tun, u32 rxhash,
|
|
struct tun_file *tfile)
|
|
{
|
|
struct hlist_head *head;
|
|
struct tun_flow_entry *e;
|
|
unsigned long delay = tun->ageing_time;
|
|
u16 queue_index = tfile->queue_index;
|
|
|
|
if (!rxhash)
|
|
return;
|
|
else
|
|
head = &tun->flows[tun_hashfn(rxhash)];
|
|
|
|
rcu_read_lock();
|
|
|
|
e = tun_flow_find(head, rxhash);
|
|
if (likely(e)) {
|
|
/* TODO: keep queueing to old queue until it's empty? */
|
|
e->queue_index = queue_index;
|
|
e->updated = jiffies;
|
|
sock_rps_record_flow_hash(e->rps_rxhash);
|
|
} else {
|
|
spin_lock_bh(&tun->lock);
|
|
if (!tun_flow_find(head, rxhash) &&
|
|
tun->flow_count < MAX_TAP_FLOWS)
|
|
tun_flow_create(tun, head, rxhash, queue_index);
|
|
|
|
if (!timer_pending(&tun->flow_gc_timer))
|
|
mod_timer(&tun->flow_gc_timer,
|
|
round_jiffies_up(jiffies + delay));
|
|
spin_unlock_bh(&tun->lock);
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
}
|
|
|
|
/**
|
|
* Save the hash received in the stack receive path and update the
|
|
* flow_hash table accordingly.
|
|
*/
|
|
static inline void tun_flow_save_rps_rxhash(struct tun_flow_entry *e, u32 hash)
|
|
{
|
|
if (unlikely(e->rps_rxhash != hash))
|
|
e->rps_rxhash = hash;
|
|
}
|
|
|
|
/* We try to identify a flow through its rxhash first. The reason that
|
|
* we do not check rxq no. is because some cards(e.g 82599), chooses
|
|
* the rxq based on the txq where the last packet of the flow comes. As
|
|
* the userspace application move between processors, we may get a
|
|
* different rxq no. here. If we could not get rxhash, then we would
|
|
* hope the rxq no. may help here.
|
|
*/
|
|
static u16 tun_automq_select_queue(struct tun_struct *tun, struct sk_buff *skb)
|
|
{
|
|
struct tun_flow_entry *e;
|
|
u32 txq = 0;
|
|
u32 numqueues = 0;
|
|
|
|
numqueues = READ_ONCE(tun->numqueues);
|
|
|
|
txq = __skb_get_hash_symmetric(skb);
|
|
if (txq) {
|
|
e = tun_flow_find(&tun->flows[tun_hashfn(txq)], txq);
|
|
if (e) {
|
|
tun_flow_save_rps_rxhash(e, txq);
|
|
txq = e->queue_index;
|
|
} else
|
|
/* use multiply and shift instead of expensive divide */
|
|
txq = ((u64)txq * numqueues) >> 32;
|
|
} else if (likely(skb_rx_queue_recorded(skb))) {
|
|
txq = skb_get_rx_queue(skb);
|
|
while (unlikely(txq >= numqueues))
|
|
txq -= numqueues;
|
|
}
|
|
|
|
return txq;
|
|
}
|
|
|
|
static u16 tun_ebpf_select_queue(struct tun_struct *tun, struct sk_buff *skb)
|
|
{
|
|
struct tun_prog *prog;
|
|
u32 numqueues;
|
|
u16 ret = 0;
|
|
|
|
numqueues = READ_ONCE(tun->numqueues);
|
|
if (!numqueues)
|
|
return 0;
|
|
|
|
prog = rcu_dereference(tun->steering_prog);
|
|
if (prog)
|
|
ret = bpf_prog_run_clear_cb(prog->prog, skb);
|
|
|
|
return ret % numqueues;
|
|
}
|
|
|
|
static u16 tun_select_queue(struct net_device *dev, struct sk_buff *skb,
|
|
struct net_device *sb_dev,
|
|
select_queue_fallback_t fallback)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
u16 ret;
|
|
|
|
rcu_read_lock();
|
|
if (rcu_dereference(tun->steering_prog))
|
|
ret = tun_ebpf_select_queue(tun, skb);
|
|
else
|
|
ret = tun_automq_select_queue(tun, skb);
|
|
rcu_read_unlock();
|
|
|
|
return ret;
|
|
}
|
|
|
|
static inline bool tun_not_capable(struct tun_struct *tun)
|
|
{
|
|
const struct cred *cred = current_cred();
|
|
struct net *net = dev_net(tun->dev);
|
|
|
|
return ((uid_valid(tun->owner) && !uid_eq(cred->euid, tun->owner)) ||
|
|
(gid_valid(tun->group) && !in_egroup_p(tun->group))) &&
|
|
!ns_capable(net->user_ns, CAP_NET_ADMIN);
|
|
}
|
|
|
|
static void tun_set_real_num_queues(struct tun_struct *tun)
|
|
{
|
|
netif_set_real_num_tx_queues(tun->dev, tun->numqueues);
|
|
netif_set_real_num_rx_queues(tun->dev, tun->numqueues);
|
|
}
|
|
|
|
static void tun_disable_queue(struct tun_struct *tun, struct tun_file *tfile)
|
|
{
|
|
tfile->detached = tun;
|
|
list_add_tail(&tfile->next, &tun->disabled);
|
|
++tun->numdisabled;
|
|
}
|
|
|
|
static struct tun_struct *tun_enable_queue(struct tun_file *tfile)
|
|
{
|
|
struct tun_struct *tun = tfile->detached;
|
|
|
|
tfile->detached = NULL;
|
|
list_del_init(&tfile->next);
|
|
--tun->numdisabled;
|
|
return tun;
|
|
}
|
|
|
|
void tun_ptr_free(void *ptr)
|
|
{
|
|
if (!ptr)
|
|
return;
|
|
if (tun_is_xdp_frame(ptr)) {
|
|
struct xdp_frame *xdpf = tun_ptr_to_xdp(ptr);
|
|
|
|
xdp_return_frame(xdpf);
|
|
} else {
|
|
__skb_array_destroy_skb(ptr);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(tun_ptr_free);
|
|
|
|
static void tun_queue_purge(struct tun_file *tfile)
|
|
{
|
|
void *ptr;
|
|
|
|
while ((ptr = ptr_ring_consume(&tfile->tx_ring)) != NULL)
|
|
tun_ptr_free(ptr);
|
|
|
|
skb_queue_purge(&tfile->sk.sk_write_queue);
|
|
skb_queue_purge(&tfile->sk.sk_error_queue);
|
|
}
|
|
|
|
static void __tun_detach(struct tun_file *tfile, bool clean)
|
|
{
|
|
struct tun_file *ntfile;
|
|
struct tun_struct *tun;
|
|
|
|
tun = rtnl_dereference(tfile->tun);
|
|
|
|
if (tun && clean) {
|
|
tun_napi_disable(tfile);
|
|
tun_napi_del(tfile);
|
|
}
|
|
|
|
if (tun && !tfile->detached) {
|
|
u16 index = tfile->queue_index;
|
|
BUG_ON(index >= tun->numqueues);
|
|
|
|
rcu_assign_pointer(tun->tfiles[index],
|
|
tun->tfiles[tun->numqueues - 1]);
|
|
ntfile = rtnl_dereference(tun->tfiles[index]);
|
|
ntfile->queue_index = index;
|
|
rcu_assign_pointer(tun->tfiles[tun->numqueues - 1],
|
|
NULL);
|
|
|
|
--tun->numqueues;
|
|
if (clean) {
|
|
RCU_INIT_POINTER(tfile->tun, NULL);
|
|
sock_put(&tfile->sk);
|
|
} else
|
|
tun_disable_queue(tun, tfile);
|
|
|
|
synchronize_net();
|
|
tun_flow_delete_by_queue(tun, tun->numqueues + 1);
|
|
/* Drop read queue */
|
|
tun_queue_purge(tfile);
|
|
tun_set_real_num_queues(tun);
|
|
} else if (tfile->detached && clean) {
|
|
tun = tun_enable_queue(tfile);
|
|
sock_put(&tfile->sk);
|
|
}
|
|
|
|
if (clean) {
|
|
if (tun && tun->numqueues == 0 && tun->numdisabled == 0) {
|
|
netif_carrier_off(tun->dev);
|
|
|
|
if (!(tun->flags & IFF_PERSIST) &&
|
|
tun->dev->reg_state == NETREG_REGISTERED)
|
|
unregister_netdevice(tun->dev);
|
|
}
|
|
if (tun)
|
|
xdp_rxq_info_unreg(&tfile->xdp_rxq);
|
|
ptr_ring_cleanup(&tfile->tx_ring, tun_ptr_free);
|
|
sock_put(&tfile->sk);
|
|
}
|
|
}
|
|
|
|
static void tun_detach(struct tun_file *tfile, bool clean)
|
|
{
|
|
struct tun_struct *tun;
|
|
struct net_device *dev;
|
|
|
|
rtnl_lock();
|
|
tun = rtnl_dereference(tfile->tun);
|
|
dev = tun ? tun->dev : NULL;
|
|
__tun_detach(tfile, clean);
|
|
if (dev)
|
|
netdev_state_change(dev);
|
|
rtnl_unlock();
|
|
}
|
|
|
|
static void tun_detach_all(struct net_device *dev)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
struct tun_file *tfile, *tmp;
|
|
int i, n = tun->numqueues;
|
|
|
|
for (i = 0; i < n; i++) {
|
|
tfile = rtnl_dereference(tun->tfiles[i]);
|
|
BUG_ON(!tfile);
|
|
tun_napi_disable(tfile);
|
|
tfile->socket.sk->sk_shutdown = RCV_SHUTDOWN;
|
|
tfile->socket.sk->sk_data_ready(tfile->socket.sk);
|
|
RCU_INIT_POINTER(tfile->tun, NULL);
|
|
--tun->numqueues;
|
|
}
|
|
list_for_each_entry(tfile, &tun->disabled, next) {
|
|
tfile->socket.sk->sk_shutdown = RCV_SHUTDOWN;
|
|
tfile->socket.sk->sk_data_ready(tfile->socket.sk);
|
|
RCU_INIT_POINTER(tfile->tun, NULL);
|
|
}
|
|
BUG_ON(tun->numqueues != 0);
|
|
|
|
synchronize_net();
|
|
for (i = 0; i < n; i++) {
|
|
tfile = rtnl_dereference(tun->tfiles[i]);
|
|
tun_napi_del(tfile);
|
|
/* Drop read queue */
|
|
tun_queue_purge(tfile);
|
|
xdp_rxq_info_unreg(&tfile->xdp_rxq);
|
|
sock_put(&tfile->sk);
|
|
}
|
|
list_for_each_entry_safe(tfile, tmp, &tun->disabled, next) {
|
|
tun_enable_queue(tfile);
|
|
tun_queue_purge(tfile);
|
|
xdp_rxq_info_unreg(&tfile->xdp_rxq);
|
|
sock_put(&tfile->sk);
|
|
}
|
|
BUG_ON(tun->numdisabled != 0);
|
|
|
|
if (tun->flags & IFF_PERSIST)
|
|
module_put(THIS_MODULE);
|
|
}
|
|
|
|
static int tun_attach(struct tun_struct *tun, struct file *file,
|
|
bool skip_filter, bool napi, bool napi_frags,
|
|
bool publish_tun)
|
|
{
|
|
struct tun_file *tfile = file->private_data;
|
|
struct net_device *dev = tun->dev;
|
|
int err;
|
|
|
|
err = security_tun_dev_attach(tfile->socket.sk, tun->security);
|
|
if (err < 0)
|
|
goto out;
|
|
|
|
err = -EINVAL;
|
|
if (rtnl_dereference(tfile->tun) && !tfile->detached)
|
|
goto out;
|
|
|
|
err = -EBUSY;
|
|
if (!(tun->flags & IFF_MULTI_QUEUE) && tun->numqueues == 1)
|
|
goto out;
|
|
|
|
err = -E2BIG;
|
|
if (!tfile->detached &&
|
|
tun->numqueues + tun->numdisabled == MAX_TAP_QUEUES)
|
|
goto out;
|
|
|
|
err = 0;
|
|
|
|
/* Re-attach the filter to persist device */
|
|
if (!skip_filter && (tun->filter_attached == true)) {
|
|
lock_sock(tfile->socket.sk);
|
|
err = sk_attach_filter(&tun->fprog, tfile->socket.sk);
|
|
release_sock(tfile->socket.sk);
|
|
if (!err)
|
|
goto out;
|
|
}
|
|
|
|
if (!tfile->detached &&
|
|
ptr_ring_resize(&tfile->tx_ring, dev->tx_queue_len,
|
|
GFP_KERNEL, tun_ptr_free)) {
|
|
err = -ENOMEM;
|
|
goto out;
|
|
}
|
|
|
|
tfile->queue_index = tun->numqueues;
|
|
tfile->socket.sk->sk_shutdown &= ~RCV_SHUTDOWN;
|
|
|
|
if (tfile->detached) {
|
|
/* Re-attach detached tfile, updating XDP queue_index */
|
|
WARN_ON(!xdp_rxq_info_is_reg(&tfile->xdp_rxq));
|
|
|
|
if (tfile->xdp_rxq.queue_index != tfile->queue_index)
|
|
tfile->xdp_rxq.queue_index = tfile->queue_index;
|
|
} else {
|
|
/* Setup XDP RX-queue info, for new tfile getting attached */
|
|
err = xdp_rxq_info_reg(&tfile->xdp_rxq,
|
|
tun->dev, tfile->queue_index);
|
|
if (err < 0)
|
|
goto out;
|
|
err = xdp_rxq_info_reg_mem_model(&tfile->xdp_rxq,
|
|
MEM_TYPE_PAGE_SHARED, NULL);
|
|
if (err < 0) {
|
|
xdp_rxq_info_unreg(&tfile->xdp_rxq);
|
|
goto out;
|
|
}
|
|
err = 0;
|
|
}
|
|
|
|
if (tfile->detached) {
|
|
tun_enable_queue(tfile);
|
|
} else {
|
|
sock_hold(&tfile->sk);
|
|
tun_napi_init(tun, tfile, napi, napi_frags);
|
|
}
|
|
|
|
/* device is allowed to go away first, so no need to hold extra
|
|
* refcnt.
|
|
*/
|
|
|
|
/* Publish tfile->tun and tun->tfiles only after we've fully
|
|
* initialized tfile; otherwise we risk using half-initialized
|
|
* object.
|
|
*/
|
|
if (publish_tun)
|
|
rcu_assign_pointer(tfile->tun, tun);
|
|
rcu_assign_pointer(tun->tfiles[tun->numqueues], tfile);
|
|
tun->numqueues++;
|
|
tun_set_real_num_queues(tun);
|
|
out:
|
|
return err;
|
|
}
|
|
|
|
static struct tun_struct *tun_get(struct tun_file *tfile)
|
|
{
|
|
struct tun_struct *tun;
|
|
|
|
rcu_read_lock();
|
|
tun = rcu_dereference(tfile->tun);
|
|
if (tun)
|
|
dev_hold(tun->dev);
|
|
rcu_read_unlock();
|
|
|
|
return tun;
|
|
}
|
|
|
|
static void tun_put(struct tun_struct *tun)
|
|
{
|
|
dev_put(tun->dev);
|
|
}
|
|
|
|
/* TAP filtering */
|
|
static void addr_hash_set(u32 *mask, const u8 *addr)
|
|
{
|
|
int n = ether_crc(ETH_ALEN, addr) >> 26;
|
|
mask[n >> 5] |= (1 << (n & 31));
|
|
}
|
|
|
|
static unsigned int addr_hash_test(const u32 *mask, const u8 *addr)
|
|
{
|
|
int n = ether_crc(ETH_ALEN, addr) >> 26;
|
|
return mask[n >> 5] & (1 << (n & 31));
|
|
}
|
|
|
|
static int update_filter(struct tap_filter *filter, void __user *arg)
|
|
{
|
|
struct { u8 u[ETH_ALEN]; } *addr;
|
|
struct tun_filter uf;
|
|
int err, alen, n, nexact;
|
|
|
|
if (copy_from_user(&uf, arg, sizeof(uf)))
|
|
return -EFAULT;
|
|
|
|
if (!uf.count) {
|
|
/* Disabled */
|
|
filter->count = 0;
|
|
return 0;
|
|
}
|
|
|
|
alen = ETH_ALEN * uf.count;
|
|
addr = memdup_user(arg + sizeof(uf), alen);
|
|
if (IS_ERR(addr))
|
|
return PTR_ERR(addr);
|
|
|
|
/* The filter is updated without holding any locks. Which is
|
|
* perfectly safe. We disable it first and in the worst
|
|
* case we'll accept a few undesired packets. */
|
|
filter->count = 0;
|
|
wmb();
|
|
|
|
/* Use first set of addresses as an exact filter */
|
|
for (n = 0; n < uf.count && n < FLT_EXACT_COUNT; n++)
|
|
memcpy(filter->addr[n], addr[n].u, ETH_ALEN);
|
|
|
|
nexact = n;
|
|
|
|
/* Remaining multicast addresses are hashed,
|
|
* unicast will leave the filter disabled. */
|
|
memset(filter->mask, 0, sizeof(filter->mask));
|
|
for (; n < uf.count; n++) {
|
|
if (!is_multicast_ether_addr(addr[n].u)) {
|
|
err = 0; /* no filter */
|
|
goto free_addr;
|
|
}
|
|
addr_hash_set(filter->mask, addr[n].u);
|
|
}
|
|
|
|
/* For ALLMULTI just set the mask to all ones.
|
|
* This overrides the mask populated above. */
|
|
if ((uf.flags & TUN_FLT_ALLMULTI))
|
|
memset(filter->mask, ~0, sizeof(filter->mask));
|
|
|
|
/* Now enable the filter */
|
|
wmb();
|
|
filter->count = nexact;
|
|
|
|
/* Return the number of exact filters */
|
|
err = nexact;
|
|
free_addr:
|
|
kfree(addr);
|
|
return err;
|
|
}
|
|
|
|
/* Returns: 0 - drop, !=0 - accept */
|
|
static int run_filter(struct tap_filter *filter, const struct sk_buff *skb)
|
|
{
|
|
/* Cannot use eth_hdr(skb) here because skb_mac_hdr() is incorrect
|
|
* at this point. */
|
|
struct ethhdr *eh = (struct ethhdr *) skb->data;
|
|
int i;
|
|
|
|
/* Exact match */
|
|
for (i = 0; i < filter->count; i++)
|
|
if (ether_addr_equal(eh->h_dest, filter->addr[i]))
|
|
return 1;
|
|
|
|
/* Inexact match (multicast only) */
|
|
if (is_multicast_ether_addr(eh->h_dest))
|
|
return addr_hash_test(filter->mask, eh->h_dest);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Checks whether the packet is accepted or not.
|
|
* Returns: 0 - drop, !=0 - accept
|
|
*/
|
|
static int check_filter(struct tap_filter *filter, const struct sk_buff *skb)
|
|
{
|
|
if (!filter->count)
|
|
return 1;
|
|
|
|
return run_filter(filter, skb);
|
|
}
|
|
|
|
/* Network device part of the driver */
|
|
|
|
static const struct ethtool_ops tun_ethtool_ops;
|
|
|
|
/* Net device detach from fd. */
|
|
static void tun_net_uninit(struct net_device *dev)
|
|
{
|
|
tun_detach_all(dev);
|
|
}
|
|
|
|
/* Net device open. */
|
|
static int tun_net_open(struct net_device *dev)
|
|
{
|
|
netif_tx_start_all_queues(dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Net device close. */
|
|
static int tun_net_close(struct net_device *dev)
|
|
{
|
|
netif_tx_stop_all_queues(dev);
|
|
return 0;
|
|
}
|
|
|
|
/* Net device start xmit */
|
|
static void tun_automq_xmit(struct tun_struct *tun, struct sk_buff *skb)
|
|
{
|
|
#ifdef CONFIG_RPS
|
|
if (tun->numqueues == 1 && static_key_false(&rps_needed)) {
|
|
/* Select queue was not called for the skbuff, so we extract the
|
|
* RPS hash and save it into the flow_table here.
|
|
*/
|
|
__u32 rxhash;
|
|
|
|
rxhash = __skb_get_hash_symmetric(skb);
|
|
if (rxhash) {
|
|
struct tun_flow_entry *e;
|
|
e = tun_flow_find(&tun->flows[tun_hashfn(rxhash)],
|
|
rxhash);
|
|
if (e)
|
|
tun_flow_save_rps_rxhash(e, rxhash);
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
static unsigned int run_ebpf_filter(struct tun_struct *tun,
|
|
struct sk_buff *skb,
|
|
int len)
|
|
{
|
|
struct tun_prog *prog = rcu_dereference(tun->filter_prog);
|
|
|
|
if (prog)
|
|
len = bpf_prog_run_clear_cb(prog->prog, skb);
|
|
|
|
return len;
|
|
}
|
|
|
|
/* Net device start xmit */
|
|
static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
int txq = skb->queue_mapping;
|
|
struct tun_file *tfile;
|
|
int len = skb->len;
|
|
|
|
rcu_read_lock();
|
|
tfile = rcu_dereference(tun->tfiles[txq]);
|
|
|
|
/* Drop packet if interface is not attached */
|
|
if (!tfile)
|
|
goto drop;
|
|
|
|
if (!rcu_dereference(tun->steering_prog))
|
|
tun_automq_xmit(tun, skb);
|
|
|
|
tun_debug(KERN_INFO, tun, "tun_net_xmit %d\n", skb->len);
|
|
|
|
BUG_ON(!tfile);
|
|
|
|
/* Drop if the filter does not like it.
|
|
* This is a noop if the filter is disabled.
|
|
* Filter can be enabled only for the TAP devices. */
|
|
if (!check_filter(&tun->txflt, skb))
|
|
goto drop;
|
|
|
|
if (tfile->socket.sk->sk_filter &&
|
|
sk_filter(tfile->socket.sk, skb))
|
|
goto drop;
|
|
|
|
len = run_ebpf_filter(tun, skb, len);
|
|
if (len == 0 || pskb_trim(skb, len))
|
|
goto drop;
|
|
|
|
if (unlikely(skb_orphan_frags_rx(skb, GFP_ATOMIC)))
|
|
goto drop;
|
|
|
|
skb_tx_timestamp(skb);
|
|
|
|
/* Orphan the skb - required as we might hang on to it
|
|
* for indefinite time.
|
|
*/
|
|
skb_orphan(skb);
|
|
|
|
nf_reset(skb);
|
|
|
|
if (ptr_ring_produce(&tfile->tx_ring, skb))
|
|
goto drop;
|
|
|
|
/* Notify and wake up reader process */
|
|
if (tfile->flags & TUN_FASYNC)
|
|
kill_fasync(&tfile->fasync, SIGIO, POLL_IN);
|
|
tfile->socket.sk->sk_data_ready(tfile->socket.sk);
|
|
|
|
rcu_read_unlock();
|
|
return NETDEV_TX_OK;
|
|
|
|
drop:
|
|
this_cpu_inc(tun->pcpu_stats->tx_dropped);
|
|
skb_tx_error(skb);
|
|
kfree_skb(skb);
|
|
rcu_read_unlock();
|
|
return NET_XMIT_DROP;
|
|
}
|
|
|
|
static void tun_net_mclist(struct net_device *dev)
|
|
{
|
|
/*
|
|
* This callback is supposed to deal with mc filter in
|
|
* _rx_ path and has nothing to do with the _tx_ path.
|
|
* In rx path we always accept everything userspace gives us.
|
|
*/
|
|
}
|
|
|
|
static netdev_features_t tun_net_fix_features(struct net_device *dev,
|
|
netdev_features_t features)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
|
|
return (features & tun->set_features) | (features & ~TUN_USER_FEATURES);
|
|
}
|
|
|
|
static void tun_set_headroom(struct net_device *dev, int new_hr)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
|
|
if (new_hr < NET_SKB_PAD)
|
|
new_hr = NET_SKB_PAD;
|
|
|
|
tun->align = new_hr;
|
|
}
|
|
|
|
static void
|
|
tun_net_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
|
|
{
|
|
u32 rx_dropped = 0, tx_dropped = 0, rx_frame_errors = 0;
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
struct tun_pcpu_stats *p;
|
|
int i;
|
|
|
|
for_each_possible_cpu(i) {
|
|
u64 rxpackets, rxbytes, txpackets, txbytes;
|
|
unsigned int start;
|
|
|
|
p = per_cpu_ptr(tun->pcpu_stats, i);
|
|
do {
|
|
start = u64_stats_fetch_begin(&p->syncp);
|
|
rxpackets = p->rx_packets;
|
|
rxbytes = p->rx_bytes;
|
|
txpackets = p->tx_packets;
|
|
txbytes = p->tx_bytes;
|
|
} while (u64_stats_fetch_retry(&p->syncp, start));
|
|
|
|
stats->rx_packets += rxpackets;
|
|
stats->rx_bytes += rxbytes;
|
|
stats->tx_packets += txpackets;
|
|
stats->tx_bytes += txbytes;
|
|
|
|
/* u32 counters */
|
|
rx_dropped += p->rx_dropped;
|
|
rx_frame_errors += p->rx_frame_errors;
|
|
tx_dropped += p->tx_dropped;
|
|
}
|
|
stats->rx_dropped = rx_dropped;
|
|
stats->rx_frame_errors = rx_frame_errors;
|
|
stats->tx_dropped = tx_dropped;
|
|
}
|
|
|
|
static int tun_xdp_set(struct net_device *dev, struct bpf_prog *prog,
|
|
struct netlink_ext_ack *extack)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
struct bpf_prog *old_prog;
|
|
|
|
old_prog = rtnl_dereference(tun->xdp_prog);
|
|
rcu_assign_pointer(tun->xdp_prog, prog);
|
|
if (old_prog)
|
|
bpf_prog_put(old_prog);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static u32 tun_xdp_query(struct net_device *dev)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
const struct bpf_prog *xdp_prog;
|
|
|
|
xdp_prog = rtnl_dereference(tun->xdp_prog);
|
|
if (xdp_prog)
|
|
return xdp_prog->aux->id;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int tun_xdp(struct net_device *dev, struct netdev_bpf *xdp)
|
|
{
|
|
switch (xdp->command) {
|
|
case XDP_SETUP_PROG:
|
|
return tun_xdp_set(dev, xdp->prog, xdp->extack);
|
|
case XDP_QUERY_PROG:
|
|
xdp->prog_id = tun_xdp_query(dev);
|
|
return 0;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
static const struct net_device_ops tun_netdev_ops = {
|
|
.ndo_uninit = tun_net_uninit,
|
|
.ndo_open = tun_net_open,
|
|
.ndo_stop = tun_net_close,
|
|
.ndo_start_xmit = tun_net_xmit,
|
|
.ndo_fix_features = tun_net_fix_features,
|
|
.ndo_select_queue = tun_select_queue,
|
|
.ndo_set_rx_headroom = tun_set_headroom,
|
|
.ndo_get_stats64 = tun_net_get_stats64,
|
|
};
|
|
|
|
static void __tun_xdp_flush_tfile(struct tun_file *tfile)
|
|
{
|
|
/* Notify and wake up reader process */
|
|
if (tfile->flags & TUN_FASYNC)
|
|
kill_fasync(&tfile->fasync, SIGIO, POLL_IN);
|
|
tfile->socket.sk->sk_data_ready(tfile->socket.sk);
|
|
}
|
|
|
|
static int tun_xdp_xmit(struct net_device *dev, int n,
|
|
struct xdp_frame **frames, u32 flags)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
struct tun_file *tfile;
|
|
u32 numqueues;
|
|
int drops = 0;
|
|
int cnt = n;
|
|
int i;
|
|
|
|
if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK))
|
|
return -EINVAL;
|
|
|
|
rcu_read_lock();
|
|
|
|
resample:
|
|
numqueues = READ_ONCE(tun->numqueues);
|
|
if (!numqueues) {
|
|
rcu_read_unlock();
|
|
return -ENXIO; /* Caller will free/return all frames */
|
|
}
|
|
|
|
tfile = rcu_dereference(tun->tfiles[smp_processor_id() %
|
|
numqueues]);
|
|
if (unlikely(!tfile))
|
|
goto resample;
|
|
|
|
spin_lock(&tfile->tx_ring.producer_lock);
|
|
for (i = 0; i < n; i++) {
|
|
struct xdp_frame *xdp = frames[i];
|
|
/* Encode the XDP flag into lowest bit for consumer to differ
|
|
* XDP buffer from sk_buff.
|
|
*/
|
|
void *frame = tun_xdp_to_ptr(xdp);
|
|
|
|
if (__ptr_ring_produce(&tfile->tx_ring, frame)) {
|
|
this_cpu_inc(tun->pcpu_stats->tx_dropped);
|
|
xdp_return_frame_rx_napi(xdp);
|
|
drops++;
|
|
}
|
|
}
|
|
spin_unlock(&tfile->tx_ring.producer_lock);
|
|
|
|
if (flags & XDP_XMIT_FLUSH)
|
|
__tun_xdp_flush_tfile(tfile);
|
|
|
|
rcu_read_unlock();
|
|
return cnt - drops;
|
|
}
|
|
|
|
static int tun_xdp_tx(struct net_device *dev, struct xdp_buff *xdp)
|
|
{
|
|
struct xdp_frame *frame = convert_to_xdp_frame(xdp);
|
|
|
|
if (unlikely(!frame))
|
|
return -EOVERFLOW;
|
|
|
|
return tun_xdp_xmit(dev, 1, &frame, XDP_XMIT_FLUSH);
|
|
}
|
|
|
|
static const struct net_device_ops tap_netdev_ops = {
|
|
.ndo_uninit = tun_net_uninit,
|
|
.ndo_open = tun_net_open,
|
|
.ndo_stop = tun_net_close,
|
|
.ndo_start_xmit = tun_net_xmit,
|
|
.ndo_fix_features = tun_net_fix_features,
|
|
.ndo_set_rx_mode = tun_net_mclist,
|
|
.ndo_set_mac_address = eth_mac_addr,
|
|
.ndo_validate_addr = eth_validate_addr,
|
|
.ndo_select_queue = tun_select_queue,
|
|
.ndo_features_check = passthru_features_check,
|
|
.ndo_set_rx_headroom = tun_set_headroom,
|
|
.ndo_get_stats64 = tun_net_get_stats64,
|
|
.ndo_bpf = tun_xdp,
|
|
.ndo_xdp_xmit = tun_xdp_xmit,
|
|
};
|
|
|
|
static void tun_flow_init(struct tun_struct *tun)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < TUN_NUM_FLOW_ENTRIES; i++)
|
|
INIT_HLIST_HEAD(&tun->flows[i]);
|
|
|
|
tun->ageing_time = TUN_FLOW_EXPIRE;
|
|
timer_setup(&tun->flow_gc_timer, tun_flow_cleanup, 0);
|
|
mod_timer(&tun->flow_gc_timer,
|
|
round_jiffies_up(jiffies + tun->ageing_time));
|
|
}
|
|
|
|
static void tun_flow_uninit(struct tun_struct *tun)
|
|
{
|
|
del_timer_sync(&tun->flow_gc_timer);
|
|
tun_flow_flush(tun);
|
|
}
|
|
|
|
#define MIN_MTU 68
|
|
#define MAX_MTU 65535
|
|
|
|
/* Initialize net device. */
|
|
static void tun_net_init(struct net_device *dev)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
|
|
switch (tun->flags & TUN_TYPE_MASK) {
|
|
case IFF_TUN:
|
|
dev->netdev_ops = &tun_netdev_ops;
|
|
|
|
/* Point-to-Point TUN Device */
|
|
dev->hard_header_len = 0;
|
|
dev->addr_len = 0;
|
|
dev->mtu = 1500;
|
|
|
|
/* Zero header length */
|
|
dev->type = ARPHRD_NONE;
|
|
dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
|
|
break;
|
|
|
|
case IFF_TAP:
|
|
dev->netdev_ops = &tap_netdev_ops;
|
|
/* Ethernet TAP Device */
|
|
ether_setup(dev);
|
|
dev->priv_flags &= ~IFF_TX_SKB_SHARING;
|
|
dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
|
|
|
|
eth_hw_addr_random(dev);
|
|
|
|
break;
|
|
}
|
|
|
|
dev->min_mtu = MIN_MTU;
|
|
dev->max_mtu = MAX_MTU - dev->hard_header_len;
|
|
}
|
|
|
|
static bool tun_sock_writeable(struct tun_struct *tun, struct tun_file *tfile)
|
|
{
|
|
struct sock *sk = tfile->socket.sk;
|
|
|
|
return (tun->dev->flags & IFF_UP) && sock_writeable(sk);
|
|
}
|
|
|
|
/* Character device part */
|
|
|
|
/* Poll */
|
|
static __poll_t tun_chr_poll(struct file *file, poll_table *wait)
|
|
{
|
|
struct tun_file *tfile = file->private_data;
|
|
struct tun_struct *tun = tun_get(tfile);
|
|
struct sock *sk;
|
|
__poll_t mask = 0;
|
|
|
|
if (!tun)
|
|
return EPOLLERR;
|
|
|
|
sk = tfile->socket.sk;
|
|
|
|
tun_debug(KERN_INFO, tun, "tun_chr_poll\n");
|
|
|
|
poll_wait(file, sk_sleep(sk), wait);
|
|
|
|
if (!ptr_ring_empty(&tfile->tx_ring))
|
|
mask |= EPOLLIN | EPOLLRDNORM;
|
|
|
|
/* Make sure SOCKWQ_ASYNC_NOSPACE is set if not writable to
|
|
* guarantee EPOLLOUT to be raised by either here or
|
|
* tun_sock_write_space(). Then process could get notification
|
|
* after it writes to a down device and meets -EIO.
|
|
*/
|
|
if (tun_sock_writeable(tun, tfile) ||
|
|
(!test_and_set_bit(SOCKWQ_ASYNC_NOSPACE, &sk->sk_socket->flags) &&
|
|
tun_sock_writeable(tun, tfile)))
|
|
mask |= EPOLLOUT | EPOLLWRNORM;
|
|
|
|
if (tun->dev->reg_state != NETREG_REGISTERED)
|
|
mask = EPOLLERR;
|
|
|
|
tun_put(tun);
|
|
return mask;
|
|
}
|
|
|
|
static struct sk_buff *tun_napi_alloc_frags(struct tun_file *tfile,
|
|
size_t len,
|
|
const struct iov_iter *it)
|
|
{
|
|
struct sk_buff *skb;
|
|
size_t linear;
|
|
int err;
|
|
int i;
|
|
|
|
if (it->nr_segs > MAX_SKB_FRAGS + 1)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
local_bh_disable();
|
|
skb = napi_get_frags(&tfile->napi);
|
|
local_bh_enable();
|
|
if (!skb)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
linear = iov_iter_single_seg_count(it);
|
|
err = __skb_grow(skb, linear);
|
|
if (err)
|
|
goto free;
|
|
|
|
skb->len = len;
|
|
skb->data_len = len - linear;
|
|
skb->truesize += skb->data_len;
|
|
|
|
for (i = 1; i < it->nr_segs; i++) {
|
|
struct page_frag *pfrag = ¤t->task_frag;
|
|
size_t fragsz = it->iov[i].iov_len;
|
|
|
|
if (fragsz == 0 || fragsz > PAGE_SIZE) {
|
|
err = -EINVAL;
|
|
goto free;
|
|
}
|
|
|
|
if (!skb_page_frag_refill(fragsz, pfrag, GFP_KERNEL)) {
|
|
err = -ENOMEM;
|
|
goto free;
|
|
}
|
|
|
|
skb_fill_page_desc(skb, i - 1, pfrag->page,
|
|
pfrag->offset, fragsz);
|
|
page_ref_inc(pfrag->page);
|
|
pfrag->offset += fragsz;
|
|
}
|
|
|
|
return skb;
|
|
free:
|
|
/* frees skb and all frags allocated with napi_alloc_frag() */
|
|
napi_free_frags(&tfile->napi);
|
|
return ERR_PTR(err);
|
|
}
|
|
|
|
/* prepad is the amount to reserve at front. len is length after that.
|
|
* linear is a hint as to how much to copy (usually headers). */
|
|
static struct sk_buff *tun_alloc_skb(struct tun_file *tfile,
|
|
size_t prepad, size_t len,
|
|
size_t linear, int noblock)
|
|
{
|
|
struct sock *sk = tfile->socket.sk;
|
|
struct sk_buff *skb;
|
|
int err;
|
|
|
|
/* Under a page? Don't bother with paged skb. */
|
|
if (prepad + len < PAGE_SIZE || !linear)
|
|
linear = len;
|
|
|
|
skb = sock_alloc_send_pskb(sk, prepad + linear, len - linear, noblock,
|
|
&err, 0);
|
|
if (!skb)
|
|
return ERR_PTR(err);
|
|
|
|
skb_reserve(skb, prepad);
|
|
skb_put(skb, linear);
|
|
skb->data_len = len - linear;
|
|
skb->len += len - linear;
|
|
|
|
return skb;
|
|
}
|
|
|
|
static void tun_rx_batched(struct tun_struct *tun, struct tun_file *tfile,
|
|
struct sk_buff *skb, int more)
|
|
{
|
|
struct sk_buff_head *queue = &tfile->sk.sk_write_queue;
|
|
struct sk_buff_head process_queue;
|
|
u32 rx_batched = tun->rx_batched;
|
|
bool rcv = false;
|
|
|
|
if (!rx_batched || (!more && skb_queue_empty(queue))) {
|
|
local_bh_disable();
|
|
skb_record_rx_queue(skb, tfile->queue_index);
|
|
netif_receive_skb(skb);
|
|
local_bh_enable();
|
|
return;
|
|
}
|
|
|
|
spin_lock(&queue->lock);
|
|
if (!more || skb_queue_len(queue) == rx_batched) {
|
|
__skb_queue_head_init(&process_queue);
|
|
skb_queue_splice_tail_init(queue, &process_queue);
|
|
rcv = true;
|
|
} else {
|
|
__skb_queue_tail(queue, skb);
|
|
}
|
|
spin_unlock(&queue->lock);
|
|
|
|
if (rcv) {
|
|
struct sk_buff *nskb;
|
|
|
|
local_bh_disable();
|
|
while ((nskb = __skb_dequeue(&process_queue))) {
|
|
skb_record_rx_queue(nskb, tfile->queue_index);
|
|
netif_receive_skb(nskb);
|
|
}
|
|
skb_record_rx_queue(skb, tfile->queue_index);
|
|
netif_receive_skb(skb);
|
|
local_bh_enable();
|
|
}
|
|
}
|
|
|
|
static bool tun_can_build_skb(struct tun_struct *tun, struct tun_file *tfile,
|
|
int len, int noblock, bool zerocopy)
|
|
{
|
|
if ((tun->flags & TUN_TYPE_MASK) != IFF_TAP)
|
|
return false;
|
|
|
|
if (tfile->socket.sk->sk_sndbuf != INT_MAX)
|
|
return false;
|
|
|
|
if (!noblock)
|
|
return false;
|
|
|
|
if (zerocopy)
|
|
return false;
|
|
|
|
if (SKB_DATA_ALIGN(len + TUN_RX_PAD) +
|
|
SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) > PAGE_SIZE)
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
static struct sk_buff *tun_build_skb(struct tun_struct *tun,
|
|
struct tun_file *tfile,
|
|
struct iov_iter *from,
|
|
struct virtio_net_hdr *hdr,
|
|
int len, int *skb_xdp)
|
|
{
|
|
struct page_frag *alloc_frag = ¤t->task_frag;
|
|
struct sk_buff *skb;
|
|
struct bpf_prog *xdp_prog;
|
|
int buflen = SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
|
|
unsigned int delta = 0;
|
|
char *buf;
|
|
size_t copied;
|
|
int err, pad = TUN_RX_PAD;
|
|
|
|
rcu_read_lock();
|
|
xdp_prog = rcu_dereference(tun->xdp_prog);
|
|
if (xdp_prog)
|
|
pad += TUN_HEADROOM;
|
|
buflen += SKB_DATA_ALIGN(len + pad);
|
|
rcu_read_unlock();
|
|
|
|
alloc_frag->offset = ALIGN((u64)alloc_frag->offset, SMP_CACHE_BYTES);
|
|
if (unlikely(!skb_page_frag_refill(buflen, alloc_frag, GFP_KERNEL)))
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
buf = (char *)page_address(alloc_frag->page) + alloc_frag->offset;
|
|
copied = copy_page_from_iter(alloc_frag->page,
|
|
alloc_frag->offset + pad,
|
|
len, from);
|
|
if (copied != len)
|
|
return ERR_PTR(-EFAULT);
|
|
|
|
/* There's a small window that XDP may be set after the check
|
|
* of xdp_prog above, this should be rare and for simplicity
|
|
* we do XDP on skb in case the headroom is not enough.
|
|
*/
|
|
if (hdr->gso_type || !xdp_prog)
|
|
*skb_xdp = 1;
|
|
else
|
|
*skb_xdp = 0;
|
|
|
|
local_bh_disable();
|
|
rcu_read_lock();
|
|
xdp_prog = rcu_dereference(tun->xdp_prog);
|
|
if (xdp_prog && !*skb_xdp) {
|
|
struct xdp_buff xdp;
|
|
void *orig_data;
|
|
u32 act;
|
|
|
|
xdp.data_hard_start = buf;
|
|
xdp.data = buf + pad;
|
|
xdp_set_data_meta_invalid(&xdp);
|
|
xdp.data_end = xdp.data + len;
|
|
xdp.rxq = &tfile->xdp_rxq;
|
|
orig_data = xdp.data;
|
|
act = bpf_prog_run_xdp(xdp_prog, &xdp);
|
|
|
|
switch (act) {
|
|
case XDP_REDIRECT:
|
|
get_page(alloc_frag->page);
|
|
alloc_frag->offset += buflen;
|
|
err = xdp_do_redirect(tun->dev, &xdp, xdp_prog);
|
|
xdp_do_flush_map();
|
|
if (err)
|
|
goto err_redirect;
|
|
rcu_read_unlock();
|
|
local_bh_enable();
|
|
return NULL;
|
|
case XDP_TX:
|
|
get_page(alloc_frag->page);
|
|
alloc_frag->offset += buflen;
|
|
if (tun_xdp_tx(tun->dev, &xdp) < 0)
|
|
goto err_redirect;
|
|
rcu_read_unlock();
|
|
local_bh_enable();
|
|
return NULL;
|
|
case XDP_PASS:
|
|
delta = orig_data - xdp.data;
|
|
len = xdp.data_end - xdp.data;
|
|
break;
|
|
default:
|
|
bpf_warn_invalid_xdp_action(act);
|
|
/* fall through */
|
|
case XDP_ABORTED:
|
|
trace_xdp_exception(tun->dev, xdp_prog, act);
|
|
/* fall through */
|
|
case XDP_DROP:
|
|
goto err_xdp;
|
|
}
|
|
}
|
|
|
|
skb = build_skb(buf, buflen);
|
|
if (!skb) {
|
|
rcu_read_unlock();
|
|
local_bh_enable();
|
|
return ERR_PTR(-ENOMEM);
|
|
}
|
|
|
|
skb_reserve(skb, pad - delta);
|
|
skb_put(skb, len);
|
|
skb_set_owner_w(skb, tfile->socket.sk);
|
|
get_page(alloc_frag->page);
|
|
alloc_frag->offset += buflen;
|
|
|
|
rcu_read_unlock();
|
|
local_bh_enable();
|
|
|
|
return skb;
|
|
|
|
err_redirect:
|
|
put_page(alloc_frag->page);
|
|
err_xdp:
|
|
rcu_read_unlock();
|
|
local_bh_enable();
|
|
this_cpu_inc(tun->pcpu_stats->rx_dropped);
|
|
return NULL;
|
|
}
|
|
|
|
/* Get packet from user space buffer */
|
|
static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
|
|
void *msg_control, struct iov_iter *from,
|
|
int noblock, bool more)
|
|
{
|
|
struct tun_pi pi = { 0, cpu_to_be16(ETH_P_IP) };
|
|
struct sk_buff *skb;
|
|
size_t total_len = iov_iter_count(from);
|
|
size_t len = total_len, align = tun->align, linear;
|
|
struct virtio_net_hdr gso = { 0 };
|
|
struct tun_pcpu_stats *stats;
|
|
int good_linear;
|
|
int copylen;
|
|
bool zerocopy = false;
|
|
int err;
|
|
u32 rxhash = 0;
|
|
int skb_xdp = 1;
|
|
bool frags = tun_napi_frags_enabled(tfile);
|
|
|
|
if (!(tun->flags & IFF_NO_PI)) {
|
|
if (len < sizeof(pi))
|
|
return -EINVAL;
|
|
len -= sizeof(pi);
|
|
|
|
if (!copy_from_iter_full(&pi, sizeof(pi), from))
|
|
return -EFAULT;
|
|
}
|
|
|
|
if (tun->flags & IFF_VNET_HDR) {
|
|
int vnet_hdr_sz = READ_ONCE(tun->vnet_hdr_sz);
|
|
|
|
if (len < vnet_hdr_sz)
|
|
return -EINVAL;
|
|
len -= vnet_hdr_sz;
|
|
|
|
if (!copy_from_iter_full(&gso, sizeof(gso), from))
|
|
return -EFAULT;
|
|
|
|
if ((gso.flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) &&
|
|
tun16_to_cpu(tun, gso.csum_start) + tun16_to_cpu(tun, gso.csum_offset) + 2 > tun16_to_cpu(tun, gso.hdr_len))
|
|
gso.hdr_len = cpu_to_tun16(tun, tun16_to_cpu(tun, gso.csum_start) + tun16_to_cpu(tun, gso.csum_offset) + 2);
|
|
|
|
if (tun16_to_cpu(tun, gso.hdr_len) > len)
|
|
return -EINVAL;
|
|
iov_iter_advance(from, vnet_hdr_sz - sizeof(gso));
|
|
}
|
|
|
|
if ((tun->flags & TUN_TYPE_MASK) == IFF_TAP) {
|
|
align += NET_IP_ALIGN;
|
|
if (unlikely(len < ETH_HLEN ||
|
|
(gso.hdr_len && tun16_to_cpu(tun, gso.hdr_len) < ETH_HLEN)))
|
|
return -EINVAL;
|
|
}
|
|
|
|
good_linear = SKB_MAX_HEAD(align);
|
|
|
|
if (msg_control) {
|
|
struct iov_iter i = *from;
|
|
|
|
/* There are 256 bytes to be copied in skb, so there is
|
|
* enough room for skb expand head in case it is used.
|
|
* The rest of the buffer is mapped from userspace.
|
|
*/
|
|
copylen = gso.hdr_len ? tun16_to_cpu(tun, gso.hdr_len) : GOODCOPY_LEN;
|
|
if (copylen > good_linear)
|
|
copylen = good_linear;
|
|
linear = copylen;
|
|
iov_iter_advance(&i, copylen);
|
|
if (iov_iter_npages(&i, INT_MAX) <= MAX_SKB_FRAGS)
|
|
zerocopy = true;
|
|
}
|
|
|
|
if (!frags && tun_can_build_skb(tun, tfile, len, noblock, zerocopy)) {
|
|
/* For the packet that is not easy to be processed
|
|
* (e.g gso or jumbo packet), we will do it at after
|
|
* skb was created with generic XDP routine.
|
|
*/
|
|
skb = tun_build_skb(tun, tfile, from, &gso, len, &skb_xdp);
|
|
if (IS_ERR(skb)) {
|
|
this_cpu_inc(tun->pcpu_stats->rx_dropped);
|
|
return PTR_ERR(skb);
|
|
}
|
|
if (!skb)
|
|
return total_len;
|
|
} else {
|
|
if (!zerocopy) {
|
|
copylen = len;
|
|
if (tun16_to_cpu(tun, gso.hdr_len) > good_linear)
|
|
linear = good_linear;
|
|
else
|
|
linear = tun16_to_cpu(tun, gso.hdr_len);
|
|
}
|
|
|
|
if (frags) {
|
|
mutex_lock(&tfile->napi_mutex);
|
|
skb = tun_napi_alloc_frags(tfile, copylen, from);
|
|
/* tun_napi_alloc_frags() enforces a layout for the skb.
|
|
* If zerocopy is enabled, then this layout will be
|
|
* overwritten by zerocopy_sg_from_iter().
|
|
*/
|
|
zerocopy = false;
|
|
} else {
|
|
skb = tun_alloc_skb(tfile, align, copylen, linear,
|
|
noblock);
|
|
}
|
|
|
|
if (IS_ERR(skb)) {
|
|
if (PTR_ERR(skb) != -EAGAIN)
|
|
this_cpu_inc(tun->pcpu_stats->rx_dropped);
|
|
if (frags)
|
|
mutex_unlock(&tfile->napi_mutex);
|
|
return PTR_ERR(skb);
|
|
}
|
|
|
|
if (zerocopy)
|
|
err = zerocopy_sg_from_iter(skb, from);
|
|
else
|
|
err = skb_copy_datagram_from_iter(skb, 0, from, len);
|
|
|
|
if (err) {
|
|
err = -EFAULT;
|
|
drop:
|
|
this_cpu_inc(tun->pcpu_stats->rx_dropped);
|
|
kfree_skb(skb);
|
|
if (frags) {
|
|
tfile->napi.skb = NULL;
|
|
mutex_unlock(&tfile->napi_mutex);
|
|
}
|
|
|
|
return err;
|
|
}
|
|
}
|
|
|
|
if (virtio_net_hdr_to_skb(skb, &gso, tun_is_little_endian(tun))) {
|
|
this_cpu_inc(tun->pcpu_stats->rx_frame_errors);
|
|
kfree_skb(skb);
|
|
if (frags) {
|
|
tfile->napi.skb = NULL;
|
|
mutex_unlock(&tfile->napi_mutex);
|
|
}
|
|
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (!(tun->flags & IFF_NO_PI))
|
|
if (pi.flags & htons(CHECKSUM_UNNECESSARY))
|
|
skb->ip_summed = CHECKSUM_UNNECESSARY;
|
|
|
|
switch (tun->flags & TUN_TYPE_MASK) {
|
|
case IFF_TUN:
|
|
if (tun->flags & IFF_NO_PI) {
|
|
u8 ip_version = skb->len ? (skb->data[0] >> 4) : 0;
|
|
|
|
switch (ip_version) {
|
|
case 4:
|
|
pi.proto = htons(ETH_P_IP);
|
|
break;
|
|
case 6:
|
|
pi.proto = htons(ETH_P_IPV6);
|
|
break;
|
|
default:
|
|
this_cpu_inc(tun->pcpu_stats->rx_dropped);
|
|
kfree_skb(skb);
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
skb_reset_mac_header(skb);
|
|
skb->protocol = pi.proto;
|
|
skb->dev = tun->dev;
|
|
break;
|
|
case IFF_TAP:
|
|
if (frags && !pskb_may_pull(skb, ETH_HLEN)) {
|
|
err = -ENOMEM;
|
|
goto drop;
|
|
}
|
|
skb->protocol = eth_type_trans(skb, tun->dev);
|
|
break;
|
|
}
|
|
|
|
/* copy skb_ubuf_info for callback when skb has no error */
|
|
if (zerocopy) {
|
|
skb_shinfo(skb)->destructor_arg = msg_control;
|
|
skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY;
|
|
skb_shinfo(skb)->tx_flags |= SKBTX_SHARED_FRAG;
|
|
} else if (msg_control) {
|
|
struct ubuf_info *uarg = msg_control;
|
|
uarg->callback(uarg, false);
|
|
}
|
|
|
|
skb_reset_network_header(skb);
|
|
skb_probe_transport_header(skb, 0);
|
|
|
|
if (skb_xdp) {
|
|
struct bpf_prog *xdp_prog;
|
|
int ret;
|
|
|
|
local_bh_disable();
|
|
rcu_read_lock();
|
|
xdp_prog = rcu_dereference(tun->xdp_prog);
|
|
if (xdp_prog) {
|
|
ret = do_xdp_generic(xdp_prog, skb);
|
|
if (ret != XDP_PASS) {
|
|
rcu_read_unlock();
|
|
local_bh_enable();
|
|
if (frags) {
|
|
tfile->napi.skb = NULL;
|
|
mutex_unlock(&tfile->napi_mutex);
|
|
}
|
|
return total_len;
|
|
}
|
|
}
|
|
rcu_read_unlock();
|
|
local_bh_enable();
|
|
}
|
|
|
|
/* Compute the costly rx hash only if needed for flow updates.
|
|
* We may get a very small possibility of OOO during switching, not
|
|
* worth to optimize.
|
|
*/
|
|
if (!rcu_access_pointer(tun->steering_prog) && tun->numqueues > 1 &&
|
|
!tfile->detached)
|
|
rxhash = __skb_get_hash_symmetric(skb);
|
|
|
|
rcu_read_lock();
|
|
if (unlikely(!(tun->dev->flags & IFF_UP))) {
|
|
err = -EIO;
|
|
rcu_read_unlock();
|
|
goto drop;
|
|
}
|
|
|
|
if (frags) {
|
|
u32 headlen;
|
|
|
|
/* Exercise flow dissector code path. */
|
|
skb_push(skb, ETH_HLEN);
|
|
headlen = eth_get_headlen(skb->data, skb_headlen(skb));
|
|
|
|
if (unlikely(headlen > skb_headlen(skb))) {
|
|
this_cpu_inc(tun->pcpu_stats->rx_dropped);
|
|
napi_free_frags(&tfile->napi);
|
|
rcu_read_unlock();
|
|
mutex_unlock(&tfile->napi_mutex);
|
|
WARN_ON(1);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
local_bh_disable();
|
|
napi_gro_frags(&tfile->napi);
|
|
local_bh_enable();
|
|
mutex_unlock(&tfile->napi_mutex);
|
|
} else if (tfile->napi_enabled) {
|
|
struct sk_buff_head *queue = &tfile->sk.sk_write_queue;
|
|
int queue_len;
|
|
|
|
spin_lock_bh(&queue->lock);
|
|
__skb_queue_tail(queue, skb);
|
|
queue_len = skb_queue_len(queue);
|
|
spin_unlock(&queue->lock);
|
|
|
|
if (!more || queue_len > NAPI_POLL_WEIGHT)
|
|
napi_schedule(&tfile->napi);
|
|
|
|
local_bh_enable();
|
|
} else if (!IS_ENABLED(CONFIG_4KSTACKS)) {
|
|
tun_rx_batched(tun, tfile, skb, more);
|
|
} else {
|
|
netif_rx_ni(skb);
|
|
}
|
|
rcu_read_unlock();
|
|
|
|
stats = get_cpu_ptr(tun->pcpu_stats);
|
|
u64_stats_update_begin(&stats->syncp);
|
|
stats->rx_packets++;
|
|
stats->rx_bytes += len;
|
|
u64_stats_update_end(&stats->syncp);
|
|
put_cpu_ptr(stats);
|
|
|
|
if (rxhash)
|
|
tun_flow_update(tun, rxhash, tfile);
|
|
|
|
return total_len;
|
|
}
|
|
|
|
static ssize_t tun_chr_write_iter(struct kiocb *iocb, struct iov_iter *from)
|
|
{
|
|
struct file *file = iocb->ki_filp;
|
|
struct tun_file *tfile = file->private_data;
|
|
struct tun_struct *tun = tun_get(tfile);
|
|
ssize_t result;
|
|
|
|
if (!tun)
|
|
return -EBADFD;
|
|
|
|
result = tun_get_user(tun, tfile, NULL, from,
|
|
file->f_flags & O_NONBLOCK, false);
|
|
|
|
tun_put(tun);
|
|
return result;
|
|
}
|
|
|
|
static ssize_t tun_put_user_xdp(struct tun_struct *tun,
|
|
struct tun_file *tfile,
|
|
struct xdp_frame *xdp_frame,
|
|
struct iov_iter *iter)
|
|
{
|
|
int vnet_hdr_sz = 0;
|
|
size_t size = xdp_frame->len;
|
|
struct tun_pcpu_stats *stats;
|
|
size_t ret;
|
|
|
|
if (tun->flags & IFF_VNET_HDR) {
|
|
struct virtio_net_hdr gso = { 0 };
|
|
|
|
vnet_hdr_sz = READ_ONCE(tun->vnet_hdr_sz);
|
|
if (unlikely(iov_iter_count(iter) < vnet_hdr_sz))
|
|
return -EINVAL;
|
|
if (unlikely(copy_to_iter(&gso, sizeof(gso), iter) !=
|
|
sizeof(gso)))
|
|
return -EFAULT;
|
|
iov_iter_advance(iter, vnet_hdr_sz - sizeof(gso));
|
|
}
|
|
|
|
ret = copy_to_iter(xdp_frame->data, size, iter) + vnet_hdr_sz;
|
|
|
|
stats = get_cpu_ptr(tun->pcpu_stats);
|
|
u64_stats_update_begin(&stats->syncp);
|
|
stats->tx_packets++;
|
|
stats->tx_bytes += ret;
|
|
u64_stats_update_end(&stats->syncp);
|
|
put_cpu_ptr(tun->pcpu_stats);
|
|
|
|
return ret;
|
|
}
|
|
|
|
/* Put packet to the user space buffer */
|
|
static ssize_t tun_put_user(struct tun_struct *tun,
|
|
struct tun_file *tfile,
|
|
struct sk_buff *skb,
|
|
struct iov_iter *iter)
|
|
{
|
|
struct tun_pi pi = { 0, skb->protocol };
|
|
struct tun_pcpu_stats *stats;
|
|
ssize_t total;
|
|
int vlan_offset = 0;
|
|
int vlan_hlen = 0;
|
|
int vnet_hdr_sz = 0;
|
|
|
|
if (skb_vlan_tag_present(skb))
|
|
vlan_hlen = VLAN_HLEN;
|
|
|
|
if (tun->flags & IFF_VNET_HDR)
|
|
vnet_hdr_sz = READ_ONCE(tun->vnet_hdr_sz);
|
|
|
|
total = skb->len + vlan_hlen + vnet_hdr_sz;
|
|
|
|
if (!(tun->flags & IFF_NO_PI)) {
|
|
if (iov_iter_count(iter) < sizeof(pi))
|
|
return -EINVAL;
|
|
|
|
total += sizeof(pi);
|
|
if (iov_iter_count(iter) < total) {
|
|
/* Packet will be striped */
|
|
pi.flags |= TUN_PKT_STRIP;
|
|
}
|
|
|
|
if (copy_to_iter(&pi, sizeof(pi), iter) != sizeof(pi))
|
|
return -EFAULT;
|
|
}
|
|
|
|
if (vnet_hdr_sz) {
|
|
struct virtio_net_hdr gso;
|
|
|
|
if (iov_iter_count(iter) < vnet_hdr_sz)
|
|
return -EINVAL;
|
|
|
|
if (virtio_net_hdr_from_skb(skb, &gso,
|
|
tun_is_little_endian(tun), true,
|
|
vlan_hlen)) {
|
|
struct skb_shared_info *sinfo = skb_shinfo(skb);
|
|
pr_err("unexpected GSO type: "
|
|
"0x%x, gso_size %d, hdr_len %d\n",
|
|
sinfo->gso_type, tun16_to_cpu(tun, gso.gso_size),
|
|
tun16_to_cpu(tun, gso.hdr_len));
|
|
print_hex_dump(KERN_ERR, "tun: ",
|
|
DUMP_PREFIX_NONE,
|
|
16, 1, skb->head,
|
|
min((int)tun16_to_cpu(tun, gso.hdr_len), 64), true);
|
|
WARN_ON_ONCE(1);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (copy_to_iter(&gso, sizeof(gso), iter) != sizeof(gso))
|
|
return -EFAULT;
|
|
|
|
iov_iter_advance(iter, vnet_hdr_sz - sizeof(gso));
|
|
}
|
|
|
|
if (vlan_hlen) {
|
|
int ret;
|
|
struct veth veth;
|
|
|
|
veth.h_vlan_proto = skb->vlan_proto;
|
|
veth.h_vlan_TCI = htons(skb_vlan_tag_get(skb));
|
|
|
|
vlan_offset = offsetof(struct vlan_ethhdr, h_vlan_proto);
|
|
|
|
ret = skb_copy_datagram_iter(skb, 0, iter, vlan_offset);
|
|
if (ret || !iov_iter_count(iter))
|
|
goto done;
|
|
|
|
ret = copy_to_iter(&veth, sizeof(veth), iter);
|
|
if (ret != sizeof(veth) || !iov_iter_count(iter))
|
|
goto done;
|
|
}
|
|
|
|
skb_copy_datagram_iter(skb, vlan_offset, iter, skb->len - vlan_offset);
|
|
|
|
done:
|
|
/* caller is in process context, */
|
|
stats = get_cpu_ptr(tun->pcpu_stats);
|
|
u64_stats_update_begin(&stats->syncp);
|
|
stats->tx_packets++;
|
|
stats->tx_bytes += skb->len + vlan_hlen;
|
|
u64_stats_update_end(&stats->syncp);
|
|
put_cpu_ptr(tun->pcpu_stats);
|
|
|
|
return total;
|
|
}
|
|
|
|
static void *tun_ring_recv(struct tun_file *tfile, int noblock, int *err)
|
|
{
|
|
DECLARE_WAITQUEUE(wait, current);
|
|
void *ptr = NULL;
|
|
int error = 0;
|
|
|
|
ptr = ptr_ring_consume(&tfile->tx_ring);
|
|
if (ptr)
|
|
goto out;
|
|
if (noblock) {
|
|
error = -EAGAIN;
|
|
goto out;
|
|
}
|
|
|
|
add_wait_queue(&tfile->wq.wait, &wait);
|
|
|
|
while (1) {
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
|
ptr = ptr_ring_consume(&tfile->tx_ring);
|
|
if (ptr)
|
|
break;
|
|
if (signal_pending(current)) {
|
|
error = -ERESTARTSYS;
|
|
break;
|
|
}
|
|
if (tfile->socket.sk->sk_shutdown & RCV_SHUTDOWN) {
|
|
error = -EFAULT;
|
|
break;
|
|
}
|
|
|
|
schedule();
|
|
}
|
|
|
|
__set_current_state(TASK_RUNNING);
|
|
remove_wait_queue(&tfile->wq.wait, &wait);
|
|
|
|
out:
|
|
*err = error;
|
|
return ptr;
|
|
}
|
|
|
|
static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile,
|
|
struct iov_iter *to,
|
|
int noblock, void *ptr)
|
|
{
|
|
ssize_t ret;
|
|
int err;
|
|
|
|
tun_debug(KERN_INFO, tun, "tun_do_read\n");
|
|
|
|
if (!iov_iter_count(to)) {
|
|
tun_ptr_free(ptr);
|
|
return 0;
|
|
}
|
|
|
|
if (!ptr) {
|
|
/* Read frames from ring */
|
|
ptr = tun_ring_recv(tfile, noblock, &err);
|
|
if (!ptr)
|
|
return err;
|
|
}
|
|
|
|
if (tun_is_xdp_frame(ptr)) {
|
|
struct xdp_frame *xdpf = tun_ptr_to_xdp(ptr);
|
|
|
|
ret = tun_put_user_xdp(tun, tfile, xdpf, to);
|
|
xdp_return_frame(xdpf);
|
|
} else {
|
|
struct sk_buff *skb = ptr;
|
|
|
|
ret = tun_put_user(tun, tfile, skb, to);
|
|
if (unlikely(ret < 0))
|
|
kfree_skb(skb);
|
|
else
|
|
consume_skb(skb);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static ssize_t tun_chr_read_iter(struct kiocb *iocb, struct iov_iter *to)
|
|
{
|
|
struct file *file = iocb->ki_filp;
|
|
struct tun_file *tfile = file->private_data;
|
|
struct tun_struct *tun = tun_get(tfile);
|
|
ssize_t len = iov_iter_count(to), ret;
|
|
|
|
if (!tun)
|
|
return -EBADFD;
|
|
ret = tun_do_read(tun, tfile, to, file->f_flags & O_NONBLOCK, NULL);
|
|
ret = min_t(ssize_t, ret, len);
|
|
if (ret > 0)
|
|
iocb->ki_pos = ret;
|
|
tun_put(tun);
|
|
return ret;
|
|
}
|
|
|
|
static void tun_prog_free(struct rcu_head *rcu)
|
|
{
|
|
struct tun_prog *prog = container_of(rcu, struct tun_prog, rcu);
|
|
|
|
bpf_prog_destroy(prog->prog);
|
|
kfree(prog);
|
|
}
|
|
|
|
static int __tun_set_ebpf(struct tun_struct *tun,
|
|
struct tun_prog __rcu **prog_p,
|
|
struct bpf_prog *prog)
|
|
{
|
|
struct tun_prog *old, *new = NULL;
|
|
|
|
if (prog) {
|
|
new = kmalloc(sizeof(*new), GFP_KERNEL);
|
|
if (!new)
|
|
return -ENOMEM;
|
|
new->prog = prog;
|
|
}
|
|
|
|
spin_lock_bh(&tun->lock);
|
|
old = rcu_dereference_protected(*prog_p,
|
|
lockdep_is_held(&tun->lock));
|
|
rcu_assign_pointer(*prog_p, new);
|
|
spin_unlock_bh(&tun->lock);
|
|
|
|
if (old)
|
|
call_rcu(&old->rcu, tun_prog_free);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void tun_free_netdev(struct net_device *dev)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
|
|
BUG_ON(!(list_empty(&tun->disabled)));
|
|
free_percpu(tun->pcpu_stats);
|
|
tun_flow_uninit(tun);
|
|
security_tun_dev_free_security(tun->security);
|
|
__tun_set_ebpf(tun, &tun->steering_prog, NULL);
|
|
__tun_set_ebpf(tun, &tun->filter_prog, NULL);
|
|
}
|
|
|
|
static void tun_setup(struct net_device *dev)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
|
|
tun->owner = INVALID_UID;
|
|
tun->group = INVALID_GID;
|
|
tun_default_link_ksettings(dev, &tun->link_ksettings);
|
|
|
|
dev->ethtool_ops = &tun_ethtool_ops;
|
|
dev->needs_free_netdev = true;
|
|
dev->priv_destructor = tun_free_netdev;
|
|
/* We prefer our own queue length */
|
|
dev->tx_queue_len = TUN_READQ_SIZE;
|
|
}
|
|
|
|
/* Trivial set of netlink ops to allow deleting tun or tap
|
|
* device with netlink.
|
|
*/
|
|
static int tun_validate(struct nlattr *tb[], struct nlattr *data[],
|
|
struct netlink_ext_ack *extack)
|
|
{
|
|
NL_SET_ERR_MSG(extack,
|
|
"tun/tap creation via rtnetlink is not supported.");
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
static size_t tun_get_size(const struct net_device *dev)
|
|
{
|
|
BUILD_BUG_ON(sizeof(u32) != sizeof(uid_t));
|
|
BUILD_BUG_ON(sizeof(u32) != sizeof(gid_t));
|
|
|
|
return nla_total_size(sizeof(uid_t)) + /* OWNER */
|
|
nla_total_size(sizeof(gid_t)) + /* GROUP */
|
|
nla_total_size(sizeof(u8)) + /* TYPE */
|
|
nla_total_size(sizeof(u8)) + /* PI */
|
|
nla_total_size(sizeof(u8)) + /* VNET_HDR */
|
|
nla_total_size(sizeof(u8)) + /* PERSIST */
|
|
nla_total_size(sizeof(u8)) + /* MULTI_QUEUE */
|
|
nla_total_size(sizeof(u32)) + /* NUM_QUEUES */
|
|
nla_total_size(sizeof(u32)) + /* NUM_DISABLED_QUEUES */
|
|
0;
|
|
}
|
|
|
|
static int tun_fill_info(struct sk_buff *skb, const struct net_device *dev)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
|
|
if (nla_put_u8(skb, IFLA_TUN_TYPE, tun->flags & TUN_TYPE_MASK))
|
|
goto nla_put_failure;
|
|
if (uid_valid(tun->owner) &&
|
|
nla_put_u32(skb, IFLA_TUN_OWNER,
|
|
from_kuid_munged(current_user_ns(), tun->owner)))
|
|
goto nla_put_failure;
|
|
if (gid_valid(tun->group) &&
|
|
nla_put_u32(skb, IFLA_TUN_GROUP,
|
|
from_kgid_munged(current_user_ns(), tun->group)))
|
|
goto nla_put_failure;
|
|
if (nla_put_u8(skb, IFLA_TUN_PI, !(tun->flags & IFF_NO_PI)))
|
|
goto nla_put_failure;
|
|
if (nla_put_u8(skb, IFLA_TUN_VNET_HDR, !!(tun->flags & IFF_VNET_HDR)))
|
|
goto nla_put_failure;
|
|
if (nla_put_u8(skb, IFLA_TUN_PERSIST, !!(tun->flags & IFF_PERSIST)))
|
|
goto nla_put_failure;
|
|
if (nla_put_u8(skb, IFLA_TUN_MULTI_QUEUE,
|
|
!!(tun->flags & IFF_MULTI_QUEUE)))
|
|
goto nla_put_failure;
|
|
if (tun->flags & IFF_MULTI_QUEUE) {
|
|
if (nla_put_u32(skb, IFLA_TUN_NUM_QUEUES, tun->numqueues))
|
|
goto nla_put_failure;
|
|
if (nla_put_u32(skb, IFLA_TUN_NUM_DISABLED_QUEUES,
|
|
tun->numdisabled))
|
|
goto nla_put_failure;
|
|
}
|
|
|
|
return 0;
|
|
|
|
nla_put_failure:
|
|
return -EMSGSIZE;
|
|
}
|
|
|
|
static struct rtnl_link_ops tun_link_ops __read_mostly = {
|
|
.kind = DRV_NAME,
|
|
.priv_size = sizeof(struct tun_struct),
|
|
.setup = tun_setup,
|
|
.validate = tun_validate,
|
|
.get_size = tun_get_size,
|
|
.fill_info = tun_fill_info,
|
|
};
|
|
|
|
static void tun_sock_write_space(struct sock *sk)
|
|
{
|
|
struct tun_file *tfile;
|
|
wait_queue_head_t *wqueue;
|
|
|
|
if (!sock_writeable(sk))
|
|
return;
|
|
|
|
if (!test_and_clear_bit(SOCKWQ_ASYNC_NOSPACE, &sk->sk_socket->flags))
|
|
return;
|
|
|
|
wqueue = sk_sleep(sk);
|
|
if (wqueue && waitqueue_active(wqueue))
|
|
wake_up_interruptible_sync_poll(wqueue, EPOLLOUT |
|
|
EPOLLWRNORM | EPOLLWRBAND);
|
|
|
|
tfile = container_of(sk, struct tun_file, sk);
|
|
kill_fasync(&tfile->fasync, SIGIO, POLL_OUT);
|
|
}
|
|
|
|
static int tun_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len)
|
|
{
|
|
int ret;
|
|
struct tun_file *tfile = container_of(sock, struct tun_file, socket);
|
|
struct tun_struct *tun = tun_get(tfile);
|
|
|
|
if (!tun)
|
|
return -EBADFD;
|
|
|
|
ret = tun_get_user(tun, tfile, m->msg_control, &m->msg_iter,
|
|
m->msg_flags & MSG_DONTWAIT,
|
|
m->msg_flags & MSG_MORE);
|
|
tun_put(tun);
|
|
return ret;
|
|
}
|
|
|
|
static int tun_recvmsg(struct socket *sock, struct msghdr *m, size_t total_len,
|
|
int flags)
|
|
{
|
|
struct tun_file *tfile = container_of(sock, struct tun_file, socket);
|
|
struct tun_struct *tun = tun_get(tfile);
|
|
void *ptr = m->msg_control;
|
|
int ret;
|
|
|
|
if (!tun) {
|
|
ret = -EBADFD;
|
|
goto out_free;
|
|
}
|
|
|
|
if (flags & ~(MSG_DONTWAIT|MSG_TRUNC|MSG_ERRQUEUE)) {
|
|
ret = -EINVAL;
|
|
goto out_put_tun;
|
|
}
|
|
if (flags & MSG_ERRQUEUE) {
|
|
ret = sock_recv_errqueue(sock->sk, m, total_len,
|
|
SOL_PACKET, TUN_TX_TIMESTAMP);
|
|
goto out;
|
|
}
|
|
ret = tun_do_read(tun, tfile, &m->msg_iter, flags & MSG_DONTWAIT, ptr);
|
|
if (ret > (ssize_t)total_len) {
|
|
m->msg_flags |= MSG_TRUNC;
|
|
ret = flags & MSG_TRUNC ? ret : total_len;
|
|
}
|
|
out:
|
|
tun_put(tun);
|
|
return ret;
|
|
|
|
out_put_tun:
|
|
tun_put(tun);
|
|
out_free:
|
|
tun_ptr_free(ptr);
|
|
return ret;
|
|
}
|
|
|
|
static int tun_ptr_peek_len(void *ptr)
|
|
{
|
|
if (likely(ptr)) {
|
|
if (tun_is_xdp_frame(ptr)) {
|
|
struct xdp_frame *xdpf = tun_ptr_to_xdp(ptr);
|
|
|
|
return xdpf->len;
|
|
}
|
|
return __skb_array_len_with_tag(ptr);
|
|
} else {
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
static int tun_peek_len(struct socket *sock)
|
|
{
|
|
struct tun_file *tfile = container_of(sock, struct tun_file, socket);
|
|
struct tun_struct *tun;
|
|
int ret = 0;
|
|
|
|
tun = tun_get(tfile);
|
|
if (!tun)
|
|
return 0;
|
|
|
|
ret = PTR_RING_PEEK_CALL(&tfile->tx_ring, tun_ptr_peek_len);
|
|
tun_put(tun);
|
|
|
|
return ret;
|
|
}
|
|
|
|
/* Ops structure to mimic raw sockets with tun */
|
|
static const struct proto_ops tun_socket_ops = {
|
|
.peek_len = tun_peek_len,
|
|
.sendmsg = tun_sendmsg,
|
|
.recvmsg = tun_recvmsg,
|
|
};
|
|
|
|
static struct proto tun_proto = {
|
|
.name = "tun",
|
|
.owner = THIS_MODULE,
|
|
.obj_size = sizeof(struct tun_file),
|
|
};
|
|
|
|
static int tun_flags(struct tun_struct *tun)
|
|
{
|
|
return tun->flags & (TUN_FEATURES | IFF_PERSIST | IFF_TUN | IFF_TAP);
|
|
}
|
|
|
|
static ssize_t tun_show_flags(struct device *dev, struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(to_net_dev(dev));
|
|
return sprintf(buf, "0x%x\n", tun_flags(tun));
|
|
}
|
|
|
|
static ssize_t tun_show_owner(struct device *dev, struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(to_net_dev(dev));
|
|
return uid_valid(tun->owner)?
|
|
sprintf(buf, "%u\n",
|
|
from_kuid_munged(current_user_ns(), tun->owner)):
|
|
sprintf(buf, "-1\n");
|
|
}
|
|
|
|
static ssize_t tun_show_group(struct device *dev, struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(to_net_dev(dev));
|
|
return gid_valid(tun->group) ?
|
|
sprintf(buf, "%u\n",
|
|
from_kgid_munged(current_user_ns(), tun->group)):
|
|
sprintf(buf, "-1\n");
|
|
}
|
|
|
|
static DEVICE_ATTR(tun_flags, 0444, tun_show_flags, NULL);
|
|
static DEVICE_ATTR(owner, 0444, tun_show_owner, NULL);
|
|
static DEVICE_ATTR(group, 0444, tun_show_group, NULL);
|
|
|
|
static struct attribute *tun_dev_attrs[] = {
|
|
&dev_attr_tun_flags.attr,
|
|
&dev_attr_owner.attr,
|
|
&dev_attr_group.attr,
|
|
NULL
|
|
};
|
|
|
|
static const struct attribute_group tun_attr_group = {
|
|
.attrs = tun_dev_attrs
|
|
};
|
|
|
|
static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
|
|
{
|
|
struct tun_struct *tun;
|
|
struct tun_file *tfile = file->private_data;
|
|
struct net_device *dev;
|
|
int err;
|
|
|
|
if (tfile->detached)
|
|
return -EINVAL;
|
|
|
|
if ((ifr->ifr_flags & IFF_NAPI_FRAGS)) {
|
|
if (!capable(CAP_NET_ADMIN))
|
|
return -EPERM;
|
|
|
|
if (!(ifr->ifr_flags & IFF_NAPI) ||
|
|
(ifr->ifr_flags & TUN_TYPE_MASK) != IFF_TAP)
|
|
return -EINVAL;
|
|
}
|
|
|
|
dev = __dev_get_by_name(net, ifr->ifr_name);
|
|
if (dev) {
|
|
if (ifr->ifr_flags & IFF_TUN_EXCL)
|
|
return -EBUSY;
|
|
if ((ifr->ifr_flags & IFF_TUN) && dev->netdev_ops == &tun_netdev_ops)
|
|
tun = netdev_priv(dev);
|
|
else if ((ifr->ifr_flags & IFF_TAP) && dev->netdev_ops == &tap_netdev_ops)
|
|
tun = netdev_priv(dev);
|
|
else
|
|
return -EINVAL;
|
|
|
|
if (!!(ifr->ifr_flags & IFF_MULTI_QUEUE) !=
|
|
!!(tun->flags & IFF_MULTI_QUEUE))
|
|
return -EINVAL;
|
|
|
|
if (tun_not_capable(tun))
|
|
return -EPERM;
|
|
err = security_tun_dev_open(tun->security);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
err = tun_attach(tun, file, ifr->ifr_flags & IFF_NOFILTER,
|
|
ifr->ifr_flags & IFF_NAPI,
|
|
ifr->ifr_flags & IFF_NAPI_FRAGS, true);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
if (tun->flags & IFF_MULTI_QUEUE &&
|
|
(tun->numqueues + tun->numdisabled > 1)) {
|
|
/* One or more queue has already been attached, no need
|
|
* to initialize the device again.
|
|
*/
|
|
netdev_state_change(dev);
|
|
return 0;
|
|
}
|
|
|
|
tun->flags = (tun->flags & ~TUN_FEATURES) |
|
|
(ifr->ifr_flags & TUN_FEATURES);
|
|
|
|
netdev_state_change(dev);
|
|
} else {
|
|
char *name;
|
|
unsigned long flags = 0;
|
|
int queues = ifr->ifr_flags & IFF_MULTI_QUEUE ?
|
|
MAX_TAP_QUEUES : 1;
|
|
|
|
if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
|
|
return -EPERM;
|
|
err = security_tun_dev_create();
|
|
if (err < 0)
|
|
return err;
|
|
|
|
/* Set dev type */
|
|
if (ifr->ifr_flags & IFF_TUN) {
|
|
/* TUN device */
|
|
flags |= IFF_TUN;
|
|
name = "tun%d";
|
|
} else if (ifr->ifr_flags & IFF_TAP) {
|
|
/* TAP device */
|
|
flags |= IFF_TAP;
|
|
name = "tap%d";
|
|
} else
|
|
return -EINVAL;
|
|
|
|
if (*ifr->ifr_name)
|
|
name = ifr->ifr_name;
|
|
|
|
dev = alloc_netdev_mqs(sizeof(struct tun_struct), name,
|
|
NET_NAME_UNKNOWN, tun_setup, queues,
|
|
queues);
|
|
|
|
if (!dev)
|
|
return -ENOMEM;
|
|
err = dev_get_valid_name(net, dev, name);
|
|
if (err < 0)
|
|
goto err_free_dev;
|
|
|
|
dev_net_set(dev, net);
|
|
dev->rtnl_link_ops = &tun_link_ops;
|
|
dev->ifindex = tfile->ifindex;
|
|
dev->sysfs_groups[0] = &tun_attr_group;
|
|
|
|
tun = netdev_priv(dev);
|
|
tun->dev = dev;
|
|
tun->flags = flags;
|
|
tun->txflt.count = 0;
|
|
tun->vnet_hdr_sz = sizeof(struct virtio_net_hdr);
|
|
|
|
tun->align = NET_SKB_PAD;
|
|
tun->filter_attached = false;
|
|
tun->sndbuf = tfile->socket.sk->sk_sndbuf;
|
|
tun->rx_batched = 0;
|
|
RCU_INIT_POINTER(tun->steering_prog, NULL);
|
|
|
|
tun->pcpu_stats = netdev_alloc_pcpu_stats(struct tun_pcpu_stats);
|
|
if (!tun->pcpu_stats) {
|
|
err = -ENOMEM;
|
|
goto err_free_dev;
|
|
}
|
|
|
|
spin_lock_init(&tun->lock);
|
|
|
|
err = security_tun_dev_alloc_security(&tun->security);
|
|
if (err < 0)
|
|
goto err_free_stat;
|
|
|
|
tun_net_init(dev);
|
|
tun_flow_init(tun);
|
|
|
|
dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST |
|
|
TUN_USER_FEATURES | NETIF_F_HW_VLAN_CTAG_TX |
|
|
NETIF_F_HW_VLAN_STAG_TX;
|
|
dev->features = dev->hw_features | NETIF_F_LLTX;
|
|
dev->vlan_features = dev->features &
|
|
~(NETIF_F_HW_VLAN_CTAG_TX |
|
|
NETIF_F_HW_VLAN_STAG_TX);
|
|
|
|
tun->flags = (tun->flags & ~TUN_FEATURES) |
|
|
(ifr->ifr_flags & TUN_FEATURES);
|
|
|
|
INIT_LIST_HEAD(&tun->disabled);
|
|
err = tun_attach(tun, file, false, ifr->ifr_flags & IFF_NAPI,
|
|
ifr->ifr_flags & IFF_NAPI_FRAGS, false);
|
|
if (err < 0)
|
|
goto err_free_flow;
|
|
|
|
err = register_netdevice(tun->dev);
|
|
if (err < 0)
|
|
goto err_detach;
|
|
/* free_netdev() won't check refcnt, to aovid race
|
|
* with dev_put() we need publish tun after registration.
|
|
*/
|
|
rcu_assign_pointer(tfile->tun, tun);
|
|
}
|
|
|
|
netif_carrier_on(tun->dev);
|
|
|
|
tun_debug(KERN_INFO, tun, "tun_set_iff\n");
|
|
|
|
/* Make sure persistent devices do not get stuck in
|
|
* xoff state.
|
|
*/
|
|
if (netif_running(tun->dev))
|
|
netif_tx_wake_all_queues(tun->dev);
|
|
|
|
strcpy(ifr->ifr_name, tun->dev->name);
|
|
return 0;
|
|
|
|
err_detach:
|
|
tun_detach_all(dev);
|
|
/* register_netdevice() already called tun_free_netdev() */
|
|
goto err_free_dev;
|
|
|
|
err_free_flow:
|
|
tun_flow_uninit(tun);
|
|
security_tun_dev_free_security(tun->security);
|
|
err_free_stat:
|
|
free_percpu(tun->pcpu_stats);
|
|
err_free_dev:
|
|
free_netdev(dev);
|
|
return err;
|
|
}
|
|
|
|
static void tun_get_iff(struct net *net, struct tun_struct *tun,
|
|
struct ifreq *ifr)
|
|
{
|
|
tun_debug(KERN_INFO, tun, "tun_get_iff\n");
|
|
|
|
strcpy(ifr->ifr_name, tun->dev->name);
|
|
|
|
ifr->ifr_flags = tun_flags(tun);
|
|
|
|
}
|
|
|
|
/* This is like a cut-down ethtool ops, except done via tun fd so no
|
|
* privs required. */
|
|
static int set_offload(struct tun_struct *tun, unsigned long arg)
|
|
{
|
|
netdev_features_t features = 0;
|
|
|
|
if (arg & TUN_F_CSUM) {
|
|
features |= NETIF_F_HW_CSUM;
|
|
arg &= ~TUN_F_CSUM;
|
|
|
|
if (arg & (TUN_F_TSO4|TUN_F_TSO6)) {
|
|
if (arg & TUN_F_TSO_ECN) {
|
|
features |= NETIF_F_TSO_ECN;
|
|
arg &= ~TUN_F_TSO_ECN;
|
|
}
|
|
if (arg & TUN_F_TSO4)
|
|
features |= NETIF_F_TSO;
|
|
if (arg & TUN_F_TSO6)
|
|
features |= NETIF_F_TSO6;
|
|
arg &= ~(TUN_F_TSO4|TUN_F_TSO6);
|
|
}
|
|
|
|
arg &= ~TUN_F_UFO;
|
|
}
|
|
|
|
/* This gives the user a way to test for new features in future by
|
|
* trying to set them. */
|
|
if (arg)
|
|
return -EINVAL;
|
|
|
|
tun->set_features = features;
|
|
tun->dev->wanted_features &= ~TUN_USER_FEATURES;
|
|
tun->dev->wanted_features |= features;
|
|
netdev_update_features(tun->dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void tun_detach_filter(struct tun_struct *tun, int n)
|
|
{
|
|
int i;
|
|
struct tun_file *tfile;
|
|
|
|
for (i = 0; i < n; i++) {
|
|
tfile = rtnl_dereference(tun->tfiles[i]);
|
|
lock_sock(tfile->socket.sk);
|
|
sk_detach_filter(tfile->socket.sk);
|
|
release_sock(tfile->socket.sk);
|
|
}
|
|
|
|
tun->filter_attached = false;
|
|
}
|
|
|
|
static int tun_attach_filter(struct tun_struct *tun)
|
|
{
|
|
int i, ret = 0;
|
|
struct tun_file *tfile;
|
|
|
|
for (i = 0; i < tun->numqueues; i++) {
|
|
tfile = rtnl_dereference(tun->tfiles[i]);
|
|
lock_sock(tfile->socket.sk);
|
|
ret = sk_attach_filter(&tun->fprog, tfile->socket.sk);
|
|
release_sock(tfile->socket.sk);
|
|
if (ret) {
|
|
tun_detach_filter(tun, i);
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
tun->filter_attached = true;
|
|
return ret;
|
|
}
|
|
|
|
static void tun_set_sndbuf(struct tun_struct *tun)
|
|
{
|
|
struct tun_file *tfile;
|
|
int i;
|
|
|
|
for (i = 0; i < tun->numqueues; i++) {
|
|
tfile = rtnl_dereference(tun->tfiles[i]);
|
|
tfile->socket.sk->sk_sndbuf = tun->sndbuf;
|
|
}
|
|
}
|
|
|
|
static int tun_set_queue(struct file *file, struct ifreq *ifr)
|
|
{
|
|
struct tun_file *tfile = file->private_data;
|
|
struct tun_struct *tun;
|
|
int ret = 0;
|
|
|
|
rtnl_lock();
|
|
|
|
if (ifr->ifr_flags & IFF_ATTACH_QUEUE) {
|
|
tun = tfile->detached;
|
|
if (!tun) {
|
|
ret = -EINVAL;
|
|
goto unlock;
|
|
}
|
|
ret = security_tun_dev_attach_queue(tun->security);
|
|
if (ret < 0)
|
|
goto unlock;
|
|
ret = tun_attach(tun, file, false, tun->flags & IFF_NAPI,
|
|
tun->flags & IFF_NAPI_FRAGS, true);
|
|
} else if (ifr->ifr_flags & IFF_DETACH_QUEUE) {
|
|
tun = rtnl_dereference(tfile->tun);
|
|
if (!tun || !(tun->flags & IFF_MULTI_QUEUE) || tfile->detached)
|
|
ret = -EINVAL;
|
|
else
|
|
__tun_detach(tfile, false);
|
|
} else
|
|
ret = -EINVAL;
|
|
|
|
if (ret >= 0)
|
|
netdev_state_change(tun->dev);
|
|
|
|
unlock:
|
|
rtnl_unlock();
|
|
return ret;
|
|
}
|
|
|
|
static int tun_set_ebpf(struct tun_struct *tun, struct tun_prog **prog_p,
|
|
void __user *data)
|
|
{
|
|
struct bpf_prog *prog;
|
|
int fd;
|
|
|
|
if (copy_from_user(&fd, data, sizeof(fd)))
|
|
return -EFAULT;
|
|
|
|
if (fd == -1) {
|
|
prog = NULL;
|
|
} else {
|
|
prog = bpf_prog_get_type(fd, BPF_PROG_TYPE_SOCKET_FILTER);
|
|
if (IS_ERR(prog))
|
|
return PTR_ERR(prog);
|
|
}
|
|
|
|
return __tun_set_ebpf(tun, prog_p, prog);
|
|
}
|
|
|
|
static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
|
|
unsigned long arg, int ifreq_len)
|
|
{
|
|
struct tun_file *tfile = file->private_data;
|
|
struct net *net = sock_net(&tfile->sk);
|
|
struct tun_struct *tun;
|
|
void __user* argp = (void __user*)arg;
|
|
struct ifreq ifr;
|
|
kuid_t owner;
|
|
kgid_t group;
|
|
int sndbuf;
|
|
int vnet_hdr_sz;
|
|
unsigned int ifindex;
|
|
int le;
|
|
int ret;
|
|
bool do_notify = false;
|
|
|
|
#ifdef CONFIG_ANDROID_PARANOID_NETWORK
|
|
if (cmd != TUNGETIFF && !capable(CAP_NET_ADMIN)) {
|
|
return -EPERM;
|
|
}
|
|
#endif
|
|
|
|
if (cmd == TUNSETIFF || cmd == TUNSETQUEUE ||
|
|
(_IOC_TYPE(cmd) == SOCK_IOC_TYPE && cmd != SIOCGSKNS)) {
|
|
if (copy_from_user(&ifr, argp, ifreq_len))
|
|
return -EFAULT;
|
|
} else {
|
|
memset(&ifr, 0, sizeof(ifr));
|
|
}
|
|
if (cmd == TUNGETFEATURES) {
|
|
/* Currently this just means: "what IFF flags are valid?".
|
|
* This is needed because we never checked for invalid flags on
|
|
* TUNSETIFF.
|
|
*/
|
|
return put_user(IFF_TUN | IFF_TAP | TUN_FEATURES,
|
|
(unsigned int __user*)argp);
|
|
} else if (cmd == TUNSETQUEUE) {
|
|
return tun_set_queue(file, &ifr);
|
|
} else if (cmd == SIOCGSKNS) {
|
|
if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
|
|
return -EPERM;
|
|
return open_related_ns(&net->ns, get_net_ns);
|
|
}
|
|
|
|
ret = 0;
|
|
rtnl_lock();
|
|
|
|
tun = tun_get(tfile);
|
|
if (cmd == TUNSETIFF) {
|
|
ret = -EEXIST;
|
|
if (tun)
|
|
goto unlock;
|
|
|
|
ifr.ifr_name[IFNAMSIZ-1] = '\0';
|
|
|
|
ret = tun_set_iff(net, file, &ifr);
|
|
|
|
if (ret)
|
|
goto unlock;
|
|
|
|
if (copy_to_user(argp, &ifr, ifreq_len))
|
|
ret = -EFAULT;
|
|
goto unlock;
|
|
}
|
|
if (cmd == TUNSETIFINDEX) {
|
|
ret = -EPERM;
|
|
if (tun)
|
|
goto unlock;
|
|
|
|
ret = -EFAULT;
|
|
if (copy_from_user(&ifindex, argp, sizeof(ifindex)))
|
|
goto unlock;
|
|
|
|
ret = 0;
|
|
tfile->ifindex = ifindex;
|
|
goto unlock;
|
|
}
|
|
|
|
ret = -EBADFD;
|
|
if (!tun)
|
|
goto unlock;
|
|
|
|
tun_debug(KERN_INFO, tun, "tun_chr_ioctl cmd %u\n", cmd);
|
|
|
|
ret = 0;
|
|
switch (cmd) {
|
|
case TUNGETIFF:
|
|
tun_get_iff(current->nsproxy->net_ns, tun, &ifr);
|
|
|
|
if (tfile->detached)
|
|
ifr.ifr_flags |= IFF_DETACH_QUEUE;
|
|
if (!tfile->socket.sk->sk_filter)
|
|
ifr.ifr_flags |= IFF_NOFILTER;
|
|
|
|
if (copy_to_user(argp, &ifr, ifreq_len))
|
|
ret = -EFAULT;
|
|
break;
|
|
|
|
case TUNSETNOCSUM:
|
|
/* Disable/Enable checksum */
|
|
|
|
/* [unimplemented] */
|
|
tun_debug(KERN_INFO, tun, "ignored: set checksum %s\n",
|
|
arg ? "disabled" : "enabled");
|
|
break;
|
|
|
|
case TUNSETPERSIST:
|
|
/* Disable/Enable persist mode. Keep an extra reference to the
|
|
* module to prevent the module being unprobed.
|
|
*/
|
|
if (arg && !(tun->flags & IFF_PERSIST)) {
|
|
tun->flags |= IFF_PERSIST;
|
|
__module_get(THIS_MODULE);
|
|
do_notify = true;
|
|
}
|
|
if (!arg && (tun->flags & IFF_PERSIST)) {
|
|
tun->flags &= ~IFF_PERSIST;
|
|
module_put(THIS_MODULE);
|
|
do_notify = true;
|
|
}
|
|
|
|
tun_debug(KERN_INFO, tun, "persist %s\n",
|
|
arg ? "enabled" : "disabled");
|
|
break;
|
|
|
|
case TUNSETOWNER:
|
|
/* Set owner of the device */
|
|
owner = make_kuid(current_user_ns(), arg);
|
|
if (!uid_valid(owner)) {
|
|
ret = -EINVAL;
|
|
break;
|
|
}
|
|
tun->owner = owner;
|
|
do_notify = true;
|
|
tun_debug(KERN_INFO, tun, "owner set to %u\n",
|
|
from_kuid(&init_user_ns, tun->owner));
|
|
break;
|
|
|
|
case TUNSETGROUP:
|
|
/* Set group of the device */
|
|
group = make_kgid(current_user_ns(), arg);
|
|
if (!gid_valid(group)) {
|
|
ret = -EINVAL;
|
|
break;
|
|
}
|
|
tun->group = group;
|
|
do_notify = true;
|
|
tun_debug(KERN_INFO, tun, "group set to %u\n",
|
|
from_kgid(&init_user_ns, tun->group));
|
|
break;
|
|
|
|
case TUNSETLINK:
|
|
/* Only allow setting the type when the interface is down */
|
|
if (tun->dev->flags & IFF_UP) {
|
|
tun_debug(KERN_INFO, tun,
|
|
"Linktype set failed because interface is up\n");
|
|
ret = -EBUSY;
|
|
} else {
|
|
tun->dev->type = (int) arg;
|
|
tun_debug(KERN_INFO, tun, "linktype set to %d\n",
|
|
tun->dev->type);
|
|
ret = 0;
|
|
}
|
|
break;
|
|
|
|
#ifdef TUN_DEBUG
|
|
case TUNSETDEBUG:
|
|
tun->debug = arg;
|
|
break;
|
|
#endif
|
|
case TUNSETOFFLOAD:
|
|
ret = set_offload(tun, arg);
|
|
break;
|
|
|
|
case TUNSETTXFILTER:
|
|
/* Can be set only for TAPs */
|
|
ret = -EINVAL;
|
|
if ((tun->flags & TUN_TYPE_MASK) != IFF_TAP)
|
|
break;
|
|
ret = update_filter(&tun->txflt, (void __user *)arg);
|
|
break;
|
|
|
|
case SIOCGIFHWADDR:
|
|
/* Get hw address */
|
|
memcpy(ifr.ifr_hwaddr.sa_data, tun->dev->dev_addr, ETH_ALEN);
|
|
ifr.ifr_hwaddr.sa_family = tun->dev->type;
|
|
if (copy_to_user(argp, &ifr, ifreq_len))
|
|
ret = -EFAULT;
|
|
break;
|
|
|
|
case SIOCSIFHWADDR:
|
|
/* Set hw address */
|
|
tun_debug(KERN_DEBUG, tun, "set hw address: %pM\n",
|
|
ifr.ifr_hwaddr.sa_data);
|
|
|
|
ret = dev_set_mac_address(tun->dev, &ifr.ifr_hwaddr);
|
|
break;
|
|
|
|
case TUNGETSNDBUF:
|
|
sndbuf = tfile->socket.sk->sk_sndbuf;
|
|
if (copy_to_user(argp, &sndbuf, sizeof(sndbuf)))
|
|
ret = -EFAULT;
|
|
break;
|
|
|
|
case TUNSETSNDBUF:
|
|
if (copy_from_user(&sndbuf, argp, sizeof(sndbuf))) {
|
|
ret = -EFAULT;
|
|
break;
|
|
}
|
|
if (sndbuf <= 0) {
|
|
ret = -EINVAL;
|
|
break;
|
|
}
|
|
|
|
tun->sndbuf = sndbuf;
|
|
tun_set_sndbuf(tun);
|
|
break;
|
|
|
|
case TUNGETVNETHDRSZ:
|
|
vnet_hdr_sz = tun->vnet_hdr_sz;
|
|
if (copy_to_user(argp, &vnet_hdr_sz, sizeof(vnet_hdr_sz)))
|
|
ret = -EFAULT;
|
|
break;
|
|
|
|
case TUNSETVNETHDRSZ:
|
|
if (copy_from_user(&vnet_hdr_sz, argp, sizeof(vnet_hdr_sz))) {
|
|
ret = -EFAULT;
|
|
break;
|
|
}
|
|
if (vnet_hdr_sz < (int)sizeof(struct virtio_net_hdr)) {
|
|
ret = -EINVAL;
|
|
break;
|
|
}
|
|
|
|
tun->vnet_hdr_sz = vnet_hdr_sz;
|
|
break;
|
|
|
|
case TUNGETVNETLE:
|
|
le = !!(tun->flags & TUN_VNET_LE);
|
|
if (put_user(le, (int __user *)argp))
|
|
ret = -EFAULT;
|
|
break;
|
|
|
|
case TUNSETVNETLE:
|
|
if (get_user(le, (int __user *)argp)) {
|
|
ret = -EFAULT;
|
|
break;
|
|
}
|
|
if (le)
|
|
tun->flags |= TUN_VNET_LE;
|
|
else
|
|
tun->flags &= ~TUN_VNET_LE;
|
|
break;
|
|
|
|
case TUNGETVNETBE:
|
|
ret = tun_get_vnet_be(tun, argp);
|
|
break;
|
|
|
|
case TUNSETVNETBE:
|
|
ret = tun_set_vnet_be(tun, argp);
|
|
break;
|
|
|
|
case TUNATTACHFILTER:
|
|
/* Can be set only for TAPs */
|
|
ret = -EINVAL;
|
|
if ((tun->flags & TUN_TYPE_MASK) != IFF_TAP)
|
|
break;
|
|
ret = -EFAULT;
|
|
if (copy_from_user(&tun->fprog, argp, sizeof(tun->fprog)))
|
|
break;
|
|
|
|
ret = tun_attach_filter(tun);
|
|
break;
|
|
|
|
case TUNDETACHFILTER:
|
|
/* Can be set only for TAPs */
|
|
ret = -EINVAL;
|
|
if ((tun->flags & TUN_TYPE_MASK) != IFF_TAP)
|
|
break;
|
|
ret = 0;
|
|
tun_detach_filter(tun, tun->numqueues);
|
|
break;
|
|
|
|
case TUNGETFILTER:
|
|
ret = -EINVAL;
|
|
if ((tun->flags & TUN_TYPE_MASK) != IFF_TAP)
|
|
break;
|
|
ret = -EFAULT;
|
|
if (copy_to_user(argp, &tun->fprog, sizeof(tun->fprog)))
|
|
break;
|
|
ret = 0;
|
|
break;
|
|
|
|
case TUNSETSTEERINGEBPF:
|
|
ret = tun_set_ebpf(tun, &tun->steering_prog, argp);
|
|
break;
|
|
|
|
case TUNSETFILTEREBPF:
|
|
ret = tun_set_ebpf(tun, &tun->filter_prog, argp);
|
|
break;
|
|
|
|
default:
|
|
ret = -EINVAL;
|
|
break;
|
|
}
|
|
|
|
if (do_notify)
|
|
netdev_state_change(tun->dev);
|
|
|
|
unlock:
|
|
rtnl_unlock();
|
|
if (tun)
|
|
tun_put(tun);
|
|
return ret;
|
|
}
|
|
|
|
static long tun_chr_ioctl(struct file *file,
|
|
unsigned int cmd, unsigned long arg)
|
|
{
|
|
return __tun_chr_ioctl(file, cmd, arg, sizeof (struct ifreq));
|
|
}
|
|
|
|
#ifdef CONFIG_COMPAT
|
|
static long tun_chr_compat_ioctl(struct file *file,
|
|
unsigned int cmd, unsigned long arg)
|
|
{
|
|
switch (cmd) {
|
|
case TUNSETIFF:
|
|
case TUNGETIFF:
|
|
case TUNSETTXFILTER:
|
|
case TUNGETSNDBUF:
|
|
case TUNSETSNDBUF:
|
|
case SIOCGIFHWADDR:
|
|
case SIOCSIFHWADDR:
|
|
arg = (unsigned long)compat_ptr(arg);
|
|
break;
|
|
default:
|
|
arg = (compat_ulong_t)arg;
|
|
break;
|
|
}
|
|
|
|
/*
|
|
* compat_ifreq is shorter than ifreq, so we must not access beyond
|
|
* the end of that structure. All fields that are used in this
|
|
* driver are compatible though, we don't need to convert the
|
|
* contents.
|
|
*/
|
|
return __tun_chr_ioctl(file, cmd, arg, sizeof(struct compat_ifreq));
|
|
}
|
|
#endif /* CONFIG_COMPAT */
|
|
|
|
static int tun_chr_fasync(int fd, struct file *file, int on)
|
|
{
|
|
struct tun_file *tfile = file->private_data;
|
|
int ret;
|
|
|
|
if ((ret = fasync_helper(fd, file, on, &tfile->fasync)) < 0)
|
|
goto out;
|
|
|
|
if (on) {
|
|
__f_setown(file, task_pid(current), PIDTYPE_TGID, 0);
|
|
tfile->flags |= TUN_FASYNC;
|
|
} else
|
|
tfile->flags &= ~TUN_FASYNC;
|
|
ret = 0;
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
static int tun_chr_open(struct inode *inode, struct file * file)
|
|
{
|
|
struct net *net = current->nsproxy->net_ns;
|
|
struct tun_file *tfile;
|
|
|
|
DBG1(KERN_INFO, "tunX: tun_chr_open\n");
|
|
|
|
tfile = (struct tun_file *)sk_alloc(net, AF_UNSPEC, GFP_KERNEL,
|
|
&tun_proto, 0);
|
|
if (!tfile)
|
|
return -ENOMEM;
|
|
if (ptr_ring_init(&tfile->tx_ring, 0, GFP_KERNEL)) {
|
|
sk_free(&tfile->sk);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
mutex_init(&tfile->napi_mutex);
|
|
RCU_INIT_POINTER(tfile->tun, NULL);
|
|
tfile->flags = 0;
|
|
tfile->ifindex = 0;
|
|
|
|
init_waitqueue_head(&tfile->wq.wait);
|
|
RCU_INIT_POINTER(tfile->socket.wq, &tfile->wq);
|
|
|
|
tfile->socket.file = file;
|
|
tfile->socket.ops = &tun_socket_ops;
|
|
|
|
sock_init_data(&tfile->socket, &tfile->sk);
|
|
|
|
tfile->sk.sk_write_space = tun_sock_write_space;
|
|
tfile->sk.sk_sndbuf = INT_MAX;
|
|
|
|
file->private_data = tfile;
|
|
INIT_LIST_HEAD(&tfile->next);
|
|
|
|
sock_set_flag(&tfile->sk, SOCK_ZEROCOPY);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int tun_chr_close(struct inode *inode, struct file *file)
|
|
{
|
|
struct tun_file *tfile = file->private_data;
|
|
|
|
tun_detach(tfile, true);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_PROC_FS
|
|
static void tun_chr_show_fdinfo(struct seq_file *m, struct file *file)
|
|
{
|
|
struct tun_file *tfile = file->private_data;
|
|
struct tun_struct *tun;
|
|
struct ifreq ifr;
|
|
|
|
memset(&ifr, 0, sizeof(ifr));
|
|
|
|
rtnl_lock();
|
|
tun = tun_get(tfile);
|
|
if (tun)
|
|
tun_get_iff(current->nsproxy->net_ns, tun, &ifr);
|
|
rtnl_unlock();
|
|
|
|
if (tun)
|
|
tun_put(tun);
|
|
|
|
seq_printf(m, "iff:\t%s\n", ifr.ifr_name);
|
|
}
|
|
#endif
|
|
|
|
static const struct file_operations tun_fops = {
|
|
.owner = THIS_MODULE,
|
|
.llseek = no_llseek,
|
|
.read_iter = tun_chr_read_iter,
|
|
.write_iter = tun_chr_write_iter,
|
|
.poll = tun_chr_poll,
|
|
.unlocked_ioctl = tun_chr_ioctl,
|
|
#ifdef CONFIG_COMPAT
|
|
.compat_ioctl = tun_chr_compat_ioctl,
|
|
#endif
|
|
.open = tun_chr_open,
|
|
.release = tun_chr_close,
|
|
.fasync = tun_chr_fasync,
|
|
#ifdef CONFIG_PROC_FS
|
|
.show_fdinfo = tun_chr_show_fdinfo,
|
|
#endif
|
|
};
|
|
|
|
static struct miscdevice tun_miscdev = {
|
|
.minor = TUN_MINOR,
|
|
.name = "tun",
|
|
.nodename = "net/tun",
|
|
.fops = &tun_fops,
|
|
};
|
|
|
|
/* ethtool interface */
|
|
|
|
static void tun_default_link_ksettings(struct net_device *dev,
|
|
struct ethtool_link_ksettings *cmd)
|
|
{
|
|
ethtool_link_ksettings_zero_link_mode(cmd, supported);
|
|
ethtool_link_ksettings_zero_link_mode(cmd, advertising);
|
|
cmd->base.speed = SPEED_10;
|
|
cmd->base.duplex = DUPLEX_FULL;
|
|
cmd->base.port = PORT_TP;
|
|
cmd->base.phy_address = 0;
|
|
cmd->base.autoneg = AUTONEG_DISABLE;
|
|
}
|
|
|
|
static int tun_get_link_ksettings(struct net_device *dev,
|
|
struct ethtool_link_ksettings *cmd)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
|
|
memcpy(cmd, &tun->link_ksettings, sizeof(*cmd));
|
|
return 0;
|
|
}
|
|
|
|
static int tun_set_link_ksettings(struct net_device *dev,
|
|
const struct ethtool_link_ksettings *cmd)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
|
|
memcpy(&tun->link_ksettings, cmd, sizeof(*cmd));
|
|
return 0;
|
|
}
|
|
|
|
static void tun_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
|
|
strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
|
|
strlcpy(info->version, DRV_VERSION, sizeof(info->version));
|
|
|
|
switch (tun->flags & TUN_TYPE_MASK) {
|
|
case IFF_TUN:
|
|
strlcpy(info->bus_info, "tun", sizeof(info->bus_info));
|
|
break;
|
|
case IFF_TAP:
|
|
strlcpy(info->bus_info, "tap", sizeof(info->bus_info));
|
|
break;
|
|
}
|
|
}
|
|
|
|
static u32 tun_get_msglevel(struct net_device *dev)
|
|
{
|
|
#ifdef TUN_DEBUG
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
return tun->debug;
|
|
#else
|
|
return -EOPNOTSUPP;
|
|
#endif
|
|
}
|
|
|
|
static void tun_set_msglevel(struct net_device *dev, u32 value)
|
|
{
|
|
#ifdef TUN_DEBUG
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
tun->debug = value;
|
|
#endif
|
|
}
|
|
|
|
static int tun_get_coalesce(struct net_device *dev,
|
|
struct ethtool_coalesce *ec)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
|
|
ec->rx_max_coalesced_frames = tun->rx_batched;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int tun_set_coalesce(struct net_device *dev,
|
|
struct ethtool_coalesce *ec)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
|
|
if (ec->rx_max_coalesced_frames > NAPI_POLL_WEIGHT)
|
|
tun->rx_batched = NAPI_POLL_WEIGHT;
|
|
else
|
|
tun->rx_batched = ec->rx_max_coalesced_frames;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct ethtool_ops tun_ethtool_ops = {
|
|
.get_drvinfo = tun_get_drvinfo,
|
|
.get_msglevel = tun_get_msglevel,
|
|
.set_msglevel = tun_set_msglevel,
|
|
.get_link = ethtool_op_get_link,
|
|
.get_ts_info = ethtool_op_get_ts_info,
|
|
.get_coalesce = tun_get_coalesce,
|
|
.set_coalesce = tun_set_coalesce,
|
|
.get_link_ksettings = tun_get_link_ksettings,
|
|
.set_link_ksettings = tun_set_link_ksettings,
|
|
};
|
|
|
|
static int tun_queue_resize(struct tun_struct *tun)
|
|
{
|
|
struct net_device *dev = tun->dev;
|
|
struct tun_file *tfile;
|
|
struct ptr_ring **rings;
|
|
int n = tun->numqueues + tun->numdisabled;
|
|
int ret, i;
|
|
|
|
rings = kmalloc_array(n, sizeof(*rings), GFP_KERNEL);
|
|
if (!rings)
|
|
return -ENOMEM;
|
|
|
|
for (i = 0; i < tun->numqueues; i++) {
|
|
tfile = rtnl_dereference(tun->tfiles[i]);
|
|
rings[i] = &tfile->tx_ring;
|
|
}
|
|
list_for_each_entry(tfile, &tun->disabled, next)
|
|
rings[i++] = &tfile->tx_ring;
|
|
|
|
ret = ptr_ring_resize_multiple(rings, n,
|
|
dev->tx_queue_len, GFP_KERNEL,
|
|
tun_ptr_free);
|
|
|
|
kfree(rings);
|
|
return ret;
|
|
}
|
|
|
|
static int tun_device_event(struct notifier_block *unused,
|
|
unsigned long event, void *ptr)
|
|
{
|
|
struct net_device *dev = netdev_notifier_info_to_dev(ptr);
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
int i;
|
|
|
|
if (dev->rtnl_link_ops != &tun_link_ops)
|
|
return NOTIFY_DONE;
|
|
|
|
switch (event) {
|
|
case NETDEV_CHANGE_TX_QUEUE_LEN:
|
|
if (tun_queue_resize(tun))
|
|
return NOTIFY_BAD;
|
|
break;
|
|
case NETDEV_UP:
|
|
for (i = 0; i < tun->numqueues; i++) {
|
|
struct tun_file *tfile;
|
|
|
|
tfile = rtnl_dereference(tun->tfiles[i]);
|
|
tfile->socket.sk->sk_write_space(tfile->socket.sk);
|
|
}
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return NOTIFY_DONE;
|
|
}
|
|
|
|
static struct notifier_block tun_notifier_block __read_mostly = {
|
|
.notifier_call = tun_device_event,
|
|
};
|
|
|
|
static int __init tun_init(void)
|
|
{
|
|
int ret = 0;
|
|
|
|
pr_info("%s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
|
|
|
|
ret = rtnl_link_register(&tun_link_ops);
|
|
if (ret) {
|
|
pr_err("Can't register link_ops\n");
|
|
goto err_linkops;
|
|
}
|
|
|
|
ret = misc_register(&tun_miscdev);
|
|
if (ret) {
|
|
pr_err("Can't register misc device %d\n", TUN_MINOR);
|
|
goto err_misc;
|
|
}
|
|
|
|
ret = register_netdevice_notifier(&tun_notifier_block);
|
|
if (ret) {
|
|
pr_err("Can't register netdevice notifier\n");
|
|
goto err_notifier;
|
|
}
|
|
|
|
return 0;
|
|
|
|
err_notifier:
|
|
misc_deregister(&tun_miscdev);
|
|
err_misc:
|
|
rtnl_link_unregister(&tun_link_ops);
|
|
err_linkops:
|
|
return ret;
|
|
}
|
|
|
|
static void tun_cleanup(void)
|
|
{
|
|
misc_deregister(&tun_miscdev);
|
|
rtnl_link_unregister(&tun_link_ops);
|
|
unregister_netdevice_notifier(&tun_notifier_block);
|
|
}
|
|
|
|
/* Get an underlying socket object from tun file. Returns error unless file is
|
|
* attached to a device. The returned object works like a packet socket, it
|
|
* can be used for sock_sendmsg/sock_recvmsg. The caller is responsible for
|
|
* holding a reference to the file for as long as the socket is in use. */
|
|
struct socket *tun_get_socket(struct file *file)
|
|
{
|
|
struct tun_file *tfile;
|
|
if (file->f_op != &tun_fops)
|
|
return ERR_PTR(-EINVAL);
|
|
tfile = file->private_data;
|
|
if (!tfile)
|
|
return ERR_PTR(-EBADFD);
|
|
return &tfile->socket;
|
|
}
|
|
EXPORT_SYMBOL_GPL(tun_get_socket);
|
|
|
|
struct ptr_ring *tun_get_tx_ring(struct file *file)
|
|
{
|
|
struct tun_file *tfile;
|
|
|
|
if (file->f_op != &tun_fops)
|
|
return ERR_PTR(-EINVAL);
|
|
tfile = file->private_data;
|
|
if (!tfile)
|
|
return ERR_PTR(-EBADFD);
|
|
return &tfile->tx_ring;
|
|
}
|
|
EXPORT_SYMBOL_GPL(tun_get_tx_ring);
|
|
|
|
module_init(tun_init);
|
|
module_exit(tun_cleanup);
|
|
MODULE_DESCRIPTION(DRV_DESCRIPTION);
|
|
MODULE_AUTHOR(DRV_COPYRIGHT);
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS_MISCDEV(TUN_MINOR);
|
|
MODULE_ALIAS("devname:net/tun");
|