From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mogw0429.ocn.ad.jp (mogw0429.ocn.ad.jp [118.23.109.57]) by dpdk.org (Postfix) with ESMTP id 38521A493 for ; Tue, 23 Jan 2018 01:30:15 +0100 (CET) Received: from mf-smf-ucb002.ocn.ad.jp (mf-smf-ucb002.ocn.ad.jp [153.149.227.4]) by mogw0429.ocn.ad.jp (Postfix) with ESMTP id 90A2138C2BB; Tue, 23 Jan 2018 09:30:13 +0900 (JST) Received: from mf-smf-ucb002.ocn.ad.jp (mf-smf-ucb002 [153.149.227.4]) by mf-smf-ucb002.ocn.ad.jp (Postfix) with ESMTP id 5EBAFC0678; Tue, 23 Jan 2018 09:30:13 +0900 (JST) Received: from ntt.pod01.mv-mta-ucb023 (mv-mta-ucb023.ocn.ad.jp [153.149.142.86]) by mf-smf-ucb002.ocn.ad.jp (Switch-3.3.4/Switch-3.3.4) with ESMTP id w0N0U31M040998; Tue, 23 Jan 2018 09:30:12 +0900 Received: from smtp.ocn.ne.jp ([153.149.227.135]) by ntt.pod01.mv-mta-ucb023 with id 1cWC1x0092vuoep01cWCbY; Tue, 23 Jan 2018 00:30:12 +0000 Received: from mugwort.jp (p1247-ipngn8903marunouchi.tokyo.ocn.ne.jp [153.221.64.247]) by smtp.ocn.ne.jp (Postfix) with ESMTPA; Tue, 23 Jan 2018 09:30:12 +0900 (JST) From: ogawa.yasufumi@lab.ntt.co.jp To: spp@dpdk.org, ferruh.yigit@intel.com, x-fn-spp@sl.ntt-tx.co.jp Cc: Hiroyuki Nakamura , Kentaro Watanabe , Naoki Takada , Yasufumi Ogawa Date: Tue, 23 Jan 2018 09:30:20 +0900 Message-Id: <20180123003021.28557-8-ogawa.yasufumi@lab.ntt.co.jp> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20180123003021.28557-1-ogawa.yasufumi@lab.ntt.co.jp> References: <20180123003021.28557-1-ogawa.yasufumi@lab.ntt.co.jp> Subject: [spp] [PATCH 27/28] doc: update sample config section X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jan 2018 00:30:17 -0000 From: Hiroyuki Nakamura Update "Sample Config" section in config_manual.md according to the latest config version format. Some errors are corrected. * Replace network diagram ascii art to the link to spp_sample_config.svg. * Change config example to the one aligned to the network diagram. * Remove comments in config example since no comment is allowed in config file. Signed-off-by: Kentaro Watanabe Signed-off-by: Naoki Takada Signed-off-by: Yasufumi Ogawa --- docs/spp_vf/config_manual.md | 110 +-- docs/spp_vf/spp_sample_config.svg | 1891 +++++++++++++++++++++++++++++++++++++ 2 files changed, 1904 insertions(+), 97 deletions(-) create mode 100644 docs/spp_vf/spp_sample_config.svg diff --git a/docs/spp_vf/config_manual.md b/docs/spp_vf/config_manual.md index cdf10b5..49f9701 100644 --- a/docs/spp_vf/config_manual.md +++ b/docs/spp_vf/config_manual.md @@ -50,22 +50,21 @@ Here is default config `spp.json` and network diagram of it. "vfs": [ { "name": "vf0", - "num_vhost": 4, // Number of vhosts - "num_ring": 9, // Number of rings - "functions":[ // Attributes of forward,merge or classifier_mac + "num_vhost": 2, + "num_ring": 4, + "functions":[ { - "core": 2, // Core ID - "type": "merge", // Forwarder type - "rx_port": ["phy:0", "phy:1"], // Rx port, It MUST be a list for merge type - "tx_port": "ring:8" // Tx port + "core": 2, + "type": "classifier_mac", + "rx_port": "phy:0", + "tx_port": ["ring:0", "ring:1"] }, { "core": 3, - "type": "classifier_mac", - "rx_port": "ring:8", // Rx port, It is not a list because type is classifier_mac - "tx_port": ["ring:0", "ring:1", "ring:4", "ring:5"] + "type": "merge", + "rx_port": ["ring:2", "ring:3"], + "tx_port": "phy:0" }, - { "core": 4, "type": "forward", @@ -76,7 +75,7 @@ Here is default config `spp.json` and network diagram of it. "core": 5, "type": "forward", "rx_port": "ring:1", - "tx_port": "vhost:2" + "tx_port": "vhost:1" }, { "core": 6, @@ -87,45 +86,8 @@ Here is default config `spp.json` and network diagram of it. { "core": 7, "type": "forward", - "rx_port": "vhost:2", - "tx_port": "ring:3" - }, - { - "core": 8, - "type": "merge", - "rx_port": ["ring:2", "ring:3"], - "tx_port": "phy:0" - }, - - { - "core": 9, - "type": "forward", - "rx_port": "ring:4", - "tx_port": "vhost:1" - }, - { - "core": 10, - "type": "forward", - "rx_port": "ring:5", - "tx_port": "vhost:3" - }, - { - "core": 11, - "type": "forward", "rx_port": "vhost:1", - "tx_port": "ring:6" - }, - { - "core": 12, - "type": "forward", - "rx_port": "vhost:3", - "tx_port": "ring:7" - }, - { - "core": 13, - "type": "merge", - "rx_port": ["ring:6", "ring:7"], - "tx_port": "phy:1" + "tx_port": "ring:3" } ] } @@ -134,50 +96,4 @@ Here is default config `spp.json` and network diagram of it. ``` Network diagram -[TODO] Replace it to more readable SVG img. - -``` -+---------+ +-----------------------------------------------------------------------------------------------+ -| host2 | | Host1 | -| | | +------------------------------------------------------+ +-------------------+ | -| | | | spp_vf | | | | -| +-----+ | | +--------+ | +---+ +----+ +---+ +----+ +---+ +----------+ | | +----------+ | | -| | nic <------> nic0 +-----> M +--> r8 +--> C +-----> r0 +--> F +--> +------> | | | -| +-----+ | | +----+---+ | +-^-+ +----+ +-+-+ +----+ +---+ | | | | | | | | -| | | ^ | | | | vhost0 | | | | nic | | | -| | | | | | | +----+ +---+ | | | | | | | | -| | | | | | +--------------+ r2 <--+ F <--+ <------+ | | | -| | | | | | | | +----+ +---+ +----------+ | | +----------+ | | -| | | | | | | | | | spp vm| | -| | | | | | | | +----+ +---+ +----------+ | | +----------+ | | -| | | | | | | +-------> r4 +--+ F +--> +------> | | | -| | | | | | +--v--+ | +----+ +---+ | | | | | | | | -| | | +----------------+ M | | | vhost1 | | | | nic | | | -| | | | | +--^--+ | +----+ +---+ | | | | | | | | -| | | | | | +------------+ r6 +--+ F <--+ <------+ | | | -| | | | | | | | +----+ +---+ +----------+ | | +----------+ | | -| | | | | | | | | | | | -| | | | | | | | | +-------------------+ | -| | | | | | | | | | -| | | | | | | | | +-------------------+ | -| | | | | | | | | | | | -| +-----+ | | +--------+ | | | | | +----+ +---+ +----------+ | | +----------+ | | -| | nic <------> nic1 +-------+ | | +-------> r1 +--+ F +--> +------> | | | -| +-----+ | | +----+---+ | | | | +----+ +---+ | | | | | | | | -| | | ^ | | | | | vhost2 | | | | nic | | | -| | | | | | | | +----+ +---+ | | | | | | | | -| | | | | +--------------+ r3 +--+ F <--+ <------+ | | | -| | | | | | | +----+ +---+ +----------+ | | +----------+ | | -| | | | | | | | | spp vm| | -| | | | | | | +----+ +---+ +----------+ | | +----------+ | | -| | | | | | +-------> r5 +--+ F +--> +------> | | | -| | | | | +----v+ +----+ +---+ | | | | | | | | -| | | +----------------+ M | | vhost3 | | | | nic | | | -| | | | +--^--+ +----+ +---+ | | | | | | | | -| | | | +--------------+ r7 +--+ F <--+ <------+ | | | -| | | | +----+ +---+ +----------+ | | +----------+ | | -| | | | | | | | -| | | +------------------------------------------------------+ +-------------------+ | -| | | | -+---------+ +-----------------------------------------------------------------------------------------------+ -``` +![spp_sample_config](spp_sample_config.svg) diff --git a/docs/spp_vf/spp_sample_config.svg b/docs/spp_vf/spp_sample_config.svg new file mode 100644 index 0000000..25c19f2 --- /dev/null +++ b/docs/spp_vf/spp_sample_config.svg @@ -0,0 +1,1891 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + host1 + + NIC0 + + host2 + + NIC1 + + + + + + + + + + spp_vf + + + + guest vm1 + + guest vm2 + + vNIC + + vNIC + + + + + + + classifier + + + + vhost1 + + + + + + + + + + + merger + + + forwarder + + + + forwarder + + + + forwarder + + + + forwarder + + + traffic generator + + + + app2 + + + + app1 + + + + + + vhost0 + + + + + ring + + ring0 + + + ring + + ring1 + + + ring + + ring2 + + + ring + + ring3 + + -- 2.13.1