linux-stable.git/arch/mips/net, branch v3.16

MIPS: bpf: Fix stack space allocation for BPF memwords on MIPS64

2014-06-26T09:48:23+00:00

When allocating stack space for BPF memwords we need to use the
appropriate 32 or 64-bit instruction to avoid losing the top 32 bits
of the stack pointer.

Signed-off-by: Markos Chandras 
Cc: "David S. Miller" 
Cc: Daniel Borkmann 
Cc: Alexei Starovoitov 
Cc: netdev@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7135/
Signed-off-by: Ralf Baechle

MIPS: BPF: Use 32 or 64-bit load instruction to load an address to register

2014-06-26T09:48:22+00:00

When loading a pointer to register we need to use the appropriate
32 or 64bit instruction to preserve the pointers' top 32bits.

Signed-off-by: Markos Chandras 
Cc: David S. Miller 
Cc: Daniel Borkmann 
Cc: Alexei Starovoitov 
Cc: netdev@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7180/
Signed-off-by: Ralf Baechle

MIPS: bpf: Fix PKT_TYPE case for big-endian cores

2014-06-26T09:48:22+00:00

The skb->pkt_type field is defined as follows:

u8 pkt_type:3,
   fclone:2,
   ipvs_property:1,
   peeked:1,
   nf_trace:1

resulting to the following layout in big-endian systems

[pkt_type][fclone][ipvs_propery][peeked][nf_trace]
^                                                ^
|                                                |
LSB                                             MSB

As a result, the existing code did not work because it was trying to
match pkt_type == 7 whereas in reality it is 7<<5 on big-endian
systems.

This has been fixed in the interpreter in
0dcceabb0c1bf2d4c12a748df9933fad303072a7
"net: filter: fix SKF_AD_PKTTYPE extension on big-endian"

The fix is to look for 7<<5 on big-endian systems for the pkt_type
field, and shift by 5 so the packet type will be at the lower 3 bits
of the A register.

Signed-off-by: Markos Chandras 
Cc: David S. Miller 
Cc: Daniel Borkmann 
Cc: Alexei Starovoitov 
Cc: netdev@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7132/
Signed-off-by: Ralf Baechle

MIPS: BPF: Prevent kernel fall over for >=32bit shifts

2014-06-26T09:48:22+00:00

Remove BUG_ON() if the shift immediate is >=32 to avoid kernel crashes
due to malicious user input. If the shift immediate is >= 32,
we simply load the destination register with 0 since only
32-bit instructions are used by JIT so this will do the
correct thing even on MIPS64.

Signed-off-by: Markos Chandras 
Cc: David S. Miller 
Cc: Daniel Borkmann 
Cc: Alexei Starovoitov 
Cc: netdev@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7179/
Signed-off-by: Ralf Baechle

MIPS: bpf: Drop update_on_xread and always initialize the X register

2014-06-26T09:48:22+00:00

Previously, update_on_xread() only set the reset flag if SEEN_X hasn't
been set already. However, SEEN_X is used to indicate that X is used
as destination or source register so there are some cases where X
is only used as source register and we really need to make sure that it
has been initialized in time. As a result of which, drop this function and
always set X to zero if it's used in any of the opcodes.

Signed-off-by: Markos Chandras 
Cc: David S. Miller 
Cc: Daniel Borkmann 
Cc: Alexei Starovoitov 
Cc: netdev@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7133/
Signed-off-by: Ralf Baechle

MIPS: bpf: Fix is_range() semantics

2014-06-26T09:48:21+00:00

is_range() was meant to check whether the number is within
the s16 range or not. However the return values and consumers expected
the exact opposite. We fix that by inverting the logic in the function
to return 'true' for < s16 and 'false' for > s16.

Signed-off-by: Markos Chandras 
Reported-by: Alexei Starovoitov 
Cc: David S. Miller 
Cc: Daniel Borkmann 
Cc: Alexei Starovoitov 
Cc: netdev@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7131/
Signed-off-by: Ralf Baechle

MIPS: bpf: Use pr_debug instead of pr_warn for unhandled opcodes

2014-06-26T09:48:21+00:00

We should prevent spamming the logs during normal execution of bpf-jit.

Signed-off-by: Markos Chandras 
Suggested-by: Alexei Starovoitov 
Cc: David S. Miller 
Cc: Daniel Borkmann 
Cc: Alexei Starovoitov 
Cc: netdev@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7129/
Signed-off-by: Ralf Baechle

MIPS: bpf: Fix return values for VLAN_TAG_PRESENT case

2014-06-26T09:48:21+00:00

If VLAN_TAG_PRESENT is not zero, then return 1 as expected by
classic BPF. Otherwise return 0.

Signed-off-by: Markos Chandras 
Cc: David S. Miller 
Cc: Daniel Borkmann 
Cc: Alexei Starovoitov 
Cc: netdev@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7128/
Signed-off-by: Ralf Baechle

MIPS: bpf: Use correct mask for VLAN_TAG case

2014-06-26T09:48:21+00:00

Using VLAN_VID_MASK is not correct to get the vlan tag. Use
~VLAN_PRESENT_MASK instead and make sure it's u16 so the top 16-bits
will be removed. This will ensure that the emit_andi() code will not
treat this as a big 32-bit unsigned value.

Signed-off-by: Markos Chandras 
Cc: David S. Miller 
Cc: Daniel Borkmann 
Cc: Alexei Starovoitov 
Cc: netdev@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7127/
Signed-off-by: Ralf Baechle

MIPS: bpf: Fix branch conditional for BPF_J{GT/GE} cases

2014-06-26T09:48:21+00:00

The sltiu and sltu instructions will set the scratch register
to 1 if A <= X|K so fix the emitted branch conditional to check
for scratch != zero rather than scratch >= zero which would complicate
the resuling branch logic given that MIPS does not have a BGT or BGET
instructions to compare general purpose registers directly.

Signed-off-by: Markos Chandras 
Cc: David S. Miller 
Cc: Daniel Borkmann 
Cc: Alexei Starovoitov 
Cc: netdev@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7126/
Signed-off-by: Ralf Baechle