@@ -13,6 +13,7 @@
#include <linux/bpf.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
+#include <linux/netdev_features_helper.h>
#include <linux/if_vlan.h>
#include <linux/random.h>
#include <linux/highmem.h>
@@ -14718,27 +14719,48 @@ static __init struct sk_buff *build_test_skb_linear_no_head_frag(void)
struct skb_segment_test {
const char *descr;
struct sk_buff *(*build_skb)(void);
- netdev_features_t features;
+ const netdev_features_t *features;
};
+static DECLARE_NETDEV_FEATURE_SET(gso_frags_feature_set,
+ NETIF_F_SG_BIT,
+ NETIF_F_GSO_PARTIAL_BIT,
+ NETIF_F_IP_CSUM_BIT,
+ NETIF_F_IPV6_CSUM_BIT,
+ NETIF_F_RXCSUM_BIT);
+static DECLARE_NETDEV_FEATURE_SET(gso_linear_feature_set,
+ NETIF_F_SG_BIT,
+ NETIF_F_FRAGLIST_BIT,
+ NETIF_F_HW_VLAN_CTAG_TX_BIT,
+ NETIF_F_GSO_BIT,
+ NETIF_F_LLTX_BIT,
+ NETIF_F_GRO_BIT,
+ NETIF_F_IPV6_CSUM_BIT,
+ NETIF_F_RXCSUM_BIT,
+ NETIF_F_HW_VLAN_STAG_TX_BIT);
+static netdev_features_t gso_frags_features __ro_after_init;
+static netdev_features_t gso_linear_feature_features __ro_after_init;
+
static struct skb_segment_test skb_segment_tests[] __initconst = {
{
.descr = "gso_with_rx_frags",
.build_skb = build_test_skb,
- .features = NETIF_F_SG | NETIF_F_GSO_PARTIAL | NETIF_F_IP_CSUM |
- NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM
+ .features = &gso_frags_features
},
{
.descr = "gso_linear_no_head_frag",
.build_skb = build_test_skb_linear_no_head_frag,
- .features = NETIF_F_SG | NETIF_F_FRAGLIST |
- NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_GSO |
- NETIF_F_LLTX | NETIF_F_GRO |
- NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |
- NETIF_F_HW_VLAN_STAG_TX
+ .features = &gso_linear_feature_features
}
};
+static void __init test_skb_features_init(void)
+{
+ netdev_features_set_array(&gso_frags_feature_set, &gso_frags_features);
+ netdev_features_set_array(&gso_linear_feature_set,
+ &gso_linear_feature_features);
+}
+
static __init int test_skb_segment_single(const struct skb_segment_test *test)
{
struct sk_buff *skb, *segs;
@@ -14750,7 +14772,7 @@ static __init int test_skb_segment_single(const struct skb_segment_test *test)
goto done;
}
- segs = skb_segment(skb, test->features);
+ segs = skb_segment(skb, *test->features);
if (!IS_ERR(segs)) {
kfree_skb_list(segs);
ret = 0;
@@ -14764,6 +14786,8 @@ static __init int test_skb_segment(void)
{
int i, err_cnt = 0, pass_cnt = 0;
+ test_skb_features_init();
+
for (i = 0; i < ARRAY_SIZE(skb_segment_tests); i++) {
const struct skb_segment_test *test = &skb_segment_tests[i];
The test_bpf uses netdev_features in global structure initialization. Changed the its netdev_features_t memeber to netdev_features_t *, and make it refer to a netdev_features_t global variables. Signed-off-by: Jian Shen <shenjian15@huawei.com> --- lib/test_bpf.c | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-)