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 18ADA41DCD; Mon, 6 Mar 2023 16:42:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 013DB40EDB; Mon, 6 Mar 2023 16:42:30 +0100 (CET) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mails.dpdk.org (Postfix) with ESMTP id 0CA3B40A8A for ; Mon, 6 Mar 2023 16:42:29 +0100 (CET) Received: by mail-pj1-f44.google.com with SMTP id me6-20020a17090b17c600b0023816b0c7ceso13568095pjb.2 for ; Mon, 06 Mar 2023 07:42:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678117348; 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=/UoLhCSrUQls8cC91r/c59ckE6clarehCo4R+A9+Fcg=; b=VspDKU/gK3miNzyHAuj5EHOTZkKUK2BgTWrPL4cJ/R8svR4hx+gt4ylJ1wnDOsU3ze r7zB6dFwLjIUZUKHUf5flJefCSjZUPQCHc/CNUkUDUlpKocCSdhuM4lqnA3coSnnhg5H 2SETi3u15HTZe2ewdeG9pEoeJLZFl5r76Ec5YoUoCheyIhEYJm1M5k1Bwi8A6ePgRl8w PL/fnSFo9rjC5GGddAvMAUkGB6tjELFp3OmZy1YobDsk0vwjPIZjKv3aUpCUowCYQzRi FG41Vis1NsD+MuQI9O3uzNv6odyYscor0YjDOTkcS3a/6OX+gWTkkTN6kJihOv96uh9W zlBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678117348; 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=/UoLhCSrUQls8cC91r/c59ckE6clarehCo4R+A9+Fcg=; b=4/KsPU6xgD2KjeALaYFxtUowsk/RgJvK068l6zRpws0sQXy56IOE+vF+O7MtGgAQB4 l1ljoumsA5XYC21HmL2MsstFpvLjUBR+Yi5HseynWq1v9TldahO4B3KqxSc/diqq//Oi UkKNx9abpVs1J8h83djdU39dUrvuWYpoOz5PLWt1s01rI9i5OcO7+rm4BFRJvMriKybE aJsy97sZtSBa0mWY6yZgjGsueYIyIQsL7E2mDMcXQ7Pcj7PkJmRkKEqznWhv1chb9Zt8 /ZB6ux+GRX/pxpj6q/CGRsnvRicPp8qkbiqcORcjF0oaD6ugZGr7xPhJC2O1RldaqQau m46g== X-Gm-Message-State: AO0yUKUeLfQLLxQXvDNPqgr1TBCEbXL9DTxcK1doK9oP4/UhqHI7iUjy Up+QWciCW3/N78qIQvYaBFeialXDdVmU9n+4 X-Google-Smtp-Source: AK7set+K4eHTqpvw+SisgK26Z8QljnyAPodRRuaoOo9JhW0x5pEQNyoErMrYfGT7DhqYIhVYMtFBMg== X-Received: by 2002:a17:902:7106:b0:19d:1c6e:d31f with SMTP id a6-20020a170902710600b0019d1c6ed31fmr10441934pll.29.1678117348113; Mon, 06 Mar 2023 07:42:28 -0800 (PST) Received: from localhost.localdomain ([2409:8a55:316d:eb00:a902:28a8:e8fd:edbe]) by smtp.gmail.com with ESMTPSA id f13-20020a170902ce8d00b0019926c77577sm2077437plg.90.2023.03.06.07.42.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Mar 2023 07:42:27 -0800 (PST) From: Martzki To: dev@dpdk.org Cc: stephen@networkplumber.org, Martzki , Konstantin Ananyev , Ruifeng Wang Subject: [PATCH v3] lib/bpf: Rename bpf function names to avoid potential conflict with libpcap Date: Mon, 6 Mar 2023 23:42:15 +0800 Message-Id: <20230306154216.41154-1-mars14850@gmail.com> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) In-Reply-To: <20230306153218.40320-1-mars14850@gmail.com> References: <20230306153218.40320-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: Martzki --- 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)