Commit e18c011a authored Oct 12, 2023 by Greg Kroah-Hartman

Merge 5.4.258 into android11-5.4-lts



Changes in 5.4.258
	NFS/pNFS: Report EINVAL errors from connect() to the server
	SUNRPC: Mark the cred for revalidation if the server rejects it
	tracing: Increase trace array ref count on enable and filter files
	ata: libahci: clear pending interrupt status
	ext4: remove the 'group' parameter of ext4_trim_extent
	ext4: add new helper interface ext4_try_to_trim_range()
	ext4: scope ret locally in ext4_try_to_trim_range()
	ext4: change s_last_trim_minblks type to unsigned long
	ext4: mark group as trimmed only if it was fully scanned
	ext4: replace the traditional ternary conditional operator with with max()/min()
	ext4: move setting of trimmed bit into ext4_try_to_trim_range()
	ext4: do not let fstrim block system suspend
	ASoC: meson: spdifin: start hw on dai probe
	netfilter: nf_tables: disallow element removal on anonymous sets
	bpf: Avoid deadlock when using queue and stack maps from NMI
	selftests/tls: Add {} to avoid static checker warning
	selftests: tls: swap the TX and RX sockets in some tests
	ASoC: imx-audmix: Fix return error with devm_clk_get()
	i40e: Fix for persistent lldp support
	i40e: Remove scheduling while atomic possibility
	i40e: Fix warning message and call stack during rmmod i40e driver
	i40e: Fix VF VLAN offloading when port VLAN is configured
	ipv4: fix null-deref in ipv4_link_failure
	powerpc/perf/hv-24x7: Update domain value check
	dccp: fix dccp_v4_err()/dccp_v6_err() again
	net: hns3: add 5ms delay before clear firmware reset irq source
	net: bridge: use DEV_STATS_INC()
	team: fix null-ptr-deref when team device type is changed
	net: rds: Fix possible NULL-pointer dereference
	netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
	gpio: tb10x: Fix an error handling path in tb10x_gpio_probe()
	i2c: mux: demux-pinctrl: check the return value of devm_kstrdup()
	Input: i8042 - add quirk for TUXEDO Gemini 17 Gen1/Clevo PD70PN
	scsi: qla2xxx: Fix update_fcport for current_topology
	scsi: qla2xxx: Fix deletion race condition
	drm/amd/display: Reinstate LFC optimization
	drm/amd/display: Fix LFC multiplier changing erratically
	drm/amd/display: prevent potential division by zero errors
	ata: libata: disallow dev-initiated LPM transitions to unsupported states
	MIPS: Alchemy: only build mmc support helpers if au1xmmc is enabled
	clk: tegra: fix error return case for recalc_rate
	ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot
	bus: ti-sysc: Fix SYSC_QUIRK_SWSUP_SIDLE_ACT handling for uart wake-up
	xtensa: add default definition for XCHAL_HAVE_DIV32
	xtensa: iss/network: make functions static
	xtensa: boot: don't add include-dirs
	xtensa: boot/lib: fix function prototypes
	gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip
	parisc: sba: Fix compile warning wrt list of SBA devices
	parisc: iosapic.c: Fix sparse warnings
	parisc: drivers: Fix sparse warning
	parisc: irq: Make irq_stack_union static to avoid sparse warning
	selftests/ftrace: Correctly enable event in instance-event.tc
	ring-buffer: Avoid softlockup in ring_buffer_resize()
	ata: libata-eh: do not clear ATA_PFLAG_EH_PENDING in ata_eh_reset()
	spi: nxp-fspi: reset the FLSHxCR1 registers
	bpf: Clarify error expectations from bpf_clone_redirect
	powerpc/watchpoints: Annotate atomic context in more places
	ncsi: Propagate carrier gain/loss events to the NCSI controller
	fbdev/sh7760fb: Depend on FB=y
	nvme-pci: do not set the NUMA node of device if it has none
	watchdog: iTCO_wdt: No need to stop the timer in probe
	watchdog: iTCO_wdt: Set NO_REBOOT if the watchdog is not already running
	i40e: improve locking of mac_filter_hash
	i40e: always propagate error value in i40e_set_vsi_promisc()
	i40e: fix return of uninitialized aq_ret in i40e_set_vsi_promisc
	smack: Record transmuting in smk_transmuted
	smack: Retrieve transmuting information in smack_inode_getsecurity()
	Smack:- Use overlay inode label in smack_inode_copy_up()
	serial: 8250_port: Check IRQ data before use
	nilfs2: fix potential use after free in nilfs_gccache_submit_read_data()
	ALSA: hda: Disable power save for solving pop issue on Lenovo ThinkCentre M70q
	ata: libata-scsi: ignore reserved bits for REPORT SUPPORTED OPERATION CODES
	i2c: i801: unregister tco_pdev in i801_probe() error path
	ring-buffer: Update "shortest_full" in polling
	btrfs: properly report 0 avail for very full file systems
	net: thunderbolt: Fix TCPv6 GSO checksum calculation
	ata: libata-core: Fix ata_port_request_pm() locking
	ata: libata-core: Fix port and device removal
	ata: libata-core: Do not register PM operations for SAS ports
	ata: libata-sata: increase PMP SRST timeout to 10s
	fs: binfmt_elf_efpic: fix personality for ELF-FDPIC
	rbd: move rbd_dev_refresh() definition
	rbd: decouple header read-in from updating rbd_dev->header
	rbd: decouple parent info read-in from updating rbd_dev
	rbd: take header_rwsem in rbd_dev_refresh() only when updating
	Revert "PCI: qcom: Disable write access to read only registers for IP v2.3.3"
	scsi: zfcp: Fix a double put in zfcp_port_enqueue()
	qed/red_ll2: Fix undefined behavior bug in struct qed_ll2_info
	wifi: mwifiex: Fix tlv_buf_left calculation
	net: replace calls to sock->ops->connect() with kernel_connect()
	net: prevent rewrite of msg_name in sock_sendmsg()
	ubi: Refuse attaching if mtd's erasesize is 0
	wifi: iwlwifi: dbg_ini: fix structure packing
	wifi: mwifiex: Fix oob check condition in mwifiex_process_rx_packet
	drivers/net: process the result of hdlc_open() and add call of hdlc_close() in uhdlc_close()
	wifi: mt76: mt76x02: fix MT76x0 external LNA gain handling
	regmap: rbtree: Fix wrong register marked as in-cache when creating new node
	ima: Finish deprecation of IMA_TRUSTED_KEYRING Kconfig
	scsi: target: core: Fix deadlock due to recursive locking
	NFS4: Trace state recovery operation
	NFS: Add a helper nfs_client_for_each_server()
	NFSv4: Fix a nfs4_state_manager() race
	modpost: add missing else to the "of" check
	net: fix possible store tearing in neigh_periodic_work()
	ipv4, ipv6: Fix handling of transhdrlen in __ip{,6}_append_data()
	net: dsa: mv88e6xxx: Avoid EEPROM timeout when EEPROM is absent
	net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg
	net: nfc: llcp: Add lock when modifying device list
	netfilter: handle the connecting collision properly in nf_conntrack_proto_sctp
	net: stmmac: dwmac-stm32: fix resume on STM32 MCU
	tcp: fix quick-ack counting to count actual ACKs of new data
	tcp: fix delayed ACKs for MSS boundary condition
	sctp: update transport state when processing a dupcook packet
	sctp: update hb timer immediately after users change hb_interval
	cpupower: add Makefile dependencies for install targets
	RDMA/core: Require admin capabilities to set system parameters
	IB/mlx4: Fix the size of a buffer in add_port_entries()
	gpio: aspeed: fix the GPIO number passed to pinctrl_gpio_set_config()
	gpio: pxa: disable pinctrl calls for MMP_GPIO
	RDMA/cma: Fix truncation compilation warning in make_cma_ports
	RDMA/uverbs: Fix typo of sizeof argument
	RDMA/siw: Fix connection failure handling
	RDMA/mlx5: Fix NULL string error
	parisc: Restore __ldcw_align for PA-RISC 2.0 processors
	NFS: Fix a race in __nfs_list_for_each_server()
	ima: rework CONFIG_IMA dependency block
	xen/events: replace evtchn_rwlock with RCU
	Linux 5.4.258

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

