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

Commit cc833652 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Treehugger Robot
Browse files

Merge 52c46caf ("tcp: Add memory barrier to tcp_push()") into android-mainline 



Steps on the way to 4.19.307

Change-Id: I67749a2eebff3778e717a9acce93c1d7ed1f6328
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 8ea171e4 52c46caf

arch/powerpc/lib/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ obj-$(CONFIG_PPC32) += div64.o copy_32.o crtsavres.o strlen_32.o 
# 64-bit linker creates .sfpr on demand for final link (vmlinux),

# so it is only needed for modules, and only for older linkers which

# do not support --save-restore-funcs

ifeq ($(call ld-ifversion, -lt, 225000000, y),y)

always-$(CONFIG_PPC64)	+= crtsavres.o

ifeq ($(call ld-ifversion, -lt, 225000000, y)$(CONFIG_PPC64),yy)

always	+= crtsavres.o

endif



obj-$(CONFIG_PPC_BOOK3S_64) += copyuser_power7.o copypage_power7.o \

arch/x86/kernel/cpu/amd.c

+11 −9
Original line number Diff line number Diff line
@@ -271,15 +271,6 @@ static void init_amd_k6(struct cpuinfo_x86 *c) 
		return;

	}

#endif

	/*

	 * Work around Erratum 1386.  The XSAVES instruction malfunctions in

	 * certain circumstances on Zen1/2 uarch, and not all parts have had

	 * updated microcode at the time of writing (March 2023).

	 *

	 * Affected parts all have no supervisor XSAVE states, meaning that

	 * the XSAVEC instruction (which works fine) is equivalent.

	 */

	clear_cpu_cap(c, X86_FEATURE_XSAVES);

}



static void init_amd_k7(struct cpuinfo_x86 *c)
@@ -979,6 +970,17 @@ static void init_amd_zn(struct cpuinfo_x86 *c) 
		if (c->x86 == 0x19 && !cpu_has(c, X86_FEATURE_BTC_NO))

			set_cpu_cap(c, X86_FEATURE_BTC_NO);

	}



	/*

	 * Work around Erratum 1386.  The XSAVES instruction malfunctions in

	 * certain circumstances on Zen1/2 uarch, and not all parts have had

	 * updated microcode at the time of writing (March 2023).

	 *

	 * Affected parts all have no supervisor XSAVE states, meaning that

	 * the XSAVEC instruction (which works fine) is equivalent.

	 */

	if (c->x86 == 0x17)

		clear_cpu_cap(c, X86_FEATURE_XSAVES);

}



static bool cpu_has_zenbleed_microcode(void)

drivers/base/core.c

+6 −4
Original line number Diff line number Diff line
@@ -3789,13 +3789,15 @@ define_dev_printk_level(_dev_info, KERN_INFO); 
 * This helper implements common pattern present in probe functions for error

 * checking: print debug or error message depending if the error value is

 * -EPROBE_DEFER and propagate error upwards.

 * It replaces code sequence:

 * It replaces code sequence::

 * 	if (err != -EPROBE_DEFER)

 * 		dev_err(dev, ...);

 * 	else

 * 		dev_dbg(dev, ...);

 * 	return err;

 * with

 *

 * with::

 *

 * 	return dev_err_probe(dev, err, ...);

 *

 * Returns @err.
@@ -3811,9 +3813,9 @@ int dev_err_probe(const struct device *dev, int err, const char *fmt, ...) 
	vaf.va = &args;



	if (err != -EPROBE_DEFER)

		dev_err(dev, "error %d: %pV", err, &vaf);

		dev_err(dev, "error %pe: %pV", ERR_PTR(err), &vaf);

	else

		dev_dbg(dev, "error %d: %pV", err, &vaf);

		dev_dbg(dev, "error %pe: %pV", ERR_PTR(err), &vaf);



	va_end(args);

include/net/llc_pdu.h

+2 −4
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ static inline void llc_pdu_header_init(struct sk_buff *skb, u8 type, 
 */

static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)

{

	if (skb->protocol == htons(ETH_P_802_2))

	memcpy(sa, eth_hdr(skb)->h_source, ETH_ALEN);

}
@@ -275,7 +274,6 @@ static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa) 
 */

static inline void llc_pdu_decode_da(struct sk_buff *skb, u8 *da)

{

	if (skb->protocol == htons(ETH_P_802_2))

	memcpy(da, eth_hdr(skb)->h_dest, ETH_ALEN);

}

kernel/trace/tracing_map.c

+6 −1
Original line number Diff line number Diff line
@@ -574,7 +574,12 @@ __tracing_map_insert(struct tracing_map *map, void *key, bool lookup_only) 
				}



				memcpy(elt->key, key, map->key_size);

				entry->val = elt;

				/*

				 * Ensure the initialization is visible and

				 * publish the elt.

				 */

				smp_wmb();

				WRITE_ONCE(entry->val, elt);

				atomic64_inc(&map->hits);



				return entry->val;