nfp: bpf: fix immed relocation for larger offsets

Jakub Kicinski · borkmann · commit b7d99235473a · 2018-02-08T11:59:50.000+01:00
Immed relocation is missing a shift which means for larger offsets the lower and higher part of the address would be ORed together. Fixes: ce4ebfd ("nfp: bpf: add helpers for updating immediate instructions") Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Reviewed-by: Jiong Wang <jiong.wang@netronome.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_asm.c b/drivers/net/ethernet/netronome/nfp/nfp_asm.c
@@ -107,7 +107,7 @@ u16 immed_get_value(u64 instr)
 	if (!unreg_is_imm(reg))
 		reg = FIELD_GET(OP_IMMED_B_SRC, instr);
 
-	return (reg & 0xff) | FIELD_GET(OP_IMMED_IMM, instr);
+	return (reg & 0xff) | FIELD_GET(OP_IMMED_IMM, instr) << 8;
 }
 
 void immed_set_value(u64 *instr, u16 immed)

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ u16 immed_get_value(u64 instr)`
`107`	`107`	`if (!unreg_is_imm(reg))`
`108`	`108`	`reg = FIELD_GET(OP_IMMED_B_SRC, instr);`
`109`	`109`
`110`		`- return (reg & 0xff) \| FIELD_GET(OP_IMMED_IMM, instr);`
	`110`	`+ return (reg & 0xff) \| FIELD_GET(OP_IMMED_IMM, instr) << 8;`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`void immed_set_value(u64 *instr, u16 immed)`