mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "bpf, test_run: fix &xdp_frame misplacement for LIVE_FRAMES" 

commit 181127fb76 upstream.

This reverts commit 6c20822fad.

build bot failed on arch with different cache line size:
https://lore.kernel.org/bpf/50c35055-afa9-d01e-9a05-ea5351280e4f@intel.com/

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Martin KaFai Lau 2023-02-17 12:13:09 -08:00 committed by Greg Kroah-Hartman
parent c20fb060ce
commit 53c250a148
2 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
net/bpf/test_run.c
View File

@ -97,11 +97,8 @@ reset:
struct xdp_page_head { struct xdp_page_head {
struct xdp_buff orig_ctx; struct xdp_buff orig_ctx;
struct xdp_buff ctx; struct xdp_buff ctx;
union { struct xdp_frame frm;
/* ::data_hard_start starts here */ u8 data[];
DECLARE_FLEX_ARRAY(struct xdp_frame, frame);
DECLARE_FLEX_ARRAY(u8, data);
};
}; };
struct xdp_test_data { struct xdp_test_data {
@ -119,20 +116,6 @@ struct xdp_test_data {
#define TEST_XDP_FRAME_SIZE (PAGE_SIZE - sizeof(struct xdp_page_head)) #define TEST_XDP_FRAME_SIZE (PAGE_SIZE - sizeof(struct xdp_page_head))
#define TEST_XDP_MAX_BATCH 256 #define TEST_XDP_MAX_BATCH 256
#if BITS_PER_LONG == 64 && PAGE_SIZE == SZ_4K
/* tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c:%MAX_PKT_SIZE
* must be updated accordingly when any of these changes, otherwise BPF
* selftests will fail.
*/
#ifdef __s390x__
#define TEST_MAX_PKT_SIZE 3216
#else
#define TEST_MAX_PKT_SIZE 3408
#endif
static_assert(SKB_WITH_OVERHEAD(TEST_XDP_FRAME_SIZE - XDP_PACKET_HEADROOM) ==
TEST_MAX_PKT_SIZE);
#endif
static void xdp_test_run_init_page(struct page *page, void *arg) static void xdp_test_run_init_page(struct page *page, void *arg)
{ {
struct xdp_page_head *head = phys_to_virt(page_to_phys(page)); struct xdp_page_head *head = phys_to_virt(page_to_phys(page));
@ -149,8 +132,8 @@ static void xdp_test_run_init_page(struct page *page, void *arg)
headroom -= meta_len; headroom -= meta_len;
new_ctx = &head->ctx; new_ctx = &head->ctx;
frm = head->frame; frm = &head->frm;
data = head->data; data = &head->data;
memcpy(data + headroom, orig_ctx->data_meta, frm_len); memcpy(data + headroom, orig_ctx->data_meta, frm_len);
xdp_init_buff(new_ctx, TEST_XDP_FRAME_SIZE, &xdp->rxq); xdp_init_buff(new_ctx, TEST_XDP_FRAME_SIZE, &xdp->rxq);
@ -240,7 +223,7 @@ static void reset_ctx(struct xdp_page_head *head)
head->ctx.data = head->orig_ctx.data; head->ctx.data = head->orig_ctx.data;
head->ctx.data_meta = head->orig_ctx.data_meta; head->ctx.data_meta = head->orig_ctx.data_meta;
head->ctx.data_end = head->orig_ctx.data_end; head->ctx.data_end = head->orig_ctx.data_end;
xdp_update_frame_from_buff(&head->ctx, head->frame); xdp_update_frame_from_buff(&head->ctx, &head->frm);
} }
static int xdp_recv_frames(struct xdp_frame **frames, int nframes, static int xdp_recv_frames(struct xdp_frame **frames, int nframes,
@ -302,7 +285,7 @@ static int xdp_test_run_batch(struct xdp_test_data *xdp, struct bpf_prog *prog,
head = phys_to_virt(page_to_phys(page)); head = phys_to_virt(page_to_phys(page));
reset_ctx(head); reset_ctx(head);
ctx = &head->ctx; ctx = &head->ctx;
frm = head->frame; frm = &head->frm;
xdp->frame_cnt++; xdp->frame_cnt++;
act = bpf_prog_run_xdp(prog, ctx); act = bpf_prog_run_xdp(prog, ctx);

7
tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c
View File

@ -63,13 +63,12 @@ static int attach_tc_prog(struct bpf_tc_hook *hook, int fd)
} }
/* The maximum permissible size is: PAGE_SIZE - sizeof(struct xdp_page_head) - /* The maximum permissible size is: PAGE_SIZE - sizeof(struct xdp_page_head) -
* SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) - XDP_PACKET_HEADROOM = * sizeof(struct skb_shared_info) - XDP_PACKET_HEADROOM = 3368 bytes
* 3408 bytes for 64-byte cacheline and 3216 for 256-byte one.
*/ */
#if defined(__s390x__) #if defined(__s390x__)
#define MAX_PKT_SIZE 3216 #define MAX_PKT_SIZE 3176
#else #else
#define MAX_PKT_SIZE 3408 #define MAX_PKT_SIZE 3368
#endif #endif
static void test_max_pkt_size(int fd) static void test_max_pkt_size(int fd)
{ {