* [PATCH net-next 0/2] docs: Fix failover build warnings
@ 2018-07-11 21:42 Tobin C. Harding
2018-07-11 21:42 ` [PATCH net-next 1/2] docs: networking: Add failover docs to index Tobin C. Harding
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Tobin C. Harding @ 2018-07-11 21:42 UTC (permalink / raw)
To: David S. Miller
Cc: Tobin C. Harding, Sridhar Samudrala, linux-doc, netdev, linux-kernel
Hi Dave,
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.
thanks,
Tobin.
Tobin C. Harding (2):
docs: networking: Add failover docs to index
docs: networking: Fix failover build warnings
Documentation/networking/index.rst | 2 +
Documentation/networking/net_failover.rst | 111 +++++++++++-----------
2 files changed, 59 insertions(+), 54 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net-next 1/2] docs: networking: Add failover docs to index
2018-07-11 21:42 [PATCH net-next 0/2] docs: Fix failover build warnings Tobin C. Harding
@ 2018-07-11 21:42 ` Tobin C. Harding
2018-07-11 21:42 ` [PATCH net-next 2/2] docs: networking: Fix failover build warnings Tobin C. Harding
2018-07-16 18:28 ` [PATCH net-next 0/2] docs: " David Miller
2 siblings, 0 replies; 5+ messages in thread
From: Tobin C. Harding @ 2018-07-11 21:42 UTC (permalink / raw)
To: David S. Miller
Cc: Tobin C. Harding, Sridhar Samudrala, linux-doc, netdev, linux-kernel
Currently we have rst format docs for the failover and net_failover
modules however these docs are not linked to within the index.
Add `failover` and `net_failover` to the networking documentation index.
Signed-off-by: Tobin C. Harding <me@tobin.cc>
---
Documentation/networking/index.rst | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/networking/index.rst b/Documentation/networking/index.rst
index fec8588a588e..6123a7e9e1da 100644
--- a/Documentation/networking/index.rst
+++ b/Documentation/networking/index.rst
@@ -15,6 +15,8 @@ Contents:
kapi
z8530book
msg_zerocopy
+ failover
+ net_failover
.. only:: subproject
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net-next 2/2] docs: networking: Fix failover build warnings
2018-07-11 21:42 [PATCH net-next 0/2] docs: Fix failover build warnings Tobin C. Harding
2018-07-11 21:42 ` [PATCH net-next 1/2] docs: networking: Add failover docs to index Tobin C. Harding
@ 2018-07-11 21:42 ` Tobin C. Harding
2018-07-13 9:04 ` FYI: " Markus Heiser
2018-07-16 18:28 ` [PATCH net-next 0/2] docs: " David Miller
2 siblings, 1 reply; 5+ messages in thread
From: Tobin C. Harding @ 2018-07-11 21:42 UTC (permalink / raw)
To: David S. Miller
Cc: Tobin C. Harding, Sridhar Samudrala, linux-doc, netdev,
linux-kernel, Jonathan Corbet
Currently building the net_failover docs causes a bunch of warnings to
be emitted. These warnings are all related to indentation and correctly
highlight missing '::' (for code sections). It looks, from other rst
files in Documentation, that the first column should be indented 2
spaces.
Add '::' before code snippets and indent all snippets uniformly starting
with 2 spaces.
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Tobin C. Harding <me@tobin.cc>
---
Cc'd Jon incase he wants to suggest a preferred level of indentation.
thanks,
Tobin.
Documentation/networking/net_failover.rst | 111 +++++++++++-----------
1 file changed, 57 insertions(+), 54 deletions(-)
diff --git a/Documentation/networking/net_failover.rst b/Documentation/networking/net_failover.rst
index 70ca2f5800c4..06c97dcb57ca 100644
--- a/Documentation/networking/net_failover.rst
+++ b/Documentation/networking/net_failover.rst
@@ -36,37 +36,39 @@ feature on the virtio-net interface and assign the same MAC address to both
virtio-net and VF interfaces.
Here is an example XML snippet that shows such configuration.
-
- <interface type='network'>
- <mac address='52:54:00:00:12:53'/>
- <source network='enp66s0f0_br'/>
- <target dev='tap01'/>
- <model type='virtio'/>
- <driver name='vhost' queues='4'/>
- <link state='down'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
- </interface>
- <interface type='hostdev' managed='yes'>
- <mac address='52:54:00:00:12:53'/>
- <source>
- <address type='pci' domain='0x0000' bus='0x42' slot='0x02' function='0x5'/>
- </source>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/>
- </interface>
+::
+
+ <interface type='network'>
+ <mac address='52:54:00:00:12:53'/>
+ <source network='enp66s0f0_br'/>
+ <target dev='tap01'/>
+ <model type='virtio'/>
+ <driver name='vhost' queues='4'/>
+ <link state='down'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
+ </interface>
+ <interface type='hostdev' managed='yes'>
+ <mac address='52:54:00:00:12:53'/>
+ <source>
+ <address type='pci' domain='0x0000' bus='0x42' slot='0x02' function='0x5'/>
+ </source>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/>
+ </interface>
Booting a VM with the above configuration will result in the following 3
netdevs created in the VM.
-
-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
- inet 192.168.12.53/24 brd 192.168.12.255 scope global dynamic ens10
- valid_lft 42482sec preferred_lft 42482sec
- inet6 fe80::97d8:db2:8c10:b6d6/64 scope link
- 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
- 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
- link/ether 52:54:00:00:12:53 brd ff:ff:ff:ff:ff:ff
+::
+
+ 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
+ inet 192.168.12.53/24 brd 192.168.12.255 scope global dynamic ens10
+ valid_lft 42482sec preferred_lft 42482sec
+ inet6 fe80::97d8:db2:8c10:b6d6/64 scope link
+ 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
+ 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
+ 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
'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
the source hypervisor.
+::
-# cat vf_xml
-<interface type='hostdev' managed='yes'>
- <mac address='52:54:00:00:12:53'/>
- <source>
- <address type='pci' domain='0x0000' bus='0x42' slot='0x02' function='0x5'/>
- </source>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/>
-</interface>
+ # cat vf_xml
+ <interface type='hostdev' managed='yes'>
+ <mac address='52:54:00:00:12:53'/>
+ <source>
+ <address type='pci' domain='0x0000' bus='0x42' slot='0x02' function='0x5'/>
+ </source>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/>
+ </interface>
-# Source Hypervisor
-#!/bin/bash
+ # Source Hypervisor
+ #!/bin/bash
-DOMAIN=fedora27-tap01
-PF=enp66s0f0
-VF_NUM=5
-TAP_IF=tap01
-VF_XML=
+ DOMAIN=fedora27-tap01
+ PF=enp66s0f0
+ VF_NUM=5
+ TAP_IF=tap01
+ VF_XML=
-MAC=52:54:00:00:12:53
-ZERO_MAC=00:00:00:00:00:00
+ MAC=52:54:00:00:12:53
+ ZERO_MAC=00:00:00:00:00:00
-virsh domif-setlink $DOMAIN $TAP_IF up
-bridge fdb del $MAC dev $PF master
-virsh detach-device $DOMAIN $VF_XML
-ip link set $PF vf $VF_NUM mac $ZERO_MAC
+ virsh domif-setlink $DOMAIN $TAP_IF up
+ bridge fdb del $MAC dev $PF master
+ virsh detach-device $DOMAIN $VF_XML
+ 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
-#!/bin/bash
+ # Destination Hypervisor
+ #!/bin/bash
-virsh attach-device $DOMAIN $VF_XML
-virsh domif-setlink $DOMAIN $TAP_IF down
+ virsh attach-device $DOMAIN $VF_XML
+ virsh domif-setlink $DOMAIN $TAP_IF down
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* FYI: [PATCH net-next 2/2] docs: networking: Fix failover build warnings
2018-07-11 21:42 ` [PATCH net-next 2/2] docs: networking: Fix failover build warnings Tobin C. Harding
@ 2018-07-13 9:04 ` Markus Heiser
0 siblings, 0 replies; 5+ messages in thread
From: Markus Heiser @ 2018-07-13 9:04 UTC (permalink / raw)
To: Tobin C. Harding, David S. Miller
Cc: Sridhar Samudrala, linux-doc, netdev, linux-kernel, Jonathan Corbet
Hy Tobin,
> Add '::' before code snippets and indent all snippets uniformly starting
> with 2 spaces.
Just FYI about reST Markup (no need to fix anything in your patch).
You can also add '::' (the markup for literal blocks) at the last line of the
previous paragraph, e.g:
<snip>---
Booting a VM with the above configuration will result in the following 3
netdevs created in the VM.::
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
<snap>---
IMO its more readable in plain text. Anyway it is not wrong to add '::' in a
separated new line ... and thanks for your patch.
If you have any doubt about reST markup, I recommend the primer from the Sphinx
project:
http://www.sphinx-doc.org/en/stable/rest.html
and the quickref from the (underlying) docutils project:
http://docutils.sourceforge.net/docs/user/rst/quickref.html
-- Markus --
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 0/2] docs: Fix failover build warnings
2018-07-11 21:42 [PATCH net-next 0/2] docs: Fix failover build warnings Tobin C. Harding
2018-07-11 21:42 ` [PATCH net-next 1/2] docs: networking: Add failover docs to index Tobin C. Harding
2018-07-11 21:42 ` [PATCH net-next 2/2] docs: networking: Fix failover build warnings Tobin C. Harding
@ 2018-07-16 18:28 ` David Miller
2 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2018-07-16 18:28 UTC (permalink / raw)
To: me; +Cc: sridhar.samudrala, linux-doc, netdev, linux-kernel
From: "Tobin C. Harding" <me@tobin.cc>
Date: Thu, 12 Jul 2018 07:42:48 +1000
> 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.
Series applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-07-16 18:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-11 21:42 [PATCH net-next 0/2] docs: Fix failover build warnings Tobin C. Harding
2018-07-11 21:42 ` [PATCH net-next 1/2] docs: networking: Add failover docs to index Tobin C. Harding
2018-07-11 21:42 ` [PATCH net-next 2/2] docs: networking: Fix failover build warnings Tobin C. Harding
2018-07-13 9:04 ` FYI: " Markus Heiser
2018-07-16 18:28 ` [PATCH net-next 0/2] docs: " David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).