From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 81576A00E6 for ; Fri, 17 May 2019 16:10:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 640926904; Fri, 17 May 2019 16:10:05 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 085892BD8; Fri, 17 May 2019 16:10:00 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 May 2019 07:10:00 -0700 X-ExtLoop1: 1 Received: from sivswdev08.ir.intel.com ([10.237.217.47]) by orsmga008.jf.intel.com with ESMTP; 17 May 2019 07:09:58 -0700 From: Konstantin Ananyev To: dev@dpdk.org Cc: Konstantin Ananyev , stable@dpdk.org Date: Fri, 17 May 2019 15:09:42 +0100 Message-Id: <20190517140942.20724-1-konstantin.ananyev@intel.com> X-Mailer: git-send-email 2.18.0 Subject: [dpdk-stable] [PATCH] bpf: fix pseudo calls for BPF programs loaded from ELF X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" clang 6.0 and onwards, for the external function call generates BPF_PSEUDO_CALL instruction: call pseudo +-off -> call another bpf function. More details about that change: https://lwn.net/Articles/741773/ DPDK BPF implementation right now doesn't support multiple BPF functions per module. To overcome that problem, and preserve existing functionality (ability to call allowed by user external functions), bpf_elf_load() clears EBPF_PSEUDO_CALL value. For details how to reproduce the issue: https://bugs.dpdk.org/show_bug.cgi?id=259 Fixes: 5dba93ae5f2d ("bpf: add ability to load eBPF program from ELF object file") Cc: stable@dpdk.org Signed-off-by: Konstantin Ananyev --- lib/librte_bpf/bpf_def.h | 8 ++++++++ lib/librte_bpf/bpf_load_elf.c | 15 +++++++++++++-- lib/librte_bpf/rte_bpf.h | 3 +++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/lib/librte_bpf/bpf_def.h b/lib/librte_bpf/bpf_def.h index c10f3aec4..d39992997 100644 --- a/lib/librte_bpf/bpf_def.h +++ b/lib/librte_bpf/bpf_def.h @@ -120,6 +120,14 @@ enum { EBPF_REG_NUM, }; +/* + * When EBPF_CALL instruction has src_reg == EBPF_PSEUDO_CALL, + * it should be treated as pseudo-call instruction, where + * imm value contains pc-relative offset to another EBPF function. + * Right now DPDK EBPF library doesn't support it. + */ +#define EBPF_PSEUDO_CALL EBPF_REG_1 + /* * eBPF instruction format */ diff --git a/lib/librte_bpf/bpf_load_elf.c b/lib/librte_bpf/bpf_load_elf.c index 96d3630fe..926317b6f 100644 --- a/lib/librte_bpf/bpf_load_elf.c +++ b/lib/librte_bpf/bpf_load_elf.c @@ -77,10 +77,21 @@ resolve_xsym(const char *sn, size_t ofs, struct ebpf_insn *ins, size_t ins_sz, return -ENOENT; /* for function we just need an index in our xsym table */ - if (type == RTE_BPF_XTYPE_FUNC) + if (type == RTE_BPF_XTYPE_FUNC) { + + /* we don't support multiple functions per BPF module, + * so treat EBPF_PSEUDO_CALL to extrernal function + * as an ordinary EBPF_CALL. + */ + if (ins[idx].src_reg == EBPF_PSEUDO_CALL) { + RTE_BPF_LOG(INFO, "%s(%u): " + "EBPF_PSEUDO_CALL to external function: %s\n", + __func__, idx, sn); + ins[idx].src_reg = EBPF_REG_0; + } ins[idx].imm = fidx; /* for variable we need to store its absolute address */ - else { + } else { ins[idx].imm = (uintptr_t)prm->xsym[fidx].var.val; ins[idx + 1].imm = (uint64_t)(uintptr_t)prm->xsym[fidx].var.val >> 32; diff --git a/lib/librte_bpf/rte_bpf.h b/lib/librte_bpf/rte_bpf.h index ab92af8fe..c8b960176 100644 --- a/lib/librte_bpf/rte_bpf.h +++ b/lib/librte_bpf/rte_bpf.h @@ -134,6 +134,9 @@ rte_bpf_load(const struct rte_bpf_prm *prm); /** * Create a new eBPF execution context and load BPF code from given ELF * file into it. + * Note that if the function will encounter EBPF_PSEUDO_CALL instruction + * that references external symbol, it will treat is as standard BPF_CALL + * to the external helper function. * * @param prm * Parameters used to create and initialise the BPF execution context. -- 2.17.1