Skip to content

L
linux
Commit b19a42e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull more s390 updates from Martin Schwidefsky:
 "The big thing in this second merge for s390 is the new eBPF JIT from
  Michael which replaces the old 32-bit backend.

  The remaining commits are bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/pci: add locking for fmb access
  s390/pci: extract software counters from fmb
  s390/dasd: Fix unresumed device after suspend/resume having no paths
  s390/dasd: fix unresumed device after suspend/resume
  s390/dasd: fix inability to set a DASD device offline
  s390/mm: Fix memory hotplug for unaligned standby memory
  s390/bpf: Add s390x eBPF JIT compiler backend
  s390: Use bool function return values of true/false not 1/0
parents 5ca08a82 80ed156a
Hide whitespace changes
Inline Side-by-side
Showing with 1348 additions and 841 deletions
arch/s390/Kconfig
View file @ b19a42e3
...@@ -115,7 +115,7 @@ config S390 ...@@ -115,7 +115,7 @@ config S390
select HAVE_ARCH_SECCOMP_FILTER select HAVE_ARCH_SECCOMP_FILTER
select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRACEHOOK
select HAVE_ARCH_TRANSPARENT_HUGEPAGE select HAVE_ARCH_TRANSPARENT_HUGEPAGE
select HAVE_BPF_JIT if PACK_STACK select HAVE_BPF_JIT if PACK_STACK && HAVE_MARCH_Z9_109_FEATURES
select HAVE_CMPXCHG_DOUBLE select HAVE_CMPXCHG_DOUBLE
select HAVE_CMPXCHG_LOCAL select HAVE_CMPXCHG_LOCAL
select HAVE_DEBUG_KMEMLEAK select HAVE_DEBUG_KMEMLEAK
......
arch/s390/include/asm/dma-mapping.h
View file @ b19a42e3
...@@ -42,7 +42,7 @@ static inline int dma_supported(struct device *dev, u64 mask) ...@@ -42,7 +42,7 @@ static inline int dma_supported(struct device *dev, u64 mask)
static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
{ {
if (!dev->dma_mask) if (!dev->dma_mask)
return 0; return false;
return addr + size - 1 <= *dev->dma_mask; return addr + size - 1 <= *dev->dma_mask;
} }
......
arch/s390/include/asm/pci.h
View file @ b19a42e3
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#define PCI_BAR_COUNT 6 #define PCI_BAR_COUNT 6
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/mutex.h>
#include <asm-generic/pci.h> #include <asm-generic/pci.h>
#include <asm-generic/pci-dma-compat.h> #include <asm-generic/pci-dma-compat.h>
#include <asm/pci_clp.h> #include <asm/pci_clp.h>
...@@ -44,10 +45,6 @@ struct zpci_fmb { ...@@ -44,10 +45,6 @@ struct zpci_fmb {
u64 rpcit_ops; u64 rpcit_ops;
u64 dma_rbytes; u64 dma_rbytes;
u64 dma_wbytes; u64 dma_wbytes;
/* software counters */
atomic64_t allocated_pages;
atomic64_t mapped_pages;
atomic64_t unmapped_pages;
} __packed __aligned(16); } __packed __aligned(16);
enum zpci_state { enum zpci_state {
...@@ -80,6 +77,7 @@ struct zpci_dev { ...@@ -80,6 +77,7 @@ struct zpci_dev {
u8 pft; /* pci function type */ u8 pft; /* pci function type */
u16 domain; u16 domain;
struct mutex lock;
u8 pfip[CLP_PFIP_NR_SEGMENTS]; /* pci function internal path */ u8 pfip[CLP_PFIP_NR_SEGMENTS]; /* pci function internal path */
u32 uid; /* user defined id */ u32 uid; /* user defined id */
u8 util_str[CLP_UTIL_STR_LEN]; /* utility string */ u8 util_str[CLP_UTIL_STR_LEN]; /* utility string */
...@@ -111,6 +109,10 @@ struct zpci_dev { ...@@ -111,6 +109,10 @@ struct zpci_dev {
/* Function measurement block */ /* Function measurement block */
struct zpci_fmb *fmb; struct zpci_fmb *fmb;
u16 fmb_update; /* update interval */ u16 fmb_update; /* update interval */
/* software counters */
atomic64_t allocated_pages;
atomic64_t mapped_pages;
atomic64_t unmapped_pages;
enum pci_bus_speed max_bus_speed; enum pci_bus_speed max_bus_speed;
......
arch/s390/net/bpf_jit.S
View file @ b19a42e3
/* /*
* BPF Jit compiler for s390, help functions. * BPF Jit compiler for s390, help functions.
* *
* Copyright IBM Corp. 2012 * Copyright IBM Corp. 2012,2015
* *
* Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com> * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
* Michael Holzheu <holzheu@linux.vnet.ibm.com>
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include "bpf_jit.h"
/* /*
* Calling convention: * Calling convention:
* registers %r2, %r6-%r8, %r10-%r11, %r13, %r15 are call saved * registers %r7-%r10, %r11,%r13, and %r15 are call saved
* %r2: skb pointer *
* %r3: offset parameter * Input (64 bit):
* %r5: BPF A accumulator * %r3 (%b2) = offset into skb data
* %r8: return address * %r6 (%b5) = return address
* %r9: save register for skb pointer * %r7 (%b6) = skb pointer
* %r10: skb->data * %r12 = skb data pointer
* %r11: skb->len - skb->data_len (headlen) *
* %r12: BPF X accumulator * Output:
* %r14= %b0 = return value (read skb value)
*
* Work registers: %r2,%r4,%r5,%r14
* *
* skb_copy_bits takes 4 parameters: * skb_copy_bits takes 4 parameters:
* %r2 = skb pointer * %r2 = skb pointer
* %r3 = offset into skb data * %r3 = offset into skb data
* %r4 = pointer to temp buffer * %r4 = pointer to temp buffer
* %r5 = length to copy * %r5 = length to copy
* Return value in %r2: 0 = ok
*
* bpf_internal_load_pointer_neg_helper takes 3 parameters:
* %r2 = skb pointer
* %r3 = offset into data
* %r4 = length to copy
* Return value in %r2: Pointer to data
*/ */
#define SKBDATA %r8
/* A = *(u32 *) (skb->data+K+X) */
ENTRY(sk_load_word_ind)
ar %r3,%r12 # offset += X
bmr %r8 # < 0 -> return with cc
/* A = *(u32 *) (skb->data+K) */
ENTRY(sk_load_word)
llgfr %r1,%r3 # extend offset
ahi %r3,4 # offset + 4
clr %r11,%r3 # hlen <= offset + 4 ?
jl sk_load_word_slow
l %r5,0(%r1,%r10) # get word from skb
xr %r1,%r1 # set cc to zero
br %r8
sk_load_word_slow: #define SKF_MAX_NEG_OFF -0x200000 /* SKF_LL_OFF from filter.h */
lgr %r9,%r2 # save %r2
lgr %r3,%r1 # offset
la %r4,160(%r15) # pointer to temp buffer
lghi %r5,4 # 4 bytes
brasl %r14,skb_copy_bits # get data from skb
l %r5,160(%r15) # load result from temp buffer
ltgr %r2,%r2 # set cc to (%r2 != 0)
lgr %r2,%r9 # restore %r2
br %r8
/* A = *(u16 *) (skb->data+K+X) */ /*
ENTRY(sk_load_half_ind) * Load SIZE bytes from SKB
ar %r3,%r12 # offset += X */
bmr %r8 # < 0 -> return with cc #define sk_load_common(NAME, SIZE, LOAD) \
ENTRY(sk_load_##NAME); \
/* A = *(u16 *) (skb->data+K) */ ltgr %r3,%r3; /* Is offset negative? */ \
ENTRY(sk_load_half) jl sk_load_##NAME##_slow_neg; \
llgfr %r1,%r3 # extend offset ENTRY(sk_load_##NAME##_pos); \
ahi %r3,2 # offset + 2 aghi %r3,SIZE; /* Offset + SIZE */ \
clr %r11,%r3 # hlen <= offset + 2 ? clg %r3,STK_OFF_HLEN(%r15); /* Offset + SIZE > hlen? */ \
jl sk_load_half_slow jh sk_load_##NAME##_slow; \
llgh %r5,0(%r1,%r10) # get half from skb LOAD %r14,-SIZE(%r3,%r12); /* Get data from skb */ \
xr %r1,%r1 # set cc to zero b OFF_OK(%r6); /* Return */ \
br %r8 \
sk_load_##NAME##_slow:; \
sk_load_half_slow: lgr %r2,%r7; /* Arg1 = skb pointer */ \
lgr %r9,%r2 # save %r2 aghi %r3,-SIZE; /* Arg2 = offset */ \
lgr %r3,%r1 # offset la %r4,STK_OFF_TMP(%r15); /* Arg3 = temp bufffer */ \
la %r4,162(%r15) # pointer to temp buffer lghi %r5,SIZE; /* Arg4 = size */ \
lghi %r5,2 # 2 bytes brasl %r14,skb_copy_bits; /* Get data from skb */ \
brasl %r14,skb_copy_bits # get data from skb LOAD %r14,STK_OFF_TMP(%r15); /* Load from temp bufffer */ \
xc 160(2,%r15),160(%r15) ltgr %r2,%r2; /* Set cc to (%r2 != 0) */ \
l %r5,160(%r15) # load result from temp buffer br %r6; /* Return */
ltgr %r2,%r2 # set cc to (%r2 != 0)
lgr %r2,%r9 # restore %r2
br %r8
/* A = *(u8 *) (skb->data+K+X) */ sk_load_common(word, 4, llgf) /* r14 = *(u32 *) (skb->data+offset) */
ENTRY(sk_load_byte_ind) sk_load_common(half, 2, llgh) /* r14 = *(u16 *) (skb->data+offset) */
ar %r3,%r12 # offset += X
bmr %r8 # < 0 -> return with cc
/* A = *(u8 *) (skb->data+K) */ /*
* Load 1 byte from SKB (optimized version)
*/
/* r14 = *(u8 *) (skb->data+offset) */
ENTRY(sk_load_byte) ENTRY(sk_load_byte)
llgfr %r1,%r3 # extend offset ltgr %r3,%r3 # Is offset negative?
clr %r11,%r3 # hlen < offset ? jl sk_load_byte_slow_neg
jle sk_load_byte_slow ENTRY(sk_load_byte_pos)
lhi %r5,0 clg %r3,STK_OFF_HLEN(%r15) # Offset >= hlen?
ic %r5,0(%r1,%r10) # get byte from skb jnl sk_load_byte_slow
xr %r1,%r1 # set cc to zero llgc %r14,0(%r3,%r12) # Get byte from skb
br %r8 b OFF_OK(%r6) # Return OK
sk_load_byte_slow: sk_load_byte_slow:
lgr %r9,%r2 # save %r2 lgr %r2,%r7 # Arg1 = skb pointer
lgr %r3,%r1 # offset # Arg2 = offset
la %r4,163(%r15) # pointer to temp buffer la %r4,STK_OFF_TMP(%r15) # Arg3 = pointer to temp buffer
lghi %r5,1 # 1 byte lghi %r5,1 # Arg4 = size (1 byte)
brasl %r14,skb_copy_bits # get data from skb brasl %r14,skb_copy_bits # Get data from skb
xc 160(3,%r15),160(%r15) llgc %r14,STK_OFF_TMP(%r15) # Load result from temp buffer
l %r5,160(%r15) # load result from temp buffer ltgr %r2,%r2 # Set cc to (%r2 != 0)
ltgr %r2,%r2 # set cc to (%r2 != 0) br %r6 # Return cc
lgr %r2,%r9 # restore %r2
br %r8 #define sk_negative_common(NAME, SIZE, LOAD) \
sk_load_##NAME##_slow_neg:; \
cgfi %r3,SKF_MAX_NEG_OFF; \
jl bpf_error; \
lgr %r2,%r7; /* Arg1 = skb pointer */ \
/* Arg2 = offset */ \
lghi %r4,SIZE; /* Arg3 = size */ \
brasl %r14,bpf_internal_load_pointer_neg_helper; \
ltgr %r2,%r2; \
jz bpf_error; \
LOAD %r14,0(%r2); /* Get data from pointer */ \
xr %r3,%r3; /* Set cc to zero */ \
br %r6; /* Return cc */
/* X = (*(u8 *)(skb->data+K) & 0xf) << 2 */ sk_negative_common(word, 4, llgf)
ENTRY(sk_load_byte_msh) sk_negative_common(half, 2, llgh)
llgfr %r1,%r3 # extend offset sk_negative_common(byte, 1, llgc)
clr %r11,%r3 # hlen < offset ?
jle sk_load_byte_msh_slow
lhi %r12,0
ic %r12,0(%r1,%r10) # get byte from skb
nill %r12,0x0f
sll %r12,2
xr %r1,%r1 # set cc to zero
br %r8
sk_load_byte_msh_slow: bpf_error:
lgr %r9,%r2 # save %r2 # force a return 0 from jit handler
lgr %r3,%r1 # offset ltgr %r15,%r15 # Set condition code
la %r4,163(%r15) # pointer to temp buffer br %r6
lghi %r5,1 # 1 byte
brasl %r14,skb_copy_bits # get data from skb
xc 160(3,%r15),160(%r15)
l %r12,160(%r15) # load result from temp buffer
nill %r12,0x0f
sll %r12,2
ltgr %r2,%r2 # set cc to (%r2 != 0)
lgr %r2,%r9 # restore %r2
br %r8
arch/s390/net/bpf_jit.h 0 → 100644
View file @ b19a42e3
/*
* BPF Jit compiler defines
*
* Copyright IBM Corp. 2012,2015
*
* Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
* Michael Holzheu <holzheu@linux.vnet.ibm.com>
*/
#ifndef __ARCH_S390_NET_BPF_JIT_H
#define __ARCH_S390_NET_BPF_JIT_H
#ifndef __ASSEMBLY__
#include <linux/filter.h>
#include <linux/types.h>
extern u8 sk_load_word_pos[], sk_load_half_pos[], sk_load_byte_pos[];
extern u8 sk_load_word[], sk_load_half[], sk_load_byte[];
#endif /* __ASSEMBLY__ */
/*
* Stackframe layout (packed stack):
*
* ^ high
* +---------------+ |
* | old backchain | |
* +---------------+ |
* | r15 - r6 | |
* BFP -> +===============+ |
* | | |
* | BPF stack | |
* | | |
* +---------------+ |
* | 8 byte hlen | |
* R15+168 -> +---------------+ |
* | 4 byte align | |
* +---------------+ |
* | 4 byte temp | |
* | for bpf_jit.S | |
* R15+160 -> +---------------+ |
* | new backchain | |
* R15+152 -> +---------------+ |
* | + 152 byte SA | |
* R15 -> +---------------+ + low
*
* We get 160 bytes stack space from calling function, but only use
* 11 * 8 byte (old backchain + r15 - r6) for storing registers.
*/
#define STK_OFF (MAX_BPF_STACK + 8 + 4 + 4 + (160 - 11 * 8))
#define STK_OFF_TMP 160 /* Offset of tmp buffer on stack */
#define STK_OFF_HLEN 168 /* Offset of SKB header length on stack */
/* Offset to skip condition code check */
#define OFF_OK 4
#endif /* __ARCH_S390_NET_BPF_JIT_H */
arch/s390/net/bpf_jit_comp.c
View file @ b19a42e3
/* /*
* BPF Jit compiler for s390. * BPF Jit compiler for s390.
* *
* Copyright IBM Corp. 2012 * Minimum build requirements:
*
* - HAVE_MARCH_Z196_FEATURES: laal, laalg
* - HAVE_MARCH_Z10_FEATURES: msfi, cgrj, clgrj
* - HAVE_MARCH_Z9_109_FEATURES: alfi, llilf, clfi, oilf, nilf
* - PACK_STACK
* - 64BIT
*
* Copyright IBM Corp. 2012,2015
* *
* Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com> * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
* Michael Holzheu <holzheu@linux.vnet.ibm.com>
*/ */
#define KMSG_COMPONENT "bpf_jit"
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/if_vlan.h>
#include <linux/filter.h> #include <linux/filter.h>
#include <linux/init.h> #include <linux/init.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/facility.h>
#include <asm/dis.h> #include <asm/dis.h>
#include "bpf_jit.h"
/*
* Conventions:
* %r2 = skb pointer
* %r3 = offset parameter
* %r4 = scratch register / length parameter
* %r5 = BPF A accumulator
* %r8 = return address
* %r9 = save register for skb pointer
* %r10 = skb->data
* %r11 = skb->len - skb->data_len (headlen)
* %r12 = BPF X accumulator
* %r13 = literal pool pointer
* 0(%r15) - 63(%r15) scratch memory array with BPF_MEMWORDS
*/
int bpf_jit_enable __read_mostly; int bpf_jit_enable __read_mostly;
struct bpf_jit {
u32 seen; /* Flags to remember seen eBPF instructions */
u32 seen_reg[16]; /* Array to remember which registers are used */
u32 *addrs; /* Array with relative instruction addresses */
u8 *prg_buf; /* Start of program */
int size; /* Size of program and literal pool */
int size_prg; /* Size of program */
int prg; /* Current position in program */
int lit_start; /* Start of literal pool */
int lit; /* Current position in literal pool */
int base_ip; /* Base address for literal pool */
int ret0_ip; /* Address of return 0 */
int exit_ip; /* Address of exit */
};
#define BPF_SIZE_MAX 4096 /* Max size for program */
#define SEEN_SKB 1 /* skb access */
#define SEEN_MEM 2 /* use mem[] for temporary storage */
#define SEEN_RET0 4 /* ret0_ip points to a valid return 0 */
#define SEEN_LITERAL 8 /* code uses literals */
#define SEEN_FUNC 16 /* calls C functions */
#define SEEN_STACK (SEEN_FUNC | SEEN_MEM | SEEN_SKB)
/* /*
* assembly code in arch/x86/net/bpf_jit.S * s390 registers
*/ */
extern u8 sk_load_word[], sk_load_half[], sk_load_byte[], sk_load_byte_msh[]; #define REG_W0 (__MAX_BPF_REG+0) /* Work register 1 (even) */
extern u8 sk_load_word_ind[], sk_load_half_ind[], sk_load_byte_ind[]; #define REG_W1 (__MAX_BPF_REG+1) /* Work register 2 (odd) */
#define REG_SKB_DATA (__MAX_BPF_REG+2) /* SKB data register */
#define REG_L (__MAX_BPF_REG+3) /* Literal pool register */
#define REG_15 (__MAX_BPF_REG+4) /* Register 15 */
#define REG_0 REG_W0 /* Register 0 */
#define REG_2 BPF_REG_1 /* Register 2 */
#define REG_14 BPF_REG_0 /* Register 14 */
struct bpf_jit { /*
unsigned int seen; * Mapping of BPF registers to s390 registers
u8 *start; */
u8 *prg; static const int reg2hex[] = {
u8 *mid; /* Return code */
u8 *lit; [BPF_REG_0] = 14,
u8 *end; /* Function parameters */
u8 *base_ip; [BPF_REG_1] = 2,
u8 *ret0_ip; [BPF_REG_2] = 3,
u8 *exit_ip; [BPF_REG_3] = 4,
unsigned int off_load_word; [BPF_REG_4] = 5,
unsigned int off_load_half; [BPF_REG_5] = 6,
unsigned int off_load_byte; /* Call saved registers */
unsigned int off_load_bmsh; [BPF_REG_6] = 7,
unsigned int off_load_iword; [BPF_REG_7] = 8,
unsigned int off_load_ihalf; [BPF_REG_8] = 9,
unsigned int off_load_ibyte; [BPF_REG_9] = 10,
/* BPF stack pointer */
[BPF_REG_FP] = 13,
/* SKB data pointer */
[REG_SKB_DATA] = 12,
/* Work registers for s390x backend */
[REG_W0] = 0,
[REG_W1] = 1,
[REG_L] = 11,
[REG_15] = 15,
}; };
#define BPF_SIZE_MAX 4096 /* Max size for program */ static inline u32 reg(u32 dst_reg, u32 src_reg)
{
return reg2hex[dst_reg] << 4 | reg2hex[src_reg];
}
static inline u32 reg_high(u32 reg)
{
return reg2hex[reg] << 4;
}
static inline void reg_set_seen(struct bpf_jit *jit, u32 b1)
{
u32 r1 = reg2hex[b1];
if (!jit->seen_reg[r1] && r1 >= 6 && r1 <= 15)
jit->seen_reg[r1] = 1;
}
#define REG_SET_SEEN(b1) \
({ \
reg_set_seen(jit, b1); \
})
#define REG_SEEN(b1) jit->seen_reg[reg2hex[(b1)]]
/*
* EMIT macros for code generation
*/
#define _EMIT2(op) \
({ \
if (jit->prg_buf) \
*(u16 *) (jit->prg_buf + jit->prg) = op; \
jit->prg += 2; \
})
#define SEEN_DATAREF 1 /* might call external helpers */ #define EMIT2(op, b1, b2) \
#define SEEN_XREG 2 /* ebx is used */ ({ \
#define SEEN_MEM 4 /* use mem[] for temporary storage */ _EMIT2(op | reg(b1, b2)); \
#define SEEN_RET0 8 /* pc_ret0 points to a valid return 0 */ REG_SET_SEEN(b1); \
#define SEEN_LITERAL 16 /* code uses literals */ REG_SET_SEEN(b2); \
#define SEEN_LOAD_WORD 32 /* code uses sk_load_word */
#define SEEN_LOAD_HALF 64 /* code uses sk_load_half */
#define SEEN_LOAD_BYTE 128 /* code uses sk_load_byte */
#define SEEN_LOAD_BMSH 256 /* code uses sk_load_byte_msh */
#define SEEN_LOAD_IWORD 512 /* code uses sk_load_word_ind */
#define SEEN_LOAD_IHALF 1024 /* code uses sk_load_half_ind */
#define SEEN_LOAD_IBYTE 2048 /* code uses sk_load_byte_ind */
#define EMIT2(op) \
({ \
if (jit->prg + 2 <= jit->mid) \
*(u16 *) jit->prg = op; \
jit->prg += 2; \
}) })
#define EMIT4(op) \ #define _EMIT4(op) \
({ \ ({ \
if (jit->prg + 4 <= jit->mid) \ if (jit->prg_buf) \
*(u32 *) jit->prg = op; \ *(u32 *) (jit->prg_buf + jit->prg) = op; \
jit->prg += 4; \ jit->prg += 4; \
}) })
#define EMIT4_DISP(op, disp) \ #define EMIT4(op, b1, b2) \
({ \ ({ \
unsigned int __disp = (disp) & 0xfff; \ _EMIT4(op | reg(b1, b2)); \
EMIT4(op | __disp); \ REG_SET_SEEN(b1); \
REG_SET_SEEN(b2); \
}) })
#define EMIT4_IMM(op, imm) \ #define EMIT4_RRF(op, b1, b2, b3) \
({ \ ({ \
unsigned int __imm = (imm) & 0xffff; \ _EMIT4(op | reg_high(b3) << 8 | reg(b1, b2)); \
EMIT4(op | __imm); \ REG_SET_SEEN(b1); \
REG_SET_SEEN(b2); \
REG_SET_SEEN(b3); \
}) })
#define EMIT4_PCREL(op, pcrel) \ #define _EMIT4_DISP(op, disp) \
({ \ ({ \
long __pcrel = ((pcrel) >> 1) & 0xffff; \ unsigned int __disp = (disp) & 0xfff; \
EMIT4(op | __pcrel); \ _EMIT4(op | __disp); \
}) })
#define EMIT6(op1, op2) \ #define EMIT4_DISP(op, b1, b2, disp) \
({ \ ({ \
if (jit->prg + 6 <= jit->mid) { \ _EMIT4_DISP(op | reg_high(b1) << 16 | \
*(u32 *) jit->prg = op1; \ reg_high(b2) << 8, disp); \
*(u16 *) (jit->prg + 4) = op2; \ REG_SET_SEEN(b1); \
} \ REG_SET_SEEN(b2); \
jit->prg += 6; \
}) })
#define EMIT6_DISP(op1, op2, disp) \ #define EMIT4_IMM(op, b1, imm) \
({ \ ({ \
unsigned int __disp = (disp) & 0xfff; \ unsigned int __imm = (imm) & 0xffff; \
EMIT6(op1 | __disp, op2); \ _EMIT4(op | reg_high(b1) << 16 | __imm); \
REG_SET_SEEN(b1); \
}) })
#define EMIT6_IMM(op, imm) \ #define EMIT4_PCREL(op, pcrel) \
({ \ ({ \
unsigned int __imm = (imm); \ long __pcrel = ((pcrel) >> 1) & 0xffff; \
EMIT6(op | (__imm >> 16), __imm & 0xffff); \ _EMIT4(op | __pcrel); \
}) })
#define EMIT_CONST(val) \ #define _EMIT6(op1, op2) \
({ \ ({ \
unsigned int ret; \ if (jit->prg_buf) { \
ret = (unsigned int) (jit->lit - jit->base_ip); \ *(u32 *) (jit->prg_buf + jit->prg) = op1; \
jit->seen |= SEEN_LITERAL; \ *(u16 *) (jit->prg_buf + jit->prg + 4) = op2; \
if (jit->lit + 4 <= jit->end) \ } \
*(u32 *) jit->lit = val; \ jit->prg += 6; \
jit->lit += 4; \
ret; \
}) })
#define EMIT_FN_CONST(bit, fn) \ #define _EMIT6_DISP(op1, op2, disp) \
({ \ ({ \
unsigned int ret; \ unsigned int __disp = (disp) & 0xfff; \
ret = (unsigned int) (jit->lit - jit->base_ip); \ _EMIT6(op1 | __disp, op2); \
if (jit->seen & bit) { \
jit->seen |= SEEN_LITERAL; \
if (jit->lit + 8 <= jit->end) \
*(void **) jit->lit = fn; \
jit->lit += 8; \
} \
ret; \
}) })
static void bpf_jit_fill_hole(void *area, unsigned int size) #define EMIT6_DISP(op1, op2, b1, b2, b3, disp) \
({ \
_EMIT6_DISP(op1 | reg(b1, b2) << 16 | \
reg_high(b3) << 8, op2, disp); \
REG_SET_SEEN(b1); \
REG_SET_SEEN(b2); \
REG_SET_SEEN(b3); \
})
#define _EMIT6_DISP_LH(op1, op2, disp) \
({ \
unsigned int __disp_h = ((u32)disp) & 0xff000; \
unsigned int __disp_l = ((u32)disp) & 0x00fff; \
_EMIT6(op1 | __disp_l, op2 | __disp_h >> 4); \
})
#define EMIT6_DISP_LH(op1, op2, b1, b2, b3, disp) \
({ \
_EMIT6_DISP_LH(op1 | reg(b1, b2) << 16 | \
reg_high(b3) << 8, op2, disp); \
REG_SET_SEEN(b1); \
REG_SET_SEEN(b2); \
REG_SET_SEEN(b3); \
})
#define EMIT6_PCREL(op1, op2, b1, b2, i, off, mask) \
({ \
/* Branch instruction needs 6 bytes */ \
int rel = (addrs[i + off + 1] - (addrs[i + 1] - 6)) / 2;\
_EMIT6(op1 | reg(b1, b2) << 16 | rel, op2 | mask); \
REG_SET_SEEN(b1); \
REG_SET_SEEN(b2); \
})
#define _EMIT6_IMM(op, imm) \
({ \
unsigned int __imm = (imm); \
_EMIT6(op | (__imm >> 16), __imm & 0xffff); \
})
#define EMIT6_IMM(op, b1, imm) \
({ \
_EMIT6_IMM(op | reg_high(b1) << 16, imm); \
REG_SET_SEEN(b1); \
})
#define EMIT_CONST_U32(val) \
({ \
unsigned int ret; \
ret = jit->lit - jit->base_ip; \
jit->seen |= SEEN_LITERAL; \
if (jit->prg_buf) \
*(u32 *) (jit->prg_buf + jit->lit) = (u32) val; \
jit->lit += 4; \
ret; \
})
#define EMIT_CONST_U64(val) \
({ \
unsigned int ret; \
ret = jit->lit - jit->base_ip; \
jit->seen |= SEEN_LITERAL; \
if (jit->prg_buf) \
*(u64 *) (jit->prg_buf + jit->lit) = (u64) val; \
jit->lit += 8; \
ret; \
})
#define EMIT_ZERO(b1) \
({ \
/* llgfr %dst,%dst (zero extend to 64 bit) */ \
EMIT4(0xb9160000, b1, b1); \
REG_SET_SEEN(b1); \
})
/*
* Fill whole space with illegal instructions
*/
static void jit_fill_hole(void *area, unsigned int size)
{ {
/* Fill whole space with illegal instructions */
memset(area, 0, size); memset(area, 0, size);
} }
static void bpf_jit_prologue(struct bpf_jit *jit) /*
* Save registers from "rs" (register start) to "re" (register end) on stack
*/
static void save_regs(struct bpf_jit *jit, u32 rs, u32 re)
{
u32 off = 72 + (rs - 6) * 8;
if (rs == re)
/* stg %rs,off(%r15) */
_EMIT6(0xe300f000 | rs << 20 | off, 0x0024);
else
/* stmg %rs,%re,off(%r15) */
_EMIT6_DISP(0xeb00f000 | rs << 20 | re << 16, 0x0024, off);
}
/*
* Restore registers from "rs" (register start) to "re" (register end) on stack
*/
static void restore_regs(struct bpf_jit *jit, u32 rs, u32 re)
{ {
/* Save registers and create stack frame if necessary */ u32 off = 72 + (rs - 6) * 8;
if (jit->seen & SEEN_DATAREF) {
/* stmg %r8,%r15,88(%r15) */ if (jit->seen & SEEN_STACK)
EMIT6(0xeb8ff058, 0x0024); off += STK_OFF;
/* lgr %r14,%r15 */
EMIT4(0xb90400ef); if (rs == re)
/* aghi %r15,<offset> */ /* lg %rs,off(%r15) */
EMIT4_IMM(0xa7fb0000, (jit->seen & SEEN_MEM) ? -112 : -80); _EMIT6(0xe300f000 | rs << 20 | off, 0x0004);
/* stg %r14,152(%r15) */ else
EMIT6(0xe3e0f098, 0x0024); /* lmg %rs,%re,off(%r15) */
} else if ((jit->seen & SEEN_XREG) && (jit->seen & SEEN_LITERAL)) _EMIT6_DISP(0xeb00f000 | rs << 20 | re << 16, 0x0004, off);
/* stmg %r12,%r13,120(%r15) */ }
EMIT6(0xebcdf078, 0x0024);
else if (jit->seen & SEEN_XREG)
/* stg %r12,120(%r15) */
EMIT6(0xe3c0f078, 0x0024);
else if (jit->seen & SEEN_LITERAL)
/* stg %r13,128(%r15) */
EMIT6(0xe3d0f080, 0x0024);
/*
* Return first seen register (from start)
*/
static int get_start(struct bpf_jit *jit, int start)
{
int i;
for (i = start; i <= 15; i++) {
if (jit->seen_reg[i])
return i;
}
return 0;
}
/*
* Return last seen register (from start) (gap >= 2)
*/
static int get_end(struct bpf_jit *jit, int start)
{
int i;
for (i = start; i < 15; i++) {
if (!jit->seen_reg[i] && !jit->seen_reg[i + 1])
return i - 1;
}
return jit->seen_reg[15] ? 15 : 14;
}
#define REGS_SAVE 1
#define REGS_RESTORE 0
/*
* Save and restore clobbered registers (6-15) on stack.
* We save/restore registers in chunks with gap >= 2 registers.
*/
static void save_restore_regs(struct bpf_jit *jit, int op)
{
int re = 6, rs;
do {
rs = get_start(jit, re);
if (!rs)
break;
re = get_end(jit, rs + 1);
if (op == REGS_SAVE)
save_regs(jit, rs, re);
else
restore_regs(jit, rs, re);
re++;
} while (re <= 15);
}
/*
* Emit function prologue
*
* Save registers and create stack frame if necessary.
* See stack frame layout desription in "bpf_jit.h"!
*/
static void bpf_jit_prologue(struct bpf_jit *jit)
{
/* Save registers */
save_restore_regs(jit, REGS_SAVE);
/* Setup literal pool */ /* Setup literal pool */
if (jit->seen & SEEN_LITERAL) { if (jit->seen & SEEN_LITERAL) {
/* basr %r13,0 */ /* basr %r13,0 */
EMIT2(0x0dd0); EMIT2(0x0d00, REG_L, REG_0);
jit->base_ip = jit->prg; jit->base_ip = jit->prg;
} }
jit->off_load_word = EMIT_FN_CONST(SEEN_LOAD_WORD, sk_load_word); /* Setup stack and backchain */
jit->off_load_half = EMIT_FN_CONST(SEEN_LOAD_HALF, sk_load_half); if (jit->seen & SEEN_STACK) {
jit->off_load_byte = EMIT_FN_CONST(SEEN_LOAD_BYTE, sk_load_byte); /* lgr %bfp,%r15 (BPF frame pointer) */
jit->off_load_bmsh = EMIT_FN_CONST(SEEN_LOAD_BMSH, sk_load_byte_msh); EMIT4(0xb9040000, BPF_REG_FP, REG_15);
jit->off_load_iword = EMIT_FN_CONST(SEEN_LOAD_IWORD, sk_load_word_ind); /* aghi %r15,-STK_OFF */
jit->off_load_ihalf = EMIT_FN_CONST(SEEN_LOAD_IHALF, sk_load_half_ind); EMIT4_IMM(0xa70b0000, REG_15, -STK_OFF);
jit->off_load_ibyte = EMIT_FN_CONST(SEEN_LOAD_IBYTE, sk_load_byte_ind); if (jit->seen & SEEN_FUNC)
/* stg %bfp,152(%r15) (backchain) */
/* Filter needs to access skb data */ EMIT6_DISP_LH(0xe3000000, 0x0024, BPF_REG_FP, REG_0,
if (jit->seen & SEEN_DATAREF) { REG_15, 152);
/* l %r11,<len>(%r2) */ }
EMIT4_DISP(0x58b02000, offsetof(struct sk_buff, len)); /*
/* s %r11,<data_len>(%r2) */ * For SKB access %b1 contains the SKB pointer. For "bpf_jit.S"
EMIT4_DISP(0x5bb02000, offsetof(struct sk_buff, data_len)); * we store the SKB header length on the stack and the SKB data
/* lg %r10,<data>(%r2) */ * pointer in REG_SKB_DATA.
EMIT6_DISP(0xe3a02000, 0x0004, */
offsetof(struct sk_buff, data)); if (jit->seen & SEEN_SKB) {
/* Header length: llgf %w1,<len>(%b1) */
EMIT6_DISP_LH(0xe3000000, 0x0016, REG_W1, REG_0, BPF_REG_1,
offsetof(struct sk_buff, len));
/* s %w1,<data_len>(%b1) */
EMIT4_DISP(0x5b000000, REG_W1, BPF_REG_1,
offsetof(struct sk_buff, data_len));
/* stg %w1,ST_OFF_HLEN(%r0,%r15) */
EMIT6_DISP_LH(0xe3000000, 0x0024, REG_W1, REG_0, REG_15,
STK_OFF_HLEN);
/* lg %skb_data,data_off(%b1) */
EMIT6_DISP_LH(0xe3000000, 0x0004, REG_SKB_DATA, REG_0,
BPF_REG_1, offsetof(struct sk_buff, data));
} }
/* BPF compatibility: clear A (%b7) and X (%b8) registers */
if (REG_SEEN(BPF_REG_7))
/* lghi %b7,0 */
EMIT4_IMM(0xa7090000, BPF_REG_7, 0);
if (REG_SEEN(BPF_REG_8))
/* lghi %b8,0 */
EMIT4_IMM(0xa7090000, BPF_REG_8, 0);
} }
/*
* Function epilogue
*/
static void bpf_jit_epilogue(struct bpf_jit *jit) static void bpf_jit_epilogue(struct bpf_jit *jit)
{ {
/* Return 0 */ /* Return 0 */
if (jit->seen & SEEN_RET0) { if (jit->seen & SEEN_RET0) {
jit->ret0_ip = jit->prg; jit->ret0_ip = jit->prg;
/* lghi %r2,0 */ /* lghi %b0,0 */
EMIT4(0xa7290000); EMIT4_IMM(0xa7090000, BPF_REG_0, 0);
} }
jit->exit_ip = jit->prg; jit->exit_ip = jit->prg;
/* Load exit code: lgr %r2,%b0 */
EMIT4(0xb9040000, REG_2, BPF_REG_0);
/* Restore registers */ /* Restore registers */
if (jit->seen & SEEN_DATAREF) save_restore_regs(jit, REGS_RESTORE);
/* lmg %r8,%r15,<offset>(%r15) */
EMIT6_DISP(0xeb8ff000, 0x0004,
(jit->seen & SEEN_MEM) ? 200 : 168);
else if ((jit->seen & SEEN_XREG) && (jit->seen & SEEN_LITERAL))
/* lmg %r12,%r13,120(%r15) */
EMIT6(0xebcdf078, 0x0004);
else if (jit->seen & SEEN_XREG)
/* lg %r12,120(%r15) */
EMIT6(0xe3c0f078, 0x0004);
else if (jit->seen & SEEN_LITERAL)
/* lg %r13,128(%r15) */
EMIT6(0xe3d0f080, 0x0004);
/* br %r14 */ /* br %r14 */
EMIT2(0x07fe); _EMIT2(0x07fe);
} }
/* /*
* make sure we dont leak kernel information to user * Compile one eBPF instruction into s390x code
*/ */
static void bpf_jit_noleaks(struct bpf_jit *jit, struct sock_filter *filter) static int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i)
{ {
/* Clear temporary memory if (seen & SEEN_MEM) */ struct bpf_insn *insn = &fp->insnsi[i];
if (jit->seen & SEEN_MEM) int jmp_off, last, insn_count = 1;
/* xc 0(64,%r15),0(%r15) */ unsigned int func_addr, mask;
EMIT6(0xd73ff000, 0xf000); u32 dst_reg = insn->dst_reg;
/* Clear X if (seen & SEEN_XREG) */ u32 src_reg = insn->src_reg;
if (jit->seen & SEEN_XREG) u32 *addrs = jit->addrs;
/* lhi %r12,0 */ s32 imm = insn->imm;
EMIT4(0xa7c80000); s16 off = insn->off;
/* Clear A if the first register does not set it. */
switch (filter[0].code) {
case BPF_LD | BPF_W | BPF_ABS:
case BPF_LD | BPF_H | BPF_ABS:
case BPF_LD | BPF_B | BPF_ABS:
case BPF_LD | BPF_W | BPF_LEN:
case BPF_LD | BPF_W | BPF_IND:
case BPF_LD | BPF_H | BPF_IND:
case BPF_LD | BPF_B | BPF_IND:
case BPF_LD | BPF_IMM:
case BPF_LD | BPF_MEM:
case BPF_MISC | BPF_TXA:
case BPF_RET | BPF_K:
/* first instruction sets A register */
break;
default: /* A = 0 */
/* lhi %r5,0 */
EMIT4(0xa7580000);
}
}
static int bpf_jit_insn(struct bpf_jit *jit, struct sock_filter *filter, switch (insn->code) {
unsigned int *addrs, int i, int last) /*
{ * BPF_MOV
unsigned int K; */
int offset; case BPF_ALU | BPF_MOV | BPF_X: /* dst = (u32) src */
unsigned int mask; /* llgfr %dst,%src */
u16 code; EMIT4(0xb9160000, dst_reg, src_reg);
break;
K = filter->k; case BPF_ALU64 | BPF_MOV | BPF_X: /* dst = src */
code = bpf_anc_helper(filter); /* lgr %dst,%src */
EMIT4(0xb9040000, dst_reg, src_reg);
switch (code) { break;
case BPF_ALU | BPF_ADD | BPF_X: /* A += X */ case BPF_ALU | BPF_MOV | BPF_K: /* dst = (u32) imm */
jit->seen |= SEEN_XREG; /* llilf %dst,imm */
/* ar %r5,%r12 */ EMIT6_IMM(0xc00f0000, dst_reg, imm);
EMIT2(0x1a5c); break;
break; case BPF_ALU64 | BPF_MOV | BPF_K: /* dst = imm */
case BPF_ALU | BPF_ADD | BPF_K: /* A += K */ /* lgfi %dst,imm */
if (!K) EMIT6_IMM(0xc0010000, dst_reg, imm);
break;
/*
* BPF_LD 64
*/
case BPF_LD | BPF_IMM | BPF_DW: /* dst = (u64) imm */
{
/* 16 byte instruction that uses two 'struct bpf_insn' */
u64 imm64;
imm64 = (u64)(u32) insn[0].imm | ((u64)(u32) insn[1].imm) << 32;
/* lg %dst,<d(imm)>(%l) */
EMIT6_DISP_LH(0xe3000000, 0x0004, dst_reg, REG_0, REG_L,
EMIT_CONST_U64(imm64));
insn_count = 2;
break;
}
/*
* BPF_ADD
*/
case BPF_ALU | BPF_ADD | BPF_X: /* dst = (u32) dst + (u32) src */
/* ar %dst,%src */
EMIT2(0x1a00, dst_reg, src_reg);
EMIT_ZERO(dst_reg);
break;
case BPF_ALU64 | BPF_ADD | BPF_X: /* dst = dst + src */
/* agr %dst,%src */
EMIT4(0xb9080000, dst_reg, src_reg);
break;
case BPF_ALU | BPF_ADD | BPF_K: /* dst = (u32) dst + (u32) imm */
if (!imm)
break; break;
if (K <= 16383) /* alfi %dst,imm */
/* ahi %r5,<K> */ EMIT6_IMM(0xc20b0000, dst_reg, imm);
EMIT4_IMM(0xa75a0000, K); EMIT_ZERO(dst_reg);
else if (test_facility(21)) break;
/* alfi %r5,<K> */ case BPF_ALU64 | BPF_ADD | BPF_K: /* dst = dst + imm */
EMIT6_IMM(0xc25b0000, K); if (!imm)
else break;
/* a %r5,<d(K)>(%r13) */ /* agfi %dst,imm */
EMIT4_DISP(0x5a50d000, EMIT_CONST(K)); EMIT6_IMM(0xc2080000, dst_reg, imm);
break;
/*
* BPF_SUB
*/
case BPF_ALU | BPF_SUB | BPF_X: /* dst = (u32) dst - (u32) src */
/* sr %dst,%src */
EMIT2(0x1b00, dst_reg, src_reg);
EMIT_ZERO(dst_reg);
break; break;
case BPF_ALU | BPF_SUB | BPF_X: /* A -= X */ case BPF_ALU64 | BPF_SUB | BPF_X: /* dst = dst - src */
jit->seen |= SEEN_XREG; /* sgr %dst,%src */
/* sr %r5,%r12 */ EMIT4(0xb9090000, dst_reg, src_reg);
EMIT2(0x1b5c);
break; break;
case BPF_ALU | BPF_SUB | BPF_K: /* A -= K */ case BPF_ALU | BPF_SUB | BPF_K: /* dst = (u32) dst - (u32) imm */
if (!K) if (!imm)
break; break;
if (K <= 16384) /* alfi %dst,-imm */
/* ahi %r5,-K */ EMIT6_IMM(0xc20b0000, dst_reg, -imm);
EMIT4_IMM(0xa75a0000, -K); EMIT_ZERO(dst_reg);
else if (test_facility(21))
/* alfi %r5,-K */
EMIT6_IMM(0xc25b0000, -K);
else
/* s %r5,<d(K)>(%r13) */
EMIT4_DISP(0x5b50d000, EMIT_CONST(K));
break;
case BPF_ALU | BPF_MUL | BPF_X: /* A *= X */
jit->seen |= SEEN_XREG;
/* msr %r5,%r12 */
EMIT4(0xb252005c);
break;
case BPF_ALU | BPF_MUL | BPF_K: /* A *= K */
if (K <= 16383)
/* mhi %r5,K */
EMIT4_IMM(0xa75c0000, K);
else if (test_facility(34))
/* msfi %r5,<K> */
EMIT6_IMM(0xc2510000, K);
else
/* ms %r5,<d(K)>(%r13) */
EMIT4_DISP(0x7150d000, EMIT_CONST(K));
break; break;
case BPF_ALU | BPF_DIV | BPF_X: /* A /= X */ case BPF_ALU64 | BPF_SUB | BPF_K: /* dst = dst - imm */
jit->seen |= SEEN_XREG | SEEN_RET0; if (!imm)
/* ltr %r12,%r12 */ break;
EMIT2(0x12cc); /* agfi %dst,-imm */
/* jz <ret0> */ EMIT6_IMM(0xc2080000, dst_reg, -imm);
EMIT4_PCREL(0xa7840000, (jit->ret0_ip - jit->prg)); break;
/* lhi %r4,0 */ /*
EMIT4(0xa7480000); * BPF_MUL
/* dlr %r4,%r12 */ */
EMIT4(0xb997004c); case BPF_ALU | BPF_MUL | BPF_X: /* dst = (u32) dst * (u32) src */
break; /* msr %dst,%src */
case BPF_ALU | BPF_DIV | BPF_K: /* A /= K */ EMIT4(0xb2520000, dst_reg, src_reg);
if (K == 1) EMIT_ZERO(dst_reg);
break;
case BPF_ALU64 | BPF_MUL | BPF_X: /* dst = dst * src */
/* msgr %dst,%src */
EMIT4(0xb90c0000, dst_reg, src_reg);
break;
case BPF_ALU | BPF_MUL | BPF_K: /* dst = (u32) dst * (u32) imm */
if (imm == 1)
break;
/* msfi %r5,imm */
EMIT6_IMM(0xc2010000, dst_reg, imm);
EMIT_ZERO(dst_reg);
break;
case BPF_ALU64 | BPF_MUL | BPF_K: /* dst = dst * imm */
if (imm == 1)
break; break;
/* lhi %r4,0 */ /* msgfi %dst,imm */
EMIT4(0xa7480000); EMIT6_IMM(0xc2000000, dst_reg, imm);
/* dl %r4,<d(K)>(%r13) */ break;
EMIT6_DISP(0xe340d000, 0x0097, EMIT_CONST(K)); /*
break; * BPF_DIV / BPF_MOD
case BPF_ALU | BPF_MOD | BPF_X: /* A %= X */ */
jit->seen |= SEEN_XREG | SEEN_RET0; case BPF_ALU | BPF_DIV | BPF_X: /* dst = (u32) dst / (u32) src */
/* ltr %r12,%r12 */ case BPF_ALU | BPF_MOD | BPF_X: /* dst = (u32) dst % (u32) src */
EMIT2(0x12cc); {
int rc_reg = BPF_OP(insn->code) == BPF_DIV ? REG_W1 : REG_W0;
jit->seen |= SEEN_RET0;
/* ltr %src,%src (if src == 0 goto fail) */
EMIT2(0x1200, src_reg, src_reg);
/* jz <ret0> */
EMIT4_PCREL(0xa7840000, jit->ret0_ip - jit->prg);
/* lhi %w0,0 */
EMIT4_IMM(0xa7080000, REG_W0, 0);
/* lr %w1,%dst */
EMIT2(0x1800, REG_W1, dst_reg);
/* dlr %w0,%src */
EMIT4(0xb9970000, REG_W0, src_reg);
/* llgfr %dst,%rc */
EMIT4(0xb9160000, dst_reg, rc_reg);
break;
}
case BPF_ALU64 | BPF_DIV | BPF_X: /* dst = dst / (u32) src */
case BPF_ALU64 | BPF_MOD | BPF_X: /* dst = dst % (u32) src */
{
int rc_reg = BPF_OP(insn->code) == BPF_DIV ? REG_W1 : REG_W0;
jit->seen |= SEEN_RET0;
/* ltgr %src,%src (if src == 0 goto fail) */
EMIT4(0xb9020000, src_reg, src_reg);
/* jz <ret0> */ /* jz <ret0> */
EMIT4_PCREL(0xa7840000, (jit->ret0_ip - jit->prg)); EMIT4_PCREL(0xa7840000, jit->ret0_ip - jit->prg);
/* lhi %r4,0 */ /* lghi %w0,0 */
EMIT4(0xa7480000); EMIT4_IMM(0xa7090000, REG_W0, 0);
/* dlr %r4,%r12 */ /* lgr %w1,%dst */
EMIT4(0xb997004c); EMIT4(0xb9040000, REG_W1, dst_reg);
/* lr %r5,%r4 */ /* llgfr %dst,%src (u32 cast) */
EMIT2(0x1854); EMIT4(0xb9160000, dst_reg, src_reg);
break; /* dlgr %w0,%dst */
case BPF_ALU | BPF_MOD | BPF_K: /* A %= K */ EMIT4(0xb9870000, REG_W0, dst_reg);
if (K == 1) { /* lgr %dst,%rc */
/* lhi %r5,0 */ EMIT4(0xb9040000, dst_reg, rc_reg);
EMIT4(0xa7580000); break;
}
case BPF_ALU | BPF_DIV | BPF_K: /* dst = (u32) dst / (u32) imm */
case BPF_ALU | BPF_MOD | BPF_K: /* dst = (u32) dst % (u32) imm */
{
int rc_reg = BPF_OP(insn->code) == BPF_DIV ? REG_W1 : REG_W0;
if (imm == 1) {
if (BPF_OP(insn->code) == BPF_MOD)
/* lhgi %dst,0 */
EMIT4_IMM(0xa7090000, dst_reg, 0);
break; break;
} }
/* lhi %r4,0 */ /* lhi %w0,0 */
EMIT4(0xa7480000); EMIT4_IMM(0xa7080000, REG_W0, 0);
/* dl %r4,<d(K)>(%r13) */ /* lr %w1,%dst */
EMIT6_DISP(0xe340d000, 0x0097, EMIT_CONST(K)); EMIT2(0x1800, REG_W1, dst_reg);
/* lr %r5,%r4 */ /* dl %w0,<d(imm)>(%l) */
EMIT2(0x1854); EMIT6_DISP_LH(0xe3000000, 0x0097, REG_W0, REG_0, REG_L,
break; EMIT_CONST_U32(imm));
case BPF_ALU | BPF_AND | BPF_X: /* A &= X */ /* llgfr %dst,%rc */
jit->seen |= SEEN_XREG; EMIT4(0xb9160000, dst_reg, rc_reg);
/* nr %r5,%r12 */ break;
EMIT2(0x145c); }
break; case BPF_ALU64 | BPF_DIV | BPF_K: /* dst = dst / (u32) imm */
case BPF_ALU | BPF_AND | BPF_K: /* A &= K */ case BPF_ALU64 | BPF_MOD | BPF_K: /* dst = dst % (u32) imm */
if (test_facility(21)) {
/* nilf %r5,<K> */ int rc_reg = BPF_OP(insn->code) == BPF_DIV ? REG_W1 : REG_W0;
EMIT6_IMM(0xc05b0000, K);
else if (imm == 1) {
/* n %r5,<d(K)>(%r13) */ if (BPF_OP(insn->code) == BPF_MOD)
EMIT4_DISP(0x5450d000, EMIT_CONST(K)); /* lhgi %dst,0 */
break; EMIT4_IMM(0xa7090000, dst_reg, 0);
case BPF_ALU | BPF_OR | BPF_X: /* A |= X */ break;
jit->seen |= SEEN_XREG; }
/* or %r5,%r12 */ /* lghi %w0,0 */
EMIT2(0x165c); EMIT4_IMM(0xa7090000, REG_W0, 0);
break; /* lgr %w1,%dst */
case BPF_ALU | BPF_OR | BPF_K: /* A |= K */ EMIT4(0xb9040000, REG_W1, dst_reg);
if (test_facility(21)) /* dlg %w0,<d(imm)>(%l) */
/* oilf %r5,<K> */ EMIT6_DISP_LH(0xe3000000, 0x0087, REG_W0, REG_0, REG_L,
EMIT6_IMM(0xc05d0000, K); EMIT_CONST_U64((u32) imm));
else /* lgr %dst,%rc */
/* o %r5,<d(K)>(%r13) */ EMIT4(0xb9040000, dst_reg, rc_reg);
EMIT4_DISP(0x5650d000, EMIT_CONST(K)); break;
}
/*
* BPF_AND
*/
case BPF_ALU | BPF_AND | BPF_X: /* dst = (u32) dst & (u32) src */
/* nr %dst,%src */
EMIT2(0x1400, dst_reg, src_reg);
EMIT_ZERO(dst_reg);
break;
case BPF_ALU64 | BPF_AND | BPF_X: /* dst = dst & src */
/* ngr %dst,%src */
EMIT4(0xb9800000, dst_reg, src_reg);
break;
case BPF_ALU | BPF_AND | BPF_K: /* dst = (u32) dst & (u32) imm */
/* nilf %dst,imm */
EMIT6_IMM(0xc00b0000, dst_reg, imm);
EMIT_ZERO(dst_reg);
break; break;
case BPF_ANC | SKF_AD_ALU_XOR_X: /* A ^= X; */ case BPF_ALU64 | BPF_AND | BPF_K: /* dst = dst & imm */
case BPF_ALU | BPF_XOR | BPF_X: /* ng %dst,<d(imm)>(%l) */
jit->seen |= SEEN_XREG; EMIT6_DISP_LH(0xe3000000, 0x0080, dst_reg, REG_0, REG_L,
/* xr %r5,%r12 */ EMIT_CONST_U64(imm));
EMIT2(0x175c);
break; break;
case BPF_ALU | BPF_XOR | BPF_K: /* A ^= K */ /*
if (!K) * BPF_OR
*/
case BPF_ALU | BPF_OR | BPF_X: /* dst = (u32) dst | (u32) src */
/* or %dst,%src */
EMIT2(0x1600, dst_reg, src_reg);
EMIT_ZERO(dst_reg);
break;
case BPF_ALU64 | BPF_OR | BPF_X: /* dst = dst | src */
/* ogr %dst,%src */
EMIT4(0xb9810000, dst_reg, src_reg);
break;
case BPF_ALU | BPF_OR | BPF_K: /* dst = (u32) dst | (u32) imm */
/* oilf %dst,imm */
EMIT6_IMM(0xc00d0000, dst_reg, imm);
EMIT_ZERO(dst_reg);
break;
case BPF_ALU64 | BPF_OR | BPF_K: /* dst = dst | imm */
/* og %dst,<d(imm)>(%l) */
EMIT6_DISP_LH(0xe3000000, 0x0081, dst_reg, REG_0, REG_L,
EMIT_CONST_U64(imm));
break;
/*
* BPF_XOR
*/
case BPF_ALU | BPF_XOR | BPF_X: /* dst = (u32) dst ^ (u32) src */
/* xr %dst,%src */
EMIT2(0x1700, dst_reg, src_reg);
EMIT_ZERO(dst_reg);
break;
case BPF_ALU64 | BPF_XOR | BPF_X: /* dst = dst ^ src */
/* xgr %dst,%src */
EMIT4(0xb9820000, dst_reg, src_reg);
break;
case BPF_ALU | BPF_XOR | BPF_K: /* dst = (u32) dst ^ (u32) imm */
if (!imm)
break; break;
/* x %r5,<d(K)>(%r13) */ /* xilf %dst,imm */
EMIT4_DISP(0x5750d000, EMIT_CONST(K)); EMIT6_IMM(0xc0070000, dst_reg, imm);
EMIT_ZERO(dst_reg);
break;
case BPF_ALU64 | BPF_XOR | BPF_K: /* dst = dst ^ imm */
/* xg %dst,<d(imm)>(%l) */
EMIT6_DISP_LH(0xe3000000, 0x0082, dst_reg, REG_0, REG_L,
EMIT_CONST_U64(imm));
break;
/*
* BPF_LSH
*/
case BPF_ALU | BPF_LSH | BPF_X: /* dst = (u32) dst << (u32) src */
/* sll %dst,0(%src) */
EMIT4_DISP(0x89000000, dst_reg, src_reg, 0);
EMIT_ZERO(dst_reg);
break; break;
case BPF_ALU | BPF_LSH | BPF_X: /* A <<= X; */ case BPF_ALU64 | BPF_LSH | BPF_X: /* dst = dst << src */
jit->seen |= SEEN_XREG; /* sllg %dst,%dst,0(%src) */
/* sll %r5,0(%r12) */ EMIT6_DISP_LH(0xeb000000, 0x000d, dst_reg, dst_reg, src_reg, 0);
EMIT4(0x8950c000);
break; break;
case BPF_ALU | BPF_LSH | BPF_K: /* A <<= K */ case BPF_ALU | BPF_LSH | BPF_K: /* dst = (u32) dst << (u32) imm */
if (K == 0) if (imm == 0)
break; break;
/* sll %r5,K */ /* sll %dst,imm(%r0) */
EMIT4_DISP(0x89500000, K); EMIT4_DISP(0x89000000, dst_reg, REG_0, imm);
EMIT_ZERO(dst_reg);
break; break;
case BPF_ALU | BPF_RSH | BPF_X: /* A >>= X; */ case BPF_ALU64 | BPF_LSH | BPF_K: /* dst = dst << imm */
jit->seen |= SEEN_XREG; if (imm == 0)
/* srl %r5,0(%r12) */ break;
EMIT4(0x8850c000); /* sllg %dst,%dst,imm(%r0) */
EMIT6_DISP_LH(0xeb000000, 0x000d, dst_reg, dst_reg, REG_0, imm);
break;
/*
* BPF_RSH
*/
case BPF_ALU | BPF_RSH | BPF_X: /* dst = (u32) dst >> (u32) src */
/* srl %dst,0(%src) */
EMIT4_DISP(0x88000000, dst_reg, src_reg, 0);
EMIT_ZERO(dst_reg);
break; break;
case BPF_ALU | BPF_RSH | BPF_K: /* A >>= K; */ case BPF_ALU64 | BPF_RSH | BPF_X: /* dst = dst >> src */
if (K == 0) /* srlg %dst,%dst,0(%src) */
EMIT6_DISP_LH(0xeb000000, 0x000c, dst_reg, dst_reg, src_reg, 0);
break;
case BPF_ALU | BPF_RSH | BPF_K: /* dst = (u32) dst >> (u32) imm */
if (imm == 0)
break; break;
/* srl %r5,K */ /* srl %dst,imm(%r0) */
EMIT4_DISP(0x88500000, K); EMIT4_DISP(0x88000000, dst_reg, REG_0, imm);
break; EMIT_ZERO(dst_reg);
case BPF_ALU | BPF_NEG: /* A = -A */ break;
/* lcr %r5,%r5 */ case BPF_ALU64 | BPF_RSH | BPF_K: /* dst = dst >> imm */
EMIT2(0x1355); if (imm == 0)
break;
case BPF_JMP | BPF_JA: /* ip += K */
offset = addrs[i + K] + jit->start - jit->prg;
EMIT4_PCREL(0xa7f40000, offset);
break;
case BPF_JMP | BPF_JGT | BPF_K: /* ip += (A > K) ? jt : jf */
mask = 0x200000; /* jh */
goto kbranch;
case BPF_JMP | BPF_JGE | BPF_K: /* ip += (A >= K) ? jt : jf */
mask = 0xa00000; /* jhe */
goto kbranch;
case BPF_JMP | BPF_JEQ | BPF_K: /* ip += (A == K) ? jt : jf */
mask = 0x800000; /* je */
kbranch: /* Emit compare if the branch targets are different */
if (filter->jt != filter->jf) {
if (test_facility(21))
/* clfi %r5,<K> */
EMIT6_IMM(0xc25f0000, K);
else
/* cl %r5,<d(K)>(%r13) */
EMIT4_DISP(0x5550d000, EMIT_CONST(K));
}
branch: if (filter->jt == filter->jf) {
if (filter->jt == 0)
break;
/* j <jt> */
offset = addrs[i + filter->jt] + jit->start - jit->prg;
EMIT4_PCREL(0xa7f40000, offset);
break; break;
} /* srlg %dst,%dst,imm(%r0) */
if (filter->jt != 0) { EMIT6_DISP_LH(0xeb000000, 0x000c, dst_reg, dst_reg, REG_0, imm);
/* brc <mask>,<jt> */
offset = addrs[i + filter->jt] + jit->start - jit->prg;
EMIT4_PCREL(0xa7040000 | mask, offset);
}
if (filter->jf != 0) {
/* brc <mask^15>,<jf> */
offset = addrs[i + filter->jf] + jit->start - jit->prg;
EMIT4_PCREL(0xa7040000 | (mask ^ 0xf00000), offset);
}
break; break;
case BPF_JMP | BPF_JSET | BPF_K: /* ip += (A & K) ? jt : jf */ /*
mask = 0x700000; /* jnz */ * BPF_ARSH
/* Emit test if the branch targets are different */ */
if (filter->jt != filter->jf) { case BPF_ALU64 | BPF_ARSH | BPF_X: /* ((s64) dst) >>= src */
if (K > 65535) { /* srag %dst,%dst,0(%src) */
/* lr %r4,%r5 */ EMIT6_DISP_LH(0xeb000000, 0x000a, dst_reg, dst_reg, src_reg, 0);
EMIT2(0x1845); break;
/* n %r4,<d(K)>(%r13) */ case BPF_ALU64 | BPF_ARSH | BPF_K: /* ((s64) dst) >>= imm */
EMIT4_DISP(0x5440d000, EMIT_CONST(K)); if (imm == 0)
} else break;
/* tmll %r5,K */ /* srag %dst,%dst,imm(%r0) */
EMIT4_IMM(0xa7510000, K); EMIT6_DISP_LH(0xeb000000, 0x000a, dst_reg, dst_reg, REG_0, imm);
} break;
goto branch; /*
case BPF_JMP | BPF_JGT | BPF_X: /* ip += (A > X) ? jt : jf */ * BPF_NEG
mask = 0x200000; /* jh */ */
goto xbranch; case BPF_ALU | BPF_NEG: /* dst = (u32) -dst */
case BPF_JMP | BPF_JGE | BPF_X: /* ip += (A >= X) ? jt : jf */ /* lcr %dst,%dst */
mask = 0xa00000; /* jhe */ EMIT2(0x1300, dst_reg, dst_reg);
goto xbranch; EMIT_ZERO(dst_reg);
case BPF_JMP | BPF_JEQ | BPF_X: /* ip += (A == X) ? jt : jf */ break;
mask = 0x800000; /* je */ case BPF_ALU64 | BPF_NEG: /* dst = -dst */
xbranch: /* Emit compare if the branch targets are different */ /* lcgr %dst,%dst */
if (filter->jt != filter->jf) { EMIT4(0xb9130000, dst_reg, dst_reg);
jit->seen |= SEEN_XREG; break;
/* clr %r5,%r12 */ /*
EMIT2(0x155c); * BPF_FROM_BE/LE
} */
goto branch; case BPF_ALU | BPF_END | BPF_FROM_BE:
case BPF_JMP | BPF_JSET | BPF_X: /* ip += (A & X) ? jt : jf */ /* s390 is big endian, therefore only clear high order bytes */
mask = 0x700000; /* jnz */ switch (imm) {
/* Emit test if the branch targets are different */ case 16: /* dst = (u16) cpu_to_be16(dst) */
if (filter->jt != filter->jf) { /* llghr %dst,%dst */
jit->seen |= SEEN_XREG; EMIT4(0xb9850000, dst_reg, dst_reg);
/* lr %r4,%r5 */ break;
EMIT2(0x1845); case 32: /* dst = (u32) cpu_to_be32(dst) */
/* nr %r4,%r12 */ /* llgfr %dst,%dst */
EMIT2(0x144c); EMIT4(0xb9160000, dst_reg, dst_reg);
break;
case 64: /* dst = (u64) cpu_to_be64(dst) */
break;
} }
goto branch;
case BPF_LD | BPF_W | BPF_ABS: /* A = *(u32 *) (skb->data+K) */
jit->seen |= SEEN_DATAREF | SEEN_RET0 | SEEN_LOAD_WORD;
offset = jit->off_load_word;
goto load_abs;
case BPF_LD | BPF_H | BPF_ABS: /* A = *(u16 *) (skb->data+K) */
jit->seen |= SEEN_DATAREF | SEEN_RET0 | SEEN_LOAD_HALF;
offset = jit->off_load_half;
goto load_abs;
case BPF_LD | BPF_B | BPF_ABS: /* A = *(u8 *) (skb->data+K) */
jit->seen |= SEEN_DATAREF | SEEN_RET0 | SEEN_LOAD_BYTE;
offset = jit->off_load_byte;
load_abs: if ((int) K < 0)
goto out;
call_fn: /* lg %r1,<d(function)>(%r13) */
EMIT6_DISP(0xe310d000, 0x0004, offset);
/* l %r3,<d(K)>(%r13) */
EMIT4_DISP(0x5830d000, EMIT_CONST(K));
/* basr %r8,%r1 */
EMIT2(0x0d81);
/* jnz <ret0> */
EMIT4_PCREL(0xa7740000, (jit->ret0_ip - jit->prg));
break; break;
case BPF_LD | BPF_W | BPF_IND: /* A = *(u32 *) (skb->data+K+X) */ case BPF_ALU | BPF_END | BPF_FROM_LE:
jit->seen |= SEEN_DATAREF | SEEN_RET0 | SEEN_LOAD_IWORD; switch (imm) {
offset = jit->off_load_iword; case 16: /* dst = (u16) cpu_to_le16(dst) */
goto call_fn; /* lrvr %dst,%dst */
case BPF_LD | BPF_H | BPF_IND: /* A = *(u16 *) (skb->data+K+X) */ EMIT4(0xb91f0000, dst_reg, dst_reg);
jit->seen |= SEEN_DATAREF | SEEN_RET0 | SEEN_LOAD_IHALF; /* srl %dst,16(%r0) */
offset = jit->off_load_ihalf; EMIT4_DISP(0x88000000, dst_reg, REG_0, 16);
goto call_fn; /* llghr %dst,%dst */
case BPF_LD | BPF_B | BPF_IND: /* A = *(u8 *) (skb->data+K+X) */ EMIT4(0xb9850000, dst_reg, dst_reg);
jit->seen |= SEEN_DATAREF | SEEN_RET0 | SEEN_LOAD_IBYTE; break;
offset = jit->off_load_ibyte; case 32: /* dst = (u32) cpu_to_le32(dst) */
goto call_fn; /* lrvr %dst,%dst */
case BPF_LDX | BPF_B | BPF_MSH: EMIT4(0xb91f0000, dst_reg, dst_reg);
/* X = (*(u8 *)(skb->data+K) & 0xf) << 2 */ /* llgfr %dst,%dst */
jit->seen |= SEEN_RET0; EMIT4(0xb9160000, dst_reg, dst_reg);
if ((int) K < 0) { break;
/* j <ret0> */ case 64: /* dst = (u64) cpu_to_le64(dst) */
EMIT4_PCREL(0xa7f40000, (jit->ret0_ip - jit->prg)); /* lrvgr %dst,%dst */
EMIT4(0xb90f0000, dst_reg, dst_reg);
break; break;
} }
jit->seen |= SEEN_DATAREF | SEEN_LOAD_BMSH;
offset = jit->off_load_bmsh;
goto call_fn;
case BPF_LD | BPF_W | BPF_LEN: /* A = skb->len; */
BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, len) != 4);
/* l %r5,<d(len)>(%r2) */
EMIT4_DISP(0x58502000, offsetof(struct sk_buff, len));
break;
case BPF_LDX | BPF_W | BPF_LEN: /* X = skb->len; */
jit->seen |= SEEN_XREG;
/* l %r12,<d(len)>(%r2) */
EMIT4_DISP(0x58c02000, offsetof(struct sk_buff, len));
break;
case BPF_LD | BPF_IMM: /* A = K */
if (K <= 16383)
/* lhi %r5,K */
EMIT4_IMM(0xa7580000, K);
else if (test_facility(21))
/* llilf %r5,<K> */
EMIT6_IMM(0xc05f0000, K);
else
/* l %r5,<d(K)>(%r13) */
EMIT4_DISP(0x5850d000, EMIT_CONST(K));
break;
case BPF_LDX | BPF_IMM: /* X = K */
jit->seen |= SEEN_XREG;
if (K <= 16383)
/* lhi %r12,<K> */
EMIT4_IMM(0xa7c80000, K);
else if (test_facility(21))
/* llilf %r12,<K> */
EMIT6_IMM(0xc0cf0000, K);
else
/* l %r12,<d(K)>(%r13) */
EMIT4_DISP(0x58c0d000, EMIT_CONST(K));
break; break;
case BPF_LD | BPF_MEM: /* A = mem[K] */ /*
* BPF_ST(X)
*/
case BPF_STX | BPF_MEM | BPF_B: /* *(u8 *)(dst + off) = src_reg */
/* stcy %src,off(%dst) */
EMIT6_DISP_LH(0xe3000000, 0x0072, src_reg, dst_reg, REG_0, off);
jit->seen |= SEEN_MEM;
break;
case BPF_STX | BPF_MEM | BPF_H: /* (u16 *)(dst + off) = src */
/* sthy %src,off(%dst) */
EMIT6_DISP_LH(0xe3000000, 0x0070, src_reg, dst_reg, REG_0, off);
jit->seen |= SEEN_MEM;
break;
case BPF_STX | BPF_MEM | BPF_W: /* *(u32 *)(dst + off) = src */
/* sty %src,off(%dst) */
EMIT6_DISP_LH(0xe3000000, 0x0050, src_reg, dst_reg, REG_0, off);
jit->seen |= SEEN_MEM;
break;
case BPF_STX | BPF_MEM | BPF_DW: /* (u64 *)(dst + off) = src */
/* stg %src,off(%dst) */
EMIT6_DISP_LH(0xe3000000, 0x0024, src_reg, dst_reg, REG_0, off);
jit->seen |= SEEN_MEM;
break;
case BPF_ST | BPF_MEM | BPF_B: /* *(u8 *)(dst + off) = imm */
/* lhi %w0,imm */
EMIT4_IMM(0xa7080000, REG_W0, (u8) imm);
/* stcy %w0,off(dst) */
EMIT6_DISP_LH(0xe3000000, 0x0072, REG_W0, dst_reg, REG_0, off);
jit->seen |= SEEN_MEM;
break;
case BPF_ST | BPF_MEM | BPF_H: /* (u16 *)(dst + off) = imm */
/* lhi %w0,imm */
EMIT4_IMM(0xa7080000, REG_W0, (u16) imm);
/* sthy %w0,off(dst) */
EMIT6_DISP_LH(0xe3000000, 0x0070, REG_W0, dst_reg, REG_0, off);
jit->seen |= SEEN_MEM; jit->seen |= SEEN_MEM;
/* l %r5,<K>(%r15) */
EMIT4_DISP(0x5850f000,
(jit->seen & SEEN_DATAREF) ? 160 + K*4 : K*4);
break;
case BPF_LDX | BPF_MEM: /* X = mem[K] */
jit->seen |= SEEN_XREG | SEEN_MEM;
/* l %r12,<K>(%r15) */
EMIT4_DISP(0x58c0f000,
(jit->seen & SEEN_DATAREF) ? 160 + K*4 : K*4);
break;
case BPF_MISC | BPF_TAX: /* X = A */
jit->seen |= SEEN_XREG;
/* lr %r12,%r5 */
EMIT2(0x18c5);
break;
case BPF_MISC | BPF_TXA: /* A = X */
jit->seen |= SEEN_XREG;
/* lr %r5,%r12 */
EMIT2(0x185c);
break;
case BPF_RET | BPF_K:
if (K == 0) {
jit->seen |= SEEN_RET0;
if (last)
break;
/* j <ret0> */
EMIT4_PCREL(0xa7f40000, jit->ret0_ip - jit->prg);
} else {
if (K <= 16383)
/* lghi %r2,K */
EMIT4_IMM(0xa7290000, K);
else
/* llgf %r2,<K>(%r13) */
EMIT6_DISP(0xe320d000, 0x0016, EMIT_CONST(K));
/* j <exit> */
if (last && !(jit->seen & SEEN_RET0))
break;
EMIT4_PCREL(0xa7f40000, jit->exit_ip - jit->prg);
}
break; break;
case BPF_RET | BPF_A: case BPF_ST | BPF_MEM | BPF_W: /* *(u32 *)(dst + off) = imm */
/* llgfr %r2,%r5 */ /* llilf %w0,imm */
EMIT4(0xb9160025); EMIT6_IMM(0xc00f0000, REG_W0, (u32) imm);
/* sty %w0,off(%dst) */
EMIT6_DISP_LH(0xe3000000, 0x0050, REG_W0, dst_reg, REG_0, off);
jit->seen |= SEEN_MEM;
break;
case BPF_ST | BPF_MEM | BPF_DW: /* *(u64 *)(dst + off) = imm */
/* lgfi %w0,imm */
EMIT6_IMM(0xc0010000, REG_W0, imm);
/* stg %w0,off(%dst) */
EMIT6_DISP_LH(0xe3000000, 0x0024, REG_W0, dst_reg, REG_0, off);
jit->seen |= SEEN_MEM;
break;
/*
* BPF_STX XADD (atomic_add)
*/
case BPF_STX | BPF_XADD | BPF_W: /* *(u32 *)(dst + off) += src */
/* laal %w0,%src,off(%dst) */
EMIT6_DISP_LH(0xeb000000, 0x00fa, REG_W0, src_reg,
dst_reg, off);
jit->seen |= SEEN_MEM;
break;
case BPF_STX | BPF_XADD | BPF_DW: /* *(u64 *)(dst + off) += src */
/* laalg %w0,%src,off(%dst) */
EMIT6_DISP_LH(0xeb000000, 0x00ea, REG_W0, src_reg,
dst_reg, off);
jit->seen |= SEEN_MEM;
break;
/*
* BPF_LDX
*/
case BPF_LDX | BPF_MEM | BPF_B: /* dst = *(u8 *)(ul) (src + off) */
/* llgc %dst,0(off,%src) */
EMIT6_DISP_LH(0xe3000000, 0x0090, dst_reg, src_reg, REG_0, off);
jit->seen |= SEEN_MEM;
break;
case BPF_LDX | BPF_MEM | BPF_H: /* dst = *(u16 *)(ul) (src + off) */
/* llgh %dst,0(off,%src) */
EMIT6_DISP_LH(0xe3000000, 0x0091, dst_reg, src_reg, REG_0, off);
jit->seen |= SEEN_MEM;
break;
case BPF_LDX | BPF_MEM | BPF_W: /* dst = *(u32 *)(ul) (src + off) */
/* llgf %dst,off(%src) */
jit->seen |= SEEN_MEM;
EMIT6_DISP_LH(0xe3000000, 0x0016, dst_reg, src_reg, REG_0, off);
break;
case BPF_LDX | BPF_MEM | BPF_DW: /* dst = *(u64 *)(ul) (src + off) */
/* lg %dst,0(off,%src) */
jit->seen |= SEEN_MEM;
EMIT6_DISP_LH(0xe3000000, 0x0004, dst_reg, src_reg, REG_0, off);
break;
/*
* BPF_JMP / CALL
*/
case BPF_JMP | BPF_CALL:
{
/*
* b0 = (__bpf_call_base + imm)(b1, b2, b3, b4, b5)
*/
const u64 func = (u64)__bpf_call_base + imm;
REG_SET_SEEN(BPF_REG_5);
jit->seen |= SEEN_FUNC;
/* lg %w1,<d(imm)>(%l) */
EMIT6_DISP(0xe3000000, 0x0004, REG_W1, REG_0, REG_L,
EMIT_CONST_U64(func));
/* basr %r14,%w1 */
EMIT2(0x0d00, REG_14, REG_W1);
/* lgr %b0,%r2: load return value into %b0 */
EMIT4(0xb9040000, BPF_REG_0, REG_2);
break;
}
case BPF_JMP | BPF_EXIT: /* return b0 */
last = (i == fp->len - 1) ? 1 : 0;
if (last && !(jit->seen & SEEN_RET0))
break;
/* j <exit> */ /* j <exit> */
EMIT4_PCREL(0xa7f40000, jit->exit_ip - jit->prg); EMIT4_PCREL(0xa7f40000, jit->exit_ip - jit->prg);
break; break;
case BPF_ST: /* mem[K] = A */ /*
jit->seen |= SEEN_MEM; * Branch relative (number of skipped instructions) to offset on
/* st %r5,<K>(%r15) */ * condition.
EMIT4_DISP(0x5050f000, *
(jit->seen & SEEN_DATAREF) ? 160 + K*4 : K*4); * Condition code to mask mapping:
break; *
case BPF_STX: /* mem[K] = X : mov %ebx,off8(%rbp) */ * CC | Description | Mask
jit->seen |= SEEN_XREG | SEEN_MEM; * ------------------------------
/* st %r12,<K>(%r15) */ * 0 | Operands equal | 8
EMIT4_DISP(0x50c0f000, * 1 | First operand low | 4
(jit->seen & SEEN_DATAREF) ? 160 + K*4 : K*4); * 2 | First operand high | 2
break; * 3 | Unused | 1
case BPF_ANC | SKF_AD_PROTOCOL: /* A = ntohs(skb->protocol); */ *
BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, protocol) != 2); * For s390x relative branches: ip = ip + off_bytes
/* lhi %r5,0 */ * For BPF relative branches: insn = insn + off_insns + 1
EMIT4(0xa7580000); *
/* icm %r5,3,<d(protocol)>(%r2) */ * For example for s390x with offset 0 we jump to the branch
EMIT4_DISP(0xbf532000, offsetof(struct sk_buff, protocol)); * instruction itself (loop) and for BPF with offset 0 we
break; * branch to the instruction behind the branch.
case BPF_ANC | SKF_AD_IFINDEX: /* if (!skb->dev) return 0; */
* A = skb->dev->ifindex */ case BPF_JMP | BPF_JA: /* if (true) */
BUILD_BUG_ON(FIELD_SIZEOF(struct net_device, ifindex) != 4); mask = 0xf000; /* j */
jit->seen |= SEEN_RET0; goto branch_oc;
/* lg %r1,<d(dev)>(%r2) */ case BPF_JMP | BPF_JSGT | BPF_K: /* ((s64) dst > (s64) imm) */
EMIT6_DISP(0xe3102000, 0x0004, offsetof(struct sk_buff, dev)); mask = 0x2000; /* jh */
/* ltgr %r1,%r1 */ goto branch_ks;
EMIT4(0xb9020011); case BPF_JMP | BPF_JSGE | BPF_K: /* ((s64) dst >= (s64) imm) */
/* jz <ret0> */ mask = 0xa000; /* jhe */
EMIT4_PCREL(0xa7840000, jit->ret0_ip - jit->prg); goto branch_ks;
/* l %r5,<d(ifindex)>(%r1) */ case BPF_JMP | BPF_JGT | BPF_K: /* (dst_reg > imm) */
EMIT4_DISP(0x58501000, offsetof(struct net_device, ifindex)); mask = 0x2000; /* jh */
break; goto branch_ku;
case BPF_ANC | SKF_AD_MARK: /* A = skb->mark */ case BPF_JMP | BPF_JGE | BPF_K: /* (dst_reg >= imm) */
BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, mark) != 4); mask = 0xa000; /* jhe */
/* l %r5,<d(mark)>(%r2) */ goto branch_ku;
EMIT4_DISP(0x58502000, offsetof(struct sk_buff, mark)); case BPF_JMP | BPF_JNE | BPF_K: /* (dst_reg != imm) */
break; mask = 0x7000; /* jne */
case BPF_ANC | SKF_AD_QUEUE: /* A = skb->queue_mapping */ goto branch_ku;
BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, queue_mapping) != 2); case BPF_JMP | BPF_JEQ | BPF_K: /* (dst_reg == imm) */
/* lhi %r5,0 */ mask = 0x8000; /* je */
EMIT4(0xa7580000); goto branch_ku;
/* icm %r5,3,<d(queue_mapping)>(%r2) */ case BPF_JMP | BPF_JSET | BPF_K: /* (dst_reg & imm) */
EMIT4_DISP(0xbf532000, offsetof(struct sk_buff, queue_mapping)); mask = 0x7000; /* jnz */
break; /* lgfi %w1,imm (load sign extend imm) */
case BPF_ANC | SKF_AD_HATYPE: /* if (!skb->dev) return 0; EMIT6_IMM(0xc0010000, REG_W1, imm);
* A = skb->dev->type */ /* ngr %w1,%dst */
BUILD_BUG_ON(FIELD_SIZEOF(struct net_device, type) != 2); EMIT4(0xb9800000, REG_W1, dst_reg);
jit->seen |= SEEN_RET0; goto branch_oc;
/* lg %r1,<d(dev)>(%r2) */
EMIT6_DISP(0xe3102000, 0x0004, offsetof(struct sk_buff, dev)); case BPF_JMP | BPF_JSGT | BPF_X: /* ((s64) dst > (s64) src) */
/* ltgr %r1,%r1 */ mask = 0x2000; /* jh */
EMIT4(0xb9020011); goto branch_xs;
/* jz <ret0> */ case BPF_JMP | BPF_JSGE | BPF_X: /* ((s64) dst >= (s64) src) */
EMIT4_PCREL(0xa7840000, jit->ret0_ip - jit->prg); mask = 0xa000; /* jhe */
/* lhi %r5,0 */ goto branch_xs;
EMIT4(0xa7580000); case BPF_JMP | BPF_JGT | BPF_X: /* (dst > src) */
/* icm %r5,3,<d(type)>(%r1) */ mask = 0x2000; /* jh */
EMIT4_DISP(0xbf531000, offsetof(struct net_device, type)); goto branch_xu;
break; case BPF_JMP | BPF_JGE | BPF_X: /* (dst >= src) */
case BPF_ANC | SKF_AD_RXHASH: /* A = skb->hash */ mask = 0xa000; /* jhe */
BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, hash) != 4); goto branch_xu;
/* l %r5,<d(hash)>(%r2) */ case BPF_JMP | BPF_JNE | BPF_X: /* (dst != src) */
EMIT4_DISP(0x58502000, offsetof(struct sk_buff, hash)); mask = 0x7000; /* jne */
break; goto branch_xu;
case BPF_ANC | SKF_AD_VLAN_TAG: case BPF_JMP | BPF_JEQ | BPF_X: /* (dst == src) */
case BPF_ANC | SKF_AD_VLAN_TAG_PRESENT: mask = 0x8000; /* je */
BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, vlan_tci) != 2); goto branch_xu;
BUILD_BUG_ON(VLAN_TAG_PRESENT != 0x1000); case BPF_JMP | BPF_JSET | BPF_X: /* (dst & src) */
/* lhi %r5,0 */ mask = 0x7000; /* jnz */
EMIT4(0xa7580000); /* ngrk %w1,%dst,%src */
/* icm %r5,3,<d(vlan_tci)>(%r2) */ EMIT4_RRF(0xb9e40000, REG_W1, dst_reg, src_reg);
EMIT4_DISP(0xbf532000, offsetof(struct sk_buff, vlan_tci)); goto branch_oc;
if (code == (BPF_ANC | SKF_AD_VLAN_TAG)) { branch_ks:
/* nill %r5,0xefff */ /* lgfi %w1,imm (load sign extend imm) */
EMIT4_IMM(0xa5570000, ~VLAN_TAG_PRESENT); EMIT6_IMM(0xc0010000, REG_W1, imm);
} else { /* cgrj %dst,%w1,mask,off */
/* nill %r5,0x1000 */ EMIT6_PCREL(0xec000000, 0x0064, dst_reg, REG_W1, i, off, mask);
EMIT4_IMM(0xa5570000, VLAN_TAG_PRESENT); break;
/* srl %r5,12 */ branch_ku:
EMIT4_DISP(0x88500000, 12); /* lgfi %w1,imm (load sign extend imm) */
} EMIT6_IMM(0xc0010000, REG_W1, imm);
/* clgrj %dst,%w1,mask,off */
EMIT6_PCREL(0xec000000, 0x0065, dst_reg, REG_W1, i, off, mask);
break;
branch_xs:
/* cgrj %dst,%src,mask,off */
EMIT6_PCREL(0xec000000, 0x0064, dst_reg, src_reg, i, off, mask);
break;
branch_xu:
/* clgrj %dst,%src,mask,off */
EMIT6_PCREL(0xec000000, 0x0065, dst_reg, src_reg, i, off, mask);
break;
branch_oc:
/* brc mask,jmp_off (branch instruction needs 4 bytes) */
jmp_off = addrs[i + off + 1] - (addrs[i + 1] - 4);
EMIT4_PCREL(0xa7040000 | mask << 8, jmp_off);
break; break;
case BPF_ANC | SKF_AD_PKTTYPE: /*
/* lhi %r5,0 */ * BPF_LD
EMIT4(0xa7580000); */
/* ic %r5,<d(pkt_type_offset)>(%r2) */ case BPF_LD | BPF_ABS | BPF_B: /* b0 = *(u8 *) (skb->data+imm) */
EMIT4_DISP(0x43502000, PKT_TYPE_OFFSET()); case BPF_LD | BPF_IND | BPF_B: /* b0 = *(u8 *) (skb->data+imm+src) */
/* srl %r5,5 */ if ((BPF_MODE(insn->code) == BPF_ABS) && (imm >= 0))
EMIT4_DISP(0x88500000, 5); func_addr = __pa(sk_load_byte_pos);
break; else
case BPF_ANC | SKF_AD_CPU: /* A = smp_processor_id() */ func_addr = __pa(sk_load_byte);
#ifdef CONFIG_SMP goto call_fn;
/* l %r5,<d(cpu_nr)> */ case BPF_LD | BPF_ABS | BPF_H: /* b0 = *(u16 *) (skb->data+imm) */
EMIT4_DISP(0x58500000, offsetof(struct _lowcore, cpu_nr)); case BPF_LD | BPF_IND | BPF_H: /* b0 = *(u16 *) (skb->data+imm+src) */
#else if ((BPF_MODE(insn->code) == BPF_ABS) && (imm >= 0))
/* lhi %r5,0 */ func_addr = __pa(sk_load_half_pos);
EMIT4(0xa7580000); else
#endif func_addr = __pa(sk_load_half);
goto call_fn;
case BPF_LD | BPF_ABS | BPF_W: /* b0 = *(u32 *) (skb->data+imm) */
case BPF_LD | BPF_IND | BPF_W: /* b0 = *(u32 *) (skb->data+imm+src) */
if ((BPF_MODE(insn->code) == BPF_ABS) && (imm >= 0))
func_addr = __pa(sk_load_word_pos);
else
func_addr = __pa(sk_load_word);
goto call_fn;
call_fn:
jit->seen |= SEEN_SKB | SEEN_RET0 | SEEN_FUNC;
REG_SET_SEEN(REG_14); /* Return address of possible func call */
/*
* Implicit input:
* BPF_REG_6 (R7) : skb pointer
* REG_SKB_DATA (R12): skb data pointer
*
* Calculated input:
* BPF_REG_2 (R3) : offset of byte(s) to fetch in skb
* BPF_REG_5 (R6) : return address
*
* Output:
* BPF_REG_0 (R14): data read from skb
*
* Scratch registers (BPF_REG_1-5)
*/
/* Call function: llilf %w1,func_addr */
EMIT6_IMM(0xc00f0000, REG_W1, func_addr);
/* Offset: lgfi %b2,imm */
EMIT6_IMM(0xc0010000, BPF_REG_2, imm);
if (BPF_MODE(insn->code) == BPF_IND)
/* agfr %b2,%src (%src is s32 here) */
EMIT4(0xb9180000, BPF_REG_2, src_reg);
/* basr %b5,%w1 (%b5 is call saved) */
EMIT2(0x0d00, BPF_REG_5, REG_W1);
/*
* Note: For fast access we jump directly after the
* jnz instruction from bpf_jit.S
*/
/* jnz <ret0> */
EMIT4_PCREL(0xa7740000, jit->ret0_ip - jit->prg);
break; break;
default: /* too complex, give up */ default: /* too complex, give up */
goto out; pr_err("Unknown opcode %02x\n", insn->code);
return -1;
}
return insn_count;
}
/*
* Compile eBPF program into s390x code
*/
static int bpf_jit_prog(struct bpf_jit *jit, struct bpf_prog *fp)
{
int i, insn_count;
jit->lit = jit->lit_start;
jit->prg = 0;
bpf_jit_prologue(jit);
for (i = 0; i < fp->len; i += insn_count) {
insn_count = bpf_jit_insn(jit, fp, i);
if (insn_count < 0)
return -1;
jit->addrs[i + 1] = jit->prg; /* Next instruction address */
} }
addrs[i] = jit->prg - jit->start; bpf_jit_epilogue(jit);
jit->lit_start = jit->prg;
jit->size = jit->lit;
jit->size_prg = jit->prg;
return 0; return 0;
out:
return -1;
} }
/*
* Classic BPF function stub. BPF programs will be converted into
* eBPF and then bpf_int_jit_compile() will be called.
*/
void bpf_jit_compile(struct bpf_prog *fp) void bpf_jit_compile(struct bpf_prog *fp)
{ {
struct bpf_binary_header *header = NULL; }
unsigned long size, prg_len, lit_len;
struct bpf_jit jit, cjit; /*
unsigned int *addrs; * Compile eBPF program "fp"
int pass, i; */
void bpf_int_jit_compile(struct bpf_prog *fp)
{
struct bpf_binary_header *header;
struct bpf_jit jit;
int pass;
if (!bpf_jit_enable) if (!bpf_jit_enable)
return; return;
addrs = kcalloc(fp->len, sizeof(*addrs), GFP_KERNEL); memset(&jit, 0, sizeof(jit));
if (addrs == NULL) jit.addrs = kcalloc(fp->len + 1, sizeof(*jit.addrs), GFP_KERNEL);
if (jit.addrs == NULL)
return; return;
memset(&jit, 0, sizeof(cjit)); /*
memset(&cjit, 0, sizeof(cjit)); * Three initial passes:
* - 1/2: Determine clobbered registers
for (pass = 0; pass < 10; pass++) { * - 3: Calculate program size and addrs arrray
jit.prg = jit.start; */
jit.lit = jit.mid; for (pass = 1; pass <= 3; pass++) {
if (bpf_jit_prog(&jit, fp))
bpf_jit_prologue(&jit); goto free_addrs;
bpf_jit_noleaks(&jit, fp->insns);
for (i = 0; i < fp->len; i++) {
if (bpf_jit_insn(&jit, fp->insns + i, addrs, i,
i == fp->len - 1))
goto out;
}
bpf_jit_epilogue(&jit);
if (jit.start) {
WARN_ON(jit.prg > cjit.prg || jit.lit > cjit.lit);
if (memcmp(&jit, &cjit, sizeof(jit)) == 0)
break;
} else if (jit.prg == cjit.prg && jit.lit == cjit.lit) {
prg_len = jit.prg - jit.start;
lit_len = jit.lit - jit.mid;
size = prg_len + lit_len;
if (size >= BPF_SIZE_MAX)
goto out;
header = bpf_jit_binary_alloc(size, &jit.start,
2, bpf_jit_fill_hole);
if (!header)
goto out;
jit.prg = jit.mid = jit.start + prg_len;
jit.lit = jit.end = jit.start + prg_len + lit_len;
jit.base_ip += (unsigned long) jit.start;
jit.exit_ip += (unsigned long) jit.start;
jit.ret0_ip += (unsigned long) jit.start;
}
cjit = jit;
} }
/*
* Final pass: Allocate and generate program
*/
if (jit.size >= BPF_SIZE_MAX)
goto free_addrs;
header = bpf_jit_binary_alloc(jit.size, &jit.prg_buf, 2, jit_fill_hole);
if (!header)
goto free_addrs;
if (bpf_jit_prog(&jit, fp))
goto free_addrs;
if (bpf_jit_enable > 1) { if (bpf_jit_enable > 1) {
bpf_jit_dump(fp->len, jit.end - jit.start, pass, jit.start); bpf_jit_dump(fp->len, jit.size, pass, jit.prg_buf);
if (jit.start) if (jit.prg_buf)
print_fn_code(jit.start, jit.mid - jit.start); print_fn_code(jit.prg_buf, jit.size_prg);
} }
if (jit.start) { if (jit.prg_buf) {
set_memory_ro((unsigned long)header, header->pages); set_memory_ro((unsigned long)header, header->pages);
fp->bpf_func = (void *) jit.start; fp->bpf_func = (void *) jit.prg_buf;
fp->jited = true; fp->jited = true;
} }
out: free_addrs:
kfree(addrs); kfree(jit.addrs);
} }
/*
* Free eBPF program
*/
void bpf_jit_free(struct bpf_prog *fp) void bpf_jit_free(struct bpf_prog *fp)
{ {
unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK; unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
......
arch/s390/pci/pci.c
View file @ b19a42e3
...@@ -190,6 +190,11 @@ int zpci_fmb_enable_device(struct zpci_dev *zdev) ...@@ -190,6 +190,11 @@ int zpci_fmb_enable_device(struct zpci_dev *zdev)
return -ENOMEM; return -ENOMEM;
WARN_ON((u64) zdev->fmb & 0xf); WARN_ON((u64) zdev->fmb & 0xf);
/* reset software counters */
atomic64_set(&zdev->allocated_pages, 0);
atomic64_set(&zdev->mapped_pages, 0);
atomic64_set(&zdev->unmapped_pages, 0);
args.fmb_addr = virt_to_phys(zdev->fmb); args.fmb_addr = virt_to_phys(zdev->fmb);
return mod_pci(zdev, ZPCI_MOD_FC_SET_MEASURE, 0, &args); return mod_pci(zdev, ZPCI_MOD_FC_SET_MEASURE, 0, &args);
} }
...@@ -822,6 +827,7 @@ int zpci_create_device(struct zpci_dev *zdev) ...@@ -822,6 +827,7 @@ int zpci_create_device(struct zpci_dev *zdev)
if (rc) if (rc)
goto out; goto out;
mutex_init(&zdev->lock);
if (zdev->state == ZPCI_FN_STATE_CONFIGURED) { if (zdev->state == ZPCI_FN_STATE_CONFIGURED) {
rc = zpci_enable_device(zdev); rc = zpci_enable_device(zdev);
if (rc) if (rc)
......
arch/s390/pci/pci_debug.c
View file @ b19a42e3
...@@ -31,12 +31,25 @@ static char *pci_perf_names[] = { ...@@ -31,12 +31,25 @@ static char *pci_perf_names[] = {
"Refresh operations", "Refresh operations",
"DMA read bytes", "DMA read bytes",
"DMA write bytes", "DMA write bytes",
/* software counters */ };
static char *pci_sw_names[] = {
"Allocated pages", "Allocated pages",
"Mapped pages", "Mapped pages",
"Unmapped pages", "Unmapped pages",
}; };
static void pci_sw_counter_show(struct seq_file *m)
{
struct zpci_dev *zdev = m->private;
atomic64_t *counter = &zdev->allocated_pages;
int i;
for (i = 0; i < ARRAY_SIZE(pci_sw_names); i++, counter++)
seq_printf(m, "%26s:\t%llu\n", pci_sw_names[i],
atomic64_read(counter));
}
static int pci_perf_show(struct seq_file *m, void *v) static int pci_perf_show(struct seq_file *m, void *v)
{ {
struct zpci_dev *zdev = m->private; struct zpci_dev *zdev = m->private;
...@@ -45,7 +58,10 @@ static int pci_perf_show(struct seq_file *m, void *v) ...@@ -45,7 +58,10 @@ static int pci_perf_show(struct seq_file *m, void *v)
if (!zdev) if (!zdev)
return 0; return 0;
mutex_lock(&zdev->lock);
if (!zdev->fmb) { if (!zdev->fmb) {
mutex_unlock(&zdev->lock);
seq_puts(m, "FMB statistics disabled\n"); seq_puts(m, "FMB statistics disabled\n");
return 0; return 0;
} }
...@@ -65,12 +81,9 @@ static int pci_perf_show(struct seq_file *m, void *v) ...@@ -65,12 +81,9 @@ static int pci_perf_show(struct seq_file *m, void *v)
for (i = 4; i < 6; i++) for (i = 4; i < 6; i++)
seq_printf(m, "%26s:\t%llu\n", seq_printf(m, "%26s:\t%llu\n",
pci_perf_names[i], *(stat + i)); pci_perf_names[i], *(stat + i));
/* software counters */
for (i = 6; i < ARRAY_SIZE(pci_perf_names); i++)
seq_printf(m, "%26s:\t%llu\n",
pci_perf_names[i],
atomic64_read((atomic64_t *) (stat + i)));
pci_sw_counter_show(m);
mutex_unlock(&zdev->lock);
return 0; return 0;
} }
...@@ -88,19 +101,17 @@ static ssize_t pci_perf_seq_write(struct file *file, const char __user *ubuf, ...@@ -88,19 +101,17 @@ static ssize_t pci_perf_seq_write(struct file *file, const char __user *ubuf,
if (rc) if (rc)
return rc; return rc;
mutex_lock(&zdev->lock);
switch (val) { switch (val) {
case 0: case 0:
rc = zpci_fmb_disable_device(zdev); rc = zpci_fmb_disable_device(zdev);
if (rc)
return rc;
break; break;
case 1: case 1:
rc = zpci_fmb_enable_device(zdev); rc = zpci_fmb_enable_device(zdev);
if (rc)
return rc;
break; break;
} }
return count; mutex_unlock(&zdev->lock);
return rc ? rc : count;
} }
static int pci_perf_seq_open(struct inode *inode, struct file *filp) static int pci_perf_seq_open(struct inode *inode, struct file *filp)
......
arch/s390/pci/pci_dma.c
View file @ b19a42e3
...@@ -300,7 +300,7 @@ static dma_addr_t s390_dma_map_pages(struct device *dev, struct page *page, ...@@ -300,7 +300,7 @@ static dma_addr_t s390_dma_map_pages(struct device *dev, struct page *page,
flags |= ZPCI_TABLE_PROTECTED; flags |= ZPCI_TABLE_PROTECTED;
if (!dma_update_trans(zdev, pa, dma_addr, size, flags)) { if (!dma_update_trans(zdev, pa, dma_addr, size, flags)) {
atomic64_add(nr_pages, &zdev->fmb->mapped_pages); atomic64_add(nr_pages, &zdev->mapped_pages);
return dma_addr + (offset & ~PAGE_MASK); return dma_addr + (offset & ~PAGE_MASK);
} }
...@@ -328,7 +328,7 @@ static void s390_dma_unmap_pages(struct device *dev, dma_addr_t dma_addr, ...@@ -328,7 +328,7 @@ static void s390_dma_unmap_pages(struct device *dev, dma_addr_t dma_addr,
zpci_err_hex(&dma_addr, sizeof(dma_addr)); zpci_err_hex(&dma_addr, sizeof(dma_addr));
} }
atomic64_add(npages, &zdev->fmb->unmapped_pages); atomic64_add(npages, &zdev->unmapped_pages);
iommu_page_index = (dma_addr - zdev->start_dma) >> PAGE_SHIFT; iommu_page_index = (dma_addr - zdev->start_dma) >> PAGE_SHIFT;
dma_free_iommu(zdev, iommu_page_index, npages); dma_free_iommu(zdev, iommu_page_index, npages);
} }
...@@ -357,7 +357,7 @@ static void *s390_dma_alloc(struct device *dev, size_t size, ...@@ -357,7 +357,7 @@ static void *s390_dma_alloc(struct device *dev, size_t size,
return NULL; return NULL;
} }
atomic64_add(size / PAGE_SIZE, &zdev->fmb->allocated_pages); atomic64_add(size / PAGE_SIZE, &zdev->allocated_pages);
if (dma_handle) if (dma_handle)
*dma_handle = map; *dma_handle = map;
return (void *) pa; return (void *) pa;
...@@ -370,7 +370,7 @@ static void s390_dma_free(struct device *dev, size_t size, ...@@ -370,7 +370,7 @@ static void s390_dma_free(struct device *dev, size_t size,
struct zpci_dev *zdev = get_zdev(to_pci_dev(dev)); struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));
size = PAGE_ALIGN(size); size = PAGE_ALIGN(size);
atomic64_sub(size / PAGE_SIZE, &zdev->fmb->allocated_pages); atomic64_sub(size / PAGE_SIZE, &zdev->allocated_pages);
s390_dma_unmap_pages(dev, dma_handle, size, DMA_BIDIRECTIONAL, NULL); s390_dma_unmap_pages(dev, dma_handle, size, DMA_BIDIRECTIONAL, NULL);
free_pages((unsigned long) pa, get_order(size)); free_pages((unsigned long) pa, get_order(size));
} }
......
drivers/s390/block/dasd.c
View file @ b19a42e3
...@@ -579,7 +579,8 @@ void dasd_kick_device(struct dasd_device *device) ...@@ -579,7 +579,8 @@ void dasd_kick_device(struct dasd_device *device)
{ {
dasd_get_device(device); dasd_get_device(device);
/* queue call to dasd_kick_device to the kernel event daemon. */ /* queue call to dasd_kick_device to the kernel event daemon. */
schedule_work(&device->kick_work); if (!schedule_work(&device->kick_work))
dasd_put_device(device);
} }
EXPORT_SYMBOL(dasd_kick_device); EXPORT_SYMBOL(dasd_kick_device);
...@@ -599,7 +600,8 @@ void dasd_reload_device(struct dasd_device *device) ...@@ -599,7 +600,8 @@ void dasd_reload_device(struct dasd_device *device)
{ {
dasd_get_device(device); dasd_get_device(device);
/* queue call to dasd_reload_device to the kernel event daemon. */ /* queue call to dasd_reload_device to the kernel event daemon. */
schedule_work(&device->reload_device); if (!schedule_work(&device->reload_device))
dasd_put_device(device);
} }
EXPORT_SYMBOL(dasd_reload_device); EXPORT_SYMBOL(dasd_reload_device);
...@@ -619,7 +621,8 @@ void dasd_restore_device(struct dasd_device *device) ...@@ -619,7 +621,8 @@ void dasd_restore_device(struct dasd_device *device)
{ {
dasd_get_device(device); dasd_get_device(device);
/* queue call to dasd_restore_device to the kernel event daemon. */ /* queue call to dasd_restore_device to the kernel event daemon. */
schedule_work(&device->restore_device); if (!schedule_work(&device->restore_device))
dasd_put_device(device);
} }
/* /*
...@@ -2163,18 +2166,22 @@ static int _dasd_sleep_on(struct dasd_ccw_req *maincqr, int interruptible) ...@@ -2163,18 +2166,22 @@ static int _dasd_sleep_on(struct dasd_ccw_req *maincqr, int interruptible)
cqr->intrc = -ENOLINK; cqr->intrc = -ENOLINK;
continue; continue;
} }
/* Don't try to start requests if device is stopped */ /*
if (interruptible) { * Don't try to start requests if device is stopped
rc = wait_event_interruptible( * except path verification requests
generic_waitq, !(device->stopped)); */
if (rc == -ERESTARTSYS) { if (!test_bit(DASD_CQR_VERIFY_PATH, &cqr->flags)) {
cqr->status = DASD_CQR_FAILED; if (interruptible) {
maincqr->intrc = rc; rc = wait_event_interruptible(
continue; generic_waitq, !(device->stopped));
} if (rc == -ERESTARTSYS) {
} else cqr->status = DASD_CQR_FAILED;
wait_event(generic_waitq, !(device->stopped)); maincqr->intrc = rc;
continue;
}
} else
wait_event(generic_waitq, !(device->stopped));
}
if (!cqr->callback) if (!cqr->callback)
cqr->callback = dasd_wakeup_cb; cqr->callback = dasd_wakeup_cb;
...@@ -2524,6 +2531,11 @@ static void __dasd_process_request_queue(struct dasd_block *block) ...@@ -2524,6 +2531,11 @@ static void __dasd_process_request_queue(struct dasd_block *block)
__blk_end_request_all(req, -EIO); __blk_end_request_all(req, -EIO);
return; return;
} }
/* if device ist stopped do not fetch new requests */
if (basedev->stopped)
return;
/* Now we try to fetch requests from the request queue */ /* Now we try to fetch requests from the request queue */
while ((req = blk_peek_request(queue))) { while ((req = blk_peek_request(queue))) {
if (basedev->features & DASD_FEATURE_READONLY && if (basedev->features & DASD_FEATURE_READONLY &&
......
drivers/s390/block/dasd_eckd.c
View file @ b19a42e3
...@@ -1628,7 +1628,8 @@ static void dasd_eckd_kick_validate_server(struct dasd_device *device) ...@@ -1628,7 +1628,8 @@ static void dasd_eckd_kick_validate_server(struct dasd_device *device)
return; return;
} }
/* queue call to do_validate_server to the kernel event daemon. */ /* queue call to do_validate_server to the kernel event daemon. */
schedule_work(&device->kick_validate); if (!schedule_work(&device->kick_validate))
dasd_put_device(device);
} }
static u32 get_fcx_max_data(struct dasd_device *device) static u32 get_fcx_max_data(struct dasd_device *device)
......
drivers/s390/char/sclp_cmd.c
View file @ b19a42e3
...@@ -315,10 +315,29 @@ static int sclp_mem_change_state(unsigned long start, unsigned long size, ...@@ -315,10 +315,29 @@ static int sclp_mem_change_state(unsigned long start, unsigned long size,
rc |= sclp_assign_storage(incr->rn); rc |= sclp_assign_storage(incr->rn);
else else
sclp_unassign_storage(incr->rn); sclp_unassign_storage(incr->rn);
if (rc == 0)
incr->standby = online ? 0 : 1;
} }
return rc ? -EIO : 0; return rc ? -EIO : 0;
} }
static bool contains_standby_increment(unsigned long start, unsigned long end)
{
struct memory_increment *incr;
unsigned long istart;
list_for_each_entry(incr, &sclp_mem_list, list) {
istart = rn2addr(incr->rn);
if (end - 1 < istart)
continue;
if (start > istart + sclp_rzm - 1)
continue;
if (incr->standby)
return true;
}
return false;
}
static int sclp_mem_notifier(struct notifier_block *nb, static int sclp_mem_notifier(struct notifier_block *nb,
unsigned long action, void *data) unsigned long action, void *data)
{ {
...@@ -334,8 +353,16 @@ static int sclp_mem_notifier(struct notifier_block *nb, ...@@ -334,8 +353,16 @@ static int sclp_mem_notifier(struct notifier_block *nb,
for_each_clear_bit(id, sclp_storage_ids, sclp_max_storage_id + 1) for_each_clear_bit(id, sclp_storage_ids, sclp_max_storage_id + 1)
sclp_attach_storage(id); sclp_attach_storage(id);
switch (action) { switch (action) {
case MEM_ONLINE:
case MEM_GOING_OFFLINE: case MEM_GOING_OFFLINE:
/*
* We do not allow to set memory blocks offline that contain
* standby memory. This is done to simplify the "memory online"
* case.
*/
if (contains_standby_increment(start, start + size))
rc = -EPERM;
break;
case MEM_ONLINE:
case MEM_CANCEL_OFFLINE: case MEM_CANCEL_OFFLINE:
break; break;
case MEM_GOING_ONLINE: case MEM_GOING_ONLINE:
...@@ -361,6 +388,21 @@ static struct notifier_block sclp_mem_nb = { ...@@ -361,6 +388,21 @@ static struct notifier_block sclp_mem_nb = {
.notifier_call = sclp_mem_notifier, .notifier_call = sclp_mem_notifier,
}; };
static void __init align_to_block_size(unsigned long long *start,
unsigned long long *size)
{
unsigned long long start_align, size_align, alignment;
alignment = memory_block_size_bytes();
start_align = roundup(*start, alignment);
size_align = rounddown(*start + *size, alignment) - start_align;
pr_info("Standby memory at 0x%llx (%lluM of %lluM usable)\n",
*start, size_align >> 20, *size >> 20);
*start = start_align;
*size = size_align;
}
static void __init add_memory_merged(u16 rn) static void __init add_memory_merged(u16 rn)
{ {
static u16 first_rn, num; static u16 first_rn, num;
...@@ -382,7 +424,9 @@ static void __init add_memory_merged(u16 rn) ...@@ -382,7 +424,9 @@ static void __init add_memory_merged(u16 rn)
goto skip_add; goto skip_add;
if (memory_end_set && (start + size > memory_end)) if (memory_end_set && (start + size > memory_end))
size = memory_end - start; size = memory_end - start;
add_memory(0, start, size); align_to_block_size(&start, &size);
if (size)
add_memory(0, start, size);
skip_add: skip_add:
first_rn = rn; first_rn = rn;
num = 1; num = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7