18 files changed, 63 insertions, 25 deletions

diff --git a/arch/alpha/include/uapi/asm/socket.h b/arch/alpha/include/uapi/asm/socket.h
index 3de1394bcab8..e2fe0700b3b4 100644
--- a/arch/alpha/include/uapi/asm/socket.h
+++ b/arch/alpha/include/uapi/asm/socket.h
@@ -87,4 +87,6 @@
 
 #define SO_BPF_EXTENSIONS       48
 
+#define SO_INCOMING_CPU         49
+
 #endif /* _UAPI_ASM_SOCKET_H */
diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c
index e90a3148f385..b83f3b7737fb 100644
--- a/arch/arm/kernel/sys_oabi-compat.c
+++ b/arch/arm/kernel/sys_oabi-compat.c
@@ -400,7 +400,7 @@ asmlinkage long sys_oabi_sendto(int fd, void __user *buff,
         return sys_sendto(fd, buff, len, flags, addr, addrlen);
 }
 
-asmlinkage long sys_oabi_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
+asmlinkage long sys_oabi_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags)
 {
         struct sockaddr __user *addr;
         int msg_namelen;
@@ -446,7 +446,7 @@ asmlinkage long sys_oabi_socketcall(int call, unsigned long __user *args)
                 break;
         case SYS_SENDMSG:
                 if (copy_from_user(a, args, 3 * sizeof(long)) == 0)
-                        r = sys_oabi_sendmsg(a[0], (struct msghdr __user *)a[1], a[2]);
+                        r = sys_oabi_sendmsg(a[0], (struct user_msghdr __user *)a[1], a[2]);
                 break;
         default:
                 r = sys_socketcall(call, args);
diff --git a/arch/arm/mach-mmp/gplugd.c b/arch/arm/mach-mmp/gplugd.c
index d81b2475e67e..22762a1f9f72 100644
--- a/arch/arm/mach-mmp/gplugd.c
+++ b/arch/arm/mach-mmp/gplugd.c
@@ -158,6 +158,7 @@ struct pxa168_eth_platform_data gplugd_eth_platform_data = {
         .port_number = 0,
         .phy_addr    = 0,
         .speed       = 0, /* Autonagotiation */
+        .intf        = PHY_INTERFACE_MODE_RMII,
         .init        = gplugd_eth_init,
 };
 
diff --git a/arch/avr32/include/uapi/asm/socket.h b/arch/avr32/include/uapi/asm/socket.h
index 6e6cd159924b..92121b0f5b98 100644
--- a/arch/avr32/include/uapi/asm/socket.h
+++ b/arch/avr32/include/uapi/asm/socket.h
@@ -80,4 +80,6 @@
 
 #define SO_BPF_EXTENSIONS       48
 
+#define SO_INCOMING_CPU         49
+
 #endif /* _UAPI__ASM_AVR32_SOCKET_H */
diff --git a/arch/cris/include/uapi/asm/socket.h b/arch/cris/include/uapi/asm/socket.h
index ed94e5ed0a23..60f60f5b9b35 100644
--- a/arch/cris/include/uapi/asm/socket.h
+++ b/arch/cris/include/uapi/asm/socket.h
@@ -82,6 +82,8 @@
 
 #define SO_BPF_EXTENSIONS       48
 
+#define SO_INCOMING_CPU         49
+
 #endif /* _ASM_SOCKET_H */
 
 
diff --git a/arch/frv/include/uapi/asm/socket.h b/arch/frv/include/uapi/asm/socket.h
index ca2c6e6f31c6..2c6890209ea6 100644
--- a/arch/frv/include/uapi/asm/socket.h
+++ b/arch/frv/include/uapi/asm/socket.h
@@ -80,5 +80,7 @@
 
 #define SO_BPF_EXTENSIONS       48
 
+#define SO_INCOMING_CPU         49
+
 #endif /* _ASM_SOCKET_H */
 
diff --git a/arch/ia64/include/uapi/asm/socket.h b/arch/ia64/include/uapi/asm/socket.h
index a1b49bac7951..09a93fb566f6 100644
--- a/arch/ia64/include/uapi/asm/socket.h
+++ b/arch/ia64/include/uapi/asm/socket.h
@@ -89,4 +89,6 @@
 
 #define SO_BPF_EXTENSIONS       48
 
+#define SO_INCOMING_CPU         49
+
 #endif /* _ASM_IA64_SOCKET_H */
diff --git a/arch/m32r/include/uapi/asm/socket.h b/arch/m32r/include/uapi/asm/socket.h
index 6c9a24b3aefa..e8589819c274 100644
--- a/arch/m32r/include/uapi/asm/socket.h
+++ b/arch/m32r/include/uapi/asm/socket.h
@@ -80,4 +80,6 @@
 
 #define SO_BPF_EXTENSIONS       48
 
+#define SO_INCOMING_CPU         49
+
 #endif /* _ASM_M32R_SOCKET_H */
diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/asm/socket.h
index a14baa218c76..2e9ee8c55a10 100644
--- a/arch/mips/include/uapi/asm/socket.h
+++ b/arch/mips/include/uapi/asm/socket.h
@@ -98,4 +98,6 @@
 
 #define SO_BPF_EXTENSIONS       48
 
+#define SO_INCOMING_CPU         49
+
 #endif /* _UAPI_ASM_SOCKET_H */
diff --git a/arch/mn10300/include/uapi/asm/socket.h b/arch/mn10300/include/uapi/asm/socket.h
index 6aa3ce1854aa..f3492e8c9f70 100644
--- a/arch/mn10300/include/uapi/asm/socket.h
+++ b/arch/mn10300/include/uapi/asm/socket.h
@@ -80,4 +80,6 @@
 
 #define SO_BPF_EXTENSIONS       48
 
+#define SO_INCOMING_CPU         49
+
 #endif /* _ASM_SOCKET_H */
diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h
index fe35ceacf0e7..7984a1cab3da 100644
--- a/arch/parisc/include/uapi/asm/socket.h
+++ b/arch/parisc/include/uapi/asm/socket.h
@@ -79,4 +79,6 @@
 
 #define SO_BPF_EXTENSIONS       0x4029
 
+#define SO_INCOMING_CPU         0x402A
+
 #endif /* _UAPI_ASM_SOCKET_H */
diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h
index 6f8536208049..1a5287759fc8 100644
--- a/arch/powerpc/include/asm/ppc-opcode.h
+++ b/arch/powerpc/include/asm/ppc-opcode.h
@@ -204,6 +204,7 @@
 #define PPC_INST_ERATSX_DOT             0x7c000127
 
 /* Misc instructions for BPF compiler */
+#define PPC_INST_LBZ                    0x88000000
 #define PPC_INST_LD                     0xe8000000
 #define PPC_INST_LHZ                    0xa0000000
 #define PPC_INST_LHBRX                  0x7c00062c
diff --git a/arch/powerpc/include/uapi/asm/socket.h b/arch/powerpc/include/uapi/asm/socket.h
index a9c3e2e18c05..3474e4ef166d 100644
--- a/arch/powerpc/include/uapi/asm/socket.h
+++ b/arch/powerpc/include/uapi/asm/socket.h
@@ -87,4 +87,6 @@
 
 #define SO_BPF_EXTENSIONS       48
 
+#define SO_INCOMING_CPU         49
+
 #endif  /* _ASM_POWERPC_SOCKET_H */
diff --git a/arch/powerpc/net/bpf_jit.h b/arch/powerpc/net/bpf_jit.h
index 9aee27c582dc..c406aa95b2bc 100644
--- a/arch/powerpc/net/bpf_jit.h
+++ b/arch/powerpc/net/bpf_jit.h
@@ -87,6 +87,9 @@ DECLARE_LOAD_FUNC(sk_load_byte_msh);
 #define PPC_STD(r, base, i)     EMIT(PPC_INST_STD | ___PPC_RS(r) |            \
                                      ___PPC_RA(base) | ((i) & 0xfffc))
 
