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

Commit dbc4aced authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14.132 (0dcd8eb0) into msm-4.14 



* refs/heads/tmp-0dcd8eb0:
  Linux 4.14.132
  arm64: insn: Fix ldadd instruction encoding
  tipc: pass tunnel dev as NULL to udp_tunnel(6)_xmit_skb
  futex: Update comments and docs about return values of arch futex code
  bpf, arm64: use more scalable stadd over ldxr / stxr loop in xadd
  arm64: futex: Avoid copying out uninitialised stack in failed cmpxchg()
  bpf: udp: ipv6: Avoid running reuseport's bpf_prog from __udp6_lib_err
  bpf: udp: Avoid calling reuseport's bpf_prog from udp_gro
  bonding: Always enable vlan tx offload
  team: Always enable vlan tx offload
  tun: wake up waitqueues after IFF_UP is set
  tipc: check msg->req data len in tipc_nl_compat_bearer_disable
  tipc: change to use register_pernet_device
  sctp: change to hold sk after auth shkey is created successfully
  net: stmmac: fixed new system time seconds value calculation
  net: remove duplicate fetch in sock_getsockopt
  net/packet: fix memory leak in packet_set_ring()
  ipv4: Use return value of inet_iif() for __raw_v4_lookup in the while loop
  af_packet: Block execution of tasks waiting for transmit to complete in AF_PACKET
  eeprom: at24: fix unexpected timeout under high load
  cpu/speculation: Warn on unsupported mitigations= parameter
  NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O
  x86/microcode: Fix the microcode load on CPU hotplug for real
  x86/speculation: Allow guests to use SSBD even if host does not
  scsi: vmw_pscsi: Fix use-after-free in pvscsi_queue_lck()
  dm log writes: make sure super sector log updates are written in order
  mm/page_idle.c: fix oops because end_pfn is larger than max_pfn
  fs/binfmt_flat.c: make load_flat_shared_library() work
  mm/mempolicy.c: fix an incorrect rebind node in mpol_rebind_nodemask
  fs/proc/array.c: allow reporting eip/esp for all coredumping threads
  Revert "compiler.h: update definition of unreachable()"
  qmi_wwan: Fix out-of-bounds read
  net/9p: include trans_common.h to fix missing prototype warning.
  9p: p9dirent_read: check network-provided name length
  9p/rdma: remove useless check in cm_event_handler
  9p: acl: fix uninitialized iattr access
  9p/rdma: do not disconnect on down_interruptible EAGAIN
  9p/xen: fix check for xenbus_read error in front_probe
  block: bio_iov_iter_get_pages: pin more pages for multi-segment IOs
  block: add a lower-level bio_add_page interface
  IB/hfi1: Close PSM sdma_progress sleep window
  Revert "x86/uaccess, ftrace: Fix ftrace_likely_update() vs. SMAP"
  perf header: Fix unchecked usage of strncpy()
  perf help: Remove needless use of strncpy()
  perf ui helpline: Use strlcpy() as a shorter form of strncpy() + explicit set nul

Change-Id: I253fc7ffebfad129b8c2165dd2d5aa5af221fd4b
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents b7ca0f32 0dcd8eb0

Documentation/robust-futexes.txt

+1 −2
Original line number Diff line number Diff line
@@ -218,5 +218,4 @@ All other architectures should build just fine too - but they won't have 
the new syscalls yet.



Architectures need to implement the new futex_atomic_cmpxchg_inatomic()

inline function before writing up the syscalls (that function returns

-ENOSYS right now).
 
inline function before writing up the syscalls.

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 131

SUBLEVEL = 132

EXTRAVERSION =

NAME = Petit Gorille

arch/arm64/include/asm/futex.h

+3 −1
Original line number Diff line number Diff line
@@ -134,7 +134,9 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *_uaddr, 
	: "memory");

	uaccess_disable();



	if (!ret)

		*uval = val;



	return ret;

}

arch/arm64/include/asm/insn.h

+8 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ __AARCH64_INSN_FUNCS(adrp, 0x9F000000, 0x90000000) 
__AARCH64_INSN_FUNCS(prfm,	0x3FC00000, 0x39800000)

__AARCH64_INSN_FUNCS(prfm_lit,	0xFF000000, 0xD8000000)

__AARCH64_INSN_FUNCS(str_reg,	0x3FE0EC00, 0x38206800)

__AARCH64_INSN_FUNCS(ldadd,	0x3F20FC00, 0x38200000)

__AARCH64_INSN_FUNCS(ldr_reg,	0x3FE0EC00, 0x38606800)

__AARCH64_INSN_FUNCS(ldr_lit,	0xBF000000, 0x18000000)

__AARCH64_INSN_FUNCS(ldrsw_lit,	0xFF000000, 0x98000000)
@@ -383,6 +384,13 @@ u32 aarch64_insn_gen_load_store_ex(enum aarch64_insn_register reg, 
				   enum aarch64_insn_register state,

				   enum aarch64_insn_size_type size,

				   enum aarch64_insn_ldst_type type);

u32 aarch64_insn_gen_ldadd(enum aarch64_insn_register result,

			   enum aarch64_insn_register address,

			   enum aarch64_insn_register value,

			   enum aarch64_insn_size_type size);

u32 aarch64_insn_gen_stadd(enum aarch64_insn_register address,

			   enum aarch64_insn_register value,

			   enum aarch64_insn_size_type size);

u32 aarch64_insn_gen_add_sub_imm(enum aarch64_insn_register dst,

				 enum aarch64_insn_register src,

				 int imm, enum aarch64_insn_variant variant,

arch/arm64/kernel/insn.c

+40 −0
Original line number Diff line number Diff line
@@ -793,6 +793,46 @@ u32 aarch64_insn_gen_load_store_ex(enum aarch64_insn_register reg, 
					    state);

}



u32 aarch64_insn_gen_ldadd(enum aarch64_insn_register result,

			   enum aarch64_insn_register address,

			   enum aarch64_insn_register value,

			   enum aarch64_insn_size_type size)

{

	u32 insn = aarch64_insn_get_ldadd_value();



	switch (size) {

	case AARCH64_INSN_SIZE_32:

	case AARCH64_INSN_SIZE_64:

		break;

	default:

		pr_err("%s: unimplemented size encoding %d\n", __func__, size);

		return AARCH64_BREAK_FAULT;

	}



	insn = aarch64_insn_encode_ldst_size(size, insn);



	insn = aarch64_insn_encode_register(AARCH64_INSN_REGTYPE_RT, insn,

					    result);



	insn = aarch64_insn_encode_register(AARCH64_INSN_REGTYPE_RN, insn,

					    address);



	return aarch64_insn_encode_register(AARCH64_INSN_REGTYPE_RS, insn,

					    value);

}



u32 aarch64_insn_gen_stadd(enum aarch64_insn_register address,

			   enum aarch64_insn_register value,

			   enum aarch64_insn_size_type size)

{

	/*

	 * STADD is simply encoded as an alias for LDADD with XZR as

	 * the destination register.

	 */

	return aarch64_insn_gen_ldadd(AARCH64_INSN_REG_ZR, address,

				      value, size);

}



static u32 aarch64_insn_encode_prfm_imm(enum aarch64_insn_prfm_type type,

					enum aarch64_insn_prfm_target target,

					enum aarch64_insn_prfm_policy policy,