leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'docs-Fix-failover-build-warnings'

Browse Source 
Tobin C. Harding says:

====================
docs: Fix failover build warnings

This is my first patch set to net-next.  Please shout loud and clear if
I've botched anything.

Recently failover and net_failover modules were added to the mainline.
Documentation was included in rst format but they were not added to the
toctree in `networking/index.rst`.  Also building docs for net_failover
is currently emitting a few warnings.

Patch 1 adds failover and net_failover to the index toctree
Patch 2 fixes the build warnings for net_failover

I haven't been super active on netdev list so if there is some reason I
missed why these files are not in the index please do say so.

Has there been any discussion on preferred order for the toctree index
list?  I just added them to the bottom of the list.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2018-07-16 11:23:54 -07:00
commit 568a74d491
2 changed files with 57 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/networking/index.rst
View File

@ -15,6 +15,8 @@ Contents:
kapi kapi
z8530book z8530book
msg_zerocopy msg_zerocopy
failover
net_failover
.. only:: subproject .. only:: subproject

107
Documentation/networking/net_failover.rst
View File

@ -36,37 +36,39 @@ feature on the virtio-net interface and assign the same MAC address to both
virtio-net and VF interfaces. virtio-net and VF interfaces.
Here is an example XML snippet that shows such configuration. Here is an example XML snippet that shows such configuration.
::
<interface type='network'> <interface type='network'>
<mac address='52:54:00:00:12:53'/> <mac address='52:54:00:00:12:53'/>
<source network='enp66s0f0_br'/> <source network='enp66s0f0_br'/>
<target dev='tap01'/> <target dev='tap01'/>
<model type='virtio'/> <model type='virtio'/>
<driver name='vhost' queues='4'/> <driver name='vhost' queues='4'/>
<link state='down'/> <link state='down'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
</interface> </interface>
<interface type='hostdev' managed='yes'> <interface type='hostdev' managed='yes'>
<mac address='52:54:00:00:12:53'/> <mac address='52:54:00:00:12:53'/>
<source> <source>
<address type='pci' domain='0x0000' bus='0x42' slot='0x02' function='0x5'/> <address type='pci' domain='0x0000' bus='0x42' slot='0x02' function='0x5'/>
</source> </source>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/>
</interface> </interface>
Booting a VM with the above configuration will result in the following 3 Booting a VM with the above configuration will result in the following 3
netdevs created in the VM. netdevs created in the VM.
::
4: ens10: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP group default qlen 1000 4: ens10: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP group default qlen 1000
link/ether 52:54:00:00:12:53 brd ff:ff:ff:ff:ff:ff link/ether 52:54:00:00:12:53 brd ff:ff:ff:ff:ff:ff
inet 192.168.12.53/24 brd 192.168.12.255 scope global dynamic ens10 inet 192.168.12.53/24 brd 192.168.12.255 scope global dynamic ens10
valid_lft 42482sec preferred_lft 42482sec valid_lft 42482sec preferred_lft 42482sec
inet6 fe80::97d8:db2:8c10:b6d6/64 scope link inet6 fe80::97d8:db2:8c10:b6d6/64 scope link
valid_lft forever preferred_lft forever valid_lft forever preferred_lft forever
5: ens10nsby: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc fq_codel master ens10 state UP group default qlen 1000 5: ens10nsby: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc fq_codel master ens10 state UP group default qlen 1000
link/ether 52:54:00:00:12:53 brd ff:ff:ff:ff:ff:ff link/ether 52:54:00:00:12:53 brd ff:ff:ff:ff:ff:ff
7: ens11: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq master ens10 state UP group default qlen 1000 7: ens11: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq master ens10 state UP group default qlen 1000
link/ether 52:54:00:00:12:53 brd ff:ff:ff:ff:ff:ff link/ether 52:54:00:00:12:53 brd ff:ff:ff:ff:ff:ff
ens10 is the 'failover' master netdev, ens10nsby and ens11 are the slave ens10 is the 'failover' master netdev, ens10nsby and ens11 are the slave
'standby' and 'primary' netdevs respectively. 'standby' and 'primary' netdevs respectively.
@ -80,37 +82,38 @@ the paravirtual datapath when the VF is unplugged.
Here is a sample script that shows the steps to initiate live migration on Here is a sample script that shows the steps to initiate live migration on
the source hypervisor. the source hypervisor.
::
# cat vf_xml # cat vf_xml
<interface type='hostdev' managed='yes'> <interface type='hostdev' managed='yes'>
<mac address='52:54:00:00:12:53'/> <mac address='52:54:00:00:12:53'/>
<source> <source>
<address type='pci' domain='0x0000' bus='0x42' slot='0x02' function='0x5'/> <address type='pci' domain='0x0000' bus='0x42' slot='0x02' function='0x5'/>
</source> </source>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/>
</interface> </interface>
# Source Hypervisor # Source Hypervisor
#!/bin/bash #!/bin/bash
DOMAIN=fedora27-tap01 DOMAIN=fedora27-tap01
PF=enp66s0f0 PF=enp66s0f0
VF_NUM=5 VF_NUM=5
TAP_IF=tap01 TAP_IF=tap01
VF_XML= VF_XML=
MAC=52:54:00:00:12:53 MAC=52:54:00:00:12:53
ZERO_MAC=00:00:00:00:00:00 ZERO_MAC=00:00:00:00:00:00
virsh domif-setlink $DOMAIN $TAP_IF up virsh domif-setlink $DOMAIN $TAP_IF up
bridge fdb del $MAC dev $PF master bridge fdb del $MAC dev $PF master
virsh detach-device $DOMAIN $VF_XML virsh detach-device $DOMAIN $VF_XML
ip link set $PF vf $VF_NUM mac $ZERO_MAC ip link set $PF vf $VF_NUM mac $ZERO_MAC
virsh migrate --live $DOMAIN qemu+ssh://$REMOTE_HOST/system virsh migrate --live $DOMAIN qemu+ssh://$REMOTE_HOST/system
# Destination Hypervisor # Destination Hypervisor
#!/bin/bash #!/bin/bash
virsh attach-device $DOMAIN $VF_XML virsh attach-device $DOMAIN $VF_XML
virsh domif-setlink $DOMAIN $TAP_IF down virsh domif-setlink $DOMAIN $TAP_IF down