+
+#define PPC_LBZ(r, base, i)     EMIT(PPC_INST_LBZ | ___PPC_RT(r) |            \
+                                     ___PPC_RA(base) | IMM_L(i))
 #define PPC_LD(r, base, i)      EMIT(PPC_INST_LD | ___PPC_RT(r) |             \
                                      ___PPC_RA(base) | IMM_L(i))
 #define PPC_LWZ(r, base, i)     EMIT(PPC_INST_LWZ | ___PPC_RT(r) |            \
@@ -96,6 +99,10 @@ DECLARE_LOAD_FUNC(sk_load_byte_msh);
 #define PPC_LHBRX(r, base, b)   EMIT(PPC_INST_LHBRX | ___PPC_RT(r) |          \
                                      ___PPC_RA(base) | ___PPC_RB(b))
 /* Convenience helpers for the above with 'far' offsets: */
+#define PPC_LBZ_OFFS(r, base, i) do { if ((i) < 32768) PPC_LBZ(r, base, i);   \
+                else {  PPC_ADDIS(r, base, IMM_HA(i));                        \
+                        PPC_LBZ(r, r, IMM_L(i)); } } while(0)
+
 #define PPC_LD_OFFS(r, base, i) do { if ((i) < 32768) PPC_LD(r, base, i);     \
                 else {  PPC_ADDIS(r, base, IMM_HA(i));                        \
                         PPC_LD(r, r, IMM_L(i)); } } while(0)
diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index cbae2dfd053c..1ca125b9c226 100644
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -181,6 +181,7 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,
                         }
                         break;
                 case BPF_ALU | BPF_MOD | BPF_X: /* A %= X; */
+                case BPF_ALU | BPF_DIV | BPF_X: /* A /= X; */
                         ctx->seen |= SEEN_XREG;
                         PPC_CMPWI(r_X, 0);
                         if (ctx->pc_ret0 != -1) {
@@ -190,9 +191,13 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,
                                 PPC_LI(r_ret, 0);
                                 PPC_JMP(exit_addr);
                         }
-                        PPC_DIVWU(r_scratch1, r_A, r_X);
-                        PPC_MUL(r_scratch1, r_X, r_scratch1);
-                        PPC_SUB(r_A, r_A, r_scratch1);
+                        if (code == (BPF_ALU | BPF_MOD | BPF_X)) {
+                                PPC_DIVWU(r_scratch1, r_A, r_X);
+                                PPC_MUL(r_scratch1, r_X, r_scratch1);
+                                PPC_SUB(r_A, r_A, r_scratch1);
+                        } else {
+                                PPC_DIVWU(r_A, r_A, r_X);
+                        }
                         break;
                 case BPF_ALU | BPF_MOD | BPF_K: /* A %= K; */
                         PPC_LI32(r_scratch2, K);
@@ -200,22 +205,6 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,
                         PPC_MUL(r_scratch1, r_scratch2, r_scratch1);
                         PPC_SUB(r_A, r_A, r_scratch1);
                         break;
-                case BPF_ALU | BPF_DIV | BPF_X: /* A /= X; */
-                        ctx->seen |= SEEN_XREG;
-                        PPC_CMPWI(r_X, 0);
-                        if (ctx->pc_ret0 != -1) {
-                                PPC_BCC(COND_EQ, addrs[ctx->pc_ret0]);
-                        } else {
-                                /*
-                                 * Exit, returning 0; first pass hits here
-                                 * (longer worst-case code size).
-                                 */
-                                PPC_BCC_SHORT(COND_NE, (ctx->idx*4)+12);
-                                PPC_LI(r_ret, 0);
-                                PPC_JMP(exit_addr);
-                        }
-                        PPC_DIVWU(r_A, r_A, r_X);
-                        break;
                 case BPF_ALU | BPF_DIV | BPF_K: /* A /= K */
                         if (K == 1)
                                 break;
@@ -361,6 +350,11 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,
                                                             protocol));
                         break;
                 case BPF_ANC | SKF_AD_IFINDEX:
