bpf: Rename nfct_bsa to nfct_btf_struct_access

The former name was a little hard to guess.

Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
Link: https://lore.kernel.org/r/73adc72385c8b162391fbfb404f0b6d4c5cc55d7.1663683114.git.dxu@dxuuu.xyz
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>

diff --git a/include/net/netfilter/nf_conntrack_bpf.h b/include/net/netfilter/nf_conntrack_bpf.h
index 9c07d2d..1199d4f 100644 (file)
--- a/include/net/netfilter/nf_conntrack_bpf.h
+++ b/include/net/netfilter/nf_conntrack_bpf.h
@@ -13,10 +13,10 @@ extern int register_nf_conntrack_bpf(void);
 extern void cleanup_nf_conntrack_bpf(void);
 
 extern struct mutex nf_conn_btf_access_lock;
-extern int (*nfct_bsa)(struct bpf_verifier_log *log, const struct btf *btf,
-                      const struct btf_type *t, int off, int size,
-                      enum bpf_access_type atype, u32 *next_btf_id,
-                      enum bpf_type_flag *flag);
+extern int (*nfct_btf_struct_access)(struct bpf_verifier_log *log, const struct btf *btf,
+                                    const struct btf_type *t, int off, int size,
+                                    enum bpf_access_type atype, u32 *next_btf_id,
+                                    enum bpf_type_flag *flag);
 
 #else
 

diff --git a/net/core/filter.c b/net/core/filter.c
index 4b2be21..2fd9449 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -8608,11 +8608,11 @@ static bool tc_cls_act_is_valid_access(int off, int size,
 DEFINE_MUTEX(nf_conn_btf_access_lock);
 EXPORT_SYMBOL_GPL(nf_conn_btf_access_lock);
 
-int (*nfct_bsa)(struct bpf_verifier_log *log, const struct btf *btf,
-               const struct btf_type *t, int off, int size,
-               enum bpf_access_type atype, u32 *next_btf_id,
-               enum bpf_type_flag *flag);
-EXPORT_SYMBOL_GPL(nfct_bsa);
+int (*nfct_btf_struct_access)(struct bpf_verifier_log *log, const struct btf *btf,
+                             const struct btf_type *t, int off, int size,
+                             enum bpf_access_type atype, u32 *next_btf_id,
+                             enum bpf_type_flag *flag);
+EXPORT_SYMBOL_GPL(nfct_btf_struct_access);
 
 static int tc_cls_act_btf_struct_access(struct bpf_verifier_log *log,
                                        const struct btf *btf,
@@ -8628,8 +8628,8 @@ static int tc_cls_act_btf_struct_access(struct bpf_verifier_log *log,
                                         flag);
 
        mutex_lock(&nf_conn_btf_access_lock);
-       if (nfct_bsa)
-               ret = nfct_bsa(log, btf, t, off, size, atype, next_btf_id, flag);
+       if (nfct_btf_struct_access)
+               ret = nfct_btf_struct_access(log, btf, t, off, size, atype, next_btf_id, flag);
        mutex_unlock(&nf_conn_btf_access_lock);
 
        return ret;
@@ -8708,8 +8708,8 @@ static int xdp_btf_struct_access(struct bpf_verifier_log *log,
                                         flag);
 
        mutex_lock(&nf_conn_btf_access_lock);
-       if (nfct_bsa)
-               ret = nfct_bsa(log, btf, t, off, size, atype, next_btf_id, flag);
+       if (nfct_btf_struct_access)
+               ret = nfct_btf_struct_access(log, btf, t, off, size, atype, next_btf_id, flag);
        mutex_unlock(&nf_conn_btf_access_lock);
 
        return ret;

diff --git a/net/netfilter/nf_conntrack_bpf.c b/net/netfilter/nf_conntrack_bpf.c
index 77eb8e9..29c4efb 100644 (file)
--- a/net/netfilter/nf_conntrack_bpf.c
+++ b/net/netfilter/nf_conntrack_bpf.c
@@ -502,7 +502,7 @@ int register_nf_conntrack_bpf(void)
        ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SCHED_CLS, &nf_conntrack_kfunc_set);
        if (!ret) {
                mutex_lock(&nf_conn_btf_access_lock);
-               nfct_bsa = _nf_conntrack_btf_struct_access;
+               nfct_btf_struct_access = _nf_conntrack_btf_struct_access;
                mutex_unlock(&nf_conn_btf_access_lock);
        }
 
@@ -512,6 +512,6 @@ int register_nf_conntrack_bpf(void)
 void cleanup_nf_conntrack_bpf(void)
 {
        mutex_lock(&nf_conn_btf_access_lock);
-       nfct_bsa = NULL;
+       nfct_btf_struct_access = NULL;
        mutex_unlock(&nf_conn_btf_access_lock);
 }