samples/bpf: xdpsock: Add VLAN support for Tx-only operation
In multi-queue environment testing, the support for VLAN-tag based steering is useful. So, this patch adds the capability to add VLAN tag (VLAN ID and Priority) to the generated Tx frame. To set the VLAN ID=10 and Priority=2 for Tx only through TxQ=3: $ xdpsock -i eth0 -t -N -z -q 3 -V -J 10 -K 2 If VLAN ID (-J) and Priority (-K) is set, it default to VLAN ID = 1 VLAN Priority = 0. For example, VLAN-tagged Tx only, xdp copy mode through TxQ=1: $ xdpsock -i eth0 -t -N -c -q 1 -V Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Acked-by: Song Liu <songliubraving@fb.com> Link: https://lore.kernel.org/bpf/20211230035447.523177-2-boon.leong.ong@intel.com
This commit is contained in:
Ong Boon Leong
Alexei Starovoitov
Родитель
5f60826428
Коммит
2741a0493c
|
|
@ -56,6 +56,12 @@
|
|||
|
||||
#define DEBUG_HEXDUMP 0
|
||||
|
||||
#define VLAN_PRIO_MASK 0xe000 /* Priority Code Point */
|
||||
#define VLAN_PRIO_SHIFT 13
|
||||
#define VLAN_VID_MASK 0x0fff /* VLAN Identifier */
|
||||
#define VLAN_VID__DEFAULT 1
|
||||
#define VLAN_PRI__DEFAULT 0
|
||||
|
||||
typedef __u64 u64;
|
||||
typedef __u32 u32;
|
||||
typedef __u16 u16;
|
||||
|
|
@ -81,6 +87,9 @@ static u32 opt_batch_size = 64;
|
|||
static int opt_pkt_count;
|
||||
static u16 opt_pkt_size = MIN_PKT_SIZE;
|
||||
static u32 opt_pkt_fill_pattern = 0x12345678;
|
||||
static bool opt_vlan_tag;
|
||||
static u16 opt_pkt_vlan_id = VLAN_VID__DEFAULT;
|
||||
static u16 opt_pkt_vlan_pri = VLAN_PRI__DEFAULT;
|
||||
static bool opt_extra_stats;
|
||||
static bool opt_quiet;
|
||||
static bool opt_app_stats;
|
||||
|
|
@ -101,6 +110,14 @@ static u32 prog_id;
|
|||
static bool opt_busy_poll;
|
||||
static bool opt_reduced_cap;
|
||||
|
||||
struct vlan_ethhdr {
|
||||
unsigned char h_dest[6];
|
||||
unsigned char h_source[6];
|
||||
__be16 h_vlan_proto;
|
||||
__be16 h_vlan_TCI;
|
||||
__be16 h_vlan_encapsulated_proto;
|
||||
};
|
||||
|
||||
struct xsk_ring_stats {
|
||||
unsigned long rx_npkts;
|
||||
unsigned long tx_npkts;
|
||||
|
|
@ -740,11 +757,13 @@ static inline u16 udp_csum(u32 saddr, u32 daddr, u32 len,
|
|||
|
||||
#define ETH_FCS_SIZE 4
|
||||
|
||||
#define PKT_HDR_SIZE (sizeof(struct ethhdr) + sizeof(struct iphdr) + \
|
||||
#define ETH_HDR_SIZE (opt_vlan_tag ? sizeof(struct vlan_ethhdr) : \
|
||||
sizeof(struct ethhdr))
|
||||
#define PKT_HDR_SIZE (ETH_HDR_SIZE + sizeof(struct iphdr) + \
|
||||
sizeof(struct udphdr))
|
||||
|
||||
#define PKT_SIZE (opt_pkt_size - ETH_FCS_SIZE)
|
||||
#define IP_PKT_SIZE (PKT_SIZE - sizeof(struct ethhdr))
|
||||
#define IP_PKT_SIZE (PKT_SIZE - ETH_HDR_SIZE)
|
||||
#define UDP_PKT_SIZE (IP_PKT_SIZE - sizeof(struct iphdr))
|
||||
#define UDP_PKT_DATA_SIZE (UDP_PKT_SIZE - sizeof(struct udphdr))
|
||||
|
||||
|
|
@ -752,17 +771,42 @@ static u8 pkt_data[XSK_UMEM__DEFAULT_FRAME_SIZE];
|
|||
|
||||
static void gen_eth_hdr_data(void)
|
||||
{
|
||||
struct udphdr *udp_hdr = (struct udphdr *)(pkt_data +
|
||||
sizeof(struct ethhdr) +
|
||||
sizeof(struct iphdr));
|
||||
struct iphdr *ip_hdr = (struct iphdr *)(pkt_data +
|
||||
sizeof(struct ethhdr));
|
||||
struct ethhdr *eth_hdr = (struct ethhdr *)pkt_data;
|
||||
struct udphdr *udp_hdr;
|
||||
struct iphdr *ip_hdr;
|
||||
|
||||
if (opt_vlan_tag) {
|
||||
struct vlan_ethhdr *veth_hdr = (struct vlan_ethhdr *)pkt_data;
|
||||
u16 vlan_tci = 0;
|
||||
|
||||
udp_hdr = (struct udphdr *)(pkt_data +
|
||||
sizeof(struct vlan_ethhdr) +
|
||||
sizeof(struct iphdr));
|
||||
ip_hdr = (struct iphdr *)(pkt_data +
|
||||
sizeof(struct vlan_ethhdr));
|
||||
|
||||
/* ethernet & VLAN header */
|
||||
memcpy(veth_hdr->h_dest, "\x3c\xfd\xfe\x9e\x7f\x71", ETH_ALEN);
|
||||
memcpy(veth_hdr->h_source, "\xec\xb1\xd7\x98\x3a\xc0", ETH_ALEN);
|
||||
veth_hdr->h_vlan_proto = htons(ETH_P_8021Q);
|
||||
vlan_tci = opt_pkt_vlan_id & VLAN_VID_MASK;
|
||||
vlan_tci |= (opt_pkt_vlan_pri << VLAN_PRIO_SHIFT) & VLAN_PRIO_MASK;
|
||||
veth_hdr->h_vlan_TCI = htons(vlan_tci);
|
||||
veth_hdr->h_vlan_encapsulated_proto = htons(ETH_P_IP);
|
||||
} else {
|
||||
struct ethhdr *eth_hdr = (struct ethhdr *)pkt_data;
|
||||
|
||||
udp_hdr = (struct udphdr *)(pkt_data +
|
||||
sizeof(struct ethhdr) +
|
||||
sizeof(struct iphdr));
|
||||
ip_hdr = (struct iphdr *)(pkt_data +
|
||||
sizeof(struct ethhdr));
|
||||
|
||||
/* ethernet header */
|
||||
memcpy(eth_hdr->h_dest, "\x3c\xfd\xfe\x9e\x7f\x71", ETH_ALEN);
|
||||
memcpy(eth_hdr->h_source, "\xec\xb1\xd7\x98\x3a\xc0", ETH_ALEN);
|
||||
eth_hdr->h_proto = htons(ETH_P_IP);
|
||||
}
|
||||
|
||||
/* ethernet header */
|
||||
memcpy(eth_hdr->h_dest, "\x3c\xfd\xfe\x9e\x7f\x71", ETH_ALEN);
|
||||
memcpy(eth_hdr->h_source, "\xec\xb1\xd7\x98\x3a\xc0", ETH_ALEN);
|
||||
eth_hdr->h_proto = htons(ETH_P_IP);
|
||||
|
||||
/* IP header */
|
||||
ip_hdr->version = IPVERSION;
|
||||
|
|
@ -920,6 +964,9 @@ static struct option long_options[] = {
|
|||
{"tx-pkt-count", required_argument, 0, 'C'},
|
||||
{"tx-pkt-size", required_argument, 0, 's'},
|
||||
{"tx-pkt-pattern", required_argument, 0, 'P'},
|
||||
{"tx-vlan", no_argument, 0, 'V'},
|
||||
{"tx-vlan-id", required_argument, 0, 'J'},
|
||||
{"tx-vlan-pri", required_argument, 0, 'K'},
|
||||
{"extra-stats", no_argument, 0, 'x'},
|
||||
{"quiet", no_argument, 0, 'Q'},
|
||||
{"app-stats", no_argument, 0, 'a'},
|
||||
|
|
@ -960,6 +1007,9 @@ static void usage(const char *prog)
|
|||
" (Default: %d bytes)\n"
|
||||
" Min size: %d, Max size %d.\n"
|
||||
" -P, --tx-pkt-pattern=nPacket fill pattern. Default: 0x%x\n"
|
||||
" -V, --tx-vlan Send VLAN tagged packets (For -t|--txonly)\n"
|
||||
" -J, --tx-vlan-id=n Tx VLAN ID [1-4095]. Default: %d (For -V|--tx-vlan)\n"
|
||||
" -K, --tx-vlan-pri=n Tx VLAN Priority [0-7]. Default: %d (For -V|--tx-vlan)\n"
|
||||
" -x, --extra-stats Display extra statistics.\n"
|
||||
" -Q, --quiet Do not display any stats.\n"
|
||||
" -a, --app-stats Display application (syscall) statistics.\n"
|
||||
|
|
@ -969,7 +1019,8 @@ static void usage(const char *prog)
|
|||
"\n";
|
||||
fprintf(stderr, str, prog, XSK_UMEM__DEFAULT_FRAME_SIZE,
|
||||
opt_batch_size, MIN_PKT_SIZE, MIN_PKT_SIZE,
|
||||
XSK_UMEM__DEFAULT_FRAME_SIZE, opt_pkt_fill_pattern);
|
||||
XSK_UMEM__DEFAULT_FRAME_SIZE, opt_pkt_fill_pattern,
|
||||
VLAN_VID__DEFAULT, VLAN_PRI__DEFAULT);
|
||||
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
|
@ -981,7 +1032,7 @@ static void parse_command_line(int argc, char **argv)
|
|||
opterr = 0;
|
||||
|
||||
for (;;) {
|
||||
c = getopt_long(argc, argv, "Frtli:q:pSNn:czf:muMd:b:C:s:P:xQaI:BR",
|
||||
c = getopt_long(argc, argv, "Frtli:q:pSNn:czf:muMd:b:C:s:P:VJ:K:xQaI:BR",
|
||||
long_options, &option_index);
|
||||
if (c == -1)
|
||||
break;
|
||||
|
|
@ -1062,6 +1113,15 @@ static void parse_command_line(int argc, char **argv)
|
|||
case 'P':
|
||||
opt_pkt_fill_pattern = strtol(optarg, NULL, 16);
|
||||
break;
|
||||
case 'V':
|
||||
opt_vlan_tag = true;
|
||||
break;
|
||||
case 'J':
|
||||
opt_pkt_vlan_id = atoi(optarg);
|
||||
break;
|
||||
case 'K':
|
||||
opt_pkt_vlan_pri = atoi(optarg);
|
||||
break;
|
||||
case 'x':
|
||||
opt_extra_stats = 1;
|
||||
break;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче