Skip to content

Fix inverted XDP copy/zero-copy bind flag handling #221

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
jason-sirius wants to merge 1 commit into
base: develop
Choose a base branch
from
+8 −8
Open

Fix inverted XDP copy/zero-copy bind flag handling #221

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
12 changes: 6 additions & 6 deletions lib/format_linux_xdp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1604,16 +1604,16 @@ static int linux_xdp_config_input(libtrace_t *libtrace, trace_option_t options,
XDP_FORMAT_DATA->cfg.xdp_flags &= ~XDP_FLAGS_MODES;
XDP_FORMAT_DATA->cfg.xdp_flags |= XDP_FLAGS_SKB_MODE;
/* cannot use zero copy mode with SKB so force copy */
XDP_FORMAT_DATA->cfg.xsk_bind_flags &= XDP_COPY;
XDP_FORMAT_DATA->cfg.xsk_bind_flags |= XDP_ZEROCOPY;
XDP_FORMAT_DATA->cfg.xsk_bind_flags &= ~XDP_ZEROCOPY;
XDP_FORMAT_DATA->cfg.xsk_bind_flags |= XDP_COPY;
return 0;
case TRACE_OPTION_XDP_ZERO_COPY_MODE:
XDP_FORMAT_DATA->cfg.xsk_bind_flags &= XDP_ZEROCOPY;
XDP_FORMAT_DATA->cfg.xsk_bind_flags |= XDP_COPY;
XDP_FORMAT_DATA->cfg.xsk_bind_flags &= ~XDP_COPY;
XDP_FORMAT_DATA->cfg.xsk_bind_flags |= XDP_ZEROCOPY;
return 0;
case TRACE_OPTION_XDP_COPY_MODE:
XDP_FORMAT_DATA->cfg.xsk_bind_flags &= XDP_COPY;
XDP_FORMAT_DATA->cfg.xsk_bind_flags |= XDP_ZEROCOPY;
XDP_FORMAT_DATA->cfg.xsk_bind_flags &= ~XDP_ZEROCOPY;
XDP_FORMAT_DATA->cfg.xsk_bind_flags |= XDP_COPY;
return 0;
}

Expand Down
4 changes: 2 additions & 2 deletions lib/libtrace.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1648,10 +1648,10 @@ typedef enum {
/** Install XDP program in SKB (generic) mode */
TRACE_OPTION_XDP_SKB_MODE,

/** Force XDP copy mode */
/** Force XDP zero copy mode */
TRACE_OPTION_XDP_ZERO_COPY_MODE,

/** Force XDP zero copy mode */
/** Force XDP copy mode */
TRACE_OPTION_XDP_COPY_MODE,
} trace_option_t;

Expand Down