From patchwork Wed Jul 11 21:42:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tobin C. Harding" X-Patchwork-Id: 942719 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tobin.cc Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tobin.cc header.i=@tobin.cc header.b="o4n+yYH7"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="HhlS4TNB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41Qt5z3x3zz9s1R for ; Thu, 12 Jul 2018 07:50:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390558AbeGKV4c (ORCPT ); Wed, 11 Jul 2018 17:56:32 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:50573 "EHLO wout3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732452AbeGKV4c (ORCPT ); Wed, 11 Jul 2018 17:56:32 -0400 X-Greylist: delayed 431 seconds by postgrey-1.27 at vger.kernel.org; Wed, 11 Jul 2018 17:56:31 EDT Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 32E61256; Wed, 11 Jul 2018 17:43:08 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Wed, 11 Jul 2018 17:43:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobin.cc; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=LKxdHjvbzHqWCvLMt ysu/h6lmqGxQFVuhZicxaoeRg0=; b=o4n+yYH7UVjF/xHlg5vbd3PUtNYjFyYXp X4a/SroGZDe6ETAjzxdySQ4d9xf6i8mmKCmUJ8Hro4SljKhwEX2DvAFCyzrRVdWp LgOVDMqInf1uOflXXVYC3sZ3BH26V1RF/4Z6bJYmYWDyHqIF5HTeLHaestSR8IHe ruN/BTz30XelZA7acyoa8yvx1x5aUemUGRUibCtBJI40nk7zth9un4AJiEm4xjOa 5H9E7/mQwQEWse6JRzAmpCjA6KVMMUGdXgon9FhfODueWok8iAIyVRQhU4enYe22 Py9tdm5tshj0uHMyzmwtVrKjV4Ztl8VHifL4Lr2joBfy0sZ+s0KMw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=LKxdHjvbzHqWCvLMtysu/h6lmqGxQFVuhZicxaoeRg0=; b=HhlS4TNB Yl+A6pFudD0qZw0Anz6GQmxCdK1l40Spi0J6ed1LeLlNQ2CQYawLQaDpG3NQ4ulM u9tCvQ7bL05nAAJtF04lCQCJhxoamUQ0nRWDjwzHzbUccleloBJn5XN+89/R4Mbw l8Qwd5XY1SJJ7FPBTtPSViD1Htfw9phOic1vqcgwJ0xeWhFU0cBup3lBz9dTubOe XPT9hZtqk0iCeiySd/0zlHTCV+RweRXwxyIVEc/Cg5kYxS4rsoViBtLB7U6DAym8 zaVXCeo0xhcB/ViCBLqTm04Cxh3Tv7VZA+J7r9EoowEx5ykud+X3P2IvFISc0hh6 RoMvYvyCZBXZqA== X-ME-Proxy: X-ME-Sender: Received: from localhost (ppp121-44-208-89.bras1.syd2.internode.on.net [121.44.208.89]) by mail.messagingengine.com (Postfix) with ESMTPA id CC1A91026B; Wed, 11 Jul 2018 17:43:06 -0400 (EDT) From: "Tobin C. Harding" To: "David S. Miller" Cc: "Tobin C. Harding" , Sridhar Samudrala , linux-doc@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Corbet Subject: [PATCH net-next 2/2] docs: networking: Fix failover build warnings Date: Thu, 12 Jul 2018 07:42:50 +1000 Message-Id: <20180711214250.19039-3-me@tobin.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180711214250.19039-1-me@tobin.cc> References: <20180711214250.19039-1-me@tobin.cc> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Signed-off-by: Tobin C. Harding --- 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. - - - - - - - - -
- - - - -
- -
- +:: + + + + + + + + +
+ + + + +
+ +
+ Booting a VM with the above configuration will result in the following 3 netdevs created in the VM. - -4: ens10: 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: 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: 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: 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: 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: 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 - - - -
- -
- + # cat vf_xml + + + +
+ +
+ -# 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