Skip to contentSkip to conversation

Linux 4.8.10

DISCUSSION Greg KH 1 participant 2 messages Nov 21, 2016 Stable branch

lore
Share & tools
lore

Greg KH

author maintainer
#0 lore raw

I'm announcing the release of the 4.8.10 kernel.

All users of the 4.8 kernel series must upgrade.

The updated 4.8.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.8.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Makefile                                              |    2 
 arch/sparc/include/asm/uaccess_64.h                   |   28 -
 arch/sparc/kernel/head_64.S                           |   36 -
 arch/sparc/kernel/jump_label.c                        |   23 -
 arch/sparc/kernel/sparc_ksyms_64.c                    |    1 
 arch/sparc/lib/GENcopy_from_user.S                    |    4 
 arch/sparc/lib/GENcopy_to_user.S                      |    4 
 arch/sparc/lib/GENmemcpy.S                            |   48 +-
 arch/sparc/lib/Makefile                               |    2 
 arch/sparc/lib/NG2copy_from_user.S                    |    8 
 arch/sparc/lib/NG2copy_to_user.S                      |    8 
 arch/sparc/lib/NG2memcpy.S                            |  228 ++++++----
 arch/sparc/lib/NG4copy_from_user.S                    |    8 
 arch/sparc/lib/NG4copy_to_user.S                      |    8 
 arch/sparc/lib/NG4memcpy.S                            |  294 ++++++++++----
 arch/sparc/lib/NGcopy_from_user.S                     |    4 
 arch/sparc/lib/NGcopy_to_user.S                       |    4 
 arch/sparc/lib/NGmemcpy.S                             |  233 +++++++----
 arch/sparc/lib/U1copy_from_user.S                     |    8 
 arch/sparc/lib/U1copy_to_user.S                       |    8 
 arch/sparc/lib/U1memcpy.S                             |  345 +++++++++++-----
 arch/sparc/lib/U3copy_from_user.S                     |    8 
 arch/sparc/lib/U3copy_to_user.S                       |    8 
 arch/sparc/lib/U3memcpy.S                             |  227 +++++++---
 arch/sparc/lib/copy_in_user.S                         |   35 +
 arch/sparc/lib/user_fixup.c                           |   71 ---
 arch/sparc/mm/tsb.c                                   |   17 
 arch/sparc/mm/ultra.S                                 |  374 ++++++++++++++----
 drivers/net/ethernet/broadcom/bgmac.c                 |    5 
 drivers/net/ethernet/broadcom/bnx2.c                  |   48 +-
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c        |    4 
 drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c |   22 +
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c     |    7 
 drivers/usb/gadget/function/f_fs.c                    |  107 ++++-
 include/net/ip.h                                      |    1 
 include/net/ip6_tunnel.h                              |    1 
 include/net/sock.h                                    |    4 
 include/net/tcp.h                                     |    1 
 include/uapi/linux/atm_zatm.h                         |    1 
 kernel/bpf/hashtab.c                                  |    3 
 net/core/dev.c                                        |    2 
 net/core/flow_dissector.c                             |   11 
 net/core/sock.c                                       |    6 
 net/dccp/ipv4.c                                       |   16 
 net/dccp/ipv6.c                                       |   19 
 net/dccp/proto.c                                      |    4 
 net/ipv4/fib_trie.c                                   |   21 -
 net/ipv4/icmp.c                                       |    4 
 net/ipv4/ip_forward.c                                 |    2 
 net/ipv4/ip_output.c                                  |    6 
 net/ipv4/ip_tunnel_core.c                             |   11 
 net/ipv4/ipmr.c                                       |    2 
 net/ipv4/route.c                                      |    4 
 net/ipv4/tcp.c                                        |    4 
 net/ipv4/tcp_dctcp.c                                  |   13 
 net/ipv4/tcp_ipv4.c                                   |   19 
 net/ipv6/icmp.c                                       |    2 
 net/ipv6/tcp_ipv6.c                                   |    6 
 net/sctp/socket.c                                     |   22 -
 net/socket.c                                          |    2 
 tools/spi/spidev_test.c                               |    1 
 61 files changed, 1624 insertions(+), 801 deletions(-)

