From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B242C41E09; Sun, 12 Mar 2023 07:20:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 41AA4406A2; Sun, 12 Mar 2023 07:20:33 +0100 (CET) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mails.dpdk.org (Postfix) with ESMTP id DD94240395 for ; Sun, 12 Mar 2023 07:20:31 +0100 (CET) Received: by mail-pl1-f174.google.com with SMTP id ix20so3253390plb.3 for ; Sat, 11 Mar 2023 22:20:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678602031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+bdKBXe0yCmw2t3OMCmtvsJP1erTj/u+c59uzj9WKZU=; b=lhcRXTx8Ff+e2Z7ZEsWVy6HW1E0Z0opoowjmGieLPwojgQmnZ8ja5tx4bMFw0FW/I8 0tbP75nRbvsTUOVGA3ZA+pNLMksGx74uSW8NsPuHwdXoUgSRdCKmdkuPJajCqzB2bhOu PRbJDLx7rbDl4d3MyE7mPQDke9G+tYWfWI1ioGnJcebiclfTb9uhKWzqdRNsLN670MVc wp01vgvRfeuR5dVavmufAhAU37IxyWYTTQlO+SqMOuHhFZXywK5gihK8qKaceHNpn5sF 1KR8WEb0FjYMljKAy+PxQEUcUjy/bHNF527TpOUZ8HBIBhuAa4M3LXkVzuQUuYhNGOJb nfeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678602031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+bdKBXe0yCmw2t3OMCmtvsJP1erTj/u+c59uzj9WKZU=; b=2pCCQ6HhC+08BRfoFoZ8ESaVYdgVQ54vgZdUtYPjOPsnr73LJSqXxYx5r3MTkhgGWi EQZxJ5FsUlBtBteI0Dth570aTwlFaRWWngbmys8tVQqpKiNN3QpGOEm0/ZWUC81Gp2vv 5TQCqIpSCUz1dy8KQ0A9wyNgKacIRJWXxuT+3Ri3RGa43kMggURlImJJp4pRSlFFHM3b wqdq/tRX1322jHtzGqvXGGEC4Pp8wehuqba8T7iIfXXgErvyfY/R3eIBKrSL9bfZRRMe QbiR3EbrC76GTcQ+omqk5XBRTCQnn80y77y6HGrBWbJjjiE8tCDYQjVlRrHZRknvaSuu GA6Q== X-Gm-Message-State: AO0yUKUE3qw8qlDKbe4MW101Txhm09w3PZI9Vtd5aeF0JyAs0WVyt9gt oFecQ1IOFYpAhjITxvLEZlt/zxQssgZd+yKp X-Google-Smtp-Source: AK7set/xyS0Qrg/TcZqDRxhUhWtRWBxvuMy0pFCT0ZzSZNaLKeH0PIy4A4Jr5hur0pjFZ45XBDpzbw== X-Received: by 2002:a17:90b:1c05:b0:231:248c:6ac4 with SMTP id oc5-20020a17090b1c0500b00231248c6ac4mr31515716pjb.7.1678602030769; Sat, 11 Mar 2023 22:20:30 -0800 (PST) Received: from localhost.localdomain ([120.231.212.155]) by smtp.gmail.com with ESMTPSA id t4-20020a170902a5c400b00185402cfedesm2312348plq.246.2023.03.11.22.20.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Mar 2023 22:20:30 -0800 (PST) From: "J.J. Martzki" To: dev@dpdk.org Cc: stephen@networkplumber.org, thomas@monjalon.net, "J.J. Martzki" , Konstantin Ananyev , Ruifeng Wang Subject: [PATCH v4] lib/bpf: Rename bpf function names to avoid potential conflict with libpcap Date: Sun, 12 Mar 2023 14:20:20 +0800 Message-Id: <20230312062021.7349-1-mars14850@gmail.com> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) In-Reply-To: <20230306154216.41154-1-mars14850@gmail.com> References: <20230306154216.41154-1-mars14850@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The library libpcap has their function 'bpf_validate' either so there would be a multiple definition issue when linking with librte_bpf.a and libpcap.a statically (Same as http://dpdk.org/patch/52631). So just rename the function names to avoid such issue. Signed-off-by: J.J. Martzki --- v4: * Update my name. v3: * Rewrite the commit message. v2: * Rename all functions in bpf_impl.h. * Adjust the commit message. --- lib/bpf/bpf.c | 6 +++--- lib/bpf/bpf_convert.c | 3 --- lib/bpf/bpf_impl.h | 10 ++++------ lib/bpf/bpf_jit_arm64.c | 2 +- lib/bpf/bpf_jit_x86.c | 2 +- lib/bpf/bpf_load.c | 4 ++-- lib/bpf/bpf_validate.c | 2 +- 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/lib/bpf/bpf.c b/lib/bpf/bpf.c index 1e1dd42a58..f218a8f2b0 100644 --- a/lib/bpf/bpf.c +++ b/lib/bpf/bpf.c @@ -31,14 +31,14 @@ rte_bpf_get_jit(const struct rte_bpf *bpf, struct rte_bpf_jit *jit) } int -bpf_jit(struct rte_bpf *bpf) +rte_bpf_jit(struct rte_bpf *bpf) { int32_t rc; #if defined(RTE_ARCH_X86_64) - rc = bpf_jit_x86(bpf); + rc = rte_bpf_jit_x86(bpf); #elif defined(RTE_ARCH_ARM64) - rc = bpf_jit_arm64(bpf); + rc = rte_bpf_jit_arm64(bpf); #else rc = -ENOTSUP; #endif diff --git a/lib/bpf/bpf_convert.c b/lib/bpf/bpf_convert.c index 9563274c9c..d441be6663 100644 --- a/lib/bpf/bpf_convert.c +++ b/lib/bpf/bpf_convert.c @@ -23,11 +23,8 @@ #include #include -/* Workaround name conflicts with libpcap */ -#define bpf_validate(f, len) bpf_validate_libpcap(f, len) #include #include -#undef bpf_validate #include "bpf_impl.h" #include "bpf_def.h" diff --git a/lib/bpf/bpf_impl.h b/lib/bpf/bpf_impl.h index b4d8e87c6d..e955b74181 100644 --- a/lib/bpf/bpf_impl.h +++ b/lib/bpf/bpf_impl.h @@ -17,12 +17,10 @@ struct rte_bpf { uint32_t stack_sz; }; -extern int bpf_validate(struct rte_bpf *bpf); - -extern int bpf_jit(struct rte_bpf *bpf); - -extern int bpf_jit_x86(struct rte_bpf *); -extern int bpf_jit_arm64(struct rte_bpf *); +extern int rte_bpf_validate(struct rte_bpf *bpf); +extern int rte_bpf_jit(struct rte_bpf *bpf); +extern int rte_bpf_jit_x86(struct rte_bpf *bpf); +extern int rte_bpf_jit_arm64(struct rte_bpf *bpf); extern int rte_bpf_logtype; diff --git a/lib/bpf/bpf_jit_arm64.c b/lib/bpf/bpf_jit_arm64.c index db79ff7385..d1ab5f8fbf 100644 --- a/lib/bpf/bpf_jit_arm64.c +++ b/lib/bpf/bpf_jit_arm64.c @@ -1393,7 +1393,7 @@ emit(struct a64_jit_ctx *ctx, struct rte_bpf *bpf) * Produce a native ISA version of the given BPF code. */ int -bpf_jit_arm64(struct rte_bpf *bpf) +rte_bpf_jit_arm64(struct rte_bpf *bpf) { struct a64_jit_ctx ctx; size_t size; diff --git a/lib/bpf/bpf_jit_x86.c b/lib/bpf/bpf_jit_x86.c index c1a30e0386..182004ac7d 100644 --- a/lib/bpf/bpf_jit_x86.c +++ b/lib/bpf/bpf_jit_x86.c @@ -1490,7 +1490,7 @@ emit(struct bpf_jit_state *st, const struct rte_bpf *bpf) * produce a native ISA version of the given BPF code. */ int -bpf_jit_x86(struct rte_bpf *bpf) +rte_bpf_jit_x86(struct rte_bpf *bpf) { int32_t rc; uint32_t i; diff --git a/lib/bpf/bpf_load.c b/lib/bpf/bpf_load.c index 1e17df6ce0..2c4bca3586 100644 --- a/lib/bpf/bpf_load.c +++ b/lib/bpf/bpf_load.c @@ -108,9 +108,9 @@ rte_bpf_load(const struct rte_bpf_prm *prm) return NULL; } - rc = bpf_validate(bpf); + rc = rte_bpf_validate(bpf); if (rc == 0) { - bpf_jit(bpf); + rte_bpf_jit(bpf); if (mprotect(bpf, bpf->sz, PROT_READ) != 0) rc = -ENOMEM; } diff --git a/lib/bpf/bpf_validate.c b/lib/bpf/bpf_validate.c index 61cbb42216..2d3d899966 100644 --- a/lib/bpf/bpf_validate.c +++ b/lib/bpf/bpf_validate.c @@ -2302,7 +2302,7 @@ evaluate(struct bpf_verifier *bvf) } int -bpf_validate(struct rte_bpf *bpf) +rte_bpf_validate(struct rte_bpf *bpf) { int32_t rc; struct bpf_verifier bvf; -- 2.37.1 (Apple Git-137.1)