+                case BPF_ANC | SKF_AD_HATYPE:
+                        BUILD_BUG_ON(FIELD_SIZEOF(struct net_device,
+                                                ifindex) != 4);
+                        BUILD_BUG_ON(FIELD_SIZEOF(struct net_device,
+                                                type) != 2);
                         PPC_LD_OFFS(r_scratch1, r_skb, offsetof(struct sk_buff,
                                                                 dev));
                         PPC_CMPDI(r_scratch1, 0);
@@ -368,14 +362,18 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,
                                 PPC_BCC(COND_EQ, addrs[ctx->pc_ret0]);
                         } else {
                                 /* Exit, returning 0; first pass hits here. */
-                                PPC_BCC_SHORT(COND_NE, (ctx->idx*4)+12);
+                                PPC_BCC_SHORT(COND_NE, ctx->idx * 4 + 12);
                                 PPC_LI(r_ret, 0);
                                 PPC_JMP(exit_addr);
                         }
-                        BUILD_BUG_ON(FIELD_SIZEOF(struct net_device,
-                                                  ifindex) != 4);
-                        PPC_LWZ_OFFS(r_A, r_scratch1,
+                        if (code == (BPF_ANC | SKF_AD_IFINDEX)) {
+                                PPC_LWZ_OFFS(r_A, r_scratch1,
                                      offsetof(struct net_device, ifindex));
+                        } else {
+                                PPC_LHZ_OFFS(r_A, r_scratch1,
+                                     offsetof(struct net_device, type));
+                        }
+
                         break;
                 case BPF_ANC | SKF_AD_MARK:
                         BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, mark) != 4);
@@ -407,6 +405,11 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,
                         PPC_LHZ_OFFS(r_A, r_skb, offsetof(struct sk_buff,
                                                           queue_mapping));
                         break;
+                case BPF_ANC | SKF_AD_PKTTYPE:
+                        PPC_LBZ_OFFS(r_A, r_skb, PKT_TYPE_OFFSET());
+                        PPC_ANDI(r_A, r_A, PKT_TYPE_MAX);
+                        PPC_SRWI(r_A, r_A, 5);
+                        break;
                 case BPF_ANC | SKF_AD_CPU:
 #ifdef CONFIG_SMP
                         /*
diff --git a/arch/s390/include/uapi/asm/socket.h b/arch/s390/include/uapi/asm/socket.h
index e031332096d7..8457636c33e1 100644
--- a/arch/s390/include/uapi/asm/socket.h
+++ b/arch/s390/include/uapi/asm/socket.h
@@ -86,4 +86,6 @@
 
 #define SO_BPF_EXTENSIONS       48
 
+#define SO_INCOMING_CPU         49
+
 #endif /* _ASM_SOCKET_H */
diff --git a/arch/sparc/include/uapi/asm/socket.h b/arch/sparc/include/uapi/asm/socket.h
index 54d9608681b6..4a8003a94163 100644
--- a/arch/sparc/include/uapi/asm/socket.h
+++ b/arch/sparc/include/uapi/asm/socket.h
@@ -76,6 +76,8 @@
 
 #define SO_BPF_EXTENSIONS       0x0032
 
+#define SO_INCOMING_CPU         0x0033
+
 /* Security levels - as per NRL IPv6 - don't actually do anything */
 #define SO_SECURITY_AUTHENTICATION              0x5001
 #define SO_SECURITY_ENCRYPTION_TRANSPORT        0x5002
diff --git a/arch/xtensa/include/uapi/asm/socket.h b/arch/xtensa/include/uapi/asm/socket.h
index 39acec0cf0b1..c46f6a696849 100644
--- a/arch/xtensa/include/uapi/asm/socket.h
+++ b/arch/xtensa/include/uapi/asm/socket.h
@@ -91,4 +91,6 @@
 
 #define SO_BPF_EXTENSIONS       48
 
+#define SO_INCOMING_CPU         49
+
 #endif  /* _XTENSA_SOCKET_H */