Skip to content

Add RX Queue Config Option And Spread Load Across Queues. #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gamemann wants to merge 1 commit into
base: master
Choose a base branch
from
+39 −7
Open

Add RX Queue Config Option And Spread Load Across Queues. #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/compressor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,17 @@ int main(int argc, char **argv) {
tcp_exclude = 0;
}

int rxqueues = 0;

if (config_lookup_int(&config, "rxqueues", &rxqueues) == CONFIG_FALSE)
{
rxqueues = 0;
}

cfg.rate_limit = rate_limit;
cfg.new_conn_limit = new_conn_limit;
cfg.tcp_exclude = tcp_exclude;
cfg.rxqueues = rxqueues;

int cockpit_enabled = 0;
config_lookup_bool(&config, "cockpit_enabled", &cockpit_enabled);
Expand Down Expand Up @@ -143,7 +151,7 @@ int main(int argc, char **argv) {
return 1;
}

load_skb_program(interface, ifindex, maps->xsk_map_fd, maps->a2s_cache_map_fd);
load_skb_program(interface, ifindex, maps->xsk_map_fd, maps->a2s_cache_map_fd, &cfg);
if (redis_addr && redis_port) {
start_cache_seeding(maps->a2s_cache_map_fd, forwarding_rules, redis_addr, redis_port);
}
Expand Down
31 changes: 26 additions & 5 deletions src/compressor_cache_user.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
#include "compressor_filter_user.h"
#include "xassert.h"
#include "checksum.h"
#include "config.h"

#ifndef AF_XDP
#define AF_XDP 44
Expand Down Expand Up @@ -447,7 +448,7 @@ struct xdp_umem *xdp_umem_configure(int sfd) {
return umem;
}

struct xdp_sock *xsk_configure(struct xdp_umem *umem, int ifindex) {
struct xdp_sock *xsk_configure(struct xdp_umem *umem, int ifindex, int cpu_id, int *allow) {
static int ndescs = NUM_DESCS;

struct xdp_sock *xsk = calloc(1, sizeof(struct xdp_sock));
Expand Down Expand Up @@ -499,7 +500,7 @@ struct xdp_sock *xsk_configure(struct xdp_umem *umem, int ifindex) {
struct sockaddr_xdp sxdp = {};
sxdp.sxdp_family = AF_XDP;
sxdp.sxdp_ifindex = ifindex;
sxdp.sxdp_queue_id = 0;
sxdp.sxdp_queue_id = cpu_id;

if (umem) {
sxdp.sxdp_flags = XDP_SHARED_UMEM;
Expand All @@ -508,21 +509,41 @@ struct xdp_sock *xsk_configure(struct xdp_umem *umem, int ifindex) {
sxdp.sxdp_flags = 0;
}

xassert(bind(sfd, (struct sockaddr *)&sxdp, sizeof(sxdp)) == 0);
if (bind(sfd, (struct sockaddr *)&sxdp, sizeof(sxdp)) != 0)
{
*allow = 0;
}

return xsk;
}

void load_skb_program(const char *ifname, int ifindex, int xsk_map_fd, int a2s_info_cache_map_fd) {
void load_skb_program(const char *ifname, int ifindex, int xsk_map_fd, int a2s_info_cache_map_fd, struct config *cfg) {
a2s_cache_map_fd = a2s_info_cache_map_fd;
xassert(pthread_rwlock_init(&a2s_cache_lock, NULL) == 0);

int num_cpus = get_nprocs_conf();

// Check for config override.
if (cfg->rxqueues > 0) {
num_cpus = cfg->rxqueues;
}

if (num_cpus > MAX_CPUS) {
num_cpus = MAX_CPUS;
}

for (int cpu_id = 0; cpu_id < num_cpus; cpu_id++) {
struct xdp_sock *xsk = xsk_configure(NULL, ifindex);
int allow = 1;
struct xdp_sock *xsk = xsk_configure(NULL, ifindex, cpu_id, &allow);

if (!allow)
{
int errnum = errno;
fprintf(stdout, "WARNING - Couldn't configure AF_XDP socket for CPU #%d :: %s\n", cpu_id, strerror(errnum));

continue;
}

xassert(bpf_map_update_elem(xsk_map_fd, &cpu_id, &xsk->sfd, BPF_ANY) == 0);
xsk_cache_run(xsk);
}
Expand Down
4 changes: 3 additions & 1 deletion src/compressor_cache_user.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@

#pragma once

void load_skb_program(const char *ifname, int ifindex, int xsk_map_fd, int a2s_info_cache_map_fd);
#include "config.h"

void load_skb_program(const char *ifname, int ifindex, int xsk_map_fd, int a2s_info_cache_map_fd, struct config *cfg);
void get_cache_rlock(void);
void get_cache_wlock(void);
void release_cache_lock(void);
Expand Down
1 change: 1 addition & 0 deletions src/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ struct config {
uint_fast64_t new_conn_limit;
uint_fast64_t rate_limit;
uint_fast8_t tcp_exclude;
uint16_t rxqueues;
};

struct forwarding_rule {
Expand Down