diff options
| author |   Alexei Starovoitov <ast@kernel.org> | 2018-07-02 18:37:12 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2018-07-02 18:37:12 -0700 |
| commit | 39d393cf209697babc53f8b29e6aecd6acd8509e (patch) | |
| tree | e8ab093eacf899194e27a120f8ede438ca3fece3 /samples/bpf | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md (diff) | |
| parent | xsk: fix potential race in SKB TX completion code (diff) | |
| download | linux-dev-39d393cf209697babc53f8b29e6aecd6acd8509e.tar.xz linux-dev-39d393cf209697babc53f8b29e6aecd6acd8509e.zip | |
Merge branch 'af_xdp-fixes'
Magnus Karlsson says:
====================
This patch set fixes three bugs in the SKB TX path of AF_XDP.
Details in the individual commits.
The structure of the patch set is as follows:
Patch 1: Fix for lost completion message
Patch 2-3: Fix for possible multiple completions of single packet
Patch 4: Fix potential race during error
Changes from v1:
* Added explanation of race in commit message of patch 4.
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'samples/bpf')
| -rw-r--r-- | samples/bpf/xdpsock_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c index d69c8d78d3fd..5904b1543831 100644 --- a/samples/bpf/xdpsock_user.c +++ b/samples/bpf/xdpsock_user.c @@ -729,7 +729,7 @@ static void kick_tx(int fd) int ret; ret = sendto(fd, NULL, 0, MSG_DONTWAIT, NULL, 0); - if (ret >= 0 || errno == ENOBUFS || errno == EAGAIN) + if (ret >= 0 || errno == ENOBUFS || errno == EAGAIN || errno == EBUSY) return; lassert(0); } |