!1183 Fix some warning messages in netacc

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/5JKP2KL26FXHAGD4SJXBYZ2YJPD4DYLT/ 
v1->v2: add bugzilla tag.

Fix below warning messages:
libbpf: Error in bpf_create_map_xattr(redissock_map):ERROR: strerror_r(-524)=22(-524). Retrying without BTF.
rmmod: ERROR: Module localip is not currently loaded

Hengqi Chen (1):
  libbpf: Support uniform BTF-defined key/value specification across all
    BPF maps

Liu Jian (1):
  tools: ignore one warning message


-- 
2.34.1
 
 
Link:https://gitee.com/openeuler/kernel/pulls/1183 

Reviewed-by: Yue Haibing <yuehaibing@huawei.com> 
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com> 

tools/lib/bpf/libbpf.c

@@ -4229,6 +4229,30 @@ static int bpf_object__create_map(struct bpf_object *obj, struct bpf_map *map)
 			create_attr.inner_map_fd = map->inner_map_fd;
 	}
 
+	switch (def->type) {
+	case BPF_MAP_TYPE_PERF_EVENT_ARRAY:
+	case BPF_MAP_TYPE_CGROUP_ARRAY:
+	case BPF_MAP_TYPE_STACK_TRACE:
+	case BPF_MAP_TYPE_ARRAY_OF_MAPS:
+	case BPF_MAP_TYPE_HASH_OF_MAPS:
+	case BPF_MAP_TYPE_DEVMAP:
+	case BPF_MAP_TYPE_DEVMAP_HASH:
+	case BPF_MAP_TYPE_CPUMAP:
+	case BPF_MAP_TYPE_XSKMAP:
+	case BPF_MAP_TYPE_SOCKMAP:
+	case BPF_MAP_TYPE_SOCKHASH:
+	case BPF_MAP_TYPE_QUEUE:
+	case BPF_MAP_TYPE_STACK:
+	case BPF_MAP_TYPE_RINGBUF:
+		create_attr.btf_fd = 0;
+		create_attr.btf_key_type_id = 0;
+		create_attr.btf_value_type_id = 0;
+		map->btf_key_type_id = 0;
+		map->btf_value_type_id = 0;
+	default:
+		break;
+	}
+
 	map->fd = bpf_create_map_xattr(&create_attr);
 	if (map->fd < 0 && (create_attr.btf_key_type_id ||
 			    create_attr.btf_value_type_id)) {

tools/netacc/net-acc

@@ -27,7 +27,7 @@ if [[ "$CMD"X == "enableX" ]]; then
 	/usr/sbin/tuned_acc/redis_acc enable
 elif [[ "$CMD"X == "disableX" ]]; then
 	/usr/sbin/tuned_acc/redis_acc disable
-	rmmod localip
+	rmmod localip 2>/dev/null
 	exit 0
 else
 	usage;