upstream/knot-dns
1
0
Fork 0
mirror of https://gitlab.nic.cz/knot/knot-dns.git synced 2026-02-03 18:49:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf: add 'xdp.force-copy' config option

Browse source
This commit is contained in:
Daniel Salzman 2024-01-30 15:10:51 +01:00
parent c62ff53985
commit 44b44d7650
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/knot/conf/schema.c
View file

@ -273,6 +273,7 @@ static const yp_item_t desc_xdp[] = {
{ C_TCP_IDLE_RESET, YP_TINT, YP_VINT = { 1, INT32_MAX, 20, YP_STIME } },
{ C_TCP_RESEND, YP_TINT, YP_VINT = { 1, INT32_MAX, 5, YP_STIME } },
{ C_ROUTE_CHECK, YP_TBOOL, YP_VNONE },
{ C_FORCE_COPY, YP_TBOOL, YP_VNONE },
{ C_EXTRA_FRAMES, YP_TBOOL, YP_VNONE },
{ C_COMMENT, YP_TSTR, YP_VNONE },
// Legacy items.

1
src/knot/conf/schema.h
View file

@ -65,6 +65,7 @@
#define C_EXPIRE_MIN_INTERVAL "\x13""expire-min-interval"
#define C_EXTRA_FRAMES "\x0C""extra-frames"
#define C_FILE "\x04""file"
#define C_FORCE_COPY "\x0A""force-copy"
#define C_GLOBAL_MODULE "\x0D""global-module"
#define C_ID "\x02""id"
#define C_IDENT "\x08""identity"

8
src/knot/server/server.c
View file

@ -254,7 +254,7 @@ static size_t quic_rmt_count(conf_t *conf)
static iface_t *server_init_xdp_iface(struct sockaddr_storage *addr, bool route_check,
bool udp, bool tcp, uint16_t quic, unsigned *thread_id_start,
bool extra_frames)
bool extra_frames, bool force_copy)
{
#ifndef ENABLE_XDP
assert(0);
@ -296,7 +296,7 @@ static iface_t *server_init_xdp_iface(struct sockaddr_storage *addr, bool route_
xdp_flags |= KNOT_XDP_FILTER_ROUTE;
}
knot_xdp_config_t xdp_config = { .extra_frames = extra_frames };
knot_xdp_config_t xdp_config = { .force_copy = force_copy, .extra_frames = extra_frames };
for (int i = 0; i < iface.queues; i++) {
knot_xdp_load_bpf_t mode =
(i == 0 ? KNOT_XDP_LOAD_BPF_ALWAYS : KNOT_XDP_LOAD_BPF_NEVER);
@ -737,6 +737,8 @@ static int configure_sockets(conf_t *conf, server_t *s)
s->handlers[IO_TCP].handler.unit->size;
conf_val_t extra_frames_val = conf_get(conf, C_XDP, C_EXTRA_FRAMES);
bool extra_frames = conf_bool(&extra_frames_val);
conf_val_t force_copy_val = conf_get(conf, C_XDP, C_FORCE_COPY);
bool force_copy = conf_bool(&force_copy_val);
while (lisxdp_val.code == KNOT_EOK) {
struct sockaddr_storage addr = conf_addr(&lisxdp_val, NULL);
char addr_str[SOCKADDR_STRLEN] = { 0 };
@ -745,7 +747,7 @@ static int configure_sockets(conf_t *conf, server_t *s)
iface_t *new_if = server_init_xdp_iface(&addr, route_check, xdp_udp,
xdp_tcp, xdp_quic, &thread_id,
extra_frames);
extra_frames, force_copy);
if (new_if == NULL) {
server_deinit_iface_list(newlist, nifs);
return KNOT_ERROR;