Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tools: bpf_asm: cleanup vlan extension related token

Browse source 
We now have K_VLANT, K_VLANP and K_VLANTPID. Clean them up into more
descriptive token, namely K_VLAN_TCI, K_VLAN_AVAIL and K_VLAN_TPID.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Borkmann 2015-03-24 23:19:24 +01:00 committed by David S. Miller
parent b1275eb32e
commit 835c3d9b7a
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/net/bpf_exp.l
View file

@ -90,10 +90,10 @@ extern void yyerror(const char *str);
"#"?("hatype") { return K_HATYPE; } "#"?("hatype") { return K_HATYPE; }
"#"?("rxhash") { return K_RXHASH; } "#"?("rxhash") { return K_RXHASH; }
"#"?("cpu") { return K_CPU; } "#"?("cpu") { return K_CPU; }
"#"?("vlan_tci") { return K_VLANT; } "#"?("vlan_tci") { return K_VLAN_TCI; }
"#"?("vlan_pr") { return K_VLANP; } "#"?("vlan_pr") { return K_VLAN_AVAIL; }
"#"?("vlan_avail") { return K_VLANP; } "#"?("vlan_avail") { return K_VLAN_AVAIL; }
"#"?("vlan_tpid") { return K_VLANTPID; } "#"?("vlan_tpid") { return K_VLAN_TPID; }
"#"?("rand") { return K_RAND; } "#"?("rand") { return K_RAND; }
":" { return ':'; } ":" { return ':'; }

20
tools/net/bpf_exp.y
View file

@ -56,7 +56,7 @@ static void bpf_set_jmp_label(char *label, enum jmp_type type);
%token OP_LDXI %token OP_LDXI
%token K_PKT_LEN K_PROTO K_TYPE K_NLATTR K_NLATTR_NEST K_MARK K_QUEUE K_HATYPE %token K_PKT_LEN K_PROTO K_TYPE K_NLATTR K_NLATTR_NEST K_MARK K_QUEUE K_HATYPE
%token K_RXHASH K_CPU K_IFIDX K_VLANT K_VLANP K_VLANTPID K_POFF K_RAND %token K_RXHASH K_CPU K_IFIDX K_VLAN_TCI K_VLAN_AVAIL K_VLAN_TPID K_POFF K_RAND
%token ':' ',' '[' ']' '(' ')' 'x' 'a' '+' 'M' '*' '&' '#' '%' %token ':' ',' '[' ']' '(' ')' 'x' 'a' '+' 'M' '*' '&' '#' '%'
@ -155,10 +155,10 @@ ldb
| OP_LDB K_CPU { | OP_LDB K_CPU {
bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0, bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0,
SKF_AD_OFF + SKF_AD_CPU); } SKF_AD_OFF + SKF_AD_CPU); }
| OP_LDB K_VLANT { | OP_LDB K_VLAN_TCI {
bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0, bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0,
SKF_AD_OFF + SKF_AD_VLAN_TAG); } SKF_AD_OFF + SKF_AD_VLAN_TAG); }
| OP_LDB K_VLANP { | OP_LDB K_VLAN_AVAIL {
bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0, bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0,
SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT); } SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT); }
| OP_LDB K_POFF { | OP_LDB K_POFF {
@ -167,7 +167,7 @@ ldb
| OP_LDB K_RAND { | OP_LDB K_RAND {
bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0, bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0,
SKF_AD_OFF + SKF_AD_RANDOM); } SKF_AD_OFF + SKF_AD_RANDOM); }
| OP_LDB K_VLANTPID { | OP_LDB K_VLAN_TPID {
bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0, bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0,
SKF_AD_OFF + SKF_AD_VLAN_TPID); } SKF_AD_OFF + SKF_AD_VLAN_TPID); }
; ;
@ -209,10 +209,10 @@ ldh
| OP_LDH K_CPU { | OP_LDH K_CPU {
bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0, bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0,
SKF_AD_OFF + SKF_AD_CPU); } SKF_AD_OFF + SKF_AD_CPU); }
| OP_LDH K_VLANT { | OP_LDH K_VLAN_TCI {
bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0, bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0,
SKF_AD_OFF + SKF_AD_VLAN_TAG); } SKF_AD_OFF + SKF_AD_VLAN_TAG); }
| OP_LDH K_VLANP { | OP_LDH K_VLAN_AVAIL {
bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0, bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0,
SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT); } SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT); }
| OP_LDH K_POFF { | OP_LDH K_POFF {
@ -221,7 +221,7 @@ ldh
| OP_LDH K_RAND { | OP_LDH K_RAND {
bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0, bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0,
SKF_AD_OFF + SKF_AD_RANDOM); } SKF_AD_OFF + SKF_AD_RANDOM); }
| OP_LDH K_VLANTPID { | OP_LDH K_VLAN_TPID {
bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0, bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0,
SKF_AD_OFF + SKF_AD_VLAN_TPID); } SKF_AD_OFF + SKF_AD_VLAN_TPID); }
; ;
@ -268,10 +268,10 @@ ld
| OP_LD K_CPU { | OP_LD K_CPU {
bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0, bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0,
SKF_AD_OFF + SKF_AD_CPU); } SKF_AD_OFF + SKF_AD_CPU); }
| OP_LD K_VLANT { | OP_LD K_VLAN_TCI {
bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0, bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0,
SKF_AD_OFF + SKF_AD_VLAN_TAG); } SKF_AD_OFF + SKF_AD_VLAN_TAG); }
| OP_LD K_VLANP { | OP_LD K_VLAN_AVAIL {
bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0, bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0,
SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT); } SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT); }
| OP_LD K_POFF { | OP_LD K_POFF {
@ -280,7 +280,7 @@ ld
| OP_LD K_RAND { | OP_LD K_RAND {
bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0, bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0,
SKF_AD_OFF + SKF_AD_RANDOM); } SKF_AD_OFF + SKF_AD_RANDOM); }
| OP_LD K_VLANTPID { | OP_LD K_VLAN_TPID {
bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0, bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0,
SKF_AD_OFF + SKF_AD_VLAN_TPID); } SKF_AD_OFF + SKF_AD_VLAN_TPID); }
| OP_LD 'M' '[' number ']' { | OP_LD 'M' '[' number ']' {