Alexander Duyck (1):
fib_trie: Correct /proc/net/route off by one error

Andy Gospodarek (1):
bgmac: stop clearing DMA receive control register right after it is set

Arkadi Sharshevsky (1):
mlxsw: spectrum_router: Correctly dump neighbour activity

Baoquan He (2):
Revert "bnx2: Reset device during driver initialization"
bnx2: Wait for in-flight DMA to complete at probe stage

Baruch Siach (1):
spi: spidev_test: fix build with musl libc

Daniel Borkmann (1):
bpf: fix htab map destruction when extra reserve is in use

David Ahern (2):
net: icmp6_send should use dst dev to determine L3 domain
net: icmp_route_lookup should use rt dev to determine L3 domain

David S. Miller (16):
sparc64: Handle extremely large kernel TSB range flushes sanely.
sparc64: Fix illegal relative branches in hypervisor patched TLB code.
sparc64: Fix instruction count in comment for __hypervisor_flush_tlb_pending.
sparc64: Fix illegal relative branches in hypervisor patched TLB cross-call code.
sparc64: Handle extremely large kernel TLB range flushes more gracefully.
sparc64: Delete __ret_efault.
sparc64: Prepare to move to more saner user copy exception handling.
sparc64: Convert copy_in_user to accurate exception reporting.
sparc64: Convert GENcopy_{from,to}_user to accurate exception reporting.
sparc64: Convert U1copy_{from,to}_user to accurate exception reporting.
sparc64: Convert NG4copy_{from,to}_user to accurate exception reporting.
sparc64: Convert NGcopy_{from,to}_user to accurate exception reporting.
sparc64: Convert NG2copy_{from,to}_user to accurate exception reporting.
sparc64: Convert U3copy_{from,to}_user to accurate exception reporting.
sparc64: Delete now unused user copy assembler helpers.
sparc64: Delete now unused user copy fixup functions.

Eli Cooper (1):
ip6_tunnel: Clear IP6CB in ip6tunnel_xmit()

Eric Dumazet (11):
net: clear sk_err_soft in sk_clone_lock()
net: mangle zero checksum in skb_checksum_help()
tcp: fix potential memory corruption
tcp: fix return value for partial writes
dccp: do not release listeners too soon
dccp: do not send reset to already closed sockets
dccp: fix out of bound access in dccp_v4_err()
ipv6: dccp: fix out of bound access in dccp_v6_err()
ipv6: dccp: add missing bind_conflict to dccp_ipv6_mapped
net: __skb_flow_dissect() must cap its return value
tcp: take care of truncations done by sk_filter()

Florian Fainelli (1):
net: stmmac: Fix lack of link transition for fixed PHYs

Florian Westphal (1):
dctcp: avoid bogus doubling of cwnd after loss

Greg Kroah-Hartman (1):

      Linux 4.8.10

James Clarke (1):
sparc: Handle negative offsets in arch_jump_label_transform

Lance Richardson (1):
ipv4: allow local fragmentation in ip_finish_output_gso()

Marcelo Ricardo Leitner (1):
sctp: assign assoc_id earlier in __sctp_connect

Michal Nazarewicz (2):
usb: gadget: f_fs: edit epfile->ep under lock
usb: gadget: f_fs: stop sleeping in ffs_func_eps_disable

Mike Frysinger (1):
Revert "include/uapi/linux/atm_zatm.h: include linux/time.h"

Soheil Hassas Yeganeh (1):
sock: fix sendmmsg for partial sendmsg

Stephen Suryaputra Lin (1):
ipv4: use new_gw for redirect neigh lookup

Xin Long (1):
sctp: change sk state only when it has assocs in sctp_shutdown

Yotam Gigi (1):
mlxsw: spectrum: Fix refcount bug on span entries

