mirror of
https://github.com/rd-stuffs/msm-4.14.git
synced 2025-02-20 11:45:48 +08:00
* refs/heads/tmp-816f245: Revert "clk: qcom: rcg2: Don't crash if our parent can't be found; return an error" Reverting crypto patches Reverting incremental fs changes Linux 4.14.180 cgroup, netclassid: remove double cond_resched mac80211: add ieee80211_is_any_nullfunc() ALSA: hda: Match both PCI ID and SSID for driver blacklist tracing: Reverse the order of trace_types_lock and event_mutex sctp: Fix SHUTDOWN CTSN Ack in the peer restart case net: systemport: suppress warnings on failed Rx SKB allocations net: bcmgenet: suppress warnings on failed Rx SKB allocations lib/mpi: Fix building for powerpc with clang net: dsa: b53: Rework ARL bin logic scripts/config: allow colons in option strings for sed s390/ftrace: fix potential crashes when switching tracers cifs: protect updating server->dstaddr with a spinlock net: stmmac: Fix sub-second increment net: stmmac: fix enabling socfpga's ptp_ref_clock wimax/i2400m: Fix potential urb refcnt leak ASoC: codecs: hdac_hdmi: Fix incorrect use of list_for_each_entry ASoC: rsnd: Fix HDMI channel mapping for multi-SSI mode ASoC: sgtl5000: Fix VAG power-on handling selftests/ipc: Fix test failure seen after initial test run ASoC: topology: Check return value of pcm_new_ver powerpc/pci/of: Parse unassigned resources vhost: vsock: kick send_pkt worker once device is started ANDROID: arm64: fix a mismerge in proc.S Linux 4.14.179 selinux: properly handle multiple messages in selinux_netlink_send() dmaengine: dmatest: Fix iteration non-stop logic nfs: Fix potential posix_acl refcnt leak in nfs3_set_acl ALSA: opti9xx: shut up gcc-10 range warning iommu/amd: Fix legacy interrupt remapping for x2APIC-enabled system scsi: target/iblock: fix WRITE SAME zeroing iommu/qcom: Fix local_base status check vfio/type1: Fix VA->PA translation for PFNMAP VMAs in vaddr_get_pfn() vfio: avoid possible overflow in vfio_iommu_type1_pin_pages RDMA/mlx4: Initialize ib_spec on the stack RDMA/mlx5: Set GRH fields in query QP on RoCE dm verity fec: fix hash block number in verity_fec_decode PM: hibernate: Freeze kernel threads in software_resume() PM: ACPI: Output correct message on target power state ALSA: pcm: oss: Place the plugin buffer overflow checks correctly ALSA: hda/hdmi: fix without unlocked before return ALSA: hda/realtek - Two front mics on a Lenovo ThinkCenter mmc: sdhci-pci: Fix eMMC driver strength for BYT-based controllers mmc: sdhci-xenon: fix annoying 1.8V regulator warning btrfs: fix partial loss of prealloc extent past i_size after fsync btrfs: fix block group leak when removing fails drm/qxl: qxl_release use after free drm/qxl: qxl_release leak in qxl_hw_surface_alloc() drm/qxl: qxl_release leak in qxl_draw_dirty_fb() drm/edid: Fix off-by-one in DispID DTD pixel clock ext4: fix special inode number checks in __ext4_iget() ANDROID: Incremental fs: Fix issues with very large files Linux 4.14.178 propagate_one(): mnt_set_mountpoint() needs mount_lock ext4: check for non-zero journal inum in ext4_calculate_overhead qed: Fix use after free in qed_chain_free ext4: unsigned int compared against zero ext4: fix block validity checks for journal inodes using indirect blocks ext4: don't perform block validity checks on the journal inode ext4: protect journal inode's blocks using block_validity ext4: avoid declaring fs inconsistent due to invalid file handles hwmon: (jc42) Fix name to have no illegal characters ext4: convert BUG_ON's to WARN_ON's in mballoc.c ext4: increase wait time needed before reuse of deleted inode numbers ext4: use matching invalidatepage in ext4_writepage arm64: Delete the space separator in __emit_inst xen/xenbus: ensure xenbus_map_ring_valloc() returns proper grant status objtool: Support Clang non-section symbols in ORC dump objtool: Fix CONFIG_UBSAN_TRAP unreachable warnings scsi: target: fix PR IN / READ FULL STATUS for FC xfs: fix partially uninitialized structure in xfs_reflink_remap_extent x86: hyperv: report value of misc_features bpf, x86: Fix encoding for lower 8-bit registers in BPF_STX BPF_B mm: shmem: disable interrupt when acquiring info->lock in userfaultfd_copy path perf/core: fix parent pid/tid in task exit events ARM: dts: bcm283x: Disable dsi0 node net/cxgb4: Check the return from t4_query_params properly i2c: altera: use proper variable to hold errno nfsd: memory corruption in nfsd4_lock() iio:ad7797: Use correct attribute_group usb: gadget: udc: bdc: Remove unnecessary NULL checks in bdc_req_complete usb: dwc3: gadget: Do link recovery for SS and SSP binder: take read mode of mmap_sem in binder_alloc_free_page() include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap mtd: cfi: fix deadloop in cfi_cmdset_0002.c do_write_buffer remoteproc: Fix wrong rvring index computation xfs: Fix deadlock between AGI and AGF with RENAME_WHITEOUT xfs: validate sb_logsunit is a multiple of the fs blocksize serial: sh-sci: Make sure status register SCxSR is read in correct sequence usb: f_fs: Clear OS Extended descriptor counts to zero in ffs_data_reset() UAS: fix deadlock in error handling and PM flushing work UAS: no use logging any details in case of ENODEV cdc-acm: introduce a cool down cdc-acm: close race betrween suspend() and acm_softint staging: vt6656: Power save stop wake_up_count wrap around. staging: vt6656: Fix pairwise key entry save. staging: vt6656: Fix drivers TBTT timing counter. staging: vt6656: Fix calling conditions of vnt_set_bss_mode staging: vt6656: Don't set RCR_MULTICAST or RCR_BROADCAST by default. vt: don't hardcode the mem allocation upper bound staging: comedi: Fix comedi_device refcnt leak in comedi_open staging: comedi: dt2815: fix writing hi byte of analog output powerpc/setup_64: Set cache-line-size based on cache-block-size ARM: imx: provide v7_cpu_resume() only on ARM_CPU_SUSPEND=y iwlwifi: pcie: actually release queue memory in TVQM ASoC: dapm: fixup dapm kcontrol widget audit: check the length of userspace generated audit records usb-storage: Add unusual_devs entry for JMicron JMS566 tty: rocket, avoid OOB access tty: hvc: fix buffer overflow during hvc_alloc(). KVM: VMX: Enable machine check support for 32bit targets KVM: Check validity of resolved slot when searching memslots tpm: ibmvtpm: retry on H_CLOSED in tpm_ibmvtpm_send() tpm/tpm_tis: Free IRQ if probing fails ALSA: usb-audio: Filter out unsupported sample rates on Focusrite devices ALSA: usb-audio: Fix usb audio refcnt leak when getting spdif ALSA: hda/realtek - Add new codec supported for ALC245 ALSA: usx2y: Fix potential NULL dereference tools/vm: fix cross-compile build mm/ksm: fix NULL pointer dereference when KSM zero page is enabled mm/hugetlb: fix a addressing exception caused by huge_pte_offset vmalloc: fix remap_vmalloc_range() bounds checks overflow.h: Add arithmetic shift helper USB: hub: Fix handling of connect changes during sleep USB: core: Fix free-while-in-use bug in the USB S-Glibrary USB: early: Handle AMD's spec-compliant identifiers, too USB: Add USB_QUIRK_DELAY_CTRL_MSG and USB_QUIRK_DELAY_INIT for Corsair K70 RGB RAPIDFIRE USB: sisusbvga: Change port variable from signed to unsigned fs/namespace.c: fix mountpoint reference counter race iio: xilinx-xadc: Fix sequencer configuration for aux channels in simultaneous mode iio: xilinx-xadc: Fix clearing interrupt when enabling trigger iio: xilinx-xadc: Fix ADC-B powerdown iio: adc: stm32-adc: fix sleep in atomic context ALSA: hda: Remove ASUS ROG Zenith from the blacklist KEYS: Avoid false positive ENOMEM error on key read vrf: Check skb for XFRM_TRANSFORMED flag xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish net: dsa: b53: Fix ARL register definitions team: fix hang in team_mode_get() tcp: cache line align MAX_TCP_HEADER net/x25: Fix x25_neigh refcnt leak when receiving frame net: netrom: Fix potential nr_neigh refcnt leak in nr_add_node net: bcmgenet: correct per TX/RX ring statistics macvlan: fix null dereference in macvlan_device_event() macsec: avoid to set wrong mtu ipv6: fix restrict IPV6_ADDRFORM operation cxgb4: fix large delays in PTP synchronization mm, slub: restore the original intention of prefetch_freepointer() PCI/ASPM: Allow re-enabling Clock PM perf/core: Disable page faults when getting phys address pwm: bcm2835: Dynamically allocate base pwm: renesas-tpu: Fix late Runtime PM enablement s390/cio: avoid duplicated 'ADD' uevents ipc/util.c: sysvipc_find_ipc() should increase position index selftests: kmod: fix handling test numbers above 9 kernel/gcov/fs.c: gcov_seq_next() should increase position index ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map() scsi: iscsi: Report unbind session event when the target has been removed pwm: rcar: Fix late Runtime PM enablement ceph: don't skip updating wanted caps when cap is stale ceph: return ceph_mdsc_do_request() errors from __get_parent() scsi: lpfc: Fix kasan slab-out-of-bounds error in lpfc_unreg_login watchdog: reset last_hw_keepalive time at start vti4: removed duplicate log message. crypto: mxs-dcp - make symbols 'sha1_null_hash' and 'sha256_null_hash' static drm/msm: Use the correct dma_sync calls harder keys: Fix the use of the C++ keyword "private" in uapi/linux/keyctl.h net: ipv4: avoid unused variable warning for sysctl net: ipv4: emulate READ_ONCE() on ->hdrincl bit-field in raw_sendmsg() ext4: fix extent_status fragmentation for plain files FROMGIT: f2fs: fix missing check for f2fs_unlock_op ANDROID: Fix kernel build regressions from virtio-gpu-next patches ANDROID: Incremental fs: Add setattr call ANDROID: cuttlefish_defconfig: enable LTO and CFI ANDROID: x86: map CFI jump tables in pti_clone_entry_text ANDROID: crypto: aesni: fix function types for aesni_(enc|dec) ANDROID: x86: disable CFI for do_syscall_* ANDROID: BACKPORT: x86, module: Ignore __typeid__ relocations ANDROID: BACKPORT: x86, relocs: Ignore __typeid__ relocations ANDROID: BACKPORT: x86/extable: Do not mark exception callback as CFI FROMLIST: crypto, x86/sha: Eliminate casts on asm implementations UPSTREAM: crypto: x86 - Rename functions to avoid conflict with crypto/sha256.h BACKPORT: x86/vmlinux: Actually use _etext for the end of the text segment ANDROID: x86: disable STACK_VALIDATION with LTO_CLANG ANDROID: x86: add support for CONFIG_LTO_CLANG ANDROID: x86/vdso: disable LTO only for VDSO ANDROID: x86/cpu/vmware: use the full form of inl in VMWARE_PORT UPSTREAM: x86/build/lto: Fix truncated .bss with -fdata-sections ANDROID: kbuild: don't select LD_DEAD_CODE_DATA_ELIMINATION with LTO ANDROID: kbuild: export LTO and CFI flags ANDROID: cfi: remove unnecessary <asm/memory.h> include ANDROID: drm/virtio: rebase to latest virgl/drm-misc-next (take 2) UPSTREAM: sysrq: Use panic() to force a crash ANDROID: Incremental fs: Use simple compression in log buffer ANDROID: dm-bow: Fix not to skip trim at framented range ANDROID: Remove VLA from uid_sys_stats.c ANDROID: cuttlefish_defconfig: enable CONFIG_DEBUG_LIST Linux 4.14.177 KEYS: Don't write out to userspace while holding key semaphore KEYS: Use individual pages in big_key for crypto buffers mtd: phram: fix a double free issue in error path mtd: lpddr: Fix a double free in probe() locktorture: Print ratio of acquisitions, not failures tty: evh_bytechan: Fix out of bounds accesses fbdev: potential information leak in do_fb_ioctl() net: dsa: bcm_sf2: Fix overflow checks iommu/amd: Fix the configuration of GCR3 table root pointer libnvdimm: Out of bounds read in __nd_ioctl() ext2: fix debug reference to ext2_xattr_cache ext2: fix empty body warnings when -Wextra is used iommu/vt-d: Fix mm reference leak NFS: Fix memory leaks in nfs_pageio_stop_mirroring() drm/amdkfd: kfree the wrong pointer x86: ACPI: fix CPU hotplug deadlock KVM: s390: vsie: Fix possible race when shadowing region 3 tables compiler.h: fix error in BUILD_BUG_ON() reporting percpu_counter: fix a data race at vm_committed_as include/linux/swapops.h: correct guards for non_swap_entry() ext4: do not commit super on read-only bdev powerpc/maple: Fix declaration made after definition s390/cpuinfo: fix wrong output when CPU0 is offline NFS: direct.c: Fix memory leak of dreq when nfs_get_lock_context fails NFSv4/pnfs: Return valid stateids in nfs_layout_find_inode_by_stateid() rtc: 88pm860x: fix possible race condition soc: imx: gpc: fix power up sequencing clk: tegra: Fix Tegra PMC clock out parents power: supply: bq27xxx_battery: Silence deferred-probe error clk: at91: usb: continue if clk_hw_round_rate() return zero of: unittest: kmemleak in of_unittest_platform_populate() rbd: call rbd_dev_unprobe() after unwatching and flushing notifies rbd: avoid a deadlock on header_rwsem when flushing notifies of: fix missing kobject init for !SYSFS && OF_DYNAMIC config soc: qcom: smem: Use le32_to_cpu for comparison wil6210: abort properly in cfg suspend wil6210: fix length check in __wmi_send wil6210: add block size checks during FW load wil6210: fix PCIe bus mastering in case of interface down rpmsg: glink: smem: Ensure ordering during tx rpmsg: glink: Fix missing mutex_init() in qcom_glink_alloc_channel() rtc: pm8xxx: Fix issue in RTC write path rpmsg: glink: use put_device() if device_register fail wil6210: rate limit wil_rx_refill error scsi: ufs: ufs-qcom: remove broken hci version quirk scsi: ufs: make sure all interrupts are processed wil6210: fix temperature debugfs wil6210: increase firmware ready timeout arch_topology: Fix section miss match warning due to free_raw_capacity() arm64: traps: Don't print stack or raw PC/LR values in backtraces arm64: perf: remove unsupported events for Cortex-A73 Revert "gpio: set up initial state from .get_direction()" clk: Fix debugfs_create_*() usage drm: NULL pointer dereference [null-pointer-deref] (CWE 476) problem video: fbdev: sis: Remove unnecessary parentheses and commented code lib/raid6: use vdupq_n_u8 to avoid endianness warnings ALSA: hda: Don't release card at firmware loading error irqchip/mbigen: Free msi_desc on device teardown netfilter: nf_tables: report EOPNOTSUPP on unsupported flags/object type arm, bpf: Fix bugs with ALU64 {RSH, ARSH} BPF_K shift by 0 ext4: use non-movable memory for superblock readahead scsi: sg: add sg_remove_request in sg_common_write objtool: Fix switch table detection in .text.unlikely mm/vmalloc.c: move 'area->pages' after if statement x86/resctrl: Fix invalid attempt at removing the default resource group x86/resctrl: Preserve CDP enable over CPU hotplug x86/intel_rdt: Enable L2 CDP in MSR IA32_L2_QOS_CFG x86/intel_rdt: Add two new resources for L2 Code and Data Prioritization (CDP) x86/intel_rdt: Enumerate L2 Code and Data Prioritization (CDP) feature x86/microcode/AMD: Increase microcode PATCH_MAX_SIZE scsi: target: fix hang when multiple threads try to destroy the same iscsi session scsi: target: remove boilerplate code kvm: x86: Host feature SSBD doesn't imply guest feature SPEC_CTRL_SSBD dm flakey: check for null arg_name in parse_features() ext4: do not zeroout extents beyond i_disksize mac80211_hwsim: Use kstrndup() in place of kasprintf() btrfs: check commit root generation in should_ignore_root tracing: Fix the race between registering 'snapshot' event trigger and triggering 'snapshot' operation ALSA: usb-audio: Don't override ignore_ctl_error value from the map ASoC: Intel: mrfld: return error codes when an error occurs ASoC: Intel: mrfld: fix incorrect check on p->sink ext4: fix incorrect inodes per group in error message ext4: fix incorrect group count in ext4_fill_super error message pwm: pca9685: Fix PWM/GPIO inter-operation jbd2: improve comments about freeing data buffers whose page mapping is NULL scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic net: stmmac: dwmac-sunxi: Provide TX and RX fifo sizes net: revert default NAPI poll timeout to 2 jiffies net: qrtr: send msgs from local of same id as broadcast net: ipv6: do not consider routes via gateways for anycast address check net: ipv4: devinet: Fix crash when add/del multicast IP with autojoin hsr: check protocol version in hsr_newlink() amd-xgbe: Use __napi_schedule() in BH context mfd: dln2: Fix sanity checking for endpoints misc: echo: Remove unnecessary parentheses and simplify check for zero powerpc/fsl_booke: Avoid creating duplicate tlb1 entry ipmi: fix hung processes in __get_guid() ftrace/kprobe: Show the maxactive number on kprobe_events drm: Remove PageReserved manipulation from drm_pci_alloc drm/dp_mst: Fix clearing payload state on topology disable crypto: caam - update xts sector size for large input length dm zoned: remove duplicate nr_rnd_zones increase in dmz_init_zone() btrfs: use nofs allocations for running delayed items Btrfs: fix crash during unmount due to race with delayed inode workers powerpc: Make setjmp/longjmp signature standard powerpc: Add attributes for setjmp/longjmp scsi: mpt3sas: Fix kernel panic observed on soft HBA unplug powerpc/kprobes: Ignore traps that happened in real mode powerpc/xive: Use XIVE_BAD_IRQ instead of zero to catch non configured IPIs powerpc/hash64/devmap: Use H_PAGE_THP_HUGE when setting up huge devmap PTE entries powerpc/64/tm: Don't let userspace set regs->trap via sigreturn powerpc/powernv/idle: Restore AMR/UAMOR/AMOR after idle libata: Return correct status in sata_pmp_eh_recover_pm() when ATA_DFLAG_DETACH is set hfsplus: fix crash and filesystem corruption when deleting files cpufreq: powernv: Fix use-after-free kmod: make request_module() return an error when autoloading is disabled Input: i8042 - add Acer Aspire 5738z to nomux list s390/diag: fix display of diagnose call statistics perf tools: Support Python 3.8+ in Makefile ocfs2: no need try to truncate file beyond i_size fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once() ext4: fix a data race at inode->i_blocks NFS: Fix a page leak in nfs_destroy_unlinked_subrequests() rtc: omap: Use define directive for PIN_CONFIG_ACTIVE_HIGH arm64: armv8_deprecated: Fix undef_hook mask for thumb setend scsi: zfcp: fix missing erp_lock in port recovery trigger for point-to-point dm verity fec: fix memory leak in verity_fec_dtr mm: Use fixed constant in page_frag_alloc instead of size + 1 tools: gpio: Fix out-of-tree build regression x86/speculation: Remove redundant arch_smt_update() invocation powerpc/pseries: Drop pointless static qualifier in vpa_debugfs_init() net: rtnl_configure_link: fix dev flags changes arg to __dev_notify_flags ALSA: hda: Initialize power_state field properly crypto: mxs-dcp - fix scatterlist linearization for hash btrfs: drop block from cache on error in relocation CIFS: Fix bug which the return value by asynchronous read is error KVM: VMX: fix crash cleanup when KVM wasn't used KVM: VMX: Always VMCLEAR in-use VMCSes during crash with kexec support KVM: x86: Allocate new rmap and large page tracking when moving memslot KVM: s390: vsie: Fix delivery of addressing exceptions KVM: s390: vsie: Fix region 1 ASCE sanity shadow address checks KVM: nVMX: Properly handle userspace interrupt window request x86/entry/32: Add missing ASM_CLAC to general_protection entry signal: Extend exec_id to 64bits ath9k: Handle txpower changes even when TPC is disabled MIPS: OCTEON: irq: Fix potential NULL pointer dereference irqchip/versatile-fpga: Apply clear-mask earlier KEYS: reaching the keys quotas correctly PCI: endpoint: Fix for concurrent memory allocation in OB address region PCI/ASPM: Clear the correct bits when enabling L1 substates nvme-fc: Revert "add module to ops template to allow module references" thermal: devfreq_cooling: inline all stubs for CONFIG_DEVFREQ_THERMAL=n acpi/x86: ignore unspecified bit positions in the ACPI global lock field media: ti-vpe: cal: fix disable_irqs to only the intended target ALSA: hda/realtek - Set principled PC Beep configuration for ALC256 ALSA: doc: Document PC Beep Hidden Register on Realtek ALC256 ALSA: pcm: oss: Fix regression by buffer overflow fix ALSA: ice1724: Fix invalid access for enumerated ctl items ALSA: hda: Fix potential access overflow in beep helper ALSA: hda: Add driver blacklist ALSA: usb-audio: Add mixer workaround for TRX40 and co usb: gadget: composite: Inform controller driver of self-powered usb: gadget: f_fs: Fix use after free issue as part of queue failure ASoC: topology: use name_prefix for new kcontrol ASoC: dpcm: allow start or stop during pause for backend ASoC: dapm: connect virtual mux with default value ASoC: fix regwmask slub: improve bit diffusion for freelist ptr obfuscation misc: rtsx: set correct pcr_ops for rts522A uapi: rename ext2_swab() to swab() and share globally in swab.h btrfs: track reloc roots based on their commit root bytenr btrfs: remove a BUG_ON() from merge_reloc_roots() block, bfq: fix use-after-free in bfq_idle_slice_timer_body locking/lockdep: Avoid recursion in lockdep_count_{for,back}ward_deps() irqchip/gic-v4: Provide irq_retrigger to avoid circular locking dependency usb: dwc3: core: add support for disabling SS instances in park mode block: Fix use-after-free issue accessing struct io_cq genirq/irqdomain: Check pointer in irq_domain_alloc_irqs_hierarchy() efi/x86: Ignore the memory attributes table on i386 x86/boot: Use unsigned comparison for addresses gfs2: Don't demote a glock until its revokes are written libata: Remove extra scsi_host_put() in ata_scsi_add_hosts() PCI/switchtec: Fix init_completion race condition with poll_wait() selftests/x86/ptrace_syscall_32: Fix no-vDSO segfault sched: Avoid scale real weight down to zero irqchip/versatile-fpga: Handle chained IRQs properly block: keep bdi->io_pages in sync with max_sectors_kb for stacked devices x86: Don't let pgprot_modify() change the page encryption bit null_blk: fix spurious IO errors after failed past-wp access null_blk: Handle null_add_dev() failures properly null_blk: Fix the null_add_dev() error path i2c: st: fix missing struct parameter description qlcnic: Fix bad kzalloc null test cxgb4/ptp: pass the sign of offset delta in FW CMD hinic: fix wrong para of wait_for_completion_timeout hinic: fix a bug of waitting for IO stopped net: vxge: fix wrong __VA_ARGS__ usage bus: sunxi-rsb: Return correct data when mixing 16-bit and 8-bit reads ANDROID: fix wakeup reason findings UPSTREAM: gpu/trace: add a gpu total memory usage tracepoint CHROMIUM: drm/virtio: rebase zero-copy patches to virgl/drm-misc-next CHROMIUM: virtio-gpu: add VIRTIO_GPU_F_RESOURCE_UUID feature CHROMIUM: drm/virtgpu: add legacy VIRTIO_GPU_* values for non-upstream variants CHROMIUM: drm/virtgpu: fix various warnings CHROMIUM: drm/virtgpu: implement metadata allocation ioctl CHROMIUM: drm/virtgpu: introduce request IDRs CHROMIUM: drm/virtgpu: implement DRM_VIRTGPU_RESOURCE_CREATE_V2 CHROMIUM: drm/virtgpu: add stub ioctl implementation CHROMIUM: drm/virtgpu: check for revelant capabilites CHROMIUM: drm/virtgpu: add memory type to virtio_gpu_object_params CHROMIUM: drm/virtgpu: make memory and resource creation opaque CHROMIUM: virtio-gpu api: VIRTIO_GPU_F_MEMORY CHROMIUM: virtwl: store plane info per virtio_gpu_object CHROMIUM: drm/virtgpu: expose new ioctls to userspace BACKPORT: drm/virtio: move virtio_gpu_object_{attach, detach} calls. ANDROID: drm: ttm: Add ttm_tt_create2 driver hook UPSTREAM: virtio-gpu api: comment feature flags UPSTREAM: drm/virtio: module_param_named() requires linux/moduleparam.h BACKPORT: drm/virtio: fix resource id creation race BACKPORT: drm/virtio: make resource id workaround runtime switchable. BACKPORT: drm/virtio: do NOT reuse resource ids BACKPORT: drm/virtio: Drop deprecated load/unload initialization f2fs: fix quota_sync failure due to f2fs_lock_op f2fs: support read iostat f2fs: Fix the accounting of dcc->undiscard_blks f2fs: fix to handle error path of f2fs_ra_meta_pages() f2fs: report the discard cmd errors properly f2fs: fix long latency due to discard during umount f2fs: add tracepoint for f2fs iostat f2fs: introduce sysfs/data_io_flag to attach REQ_META/FUA UPSTREAM: kheaders: include only headers into kheaders_data.tar.xz UPSTREAM: kheaders: remove meaningless -R option of 'ls' ANDROID: Incremental fs: Fix create_file performance ANDROID: Incremental fs: Fix compound page usercopy crash ANDROID: Incremental fs: Clean up incfs_test build process ANDROID: Incremental fs: make remount log buffer change atomic ANDROID: Incremental fs: Optimize get_filled_block ANDROID: Incremental fs: Fix mislabeled __user ptrs ANDROID: Incremental fs: Use 64-bit int for file_size when writing hash blocks Revert "ANDROID: Incremental fs: Fix initialization, use of bitfields" Linux 4.14.176 drm/msm: Use the correct dma_sync calls in msm_gem rpmsg: glink: smem: Support rx peak for size less than 4 bytes drm_dp_mst_topology: fix broken drm_dp_sideband_parse_remote_dpcd_read() usb: dwc3: don't set gadget->is_otg flag rpmsg: glink: Remove chunk size word align warning arm64: Fix size of __early_cpu_boot_status drm/msm: stop abusing dma_map/unmap for cache clk: qcom: rcg: Return failure for RCG update acpi/nfit: Fix bus command validation fbcon: fix null-ptr-deref in fbcon_switch RDMA/cm: Update num_paths in cma_resolve_iboe_route error flow Bluetooth: RFCOMM: fix ODEBUG bug in rfcomm_dev_ioctl ceph: canonicalize server path in place ceph: remove the extra slashes in the server path IB/hfi1: Fix memory leaks in sysfs registration and unregistration IB/hfi1: Call kobject_put() when kobject_init_and_add() fails ASoC: jz4740-i2s: Fix divider written at incorrect offset in register hwrng: imx-rngc - fix an error path tools/accounting/getdelays.c: fix netlink attribute length random: always use batched entropy for get_random_u{32,64} mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_VLAN_MANGLE slcan: Don't transmit uninitialized stack data in padding net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting net: phy: micrel: kszphy_resume(): add delay after genphy_resume() before accessing PHY registers net: dsa: bcm_sf2: Ensure correct sub-node is parsed ipv6: don't auto-add link-local address to lag ports mm: mempolicy: require at least one nodeid for MPOL_PREFERRED padata: always acquire cpu_hotplug_lock before pinst->lock coresight: do not use the BIT() macro in the UAPI header misc: pci_endpoint_test: Fix to support > 10 pci-endpoint-test devices blk-mq: Allow blocking queue tag iter callbacks blk-mq: sync the update nr_hw_queues with blk_mq_queue_tag_busy_iter drm/etnaviv: replace MMU flush marker with flush sequence tools/power turbostat: Fix gcc build warnings initramfs: restore default compression behavior drm/bochs: downgrade pci_request_region failure from error to warning sctp: fix possibly using a bad saddr with a given dst sctp: fix refcount bug in sctp_wfree net, ip_tunnel: fix interface lookup with no key ipv4: fix a RCU-list lock in fib_triestat_seq_show ANDROID: power: wakeup_reason: wake reason enhancements ubifs: wire up FS_IOC_GET_ENCRYPTION_NONCE f2fs: wire up FS_IOC_GET_ENCRYPTION_NONCE ext4: wire up FS_IOC_GET_ENCRYPTION_NONCE fscrypt: add FS_IOC_GET_ENCRYPTION_NONCE ioctl FROMLIST: power_supply: Add additional health properties to the header UPSTREAM: power: supply: core: Update sysfs-class-power ABI document BACKPORT: FROMGIT: kbuild: mkcompile_h: Include $LD version in /proc/version ANDROID: fscrypt: fall back to filesystem-layer crypto when needed ANDROID: block: require drivers to declare supported crypto key type(s) ANDROID: block: make blk_crypto_start_using_mode() properly check for support f2fs: keep inline_data when compression conversion f2fs: fix to disable compression on directory f2fs: add missing CONFIG_F2FS_FS_COMPRESSION f2fs: switch discard_policy.timeout to bool type f2fs: fix to verify tpage before releasing in f2fs_free_dic() f2fs: show compression in statx f2fs: clean up dic->tpages assignment f2fs: compress: support zstd compress algorithm f2fs: compress: add .{init,destroy}_decompress_ctx callback f2fs: compress: fix to call missing destroy_compress_ctx() f2fs: change default compression algorithm f2fs: clean up {cic,dic}.ref handling f2fs: fix to use f2fs_readpage_limit() in f2fs_read_multi_pages() f2fs: xattr.h: Make stub helpers inline f2fs: fix to avoid double unlock f2fs: fix potential .flags overflow on 32bit architecture f2fs: fix NULL pointer dereference in f2fs_verity_work() f2fs: fix to clear PG_error if fsverity failed f2fs: don't call fscrypt_get_encryption_info() explicitly in f2fs_tmpfile() f2fs: don't trigger data flush in foreground operation f2fs: fix NULL pointer dereference in f2fs_write_begin() f2fs: clean up f2fs_may_encrypt() f2fs: fix to avoid potential deadlock f2fs: don't change inode status under page lock f2fs: fix potential deadlock on compressed quota file f2fs: delete DIO read lock f2fs: don't mark compressed inode dirty during f2fs_iget() f2fs: fix to account compressed blocks in f2fs_compressed_blocks() f2fs: xattr.h: Replace zero-length array with flexible-array member f2fs: fix to update f2fs_super_block fields under sb_lock f2fs: Add a new CP flag to help fsck fix resize SPO issues f2fs: Fix mount failure due to SPO after a successful online resize FS f2fs: use kmem_cache pool during inline xattr lookups f2fs: skip migration only when BG_GC is called f2fs: fix to show tracepoint correctly f2fs: avoid __GFP_NOFAIL in f2fs_bio_alloc f2fs: introduce F2FS_IOC_GET_COMPRESS_BLOCKS f2fs: fix to avoid triggering IO in write path f2fs: add prefix for f2fs slab cache name f2fs: introduce DEFAULT_IO_TIMEOUT f2fs: skip GC when section is full f2fs: add migration count iff migration happens f2fs: clean up bggc mount option f2fs: clean up lfs/adaptive mount option f2fs: fix to show norecovery mount option f2fs: clean up parameter of macro XATTR_SIZE() f2fs: clean up codes with {f2fs_,}data_blkaddr() f2fs: show mounted time f2fs: Use scnprintf() for avoiding potential buffer overflow f2fs: allow to clear F2FS_COMPR_FL flag f2fs: fix to check dirty pages during compressed inode conversion f2fs: fix to account compressed inode correctly f2fs: fix wrong check on F2FS_IOC_FSSETXATTR f2fs: fix to avoid use-after-free in f2fs_write_multi_pages() f2fs: fix to avoid using uninitialized variable f2fs: fix inconsistent comments f2fs: remove i_sem lock coverage in f2fs_setxattr() f2fs: cover last_disk_size update with spinlock f2fs: fix to check i_compr_blocks correctly FROMLIST: kmod: make request_module() return an error when autoloading is disabled UPSTREAM: loop: Only freeze block queue when needed. UPSTREAM: loop: Only change blocksize when needed. ANDROID: Incremental fs: Fix remount ANDROID: Incremental fs: Protect get_fill_block, and add a field ANDROID: Incremental fs: Fix crash polling 0 size read_log ANDROID: Incremental fs: get_filled_blocks: better index_out ANDROID: Fix wq fp check for CFI builds ANDROID: Incremental fs: Fix four resource bugs ANDROID: kbuild: ensure __cfi_check is correctly aligned ANDROID: kbuild: fix module linker script flags for LTO Linux 4.14.175 arm64: dts: ls1046ardb: set RGMII interfaces to RGMII_ID mode arm64: dts: ls1043a-rdb: correct RGMII delay mode to rgmii-id ARM: bcm2835-rpi-zero-w: Add missing pinctrl name ARM: dts: oxnas: Fix clear-mask property perf map: Fix off by one in strncpy() size argument arm64: alternative: fix build with clang integrated assembler net: ks8851-ml: Fix IO operations, again gpiolib: acpi: Add quirk to ignore EC wakeups on HP x2 10 CHT + AXP288 model bpf: Explicitly memset some bpf info structures declared on the stack bpf: Explicitly memset the bpf_attr structure platform/x86: pmc_atom: Add Lex 2I385SW to critclk_systems DMI table vt: vt_ioctl: fix use-after-free in vt_in_use() vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console vt: vt_ioctl: remove unnecessary console allocation checks vt: switch vt_dont_switch to bool vt: ioctl, switch VT_IS_IN_USE and VT_BUSY to inlines vt: selection, introduce vc_is_sel mac80211: fix authentication with iwlwifi/mvm mac80211: Check port authorization in the ieee80211_tx_dequeue() case media: xirlink_cit: add missing descriptor sanity checks media: stv06xx: add missing descriptor sanity checks media: dib0700: fix rc endpoint lookup media: ov519: add missing endpoint sanity checks libfs: fix infoleak in simple_attr_read() staging: wlan-ng: fix use-after-free Read in hfa384x_usbin_callback staging: wlan-ng: fix ODEBUG bug in prism2sta_disconnect_usb staging: rtl8188eu: Add ASUS USB-N10 Nano B1 to device table media: usbtv: fix control-message timeouts media: flexcop-usb: fix endpoint sanity check usb: musb: fix crash with highmen PIO and usbmon USB: serial: io_edgeport: fix slab-out-of-bounds read in edge_interrupt_callback USB: cdc-acm: restore capability check order USB: serial: option: add Wistron Neweb D19Q1 USB: serial: option: add BroadMobi BM806U USB: serial: option: add support for ASKEY WWHC050 afs: Fix some tracing details Input: raydium_i2c_ts - fix error codes in raydium_i2c_boot_trigger() Input: raydium_i2c_ts - use true and false for boolean values vti6: Fix memory leak of skb if input policy check fails netfilter: nft_fwd_netdev: validate family and chain type xfrm: policy: Fix doulbe free in xfrm_policy_timer xfrm: add the missing verify_sec_ctx_len check in xfrm_add_acquire xfrm: fix uctx len check in verify_sec_ctx_len RDMA/mlx5: Block delay drop to unprivileged users vti[6]: fix packet tx through bpf_redirect() in XinY cases xfrm: handle NETDEV_UNREGISTER for xfrm device genirq: Fix reference leaks on irq affinity notifiers RDMA/core: Ensure security pkey modify is not lost gpiolib: acpi: Add quirk to ignore EC wakeups on HP x2 10 BYT + AXP288 model gpiolib: acpi: Rework honor_wakeup option into an ignore_wake option gpiolib: acpi: Correct comment for HP x2 10 honor_wakeup quirk mac80211: mark station unauthorized before key removal scsi: sd: Fix optimal I/O size for devices that change reported values scripts/dtc: Remove redundant YYLOC global declaration tools: Let O= makes handle a relative path with -C option perf probe: Do not depend on dwfl_module_addrsym() ARM: dts: omap5: Add bus_dma_limit for L3 bus ARM: dts: dra7: Add bus_dma_limit for L3 bus Input: avoid BIT() macro usage in the serio.h UAPI header Input: synaptics - enable RMI on HP Envy 13-ad105ng i2c: hix5hd2: add missed clk_disable_unprepare in remove ftrace/x86: Anotate text_mutex split between ftrace_arch_code_modify_post_process() and ftrace_arch_code_modify_prepare() arm64: compat: map SPSR_ELx<->PSR for signals arm64: ptrace: map SPSR_ELx<->PSR for compat tasks sxgbe: Fix off by one in samsung driver strncpy size arg dpaa_eth: Remove unnecessary boolean expression in dpaa_get_headroom mac80211: Do not send mesh HWMP PREQ if HWMP is disabled scsi: ipr: Fix softlockup when rescanning devices in petitboot fsl/fman: detect FMan erratum A050385 arm64: dts: ls1043a: FMan erratum A050385 dt-bindings: net: FMan erratum A050385 cgroup1: don't call release_agent when it is "" drivers/of/of_mdio.c:fix of_mdiobus_register() cpupower: avoid multiple definition with gcc -fno-common cgroup-v1: cgroup_pidlist_next should update position index net: ipv4: don't let PMTU updates increase route MTU hsr: set .netnsok flag hsr: add restart routine into hsr_get_node_list() hsr: use rcu_read_lock() in hsr_get_node_{list/status}() vxlan: check return value of gro_cells_init() net: dsa: mt7530: Change the LINK bit to reflect the link status bnxt_en: fix memory leaks in bnxt_dcbnl_ieee_getets() slcan: not call free_netdev before rtnl_unlock in slcan_open NFC: fdp: Fix a signedness bug in fdp_nci_send_patch() net: stmmac: dwmac-rk: fix error path in rk_gmac_probe net_sched: keep alloc_hash updated after hash allocation net_sched: cls_route: remove the right filter from hashtable net: qmi_wwan: add support for ASKEY WWHC050 net/packet: tpacket_rcv: avoid a producer race condition net: mvneta: Fix the case where the last poll did not process all rx net: dsa: Fix duplicate frames flooded by learning macsec: restrict to ethernet devices hsr: fix general protection fault in hsr_addr_is_self() Revert "drm/dp_mst: Skip validating ports during destruction, just ref" staging: greybus: loopback_test: fix potential path truncations staging: greybus: loopback_test: fix potential path truncation drm/bridge: dw-hdmi: fix AVI frame colorimetry arm64: smp: fix crash_smp_send_stop() behaviour arm64: smp: fix smp_send_stop() behaviour ALSA: hda/realtek: Fix pop noise on ALC225 Revert "ipv6: Fix handling of LLA with VRF and sockets bound to VRF" Revert "vrf: mark skb for multicast or link-local as enslaved to VRF" futex: Unbreak futex hashing futex: Fix inode life-time issue kbuild: Disable -Wpointer-to-enum-cast iio: adc: at91-sama5d2_adc: fix differential channels in triggered mode iio: adc: at91-sama5d2_adc: fix channel configuration for differential channels USB: cdc-acm: fix rounding error in TIOCSSERIAL USB: cdc-acm: fix close_delay and closing_wait units in TIOCSSERIAL x86/mm: split vmalloc_sync_all() page-flags: fix a crash at SetPageError(THP_SWAP) mm, slub: prevent kmalloc_node crashes and memory leaks mm: slub: be more careful about the double cmpxchg of freelist memcg: fix NULL pointer dereference in __mem_cgroup_usage_unregister_event xhci: Do not open code __print_symbolic() in xhci trace events rtc: max8907: add missing select REGMAP_IRQ intel_th: pci: Add Elkhart Lake CPU support intel_th: Fix user-visible error codes staging/speakup: fix get_word non-space look-ahead staging: rtl8188eu: Add device id for MERCUSYS MW150US v2 mmc: sdhci-of-at91: fix cd-gpios for SAMA5D2 iio: magnetometer: ak8974: Fix negative raw values in sysfs iio: trigger: stm32-timer: disable master mode when stopping ALSA: pcm: oss: Remove WARNING from snd_pcm_plug_alloc() checks ALSA: pcm: oss: Avoid plugin buffer overflow ALSA: seq: oss: Fix running status after receiving sysex ALSA: seq: virmidi: Fix running status after receiving sysex ALSA: line6: Fix endless MIDI read loop usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c USB: serial: pl2303: add device-id for HP LD381 usb: host: xhci-plat: add a shutdown USB: serial: option: add ME910G1 ECM composition 0x110b usb: quirks: add NO_LPM quirk for RTL8153 based ethernet adapters USB: Disable LPM on WD19's Realtek Hub parse-maintainers: Mark as executable block, bfq: fix overwrite of bfq_group pointer in bfq_find_set_group() xenbus: req->err should be updated before req->state xenbus: req->body should be updated before req->state dm bio record: save/restore bi_end_io and bi_integrity altera-stapl: altera_get_note: prevent write beyond end of 'key' drivers/perf: arm_pmu_acpi: Fix incorrect checking of gicc pointer drm/exynos: dsi: fix workaround for the legacy clock name drm/exynos: dsi: propagate error value and silence meaningless warning spi/zynqmp: remove entry that causes a cs glitch spi: pxa2xx: Add CS control clock quirk ARM: dts: dra7: Add "dma-ranges" property to PCIe RC DT nodes powerpc: Include .BTF section spi: qup: call spi_qup_pm_resume_runtime before suspending UPSTREAM: ubifs: wire up FS_IOC_GET_ENCRYPTION_NONCE UPSTREAM: f2fs: wire up FS_IOC_GET_ENCRYPTION_NONCE UPSTREAM: ext4: wire up FS_IOC_GET_ENCRYPTION_NONCE UPSTREAM: fscrypt: add FS_IOC_GET_ENCRYPTION_NONCE ioctl UPSTREAM: usb: raw_gadget: fix compilation warnings in uapi headers BACKPORT: usb: gadget: add raw-gadget interface UPSTREAM: usb: gadget: move choice ... endchoice to legacy/Kconfig ANDROID: clang: update to 10.0.5 FROMLIST: arm64: define __alloc_zeroed_user_highpage ANDROID: Incremental fs: Add INCFS_IOC_GET_FILLED_BLOCKS ANDROID: Incremental fs: Fix two typos f2fs: fix to avoid potential deadlock f2fs: add missing function name in kernel message f2fs: recycle unused compress_data.chksum feild f2fs: fix to avoid NULL pointer dereference f2fs: fix leaking uninitialized memory in compressed clusters f2fs: fix the panic in do_checkpoint() f2fs: fix to wait all node page writeback mm/swapfile.c: move inode_lock out of claim_swapfile UPSTREAM: ipv6: ndisc: add support for 'PREF64' dns64 prefix identifier UPSTREAM: ipv6: ndisc: add support for 'PREF64' dns64 prefix identifier ANDROID: dm-bow: Fix free_show value is incorrect UPSTREAM: coresight: Potential uninitialized variable in probe() ANDROID: kbuild: do not merge .section..* into .section in modules ANDROID: scsi: ufs: add ->map_sg_crypto() variant op UPSTREAM: bpf: Explicitly memset some bpf info structures declared on the stack UPSTREAM: bpf: Explicitly memset the bpf_attr structure Linux 4.14.174 ipv4: ensure rcu_read_lock() in cipso_v4_error() mm: slub: add missing TID bump in kmem_cache_alloc_bulk() ARM: 8958/1: rename missed uaccess .fixup section ARM: 8957/1: VDSO: Match ARMv8 timer in cntvct_functional() jbd2: fix data races at struct journal_head net: rmnet: fix NULL pointer dereference in rmnet_newlink() hinic: fix a bug of setting hw_ioctxt slip: not call free_netdev before rtnl_unlock in slip_open signal: avoid double atomic counter increments for user accounting mac80211: rx: avoid RCU list traversal under mutex net: ks8851-ml: Fix IRQ handling and locking net: usb: qmi_wwan: restore mtu min/max values after raw_ip switch scsi: libfc: free response frame from GPN_ID cfg80211: check reg_rule for NULL in handle_channel_custom() HID: i2c-hid: add Trekstor Surfbook E11B to descriptor override HID: apple: Add support for recent firmware on Magic Keyboards ACPI: watchdog: Allow disabling WDAT at boot perf/amd/uncore: Replace manual sampling check with CAP_NO_INTERRUPT flag batman-adv: Don't schedule OGM for disabled interface batman-adv: Avoid free/alloc race when handling OGM buffer batman-adv: Avoid free/alloc race when handling OGM2 buffer batman-adv: Fix duplicated OGMs on NETDEV_UP batman-adv: Fix debugfs path for renamed softif batman-adv: Fix debugfs path for renamed hardif batman-adv: prevent TT request storms by not sending inconsistent TT TLVLs batman-adv: Fix TT sync flags for intermediate TT responses batman-adv: Avoid race in TT TVLV allocator helper batman-adv: update data pointers after skb_cow() batman-adv: Fix internal interface indices types batman-adv: Fix lock for ogm cnt access in batadv_iv_ogm_calc_tq batman-adv: Fix check of retrieved orig_gw in batadv_v_gw_is_eligible batman-adv: Always initialize fragment header priority batman-adv: Avoid spurious warnings from bat_v neigh_cmp implementation efi: Add a sanity check to efivar_store_raw() net/smc: check for valid ib_client_data ipv6: restrict IPV6_ADDRFORM operation i2c: acpi: put device when verifying client fails iommu/vt-d: Ignore devices with out-of-spec domain number iommu/vt-d: Fix the wrong printing in RHSA parsing netfilter: nft_payload: add missing attribute validation for payload csum flags netfilter: cthelper: add missing attribute validation for cthelper nl80211: add missing attribute validation for channel switch nl80211: add missing attribute validation for beacon report scanning nl80211: add missing attribute validation for critical protocol indication pinctrl: core: Remove extra kref_get which blocks hogs being freed pinctrl: meson-gxl: fix GPIOX sdio pins iommu/vt-d: Fix a bug in intel_iommu_iova_to_phys() for huge page iommu/vt-d: dmar: replace WARN_TAINT with pr_warn + add_taint iommu/dma: Fix MSI reservation allocation x86/mce: Fix logic and comments around MSR_PPIN_CTL efi: Fix a race and a buffer overflow while reading efivars via sysfs ARC: define __ALIGN_STR and __ALIGN symbols for ARC KVM: x86: clear stale x86_emulate_ctxt->intercept value gfs2_atomic_open(): fix O_EXCL|O_CREAT handling on cold dcache cifs_atomic_open(): fix double-put on late allocation failure ktest: Add timeout for ssh sync testing drm/amd/display: remove duplicated assignment to grph_obj_type workqueue: don't use wq_select_unbound_cpu() for bound works iommu/vt-d: quirk_ioat_snb_local_iommu: replace WARN_TAINT with pr_warn + add_taint virtio-blk: fix hw_queue stopped on arbitrary error iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices cgroup: Iterate tasks that did not finish do_exit() cgroup: cgroup_procs_next should increase position index ipvlan: don't deref eth hdr before checking it's set ipvlan: egress mcast packets are not exceptional ipvlan: do not add hardware address of master to its unicast filter list inet_diag: return classid for all socket types macvlan: add cond_resched() during multicast processing net: fec: validate the new settings in fec_enet_set_coalesce() slip: make slhc_compress() more robust against malicious packets bonding/alb: make sure arp header is pulled before accessing it net: phy: fix MDIO bus PM PHY resuming nfc: add missing attribute validation for vendor subcommand nfc: add missing attribute validation for SE API team: add missing attribute validation for array index team: add missing attribute validation for port ifindex net: fq: add missing attribute validation for orphan mask macsec: add missing attribute validation for port can: add missing attribute validation for termination nl802154: add missing attribute validation for dev_type nl802154: add missing attribute validation fib: add missing attribute validation for tun_id net: memcg: fix lockdep splat in inet_csk_accept() net: memcg: late association of sock to memcg cgroup: memcg: net: do not associate sock with unrelated cgroup bnxt_en: reinitialize IRQs when MTU is modified sfc: detach from cb_page in efx_copy_channel() r8152: check disconnect status after long sleep net/packet: tpacket_rcv: do not increment ring index on drop net: nfc: fix bounds checking bugs on "pipe" net: macsec: update SCI upon MAC address change. netlink: Use netlink header as base to calculate bad attribute offset ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast() ipvlan: add cond_resched_rcu() while processing muticast backlog ipv6/addrconf: call ipv6_mc_up() for non-Ethernet interface gre: fix uninit-value in __iptunnel_pull_header cgroup, netclassid: periodically release file_lock on classid updating net: phy: Avoid multiple suspends phy: Revert toggling reset changes. ANDROID: Incremental fs: Add INCFS_IOC_PERMIT_FILL ANDROID: Incremental fs: Remove signature checks from kernel ANDROID: Incremental fs: Pad hash blocks ANDROID: Incremental fs: Make fill block an ioctl ANDROID: Incremental fs: Remove all access_ok checks UPSTREAM: cgroup: Iterate tasks that did not finish do_exit() UPSTREAM: arm64: memory: Add missing brackets to untagged_addr() macro UPSTREAM: mm: Avoid creating virtual address aliases in brk()/mmap()/mremap() ANDROID: Add TPM support and the vTPM proxy to Cuttlefish. ANDROID: serdev: restrict claim of platform devices UPSTREAM: fscrypt: don't evict dirty inodes after removing key fscrypt: don't evict dirty inodes after removing key Linux 4.14.173 ASoC: topology: Fix memleak in soc_tplg_manifest_load() xhci: handle port status events for removed USB3 hcd dm integrity: fix a deadlock due to offloading to an incorrect workqueue powerpc: fix hardware PMU exception bug on PowerVM compatibility mode systems dmaengine: coh901318: Fix a double lock bug in dma_tc_handle() hwmon: (adt7462) Fix an error return in ADT7462_REG_VOLT() ARM: imx: build v7_cpu_resume() unconditionally IB/hfi1, qib: Ensure RCU is locked when accessing list RMDA/cm: Fix missing ib_cm_destroy_id() in ib_cm_insert_listen() RDMA/iwcm: Fix iwcm work deallocation ASoC: dapm: Correct DAPM handling of active widgets during shutdown ASoC: pcm512x: Fix unbalanced regulator enable call in probe error path ASoC: pcm: Fix possible buffer overflow in dpcm state sysfs output ASoC: intel: skl: Fix possible buffer overflow in debug outputs ASoC: intel: skl: Fix pin debug prints ASoC: topology: Fix memleak in soc_tplg_link_elems_load() ARM: dts: ls1021a: Restore MDIO compatible to gianfar dm cache: fix a crash due to incorrect work item cancelling dmaengine: tegra-apb: Prevent race conditions of tasklet vs free list dmaengine: tegra-apb: Fix use-after-free x86/pkeys: Manually set X86_FEATURE_OSPKE to preserve existing changes vt: selection, push sel_lock up vt: selection, push console lock down vt: selection, close sel_buffer race serial: 8250_exar: add support for ACCES cards tty:serial:mvebu-uart:fix a wrong return arm: dts: dra76x: Fix mmc3 max-frequency fat: fix uninit-memory access for partial initialized inode mm, numa: fix bad pmd by atomically check for pmd_trans_huge when marking page tables prot_numa vgacon: Fix a UAF in vgacon_invert_region usb: core: port: do error out if usb_autopm_get_interface() fails usb: core: hub: do error out if usb_autopm_get_interface() fails usb: core: hub: fix unhandled return by employing a void function usb: quirks: add NO_LPM quirk for Logitech Screen Share usb: storage: Add quirk for Samsung Fit flash cifs: don't leak -EAGAIN for stat() during reconnect net: thunderx: workaround BGX TX Underflow issue x86/xen: Distribute switch variables for initialization nvme: Fix uninitialized-variable warning x86/boot/compressed: Don't declare __force_order in kaslr_64.c s390/cio: cio_ignore_proc_seq_next should increase position index watchdog: da9062: do not ping the hw during stop() net: ks8851-ml: Fix 16-bit IO operation net: ks8851-ml: Fix 16-bit data access net: ks8851-ml: Remove 8-bit bus accessors drm/msm/dsi: save pll state before dsi host is powered off drm: msm: Fix return type of dsi_mgr_connector_mode_valid for kCFI drm/msm/mdp5: rate limit pp done timeout warnings usb: gadget: serial: fix Tx stall after buffer overflow usb: gadget: ffs: ffs_aio_cancel(): Save/restore IRQ flags usb: gadget: composite: Support more than 500mA MaxPower selftests: fix too long argument serial: ar933x_uart: set UART_CS_{RX,TX}_READY_ORIDE kprobes: Fix optimize_kprobe()/unoptimize_kprobe() cancellation logic RDMA/core: Fix use of logical OR in get_new_pps RDMA/core: Fix pkey and port assignment in get_new_pps net: dsa: bcm_sf2: Forcibly configure IMP port for 1Gb/sec EDAC/amd64: Set grain per DIMM x86/mce: Handle varying MCA bank counts vhost: Check docket sk_family instead of call getname audit: always check the netlink payload length in audit_receive_msg() Revert "char/random: silence a lockdep splat with printk()" mm, thp: fix defrag setting if newline is not used mm/huge_memory.c: use head to check huge zero page perf hists browser: Restore ESC as "Zoom out" of DSO/thread/etc kprobes: Set unoptimized flag after unoptimizing code drivers: net: xgene: Fix the order of the arguments of 'alloc_etherdev_mqs()' tuntap: correctly set SOCKWQ_ASYNC_NOSPACE KVM: Check for a bad hva before dropping into the ghc slow path KVM: SVM: Override default MMIO mask if memory encryption is enabled mwifiex: drop most magic numbers from mwifiex_process_tdls_action_frame() namei: only return -ECHILD from follow_dotdot_rcu() net: ena: make ena rxfh support ETH_RSS_HASH_NO_CHANGE net: atlantic: fix potential error handling net: netlink: cap max groups which will be considered in netlink_bind() include/linux/bitops.h: introduce BITS_PER_TYPE ecryptfs: Fix up bad backport of fe2e082f5da5b4a0a92ae32978f81507ef37ec66 usb: charger: assign specific number for enum value drm/i915/gvt: Separate display reset from ALL_ENGINES reset i2c: jz4780: silence log flood on txabrt i2c: altera: Fix potential integer overflow MIPS: VPE: Fix a double free and a memory leak in 'release_vpe()' HID: hiddev: Fix race in in hiddev_disconnect() Revert "PM / devfreq: Modify the device name as devfreq(X) for sysfs" tracing: Disable trace_printk() on post poned tests HID: core: increase HID report buffer size to 8KiB HID: core: fix off-by-one memset in hid_report_raw_event() HID: ite: Only bind to keyboard USB interface on Acer SW5-012 keyboard dock KVM: VMX: check descriptor table exits on instruction emulation ACPI: watchdog: Fix gas->access_width usage ACPICA: Introduce ACPI_ACCESS_BYTE_WIDTH() macro audit: fix error handling in audit_data_to_entry() ext4: potential crash on allocation error in ext4_alloc_flex_bg_array() net: sched: correct flower port blocking qede: Fix race between rdma destroy workqueue and link change event ipv6: Fix route replacement with dev-only route ipv6: Fix nlmsg_flags when splitting a multipath route sctp: move the format error check out of __sctp_sf_do_9_1_abort nfc: pn544: Fix occasional HW initialization failure net: phy: restore mdio regs in the iproc mdio driver net: fib_rules: Correctly set table field when table number exceeds 8 bits sysrq: Remove duplicated sysrq message sysrq: Restore original console_loglevel when sysrq disabled cfg80211: add missing policy for NL80211_ATTR_STATUS_CODE cifs: Fix mode output in debugging statements net: ena: ena-com.c: prevent NULL pointer dereference net: ena: ethtool: use correct value for crc32 hash net: ena: fix incorrectly saving queue numbers when setting RSS indirection table net: ena: rss: store hash function as values and not bits net: ena: rss: fix failure to get indirection table net: ena: fix incorrect default RSS key net: ena: add missing ethtool TX timestamping indication net: ena: fix uses of round_jiffies() net: ena: fix potential crash when rxfh key is NULL qmi_wwan: unconditionally reject 2 ep interfaces qmi_wwan: re-add DW5821e pre-production variant cfg80211: check wiphy driver existence for drvinfo report mac80211: consider more elements in parsing CRC dax: pass NOWAIT flag to iomap_apply drm/msm: Set dma maximum segment size for mdss ipmi:ssif: Handle a possible NULL pointer reference ext4: fix potential race between s_group_info online resizing and access ext4: fix potential race between s_flex_groups online resizing and access ext4: fix potential race between online resizing and write operations netfilter: nf_conntrack: resolve clash for matching conntracks iwlwifi: pcie: fix rb_allocator workqueue allocation FROMLIST: f2fs: fix wrong check on F2FS_IOC_FSSETXATTR UPSTREAM: binder: prevent UAF for binderfs devices II UPSTREAM: binder: prevent UAF for binderfs devices FROMLIST: lib: test_stackinit.c: XFAIL switch variable init tests ANDROID: cuttlefish: disable KPROBES ANDROID: scsi: ufs: allow ufs variants to override sg entry size FROMLIST: ufs: fix a bug on printing PRDT BACKPORT: loop: Add LOOP_SET_BLOCK_SIZE in compat ioctl ANDROID: fix build issue in security/selinux/avc.c ANDROID: cuttlefish_defconfig: Disable CONFIG_RT_GROUP_SCHED ANDROID: Enable HID_NINTENDO as y FROMLIST: HID: nintendo: add nintendo switch controller driver Linux 4.14.172 s390/mm: Explicitly compare PAGE_DEFAULT_KEY against zero in storage_key_init_range xen: Enable interrupts when calling _cond_resched() ata: ahci: Add shutdown to freeze hardware resources of ahci netfilter: xt_hashlimit: limit the max size of hashtable ALSA: seq: Fix concurrent access to queue current tick/time ALSA: seq: Avoid concurrent access to queue flags ALSA: rawmidi: Avoid bit fields for state flags genirq/proc: Reject invalid affinity masks (again) iommu/vt-d: Fix compile warning from intel-svm.h ecryptfs: replace BUG_ON with error handling code staging: greybus: use after free in gb_audio_manager_remove_all() staging: rtl8723bs: fix copy of overlapping memory usb: gadget: composite: Fix bMaxPower for SuperSpeedPlus scsi: Revert "target: iscsi: Wait for all commands to finish before freeing a session" scsi: Revert "RDMA/isert: Fix a recently introduced regression related to logout" Btrfs: fix btrfs_wait_ordered_range() so that it waits for all ordered extents btrfs: do not check delayed items are empty for single transaction cleanup btrfs: fix bytes_may_use underflow in prealloc error condtition KVM: apic: avoid calculating pending eoi from an uninitialized val KVM: nVMX: handle nested posted interrupts when apicv is disabled for L1 KVM: nVMX: Check IO instruction VM-exit conditions KVM: nVMX: Refactor IO bitmap checks into helper function ext4: fix race between writepages and enabling EXT4_EXTENTS_FL ext4: rename s_journal_flag_rwsem to s_writepages_rwsem ext4: fix mount failure with quota configured as module ext4: add cond_resched() to __ext4_find_entry() ext4: fix a data race in EXT4_I(inode)->i_disksize KVM: nVMX: Don't emulate instructions in guest mode lib/stackdepot.c: fix global out-of-bounds in stack_slabs serial: 8250: Check UPF_IRQ_SHARED in advance vt: vt_ioctl: fix race in VT_RESIZEX VT_RESIZEX: get rid of field-by-field copyin xhci: apply XHCI_PME_STUCK_QUIRK to Intel Comet Lake platforms KVM: x86: don't notify userspace IOAPIC on edge-triggered interrupt EOI drm/amdgpu/soc15: fix xclk for raven mm/vmscan.c: don't round up scan size for online memory cgroup Revert "ipc,sem: remove uneeded sem_undo_list lock usage in exit_sem()" MAINTAINERS: Update drm/i915 bug filing URL serdev: ttyport: restore client ops on deregistration tty: serial: imx: setup the correct sg entry for tx dma tty/serial: atmel: manage shutdown in case of RS485 or ISO7816 mode x86/mce/amd: Fix kobject lifetime x86/mce/amd: Publish the bank pointer only after setup has succeeded staging: rtl8723bs: Fix potential overuse of kernel memory staging: rtl8723bs: Fix potential security hole staging: rtl8188eu: Fix potential overuse of kernel memory staging: rtl8188eu: Fix potential security hole USB: hub: Fix the broken detection of USB3 device in SMSC hub USB: hub: Don't record a connect-change event during reset-resume USB: Fix novation SourceControl XL after suspend usb: uas: fix a plug & unplug racing usb: host: xhci: update event ring dequeue pointer on purpose xhci: fix runtime pm enabling for quirky Intel hosts xhci: Force Maximum Packet size for Full-speed bulk devices to valid range. staging: vt6656: fix sign of rx_dbm to bb_pre_ed_rssi. staging: android: ashmem: Disallow ashmem memory from being remapped vt: selection, handle pending signals in paste_selection floppy: check FDC index for errors before assigning it USB: misc: iowarrior: add support for the 100 device USB: misc: iowarrior: add support for the 28 and 28L devices USB: misc: iowarrior: add support for 2 OEMed devices thunderbolt: Prevent crash if non-active NVMem file is read net/smc: fix leak of kernel memory to user space net/sched: flower: add missing validation of TCA_FLOWER_FLAGS net/sched: matchall: add missing validation of TCA_MATCHALL_FLAGS net: dsa: tag_qca: Make sure there is headroom for tag enic: prevent waking up stopped tx queues over watchdog reset selinux: ensure we cleanup the internal AVC counters on error in avc_update() mlxsw: spectrum_dpipe: Add missing error path virtio_balloon: prevent pfn array overflow help_next should increase position index brd: check and limit max_part par microblaze: Prevent the overflow of the start iwlwifi: mvm: Fix thermal zone registration irqchip/gic-v3-its: Reference to its_invall_cmd descriptor when building INVALL bcache: explicity type cast in bset_bkey_last() reiserfs: prevent NULL pointer dereference in reiserfs_insert_item() lib/scatterlist.c: adjust indentation in __sg_alloc_table ocfs2: fix a NULL pointer dereference when call ocfs2_update_inode_fsync_trans() radeon: insert 10ms sleep in dce5_crtc_load_lut trigger_next should increase position index ftrace: fpid_next() should increase position index drm/nouveau/disp/nv50-: prevent oops when no channel method map provided irqchip/gic-v3: Only provision redistributors that are enabled in ACPI ceph: check availability of mds cluster on mount after wait timeout cifs: fix NULL dereference in match_prepath iwlegacy: ensure loop counter addr does not wrap and cause an infinite loop hostap: Adjust indentation in prism2_hostapd_add_sta ARM: 8951/1: Fix Kexec compilation issue. jbd2: make sure ESHUTDOWN to be recorded in the journal superblock jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record powerpc/sriov: Remove VF eeh_dev state when disabling SR-IOV ALSA: hda - Add docking station support for Lenovo Thinkpad T420s driver core: platform: fix u32 greater or equal to zero comparison s390/ftrace: generate traced function stack frame x86/decoder: Add TEST opcode to Group3-2 ALSA: hda/hdmi - add retry logic to parse_intel_hdmi() irqchip/mbigen: Set driver .suppress_bind_attrs to avoid remove problems remoteproc: Initialize rproc_class before use btrfs: device stats, log when stats are zeroed btrfs: safely advance counter when looking up bio csums btrfs: fix possible NULL-pointer dereference in integrity checks pwm: Remove set but not set variable 'pwm' ide: serverworks: potential overflow in svwks_set_pio_mode() cmd64x: potential buffer overflow in cmd64x_program_timings() pwm: omap-dmtimer: Remove PWM chip in .remove before making it unfunctional x86/mm: Fix NX bit clearing issue in kernel_map_pages_in_pgd f2fs: fix memleak of kobject watchdog/softlockup: Enforce that timestamp is valid on boot arm64: fix alternatives with LLVM's integrated assembler scsi: iscsi: Don't destroy session if there are outstanding connections f2fs: free sysfs kobject iommu/arm-smmu-v3: Use WRITE_ONCE() when changing validity of an STE usb: musb: omap2430: Get rid of musb .set_vbus for omap2430 glue drm/vmwgfx: prevent memory leak in vmw_cmdbuf_res_add drm/nouveau: Fix copy-paste error in nouveau_fence_wait_uevent_handler drm/nouveau/gr/gk20a,gm200-: add terminators to method lists read from fw drm/nouveau/secboot/gm20b: initialize pointer in gm20b_secboot_new() vme: bridges: reduce stack usage driver core: Print device when resources present in really_probe() driver core: platform: Prevent resouce overflow from causing infinite loops tty: synclink_gt: Adjust indentation in several functions tty: synclinkmp: Adjust indentation in several functions ASoC: atmel: fix build error with CONFIG_SND_ATMEL_SOC_DMA=m wan: ixp4xx_hss: fix compile-testing on 64-bit Input: edt-ft5x06 - work around first register access error rcu: Use WRITE_ONCE() for assignments to ->pprev for hlist_nulls efi/x86: Don't panic or BUG() on non-critical error conditions soc/tegra: fuse: Correct straps' address for older Tegra124 device trees IB/hfi1: Add software counter for ctxt0 seq drop udf: Fix free space reporting for metadata and virtual partitions usbip: Fix unsafe unaligned pointer usage drm: remove the newline for CRC source name. tools lib api fs: Fix gcc9 stringop-truncation compilation error ALSA: sh: Fix compile warning wrt const ALSA: sh: Fix unused variable warnings clk: sunxi-ng: add mux and pll notifiers for A64 CPU clock RDMA/rxe: Fix error type of mmap_offset pinctrl: sh-pfc: sh7269: Fix CAN function GPIOs PM / devfreq: rk3399_dmc: Add COMPILE_TEST and HAVE_ARM_SMCCC dependency x86/vdso: Provide missing include file dmaengine: Store module owner in dma_device struct ARM: dts: r8a7779: Add device node for ARM global timer drm/mediatek: handle events when enabling/disabling crtc scsi: aic7xxx: Adjust indentation in ahc_find_syncrate scsi: ufs: Complete pending requests in host reset and restore path ACPICA: Disassembler: create buffer fields in ACPI_PARSE_LOAD_PASS1 orinoco: avoid assertion in case of NULL pointer rtlwifi: rtl_pci: Fix -Wcast-function-type iwlegacy: Fix -Wcast-function-type ipw2x00: Fix -Wcast-function-type b43legacy: Fix -Wcast-function-type ALSA: usx2y: Adjust indentation in snd_usX2Y_hwdep_dsp_status fore200e: Fix incorrect checks of NULL pointer dereference reiserfs: Fix spurious unlock in reiserfs_fill_super() error handling media: v4l2-device.h: Explicitly compare grp{id,mask} to zero in v4l2_device macros ARM: dts: imx6: rdu2: Disable WP for USDHC2 and USDHC3 arm64: dts: qcom: msm8996: Disable USB2 PHY suspend by core NFC: port100: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu(). PCI/IOV: Fix memory leak in pci_iov_add_virtfn() net/wan/fsl_ucc_hdlc: reject muram offsets above 64K regulator: rk808: Lower log level on optional GPIOs being not available drm/amdgpu: remove 4 set but not used variable in amdgpu_atombios_get_connector_info_from_object_table clk: qcom: rcg2: Don't crash if our parent can't be found; return an error kconfig: fix broken dependency in randconfig-generated .config KVM: s390: ENOTSUPP -> EOPNOTSUPP fixups nbd: add a flush_workqueue in nbd_start_device ext4, jbd2: ensure panic when aborting with zero errno tracing: Fix very unlikely race of registering two stat tracers tracing: Fix tracing_stat return values in error handling paths x86/sysfb: Fix check for bad VRAM size jbd2: clear JBD2_ABORT flag before journal_reset to update log tail info when load journal kselftest: Minimise dependency of get_size on C library interfaces clocksource/drivers/bcm2835_timer: Fix memory leak of timer usb: dwc2: Fix IN FIFO allocation usb: gadget: udc: fix possible sleep-in-atomic-context bugs in gr_probe() uio: fix a sleep-in-atomic-context bug in uio_dmem_genirq_irqcontrol() sparc: Add .exit.data section. MIPS: Loongson: Fix potential NULL dereference in loongson3_platform_init() efi/x86: Map the entire EFI vendor string before copying it pinctrl: baytrail: Do not clear IRQ flags on direct-irq enabled pins media: sti: bdisp: fix a possible sleep-in-atomic-context bug in bdisp_device_run() char/random: silence a lockdep splat with printk() gpio: gpio-grgpio: fix possible sleep-in-atomic-context bugs in grgpio_irq_map/unmap() powerpc/powernv/iov: Ensure the pdn for VFs always contains a valid PE number media: i2c: mt9v032: fix enum mbus codes and frame sizes pxa168fb: Fix the function used to release some memory in an error handling path pinctrl: sh-pfc: sh7264: Fix CAN function GPIOs gianfar: Fix TX timestamping with a stacked DSA driver ALSA: ctl: allow TLV read operation for callback type of element in locked case ext4: fix ext4_dax_read/write inode locking sequence for IOCB_NOWAIT leds: pca963x: Fix open-drain initialization brcmfmac: Fix use after free in brcmf_sdio_readframes() cpu/hotplug, stop_machine: Fix stop_machine vs hotplug order drm/gma500: Fixup fbdev stolen size usage evaluation KVM: nVMX: Use correct root level for nested EPT shadow page tables Revert "KVM: VMX: Add non-canonical check on writes to RTIT address MSRs" Revert "KVM: nVMX: Use correct root level for nested EPT shadow page tables" scsi: qla2xxx: fix a potential NULL pointer dereference jbd2: do not clear the BH_Mapped flag when forgetting a metadata buffer jbd2: move the clearing of b_modified flag to the journal_unmap_buffer() hwmon: (pmbus/ltc2978) Fix PMBus polling of MFR_COMMON definitions. perf/x86/intel: Fix inaccurate period in context switch for auto-reload s390/time: Fix clk type in get_tod_clock RDMA/core: Fix protection fault in get_pkey_idx_qp_list IB/hfi1: Close window for pq and request coliding serial: imx: Only handle irqs that are actually enabled serial: imx: ensure that RX irqs are off if RX is off padata: Remove broken queue flushing perf/x86/amd: Add missing L2 misses event spec to AMD Family 17h's event map KVM: nVMX: Use correct root level for nested EPT shadow page tables arm64: ssbs: Fix context-switch when SSBS is present on all CPUs btrfs: log message when rw remount is attempted with unclean tree-log btrfs: print message when tree-log replay starts Btrfs: fix race between using extent maps and merging them ext4: improve explanation of a mount failure caused by a misconfigured kernel ext4: fix checksum errors with indexed dirs ext4: fix support for inode sizes > 1024 bytes ext4: don't assume that mmp_nodename/bdevname have NUL ARM: 8723/2: always assume the "unified" syntax for assembly code arm64: nofpsimd: Handle TIF_FOREIGN_FPSTATE flag cleanly arm64: ptrace: nofpsimd: Fail FP/SIMD regset operations arm64: cpufeature: Set the FP/SIMD compat HWCAP bits properly ALSA: usb-audio: Apply sample rate quirk for Audioengine D1 Input: synaptics - remove the LEN0049 dmi id from topbuttonpad list Input: synaptics - enable SMBus on ThinkPad L470 Input: synaptics - switch T470s to RMI4 by default ecryptfs: fix a memory leak bug in ecryptfs_init_messaging() ecryptfs: fix a memory leak bug in parse_tag_1_packet() ASoC: sun8i-codec: Fix setting DAI data format ALSA: hda: Use scnprintf() for printing texts for sysfs/procfs iommu/qcom: Fix bogus detach logic KVM: x86: emulate RDPID UPSTREAM: sched/psi: Fix OOB write when writing 0 bytes to PSI files UPSTREAM: psi: Fix a division error in psi poll() UPSTREAM: sched/psi: Fix sampling error and rare div0 crashes with cgroups and high uptime UPSTREAM: sched/psi: Correct overly pessimistic size calculation FROMLIST: f2fs: Handle casefolding with Encryption FROMLIST: fscrypt: Have filesystems handle their d_ops FROMLIST: ext4: Use generic casefolding support FROMLIST: f2fs: Use generic casefolding support FROMLIST: Add standard casefolding support FROMLIST: unicode: Add utf8_casefold_hash ANDROID: cuttlefish_defconfig: Add CONFIG_UNICODE ANDROID: sdcardfs: fix -ENOENT lookup race issue ANDROID: gki_defconfig: Enable CONFIG_RD_LZ4 ANDROID: dm: Add wrapped key support in dm-default-key ANDROID: dm: add support for passing through derive_raw_secret ANDROID: block: Prevent crypto fallback for wrapped keys ANDROID: Disable wq fp check in CFI builds ANDROID: increase limit on sched-tune boost groups ANDROID: ufs, block: fix crypto power management and move into block layer ANDROID: Incremental fs: Support xattrs ANDROID: test_stackinit: work around LLVM PR44916 ANDROID: clang: update to 10.0.4 fs-verity: use u64_to_user_ptr() fs-verity: use mempool for hash requests fs-verity: implement readahead of Merkle tree pages ext4: readpages() should submit IO as read-ahead fs-verity: implement readahead for FS_IOC_ENABLE_VERITY fscrypt: improve format of no-key names ubifs: allow both hash and disk name to be provided in no-key names ubifs: don't trigger assertion on invalid no-key filename fscrypt: clarify what is meant by a per-file key fscrypt: derive dirhash key for casefolded directories fscrypt: don't allow v1 policies with casefolding fscrypt: add "fscrypt_" prefix to fname_encrypt() fscrypt: don't print name of busy file when removing key fscrypt: document gfp_flags for bounce page allocation fscrypt: optimize fscrypt_zeroout_range() fscrypt: remove redundant bi_status check fscrypt: Allow modular crypto algorithms fscrypt: include <linux/ioctl.h> in UAPI header fscrypt: don't check for ENOKEY from fscrypt_get_encryption_info() fscrypt: remove fscrypt_is_direct_key_policy() fscrypt: move fscrypt_valid_enc_modes() to policy.c fscrypt: check for appropriate use of DIRECT_KEY flag earlier fscrypt: split up fscrypt_supported_policy() by policy version fscrypt: introduce fscrypt_needs_contents_encryption() fscrypt: move fscrypt_d_revalidate() to fname.c fscrypt: constify inode parameter to filename encryption functions fscrypt: constify struct fscrypt_hkdf parameter to fscrypt_hkdf_expand() fscrypt: verify that the crypto_skcipher has the correct ivsize fscrypt: use crypto_skcipher_driver_name() fscrypt: support passing a keyring key to FS_IOC_ADD_ENCRYPTION_KEY keys: Export lookup_user_key to external users f2fs: fix build error on PAGE_KERNEL_RO Conflicts: arch/arm64/kernel/smp.c arch/arm64/kernel/traps.c block/blk-crypto-fallback.c block/keyslot-manager.c drivers/base/power/wakeup.c drivers/clk/clk.c drivers/clk/qcom/clk-rcg2.c drivers/gpu/Makefile drivers/gpu/drm/msm/msm_drv.c drivers/gpu/drm/msm/msm_gem.c drivers/hwtracing/coresight/coresight-funnel.c drivers/irqchip/irq-gic-v3.c drivers/md/dm.c drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c drivers/net/macsec.c drivers/net/phy/micrel.c drivers/net/wireless/ath/wil6210/cfg80211.c drivers/net/wireless/ath/wil6210/fw_inc.c drivers/net/wireless/ath/wil6210/pcie_bus.c drivers/net/wireless/ath/wil6210/pm.c drivers/net/wireless/ath/wil6210/wil6210.h drivers/of/base.c drivers/power/supply/power_supply_sysfs.c drivers/rpmsg/qcom_glink_smem.c drivers/scsi/sd.c drivers/scsi/ufs/ufshcd-crypto.c drivers/scsi/ufs/ufshcd.c drivers/scsi/ufs/ufshcd.h drivers/scsi/ufs/ufshci.h drivers/usb/dwc3/core.c drivers/usb/dwc3/gadget.c drivers/usb/gadget/Kconfig drivers/usb/gadget/composite.c drivers/usb/gadget/function/f_fs.c drivers/usb/gadget/legacy/Makefile drivers/usb/host/xhci-mem.c fs/ext4/readpage.c fs/sdcardfs/lookup.c include/linux/key.h include/linux/keyslot-manager.h include/linux/power_supply.h include/uapi/linux/coresight-stm.h net/qrtr/qrtr.c Change-Id: Iaa9fcbe987e721f02596e167249a519781ed3888 Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2947 lines
68 KiB
C
2947 lines
68 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 <linux/seq_file.h>
|
|
#include <linux/uio.h>
|
|
#include <linux/skb_array.h>
|
|
#include <linux/bpf.h>
|
|
#include <linux/bpf_trace.h>
|
|
|
|
#include <linux/uaccess.h>
|
|
|
|
/* 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)
|
|
#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 list_head next;
|
|
struct tun_struct *detached;
|
|
struct skb_array tx_array;
|
|
};
|
|
|
|
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
|
|
|
|
/* 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;
|
|
};
|
|
|
|
#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 & 0x3ff;
|
|
}
|
|
|
|
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(unsigned long data)
|
|
{
|
|
struct tun_struct *tun = (struct tun_struct *)data;
|
|
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_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) {
|
|
unsigned long this_timer;
|
|
count++;
|
|
this_timer = e->updated + delay;
|
|
if (time_before_eq(this_timer, jiffies))
|
|
tun_flow_delete(tun, e);
|
|
else 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_bh(&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();
|
|
|
|
/* We may get a very small possibility of OOO during switching, not
|
|
* worth to optimize.*/
|
|
if (tun->numqueues == 1 || tfile->detached)
|
|
goto unlock;
|
|
|
|
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);
|
|
}
|
|
|
|
unlock:
|
|
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_select_queue(struct net_device *dev, struct sk_buff *skb,
|
|
void *accel_priv, select_queue_fallback_t fallback)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
struct tun_flow_entry *e;
|
|
u32 txq = 0;
|
|
u32 numqueues = 0;
|
|
|
|
rcu_read_lock();
|
|
numqueues = ACCESS_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;
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
return txq;
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
static void tun_queue_purge(struct tun_file *tfile)
|
|
{
|
|
struct sk_buff *skb;
|
|
|
|
while ((skb = skb_array_consume(&tfile->tx_array)) != NULL)
|
|
kfree_skb(skb);
|
|
|
|
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 && !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;
|
|
|
|
--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);
|
|
}
|
|
skb_array_cleanup(&tfile->tx_array);
|
|
sock_put(&tfile->sk);
|
|
}
|
|
}
|
|
|
|
static void tun_detach(struct tun_file *tfile, bool clean)
|
|
{
|
|
rtnl_lock();
|
|
__tun_detach(tfile, clean);
|
|
rtnl_unlock();
|
|
}
|
|
|
|
static void tun_detach_all(struct net_device *dev)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
struct bpf_prog *xdp_prog = rtnl_dereference(tun->xdp_prog);
|
|
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);
|
|
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]);
|
|
/* Drop read queue */
|
|
tun_queue_purge(tfile);
|
|
sock_put(&tfile->sk);
|
|
}
|
|
list_for_each_entry_safe(tfile, tmp, &tun->disabled, next) {
|
|
tun_enable_queue(tfile);
|
|
tun_queue_purge(tfile);
|
|
sock_put(&tfile->sk);
|
|
}
|
|
BUG_ON(tun->numdisabled != 0);
|
|
|
|
if (xdp_prog)
|
|
bpf_prog_put(xdp_prog);
|
|
|
|
if (tun->flags & IFF_PERSIST)
|
|
module_put(THIS_MODULE);
|
|
}
|
|
|
|
static int tun_attach(struct tun_struct *tun, struct file *file,
|
|
bool skip_filter, 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 &&
|
|
skb_array_resize(&tfile->tx_array, dev->tx_queue_len, GFP_KERNEL)) {
|
|
err = -ENOMEM;
|
|
goto out;
|
|
}
|
|
|
|
tfile->queue_index = tun->numqueues;
|
|
tfile->socket.sk->sk_shutdown &= ~RCV_SHUTDOWN;
|
|
if (publish_tun)
|
|
rcu_assign_pointer(tfile->tun, tun);
|
|
rcu_assign_pointer(tun->tfiles[tun->numqueues], tfile);
|
|
tun->numqueues++;
|
|
|
|
if (tfile->detached)
|
|
tun_enable_queue(tfile);
|
|
else
|
|
sock_hold(&tfile->sk);
|
|
|
|
tun_set_real_num_queues(tun);
|
|
|
|
/* device is allowed to go away first, so no need to hold extra
|
|
* refcnt.
|
|
*/
|
|
|
|
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 struct tun_struct *tun_get(struct file *file)
|
|
{
|
|
return __tun_get(file->private_data);
|
|
}
|
|
|
|
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 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;
|
|
u32 numqueues = 0;
|
|
|
|
rcu_read_lock();
|
|
tfile = rcu_dereference(tun->tfiles[txq]);
|
|
numqueues = ACCESS_ONCE(tun->numqueues);
|
|
|
|
/* Drop packet if interface is not attached */
|
|
if (txq >= numqueues)
|
|
goto drop;
|
|
|
|
#ifdef CONFIG_RPS
|
|
if (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
|
|
|
|
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;
|
|
|
|
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 (skb_array_produce(&tfile->tx_array, 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);
|
|
}
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
static void tun_poll_controller(struct net_device *dev)
|
|
{
|
|
/*
|
|
* Tun only receives frames when:
|
|
* 1) the char device endpoint gets data from user space
|
|
* 2) the tun socket gets a sendmsg call from user space
|
|
* Since both of those are synchronous operations, we are guaranteed
|
|
* never to have pending data when we poll for it
|
|
* so there is nothing to do here but return.
|
|
* We need this though so netpoll recognizes us as an interface that
|
|
* supports polling, which enables bridge devices in virt setups to
|
|
* still use netconsole
|
|
*/
|
|
return;
|
|
}
|
|
#endif
|
|
|
|
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_xdp *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);
|
|
xdp->prog_attached = !!xdp->prog_id;
|
|
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,
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
.ndo_poll_controller = tun_poll_controller,
|
|
#endif
|
|
.ndo_set_rx_headroom = tun_set_headroom,
|
|
.ndo_get_stats64 = tun_net_get_stats64,
|
|
};
|
|
|
|
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,
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
.ndo_poll_controller = tun_poll_controller,
|
|
#endif
|
|
.ndo_features_check = passthru_features_check,
|
|
.ndo_set_rx_headroom = tun_set_headroom,
|
|
.ndo_get_stats64 = tun_net_get_stats64,
|
|
.ndo_xdp = tun_xdp,
|
|
};
|
|
|
|
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;
|
|
setup_timer(&tun->flow_gc_timer, tun_flow_cleanup, (unsigned long)tun);
|
|
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 unsigned int 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;
|
|
unsigned int mask = 0;
|
|
|
|
if (!tun)
|
|
return POLLERR;
|
|
|
|
sk = tfile->socket.sk;
|
|
|
|
tun_debug(KERN_INFO, tun, "tun_chr_poll\n");
|
|
|
|
poll_wait(file, sk_sleep(sk), wait);
|
|
|
|
if (!skb_array_empty(&tfile->tx_array))
|
|
mask |= POLLIN | POLLRDNORM;
|
|
|
|
/* 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 |= POLLOUT | POLLWRNORM;
|
|
|
|
if (tun->dev->reg_state != NETREG_REGISTERED)
|
|
mask = POLLERR;
|
|
|
|
tun_put(tun);
|
|
return mask;
|
|
}
|
|
|
|
/* 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;
|
|
bool xdp_xmit = false;
|
|
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.data_end = xdp.data + len;
|
|
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:
|
|
xdp_xmit = true;
|
|
/* fall through */
|
|
case XDP_PASS:
|
|
delta = orig_data - 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 + delta);
|
|
skb_set_owner_w(skb, tfile->socket.sk);
|
|
get_page(alloc_frag->page);
|
|
alloc_frag->offset += buflen;
|
|
|
|
if (xdp_xmit) {
|
|
skb->dev = tun->dev;
|
|
generic_xdp_tx(skb, xdp_prog);
|
|
rcu_read_unlock();
|
|
local_bh_enable();
|
|
return NULL;
|
|
}
|
|
|
|
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;
|
|
int skb_xdp = 1;
|
|
|
|
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 (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);
|
|
}
|
|
|
|
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);
|
|
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);
|
|
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);
|
|
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:
|
|
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();
|
|
return total_len;
|
|
}
|
|
}
|
|
rcu_read_unlock();
|
|
local_bh_enable();
|
|
}
|
|
|
|
rxhash = __skb_get_hash_symmetric(skb);
|
|
|
|
rcu_read_lock();
|
|
if (unlikely(!(tun->dev->flags & IFF_UP))) {
|
|
err = -EIO;
|
|
rcu_read_unlock();
|
|
goto drop;
|
|
}
|
|
|
|
#ifndef CONFIG_4KSTACKS
|
|
tun_rx_batched(tun, tfile, skb, more);
|
|
#else
|
|
netif_rx_ni(skb);
|
|
#endif
|
|
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);
|
|
|
|
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_struct *tun = tun_get(file);
|
|
struct tun_file *tfile = file->private_data;
|
|
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;
|
|
}
|
|
|
|
/* 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 {
|
|
__be16 h_vlan_proto;
|
|
__be16 h_vlan_TCI;
|
|
} 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 struct sk_buff *tun_ring_recv(struct tun_file *tfile, int noblock,
|
|
int *err)
|
|
{
|
|
DECLARE_WAITQUEUE(wait, current);
|
|
struct sk_buff *skb = NULL;
|
|
int error = 0;
|
|
|
|
skb = skb_array_consume(&tfile->tx_array);
|
|
if (skb)
|
|
goto out;
|
|
if (noblock) {
|
|
error = -EAGAIN;
|
|
goto out;
|
|
}
|
|
|
|
add_wait_queue(&tfile->wq.wait, &wait);
|
|
|
|
while (1) {
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
|
skb = skb_array_consume(&tfile->tx_array);
|
|
if (skb)
|
|
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 skb;
|
|
}
|
|
|
|
static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile,
|
|
struct iov_iter *to,
|
|
int noblock, struct sk_buff *skb)
|
|
{
|
|
ssize_t ret;
|
|
int err;
|
|
|
|
tun_debug(KERN_INFO, tun, "tun_do_read\n");
|
|
|
|
if (!iov_iter_count(to)) {
|
|
if (skb)
|
|
kfree_skb(skb);
|
|
return 0;
|
|
}
|
|
|
|
if (!skb) {
|
|
/* Read frames from ring */
|
|
skb = tun_ring_recv(tfile, noblock, &err);
|
|
if (!skb)
|
|
return err;
|
|
}
|
|
|
|
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_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);
|
|
}
|
|
|
|
static void tun_setup(struct net_device *dev)
|
|
{
|
|
struct tun_struct *tun = netdev_priv(dev);
|
|
|
|
tun->owner = INVALID_UID;
|
|
tun->group = INVALID_GID;
|
|
|
|
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 struct rtnl_link_ops tun_link_ops __read_mostly = {
|
|
.kind = DRV_NAME,
|
|
.priv_size = sizeof(struct tun_struct),
|
|
.setup = tun_setup,
|
|
.validate = tun_validate,
|
|
};
|
|
|
|
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, POLLOUT |
|
|
POLLWRNORM | POLLWRBAND);
|
|
|
|
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);
|
|
struct sk_buff *skb = m->msg_control;
|
|
int ret;
|
|
|
|
if (!tun) {
|
|
ret = -EBADFD;
|
|
goto out_free_skb;
|
|
}
|
|
|
|
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, skb);
|
|
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_skb:
|
|
if (skb)
|
|
kfree_skb(skb);
|
|
return ret;
|
|
}
|
|
|
|
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 = skb_array_peek_len(&tfile->tx_array);
|
|
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;
|
|
|
|
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, 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.
|
|
*/
|
|
return 0;
|
|
}
|
|
}
|
|
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;
|
|
|
|
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);
|
|
|
|
INIT_LIST_HEAD(&tun->disabled);
|
|
err = tun_attach(tun, file, false, 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");
|
|
|
|
tun->flags = (tun->flags & ~TUN_FEATURES) |
|
|
(ifr->ifr_flags & TUN_FEATURES);
|
|
|
|
/* 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, 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;
|
|
|
|
unlock:
|
|
rtnl_unlock();
|
|
return ret;
|
|
}
|
|
|
|
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 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;
|
|
|
|
if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == SOCK_IOC_TYPE) {
|
|
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);
|
|
|
|
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(sock_net(&tfile->sk), 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);
|
|
}
|
|
if (!arg && (tun->flags & IFF_PERSIST)) {
|
|
tun->flags &= ~IFF_PERSIST;
|
|
module_put(THIS_MODULE);
|
|
}
|
|
|
|
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;
|
|
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;
|
|
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;
|
|
|
|
default:
|
|
ret = -EINVAL;
|
|
break;
|
|
}
|
|
|
|
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_PID, 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 (skb_array_init(&tfile->tx_array, 0, GFP_KERNEL)) {
|
|
sk_free(&tfile->sk);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
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 *f)
|
|
{
|
|
struct tun_struct *tun;
|
|
struct ifreq ifr;
|
|
|
|
memset(&ifr, 0, sizeof(ifr));
|
|
|
|
rtnl_lock();
|
|
tun = tun_get(f);
|
|
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 int tun_get_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;
|
|
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,
|
|
};
|
|
|
|
static int tun_queue_resize(struct tun_struct *tun)
|
|
{
|
|
struct net_device *dev = tun->dev;
|
|
struct tun_file *tfile;
|
|
struct skb_array **arrays;
|
|
int n = tun->numqueues + tun->numdisabled;
|
|
int ret, i;
|
|
|
|
arrays = kmalloc_array(n, sizeof(*arrays), GFP_KERNEL);
|
|
if (!arrays)
|
|
return -ENOMEM;
|
|
|
|
for (i = 0; i < tun->numqueues; i++) {
|
|
tfile = rtnl_dereference(tun->tfiles[i]);
|
|
arrays[i] = &tfile->tx_array;
|
|
}
|
|
list_for_each_entry(tfile, &tun->disabled, next)
|
|
arrays[i++] = &tfile->tx_array;
|
|
|
|
ret = skb_array_resize_multiple(arrays, n,
|
|
dev->tx_queue_len, GFP_KERNEL);
|
|
|
|
kfree(arrays);
|
|
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 skb_array *tun_get_skb_array(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_array;
|
|
}
|
|
EXPORT_SYMBOL_GPL(tun_get_skb_array);
|
|
|
|
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");
|