Commit Graph

2401 Commits

Author SHA1 Message Date
Ivaylo Georgiev
13d1442047 Merge keystone/android12-5.10-keystone-qcom-release.34+ (5de3fa7) into msm-5.10
* refs/heads/tmp-5de3fa7:
  ANDROID: irq: manage: Export irq_do_set_affinity symbol
  FROMLIST: usb: typec: tcpm: Fix wrong handling in GET_SINK_CAP
  ANDROID: GKI: Enable CONFIG_USB_CONFIGFS_F_UAC2
  ANDROID: qki: Add consolidate config
  ANDROID: Update the ABI xml and symbol list
  UPSTREAM: remoteproc: core: Remove casting to rproc_handle_resource_t
  ANDROID: GKI: enable CONFIG_MTK_TIMER
  ANDROID: sched: Add vendor hooks for update_topology
  ANDROID: GKI: Enable CONFIG_EXFAT_FS in gki_defconfig
  ANDROID: cgroup: Add android_rvh_cgroup_force_kthread_migration
  ANDROID: Update the ABI xml and symbol list
  FROMLIST: sched: Fix out-of-bound access in uclamp
  ANDROID: mm: spf: fix task fault accounting
  ANDROID: Update the ABI xml and symbol list
  Revert "ANDROID: gki_defconfig: temporarily disable KFENCE in GKI"
  Linux 5.10.34
  mei: me: add Alder Lake P device id.
  iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_gen2_enqueue_hcmd()
  ANDROID: Update the ABI xml and symbol list
  FROMGIT: mmc: sdhci: Check for reset prior to DMA address unmap
  ANDROID: ABI: Add symbols for CONFIG_PAGE_PINNER
  ANDROID: GKI: Enable CONFIG_PAGE_PINNER
  ANDROID: mm: page_pinner: use put_user_page at unstable_tree_search_insert
  ANDROID: mm: page_pinner: unattribute follow_page in munlock_vma_pages_range
  ANDROID: mm: page_pinner: use put_user_page at add_page_for_migration
  ANDROID: mm: page_pinner: use put_user_page at dump_user_range
  ANDROID: mm: page_pinner: use put_user_page at seq_print_vma_name
  ANDROID: mm: page_pinner: use put_user_page at fuse_copy_finish
  ANDROID: mm: page_pinner: use put_user_page at get_futex_key
  ANDROID: mm: page_pinner: use put_user_page at copy_string
  ANDROID: mm: page_pinner: use put_user_page at access_remote_vm
  ANDROID: mm: page_pinner: introduce failure_tracking feature
  ANDROID: mm: introduce page_pinner
  ANDROID: vendor_hooks: Fix psi_event build warning
  ANDROID: vendor_hooks: Add hooks for binder proc transaction
  ANDROID: vendor_hooks: tune reclaim inactive ratio
  ANDROID: dma-buf: Make DMA-BUF sysfs stats kobjects not send uevents
  ANDROID: vendor_hooks: bypass shrink slab
  FROMGIT: kbuild: update config_data.gz only when the content of .config is changed
  ANDROID: arm64: Initialise mismatched compat hwcaps from CPU notifier
  UPSTREAM: ARM: 9039/1: assembler: generalize byte swapping macro into rev_l
  UPSTREAM: ARM: 9035/1: uncompress: Add be32tocpu macro
  FROMGIT: kfence: use power-efficient work queue to run delayed work
  FROMGIT: kfence: maximize allocation wait timeout duration
  FROMGIT: kfence: await for allocation using wait_event
  FROMGIT: kfence: zero guard page after out-of-bounds access
  UPSTREAM: kfence: make compatible with kmemleak
  UPSTREAM: kfence: fix reports if constant function prefixes exist
  UPSTREAM: kfence: fix printk format for ptrdiff_t
  ANDROID: Support disabling symbol trimming
  ANDROID: Incremental fs: Fix pseudo-file attributes
  ANDROID: sched: Fix missing RQCF_UPDATED in migrate_tasks
  FROMLIST: mm, thp: Relax the VM_DENYWRITE constraint on file-backed THPs
  Linux 5.10.33
  USB: CDC-ACM: fix poison/unpoison imbalance
  net: hso: fix NULL-deref on disconnect regression
  x86/crash: Fix crash_setup_memmap_entries() out-of-bounds access
  ia64: tools: remove duplicate definition of ia64_mf() on ia64
  ia64: fix discontig.c section mismatches
  csky: change a Kconfig symbol name to fix e1000 build error
  kasan: fix hwasan build for gcc
  cavium/liquidio: Fix duplicate argument
  xen-netback: Check for hotplug-status existence before watching
  arm64: kprobes: Restore local irqflag if kprobes is cancelled
  s390/entry: save the caller of psw_idle
  dmaengine: tegra20: Fix runtime PM imbalance on error
  net: geneve: check skb is large enough for IPv4/IPv6 header
  ARM: dts: Fix swapped mmc order for omap3
  dmaengine: xilinx: dpdma: Fix race condition in done IRQ
  dmaengine: xilinx: dpdma: Fix descriptor issuing on video group
  soc: qcom: geni: shield geni_icc_get() for ACPI boot
  HID: wacom: Assign boolean values to a bool variable
  HID cp2112: fix support for multiple gpiochips
  HID: alps: fix error return code in alps_input_configured()
  HID: google: add don USB id
  perf map: Fix error return code in maps__clone()
  perf auxtrace: Fix potential NULL pointer dereference
  perf/x86/kvm: Fix Broadwell Xeon stepping in isolation_ucodes[]
  perf/x86/intel/uncore: Remove uncore extra PCI dev HSWEP_PCI_PCU_3
  locking/qrwlock: Fix ordering in queued_write_lock_slowpath()
  bpf: Tighten speculative pointer arithmetic mask
  bpf: Refactor and streamline bounds check into helper
  bpf: Allow variable-offset stack access
  bpf: Permits pointers on stack for helper calls
  arm64: dts: allwinner: Revert SD card CD GPIO for Pine64-LTS
  pinctrl: core: Show pin numbers for the controllers with base = 0
  block: return -EBUSY when there are open partitions in blkdev_reread_part
  pinctrl: lewisburg: Update number of pins in community
  vdpa/mlx5: Set err = -ENOMEM in case dma_map_sg_attrs fails
  KEYS: trusted: Fix TPM reservation for seal/unseal
  gpio: omap: Save and restore sysconfig
  vhost-vdpa: protect concurrent access to vhost device iotlb
  ANDROID: GKI: Update the generic symbol list
  ANDROID: ABI: Add symbols for crypto
  ANDROID: ABI: Update the ABI XML
  Revert "ANDROID: GKI: Change UCLAMP_BUCKETS_COUNT to 20"
  ANDROID: vendor_hooks: Add hook for binder
  UPSTREAM: crypto: arm/blake2s - fix for big endian
  UPSTREAM: crypto: arm/blake2b - drop unnecessary return statement
  FROMGIT: kasan, arm64: tests supports for HW_TAGS async mode
  FROMGIT: arm64: mte: Report async tag faults before suspend
  FROMGIT: arm64: mte: Enable async tag check fault
  FROMGIT: arm64: mte: Conditionally compile mte_enable_kernel_*()
  ANDROID: ABI: Update the ABI xml
  ANDROID: ABI: Update the generic symbol list
  ANDROID: selinux: add vendor hook in selinux
  FROMGIT: arm64: mte: Enable TCO in functions that can read beyond buffer limits

Change-Id: Ia5306eea12edc8ec29b8732a03de075bed22a1bf
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-05-07 06:54:29 -07:00
Elliot Berman
e2058ba412 ANDROID: qki: Add consolidate config
Add a "consolidate" defconfig fragment to enable further debug options
of the GKI kernel. The "consolidate" name has a storied history, but
it's effectively a "debug" kernel.

The options enabled in the consolidate.fragment have been found to have
a good balance of additional debug features versus performance impact.
For instance, SLUB_DEBUG is not enabled due to large performance impact.

Bug: 186872007
Change-Id: I8fcbda0f9b47b3b33636a594797f97e86d2a6778
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
2021-05-05 19:49:45 -07:00
qctecmdr
6827c90957 Merge "treewide: Kconfig: Cleanup unused and orphaned symbols" 2021-05-04 14:37:13 -07:00
Ivaylo Georgiev
fd88580ed5 Merge keystone/android12-5.10-keystone-qcom-release.32+ (0fad51f) into msm-5.10
* refs/heads/tmp-0fad51f:
  ANDROID: sched: Add vendor hooks for update_load_avg
  ANDROID: Update ABI with __traceiter_*() additions
  ANDROID: Update the cf symbol list
  ANDROID: Update the qcom symbol list
  ANDROID: Update the hikey960 symbol list
  ANDROID: Update the generic symbol list
  ANDROID: Update the exynos symbol list
  ANDROID: Update the db845c symbol list
  UPSTREAM: arm64: Move PSTATE.TCO setting to separate functions
  FROMGIT: kasan: Add report for async mode
  FROMGIT: arm64: mte: Drop arch_enable_tagging()
  ANDROID: GKI: 4/23 KMI update
  FROMGIT: kasan: Add KASAN mode kernel parameter
  FROMGIT: arm64: mte: Add asynchronous mode support
  ANDROID: GKI: update ABI description
  FROMLIST: remoteproc: core: Move cdev add before device add
  ANDROID: mm: allow vmas with vm_ops to be speculatively handled
  ANDROID: sched: Add ANDROID_OEM_DATA_ARRAY in user_struct.
  ANDROID: sched: Add vendor hooks for sched.
  ANDROID: sched: Add vendor hooks to compute new cpu freq.
  Revert "Revert "net: xfrm: Localize sequence counter per network namespace""
  FROMGIT: usb: typec: tcpm: Allow slow charging loops to comply to pSnkStby
  FROMGIT: usb: dwc3: gadget: Check for disabled LPM quirk
  ANDROID: GKI: arm64: reserve space in cpu_hwcaps and cpu_hwcap_keys arrays
  FROMLIST: export: Make CRCs robust to symbol trimming
  ANDROID: Kconfig.gki Add SND_SOC_TOPOLOGY
  ANDROID: GKI: Change UCLAMP_BUCKETS_COUNT to 20
  FROMGIT: ASoC: soc-component: Add snd_soc_pcm_component_ack
  UPSTREAM: ASoC: dmaengine_pcm: add peripheral configuration
  UPSTREAM: dmaengine: add peripheral configuration
  UPSTREAM: PM: domains: use device's next wakeup to determine domain idle state
  UPSTREAM: PM: domains: inform PM domain of a device's next wakeup
  Revert "FROMLIST: PM / Domains: add domain feature flag for next wakeup"
  Revert "FROMLIST: PM / domains: inform PM domain of a device's next wakeup"
  Revert "FROMLIST: PM / Domains: use device's next wakeup to determine domain idle state"
  FROMGIT: mm: cma: add the CMA instance name to cma trace events
  FROMGIT: mm: cma: Add the CMA instance name to the cma_alloc_start trace event
  FROMGIT: mm: cma: add trace events for CMA alloc perf testing
  ANDROID: mm: compaction: fix isolate_and_split_free_page() redefinition
  ANDROID: vendor_hooks: Fix build-break due to psi_event
  ANDROID: GKI: Update abi_gki_aarch64_qcom list for kprobe module
  ANDROID: GKI: Enable CONFIG_HIST_TRIGGERS
  FROMGIT: tick/broadcast: Allow late registered device to enter oneshot mode
  UPSTREAM: arm64: uaccess: split user/kernel routines
  UPSTREAM: arm64: uaccess: refactor __{get,put}_user
  BACKPORT: arm64: uaccess: rename privileged uaccess routines
  ANDROID: Incremental fs: Add INCFS_IOC_GET_LAST_READ_ERROR
  ANDROID: Incremental fs: Fix INCFS_MAGIC_NUMBER casts
  ANDROID: Incremental fs: Add status to sysfs
  ANDROID: Incremental fs: fix u64 integer cast to pointer
  ANDROID: Incremental fs: stat should return actual used blocks
  ANDROID: Incremental fs: Add FS_IOC_READ_VERITY_METADATA
  ANDROID: export find_user() & free_uid()for GKI purpose.
  ANDROID: GKI: update ABI description
  ANDROID: GKI: Update abi_gki_aarch64_qcom for kgsl AO tracing support
  ANDROID: ABI: update symbols to unisoc whitelist for the fifth time
  ANDROID: sched: Add vendor hooks for cpu affinity.
  ANDROID: GKI: Update abi_gki_aarch64_qcom list for reverse migration
  ANDROID: abi_gki_aarch64_generic: Add a few more symbols
  FROMGIT: usb: dwc3: gadget: Remove FS bInterval_m1 limitation
  ANDROID: abi_gki_aarch64_qcom: Add __bitmap_or
  ANDROID: GKI: Update abi_gki_aarch64_qcom for gpio block read tracepoint
  FROMGIT: dt-bindings: connector: Add slow-charger-loop definition
  FROMGIT: usb: dwc3: gadget: Fix START_TRANSFER link state check
  FROMGIT: usb: gadget: Fix double free of device descriptor pointers
  FROMGIT: usb: typec: tcpm: Fix error while calculating PPS out values
  ANDROID: inline isolate_and_split_free_page
  ANDROID: kernel: clear debug_kinfo precisely
  ANDROID: cgroup: Add vendor hook for cpuset.
  ANDROID: GKI: Update abi_gki_aarch64_qcom for PSI tracepoints
  ANDROID: psi: Add vendor hooks for PSI tracing
  Linux 5.10.32
  net: phy: marvell: fix detection of PHY on Topaz switches
  bpf: Move sanitize_val_alu out of op switch
  bpf: Improve verifier error messages for users
  bpf: Rework ptr_limit into alu_limit and add common error path
  arm64: mte: Ensure TIF_MTE_ASYNC_FAULT is set atomically
  ARM: 9071/1: uprobes: Don't hook on thumb instructions
  bpf: Move off_reg into sanitize_ptr_alu
  bpf: Ensure off_reg has no mixed signed bounds for all types
  r8169: don't advertise pause in jumbo mode
  r8169: tweak max read request size for newer chips also in jumbo mtu mode
  KVM: VMX: Don't use vcpu->run->internal.ndata as an array index
  KVM: VMX: Convert vcpu_vmx.exit_reason to a union
  bpf: Use correct permission flag for mixed signed bounds arithmetic
  arm64: dts: allwinner: h6: beelink-gs1: Remove ext. 32 kHz osc reference
  arm64: dts: allwinner: Fix SD card CD GPIO for SOPine systems
  ARM: OMAP2+: Fix uninitialized sr_inst
  ARM: footbridge: fix PCI interrupt mapping
  ARM: 9069/1: NOMMU: Fix conversion for_each_membock() to for_each_mem_range()
  ARM: OMAP2+: Fix warning for omap_init_time_of()
  gro: ensure frag0 meets IP header alignment
  ch_ktls: do not send snd_una update to TCB in middle
  ch_ktls: tcb close causes tls connection failure
  ch_ktls: fix device connection close
  ch_ktls: Fix kernel panic
  ibmvnic: remove duplicate napi_schedule call in open function
  ibmvnic: remove duplicate napi_schedule call in do_reset function
  ibmvnic: avoid calling napi_disable() twice
  ia64: tools: remove inclusion of ia64-specific version of errno.h header
  ia64: remove duplicate entries in generic_defconfig
  ethtool: pause: make sure we init driver stats
  i40e: fix the panic when running bpf in xdpdrv mode
  net: Make tcp_allowed_congestion_control readonly in non-init netns
  mm: ptdump: fix build failure
  net: ip6_tunnel: Unregister catch-all devices
  net: sit: Unregister catch-all devices
  net: davicom: Fix regulator not turned off on failed probe
  net/mlx5e: Fix setting of RS FEC mode
  netfilter: nft_limit: avoid possible divide error in nft_limit_init
  net/mlx5e: fix ingress_ifindex check in mlx5e_flower_parse_meta
  net: macb: fix the restore of cmp registers
  libbpf: Fix potential NULL pointer dereference
  netfilter: arp_tables: add pre_exit hook for table unregister
  netfilter: bridge: add pre_exit hooks for ebtable unregistration
  libnvdimm/region: Fix nvdimm_has_flush() to handle ND_REGION_ASYNC
  ice: Fix potential infinite loop when using u8 loop counter
  netfilter: conntrack: do not print icmpv6 as unknown via /proc
  netfilter: flowtable: fix NAT IPv6 offload mangling
  ixgbe: fix unbalanced device enable/disable in suspend/resume
  scsi: libsas: Reset num_scatter if libata marks qc as NODATA
  riscv: Fix spelling mistake "SPARSEMEM" to "SPARSMEM"
  vfio/pci: Add missing range check in vfio_pci_mmap
  arm64: alternatives: Move length validation in alternative_{insn, endif}
  arm64: fix inline asm in load_unaligned_zeropad()
  readdir: make sure to verify directory entry for legacy interfaces too
  dm verity fec: fix misaligned RS roots IO
  HID: wacom: set EV_KEY and EV_ABS only for non-HID_GENERIC type of devices
  Input: i8042 - fix Pegatron C15B ID entry
  Input: s6sy761 - fix coordinate read bit shift
  lib: fix kconfig dependency on ARCH_WANT_FRAME_POINTERS
  virt_wifi: Return micros for BSS TSF values
  mac80211: clear sta->fast_rx when STA removed from 4-addr VLAN
  pcnet32: Use pci_resource_len to validate PCI resource
  net: ieee802154: forbid monitor for add llsec seclevel
  net: ieee802154: stop dump llsec seclevels for monitors
  net: ieee802154: forbid monitor for del llsec devkey
  net: ieee802154: forbid monitor for add llsec devkey
  net: ieee802154: stop dump llsec devkeys for monitors
  net: ieee802154: forbid monitor for del llsec dev
  net: ieee802154: forbid monitor for add llsec dev
  net: ieee802154: stop dump llsec devs for monitors
  net: ieee802154: forbid monitor for del llsec key
  net: ieee802154: forbid monitor for add llsec key
  net: ieee802154: stop dump llsec keys for monitors
  iwlwifi: add support for Qu with AX201 device
  scsi: scsi_transport_srp: Don't block target in SRP_PORT_LOST state
  ASoC: fsl_esai: Fix TDM slot setup for I2S mode
  drm/msm: Fix a5xx/a6xx timestamps
  ARM: omap1: fix building with clang IAS
  ARM: keystone: fix integer overflow warning
  neighbour: Disregard DEAD dst in neigh_update
  gpu/xen: Fix a use after free in xen_drm_drv_init
  ASoC: max98373: Added 30ms turn on/off time delay
  ASoC: max98373: Changed amp shutdown register as volatile
  xfrm: BEET mode doesn't support fragments for inner packets
  iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_enqueue_hcmd()
  arc: kernel: Return -EFAULT if copy_to_user() fails
  lockdep: Add a missing initialization hint to the "INFO: Trying to register non-static key" message
  ARM: dts: Fix moving mmc devices with aliases for omap4 & 5
  ARM: dts: Drop duplicate sha2md5_fck to fix clk_disable race
  ACPI: x86: Call acpi_boot_table_init() after acpi_table_upgrade()
  dmaengine: idxd: fix wq cleanup of WQCFG registers
  dmaengine: plx_dma: add a missing put_device() on error path
  dmaengine: Fix a double free in dma_async_device_register
  dmaengine: dw: Make it dependent to HAS_IOMEM
  dmaengine: idxd: fix wq size store permission state
  dmaengine: idxd: fix opcap sysfs attribute output
  dmaengine: idxd: fix delta_rec and crc size field for completion record
  dmaengine: idxd: Fix clobbering of SWERR overflow bit on writeback
  gpio: sysfs: Obey valid_mask
  Input: nspire-keypad - enable interrupts only when opened
  mtd: rawnand: mtk: Fix WAITRDY break condition and timeout
  net/sctp: fix race condition in sctp_destroy_sock
  ANDROID: abi_gki_aarch64_qcom: Add android_rvh_sched_setaffinity
  ANDROID: gki_defconfig: temporarily disable KFENCE in GKI
  ANDROID: GKI: Update abi_gki_aarch64_qcom list for minidump
  ANDROID: implement wrapper for reverse migration
  ANDROID: cpuidle: enable TEO and MENU governors in gki_defconfig
  ANDROID: abi_gki_aarch64_qcom: Update symbol list
  ANDROID: clang: update to 12.0.5
  ANDROID: Add initial Exynos symbol list

Conflicts:
	Documentation/devicetree/bindings
	Documentation/devicetree/bindings/connector/usb-connector.yaml
	include/linux/pm_domain.h

Change-Id: I5701e429fa31cfb870b758f09af62b9bdad0fac9
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-04-29 21:38:09 -07:00
Gyeongtaek Lee
e67935d786 ANDROID: Kconfig.gki Add SND_SOC_TOPOLOGY
Enable hidden config SND_SOC_TOPOLOGY need by SND_SOC=m

Bug: 153682187
Change-Id: I47dabfaa6f0d138f78fbc1c9fc0d4ac3c7c73986
Signed-off-by: Gyeongtaek Lee <gt82.lee@samsung.com>
2021-04-23 18:42:37 -07:00
Elliot Berman
1062254d86 treewide: Kconfig: Cleanup unused and orphaned symbols
Remove unused Kconfig symbols tree-wide to align to upstream.

Change-Id: I44e2ae08377c43307ac8e82f6b8dabe26219d40f
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
2021-04-20 21:18:59 -07:00
Ivaylo Georgiev
01bf73a615 Merge android12-5.10.29 (c62f091) into msm-5.10
* refs/heads/tmp-c62f091:
  ANDROID: Add GKI_HIDDEN_MM_CONFIGS to support ballooning.
  ANDROID: usb: dwc3: gadget: don't cancel the started requests
  Linux 5.10.29
  init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM
  init/Kconfig: make COMPILE_TEST depend on !S390
  bpf, x86: Validate computation of branch displacements for x86-32
  bpf, x86: Validate computation of branch displacements for x86-64
  tools/resolve_btfids: Add /libbpf to .gitignore
  kbuild: Do not clean resolve_btfids if the output does not exist
  kbuild: Add resolve_btfids clean to root clean target
  tools/resolve_btfids: Set srctree variable unconditionally
  tools/resolve_btfids: Check objects before removing
  tools/resolve_btfids: Build libbpf and libsubcmd in separate directories
  math: Export mul_u64_u64_div_u64
  io_uring: fix timeout cancel return code
  cifs: Silently ignore unknown oplock break handle
  cifs: revalidate mapping when we open files for SMB1 POSIX
  ia64: fix format strings for err_inject
  ia64: mca: allocate early mca with GFP_ATOMIC
  selftests/vm: fix out-of-tree build
  scsi: target: pscsi: Clean up after failure in pscsi_map_sg()
  ptp_qoriq: fix overflow in ptp_qoriq_adjfine() u64 calcalation
  platform/x86: intel_pmc_core: Ignore GBE LTR on Tiger Lake platforms
  block: clear GD_NEED_PART_SCAN later in bdev_disk_changed
  x86/build: Turn off -fcf-protection for realmode targets
  drm/msm/disp/dpu1: icc path needs to be set before dpu runtime resume
  kselftest/arm64: sve: Do not use non-canonical FFR register value
  platform/x86: thinkpad_acpi: Allow the FnLock LED to change state
  net: ipa: fix init header command validation
  netfilter: nftables: skip hook overlap logic if flowtable is stale
  netfilter: conntrack: Fix gre tunneling over ipv6
  drm/msm: Ratelimit invalid-fence message
  drm/msm/adreno: a5xx_power: Don't apply A540 lm_setup to other GPUs
  drm/msm/dsi_pll_7nm: Fix variable usage for pll_lockdet_rate
  mac80211: choose first enabled channel for monitor
  mac80211: Check crypto_aead_encrypt for errors
  mISDN: fix crash in fritzpci
  kunit: tool: Fix a python tuple typing error
  net: pxa168_eth: Fix a potential data race in pxa168_eth_remove
  net/mlx5e: Enforce minimum value check for ICOSQ size
  bpf, x86: Use kvmalloc_array instead kmalloc_array in bpf_jit_comp
  platform/x86: intel-hid: Support Lenovo ThinkPad X1 Tablet Gen 2
  bus: ti-sysc: Fix warning on unbind if reset is not deasserted
  ARM: dts: am33xx: add aliases for mmc interfaces
  FROMGIT: usb: typec: tcpm: update power supply once partner accepts
  FROMGIT: usb: typec: tcpm: Address incorrect values of tcpm psy for pps supply
  FROMGIT: usb: typec: tcpm: Address incorrect values of tcpm psy for fixed supply
  ANDROID: first 4/9/2021 KMI update
  ANDROID: Add a new core symbol list
  FROMLIST: iommu/arm-smmu: Implement the map_pages() IOMMU driver callback
  FROMLIST: iommu/arm-smmu: Implement the unmap_pages() IOMMU driver callback
  FROMLIST: iommu/io-pgtable-arm-v7s: Implement arm_v7s_map_pages()
  FROMLIST: iommu/io-pgtable-arm-v7s: Implement arm_v7s_unmap_pages()
  FROMLIST: iommu/io-pgtable-arm: Implement arm_lpae_map_pages()
  FROMLIST: iommu/io-pgtable-arm: Implement arm_lpae_unmap_pages()
  BACKPORT: FROMLIST: iommu/io-pgtable-arm: Prepare PTE methods for handling multiple entries
  FROMLIST: iommu: Add support for the map_pages() callback
  FROMLIST: iommu: Hook up '->unmap_pages' driver callback
  FROMLIST: iommu: Split 'addr_merge' argument to iommu_pgsize() into separate parts
  FROMLIST: iommu: Use bitmap to calculate page size in iommu_pgsize()
  BACKPORT: FROMLIST: iommu: Add a map_pages() op for IOMMU drivers
  BACKPORT: FROMLIST: iommu/io-pgtable: Introduce map_pages() as a page table op
  FROMLIST: iommu: Add an unmap_pages() op for IOMMU drivers
  FROMLIST: iommu/io-pgtable: Introduce unmap_pages() as a page table op
  Revert "Revert "net: introduce CAN specific pointer in the struct net_device""
  Revert "Revert "bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG""
  Revert "Revert "bpf: Fix fexit trampoline.""
  Revert "ANDROID: GKI: hack to handle genksyms change in sound/soc/soc-core.c"
  Revert "Revert "can: dev: Move device back to init netns on owning netns delete""
  Revert "Revert "net: phy: broadcom: Fix RGMII delays for BCM50160 and BCM50610M""
  Revert "Revert "net: phy: broadcom: Set proper 1000BaseX/SGMII interface mode for BCM54616S""
  Revert "Revert "net: phy: broadcom: Avoid forward for bcm54xx_config_clock_delay()""
  Revert "Revert "net: phy: introduce phydev->port""
  ANDROID: abi_gki_aarch64_qcom: Add __tracepoint_android_rvh_replace_next_task_fair
  ANDROID: sched: Update android_rvh_check_preempt_wakeup hook
  FROMGIT: scsi: ufs: ufs-debugfs: Add error counters
  FROMGIT: scsi: ufs: Refine error history functions
  ANDROID: GKI: Add android_rvh_cpu_cgroup_online to qcom symbol list
  ANDROID: sched: Add android_rvh_cpu_cgroup_online hook
  FROMLIST: userfaultfd/shmem: fix minor fault page leak
  FROMLIST: userfaultfd/hugetlbfs: Fix minor fault page leak
  BACKPORT: FROMGIT: userfaultfd/selftests: unify error handling
  FROMGIT: userfaultfd/selftests: only dump counts if mode enabled
  FROMGIT: userfaultfd/selftests: drop VERIFY check in locking_thread
  FROMGIT: userfaultfd/selftests: remove the time() check on delayed uffd
  FROMGIT: userfaultfd/selftests: use user mode only
  FROMGIT: userfaultfd/selftests: exercise minor fault handling shmem support
  BACKPORT: FROMGIT: userfaultfd/selftests: reinitialize test context in each test
  FROMGIT: userfaultfd/selftests: create alias mappings in the shmem test
  FROMGIT: userfaultfd/selftests: use memfd_create for shmem test type
  BACKPORT: FROMGIT: userfaultfd: support minor fault handling for shmem
  FROMGIT: userfaultfd/selftests: add test exercising minor fault handling
  FROMGIT: userfaultfd: update documentation to describe minor fault handling
  BACKPORT: FROMGIT: userfaultfd: add UFFDIO_CONTINUE ioctl
  BACKPORT: FROMGIT: userfaultfd: hugetlbfs: only compile UFFD helpers if config enabled
  FROMGIT: userfaultfd: disable huge PMD sharing for MINOR registered VMAs
  BACKPORT: FROMGIT: userfaultfd: add minor fault registration mode
  FROMGIT: hugetlb/userfaultfd: unshare all pmds for hugetlbfs when register wp
  FROMGIT: mm/hugetlb: move flush_hugetlb_tlb_range() into hugetlb.h
  FROMGIT: mm/hugetlb: fix build with !ARCH_WANT_HUGE_PMD_SHARE
  FROMGIT: hugetlb/userfaultfd: forbid huge pmd sharing when uffd enabled
  BACKPORT: FROMGIT: hugetlb: pass vma into huge_pte_alloc() and huge_pmd_share()
  ANDROID: arm64: coresight: Fix a sparse warning
  ANDROID: usb: dwc3: export tracepoint for dwc3 read/write

Conflicts:
	drivers/iommu/arm/arm-smmu/arm-smmu.c

Change-Id: Id5b65da0d3a7bd2e169e28f227f362c6627048ec
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-04-12 22:00:57 -07:00
Greg Kroah-Hartman
c62f09151d Merge 5.10.29 into android12-5.10
Changes in 5.10.29
	ARM: dts: am33xx: add aliases for mmc interfaces
	bus: ti-sysc: Fix warning on unbind if reset is not deasserted
	platform/x86: intel-hid: Support Lenovo ThinkPad X1 Tablet Gen 2
	bpf, x86: Use kvmalloc_array instead kmalloc_array in bpf_jit_comp
	net/mlx5e: Enforce minimum value check for ICOSQ size
	net: pxa168_eth: Fix a potential data race in pxa168_eth_remove
	kunit: tool: Fix a python tuple typing error
	mISDN: fix crash in fritzpci
	mac80211: Check crypto_aead_encrypt for errors
	mac80211: choose first enabled channel for monitor
	drm/msm/dsi_pll_7nm: Fix variable usage for pll_lockdet_rate
	drm/msm/adreno: a5xx_power: Don't apply A540 lm_setup to other GPUs
	drm/msm: Ratelimit invalid-fence message
	netfilter: conntrack: Fix gre tunneling over ipv6
	netfilter: nftables: skip hook overlap logic if flowtable is stale
	net: ipa: fix init header command validation
	platform/x86: thinkpad_acpi: Allow the FnLock LED to change state
	kselftest/arm64: sve: Do not use non-canonical FFR register value
	drm/msm/disp/dpu1: icc path needs to be set before dpu runtime resume
	x86/build: Turn off -fcf-protection for realmode targets
	block: clear GD_NEED_PART_SCAN later in bdev_disk_changed
	platform/x86: intel_pmc_core: Ignore GBE LTR on Tiger Lake platforms
	ptp_qoriq: fix overflow in ptp_qoriq_adjfine() u64 calcalation
	scsi: target: pscsi: Clean up after failure in pscsi_map_sg()
	selftests/vm: fix out-of-tree build
	ia64: mca: allocate early mca with GFP_ATOMIC
	ia64: fix format strings for err_inject
	cifs: revalidate mapping when we open files for SMB1 POSIX
	cifs: Silently ignore unknown oplock break handle
	io_uring: fix timeout cancel return code
	math: Export mul_u64_u64_div_u64
	tools/resolve_btfids: Build libbpf and libsubcmd in separate directories
	tools/resolve_btfids: Check objects before removing
	tools/resolve_btfids: Set srctree variable unconditionally
	kbuild: Add resolve_btfids clean to root clean target
	kbuild: Do not clean resolve_btfids if the output does not exist
	tools/resolve_btfids: Add /libbpf to .gitignore
	bpf, x86: Validate computation of branch displacements for x86-64
	bpf, x86: Validate computation of branch displacements for x86-32
	init/Kconfig: make COMPILE_TEST depend on !S390
	init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM
	Linux 5.10.29

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib3f9484150747de48eca46c69d690830b790418e
2021-04-11 09:11:53 +02:00
Michael Hoyle
1d3b80670f ANDROID: Add GKI_HIDDEN_MM_CONFIGS to support ballooning.
Bug: 183227346
Signed-off-by: Michael Hoyle <mikehoyle@google.com>
Change-Id: I67ab3cd12ee5925a941af2509ec1eef1fac07b86
2021-04-10 13:53:31 -07:00
Masahiro Yamada
cef13a0437 init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM
commit ea29b20a828511de3348334e529a3d046a180416 upstream.

I read the commit log of the following two:

- bc083a64b6 ("init/Kconfig: make COMPILE_TEST depend on !UML")
- 334ef6ed06fa ("init/Kconfig: make COMPILE_TEST depend on !S390")

Both are talking about HAS_IOMEM dependency missing in many drivers.

So, 'depends on HAS_IOMEM' seems the direct, sensible solution to me.

This does not change the behavior of UML. UML still cannot enable
COMPILE_TEST because it does not provide HAS_IOMEM.

The current dependency for S390 is too strong. Under the condition of
CONFIG_PCI=y, S390 provides HAS_IOMEM, hence can enable COMPILE_TEST.

I also removed the meaningless 'default n'.

Link: https://lkml.kernel.org/r/20210224140809.1067582-1-masahiroy@kernel.org
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Arnd Bergmann <arnd@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: KP Singh <kpsingh@google.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Terrell <terrelln@fb.com>
Cc: Quentin Perret <qperret@google.com>
Cc: Valentin Schneider <valentin.schneider@arm.com>
Cc: "Enrico Weigelt, metux IT consult" <lkml@metux.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-04-10 13:36:11 +02:00
Heiko Carstens
ba02635769 init/Kconfig: make COMPILE_TEST depend on !S390
commit 334ef6ed06fa1a54e35296b77b693bcf6d63ee9e upstream.

While allmodconfig and allyesconfig build for s390 there are also
various bots running compile tests with randconfig, where PCI is
disabled. This reveals that a lot of drivers should actually depend on
HAS_IOMEM.
Adding this to each device driver would be a never ending story,
therefore just disable COMPILE_TEST for s390.

The reasoning is more or less the same as described in
commit bc083a64b6 ("init/Kconfig: make COMPILE_TEST depend on !UML").

Reported-by: kernel test robot <lkp@intel.com>
Suggested-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-04-10 13:36:11 +02:00
Axel Rasmussen
4d3dd339de BACKPORT: FROMGIT: userfaultfd: add minor fault registration mode
Patch series "userfaultfd: add minor fault handling", v9.

Overview
========

This series adds a new userfaultfd feature, UFFD_FEATURE_MINOR_HUGETLBFS.
When enabled (via the UFFDIO_API ioctl), this feature means that any
hugetlbfs VMAs registered with UFFDIO_REGISTER_MODE_MISSING will *also*
get events for "minor" faults.  By "minor" fault, I mean the following
situation:

Let there exist two mappings (i.e., VMAs) to the same page(s) (shared
memory).  One of the mappings is registered with userfaultfd (in minor
mode), and the other is not.  Via the non-UFFD mapping, the underlying
pages have already been allocated & filled with some contents.  The UFFD
mapping has not yet been faulted in; when it is touched for the first
time, this results in what I'm calling a "minor" fault.  As a concrete
example, when working with hugetlbfs, we have huge_pte_none(), but
find_lock_page() finds an existing page.

We also add a new ioctl to resolve such faults: UFFDIO_CONTINUE.  The idea
is, userspace resolves the fault by either a) doing nothing if the
contents are already correct, or b) updating the underlying contents using
the second, non-UFFD mapping (via memcpy/memset or similar, or something
fancier like RDMA, or etc...).  In either case, userspace issues
UFFDIO_CONTINUE to tell the kernel "I have ensured the page contents are
correct, carry on setting up the mapping".

Use Case
========

Consider the use case of VM live migration (e.g. under QEMU/KVM):

1. While a VM is still running, we copy the contents of its memory to a
   target machine. The pages are populated on the target by writing to the
   non-UFFD mapping, using the setup described above. The VM is still running
   (and therefore its memory is likely changing), so this may be repeated
   several times, until we decide the target is "up to date enough".

2. We pause the VM on the source, and start executing on the target machine.
   During this gap, the VM's user(s) will *see* a pause, so it is desirable to
   minimize this window.

3. Between the last time any page was copied from the source to the target, and
   when the VM was paused, the contents of that page may have changed - and
   therefore the copy we have on the target machine is out of date. Although we
   can keep track of which pages are out of date, for VMs with large amounts of
   memory, it is "slow" to transfer this information to the target machine. We
   want to resume execution before such a transfer would complete.

4. So, the guest begins executing on the target machine. The first time it
   touches its memory (via the UFFD-registered mapping), userspace wants to
   intercept this fault. Userspace checks whether or not the page is up to date,
   and if not, copies the updated page from the source machine, via the non-UFFD
   mapping. Finally, whether a copy was performed or not, userspace issues a
   UFFDIO_CONTINUE ioctl to tell the kernel "I have ensured the page contents
   are correct, carry on setting up the mapping".

We don't have to do all of the final updates on-demand. The userfaultfd manager
can, in the background, also copy over updated pages once it receives the map of
which pages are up-to-date or not.

Interaction with Existing APIs
==============================

Because this is a feature, a registered VMA could potentially receive both
missing and minor faults.  I spent some time thinking through how the
existing API interacts with the new feature:

UFFDIO_CONTINUE cannot be used to resolve non-minor faults, as it does not
allocate a new page.  If UFFDIO_CONTINUE is used on a non-minor fault:

- For non-shared memory or shmem, -EINVAL is returned.
- For hugetlb, -EFAULT is returned.

UFFDIO_COPY and UFFDIO_ZEROPAGE cannot be used to resolve minor faults.
Without modifications, the existing codepath assumes a new page needs to
be allocated.  This is okay, since userspace must have a second
non-UFFD-registered mapping anyway, thus there isn't much reason to want
to use these in any case (just memcpy or memset or similar).

- If UFFDIO_COPY is used on a minor fault, -EEXIST is returned.
- If UFFDIO_ZEROPAGE is used on a minor fault, -EEXIST is returned (or -EINVAL
  in the case of hugetlb, as UFFDIO_ZEROPAGE is unsupported in any case).
- UFFDIO_WRITEPROTECT simply doesn't work with shared memory, and returns
  -ENOENT in that case (regardless of the kind of fault).

Future Work
===========

This series only supports hugetlbfs.  I have a second series in flight to
support shmem as well, extending the functionality.  This series is more
mature than the shmem support at this point, and the functionality works
fully on hugetlbfs, so this series can be merged first and then shmem
support will follow.

This patch (of 6):

This feature allows userspace to intercept "minor" faults.  By "minor"
faults, I mean the following situation:

Let there exist two mappings (i.e., VMAs) to the same page(s).  One of the
mappings is registered with userfaultfd (in minor mode), and the other is
not.  Via the non-UFFD mapping, the underlying pages have already been
allocated & filled with some contents.  The UFFD mapping has not yet been
faulted in; when it is touched for the first time, this results in what
I'm calling a "minor" fault.  As a concrete example, when working with
hugetlbfs, we have huge_pte_none(), but find_lock_page() finds an existing
page.

This commit adds the new registration mode, and sets the relevant flag on
the VMAs being registered.  In the hugetlb fault path, if we find that we
have huge_pte_none(), but find_lock_page() does indeed find an existing
page, then we have a "minor" fault, and if the VMA has the userfaultfd
registration flag, we call into userfaultfd to handle it.

This is implemented as a new registration mode, instead of an API feature.
This is because the alternative implementation has significant drawbacks
[1].

However, doing it this was requires we allocate a VM_* flag for the new
registration mode.  On 32-bit systems, there are no unused bits, so this
feature is only supported on architectures with
CONFIG_ARCH_USES_HIGH_VMA_FLAGS.  When attempting to register a VMA in
MINOR mode on 32-bit architectures, we return -EINVAL.

[1] https://lore.kernel.org/patchwork/patch/1380226/

Link: https://lkml.kernel.org/r/20210301222728.176417-1-axelrasmussen@google.com
Link: https://lkml.kernel.org/r/20210301222728.176417-2-axelrasmussen@google.com
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chinwen Chang <chinwen.chang@mediatek.com>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jann Horn <jannh@google.com>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: Lokesh Gidra <lokeshgidra@google.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: "Michal Koutn" <mkoutny@suse.com>
Cc: Michel Lespinasse <walken@google.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Shaohua Li <shli@fb.com>
Cc: Shawn Anastasio <shawn@anastas.io>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Steven Price <steven.price@arm.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Adam Ruprecht <ruprecht@google.com>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Cc: Cannon Matthews <cannonmatthews@google.com>
Cc: "Dr . David Alan Gilbert" <dgilbert@redhat.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Mina Almasry <almasrymina@google.com>
Cc: Oliver Upton <oupton@google.com>
Cc: Kirill A. Shutemov <kirill@shutemov.name>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

(cherry picked from commit 82a150ec394f6b944e26786b907fc0deab5b2064
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git akpm)
Link: https://lore.kernel.org/patchwork/patch/1388132/

Conflicts:
	arch/arm64/Kconfig
	fs/userfaultfd.c
	mm/hugetlb.c

(All related to SPF feature. Resolved by manual rebase)

Signed-off-by: Lokesh Gidra <lokeshgidra@google.com>
Bug: 160737021
Bug: 169683130
Change-Id: I43b37272d531341439ceaa03213d0e2415e04688
2021-04-09 15:35:59 -07:00
Ivaylo Georgiev
86e90c034c Merge android12-5.10.21+ (44f812e) into msm-5.10
* refs/heads/tmp-44f812e:
  ANDROID: sched/core: Move en/dequeue hooks before related callbacks
  FROMGIT: kasan: record task_work_add() call stack
  FROMGIT: kasan, mm: integrate slab init_on_free with HW_TAGS
  FROMGIT: kasan, mm: integrate slab init_on_alloc with HW_TAGS
  FROMGIT: kasan, mm: integrate page_alloc init with HW_TAGS
  FROMGIT: mm: introduce debug_pagealloc_{map,unmap}_pages() helpers
  FROMGIT: mm, page_poison: remove CONFIG_PAGE_POISONING_ZERO
  FROMGIT: mm/page_alloc: clear all pages in post_alloc_hook() with init_on_alloc=1
  FROMGIT: mm, page_poison: remove CONFIG_PAGE_POISONING_NO_SANITY
  FROMGIT: kernel/power: allow hibernation with page_poison sanity checking
  FROMGIT: mm, page_poison: use static key more efficiently
  BACKPORT: mm, page_alloc: do not rely on the order of page_poison and init_on_alloc/free parameters
  FROMGIT: kasan: init memory in kasan_(un)poison for HW_TAGS
  FROMGIT: arm64: kasan: allow to init memory when setting tags
  FROMGIT: mm, kasan: don't poison boot memory with tag-based modes
  FROMGIT: kasan: initialize shadow to TAG_INVALID for SW_TAGS
  FROMGIT: mm/kasan: switch from strlcpy to strscpy
  BACKPORT: kasan: remove redundant config option
  FROMGIT: kasan: fix per-page tags for non-page_alloc pages
  FROMGIT: kasan: fix KASAN_STACK dependency for HW_TAGS
  FROMGIT: kasan, mm: fix crash with HW_TAGS and DEBUG_PAGEALLOC
  FROMGIT: arm64: kasan: fix page_alloc tagging with DEBUG_VIRTUAL
  FROMLIST: configfs: make directories inherit uid/gid from creator
  ANDROID: GKI: add some padding to some driver core structures
  ANDROID: Initial Android 12 OWNERS for abi metafiles
  UPSTREAM: iommu/msm: Hook up iotlb_sync_map
  UPSTREAM: memory: mtk-smi: Allow building as module
  UPSTREAM: memory: mtk-smi: Use platform_register_drivers
  UPSTREAM: iommu/mediatek: Fix error code in probe()
  UPSTREAM: iommu/mediatek: Fix unsigned domid comparison with less than zero
  UPSTREAM: iommu/mediatek: Add mt8192 support
  UPSTREAM: memory: mtk-smi: Add mt8192 support
  UPSTREAM: iommu/mediatek: Remove unnecessary check in attach_device
  UPSTREAM: iommu/mediatek: Support master use iova over 32bit
  UPSTREAM: iommu/mediatek: Add iova reserved function
  UPSTREAM: iommu/mediatek: Support for multi domains
  UPSTREAM: iommu/mediatek: Add get_domain_id from dev->dma_range_map
  UPSTREAM: iommu/mediatek: Add iova_region structure
  UPSTREAM: iommu/mediatek: Move geometry.aperture updating into domain_finalise
  UPSTREAM: iommu/mediatek: Move domain_finalise into attach_device
  UPSTREAM: iommu/mediatek: Adjust the structure
  UPSTREAM: iommu/mediatek: Support report iova 34bit translation fault in ISR
  UPSTREAM: iommu/mediatek: Support up to 34bit iova in tlb flush
  UPSTREAM: iommu/mediatek: Add power-domain operation
  UPSTREAM: iommu/mediatek: Add pm runtime callback
  UPSTREAM: iommu/mediatek: Add device link for smi-common and m4u
  UPSTREAM: iommu/mediatek: Add error handle for mtk_iommu_probe
  UPSTREAM: iommu/mediatek: Move hw_init into attach_device
  UPSTREAM: iommu/mediatek: Update oas for v7s
  UPSTREAM: iommu/mediatek: Add a flag for iova 34bits case
  UPSTREAM: iommu/io-pgtable-arm-v7s: Quad lvl1 pgtable for MediaTek
  UPSTREAM: iommu/io-pgtable-arm-v7s: Add cfg as a param in some macros
  UPSTREAM: iommu/io-pgtable-arm-v7s: Clarify LVL_SHIFT/BITS macro
  UPSTREAM: iommu/io-pgtable-arm-v7s: Use ias to check the valid iova in unmap
  UPSTREAM: iommu/io-pgtable-arm-v7s: Extend PA34 for MediaTek
  UPSTREAM: iommu/mediatek: Use the common mtk-memory-port.h
  UPSTREAM: dt-bindings: mediatek: Add binding for mt8192 IOMMU
  UPSTREAM: dt-bindings: memory: mediatek: Rename header guard for SMI header file
  UPSTREAM: dt-bindings: memory: mediatek: Extend LARB_NR_MAX to 32
  UPSTREAM: dt-bindings: memory: mediatek: Add a common memory header file
  UPSTREAM: dt-bindings: memory: mediatek: Convert SMI to DT schema
  UPSTREAM: dt-bindings: iommu: mediatek: Convert IOMMU to DT schema
  UPSTREAM: iommu/mediatek: Remove the tlb-ops for v7s
  UPSTREAM: iommu/io-pgtable: Remove TLBI_ON_MAP quirk
  UPSTREAM: iommu/io-pgtable: Allow io_pgtable_tlb ops optional
  UPSTREAM: iommu/mediatek: Gather iova in iommu_unmap to achieve tlb sync once
  UPSTREAM: iommu/mediatek: Add iotlb_sync_map to sync whole the iova range
  BACKPORT: UPSTREAM: iommu: Add iova and size as parameters in iotlb_sync_map
  UPSTREAM: iommu/io-pgtable: Remove tlb_flush_leaf
  ANDROID: abi_gki_aarch64_qcom: Add symbols to allow list
  ANDROID: Add vendor hook to binder.
  ANDROID: fs: Add vendor hooks for ep_create_wakeup_source & timerfd_create
  Revert "FROMLIST: fs/buffer.c: Revoke LRU when trying to drop buffers"
  ANDROID: enable LLVM_IAS=1 for clang's integrated assembler for arm
  FROMLIST: ARM: kprobes: rewrite test-arm.c in UAL
  FROMLIST: ARM: kprobes: fix UNPREDICTABLE warnings
  UPSTREAM: ARM: efistub: replace adrl pseudo-op with adr_l macro invocation
  UPSTREAM: ARM: assembler: introduce adr_l, ldr_l and str_l macros
  UPSTREAM: ARM: 9029/1: Make iwmmxt.S support Clang's integrated assembler
  FROMGIT: binder: BINDER_GET_FROZEN_INFO ioctl
  FROMGIT: binder: use EINTR for interrupted wait for work
  BACKPORT: FROMGIT: binder: BINDER_FREEZE ioctl
  ANDROID: qcom: Add pci_dev_present to ABI
  ANDROID: GKI: Add sysfs_emit to symbol list
  ANDROID: gki_defconfig: Enable IFB, NET_SCH_TBF, NET_ACT_POLICE
  ANDROID: gki_defconfig: Enable USB_NET_CDC_NCM
  ANDROID: gki_defconfig: Enable USB_NET_AQC111
  UPSTREAM: usb: dwc3: gadget: Use max speed if unspecified
  UPSTREAM: usb: dwc3: gadget: Set gadget_max_speed when set ssp_rate
  ANDROID: freezer: export the freezer_cgrp_subsys for GKI purpose.
  UPSTREAM: usb: dwc3: qcom: skip interconnect init for ACPI probe
  FROMGIT: usb: dwc3: gadget: Ignore EP queue requests during bus reset
  FROMGIT: usb: dwc3: gadget: Avoid continuing preparing TRBs during teardown
  ANDROID: gpiolib: Add vendor hook for gpio read
  ANDROID: abi_gki_aarch64_qcom: Whitelist sched_setattr
  ANDROID: GKI: sched: add Android ABI padding to some structures
  ANDROID: GKI: mm: add Android ABI padding to some structures
  ANDROID: GKI: mount.h: add Android ABI padding to some structures
  FROMLIST: mm: fs: Invalidate BH LRU during page migration
  FROMLIST: mm: replace migrate_[prep|finish] with lru_cache_[disable|enable]
  BACKPORT: FROMLIST: mm: disable LRU pagevec during the migration temporarily
  Revert "FROMLIST: mm: replace migrate_prep with lru_add_drain_all"
  Revert "BACKPORT: FROMLIST: mm: disable LRU pagevec during the migration temporarily"
  Revert "FROMLIST: mm: fs: Invalidate BH LRU during page migration"
  ANDROID: vendor_hooks: Add hooks for account process tick
  ANDROID: usb: dwc3: gadget: Export dwc3_stop_active_transfer, dwc3_send_gadget_ep_cmd
  ANDROID: clang: update to 12.0.4
  ANDROID: vendor_hooks: Add hooks for improving binder trans
  ANDROID: GKI: Disable DTPM CPU device
  UPSTREAM: powercap/drivers/dtpm: Add the experimental label to the option description
  UPSTREAM: powercap/drivers/dtpm: Fix root node initialization
  ANDROID: GKI: sched.h: add Android ABI padding to some structures
  ANDROID: GKI: module.h: add Android ABI padding to some structures
  ANDROID: GKI: sock.h: add Android ABI padding to some structures
  ANDROID: sched/fair: Do not sync task util with SD_BALANCE_FORK
  FROMGIT: selinux: vsock: Set SID for socket returned by accept()
  ANDROID: usb: typec: tcpci: Migrate restricted vendor hook
  ANDROID: qcom: Add is_dma_buf_file to ABI
  ANDROID: GKI: update .xml file
  ANDROID: GKI: enable KFENCE by setting the sample interval to 500ms
  ANDROID: abi_gki_aarch64_qcom: Add xhci symbols to list
  ANDROID: vmlinux.lds.h: Define SANITIZER_DISCARDS with CONFIG_CFI_CLANG
  ANDROID: usb: typec: tcpci: Add vendor hook to mask vbus present
  ANDROID: usb: typce: tcpci: Add vendor hook for chip specific features
  ANDROID: usb: typec: tcpci: Add vendor hooks for tcpci interface
  FROMGIT: f2fs: add sysfs nodes to get runtime compression stat
  ANDROID: dma-buf: Fix error path on system heaps use of the page pool
  ANDROID: usb: typec: tcpm: Fix event storm caused by error in backport
  ANDROID: GKI: USB: XHCI: add Android ABI padding to lots of xhci structures
  FROMGIT: KVM: arm64: Fix host's ZCR_EL2 restore on nVHE
  FROMGIT: KVM: arm64: Force SCTLR_EL2.WXN when running nVHE
  FROMGIT: KVM: arm64: Turn SCTLR_ELx_FLAGS into INIT_SCTLR_EL2_MMU_ON
  FROMGIT: KVM: arm64: Use INIT_SCTLR_EL2_MMU_OFF to disable the MMU on KVM teardown
  FROMGIT: arm64: Use INIT_SCTLR_EL1_MMU_OFF to disable the MMU on CPU restart
  FROMGIT: KVM: arm64: Enable SVE support for nVHE
  FROMGIT: KVM: arm64: Save/restore SVE state for nVHE
  BACKPORT: FROMGIT: KVM: arm64: Trap host SVE accesses when the FPSIMD state is dirty
  FROMGIT: KVM: arm64: Save guest's ZCR_EL1 before saving the FPSIMD state
  FROMGIT: KVM: arm64: Map SVE context at EL2 when available
  BACKPORT: FROMGIT: KVM: arm64: Rework SVE host-save/guest-restore
  FROMGIT: arm64: sve: Provide a conditional update accessor for ZCR_ELx
  FROMGIT: KVM: arm64: Introduce vcpu_sve_vq() helper
  FROMGIT: KVM: arm64: Let vcpu_sve_pffr() handle HYP VAs
  FROMGIT: KVM: arm64: Use {read,write}_sysreg_el1 to access ZCR_EL1
  FROMGIT: KVM: arm64: Provide KVM's own save/restore SVE primitives
  ANDROID: GKI: USB: Gadget: add Android ABI padding to struct usb_gadget
  ANDROID: vendor_hooks: Add hooks for memory when debug
  ANDROID: vendor_hooks: Add hooks for ufs scheduler
  ANDROID: GKI: sound/usb/card.h: add Android ABI padding to struct snd_usb_endpoint
  ANDROID: GKI: user_namespace.h: add Android ABI padding to a structure
  ANDROID: GKI: timer.h: add Android ABI padding to a structure
  ANDROID: GKI: quota.h: add Android ABI padding to some structures
  ANDROID: GKI: mmu_notifier.h: add Android ABI padding to some structures
  ANDROID: GKI: mm.h: add Android ABI padding to a structure
  ANDROID: GKI: kobject.h: add Android ABI padding to some structures
  ANDROID: GKI: kernfs.h: add Android ABI padding to some structures
  ANDROID: GKI: irqdomain.h: add Android ABI padding to a structure
  ANDROID: GKI: ioport.h: add Android ABI padding to a structure
  ANDROID: GKI: iomap.h: add Android ABI padding to a structure
  ANDROID: GKI: hrtimer.h: add Android ABI padding to a structure
  ANDROID: GKI: genhd.h: add Android ABI padding to some structures
  ANDROID: GKI: ethtool.h: add Android ABI padding to a structure
  ANDROID: GKI: dma-mapping.h: add Android ABI padding to a structure
  ANDROID: GKI: networking: add Android ABI padding to a lot of networking structures
  ANDROID: GKI: blk_types.h: add Android ABI padding to a structure
  ANDROID: GKI: scsi.h: add Android ABI padding to a structure
  ANDROID: GKI: pci: add Android ABI padding to some structures
  ANDROID: GKI: add Android ABI padding to struct nf_conn

Conflicts:
	Documentation/devicetree/bindings
	include/linux/usb/gadget.h

Change-Id: Id08dc5a5299b4a780553a44a402d18e9b5b096cb
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-03-25 04:30:56 -07:00
Vlastimil Babka
0879d44ddd BACKPORT: mm, page_alloc: do not rely on the order of page_poison and init_on_alloc/free parameters
Patch series "cleanup page poisoning", v3.

I have identified a number of issues and opportunities for cleanup with
CONFIG_PAGE_POISON and friends:

 - interaction with init_on_alloc and init_on_free parameters depends on
   the order of parameters (Patch 1)

 - the boot time enabling uses static key, but inefficienty (Patch 2)

 - sanity checking is incompatible with hibernation (Patch 3)

 - CONFIG_PAGE_POISONING_NO_SANITY can be removed now that we have
   init_on_free (Patch 4)

 - CONFIG_PAGE_POISONING_ZERO can be most likely removed now that we
   have init_on_free (Patch 5)

This patch (of 5):

Enabling page_poison=1 together with init_on_alloc=1 or init_on_free=1
produces a warning in dmesg that page_poison takes precedence.  However,
as these warnings are printed in early_param handlers for
init_on_alloc/free, they are not printed if page_poison is enabled later
on the command line (handlers are called in the order of their
parameters), or when init_on_alloc/free is always enabled by the
respective config option - before the page_poison early param handler is
called, it is not considered to be enabled.  This is inconsistent.

We can remove the dependency on order by making the init_on_* parameters
only set a boolean variable, and postponing the evaluation after all early
params have been processed.  Introduce a new
init_mem_debugging_and_hardening() function for that, and move the related
debug_pagealloc processing there as well.

As a result init_mem_debugging_and_hardening() knows always accurately if
init_on_* and/or page_poison options were enabled.  Thus we can also
optimize want_init_on_alloc() and want_init_on_free().  We don't need to
check page_poisoning_enabled() there, we can instead not enable the
init_on_* static keys at all, if page poisoning is enabled.  This results
in a simpler and more effective code.

Link: https://lkml.kernel.org/r/20201113104033.22907-1-vbabka@suse.cz
Link: https://lkml.kernel.org/r/20201113104033.22907-2-vbabka@suse.cz
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Mateusz Nosek <mateusznosek0@gmail.com>
Cc: Laura Abbott <labbott@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

(cherry picked from commit 04013513cc84c401c7de9023ff3eda7863fc4add
 https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git akpm)
Bug: 182930667
[glider: resolved a minor conflict in init/main.c - API change]
Signed-off-by: Alexander Potapenko <glider@google.com>
Change-Id: I6c0ffcb0d8e2f56a688986aa1dc201adf89de067
2021-03-24 15:09:16 -07:00
Blagovest Kolenichev
d82a67cbef Merge android12-5.10.21+ (8cf9478) into msm-5.10
* refs/heads/tmp-8cf9478:
  Revert "ANDROID: GKI: Enable bounds sanitizer"
  ANDROID: GKI: temporarily disable LTO/CFI
  ANDROID: Revert "f2fs: fix to tag FIEMAP_EXTENT_MERGED in f2fs_fiemap()"
  FROMLIST: KVM: arm64: Disable FWB in host stage-2
  FROMLIST: KVM: arm64: Introduce KVM_PGTABLE_S2_NOFWB Stage-2 flag
  FROMLIST: KVM: arm64: Protect the .hyp sections from the host
  FROMLIST: KVM: arm64: Disable PMU support in protected mode
  FROMLIST: KVM: arm64: Page-align the .hyp sections
  FROMLIST: KVM: arm64: Wrap the host with a stage 2
  FROMLIST: KVM: arm64: Provide sanitized mmfr* registers at EL2
  FROMLIST: KVM: arm64: Add kvm_pgtable_stage2_find_range()
  FROMLIST: KVM: arm64: Refactor the *_map_set_prot_attr() helpers
  FROMLIST: KVM: arm64: Use page-table to track page ownership
  FROMLIST: KVM: arm64: Always zero invalid PTEs
  FROMLIST: KVM: arm64: Sort the hypervisor memblocks
  FROMLIST: KVM: arm64: Reserve memory for host stage 2
  FROMLIST: KVM: arm64: Make memcache anonymous in pgtable allocator
  FROMLIST: KVM: arm64: Refactor __populate_fault_info()
  FROMLIST: KVM: arm64: Refactor __load_guest_stage2()
  FROMLIST: KVM: arm64: Refactor kvm_arm_setup_stage2()
  FROMLIST: KVM: arm64: Set host stage 2 using kvm_nvhe_init_params
  FROMLIST: KVM: arm64: Use kvm_arch in kvm_s2_mmu
  FROMLIST: KVM: arm64: Use kvm_arch for stage 2 pgtable
  FROMLIST: KVM: arm64: Elevate hypervisor mappings creation at EL2
  FROMLIST: KVM: arm64: Prepare the creation of s1 mappings at EL2
  FROMLIST: arm64: asm: Provide set_sctlr_el2 macro
  FROMLIST: KVM: arm64: Factor out vector address calculation
  FROMLIST: KVM: arm64: Provide __flush_dcache_area at EL2
  FROMLIST: KVM: arm64: Enable access to sanitized CPU features at EL2
  FROMLIST: KVM: arm64: Introduce a Hyp buddy page allocator
  FROMLIST: KVM: arm64: Stub CONFIG_DEBUG_LIST at Hyp
  FROMLIST: KVM: arm64: Introduce an early Hyp page allocator
  FROMLIST: KVM: arm64: Allow using kvm_nvhe_sym() in hyp code
  FROMLIST: KVM: arm64: Make kvm_call_hyp() a function call at Hyp
  FROMLIST: KVM: arm64: Introduce a BSS section for use at Hyp
  FROMLIST: KVM: arm64: Factor memory allocation out of pgtable.c
  FROMLIST: KVM: arm64: Avoid free_page() in page-table allocator
  FROMLIST: KVM: arm64: Initialize kvm_nvhe_init_params early
  FROMLIST: arm64: kvm: Add standalone ticket spinlock implementation for use at hyp
  FROMLIST: KVM: arm64: Link position-independent string routines into .hyp.text
  FROMLIST: arm64: lib: Annotate {clear, copy}_page() as position-independent
  Revert "ANDROID: sched: cpufreq_schedutil: add sugov tracepoints"
  ANDROID: Partial revert of 06881e01b5 ("ANDROID: sched: Add vendor hooks for override sugov behavior")
  Revert "ANDROID: sched: Add vendor hooks for skipping sugov update"
  Revert "ANDROID: sched: cpufreq_schedutil: move sugov traces to sched"
  ANDROID: thermal: Add logic for filter on-die tz genl event.
  ANDROID: mmc: support hardware that takes key directly
  UPSTREAM: zram: fix broken page writeback
  UPSTREAM: zram: fix return value on writeback_store
  ANDROID: sched: Add vendor hook for util_est_update
  ANDROID: GKI: Enable DTPM framework
  ANDROID: GKI: Add remoteproc framework symbols to symbol list
  ANDROID: vendor_hooks: Add hooks for scheduler
  FROMGIT: configfs: fix a use-after-free in __configfs_open_file
  ANDROID: lib/plist.c: Export plist-related APIs
  ANDROID: module: Add vendor hook
  ANDROID: bpf: Add vendor hook
  ANDROID: kernel: Add vendor hook in creds
  ANDROID: security: selinux: Add vendor hook in avc
  UPSTREAM: KVM: arm64: Fix exclusive limit for IPA size
  UPSTREAM: KVM: arm64: Reject VM creation when the default IPA size is unsupported
  ANDROID: GKI: add android_kabi.h
  UPSTREAM: MAINTAINERS: add entry for KFENCE
  ANDROID: Clang LTO: Comment on symbol visibility workaround
  FROMLIST: mm: fs: Invalidate BH LRU during page migration
  BACKPORT: FROMLIST: mm: disable LRU pagevec during the migration temporarily
  FROMLIST: mm: replace migrate_prep with lru_add_drain_all
  UPSTREAM: mm: migrate: initialize err in do_migrate_pages
  UPSTREAM: mm: migrate: clean up migrate_prep{_local}
  ANDROID: Clang LTO: Only set -fvisibility=hidden for x86
  UPSTREAM: usb: typec: tcpci: Refactor tcpc_presenting_cc1_rd macro
  ANDROID: mm: build alloc_contig_dump_pages in page_alloc.o
  FROMLIST: mm: page_alloc: dump migrate-failed pages
  ANDROID: sched: Add vendor hook for uclamp_eff_get
  ANDROID: cpu/hotplug: failure to offline 2nd to last cpu
  ANDROID: qcom: Add devm_blk_ksm_init to ABI
  ANDROID: arm64: add vendor hooks for unusal abort cases
  UPSTREAM: powercap/drivers/dtpm: Fix size of object being allocated
  UPSTREAM: powercap/drivers/dtpm: Fix an IS_ERR() vs NULL check
  UPSTREAM: powercap/drivers/dtpm: Fix some missing unlock bugs
  UPSTREAM: powercap/drivers/dtpm: Fix a double shift bug
  UPSTREAM: powercap/drivers/dtpm: Fix __udivdi3 and __aeabi_uldivmod unresolved symbols
  UPSTREAM: powercap/drivers/dtpm: Add CPU energy model based support
  UPSTREAM: powercap/drivers/dtpm: Add API for dynamic thermal power management
  UPSTREAM: units: Add Watt units
  UPSTREAM: Documentation/powercap/dtpm: Add documentation for dtpm
  UPSTREAM: xhci: Fix repeated xhci wake after suspend due to uncleared internal wake state
  UPSTREAM: usb: xhci: Fix ASMedia ASM1042A and ASM3242 DMA addressing
  UPSTREAM: xhci: Improve detection of device initiated wake signal.
  UPSTREAM: usb: xhci: do not perform Soft Retry for some xHCI hosts
  FROMGIT: rcu/tree: Add a trace event for RCU CPU stall warnings
  ANDROID: GKI: Update virtual_device symbol list
  ANDROID: usb: host: export additional xhci symbols for ring management
  ANDROID: GKI: add fields required to enable CONFIG_READ_ONLY_THP_FOR_FS
  ANDROID: vendor_hooks: Add hooks for rwsem and mutex
  BACKPORT: usb: dwc3: gadget: Allow runtime suspend if UDC unbinded
  FROMGIT: ASoC: codecs: wcd934x: add a sanity check in set channel map
  FROMGIT: ASoC: qcom: sdm845: Fix array out of range on rx slim channels
  FROMGIT: ASoC: qcom: sdm845: Fix array out of bounds access
  FROMGIT: arm64: mte: Map hotplugged memory as Normal Tagged
  ANDROID: KVM: arm64: Disable CFI only for nVHE hyp object
  FROMGIT: KVM: arm64: Ensure I-cache isolation between vcpus of a same VM
  FROMGIT: KVM: arm64: Don't use cbz/adr with external symbols
  FROMGIT: KVM: arm64: Fix range alignment when walking page tables
  BACKPORT: binder: move structs from core file to header file
  ANDROID: dma-buf: add get_each_dmabuf function
  FROMLIST: drivers: thermal: Add NULL pointer check before using cooling device stats
  ANDROID: GKI: Switch to LTO_FULL
  ANDROID: gki_defconfig: set CONFIG_STACK_HASH_ORDER to 12
  ANDROID: sched: move vendor hook to check scheduling nice value
  ANDROID: qcom: Add __cfi_slowpath
  FROMGIT: usb: dwc3: qcom: Honor wakeup enabled/disabled state
  FROMGIT: usb: typec: stusb160x: fix return value check in stusb160x_probe()
  FROMGIT: usb: typec: tps6598x: Fix return value check in tps6598x_probe()
  FROMGIT: usb: typec: tcpm: turn tcpm_ams_finish into void function
  FROMGIT: usb: typec: tcpci: Check ROLE_CONTROL while interpreting CC_STATUS
  ANDROID: GKI: Update abi_gki_aarch64_qcom for timer hook
  ANDROID: Add vendor hooks when syscall prctl finished
  ANDROID: cgroup: Add vendor hook to the cgroup
  FROMGIT: usb: common: move function's kerneldoc next to its definition
  FROMGIT: usb: xhci-mtk: print debug info of endpoint interval
  FROMGIT: usb: common: add function to get interval expressed in us unit
  FROMGIT: usb: xhci-mtk: support to build xhci-mtk-hcd.ko
  FROMGIT: usb: xhci-mtk: remove declaration of xhci_mtk_setup()
  FROMGIT: usb: xhci-mtk: add some schedule error number
  FROMGIT: usb: xhci-mtk: rebuild the way to get bandwidth domain
  FROMGIT: usb: xhci-mtk: use @tt_info to check the FS/LS device is under a HS hub
  FROMGIT: usb: xhci-mtk: add a member @speed in mu3h_sch_ep_info struct
  FROMGIT: usb: xhci-mtk: use clear type instead of void
  FROMGIT: usb: xhci-mtk: remove unnecessary members of mu3h_sch_tt struct
  FROMGIT: usb: xhci-mtk: add a function to get bandwidth boundary
  FROMGIT: usb: xhci-mtk: add a function to (un)load bandwidth info
  FROMGIT: usb: xhci-mtk: use @sch_tt to check whether need do TT schedule
  FROMGIT: usb: xhci-mtk: add only one extra CS for FS/LS INTR
  FROMGIT: usb: xhci-mtk: get the microframe boundary for ESIT
  FROMGIT: usb: xhci-mtk: improve bandwidth scheduling with TT
  FROMGIT: usb: xhci-mtk: remove or operator for setting schedule parameters
  ANDROID: abi_gki_aarch64_qcom: Add __tracepoint_cpu_frequency_limits
  ANDROID: cpufreq: Export cpu_frequency_limits tracepoint
  ANDROID: kbuild: Copy out-of-tree kernel headers to INSTALL_HDR_PATH
  ANDROID: build.config: Disable LTO for KASAN and Kprobes builds
  ANDROID: GKI: arm64: Enable LTO+CFI
  Linux 5.10.21
  net: sfp: add workaround for Realtek RTL8672 and RTL9601C chips
  net: sfp: VSOL V2801F / CarlitoxxPro CPGOS03-0490 v2.0 workaround
  ALSA: hda/realtek: Apply dual codec quirks for MSI Godlike X570 board
  ALSA: hda/realtek: Add quirk for Intel NUC 10
  ALSA: hda/realtek: Add quirk for Clevo NH55RZQ
  media: v4l: ioctl: Fix memory leak in video_usercopy
  tty: teach the n_tty ICANON case about the new "cookie continuations" too
  tty: teach n_tty line discipline about the new "cookie continuations"
  tty: clean up legacy leftovers from n_tty line discipline
  tty: fix up hung_up_tty_read() conversion
  tty: fix up iterate_tty_read() EOVERFLOW handling
  powerpc/sstep: Fix incorrect return from analyze_instr()
  powerpc/sstep: Check instruction validity against ISA version before emulation
  swap: fix swapfile read/write offset
  remoteproc/mediatek: Fix kernel test robot warning
  zsmalloc: account the number of compacted pages correctly
  xen: fix p2m size in dom0 for disabled memory hotplug case
  xen-netback: respect gnttab_map_refs()'s return value
  Xen/gnttab: handle p2m update errors on a per-slot basis
  scsi: iscsi: Verify lengths on passthrough PDUs
  scsi: iscsi: Ensure sysfs attributes are limited to PAGE_SIZE
  scsi: iscsi: Restrict sessions and handles to admin capabilities
  ASoC: Intel: bytcr_rt5640: Add quirk for the Acer One S1002 tablet
  ASoC: Intel: bytcr_rt5651: Add quirk for the Jumper EZpad 7 tablet
  ASoC: Intel: bytcr_rt5640: Add quirk for the Voyo Winpad A15 tablet
  ASoC: Intel: bytcr_rt5640: Add quirk for the Estar Beauty HD MID 7316R tablet
  sched/features: Fix hrtick reprogramming
  parisc: Bump 64-bit IRQ stack size to 64 KB
  ASoC: Intel: sof_sdw: detect DMIC number based on mach params
  ASoC: Intel: sof-sdw: indent and add quirks consistently
  perf/x86/kvm: Add Cascade Lake Xeon steppings to isolation_ucodes[]
  btrfs: fix error handling in commit_fs_roots
  ASoC: Intel: Add DMI quirk table to soc_intel_is_byt_cr()
  nvme-tcp: add clean action for failed reconnection
  nvme-rdma: add clean action for failed reconnection
  nvme-core: add cancel tagset helpers
  f2fs: fix to set/clear I_LINKABLE under i_lock
  f2fs: handle unallocated section and zone on pinned/atgc
  media: uvcvideo: Allow entities with no pads
  drm/amd/amdgpu: add error handling to amdgpu_virt_read_pf2vf_data
  drm/amd/display: Guard against NULL pointer deref when get_i2c_info fails
  ASoC: Intel: bytcr_rt5640: Add new BYT_RT5640_NO_SPEAKERS quirk-flag
  PCI: Add a REBAR size quirk for Sapphire RX 5600 XT Pulse
  drm/amdgpu: Add check to prevent IH overflow
  fs: make unlazy_walk() error handling consistent
  crypto: tcrypt - avoid signed overflow in byte count
  drm/hisilicon: Fix use-after-free
  brcmfmac: Add DMI nvram filename quirk for Voyo winpad A15 tablet
  brcmfmac: Add DMI nvram filename quirk for Predia Basic tablet
  staging: bcm2835-audio: Replace unsafe strcpy() with strscpy()
  staging: most: sound: add sanity check for function argument
  Bluetooth: Fix null pointer dereference in amp_read_loc_assoc_final_data
  Bluetooth: Add new HCI_QUIRK_NO_SUSPEND_NOTIFIER quirk
  net: sfp: add mode quirk for GPON module Ubiquiti U-Fiber Instant
  ath10k: fix wmi mgmt tx queue full due to race condition
  pktgen: fix misuse of BUG_ON() in pktgen_thread_worker()
  mt76: mt7615: reset token when mac_reset happens
  Bluetooth: btusb: fix memory leak on suspend and resume
  Bluetooth: hci_h5: Set HCI_QUIRK_SIMULTANEOUS_DISCOVERY for btrtl
  wlcore: Fix command execute failure 19 for wl12xx
  vt/consolemap: do font sum unsigned
  x86/reboot: Add Zotac ZBOX CI327 nano PCI reboot quirk
  staging: fwserial: Fix error handling in fwserial_create
  EDAC/amd64: Do not load on family 0x15, model 0x13
  rsi: Move card interrupt handling to RX thread
  rsi: Fix TX EAPOL packet handling against iwlwifi AP
  ASoC: qcom: Remove useless debug print
  dt-bindings: net: btusb: DT fix s/interrupt-name/interrupt-names/
  dt-bindings: ethernet-controller: fix fixed-link specification
  net: fix dev_ifsioc_locked() race condition
  net: psample: Fix netlink skb length with tunnel info
  net: hsr: add support for EntryForgetTime
  net: ag71xx: remove unnecessary MTU reservation
  net: dsa: tag_rtl4_a: Support also egress tags
  net/sched: cls_flower: Reject invalid ct_state flags rules
  net: bridge: use switchdev for port flags set through sysfs too
  mptcp: do not wakeup listener for MPJ subflows
  tcp: fix tcp_rmem documentation
  RDMA/rtrs-srv: Do not signal REG_MR
  RDMA/rtrs-clt: Use bitmask to check sess->flags
  RDMA/rtrs: Do not signal for heatbeat
  mm/hugetlb.c: fix unnecessary address expansion of pmd sharing
  nbd: handle device refs for DESTROY_ON_DISCONNECT properly
  riscv: Get rid of MAX_EARLY_MAPPING_SIZE
  net: fix up truesize of cloned skb in skb_prepare_for_shift()
  tomoyo: ignore data race while checking quota
  smackfs: restrict bytes count in smackfs write functions
  net/af_iucv: remove WARN_ONCE on malformed RX packets
  xfs: Fix assert failure in xfs_setattr_size()
  media: v4l2-ctrls.c: fix shift-out-of-bounds in std_validate
  erofs: fix shift-out-of-bounds of blkszbits
  media: mceusb: sanity check for prescaler value
  udlfb: Fix memory leak in dlfb_usb_probe
  sched/core: Allow try_invoke_on_locked_down_task() with irqs disabled
  JFS: more checks for invalid superblock
  x86/build: Treat R_386_PLT32 relocation as R_386_PC32
  drm/virtio: use kvmalloc for large allocations
  Input: elan_i2c - add new trackpoint report type 0x5F
  Input: elantech - fix protocol errors for some trackpoints in SMBus mode
  net: usb: qmi_wwan: support ZTE P685M modem
  ANDROID: GKI: Enable bounds sanitizer
  ANDROID: Allow HAS_LTO_CLANG with KASAN_HW_TAGS
  ANDROID: abi_gki_aarch64_qcom: Add cpufreq related symbols
  ANDROID: cpufreq: Add a restricted vendor hook for freq transition
  ANDROID: scsi: ufs: add hooks to track ufs commands
  ANDROID: Fix compilation error when CPU_FREQ is disabled
  BACKPORT: kasan, arm64: allow using KUnit tests with HW_TAGS mode
  Revert "FROMGIT: kasan, arm64: allow using KUnit tests with HW_TAGS mode"
  Revert "BACKPORT: kasan: remove redundant config option"
  UPSTREAM: arm/kasan: fix the array size of kasan_early_shadow_pte[]
  FROMGIT: KVM: arm64: Workaround firmware wrongly advertising GICv2-on-v3 compatibility
  FROMGIT: KVM: arm64: Rename __vgic_v3_get_ich_vtr_el2() to __vgic_v3_get_gic_config()
  FROMGIT: KVM: arm64: Don't access PMSELR_EL0/PMUSERENR_EL0 when no PMU is available
  FROMGIT: KVM: arm64: Turn kvm_arm_support_pmu_v3() into a static key
  FROMGIT: KVM: arm64: Fix nVHE hyp panic host context restore
  FROMGIT: KVM: arm64: Avoid corrupting vCPU context register in guest exit
  FROMLIST: arm64: cpufeatures: Fix handling of CONFIG_CMDLINE for idreg overrides
  Linux 5.10.20
  ARM: dts: aspeed: Add LCLK to lpc-snoop
  net_sched: fix RTNL deadlock again caused by request_module()
  net: qrtr: Fix memory leak in qrtr_tun_open
  net: sched: fix police ext initialization
  wireguard: queueing: get rid of per-peer ring buffers
  wireguard: selftests: test multiple parallel streams
  net: icmp: pass zeroed opts from icmp{,v6}_ndo_send before sending
  ipv6: silence compilation warning for non-IPV6 builds
  kgdb: fix to kill breakpoints on initmem after boot
  drm/i915: Reject 446-480MHz HDMI clock on GLK
  dm era: only resize metadata in preresume
  dm era: Reinitialize bitset cache before digesting a new writeset
  dm era: Use correct value size in equality function of writeset tree
  dm era: Fix bitset memory leaks
  dm era: Verify the data block size hasn't changed
  dm era: Update in-core bitset after committing the metadata
  dm era: Recover committed writeset after crash
  dm writecache: fix writing beyond end of underlying device when shrinking
  dm writecache: return the exact table values that were set
  dm writecache: fix performance degradation in ssd mode
  dm table: fix zoned iterate_devices based device capability checks
  dm table: fix DAX iterate_devices based device capability checks
  dm table: fix iterate_devices based device capability checks
  dm: fix deadlock when swapping to encrypted device
  gfs2: Recursive gfs2_quota_hold in gfs2_iomap_end
  gfs2: Lock imbalance on error path in gfs2_recover_one
  gfs2: Don't skip dlm unlock if glock has an lvb
  gfs2: fix glock confusion in function signal_our_withdraw
  spi: spi-synquacer: fix set_cs handling
  spi: fsl: invert spisel_boot signal on MPC8309
  sparc32: fix a user-triggerable oops in clear_user()
  f2fs: flush data when enabling checkpoint back
  f2fs: enforce the immutable flag on open files
  f2fs: fix out-of-repair __setattr_copy()
  irqchip/loongson-pch-msi: Use bitmap_zalloc() to allocate bitmap
  um: defer killing userspace on page table update failures
  um: mm: check more comprehensively for stub changes
  virtio/s390: implement virtio-ccw revision 2 correctly
  s390/vtime: fix inline assembly clobber list
  proc: don't allow async path resolution of /proc/thread-self components
  cpufreq: intel_pstate: Get per-CPU max freq via MSR_HWP_CAPABILITIES if available
  cpufreq: intel_pstate: Change intel_pstate_get_hwp_max() argument
  cpufreq: qcom-hw: drop devm_xxx() calls from init/exit hooks
  thermal: cpufreq_cooling: freq_qos_update_request() returns < 0 on error
  kcmp: Support selection of SYS_kcmp without CHECKPOINT_RESTORE
  zonefs: Fix file size of zones in full condition
  exfat: fix shift-out-of-bounds in exfat_fill_super()
  printk: fix deadlock when kernel panic
  mfd: gateworks-gsc: Fix interrupt type
  gpio: pcf857x: Fix missing first interrupt
  mei: me: add adler lake point LP DID
  mei: me: add adler lake point S DID
  mei: me: emmitsburg workstation DID
  mei: fix transfer over dma with extended header
  spmi: spmi-pmic-arb: Fix hw_irq overflow
  powerpc/32s: Add missing call to kuep_lock on syscall entry
  powerpc/kexec_file: fix FDT size estimation for kdump kernel
  powerpc/32: Preserve cr1 in exception prolog stack check to fix build error
  mmc: sdhci-pci-o2micro: Bug fix for SDR104 HW tuning failure
  mmc: sdhci-esdhc-imx: fix kernel panic when remove module
  module: Ignore _GLOBAL_OFFSET_TABLE_ when warning for undefined symbols
  nvmem: qcom-spmi-sdam: Fix uninitialized pdev pointer
  KVM: nSVM: fix running nested guests when npt=0
  mm, compaction: make fast_isolate_freepages() stay within zone
  mm/vmscan: restore zone_reclaim_mode ABI
  hugetlb: fix copy_huge_page_from_user contig page struct assumption
  hugetlb: fix update_and_free_page contig page struct assumption
  mm: memcontrol: fix get_active_memcg return value
  mm: memcontrol: fix swap undercounting in cgroup2
  x86: fix seq_file iteration for pat/memtype.c
  seq_file: document how per-entry resources are managed.
  fs/affs: release old buffer head on error path
  mtd: spi-nor: hisi-sfc: Put child node np on error path
  mtd: spi-nor: core: Add erase size check for erase command initialization
  mtd: spi-nor: core: Fix erase type discovery for overlaid region
  mtd: spi-nor: sfdp: Fix wrong erase type bitmask for overlaid region
  mtd: spi-nor: sfdp: Fix last erase region marking
  coresight: etm4x: Handle accesses to TRCSTALLCTLR
  watchdog: mei_wdt: request stop on unregister
  watchdog: qcom: Remove incorrect usage of QCOM_WDT_ENABLE_IRQ
  riscv: Disable KSAN_SANITIZE for vDSO
  arm64: spectre: Prevent lockdep splat on v4 mitigation enable path
  arm64 module: set plt* section addresses to 0x0
  arm64: uprobe: Return EOPNOTSUPP for AARCH32 instruction probing
  arm64: kexec_file: fix memory leakage in create_dtb() when fdt_open_into() fails
  iommu/arm-smmu-qcom: Fix mask extraction for bootloader programmed SMRs
  arm64: Extend workaround for erratum 1024718 to all versions of Cortex-A55
  kprobes: Fix to delay the kprobes jump optimization
  rcu/nocb: Perform deferred wake up before last idle's need_resched() check
  rcu: Pull deferred rcuog wake up to rcu_eqs_enter() callers
  powerpc/prom: Fix "ibm,arch-vec-5-platform-support" scan
  x86/entry: Fix instrumentation annotation
  x86/fault: Fix AMD erratum #91 errata fixup for user code
  x86/reboot: Force all cpus to exit VMX root if VMX is supported
  x86/virt: Eat faults on VMXOFF in reboot flows
  media: smipcie: fix interrupt handling and IR timeout
  media: marvell-ccic: power up the device on mclk enable
  media: ipu3-cio2: Fix mbus_code processing in cio2_subdev_set_fmt()
  media: ir_toy: add another IR Droid device
  media: i2c: max9286: fix access to unallocated memory
  floppy: reintroduce O_NDELAY fix
  staging: rtl8188eu: Add Edimax EW-7811UN V2 to device table
  staging: gdm724x: Fix DMA from stack
  staging/mt7621-dma: mtk-hsdma.c->hsdma-mt7621.c
  arm64: dts: agilex: fix phy interface bit shift for gmac1 and gmac2
  dts64: mt7622: fix slow sd card access
  pstore: Fix typo in compression option name
  drivers/misc/vmw_vmci: restrict too big queue size in qp_host_alloc_queue
  misc: rtsx: init of rts522a add OCP power off when no card is present
  arm64: ptrace: Fix seccomp of traced syscall -1 (NO_SYSCALL)
  seccomp: Add missing return in non-void function
  soc: samsung: exynos-asv: handle reading revision register error
  soc: samsung: exynos-asv: don't defer early on not-supported SoCs
  crypto: sun4i-ss - initialize need_fallback
  crypto: sun4i-ss - handle BigEndian for cipher
  crypto: sun4i-ss - IV register does not work on A10 and A13
  crypto: sun4i-ss - checking sg length is not sufficient
  crypto: michael_mic - fix broken misalignment handling
  crypto: aesni - prevent misaligned buffers on the stack
  crypto: arm64/sha - add missing module aliases
  drm/i915/gt: Correct surface base address for renderclear
  drm/i915/gt: Flush before changing register state
  btrfs: fix extent buffer leak on failure to copy root
  btrfs: account for new extents being deleted in total_bytes_pinned
  btrfs: handle space_info::total_bytes_pinned inside the delayed ref itself
  btrfs: splice remaining dirty_bg's onto the transaction dirty bg list
  btrfs: fix reloc root leak with 0 ref reloc roots on recovery
  btrfs: abort the transaction if we fail to inc ref in btrfs_copy_root
  btrfs: add asserts for deleting backref cache nodes
  btrfs: do not warn if we can't find the reloc root when looking up backref
  btrfs: do not cleanup upper nodes in btrfs_backref_cleanup_node
  KEYS: trusted: Reserve TPM for seal and unseal operations
  KEYS: trusted: Fix migratable=1 failing
  KEYS: trusted: Fix incorrect handling of tpm_get_random()
  tpm_tis: Clean up locality release
  tpm_tis: Fix check_locality for correct locality acquisition
  erofs: initialized fields can only be observed after bit is set
  selinux: fix inconsistency between inode_getxattr and inode_listsecurity
  ASoC: siu: Fix build error by a wrong const prefix
  drm/rockchip: Require the YTR modifier for AFBC
  drm/panel: kd35t133: allow using non-continuous dsi clock
  drm/sched: Cancel and flush all outstanding jobs before finish.
  drm/modes: Switch to 64bit maths to avoid integer overflow
  drm/nouveau/kms: handle mDP connectors
  drm/amdgpu: Set reference clock to 100Mhz on Renoir (v2)
  drm/amdkfd: Fix recursive lock warnings
  drm/amd/display: Add vupdate_no_lock interrupts for DCN2.1
  drm/amd/display: Remove Assert from dcn10_get_dig_frontend
  drm/amd/display: Add FPU wrappers to dcn21_validate_bandwidth()
  Revert "drm/amd/display: Update NV1x SR latency values"
  bcache: Move journal work to new flush wq
  bcache: Give btree_io_wq correct semantics again
  Revert "bcache: Kill btree_io_wq"
  Revert "MIPS: Octeon: Remove special handling of CONFIG_MIPS_ELF_APPENDED_DTB=y"
  MIPS: VDSO: Use CLANG_FLAGS instead of filtering out '--target='
  MIPS: Support binutils configured with --enable-mips-fix-loongson3-llsc=yes
  MIPS: Ingenic: Disable HPTLB for D0 XBurst CPUs too
  ALSA: hda/realtek: Quirk for HP Spectre x360 14 amp setup
  ALSA: hda/realtek: modify EAPD in the ALC886
  ALSA: hda/hdmi: Drop bogus check at closing a stream
  ALSA: hda: Add another CometLake-H PCI ID
  ALSA: fireface: fix to parse sync status register of latter protocol
  phy: lantiq: rcu-usb2: wait after clock enable
  USB: serial: mos7720: fix error code in mos7720_write()
  USB: serial: mos7840: fix error code in mos7840_write()
  USB: serial: pl2303: fix line-speed handling on newer chips
  USB: serial: ftdi_sio: fix FTX sub-integer prescaler
  usb: dwc3: gadget: Fix dep->interval for fullspeed interrupt
  usb: dwc3: gadget: Fix setting of DEPCFG.bInterval_m1
  usb: musb: Fix runtime PM race in musb_queue_resume_work
  USB: serial: option: update interface mapping for ZTE P685M
  media: mceusb: Fix potential out-of-bounds shift
  Input: i8042 - add ASUS Zenbook Flip to noselftest list
  Input: joydev - prevent potential read overflow in ioctl
  Input: xpad - add support for PowerA Enhanced Wired Controller for Xbox Series X|S
  Input: raydium_ts_i2c - do not send zero length
  HID: wacom: Ignore attempts to overwrite the touch_max value from HID
  HID: logitech-dj: add support for keyboard events in eQUAD step 4 Gaming
  cpufreq: ACPI: Set cpuinfo.max_freq directly if max boost is known
  ACPI: configfs: add missing check after configfs_register_default_group()
  ACPI: property: Fix fwnode string properties matching
  soundwire: intel: fix possible crash when no device is detected
  blk-settings: align max_sectors on "logical_block_size" boundary
  scsi: sd: Fix Opal support
  ide/falconide: Fix module unload
  block: reopen the device in blkdev_reread_part
  scsi: sd: sd_zbc: Don't pass GFP_NOIO to kvcalloc
  scsi: bnx2fc: Fix Kconfig warning & CNIC build errors
  csky: Fix a size determination in gpr_get()
  proc: use kvzalloc for our kernel buffer
  mm/rmap: fix potential pte_unmap on an not mapped pte
  mm: fix memory_failure() handling of dax-namespace metadata
  mm,thp,shmem: make khugepaged obey tmpfs mount flags
  i2c: exynos5: Preserve high speed master code
  i2c: brcmstb: Fix brcmstd_send_i2c_cmd condition
  arm64: Add missing ISB after invalidating TLB in __primary_switch
  KVM: x86/mmu: Expand collapsible SPTE zap for TDP MMU to ZONE_DEVICE and HugeTLB pages
  KVM: SVM: Intercept INVPCID when it's disabled to inject #UD
  NFSv4: Fixes for nfs4_bitmask_adjust()
  r8169: fix jumbo packet handling on RTL8168e
  mm/compaction: fix misbehaviors of fast_find_migrateblock()
  mm/hugetlb: suppress wrong warning info when alloc gigantic page
  mm/hugetlb: fix potential double free in hugetlb_register_node() error path
  mm/memory.c: fix potential pte_unmap_unlock pte error
  mm: memcontrol: fix slub memory accounting
  mm: memcontrol: fix NR_ANON_THPS accounting in charge moving
  ocfs2: fix a use after free on error
  wireguard: kconfig: use arm chacha even with no neon
  wireguard: device: do not generate ICMP for non-IP packets
  vxlan: move debug check after netdev unregister
  PCI: rockchip: Make 'ep-gpios' DT property optional
  net/mlx4_core: Add missed mlx4_free_cmd_mailbox()
  net: stmmac: fix CBS idleslope and sendslope calculation
  ice: update the number of available RSS queues
  ice: Fix state bits on LLDP mode switch
  ice: Account for port VLAN in VF max packet size calculation
  ice: report correct max number of TCs
  vfio/type1: Use follow_pte()
  pwm: iqs620a: Fix overflow and optimize calculations
  octeontx2-af: Fix an off by one in rvu_dbg_qsize_write()
  i40e: Fix add TC filter for IPv6
  nios2: fixed broken sys_clone syscall
  Take mmap lock in cacheflush syscall
  i40e: Fix VFs not created
  i40e: Fix addition of RX filters after enabling FW LLDP agent
  i40e: Fix overwriting flow control settings during driver loading
  i40e: Add zero-initialization of AQ command structures
  i40e: Fix flow for IPv6 next header (extension header)
  PCI: cadence: Fix DMA range mapping early return error
  PCI: pci-bridge-emul: Fix array overruns, improve safety
  device-dax: Fix default return code of range_parse()
  mailbox: sprd: correct definition of SPRD_OUTBOX_FIFO_FULL
  ext: EXT4_KUNIT_TESTS should depend on EXT4_FS instead of selecting it
  regmap: sdw: use _no_pm functions in regmap_read/write
  remoteproc/mediatek: acknowledge watchdog IRQ after handled
  misc: fastrpc: fix incorrect usage of dma_map_sgtable
  soundwire: bus: fix confusion on device used by pm_runtime
  soundwire: export sdw_write/read_no_pm functions
  soundwire: bus: use sdw_write_no_pm when setting the bus scale registers
  soundwire: bus: use sdw_update_no_pm when initializing a device
  nvmem: core: skip child nodes not matching binding
  nvmem: core: Fix a resource leak on error in nvmem_add_cells_from_of()
  coresight: etm4x: Skip accessing TRCPDCR in save/restore
  phy: USB_LGM_PHY should depend on X86
  ext4: fix potential htree index checksum corruption
  vfio-pci/zdev: fix possible segmentation fault issue
  vfio/iommu_type1: Fix some sanity checks in detach group
  vfio/iommu_type1: Populate full dirty when detach non-pinned group
  drm/msm/dp: trigger unplug event in msm_dp_display_disable
  drm/msm: Fix races managing the OOB state for timestamp vs timestamps.
  drm/msm: Fix race of GPU init vs timestamp power management.
  drm/msm/mdp5: Fix wait-for-commit for cmd panels
  drm/msm/dsi: Correct io_start for MSM8994 (20nm PHY)
  drm/msm: Fix MSM_INFO_GET_IOVA with carveout
  mei: hbm: call mei_set_devstate() on hbm stop response
  PCI: Align checking of syscall user config accessors
  VMCI: Use set_page_dirty_lock() when unregistering guest memory
  PCI: xilinx-cpm: Fix reference count leak on error path
  pwm: rockchip: Eliminate potential race condition when probing
  pwm: rockchip: rockchip_pwm_probe(): Remove superfluous clk_unprepare()
  pwm: rockchip: Enable APB clock during register access while probing
  soundwire: cadence: fix ACK/NAK handling
  PCI: rcar: Always allocate MSI addresses in 32bit space
  misc: eeprom_93xx46: Add module alias to avoid breaking support for non device tree users
  phy: cadence-torrent: Fix error code in cdns_torrent_phy_probe()
  phy: rockchip-emmc: emmc_phy_init() always return 0
  misc: eeprom_93xx46: Fix module alias to enable module autoprobe
  ARM: 9065/1: OABI compat: fix build when EPOLL is not enabled
  Input: zinitix - fix return type of zinitix_init_touch()
  sparc: fix led.c driver when PROC_FS is not enabled
  sparc64: only select COMPAT_BINFMT_ELF if BINFMT_ELF is set
  Input: elo - fix an error code in elo_connect()
  perf test: Fix unaligned access in sample parsing test
  perf intel-pt: Fix IPC with CYC threshold
  perf intel-pt: Fix premature IPC
  perf intel-pt: Fix missing CYC processing in PSB
  perf record: Fix continue profiling after draining the buffer
  Input: sur40 - fix an error code in sur40_probe()
  RDMA/rtrs-srv: Do not pass a valid pointer to PTR_ERR()
  RDMA/rtrs-srv-sysfs: fix missing put_device
  RDMA/rtrs-srv: fix memory leak by missing kobject free
  RDMA/rtrs: Only allow addition of path to an already established session
  RDMA/rtrs-srv: Fix stack-out-of-bounds
  RDMA/ucma: Fix use-after-free bug in ucma_create_uevent
  RDMA/hns: Fixes missing error code of CMDQ
  ceph: fix flush_snap logic after putting caps
  svcrdma: Hold private mutex while invoking rdma_accept()
  nfsd: register pernet ops last, unregister first
  perf symbols: Fix return value when loading PE DSO
  printk: avoid prb_first_valid_seq() where possible
  spi: Skip zero-length transfers in spi_transfer_one_message()
  spi: dw: Avoid stack content exposure
  regulator: bd718x7, bd71828, Fix dvs voltage levels
  perf symbols: Use (long) for iterator for bfd symbols
  selftests/ftrace: Update synthetic event syntax errors
  clk: aspeed: Fix APLL calculate formula from ast2600-A2
  regulator: qcom-rpmh: fix pm8009 ldo7
  powerpc/kuap: Restore AMR after replaying soft interrupts
  powerpc/uaccess: Avoid might_fault() when user access is enabled
  spi: pxa2xx: Fix the controller numbering for Wildcat Point
  clk: divider: fix initialization with parent_hw
  RDMA/hns: Disable RQ inline by default
  RDMA/hns: Fix type of sq_signal_bits
  RDMA/siw: Fix calculation of tx_valid_cpus size
  RDMA/hns: Fixed wrong judgments in the goto branch
  kselftests: dmabuf-heaps: Fix Makefile's inclusion of the kernel's usr/include dir
  kunit: tool: fix unit test cleanup handling
  clk: qcom: gcc-msm8998: Fix Alpha PLL type for all GPLLs
  powerpc/8xx: Fix software emulation interrupt
  powerpc/pseries/dlpar: handle ibm, configure-connector delay status
  mfd: wm831x-auxadc: Prevent use after free in wm831x_auxadc_read_irq()
  mfd: altera-sysmgr: Fix physical address storing more
  spi: stm32: properly handle 0 byte transfer
  RDMA/rxe: Correct skb on loopback path
  RDMA/rxe: Fix coding error in rxe_rcv_mcast_pkt
  RDMA/rxe: Fix coding error in rxe_recv.c
  perf vendor events arm64: Fix Ampere eMag event typo
  perf tools: Fix DSO filtering when not finding a map for a sampled address
  rtc: zynqmp: depend on HAS_IOMEM
  tracepoint: Do not fail unregistering a probe due to memory failure
  IB/cm: Avoid a loop when device has 255 ports
  IB/mlx5: Return appropriate error code instead of ENOMEM
  iommu: Properly pass gfp_t in _iommu_map() to avoid atomic sleeping
  iommu: Move iotlb_sync_map out from __iommu_map
  amba: Fix resource leak for drivers without .remove
  i2c: qcom-geni: Store DMA mapping data in geni_i2c_dev struct
  ARM: 9046/1: decompressor: Do not clear SCTLR.nTLSMD for ARMv7+ cores
  mmc: renesas_sdhi_internal_dmac: Fix DMA buffer alignment from 8 to 128-bytes
  mmc: usdhi6rol0: Fix a resource leak in the error handling path of the probe
  mmc: sdhci-sprd: Fix some resource leaks in the remove function
  mmc: owl-mmc: Fix a resource leak in an error handling path and in the remove function
  powerpc/time: Enable sched clock for irqtime
  powerpc/47x: Disable 256k page size
  KVM: PPC: Make the VMX instruction emulation routines static
  IB/umad: Return EPOLLERR in case of when device disassociated
  IB/umad: Return EIO in case of when device disassociated
  iommu: Switch gather->end to the inclusive end
  scsi: lpfc: Fix ancient double free
  objtool: Fix ".cold" section suffix check for newer versions of GCC
  objtool: Fix retpoline detection in asm code
  objtool: Fix error handling for STD/CLD warnings
  auxdisplay: ht16k33: Fix refresh rate handling
  watchdog: intel-mid_wdt: Postpone IRQ handler registration till SCU is ready
  isofs: release buffer head before return
  regulator: core: Avoid debugfs: Directory ... already present! error
  power: supply: smb347-charger: Fix interrupt usage if interrupt is unavailable
  power: supply: axp20x_usb_power: Init work before enabling IRQs
  regulator: s5m8767: Drop regulators OF node reference
  spi: atmel: Put allocated master before return
  regulator: s5m8767: Fix reference count leak
  certs: Fix blacklist flag type confusion
  watch_queue: Drop references to /dev/watch_queue
  regulator: axp20x: Fix reference cout leak
  platform/chrome: cros_ec_proto: Add LID and BATTERY to default mask
  platform/chrome: cros_ec_proto: Use EC_HOST_EVENT_MASK not BIT
  clk: sunxi-ng: h6: Fix clock divider range on some clocks
  IB/mlx5: Add mutex destroy call to cap_mask_mutex mutex
  RDMA/mlx5: Use the correct obj_id upon DEVX TIR creation
  spi: imx: Don't print error on -EPROBEDEFER
  clocksource/drivers/mxs_timer: Add missing semicolon when DEBUG is defined
  clocksource/drivers/ixp4xx: Select TIMER_OF when needed
  power: supply: fix sbs-charger build, needs REGMAP_I2C
  dmaengine: idxd: set DMA channel to be private
  rtc: s5m: select REGMAP_I2C
  power: reset: at91-sama5d2_shdwc: fix wkupdbc mask
  RDMA/rtrs-srv: Init wr_cnt as 1
  RDMA/rtrs-clt: Refactor the failure cases in alloc_clt
  RDMA/rtrs-srv: Fix missing wr_cqe
  RDMA/rtrs: Call kobject_put in the failure path
  RDMA/rtrs-clt: Set mininum limit when create QP
  RDMA/rtrs-srv: Use sysfs_remove_file_self for disconnect
  RDMA/rtrs-srv: Release lock before call into close_sess
  RDMA/rtrs: Extend ibtrs_cq_qp_create
  of/fdt: Make sure no-map does not remove already reserved regions
  fdt: Properly handle "no-map" field in the memory region
  power: supply: cpcap-charger: Fix power_supply_put on null battery pointer
  power: supply: cpcap-battery: Fix missing power_supply_put()
  power: supply: cpcap-charger: Fix missing power_supply_put()
  mfd: bd9571mwv: Use devm_mfd_add_devices()
  dmaengine: hsu: disable spurious interrupt
  dmaengine: owl-dma: Fix a resource leak in the remove function
  dmaengine: fsldma: Fix a resource leak in an error handling path of the probe function
  dmaengine: fsldma: Fix a resource leak in the remove function
  RDMA/siw: Fix handling of zero-sized Read and Receive Queues.
  HID: core: detect and skip invalid inputs to snto32()
  clk: renesas: r8a779a0: Fix parent of CBFUSA clock
  clk: renesas: r8a779a0: Remove non-existent S2 clock
  clk: sunxi-ng: h6: Fix CEC clock
  spi: cadence-quadspi: Abort read if dummy cycles required are too many
  i2c: iproc: handle master read request
  i2c: iproc: update slave isr mask (ISR_MASK_SLAVE)
  i2c: iproc: handle only slave interrupts which are enabled
  quota: Fix memory leak when handling corrupted quota file
  arm64: dts: qcom: qrb5165-rb5: fix pm8009 regulators
  regulator: qcom-rpmh-regulator: add pm8009-1 chip revision
  selftests/powerpc: Make the test check in eeh-basic.sh posix compliant
  clk: meson: clk-pll: propagate the error from meson_clk_pll_set_rate()
  clk: meson: clk-pll: make "ret" a signed integer
  clk: meson: clk-pll: fix initializing the old rate (fallback) for a PLL
  power: supply: cpcap: Add missing IRQF_ONESHOT to fix regression
  HSI: Fix PM usage counter unbalance in ssi_hw_init
  capabilities: Don't allow writing ambiguous v3 file capabilities
  drm/amdgpu/display: remove hdcp_srm sysfs on device removal
  smp: Process pending softirqs in flush_smp_call_function_from_idle()
  irqchip/imx: IMX_INTMUX should not default to y, unconditionally
  ubifs: Fix error return code in alloc_wbufs()
  ubifs: replay: Fix high stack usage, again
  ubifs: Fix memleak in ubifs_init_authentication
  jffs2: fix use after free in jffs2_sum_write_data()
  fs/jfs: fix potential integer overflow on shift of a int
  ASoC: simple-card-utils: Fix device module clock
  ima: Free IMA measurement buffer after kexec syscall
  ima: Free IMA measurement buffer on error
  ASoC: SOF: sof-pci-dev: add missing Up-Extreme quirk
  nvmet: set status to 0 in case for invalid nsid
  nvmet: remove extra variable in identify ns
  nvme-multipath: set nr_zones for zoned namespaces
  nvmet-tcp: fix potential race of tcp socket closing accept_work
  nvmet-tcp: fix receive data digest calculation for multiple h2cdata PDUs
  io_uring: fix possible deadlock in io_uring_poll
  crypto: ecdh_helper - Ensure 'len >= secret.len' in decode_key()
  hwrng: timeriomem - Fix cooldown period calculation
  drm/dp_mst: Don't cache EDIDs for physical ports
  drm/lima: fix reference leak in lima_pm_busy
  drm/vc4: hdmi: Update the CEC clock divider on HSM rate change
  drm/vc4: hdmi: Compute the CEC clock divider from the clock rate
  drm/vc4: hdmi: Restore cec physical address on reconnect
  drm/vc4: hdmi: Fix up CEC registers
  drm/vc4: hdmi: Fix register offset with longer CEC messages
  drm/vc4: hdmi: Move hdmi reset to bind
  s390/zcrypt: return EIO when msg retry limit reached
  KVM: x86: Restore all 64 bits of DR6 and DR7 during RSM on x86-64
  btrfs: fix double accounting of ordered extent for subpage case in btrfs_invalidapge
  btrfs: clarify error returns values in __load_free_space_cache
  ASoC: SOF: debug: Fix a potential issue on string buffer termination
  ASoC: rt5682: Fix panic in rt5682_jack_detect_handler happening during system shutdown
  ASoC: qcom: lpass: Fix i2s ctl register bit map
  locking/lockdep: Avoid unmatched unlock
  ASoC: Intel: sof_sdw: add missing TGL_HDMI quirk for Dell SKU 0A3E
  ASoC: Intel: sof_sdw: add missing TGL_HDMI quirk for Dell SKU 0A5E
  Drivers: hv: vmbus: Avoid use-after-free in vmbus_onoffer_rescind()
  drm/mediatek: Check if fb is null
  KVM: nSVM: Don't strip host's C-bit from guest's CR3 when reading PDPTRs
  ASoC: qcom: Fix typo error in HDMI regmap config callbacks
  f2fs: fix a wrong condition in __submit_bio
  drm/amdgpu: Prevent shift wrapping in amdgpu_read_mask()
  f2fs: fix to avoid inconsistent quota data
  mtd: parsers: afs: Fix freeing the part name memory in failure
  ASoC: codecs: add missing max_register in regmap config
  ASoC: cpcap: fix microphone timeslot mask
  ata: ahci_brcm: Add back regulators management
  mm: proc: Invalidate TLB after clearing soft-dirty page state
  drm/nouveau: bail out of nouveau_channel_new if channel init fails
  crypto: talitos - Fix ctr(aes) on SEC1
  crypto: talitos - Work around SEC6 ERRATA (AES-CTR mode data size error)
  mtd: parser: imagetag: fix error codes in bcm963xx_parse_imagetag_partitions()
  perf/arm-cmn: Move IRQs when migrating context
  perf/arm-cmn: Fix PMU instance naming
  ASoC: SOF: Intel: hda: cancel D0i3 work during runtime suspend
  ASoC: qcom: lpass-cpu: Remove bit clock state check
  f2fs: compress: fix potential deadlock
  sched/eas: Don't update misfit status if the task is pinned
  media: uvcvideo: Accept invalid bFormatIndex and bFrameIndex values
  media: pxa_camera: declare variable when DEBUG is defined
  media: mtk-vcodec: fix argument used when DEBUG is defined
  media: cx25821: Fix a bug when reallocating some dma memory
  media: qm1d1c0042: fix error return code in qm1d1c0042_init()
  media: atomisp: Fix a buffer overflow in debug code
  media: vidtv: psi: fix missing crc for PMT
  media: lmedm04: Fix misuse of comma
  media: software_node: Fix refcounts in software_node_get_next_child()
  drm/amd/display: Fix HDMI deep color output for DCE 6-11.
  drm/amd/display: Fix 10/12 bpc setup in DCE output bit depth reduction.
  macintosh/adb-iop: Use big-endian autopoll mask
  bsg: free the request before return error code
  drm/amdgpu: toggle on DF Cstate after finishing xgmi injection
  drm/tegra: Fix reference leak when pm_runtime_get_sync() fails
  MIPS: Compare __SYNC_loongson3_war against 0
  MIPS: properly stop .eh_frame generation
  media: ti-vpe: cal: fix write to unallocated memory
  media: imx7: csi: Fix pad link validation
  media: imx7: csi: Fix regression for parallel cameras on i.MX6UL
  drm/sun4i: tcon: fix inverted DCLK polarity
  sched/fair: Avoid stale CPU util_est value for schedutil in task dequeue
  crypto: bcm - Rename struct device_private to bcm_device_private
  evm: Fix memleak in init_desc
  ASoC: qcom: qdsp6: Move frontend AIFs to q6asm-dai
  ASoC: cs42l56: fix up error handling in probe
  media: aspeed: fix error return code in aspeed_video_setup_video()
  media: tm6000: Fix memleak in tm6000_start_stream
  media: media/pci: Fix memleak in empress_init
  media: em28xx: Fix use-after-free in em28xx_alloc_urbs
  media: vsp1: Fix an error handling path in the probe function
  media: camss: missing error code in msm_video_register()
  media: mtk-vcodec: fix error return code in vdec_vp9_decode()
  media: imx: Fix csc/scaler unregister
  media: imx: Unregister csc/scaler only if registered
  media: i2c: ov5670: Fix PIXEL_RATE minimum value
  media: ipu3-cio2: Build only for x86
  drm/fourcc: fix Amlogic format modifier masks
  drm/virtio: make sure context is created in gem open
  MIPS: lantiq: Explicitly compare LTQ_EBU_PCC_ISTAT against 0
  MIPS: c-r4k: Fix section mismatch for loongson2_sc_init
  drm/amdgpu: Fix macro name _AMDGPU_TRACE_H_ in preprocessor if condition
  drm: rcar-du: Fix the return check of of_parse_phandle and of_find_device_by_node
  drm: rcar-du: Fix crash when using LVDS1 clock for CRTC
  drm: rcar-du: Fix PM reference leak in rcar_cmm_enable()
  kcsan: Rewrite kcsan_prandom_u32_max() without prandom_u32_state()
  media: allegro: Fix use after free on error
  hwrng: ingenic - Fix a resource leak in an error handling path
  crypto: arm64/aes-ce - really hide slower algos when faster ones are enabled
  crypto: sun4i-ss - fix kmap usage
  crypto: sun4i-ss - linearize buffers content must be kept
  drm/vc4: hdmi: Take into account the clock doubling flag in atomic_check
  drm/panel: mantix: Tweak init sequence
  drm/fb-helper: Add missed unlocks in setcmap_legacy()
  gma500: clean up error handling in init
  drm/gma500: Fix error return code in psb_driver_load()
  fbdev: aty: SPARC64 requires FB_ATY_CT
  tty: implement read_iter
  tty: convert tty_ldisc_ops 'read()' function to take a kernel pointer
  net: enetc: fix destroyed phylink dereference during unbind
  net: mvneta: Remove per-cpu queue mapping for Armada 3700
  net: amd-xgbe: Fix network fluctuations when using 1G BELFUSE SFP
  net: amd-xgbe: Reset link when the link never comes back
  net: amd-xgbe: Fix NETDEV WATCHDOG transmit queue timeout warning
  net: amd-xgbe: Reset the PHY rx data path when mailbox command timeout
  net: phy: mscc: adding LCPLL reset to VSC8514
  net: dsa: felix: don't deinitialize unused ports
  net: dsa: felix: perform teardown in reverse order of setup
  ibmvnic: skip send_request_unmap for timeout reset
  ibmvnic: add memory barrier to protect long term buffer
  bpf: Clear subreg_def for global function return values
  b43: N-PHY: Fix the update of coef for the PHY revision >= 3case
  cxgb4/chtls/cxgbit: Keeping the max ofld immediate data size same in cxgb4 and ulds
  net: axienet: Handle deferred probe on clock properly
  tcp: fix SO_RCVLOWAT related hangs under mem pressure
  selftests: mptcp: fix ACKRX debug message
  bpf: Fix bpf_fib_lookup helper MTU check for SKB ctx
  bpf, devmap: Use GFP_KERNEL for xdp bulk queue allocation
  bpf: Fix an unitialized value in bpf_iter
  libbpf: Ignore non function pointer member in struct_ops
  mac80211: fix potential overflow when multiplying to u32 integers
  net/mlx5e: Check tunnel offload is required before setting SWP
  net/mlx5e: CT: manage the lifetime of the ct entry object
  net/mlx5: Disable devlink reload for lag devices
  net/mlx5: Disallow RoCE on lag device
  net/mlx5: Disallow RoCE on multi port slave device
  net/mlx5: Disable devlink reload for multi port slave device
  net/mlx5e: kTLS, Use refcounts to free kTLS RX priv context
  net/mlx5e: Replace synchronize_rcu with synchronize_net
  net/mlx5: Fix health error state handling
  net/mlx5e: Change interrupt moderation channel params also when channels are closed
  net/mlx5e: Don't change interrupt moderation params when DIM is enabled
  net: phy: consider that suspend2ram may cut off PHY power
  dpaa2-eth: fix memory leak in XDP_REDIRECT
  xen/netback: fix spurious event detection for common event case
  bnxt_en: Fix devlink info's stored fw.psid version format.
  bnxt_en: reverse order of TX disable and carrier off
  ibmvnic: Set to CLOSED state even on error
  selftests/bpf: Convert test_xdp_redirect.sh to bash
  ath9k: fix data bus crash when setting nf_override via debugfs
  iwlwifi: pnvm: increment the pointer before checking the TLV
  iwlwifi: pnvm: set the PNVM again if it was already loaded
  bpf_lru_list: Read double-checked variable once without lock
  iwlwifi: mvm: don't check if CSA event is running before removing
  iwlwifi: mvm: assign SAR table revision to the command later
  iwlwifi: mvm: send stored PPAG command instead of local
  iwlwifi: mvm: store PPAG enabled/disabled flag properly
  iwlwifi: mvm: fix the type we use in the PPAG table validity checks
  soc: aspeed: snoop: Add clock control logic
  ath11k: fix a locking bug in ath11k_mac_op_start()
  ath10k: Fix lockdep assertion warning in ath10k_sta_statistics
  ath10k: Fix suspicious RCU usage warning in ath10k_wmi_tlv_parse_peer_stats_info()
  ARM: at91: use proper asm syntax in pm_suspend
  staging: wfx: fix possible panic with re-queued frames
  optee: simplify i2c access
  ARM: s3c: fix fiq for clang IAS
  iwlwifi: mvm: set enabled in the PPAG command properly
  arm64: dts: meson: fix broken wifi node for Khadas VIM3L
  arm64: dts: msm8916: Fix reserved and rfsa nodes unit address
  soc: qcom: ocmem: don't return NULL in of_get_ocmem
  Bluetooth: btusb: Fix memory leak in btusb_mtk_wmt_recv
  opp: Correct debug message in _opp_add_static_v2()
  arm64: dts: armada-3720-turris-mox: rename u-boot mtd partition to a53-firmware
  ARM: dts: armada388-helios4: assign pinctrl to each fan
  ARM: dts: armada388-helios4: assign pinctrl to LEDs
  can: mcp251xfd: mcp251xfd_probe(): fix errata reference
  arm64: dts: renesas: beacon: Fix EEPROM compatible value
  x86/MSR: Filter MSR writes through X86_IOC_WRMSR_REGS ioctl too
  staging: rtl8723bs: wifi_regd.c: Fix incorrect number of regulatory rules
  usb: dwc2: Make "trimming xfer length" a debug message
  usb: dwc2: Abort transaction after errors with unknown reason
  usb: dwc2: Do not update data length if it is 0 on inbound transfers
  ARM: dts: Configure missing thermal interrupt for 4430
  memory: ti-aemif: Drop child node when jumping out loop
  Bluetooth: Put HCI device if inquiry procedure interrupts
  Bluetooth: drop HCI device reference before return
  staging: media: atomisp: Fix size_t format specifier in hmm_alloc() debug statemenet
  soc: ti: pm33xx: Fix some resource leak in the error handling paths of the probe function
  soc: qcom: socinfo: Fix an off by one in qcom_show_pmic_model()
  arm64: dts: qcom: sdm845-db845c: Fix reset-pin of ov8856 node
  usb: gadget: u_audio: Free requests only after callback
  ACPICA: Fix exception code class checks
  arm64: dts: rockchip: rk3328: Add clock_in_out property to gmac2phy node
  cpufreq: brcmstb-avs-cpufreq: Fix resource leaks in ->remove()
  cpufreq: brcmstb-avs-cpufreq: Free resources in error path
  arm64: dts: qcom: msm8916-samsung-a2015: Fix sensors
  arm64: dts: allwinner: A64: Limit MMC2 bus frequency to 150 MHz
  arm64: dts: allwinner: H6: Allow up to 150 MHz MMC bus frequency
  arm64: dts: allwinner: Drop non-removable from SoPine/LTS SD card
  arm64: dts: allwinner: H6: properly connect USB PHY to port 0
  arm64: dts: allwinner: A64: properly connect USB PHY to port 0
  firmware: arm_scmi: Fix call site of scmi_notification_exit
  bpf: Avoid warning when re-casting __bpf_call_base into __bpf_call_base_args
  bpf: Add bpf_patch_call_args prototype to include/linux/bpf.h
  net: stmmac: dwmac-meson8b: fix enabling the timing-adjustment clock
  arm64: dts: qcom: msm8916-samsung-a5u: Fix iris compatible
  staging: vchiq: Fix bulk transfers on 64-bit builds
  staging: vchiq: Fix bulk userdata handling
  Bluetooth: hci_qca: Fix memleak in qca_controller_memdump
  memory: mtk-smi: Fix PM usage counter unbalance in mtk_smi ops
  arm64: dts: exynos: correct PMIC interrupt trigger level on Espresso
  arm64: dts: exynos: correct PMIC interrupt trigger level on TM2
  ARM: dts: exynos: correct PMIC interrupt trigger level on Odroid XU3 family
  ARM: dts: exynos: correct PMIC interrupt trigger level on Arndale Octa
  ARM: dts: exynos: correct PMIC interrupt trigger level on Spring
  ARM: dts: exynos: correct PMIC interrupt trigger level on Rinato
  ARM: dts: exynos: correct PMIC interrupt trigger level on Monk
  ARM: dts: exynos: correct PMIC interrupt trigger level on Artik 5
  arm64: dts: renesas: beacon: Fix audio-1.8V pin enable
  arm64: dts: renesas: beacon kit: Fix choppy Bluetooth Audio
  Bluetooth: Fix initializing response id after clearing struct
  Bluetooth: hci_uart: Fix a race for write_work scheduling
  Bluetooth: btqcomsmd: Fix a resource leak in error handling paths in the probe function
  ath10k: Fix error handling in case of CE pipe init failure
  drm/i915/gt: One more flush for Baytrail clear residuals
  ALSA: pcm: Don't call sync_stop if it hasn't been stopped
  ALSA: pcm: Assure sync with the pending stop operation at suspend
  ALSA: pcm: Call sync_stop at disconnection
  random: fix the RNDRESEEDCRNG ioctl
  vmlinux.lds.h: Define SANTIZER_DISCARDS with CONFIG_GCOV_KERNEL=y
  MIPS: vmlinux.lds.S: add missing PAGE_ALIGNED_DATA() section
  ALSA: usb-audio: Fix PCM buffer allocation in non-vmalloc mode
  bfq: Avoid false bfq queue merging
  virt: vbox: Do not use wait_event_interruptible when called from kernel context
  PCI: Decline to resize resources if boot config must be preserved
  PCI: qcom: Use PHY_REFCLK_USE_PAD only for ipq8064
  w1: w1_therm: Fix conversion result for negative temperatures
  kdb: Make memory allocations more robust
  scsi: qla2xxx: Fix mailbox Ch erroneous error
  scsi: libsas: docs: Remove notify_ha_event()
  debugfs: do not attempt to create a new file before the filesystem is initalized
  debugfs: be more robust at handling improper input in debugfs_lookup()
  vdpa/mlx5: fix param validation in mlx5_vdpa_get_config()
  vmlinux.lds.h: add DWARF v5 sections

 Conflicts:
	Documentation/devicetree/bindings
	Documentation/devicetree/bindings/net/btusb.txt
	Documentation/devicetree/bindings/net/ethernet-controller.yaml
	drivers/cpufreq/qcom-cpufreq-hw.c
	drivers/nvmem/qcom-spmi-sdam.c
	drivers/soc/qcom/socinfo.c
	drivers/spmi/spmi-pmic-arb.c
	net/qrtr/tun.c

Change-Id: I5a14e8d8d00a40af0a0e022ad85996f1351704f4
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2021-03-18 02:00:06 -07:00
Greg Kroah-Hartman
d8c7f0a3cd Merge 5.10.20 into android12-5.10
Changes in 5.10.20
	vmlinux.lds.h: add DWARF v5 sections
	vdpa/mlx5: fix param validation in mlx5_vdpa_get_config()
	debugfs: be more robust at handling improper input in debugfs_lookup()
	debugfs: do not attempt to create a new file before the filesystem is initalized
	scsi: libsas: docs: Remove notify_ha_event()
	scsi: qla2xxx: Fix mailbox Ch erroneous error
	kdb: Make memory allocations more robust
	w1: w1_therm: Fix conversion result for negative temperatures
	PCI: qcom: Use PHY_REFCLK_USE_PAD only for ipq8064
	PCI: Decline to resize resources if boot config must be preserved
	virt: vbox: Do not use wait_event_interruptible when called from kernel context
	bfq: Avoid false bfq queue merging
	ALSA: usb-audio: Fix PCM buffer allocation in non-vmalloc mode
	MIPS: vmlinux.lds.S: add missing PAGE_ALIGNED_DATA() section
	vmlinux.lds.h: Define SANTIZER_DISCARDS with CONFIG_GCOV_KERNEL=y
	random: fix the RNDRESEEDCRNG ioctl
	ALSA: pcm: Call sync_stop at disconnection
	ALSA: pcm: Assure sync with the pending stop operation at suspend
	ALSA: pcm: Don't call sync_stop if it hasn't been stopped
	drm/i915/gt: One more flush for Baytrail clear residuals
	ath10k: Fix error handling in case of CE pipe init failure
	Bluetooth: btqcomsmd: Fix a resource leak in error handling paths in the probe function
	Bluetooth: hci_uart: Fix a race for write_work scheduling
	Bluetooth: Fix initializing response id after clearing struct
	arm64: dts: renesas: beacon kit: Fix choppy Bluetooth Audio
	arm64: dts: renesas: beacon: Fix audio-1.8V pin enable
	ARM: dts: exynos: correct PMIC interrupt trigger level on Artik 5
	ARM: dts: exynos: correct PMIC interrupt trigger level on Monk
	ARM: dts: exynos: correct PMIC interrupt trigger level on Rinato
	ARM: dts: exynos: correct PMIC interrupt trigger level on Spring
	ARM: dts: exynos: correct PMIC interrupt trigger level on Arndale Octa
	ARM: dts: exynos: correct PMIC interrupt trigger level on Odroid XU3 family
	arm64: dts: exynos: correct PMIC interrupt trigger level on TM2
	arm64: dts: exynos: correct PMIC interrupt trigger level on Espresso
	memory: mtk-smi: Fix PM usage counter unbalance in mtk_smi ops
	Bluetooth: hci_qca: Fix memleak in qca_controller_memdump
	staging: vchiq: Fix bulk userdata handling
	staging: vchiq: Fix bulk transfers on 64-bit builds
	arm64: dts: qcom: msm8916-samsung-a5u: Fix iris compatible
	net: stmmac: dwmac-meson8b: fix enabling the timing-adjustment clock
	bpf: Add bpf_patch_call_args prototype to include/linux/bpf.h
	bpf: Avoid warning when re-casting __bpf_call_base into __bpf_call_base_args
	firmware: arm_scmi: Fix call site of scmi_notification_exit
	arm64: dts: allwinner: A64: properly connect USB PHY to port 0
	arm64: dts: allwinner: H6: properly connect USB PHY to port 0
	arm64: dts: allwinner: Drop non-removable from SoPine/LTS SD card
	arm64: dts: allwinner: H6: Allow up to 150 MHz MMC bus frequency
	arm64: dts: allwinner: A64: Limit MMC2 bus frequency to 150 MHz
	arm64: dts: qcom: msm8916-samsung-a2015: Fix sensors
	cpufreq: brcmstb-avs-cpufreq: Free resources in error path
	cpufreq: brcmstb-avs-cpufreq: Fix resource leaks in ->remove()
	arm64: dts: rockchip: rk3328: Add clock_in_out property to gmac2phy node
	ACPICA: Fix exception code class checks
	usb: gadget: u_audio: Free requests only after callback
	arm64: dts: qcom: sdm845-db845c: Fix reset-pin of ov8856 node
	soc: qcom: socinfo: Fix an off by one in qcom_show_pmic_model()
	soc: ti: pm33xx: Fix some resource leak in the error handling paths of the probe function
	staging: media: atomisp: Fix size_t format specifier in hmm_alloc() debug statemenet
	Bluetooth: drop HCI device reference before return
	Bluetooth: Put HCI device if inquiry procedure interrupts
	memory: ti-aemif: Drop child node when jumping out loop
	ARM: dts: Configure missing thermal interrupt for 4430
	usb: dwc2: Do not update data length if it is 0 on inbound transfers
	usb: dwc2: Abort transaction after errors with unknown reason
	usb: dwc2: Make "trimming xfer length" a debug message
	staging: rtl8723bs: wifi_regd.c: Fix incorrect number of regulatory rules
	x86/MSR: Filter MSR writes through X86_IOC_WRMSR_REGS ioctl too
	arm64: dts: renesas: beacon: Fix EEPROM compatible value
	can: mcp251xfd: mcp251xfd_probe(): fix errata reference
	ARM: dts: armada388-helios4: assign pinctrl to LEDs
	ARM: dts: armada388-helios4: assign pinctrl to each fan
	arm64: dts: armada-3720-turris-mox: rename u-boot mtd partition to a53-firmware
	opp: Correct debug message in _opp_add_static_v2()
	Bluetooth: btusb: Fix memory leak in btusb_mtk_wmt_recv
	soc: qcom: ocmem: don't return NULL in of_get_ocmem
	arm64: dts: msm8916: Fix reserved and rfsa nodes unit address
	arm64: dts: meson: fix broken wifi node for Khadas VIM3L
	iwlwifi: mvm: set enabled in the PPAG command properly
	ARM: s3c: fix fiq for clang IAS
	optee: simplify i2c access
	staging: wfx: fix possible panic with re-queued frames
	ARM: at91: use proper asm syntax in pm_suspend
	ath10k: Fix suspicious RCU usage warning in ath10k_wmi_tlv_parse_peer_stats_info()
	ath10k: Fix lockdep assertion warning in ath10k_sta_statistics
	ath11k: fix a locking bug in ath11k_mac_op_start()
	soc: aspeed: snoop: Add clock control logic
	iwlwifi: mvm: fix the type we use in the PPAG table validity checks
	iwlwifi: mvm: store PPAG enabled/disabled flag properly
	iwlwifi: mvm: send stored PPAG command instead of local
	iwlwifi: mvm: assign SAR table revision to the command later
	iwlwifi: mvm: don't check if CSA event is running before removing
	bpf_lru_list: Read double-checked variable once without lock
	iwlwifi: pnvm: set the PNVM again if it was already loaded
	iwlwifi: pnvm: increment the pointer before checking the TLV
	ath9k: fix data bus crash when setting nf_override via debugfs
	selftests/bpf: Convert test_xdp_redirect.sh to bash
	ibmvnic: Set to CLOSED state even on error
	bnxt_en: reverse order of TX disable and carrier off
	bnxt_en: Fix devlink info's stored fw.psid version format.
	xen/netback: fix spurious event detection for common event case
	dpaa2-eth: fix memory leak in XDP_REDIRECT
	net: phy: consider that suspend2ram may cut off PHY power
	net/mlx5e: Don't change interrupt moderation params when DIM is enabled
	net/mlx5e: Change interrupt moderation channel params also when channels are closed
	net/mlx5: Fix health error state handling
	net/mlx5e: Replace synchronize_rcu with synchronize_net
	net/mlx5e: kTLS, Use refcounts to free kTLS RX priv context
	net/mlx5: Disable devlink reload for multi port slave device
	net/mlx5: Disallow RoCE on multi port slave device
	net/mlx5: Disallow RoCE on lag device
	net/mlx5: Disable devlink reload for lag devices
	net/mlx5e: CT: manage the lifetime of the ct entry object
	net/mlx5e: Check tunnel offload is required before setting SWP
	mac80211: fix potential overflow when multiplying to u32 integers
	libbpf: Ignore non function pointer member in struct_ops
	bpf: Fix an unitialized value in bpf_iter
	bpf, devmap: Use GFP_KERNEL for xdp bulk queue allocation
	bpf: Fix bpf_fib_lookup helper MTU check for SKB ctx
	selftests: mptcp: fix ACKRX debug message
	tcp: fix SO_RCVLOWAT related hangs under mem pressure
	net: axienet: Handle deferred probe on clock properly
	cxgb4/chtls/cxgbit: Keeping the max ofld immediate data size same in cxgb4 and ulds
	b43: N-PHY: Fix the update of coef for the PHY revision >= 3case
	bpf: Clear subreg_def for global function return values
	ibmvnic: add memory barrier to protect long term buffer
	ibmvnic: skip send_request_unmap for timeout reset
	net: dsa: felix: perform teardown in reverse order of setup
	net: dsa: felix: don't deinitialize unused ports
	net: phy: mscc: adding LCPLL reset to VSC8514
	net: amd-xgbe: Reset the PHY rx data path when mailbox command timeout
	net: amd-xgbe: Fix NETDEV WATCHDOG transmit queue timeout warning
	net: amd-xgbe: Reset link when the link never comes back
	net: amd-xgbe: Fix network fluctuations when using 1G BELFUSE SFP
	net: mvneta: Remove per-cpu queue mapping for Armada 3700
	net: enetc: fix destroyed phylink dereference during unbind
	tty: convert tty_ldisc_ops 'read()' function to take a kernel pointer
	tty: implement read_iter
	fbdev: aty: SPARC64 requires FB_ATY_CT
	drm/gma500: Fix error return code in psb_driver_load()
	gma500: clean up error handling in init
	drm/fb-helper: Add missed unlocks in setcmap_legacy()
	drm/panel: mantix: Tweak init sequence
	drm/vc4: hdmi: Take into account the clock doubling flag in atomic_check
	crypto: sun4i-ss - linearize buffers content must be kept
	crypto: sun4i-ss - fix kmap usage
	crypto: arm64/aes-ce - really hide slower algos when faster ones are enabled
	hwrng: ingenic - Fix a resource leak in an error handling path
	media: allegro: Fix use after free on error
	kcsan: Rewrite kcsan_prandom_u32_max() without prandom_u32_state()
	drm: rcar-du: Fix PM reference leak in rcar_cmm_enable()
	drm: rcar-du: Fix crash when using LVDS1 clock for CRTC
	drm: rcar-du: Fix the return check of of_parse_phandle and of_find_device_by_node
	drm/amdgpu: Fix macro name _AMDGPU_TRACE_H_ in preprocessor if condition
	MIPS: c-r4k: Fix section mismatch for loongson2_sc_init
	MIPS: lantiq: Explicitly compare LTQ_EBU_PCC_ISTAT against 0
	drm/virtio: make sure context is created in gem open
	drm/fourcc: fix Amlogic format modifier masks
	media: ipu3-cio2: Build only for x86
	media: i2c: ov5670: Fix PIXEL_RATE minimum value
	media: imx: Unregister csc/scaler only if registered
	media: imx: Fix csc/scaler unregister
	media: mtk-vcodec: fix error return code in vdec_vp9_decode()
	media: camss: missing error code in msm_video_register()
	media: vsp1: Fix an error handling path in the probe function
	media: em28xx: Fix use-after-free in em28xx_alloc_urbs
	media: media/pci: Fix memleak in empress_init
	media: tm6000: Fix memleak in tm6000_start_stream
	media: aspeed: fix error return code in aspeed_video_setup_video()
	ASoC: cs42l56: fix up error handling in probe
	ASoC: qcom: qdsp6: Move frontend AIFs to q6asm-dai
	evm: Fix memleak in init_desc
	crypto: bcm - Rename struct device_private to bcm_device_private
	sched/fair: Avoid stale CPU util_est value for schedutil in task dequeue
	drm/sun4i: tcon: fix inverted DCLK polarity
	media: imx7: csi: Fix regression for parallel cameras on i.MX6UL
	media: imx7: csi: Fix pad link validation
	media: ti-vpe: cal: fix write to unallocated memory
	MIPS: properly stop .eh_frame generation
	MIPS: Compare __SYNC_loongson3_war against 0
	drm/tegra: Fix reference leak when pm_runtime_get_sync() fails
	drm/amdgpu: toggle on DF Cstate after finishing xgmi injection
	bsg: free the request before return error code
	macintosh/adb-iop: Use big-endian autopoll mask
	drm/amd/display: Fix 10/12 bpc setup in DCE output bit depth reduction.
	drm/amd/display: Fix HDMI deep color output for DCE 6-11.
	media: software_node: Fix refcounts in software_node_get_next_child()
	media: lmedm04: Fix misuse of comma
	media: vidtv: psi: fix missing crc for PMT
	media: atomisp: Fix a buffer overflow in debug code
	media: qm1d1c0042: fix error return code in qm1d1c0042_init()
	media: cx25821: Fix a bug when reallocating some dma memory
	media: mtk-vcodec: fix argument used when DEBUG is defined
	media: pxa_camera: declare variable when DEBUG is defined
	media: uvcvideo: Accept invalid bFormatIndex and bFrameIndex values
	sched/eas: Don't update misfit status if the task is pinned
	f2fs: compress: fix potential deadlock
	ASoC: qcom: lpass-cpu: Remove bit clock state check
	ASoC: SOF: Intel: hda: cancel D0i3 work during runtime suspend
	perf/arm-cmn: Fix PMU instance naming
	perf/arm-cmn: Move IRQs when migrating context
	mtd: parser: imagetag: fix error codes in bcm963xx_parse_imagetag_partitions()
	crypto: talitos - Work around SEC6 ERRATA (AES-CTR mode data size error)
	crypto: talitos - Fix ctr(aes) on SEC1
	drm/nouveau: bail out of nouveau_channel_new if channel init fails
	mm: proc: Invalidate TLB after clearing soft-dirty page state
	ata: ahci_brcm: Add back regulators management
	ASoC: cpcap: fix microphone timeslot mask
	ASoC: codecs: add missing max_register in regmap config
	mtd: parsers: afs: Fix freeing the part name memory in failure
	f2fs: fix to avoid inconsistent quota data
	drm/amdgpu: Prevent shift wrapping in amdgpu_read_mask()
	f2fs: fix a wrong condition in __submit_bio
	ASoC: qcom: Fix typo error in HDMI regmap config callbacks
	KVM: nSVM: Don't strip host's C-bit from guest's CR3 when reading PDPTRs
	drm/mediatek: Check if fb is null
	Drivers: hv: vmbus: Avoid use-after-free in vmbus_onoffer_rescind()
	ASoC: Intel: sof_sdw: add missing TGL_HDMI quirk for Dell SKU 0A5E
	ASoC: Intel: sof_sdw: add missing TGL_HDMI quirk for Dell SKU 0A3E
	locking/lockdep: Avoid unmatched unlock
	ASoC: qcom: lpass: Fix i2s ctl register bit map
	ASoC: rt5682: Fix panic in rt5682_jack_detect_handler happening during system shutdown
	ASoC: SOF: debug: Fix a potential issue on string buffer termination
	btrfs: clarify error returns values in __load_free_space_cache
	btrfs: fix double accounting of ordered extent for subpage case in btrfs_invalidapge
	KVM: x86: Restore all 64 bits of DR6 and DR7 during RSM on x86-64
	s390/zcrypt: return EIO when msg retry limit reached
	drm/vc4: hdmi: Move hdmi reset to bind
	drm/vc4: hdmi: Fix register offset with longer CEC messages
	drm/vc4: hdmi: Fix up CEC registers
	drm/vc4: hdmi: Restore cec physical address on reconnect
	drm/vc4: hdmi: Compute the CEC clock divider from the clock rate
	drm/vc4: hdmi: Update the CEC clock divider on HSM rate change
	drm/lima: fix reference leak in lima_pm_busy
	drm/dp_mst: Don't cache EDIDs for physical ports
	hwrng: timeriomem - Fix cooldown period calculation
	crypto: ecdh_helper - Ensure 'len >= secret.len' in decode_key()
	io_uring: fix possible deadlock in io_uring_poll
	nvmet-tcp: fix receive data digest calculation for multiple h2cdata PDUs
	nvmet-tcp: fix potential race of tcp socket closing accept_work
	nvme-multipath: set nr_zones for zoned namespaces
	nvmet: remove extra variable in identify ns
	nvmet: set status to 0 in case for invalid nsid
	ASoC: SOF: sof-pci-dev: add missing Up-Extreme quirk
	ima: Free IMA measurement buffer on error
	ima: Free IMA measurement buffer after kexec syscall
	ASoC: simple-card-utils: Fix device module clock
	fs/jfs: fix potential integer overflow on shift of a int
	jffs2: fix use after free in jffs2_sum_write_data()
	ubifs: Fix memleak in ubifs_init_authentication
	ubifs: replay: Fix high stack usage, again
	ubifs: Fix error return code in alloc_wbufs()
	irqchip/imx: IMX_INTMUX should not default to y, unconditionally
	smp: Process pending softirqs in flush_smp_call_function_from_idle()
	drm/amdgpu/display: remove hdcp_srm sysfs on device removal
	capabilities: Don't allow writing ambiguous v3 file capabilities
	HSI: Fix PM usage counter unbalance in ssi_hw_init
	power: supply: cpcap: Add missing IRQF_ONESHOT to fix regression
	clk: meson: clk-pll: fix initializing the old rate (fallback) for a PLL
	clk: meson: clk-pll: make "ret" a signed integer
	clk: meson: clk-pll: propagate the error from meson_clk_pll_set_rate()
	selftests/powerpc: Make the test check in eeh-basic.sh posix compliant
	regulator: qcom-rpmh-regulator: add pm8009-1 chip revision
	arm64: dts: qcom: qrb5165-rb5: fix pm8009 regulators
	quota: Fix memory leak when handling corrupted quota file
	i2c: iproc: handle only slave interrupts which are enabled
	i2c: iproc: update slave isr mask (ISR_MASK_SLAVE)
	i2c: iproc: handle master read request
	spi: cadence-quadspi: Abort read if dummy cycles required are too many
	clk: sunxi-ng: h6: Fix CEC clock
	clk: renesas: r8a779a0: Remove non-existent S2 clock
	clk: renesas: r8a779a0: Fix parent of CBFUSA clock
	HID: core: detect and skip invalid inputs to snto32()
	RDMA/siw: Fix handling of zero-sized Read and Receive Queues.
	dmaengine: fsldma: Fix a resource leak in the remove function
	dmaengine: fsldma: Fix a resource leak in an error handling path of the probe function
	dmaengine: owl-dma: Fix a resource leak in the remove function
	dmaengine: hsu: disable spurious interrupt
	mfd: bd9571mwv: Use devm_mfd_add_devices()
	power: supply: cpcap-charger: Fix missing power_supply_put()
	power: supply: cpcap-battery: Fix missing power_supply_put()
	power: supply: cpcap-charger: Fix power_supply_put on null battery pointer
	fdt: Properly handle "no-map" field in the memory region
	of/fdt: Make sure no-map does not remove already reserved regions
	RDMA/rtrs: Extend ibtrs_cq_qp_create
	RDMA/rtrs-srv: Release lock before call into close_sess
	RDMA/rtrs-srv: Use sysfs_remove_file_self for disconnect
	RDMA/rtrs-clt: Set mininum limit when create QP
	RDMA/rtrs: Call kobject_put in the failure path
	RDMA/rtrs-srv: Fix missing wr_cqe
	RDMA/rtrs-clt: Refactor the failure cases in alloc_clt
	RDMA/rtrs-srv: Init wr_cnt as 1
	power: reset: at91-sama5d2_shdwc: fix wkupdbc mask
	rtc: s5m: select REGMAP_I2C
	dmaengine: idxd: set DMA channel to be private
	power: supply: fix sbs-charger build, needs REGMAP_I2C
	clocksource/drivers/ixp4xx: Select TIMER_OF when needed
	clocksource/drivers/mxs_timer: Add missing semicolon when DEBUG is defined
	spi: imx: Don't print error on -EPROBEDEFER
	RDMA/mlx5: Use the correct obj_id upon DEVX TIR creation
	IB/mlx5: Add mutex destroy call to cap_mask_mutex mutex
	clk: sunxi-ng: h6: Fix clock divider range on some clocks
	platform/chrome: cros_ec_proto: Use EC_HOST_EVENT_MASK not BIT
	platform/chrome: cros_ec_proto: Add LID and BATTERY to default mask
	regulator: axp20x: Fix reference cout leak
	watch_queue: Drop references to /dev/watch_queue
	certs: Fix blacklist flag type confusion
	regulator: s5m8767: Fix reference count leak
	spi: atmel: Put allocated master before return
	regulator: s5m8767: Drop regulators OF node reference
	power: supply: axp20x_usb_power: Init work before enabling IRQs
	power: supply: smb347-charger: Fix interrupt usage if interrupt is unavailable
	regulator: core: Avoid debugfs: Directory ... already present! error
	isofs: release buffer head before return
	watchdog: intel-mid_wdt: Postpone IRQ handler registration till SCU is ready
	auxdisplay: ht16k33: Fix refresh rate handling
	objtool: Fix error handling for STD/CLD warnings
	objtool: Fix retpoline detection in asm code
	objtool: Fix ".cold" section suffix check for newer versions of GCC
	scsi: lpfc: Fix ancient double free
	iommu: Switch gather->end to the inclusive end
	IB/umad: Return EIO in case of when device disassociated
	IB/umad: Return EPOLLERR in case of when device disassociated
	KVM: PPC: Make the VMX instruction emulation routines static
	powerpc/47x: Disable 256k page size
	powerpc/time: Enable sched clock for irqtime
	mmc: owl-mmc: Fix a resource leak in an error handling path and in the remove function
	mmc: sdhci-sprd: Fix some resource leaks in the remove function
	mmc: usdhi6rol0: Fix a resource leak in the error handling path of the probe
	mmc: renesas_sdhi_internal_dmac: Fix DMA buffer alignment from 8 to 128-bytes
	ARM: 9046/1: decompressor: Do not clear SCTLR.nTLSMD for ARMv7+ cores
	i2c: qcom-geni: Store DMA mapping data in geni_i2c_dev struct
	amba: Fix resource leak for drivers without .remove
	iommu: Move iotlb_sync_map out from __iommu_map
	iommu: Properly pass gfp_t in _iommu_map() to avoid atomic sleeping
	IB/mlx5: Return appropriate error code instead of ENOMEM
	IB/cm: Avoid a loop when device has 255 ports
	tracepoint: Do not fail unregistering a probe due to memory failure
	rtc: zynqmp: depend on HAS_IOMEM
	perf tools: Fix DSO filtering when not finding a map for a sampled address
	perf vendor events arm64: Fix Ampere eMag event typo
	RDMA/rxe: Fix coding error in rxe_recv.c
	RDMA/rxe: Fix coding error in rxe_rcv_mcast_pkt
	RDMA/rxe: Correct skb on loopback path
	spi: stm32: properly handle 0 byte transfer
	mfd: altera-sysmgr: Fix physical address storing more
	mfd: wm831x-auxadc: Prevent use after free in wm831x_auxadc_read_irq()
	powerpc/pseries/dlpar: handle ibm, configure-connector delay status
	powerpc/8xx: Fix software emulation interrupt
	clk: qcom: gcc-msm8998: Fix Alpha PLL type for all GPLLs
	kunit: tool: fix unit test cleanup handling
	kselftests: dmabuf-heaps: Fix Makefile's inclusion of the kernel's usr/include dir
	RDMA/hns: Fixed wrong judgments in the goto branch
	RDMA/siw: Fix calculation of tx_valid_cpus size
	RDMA/hns: Fix type of sq_signal_bits
	RDMA/hns: Disable RQ inline by default
	clk: divider: fix initialization with parent_hw
	spi: pxa2xx: Fix the controller numbering for Wildcat Point
	powerpc/uaccess: Avoid might_fault() when user access is enabled
	powerpc/kuap: Restore AMR after replaying soft interrupts
	regulator: qcom-rpmh: fix pm8009 ldo7
	clk: aspeed: Fix APLL calculate formula from ast2600-A2
	selftests/ftrace: Update synthetic event syntax errors
	perf symbols: Use (long) for iterator for bfd symbols
	regulator: bd718x7, bd71828, Fix dvs voltage levels
	spi: dw: Avoid stack content exposure
	spi: Skip zero-length transfers in spi_transfer_one_message()
	printk: avoid prb_first_valid_seq() where possible
	perf symbols: Fix return value when loading PE DSO
	nfsd: register pernet ops last, unregister first
	svcrdma: Hold private mutex while invoking rdma_accept()
	ceph: fix flush_snap logic after putting caps
	RDMA/hns: Fixes missing error code of CMDQ
	RDMA/ucma: Fix use-after-free bug in ucma_create_uevent
	RDMA/rtrs-srv: Fix stack-out-of-bounds
	RDMA/rtrs: Only allow addition of path to an already established session
	RDMA/rtrs-srv: fix memory leak by missing kobject free
	RDMA/rtrs-srv-sysfs: fix missing put_device
	RDMA/rtrs-srv: Do not pass a valid pointer to PTR_ERR()
	Input: sur40 - fix an error code in sur40_probe()
	perf record: Fix continue profiling after draining the buffer
	perf intel-pt: Fix missing CYC processing in PSB
	perf intel-pt: Fix premature IPC
	perf intel-pt: Fix IPC with CYC threshold
	perf test: Fix unaligned access in sample parsing test
	Input: elo - fix an error code in elo_connect()
	sparc64: only select COMPAT_BINFMT_ELF if BINFMT_ELF is set
	sparc: fix led.c driver when PROC_FS is not enabled
	Input: zinitix - fix return type of zinitix_init_touch()
	ARM: 9065/1: OABI compat: fix build when EPOLL is not enabled
	misc: eeprom_93xx46: Fix module alias to enable module autoprobe
	phy: rockchip-emmc: emmc_phy_init() always return 0
	phy: cadence-torrent: Fix error code in cdns_torrent_phy_probe()
	misc: eeprom_93xx46: Add module alias to avoid breaking support for non device tree users
	PCI: rcar: Always allocate MSI addresses in 32bit space
	soundwire: cadence: fix ACK/NAK handling
	pwm: rockchip: Enable APB clock during register access while probing
	pwm: rockchip: rockchip_pwm_probe(): Remove superfluous clk_unprepare()
	pwm: rockchip: Eliminate potential race condition when probing
	PCI: xilinx-cpm: Fix reference count leak on error path
	VMCI: Use set_page_dirty_lock() when unregistering guest memory
	PCI: Align checking of syscall user config accessors
	mei: hbm: call mei_set_devstate() on hbm stop response
	drm/msm: Fix MSM_INFO_GET_IOVA with carveout
	drm/msm/dsi: Correct io_start for MSM8994 (20nm PHY)
	drm/msm/mdp5: Fix wait-for-commit for cmd panels
	drm/msm: Fix race of GPU init vs timestamp power management.
	drm/msm: Fix races managing the OOB state for timestamp vs timestamps.
	drm/msm/dp: trigger unplug event in msm_dp_display_disable
	vfio/iommu_type1: Populate full dirty when detach non-pinned group
	vfio/iommu_type1: Fix some sanity checks in detach group
	vfio-pci/zdev: fix possible segmentation fault issue
	ext4: fix potential htree index checksum corruption
	phy: USB_LGM_PHY should depend on X86
	coresight: etm4x: Skip accessing TRCPDCR in save/restore
	nvmem: core: Fix a resource leak on error in nvmem_add_cells_from_of()
	nvmem: core: skip child nodes not matching binding
	soundwire: bus: use sdw_update_no_pm when initializing a device
	soundwire: bus: use sdw_write_no_pm when setting the bus scale registers
	soundwire: export sdw_write/read_no_pm functions
	soundwire: bus: fix confusion on device used by pm_runtime
	misc: fastrpc: fix incorrect usage of dma_map_sgtable
	remoteproc/mediatek: acknowledge watchdog IRQ after handled
	regmap: sdw: use _no_pm functions in regmap_read/write
	ext: EXT4_KUNIT_TESTS should depend on EXT4_FS instead of selecting it
	mailbox: sprd: correct definition of SPRD_OUTBOX_FIFO_FULL
	device-dax: Fix default return code of range_parse()
	PCI: pci-bridge-emul: Fix array overruns, improve safety
	PCI: cadence: Fix DMA range mapping early return error
	i40e: Fix flow for IPv6 next header (extension header)
	i40e: Add zero-initialization of AQ command structures
	i40e: Fix overwriting flow control settings during driver loading
	i40e: Fix addition of RX filters after enabling FW LLDP agent
	i40e: Fix VFs not created
	Take mmap lock in cacheflush syscall
	nios2: fixed broken sys_clone syscall
	i40e: Fix add TC filter for IPv6
	octeontx2-af: Fix an off by one in rvu_dbg_qsize_write()
	pwm: iqs620a: Fix overflow and optimize calculations
	vfio/type1: Use follow_pte()
	ice: report correct max number of TCs
	ice: Account for port VLAN in VF max packet size calculation
	ice: Fix state bits on LLDP mode switch
	ice: update the number of available RSS queues
	net: stmmac: fix CBS idleslope and sendslope calculation
	net/mlx4_core: Add missed mlx4_free_cmd_mailbox()
	PCI: rockchip: Make 'ep-gpios' DT property optional
	vxlan: move debug check after netdev unregister
	wireguard: device: do not generate ICMP for non-IP packets
	wireguard: kconfig: use arm chacha even with no neon
	ocfs2: fix a use after free on error
	mm: memcontrol: fix NR_ANON_THPS accounting in charge moving
	mm: memcontrol: fix slub memory accounting
	mm/memory.c: fix potential pte_unmap_unlock pte error
	mm/hugetlb: fix potential double free in hugetlb_register_node() error path
	mm/hugetlb: suppress wrong warning info when alloc gigantic page
	mm/compaction: fix misbehaviors of fast_find_migrateblock()
	r8169: fix jumbo packet handling on RTL8168e
	NFSv4: Fixes for nfs4_bitmask_adjust()
	KVM: SVM: Intercept INVPCID when it's disabled to inject #UD
	KVM: x86/mmu: Expand collapsible SPTE zap for TDP MMU to ZONE_DEVICE and HugeTLB pages
	arm64: Add missing ISB after invalidating TLB in __primary_switch
	i2c: brcmstb: Fix brcmstd_send_i2c_cmd condition
	i2c: exynos5: Preserve high speed master code
	mm,thp,shmem: make khugepaged obey tmpfs mount flags
	mm: fix memory_failure() handling of dax-namespace metadata
	mm/rmap: fix potential pte_unmap on an not mapped pte
	proc: use kvzalloc for our kernel buffer
	csky: Fix a size determination in gpr_get()
	scsi: bnx2fc: Fix Kconfig warning & CNIC build errors
	scsi: sd: sd_zbc: Don't pass GFP_NOIO to kvcalloc
	block: reopen the device in blkdev_reread_part
	ide/falconide: Fix module unload
	scsi: sd: Fix Opal support
	blk-settings: align max_sectors on "logical_block_size" boundary
	soundwire: intel: fix possible crash when no device is detected
	ACPI: property: Fix fwnode string properties matching
	ACPI: configfs: add missing check after configfs_register_default_group()
	cpufreq: ACPI: Set cpuinfo.max_freq directly if max boost is known
	HID: logitech-dj: add support for keyboard events in eQUAD step 4 Gaming
	HID: wacom: Ignore attempts to overwrite the touch_max value from HID
	Input: raydium_ts_i2c - do not send zero length
	Input: xpad - add support for PowerA Enhanced Wired Controller for Xbox Series X|S
	Input: joydev - prevent potential read overflow in ioctl
	Input: i8042 - add ASUS Zenbook Flip to noselftest list
	media: mceusb: Fix potential out-of-bounds shift
	USB: serial: option: update interface mapping for ZTE P685M
	usb: musb: Fix runtime PM race in musb_queue_resume_work
	usb: dwc3: gadget: Fix setting of DEPCFG.bInterval_m1
	usb: dwc3: gadget: Fix dep->interval for fullspeed interrupt
	USB: serial: ftdi_sio: fix FTX sub-integer prescaler
	USB: serial: pl2303: fix line-speed handling on newer chips
	USB: serial: mos7840: fix error code in mos7840_write()
	USB: serial: mos7720: fix error code in mos7720_write()
	phy: lantiq: rcu-usb2: wait after clock enable
	ALSA: fireface: fix to parse sync status register of latter protocol
	ALSA: hda: Add another CometLake-H PCI ID
	ALSA: hda/hdmi: Drop bogus check at closing a stream
	ALSA: hda/realtek: modify EAPD in the ALC886
	ALSA: hda/realtek: Quirk for HP Spectre x360 14 amp setup
	MIPS: Ingenic: Disable HPTLB for D0 XBurst CPUs too
	MIPS: Support binutils configured with --enable-mips-fix-loongson3-llsc=yes
	MIPS: VDSO: Use CLANG_FLAGS instead of filtering out '--target='
	Revert "MIPS: Octeon: Remove special handling of CONFIG_MIPS_ELF_APPENDED_DTB=y"
	Revert "bcache: Kill btree_io_wq"
	bcache: Give btree_io_wq correct semantics again
	bcache: Move journal work to new flush wq
	Revert "drm/amd/display: Update NV1x SR latency values"
	drm/amd/display: Add FPU wrappers to dcn21_validate_bandwidth()
	drm/amd/display: Remove Assert from dcn10_get_dig_frontend
	drm/amd/display: Add vupdate_no_lock interrupts for DCN2.1
	drm/amdkfd: Fix recursive lock warnings
	drm/amdgpu: Set reference clock to 100Mhz on Renoir (v2)
	drm/nouveau/kms: handle mDP connectors
	drm/modes: Switch to 64bit maths to avoid integer overflow
	drm/sched: Cancel and flush all outstanding jobs before finish.
	drm/panel: kd35t133: allow using non-continuous dsi clock
	drm/rockchip: Require the YTR modifier for AFBC
	ASoC: siu: Fix build error by a wrong const prefix
	selinux: fix inconsistency between inode_getxattr and inode_listsecurity
	erofs: initialized fields can only be observed after bit is set
	tpm_tis: Fix check_locality for correct locality acquisition
	tpm_tis: Clean up locality release
	KEYS: trusted: Fix incorrect handling of tpm_get_random()
	KEYS: trusted: Fix migratable=1 failing
	KEYS: trusted: Reserve TPM for seal and unseal operations
	btrfs: do not cleanup upper nodes in btrfs_backref_cleanup_node
	btrfs: do not warn if we can't find the reloc root when looking up backref
	btrfs: add asserts for deleting backref cache nodes
	btrfs: abort the transaction if we fail to inc ref in btrfs_copy_root
	btrfs: fix reloc root leak with 0 ref reloc roots on recovery
	btrfs: splice remaining dirty_bg's onto the transaction dirty bg list
	btrfs: handle space_info::total_bytes_pinned inside the delayed ref itself
	btrfs: account for new extents being deleted in total_bytes_pinned
	btrfs: fix extent buffer leak on failure to copy root
	drm/i915/gt: Flush before changing register state
	drm/i915/gt: Correct surface base address for renderclear
	crypto: arm64/sha - add missing module aliases
	crypto: aesni - prevent misaligned buffers on the stack
	crypto: michael_mic - fix broken misalignment handling
	crypto: sun4i-ss - checking sg length is not sufficient
	crypto: sun4i-ss - IV register does not work on A10 and A13
	crypto: sun4i-ss - handle BigEndian for cipher
	crypto: sun4i-ss - initialize need_fallback
	soc: samsung: exynos-asv: don't defer early on not-supported SoCs
	soc: samsung: exynos-asv: handle reading revision register error
	seccomp: Add missing return in non-void function
	arm64: ptrace: Fix seccomp of traced syscall -1 (NO_SYSCALL)
	misc: rtsx: init of rts522a add OCP power off when no card is present
	drivers/misc/vmw_vmci: restrict too big queue size in qp_host_alloc_queue
	pstore: Fix typo in compression option name
	dts64: mt7622: fix slow sd card access
	arm64: dts: agilex: fix phy interface bit shift for gmac1 and gmac2
	staging/mt7621-dma: mtk-hsdma.c->hsdma-mt7621.c
	staging: gdm724x: Fix DMA from stack
	staging: rtl8188eu: Add Edimax EW-7811UN V2 to device table
	floppy: reintroduce O_NDELAY fix
	media: i2c: max9286: fix access to unallocated memory
	media: ir_toy: add another IR Droid device
	media: ipu3-cio2: Fix mbus_code processing in cio2_subdev_set_fmt()
	media: marvell-ccic: power up the device on mclk enable
	media: smipcie: fix interrupt handling and IR timeout
	x86/virt: Eat faults on VMXOFF in reboot flows
	x86/reboot: Force all cpus to exit VMX root if VMX is supported
	x86/fault: Fix AMD erratum #91 errata fixup for user code
	x86/entry: Fix instrumentation annotation
	powerpc/prom: Fix "ibm,arch-vec-5-platform-support" scan
	rcu: Pull deferred rcuog wake up to rcu_eqs_enter() callers
	rcu/nocb: Perform deferred wake up before last idle's need_resched() check
	kprobes: Fix to delay the kprobes jump optimization
	arm64: Extend workaround for erratum 1024718 to all versions of Cortex-A55
	iommu/arm-smmu-qcom: Fix mask extraction for bootloader programmed SMRs
	arm64: kexec_file: fix memory leakage in create_dtb() when fdt_open_into() fails
	arm64: uprobe: Return EOPNOTSUPP for AARCH32 instruction probing
	arm64 module: set plt* section addresses to 0x0
	arm64: spectre: Prevent lockdep splat on v4 mitigation enable path
	riscv: Disable KSAN_SANITIZE for vDSO
	watchdog: qcom: Remove incorrect usage of QCOM_WDT_ENABLE_IRQ
	watchdog: mei_wdt: request stop on unregister
	coresight: etm4x: Handle accesses to TRCSTALLCTLR
	mtd: spi-nor: sfdp: Fix last erase region marking
	mtd: spi-nor: sfdp: Fix wrong erase type bitmask for overlaid region
	mtd: spi-nor: core: Fix erase type discovery for overlaid region
	mtd: spi-nor: core: Add erase size check for erase command initialization
	mtd: spi-nor: hisi-sfc: Put child node np on error path
	fs/affs: release old buffer head on error path
	seq_file: document how per-entry resources are managed.
	x86: fix seq_file iteration for pat/memtype.c
	mm: memcontrol: fix swap undercounting in cgroup2
	mm: memcontrol: fix get_active_memcg return value
	hugetlb: fix update_and_free_page contig page struct assumption
	hugetlb: fix copy_huge_page_from_user contig page struct assumption
	mm/vmscan: restore zone_reclaim_mode ABI
	mm, compaction: make fast_isolate_freepages() stay within zone
	KVM: nSVM: fix running nested guests when npt=0
	nvmem: qcom-spmi-sdam: Fix uninitialized pdev pointer
	module: Ignore _GLOBAL_OFFSET_TABLE_ when warning for undefined symbols
	mmc: sdhci-esdhc-imx: fix kernel panic when remove module
	mmc: sdhci-pci-o2micro: Bug fix for SDR104 HW tuning failure
	powerpc/32: Preserve cr1 in exception prolog stack check to fix build error
	powerpc/kexec_file: fix FDT size estimation for kdump kernel
	powerpc/32s: Add missing call to kuep_lock on syscall entry
	spmi: spmi-pmic-arb: Fix hw_irq overflow
	mei: fix transfer over dma with extended header
	mei: me: emmitsburg workstation DID
	mei: me: add adler lake point S DID
	mei: me: add adler lake point LP DID
	gpio: pcf857x: Fix missing first interrupt
	mfd: gateworks-gsc: Fix interrupt type
	printk: fix deadlock when kernel panic
	exfat: fix shift-out-of-bounds in exfat_fill_super()
	zonefs: Fix file size of zones in full condition
	kcmp: Support selection of SYS_kcmp without CHECKPOINT_RESTORE
	thermal: cpufreq_cooling: freq_qos_update_request() returns < 0 on error
	cpufreq: qcom-hw: drop devm_xxx() calls from init/exit hooks
	cpufreq: intel_pstate: Change intel_pstate_get_hwp_max() argument
	cpufreq: intel_pstate: Get per-CPU max freq via MSR_HWP_CAPABILITIES if available
	proc: don't allow async path resolution of /proc/thread-self components
	s390/vtime: fix inline assembly clobber list
	virtio/s390: implement virtio-ccw revision 2 correctly
	um: mm: check more comprehensively for stub changes
	um: defer killing userspace on page table update failures
	irqchip/loongson-pch-msi: Use bitmap_zalloc() to allocate bitmap
	f2fs: fix out-of-repair __setattr_copy()
	f2fs: enforce the immutable flag on open files
	f2fs: flush data when enabling checkpoint back
	sparc32: fix a user-triggerable oops in clear_user()
	spi: fsl: invert spisel_boot signal on MPC8309
	spi: spi-synquacer: fix set_cs handling
	gfs2: fix glock confusion in function signal_our_withdraw
	gfs2: Don't skip dlm unlock if glock has an lvb
	gfs2: Lock imbalance on error path in gfs2_recover_one
	gfs2: Recursive gfs2_quota_hold in gfs2_iomap_end
	dm: fix deadlock when swapping to encrypted device
	dm table: fix iterate_devices based device capability checks
	dm table: fix DAX iterate_devices based device capability checks
	dm table: fix zoned iterate_devices based device capability checks
	dm writecache: fix performance degradation in ssd mode
	dm writecache: return the exact table values that were set
	dm writecache: fix writing beyond end of underlying device when shrinking
	dm era: Recover committed writeset after crash
	dm era: Update in-core bitset after committing the metadata
	dm era: Verify the data block size hasn't changed
	dm era: Fix bitset memory leaks
	dm era: Use correct value size in equality function of writeset tree
	dm era: Reinitialize bitset cache before digesting a new writeset
	dm era: only resize metadata in preresume
	drm/i915: Reject 446-480MHz HDMI clock on GLK
	kgdb: fix to kill breakpoints on initmem after boot
	ipv6: silence compilation warning for non-IPV6 builds
	net: icmp: pass zeroed opts from icmp{,v6}_ndo_send before sending
	wireguard: selftests: test multiple parallel streams
	wireguard: queueing: get rid of per-peer ring buffers
	net: sched: fix police ext initialization
	net: qrtr: Fix memory leak in qrtr_tun_open
	net_sched: fix RTNL deadlock again caused by request_module()
	ARM: dts: aspeed: Add LCLK to lpc-snoop
	Linux 5.10.20

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3fbcecd9413ce212dac68d5cc800c9457feba56a
2021-03-07 12:33:33 +01:00
Sumit Garg
13e83186c9 kgdb: fix to kill breakpoints on initmem after boot
commit d54ce6158e354f5358a547b96299ecd7f3725393 upstream.

Currently breakpoints in kernel .init.text section are not handled
correctly while allowing to remove them even after corresponding pages
have been freed.

Fix it via killing .init.text section breakpoints just prior to initmem
pages being freed.

Doug: "HW breakpoints aren't handled by this patch but it's probably
not such a big deal".

Link: https://lkml.kernel.org/r/20210224081652.587785-1-sumit.garg@linaro.org
Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
Suggested-by: Doug Anderson <dianders@chromium.org>
Acked-by: Doug Anderson <dianders@chromium.org>
Acked-by: Daniel Thompson <daniel.thompson@linaro.org>
Tested-by: Daniel Thompson <daniel.thompson@linaro.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Jason Wessel <jason.wessel@windriver.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-03-04 11:38:46 +01:00
Chris Wilson
1ea3602095 kcmp: Support selection of SYS_kcmp without CHECKPOINT_RESTORE
commit bfe3911a91047557eb0e620f95a370aee6a248c7 upstream.

Userspace has discovered the functionality offered by SYS_kcmp and has
started to depend upon it. In particular, Mesa uses SYS_kcmp for
os_same_file_description() in order to identify when two fd (e.g. device
or dmabuf) point to the same struct file. Since they depend on it for
core functionality, lift SYS_kcmp out of the non-default
CONFIG_CHECKPOINT_RESTORE into the selectable syscall category.

Rasmus Villemoes also pointed out that systemd uses SYS_kcmp to
deduplicate the per-service file descriptor store.

Note that some distributions such as Ubuntu are already enabling
CHECKPOINT_RESTORE in their configs and so, by extension, SYS_kcmp.

References: https://gitlab.freedesktop.org/drm/intel/-/issues/3046
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Kees Cook <keescook@chromium.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Will Drewry <wad@chromium.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: stable@vger.kernel.org
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> # DRM depends on kcmp
Acked-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> # systemd uses kcmp
Reviewed-by: Cyrill Gorcunov <gorcunov@gmail.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210205220012.1983-1-chris@chris-wilson.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-03-04 11:38:41 +01:00
Ivaylo Georgiev
1339b0e87a Merge android12-5.10.18 (59e0bda) into msm-5.10
* refs/heads/tmp-59e0bda:
  Revert "UPSTREAM: mmc: sdhci-msm: add Inline Crypto Engine support"
  ANDROID: GKI: Update abi_gki_aarch64_qcom for bitmap parsing
  ANDROID: mm, oom: Prevent extra put_task when oom_evaluate_task is aborted
  ANDROID: Update the ABI
  ANDROID: modpost: update nits from late review
  ANDROID: GKI: Enable CONFIG_MODULE_SCMVERSION=y
  ANDROID: modpost: Support relative paths for module_srcpath
  ANDROID: modules: introduce the MODULE_SCMVERSION config
  ANDROID: scripts/setlocalversion: allow running in a subdir
  ANDROID: abi_gki_aarch64_qcom: Update symbol list
  ANDROID: GKI: Add iommu_get_msi_cookie() to the symbol list
  UPSTREAM: zram: support page writeback
  ANDROID: sched/pause: migrate_tasks crash
  Linux 5.10.18
  media: pwc: Use correct device for DMA
  btrfs: fix crash after non-aligned direct IO write with O_DSYNC
  btrfs: fix backport of 2175bf57dc in 5.10.13
  Bluetooth: btusb: Always fallback to alt 1 for WBS
  tty: protect tty_write from odd low-level tty disciplines
  xen-blkback: fix error handling in xen_blkbk_map()
  xen-scsiback: don't "handle" error by BUG()
  xen-netback: don't "handle" error by BUG()
  xen-blkback: don't "handle" error by BUG()
  xen/arm: don't ignore return errors from set_phys_to_machine
  Xen/gntdev: correct error checking in gntdev_map_grant_pages()
  Xen/gntdev: correct dev_bus_addr handling in gntdev_map_grant_pages()
  Xen/x86: also check kernel mapping in set_foreign_p2m_mapping()
  Xen/x86: don't bail early from clear_foreign_p2m_mapping()
  net: fix proc_fs init handling in af_packet and tls
  net: bridge: Fix a warning when del bridge sysfs
  net: openvswitch: fix TTL decrement exception action execution
  net: sched: incorrect Kconfig dependencies on Netfilter modules
  mt76: mt7615: fix rdd mcu cmd endianness
  mt76: mt7915: fix endian issues
  net/sched: fix miss init the mru in qdisc_skb_cb
  mptcp: skip to next candidate if subflow has unacked data
  net: qrtr: Fix port ID for control messages
  IB/isert: add module param to set sg_tablesize for IO cmd
  vdpa_sim: add get_config callback in vdpasim_dev_attr
  vdpa_sim: make 'config' generic and usable for any device type
  vdpa_sim: store parsed MAC address in a buffer
  vdpa_sim: add struct vdpasim_dev_attr for device attributes
  vdpa_sim: remove hard-coded virtq count
  ANDROID: sched: Exempt paused CPU from nohz idle balance
  ANDROID: Update QCOM symbol list
  ANDROID: gki_defconfig: enable CONFIG_MMC_CRYPTO
  ANDROID: mmc: cqhci: set blk_keyslot_manager::features
  UPSTREAM: mmc: sdhci-msm: add Inline Crypto Engine support
  UPSTREAM: dt-bindings: mmc: sdhci-msm: add ICE registers and clock
  UPSTREAM: firmware: qcom_scm: update comment for ICE-related functions
  UPSTREAM: mmc: cqhci: add cqhci_host_ops::program_key
  UPSTREAM: mmc: cqhci: add support for inline encryption
  UPSTREAM: mmc: cqhci: initialize upper 64 bits of 128-bit task descriptors
  UPSTREAM: mmc: cqhci: rename cqhci.c to cqhci-core.c
  UPSTREAM: mmc: core: Add basic support for inline encryption
  UPSTREAM: scsi: ufs: use devm_blk_ksm_init()
  UPSTREAM: block/keyslot-manager: introduce devm_blk_ksm_init()
  ANDROID: gki_defconfig: enable BLAKE2b support
  UPSTREAM: crypto: arm/blake2b - add NEON-accelerated BLAKE2b
  UPSTREAM: crypto: blake2b - update file comment
  UPSTREAM: crypto: blake2b - sync with blake2s implementation
  UPSTREAM: wireguard: Kconfig: select CRYPTO_BLAKE2S_ARM
  UPSTREAM: crypto: arm/blake2s - add ARM scalar optimized BLAKE2s
  UPSTREAM: crypto: blake2s - include <linux/bug.h> instead of <asm/bug.h>
  UPSTREAM: crypto: blake2s - adjust include guard naming
  UPSTREAM: crypto: blake2s - add comment for blake2s_state fields
  UPSTREAM: crypto: blake2s - optimize blake2s initialization
  UPSTREAM: crypto: blake2s - share the "shash" API boilerplate code
  UPSTREAM: crypto: blake2s - move update and final logic to internal/blake2s.h
  UPSTREAM: crypto: blake2s - remove unneeded includes
  UPSTREAM: crypto: x86/blake2s - define shash_alg structs using macros
  UPSTREAM: crypto: blake2s - define shash_alg structs using macros
  UPSTREAM: crypto: lib/blake2s - Move selftest prototype into header file
  ANDROID: vmscan: Fix sparse warnings for kswapd_threads
  ANDROID: mm: hide get_each_object_track declaration when CONFIG_SLUB=n
  FROMGIT: mm, compaction: make fast_isolate_freepages() stay within zone
  ANDROID: sched: time: Export symbols needed for schedutil module
  ANDROID: vmscan: Support multiple kswapd threads per node
  ANDROID: mm: add get_each_object_track function
  ANDROID: mm: Add vendor hook in pagecache_get_page()
  ANDROID: mm: Add vendor hook in rmqueue()
  ANDROID: GKI: Build in VIRTIO_FS
  ANDROID: dm: sync inline crypto support with patches going upstream
  ANDROID: sched: Add restricted vendor hooks in CFS scheduler
  ANDROID: drm: kirin: Remove dead code that was causing build failures
  ANDROID: adv7511: Add poweron delay to allow for EDID probing to work
  ANDROID: Add hikey960 build infrastructure file
  ANDROID: Add hikey960 GKI config fragment
  ANDROID: arm64: dts: hi3660-hikey960: Add i2s & sound device
  ANDROID: ASoC: add hikey960-i2s DT bindings
  ANDROID: sound: Add hikey960 i2s audio driver
  ANDROID: arm64: dts: hi3660: enable gpu
  ANDROID: arm64: dts: hi3660: add display driver dts
  ANDROID: arm64: dts: hikey960: Add CMA entry for DMA-BUF Heap/framebuffers
  ANDROID: drm: kirin960: Remove one mode-line that seems to be causing trouble
  ANDROID: drm: kirin: remove wait for VACTIVE IRQ
  ANDROID: drm: kirin: Add kirin960 dpe driver support
  ANDROID: drm: kirin: Introduce kirin960
  ANDROID: dts: hi3660-hikey960: Add usb mux hub for hikey960
  ANDROID: dt-bindings: misc: Add bindings for HiSilicon usb hub and data role switch functionality on HiKey960
  UPSTREAM: remoteproc: coredump: Add minidump functionality
  UPSTREAM: remoteproc: core: Add ops to enable custom coredump functionality
  ANDROID: gic-v3: Update vendor hook to set affinity in GIC v3
  ANDROID: cpuhp/aarch32: keep last 32bit cpu active

Conflicts:
	Documentation/devicetree/bindings
	Documentation/devicetree/bindings/mmc/sdhci-msm.txt
	android/abi_gki_aarch64_qcom
	net/qrtr/qrtr.c

Change-Id: I66803e82c640c2d190a03f21dc3ccf6c000d4937
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-02-26 08:52:59 -08:00
Will McVicker
da2089a28a ANDROID: modules: introduce the MODULE_SCMVERSION config
Config MODULE_SCMVERSION introduces a new module attribute --
`scmversion` -- which can be used to identify a given module's SCM
version.  This is very useful for developers that update their kernel
independently from their kernel modules or vice-versa since the SCM
version provided by UTS_RELEASE (`uname -r`) will now differ from the
module's vermagic attribute.

For example, we have a CI setup that tests new kernel changes on the
hikey960 and db845c devices without updating their kernel modules. When
these tests fail, we need to be able to identify the exact device
configuration the test was using. By including MODULE_SCMVERSION, we can
identify the exact kernel and modules' SCM versions for debugging the
failures.

Additionally, by exposing the SCM version via the sysfs node
/sys/module/MODULENAME/scmversion, one can also verify the SCM versions
of the modules loaded from the initramfs. Currently, modinfo can only
retrieve module attributes from the module's ko on disk and not from the
actual module that is loaded in RAM.

You can retrieve the SCM version in two ways,

1) By using modinfo:
    > modinfo -F scmversion MODULENAME
2) By module sysfs node:
    > cat /sys/module/MODULENAME/scmversion

Bug: 180027765
Link: https://lore.kernel.org/lkml/20210121213641.3477522-1-willmcvicker@google.com
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: Ib7c72c72f95c4545adb7cd4e842729557039ce3a
2021-02-23 16:42:21 -08:00
Ivaylo Georgiev
28da9c212b Merge android12-5.10.17 (b129c98) into msm-5.10
* refs/heads/tmp-b129c98:
  ANDROID: mm: avoid writing to read-only elements
  Linux 5.10.17
  kcov, usb: only collect coverage from __usb_hcd_giveback_urb in softirq
  ovl: expand warning in ovl_d_real()
  net/qrtr: restrict user-controlled length in qrtr_tun_write_iter()
  net/rds: restrict iovecs length for RDS_CMSG_RDMA_ARGS
  vsock: fix locking in vsock_shutdown()
  vsock/virtio: update credit only if socket is not closed
  switchdev: mrp: Remove SWITCHDEV_ATTR_ID_MRP_PORT_STAT
  bridge: mrp: Fix the usage of br_mrp_port_switchdev_set_state
  net: watchdog: hold device global xmit lock during tx disable
  net/vmw_vsock: improve locking in vsock_connect_timeout()
  net/vmw_vsock: fix NULL pointer dereference
  net: fix iteration for sctp transport seq_files
  net: gro: do not keep too many GRO packets in napi->rx_list
  cpufreq: ACPI: Update arch scale-invariance max perf ratio if CPPC is not there
  cpufreq: ACPI: Extend frequency tables to cover boost frequencies
  net: dsa: call teardown method on probe failure
  udp: fix skb_copy_and_csum_datagram with odd segment sizes
  rxrpc: Fix clearance of Tx/Rx ring when releasing a call
  arm64: mte: Allow PTRACE_PEEKMTETAGS access to the zero page
  x86/pci: Create PCI/MSI irqdomain after x86_init.pci.arch_init()
  scripts: set proper OpenSSL include dir also for sign-file
  h8300: fix PREEMPTION build, TI_PRE_COUNT undefined
  i2c: stm32f7: fix configuration of the digital filter
  clk: sunxi-ng: mp: fix parent rate change flag check
  drm/sun4i: dw-hdmi: Fix max. frequency for H6
  drm/sun4i: Fix H6 HDMI PHY configuration
  drm/sun4i: dw-hdmi: always set clock rate
  drm/sun4i: tcon: set sync polarity for tcon1 channel
  firmware_loader: align .builtin_fw to 8
  net: hns3: add a check for index in hclge_get_rss_key()
  net: hns3: add a check for tqp_index in hclge_get_ring_chain_from_mbx()
  net: hns3: add a check for queue_id in hclge_reset_vf_queue()
  net: dsa: felix: implement port flushing on .phylink_mac_link_down
  x86/build: Disable CET instrumentation in the kernel for 32-bit too
  scsi: scsi_debug: Fix a memory leak
  netfilter: conntrack: skip identical origin tuple in same zone only
  ibmvnic: Clear failover_pending if unable to schedule
  net: stmmac: set TxQ mode back to DCB after disabling CBS
  selftests: txtimestamp: fix compilation issue
  net: enetc: initialize the RFS and RSS memories
  hv_netvsc: Reset the RSC count if NVSP_STAT_FAIL in netvsc_receive()
  net: ipa: set error code in gsi_channel_setup()
  net: hdlc_x25: Return meaningful error code in x25_open
  xen/netback: avoid race in xenvif_rx_ring_slots_available()
  netfilter: flowtable: fix tcp and udp header checksum update
  netfilter: nftables: fix possible UAF over chains from packet path in netns
  selftests: netfilter: fix current year
  netfilter: xt_recent: Fix attempt to update deleted entry
  bpf: Check for integer overflow when using roundup_pow_of_two()
  bpf: Unbreak BPF_PROG_TYPE_KPROBE when kprobe is called via do_int3
  dmaengine: idxd: check device state before issue command
  drm/vc4: hvs: Fix buffer overflow with the dlist handling
  mt76: dma: fix a possible memory leak in mt76_add_fragment()
  ath9k: fix build error with LEDS_CLASS=m
  dmaengine: idxd: fix misc interrupt completion
  cgroup-v1: add disabled controller check in cgroup1_parse_param()
  KVM: x86: cleanup CR3 reserved bits checks
  lkdtm: don't move ctors to .rodata
  x86/efi: Remove EFI PGD build time checks
  Revert "lib: Restrict cpumask_local_spread to houskeeping CPUs"
  ubsan: implement __ubsan_handle_alignment_assumption
  ARM: kexec: fix oops after TLB are invalidated
  ARM: ensure the signal page contains defined contents
  kallsyms: fix nonconverging kallsyms table with lld
  ARM: dts: lpc32xx: Revert set default clock rate of HCLK PLL
  bfq-iosched: Revert "bfq: Fix computation of shallow depth"
  riscv: virt_addr_valid must check the address belongs to linear mapping
  drm/amd/display: Decrement refcount of dc_sink before reassignment
  drm/amd/display: Free atomic state after drm_atomic_commit
  drm/amd/display: Fix dc_sink kref count in emulated_link_detect
  drm/amd/display: Release DSC before acquiring
  drm/amd/display: Add more Clock Sources to DCN2.1
  drm/amd/display: Fix DPCD translation for LTTPR AUX_RD_INTERVAL
  nvme-pci: ignore the subsysem NQN on Phison E16
  x86/split_lock: Enable the split lock feature on another Alder Lake CPU
  scsi: lpfc: Fix EEH encountering oops with NVMe traffic
  ovl: skip getxattr of security labels
  cap: fix conversions on getxattr
  ovl: perform vfs_getxattr() with mounter creds
  arm64: dts: rockchip: Disable display for NanoPi R2S
  platform/x86: hp-wmi: Disable tablet-mode reporting by default
  arm64: dts: rockchip: remove interrupt-names property from rk3399 vdec node
  ARM: OMAP2+: Fix suspcious RCU usage splats for omap_enter_idle_coupled
  arm64: dts: qcom: sdm845: Reserve LPASS clocks in gcc
  arm64: dts: rockchip: Fix PCIe DT properties on rk3399
  soc: ti: omap-prm: Fix boot time errors for rst_map_012 bits 0 and 1
  tmpfs: disallow CONFIG_TMPFS_INODE64 on alpha
  tmpfs: disallow CONFIG_TMPFS_INODE64 on s390
  dmaengine: move channel device_node deletion to driver
  drm/dp_mst: Don't report ports connected if nothing is attached to them
  drm/i915/tgl+: Make sure TypeC FIA is powered up when initializing it
  Revert "drm/amd/display: Update NV1x SR latency values"
  cgroup: fix psi monitor for root cgroup
  arm/xen: Don't probe xenbus as part of an early initcall
  drm/i915: Fix overlay frontbuffer tracking
  tracing: Check length before giving out the filter buffer
  tracing: Do not count ftrace events in top level enable output
  gpio: ep93xx: Fix single irqchip with multi gpiochips
  gpio: ep93xx: fix BUG_ON port F usage
  gpio: mxs: GPIO_MXS should not default to y unconditionally
  Revert "dts: phy: add GPIO number and active state used for phy reset"
  objtool: Fix seg fault with Clang non-section symbols
  ANDROID: dma-buf: heaps: fix a warning in dmabuf page pools
  ANDROID: cfi: switch to synchronize_rcu_expedited()
  FROMGIT: kasan: clarify that only first bug is reported in HW_TAGS
  FROMGIT: kasan: inline HW_TAGS helper functions
  FROMGIT: arm64: fix warning in mte_get_random_tag()
  FROMGIT: arm64: kasan: simplify and inline MTE functions
  FROMGIT: kasan: ensure poisoning size alignment
  FROMGIT: kasan, mm: optimize krealloc poisoning
  FROMGIT: kasan, mm: fail krealloc on freed objects
  FROMGIT: kasan: rework krealloc tests
  FROMGIT: kasan: unify large kfree checks
  FROMGIT: kasan: clean up setting free info in kasan_slab_free
  FROMGIT: kasan: optimize large kmalloc poisoning
  FROMGIT: kasan, mm: optimize kmalloc poisoning
  FROMGIT: kasan, mm: don't save alloc stacks twice
  UPSTREAM: kasan: fix stack traces dependency for HW_TAGS
  UPSTREAM: kasan: make addr_has_metadata() return true for valid addresses
  UPSTREAM: kasan: add explicit preconditions to kasan_report()
  ANDROID: gki_defconfig: Enable CONFIG_PAGE_OWNER
  ANDROID: gki_defconfig: enable CONFIG_KASAN_HW_TAGS
  FROMGIT: lib: stackdepot: fix ignoring return value warning
  FROMGIT: lib: stackdepot: add support to disable stack depot
  FROMGIT: lib: stackdepot: add support to configure STACK_HASH_SIZE
  UPSTREAM: lib/stackdepot.c: use array_size() helper in jhash2()
  UPSTREAM: lib/stackdepot.c: use flex_array_size() helper in memcpy()
  UPSTREAM: lib/stackdepot.c: replace one-element array with flexible-array member
  ANDROID: build_config: drop CONFIG_KASAN_PANIC_ON_WARN
  ANDROID: sched: Export max_load_balance_interval

Conflicts:
	lib/Kconfig
	lib/stackdepot.c

Change-Id: Ie00619c0594aeaf0656f41ec94d38683372a4863
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-02-18 10:43:59 -08:00
Ivaylo Georgiev
0c808a6c34 Merge android12-5.10.16 (a6310f1) into msm-5.10
* refs/heads/tmp-a6310f1:
  Linux 5.10.16
  squashfs: add more sanity checks in xattr id lookup
  squashfs: add more sanity checks in inode lookup
  squashfs: add more sanity checks in id lookup
  squashfs: avoid out of bounds writes in decompressors
  Revert "mm: memcontrol: avoid workload stalls when lowering memory.high"
  nilfs2: make splice write available again
  drm/i915: Skip vswing programming for TBT
  drm/i915: Fix ICL MG PHY vswing handling
  bpf: Fix verifier jsgt branch analysis on max bound
  bpf: Fix 32 bit src register truncation on div/mod
  bpf: Fix verifier jmp32 pruning decision logic
  regulator: Fix lockdep warning resolving supplies
  blk-cgroup: Use cond_resched() when destroy blkgs
  i2c: mediatek: Move suspend and resume handling to NOIRQ phase
  SUNRPC: Handle 0 length opaque XDR object data properly
  SUNRPC: Move simple_get_bytes and simple_get_netobj into private header
  iwlwifi: queue: bail out on invalid freeing
  iwlwifi: mvm: guard against device removal in reprobe
  iwlwifi: pcie: add rules to match Qu with Hr2
  iwlwifi: mvm: invalidate IDs of internal stations at mvm start
  iwlwifi: pcie: fix context info memory leak
  iwlwifi: pcie: add a NULL check in iwl_pcie_txq_unmap
  iwlwifi: mvm: take mutex for calling iwl_mvm_get_sync_time()
  iwlwifi: mvm: skip power command when unbinding vif during CSA
  ASoC: Intel: sof_sdw: set proper flags for Dell TGL-H SKU 0A5E
  ASoC: ak4458: correct reset polarity
  ALSA: hda: intel-dsp-config: add PCI id for TGL-H
  pNFS/NFSv4: Improve rejection of out-of-order layouts
  pNFS/NFSv4: Try to return invalid layout in pnfs_layout_process()
  chtls: Fix potential resource leak
  ASoC: Intel: Skylake: Zero snd_ctl_elem_value
  mac80211: 160MHz with extended NSS BW in CSA
  drm/nouveau/nvif: fix method count when pushing an array
  ASoC: wm_adsp: Fix control name parsing for multi-fw
  regulator: core: avoid regulator_resolve_supply() race condition
  af_key: relax availability checks for skb size calculation
  powerpc/64/signal: Fix regression in __kernel_sigtramp_rt64() semantics
  gpiolib: cdev: clear debounce period if line set to output
  io_uring: drop mm/files between task_work_submit
  io_uring: reinforce cancel on flush during exit
  io_uring: fix sqo ownership false positive warning
  io_uring: fix list corruption for splice file_get
  io_uring: fix flush cqring overflow list while TASK_INTERRUPTIBLE
  io_uring: fix cancellation taking mutex while TASK_UNINTERRUPTIBLE
  io_uring: replace inflight_wait with tctx->wait
  io_uring: fix __io_uring_files_cancel() with TASK_UNINTERRUPTIBLE
  io_uring: if we see flush on exit, cancel related tasks
  io_uring: account io_uring internal files as REQ_F_INFLIGHT
  io_uring: fix files cancellation
  io_uring: always batch cancel in *cancel_files()
  io_uring: pass files into kill timeouts/poll
  io_uring: don't iterate io_uring_cancel_files()
  io_uring: add a {task,files} pair matching helper
  io_uring: simplify io_task_match()
  UPSTREAM: Documentation: connector: Update the description of sink-vdos
  ANDROID: GKI: enable CONFIG_FAIR_GROUP_SCHED
  Revert "ANDROID: gki_defconfig: enable CONFIG_KASAN_HW_TAGS"
  ANDROID: GKI: bring WPAN into GKI
  FROMGIT: arm64: cpufeatures: Allow disabling of Pointer Auth from the command-line
  FROMGIT: arm64: Defer enabling pointer authentication on boot core
  FROMGIT: arm64: cpufeatures: Allow disabling of BTI from the command-line
  FROMGIT: arm64: Move "nokaslr" over to the early cpufeature infrastructure
  FROMGIT: KVM: arm64: Document HVC_VHE_RESTART stub hypercall
  FROMGIT: arm64: Make kvm-arm.mode={nvhe, protected} an alias of id_aa64mmfr1.vh=0
  FROMGIT: arm64: Add an aliasing facility for the idreg override
  FROMGIT: arm64: Honor VHE being disabled from the command-line
  FROMGIT: arm64: Allow ID_AA64MMFR1_EL1.VH to be overridden from the command line
  FROMGIT: arm64: cpufeature: Add an early command-line cpufeature override facility
  FROMGIT: arm64: Extract early FDT mapping from kaslr_early_init()
  FROMGIT: arm64: cpufeature: Use IDreg override in __read_sysreg_by_encoding()
  FROMGIT: arm64: cpufeature: Add global feature override facility
  FROMGIT: arm64: Move SCTLR_EL1 initialisation to EL-agnostic code
  FROMGIT: arm64: Simplify init_el2_state to be non-VHE only
  FROMGIT: arm64: Move VHE-specific SPE setup to mutate_to_vhe()
  FROMGIT: arm64: Drop early setting of MDSCR_EL2.TPMS
  FROMGIT: arm64: Initialise as nVHE before switching to VHE
  FROMGIT: arm64: Provide an 'upgrade to VHE' stub hypercall
  FROMGIT: arm64: Turn the MMU-on sequence into a macro
  FROMGIT: arm64: Fix outdated TCR setup comment
  FROMGIT: arm64: Fix labels in el2_setup macros
  UPSTREAM: arm64: Extend the kernel command line from the bootloader
  Revert "ANDROID: arm64: copy CONFIG_CMDLINE_EXTEND from ARM"
  UPSTREAM: arm64: kaslr: Refactor early init command line parsing
  ANDROID: GKI: amlogic: add DTB overlays
  ANDROID: GKI: add support for Amlogic SoCs, everything as modules
  ANDROID: GKI: Kconfig.gki: add hidden PHY configs
  ANDROID: GKI: enable networking; add hidden network configs
  ANDROID: GKI: Enable CONFIG_CMA_DEBUGFS
  ANDROID: dmabuf: Add mmap_count to struct dmabuf
  FROMLIST: arm64: meson: remove MESON_IRQ_GPIO selection
  FROMLIST: irqchip: irq-meson-gpio: make it possible to build as a module
  UPSTREAM: tty: serial: meson: enable console as module
  UPSTREAM: arm64: Kconfig: meson: drop pinctrl
  UPSTREAM: firmware: meson-sm: enable build as module
  UPSTREAM: soc: meson: enable building drivers as modules
  UPSTREAM: soc: amlogic: socinfo: build for specific arch
  UPSTREAM: arm64: meson: ship only the necessary clock controllers
  UPSTREAM: clk: meson: enable building as modules
  UPSTREAM: clk: avoid devm_clk_release name clash
  UPSTREAM: clk: meson: g12: use devm variant to register notifiers
  UPSTREAM: clk: add devm variant of clk_notifier_register
  UPSTREAM: clk: meson: g12: drop use of __clk_lookup()
  UPSTREAM: clk: add api to get clk consumer from clk_hw
  UPSTREAM: reset: meson: make it possible to build as a module
  UPSTREAM: pinctrl/meson: enable building as modules
  BACKPORT: FROMGIT: mm: filemap: Fix microblaze build failure with 'mmu_defconfig'
  BACKPORT: FROMGIT:  mm/nommu: Fix return type of filemap_map_pages()
  BACKPORT: FROMGIT:  Mark anonymous struct field of 'struct vm_fault' as 'const'
  BACKPORT: FROMGIT: mm: Use static initialisers for immutable fields of 'struct vm_fault'
  BACKPORT: FROMGIT: mm: Avoid modifying vmf.address in __collapse_huge_page_swapin()
  BACKPORT: FROMGIT: mm: Pass 'address' to map to do_set_pte() and drop FAULT_FLAG_PREFAULT
  BACKPORT: FROMGIT: mm: Move immutable fields of 'struct vm_fault' into anonymous struct
  BACKPORT: FROMGIT: arm64: mm: Implement arch_wants_old_prefaulted_pte()
  BACKPORT: FROMGIT:  mm: Allow architectures to request 'old' entries when prefaulting
  BACKPORT: FROMGIT: mm: Cleanup faultaround and finish_fault() codepaths
  UPSTREAM: regulator: Fix lockdep warning resolving supplies
  UPSTREAM: regulator: core: avoid regulator_resolve_supply() race condition
  ANDROID: Add EXPORT_SYMBOL_GPL for dma_heap_get_name
  FROMLIST: dma-buf: heaps: Fix the name used when exporting dmabufs to be the actual heap name
  BACKPORT: FROMLIST: dma-buf: dma-heap: Provide accessor to get heap name
  FROMLIST: BACKPORT: procfs/dmabuf: Add inode number to /proc/*/fdinfo
  FROMLIST: procfs: Allow reading fdinfo with PTRACE_MODE_READ
  FROMGIT: sched/deadline: Reduce rq lock contention in dl_add_task_root_domain()

Conflicts:
	Documentation/devicetree/bindings
	Documentation/devicetree/bindings/connector/usb-connector.yaml

Change-Id: Ife47d25dbe24585c11ba139ab884115edeeda4c9
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-02-16 15:18:32 -08:00
Ivaylo Georgiev
0fc19ea22d Merge android12-5.10.15 (1092f69) into msm-5.10
* refs/heads/tmp-1092f69:
  Linux 5.10.15
  net: sched: replaced invalid qdisc tree flush helper in qdisc_replace
  net: dsa: mv88e6xxx: override existent unicast portvec in port_fdb_add
  udp: ipv4: manipulate network header of NATed UDP GRO fraglist
  net: ip_tunnel: fix mtu calculation
  neighbour: Prevent a dead entry from updating gc_list
  igc: Report speed and duplex as unknown when device is runtime suspended
  md: Set prev_flush_start and flush_bio in an atomic way
  Input: ili210x - implement pressure reporting for ILI251x
  Input: xpad - sync supported devices with fork on GitHub
  Input: goodix - add support for Goodix GT9286 chip
  x86/apic: Add extra serialization for non-serializing MSRs
  x86/debug: Prevent data breakpoints on cpu_dr7
  x86/debug: Prevent data breakpoints on __per_cpu_offset
  x86/debug: Fix DR6 handling
  x86/build: Disable CET instrumentation in the kernel
  mm/filemap: add missing mem_cgroup_uncharge() to __add_to_page_cache_locked()
  mm: thp: fix MADV_REMOVE deadlock on shmem THP
  mm/vmalloc: separate put pages and flush VM flags
  mm, compaction: move high_pfn to the for loop scope
  mm: hugetlb: remove VM_BUG_ON_PAGE from page_huge_active
  mm: hugetlb: fix a race between isolating and freeing page
  mm: hugetlb: fix a race between freeing and dissolving the page
  mm: hugetlbfs: fix cannot migrate the fallocated HugeTLB page
  ARM: 9043/1: tegra: Fix misplaced tegra_uart_config in decompressor
  ARM: footbridge: fix dc21285 PCI configuration accessors
  ARM: dts; gta04: SPI panel chip select is active low
  DTS: ARM: gta04: remove legacy spi-cs-high to make display work again
  KVM: x86: Set so called 'reserved CR3 bits in LM mask' at vCPU reset
  KVM: x86: Update emulator context mode if SYSENTER xfers to 64-bit mode
  KVM: x86: fix CPUID entries returned by KVM_GET_CPUID2 ioctl
  KVM: x86: Allow guests to see MSR_IA32_TSX_CTRL even if tsx=off
  KVM: x86/mmu: Fix TDP MMU zap collapsible SPTEs
  KVM: SVM: Treat SVM as unsupported when running as an SEV guest
  nvme-pci: avoid the deepest sleep state on Kingston A2000 SSDs
  io_uring: don't modify identity's files uncess identity is cowed
  drm/amd/display: Revert "Fix EDID parsing after resume from suspend"
  drm/i915: Power up combo PHY lanes for for HDMI as well
  drm/i915: Extract intel_ddi_power_up_lanes()
  drm/i915/display: Prevent double YUV range correction on HDR planes
  drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs
  drm/i915/gem: Drop lru bumping on display unpinning
  drm/i915: Fix the MST PBN divider calculation
  drm/dp/mst: Export drm_dp_get_vc_payload_bw()
  Fix unsynchronized access to sev members through svm_register_enc_region
  mmc: core: Limit retries when analyse of SDIO tuples fails
  mmc: sdhci-pltfm: Fix linking err for sdhci-brcmstb
  smb3: fix crediting for compounding when only one request in flight
  smb3: Fix out-of-bounds bug in SMB2_negotiate()
  iommu: Check dev->iommu in dev_iommu_priv_get() before dereferencing it
  cifs: report error instead of invalid when revalidating a dentry fails
  RISC-V: Define MAXPHYSMEM_1GB only for RV32
  xhci: fix bounce buffer usage for non-sg list case
  scripts: use pkg-config to locate libcrypto
  genirq/msi: Activate Multi-MSI early when MSI_FLAG_ACTIVATE_EARLY is set
  genirq: Prevent [devm_]irq_alloc_desc from returning irq 0
  libnvdimm/dimm: Avoid race between probe and available_slots_show()
  libnvdimm/namespace: Fix visibility of namespace resource attribute
  tracepoint: Fix race between tracing and removing tracepoint
  tracing: Use pause-on-trace with the latency tracers
  kretprobe: Avoid re-registration of the same kretprobe earlier
  tracing/kprobe: Fix to support kretprobe events on unloaded modules
  fgraph: Initialize tracing_graph_pause at task creation
  gpiolib: free device name on error path to fix kmemleak
  mac80211: fix station rate table updates on assoc
  ovl: implement volatile-specific fsync error behaviour
  ovl: avoid deadlock on directory ioctl
  ovl: fix dentry leak in ovl_get_redirect
  thunderbolt: Fix possible NULL pointer dereference in tb_acpi_add_link()
  kbuild: fix duplicated flags in DEBUG_CFLAGS
  memblock: do not start bottom-up allocations with kernel_end
  vdpa/mlx5: Restore the hardware used index after change map
  nvmet-tcp: fix out-of-bounds access when receiving multiple h2cdata PDUs
  ARM: dts: sun7i: a20: bananapro: Fix ethernet phy-mode
  net: ipa: pass correct dma_handle to dma_free_coherent()
  r8169: fix WoL on shutdown if CONFIG_DEBUG_SHIRQ is set
  net: mvpp2: TCAM entry enable should be written after SRAM data
  net: lapb: Copy the skb before sending a packet
  net/mlx5e: Release skb in case of failure in tc update skb
  net/mlx5e: Update max_opened_tc also when channels are closed
  net/mlx5: Fix leak upon failure of rule creation
  net/mlx5: Fix function calculation for page trees
  ibmvnic: device remove has higher precedence over reset
  i40e: Revert "i40e: don't report link up for a VF who hasn't enabled queues"
  igc: check return value of ret_val in igc_config_fc_after_link_up
  igc: set the default return value to -IGC_ERR_NVM in igc_write_nvm_srwr
  SUNRPC: Fix NFS READs that start at non-page-aligned offsets
  arm64: dts: ls1046a: fix dcfg address range
  rxrpc: Fix deadlock around release of dst cached on udp tunnel
  r8169: work around RTL8125 UDP hw bug
  arm64: dts: meson: switch TFLASH_VDD_EN pin to open drain on Odroid-C4
  bpf, preload: Fix build when $(O) points to a relative path
  um: virtio: free vu_dev only with the contained struct device
  bpf, inode_storage: Put file handler if no storage was found
  bpf, cgroup: Fix problematic bounds check
  bpf, cgroup: Fix optlen WARN_ON_ONCE toctou
  vdpa/mlx5: Fix memory key MTT population
  ARM: dts: stm32: Fix GPIO hog flags on DHCOM DRC02
  ARM: dts: stm32: Disable optional TSC2004 on DRC02 board
  ARM: dts: stm32: Disable WP on DHCOM uSD slot
  ARM: dts: stm32: Connect card-detect signal on DHCOM
  ARM: dts: stm32: Fix polarity of the DH DRC02 uSD card detect
  arm64: dts: rockchip: Use only supported PCIe link speed on Pinebook Pro
  arm64: dts: rockchip: fix vopl iommu irq on px30
  arm64: dts: amlogic: meson-g12: Set FL-adj property value
  Input: i8042 - unbreak Pegatron C15B
  arm64: dts: qcom: c630: keep both touchpad devices enabled
  ARM: OMAP1: OSK: fix ohci-omap breakage
  usb: xhci-mtk: break loop when find the endpoint to drop
  usb: xhci-mtk: skip dropping bandwidth of unchecked endpoints
  usb: xhci-mtk: fix unreleased bandwidth data
  usb: dwc3: fix clock issue during resume in OTG mode
  usb: dwc2: Fix endpoint direction check in ep_from_windex
  usb: renesas_usbhs: Clear pipe running flag in usbhs_pkt_pop()
  USB: usblp: don't call usb_set_interface if there's a single alt
  usb: gadget: aspeed: add missing of_node_put
  USB: gadget: legacy: fix an error code in eth_bind()
  usb: host: xhci: mvebu: make USB 3.0 PHY optional for Armada 3720
  USB: serial: option: Adding support for Cinterion MV31
  USB: serial: cp210x: add new VID/PID for supporting Teraoka AD2000
  USB: serial: cp210x: add pid/vid for WSDA-200-USB
  ANDROID: db845c: Use FRAGMENT_CONFIG
  ANDROID: gki_defconfig: enable CONFIG_KASAN_HW_TAGS
  ANDROID: x86/mm: fix vm_area_struct leak in speculative pagefault handling
  ANDROID: iommu: Add vendor hook
  ANDROID: abi_gki_aarch64_db845c: KMI update for dmabuf heaps deferred-free/pagepool functionality
  ANDROID: dma-buf: system_heap: Add deferred freeing to the system heap
  ANDROID: dma-buf: system_heap: Add pagepool support to system heap
  ANDROID: dma-buf: heaps: Add a shrinker controlled page pool
  ANDROID: dma-buf: heaps: Add deferred-free-helper library code
  ANDROID: sched: Fix wake_q length tracking
  ANDROID: GKI: update .xml file
  ANDROID: net: introduce ip_local_unbindable_ports sysctl
  UPSTREAM: dt-bindings: connector: Add SVDM VDO properties
  UPSTREAM: dt-bindings: connector: Add property to set initial current cap for FRS
  UPSTREAM: usb: typec: tcpm: Get Sink VDO from fwnode
  UPSTREAM: usb: typec: displayport: Fill the negotiated SVDM Version in the header
  UPSTREAM: usb: typec: ucsi: Determine common SVDM Version
  UPSTREAM: usb: typec: tcpm: Determine common SVDM Version
  UPSTREAM: usb: pd: Make SVDM Version configurable in VDM header
  UPSTREAM: usb: typec: Manage SVDM version
  UPSTREAM: usb: dwc3: gadget: Fix dep->interval for fullspeed interrupt
  UPSTREAM: usb: dwc3: gadget: Fix setting of DEPCFG.bInterval_m1
  Revert "ANDROID: configs: GKI: disable ARMv8.3 PAC"

Conflicts:
	Documentation/devicetree/bindings
	Documentation/devicetree/bindings/connector/usb-connector.yaml

Change-Id: I0191f30199dd8929c37159b0c6977f51fc4e9bcb
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-02-16 15:09:33 -08:00
Ivaylo Georgiev
2a3dbbd786 Merge android12-5.10.14 (d0d8327) into msm-5.10
* refs/heads/tmp-d0d8327:
  ANDROID: mm/memory_hotplug: fix check for proper subsection removal
  Revert "FROMLIST: dt-bindings: reserved-memory: Make DMA-BUF CMA heap DT-configurable"
  Revert "FROMLIST: dma-buf: heaps: add chunk heap to dmabuf heaps"
  ANDROID: gki_defconfig: Enable NL80211_TESTMODE
  UPSTREAM: dt-binding: usb: Include USB SSP rates in GenXxY
  UPSTREAM: dt-bindings: usb: Add generic "usb-phy" property
  UPSTREAM: dt-bindings: usb: Add "ulpi/serial/hsic" PHY types
  UPSTREAM: dt-bindings: usb: Convert generic USB properties to DT schemas
  UPSTREAM: dt-bindings: usb: usb-hcd: Detach generic USB controller properties
  UPSTREAM: usb: dwc3: gadget: Set speed only up to the max supported
  UPSTREAM: usb: dwc3: gadget: Track connected SSP rate and lane count
  UPSTREAM: usb: dwc3: gadget: Implement setting of SSP rate
  UPSTREAM: usb: dwc3: core: Check maximum_speed SSP genXxY
  UPSTREAM: usb: common: Parse for USB SSP genXxY
  FROMGIT: kasan: untag addresses for KFENCE
  BACKPORT: kasan: remove redundant config option
  FROMGIT: kasan: don't run tests when KASAN is not enabled
  FROMGIT: kasan: add a test for kmem_cache_alloc/free_bulk
  FROMGIT: kasan: add proper page allocator tests
  FROMGIT: kasan: fix bug detection via ksize for HW_TAGS mode
  FROMGIT: kasan: move _RET_IP_ to inline wrappers
  FROMGIT: kasan: fix memory corruption in kasan_bitops_tags test
  FROMGIT: kasan: adapt kmalloc_uaf2 test to HW_TAGS mode
  FROMGIT: kasan: add compiler barriers to KUNIT_EXPECT_KASAN_FAIL
  FROMGIT: kasan: rename CONFIG_TEST_KASAN_MODULE
  FROMGIT: kasan, arm64: allow using KUnit tests with HW_TAGS mode
  FROMGIT: kasan: add match-all tag tests
  FROMGIT: kasan: add macros to simplify checking test constraints
  FROMGIT: kasan: clean up comments in tests
  FROMGIT: kasan: clarify HW_TAGS impact on TBI
  FROMGIT: kasan: prefix global functions with kasan_
  Linux 5.10.14
  workqueue: Restrict affinity change to rescuer
  kthread: Extract KTHREAD_IS_PER_CPU
  x86/cpu: Add another Alder Lake CPU to the Intel family
  objtool: Don't fail the kernel build on fatal errors
  habanalabs: disable FW events on device removal
  habanalabs: fix backward compatibility of idle check
  habanalabs: zero pci counters packet before submit to FW
  drm/amd/display: Fixed corruptions on HPDRX link loss restore
  drm/amd/display: Use hardware sequencer functions for PG control
  drm/amd/display: Change function decide_dp_link_settings to avoid infinite looping
  drm/amd/display: Allow PSTATE chnage when no displays are enabled
  drm/amd/display: Update dram_clock_change_latency for DCN2.1
  selftests/powerpc: Only test lwm/stmw on big endian
  platform/x86: thinkpad_acpi: Add P53/73 firmware to fan_quirk_table for dual fan control
  nvmet: set right status on error in id-ns handler
  nvme-pci: allow use of cmb on v1.4 controllers
  nvme-tcp: avoid request double completion for concurrent nvme_tcp_timeout
  nvme-rdma: avoid request double completion for concurrent nvme_rdma_timeout
  nvme: check the PRINFO bit before deciding the host buffer length
  udf: fix the problem that the disc content is not displayed
  i2c: tegra: Create i2c_writesl_vi() to use with VI I2C for filling TX FIFO
  ALSA: hda: Add Cometlake-R PCI ID
  scsi: ibmvfc: Set default timeout to avoid crash during migration
  mac80211: fix encryption key selection for 802.3 xmit
  mac80211: fix fast-rx encryption check
  mac80211: fix incorrect strlen of .write in debugfs
  objtool: Don't add empty symbols to the rbtree
  ALSA: hda: Add AlderLake-P PCI ID and HDMI codec vid
  ASoC: SOF: Intel: hda: Resume codec to do jack detection
  scsi: fnic: Fix memleak in vnic_dev_init_devcmd2
  scsi: libfc: Avoid invoking response handler twice if ep is already completed
  scsi: scsi_transport_srp: Don't block target in failfast state
  x86: __always_inline __{rd,wr}msr()
  locking/lockdep: Avoid noinstr warning for DEBUG_LOCKDEP
  habanalabs: fix dma_addr passed to dma_mmap_coherent
  platform/x86: intel-vbtn: Support for tablet mode on Dell Inspiron 7352
  platform/x86: touchscreen_dmi: Add swap-x-y quirk for Goodix touchscreen on Estar Beauty HD tablet
  tools/power/x86/intel-speed-select: Set higher of cpuinfo_max_freq or base_frequency
  tools/power/x86/intel-speed-select: Set scaling_max_freq to base_frequency
  phy: cpcap-usb: Fix warning for missing regulator_disable
  iommu/vt-d: Do not use flush-queue when caching-mode is on
  ARM: 9025/1: Kconfig: CPU_BIG_ENDIAN depends on !LD_IS_LLD
  Revert "x86/setup: don't remove E820_TYPE_RAM for pfn 0"
  arm64: Do not pass tagged addresses to __is_lm_address()
  arm64: Fix kernel address detection of __is_lm_address()
  arm64: dts: meson: Describe G12b GPU as coherent
  drm/panfrost: Support cache-coherent integrations
  iommu/io-pgtable-arm: Support coherency for Mali LPAE
  ibmvnic: Ensure that CRQ entry read are correctly ordered
  net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP
  net: dsa: bcm_sf2: put device node before return
  mlxsw: spectrum_span: Do not overwrite policer configuration
  stmmac: intel: Configure EHL PSE0 GbE and PSE1 GbE to 32 bits DMA addressing
  net: octeontx2: Make sure the buffer is 128 byte aligned
  net: fec: put child node on error path
  net: stmmac: dwmac-intel-plat: remove config data on error
  net: dsa: microchip: Adjust reset release timing to match reference reset circuit
  ANDROID: usb: gadget: configfs: Move CONFIGFS_UEVENT #endif
  ANDROID: GKI: Enable KFENCE
  FROMGIT: KVM: arm64: Move __hyp_set_vectors out of .hyp.text
  FROMGIT: KVM: arm64: Stub EXPORT_SYMBOL for nVHE EL2 code
  FROMGIT: asm-generic: export: Stub EXPORT_SYMBOL with __DISABLE_EXPORTS
  FROMGIT: KVM: arm64: Correct spelling of DBGDIDR register
  FROMGIT: KVM: arm64: Use symbolic names for the PMU versions
  FROMGIT: KVM: arm64: Upgrade PMU support to ARMv8.4
  FROMGIT: KVM: arm64: Limit the debug architecture to ARMv8.0
  FROMGIT: KVM: arm64: Refactor filtering of ID registers
  FROMGIT: KVM: arm64: Add handling of AArch32 PCMEID{2,3} PMUv3 registers
  FROMGIT: KVM: arm64: Fix AArch32 PMUv3 capping
  FROMGIT: KVM: arm64: Fix missing RES1 in emulation of DBGBIDR
  FROMGIT: KVM: arm64: Make gen-hyprel endianness agnostic
  FROMGIT: KVM: arm64: Implement the TRNG hypervisor call
  FROMGIT: KVM: arm64: Mark the page dirty only if the fault is handled successfully
  FROMGIT: KVM: arm64: Filter out the case of only changing permissions from stage-2 map path
  FROMGIT: KVM: arm64: Adjust partial code of hyp stage-1 map and guest stage-2 map
  FROMGIT: KVM: arm64: Simplify __kvm_hyp_init HVC detection
  FROMGIT: KVM: arm64: Remove hyp_symbol_addr
  FROMGIT: KVM: arm64: Remove patching of fn pointers in hyp
  FROMGIT: KVM: arm64: Fix constant-pool users in hyp
  FROMGIT: KVM: arm64: Apply hyp relocations at runtime
  FROMGIT: KVM: arm64: Generate hyp relocation data
  FROMGIT: KVM: arm64: Add symbol at the beginning of each hyp section
  FROMGIT: KVM: arm64: Set up .hyp.rodata ELF section
  FROMGIT: KVM: arm64: Rename .idmap.text in hyp linker script
  FROMGIT: firmware: smccc: Add SMCCC TRNG function call IDs
  BACKPORT: arm64: Work around broken GCC 4.9 handling of "S" constraint
  FROMGIT: kasan: use error_report_end tracepoint
  FROMGIT: kfence: use error_report_end tracepoint
  FROMGIT: tracing: add error_report_end trace point
  FROMGIT: kfence: show access type in report
  FROMGIT: kfence: fix typo in test
  FROMGIT: kfence: add test suite
  FROMGIT: kfence: add missing copyright header to documentation
  FROMGIT: kfence, Documentation: add KFENCE documentation
  FROMGIT: kfence, kasan: make KFENCE compatible with KASAN
  FROMGIT: mm, kfence: insert KFENCE hooks for SLUB
  BACKPORT: mm, kfence: insert KFENCE hooks for SLAB
  FROMGIT: mm/slab: rerform init_on_free earlier
  FROMGIT: kfence: use pt_regs to generate stack trace on faults
  FROMGIT: kfence, arm64: add missing copyright and description header
  FROMGIT: arm64, kfence: enable KFENCE for ARM64
  FROMGIT: kfence, x86: add missing copyright and description header
  FROMGIT: x86, kfence: enable KFENCE for x86
  FROMGIT: kfence: add missing copyright and description headers
  FROMGIT: kfence: add option to use KFENCE without static keys
  FROMGIT: kfence: fix potential deadlock due to wake_up()
  FROMGIT: kfence: avoid stalling work queue task without allocations
  FROMGIT: kfence: Fix parameter description for kfence_object_start()
  BACKPORT: mm: add Kernel Electric-Fence infrastructure
  FROMLIST: fuse: Fix crediantials leak in passthrough read_iter
  UPSTREAM: userfaultfd: add user-mode only option to unprivileged_userfaultfd sysctl knob
  UPSTREAM: userfaultfd: add UFFD_USER_MODE_ONLY
  UPSTREAM: userfaultfd: use secure anon inodes for userfaultfd
  BACKPORT: selinux: teach SELinux about anonymous inodes
  UPSTREAM: fs: add LSM-supporting anon-inode interface
  UPSTREAM: security: add inode_init_security_anon() LSM hook
  UPSTREAM: cfg80211: Add support to calculate and report 4096-QAM HE rates
  UPSTREAM: cfg80211: Add support to configure SAE PWE value to drivers
  UPSTREAM: usb: dwc3: fix clock issue during resume in OTG mode

Conflicts:
	Documentation/devicetree/bindings
	Documentation/devicetree/bindings/usb/usb-hcd.yaml
	drivers/dma-buf/heaps/Kconfig
	drivers/dma-buf/heaps/Makefile

Change-Id: I3726725889da6ae622c1e319388831e7f99d14c5
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-02-16 13:52:48 -08:00
Ivaylo Georgiev
75dc4d9433 Merge android12-5.10.13 (cf5b248) into msm-5.10
* refs/heads/tmp-cf5b248:
  BACKPORT: FROMLIST: arm64: Remove logic to kill 32-bit tasks on 64-bit-only cores
  FROMLIST: arm64: Hook up cmdline parameter to allow mismatched 32-bit EL0
  FROMLIST: arm64: Prevent offlining first CPU with 32-bit EL0 on mismatched system
  FROMLIST: arm64: exec: Adjust affinity for compat tasks with mismatched 32-bit EL0
  FROMLIST: arm64: Implement task_cpu_possible_mask()
  FROMLIST: sched: Introduce force_compatible_cpus_allowed_ptr() to limit CPU affinity
  FROMLIST: sched: Reject CPU affinity changes based on task_cpu_possible_mask()
  BACKPORT: FROMLIST: cpuset: Honour task_cpu_possible_mask() in guarantee_online_cpus()
  FROMLIST: cpuset: Don't use the cpu_possible_mask as a last resort for cgroup v1
  FROMLIST: sched: Introduce task_cpu_possible_mask() to limit fallback rq selection
  FROMLIST: arm64: Advertise CPUs capable of running 32-bit applications in sysfs
  BACKPORT: FROMLIST: arm64: Kill 32-bit applications scheduled on 64-bit-only CPUs
  FROMLIST: KVM: arm64: Kill 32-bit vCPUs on systems with mismatched EL0 support
  BACKPORT: FROMLIST: arm64: Allow mismatched 32-bit EL0 support
  FROMLIST: arm64: cpuinfo: Split AArch32 registers out into a separate struct
  Revert "ANDROID: arm64: Add support for asymmetric AArch32 EL0 configurations"
  Revert "ANDROID: arm64: Handle AArch32 tasks running on non AArch32 cpu"
  Revert "ANDROID: arm64: Disallow offlining the last aarch32 cpu"
  Revert "ANDROID: arm64: kvm: Hide asym aarch32 systems from KVM"
  Revert "ANDROID: arm64: Enable KVM for Asym AArch32"
  ANDROID: gki_defconfig: Remove CONFIG_ASYMMETRIC_AARCH32=y
  UPSTREAM: usb: pd: Reland VDO definitions of PD2.0
  ANDROID: sched: Add PELT cmdline arg
  ANDROID: psci: use __pa_function for cpu_resume
  ANDROID: arm64: kernel: use __pa_function for secondary_entry
  ANDROID: arm64: add vendor hooks for kernel fault cases
  ANDROID: sched: add vendor hooks for bad scheduling
  ANDROID: power: add vendor hooks for try_to_freeze fail
  ANDROID: softlockup: add vendor hook for a softlockup task
  ANDROID: Fix sparse warning in __handle_speculative_fault caused by SPF
  ANDROID: mm, oom: Fix select_bad_process customization
  ANDROID: mm: sync rss in speculative page fault path
  ANDROID: GKI: Update ABI XML report
  ANDROID: dma-buf: heaps: Add a sysfs file to report total pool size.
  ANDROID: GKI: enable CONFIG_USB_DUMMY_HCD
  ANDROID: GKI: Update ABI XML report
  ANDROID: GKI: defconfig: Enable DMA-BUF sysfs stats
  ANDROID: zram: allow zram to allocate CMA pages
  Linux 5.10.13
  vsock: fix the race conditions in multi-transport support
  tcp: fix TLP timer not set when CA_STATE changes from DISORDER to OPEN
  tcp: make TCP_USER_TIMEOUT accurate for zero window probes
  team: protect features update by RCU to avoid deadlock
  scsi: qla2xxx: Fix description for parameter ql2xenforce_iocb_limit
  ASoC: topology: Fix memory corruption in soc_tplg_denum_create_values()
  ASoC: topology: Properly unregister DAI on removal
  ASoC: mediatek: mt8183-mt6358: ignore TDM DAI link by default
  ASoC: mediatek: mt8183-da7219: ignore TDM DAI link by default
  NFC: fix possible resource leak
  NFC: fix resource leak when target index is invalid
  rxrpc: Fix memory leak in rxrpc_lookup_local
  selftests: forwarding: Specify interface when invoking mausezahn
  nvme-multipath: Early exit if no path is available
  iommu/vt-d: Correctly check addr alignment in qi_flush_dev_iotlb_pasid()
  iommu/amd: Use IVHD EFR for early initialization of IOMMU features
  of/device: Update dma_range_map only when dev has valid dma-ranges
  ACPI/IORT: Do not blindly trust DMA masks from firmware
  can: dev: prevent potential information leak in can_fill_info()
  net/mlx5: CT: Fix incorrect removal of tuple_nat_node from nat rhashtable
  net/mlx5e: Revert parameters on errors when changing MTU and LRO state without reset
  net/mlx5e: Revert parameters on errors when changing trust state without reset
  net/mlx5e: Correctly handle changing the number of queues when the interface is down
  net/mlx5e: Fix CT rule + encap slow path offload and deletion
  net/mlx5e: Disable hw-tc-offload when MLX5_CLS_ACT config is disabled
  net/mlx5: Maintain separate page trees for ECPF and PF functions
  net/mlx5e: Reduce tc unsupported key print level
  net/mlx5e: free page before return
  net/mlx5e: E-switch, Fix rate calculation for overflow
  net/mlx5: Fix memory leak on flow table creation error flow
  igc: fix link speed advertising
  i40e: acquire VSI pointer only after VF is initialized
  ice: Fix MSI-X vector fallback logic
  ice: Don't allow more channels than LAN MSI-X available
  ice: update dev_addr in ice_set_mac_address even if HW filter exists
  ice: Implement flow for IPv6 next header (extension header)
  ice: fix FDir IPv6 flexbyte
  mac80211: pause TX while changing interface type
  iwlwifi: pcie: reschedule in long-running memory reads
  iwlwifi: pcie: use jiffies for memory read spin time limit
  iwlwifi: pcie: set LTR on more devices
  iwlwifi: pnvm: don't try to load after failures
  iwlwifi: pnvm: don't skip everything when not reloading
  iwlwifi: pcie: avoid potential PNVM leaks
  ASoC: qcom: lpass: Fix out-of-bounds DAI ID lookup
  ASoC: SOF: Intel: soundwire: fix select/depend unmet dependencies
  pNFS/NFSv4: Update the layout barrier when we schedule a layoutreturn
  pNFS/NFSv4: Fix a layout segment leak in pnfs_layout_process()
  powerpc/64s: prevent recursive replay_soft_interrupts causing superfluous interrupt
  ASoC: Intel: Skylake: skl-topology: Fix OOPs ib skl_tplg_complete
  spi: altera: Fix memory leak on error path
  ASoC: qcom: lpass-ipq806x: fix bitwidth regmap field
  ASoC: qcom: Fix broken support to MI2S TERTIARY and QUATERNARY
  ASoC: qcom: Fix incorrect volatile registers
  ASoC: dt-bindings: lpass: Fix and common up lpass dai ids
  RDMA/cxgb4: Fix the reported max_recv_sge value
  firmware: imx: select SOC_BUS to fix firmware build
  arm64: dts: imx8mp: Correct the gpio ranges of gpio3
  ARM: dts: imx6qdl-sr-som: fix some cubox-i platforms
  ARM: dts: imx6qdl-kontron-samx6i: fix i2c_lcd/cam default status
  ARM: imx: fix imx8m dependencies
  arm64: dts: ls1028a: fix the offset of the reset register
  xfrm: Fix wraparound in xfrm_policy_addr_delta()
  selftests: xfrm: fix test return value override issue in xfrm_policy.sh
  xfrm: fix disable_xfrm sysctl when used on xfrm interfaces
  xfrm: Fix oops in xfrm_replay_advance_bmp
  Revert "block: simplify set_init_blocksize" to regain lost performance
  Revert "RDMA/mlx5: Fix devlink deadlock on net namespace deletion"
  netfilter: nft_dynset: add timeout extension to template
  ARM: zImage: atags_to_fdt: Fix node names on added root nodes
  ARM: imx: build suspend-imx6.S with arm instruction set
  clk: qcom: gcc-sm250: Use floor ops for sdcc clks
  clk: mmp2: fix build without CONFIG_PM
  clk: imx: fix Kconfig warning for i.MX SCU clk
  blk-mq: test QUEUE_FLAG_HCTX_ACTIVE for sbitmap_shared in hctx_may_queue
  xen-blkfront: allow discard-* nodes to be optional
  tee: optee: replace might_sleep with cond_resched
  KVM: Documentation: Fix spec for KVM_CAP_ENABLE_CAP_VM
  uapi: fix big endian definition of ipv6_rpl_sr_hdr
  drm/i915/selftest: Fix potential memory leak
  drm/i915: Check for all subplatform bits
  drm/nouveau/dispnv50: Restore pushing of all data.
  drm/vc4: Correct POS1_SCL for hvs5
  drm/vc4: Correct lbm size and calculation
  drm/nouveau/svm: fail NOUVEAU_SVM_INIT ioctl on unsupported devices
  ARM: dts: imx6qdl-kontron-samx6i: fix pwms for lcd-backlight
  net/mlx5e: Fix IPSEC stats
  drm/i915/pmu: Don't grab wakeref when enabling events
  drm/i915/gt: Clear CACHE_MODE prior to clearing residuals
  iwlwifi: Fix IWL_SUBDEVICE_NO_160 macro to use the correct bit.
  mt7601u: fix rx buffer refcounting
  mt76: mt7663s: fix rx buffer refcounting
  mt7601u: fix kernel crash unplugging the device
  arm64: dts: broadcom: Fix USB DMA address translation for Stingray
  leds: trigger: fix potential deadlock with libata
  xen: Fix XenStore initialisation for XS_LOCAL
  io_uring: fix wqe->lock/completion_lock deadlock
  KVM: Forbid the use of tagged userspace addresses for memslots
  KVM: x86: get smi pending status correctly
  KVM: nVMX: Sync unsync'd vmcs02 state to vmcs12 on migration
  KVM: x86: allow KVM_REQ_GET_NESTED_STATE_PAGES outside guest mode for VMX
  KVM: nSVM: cancel KVM_REQ_GET_NESTED_STATE_PAGES on nested vmexit
  KVM: arm64: Filter out v8.1+ events on v8.0 HW
  KVM: x86/pmu: Fix UBSAN shift-out-of-bounds warning in intel_pmu_refresh()
  KVM: x86/pmu: Fix HW_REF_CPU_CYCLES event pseudo-encoding in intel_arch_events[]
  btrfs: fix possible free space tree corruption with online conversion
  btrfs: fix lockdep warning due to seqcount_mutex on 32bit arch
  drivers: soc: atmel: add null entry at the end of at91_soc_allowed_list[]
  drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs
  crypto: marvel/cesa - Fix tdma descriptor on 64-bit
  efi/apple-properties: Reinstate support for boolean properties
  x86/entry: Emit a symbol for register restoring thunk
  PM: hibernate: flush swap writer after marking
  s390/vfio-ap: No need to disable IRQ after queue reset
  s390: uv: Fix sysfs max number of VCPUs reporting
  net: usb: qmi_wwan: added support for Thales Cinterion PLSx3 modem family
  bcache: only check feature sets when sb->version >= BCACHE_SB_VERSION_CDEV_WITH_FEATURES
  drivers/nouveau/kms/nv50-: Reject format modifiers for cursor planes
  drm/i915/gt: Always try to reserve GGTT address 0x0
  drm/i915: Always flush the active worker before returning from the wait
  drm/nouveau/kms/gk104-gp1xx: Fix > 64x64 cursors
  Revert "drm/amdgpu/swsmu: drop set_fan_speed_percent (v2)"
  ASoC: AMD Renoir - refine DMI entries for some Lenovo products
  x86/xen: avoid warning in Xen pv guest with CONFIG_AMD_MEM_ENCRYPT enabled
  wext: fix NULL-ptr-dereference with cfg80211's lack of commit()
  ARM: dts: imx6qdl-gw52xx: fix duplicate regulator naming
  ARM: dts: ux500: Reserve memory carveouts
  ARM: dts: tbs2910: rename MMC node aliases
  media: rc: ensure that uevent can be read directly after rc device register
  media: rc: ite-cir: fix min_timeout calculation
  media: rc: fix timeout handling after switch to microsecond durations
  media: hantro: Fix reset_raw_fmt initialization
  media: cedrus: Fix H264 decoding
  media: cec: add stm32 driver
  parisc: Enable -mlong-calls gcc option by default when !CONFIG_MODULES
  ALSA: hda/via: Apply the workaround generically for Clevo machines
  ALSA: hda/realtek: Enable headset of ASUS B1400CEPE with ALC256
  kernel: kexec: remove the lock operation of system_transition_mutex
  ACPI: thermal: Do not call acpi_thermal_check() directly
  ACPI: sysfs: Prefer "compatible" modalias
  tty: avoid using vfs_iocb_iter_write() for redirected console writes
  nbd: freeze the queue while we're adding connections
  iwlwifi: provide gso_type to GSO packets
  ANDROID: Add filp_open_block() for zram
  UPSTREAM: usb: pd: Update VDO definitions
  UPSTREAM: xhci: fix bounce buffer usage for non-sg list case
  UPSTREAM: usb: host: xhci: mvebu: make USB 3.0 PHY optional for Armada 3720
  UPSTREAM: usb: xhci-mtk: break loop when find the endpoint to drop
  UPSTREAM: usb: typec: Return void in typec_partner_set_pd_revision
  ANDROID: GKI: Update ABI with virtual_device symbols
  ANDROID: make per-cgroup PSI tracking configurable
  BACKPORT: FROMLIST: dmabuf: Add the capability to expose DMA-BUF stats in sysfs
  UPSTREAM: usb: typec: tcpci_maxim: Enable data path when partner is USB Comm capable
  UPSTREAM: usb: typec: tcpci: Add Callback to Usb Communication capable partner
  UPSTREAM: usb: typec: tcpm: Add Callback to Usb Communication capable partner
  UPSTREAM: usb: typec: tcpm: Set in_ams flag when Source caps have been received
  UPSTREAM: usb: typec: tcpm: Handle vbus shutoff when in source mode
  ANDROID: GKI: Update virtual_device symbol list
  ANDROID: timer: Add vendor hook for timer calc index
  ANDROID: Make vsock virtio packet buff size configurable
  ANDROID: ipi: Add function to return nr_ipi and ipi_desc
  UPSTREAM: usb: typec: Add typec_partner_set_pd_revision
  UPSTREAM: usb: typec: Provide PD Specification Revision for cable and partner
  UPSTREAM: usb: typec: Standardize PD Revision format with Type-C Revision
  UPSTREAM: usb: xhci-mtk: skip dropping bandwidth of unchecked endpoints
  UPSTREAM: modpost: turn static exports into error
  Revert "FROMLIST: modpost: Make static exports fatal"
  UPSTREAM: modpost: turn section mismatches to error from fatal()
  UPSTREAM: modpost: change license incompatibility to error() from fatal()
  UPSTREAM: modpost: turn missing MODULE_LICENSE() into error
  UPSTREAM: modpost: refactor error handling and clarify error/fatal difference
  UPSTREAM: modpost: rename merror() to error()
  Revert "ANDROID: GKI: bring WPAN into GKI"
  ANDROID: GKI: update .xml file
  ANDROID: GKI: bring WPAN into GKI
  ANDROID: db845c_gki.fragment: Drop CONFIG_USB_XHCI_HCD
  Revert "ANDROID: Update db845c KMI symbol list for DWC3 changes"
  Revert "Revert "ANDROID: GKI: Enable CONFIG_USB_XHCI_HCD""
  Revert "Revert "ANDROID: db845c_gki.fragment: Drop CONFIG_USB_DWC3 from config frament""
  Revert "Revert "ANDROID: GKI: enable CONFIG_USB_DWC3 to be build in""

Conflicts:
	arch/arm64/Kconfig
	init/Kconfig

Change-Id: I931bd41521892079722e6b8211d4864a685d3cb8
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-02-16 13:24:30 -08:00
Vijayanand Jitta
bfed1c3081 FROMGIT: lib: stackdepot: add support to disable stack depot
Add a kernel parameter stack_depot_disable to disable stack depot.  So
that stack hash table doesn't consume any memory when stack depot is
disabled.

The use case is CONFIG_PAGE_OWNER without page_owner=on.  Without this
patch, stackdepot will consume the memory for the hashtable.  By default,
it's 8M which is never trivial.

With this option, in CONFIG_PAGE_OWNER configured system, page_owner=off,
stack_depot_disable in kernel command line, we could save the wasted
memory for the hashtable.

Link: https://lkml.kernel.org/r/1611749198-24316-2-git-send-email-vjitta@codeaurora.org
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
Signed-off-by: Vijayanand Jitta <vjitta@codeaurora.org>
Cc: Alexander Potapenko <glider@google.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Yogesh Lal <ylal@codeaurora.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
(cherry picked from commit 3d9ebd4b5358d8fd4c270b516430169905c38686
 https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git akpm)
(cherry picked from commit 2b7ef118b617be551c23e975dfe44588b180c536
 https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git akpm)
Bug: 172318110
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Change-Id: Id6730d66306531a9031ab6f6359a825869fa1890
2021-02-15 15:11:44 -08:00
Kevin Hilman
a7db97195b ANDROID: GKI: Kconfig.gki: add hidden PHY configs
When testing GKI with out-of-tree PCIe support as modules, it was
discovered some hidden Kconfigs are required for DPHYs.  Add here so
out of tree PCIe drivers and PHYs can be built in a separate tree.

Bug: 179406580
Change-Id: Ic27c678b4e0dd4c29d354ff1139d453b99a3744f
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
(cherry picked from commit 4b41c1113cab477366e5f08e03453ff5e612c949 kernel/common android-mainline)
2021-02-12 10:08:03 +01:00
Kevin Hilman
2ff6197f94 ANDROID: GKI: enable networking; add hidden network configs
Drop the explicit disable of CONFIG_ETHERNET from gki_defconfig so
wired networking support is enabled by default.

Also, when testing GKI with out-of-tree wired networking modules, it
was discovered that a few hidden Kconfigs are required.  Add them here
so out of tree net drivers can be built in a separate tree.

Bug: 179406580
Change-Id: Ia66742e514ae1a3c9f8d0ec1d92eb40b68d12ce7
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
(cherry picked from commit 30f31797fe80307598bc2502bfe2eb19b9bf13fe kernel/common android-mainline)
2021-02-12 10:08:03 +01:00
Ivaylo Georgiev
72ff3c4e94 Merge android12-5.10.12 (39564d7) into msm-5.10
* refs/heads/tmp-39564d7:
  Linux 5.10.12
  printk: fix string termination for record_print_text()
  printk: fix buffer overflow potential for print_text()
  tools: Factor HOSTCC, HOSTLD, HOSTAR definitions
  mm: fix a race on nr_swap_pages
  mm/page_alloc: add a missing mm_page_alloc_zone_locked() tracepoint
  objtool: Don't fail on missing symbol table
  io_uring: fix sleeping under spin in __io_clean_op
  io_uring: dont kill fasync under completion_lock
  io_uring: fix skipping disabling sqo on exec
  io_uring: fix uring_flush in exit_files() warning
  io_uring: fix false positive sqo warning on flush
  io_uring: do sqo disable on install_fd error
  io_uring: fix null-deref in io_disable_sqo_submit
  io_uring: stop SQPOLL submit on creator's death
  io_uring: add warn_once for io_uring_flush()
  io_uring: inline io_uring_attempt_task_drop()
  kernel/io_uring: cancel io_uring before task works
  iwlwifi: dbg: Don't touch the tlv data
  RDMA/vmw_pvrdma: Fix network_hdr_type reported in WC
  media: v4l2-subdev.h: BIT() is not available in userspace
  media: Revert "media: videobuf2: Fix length check for single plane dmabuf queueing"
  HID: multitouch: Apply MT_QUIRK_CONFIDENCE quirk for multi-input devices
  HID: wacom: Correct NULL dereference on AES pen proximity
  futex: Handle faults correctly for PI futexes
  futex: Simplify fixup_pi_state_owner()
  futex: Use pi_state_update_owner() in put_pi_state()
  rtmutex: Remove unused argument from rt_mutex_proxy_unlock()
  futex: Provide and use pi_state_update_owner()
  futex: Replace pointless printk in fixup_owner()
  futex: Ensure the correct return value from futex_lock_pi()
  Revert "mm/slub: fix a memory leak in sysfs_slab_add()"
  gpio: mvebu: fix pwm .get_state period calculation
  FROMLIST: fuse: Allocate unlikely used ioctl number for passthrough V1
  UPSTREAM: xhci: handle halting transfer event properly after endpoint stop and halt raced.
  UPSTREAM: xhci: Check for pending reset endpoint command before queueing a new one.
  UPSTREAM: xhci: remove obsolete dequeue pointer moving code
  UPSTREAM: xhci: introduce a new move_dequeue_past_td() function to replace old code.
  UPSTREAM: xhci: handle stop endpoint command completion with endpoint in running state.
  UPSTREAM: xhci: Fix halted endpoint at stop endpoint command completion
  UPSTREAM: xhci: split handling halted endpoints into two steps
  UPSTREAM: xhci: move and rename xhci_cleanup_halted_endpoint()
  UPSTREAM: xhci: turn cancelled td cleanup to its own function
  UPSTREAM: xhci: store TD status in the td struct instead of passing it along
  UPSTREAM: xhci: use xhci_td_cleanup() helper when giving back cancelled URBs
  UPSTREAM: xhci: move xhci_td_cleanup so it can be called by more functions
  UPSTREAM: xhci: Add xhci_reset_halted_ep() helper function
  ANDROID: x86: GKI: Enable CFI
  UPSTREAM: kasan: fix incorrect arguments passing in kasan_add_zero_shadow
  UPSTREAM: kasan: fix unaligned address is unhandled in kasan_remove_zero_shadow
  UPSTREAM: kasan, mm: fix resetting page_alloc tags for HW_TAGS
  UPSTREAM: kasan, mm: fix conflicts with init_on_alloc/free
  UPSTREAM: kasan: fix HW_TAGS boot parameters
  UPSTREAM: kasan, arm64: fix pointer tags in KASAN reports
  UPSTREAM: arm64: mte: remove an ISB on kernel exit
  UPSTREAM: mm/mremap.c: fix extent calculation
  UPSTREAM: x86: mremap speedup - Enable HAVE_MOVE_PUD
  UPSTREAM: arm64: mremap speedup - enable HAVE_MOVE_PUD
  UPSTREAM: mm: speedup mremap on 1GB or larger regions
  ANDROID: x86: GKI: Enable LTO
  UPSTREAM: xhci: flush endpoint start to reduce race risk with stop endpoint command.
  UPSTREAM: xhci: Check link TRBs when updating ring enqueue and dequeue pointers.
  UPSTREAM: xhci: avoid DMA double fetch when reading event trb type.
  UPSTREAM: xhci: remove extra loop in interrupt context
  UPSTREAM: xhci: check slot_id is valid before gathering slot info
  UPSTREAM: xhci: prevent a theoretical endless loop while preparing rings.
  UPSTREAM: xhci: remove xhci_stream_id_to_ring() helper
  UPSTREAM: xhci: add xhci_virt_ep_to_ring() helper
  UPSTREAM: xhci: check virt_dev is valid before dereferencing it
  UPSTREAM: xhci: add xhci_get_virt_ep() helper
  UPSTREAM: xhci: remove unused event parameter from completion handlers
  UPSTREAM: xhci: adjust parameters passed to cleanup_halted_endpoint()
  UPSTREAM: xhci: get isochronous ring directly from endpoint structure
  UPSTREAM: xhci: Avoid parsing transfer events several times
  ANDROID: sched/core: prevent timers on paused cpus
  UPSTREAM: arm64: lto: Strengthen READ_ONCE() to acquire when CONFIG_LTO=y
  UPSTREAM: arm64: alternatives: Remove READ_ONCE() usage during patch operation
  BACKPORT: arm64: cpufeatures: Add capability for LDAPR instruction
  UPSTREAM: arm64: alternatives: Split up alternative.h
  UPSTREAM: arm64: uaccess: move uao_* alternatives to asm-uaccess.h
  ANDROID: x86: Add objtool to MAKE_GOALS
  FROMLIST: kbuild: improve libelf detection
  BACKPORT: tools: Factor HOSTCC, HOSTLD, HOSTAR definitions
  ANDROID: virtio: disable virtio_dma_buf callback checks with CFI
  FROMLIST: scsi: ufs: Fix deadlock while suspending ufs host
  FROMLIST: block: bsg: resume platform device before accessing
  FROMGIT: f2fs: flush data when enabling checkpoint back
  FROMGIT: KVM: arm64: Don't clobber x4 in __do_hyp_init
  FROMGIT: KVM: Forbid the use of tagged userspace addresses for memslots
  FROMGIT: KVM: arm64: Filter out v8.1+ events on v8.0 HW
  FROMGIT: KVM: arm64: Compute TPIDR_EL2 ignoring MTE tag
  FROMGIT: KVM: arm64: Use the reg_to_encoding() macro instead of sys_reg()
  FROMGIT: KVM: arm64: Allow PSCI SYSTEM_OFF/RESET to return
  FROMGIT: KVM: arm64: Simplify handling of absent PMU system registers
  FROMGIT: KVM: arm64: Hide PMU registers from userspace when not available
  UPSTREAM: KVM: arm64: Replace KVM_ARM_PMU with HW_PERF_EVENTS
  UPSTREAM: KVM: arm64: Remove spurious semicolon in reg_to_encoding()
  UPSTREAM: KVM: arm64: Fix hyp_cpu_pm_{init,exit} __init annotation
  UPSTREAM: KVM: arm64: Consolidate dist->ready setting into kvm_vgic_map_resources()
  UPSTREAM: KVM: arm64: Remove redundant call to kvm_pmu_vcpu_reset()
  UPSTREAM: KVM: arm64: Update comment in kvm_vgic_map_resources()
  UPSTREAM: KVM: arm64: Move double-checked lock to kvm_vgic_map_resources()
  UPSTREAM: KVM: arm64: arch_timer: Remove VGIC initialization check
  UPSTREAM: KVM: Documentation: Add arm64 KVM_RUN error codes
  UPSTREAM: KVM: arm64: Declutter host PSCI 0.1 handling
  UPSTREAM: KVM: arm64: Move skip_host_instruction to adjust_pc.h
  UPSTREAM: KVM: arm64: Remove unused includes in psci-relay.c
  UPSTREAM: KVM: arm64: Minor cleanup of hyp variables used in host
  UPSTREAM: KVM: arm64: Skip computing hyp VA layout for VHE
  UPSTREAM: KVM: arm64: Use lm_alias in nVHE-only VA conversion
  UPSTREAM: KVM: arm64: Prevent use of invalid PSCI v0.1 function IDs
  UPSTREAM: KVM: arm64: Fix nVHE boot on VHE systems
  UPSTREAM: KVM: arm64: Fix EL2 mode availability checks
  UPSTREAM: KVM: arm64: Trap host SMCs in protected mode
  UPSTREAM: KVM: arm64: Keep nVHE EL2 vector installed
  UPSTREAM: KVM: arm64: Intercept host's SYSTEM_SUSPEND PSCI SMCs
  UPSTREAM: KVM: arm64: Intercept host's CPU_SUSPEND PSCI SMCs
  UPSTREAM: KVM: arm64: Intercept host's CPU_ON SMCs
  UPSTREAM: KVM: arm64: Add function to enter host from KVM nVHE hyp code
  UPSTREAM: KVM: arm64: Extract __do_hyp_init into a helper function
  UPSTREAM: KVM: arm64: Forward safe PSCI SMCs coming from host
  UPSTREAM: KVM: arm64: Add offset for hyp VA <-> PA conversion
  UPSTREAM: KVM: arm64: Bootstrap PSCI SMC handler in nVHE EL2
  UPSTREAM: KVM: arm64: Add SMC handler in nVHE EL2
  UPSTREAM: KVM: arm64: Create nVHE copy of cpu_logical_map
  UPSTREAM: KVM: arm64: Support per_cpu_ptr in nVHE hyp code
  UPSTREAM: KVM: arm64: Add .hyp.data..ro_after_init ELF section
  UPSTREAM: KVM: arm64: Init MAIR/TCR_EL2 from params struct
  UPSTREAM: KVM: arm64: Move hyp-init params to a per-CPU struct
  UPSTREAM: KVM: arm64: Remove vector_ptr param of hyp-init
  UPSTREAM: arm64: Extract parts of el2_setup into a macro
  UPSTREAM: arm64: Make cpu_logical_map() take unsigned int
  UPSTREAM: psci: Add accessor for psci_0_1_function_ids
  UPSTREAM: psci: Replace psci_function_id array with a struct
  UPSTREAM: psci: Split functions to v0.1 and v0.2+ variants
  UPSTREAM: psci: Support psci_ops.get_version for v0.1
  UPSTREAM: KVM: arm64: Add ARM64_KVM_PROTECTED_MODE CPU capability
  UPSTREAM: KVM: arm64: Add kvm-arm.mode early kernel parameter
  UPSTREAM: KVM: arm64: Use kvm_write_guest_lock when init stolen time
  UPSTREAM: KVM: arm64: Some fixes of PV-time interface document
  UPSTREAM: arm64: head.S: always initialize PSTATE
  UPSTREAM: arm64: head.S: cleanup SCTLR_ELx initialization
  UPSTREAM: arm64: head.S: rename el2_setup -> init_kernel_el
  UPSTREAM: arm64: add C wrappers for SET_PSTATE_*()
  UPSTREAM: arm64: ensure ERET from kthread is illegal
  BACKPORT: KVM: arm64: Advertise ID_AA64PFR0_EL1.CSV3=1 if the CPUs are Meltdown-safe
  UPSTREAM: KVM: arm64: Delay the polling of the GICR_VPENDBASER.Dirty bit
  UPSTREAM: arm64: Make the Meltdown mitigation state available
  UPSTREAM: KVM: arm64: selftests: Filter out DEMUX registers
  UPSTREAM: KVM: arm64: CSSELR_EL1 max is 13
  UPSTREAM: KVM: arm64: Remove unused __extended_idmap_trampoline() prototype
  UPSTREAM: KVM: arm64: Remove kvm_arch_vm_ioctl_check_extension()
  UPSTREAM: KVM: arm64: Move 'struct kvm_arch_memory_slot' out of uapi/
  UPSTREAM: KVM: arm64: Get rid of the PMU ready state
  UPSTREAM: KVM: arm64: Gate kvm_pmu_update_state() on the PMU feature
  UPSTREAM: KVM: arm64: Remove dead PMU sysreg decoding code
  UPSTREAM: KVM: arm64: Remove PMU RAZ/WI handling
  UPSTREAM: KVM: arm64: Inject UNDEF on PMU access when no PMU configured
  UPSTREAM: KVM: arm64: Refuse illegal KVM_ARM_VCPU_PMU_V3 at reset time
  UPSTREAM: KVM: arm64: Set ID_AA64DFR0_EL1.PMUVer to 0 when no PMU support
  UPSTREAM: KVM: arm64: Refuse to run VCPU if PMU is not initialized
  UPSTREAM: KVM: arm64: Add kvm_vcpu_has_pmu() helper
  UPSTREAM: KVM: arm64: Avoid repetitive stack access on host EL1 to EL2 exception
  UPSTREAM: KVM: arm64: Simplify __kvm_enable_ssbs()
  UPSTREAM: KVM: arm64: Patch kimage_voffset instead of loading the EL1 value
  UPSTREAM: KVM: arm64: Remove redundant hyp vectors entry
  UPSTREAM: arm64: spectre: Consolidate spectre-v3a detection
  UPSTREAM: arm64: spectre: Rename ARM64_HARDEN_EL2_VECTORS to ARM64_SPECTRE_V3A
  BACKPORT: KVM: arm64: Allocate hyp vectors statically
  UPSTREAM: KVM: arm64: Re-jig logic when patching hardened hyp vectors
  UPSTREAM: KVM: arm64: Move BP hardening helpers into spectre.h
  UPSTREAM: KVM: arm64: Make BP hardening globals static instead
  UPSTREAM: KVM: arm64: Move kvm_get_hyp_vector() out of header file
  UPSTREAM: KVM: arm64: Tidy up kvm_map_vector()
  UPSTREAM: KVM: arm64: Remove redundant Spectre-v2 code from kvm_map_vector()
  UPSTREAM: KVM: arm64: Drop kvm_coproc.h
  UPSTREAM: KVM: arm64: Drop legacy copro shadow register
  UPSTREAM: KVM: arm64: Drop is_aarch32 trap attribute
  UPSTREAM: KVM: arm64: Drop is_32bit trap attribute
  UPSTREAM: KVM: arm64: Map AArch32 cp14 register to AArch64 sysregs
  UPSTREAM: KVM: arm64: Map AArch32 cp15 register to AArch64 sysregs
  UPSTREAM: KVM: arm64: Add AArch32 mapping annotation
  UPSTREAM: KVM: arm64: Move AArch32 exceptions over to AArch64 sysregs
  UPSTREAM: KVM: arm64: Get rid of the AArch32 register mapping code
  UPSTREAM: KVM: arm64: Consolidate exception injection
  UPSTREAM: KVM: arm64: Remove SPSR manipulation primitives
  UPSTREAM: KVM: arm64: Inject AArch32 exceptions from HYP
  UPSTREAM: KVM: arm64: Inject AArch64 exceptions from HYP
  UPSTREAM: KVM: arm64: Add basic hooks for injecting exceptions from EL2
  UPSTREAM: KVM: arm64: Move VHE direct sysreg accessors into kvm_host.h
  UPSTREAM: KVM: arm64: Move PC rollback on SError to HYP
  UPSTREAM: KVM: arm64: Make kvm_skip_instr() and co private to HYP
  UPSTREAM: KVM: arm64: Move kvm_vcpu_trap_il_is32bit into kvm_skip_instr32()
  UPSTREAM: KVM: arm64: Don't adjust PC on SError during SMC trap
  UPSTREAM: KVM: arm64: Turn host HVC handling into a dispatch table
  UPSTREAM: KVM: arm64: Add kimg_hyp_va() helper
  FROMLIST: fs/buffer.c: Revoke LRU when trying to drop buffers
  ANDROID: sched: Add restrict vendor hooks for balance_rt()
  ANDROID: GKI: select DMADEVICES if GKI_HIDDEN_SND_SOC_CONFIGS is set
  ANDROID: use ANDROID_OEM_DATA for OEM data
  ANDROID: defconfig: Enable debug_symbol driver
  ANDROID: android: Create debug_symbols driver

Change-Id: I7a567fe31d6b789d215f4e6c2ff8401fd0dcb8ac
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-02-10 07:32:30 -08:00
Greg Kroah-Hartman
1092f698e5 This is the 5.10.15 stable release
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmAjmYgACgkQONu9yGCS
 aT6bohAAiRtT6WoMrzEFXvs44tWxB4JPXJR290RmmO+fZGj+HoujKbhnWCwNMD5q
 s2PGELPybWaii7schjuXqUl0vhatUnVLs04A59hGKKHHlvpWTznQYT7Urt8C6c8I
 sm2zAB6oeGwkwG8vQnujq2srxdgZVzffx09Tm1l+PtFGudROVixuthw21Q0QhRt0
 2z2O5lcJC7utlUIudI/pe7WECgMIZHS2lRZyz8EKJ6ynMuNpQl2WuchPWuLgVhYB
 hiHV0yRLIHRzi3wNDMy8GJzjjfS1dkMuwnDK+3rZNZH+IVV3wvs/8mdr8p5d/VYU
 kfPDP1EMjnik0sBLvavl9d4ixnUcCn05HjGnFrqSbfpi8j88npqKriV3jkDrhQpO
 cLlMcVTN3ufpcrr6BIDgL6uCVCul+txeaPkUuafP6y3yNtQXDWbLxlgfm7u+TwAB
 nIr12H8cgMR6zK2iQFSZk4rGt1eXUIZkZYLcoINW88Zey9jsTImg9ZgAA+BJJMzs
 4A3UKAOthCCyGJYju3hoTUVyS0QPJVuplAODIMSklUjnxQT4JfPJ9Jk2BRw5cY4K
 Xecpb/+6vxKj7Zl6HFvcZCkU8+pul5wboDnCIgpIGOLUhq8OTyu5716Q7c9T6MbO
 R6ftZosij+bmuapo4HZhnYzybzHb7LHLsa+B/5DzK0CwTTmV1JM=
 =YVjW
 -----END PGP SIGNATURE-----

Merge 5.10.15 into android12-5.10

Changes in 5.10.15
	USB: serial: cp210x: add pid/vid for WSDA-200-USB
	USB: serial: cp210x: add new VID/PID for supporting Teraoka AD2000
	USB: serial: option: Adding support for Cinterion MV31
	usb: host: xhci: mvebu: make USB 3.0 PHY optional for Armada 3720
	USB: gadget: legacy: fix an error code in eth_bind()
	usb: gadget: aspeed: add missing of_node_put
	USB: usblp: don't call usb_set_interface if there's a single alt
	usb: renesas_usbhs: Clear pipe running flag in usbhs_pkt_pop()
	usb: dwc2: Fix endpoint direction check in ep_from_windex
	usb: dwc3: fix clock issue during resume in OTG mode
	usb: xhci-mtk: fix unreleased bandwidth data
	usb: xhci-mtk: skip dropping bandwidth of unchecked endpoints
	usb: xhci-mtk: break loop when find the endpoint to drop
	ARM: OMAP1: OSK: fix ohci-omap breakage
	arm64: dts: qcom: c630: keep both touchpad devices enabled
	Input: i8042 - unbreak Pegatron C15B
	arm64: dts: amlogic: meson-g12: Set FL-adj property value
	arm64: dts: rockchip: fix vopl iommu irq on px30
	arm64: dts: rockchip: Use only supported PCIe link speed on Pinebook Pro
	ARM: dts: stm32: Fix polarity of the DH DRC02 uSD card detect
	ARM: dts: stm32: Connect card-detect signal on DHCOM
	ARM: dts: stm32: Disable WP on DHCOM uSD slot
	ARM: dts: stm32: Disable optional TSC2004 on DRC02 board
	ARM: dts: stm32: Fix GPIO hog flags on DHCOM DRC02
	vdpa/mlx5: Fix memory key MTT population
	bpf, cgroup: Fix optlen WARN_ON_ONCE toctou
	bpf, cgroup: Fix problematic bounds check
	bpf, inode_storage: Put file handler if no storage was found
	um: virtio: free vu_dev only with the contained struct device
	bpf, preload: Fix build when $(O) points to a relative path
	arm64: dts: meson: switch TFLASH_VDD_EN pin to open drain on Odroid-C4
	r8169: work around RTL8125 UDP hw bug
	rxrpc: Fix deadlock around release of dst cached on udp tunnel
	arm64: dts: ls1046a: fix dcfg address range
	SUNRPC: Fix NFS READs that start at non-page-aligned offsets
	igc: set the default return value to -IGC_ERR_NVM in igc_write_nvm_srwr
	igc: check return value of ret_val in igc_config_fc_after_link_up
	i40e: Revert "i40e: don't report link up for a VF who hasn't enabled queues"
	ibmvnic: device remove has higher precedence over reset
	net/mlx5: Fix function calculation for page trees
	net/mlx5: Fix leak upon failure of rule creation
	net/mlx5e: Update max_opened_tc also when channels are closed
	net/mlx5e: Release skb in case of failure in tc update skb
	net: lapb: Copy the skb before sending a packet
	net: mvpp2: TCAM entry enable should be written after SRAM data
	r8169: fix WoL on shutdown if CONFIG_DEBUG_SHIRQ is set
	net: ipa: pass correct dma_handle to dma_free_coherent()
	ARM: dts: sun7i: a20: bananapro: Fix ethernet phy-mode
	nvmet-tcp: fix out-of-bounds access when receiving multiple h2cdata PDUs
	vdpa/mlx5: Restore the hardware used index after change map
	memblock: do not start bottom-up allocations with kernel_end
	kbuild: fix duplicated flags in DEBUG_CFLAGS
	thunderbolt: Fix possible NULL pointer dereference in tb_acpi_add_link()
	ovl: fix dentry leak in ovl_get_redirect
	ovl: avoid deadlock on directory ioctl
	ovl: implement volatile-specific fsync error behaviour
	mac80211: fix station rate table updates on assoc
	gpiolib: free device name on error path to fix kmemleak
	fgraph: Initialize tracing_graph_pause at task creation
	tracing/kprobe: Fix to support kretprobe events on unloaded modules
	kretprobe: Avoid re-registration of the same kretprobe earlier
	tracing: Use pause-on-trace with the latency tracers
	tracepoint: Fix race between tracing and removing tracepoint
	libnvdimm/namespace: Fix visibility of namespace resource attribute
	libnvdimm/dimm: Avoid race between probe and available_slots_show()
	genirq: Prevent [devm_]irq_alloc_desc from returning irq 0
	genirq/msi: Activate Multi-MSI early when MSI_FLAG_ACTIVATE_EARLY is set
	scripts: use pkg-config to locate libcrypto
	xhci: fix bounce buffer usage for non-sg list case
	RISC-V: Define MAXPHYSMEM_1GB only for RV32
	cifs: report error instead of invalid when revalidating a dentry fails
	iommu: Check dev->iommu in dev_iommu_priv_get() before dereferencing it
	smb3: Fix out-of-bounds bug in SMB2_negotiate()
	smb3: fix crediting for compounding when only one request in flight
	mmc: sdhci-pltfm: Fix linking err for sdhci-brcmstb
	mmc: core: Limit retries when analyse of SDIO tuples fails
	Fix unsynchronized access to sev members through svm_register_enc_region
	drm/dp/mst: Export drm_dp_get_vc_payload_bw()
	drm/i915: Fix the MST PBN divider calculation
	drm/i915/gem: Drop lru bumping on display unpinning
	drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs
	drm/i915/display: Prevent double YUV range correction on HDR planes
	drm/i915: Extract intel_ddi_power_up_lanes()
	drm/i915: Power up combo PHY lanes for for HDMI as well
	drm/amd/display: Revert "Fix EDID parsing after resume from suspend"
	io_uring: don't modify identity's files uncess identity is cowed
	nvme-pci: avoid the deepest sleep state on Kingston A2000 SSDs
	KVM: SVM: Treat SVM as unsupported when running as an SEV guest
	KVM: x86/mmu: Fix TDP MMU zap collapsible SPTEs
	KVM: x86: Allow guests to see MSR_IA32_TSX_CTRL even if tsx=off
	KVM: x86: fix CPUID entries returned by KVM_GET_CPUID2 ioctl
	KVM: x86: Update emulator context mode if SYSENTER xfers to 64-bit mode
	KVM: x86: Set so called 'reserved CR3 bits in LM mask' at vCPU reset
	DTS: ARM: gta04: remove legacy spi-cs-high to make display work again
	ARM: dts; gta04: SPI panel chip select is active low
	ARM: footbridge: fix dc21285 PCI configuration accessors
	ARM: 9043/1: tegra: Fix misplaced tegra_uart_config in decompressor
	mm: hugetlbfs: fix cannot migrate the fallocated HugeTLB page
	mm: hugetlb: fix a race between freeing and dissolving the page
	mm: hugetlb: fix a race between isolating and freeing page
	mm: hugetlb: remove VM_BUG_ON_PAGE from page_huge_active
	mm, compaction: move high_pfn to the for loop scope
	mm/vmalloc: separate put pages and flush VM flags
	mm: thp: fix MADV_REMOVE deadlock on shmem THP
	mm/filemap: add missing mem_cgroup_uncharge() to __add_to_page_cache_locked()
	x86/build: Disable CET instrumentation in the kernel
	x86/debug: Fix DR6 handling
	x86/debug: Prevent data breakpoints on __per_cpu_offset
	x86/debug: Prevent data breakpoints on cpu_dr7
	x86/apic: Add extra serialization for non-serializing MSRs
	Input: goodix - add support for Goodix GT9286 chip
	Input: xpad - sync supported devices with fork on GitHub
	Input: ili210x - implement pressure reporting for ILI251x
	md: Set prev_flush_start and flush_bio in an atomic way
	igc: Report speed and duplex as unknown when device is runtime suspended
	neighbour: Prevent a dead entry from updating gc_list
	net: ip_tunnel: fix mtu calculation
	udp: ipv4: manipulate network header of NATed UDP GRO fraglist
	net: dsa: mv88e6xxx: override existent unicast portvec in port_fdb_add
	net: sched: replaced invalid qdisc tree flush helper in qdisc_replace
	Linux 5.10.15

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I15750357b4c30739515fdc0bbbd0e04b7c986171
2021-02-10 09:53:50 +01:00
Steven Rostedt (VMware)
43b5bdbf96 fgraph: Initialize tracing_graph_pause at task creation
commit 7e0a9220467dbcfdc5bc62825724f3e52e50ab31 upstream.

On some archs, the idle task can call into cpu_suspend(). The cpu_suspend()
will disable or pause function graph tracing, as there's some paths in
bringing down the CPU that can have issues with its return address being
modified. The task_struct structure has a "tracing_graph_pause" atomic
counter, that when set to something other than zero, the function graph
tracer will not modify the return address.

The problem is that the tracing_graph_pause counter is initialized when the
function graph tracer is enabled. This can corrupt the counter for the idle
task if it is suspended in these architectures.

   CPU 1				CPU 2
   -----				-----
  do_idle()
    cpu_suspend()
      pause_graph_tracing()
          task_struct->tracing_graph_pause++ (0 -> 1)

				start_graph_tracing()
				  for_each_online_cpu(cpu) {
				    ftrace_graph_init_idle_task(cpu)
				      task-struct->tracing_graph_pause = 0 (1 -> 0)

      unpause_graph_tracing()
          task_struct->tracing_graph_pause-- (0 -> -1)

The above should have gone from 1 to zero, and enabled function graph
tracing again. But instead, it is set to -1, which keeps it disabled.

There's no reason that the field tracing_graph_pause on the task_struct can
not be initialized at boot up.

Cc: stable@vger.kernel.org
Fixes: 380c4b1411 ("tracing/function-graph-tracer: append the tracing_graph_flag")
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=211339
Reported-by: pierre.gondois@arm.com
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-02-10 09:29:16 +01:00
Ivaylo Georgiev
b69639c402 Merge android12-5.10.11 (ba15277) into msm-5.10
* refs/heads/tmp-ba15277:
  Linux 5.10.11
  Revert "mm: fix initialization of struct page for holes in memory layout"
  mm: fix initialization of struct page for holes in memory layout
  Commit 9bb48c82aced ("tty: implement write_iter") converted the tty layer to use write_iter. Fix the redirected_tty_write declaration also in n_tty and change the comparisons to use write_iter instead of write. also in n_tty and change the comparisons to use write_iter instead of write.
  fs/pipe: allow sendfile() to pipe again
  interconnect: imx8mq: Use icc_sync_state
  kernfs: wire up ->splice_read and ->splice_write
  kernfs: implement ->write_iter
  kernfs: implement ->read_iter
  bpf: Local storage helpers should check nullness of owner ptr passed
  drm/i915/hdcp: Get conn while content_type changed
  ASoC: SOF: Intel: hda: Avoid checking jack on system suspend
  tcp: Fix potential use-after-free due to double kfree()
  x86/sev-es: Handle string port IO to kernel memory properly
  net: systemport: free dev before on error path
  tty: fix up hung_up_tty_write() conversion
  tty: implement write_iter
  x86/sev: Fix nonistr violation
  pinctrl: qcom: Don't clear pending interrupts when enabling
  pinctrl: qcom: Properly clear "intr_ack_high" interrupts when unmasking
  pinctrl: qcom: No need to read-modify-write the interrupt status
  pinctrl: qcom: Allow SoCs to specify a GPIO function that's not 0
  net: core: devlink: use right genl user_ptr when handling port param get/set
  net: mscc: ocelot: Fix multicast to the CPU port
  tcp: fix TCP_USER_TIMEOUT with zero window
  tcp: do not mess with cloned skbs in tcp_add_backlog()
  net: dsa: b53: fix an off by one in checking "vlan->vid"
  net: Disable NETIF_F_HW_TLS_RX when RXCSUM is disabled
  net: mscc: ocelot: allow offloading of bridge on top of LAG
  ipv6: set multicast flag on the multicast route
  net_sched: reject silly cell_log in qdisc_get_rtab()
  net_sched: avoid shift-out-of-bounds in tcindex_set_parms()
  ipv6: create multicast route with RTPROT_KERNEL
  udp: mask TOS bits in udp_v4_early_demux()
  net_sched: gen_estimator: support large ewma log
  tcp: fix TCP socket rehash stats mis-accounting
  kasan: fix incorrect arguments passing in kasan_add_zero_shadow
  kasan: fix unaligned address is unhandled in kasan_remove_zero_shadow
  skbuff: back tiny skbs with kmalloc() in __netdev_alloc_skb() too
  lightnvm: fix memory leak when submit fails
  cachefiles: Drop superfluous readpages aops NULL check
  nvme-pci: fix error unwind in nvme_map_data
  nvme-pci: refactor nvme_unmap_data
  sh_eth: Fix power down vs. is_opened flag ordering
  selftests/powerpc: Fix exit status of pkey tests
  net: dsa: mv88e6xxx: also read STU state in mv88e6250_g1_vtu_getnext
  octeontx2-af: Fix missing check bugs in rvu_cgx.c
  ASoC: SOF: Intel: fix page fault at probe if i915 init fails
  locking/lockdep: Cure noinstr fail
  sh: Remove unused HAVE_COPY_THREAD_TLS macro
  sh: dma: fix kconfig dependency for G2_DMA
  drm/i915/hdcp: Update CP property in update_pipe
  tools: gpio: fix %llu warning in gpio-watch.c
  tools: gpio: fix %llu warning in gpio-event-mon.c
  netfilter: rpfilter: mask ecn bits before fib lookup
  cls_flower: call nla_ok() before nla_next()
  x86/cpu/amd: Set __max_die_per_package on AMD
  x86/entry: Fix noinstr fail
  drm/i915: Only enable DFP 4:4:4->4:2:0 conversion when outputting YCbCr 4:4:4
  drm/i915: s/intel_dp_sink_dpms/intel_dp_set_power/
  driver core: Extend device_is_dependent()
  driver core: Fix device link device name collision
  drivers core: Free dma_range_map when driver probe failed
  xhci: tegra: Delay for disabling LFPS detector
  xhci: make sure TRB is fully written before giving it to the controller
  usb: cdns3: imx: fix can't create core device the second time issue
  usb: cdns3: imx: fix writing read-only memory issue
  usb: bdc: Make bdc pci driver depend on BROKEN
  usb: udc: core: Use lock when write to soft_connect
  USB: gadget: dummy-hcd: Fix errors in port-reset handling
  usb: gadget: aspeed: fix stop dma register setting.
  USB: ehci: fix an interrupt calltrace error
  ehci: fix EHCI host controller initialization sequence
  serial: mvebu-uart: fix tx lost characters at power off
  stm class: Fix module init return on allocation failure
  intel_th: pci: Add Alder Lake-P support
  io_uring: fix short read retries for non-reg files
  io_uring: fix SQPOLL IORING_OP_CLOSE cancelation state
  io_uring: iopoll requests should also wake task ->in_idle state
  mm: fix numa stats for thp migration
  mm: memcg: fix memcg file_dirty numa stat
  mm: memcg/slab: optimize objcg stock draining
  proc_sysctl: fix oops caused by incorrect command parameters
  x86/setup: don't remove E820_TYPE_RAM for pfn 0
  x86/mmx: Use KFPU_387 for MMX string operations
  x86/topology: Make __max_die_per_package available unconditionally
  x86/fpu: Add kernel_fpu_begin_mask() to selectively initialize state
  irqchip/mips-cpu: Set IPI domain parent chip
  cifs: do not fail __smb_send_rqst if non-fatal signals are pending
  powerpc/64s: fix scv entry fallback flush vs interrupt
  counter:ti-eqep: remove floor
  iio: adc: ti_am335x_adc: remove omitted iio_kfifo_free()
  drivers: iio: temperature: Add delay after the addressed reset command in mlx90632.c
  iio: ad5504: Fix setting power-down state
  iio: common: st_sensors: fix possible infinite loop in st_sensors_irq_thread
  i2c: sprd: depend on COMMON_CLK to fix compile tests
  perf evlist: Fix id index for heterogeneous systems
  can: peak_usb: fix use after free bugs
  can: vxcan: vxcan_xmit: fix use after free bug
  can: dev: can_restart: fix use after free bug
  selftests: net: fib_tests: remove duplicate log test
  xsk: Clear pool even for inactive queues
  ALSA: hda: Balance runtime/system PM if direct-complete is disabled
  gpio: sifive: select IRQ_DOMAIN_HIERARCHY rather than depend on it
  platform/x86: hp-wmi: Don't log a warning on HPWMI_RET_UNKNOWN_COMMAND errors
  platform/x86: intel-vbtn: Drop HP Stream x360 Convertible PC 11 from allow-list
  drm/vc4: Unify PCM card's driver_name
  i2c: octeon: check correct size of maximum RECV_LEN packet
  iov_iter: fix the uaccess area in copy_compat_iovec_from_user
  printk: fix kmsg_dump_get_buffer length calulations
  printk: ringbuffer: fix line counting
  RDMA/cma: Fix error flow in default_roce_mode_store
  RDMA/umem: Avoid undefined behavior of rounddown_pow_of_two()
  drm/amdkfd: Fix out-of-bounds read in kdf_create_vcrat_image_cpu()
  bpf: Reject too big ctx_size_in for raw_tp test run
  arm64: entry: remove redundant IRQ flag tracing
  powerpc: Fix alignment bug within the init sections
  powerpc: Use the common INIT_DATA_SECTION macro in vmlinux.lds.S
  bpf: Prevent double bpf_prog_put call from bpf_tracing_prog_attach
  crypto: omap-sham - Fix link error without crypto-engine
  scsi: ufs: Fix tm request when non-fatal error happens
  scsi: ufs: ufshcd-pltfrm depends on HAS_IOMEM
  scsi: megaraid_sas: Fix MEGASAS_IOC_FIRMWARE regression
  btrfs: print the actual offset in btrfs_root_name
  RDMA/ucma: Do not miss ctx destruction steps in some cases
  pinctrl: mediatek: Fix fallback call path
  pinctrl: aspeed: g6: Fix PWMG0 pinctrl setting
  gpiolib: cdev: fix frame size warning in gpio_ioctl()
  nfsd: Don't set eof on a truncated READ_PLUS
  nfsd: Fixes for nfsd4_encode_read_plus_data()
  x86/xen: fix 'nopvspin' build error
  RISC-V: Fix maximum allowed phsyical memory for RV32
  RISC-V: Set current memblock limit
  libperf tests: Fail when failing to get a tracepoint id
  libperf tests: If a test fails return non-zero
  io_uring: flush timeouts that should already have expired
  drm/nouveau/kms/nv50-: fix case where notifier buffer is at offset 0
  drm/nouveau/mmu: fix vram heap sizing
  drm/nouveau/i2c/gm200: increase width of aux semaphore owner fields
  drm/nouveau/privring: ack interrupts the same way as RM
  drm/nouveau/bios: fix issue shadowing expansion ROMs
  drm/amd/display: Fix to be able to stop crc calculation
  HID: logitech-hidpp: Add product ID for MX Ergo in Bluetooth mode
  drm/amd/display: disable dcn10 pipe split by default
  drm/amdgpu/psp: fix psp gfx ctrl cmds
  riscv: defconfig: enable gpio support for HiFive Unleashed
  dts: phy: add GPIO number and active state used for phy reset
  dts: phy: fix missing mdio device and probe failure of vsc8541-01 device
  x86/xen: Fix xen_hvm_smp_init() when vector callback not available
  x86/xen: Add xen_no_vector_callback option to test PCI INTX delivery
  xen: Fix event channel callback via INTX/GSI
  arm64: make atomic helpers __always_inline
  riscv: cacheinfo: Fix using smp_processor_id() in preemptible
  ALSA: hda/tegra: fix tegra-hda on tegra30 soc
  clk: tegra30: Add hda clock default rates to clock driver
  HID: Ignore battery for Elan touchscreen on ASUS UX550
  HID: logitech-dj: add the G602 receiver
  riscv: Enable interrupts during syscalls with M-Mode
  riscv: Fix sifive serial driver
  riscv: Fix kernel time_init()
  scsi: sd: Suppress spurious errors when WRITE SAME is being disabled
  scsi: scsi_debug: Fix memleak in scsi_debug_init()
  scsi: qedi: Correct max length of CHAP secret
  scsi: ufs: Correct the LUN used in eh_device_reset_handler() callback
  scsi: ufs: Relax the condition of UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL
  x86/hyperv: Fix kexec panic/hang issues
  dm integrity: select CRYPTO_SKCIPHER
  HID: sony: select CONFIG_CRC32
  HID: multitouch: Enable multi-input for Synaptics pointstick/touchpad device
  SUNRPC: Handle TCP socket sends with kernel_sendpage() again
  ASoC: rt711: mutex between calibration and power state changes
  ASoC: Intel: haswell: Add missing pm_ops
  drm/i915: Check for rq->hwsp validity after acquiring RCU lock
  drm/i915/gt: Prevent use of engine->wa_ctx after error
  drm/amd/display: DCN2X Find Secondary Pipe properly in MPO + ODM Case
  drm/amdgpu: remove gpu info firmware of green sardine
  drm/syncobj: Fix use-after-free
  drm/atomic: put state on error path
  dm integrity: conditionally disable "recalculate" feature
  dm integrity: fix a crash if "recalculate" used without "internal_hash"
  dm: avoid filesystem lookup in dm_get_dev_t()
  mmc: sdhci-brcmstb: Fix mmc timeout errors on S5 suspend
  mmc: sdhci-xenon: fix 1.8v regulator stabilization
  mmc: sdhci-of-dwcmshc: fix rpmb access
  mmc: core: don't initialize block size from ext_csd if not present
  pinctrl: ingenic: Fix JZ4760 support
  fs: fix lazytime expiration handling in __writeback_single_inode()
  btrfs: send: fix invalid clone operations when cloning from the same file and root
  btrfs: don't clear ret in btrfs_start_dirty_block_groups
  btrfs: fix lockdep splat in btrfs_recover_relocation
  btrfs: do not double free backref nodes on error
  btrfs: don't get an EINTR during drop_snapshot for reloc
  ACPI: scan: Make acpi_bus_get_device() clear return pointer on error
  dm crypt: fix copy and paste bug in crypt_alloc_req_aead
  crypto: xor - Fix divide error in do_xor_speed()
  ALSA: hda/via: Add minimum mute flag
  ALSA: hda/realtek - Limit int mic boost on Acer Aspire E5-575T
  ALSA: seq: oss: Fix missing error check in snd_seq_oss_synth_make_info()
  platform/x86: ideapad-laptop: Disable touchpad_switch for ELAN0634
  platform/x86: i2c-multi-instantiate: Don't create platform device for INT3515 ACPI nodes
  i2c: bpmp-tegra: Ignore unknown I2C_M flags
  i2c: tegra: Wait for config load atomically while in ISR
  mtd: rawnand: nandsim: Fix the logic when selecting Hamming soft ECC engine
  mtd: rawnand: gpmi: fix dst bit offset when extracting raw payload
  scsi: target: tcmu: Fix use-after-free of se_cmd->priv
  ANDROID: simplify vendor hook definitions
  ANDROID: add macros to create OEM data fields
  ANDROID: dma-buf: fix return type mismatch
  ANDROID: cpu/hotplug: create vendor hook for cpu_up/cpu_down
  FROMLIST: fuse: Introduce passthrough for mmap
  ANDROID: Fix sparse warning in wp_page_copy caused by SPF patchset
  FROMLIST: fuse: Use daemon creds in passthrough mode
  FROMLIST: fuse: Handle asynchronous read and write in passthrough
  FROMLIST: fuse: Introduce synchronous read and write for passthrough
  FROMLIST: fuse: Passthrough initialization and release
  FROMLIST: fuse: Definitions and ioctl for passthrough
  FROMLIST: fuse: 32-bit user space ioctl compat for fuse device
  FROMLIST: fs: Generic function to convert iocb to rw flags
  Revert "FROMLIST: fuse: Definitions and ioctl() for passthrough"
  Revert "FROMLIST: fuse: Passthrough initialization and release"
  Revert "FROMLIST: fuse: Introduce synchronous read and write for passthrough"
  Revert "FROMLIST: fuse: Handle asynchronous read and write in passthrough"
  Revert "FROMLIST: fuse: Use daemon creds in passthrough mode"
  Revert "FROMLIST: fuse: Fix colliding FUSE_PASSTHROUGH flag"
  UPSTREAM: usb: xhci-mtk: fix unreleased bandwidth data
  ANDROID: sched: export task_rq_lock
  ANDROID: GKI: make VIDEOBUF2_DMA_CONTIG under GKI_HIDDEN_MEDIA_CONFIGS
  ANDROID: clang: update to 12.0.1
  FROMLIST: dma-buf: heaps: add chunk heap to dmabuf heaps
  FROMLIST: dt-bindings: reserved-memory: Make DMA-BUF CMA heap DT-configurable
  FROMLIST: mm: failfast mode with __GFP_NORETRY in alloc_contig_range
  FROMLIST: mm: cma: introduce gfp flag in cma_alloc instead of no_warn
  UPSTREAM: kernfs: wire up ->splice_read and ->splice_write
  UPSTREAM: kernfs: implement ->write_iter
  UPSTREAM: kernfs: implement ->read_iter
  UPSTREAM: usb: typec: tcpm: Create legacy PDOs for PD2 connection

Conflicts:
	Documentation/devicetree/bindings
	drivers/dma-buf/heaps/Kconfig
	drivers/dma-buf/heaps/Makefile
	drivers/pinctrl/qcom/pinctrl-msm.h

Change-Id: I6412ddc7b1d215b7ea8bff5815277e13e8143888
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-02-08 22:02:19 -08:00
Alexander Potapenko
adb54c78ab BACKPORT: mm: add Kernel Electric-Fence infrastructure
Patch series "KFENCE: A low-overhead sampling-based memory safety error detector", v7.

This adds the Kernel Electric-Fence (KFENCE) infrastructure. KFENCE is a
low-overhead sampling-based memory safety error detector of heap
use-after-free, invalid-free, and out-of-bounds access errors.  This
series enables KFENCE for the x86 and arm64 architectures, and adds
KFENCE hooks to the SLAB and SLUB allocators.

KFENCE is designed to be enabled in production kernels, and has near
zero performance overhead. Compared to KASAN, KFENCE trades performance
for precision. The main motivation behind KFENCE's design, is that with
enough total uptime KFENCE will detect bugs in code paths not typically
exercised by non-production test workloads. One way to quickly achieve a
large enough total uptime is when the tool is deployed across a large
fleet of machines.

KFENCE objects each reside on a dedicated page, at either the left or
right page boundaries. The pages to the left and right of the object
page are "guard pages", whose attributes are changed to a protected
state, and cause page faults on any attempted access to them. Such page
faults are then intercepted by KFENCE, which handles the fault
gracefully by reporting a memory access error.

Guarded allocations are set up based on a sample interval (can be set
via kfence.sample_interval). After expiration of the sample interval,
the next allocation through the main allocator (SLAB or SLUB) returns a
guarded allocation from the KFENCE object pool. At this point, the timer
is reset, and the next allocation is set up after the expiration of the
interval.

To enable/disable a KFENCE allocation through the main allocator's
fast-path without overhead, KFENCE relies on static branches via the
static keys infrastructure. The static branch is toggled to redirect the
allocation to KFENCE.

The KFENCE memory pool is of fixed size, and if the pool is exhausted no
further KFENCE allocations occur. The default config is conservative
with only 255 objects, resulting in a pool size of 2 MiB (with 4 KiB
pages).

We have verified by running synthetic benchmarks (sysbench I/O,
hackbench) and production server-workload benchmarks that a kernel with
KFENCE (using sample intervals 100-500ms) is performance-neutral
compared to a non-KFENCE baseline kernel.

KFENCE is inspired by GWP-ASan [1], a userspace tool with similar
properties. The name "KFENCE" is a homage to the Electric Fence Malloc
Debugger [2].

For more details, see Documentation/dev-tools/kfence.rst added in the
series -- also viewable here:

	https://raw.githubusercontent.com/google/kasan/kfence/Documentation/dev-tools/kfence.rst

[1] http://llvm.org/docs/GwpAsan.html
[2] https://linux.die.net/man/3/efence

This patch (of 9):

This adds the Kernel Electric-Fence (KFENCE) infrastructure. KFENCE is a
low-overhead sampling-based memory safety error detector of heap
use-after-free, invalid-free, and out-of-bounds access errors.

KFENCE is designed to be enabled in production kernels, and has near
zero performance overhead. Compared to KASAN, KFENCE trades performance
for precision. The main motivation behind KFENCE's design, is that with
enough total uptime KFENCE will detect bugs in code paths not typically
exercised by non-production test workloads. One way to quickly achieve a
large enough total uptime is when the tool is deployed across a large
fleet of machines.

KFENCE objects each reside on a dedicated page, at either the left or
right page boundaries. The pages to the left and right of the object
page are "guard pages", whose attributes are changed to a protected
state, and cause page faults on any attempted access to them. Such page
faults are then intercepted by KFENCE, which handles the fault
gracefully by reporting a memory access error. To detect out-of-bounds
writes to memory within the object's page itself, KFENCE also uses
pattern-based redzones. The following figure illustrates the page
layout:

  ---+-----------+-----------+-----------+-----------+-----------+---
     | xxxxxxxxx | O :       | xxxxxxxxx |       : O | xxxxxxxxx |
     | xxxxxxxxx | B :       | xxxxxxxxx |       : B | xxxxxxxxx |
     | x GUARD x | J : RED-  | x GUARD x | RED-  : J | x GUARD x |
     | xxxxxxxxx | E :  ZONE | xxxxxxxxx |  ZONE : E | xxxxxxxxx |
     | xxxxxxxxx | C :       | xxxxxxxxx |       : C | xxxxxxxxx |
     | xxxxxxxxx | T :       | xxxxxxxxx |       : T | xxxxxxxxx |
  ---+-----------+-----------+-----------+-----------+-----------+---

Guarded allocations are set up based on a sample interval (can be set
via kfence.sample_interval). After expiration of the sample interval, a
guarded allocation from the KFENCE object pool is returned to the main
allocator (SLAB or SLUB). At this point, the timer is reset, and the
next allocation is set up after the expiration of the interval.

To enable/disable a KFENCE allocation through the main allocator's
fast-path without overhead, KFENCE relies on static branches via the
static keys infrastructure. The static branch is toggled to redirect the
allocation to KFENCE. To date, we have verified by running synthetic
benchmarks (sysbench I/O, hackbench) that a kernel compiled with KFENCE
is performance-neutral compared to the non-KFENCE baseline.

For more details, see Documentation/dev-tools/kfence.rst (added later in
the series).

Link: https://lkml.kernel.org/r/20201103175841.3495947-2-elver@google.com
Signed-off-by: Marco Elver <elver@google.com>
Signed-off-by: Alexander Potapenko <glider@google.com>
Reviewed-by: Dmitry Vyukov <dvyukov@google.com>
Reviewed-by: SeongJae Park <sjpark@amazon.de>
Co-developed-by: Marco Elver <elver@google.com>
Reviewed-by: Jann Horn <jannh@google.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Paul E. McKenney <paulmck@kernel.org>
Cc: Andrey Konovalov <andreyknvl@google.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christopher Lameter <cl@linux.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hillf Danton <hdanton@sina.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Joern Engel <joern@purestorage.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

[glider: resolved minor conflict in init/main.c]
Bug: 177201466
(cherry picked from commit 2a8dede73c3496bbd917644657f3735a4f508cb9
    https://github.com/hnaz/linux-mm v5.11-rc4-mmots-2021-01-21-20-10)
Test: CONFIG_KFENCE_KUNIT_TEST=y passes on Cuttlefish
Signed-off-by: Alexander Potapenko <glider@google.com>
Change-Id: I6b474675cc9732c31118df53fa06c3997f577218
2021-02-05 09:20:52 -08:00
Suren Baghdasaryan
bd3983c8a8 ANDROID: make per-cgroup PSI tracking configurable
With cgroup v2 hierarchy enabled PSI accounts stalls for each cgroup
separately and aggregates at each level of the hierarchy. That causes
additional overhead since psi_avgs_work would be called for each
cgroup in the hierarchy.
In Android we use PSI only at the system level, therefore this overhead
can be avoided.
Introduce CONFIG_PSI_PER_CGROUP_ACCT that controls per-cgroup PSI
tracking and is disabled by default.

Bug: 178872719
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I70a418aba76b46a27eb9e66080434aa870496384
2021-02-02 20:48:28 +00:00
qctecmdr
d5ba8e9046 Merge "kernel: netlink based system stats interface" 2021-01-29 12:30:28 -08:00
Vinayak Menon
954aeed7b5 kernel: netlink based system stats interface
Add generic netlink based interface to pass various
system statistics to userspace.

Change-Id: I362c696ade2c5a424516728010122fec54a1a71b
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2021-01-29 14:48:34 +05:30
Ivaylo Georgiev
cca7cf51c0 Merge android12-5.10.10 (c4cf078) into msm-5.10
* refs/heads/tmp-c4cf078:
  Linux 5.10.10
  spi: cadence: cache reference clock rate during probe
  spi: fsl: Fix driver breakage when SPI_CS_HIGH is not set in spi->mode
  cxgb4/chtls: Fix tid stuck due to wrong update of qid
  net: dsa: unbind all switches from tree when DSA master unbinds
  mac80211: check if atf has been disabled in __ieee80211_schedule_txq
  mac80211: do not drop tx nulldata packets on encrypted links
  drm/panel: otm8009a: allow using non-continuous dsi clock
  can: mcp251xfd: mcp251xfd_handle_rxif_one(): fix wrong NULL pointer check
  net: stmmac: use __napi_schedule() for PREEMPT_RT
  rxrpc: Fix handling of an unsupported token type in rxrpc_read()
  net: dsa: clear devlink port type before unregistering slave netdevs
  net: phy: smsc: fix clk error handling
  dt-bindings: net: renesas,etheravb: RZ/G2H needs tx-internal-delay-ps
  net: avoid 32 x truesize under-estimation for tiny skbs
  net: stmmac: fix taprio configuration when base_time is in the past
  net: stmmac: fix taprio schedule configuration
  net: sit: unregister_netdevice on newlink's error path
  net: stmmac: Fixed mtu channged by cache aligned
  i40e: fix potential NULL pointer dereferencing
  rxrpc: Call state should be read with READ_ONCE() under some circumstances
  net: dcb: Accept RTM_GETDCB messages carrying set-like DCB commands
  net: dcb: Validate netlink message in DCB handler
  esp: avoid unneeded kmap_atomic call
  rndis_host: set proper input size for OID_GEN_PHYSICAL_MEDIUM request
  net: mvpp2: Remove Pause and Asym_Pause support
  mlxsw: core: Increase critical threshold for ASIC thermal zone
  mlxsw: core: Add validation of transceiver temperature thresholds
  tipc: fix NULL deref in tipc_link_xmit()
  net: ipv6: Validate GSO SKB before finish IPv6 processing
  netxen_nic: fix MSI/MSI-x interrupts
  udp: Prevent reuseport_select_sock from reading uninitialized socks
  net: fix use-after-free when UDP GRO with shared fraglist
  net: ipa: modem: add missing SET_NETDEV_DEV() for proper sysfs links
  bpf: Fix helper bpf_map_peek_elem_proto pointing to wrong callback
  bpf: Support PTR_TO_MEM{,_OR_NULL} register spilling
  bpf: Don't leak memory in bpf getsockopt when optlen == 0
  nfsd4: readdirplus shouldn't return parent of export
  X.509: Fix crash caused by NULL pointer
  bpf: Fix signed_{sub,add32}_overflows type handling
  drm/amdgpu/display: drop DCN support for aarch64
  x86/hyperv: Initialize clockevents after LAPIC is initialized
  bpf: Fix selftest compilation on clang 11
  Revert "kconfig: remove 'kvmconfig' and 'xenconfig' shorthands"
  ANDROID: staging: debug-kinfo: remove unnecessary defer probe
  BACKPORT: arm64: expose FAR_EL1 tag bits in siginfo
  UPSTREAM: signal: define the SA_EXPOSE_TAGBITS bit in sa_flags
  UPSTREAM: signal: define the SA_UNSUPPORTED bit in sa_flags
  UPSTREAM: arch: provide better documentation for the arch-specific SA_* flags
  UPSTREAM: signal: clear non-uapi flag bits when passing/returning sa_flags
  UPSTREAM: arch: move SA_* definitions to generic headers
  UPSTREAM: parisc: start using signal-defs.h
  UPSTREAM: parisc: Drop parisc special case for __sighandler_t
  FROMLIST: x86/mm: add speculative pagefault handling
  FROMLIST: x86/mm: define ARCH_SUPPORTS_SPECULATIVE_PAGE_FAULT
  ANDROID: mm: use raw seqcount variants in vm_write_*
  ANDROID: mm: Fix sleeping while atomic during speculative page fault
  FROMLIST: mm: don't do swap readahead during speculative page fault
  FROMLIST: mm: protect against PTE changes done by dup_mmap()
  FROMLIST: arm64/mm: add speculative page fault
  FROMLIST: arm64/mm: define ARCH_SUPPORTS_SPECULATIVE_PAGE_FAULT
  FROMLIST: mm: add speculative page fault vmstats
  FROMLIST: mm: speculative page fault handler return VMA
  FROMLIST: mm: adding speculative page fault failure trace events
  FROMLIST: mm: provide speculative fault infrastructure
  FROMLIST: mm: protect mm_rb tree with a rwlock
  FROMLIST: mm: introduce __page_add_new_anon_rmap()
  FROMLIST: mm: introduce __vm_normal_page()
  FROMLIST: mm: introduce __lru_cache_add_active_or_unevictable
  FROMLIST: mm/migrate: Pass vm_fault pointer to migrate_misplaced_page()
  FROMLIST: mm: cache some VMA fields in the vm_fault structure
  FROMLIST: mm: protect SPF handler against anon_vma changes
  FROMLIST: mm: protect mremap() against SPF hanlder
  FROMLIST: mm: protect VMA modifications using VMA sequence count
  FROMLIST: mm: VMA sequence count
  FROMLIST: mm: introduce INIT_VMA()
  FROMLIST: mm: make pte_unmap_same compatible with SPF
  FROMLIST: mm: introduce pte_spinlock for FAULT_FLAG_SPECULATIVE
  FROMLIST: mm: prepare for FAULT_FLAG_SPECULATIVE
  FROMLIST: mm: introduce CONFIG_SPECULATIVE_PAGE_FAULT
  ANDROID: mm: use alloc_flags for cma first alloc policy
  UPSTREAM: ACPI: Use fwnode_init() to set up fwnode
  UPSTREAM: driver core: Delete pointless parameter in fwnode_operations.add_links
  UPSTREAM: driver core: Refactor fw_devlink feature
  UPSTREAM: efi: Update implementation of add_links() to create fwnode links
  UPSTREAM: of: property: Update implementation of add_links() to create fwnode links
  UPSTREAM: driver core: Use device's fwnode to check if it is waiting for suppliers
  UPSTREAM: driver core: Add fw_devlink_parse_fwtree()
  UPSTREAM: driver core: Redefine the meaning of fwnode_operations.add_links()
  UPSTREAM: device property: Add fwnode_is_ancestor_of() and fwnode_get_next_parent_dev()
  UPSTREAM: driver core: Allow only unprobed consumers for SYNC_STATE_ONLY device links
  UPSTREAM: driver core: Add fwnode link support
  UPSTREAM: driver core: Add fwnode_init()
  UPSTREAM: Revert "driver core: fw_devlink: Add support for batching fwnode parsing"
  UPSTREAM: Revert "of: platform: Batch fwnode parsing when adding all top level devices"
  UPSTREAM: Revert "driver core: Remove check in driver_deferred_probe_force_trigger()"
  UPSTREAM: Revert "driver core: Don't do deferred probe in parallel with kernel_init thread"
  UPSTREAM: Revert "driver core: Rename dev_links_info.defer_sync to defer_hook"
  UPSTREAM: Revert "driver core: Avoid deferred probe due to fw_devlink_pause/resume()"
  Revert "FROMLIST: fs/buffer.c: Revoke LRU when trying to drop buffers"
  ANDROID: sched: add em_cpu_energy vendor hook
  FROMGIT: usb: typec: tcpm: Respond Wait if VDM state machine is running
  FROMGIT: usb: typec: tcpm: Protocol Error handling
  FROMGIT: usb: typec: tcpm: AMS and Collision Avoidance
  ANDROID: bug: add vendor hook for bug trap
  FROMGIT: ufs: relocate flush of exceptional event
  FROMGIT: ufs: ufs-exynos: use UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE
  FROMGIT: ufs: introduce a quirk to allow only page-aligned sg entries
  FROMGIT: ufs: ufs-exynos: apply vendor specifics for three timeouts
  FROMGIT: ufs: add a quirk not to use default unipro timeout values
  FROMGIT: dt-bindings: usb: qcom,dwc3: Add bindings for SM8150, SM8250, SM8350
  FROMGIT: dt-bindings: usb: qcom,dwc3: Add binding for SDX55
  FROMGIT: USB: gadget: udc: Process disconnect synchronously
  FROMGIT: usb: gadget: u_serial: Remove old tasklet comments
  FROMGIT: usb: typec: ucsi: Add conditional dependency on USB role switch
  FROMGIT: usb: gadget: u_audio: clean up locking
  FROMGIT: usb: gadget: u_audio: remove struct uac_req
  FROMGIT: usb: gadget: u_audio: factorize ssize to alsa fmt conversion
  FROMGIT: usb: gadget: u_audio: Free requests only after callback
  FROMGIT: usb: gadget: composite: Report various SSP sublink speeds
  FROMGIT: usb: gadget: Introduce udc_set_ssp_rate() for SSP
  FROMGIT: usb: gadget: Introduce SSP rates and lanes
  FROMGIT: usb: gadget: composite: Use SSP sublink speed macros
  ANDROID: Update QCOM symbol list
  ANDROID: gki_defconfig: add CONFIG_DEBUG_KINFO=y
  ANDROID: staging: add debug-kinfo driver
  FROMGIT: usb: ch9: Add USB 3.2 SSP attributes
  FROMGIT: usb: dwc3: qcom: add URS Host support for sdm845 ACPI boot
  FROMGIT: usb: gadget: configfs: Add a specific configFS reset callback
  FROMGIT: usb: dwc3: pci: add support for the Intel Alder Lake-P
  FROMGIT: usb: dwc3: pci: ID for Tiger Lake CPU
  FROMGIT: usb: dwc3: pci: Register a software node for the dwc3 platform device
  FROMGIT: software node: Introduce device_add_software_node()
  FROMGIT: drivers/usb/gadget/udc: Assign boolean values to a bool variable
  FROMGIT: USB: dwc3: document gadget_max_speed
  FROMGIT: usb: dwc3: gadget: Disable Vendor Test LMP Received event
  FROMGIT: usb: dwc2: disable Link Power Management on STM32MP15 HS OTG
  FROMGIT: usb: dwc2: enable FS/LS PHY clock select on STM32MP15 FS OTG
  FROMGIT: usb: dwc2: set ahbcfg parameter for STM32MP15 OTG HS and FS
  FROMGIT: usb: dwc3: Simplify with dev_err_probe()
  FROMGIT: usb: dwc3: keystone: Simplify with dev_err_probe()
  FROMGIT: usb: udc: core: Introduce started state
  FROMGIT: usb: dwc3: core: Replace devm_reset_control_array_get()
  FROMGIT: USB: gadget: f_printer: set a default q_len
  FROMGIT: usb: dwc3: gadget: Preserve UDC max speed setting
  FROMGIT: usb: gadget: composite: Split composite reset and disconnect
  FROMGIT: usb: dwc3: gadget: Introduce a DWC3 VBUS draw callback
  FROMGIT: usb: gadget: u_serial: use %*ph to print small buffer
  FROMGIT: usb: dwc3: add imx8mp dwc3 glue layer driver
  FROMGIT: dt-bindings: usb: dwc3-imx8mp: add imx8mp dwc3 glue bindings
  FROMGIT: usb: dwc3: drd: Improve dwc3_get_extcon() style
  FROMGIT: usb: dwc3: drd: Avoid error when extcon is missing
  Revert "ANDROID: arm64: gki_defconfig: Disable VHE"
  UPSTREAM: arm64: mte: optimize asynchronous tag check fault flag check
  UPSTREAM: kasan: fix null pointer dereference in kasan_record_aux_stack
  UPSTREAM: kasan: update documentation
  UPSTREAM: kasan, mm: allow cache merging with no metadata
  UPSTREAM: kasan: sanitize objects when metadata doesn't fit
  UPSTREAM: kasan: clarify comment in __kasan_kfree_large
  UPSTREAM: kasan: simplify assign_tag and set_tag calls
  UPSTREAM: kasan: don't round_up too much
  UPSTREAM: kasan, mm: rename kasan_poison_kfree
  UPSTREAM: kasan, mm: check kasan_enabled in annotations
  UPSTREAM: kasan: add and integrate kasan boot parameters
  UPSTREAM: kasan: inline (un)poison_range and check_invalid_free
  UPSTREAM: kasan: open-code kasan_unpoison_slab
  UPSTREAM: kasan: inline random_tag for HW_TAGS
  UPSTREAM: kasan: inline kasan_reset_tag for tag-based modes
  UPSTREAM: kasan: remove __kasan_unpoison_stack
  UPSTREAM: kasan: allow VMAP_STACK for HW_TAGS mode
  UPSTREAM: kasan, arm64: unpoison stack only with CONFIG_KASAN_STACK
  UPSTREAM: kasan: introduce set_alloc_info
  UPSTREAM: kasan: rename get_alloc/free_info
  UPSTREAM: kasan: simplify quarantine_put call site
  UPSTREAM: kselftest/arm64: check GCR_EL1 after context switch
  UPSTREAM: kasan: add documentation for hardware tag-based mode
  UPSTREAM: kasan, arm64: enable CONFIG_KASAN_HW_TAGS
  UPSTREAM: kasan, mm: reset tags when accessing metadata
  UPSTREAM: kasan, arm64: print report from tag fault handler
  UPSTREAM: kasan, arm64: implement HW_TAGS runtime
  BACKPORT: kasan, arm64: expand CONFIG_KASAN checks
  UPSTREAM: kasan, x86, s390: update undef CONFIG_KASAN
  UPSTREAM: kasan: define KASAN_GRANULE_SIZE for HW_TAGS
  UPSTREAM: arm64: kasan: add arch layer for memory tagging helpers
  UPSTREAM: arm64: kasan: align allocations for HW_TAGS
  UPSTREAM: kasan, mm: untag page address in free_reserved_area
  UPSTREAM: arm64: mte: switch GCR_EL1 in kernel entry and exit
  UPSTREAM: arm64: mte: convert gcr_user into an exclude mask
  UPSTREAM: arm64: kasan: allow enabling in-kernel MTE
  BACKPORT: arm64: mte: add in-kernel tag fault handler
  UPSTREAM: arm64: mte: reset the page tag in page->flags
  UPSTREAM: arm64: mte: add in-kernel MTE helpers
  UPSTREAM: arm64: enable armv8.5-a asm-arch option
  UPSTREAM: kasan: introduce CONFIG_KASAN_HW_TAGS
  UPSTREAM: kasan: separate metadata_fetch_row for each mode
  UPSTREAM: kasan: rename SHADOW layout macros to META
  UPSTREAM: kasan: rename print_shadow_for_address to print_memory_metadata
  UPSTREAM: kasan: rename addr_has_shadow to addr_has_metadata
  UPSTREAM: kasan, arm64: rename kasan_init_tags and mark as __init
  UPSTREAM: kasan, arm64: move initialization message
  UPSTREAM: kasan, arm64: only use kasan_depth for software modes
  UPSTREAM: kasan, arm64: only init shadow for software modes
  UPSTREAM: kasan: decode stack frame only with KASAN_STACK_ENABLE
  UPSTREAM: kasan: hide invalid free check implementation
  UPSTREAM: kasan: don't duplicate config dependencies
  UPSTREAM: kasan: rename report and tags files
  UPSTREAM: kasan: define KASAN_MEMORY_PER_SHADOW_PAGE
  UPSTREAM: kasan: split out shadow.c from common.c
  UPSTREAM: kasan: only build init.c for software modes
  UPSTREAM: kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_*
  UPSTREAM: kasan: rename (un)poison_shadow to (un)poison_range
  UPSTREAM: kasan: shadow declarations only for software modes
  UPSTREAM: kasan: group vmalloc code
  UPSTREAM: kasan: KASAN_VMALLOC depends on KASAN_GENERIC
  UPSTREAM: kasan: drop unnecessary GPL text from comment headers
  UPSTREAM: lkdtm: disable KASAN for rodata.o
  UPSTREAM: kasan: update documentation for generic kasan
  UPSTREAM: lib/test_kasan.c: add workqueue test case
  UPSTREAM: kasan: print workqueue stack
  UPSTREAM: workqueue: kasan: record workqueue stack
  UPSTREAM: Documentation: document /proc api for arm64 MTE vm flags
  UPSTREAM: Documentation: fix typos in dev-tools/kasan.rst
  UPSTREAM: kasan: arm64: set TCR_EL1.TBID1 when enabled
  ANDROID: dm-user: Fix the list walk-and-delete code
  ANDROID: mm: add get_page_owner_handle function
  ANDROID: Add initial QCOM symbol list
  ANDROID: schedutil: add vendor hook for adjusting util to freq calculation

Conflicts:
	Documentation/devicetree/bindings
	Documentation/devicetree/bindings/net/renesas,etheravb.yaml
	Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
	android/abi_gki_aarch64_qcom
	drivers/usb/dwc3/Kconfig
	drivers/usb/dwc3/Makefile
	drivers/usb/dwc3/core.c
	drivers/usb/dwc3/core.h
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/function/u_audio.c
	include/trace/events/pagefault.h

Change-Id: I823028f1dabf11d5dcda519d69489d50884232ee
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-01-28 00:37:58 -08:00
Miles Chen
86a65e277a ANDROID: GKI: select DMADEVICES if GKI_HIDDEN_SND_SOC_CONFIGS is set
DMA_VIRTUAL_CHANNELS depends on DMADEVICES and DMA_VIRTUAL_CHANNELS
is selected by GKI_HIDDEN_SND_SOC_CONFIGS.

To fix unmet dependency in x86_64, select DMADEVICES under
GKI_HIDDEN_SND_SOC_CONFIGS.

Also, drop CONFIG_DMADEVICES=y in arch/arm64/configs/gki_defconfig.

WARNING: unmet direct dependencies detected for DMA_VIRTUAL_CHANNELS
  Depends on [n]: DMADEVICES [=n]
    Selected by [y]:
      - GKI_HIDDEN_SND_SOC_CONFIGS [=y]

Bug: 174628645
Signed-off-by: Miles Chen <miles.chen@mediatek.com>
Change-Id: I1de491c10542f1b7c9c8754c65415b028d3bc922
2021-01-28 07:14:26 +00:00
zhang sanshan
e1dc2203e3 ANDROID: GKI: make VIDEOBUF2_DMA_CONTIG under GKI_HIDDEN_MEDIA_CONFIGS
it use vb2_dma_contig_memops as default mem_ops in csi driver
drivers/media/platform/mxc/capture/mx6s_capture.c still not upstream to linux community.
q->mem_ops = &vb2_dma_contig_memops;

mem_ops is need in videobuf2-core.c to operate dma buffer.
videobuf2-dma-contig.c is common code which have no hardware involved

Bug: 160195378
Signed-off-by: zhang sanshan <pete.zhang@nxp.com>
Change-Id: Ib084ff96bd4f92aa36f8abb8d4b62a0e9be62e6c
2021-01-26 05:04:53 +00:00
qctecmdr
1ac967b583 Merge "Merge android12-5.10.9 (88e2d5f) into msm-5.10" 2021-01-21 14:34:13 -08:00
Ivaylo Georgiev
44ecae23b1 Merge android12-5.10.9 (88e2d5f) into msm-5.10
* refs/heads/tmp-88e2d5f:
  Linux 5.10.9
  netfilter: nf_nat: Fix memleak in nf_nat_init
  netfilter: conntrack: fix reading nf_conntrack_buckets
  ALSA: firewire-tascam: Fix integer overflow in midi_port_work()
  ALSA: fireface: Fix integer overflow in transmit_midi_msg()
  dm: eliminate potential source of excessive kernel log noise
  selftests: netfilter: Pass family parameter "-f" to conntrack tool
  net: sunrpc: interpret the return value of kstrtou32 correctly
  iommu/vt-d: Fix unaligned addresses for intel_flush_svm_range_dev()
  riscv: Trace irq on only interrupt is enabled
  mm, slub: consider rest of partial list if acquire_slab() fails
  drm/i915/gt: Restore clear-residual mitigations for Ivybridge, Baytrail
  drm/i915/icl: Fix initing the DSI DSC power refcount during HW readout
  drm/i915/dsi: Use unconditional msleep for the panel_on_delay when there is no reset-deassert MIPI-sequence
  dm zoned: select CONFIG_CRC32
  umount(2): move the flag validity checks first
  IB/mlx5: Fix error unwinding when set_has_smi_cap fails
  RDMA/mlx5: Fix wrong free of blue flame register on error
  bnxt_en: Improve stats context resource accounting with RDMA driver loaded.
  RDMA/usnic: Fix memleak in find_free_vf_and_create_qp_grp
  RDMA/restrack: Don't treat as an error allocation ID wrapping
  ext4: fix superblock checksum failure when setting password salt
  scsi: ufs: Fix possible power drain during system suspend
  NFS: nfs_igrab_and_active must first reference the superblock
  NFS: nfs_delegation_find_inode_server must first reference the superblock
  NFS/pNFS: Fix a leak of the layout 'plh_outstanding' counter
  NFS/pNFS: Don't leak DS commits in pnfs_generic_retry_commit()
  NFS/pNFS: Don't call pnfs_free_bucket_lseg() before removing the request
  NFS: Adjust fs_context error logging
  pNFS: Stricter ordering of layoutget and layoutreturn
  pNFS: Mark layout for return if return-on-close was not sent
  pNFS: We want return-on-close to complete when evicting the inode
  NFS4: Fix use-after-free in trace_event_raw_event_nfs4_set_lock
  nvme-tcp: Fix warning with CONFIG_DEBUG_PREEMPT
  nvme-tcp: fix possible data corruption with bio merges
  nvme: don't intialize hwmon for discovery controllers
  nvmet-rdma: Fix NULL deref when setting pi_enable and traddr INADDR_ANY
  ASoC: Intel: fix error code cnl_set_dsp_D0()
  ASoC: meson: axg-tdmin: fix axg skew offset
  ASoC: meson: axg-tdm-interface: fix loopback
  dump_common_audit_data(): fix racy accesses to ->d_name
  perf intel-pt: Fix 'CPU too large' error
  mm: don't put pinned pages into the swap cache
  mm: don't play games with pinned pages in clear_page_refs
  mm: fix clear_refs_write locking
  blk-mq-debugfs: Add decode for BLK_MQ_F_TAG_HCTX_SHARED
  net/mlx5: E-Switch, fix changing vf VLANID
  net/mlx5: Fix passing zero to 'PTR_ERR'
  net/mlx5e: CT: Use per flow counter when CT flow accounting is enabled
  iommu/vt-d: Update domain geometry in iommu_ops.at(de)tach_dev
  nvme-fc: avoid calling _nvme_fc_abort_outstanding_ios from interrupt context
  cfg80211: select CONFIG_CRC32
  x86/sev-es: Fix SEV-ES OUT/IN immediate opcode vc handling
  bpf: Save correct stopping point in file seq iteration
  bpf: Simplify task_file_seq_get_next()
  rcu-tasks: Move RCU-tasks initialization to before early_initcall()
  poll: fix performance regression due to out-of-line __put_user()
  ARM: picoxcell: fix missing interrupt-parent properties
  drm/msm: Call msm_init_vram before binding the gpu
  ACPI: scan: add stub acpi_create_platform_device() for !CONFIG_ACPI
  iommu/vt-d: Fix lockdep splat in sva bind()/unbind()
  usb: typec: Fix copy paste error for NVIDIA alt-mode description
  drm/amdgpu: fix potential memory leak during navi12 deinitialization
  drm/amd/pm: fix the failure when change power profile for renoir
  drm/amdgpu: fix a GPU hang issue when remove device
  drm/amd/display: fix sysfs amdgpu_current_backlight_pwm NULL pointer issue
  nvmet-rdma: Fix list_del corruption on queue establishment failure
  nvme: avoid possible double fetch in handling CQE
  nvme-pci: mark Samsung PM1725a as IGNORE_DEV_SUBNQN
  selftests: fix the return value for UDP GRO test
  net: ethernet: fs_enet: Add missing MODULE_LICENSE
  misdn: dsp: select CONFIG_BITREVERSE
  arch/arc: add copy_user_page() to <asm/page.h> to fix build error on ARC
  bfq: Fix computation of shallow depth
  io_uring: drop file refs after task cancel
  spi: fix the divide by 0 error when calculating xfer waiting time
  kconfig: remove 'kvmconfig' and 'xenconfig' shorthands
  lib/raid6: Let $(UNROLL) rules work with macOS userland
  hwmon: (pwm-fan) Ensure that calculation doesn't discard big period values
  habanalabs: Fix memleak in hl_device_reset
  spi: altera: fix return value for altera_spi_txrx()
  staging: spmi: hisi-spmi-controller: Fix some error handling paths
  habanalabs: register to pci shutdown callback
  habanalabs/gaudi: retry loading TPC f/w on -EINTR
  habanalabs: adjust pci controller init to new firmware
  ARM: dts: ux500/golden: Set display max brightness
  ethernet: ucc_geth: fix definition and size of ucc_geth_tx_global_pram
  regulator: bd718x7: Add enable times
  btrfs: fix transaction leak and crash after RO remount caused by qgroup rescan
  btrfs: merge critical sections of discard lock in workfn
  btrfs: fix async discard stall
  ath11k: qmi: try to allocate a big block of DMA memory first
  netfilter: ipset: fixes possible oops in mtype_resize
  ath11k: fix crash caused by NULL rx_channel
  ARM: omap2: pmic-cpcap: fix maximum voltage to be consistent with defaults on xt875
  ARC: build: move symlink creation to arch/arc/Makefile to avoid race
  ARC: build: add boot_targets to PHONY
  ARC: build: add uImage.lzma to the top-level target
  ARC: build: remove non-existing bootpImage from KBUILD_IMAGE
  io_uring: drop mm and files after task_work_run
  io_uring: don't take files/mm for a dead task
  ext4: don't leak old mountpoint samples
  btrfs: tree-checker: check if chunk item end overflows
  r8152: Add Lenovo Powered USB-C Travel Hub
  stmmac: intel: change all EHL/TGL to auto detect phy addr
  dm crypt: defer decryption to a tasklet if interrupts disabled
  dm crypt: do not call bio_endio() from the dm-crypt tasklet
  dm crypt: do not wait for backlogged crypto request completion in softirq
  dm crypt: use GFP_ATOMIC when allocating crypto requests from softirq
  dm integrity: fix the maximum number of arguments
  dm integrity: fix flush with external metadata device
  dm snapshot: flush merged data before committing metadata
  dm raid: fix discard limits for raid1
  mm/process_vm_access.c: include compat.h
  mm/hugetlb: fix potential missing huge page size info
  mm/vmalloc.c: fix potential memory leak
  compiler.h: Raise minimum version of GCC to 5.1 for arm64
  xen/privcmd: allow fetching resource sizes
  ACPI: scan: Harden acpi_device_add() against device ID overflows
  RDMA/ocrdma: Fix use after free in ocrdma_dealloc_ucontext_pd()
  MIPS: relocatable: fix possible boot hangup with KASLR enabled
  MIPS: Fix malformed NT_FILE and NT_SIGINFO in 32bit coredumps
  MIPS: boot: Fix unaligned access with CONFIG_MIPS_RAW_APPENDED_DTB
  mips: lib: uncached: fix non-standard usage of variable 'sp'
  mips: fix Section mismatch in reference
  riscv: Fix KASAN memory mapping.
  riscv: Fixup CONFIG_GENERIC_TIME_VSYSCALL
  riscv: return -ENOSYS for syscall -1
  riscv: Drop a duplicated PAGE_KERNEL_EXEC
  cifs: fix interrupted close commands
  cifs: check pointer before freeing
  ext4: fix bug for rename with RENAME_WHITEOUT
  ext4: fix wrong list_splice in ext4_fc_cleanup
  ext4: use IS_ERR instead of IS_ERR_OR_NULL and set inode null when IS_ERR
  tools/bootconfig: Add tracing_on support to helper scripts
  tracing/kprobes: Do the notrace functions check without kprobes on ftrace
  drm/bridge: sii902x: Enable I/O and core VCC supplies if present
  dt-bindings: display: sii902x: Add supply bindings
  drm/bridge: sii902x: Refactor init code into separate function
  drm/i915/backlight: fix CPU mode backlight takeover on LPT
  drm/i915/gt: Limit VFE threads based on GT
  drm/i915: Allow the sysadmin to override security mitigations
  drm/amdgpu: add new device id for Renior
  Revert "drm/amd/display: Fixed Intermittent blue screen on OLED panel"
  drm/amdgpu: fix DRM_INFO flood if display core is not supported (bug 210921)
  drm/amdgpu: add green_sardine device id (v2)
  x86/hyperv: check cpu mask after interrupt has been disabled
  ASoC: dapm: remove widget from dirty list on free
  ASoC: AMD Renoir - add DMI entry for Lenovo ThinkPad X395
  ALSA: doc: Fix reference to mixart.rst
  ALSA: hda/realtek: fix right sounds and mute/micmute LEDs for HP machines
  btrfs: prevent NULL pointer dereference in extent_io_tree_panic
  btrfs: reloc: fix wrong file extent type check to avoid false ENOENT
  ANDROID: sched: add rvh for rebalance domains

Conflicts:
	Documentation/devicetree/bindings
	Documentation/devicetree/bindings/display/bridge/sii902x.txt

Change-Id: I098cd52094229b361661d70fc720a364ed3cd898
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-01-21 09:42:04 -08:00
qctecmdr
d06697e749 Merge "Merge android12-5.10.8 (f11e175) into msm-5.10" 2021-01-20 11:26:55 -08:00
Ivaylo Georgiev
c8ee9b1333 Merge android12-5.10.8 (f11e175) into msm-5.10
* refs/heads/tmp-f11e175:
  FROMGIT: usb: gadget: u_ether: support configuring interface names.
  Revert "FROMGIT: mm: improve mprotect(R|W) efficiency on pages referenced once"
  Linux 5.10.8
  tools headers UAPI: Sync linux/fscrypt.h with the kernel sources
  drm/panfrost: Remove unused variables in panfrost_job_close()
  regmap: debugfs: Fix a reversed if statement in regmap_debugfs_init()
  net: drop bogus skb with CHECKSUM_PARTIAL and offset beyond end of trimmed packet
  block: fix use-after-free in disk_part_iter_next
  can: isotp: isotp_getname(): fix kernel information leak
  block/rnbd-clt: avoid module unload race with close confirmation
  xsk: Rollback reservation at NETDEV_TX_BUSY
  xsk: Fix race in SKB mode transmit with shared cq
  KVM: arm64: Don't access PMCR_EL0 when no PMU is available
  selftests: fib_nexthops: Fix wrong mausezahn invocation
  net: mvneta: fix error message when MTU too large for XDP
  drm/i915/dp: Track pm_qos per connector
  net: mvpp2: disable force link UP during port init procedure
  regulator: qcom-rpmh-regulator: correct hfsmps515 definition
  arm64: cpufeature: remove non-exist CONFIG_KVM_ARM_HOST
  wan: ds26522: select CONFIG_BITREVERSE
  regmap: debugfs: Fix a memory leak when calling regmap_attach_dev
  net/mlx5e: Fix two double free cases
  net/mlx5e: Fix memleak in mlx5e_create_l2_table_groups
  nvme-tcp: Fix possible race of io_work and direct send
  bpftool: Fix compilation failure for net.o with older glibc
  iommu/intel: Fix memleak in intel_irq_remapping_alloc
  iommu/vt-d: Fix misuse of ALIGN in qi_flush_piotlb()
  zonefs: select CONFIG_CRC32
  lightnvm: select CONFIG_CRC32
  block: rsxx: select CONFIG_CRC32
  wil6210: select CONFIG_CRC32
  phy: dp83640: select CONFIG_CRC32
  qed: select CONFIG_CRC32
  arm64: mm: Fix ARCH_LOW_ADDRESS_LIMIT when !CONFIG_ZONE_DMA
  dmaengine: xilinx_dma: fix mixed_enum_type coverity warning
  dmaengine: xilinx_dma: fix incompatible param warning in _child_probe()
  dmaengine: xilinx_dma: check dma_async_device_register return value
  dmaengine: milbeaut-xdmac: Fix a resource leak in the error handling path of the probe function
  dmaengine: mediatek: mtk-hsdma: Fix a resource leak in the error handling path of the probe function
  interconnect: qcom: fix rpmh link failures
  interconnect: imx: Add a missing of_node_put after of_device_is_available
  bcache: set bcache device into read-only mode for BCH_FEATURE_INCOMPAT_OBSO_LARGE_BUCKET
  i2c: mediatek: Fix apdma and i2c hand-shake timeout
  i2c: i801: Fix the i2c-mux gpiod_lookup_table not being properly terminated
  spi: stm32: FIFO threshold level - fix align packet size
  spi: spi-geni-qcom: Fix geni_spi_isr() NULL dereference in timeout case
  cpufreq: powernow-k8: pass policy rather than use cpufreq_cpu_get()
  spi: spi-geni-qcom: Fail new xfers if xfer/cancel/abort pending
  can: kvaser_pciefd: select CONFIG_CRC32
  can: m_can: m_can_class_unregister(): remove erroneous m_can_clk_stop()
  can: tcan4x5x: fix bittiming const, use common bittiming from m_can driver
  selftests/bpf: Clarify build error if no vmlinux
  dmaengine: dw-edma: Fix use after free in dw_edma_alloc_chunk()
  i2c: sprd: use a specific timeout to avoid system hang up issue
  ARM: OMAP2+: omap_device: fix idling of devices during probe
  fanotify: Fix sys_fanotify_mark() on native x86-32
  HID: wacom: Fix memory leakage caused by kfifo_alloc
  ionic: start queues before announcing link up
  scsi: lpfc: Fix variable 'vport' set but not used in lpfc_sli4_abts_err_handler()
  net/mlx5: Check if lag is supported before creating one
  net/mlx5e: In skb build skip setting mark in switchdev mode
  net/mlx5e: ethtool, Fix restriction of autoneg with 56G
  net/mlx5: Use port_num 1 instead of 0 when delete a RoCE address
  net: dsa: lantiq_gswip: Exclude RMII from modes that report 1 GbE
  s390/qeth: fix L2 header access in qeth_l3_osa_features_check()
  s390/qeth: fix locking for discipline setup / removal
  s390/qeth: fix deadlock during recovery
  nexthop: Bounce NHA_GATEWAY in FDB nexthop groups
  nexthop: Unlink nexthop group entry in error path
  nexthop: Fix off-by-one error in error path
  octeontx2-af: fix memory leak of lmac and lmac->name
  chtls: Fix chtls resources release sequence
  chtls: Added a check to avoid NULL pointer dereference
  chtls: Replace skb_dequeue with skb_peek
  chtls: Avoid unnecessary freeing of oreq pointer
  chtls: Fix panic when route to peer not configured
  chtls: Remove invalid set_tcb call
  chtls: Fix hardware tid leak
  net: ip: always refragment ip defragmented packets
  net: fix pmtu check in nopmtudisc mode
  tools: selftests: add test for changing routes with PTMU exceptions
  net: ipv6: fib: flush exceptions when purging route
  ptp: ptp_ines: prevent build when HAS_IOMEM is not set
  net: bareudp: add missing error handling for bareudp_link_config()
  net/sonic: Fix some resource leaks in error handling paths
  net: vlan: avoid leaks on register_vlan_dev() failures
  net: stmmac: dwmac-sun8i: Balance syscon (de)initialization
  net: stmmac: dwmac-sun8i: Balance internal PHY power
  net: stmmac: dwmac-sun8i: Balance internal PHY resource references
  net: stmmac: dwmac-sun8i: Fix probe error handling
  net: hns3: fix a phy loopback fail issue
  net: hns3: fix the number of queues actually used by ARQ
  net: hns3: fix incorrect handling of sctp6 rss tuple
  net: cdc_ncm: correct overhead in delayed_ndp_size
  btrfs: shrink delalloc pages instead of full inodes
  btrfs: fix deadlock when cloning inline extent and low on free metadata space
  btrfs: skip unnecessary searches for xattrs when logging an inode
  scsi: ufs: Fix -Wsometimes-uninitialized warning
  io_uring: Fix return value from alloc_fixed_file_ref_node
  drm/panfrost: Don't corrupt the queue mutex on open/close
  iommu/arm-smmu-qcom: Initialize SCTLR of the bypass context
  RDMA/hns: Avoid filling sl in high 3 bits of vlan_id
  io_uring: patch up IOPOLL overflow_flush sync
  io_uring: limit {io|sq}poll submit locking scope
  io_uring: synchronise IOPOLL on task_submit fail
  powerpc/32s: Fix RTAS machine check with VMAP stack
  ANDROID: scsi: ufs: fix wrong merge conflict
  ANDROID: GKI: provide initial snapshot for android12-5.10 .xml
  FROMGIT: mm: improve mprotect(R|W) efficiency on pages referenced once
  BACKPORT: FROMGIT: scsi: ufs-qcom: Fix ufs RST_n specs violation
  BACKPORT: FROMGIT: scsi: ufs: Fix ufs clk specs violation
  ANDROID: fix 0-day build-break for non-GKI
  ANDROID: simplify vendor hooks for non-GKI builds
  ANDROID: fix incorrect printk format
  ANDROID: Disable CFI on restricted vendor hooks
  UPSTREAM: x86/pci: Fix the function type for check_reserved_t
  ANDROID: x86/purgatory: disable CFI
  ANDROID: x86: kprobes: fix references to optprobe_template_func
  ANDROID: x86: map CFI jump tables in pti_clone_entry_text
  ANDROID: x86, module: Ignore __typeid__ relocations
  ANDROID: x86, relocs: Ignore __typeid__ relocations
  ANDROID: x86/alternatives: Use C int3 selftest but disable KASAN
  ANDROID: x86/extable: Do not mark exception callback as CFI
  ANDROID: arm64: disable BTI with CFI for Clang <12
  ANDROID: KVM: arm64: disable CFI for hypervisor code
  ANDROID: arm64: add __nocfi to __apply_alternatives
  ANDROID: arm64: add __va_function and __pa_function
  ANDROID: arm64: add __nocfi to functions that jump to a physical address
  ANDROID: lkdtm: use __va_function
  FROMLIST: cfg80211: fix callback type mismatches in wext-compat
  FROMLIST: lib/list_sort: fix function type mismatches
  ANDROID: bpf: disable CFI in dispatcher functions
  ANDROID: kallsyms: cfi: strip hashes from static functions
  ANDROID: kthread: cfi: disable callback pointer check with modules
  ANDROID: workqueue: cfi: disable callback pointer check with modules
  ANDROID: objtool: Find a destination for jumps beyond the section end
  ANDROID: objtool: Ignore CFI jump tables
  ANDROID: export: cfi: fix ksymtab addresses
  ANDROID: module: cfi: ensure __cfi_check alignment
  ANDROID: mm: add generic __va_function and __pa_function
  ANDROID: cfi: add __cficanonical and fix PREL32 relocations
  ANDROID: add support for Clang's Control Flow Integrity (CFI)
  ANDROID: Incremental fs: Make data validation failure a warn
  ANDROID: Incremental fs: Free mount info after files are flushed
  ANDROID: Incremental fs: Fix selinux issues
  ANDROID: Incremental fs: fix .blocks_written

Conflicts:
	drivers/scsi/ufs/ufs-qcom.c

Change-Id: I5b1732fb70e1c38ef95df836b52fc329fc14e0a9
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-01-20 08:24:03 -08:00
Andrey Konovalov
e0ae1141ab UPSTREAM: kasan, arm64: only use kasan_depth for software modes
[ Upstream commit d73b49365ee65ac48074bdb5aa717bb4644dbbb7 ]

This is a preparatory commit for the upcoming addition of a new hardware
tag-based (MTE-based) KASAN mode.

Hardware tag-based KASAN won't use kasan_depth.  Only define and use it
when one of the software KASAN modes are enabled.

No functional changes for software modes.

Link: https://lkml.kernel.org/r/e16f15aeda90bc7fb4dfc2e243a14b74cc5c8219.1606161801.git.andreyknvl@google.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Alexander Potapenko <glider@google.com>
Tested-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Branislav Rankov <Branislav.Rankov@arm.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Evgenii Stepanov <eugenis@google.com>
Cc: Kevin Brodsky <kevin.brodsky@arm.com>
Cc: Marco Elver <elver@google.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Bug: 172318110
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Change-Id: I553d5ca1fa50ae80cd2eb929e328ac3cb3ce0e9f
2021-01-19 21:47:28 -08:00
Greg Kroah-Hartman
88e2d5fd10 This is the 5.10.9 stable release
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmAHFpcACgkQONu9yGCS
 aT4Vhw/+JLscHnfK//hbS6Nx95MY95VMzy+p2ccADXRy3O/5nr0HwGKnXTKB4Bg+
 05S3Hv9ZU/XSszLWvgFQ0Z0peU241ASPz1uLTgtpziBT5plXa5eJULBZ+WknWMef
 dNKpvKPphpEbQ0yz6o/4sbNAdiI9BzyGCOicQ2dl9nY7R/JA9YHquUD7iHMnvbs+
 yxwwawNHVwszUT/fJT3iFzOAehHGAttHdf3z/bGPS1ogy2S7J5IluJgTAibd3P7G
 5o7OUUA5ujEtjBLIkA61fqeL2Qaci83Ff/8KEPEfF1JeLBbMHYcLHnz3RAwBaLZh
 nlM4smyTeekcnHIzyRGw16OmpoYwY3MQAt+UFLCzKhlnscB0UqCNkA9zQA9k/taw
 cy7/fe5hWFU9DRv4uTUT2H1tkP+pNQ5eIaejPHMtld5JlYXoDN4RyQq7sAyMQgBj
 CXADStYSR/f5sWWgRbRs1F7E0lrePsVpjOcqHXxbsS+52yN2CZSKazlOIJ9xArfM
 cTzzLUuYbMZoHjIDdMMkjA41VMmyJ+BKrqEgzu3LsJQs57o/ckjnQx4VV5YiHhci
 v35OL8oa9IZi8WQikB9bx2WZRWUChOGKwMNeeUwEFD4Zmye1OtyyHuzYQf9QSjRv
 zbf1owwsg3xnfkvLcfru8mNMgJkgG8RpuNNVPO8boWZ4pgPu2tk=
 =5K55
 -----END PGP SIGNATURE-----

Merge 5.10.9 into android12-5.10

Changes in 5.10.9
	btrfs: reloc: fix wrong file extent type check to avoid false ENOENT
	btrfs: prevent NULL pointer dereference in extent_io_tree_panic
	ALSA: hda/realtek: fix right sounds and mute/micmute LEDs for HP machines
	ALSA: doc: Fix reference to mixart.rst
	ASoC: AMD Renoir - add DMI entry for Lenovo ThinkPad X395
	ASoC: dapm: remove widget from dirty list on free
	x86/hyperv: check cpu mask after interrupt has been disabled
	drm/amdgpu: add green_sardine device id (v2)
	drm/amdgpu: fix DRM_INFO flood if display core is not supported (bug 210921)
	Revert "drm/amd/display: Fixed Intermittent blue screen on OLED panel"
	drm/amdgpu: add new device id for Renior
	drm/i915: Allow the sysadmin to override security mitigations
	drm/i915/gt: Limit VFE threads based on GT
	drm/i915/backlight: fix CPU mode backlight takeover on LPT
	drm/bridge: sii902x: Refactor init code into separate function
	dt-bindings: display: sii902x: Add supply bindings
	drm/bridge: sii902x: Enable I/O and core VCC supplies if present
	tracing/kprobes: Do the notrace functions check without kprobes on ftrace
	tools/bootconfig: Add tracing_on support to helper scripts
	ext4: use IS_ERR instead of IS_ERR_OR_NULL and set inode null when IS_ERR
	ext4: fix wrong list_splice in ext4_fc_cleanup
	ext4: fix bug for rename with RENAME_WHITEOUT
	cifs: check pointer before freeing
	cifs: fix interrupted close commands
	riscv: Drop a duplicated PAGE_KERNEL_EXEC
	riscv: return -ENOSYS for syscall -1
	riscv: Fixup CONFIG_GENERIC_TIME_VSYSCALL
	riscv: Fix KASAN memory mapping.
	mips: fix Section mismatch in reference
	mips: lib: uncached: fix non-standard usage of variable 'sp'
	MIPS: boot: Fix unaligned access with CONFIG_MIPS_RAW_APPENDED_DTB
	MIPS: Fix malformed NT_FILE and NT_SIGINFO in 32bit coredumps
	MIPS: relocatable: fix possible boot hangup with KASLR enabled
	RDMA/ocrdma: Fix use after free in ocrdma_dealloc_ucontext_pd()
	ACPI: scan: Harden acpi_device_add() against device ID overflows
	xen/privcmd: allow fetching resource sizes
	compiler.h: Raise minimum version of GCC to 5.1 for arm64
	mm/vmalloc.c: fix potential memory leak
	mm/hugetlb: fix potential missing huge page size info
	mm/process_vm_access.c: include compat.h
	dm raid: fix discard limits for raid1
	dm snapshot: flush merged data before committing metadata
	dm integrity: fix flush with external metadata device
	dm integrity: fix the maximum number of arguments
	dm crypt: use GFP_ATOMIC when allocating crypto requests from softirq
	dm crypt: do not wait for backlogged crypto request completion in softirq
	dm crypt: do not call bio_endio() from the dm-crypt tasklet
	dm crypt: defer decryption to a tasklet if interrupts disabled
	stmmac: intel: change all EHL/TGL to auto detect phy addr
	r8152: Add Lenovo Powered USB-C Travel Hub
	btrfs: tree-checker: check if chunk item end overflows
	ext4: don't leak old mountpoint samples
	io_uring: don't take files/mm for a dead task
	io_uring: drop mm and files after task_work_run
	ARC: build: remove non-existing bootpImage from KBUILD_IMAGE
	ARC: build: add uImage.lzma to the top-level target
	ARC: build: add boot_targets to PHONY
	ARC: build: move symlink creation to arch/arc/Makefile to avoid race
	ARM: omap2: pmic-cpcap: fix maximum voltage to be consistent with defaults on xt875
	ath11k: fix crash caused by NULL rx_channel
	netfilter: ipset: fixes possible oops in mtype_resize
	ath11k: qmi: try to allocate a big block of DMA memory first
	btrfs: fix async discard stall
	btrfs: merge critical sections of discard lock in workfn
	btrfs: fix transaction leak and crash after RO remount caused by qgroup rescan
	regulator: bd718x7: Add enable times
	ethernet: ucc_geth: fix definition and size of ucc_geth_tx_global_pram
	ARM: dts: ux500/golden: Set display max brightness
	habanalabs: adjust pci controller init to new firmware
	habanalabs/gaudi: retry loading TPC f/w on -EINTR
	habanalabs: register to pci shutdown callback
	staging: spmi: hisi-spmi-controller: Fix some error handling paths
	spi: altera: fix return value for altera_spi_txrx()
	habanalabs: Fix memleak in hl_device_reset
	hwmon: (pwm-fan) Ensure that calculation doesn't discard big period values
	lib/raid6: Let $(UNROLL) rules work with macOS userland
	kconfig: remove 'kvmconfig' and 'xenconfig' shorthands
	spi: fix the divide by 0 error when calculating xfer waiting time
	io_uring: drop file refs after task cancel
	bfq: Fix computation of shallow depth
	arch/arc: add copy_user_page() to <asm/page.h> to fix build error on ARC
	misdn: dsp: select CONFIG_BITREVERSE
	net: ethernet: fs_enet: Add missing MODULE_LICENSE
	selftests: fix the return value for UDP GRO test
	nvme-pci: mark Samsung PM1725a as IGNORE_DEV_SUBNQN
	nvme: avoid possible double fetch in handling CQE
	nvmet-rdma: Fix list_del corruption on queue establishment failure
	drm/amd/display: fix sysfs amdgpu_current_backlight_pwm NULL pointer issue
	drm/amdgpu: fix a GPU hang issue when remove device
	drm/amd/pm: fix the failure when change power profile for renoir
	drm/amdgpu: fix potential memory leak during navi12 deinitialization
	usb: typec: Fix copy paste error for NVIDIA alt-mode description
	iommu/vt-d: Fix lockdep splat in sva bind()/unbind()
	ACPI: scan: add stub acpi_create_platform_device() for !CONFIG_ACPI
	drm/msm: Call msm_init_vram before binding the gpu
	ARM: picoxcell: fix missing interrupt-parent properties
	poll: fix performance regression due to out-of-line __put_user()
	rcu-tasks: Move RCU-tasks initialization to before early_initcall()
	bpf: Simplify task_file_seq_get_next()
	bpf: Save correct stopping point in file seq iteration
	x86/sev-es: Fix SEV-ES OUT/IN immediate opcode vc handling
	cfg80211: select CONFIG_CRC32
	nvme-fc: avoid calling _nvme_fc_abort_outstanding_ios from interrupt context
	iommu/vt-d: Update domain geometry in iommu_ops.at(de)tach_dev
	net/mlx5e: CT: Use per flow counter when CT flow accounting is enabled
	net/mlx5: Fix passing zero to 'PTR_ERR'
	net/mlx5: E-Switch, fix changing vf VLANID
	blk-mq-debugfs: Add decode for BLK_MQ_F_TAG_HCTX_SHARED
	mm: fix clear_refs_write locking
	mm: don't play games with pinned pages in clear_page_refs
	mm: don't put pinned pages into the swap cache
	perf intel-pt: Fix 'CPU too large' error
	dump_common_audit_data(): fix racy accesses to ->d_name
	ASoC: meson: axg-tdm-interface: fix loopback
	ASoC: meson: axg-tdmin: fix axg skew offset
	ASoC: Intel: fix error code cnl_set_dsp_D0()
	nvmet-rdma: Fix NULL deref when setting pi_enable and traddr INADDR_ANY
	nvme: don't intialize hwmon for discovery controllers
	nvme-tcp: fix possible data corruption with bio merges
	nvme-tcp: Fix warning with CONFIG_DEBUG_PREEMPT
	NFS4: Fix use-after-free in trace_event_raw_event_nfs4_set_lock
	pNFS: We want return-on-close to complete when evicting the inode
	pNFS: Mark layout for return if return-on-close was not sent
	pNFS: Stricter ordering of layoutget and layoutreturn
	NFS: Adjust fs_context error logging
	NFS/pNFS: Don't call pnfs_free_bucket_lseg() before removing the request
	NFS/pNFS: Don't leak DS commits in pnfs_generic_retry_commit()
	NFS/pNFS: Fix a leak of the layout 'plh_outstanding' counter
	NFS: nfs_delegation_find_inode_server must first reference the superblock
	NFS: nfs_igrab_and_active must first reference the superblock
	scsi: ufs: Fix possible power drain during system suspend
	ext4: fix superblock checksum failure when setting password salt
	RDMA/restrack: Don't treat as an error allocation ID wrapping
	RDMA/usnic: Fix memleak in find_free_vf_and_create_qp_grp
	bnxt_en: Improve stats context resource accounting with RDMA driver loaded.
	RDMA/mlx5: Fix wrong free of blue flame register on error
	IB/mlx5: Fix error unwinding when set_has_smi_cap fails
	umount(2): move the flag validity checks first
	dm zoned: select CONFIG_CRC32
	drm/i915/dsi: Use unconditional msleep for the panel_on_delay when there is no reset-deassert MIPI-sequence
	drm/i915/icl: Fix initing the DSI DSC power refcount during HW readout
	drm/i915/gt: Restore clear-residual mitigations for Ivybridge, Baytrail
	mm, slub: consider rest of partial list if acquire_slab() fails
	riscv: Trace irq on only interrupt is enabled
	iommu/vt-d: Fix unaligned addresses for intel_flush_svm_range_dev()
	net: sunrpc: interpret the return value of kstrtou32 correctly
	selftests: netfilter: Pass family parameter "-f" to conntrack tool
	dm: eliminate potential source of excessive kernel log noise
	ALSA: fireface: Fix integer overflow in transmit_midi_msg()
	ALSA: firewire-tascam: Fix integer overflow in midi_port_work()
	netfilter: conntrack: fix reading nf_conntrack_buckets
	netfilter: nf_nat: Fix memleak in nf_nat_init
	Linux 5.10.9

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I609e501511889081e03d2d18ee7e1be95406f396
2021-01-19 18:49:54 +01:00
Uladzislau Rezki (Sony)
30b491e2b6 rcu-tasks: Move RCU-tasks initialization to before early_initcall()
[ Upstream commit 1b04fa9900263b4e217ca2509fd778b32c2b4eb2 ]

PowerPC testing encountered boot failures due to RCU Tasks not being
fully initialized until core_initcall() time.  This commit therefore
initializes RCU Tasks (along with Rude RCU and RCU Tasks Trace) just
before early_initcall() time, thus allowing waiting on RCU Tasks grace
periods from early_initcall() handlers.

Link: https://lore.kernel.org/rcu/87eekfh80a.fsf@dja-thinkpad.axtens.net/
Fixes: 36dadef23f ("kprobes: Init kprobes in early_initcall")
Tested-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Uladzislau Rezki (Sony) <urezki@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2021-01-19 18:27:28 +01:00
Shaleen Agrawal
594029d6d6 sched: remove references to walt
Prepare for WALT being compiled as a module in its own directory. WALT
will primarily run off trace hooks to get invoked and will use the
exported symbols to call in to the core kernel.

Change-Id: I07b68d7545508be47dc7fa9e184b01f68bbab499
Signed-off-by: Shaleen Agrawal <shalagra@codeaurora.org>
2021-01-18 11:16:47 -08:00
Ivaylo Georgiev
9eeca3e9c5 Merge android12-5.10.7+ (43edfc8) into msm-5.10
* refs/heads/tmp-43edfc8:
  FROMLIST: fs/buffer.c: Revoke LRU when trying to drop buffers
  ANDROID: dm-user: fix typo in channel_free
  ANDROID: PM / Domains: add vendor_hook to disallow domain idle state
  ANDROID: sched: Export available_idle_cpu
  ANDROID: sched: Export sched_domains_mutex for lockdep
  ANDROID: iommu/dma: Add support for DMA_ATTR_SYS_CACHE_ONLY_NWA
  ANDROID: iommu/dma: Add support fo DMA_ATTR_SYS_CACHE_ONLY
  ANDROID: arm64: Add support for system cache memory type
  ANDROID: ftrace: vendor hook for ftrace dump on oops
  ANDROID: irqdesc: Export symbol for vendor modules
  ANDROID: fix 0-day bot build-break in fair.c
  ANDROID: cpuidle: export cpuidle_driver_state_disabled
  Linux 5.10.7
  scsi: target: Fix XCOPY NAA identifier lookup
  rtlwifi: rise completion at the last step of firmware callback
  xsk: Fix memory leak for failed bind
  KVM: x86: fix shift out of bounds reported by UBSAN
  x86/mtrr: Correct the range check before performing MTRR type lookups
  dmaengine: idxd: off by one in cleanup code
  netfilter: nft_dynset: report EOPNOTSUPP on missing set feature
  netfilter: xt_RATEEST: reject non-null terminated string from userspace
  netfilter: ipset: fix shift-out-of-bounds in htable_bits()
  netfilter: x_tables: Update remaining dereference to RCU
  ARM: dts: OMAP3: disable AES on N950/N9
  net/mlx5e: Fix SWP offsets when vlan inserted by driver
  bcache: introduce BCH_FEATURE_INCOMPAT_LOG_LARGE_BUCKET_SIZE for large bucket
  bcache: check unsupported feature sets for bcache register
  bcache: fix typo from SUUP to SUPP in features.h
  drm/i915: clear the gpu reloc batch
  drm/i915: clear the shadow batch
  arm64: link with -z norelro for LLD or aarch64-elf
  dmabuf: fix use-after-free of dmabuf's file->f_inode
  Revert "device property: Keep secondary firmware node secondary by type"
  btrfs: send: fix wrong file path when there is an inode with a pending rmdir
  btrfs: qgroup: don't try to wait flushing if we're already holding a transaction
  iommu/vt-d: Move intel_iommu info from struct intel_svm to struct intel_svm_dev
  ALSA: hda/realtek: Add two "Intel Reference board" SSID in the ALC256.
  ALSA: hda/realtek: Enable mute and micmute LED on HP EliteBook 850 G7
  ALSA: hda/realtek: Add mute LED quirk for more HP laptops
  ALSA: hda/realtek - Fix speaker volume control on Lenovo C940
  ALSA: hda/conexant: add a new hda codec CX11970
  ALSA: hda/via: Fix runtime PM for Clevo W35xSS
  blk-iocost: fix NULL iocg deref from racing against initialization
  x86/resctrl: Don't move a task to the same resource group
  x86/resctrl: Use an IPI instead of task_work_add() to update PQR_ASSOC MSR
  KVM: x86/mmu: Ensure TDP MMU roots are freed after yield
  kvm: check tlbs_dirty directly
  KVM: x86/mmu: Get root level from walkers when retrieving MMIO SPTE
  KVM: x86/mmu: Use -1 to flag an undefined spte in get_mmio_spte()
  x86/mm: Fix leak of pmd ptlock
  mm: make wait_on_page_writeback() wait for multiple pending writebacks
  hwmon: (amd_energy) fix allocation of hwmon_channel_info config
  USB: serial: keyspan_pda: remove unused variable
  usb: gadget: configfs: Fix use-after-free issue with udc_name
  usb: gadget: configfs: Preserve function ordering after bind failure
  usb: gadget: Fix spinlock lockup on usb_function_deactivate
  USB: gadget: legacy: fix return error code in acm_ms_bind()
  usb: gadget: u_ether: Fix MTU size mismatch with RX packet size
  usb: gadget: function: printer: Fix a memory leak for interface descriptor
  usb: gadget: f_uac2: reset wMaxPacketSize
  USB: Gadget: dummy-hcd: Fix shift-out-of-bounds bug
  usb: gadget: select CONFIG_CRC32
  ALSA: usb-audio: Fix UBSAN warnings for MIDI jacks
  USB: usblp: fix DMA to stack
  USB: yurex: fix control-URB timeout handling
  USB: serial: option: add Quectel EM160R-GL
  USB: serial: option: add LongSung M5710 module support
  USB: serial: iuu_phoenix: fix DMA from stack
  usb: uas: Add PNY USB Portable SSD to unusual_uas
  usb: usbip: vhci_hcd: protect shift size
  USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set
  usb: chipidea: ci_hdrc_imx: add missing put_device() call in usbmisc_get_init_data()
  usb: dwc3: ulpi: Fix USB2.0 HS/FS/LS PHY suspend regression
  usb: dwc3: ulpi: Replace CPU-based busyloop with Protocol-based one
  usb: dwc3: ulpi: Use VStsDone to detect PHY regs access completion
  usb: dwc3: gadget: Clear wait flag on dequeue
  usb: dwc3: gadget: Restart DWC3 gadget when enabling pullup
  usb: dwc3: meson-g12a: disable clk on error handling path in probe
  usb: typec: intel_pmc_mux: Configure HPD first for HPD+IRQ request
  USB: cdc-wdm: Fix use after free in service_outstanding_interrupt().
  USB: cdc-acm: blacklist another IR Droid device
  usb: gadget: enable super speed plus
  staging: mt7621-dma: Fix a resource leak in an error handling path
  Staging: comedi: Return -EFAULT if copy_to_user() fails
  powerpc: Handle .text.{hot,unlikely}.* in linker script
  crypto: asym_tpm: correct zero out potential secrets
  crypto: ecdh - avoid buffer overflow in ecdh_set_secret()
  scsi: block: Do not accept any requests while suspended
  scsi: block: Remove RQF_PREEMPT and BLK_MQ_REQ_PREEMPT
  Bluetooth: revert: hci_h5: close serdev device and free hu in h5_close
  kbuild: don't hardcode depmod path
  scsi: ufs: Clear UAC for FFU and RPMB LUNs
  depmod: handle the case of /sbin/depmod without /sbin in PATH
  lib/genalloc: fix the overflow when size is too big
  local64.h: make <asm/local64.h> mandatory
  scsi: core: Only process PM requests if rpm_status != RPM_ACTIVE
  scsi: scsi_transport_spi: Set RQF_PM for domain validation commands
  scsi: ide: Mark power management requests with RQF_PM instead of RQF_PREEMPT
  scsi: ide: Do not set the RQF_PREEMPT flag for sense requests
  scsi: block: Introduce BLK_MQ_REQ_PM
  scsi: ufs-pci: Enable UFSHCD_CAP_RPM_AUTOSUSPEND for Intel controllers
  scsi: ufs-pci: Fix recovery from hibernate exit errors for Intel controllers
  scsi: ufs-pci: Ensure UFS device is in PowerDown mode for suspend-to-disk ->poweroff()
  scsi: ufs-pci: Fix restore from S4 for Intel controllers
  scsi: ufs: Fix wrong print message in dev_err()
  workqueue: Kick a worker based on the actual activation of delayed works
  block: add debugfs stanza for QUEUE_FLAG_NOWAIT
  selftests/vm: fix building protection keys test
  stmmac: intel: Add PCI IDs for TGL-H platform
  selftests: mlxsw: Set headroom size of correct port
  net: usb: qmi_wwan: add Quectel EM160R-GL
  ibmvnic: fix: NULL pointer dereference.
  CDC-NCM: remove "connected" log message
  net: dsa: lantiq_gswip: Fix GSWIP_MII_CFG(p) register access
  net: dsa: lantiq_gswip: Enable GSWIP_MII_CFG_EN also for internal PHYs
  r8169: work around power-saving bug on some chip versions
  vhost_net: fix ubuf refcount incorrectly when sendmsg fails
  bareudp: Fix use of incorrect min_headroom size
  bareudp: set NETIF_F_LLTX flag
  net: hdlc_ppp: Fix issues when mod_timer is called while timer is running
  erspan: fix version 1 check in gre_parse_header()
  net: hns: fix return value check in __lb_other_process()
  net: sched: prevent invalid Scell_log shift count
  ipv4: Ignore ECN bits for fib lookups in fib_compute_spec_dst()
  bnxt_en: Fix AER recovery.
  net: mvpp2: fix pkt coalescing int-threshold configuration
  bnxt_en: Check TQM rings for maximum supported value.
  e1000e: Export S0ix flags to ethtool
  Revert "e1000e: disable s0ix entry and exit flows for ME systems"
  e1000e: bump up timeout to wait when ME un-configures ULP mode
  e1000e: Only run S0ix flows if shutdown succeeded
  tun: fix return value when the number of iovs exceeds MAX_SKB_FRAGS
  net: ethernet: ti: cpts: fix ethtool output when no ptp_clock registered
  net-sysfs: take the rtnl lock when accessing xps_rxqs_map and num_tc
  net-sysfs: take the rtnl lock when storing xps_rxqs
  net-sysfs: take the rtnl lock when accessing xps_cpus_map and num_tc
  net-sysfs: take the rtnl lock when storing xps_cpus
  net: ethernet: Fix memleak in ethoc_probe
  net/ncsi: Use real net-device for response handler
  virtio_net: Fix recursive call to cpus_read_lock()
  qede: fix offload for IPIP tunnel packets
  net: ethernet: mvneta: Fix error handling in mvneta_probe
  ibmvnic: continue fatal error reset after passive init
  ibmvnic: fix login buffer memory leak
  net: stmmac: dwmac-meson8b: ignore the second clock input
  net: mvpp2: Fix GoP port 3 Networking Complex Control configurations
  atm: idt77252: call pci_disable_device() on error path
  ionic: account for vlan tag len in rx buffer len
  ethernet: ucc_geth: set dev->max_mtu to 1518
  ethernet: ucc_geth: fix use-after-free in ucc_geth_remove()
  net: systemport: set dev->max_mtu to UMAC_MAX_MTU_SIZE
  net: mvpp2: prs: fix PPPoE with ipv6 packet parse
  net: mvpp2: Add TCAM entry to drop flow control pause frames
  net/sched: sch_taprio: ensure to reset/destroy all child qdiscs
  iavf: fix double-release of rtnl_lock
  i40e: Fix Error I40E_AQ_RC_EINVAL when removing VFs
  Linux 5.10.6
  mwifiex: Fix possible buffer overflows in mwifiex_cmd_802_11_ad_hoc_start
  exec: Transform exec_update_mutex into a rw_semaphore
  rwsem: Implement down_read_interruptible
  rwsem: Implement down_read_killable_nested
  perf: Break deadlock involving exec_update_mutex
  fuse: fix bad inode
  RDMA/siw,rxe: Make emulated devices virtual in the device tree
  RDMA/core: remove use of dma_virt_ops
  scsi: ufs: Re-enable WriteBooster after device reset
  scsi: ufs: Allow an error return value from ->device_reset()
  drm/i915/tgl: Fix Combo PHY DPLL fractional divider for 38.4MHz ref clock
  ALSA: hda/hdmi: Fix incorrect mutex unlock in silent_stream_disable()
  ALSA: hda/realtek - Modify Dell platform name
  Bluetooth: Fix attempting to set RPA timeout when unsupported
  kdev_t: always inline major/minor helper functions
  dt-bindings: rtc: add reset-source property
  rtc: pcf2127: only use watchdog when explicitly available
  rtc: pcf2127: move watchdog initialisation to a separate function
  Revert "mtd: spinand: Fix OOB read"
  Revert "drm/amd/display: Fix memory leaks in S3 resume"

Conflicts:
	Documentation/devicetree/bindings
	Documentation/devicetree/bindings/rtc/rtc.yaml
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/function/f_uac2.c
	fs/buffer.c
	include/linux/dma-mapping.h

Change-Id: Ia31d8db4ad2181df65e2c455c0c252563b4c004e
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-01-14 10:00:04 -08:00
Sami Tolvanen
2c351bb70a ANDROID: add support for Clang's Control Flow Integrity (CFI)
This change adds the CONFIG_CFI_CLANG option, CFI error handling,
and a faster look-up table for cross module CFI checks.

Bug: 145210207
Change-Id: I68d620ca548a911e2f49ba801bc0531406e679a3
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
2021-01-14 16:28:57 +00:00
Greg Kroah-Hartman
0290a41d05 Merge 5.10.6 into android12-5.10
Changes in 5.10.6
	Revert "drm/amd/display: Fix memory leaks in S3 resume"
	Revert "mtd: spinand: Fix OOB read"
	rtc: pcf2127: move watchdog initialisation to a separate function
	rtc: pcf2127: only use watchdog when explicitly available
	dt-bindings: rtc: add reset-source property
	kdev_t: always inline major/minor helper functions
	Bluetooth: Fix attempting to set RPA timeout when unsupported
	ALSA: hda/realtek - Modify Dell platform name
	ALSA: hda/hdmi: Fix incorrect mutex unlock in silent_stream_disable()
	drm/i915/tgl: Fix Combo PHY DPLL fractional divider for 38.4MHz ref clock
	scsi: ufs: Allow an error return value from ->device_reset()
	scsi: ufs: Re-enable WriteBooster after device reset
	RDMA/core: remove use of dma_virt_ops
	RDMA/siw,rxe: Make emulated devices virtual in the device tree
	fuse: fix bad inode
	perf: Break deadlock involving exec_update_mutex
	rwsem: Implement down_read_killable_nested
	rwsem: Implement down_read_interruptible
	exec: Transform exec_update_mutex into a rw_semaphore
	mwifiex: Fix possible buffer overflows in mwifiex_cmd_802_11_ad_hoc_start
	Linux 5.10.6

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id4c57a151a1e8f2162163d2337b6055f04edbe9b
2021-01-13 10:28:55 +01:00