Commit 0d3cca0c authored Mar 18, 2020 by Greg Kroah-Hartman

Merge 5.4.26 into android-5.4



Changes in 5.4.26
	virtio_balloon: Adjust label in virtballoon_probe
	ALSA: hda/realtek - More constifications
	ALSA: hda/realtek - Add Headset Mic supported for HP cPC
	ALSA: hda/realtek - Fixed one of HP ALC671 platform Headset Mic supported
	cgroup, netclassid: periodically release file_lock on classid updating
	gre: fix uninit-value in __iptunnel_pull_header
	inet_diag: return classid for all socket types
	ipv6/addrconf: call ipv6_mc_up() for non-Ethernet interface
	ipvlan: add cond_resched_rcu() while processing muticast backlog
	ipvlan: do not add hardware address of master to its unicast filter list
	ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast()
	ipvlan: don't deref eth hdr before checking it's set
	macvlan: add cond_resched() during multicast processing
	net: dsa: fix phylink_start()/phylink_stop() calls
	net: dsa: mv88e6xxx: fix lockup on warm boot
	net: fec: validate the new settings in fec_enet_set_coalesce()
	net: hns3: fix a not link up issue when fibre port supports autoneg
	net/ipv6: use configured metric when add peer route
	netlink: Use netlink header as base to calculate bad attribute offset
	net: macsec: update SCI upon MAC address change.
	net: nfc: fix bounds checking bugs on "pipe"
	net/packet: tpacket_rcv: do not increment ring index on drop
	net: phy: bcm63xx: fix OOPS due to missing driver name
	net: stmmac: dwmac1000: Disable ACS if enhanced descs are not used
	net: systemport: fix index check to avoid an array out of bounds access
	r8152: check disconnect status after long sleep
	sfc: detach from cb_page in efx_copy_channel()
	slip: make slhc_compress() more robust against malicious packets
	taprio: Fix sending packets without dequeueing them
	bonding/alb: make sure arp header is pulled before accessing it
	bnxt_en: reinitialize IRQs when MTU is modified
	bnxt_en: fix error handling when flashing from file
	cgroup: memcg: net: do not associate sock with unrelated cgroup
	net: memcg: late association of sock to memcg
	net: memcg: fix lockdep splat in inet_csk_accept()
	devlink: validate length of param values
	devlink: validate length of region addr/len
	fib: add missing attribute validation for tun_id
	nl802154: add missing attribute validation
	nl802154: add missing attribute validation for dev_type
	can: add missing attribute validation for termination
	macsec: add missing attribute validation for port
	net: fq: add missing attribute validation for orphan mask
	net: taprio: add missing attribute validation for txtime delay
	team: add missing attribute validation for port ifindex
	team: add missing attribute validation for array index
	tipc: add missing attribute validation for MTU property
	nfc: add missing attribute validation for SE API
	nfc: add missing attribute validation for deactivate target
	nfc: add missing attribute validation for vendor subcommand
	net: phy: avoid clearing PHY interrupts twice in irq handler
	net: phy: fix MDIO bus PM PHY resuming
	net/ipv6: need update peer route when modify metric
	net/ipv6: remove the old peer route if change it to a new one
	selftests/net/fib_tests: update addr_metric_test for peer route testing
	net: dsa: Don't instantiate phylink for CPU/DSA ports unless needed
	net: phy: Avoid multiple suspends
	cgroup: cgroup_procs_next should increase position index
	cgroup: Iterate tasks that did not finish do_exit()
	netfilter: nf_tables: fix infinite loop when expr is not available
	iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices
	virtio-blk: fix hw_queue stopped on arbitrary error
	iommu/vt-d: quirk_ioat_snb_local_iommu: replace WARN_TAINT with pr_warn + add_taint
	netfilter: nf_conntrack: ct_cpu_seq_next should increase position index
	netfilter: synproxy: synproxy_cpu_seq_next should increase position index
	netfilter: xt_recent: recent_seq_next should increase position index
	netfilter: x_tables: xt_mttg_seq_next should increase position index
	workqueue: don't use wq_select_unbound_cpu() for bound works
	drm/amd/display: remove duplicated assignment to grph_obj_type
	drm/i915: be more solid in checking the alignment
	drm/i915: Defer semaphore priority bumping to a workqueue
	mmc: sdhci-pci-gli: Enable MSI interrupt for GL975x
	pinctrl: falcon: fix syntax error
	ktest: Add timeout for ssh sync testing
	cifs_atomic_open(): fix double-put on late allocation failure
	gfs2_atomic_open(): fix O_EXCL|O_CREAT handling on cold dcache
	KVM: x86: clear stale x86_emulate_ctxt->intercept value
	KVM: nVMX: avoid NULL pointer dereference with incorrect EVMCS GPAs
	ARC: define __ALIGN_STR and __ALIGN symbols for ARC
	fuse: fix stack use after return
	s390/dasd: fix data corruption for thin provisioned devices
	ipmi_si: Avoid spurious errors for optional IRQs
	blk-iocost: fix incorrect vtime comparison in iocg_is_idle()
	fscrypt: don't evict dirty inodes after removing key
	macintosh: windfarm: fix MODINFO regression
	x86/ioremap: Map EFI runtime services data as encrypted for SEV
	efi: Fix a race and a buffer overflow while reading efivars via sysfs
	efi: Add a sanity check to efivar_store_raw()
	i2c: designware-pci: Fix BUG_ON during device removal
	mt76: fix array overflow on receiving too many fragments for a packet
	perf/amd/uncore: Replace manual sampling check with CAP_NO_INTERRUPT flag
	x86/mce: Fix logic and comments around MSR_PPIN_CTL
	iommu/dma: Fix MSI reservation allocation
	iommu/vt-d: dmar: replace WARN_TAINT with pr_warn + add_taint
	iommu/vt-d: Fix RCU list debugging warnings
	iommu/vt-d: Fix a bug in intel_iommu_iova_to_phys() for huge page
	batman-adv: Don't schedule OGM for disabled interface
	clk: imx8mn: Fix incorrect clock defines
	pinctrl: meson-gxl: fix GPIOX sdio pins
	pinctrl: imx: scu: Align imx sc msg structs to 4
	virtio_ring: Fix mem leak with vring_new_virtqueue()
	drm/i915/gvt: Fix dma-buf display blur issue on CFL
	pinctrl: core: Remove extra kref_get which blocks hogs being freed
	drm/i915/gvt: Fix unnecessary schedule timer when no vGPU exits
	driver code: clarify and fix platform device DMA mask allocation
	iommu/vt-d: Fix RCU-list bugs in intel_iommu_init()
	i2c: gpio: suppress error on probe defer
	nl80211: add missing attribute validation for critical protocol indication
	nl80211: add missing attribute validation for beacon report scanning
	nl80211: add missing attribute validation for channel switch
	perf bench futex-wake: Restore thread count default to online CPU count
	netfilter: cthelper: add missing attribute validation for cthelper
	netfilter: nft_payload: add missing attribute validation for payload csum flags
	netfilter: nft_tunnel: add missing attribute validation for tunnels
	netfilter: nf_tables: dump NFTA_CHAIN_FLAGS attribute
	netfilter: nft_chain_nat: inet family is missing module ownership
	iommu/vt-d: Fix the wrong printing in RHSA parsing
	iommu/vt-d: Ignore devices with out-of-spec domain number
	i2c: acpi: put device when verifying client fails
	iommu/amd: Fix IOMMU AVIC not properly update the is_run bit in IRTE
	ipv6: restrict IPV6_ADDRFORM operation
	net/smc: check for valid ib_client_data
	net/smc: cancel event worker during device removal
	Linux 5.4.26

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ifacde9164f8ded01031a9e6a9c313d4fbcead25b