author maintainer
#1 lore raw
Makefile +1 -1
index c1519ab85258..7cf2b4985703 100644
@@ -1,6 +1,6 @@
 VERSION = 4
 PATCHLEVEL = 8
-SUBLEVEL = 9
+SUBLEVEL = 10
 EXTRAVERSION =
 NAME = Psychotic Stoned Sheep
 
arch/sparc/include/asm/uaccess_64.h +3 -25
index 37a315d0ddd4..a6847fc05a6d 100644
@@ -98,7 +98,6 @@ struct exception_table_entry {
         unsigned int insn, fixup;
 };
 
-void __ret_efault(void);
 void __retl_efault(void);
 
 /* Uh, these should become the main single-value transfer routines..
@@ -205,55 +204,34 @@ int __get_user_bad(void);
 unsigned long __must_check ___copy_from_user(void *to,
 					     const void __user *from,
 					     unsigned long size);
-unsigned long copy_from_user_fixup(void *to, const void __user *from,
-				   unsigned long size);
 static inline unsigned long __must_check
 copy_from_user(void *to, const void __user *from, unsigned long size)
 {
-	unsigned long ret;
-
 	check_object_size(to, size, false);
 
-	ret = ___copy_from_user(to, from, size);
-	if (unlikely(ret))
-		ret = copy_from_user_fixup(to, from, size);
-
-	return ret;
+	return ___copy_from_user(to, from, size);
 }
 #define __copy_from_user copy_from_user
 
 unsigned long __must_check ___copy_to_user(void __user *to,
 					   const void *from,
 					   unsigned long size);
-unsigned long copy_to_user_fixup(void __user *to, const void *from,
-				 unsigned long size);
 static inline unsigned long __must_check
 copy_to_user(void __user *to, const void *from, unsigned long size)
 {
-	unsigned long ret;
-
 	check_object_size(from, size, true);
 
-	ret = ___copy_to_user(to, from, size);
-	if (unlikely(ret))
-		ret = copy_to_user_fixup(to, from, size);
-	return ret;
+	return ___copy_to_user(to, from, size);
 }
 #define __copy_to_user copy_to_user
 
 unsigned long __must_check ___copy_in_user(void __user *to,
 					   const void __user *from,
 					   unsigned long size);
-unsigned long copy_in_user_fixup(void __user *to, void __user *from,
-				 unsigned long size);
 static inline unsigned long __must_check
 copy_in_user(void __user *to, void __user *from, unsigned long size)
 {
-	unsigned long ret = ___copy_in_user(to, from, size);
-
-	if (unlikely(ret))
-		ret = copy_in_user_fixup(to, from, size);
-	return ret;
+	return ___copy_in_user(to, from, size);
 }
 #define __copy_in_user copy_in_user
 
arch/sparc/kernel/head_64.S +0 -36
index a076b4249e62..5f1f3ae21657 100644
@@ -922,47 +922,11 @@ prom_tba:	.xword	0
 tlb_type:	.word	0	/* Must NOT end up in BSS */
 	.section	".fixup",#alloc,#execinstr
 
-	.globl	__ret_efault, __retl_efault, __ret_one, __retl_one
-ENTRY(__ret_efault)
-	ret
-	 restore %g0, -EFAULT, %o0
-ENDPROC(__ret_efault)
-
 ENTRY(__retl_efault)
 	retl
 	 mov	-EFAULT, %o0
 ENDPROC(__retl_efault)
 
-ENTRY(__retl_one)
-	retl
-	 mov	1, %o0
-ENDPROC(__retl_one)
-
-ENTRY(__retl_one_fp)
-	VISExitHalf
-	retl
-	 mov	1, %o0
-ENDPROC(__retl_one_fp)
-
-ENTRY(__ret_one_asi)
-	wr	%g0, ASI_AIUS, %asi
-	ret
-	 restore %g0, 1, %o0
-ENDPROC(__ret_one_asi)
-
-ENTRY(__retl_one_asi)
-	wr	%g0, ASI_AIUS, %asi
-	retl
-	 mov	1, %o0
-ENDPROC(__retl_one_asi)
-
-ENTRY(__retl_one_asi_fp)
-	wr	%g0, ASI_AIUS, %asi
-	VISExitHalf
-	retl
-	 mov	1, %o0
-ENDPROC(__retl_one_asi_fp)
-
 ENTRY(__retl_o1)
 	retl
 	 mov	%o1, %o0
