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

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

Merge 4.19.170 into android-4.19-stable 



Changes in 4.19.170
	usb: ohci: Make distrust_firmware param default to false
	compiler.h: Raise minimum version of GCC to 5.1 for arm64
	dm integrity: fix flush with external metadata device
	crypto: x86/crc32c - fix building with clang ias
	nfsd4: readdirplus shouldn't return parent of export
	udp: Prevent reuseport_select_sock from reading uninitialized socks
	netxen_nic: fix MSI/MSI-x interrupts
	net: mvpp2: Remove Pause and Asym_Pause support
	rndis_host: set proper input size for OID_GEN_PHYSICAL_MEDIUM request
	esp: avoid unneeded kmap_atomic call
	net: dcb: Validate netlink message in DCB handler
	net: dcb: Accept RTM_GETDCB messages carrying set-like DCB commands
	rxrpc: Call state should be read with READ_ONCE() under some circumstances
	net: stmmac: Fixed mtu channged by cache aligned
	net: sit: unregister_netdevice on newlink's error path
	net: avoid 32 x truesize under-estimation for tiny skbs
	rxrpc: Fix handling of an unsupported token type in rxrpc_read()
	tipc: fix NULL deref in tipc_link_xmit()
	net: introduce skb_list_walk_safe for skb segment walking
	net: skbuff: disambiguate argument and member for skb_list_walk_safe helper
	net: ipv6: Validate GSO SKB before finish IPv6 processing
	spi: cadence: cache reference clock rate during probe
	Linux 4.19.170

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I4a12e49eae7097a468161952228c57c974a1b0ac
parents 1fd210f0 2263955b

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 169

SUBLEVEL = 170

EXTRAVERSION =

NAME = "People's Front"

arch/x86/crypto/crc32c-pcl-intel-asm_64.S

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ continue_block: 


	## branch into array

	lea	jump_table(%rip), bufp

	movzxw  (bufp, %rax, 2), len

	movzwq  (bufp, %rax, 2), len

	lea	crc_array(%rip), bufp

	lea     (bufp, len, 1), bufp

	JMP_NOSPEC bufp

drivers/md/dm-bufio.c

+6 −0
Original line number Diff line number Diff line
@@ -1450,6 +1450,12 @@ sector_t dm_bufio_get_device_size(struct dm_bufio_client *c) 
}

EXPORT_SYMBOL_GPL(dm_bufio_get_device_size);



struct dm_io_client *dm_bufio_get_dm_io_client(struct dm_bufio_client *c)

{

	return c->dm_io;

}

EXPORT_SYMBOL_GPL(dm_bufio_get_dm_io_client);



sector_t dm_bufio_get_block_number(struct dm_buffer *b)

{

	return b->block;

drivers/md/dm-integrity.c

+45 −5
Original line number Diff line number Diff line
@@ -1153,12 +1153,52 @@ static int dm_integrity_rw_tag(struct dm_integrity_c *ic, unsigned char *tag, se 
	return 0;

}



static void dm_integrity_flush_buffers(struct dm_integrity_c *ic)

struct flush_request {

	struct dm_io_request io_req;

	struct dm_io_region io_reg;

	struct dm_integrity_c *ic;

	struct completion comp;

};



static void flush_notify(unsigned long error, void *fr_)

{

	struct flush_request *fr = fr_;

	if (unlikely(error != 0))

		dm_integrity_io_error(fr->ic, "flusing disk cache", -EIO);

	complete(&fr->comp);

}



static void dm_integrity_flush_buffers(struct dm_integrity_c *ic, bool flush_data)

{

	int r;



	struct flush_request fr;



	if (!ic->meta_dev)

		flush_data = false;

	if (flush_data) {

		fr.io_req.bi_op = REQ_OP_WRITE,

		fr.io_req.bi_op_flags = REQ_PREFLUSH | REQ_SYNC,

		fr.io_req.mem.type = DM_IO_KMEM,

		fr.io_req.mem.ptr.addr = NULL,

		fr.io_req.notify.fn = flush_notify,

		fr.io_req.notify.context = &fr;

		fr.io_req.client = dm_bufio_get_dm_io_client(ic->bufio),

		fr.io_reg.bdev = ic->dev->bdev,

		fr.io_reg.sector = 0,

		fr.io_reg.count = 0,

		fr.ic = ic;

		init_completion(&fr.comp);

		r = dm_io(&fr.io_req, 1, &fr.io_reg, NULL);

		BUG_ON(r);

	}



	r = dm_bufio_write_dirty_buffers(ic->bufio);

	if (unlikely(r))

		dm_integrity_io_error(ic, "writing tags", r);



	if (flush_data)

		wait_for_completion(&fr.comp);

}



static void sleep_on_endio_wait(struct dm_integrity_c *ic)
@@ -1846,7 +1886,7 @@ static void integrity_commit(struct work_struct *w) 
	flushes = bio_list_get(&ic->flush_bio_list);

	if (unlikely(ic->mode != 'J')) {

		spin_unlock_irq(&ic->endio_wait.lock);

		dm_integrity_flush_buffers(ic);

		dm_integrity_flush_buffers(ic, true);

		goto release_flush_bios;

	}
@@ -2057,7 +2097,7 @@ static void do_journal_write(struct dm_integrity_c *ic, unsigned write_start, 
	complete_journal_op(&comp);

	wait_for_completion_io(&comp.comp);



	dm_integrity_flush_buffers(ic);

	dm_integrity_flush_buffers(ic, true);

}



static void integrity_writer(struct work_struct *w)
@@ -2099,7 +2139,7 @@ static void recalc_write_super(struct dm_integrity_c *ic) 
{

	int r;



	dm_integrity_flush_buffers(ic);

	dm_integrity_flush_buffers(ic, false);

	if (dm_integrity_failed(ic))

		return;
@@ -2409,7 +2449,7 @@ static void dm_integrity_postsuspend(struct dm_target *ti) 
		if (ic->meta_dev)

			queue_work(ic->writer_wq, &ic->writer_work);

		drain_workqueue(ic->writer_wq);

		dm_integrity_flush_buffers(ic);

		dm_integrity_flush_buffers(ic, true);

	}



	BUG_ON(!RB_EMPTY_ROOT(&ic->in_progress));

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

+0 −2
Original line number Diff line number Diff line
@@ -4266,8 +4266,6 @@ static void mvpp2_phylink_validate(struct net_device *dev, 


	phylink_set(mask, Autoneg);

	phylink_set_port_modes(mask);

	phylink_set(mask, Pause);

	phylink_set(mask, Asym_Pause);



	switch (state->interface) {

	case PHY_INTERFACE_MODE_10GKR: