52dbd67dff
[Changes from V1: - Avoid conflict by rebasing with latest master.] Some BPF tests use loop unrolling compiler pragmas that are clang specific and not supported by GCC. These pragmas, along with their GCC equivalences are: #pragma clang loop unroll_count(N) #pragma GCC unroll N #pragma clang loop unroll(full) #pragma GCC unroll 65534 #pragma clang loop unroll(disable) #pragma GCC unroll 1 #pragma unroll [aka #pragma clang loop unroll(enable)] There is no GCC equivalence to this pragma. It enables unrolling on loops that the compiler would not ordinarily unroll even with -O2|-funroll-loops, but it is not equivalent to full unrolling either. This patch adds a new header progs/bpf_compiler.h that defines the following macros, which correspond to each pair of compiler-specific pragmas above: __pragma_loop_unroll_count(N) __pragma_loop_unroll_full __pragma_loop_no_unroll __pragma_loop_unroll The selftests using loop unrolling pragmas are then changed to include the header and use these macros in place of the explicit pragmas. Tested in bpf-next master. No regressions. Signed-off-by: Jose E. Marchesi <jose.marchesi@oracle.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Acked-by: Yonghong Song <yonghong.song@linux.dev> Link: https://lore.kernel.org/bpf/20240208203612.29611-1-jose.marchesi@oracle.com
37 lines
618 B
C
37 lines
618 B
C
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
#include <linux/bpf.h>
|
|
#include <bpf/bpf_helpers.h>
|
|
|
|
#include "bpf_compiler.h"
|
|
|
|
char _license[] SEC("license") = "GPL";
|
|
|
|
SEC("tc")
|
|
int process(struct __sk_buff *skb)
|
|
{
|
|
__pragma_loop_unroll_full
|
|
for (int i = 0; i < 5; i++) {
|
|
if (skb->cb[i] != i + 1)
|
|
return 1;
|
|
skb->cb[i]++;
|
|
}
|
|
skb->priority++;
|
|
skb->tstamp++;
|
|
skb->mark++;
|
|
|
|
if (skb->wire_len != 100)
|
|
return 1;
|
|
if (skb->gso_segs != 8)
|
|
return 1;
|
|
if (skb->gso_size != 10)
|
|
return 1;
|
|
if (skb->ingress_ifindex != 11)
|
|
return 1;
|
|
if (skb->ifindex != 1)
|
|
return 1;
|
|
if (skb->hwtstamp != 11)
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|