Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c03e03f authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: bpf: pad code with valid nops 



We need to append up to 8 nops after last instruction to make
sure the CPU will not fetch garbage instructions with invalid
ECC if the code store was not initialized.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fd068ddc

drivers/net/ethernet/netronome/nfp/bpf/jit.c

+11 −1
Original line number Diff line number Diff line
@@ -426,6 +426,11 @@ emit_ld_field(struct nfp_prog *nfp_prog, swreg dst, u8 bmask, swreg src, 
	emit_ld_field_any(nfp_prog, sc, shift, dst, bmask, src, false);

}



static void emit_nop(struct nfp_prog *nfp_prog)

{

	__emit_immed(nfp_prog, UR_REG_IMM, UR_REG_IMM, 0, 0, 0, 0, 0, 0, 0);

}



/* --- Wrappers --- */

static bool pack_immed(u32 imm, u16 *val, enum immed_shift *shift)

{
@@ -1550,7 +1555,7 @@ static void nfp_outro(struct nfp_prog *nfp_prog) 
static int nfp_translate(struct nfp_prog *nfp_prog)

{

	struct nfp_insn_meta *meta;

	int err;

	int i, err;



	nfp_intro(nfp_prog);

	if (nfp_prog->error)
@@ -1582,6 +1587,11 @@ static int nfp_translate(struct nfp_prog *nfp_prog) 
	if (nfp_prog->error)

		return nfp_prog->error;



	for (i = 0; i < NFP_USTORE_PREFETCH_WINDOW; i++)

		emit_nop(nfp_prog);

	if (nfp_prog->error)

		return nfp_prog->error;



	return nfp_fixup_branches(nfp_prog);

}

drivers/net/ethernet/netronome/nfp/nfp_asm.h

+2 −0
Original line number Diff line number Diff line
@@ -362,6 +362,8 @@ int swreg_to_unrestricted(swreg dst, swreg lreg, swreg rreg, 
int swreg_to_restricted(swreg dst, swreg lreg, swreg rreg,

			struct nfp_insn_re_regs *reg, bool has_imm8);



#define NFP_USTORE_PREFETCH_WINDOW	8



int nfp_ustore_check_valid_no_ecc(u64 insn);

u64 nfp_ustore_calc_ecc_insn(u64 insn);