Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5905c146 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.168 into android-4.19-stable 



Changes in 4.19.168
	net: cdc_ncm: correct overhead in delayed_ndp_size
	net: hns3: fix the number of queues actually used by ARQ
	net: stmmac: dwmac-sun8i: Balance internal PHY resource references
	net: stmmac: dwmac-sun8i: Balance internal PHY power
	net: vlan: avoid leaks on register_vlan_dev() failures
	net/sonic: Fix some resource leaks in error handling paths
	net: ip: always refragment ip defragmented packets
	net: fix pmtu check in nopmtudisc mode
	net: ipv6: fib: flush exceptions when purging route
	chtls: Fix hardware tid leak
	chtls: Remove invalid set_tcb call
	chtls: Fix panic when route to peer not configured
	chtls: Replace skb_dequeue with skb_peek
	chtls: Added a check to avoid NULL pointer dereference
	chtls: Fix chtls resources release sequence
	x86/resctrl: Use an IPI instead of task_work_add() to update PQR_ASSOC MSR
	x86/resctrl: Don't move a task to the same resource group
	vmlinux.lds.h: Add PGO and AutoFDO input sections
	drm/i915: Fix mismatch between misplaced vma check and vma insert
	spi: pxa2xx: Fix use-after-free on unbind
	iio: imu: st_lsm6dsx: flip irq return logic
	iio: imu: st_lsm6dsx: fix edge-trigger interrupts
	HID: wacom: Fix memory leakage caused by kfifo_alloc
	ARM: OMAP2+: omap_device: fix idling of devices during probe
	i2c: sprd: use a specific timeout to avoid system hang up issue
	cpufreq: powernow-k8: pass policy rather than use cpufreq_cpu_get()
	spi: stm32: FIFO threshold level - fix align packet size
	dmaengine: mediatek: mtk-hsdma: Fix a resource leak in the error handling path of the probe function
	dmaengine: xilinx_dma: check dma_async_device_register return value
	dmaengine: xilinx_dma: fix incompatible param warning in _child_probe()
	dmaengine: xilinx_dma: fix mixed_enum_type coverity warning
	wil6210: select CONFIG_CRC32
	block: rsxx: select CONFIG_CRC32
	lightnvm: select CONFIG_CRC32
	iommu/intel: Fix memleak in intel_irq_remapping_alloc
	net/mlx5e: Fix memleak in mlx5e_create_l2_table_groups
	net/mlx5e: Fix two double free cases
	regmap: debugfs: Fix a memory leak when calling regmap_attach_dev
	wan: ds26522: select CONFIG_BITREVERSE
	KVM: arm64: Don't access PMCR_EL0 when no PMU is available
	block: fix use-after-free in disk_part_iter_next
	net: drop bogus skb with CHECKSUM_PARTIAL and offset beyond end of trimmed packet
	regmap: debugfs: Fix a reversed if statement in regmap_debugfs_init()
	Linux 4.19.168

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia39a78431db8bf624b3d0c0940be36c514b79a77
parents 6c376abc c110fed0

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 167

SUBLEVEL = 168

EXTRAVERSION =

NAME = "People's Front"

arch/arm/mach-omap2/omap_device.c