arch/sparc/kernel/jump_label.c +17 -6
index 59bbeff55024..07933b9e9ce0 100644
@@ -13,19 +13,30 @@
 void arch_jump_label_transform(struct jump_entry *entry,
 			       enum jump_label_type type)
 {
-	u32 val;
 	u32 *insn = (u32 *) (unsigned long) entry->code;
+	u32 val;
 
 	if (type == JUMP_LABEL_JMP) {
 		s32 off = (s32)entry->target - (s32)entry->code;
+		bool use_v9_branch = false;
+
+		BUG_ON(off & 3);
 
 #ifdef CONFIG_SPARC64
-		/* ba,pt %xcc, . + (off << 2) */
-		val = 0x10680000 | ((u32) off >> 2);
-#else
-		/* ba . + (off << 2) */
-		val = 0x10800000 | ((u32) off >> 2);
+		if (off <= 0xfffff && off >= -0x100000)
+			use_v9_branch = true;
 #endif
+		if (use_v9_branch) {
+			/* WDISP19 - target is . + immed << 2 */
+			/* ba,pt %xcc, . + off */
+			val = 0x10680000 | (((u32) off >> 2) & 0x7ffff);
+		} else {
+			/* WDISP22 - target is . + immed << 2 */
+			BUG_ON(off > 0x7fffff);
+			BUG_ON(off < -0x800000);
+			/* ba . + off */
+			val = 0x10800000 | (((u32) off >> 2) & 0x3fffff);
+		}
 	} else {
 		val = 0x01000000;
 	}
arch/sparc/kernel/sparc_ksyms_64.c +0 -1
index 9e034f29dcc5..20ffb052fe38 100644
@@ -27,7 +27,6 @@ EXPORT_SYMBOL(__flushw_user);
 EXPORT_SYMBOL_GPL(real_hard_smp_processor_id);
 
 /* from head_64.S */
-EXPORT_SYMBOL(__ret_efault);
 EXPORT_SYMBOL(tlb_type);
 EXPORT_SYMBOL(sun4v_chip_type);
 EXPORT_SYMBOL(prom_root_node);
arch/sparc/lib/GENcopy_from_user.S +2 -2
index b7d0bd6b1406..69a439fa2fc1 100644
@@ -3,11 +3,11 @@
  * Copyright (C) 2007 David S. Miller ([email protected])
  */
 
-#define EX_LD(x)		\
+#define EX_LD(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one;	\
+	.word 98b, y;		\
 	.text;			\
 	.align 4;
 
arch/sparc/lib/GENcopy_to_user.S +2 -2
index 780550e1afc7..9947427ce354 100644
@@ -3,11 +3,11 @@
  * Copyright (C) 2007 David S. Miller ([email protected])
  */
 
-#define EX_ST(x)		\
+#define EX_ST(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one;	\
+	.word 98b, y;		\
 	.text;			\
 	.align 4;
 
arch/sparc/lib/GENmemcpy.S +34 -14

93 lines not on this page · raw message

arch/sparc/lib/Makefile +1 -1
index 3269b0234093..4f2384a4286a 100644
@@ -38,7 +38,7 @@ lib-$(CONFIG_SPARC64) +=  NG4patch.o NG4copy_page.o NG4clear_page.o NG4memset.o
 lib-$(CONFIG_SPARC64) += GENmemcpy.o GENcopy_from_user.o GENcopy_to_user.o
 lib-$(CONFIG_SPARC64) += GENpatch.o GENpage.o GENbzero.o
 
-lib-$(CONFIG_SPARC64) += copy_in_user.o user_fixup.o memmove.o
+lib-$(CONFIG_SPARC64) += copy_in_user.o memmove.o
 lib-$(CONFIG_SPARC64) += mcount.o ipcsum.o xor.o hweight.o ffs.o
 
 obj-$(CONFIG_SPARC64) += iomap.o
arch/sparc/lib/NG2copy_from_user.S +4 -4
index d5242b8c4f94..b79a6998d87c 100644
@@ -3,19 +3,19 @@
  * Copyright (C) 2007 David S. Miller ([email protected])
  */
 
-#define EX_LD(x)		\
+#define EX_LD(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one_asi;\
+	.word 98b, y;		\
 	.text;			\
 	.align 4;
 
-#define EX_LD_FP(x)		\
+#define EX_LD_FP(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one_asi_fp;\
+	.word 98b, y##_fp;	\
 	.text;			\
 	.align 4;
 
arch/sparc/lib/NG2copy_to_user.S +4 -4
index 4e962d993b10..dcec55f254ab 100644
@@ -3,19 +3,19 @@
  * Copyright (C) 2007 David S. Miller ([email protected])
  */
 
-#define EX_ST(x)		\
+#define EX_ST(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one_asi;\
+	.word 98b, y;		\
 	.text;			\
 	.align 4;
 
-#define EX_ST_FP(x)		\
+#define EX_ST_FP(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one_asi_fp;\
+	.word 98b, y##_fp;	\
 	.text;			\
 	.align 4;
 
arch/sparc/lib/NG2memcpy.S +145 -83

384 lines not on this page · raw message

arch/sparc/lib/NG4copy_from_user.S +4 -4
index 2e8ee7ad07a9..16a286c1a528 100644
@@ -3,19 +3,19 @@
  * Copyright (C) 2012 David S. Miller ([email protected])
  */
 
-#define EX_LD(x)		\
+#define EX_LD(x, y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one_asi;\
+	.word 98b, y;		\
 	.text;			\
 	.align 4;
 
-#define EX_LD_FP(x)		\
+#define EX_LD_FP(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one_asi_fp;\
+	.word 98b, y##_fp;	\
 	.text;			\
 	.align 4;
 
arch/sparc/lib/NG4copy_to_user.S +4 -4
index be0bf4590df8..6b0276ffc858 100644
@@ -3,19 +3,19 @@
  * Copyright (C) 2012 David S. Miller ([email protected])
  */
 
-#define EX_ST(x)		\
+#define EX_ST(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one_asi;\
+	.word 98b, y;		\
 	.text;			\
 	.align 4;
 
-#define EX_ST_FP(x)		\
+#define EX_ST_FP(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one_asi_fp;\
+	.word 98b, y##_fp;	\
 	.text;			\
 	.align 4;
 
arch/sparc/lib/NG4memcpy.S +223 -71

447 lines not on this page · raw message

arch/sparc/lib/NGcopy_from_user.S +2 -2
index 5d1e4d1ac21e..9cd42fcbc781 100644
@@ -3,11 +3,11 @@
  * Copyright (C) 2006, 2007 David S. Miller ([email protected])
  */
 
-#define EX_LD(x)		\
+#define EX_LD(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __ret_one_asi;\
+	.word 98b, y;		\
 	.text;			\
 	.align 4;
 
arch/sparc/lib/NGcopy_to_user.S +2 -2
index ff630dcb273c..5c358afd464e 100644
@@ -3,11 +3,11 @@
  * Copyright (C) 2006, 2007 David S. Miller ([email protected])
  */
 
-#define EX_ST(x)		\
+#define EX_ST(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __ret_one_asi;\
+	.word 98b, y;		\
 	.text;			\
 	.align 4;
 
arch/sparc/lib/NGmemcpy.S +158 -75

375 lines not on this page · raw message

arch/sparc/lib/U1copy_from_user.S +4 -4
index ecc5692fa2b4..bb6ff73229e3 100644
@@ -3,19 +3,19 @@
  * Copyright (C) 1999, 2000, 2004 David S. Miller ([email protected])
  */
 
-#define EX_LD(x)		\
+#define EX_LD(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one;	\
+	.word 98b, y;		\
 	.text;			\
 	.align 4;
 
-#define EX_LD_FP(x)		\
+#define EX_LD_FP(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one_fp;\
+	.word 98b, y;		\
 	.text;			\
 	.align 4;
 
arch/sparc/lib/U1copy_to_user.S +4 -4
index 9eea392e44d4..ed92ce739558 100644
@@ -3,19 +3,19 @@
  * Copyright (C) 1999, 2000, 2004 David S. Miller ([email protected])
  */
 
-#define EX_ST(x)		\
+#define EX_ST(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one;	\
+	.word 98b, y;		\
 	.text;			\
 	.align 4;
 
-#define EX_ST_FP(x)		\
+#define EX_ST_FP(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one_fp;\
+	.word 98b, y;		\
 	.text;			\
 	.align 4;
 
arch/sparc/lib/U1memcpy.S +229 -116

561 lines not on this page · raw message

arch/sparc/lib/U3copy_from_user.S +4 -4
index 88ad73d86fe4..db73010a1af8 100644
@@ -3,19 +3,19 @@
  * Copyright (C) 1999, 2000, 2004 David S. Miller ([email protected])
  */
 
-#define EX_LD(x)		\
+#define EX_LD(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one;	\
+	.word 98b, y;		\
 	.text;			\
 	.align 4;
 
-#define EX_LD_FP(x)		\
+#define EX_LD_FP(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one_fp;\
+	.word 98b, y##_fp;	\
 	.text;			\
 	.align 4;
 
arch/sparc/lib/U3copy_to_user.S +4 -4
index 845139d75537..c4ee858e352a 100644
@@ -3,19 +3,19 @@
  * Copyright (C) 1999, 2000, 2004 David S. Miller ([email protected])
  */
 
-#define EX_ST(x)		\
+#define EX_ST(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one;	\
+	.word 98b, y;		\
 	.text;			\
 	.align 4;
 
-#define EX_ST_FP(x)		\
+#define EX_ST_FP(x,y)		\
 98:	x;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one_fp;\
+	.word 98b, y##_fp;	\
 	.text;			\
 	.align 4;
 
arch/sparc/lib/U3memcpy.S +154 -73

411 lines not on this page · raw message

arch/sparc/lib/copy_in_user.S +25 -10
index 302c0e60dc2c..4c89b486fa0d 100644
@@ -8,18 +8,33 @@
 
 #define XCC xcc
 
-#define EX(x,y)			\
+#define EX(x,y,z)		\
 98:	x,y;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_one;	\
+	.word 98b, z;		\
 	.text;			\
 	.align 4;
 
+#define EX_O4(x,y) EX(x,y,__retl_o4_plus_8)
+#define EX_O2_4(x,y) EX(x,y,__retl_o2_plus_4)
+#define EX_O2_1(x,y) EX(x,y,__retl_o2_plus_1)
+
 	.register	%g2,#scratch
 	.register	%g3,#scratch
 
 	.text
+__retl_o4_plus_8:
+	add	%o4, %o2, %o4
+	retl
+	 add	%o4, 8, %o0
+__retl_o2_plus_4:
+	retl
+	 add	%o2, 4, %o0
+__retl_o2_plus_1:
+	retl
+	 add	%o2, 1, %o0
+
 	.align	32
 
 	/* Don't try to get too fancy here, just nice and
@@ -44,8 +59,8 @@ ENTRY(___copy_in_user)	/* %o0=dst, %o1=src, %o2=len */
 	andn		%o2, 0x7, %o4
 	and		%o2, 0x7, %o2
 1:	subcc		%o4, 0x8, %o4
-	EX(ldxa [%o1] %asi, %o5)
-	EX(stxa %o5, [%o0] %asi)
+	EX_O4(ldxa [%o1] %asi, %o5)
+	EX_O4(stxa %o5, [%o0] %asi)
 	add		%o1, 0x8, %o1
 	bgu,pt		%XCC, 1b
 	 add		%o0, 0x8, %o0
@@ -53,8 +68,8 @@ ENTRY(___copy_in_user)	/* %o0=dst, %o1=src, %o2=len */
 	be,pt		%XCC, 1f
 	 nop
 	sub		%o2, 0x4, %o2
-	EX(lduwa [%o1] %asi, %o5)
-	EX(stwa %o5, [%o0] %asi)
+	EX_O2_4(lduwa [%o1] %asi, %o5)
+	EX_O2_4(stwa %o5, [%o0] %asi)
 	add		%o1, 0x4, %o1
 	add		%o0, 0x4, %o0
 1:	cmp		%o2, 0
@@ -70,8 +85,8 @@ ENTRY(___copy_in_user)	/* %o0=dst, %o1=src, %o2=len */
 
 82:
 	subcc		%o2, 4, %o2
-	EX(lduwa [%o1] %asi, %g1)
-	EX(stwa %g1, [%o0] %asi)
+	EX_O2_4(lduwa [%o1] %asi, %g1)
+	EX_O2_4(stwa %g1, [%o0] %asi)
 	add		%o1, 4, %o1
 	bgu,pt		%XCC, 82b
 	 add		%o0, 4, %o0
@@ -82,8 +97,8 @@ ENTRY(___copy_in_user)	/* %o0=dst, %o1=src, %o2=len */
 	.align	32
 90:
 	subcc		%o2, 1, %o2
-	EX(lduba [%o1] %asi, %g1)
-	EX(stba %g1, [%o0] %asi)
+	EX_O2_1(lduba [%o1] %asi, %g1)
+	EX_O2_1(stba %g1, [%o0] %asi)
 	add		%o1, 1, %o1
 	bgu,pt		%XCC, 90b
 	 add		%o0, 1, %o0
arch/sparc/lib/user_fixup.c deleted +0 -71

71 lines not on this page · raw message

arch/sparc/mm/tsb.c +17 -0
index f2b77112e9d8..e20fbbafb0b0 100644
@@ -27,6 +27,20 @@ static inline int tag_compare(unsigned long tag, unsigned long vaddr)
 	return (tag == (vaddr >> 22));
 }
 
