Skip to content

Commit

Permalink
Fix indent/format of ANO queue/flow
Browse files Browse the repository at this point in the history
- queues is not a list item, but a field under rx or tx, remove the (-)
- flows belongs under rx or tx, not under queues
  • Loading branch information
agirault committed Sep 28, 2024
1 parent e3daeb7 commit f52aaa5
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 98 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ advanced_network:
version: 1
manager: "dpdk"
master_core: 3
debug: false
debug: false

memory_regions:
- name: "Data_RX_CPU"
Expand All @@ -53,36 +53,36 @@ advanced_network:
access:
- local
num_bufs: 30720
buf_size: 1064
interfaces:
buf_size: 1064

interfaces:
- name: data2
address: 0005:03:00.0
rx:
- queues:
- name: "Default"
id: 0
cpu_core: 7
batch_size: 10240
output_port: "bench_rx_out"
memory_regions:
- "Default_RX_CPU"
- name: "Data"
queues:
- name: "Default"
id: 0
cpu_core: 7
batch_size: 10240
output_port: "bench_rx_out"
memory_regions:
- "Default_RX_CPU"
- name: "Data"
id: 1
cpu_core: 8
batch_size: 10240
output_port: "bench_rx_out"
memory_regions:
- "Data_RX_CPU"
- "Data_RX_GPU"
flows:
- name: "ADC Samples"
action:
type: queue
id: 1
cpu_core: 8
batch_size: 10240
output_port: "bench_rx_out"
memory_regions:
- "Data_RX_CPU"
- "Data_RX_GPU"
flows:
- name: "ADC Samples"
action:
type: queue
id: 1
match:
udp_src: 4096 #12288
udp_dst: 4096 #12288
match:
udp_src: 4096 #12288
udp_dst: 4096 #12288
bench_rx:
split_boundary: true
gpu_direct: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ advanced_network:
- name: data1
address: 0005:03:00.0
tx:
- queues:
- name: "ADC Samples"
id: 0
batch_size: 10240
cpu_core: 4
memory_regions:
- "Data_TX_CPU"
offloads:
- "tx_eth_src"
queues:
- name: "ADC Samples"
id: 0
batch_size: 10240
cpu_core: 4
memory_regions:
- "Data_TX_CPU"
offloads:
- "tx_eth_src"


bench_tx:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,41 +59,41 @@ advanced_network:
- name: data1
address: 0000:ca:00.0
tx:
- queues:
- name: "ADC Samples"
id: 0
batch_size: 10240
cpu_core: 11
memory_regions:
- "Data_TX_GPU"
offloads:
- "tx_eth_src"
queues:
- name: "ADC Samples"
id: 0
batch_size: 10240
cpu_core: 11
memory_regions:
- "Data_TX_GPU"
offloads:
- "tx_eth_src"
# - name: data2
# address: 0005:03:00.1
# rx:
# - queues:
# - name: "Default"
# id: 0
# cpu_core: 10
# batch_size: 10240
# output_port: "bench_rx_out"
# memory_regions:
# - "Default_RX_GPU"
# - name: "Data"
# queues:
# - name: "Default"
# id: 0
# cpu_core: 10
# batch_size: 10240
# output_port: "bench_rx_out"
# memory_regions:
# - "Default_RX_GPU"
# - name: "Data"
# id: 1
# cpu_core: 9
# batch_size: 10240
# output_port: "bench_rx_out"
# memory_regions:
# - "Data_RX_GPU"
# flows:
# - name: "ADC Samples"
# action:
# type: queue
# id: 1
# cpu_core: 9
# batch_size: 10240
# output_port: "bench_rx_out"
# memory_regions:
# - "Data_RX_GPU"
# flows:
# - name: "ADC Samples"
# action:
# type: queue
# id: 1
# match:
# udp_src: 4096 #12288
# udp_dst: 4096 #12288
# match:
# udp_src: 4096 #12288
# udp_dst: 4096 #12288

bench_rx:
split_boundary: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,39 +57,39 @@ advanced_network:
- name: data1
address: 0000:ca:00.0
tx:
- queues:
- name: "ADC Samples"
id: 0
batch_size: 10240
cpu_core: 8
memory_regions:
- "Data_TX_GPU"
offloads:
- "tx_eth_src"
queues:
- name: "ADC Samples"
id: 0
batch_size: 10240
cpu_core: 8
memory_regions:
- "Data_TX_GPU"
offloads:
- "tx_eth_src"
rx:
- queues:
- name: "Default"
id: 0
cpu_core: 10
batch_size: 10240
output_port: "bench_rx_out"
memory_regions:
- "Default_RX_GPU"
- name: "Data"
queues:
- name: "Default"
id: 0
cpu_core: 10
batch_size: 10240
output_port: "bench_rx_out"
memory_regions:
- "Default_RX_GPU"
- name: "Data"
id: 1
cpu_core: 10
batch_size: 10240
output_port: "bench_rx_out"
memory_regions:
- "Data_RX_GPU"
flows:
- name: "ADC Samples"
action:
type: queue
id: 1
cpu_core: 10
batch_size: 10240
output_port: "bench_rx_out"
memory_regions:
- "Data_RX_GPU"
flows:
- name: "ADC Samples"
action:
type: queue
id: 1
match:
udp_src: 4096 #12288
udp_dst: 4096 #12288
match:
udp_src: 4096 #12288
udp_dst: 4096 #12288

bench_tx:
eth_dst_addr: 48:b0:2d:e8:cb:17 # Destination MAC
Expand Down

0 comments on commit f52aaa5

Please sign in to comment.