Merge pull request #2 from jin13417/vpp_21.06

[jinshaohui]

vppsb suport vpp 21.06---centos 7 kernel 3.10.0-957.21.3.el7.x86_64

[micron10]

Please update for vpp 22.02

I try to compile but get this error :

-- Build files have been written to: /build/vpp/vpp/build-root/build-vpp_debug-native/vpp
@@@@ Building vpp in /build/vpp/vpp/build-root/build-vpp_debug-native/vpp @@@@
[2388/2512] Building C object CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/rtnl.c.o
FAILED: CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/rtnl.c.o
ccache /usr/lib/ccache/clang-11 --target=x86_64-linux-gnu -DCLIB_DEBUG -DHAVE_FCNTL64 -Drouter_plugin_EXPORTS -I/build/vpp/vpp/src -ICMakeFiles -I/build/vpp/vpp/src/plugins -ICMakeFiles/plugins -fPIC -g -Werror -Wall -Wno-address-of-packed-member -O0 -fstack-protector -fno-common -march=corei7 -mtune=corei7-avx -fvisibility=hidden -ffunction-sections -fdata-sections -MD -MT CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/rtnl.c.o -MF CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/rtnl.c.o.d -o CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/rtnl.c.o -c /build/vpp/vpp/src/plugins/router/librtnl/rtnl.c
/build/vpp/vpp/src/plugins/router/librtnl/rtnl.c:519:7: error: implicit declaration of function 'pool_foreach_old' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pool_foreach_old(ns, rm->streams, {
^
/build/vpp/vpp/src/plugins/router/librtnl/rtnl.c:519:41: error: expected expression
pool_foreach_old(ns, rm->streams, {
^
/build/vpp/vpp/src/plugins/router/librtnl/rtnl.c:548:5: error: implicit declaration of function 'pool_foreach_old' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pool_foreach_old(ns, rm->streams, {
^
/build/vpp/vpp/src/plugins/router/librtnl/rtnl.c:548:39: error: expected expression
pool_foreach_old(ns, rm->streams, {
^
4 errors generated.
[2391/2512] Building C object CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/netns.c.o
FAILED: CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/netns.c.o
ccache /usr/lib/ccache/clang-11 --target=x86_64-linux-gnu -DCLIB_DEBUG -DHAVE_FCNTL64 -Drouter_plugin_EXPORTS -I/build/vpp/vpp/src -ICMakeFiles -I/build/vpp/vpp/src/plugins -ICMakeFiles/plugins -fPIC -g -Werror -Wall -Wno-address-of-packed-member -O0 -fstack-protector -fno-common -march=corei7 -mtune=corei7-avx -fvisibility=hidden -ffunction-sections -fdata-sections -MD -MT CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/netns.c.o -MF CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/netns.c.o.d -o CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/netns.c.o -c /build/vpp/vpp/src/plugins/router/librtnl/netns.c
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:318:3: error: implicit declaration of function 'pool_foreach_old' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pool_foreach_old(h, nm->handles, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:318:36: error: expected expression
pool_foreach_old(h, nm->handles, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:341:3: error: implicit declaration of function 'pool_foreach_old' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pool_foreach_old(link, ns->netns.links, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:341:43: error: expected expression
pool_foreach_old(link, ns->netns.links, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:407:3: error: implicit declaration of function 'pool_foreach_old' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pool_foreach_old(route, ns->netns.routes, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:407:45: error: expected expression
pool_foreach_old(route, ns->netns.routes, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:470:3: error: implicit declaration of function 'pool_foreach_old' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pool_foreach_old(addr, ns->netns.addresses, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:470:47: error: expected expression
pool_foreach_old(addr, ns->netns.addresses, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:533:3: error: implicit declaration of function 'pool_foreach_old' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pool_foreach_old(neigh, ns->netns.neighbors, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:533:48: error: expected expression
pool_foreach_old(neigh, ns->netns.neighbors, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:609:3: error: implicit declaration of function 'pool_foreach_index_old' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
ns_object_foreach
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:586:3: note: expanded from macro 'ns_object_foreach'
(neighbors, NETNS_TYPE_NEIGH)
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:600:3: note: expanded from macro ''
pool_foreach_index_old(*i, ns->netns.pool, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:609:3: error: expected expression
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:586:3: note: expanded from macro 'ns_object_foreach'
(neighbors, NETNS_TYPE_NEIGH)
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:600:46: note: expanded from macro ''
pool_foreach_index_old(*i, ns->netns.pool, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:609:3: error: expected expression
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:587:3: note: expanded from macro 'ns_object_foreach'
(routes, NETNS_TYPE_ROUTE)
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:600:46: note: expanded from macro ''
pool_foreach_index_old(*i, ns->netns.pool, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:609:3: error: expected expression
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:588:3: note: expanded from macro 'ns_object_foreach'
(addresses, NETNS_TYPE_ADDR)
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:600:46: note: expanded from macro ''
pool_foreach_index_old(*i, ns->netns.pool, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:609:3: error: expected expression
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:589:3: note: expanded from macro 'ns_object_foreach'
(links, NETNS_TYPE_LINK)
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:600:46: note: expanded from macro ''
pool_foreach_index_old(*i, ns->netns.pool, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:659:3: error: implicit declaration of function 'pool_foreach_old' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pool_foreach_old(ns, nm->netnss, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:659:36: error: expected expression
pool_foreach_old(ns, nm->netnss, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:741:3: error: implicit declaration of function 'pool_foreach_index_old' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
ns_object_foreach
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:586:3: note: expanded from macro 'ns_object_foreach'
(neighbors, NETNS_TYPE_NEIGH)
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:736:3: note: expanded from macro ''
pool_foreach_index_old(i, ns->netns.pool, {
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:741:3: error: expected expression
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:586:3: note: expanded from macro 'ns_object_foreach'
(neighbors, NETNS_TYPE_NEIGH)
^
/build/vpp/vpp/src/plugins/router/librtnl/netns.c:736:45: note: expanded from macro ''
pool_foreach_index_old(i, ns->netns.pool, {
^
fatal error: too many errors emitted, stopping now [-ferror-limit=]
20 errors generated.
[2394/2512] Building C object CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/router/tap_inject.c.o
FAILED: CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/router/tap_inject.c.o
ccache /usr/lib/ccache/clang-11 --target=x86_64-linux-gnu -DCLIB_DEBUG -DHAVE_FCNTL64 -Drouter_plugin_EXPORTS -I/build/vpp/vpp/src -ICMakeFiles -I/build/vpp/vpp/src/plugins -ICMakeFiles/plugins -fPIC -g -Werror -Wall -Wno-address-of-packed-member -O0 -fstack-protector -fno-common -march=corei7 -mtune=corei7-avx -fvisibility=hidden -ffunction-sections -fdata-sections -MD -MT CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/router/tap_inject.c.o -MF CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/router/tap_inject.c.o.d -o CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/router/tap_inject.c.o -c /build/vpp/vpp/src/plugins/router/router/tap_inject.c
/build/vpp/vpp/src/plugins/router/router/tap_inject.c:276:3: error: implicit declaration of function 'pool_foreach_old' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pool_foreach_old (hw, interfaces, vec_add1 (*indices, hw - interfaces));
^
/build/vpp/vpp/src/plugins/router/router/tap_inject.c:276:37: error: expected expression
pool_foreach_old (hw, interfaces, vec_add1 (*indices, hw - interfaces));
^
/build/vpp/vpp/src/vppinfra/vec.h:607:33: note: expanded from macro 'vec_add1'
#define vec_add1(V,E) vec_add1_ha(V,E,0,0)
^
/build/vpp/vpp/src/vppinfra/vec.h:594:35: note: expanded from macro 'vec_add1_ha'
#define vec_add1_ha(V,E,H,A)
^
2 errors generated.
[2399/2512] Building C object CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/mapper.c.o
FAILED: CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/mapper.c.o
ccache /usr/lib/ccache/clang-11 --target=x86_64-linux-gnu -DCLIB_DEBUG -DHAVE_FCNTL64 -Drouter_plugin_EXPORTS -I/build/vpp/vpp/src -ICMakeFiles -I/build/vpp/vpp/src/plugins -ICMakeFiles/plugins -fPIC -g -Werror -Wall -Wno-address-of-packed-member -O0 -fstack-protector -fno-common -march=corei7 -mtune=corei7-avx -fvisibility=hidden -ffunction-sections -fdata-sections -MD -MT CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/mapper.c.o -MF CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/mapper.c.o.d -o CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/mapper.c.o -c /build/vpp/vpp/src/plugins/router/librtnl/mapper.c
/build/vpp/vpp/src/plugins/router/librtnl/mapper.c:45:3: error: implicit declaration of function 'pool_foreach_old' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pool_foreach_old(map, ns->mappings, {
^
/build/vpp/vpp/src/plugins/router/librtnl/mapper.c:45:39: error: expected expression
pool_foreach_old(map, ns->mappings, {
^
/build/vpp/vpp/src/plugins/router/librtnl/mapper.c:79:59: error: implicit conversion from enumeration type 'fib_protocol_t' (aka 'enum fib_protocol_t_') to different enumeration type 'dpo_proto_t' (aka 'enum dpo_proto_t_') [-Werror,-Wenum-conversion]
FIB_ENTRY_FLAG_NONE, prefix.fp_proto,
~~~~~~~^~~~~~~~
/build/vpp/vpp/src/plugins/router/librtnl/mapper.c:97:59: error: implicit conversion from enumeration type 'fib_protocol_t' (aka 'enum fib_protocol_t_') to different enumeration type 'dpo_proto_t' (aka 'enum dpo_proto_t_') [-Werror,-Wenum-conversion]
FIB_ENTRY_FLAG_NONE, prefix.fp_proto,
~~~~~~~^~~~~~~~
/build/vpp/vpp/src/plugins/router/librtnl/mapper.c:130:3: error: implicit declaration of function 'pool_foreach_old' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pool_foreach_old(route, netns->routes, {
^
/build/vpp/vpp/src/plugins/router/librtnl/mapper.c:130:42: error: expected expression
pool_foreach_old(route, netns->routes, {
^
/build/vpp/vpp/src/plugins/router/librtnl/mapper.c:142:3: error: implicit declaration of function 'pool_foreach_old' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pool_foreach_old(map, ns->mappings, {
^
/build/vpp/vpp/src/plugins/router/librtnl/mapper.c:142:39: error: expected expression
pool_foreach_old(map, ns->mappings, {
^
/build/vpp/vpp/src/plugins/router/librtnl/mapper.c:163:42: error: expected expression
pool_foreach_old(route, netns->routes, {
^
/build/vpp/vpp/src/plugins/router/librtnl/mapper.c:175:3: error: implicit declaration of function 'pool_foreach_old' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pool_foreach_old(ns, mm->namespaces, {
^
/build/vpp/vpp/src/plugins/router/librtnl/mapper.c:175:40: error: expected expression
pool_foreach_old(ns, mm->namespaces, {
^
/build/vpp/vpp/src/plugins/router/librtnl/mapper.c:249:3: error: implicit declaration of function 'pool_foreach_index_old' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pool_foreach_index_old(i, ns->mappings, {
^
/build/vpp/vpp/src/plugins/router/librtnl/mapper.c:249:43: error: expected expression
pool_foreach_index_old(i, ns->mappings, {
^
13 errors generated.
[2402/2512] Building C object CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/router/tap_inject_netlink.c.o
FAILED: CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/router/tap_inject_netlink.c.o
ccache /usr/lib/ccache/clang-11 --target=x86_64-linux-gnu -DCLIB_DEBUG -DHAVE_FCNTL64 -Drouter_plugin_EXPORTS -I/build/vpp/vpp/src -ICMakeFiles -I/build/vpp/vpp/src/plugins -ICMakeFiles/plugins -fPIC -g -Werror -Wall -Wno-address-of-packed-member -O0 -fstack-protector -fno-common -march=corei7 -mtune=corei7-avx -fvisibility=hidden -ffunction-sections -fdata-sections -MD -MT CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/router/tap_inject_netlink.c.o -MF CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/router/tap_inject_netlink.c.o.d -o CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/router/tap_inject_netlink.c.o -c /build/vpp/vpp/src/plugins/router/router/tap_inject_netlink.c
/build/vpp/vpp/src/plugins/router/router/tap_inject_netlink.c:191:63: error: implicit conversion from enumeration type 'fib_protocol_t' (aka 'enum fib_protocol_t_') to different enumeration type 'dpo_proto_t' (aka 'enum dpo_proto_t_') [-Werror,-Wenum-conversion]
FIB_ENTRY_FLAG_NONE, prefix.fp_proto,
~~~~~~~^~~~~~~~
/build/vpp/vpp/src/plugins/router/router/tap_inject_netlink.c:225:61: error: implicit conversion from enumeration type 'fib_protocol_t' (aka 'enum fib_protocol_t_') to different enumeration type 'dpo_proto_t' (aka 'enum dpo_proto_t_') [-Werror,-Wenum-conversion]
FIB_ENTRY_FLAG_NONE, prefix.fp_proto,
~~~~~~~^~~~~~~~
2 errors generated.
ninja: build stopped: subcommand failed.

[micron10]

And one more
with :
VPP version : 21.06-release
VPP library version : 21.06

FAILED: CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/mapper.c.o
ccache /usr/lib/ccache/clang-11 --target=x86_64-linux-gnu -DCLIB_DEBUG -DHAVE_FCNTL64 -Drouter_plugin_EXPORTS -I/build/vpp/vpp/src -ICMakeFiles -I/build/vpp/vpp/src/plugins -ICMakeFiles/plugins -fPIC -g -fPIC -Werror -Wall -Wno-address-of-packed-member -O0 -fstack-protector -fno-common -march=corei7 -mtune=corei7-avx -fvisibility=hidden -ffunction-sections -fdata-sections -MD -MT CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/mapper.c.o -MF CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/mapper.c.o.d -o CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/librtnl/mapper.c.o -c /build/vpp/vpp/src/plugins/router/librtnl/mapper.c
/build/vpp/vpp/src/plugins/router/librtnl/mapper.c:79:59: error: implicit conversion from enumeration type 'fib_protocol_t' (aka 'enum fib_protocol_t_') to different enumeration type 'dpo_proto_t' (aka 'enum dpo_proto_t_') [-Werror,-Wenum-conversion]
FIB_ENTRY_FLAG_NONE, prefix.fp_proto,
~~~~~~~^~~~~~~~
/build/vpp/vpp/src/plugins/router/librtnl/mapper.c:97:59: error: implicit conversion from enumeration type 'fib_protocol_t' (aka 'enum fib_protocol_t_') to different enumeration type 'dpo_proto_t' (aka 'enum dpo_proto_t_') [-Werror,-Wenum-conversion]
FIB_ENTRY_FLAG_NONE, prefix.fp_proto,
~~~~~~~^~~~~~~~
2 errors generated.
[2336/2507] Building C object CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/router/tap_inject_netlink.c.o
FAILED: CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/router/tap_inject_netlink.c.o
ccache /usr/lib/ccache/clang-11 --target=x86_64-linux-gnu -DCLIB_DEBUG -DHAVE_FCNTL64 -Drouter_plugin_EXPORTS -I/build/vpp/vpp/src -ICMakeFiles -I/build/vpp/vpp/src/plugins -ICMakeFiles/plugins -fPIC -g -fPIC -Werror -Wall -Wno-address-of-packed-member -O0 -fstack-protector -fno-common -march=corei7 -mtune=corei7-avx -fvisibility=hidden -ffunction-sections -fdata-sections -MD -MT CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/router/tap_inject_netlink.c.o -MF CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/router/tap_inject_netlink.c.o.d -o CMakeFiles/plugins/router/CMakeFiles/router_plugin.dir/router/tap_inject_netlink.c.o -c /build/vpp/vpp/src/plugins/router/router/tap_inject_netlink.c
/build/vpp/vpp/src/plugins/router/router/tap_inject_netlink.c:191:63: error: implicit conversion from enumeration type 'fib_protocol_t' (aka 'enum fib_protocol_t_') to different enumeration type 'dpo_proto_t' (aka 'enum dpo_proto_t_') [-Werror,-Wenum-conversion]
FIB_ENTRY_FLAG_NONE, prefix.fp_proto,
~~~~~~~^~~~~~~~
/build/vpp/vpp/src/plugins/router/router/tap_inject_netlink.c:225:61: error: implicit conversion from enumeration type 'fib_protocol_t' (aka 'enum fib_protocol_t_') to different enumeration type 'dpo_proto_t' (aka 'enum dpo_proto_t_') [-Werror,-Wenum-conversion]
FIB_ENTRY_FLAG_NONE, prefix.fp_proto,
~~~~~~~^~~~~~~~
2 errors generated.
[2345/2507] Building C object CMakeFiles/plugins/srv6-ad-flow/CMakeFiles/srv6adflow_plugin.dir/ad-flow.c.o

[micron10]

And one more
is there options to see PPPOE (PADO/PADI/PAXX) package via tap_inject ?