+static void flush_tsb_kernel_range_scan(unsigned long start, unsigned long end)
+{
+	unsigned long idx;
+
+	for (idx = 0; idx < KERNEL_TSB_NENTRIES; idx++) {
+		struct tsb *ent = &swapper_tsb[idx];
+		unsigned long match = idx << 13;
+
+		match |= (ent->tag << 22);
+		if (match >= start && match < end)
+			ent->tag = (1UL << TSB_TAG_INVALID_BIT);
+	}
+}
+
 /* TSB flushes need only occur on the processor initiating the address
  * space modification, not on each cpu the address space has run on.
  * Only the TLB flush needs that treatment.
@@ -36,6 +50,9 @@ void flush_tsb_kernel_range(unsigned long start, unsigned long end)
 {
 	unsigned long v;
 
+	if ((end - start) >> PAGE_SHIFT >= 2 * KERNEL_TSB_NENTRIES)
+		return flush_tsb_kernel_range_scan(start, end);
+
 	for (v = start; v < end; v += PAGE_SIZE) {
 		unsigned long hash = tsb_hash(v, PAGE_SHIFT,
 					      KERNEL_TSB_NENTRIES);
arch/sparc/mm/ultra.S +301 -73

148 lines not on this page · raw message

drivers/net/ethernet/broadcom/bgmac.c +4 -1
index c4751ece76f6..45e87c9cc828 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/broadcom/bnx2.c +36 -12

48 lines not on this page · raw message

drivers/net/ethernet/mellanox/mlxsw/spectrum.c +3 -1
index d48873bcbddf..5cdc96bdd444 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +21 -1
index 3f5c51da6d3e..62514b9bf988 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +7 -0
index 4c8c60af7985..fe9e7b1979b8 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/function/f_fs.c +92 -15

107 lines not on this page · raw message

include/net/ip.h +0 -1
index 156b0c11b524..0ccf6daf6f56 100644

Lines of this file are not shown. View the raw message.

include/net/ip6_tunnel.h +1 -0
index 43a5a0e4524c..b01d5d1d7439 100644

Lines of this file are not shown. View the raw message.

include/net/sock.h +2 -2
index 8741988e6880..c26eab962ec7 100644

Lines of this file are not shown. View the raw message.

include/net/tcp.h +1 -0
index 7717302cab91..0de698940793 100644

Lines of this file are not shown. View the raw message.

include/uapi/linux/atm_zatm.h +0 -1
index 5cd4d4d2dd1d..9c9c6ad55f14 100644

Lines of this file are not shown. View the raw message.

kernel/bpf/hashtab.c +2 -1
index 570eeca7bdfa..ad1bc67aff1b 100644

Lines of this file are not shown. View the raw message.

net/core/dev.c +1 -1
index 44b3ba462ba1..9ce9d7284ea7 100644

Lines of this file are not shown. View the raw message.

net/core/flow_dissector.c +8 -3
index 52742a02814f..5550a86f7264 100644

Lines of this file are not shown. View the raw message.

net/core/sock.c +4 -2
index fd7b41edf1ce..10acaccca5c8 100644

Lines of this file are not shown. View the raw message.

net/dccp/ipv4.c +9 -7
index 345a3aeb8c7e..b567c8725aea 100644

Lines of this file are not shown. View the raw message.

net/dccp/ipv6.c +11 -8
index 3828f94b234c..715e5d1dc107 100644

Lines of this file are not shown. View the raw message.

net/dccp/proto.c +4 -0
index 41e65804ddf5..9fe25bf63296 100644

Lines of this file are not shown. View the raw message.

net/ipv4/fib_trie.c +9 -12
index e2ffc2a5c7db..7ef703102dca 100644

Lines of this file are not shown. View the raw message.

net/ipv4/icmp.c +2 -2
index 38abe70e595f..48734ee6293f 100644

Lines of this file are not shown. View the raw message.

net/ipv4/ip_forward.c +1 -1
index 8b4ffd216839..9f0a7b96646f 100644

Lines of this file are not shown. View the raw message.

net/ipv4/ip_output.c +2 -4
index dde37fb340bf..307daed9a4b9 100644

Lines of this file are not shown. View the raw message.

net/ipv4/ip_tunnel_core.c +0 -11
index 0f227db0e9ac..afd6b5968caf 100644

Lines of this file are not shown. View the raw message.

net/ipv4/ipmr.c +1 -1
index 5f006e13de56..27089f5ebbb1 100644

Lines of this file are not shown. View the raw message.

net/ipv4/route.c +3 -1
index 62c3ed0b7556..2f23ef1a8486 100644

Lines of this file are not shown. View the raw message.

net/ipv4/tcp.c +2 -2
index ffbb218de520..c876f5ddc86c 100644

Lines of this file are not shown. View the raw message.

net/ipv4/tcp_dctcp.c +12 -1
index 10d728b6804c..ab37c6775630 100644

Lines of this file are not shown. View the raw message.

net/ipv4/tcp_ipv4.c +18 -1
index 7158d4f8dae4..7b235fa12903 100644

Lines of this file are not shown. View the raw message.

net/ipv6/icmp.c +1 -1
index bd59c343d35f..7370ad2e693a 100644

Lines of this file are not shown. View the raw message.

net/ipv6/tcp_ipv6.c +4 -2
index fc67822c42e0..af6a09efad5b 100644

Lines of this file are not shown. View the raw message.

net/sctp/socket.c +12 -10
index baccbf3c1c60..7b0e059bf13b 100644

Lines of this file are not shown. View the raw message.

net/socket.c +2 -0
index a1bd16106625..03bc2c289c94 100644

Lines of this file are not shown. View the raw message.

tools/spi/spidev_test.c +1 -0
index f3825b676e38..f046b77cfefe 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.