mirror of
https://github.com/openvswitch/ovs
synced 2025-08-22 09:58:01 +00:00
1dcc490d44
AF_XDP functions was deprecated in libbpf 0.7 and moved to libxdp. Functions bpf_get/set_link_xdp_id() was deprecated in libbpf 0.8 and replaced with bpf_xdp_query_id() and bpf_xdp_attach/detach(). Updating configuration and source code to accommodate above changes and allow building OVS with AF_XDP support on newer systems: - Checking the version of libbpf by detecting availability of bpf_xdp_detach. - Checking availability of the libxdp in a system by looking for a library providing libxdp_strerror(), if libbpf is newer than 0.6. And checking for xsk.h header provided by libxdp-dev[el]. - Use xsk.h from libbpf if it is older than 0.7 and not linking with libxdp in this case as there are known incompatible versions of libxdp in distributions. - Check for the NEED_WAKEUP feature replaced with direct checking in the source code if XDP_USE_NEED_WAKEUP is defined. - Checking availability of bpf_xdp_query_id and bpf_xdp_detach and using them instead of deprecated APIs. Fall back to old functions if not found. - Dropped LIBBPF_LDADD variable as it makes library and function detection much harder without providing any actual benefits. AC_SEARCH_LIBS is used instead and it allows use of AC_CHECK_FUNCS. - Header includes moved around to files where they are actually used. - Removed libelf dependency as it is not really used. With these changes it should be possible to build OVS with either: - libbpf built from the kernel sources (5.19 or older). - libbpf < 0.7 provided in distributions. - libxdp and libbpf >= 0.7 provided in newer distributions. While it is technically possible to build with libbpf 0.7+ without libxdp at the moment we're not allowing that for a few reasons. First, required functions in libbpf are deprecated and can be removed in future releases. Second, support for all these combinations makes the detection code fairly complex. AFAIK, most of the distributions packaging libbpf 0.7+ do package libxdp as well. libxdp added as a build dependency for Fedora build since all supported versions of Fedora are packaging this library. Acked-by: Eelco Chaudron <echaudro@redhat.com> Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
52 lines
1.5 KiB
C
52 lines
1.5 KiB
C
/*
|
|
* Copyright (c) 2018, 2019 Nicira, Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at:
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef XDPSOCK_H
|
|
#define XDPSOCK_H 1
|
|
|
|
#ifdef HAVE_AF_XDP
|
|
|
|
#include "openvswitch/thread.h"
|
|
|
|
/* LIFO ptr_array. */
|
|
struct umem_pool {
|
|
int index; /* Point to top. */
|
|
unsigned int size;
|
|
struct ovs_spin lock;
|
|
void **array; /* A pointer array pointing to umem buf. */
|
|
};
|
|
|
|
/* Array-based dp_packet_afxdp. */
|
|
struct xpacket_pool {
|
|
unsigned int size;
|
|
struct dp_packet_afxdp *array;
|
|
};
|
|
|
|
void umem_elem_push(struct umem_pool *umemp, void *addr);
|
|
void umem_elem_push_n(struct umem_pool *umemp, int n, void **addrs);
|
|
|
|
void *umem_elem_pop(struct umem_pool *umemp);
|
|
int umem_elem_pop_n(struct umem_pool *umemp, int n, void **addrs);
|
|
|
|
int umem_pool_init(struct umem_pool *umemp, unsigned int size);
|
|
void umem_pool_cleanup(struct umem_pool *umemp);
|
|
unsigned int umem_pool_count(struct umem_pool *umemp);
|
|
int xpacket_pool_init(struct xpacket_pool *xp, unsigned int size);
|
|
void xpacket_pool_cleanup(struct xpacket_pool *xp);
|
|
|
|
#endif
|
|
#endif
|