parents 4542148a 02f78c59

Makefile

+1 −1

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

arch/parisc/include/asm/ldcw.h

+20 −16

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		#ifndef __PARISC_LDCW_H
		#define __PARISC_LDCW_H

		#ifndef CONFIG_PA20
		/* Because kmalloc only guarantees 8-byte alignment for kmalloc'd data,
		and GCC only guarantees 8-byte alignment for stack locals, we can't
		be assured of 16-byte alignment for atomic lock data even if we
		@@ -11,6 +10,21 @@
		type and dynamically select the 16-byte aligned int from the array
		for the semaphore. */

		/* From: "Jim Hull" <jim.hull of hp.com>
		I've attached a summary of the change, but basically, for PA 2.0, as
		long as the ",CO" (coherent operation) completer is implemented, then the
		16-byte alignment requirement for ldcw and ldcd is relaxed, and instead
		they only require "natural" alignment (4-byte for ldcw, 8-byte for
		ldcd).

		Although the cache control hint is accepted by all PA 2.0 processors,
		it is only implemented on PA8800/PA8900 CPUs. Prior PA8X00 CPUs still
		require 16-byte alignment. If the address is unaligned, the operation
		of the instruction is undefined. The ldcw instruction does not generate
		unaligned data reference traps so misaligned accesses are not detected.
		This hid the problem for years. So, restore the 16-byte alignment dropped
		by Kyle McMartin in "Remove __ldcw_align for PA-RISC 2.0 processors". */

		#define __PA_LDCW_ALIGNMENT 16
		#define __PA_LDCW_ALIGN_ORDER 4
		#define __ldcw_align(a) ({ \
		@@ -19,22 +33,12 @@
		& ~(__PA_LDCW_ALIGNMENT - 1); \
		(volatile unsigned int *) __ret; \
		})
		#define __LDCW "ldcw"

		#else /CONFIG_PA20/
		/* From: "Jim Hull" <jim.hull of hp.com>
		I've attached a summary of the change, but basically, for PA 2.0, as
		long as the ",CO" (coherent operation) completer is specified, then the
		16-byte alignment requirement for ldcw and ldcd is relaxed, and instead
		they only require "natural" alignment (4-byte for ldcw, 8-byte for
		ldcd). */

		#define __PA_LDCW_ALIGNMENT 4
		#define __PA_LDCW_ALIGN_ORDER 2
		#define __ldcw_align(a) (&(a)->slock)
		#ifdef CONFIG_PA20
		#define __LDCW "ldcw,co"

		#endif /!CONFIG_PA20/
		#else
		#define __LDCW "ldcw"
		#endif

		/* LDCW, the only atomic read-write operation PA-RISC has. sigh.
		We don't explicitly expose that "*a" may be written as reload

arch/parisc/include/asm/spinlock_types.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -3,13 +3,8 @@
		#define __ASM_SPINLOCK_TYPES_H

		typedef struct {
		#ifdef CONFIG_PA20
		volatile unsigned int slock;
		# define __ARCH_SPIN_LOCK_UNLOCKED { 1 }
		#else
		volatile unsigned int lock[4];
		# define __ARCH_SPIN_LOCK_UNLOCKED { { 1, 1, 1, 1 } }
		#endif
		} arch_spinlock_t;

		typedef struct {

drivers/ata/libata-core.c

+30 −11

Original line number	Diff line number	Diff line
		@@ -5751,17 +5751,19 @@ static void ata_port_request_pm(struct ata_port *ap, pm_message_t mesg,
		struct ata_link *link;
		unsigned long flags;

		/* Previous resume operation might still be in
		* progress. Wait for PM_PENDING to clear.
		spin_lock_irqsave(ap->lock, flags);

		/*
		* A previous PM operation might still be in progress. Wait for
		* ATA_PFLAG_PM_PENDING to clear.
		*/
		if (ap->pflags & ATA_PFLAG_PM_PENDING) {
		spin_unlock_irqrestore(ap->lock, flags);
		ata_port_wait_eh(ap);
		WARN_ON(ap->pflags & ATA_PFLAG_PM_PENDING);
		}

		/* request PM ops to EH */
		spin_lock_irqsave(ap->lock, flags);
		}

		/* Request PM operation to EH */
		ap->pm_mesg = mesg;
		ap->pflags \|= ATA_PFLAG_PM_PENDING;
		ata_for_each_link(link, ap, HOST_FIRST) {
		@@ -5773,10 +5775,8 @@ static void ata_port_request_pm(struct ata_port *ap, pm_message_t mesg,

		spin_unlock_irqrestore(ap->lock, flags);

		if (!async) {
		if (!async)
		ata_port_wait_eh(ap);
		WARN_ON(ap->pflags & ATA_PFLAG_PM_PENDING);
		}
		}

		/*
		@@ -5942,7 +5942,7 @@ void ata_host_resume(struct ata_host *host)
		#endif

		const struct device_type ata_port_type = {
		.name = "ata_port",
		.name = ATA_PORT_TYPE_NAME,
		#ifdef CONFIG_PM
		.pm = &ata_port_pm_ops,
		#endif
		@@ -6745,11 +6745,30 @@ static void ata_port_detach(struct ata_port *ap)
		if (!ap->ops->error_handler)
		goto skip_eh;

		/* tell EH we're leaving & flush EH */
		/* Wait for any ongoing EH */
		ata_port_wait_eh(ap);

		mutex_lock(&ap->scsi_scan_mutex);
		spin_lock_irqsave(ap->lock, flags);

		/* Remove scsi devices */
		ata_for_each_link(link, ap, HOST_FIRST) {
		ata_for_each_dev(dev, link, ALL) {
		if (dev->sdev) {
		spin_unlock_irqrestore(ap->lock, flags);
		scsi_remove_device(dev->sdev);
		spin_lock_irqsave(ap->lock, flags);
		dev->sdev = NULL;
		}
		}
		}

		/* Tell EH to disable all devices */
		ap->pflags \|= ATA_PFLAG_UNLOADING;
		ata_port_schedule_eh(ap);

		spin_unlock_irqrestore(ap->lock, flags);
		mutex_unlock(&ap->scsi_scan_mutex);

		/* wait till EH commits suicide */
		ata_port_wait_eh(ap);

drivers/ata/libata-transport.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -266,6 +266,10 @@ void ata_tport_delete(struct ata_port *ap)
		put_device(dev);
		}

		static const struct device_type ata_port_sas_type = {
		.name = ATA_PORT_TYPE_NAME,
		};

		/** ata_tport_add - initialize a transport ATA port structure
		*
		* @parent: parent device
		@@ -283,6 +287,9 @@ int ata_tport_add(struct device *parent,
		struct device *dev = &ap->tdev;

		device_initialize(dev);
		if (ap->flags & ATA_FLAG_SAS_HOST)
		dev->type = &ata_port_sas_type;
		else
		dev->type = &ata_port_type;

		dev->parent = parent;