+5 −3
Original line number Diff line number Diff line
@@ -239,11 +239,13 @@ static int _omap_device_notifier_call(struct notifier_block *nb, 
		break;

	case BUS_NOTIFY_BIND_DRIVER:

		od = to_omap_device(pdev);

		if (od && (od->_state == OMAP_DEVICE_STATE_ENABLED) &&

		    pm_runtime_status_suspended(dev)) {

		if (od) {

			od->_driver_status = BUS_NOTIFY_BIND_DRIVER;

			if (od->_state == OMAP_DEVICE_STATE_ENABLED &&

			    pm_runtime_status_suspended(dev)) {

				pm_runtime_set_active(dev);

			}

		}

		break;

	case BUS_NOTIFY_ADD_DEVICE:

		if (pdev->dev.of_node)

arch/arm64/kvm/sys_regs.c

+4 −0
Original line number Diff line number Diff line
@@ -619,6 +619,10 @@ static void reset_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r) 
{

	u64 pmcr, val;



	/* No PMU available, PMCR_EL0 may UNDEF... */

	if (!kvm_arm_support_pmu_v3())

		return;



	pmcr = read_sysreg(pmcr_el0);

	/*

	 * Writable bits of PMCR_EL0 (ARMV8_PMU_PMCR_MASK) are reset to UNKNOWN

arch/x86/kernel/cpu/intel_rdt_rdtgroup.c

+49 −64
Original line number Diff line number Diff line
@@ -533,72 +533,43 @@ static void rdtgroup_remove(struct rdtgroup *rdtgrp) 
	kfree(rdtgrp);

}



struct task_move_callback {

	struct callback_head	work;

	struct rdtgroup		*rdtgrp;

};



static void move_myself(struct callback_head *head)

static void _update_task_closid_rmid(void *task)

{

	struct task_move_callback *callback;

	struct rdtgroup *rdtgrp;



	callback = container_of(head, struct task_move_callback, work);

	rdtgrp = callback->rdtgrp;



	/*

	 * If resource group was deleted before this task work callback

	 * was invoked, then assign the task to root group and free the

	 * resource group.

	 * If the task is still current on this CPU, update PQR_ASSOC MSR.

	 * Otherwise, the MSR is updated when the task is scheduled in.

	 */

	if (atomic_dec_and_test(&rdtgrp->waitcount) &&

	    (rdtgrp->flags & RDT_DELETED)) {

		current->closid = 0;

		current->rmid = 0;

		rdtgroup_remove(rdtgrp);

	}



	preempt_disable();

	/* update PQR_ASSOC MSR to make resource group go into effect */

	if (task == current)

		intel_rdt_sched_in();

	preempt_enable();

}



	kfree(callback);

static void update_task_closid_rmid(struct task_struct *t)

{

	if (IS_ENABLED(CONFIG_SMP) && task_curr(t))

		smp_call_function_single(task_cpu(t), _update_task_closid_rmid, t, 1);

	else

		_update_task_closid_rmid(t);

}



static int __rdtgroup_move_task(struct task_struct *tsk,

				struct rdtgroup *rdtgrp)

{

	struct task_move_callback *callback;

	int ret;



	callback = kzalloc(sizeof(*callback), GFP_KERNEL);

	if (!callback)

		return -ENOMEM;

	callback->work.func = move_myself;

	callback->rdtgrp = rdtgrp;

	/* If the task is already in rdtgrp, no need to move the task. */

	if ((rdtgrp->type == RDTCTRL_GROUP && tsk->closid == rdtgrp->closid &&

	     tsk->rmid == rdtgrp->mon.rmid) ||

	    (rdtgrp->type == RDTMON_GROUP && tsk->rmid == rdtgrp->mon.rmid &&

	     tsk->closid == rdtgrp->mon.parent->closid))

		return 0;



	/*

	 * Take a refcount, so rdtgrp cannot be freed before the

	 * callback has been invoked.

	 */

	atomic_inc(&rdtgrp->waitcount);

	ret = task_work_add(tsk, &callback->work, true);

	if (ret) {

		/*

		 * Task is exiting. Drop the refcount and free the callback.

		 * No need to check the refcount as the group cannot be

		 * deleted before the write function unlocks rdtgroup_mutex.

		 */

		atomic_dec(&rdtgrp->waitcount);

		kfree(callback);

		rdt_last_cmd_puts("task exited\n");

	} else {

		/*

		 * For ctrl_mon groups move both closid and rmid.

	 * Set the task's closid/rmid before the PQR_ASSOC MSR can be

	 * updated by them.

	 *

	 * For ctrl_mon groups, move both closid and rmid.

	 * For monitor groups, can move the tasks only from

	 * their parent CTRL group.

	 */



	if (rdtgrp->type == RDTCTRL_GROUP) {

		tsk->closid = rdtgrp->closid;

		tsk->rmid = rdtgrp->mon.rmid;
@@ -607,11 +578,25 @@ static int __rdtgroup_move_task(struct task_struct *tsk, 
			tsk->rmid = rdtgrp->mon.rmid;

		} else {

			rdt_last_cmd_puts("Can't move task to different control group\n");

				ret = -EINVAL;

			}

			return -EINVAL;

		}

	}

	return ret;



	/*

	 * Ensure the task's closid and rmid are written before determining if

	 * the task is current that will decide if it will be interrupted.

	 */

	barrier();



	/*

	 * By now, the task's closid and rmid are set. If the task is current

	 * on a CPU, the PQR_ASSOC MSR needs to be updated to make the resource

	 * group go into effect. If the task is not current, the MSR will be

	 * updated when the task is scheduled in.

	 */

	update_task_closid_rmid(tsk);



	return 0;

}



/**

block/genhd.c

+6 −3
Original line number Diff line number Diff line
@@ -208,14 +208,17 @@ struct hd_struct *disk_part_iter_next(struct disk_part_iter *piter) 
		part = rcu_dereference(ptbl->part[piter->idx]);

		if (!part)

			continue;

		get_device(part_to_dev(part));

		piter->part = part;

		if (!part_nr_sects_read(part) &&

		    !(piter->flags & DISK_PITER_INCL_EMPTY) &&

		    !(piter->flags & DISK_PITER_INCL_EMPTY_PART0 &&

		      piter->idx == 0))

		      piter->idx == 0)) {

			put_device(part_to_dev(part));

			piter->part = NULL;

			continue;

		}



		get_device(part_to_dev(part));

		piter->part = part;

		piter->idx += inc;

		break;

	}