d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

app/testpmd: use consistent vdev names

Browse Source 
The vdev eth_bond has been renamed to net_bond.
testpmd is creating a bonding device with the old prefix.
It is changed for consistency.

The script test-null.sh was failing because using the old name
for the null vdev.

Fixes also the bonding and testpmd doc.

Fixes: 2f45703c17ac ("drivers: make driver names consistent")

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
This commit is contained in:
Thomas Monjalon 2016-10-06 12:34:23 +02:00
parent 5fc07e3eb7
commit 58c82067f1
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/test-pmd/cmdline.c
View File

@ -4507,7 +4507,7 @@ static void cmd_create_bonded_device_parsed(void *parsed_result,
return;
}
snprintf(ethdev_name, RTE_ETH_NAME_MAX_LEN, "eth_bond_testpmd_%d",
snprintf(ethdev_name, RTE_ETH_NAME_MAX_LEN, "net_bond_testpmd_%d",
bond_dev_num++);
/* Create a new bonded device. */

4
doc/guides/contributing/documentation.rst
View File

@ -458,8 +458,8 @@ Code and Literal block sections
For long literal lines that exceed that limit try to wrap the text at sensible locations.
For example a long command line could be documented like this and still work if copied directly from the docs::
build/app/testpmd -c7 -n3 --vdev=eth_pcap0,iface=eth0 \
--vdev=eth_pcap1,iface=eth1 \
build/app/testpmd -c7 -n3 --vdev=net_pcap0,iface=eth0 \
--vdev=net_pcap1,iface=eth1 \
-- -i --nb-cores=2 --nb-ports=2 \
--total-num-mbufs=2048

2
doc/guides/howto/lm_bond_virtio_sriov.rst
View File

@ -142,7 +142,7 @@ Bonding is port 2 (P2).
.. code-block:: console
testpmd> create bonded device 1 0
Created new bonded device eth_bond_testpmd_0 on (port 2).
Created new bonded device net_bond_testpmd_0 on (port 2).
testpmd> add bonding slave 0 2
testpmd> add bonding slave 1 2
testpmd> show bonding config 2

14
doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
View File

@ -356,7 +356,7 @@ Using Link Bonding Devices from the EAL Command Line
Link bonding devices can be created at application startup time using the
``--vdev`` EAL command line option. The device name must start with the
eth_bond prefix followed by numbers or letters. The name must be unique for
net_bond prefix followed by numbers or letters. The name must be unique for
each device. Each device can have multiple options arranged in a comma
separated list. Multiple devices definitions can be arranged by calling the
``--vdev`` option multiple times.
@ -365,7 +365,7 @@ Device names and bonding options must be separated by commas as shown below:
.. code-block:: console
$RTE_TARGET/app/testpmd -c f -n 4 --vdev 'eth_bond0,bond_opt0=..,bond opt1=..'--vdev 'eth_bond1,bond _opt0=..,bond_opt1=..'
$RTE_TARGET/app/testpmd -c f -n 4 --vdev 'net_bond0,bond_opt0=..,bond opt1=..'--vdev 'net_bond1,bond _opt0=..,bond_opt1=..'
Link Bonding EAL Options
^^^^^^^^^^^^^^^^^^^^^^^^
@ -373,7 +373,7 @@ Link Bonding EAL Options
There are multiple ways of definitions that can be assessed and combined as
long as the following two rules are respected:
* A unique device name, in the format of eth_bondX is provided,
* A unique device name, in the format of net_bondX is provided,
where X can be any combination of numbers and/or letters,
and the name is no greater than 32 characters long.
@ -465,22 +465,22 @@ Create a bonded device in round robin mode with two slaves specified by their PC
.. code-block:: console
$RTE_TARGET/app/testpmd -c '0xf' -n 4 --vdev 'eth_bond0,mode=0, slave=0000:00a:00.01,slave=0000:004:00.00' -- --port-topology=chained
$RTE_TARGET/app/testpmd -c '0xf' -n 4 --vdev 'net_bond0,mode=0, slave=0000:00a:00.01,slave=0000:004:00.00' -- --port-topology=chained
Create a bonded device in round robin mode with two slaves specified by their PCI address and an overriding MAC address:
.. code-block:: console
$RTE_TARGET/app/testpmd -c '0xf' -n 4 --vdev 'eth_bond0,mode=0, slave=0000:00a:00.01,slave=0000:004:00.00,mac=00:1e:67:1d:fd:1d' -- --port-topology=chained
$RTE_TARGET/app/testpmd -c '0xf' -n 4 --vdev 'net_bond0,mode=0, slave=0000:00a:00.01,slave=0000:004:00.00,mac=00:1e:67:1d:fd:1d' -- --port-topology=chained
Create a bonded device in active backup mode with two slaves specified, and a primary slave specified by their PCI addresses:
.. code-block:: console
$RTE_TARGET/app/testpmd -c '0xf' -n 4 --vdev 'eth_bond0,mode=1, slave=0000:00a:00.01,slave=0000:004:00.00,primary=0000:00a:00.01' -- --port-topology=chained
$RTE_TARGET/app/testpmd -c '0xf' -n 4 --vdev 'net_bond0,mode=1, slave=0000:00a:00.01,slave=0000:004:00.00,primary=0000:00a:00.01' -- --port-topology=chained
Create a bonded device in balance mode with two slaves specified by their PCI addresses, and a transmission policy of layer 3 + 4 forwarding:
.. code-block:: console
$RTE_TARGET/app/testpmd -c '0xf' -n 4 --vdev 'eth_bond0,mode=2, slave=0000:00a:00.01,slave=0000:004:00.00,xmit_policy=l34' -- --port-topology=chained
$RTE_TARGET/app/testpmd -c '0xf' -n 4 --vdev 'net_bond0,mode=2, slave=0000:00a:00.01,slave=0000:004:00.00,xmit_policy=l34' -- --port-topology=chained

2
doc/guides/testpmd_app_ug/run_app.rst
View File

@ -130,7 +130,7 @@ See the DPDK Getting Started Guides for more information on these options.
For example::
--vdev 'eth_pcap0,rx_pcap=input.pcap,tx_pcap=output.pcap'
--vdev 'net_pcap0,rx_pcap=input.pcap,tx_pcap=output.pcap'
* ``--base-virtaddr``

14
doc/guides/testpmd_app_ug/testpmd_funcs.rst
View File

@ -1041,14 +1041,14 @@ For example, to attach a port created by pcap PMD.
.. code-block:: console
testpmd> port attach eth_pcap0
testpmd> port attach net_pcap0
Attaching a new port...
PMD: Initializing pmd_pcap for eth_pcap0
PMD: Initializing pmd_pcap for net_pcap0
PMD: Creating pcap-backed ethdev on numa socket 0
Port 0 is attached. Now total ports is 1
Done
In this case, identifier is ``eth_pcap0``.
In this case, identifier is ``net_pcap0``.
This identifier format is the same as ``--vdev`` format of DPDK applications.
For example, to re-attach a bonded port which has been previously detached,
@ -1056,10 +1056,10 @@ the mode and slave parameters must be given.
.. code-block:: console
testpmd> port attach eth_bond_0,mode=0,slave=1
testpmd> port attach net_bond_0,mode=0,slave=1
Attaching a new port...
EAL: Initializing pmd_bond for eth_bond_0
EAL: Create bonded device eth_bond_0 on port 0 in mode 0 on socket 0.
EAL: Initializing pmd_bond for net_bond_0
EAL: Create bonded device net_bond_0 on port 0 in mode 0 on socket 0.
Port 0 is attached. Now total ports is 1
Done
@ -1107,7 +1107,7 @@ For example, to detach a virtual device port 0.
testpmd> port detach 0
Detaching a port...
PMD: Closing pcap ethdev on numa socket 0
Port 'eth_pcap0' is detached. Now total ports is 0
Port 'net_pcap0' is detached. Now total ports is 0
Done
To remove a pci device completely from the system, first detach the port from testpmd.

2
scripts/test-null.sh
View File

@ -41,5 +41,5 @@ fi
(sleep 1 && echo stop) |
$build/app/testpmd -c $coremask -n 1 --no-huge \
$pmd --vdev eth_null1 --vdev eth_null2 -- \
$pmd --vdev net_null1 --vdev net_null2 -- \
--total-num-mbufs=2048 -ia