parents 62a48a7e 257edc6d

Documentation/filesystems/porting.rst

+8 −0

Original line number	Diff line number	Diff line
		@@ -850,3 +850,11 @@ business doing so.
		d_alloc_pseudo() is internal-only; uses outside of alloc_file_pseudo() are
		very suspect (and won't work in modules). Such uses are very likely to
		be misspelled d_alloc_anon().

		---

		mandatory

		[should've been added in 2016] stale comment in finish_open() nonwithstanding,
		failure exits in ->atomic_open() instances should NOT fput() the file,
		no matter what. Everything is handled by the caller.

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 5
		PATCHLEVEL = 4
		SUBLEVEL = 25
		SUBLEVEL = 26
		EXTRAVERSION =
		NAME = Kleptomaniac Octopus

arch/arc/include/asm/linkage.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,8 @@
		.endm

		#define ASM_NL ` /* use '`' to mark new line in macro */
		#define __ALIGN .align 4
		#define __ALIGN_STR __stringify(__ALIGN)

		/* annotation for data we want in DCCM - if enabled in .config */
		.macro ARCFP_DATA nm

arch/x86/events/amd/uncore.c

+7 −10

Original line number	Diff line number	Diff line
		@@ -190,15 +190,12 @@ static int amd_uncore_event_init(struct perf_event *event)

		/*
		* NB and Last level cache counters (MSRs) are shared across all cores
		* that share the same NB / Last level cache. Interrupts can be directed
		* to a single target core, however, event counts generated by processes
		* running on other cores cannot be masked out. So we do not support
		* sampling and per-thread events.
		* that share the same NB / Last level cache. On family 16h and below,
		* Interrupts can be directed to a single target core, however, event
		* counts generated by processes running on other cores cannot be masked
		* out. So we do not support sampling and per-thread events via
		* CAP_NO_INTERRUPT, and we do not enable counter overflow interrupts:
		*/
		if (is_sampling_event(event) \|\| event->attach_state & PERF_ATTACH_TASK)
		return -EINVAL;

		/* and we do not enable counter overflow interrupts */
		hwc->config = event->attr.config & AMD64_RAW_EVENT_MASK_NB;
		hwc->idx = -1;

		@@ -306,7 +303,7 @@ static struct pmu amd_nb_pmu = {
		.start = amd_uncore_start,
		.stop = amd_uncore_stop,
		.read = amd_uncore_read,
		.capabilities = PERF_PMU_CAP_NO_EXCLUDE,
		.capabilities = PERF_PMU_CAP_NO_EXCLUDE \| PERF_PMU_CAP_NO_INTERRUPT,
		};

		static struct pmu amd_llc_pmu = {
		@@ -317,7 +314,7 @@ static struct pmu amd_llc_pmu = {
		.start = amd_uncore_start,
		.stop = amd_uncore_stop,
		.read = amd_uncore_read,
		.capabilities = PERF_PMU_CAP_NO_EXCLUDE,
		.capabilities = PERF_PMU_CAP_NO_EXCLUDE \| PERF_PMU_CAP_NO_INTERRUPT,
		};

		static struct amd_uncore *amd_uncore_alloc(unsigned int cpu)

arch/x86/kernel/cpu/mce/intel.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -489,17 +489,18 @@ static void intel_ppin_init(struct cpuinfo_x86 *c)
		return;

		if ((val & 3UL) == 1UL) {
		/* PPIN available but disabled: */
		/* PPIN locked in disabled mode */
		return;
		}

		/* If PPIN is disabled, but not locked, try to enable: */
		if (!(val & 3UL)) {
		/* If PPIN is disabled, try to enable */
		if (!(val & 2UL)) {
		wrmsrl_safe(MSR_PPIN_CTL, val \| 2UL);
		rdmsrl_safe(MSR_PPIN_CTL, &val);
		}

		if ((val & 3UL) == 2UL)
		/* Is the enable bit set? */
		if (val & 2UL)
		set_cpu_cap(c, X86_FEATURE_INTEL_PPIN);
		}
		}