diff options
Diffstat (limited to 'docs/gettingstarted')
49 files changed, 5756 insertions, 0 deletions
diff --git a/docs/gettingstarted/developers/bihash.md b/docs/gettingstarted/developers/bihash.md new file mode 100644 index 00000000000..3f53e7bbc3e --- /dev/null +++ b/docs/gettingstarted/developers/bihash.md @@ -0,0 +1,273 @@ +Bounded-index Extensible Hashing (bihash) +========================================= + +Vpp uses bounded-index extensible hashing to solve a variety of +exact-match (key, value) lookup problems. Benefits of the current +implementation: + +* Very high record count scaling, tested to 100,000,000 records. +* Lookup performance degrades gracefully as the number of records increases +* No reader locking required +* Template implementation, it's easy to support arbitrary (key,value) types + +Bounded-index extensible hashing has been widely used in databases for +decades. + +Bihash uses a two-level data structure: + +``` + +-----------------+ + | bucket-0 | + | log2_size | + | backing store | + +-----------------+ + | bucket-1 | + | log2_size | +--------------------------------+ + | backing store | --------> | KVP_PER_PAGE * key-value-pairs | + +-----------------+ | page 0 | + ... +--------------------------------+ + +-----------------+ | KVP_PER_PAGE * key-value-pairs | + | bucket-2**N-1 | | page 1 | + | log2_size | +--------------------------------+ + | backing store | --- + +-----------------+ +--------------------------------+ + | KVP_PER_PAGE * key-value-pairs | + | page 2**(log2(size)) - 1 | + +--------------------------------+ +``` + +Discussion of the algorithm +--------------------------- + +This structure has a couple of major advantages. In practice, each +bucket entry fits into a 64-bit integer. Coincidentally, vpp's target +CPU architectures support 64-bit atomic operations. When modifying the +contents of a specific bucket, we do the following: + +* Make a working copy of the bucket's backing storage +* Atomically swap a pointer to the working copy into the bucket array +* Change the original backing store data +* Atomically swap back to the original + +So, no reader locking is required to search a bihash table. + +At lookup time, the implementation computes a key hash code. We use +the least-significant N bits of the hash to select the bucket. + +With the bucket in hand, we learn log2 (nBackingPages) for the +selected bucket. At this point, we use the next log2_size bits from +the hash code to select the specific backing page in which the +(key,value) page will be found. + +Net result: we search **one** backing page, not 2**log2_size +pages. This is a key property of the algorithm. + +When sufficient collisions occur to fill the backing pages for a given +bucket, we double the bucket size, rehash, and deal the bucket +contents into a double-sized set of backing pages. In the future, we +may represent the size as a linear combination of two powers-of-two, +to increase space efficiency. + +To solve the "jackpot case" where a set of records collide under +hashing in a bad way, the implementation will fall back to linear +search across 2**log2_size backing pages on a per-bucket basis. + +To maintain *space* efficiency, we should configure the bucket array +so that backing pages are effectively utilized. Lookup performance +tends to change *very litte* if the bucket array is too small or too +large. + +Bihash depends on selecting an effective hash function. If one were to +use a truly broken hash function such as "return 1ULL." bihash would +still work, but it would be equivalent to poorly-programmed linear +search. + +We often use cpu intrinsic functions - think crc32 - to rapidly +compute a hash code which has decent statistics. + +Bihash Cookbook +--------------- + +### Using current (key,value) template instance types + +It's quite easy to use one of the template instance types. As of this +writing, .../src/vppinfra provides pre-built templates for 8, 16, 20, +24, 40, and 48 byte keys, u8 * vector keys, and 8 byte values. + +See .../src/vppinfra/{bihash_<key-size>_8}.h + +To define the data types, #include a specific template instance, most +often in a subsystem header file: + +```c + #include <vppinfra/bihash_8_8.h> +``` + +If you're building a standalone application, you'll need to define the +various functions by #including the method implementation file in a C +source file. + +The core vpp engine currently uses most if not all of the known bihash +types, so you probably won't need to #include the method +implementation file. + + +```c + #include <vppinfra/bihash_template.c> +``` + +Add an instance of the selected bihash data structure to e.g. a +"main_t" structure: + +```c + typedef struct + { + ... + BVT (clib_bihash) hash; + or + clib_bihash_8_8_t hash; + ... + } my_main_t; +``` + +The BV macro concatenate its argument with the value of the +preprocessor symbol BIHASH_TYPE. The BVT macro concatenates its +argument with the value of BIHASH_TYPE and the fixed-string "_t". So +in the above example, BVT (clib_bihash) generates "clib_bihash_8_8_t". + +If you're sure you won't decide to change the template / type name +later, it's perfectly OK to code "clib_bihash_8_8_t" and so forth. + +In fact, if you #include multiple template instances in a single +source file, you **must** use fully-enumerated type names. The macros +stand no chance of working. + +### Initializing a bihash table + +Call the init function as shown. As a rough guide, pick a number of +buckets which is approximately +number_of_expected_records/BIHASH_KVP_PER_PAGE from the relevant +template instance header-file. See previous discussion. + +The amount of memory selected should easily contain all of the +records, with a generous allowance for hash collisions. Bihash memory +is allocated separately from the main heap, and won't cost anything +except kernel PTE's until touched, so it's OK to be reasonably +generous. + +For example: + +```c + my_main_t *mm = &my_main; + clib_bihash_8_8_t *h; + + h = &mm->hash_table; + + clib_bihash_init_8_8 (h, "test", (u32) number_of_buckets, + (uword) memory_size); +``` + +### Add or delete a key/value pair + +Use BV(clib_bihash_add_del), or the explicit type variant: + +```c + clib_bihash_kv_8_8_t kv; + clib_bihash_8_8_t * h; + my_main_t *mm = &my_main; + clib_bihash_8_8_t *h; + + h = &mm->hash_table; + kv.key = key_to_add_or_delete; + kv.value = value_to_add_or_delete; + + clib_bihash_add_del_8_8 (h, &kv, is_add /* 1=add, 0=delete */); +``` + +In the delete case, kv.value is irrelevant. To change the value associated +with an existing (key,value) pair, simply re-add the [new] pair. + +### Simple search + +The simplest possible (key, value) search goes like so: + +```c + clib_bihash_kv_8_8_t search_kv, return_kv; + clib_bihash_8_8_t * h; + my_main_t *mm = &my_main; + clib_bihash_8_8_t *h; + + h = &mm->hash_table; + search_kv.key = key_to_add_or_delete; + + if (clib_bihash_search_8_8 (h, &search_kv, &return_kv) < 0) + key_not_found() + else + key_not_found(); +``` + +Note that it's perfectly fine to collect the lookup result + +```c + if (clib_bihash_search_8_8 (h, &search_kv, &search_kv)) + key_not_found(); + etc. +``` + +### Bihash vector processing + +When processing a vector of packets which need a certain lookup +performed, it's worth the trouble to compute the key hash, and +prefetch the correct bucket ahead of time. + +Here's a sketch of one way to write the required code: + +Dual-loop: +* 6 packets ahead, prefetch 2x vlib_buffer_t's and 2x packet data + required to form the record keys +* 4 packets ahead, form 2x record keys and call BV(clib_bihash_hash) + or the explicit hash function to calculate the record hashes. + Call 2x BV(clib_bihash_prefetch_bucket) to prefetch the buckets +* 2 packets ahead, call 2x BV(clib_bihash_prefetch_data) to prefetch + 2x (key,value) data pages. +* In the processing section, call 2x BV(clib_bihash_search_inline_with_hash) + to perform the search + +Programmer's choice whether to stash the hash code somewhere in +vnet_buffer(b) metadata, or to use local variables. + +Single-loop: +* Use simple search as shown above. + +### Walking a bihash table + +A fairly common scenario to build "show" commands involves walking a +bihash table. It's simple enough: + +```c + my_main_t *mm = &my_main; + clib_bihash_8_8_t *h; + void callback_fn (clib_bihash_kv_8_8_t *, void *); + + h = &mm->hash_table; + + BV(clib_bihash_foreach_key_value_pair) (h, callback_fn, (void *) arg); +``` +To nobody's great surprise: clib_bihash_foreach_key_value_pair +iterates across the entire table, calling callback_fn with active +entries. + +### Creating a new template instance + +Creating a new template is easy. Use one of the existing templates as +a model, and make the obvious changes. The hash and key_compare +methods are performance-critical in multiple senses. + +If the key compare method is slow, every lookup will be slow. If the +hash function is slow, same story. If the hash function has poor +statistical properties, space efficiency will suffer. In the limit, a +bad enough hash function will cause large portions of the table to +revert to linear search. + +Use of the best available vector unit is well worth the trouble in the +hash and key_compare functions. diff --git a/docs/gettingstarted/developers/building.rst b/docs/gettingstarted/developers/building.rst new file mode 100644 index 00000000000..18fa943a6fb --- /dev/null +++ b/docs/gettingstarted/developers/building.rst @@ -0,0 +1,151 @@ +.. _building: + +.. toctree:: + +Building VPP +============ + +To get started developing with VPP you need to get the sources and build the packages. + +.. _setupproxies: + +Set up Proxies +-------------- + +Depending on the environment, proxies may need to be set. +You may run these commands: + +.. code-block:: console + + $ export http_proxy=http://<proxy-server-name>.com:<port-number> + $ export https_proxy=https://<proxy-server-name>.com:<port-number> + + +Get the VPP Sources +------------------- + +To get the VPP sources and get ready to build execute the following: + +.. code-block:: console + + $ git clone https://gerrit.fd.io/r/vpp + $ cd vpp + +Build VPP Dependencies +---------------------- + +Before building, make sure there are no FD.io VPP or DPDK packages installed by entering the following +commands: + +.. code-block:: console + + $ dpkg -l | grep vpp + $ dpkg -l | grep DPDK + +There should be no output, or packages showing after each of the above commands. + +Run this to install the dependencies for FD.io VPP. +If it hangs during downloading at any point, you may need to set up :ref:`proxies for this to work <setupproxies>`. + +.. code-block:: console + + $ make install-dep + Hit:1 http://us.archive.ubuntu.com/ubuntu xenial InRelease + Get:2 http://us.archive.ubuntu.com/ubuntu xenial-updates InRelease [109 kB] + Get:3 http://security.ubuntu.com/ubuntu xenial-security InRelease [107 kB] + Get:4 http://us.archive.ubuntu.com/ubuntu xenial-backports InRelease [107 kB] + Get:5 http://us.archive.ubuntu.com/ubuntu xenial-updates/main amd64 Packages [803 kB] + Get:6 http://us.archive.ubuntu.com/ubuntu xenial-updates/main i386 Packages [732 kB] + ... + ... + Update-alternatives: using /usr/lib/jvm/java-8-openjdk-amd64/bin/jmap to provide /usr/bin/jmap (jmap) in auto mode + Setting up default-jdk-headless (2:1.8-56ubuntu2) ... + Processing triggers for libc-bin (2.23-0ubuntu3) ... + Processing triggers for systemd (229-4ubuntu6) ... + Processing triggers for ureadahead (0.100.0-19) ... + Processing triggers for ca-certificates (20160104ubuntu1) ... + Updating certificates in /etc/ssl/certs... + 0 added, 0 removed; done. + Running hooks in /etc/ca-certificates/update.d... + + done. + done. + +Build VPP (Debug Mode) +---------------------- + +This build version contains debug symbols which is useful to modify VPP. The command below will build debug version of VPP. +This build will come with /build-root/vpp_debug-native. + +.. code-block:: console + + $ make build + make[1]: Entering directory '/home/vagrant/vpp-master/build-root' + @@@@ Arch for platform 'vpp' is native @@@@ + @@@@ Finding source for dpdk @@@@ + @@@@ Makefile fragment found in /home/vagrant/vpp-master/build-data/packages/dpdk.mk @@@@ + @@@@ Source found in /home/vagrant/vpp-master/dpdk @@@@ + @@@@ Arch for platform 'vpp' is native @@@@ + @@@@ Finding source for vpp @@@@ + @@@@ Makefile fragment found in /home/vagrant/vpp-master/build-data/packages/vpp.mk @@@@ + @@@@ Source found in /home/vagrant/vpp-master/src @@@@ + ... + ... + make[5]: Leaving directory '/home/vagrant/vpp-master/build-root/build-vpp_debug-native/vpp/vpp-api/java' + make[4]: Leaving directory '/home/vagrant/vpp-master/build-root/build-vpp_debug-native/vpp/vpp-api/java' + make[3]: Leaving directory '/home/vagrant/vpp-master/build-root/build-vpp_debug-native/vpp' + make[2]: Leaving directory '/home/vagrant/vpp-master/build-root/build-vpp_debug-native/vpp' + @@@@ Installing vpp: nothing to do @@@@ + make[1]: Leaving directory '/home/vagrant/vpp-master/build-root' + +Build VPP (Release Version) +--------------------------- + +To build the release version of FD.io VPP. +This build is optimized and will not create debug symbols. +This build will come with /build-root/build-vpp-native + +.. code-block:: console + + $ make release + + +Building Necessary Packages +--------------------------- + +To build the debian packages, one of the following commands below depending on the system: + +Building Debian Packages +^^^^^^^^^^^^^^^^^^^^^^^^ + +.. code-block:: console + + $ make pkg-deb + + +Building RPM Packages +^^^^^^^^^^^^^^^^^^^^^ + +.. code-block:: console + + $ make pkg-rpm + +The packages will be found in the build-root directory. + +.. code-block:: console + + $ ls *.deb + + If packages built correctly, this should be the Output + + vpp_18.07-rc0~456-gb361076_amd64.deb vpp-dbg_18.07-rc0~456-gb361076_amd64.deb + vpp-api-java_18.07-rc0~456-gb361076_amd64.deb vpp-dev_18.07-rc0~456-gb361076_amd64.deb + vpp-api-lua_18.07-rc0~456-gb361076_amd64.deb vpp-lib_18.07-rc0~456-gb361076_amd64.deb + vpp-api-python_18.07-rc0~456-gb361076_amd64.deb vpp-plugins_18.07-rc0~456-gb361076_amd64.deb + +Packages built installed end up in build-root directory. Finally, the command below installs all built packages. + +.. code-block:: console + + $ sudo bash + # dpkg -i *.deb diff --git a/docs/gettingstarted/developers/featurearcs.md b/docs/gettingstarted/developers/featurearcs.md new file mode 100644 index 00000000000..f1e3ec47d05 --- /dev/null +++ b/docs/gettingstarted/developers/featurearcs.md @@ -0,0 +1,224 @@ +Feature Arcs +============ + +A significant number of vpp features are configurable on a per-interface +or per-system basis. Rather than ask feature coders to manually +construct the required graph arcs, we built a general mechanism to +manage these mechanics. + +Specifically, feature arcs comprise ordered sets of graph nodes. Each +feature node in an arc is independently controlled. Feature arc nodes +are generally unaware of each other. Handing a packet to "the next +feature node" is quite inexpensive. + +The feature arc implementation solves the problem of creating graph arcs +used for steering. + +At the beginning of a feature arc, a bit of setup work is needed, but +only if at least one feature is enabled on the arc. + +On a per-arc basis, individual feature definitions create a set of +ordering dependencies. Feature infrastructure performs a topological +sort of the ordering dependencies, to determine the actual feature +order. Missing dependencies **will** lead to runtime disorder. See +<https://gerrit.fd.io/r/#/c/12753> for an example. + +If no partial order exists, vpp will refuse to run. Circular dependency +loops of the form "a then b, b then c, c then a" are impossible to +satisfy. + +Adding a feature to an existing feature arc +------------------------------------------- + +To nobody's great surprise, we set up feature arcs using the typical +"macro -> constructor function -> list of declarations" pattern: + +```c + VNET_FEATURE_INIT (mactime, static) = + { + .arc_name = "device-input", + .node_name = "mactime", + .runs_before = VNET_FEATURES ("ethernet-input"), + }; +``` + +This creates a "mactime" feature on the "device-input" arc. + +Once per frame, dig up the vnet\_feature\_config\_main\_t corresponding +to the "device-input" feature arc: + +```c + vnet_main_t *vnm = vnet_get_main (); + vnet_interface_main_t *im = &vnm->interface_main; + u8 arc = im->output_feature_arc_index; + vnet_feature_config_main_t *fcm; + + fcm = vnet_feature_get_config_main (arc); +``` + +Note that in this case, we've stored the required arc index - assigned +by the feature infrastructure - in the vnet\_interface\_main\_t. Where +to put the arc index is a programmer's decision when creating a feature +arc. + +Per packet, set next0 to steer packets to the next node they should +visit: + +```c + vnet_get_config_data (&fcm->config_main, + &b0->current_config_index /* value-result */, + &next0, 0 /* # bytes of config data */); +``` + +Configuration data is per-feature arc, and is often unused. Note that +it's normal to reset next0 to divert packets elsewhere; often, to drop +them for cause: + +```c + next0 = MACTIME_NEXT_DROP; + b0->error = node->errors[DROP_CAUSE]; +``` + +Creating a feature arc +---------------------- + +Once again, we create feature arcs using constructor macros: + +```c + VNET_FEATURE_ARC_INIT (ip4_unicast, static) = + { + .arc_name = "ip4-unicast", + .start_nodes = VNET_FEATURES ("ip4-input", "ip4-input-no-checksum"), + .arc_index_ptr = &ip4_main.lookup_main.ucast_feature_arc_index, + }; +``` + +In this case, we configure two arc start nodes to handle the +"hardware-verified ip checksum or not" cases. During initialization, +the feature infrastructure stores the arc index as shown. + +In the head-of-arc node, do the following to send packets along the +feature arc: + +```c + ip_lookup_main_t *lm = &im->lookup_main; + arc = lm->ucast_feature_arc_index; +``` + +Once per packet, initialize packet metadata to walk the feature arc: + +```c +vnet_feature_arc_start (arc, sw_if_index0, &next, b0); +``` + +Enabling / Disabling features +----------------------------- + +Simply call vnet_feature_enable_disable to enable or disable a specific +feature: + +```c + vnet_feature_enable_disable ("device-input", /* arc name */ + "mactime", /* feature name */ + sw_if_index, /* Interface sw_if_index */ + enable_disable, /* 1 => enable */ + 0 /* (void *) feature_configuration */, + 0 /* feature_configuration_nbytes */); +``` + +The feature_configuration opaque is seldom used. + +If you wish to make a feature a _de facto_ system-level concept, pass +sw_if_index=0 at all times. Sw_if_index 0 is always valid, and +corresponds to the "local" interface. + +Related "show" commands +----------------------- + +To display the entire set of features, use "show features [verbose]". The +verbose form displays arc indices, and feature indicies within the arcs + +``` +$ vppctl show features verbose +Available feature paths +<snip> +[14] ip4-unicast: + [ 0]: nat64-out2in-handoff + [ 1]: nat64-out2in + [ 2]: nat44-ed-hairpin-dst + [ 3]: nat44-hairpin-dst + [ 4]: ip4-dhcp-client-detect + [ 5]: nat44-out2in-fast + [ 6]: nat44-in2out-fast + [ 7]: nat44-handoff-classify + [ 8]: nat44-out2in-worker-handoff + [ 9]: nat44-in2out-worker-handoff + [10]: nat44-ed-classify + [11]: nat44-ed-out2in + [12]: nat44-ed-in2out + [13]: nat44-det-classify + [14]: nat44-det-out2in + [15]: nat44-det-in2out + [16]: nat44-classify + [17]: nat44-out2in + [18]: nat44-in2out + [19]: ip4-qos-record + [20]: ip4-vxlan-gpe-bypass + [21]: ip4-reassembly-feature + [22]: ip4-not-enabled + [23]: ip4-source-and-port-range-check-rx + [24]: ip4-flow-classify + [25]: ip4-inacl + [26]: ip4-source-check-via-rx + [27]: ip4-source-check-via-any + [28]: ip4-policer-classify + [29]: ipsec-input-ip4 + [30]: vpath-input-ip4 + [31]: ip4-vxlan-bypass + [32]: ip4-lookup +<snip> +``` + +Here, we learn that the ip4-unicast feature arc has index 14, and that +e.g. ip4-inacl is the 25th feature in the generated partial order. + +To display the features currently active on a specific interface, +use "show interface <name> features": + +``` +$ vppctl show interface GigabitEthernet3/0/0 features +Feature paths configured on GigabitEthernet3/0/0... +<snip> +ip4-unicast: + nat44-out2in +<snip> +``` + +Table of Feature Arcs +--------------------- + +Simply search for name-strings to track down the arc definition, location of +the arc index, etc. + +``` + | Arc Name | + |------------------| + | device-input | + | ethernet-output | + | interface-output | + | ip4-drop | + | ip4-local | + | ip4-multicast | + | ip4-output | + | ip4-punt | + | ip4-unicast | + | ip6-drop | + | ip6-local | + | ip6-multicast | + | ip6-output | + | ip6-punt | + | ip6-unicast | + | mpls-input | + | mpls-output | + | nsh-output | +``` diff --git a/docs/gettingstarted/developers/index.rst b/docs/gettingstarted/developers/index.rst new file mode 100644 index 00000000000..cccb18d731a --- /dev/null +++ b/docs/gettingstarted/developers/index.rst @@ -0,0 +1,18 @@ +.. _gstarteddevel: + +########## +Developers +########## + +.. toctree:: + :maxdepth: 2 + + building + softwarearchitecture + infrastructure + vlib + plugins + vnet + featurearcs + bihash + diff --git a/docs/gettingstarted/developers/infrastructure.md b/docs/gettingstarted/developers/infrastructure.md new file mode 100644 index 00000000000..688c42133ed --- /dev/null +++ b/docs/gettingstarted/developers/infrastructure.md @@ -0,0 +1,330 @@ +VPPINFRA (Infrastructure) +========================= + +The files associated with the VPP Infrastructure layer are located in +the ./src/vppinfra folder. + +VPPinfra is a collection of basic c-library services, quite +sufficient to build standalone programs to run directly on bare metal. +It also provides high-performance dynamic arrays, hashes, bitmaps, +high-precision real-time clock support, fine-grained event-logging, and +data structure serialization. + +One fair comment / fair warning about vppinfra: you can\'t always tell a +macro from an inline function from an ordinary function simply by name. +Macros are used to avoid function calls in the typical case, and to +cause (intentional) side-effects. + +Vppinfra has been around for almost 20 years and tends not to change +frequently. The VPP Infrastructure layer contains the following +functions: + +Vectors +------- + +Vppinfra vectors are ubiquitous dynamically resized arrays with by user +defined \"headers\". Many vpppinfra data structures (e.g. hash, heap, +pool) are vectors with various different headers. + +The memory layout looks like this: + +``` + User header (optional, uword aligned) + Alignment padding (if needed) + Vector length in elements + User's pointer -> Vector element 0 + Vector element 1 + ... + Vector element N-1 +``` + +As shown above, the vector APIs deal with pointers to the 0th element of +a vector. Null pointers are valid vectors of length zero. + +To avoid thrashing the memory allocator, one often resets the length of +a vector to zero while retaining the memory allocation. Set the vector +length field to zero via the vec\_reset\_length(v) macro. \[Use the +macro! It's smart about NULL pointers.\] + +Typically, the user header is not present. User headers allow for other +data structures to be built atop vppinfra vectors. Users may specify the +alignment for data elements via the [vec]()\*\_aligned macros. + +Vectors elements can be any C type e.g. (int, double, struct bar). This +is also true for data types built atop vectors (e.g. heap, pool, etc.). +Many macros have \_a variants supporting alignment of vector data and +\_h variants supporting non-zero-length vector headers. The \_ha +variants support both. + +Inconsistent usage of header and/or alignment related macro variants +will cause delayed, confusing failures. + +Standard programming error: memorize a pointer to the ith element of a +vector, and then expand the vector. Vectors expand by 3/2, so such code +may appear to work for a period of time. Correct code almost always +memorizes vector **indices** which are invariant across reallocations. + +In typical application images, one supplies a set of global functions +designed to be called from gdb. Here are a few examples: + +- vl(v) - prints vec\_len(v) +- pe(p) - prints pool\_elts(p) +- pifi(p, index) - prints pool\_is\_free\_index(p, index) +- debug\_hex\_bytes (p, nbytes) - hex memory dump nbytes starting at p + +Use the "show gdb" debug CLI command to print the current set. + +Bitmaps +------- + +Vppinfra bitmaps are dynamic, built using the vppinfra vector APIs. +Quite handy for a variety jobs. + +Pools +----- + +Vppinfra pools combine vectors and bitmaps to rapidly allocate and free +fixed-size data structures with independent lifetimes. Pools are perfect +for allocating per-session structures. + +Hashes +------ + +Vppinfra provides several hash flavors. Data plane problems involving +packet classification / session lookup often use +./src/vppinfra/bihash\_template.\[ch\] bounded-index extensible +hashes. These templates are instantiated multiple times, to efficiently +service different fixed-key sizes. + +Bihashes are thread-safe. Read-locking is not required. A simple +spin-lock ensures that only one thread writes an entry at a time. + +The original vppinfra hash implementation in +./src/vppinfra/hash.\[ch\] are simple to use, and are often used in +control-plane code which needs exact-string-matching. + +In either case, one almost always looks up a key in a hash table to +obtain an index in a related vector or pool. The APIs are simple enough, +but one must take care when using the unmanaged arbitrary-sized key +variant. Hash\_set\_mem (hash\_table, key\_pointer, value) memorizes +key\_pointer. It is usually a bad mistake to pass the address of a +vector element as the second argument to hash\_set\_mem. It is perfectly +fine to memorize constant string addresses in the text segment. + +Format +------ + +Vppinfra format is roughly equivalent to printf. + +Format has a few properties worth mentioning. Format's first argument is +a (u8 \*) vector to which it appends the result of the current format +operation. Chaining calls is very easy: + +```c + u8 * result; + + result = format (0, "junk = %d, ", junk); + result = format (result, "more junk = %d\n", more_junk); +``` + +As previously noted, NULL pointers are perfectly proper 0-length +vectors. Format returns a (u8 \*) vector, **not** a C-string. If you +wish to print a (u8 \*) vector, use the "%v" format string. If you need +a (u8 \*) vector which is also a proper C-string, either of these +schemes may be used: + +```c + vec_add1 (result, 0) + or + result = format (result, "<whatever>%c", 0); +``` + +Remember to vec\_free() the result if appropriate. Be careful not to +pass format an uninitialized (u8 \*). + +Format implements a particularly handy user-format scheme via the "%U" +format specification. For example: + +```c + u8 * format_junk (u8 * s, va_list *va) + { + junk = va_arg (va, u32); + s = format (s, "%s", junk); + return s; + } + + result = format (0, "junk = %U, format_junk, "This is some junk"); +``` + +format\_junk() can invoke other user-format functions if desired. The +programmer shoulders responsibility for argument type-checking. It is +typical for user format functions to blow up if the va\_arg(va, +type) macros don't match the caller's idea of reality. + +Unformat +-------- + +Vppinfra unformat is vaguely related to scanf, but considerably more +general. + +A typical use case involves initializing an unformat\_input\_t from +either a C-string or a (u8 \*) vector, then parsing via unformat() as +follows: + +```c + unformat_input_t input; + + unformat_init_string (&input, "<some-C-string>"); + /* or */ + unformat_init_vector (&input, <u8-vector>); +``` + +Then loop parsing individual elements: + +```c + while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (&input, "value1 %d", &value1)) + ;/* unformat sets value1 */ + else if (unformat (&input, "value2 %d", &value2) + ;/* unformat sets value2 */ + else + return clib_error_return (0, "unknown input '%U'", + format_unformat_error, input); + } +``` + +As with format, unformat implements a user-unformat function capability +via a "%U" user unformat function scheme. + +Vppinfra errors and warnings +---------------------------- + +Many functions within the vpp dataplane have return-values of type +clib\_error\_t \*. Clib\_error\_t's are arbitrary strings with a bit of +metadata \[fatal, warning\] and are easy to announce. Returning a NULL +clib\_error\_t \* indicates "A-OK, no error." + +Clib\_warning(format-args) is a handy way to add debugging +output; clib warnings prepend function:line info to unambiguously locate +the message source. Clib\_unix\_warning() adds perror()-style Linux +system-call information. In production images, clib\_warnings result in +syslog entries. + +Serialization +------------- + +Vppinfra serialization support allows the programmer to easily serialize +and unserialize complex data structures. + +The underlying primitive serialize/unserialize functions use network +byte-order, so there are no structural issues serializing on a +little-endian host and unserializing on a big-endian host. + +Event-logger, graphical event log viewer +---------------------------------------- + +The vppinfra event logger provides very lightweight (sub-100ns) +precisely time-stamped event-logging services. See +./src/vppinfra/{elog.c, elog.h} + +Serialization support makes it easy to save and ultimately to combine a +set of event logs. In a distributed system running NTP over a local LAN, +we find that event logs collected from multiple system elements can be +combined with a temporal uncertainty no worse than 50us. + +A typical event definition and logging call looks like this: + +```c + ELOG_TYPE_DECLARE (e) = + { + .format = "tx-msg: stream %d local seq %d attempt %d", + .format_args = "i4i4i4", + }; + struct { u32 stream_id, local_sequence, retry_count; } * ed; + ed = ELOG_DATA (m->elog_main, e); + ed->stream_id = stream_id; + ed->local_sequence = local_sequence; + ed->retry_count = retry_count; +``` + +The ELOG\_DATA macro returns a pointer to 20 bytes worth of arbitrary +event data, to be formatted (offline, not at runtime) as described by +format\_args. Aside from obvious integer formats, the CLIB event logger +provides a couple of interesting additions. The "t4" format +pretty-prints enumerated values: + +```c + ELOG_TYPE_DECLARE (e) = + { + .format = "get_or_create: %s", + .format_args = "t4", + .n_enum_strings = 2, + .enum_strings = { "old", "new", }, + }; +``` + +The "t" format specifier indicates that the corresponding datum is an +index in the event's set of enumerated strings, as shown in the previous +event type definition. + +The “T” format specifier indicates that the corresponding datum is an +index in the event log’s string heap. This allows the programmer to emit +arbitrary formatted strings. One often combines this facility with a +hash table to keep the event-log string heap from growing arbitrarily +large. + +Noting the 20-octet limit per-log-entry data field, the event log +formatter supports arbitrary combinations of these data types. As in: +the ".format" field may contain one or more instances of the following: + +- i1 - 8-bit unsigned integer +- i2 - 16-bit unsigned integer +- i4 - 32-bit unsigned integer +- i8 - 64-bit unsigned integer +- f4 - float +- f8 - double +- s - NULL-terminated string - be careful +- sN - N-byte character array +- t1,2,4 - per-event enumeration ID +- T4 - Event-log string table offset + +The vpp engine event log is thread-safe, and is shared by all threads. +Take care not to serialize the computation. Although the event-logger is +about as fast as practicable, it's not appropriate for per-packet use in +hard-core data plane code. It's most appropriate for capturing rare +events - link up-down events, specific control-plane events and so +forth. + +The vpp engine has several debug CLI commands for manipulating its event +log: + +``` + vpp# event-logger clear + vpp# event-logger save <filename> # for security, writes into /tmp/<filename>. + # <filename> must not contain '.' or '/' characters + vpp# show event-logger [all] [<nnn>] # display the event log + # by default, the last 250 entries +``` + +The event log defaults to 128K entries. The command-line argument "... +vlib { elog-events nnn } ..." configures the size of the event log. + +As described above, the vpp engine event log is thread-safe and shared. +To avoid confusing non-appearance of events logged by worker threads, +make sure to code vlib\_global\_main.elog\_main - instead of +vm->elog\_main. The latter form is correct in the main thread, but +will almost certainly produce bad results in worker threads. + +G2 graphical event viewer +------------------------- + +The g2 graphical event viewer can display serialized vppinfra event logs +directly, or via the c2cpel tool. + +<div class="admonition note"> + +Todo: please convert wiki page and figures + +</div> + diff --git a/docs/gettingstarted/developers/plugins.md b/docs/gettingstarted/developers/plugins.md new file mode 100644 index 00000000000..ba3a2446306 --- /dev/null +++ b/docs/gettingstarted/developers/plugins.md @@ -0,0 +1,11 @@ + +Plugins +======= + +vlib implements a straightforward plug-in DLL mechanism. VLIB client +applications specify a directory to search for plug-in .DLLs, and a name +filter to apply (if desired). VLIB needs to load plug-ins very early. + +Once loaded, the plug-in DLL mechanism uses dlsym to find and verify a +vlib\_plugin\_registration data structure in the newly-loaded plug-in. + diff --git a/docs/gettingstarted/developers/softwarearchitecture.md b/docs/gettingstarted/developers/softwarearchitecture.md new file mode 100644 index 00000000000..a663134cd46 --- /dev/null +++ b/docs/gettingstarted/developers/softwarearchitecture.md @@ -0,0 +1,44 @@ +Software Architecture +===================== + +The fd.io vpp implementation is a third-generation vector packet +processing implementation specifically related to US Patent 7,961,636, +as well as earlier work. Note that the Apache-2 license specifically +grants non-exclusive patent licenses; we mention this patent as a point +of historical interest. + +For performance, the vpp dataplane consists of a directed graph of +forwarding nodes which process multiple packets per invocation. This +schema enables a variety of micro-processor optimizations: pipelining +and prefetching to cover dependent read latency, inherent I-cache phase +behavior, vector instructions. Aside from hardware input and hardware +output nodes, the entire forwarding graph is portable code. + +Depending on the scenario at hand, we often spin up multiple worker +threads which process ingress-hashes packets from multiple queues using +identical forwarding graph replicas. + +VPP Layers - Implementation Taxonomy +------------------------------------ + + + +- VPP Infra - the VPP infrastructure layer, which contains the core + library source code. This layer performs memory functions, works + with vectors and rings, performs key lookups in hash tables, and + works with timers for dispatching graph nodes. +- VLIB - the vector processing library. The vlib layer also handles + various application management functions: buffer, memory and graph + node management, maintaining and exporting counters, thread + management, packet tracing. Vlib implements the debug CLI (command + line interface). +- VNET - works with VPP\'s networking interface (layers 2, 3, and 4) + performs session and traffic management, and works with devices and + the data control plane. +- Plugins - Contains an increasingly rich set of data-plane plugins, + as noted in the above diagram. +- VPP - the container application linked against all of the above. + +It's important to understand each of these layers in a certain amount of +detail. Much of the implementation is best dealt with at the API level +and otherwise left alone. diff --git a/docs/gettingstarted/developers/vlib.md b/docs/gettingstarted/developers/vlib.md new file mode 100644 index 00000000000..9ef37fd2657 --- /dev/null +++ b/docs/gettingstarted/developers/vlib.md @@ -0,0 +1,496 @@ + +VLIB (Vector Processing Library) +================================ + +The files associated with vlib are located in the ./src/{vlib, +vlibapi, vlibmemory} folders. These libraries provide vector +processing support including graph-node scheduling, reliable multicast +support, ultra-lightweight cooperative multi-tasking threads, a CLI, +plug in .DLL support, physical memory and Linux epoll support. Parts of +this library embody US Patent 7,961,636. + +Init function discovery +----------------------- + +vlib applications register for various \[initialization\] events by +placing structures and \_\_attribute\_\_((constructor)) functions into +the image. At appropriate times, the vlib framework walks +constructor-generated singly-linked structure lists, calling the +indicated functions. vlib applications create graph nodes, add CLI +functions, start cooperative multi-tasking threads, etc. etc. using this +mechanism. + +vlib applications invariably include a number of VLIB\_INIT\_FUNCTION +(my\_init\_function) macros. + +Each init / configure / etc. function has the return type clib\_error\_t +\*. Make sure that the function returns 0 if all is well, otherwise the +framework will announce an error and exit. + +vlib applications must link against vppinfra, and often link against +other libraries such as VNET. In the latter case, it may be necessary to +explicitly reference symbol(s) otherwise large portions of the library +may be AWOL at runtime. + +Node Graph Initialization +------------------------- + +vlib packet-processing applications invariably define a set of graph +nodes to process packets. + +One constructs a vlib\_node\_registration\_t, most often via the +VLIB\_REGISTER\_NODE macro. At runtime, the framework processes the set +of such registrations into a directed graph. It is easy enough to add +nodes to the graph at runtime. The framework does not support removing +nodes. + +vlib provides several types of vector-processing graph nodes, primarily +to control framework dispatch behaviors. The type member of the +vlib\_node\_registration\_t functions as follows: + +- VLIB\_NODE\_TYPE\_PRE\_INPUT - run before all other node types +- VLIB\_NODE\_TYPE\_INPUT - run as often as possible, after pre\_input + nodes +- VLIB\_NODE\_TYPE\_INTERNAL - only when explicitly made runnable by + adding pending frames for processing +- VLIB\_NODE\_TYPE\_PROCESS - only when explicitly made runnable. + "Process" nodes are actually cooperative multi-tasking threads. They + **must** explicitly suspend after a reasonably short period of time. + +For a precise understanding of the graph node dispatcher, please read +./src/vlib/main.c:vlib\_main\_loop. + +Graph node dispatcher +--------------------- + +Vlib\_main\_loop() dispatches graph nodes. The basic vector processing +algorithm is diabolically simple, but may not be obvious from even a +long stare at the code. Here's how it works: some input node, or set of +input nodes, produce a vector of work to process. The graph node +dispatcher pushes the work vector through the directed graph, +subdividing it as needed, until the original work vector has been +completely processed. At that point, the process recurs. + +This scheme yields a stable equilibrium in frame size, by construction. +Here's why: as the frame size increases, the per-frame-element +processing time decreases. There are several related forces at work; the +simplest to describe is the effect of vector processing on the CPU L1 +I-cache. The first frame element \[packet\] processed by a given node +warms up the node dispatch function in the L1 I-cache. All subsequent +frame elements profit. As we increase the number of frame elements, the +cost per element goes down. + +Under light load, it is a crazy waste of CPU cycles to run the graph +node dispatcher flat-out. So, the graph node dispatcher arranges to wait +for work by sitting in a timed epoll wait if the prevailing frame size +is low. The scheme has a certain amount of hysteresis to avoid +constantly toggling back and forth between interrupt and polling mode. +Although the graph dispatcher supports interrupt and polling modes, our +current default device drivers do not. + +The graph node scheduler uses a hierarchical timer wheel to reschedule +process nodes upon timer expiration. + +Graph dispatcher internals +-------------------------- + +This section may be safely skipped. It's not necessary to understand +graph dispatcher internals to create graph nodes. + +Vector Data Structure +--------------------- + +In vpp / vlib, we represent vectors as instances of the vlib_frame_t type: + +```c + typedef struct vlib_frame_t + { + /* Frame flags. */ + u16 flags; + + /* Number of scalar bytes in arguments. */ + u8 scalar_size; + + /* Number of bytes per vector argument. */ + u8 vector_size; + + /* Number of vector elements currently in frame. */ + u16 n_vectors; + + /* Scalar and vector arguments to next node. */ + u8 arguments[0]; + } vlib_frame_t; +``` + +Note that one _could_ construct all kinds of vectors - including +vectors with some associated scalar data - using this structure. In +the vpp application, vectors typically use a 4-byte vector element +size, and zero bytes' worth of associated per-frame scalar data. + +Frames are always allocated on CLIB_CACHE_LINE_BYTES boundaries. +Frames have u32 indices which make use of the alignment property, so +the maximum feasible main heap offset of a frame is +CLIB_CACHE_LINE_BYTES * 0xFFFFFFFF: 64*4 = 256 Gbytes. + +Scheduling Vectors +------------------ + +As you can see, vectors are not directly associated with graph +nodes. We represent that association in a couple of ways. The +simplest is the vlib\_pending\_frame\_t: + +```c + /* A frame pending dispatch by main loop. */ + typedef struct + { + /* Node and runtime for this frame. */ + u32 node_runtime_index; + + /* Frame index (in the heap). */ + u32 frame_index; + + /* Start of next frames for this node. */ + u32 next_frame_index; + + /* Special value for next_frame_index when there is no next frame. */ + #define VLIB_PENDING_FRAME_NO_NEXT_FRAME ((u32) ~0) + } vlib_pending_frame_t; +``` + +Here is the code in .../src/vlib/main.c:vlib_main_or_worker_loop() +which processes frames: + +```c + /* + * Input nodes may have added work to the pending vector. + * Process pending vector until there is nothing left. + * All pending vectors will be processed from input -> output. + */ + for (i = 0; i < _vec_len (nm->pending_frames); i++) + cpu_time_now = dispatch_pending_node (vm, i, cpu_time_now); + /* Reset pending vector for next iteration. */ +``` + +The pending frame node_runtime_index associates the frame with the +node which will process it. + +Complications +------------- + +Fasten your seatbelt. Here's where the story - and the data structures +\- become quite complicated... + +At 100,000 feet: vpp uses a directed graph, not a directed _acyclic_ +graph. It's really quite normal for a packet to visit ip\[46\]-lookup +multiple times. The worst-case: a graph node which enqueues packets to +itself. + +To deal with this issue, the graph dispatcher must force allocation of +a new frame if the current graph node's dispatch function happens to +enqueue a packet back to itself. + +There are no guarantees that a pending frame will be processed +immediately, which means that more packets may be added to the +underlying vlib_frame_t after it has been attached to a +vlib_pending_frame_t. Care must be taken to allocate new +frames and pending frames if a (pending\_frame, frame) pair fills. + +Next frames, next frame ownership +--------------------------------- + +The vlib\_next\_frame\_t is the last key graph dispatcher data structure: + +```c + typedef struct + { + /* Frame index. */ + u32 frame_index; + + /* Node runtime for this next. */ + u32 node_runtime_index; + + /* Next frame flags. */ + u32 flags; + + /* Reflects node frame-used flag for this next. */ + #define VLIB_FRAME_NO_FREE_AFTER_DISPATCH \ + VLIB_NODE_FLAG_FRAME_NO_FREE_AFTER_DISPATCH + + /* This next frame owns enqueue to node + corresponding to node_runtime_index. */ + #define VLIB_FRAME_OWNER (1 << 15) + + /* Set when frame has been allocated for this next. */ + #define VLIB_FRAME_IS_ALLOCATED VLIB_NODE_FLAG_IS_OUTPUT + + /* Set when frame has been added to pending vector. */ + #define VLIB_FRAME_PENDING VLIB_NODE_FLAG_IS_DROP + + /* Set when frame is to be freed after dispatch. */ + #define VLIB_FRAME_FREE_AFTER_DISPATCH VLIB_NODE_FLAG_IS_PUNT + + /* Set when frame has traced packets. */ + #define VLIB_FRAME_TRACE VLIB_NODE_FLAG_TRACE + + /* Number of vectors enqueue to this next since last overflow. */ + u32 vectors_since_last_overflow; + } vlib_next_frame_t; +``` + +Graph node dispatch functions call vlib\_get\_next\_frame (...) to +set "(u32 \*)to_next" to the right place in the vlib_frame_t +corresponding to the ith arc (aka next0) from the current node to the +indicated next node. + +After some scuffling around - two levels of macros - processing +reaches vlib\_get\_next\_frame_internal (...). Get-next-frame-internal +digs up the vlib\_next\_frame\_t corresponding to the desired graph +arc. + +The next frame data structure amounts to a graph-arc-centric frame +cache. Once a node finishes adding element to a frame, it will acquire +a vlib_pending_frame_t and end up on the graph dispatcher's +run-queue. But there's no guarantee that more vector elements won't be +added to the underlying frame from the same (source\_node, +next\_index) arc or from a different (source\_node, next\_index) arc. + +Maintaining consistency of the arc-to-frame cache is necessary. The +first step in maintaining consistency is to make sure that only one +graph node at a time thinks it "owns" the target vlib\_frame\_t. + +Back to the graph node dispatch function. In the usual case, a certain +number of packets will be added to the vlib\_frame\_t acquired by +calling vlib\_get\_next\_frame (...). + +Before a dispatch function returns, it's required to call +vlib\_put\_next\_frame (...) for all of the graph arcs it actually +used. This action adds a vlib\_pending\_frame\_t to the graph +dispatcher's pending frame vector. + +Vlib\_put\_next\_frame makes a note in the pending frame of the frame +index, and also of the vlib\_next\_frame\_t index. + +dispatch\_pending\_node actions +------------------------------- + +The main graph dispatch loop calls dispatch pending node as shown +above. + +Dispatch\_pending\_node recovers the pending frame, and the graph node +runtime / dispatch function. Further, it recovers the next\_frame +currently associated with the vlib\_frame\_t, and detaches the +vlib\_frame\_t from the next\_frame. + +In .../src/vlib/main.c:dispatch\_pending\_node(...), note this stanza: + +```c + /* Force allocation of new frame while current frame is being + dispatched. */ + restore_frame_index = ~0; + if (nf->frame_index == p->frame_index) + { + nf->frame_index = ~0; + nf->flags &= ~VLIB_FRAME_IS_ALLOCATED; + if (!(n->flags & VLIB_NODE_FLAG_FRAME_NO_FREE_AFTER_DISPATCH)) + restore_frame_index = p->frame_index; + } +``` + +dispatch\_pending\_node is worth a hard stare due to the several +second-order optimizations it implements. Almost as an afterthought, +it calls dispatch_node which actually calls the graph node dispatch +function. + +Process / thread model +---------------------- + +vlib provides an ultra-lightweight cooperative multi-tasking thread +model. The graph node scheduler invokes these processes in much the same +way as traditional vector-processing run-to-completion graph nodes; +plus-or-minus a setjmp/longjmp pair required to switch stacks. Simply +set the vlib\_node\_registration\_t type field to +vlib\_NODE\_TYPE\_PROCESS. Yes, process is a misnomer. These are +cooperative multi-tasking threads. + +As of this writing, the default stack size is 2<<15 = 32kb. +Initialize the node registration's process\_log2\_n\_stack\_bytes member +as needed. The graph node dispatcher makes some effort to detect stack +overrun, e.g. by mapping a no-access page below each thread stack. + +Process node dispatch functions are expected to be "while(1) { }" loops +which suspend when not otherwise occupied, and which must not run for +unreasonably long periods of time. + +"Unreasonably long" is an application-dependent concept. Over the years, +we have constructed frame-size sensitive control-plane nodes which will +use a much higher fraction of the available CPU bandwidth when the frame +size is low. The classic example: modifying forwarding tables. So long +as the table-builder leaves the forwarding tables in a valid state, one +can suspend the table builder to avoid dropping packets as a result of +control-plane activity. + +Process nodes can suspend for fixed amounts of time, or until another +entity signals an event, or both. See the next section for a description +of the vlib process event mechanism. + +When running in vlib process context, one must pay strict attention to +loop invariant issues. If one walks a data structure and calls a +function which may suspend, one had best know by construction that it +cannot change. Often, it's best to simply make a snapshot copy of a data +structure, walk the copy at leisure, then free the copy. + +Process events +-------------- + +The vlib process event mechanism API is extremely lightweight and easy +to use. Here is a typical example: + +```c + vlib_main_t *vm = &vlib_global_main; + uword event_type, * event_data = 0; + + while (1) + { + vlib_process_wait_for_event_or_clock (vm, 5.0 /* seconds */); + + event_type = vlib_process_get_events (vm, &event_data); + + switch (event_type) { + case EVENT1: + handle_event1s (event_data); + break; + + case EVENT2: + handle_event2s (event_data); + break; + + case ~0: /* 5-second idle/periodic */ + handle_idle (); + break; + + default: /* bug! */ + ASSERT (0); + } + + vec_reset_length(event_data); + } +``` + +In this example, the VLIB process node waits for an event to occur, or +for 5 seconds to elapse. The code demuxes on the event type, calling +the appropriate handler function. Each call to +vlib\_process\_get\_events returns a vector of per-event-type data +passed to successive vlib\_process\_signal\_event calls; it is a +serious error to process only event\_data\[0\]. + +Resetting the event\_data vector-length to 0 \[instead of calling +vec\_free\] means that the event scheme doesn't burn cycles continuously +allocating and freeing the event data vector. This is a common vppinfra +/ vlib coding pattern, well worth using when appropriate. + +Signaling an event is easy, for example: + +```c + vlib_process_signal_event (vm, process_node_index, EVENT1, + (uword)arbitrary_event1_data); /* and so forth */ +``` + +One can either know the process node index by construction - dig it out +of the appropriate vlib\_node\_registration\_t - or by finding the +vlib\_node\_t with vlib\_get\_node\_by\_name(...). + +Buffers +------- + +vlib buffering solves the usual set of packet-processing problems, +albeit at high performance. Key in terms of performance: one ordinarily +allocates / frees N buffers at a time rather than one at a time. Except +when operating directly on a specific buffer, one deals with buffers by +index, not by pointer. + +Packet-processing frames are u32\[\] arrays, not +vlib\_buffer\_t\[\] arrays. + +Packets comprise one or more vlib buffers, chained together as required. +Multiple particle sizes are supported; hardware input nodes simply ask +for the required size(s). Coalescing support is available. For obvious +reasons one is discouraged from writing one's own wild and wacky buffer +chain traversal code. + +vlib buffer headers are allocated immediately prior to the buffer data +area. In typical packet processing this saves a dependent read wait: +given a buffer's address, one can prefetch the buffer header +\[metadata\] at the same time as the first cache line of buffer data. + +Buffer header metadata (vlib\_buffer\_t) includes the usual rewrite +expansion space, a current\_data offset, RX and TX interface indices, +packet trace information, and a opaque areas. + +The opaque data is intended to control packet processing in arbitrary +subgraph-dependent ways. The programmer shoulders responsibility for +data lifetime analysis, type-checking, etc. + +Buffers have reference-counts in support of e.g. multicast replication. + +Shared-memory message API +------------------------- + +Local control-plane and application processes interact with the vpp +dataplane via asynchronous message-passing in shared memory over +unidirectional queues. The same application APIs are available via +sockets. + +Capturing API traces and replaying them in a simulation environment +requires a disciplined approach to the problem. This seems like a +make-work task, but it is not. When something goes wrong in the +control-plane after 300,000 or 3,000,000 operations, high-speed replay +of the events leading up to the accident is a huge win. + +The shared-memory message API message allocator vl\_api\_msg\_alloc uses +a particularly cute trick. Since messages are processed in order, we try +to allocate message buffering from a set of fixed-size, preallocated +rings. Each ring item has a "busy" bit. Freeing one of the preallocated +message buffers merely requires the message consumer to clear the busy +bit. No locking required. + +Debug CLI +--------- + +Adding debug CLI commands to VLIB applications is very simple. + +Here is a complete example: + +```c + static clib_error_t * + show_ip_tuple_match (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) + { + vlib_cli_output (vm, "%U\n", format_ip_tuple_match_tables, &routing_main); + return 0; + } + + /* *INDENT-OFF* */ + static VLIB_CLI_COMMAND (show_ip_tuple_command) = + { + .path = "show ip tuple match", + .short_help = "Show ip 5-tuple match-and-broadcast tables", + .function = show_ip_tuple_match, + }; + /* *INDENT-ON* */ +``` + +This example implements the "show ip tuple match" debug cli +command. In ordinary usage, the vlib cli is available via the "vppctl" +applicationn, which sends traffic to a named pipe. One can configure +debug CLI telnet access on a configurable port. + +The cli implementation has an output redirection facility which makes it +simple to deliver cli output via shared-memory API messaging, + +Particularly for debug or "show tech support" type commands, it would be +wasteful to write vlib application code to pack binary data, write more +code elsewhere to unpack the data and finally print the answer. If a +certain cli command has the potential to hurt packet processing +performance by running for too long, do the work incrementally in a +process node. The client can wait. diff --git a/docs/gettingstarted/developers/vnet.md b/docs/gettingstarted/developers/vnet.md new file mode 100644 index 00000000000..191a2a16969 --- /dev/null +++ b/docs/gettingstarted/developers/vnet.md @@ -0,0 +1,171 @@ + +VNET (VPP Network Stack) +======================== + +The files associated with the VPP network stack layer are located in the +./src/vnet folder. The Network Stack Layer is basically an +instantiation of the code in the other layers. This layer has a vnet +library that provides vectorized layer-2 and 3 networking graph nodes, a +packet generator, and a packet tracer. + +In terms of building a packet processing application, vnet provides a +platform-independent subgraph to which one connects a couple of +device-driver nodes. + +Typical RX connections include "ethernet-input" \[full software +classification, feeds ipv4-input, ipv6-input, arp-input etc.\] and +"ipv4-input-no-checksum" \[if hardware can classify, perform ipv4 header +checksum\]. + + + +List of features and layer areas that VNET works with: + +Effective graph dispatch function coding +---------------------------------------- + +Over the 15 years, multiple coding styles have emerged: a +single/dual/quad loop coding model (with variations) and a +fully-pipelined coding model. + +Single/dual loops +----------------- + +The single/dual/quad loop model variations conveniently solve problems +where the number of items to process is not known in advance: typical +hardware RX-ring processing. This coding style is also very effective +when a given node will not need to cover a complex set of dependent +reads. + +Here is an quad/single loop which can leverage up-to-avx512 SIMD vector +units to convert buffer indices to buffer pointers: + +```c + static uword + simulated_ethernet_interface_tx (vlib_main_t * vm, + vlib_node_runtime_t * + node, vlib_frame_t * frame) + { + u32 n_left_from, *from; + u32 next_index = 0; + u32 n_bytes; + u32 thread_index = vm->thread_index; + vnet_main_t *vnm = vnet_get_main (); + vnet_interface_main_t *im = &vnm->interface_main; + vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b; + u16 nexts[VLIB_FRAME_SIZE], *next; + + n_left_from = frame->n_vectors; + from = vlib_frame_args (frame); + + /* + * Convert up to VLIB_FRAME_SIZE indices in "from" to + * buffer pointers in bufs[] + */ + vlib_get_buffers (vm, from, bufs, n_left_from); + b = bufs; + next = nexts; + + /* + * While we have at least 4 vector elements (pkts) to process.. + */ + while (n_left_from >= 4) + { + /* Prefetch next quad-loop iteration. */ + if (PREDICT_TRUE (n_left_from >= 8)) + { + vlib_prefetch_buffer_header (b[4], STORE); + vlib_prefetch_buffer_header (b[5], STORE); + vlib_prefetch_buffer_header (b[6], STORE); + vlib_prefetch_buffer_header (b[7], STORE); + } + + /* + * $$$ Process 4x packets right here... + * set next[0..3] to send the packets where they need to go + */ + + do_something_to (b[0]); + do_something_to (b[1]); + do_something_to (b[2]); + do_something_to (b[3]); + + /* Process the next 0..4 packets */ + b += 4; + next += 4; + n_left_from -= 4; + } + /* + * Clean up 0...3 remaining packets at the end of the incoming frame + */ + while (n_left_from > 0) + { + /* + * $$$ Process one packet right here... + * set next[0..3] to send the packets where they need to go + */ + do_something_to (b[0]); + + /* Process the next packet */ + b += 1; + next += 1; + n_left_from -= 1; + } + + /* + * Send the packets along their respective next-node graph arcs + * Considerable locality of reference is expected, most if not all + * packets in the inbound vector will traverse the same next-node + * arc + */ + vlib_buffer_enqueue_to_next (vm, node, from, nexts, frame->n_vectors); + + return frame->n_vectors; + } +``` + +Given a packet processing task to implement, it pays to scout around +looking for similar tasks, and think about using the same coding +pattern. It is not uncommon to recode a given graph node dispatch function +several times during performance optimization. + +Packet tracer +------------- + +Vlib includes a frame element \[packet\] trace facility, with a simple +vlib cli interface. The cli is straightforward: "trace add +input-node-name count". + +To trace 100 packets on a typical x86\_64 system running the dpdk +plugin: "trace add dpdk-input 100". When using the packet generator: +"trace add pg-input 100" + +Each graph node has the opportunity to capture its own trace data. It is +almost always a good idea to do so. The trace capture APIs are simple. + +The packet capture APIs snapshoot binary data, to minimize processing at +capture time. Each participating graph node initialization provides a +vppinfra format-style user function to pretty-print data when required +by the VLIB "show trace" command. + +Set the VLIB node registration ".format\_trace" member to the name of +the per-graph node format function. + +Here's a simple example: + +```c + u8 * my_node_format_trace (u8 * s, va_list * args) + { + vlib_main_t * vm = va_arg (*args, vlib_main_t *); + vlib_node_t * node = va_arg (*args, vlib_node_t *); + my_node_trace_t * t = va_arg (*args, my_trace_t *); + + s = format (s, "My trace data was: %d", t-><whatever>); + + return s; + } +``` + +The trace framework hands the per-node format function the data it +captured as the packet whizzed by. The format function pretty-prints the +data as desired. diff --git a/docs/gettingstarted/index.rst b/docs/gettingstarted/index.rst new file mode 100644 index 00000000000..754796b670b --- /dev/null +++ b/docs/gettingstarted/index.rst @@ -0,0 +1,12 @@ +.. _gettingstarted: + +############### +Getting Started +############### + +.. toctree:: + :maxdepth: 2 + + users/index.rst + developers/index.rst + writingdocs/index.rst diff --git a/docs/gettingstarted/users/configuring/hugepages.rst b/docs/gettingstarted/users/configuring/hugepages.rst new file mode 100644 index 00000000000..42f6aa30282 --- /dev/null +++ b/docs/gettingstarted/users/configuring/hugepages.rst @@ -0,0 +1,61 @@ +.. _hugepages: + +Huge Pages +---------- + +VPP requires *'hugepages'* to run. VPP will overwrite existing hugepage +settings when VPP is installed. By default, VPP sets the number of hugepages on +a system to 1024 2M hugepages (1G hugepages are no longer supported). This is +the number of hugepages on the system, not just used by VPP. When VPP is +installed, the following file is copied to the system and used to apply the +hugepage settings on VPP installation and system reboot: + +.. code-block:: console + + $ cat /etc/sysctl.d/80-vpp.conf + # Number of 2MB hugepages desired + vm.nr_hugepages=1024 + + # Must be greater than or equal to (2 * vm.nr_hugepages). + vm.max_map_count=3096 + + # All groups allowed to access hugepages + vm.hugetlb_shm_group=0 + + # Shared Memory Max must be greator or equal to the total size of hugepages. + # For 2MB pages, TotalHugepageSize = vm.nr_hugepages * 2 * 1024 * 1024 + # If the existing kernel.shmmax setting (cat /sys/proc/kernel/shmmax) + # is greater than the calculated TotalHugepageSize then set this parameter + # to current shmmax value. + kernel.shmmax=2147483648 + +Depending on how the system is being used, this file can be updated to adjust +the number of hugepages reserved on a system. Below are some examples of +possible values. + +For a small VM with minimal workload: + +.. code-block:: console + + vm.nr_hugepages=512 + vm.max_map_count=2048 + kernel.shmmax=1073741824 + +For a large system running multiple VMs, each needing its own set of hugepages: + +.. code-block:: console + + vm.nr_hugepages=32768 + vm.max_map_count=66560 + kernel.shmmax=68719476736 + + +.. note:: + + If VPP is being run in a Virtual Machine (VM), the VM must have hugepage + backing. When VPP is installed, it will attempt to overwrite existing + hugepage setting. If the VM does not have hugepage backing, this will fail, + but this may go unnoticed. When the VM is rebooted, on system startup, + *'vm.nr_hugepages'* will be reapplied, will fail, and the VM will abort kernel + boot, locking up the VM. To avoid this scenario, ensure the VM has enough + hugepage backing. diff --git a/docs/gettingstarted/users/configuring/index.rst b/docs/gettingstarted/users/configuring/index.rst new file mode 100644 index 00000000000..75c5276d8a5 --- /dev/null +++ b/docs/gettingstarted/users/configuring/index.rst @@ -0,0 +1,13 @@ +.. _configuring: + +Configuring VPP +=============== + +There is some basic configuration that is need to run FD.io VPP. This section +will describe some basic configuration. + +.. toctree:: + :maxdepth: 2 + + hugepages + startup diff --git a/docs/gettingstarted/users/configuring/startup.rst b/docs/gettingstarted/users/configuring/startup.rst new file mode 100644 index 00000000000..7dd2c996a80 --- /dev/null +++ b/docs/gettingstarted/users/configuring/startup.rst @@ -0,0 +1,1477 @@ +.. _startup: + + +.. toctree:: + + +======================================= +VPP Configuration File - 'startup.conf' +======================================= + + +After a successful installation, VPP installs a startup config file named +*'startup.conf'* in the *'/etc/vpp/'*' directory. This file can be tailored to +make VPP run as desired, but contains default values for typical installations. +Below are more details about this file and parameter and values it contains. + +Introduction +------------ + +The VPP network stack comes with several configuration options that can be +provided either on the command line when VPP is started, or in a configuration +file. Specific applications built on the stack have been known to require a dozen +arguments, depending on requirements. + +Command-line Arguments +---------------------- + +Parameters are grouped by a section name. When providing more than one +parameter to a section, all parameters for that section must be wrapped in +curly braces. For example, to start VPP with configuration data via the +command line with the section name *'unix'*: + +.. code-block:: console + + $ sudo /usr/bin/vpp unix { interactive cli-listen 127.0.0.1:5002 } + +The command line can be presented as a single string or as several; anything +given on the command line is concatenated with spaces into a single string +before parsing. VPP applications must be able to locate their own executable +images. The simplest way to ensure this will work is to invoke a VPP +application by giving its absolute path. For example: +*'/usr/bin/vpp <options>'* At startup, VPP applications parse through their +own ELF-sections [primarily] to make lists of init, configuration, and exit +handlers. + +When developing with VPP, in gdb it's often sufficient to start an application +like this: + +.. code-block:: console + + (gdb) run unix interactive + +Configuration File +------------------ + +It is also possible to supply the configuration parameters in a startup +configuration. The path of the file is provided to the VPP application on its +command line. The format of the configuration file is a simple text file with +the same content as the command line, but with the benefit of being able to use +newlines to make the content easier to read. For example: + +.. code-block:: console + + $ cat /etc/vpp/startup.conf + unix { + nodaemon + log /var/log/vpp/vpp.log + full-coredump + cli-listen localhost:5002 + } + + api-trace { + on + } + + dpdk { + dev 0000:03:00.0 + } + +VPP is then instructed to load this file with the -c option. For example: + +.. code-block:: console + + $ sudo /usr/bin/vpp -c /etc/vpp/startup.conf + +When the VPP service is started, VPP is started with this option via another +installed file, vpp.service (Ubuntu: /lib/systemd/system/vpp.service and +CentOS: /usr/lib/systemd/system/vpp.service). See *'ExecStart'* below: + +.. code-block:: console + + $ cat /lib/systemd/system/vpp.service + [Unit] + Description=vector packet processing engine + After=network.target + + [Service] + Type=simple + ExecStartPre=-/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api + ExecStartPre=-/sbin/modprobe uio_pci_generic + ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf + ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api + Restart=always + + [Install] + WantedBy=multi-user.target + + +Configuration Parameters +------------------------ + +Below is the list of section names and their associated parameters. This is not +an exhaustive list of parameters available. The command-line argument parsers +can be found in the source code by searching for instances of the +**VLIB_CONFIG_FUNCTION** and **VLIB_EARLY_CONFIG_FUNCTION** macro. + +For example, the invocation *'VLIB_CONFIG_FUNCTION (foo_config, "foo")'* will +cause the function *'foo_config'* to receive all parameters given in a +parameter block named "foo": "foo { arg1 arg2 arg3 ... }". + + +List of Basic Parameters: +------------------------- + +| unix_ +| dpdk_ +| cpu_ + +List of Advanced Parameters: +---------------------------- + +| acl-plugin_ +| api-queue_ +| api-segment_ +| api-trace_ +| buffers_ +| cj_ +| dns_ +| heapsize_ +| ip_ +| ip6_ +| l2learn_ +| l2tp_ +| logging_ +| mactime_ +| map_ +| mc_ +| nat_ +| oam_ +| plugins_ +| plugin_path_ +| punt_ +| session_ +| socketsvr_ +| stats_ +| statseg_ +| tapcli_ +| tcp_ +| tls_ +| tuntap_ +| vhost-user_ +| vlib_ + +.. _unix: + +"unix" Parameters +_________________ + +Configure VPP startup and behavior type attributes, as well and any OS based +attributes. + + * **interactive** + Attach CLI to stdin/out and provide a debugging command line interface. + Implies nodaemon. + + **Example:** interactive + + * **nodaemon** + Do not fork / background the vpp process. Typical when invoking VPP + applications from a process monitor. Set by default in the default + *'startup.conf'* file. + + **Example:** nodaemon + + * **log <filename>** + Logs the startup configuration and all subsequent CLI commands in filename. + Very useful in situations where folks don't remember or can't be bothered + to include CLI commands in bug reports. The default *'startup.conf'* file + is to write to *'/var/log/vpp/vpp.log'*. + + In VPP 18.04, the default log file location was moved from '/tmp/vpp.log' + to '/var/log/vpp/vpp.log' . The VPP code is indifferent to the file location. + However, if SELinux is enabled, then the new location is required for the file + to be properly labeled. Check your local *'startup.conf'* file for the log file + location on your system. + + **Example:** log /var/log/vpp/vpp-debug.log + + * **exec|startup-config <filename>** + Read startup operational configuration from filename. The contents of the file + will be performed as though entered at the CLI. The two keywords are aliases + for the same function; if both are specified, only the last will have an effect. + The file contains CLI commands, for example: + + | $ cat /usr/share/vpp/scripts/interface-up.txt + | set interface state TenGigabitEthernet1/0/0 up + | set interface state TenGigabitEthernet1/0/1 up + + **Example:** startup-config /usr/share/vpp/scripts/interface-up.txt + + * **gid number|name>** + Sets the effective group ID to the input group ID or group name of the calling + process. + + **Example:** gid vpp + + * **full-coredump** + Ask the Linux kernel to dump all memory-mapped address regions, instead of + just text+data+bss. + + **Example:** full-coredump + + * **coredump-size unlimited|<n>G|<n>M|<n>K|<n>** + Set the maximum size of the coredump file. The input value can be set in + GB, MB, KB or bytes, or set to *'unlimited'*. + + **Example:** coredump-size unlimited + + * **cli-listen <ipaddress:port>|<socket-path>** + Bind the CLI to listen at address localhost on TCP port 5002. This will + accept an ipaddress:port pair or a filesystem path; in the latter case a + local Unix socket is opened instead. The default *'startup.conf'* file + is to open the socket *'/run/vpp/cli.sock'*. + + **Example:** cli-listen localhost:5002 + **Example:** cli-listen /run/vpp/cli.sock + + * **cli-line-mode** + Disable character-by-character I/O on stdin. Useful when combined with, + for example, emacs M-x gud-gdb. + + **Example:** cli-line-mode + + * **cli-prompt <string>** + Configure the CLI prompt to be string. + + **Example:** cli-prompt vpp-2 + + * **cli-history-limit <n>** + Limit commmand history to <n> lines. A value of 0 disables command history. + Default value: 50 + + **Example:** cli-history-limit 100 + + * **cli-no-banner** + Disable the login banner on stdin and Telnet connections. + + **Example:** cli-no-banner + + * **cli-no-pager** + Disable the output pager. + + **Example:** cli-no-pager + + * **cli-pager-buffer-limit <n>** + Limit pager buffer to <n> lines of output. A value of 0 disables the + pager. Default value: 100000 + + **Example:** cli-pager-buffer-limit 5000 + + * **runtime-dir <dir>** + Set the runtime directory, which is the default location for certain + files, like socket files. Default is based on User ID used to start VPP. + Typically it is *'root'*, which defaults to *'/run/vpp/'*. Otherwise, + defaults to *'/run/user/<uid>/vpp/'*. + + **Example:** runtime-dir /tmp/vpp + + * **poll-sleep-usec <n>** + Add a fixed-sleep between main loop poll. Default is 0, which is not to + sleep. + + **Example:** poll-sleep-usec 100 + + * **pidfile <filename>** + Writes the pid of the main thread in the given filename. + + **Example:** pidfile /run/vpp/vpp1.pid + +.. _dpdk: + +"dpdk" Parameters +_________________ + +Command line DPDK configuration controls a number of parameters, including +device whitelisting, the number of CPUs available for launching +dpdk-eal-controlled threads, the number of I/O buffers, and the process +affinity mask. In addition, the DPDK configuration function attempts to support +all of the DPDK EAL configuration parameters. + +All of the DPDK EAL options should be available. +See ../src/plugins/dpdk/device/dpdk_priv.h, look at the set of +"foreach_eal_XXX" macros. + +Popular options include: + * **dev <pci-dev>** + White-list [as in, attempt to drive] a specific PCI device. PCI-dev is a + string of the form "DDDD:BB:SS.F" where: + + | DDDD = Domain + | BB = Bus Number + | SS = Slot number + | F = Function + + This is the same format used in the linux sysfs tree (i.e. + /sys/bus/pci/devices) for PCI device directory names. + + **Example:** dev 0000:02:00.0 + + * **dev <pci-dev> { .. }** + When whitelisting specific interfaces by specifying PCI address, + additional custom parameters can also be specified. Valid options include: + + * **num-rx-queues <n>** + Number of receive queues. Also enables RSS. Default value is 1. + * **num-tx-queues <n>** + Number of transmit queues. Default is equal to number of worker + threads or 1 if no workers treads. + * **num-rx-desc <n>** + Number of descriptors in receive ring. Increasing or reducing number + can impact performance. Default is 1024. + * **num-rt-desc <n>** + Number of descriptors in transmit ring. Increasing or reducing number + can impact performance. Default is 1024. + * **workers** + TBD + * **vlan-strip-offload on|off**: + VLAN strip offload mode for interface. VLAN stripping is off by default + for all NICs except VICs, using ENIC driver, which has VLAN stripping on + by default. + * **hqos** + Enable the Hierarchical Quaity-of-Service (HQoS) scheduler, default is + disabled. This enables HQoS on specific output interface. + * **hqos { .. }** + HQoS can also have its own set of custom parameters. Setting a custom + parameter also enables HQoS. + + * **hqos-thread <n>** + HQoS thread used by this interface. To setup a pool of threads that + are shared by all HQoS interfaces, set via the*'cpu'* section using + either *'corelist-hqos-threads'* or *'coremask-hqos-threads'*. + + * **rss** + TBD + + **Example:** + + | dev 0000:02:00.1 { + | num-rx-queues 2 + | num-tx-queues 2 + | } + + * **vdev <eal-command>** + Provide a DPDK EAL command to specify bonded Ethernet interfaces, operating + modes and PCI addresses of slave links. Only XOR balanced (mode 2) mode is + supported. + + **Example:** + + | vdev eth_bond0,mode=2,slave=0000:0f:00.0,slave=0000:11:00.0,xmit_policy=l34 + | vdev eth_bond1,mode=2,slave=0000:10:00.0,slave=0000:12:00.0,xmit_policy=l34 + + * **num-mbufs <n>** + Increase number of buffers allocated. May be needed in scenarios with + large number of interfaces and worker threads, or a lot of physical + interfaces with multiple RSS queues. Value is per CPU socket. Default is + 16384. + + **Example:** num-mbufs 128000 + + * **no-pci** + When VPP is started, if an interface is not owned by the linux kernel + (interface is administratively down), VPP will attempt to manage the + interface. *'no-pci'* indicates that VPP should not walk the PCI table + looking for interfaces. + + **Example:** no-pci + + * **no-hugetlb** + Don't use huge TLB pages. Potentially useful for running simulator images. + + **Example:** no-hugetlb + + * **kni <n>** + Number of KNI interfaces. Refer to the DPDK documentation. + + **Example:** kni 2 + + * **uio-driver uio_pci_generic|igb_uio|vfio-pci|auto** + Change UIO driver used by VPP. Default is *'auto'*. + + **Example:** uio-driver igb_uio + + * **socket-mem <n>** + Change hugepages allocation per-socket, needed only if there is need for + larger number of mbufs. Default is 64 hugepages on each detected CPU + socket. + + **Example:** socket-mem 2048,2048 + +**Other options include:** + + * **enable-tcp-udp-checksum** + Enables UDP/TCP RX checksum offload. + + **Example:** enable-tcp-udp-checksum + + * **no-multi-seg** + Disable mutli-segment buffers, improves performance but disables Jumbo MTU + support. + + **Example:** no-multi-seg + + * **no-tx-checksum-offload** + Disables UDP/TCP TX checksum offload. Typically needed for use faster + vector PMDs (together with no-multi-seg). + + **Example:** no-tx-checksum-offload + + * **decimal-interface-names** + Format DPDK device names with decimal, as opposed to hexadecimal. + + **Example:** decimal-interface-names + + * **log-level emergency|alert|critical|error|warning|notice|info|debug** + Set the log level for DPDK logs. Default is *'notice'*. + + **Example:** log-level error + + * **dev default { .. }** + Change default settings for all intefaces. This sections supports the + same set of custom parameters described in *'dev <pci-dev> { .. }*'. + + **Example:** + + | dev default { + | num-rx-queues 3 + | num-tx-queues 3 + | } + +.. _cpu: + +"cpu" Parameters +________________ + +Command-line CPU configuration controls the creation of named thread types, and +the cpu affinity thereof. In the VPP there is one main thread and optionally +the user can create worker(s). The main thread and worker thread(s) can be +pinned to CPU core(s) automatically or manually. + +**Automatic Pinning:** + + * **workers <n>** + Create <n> worker threads. + + **Example:** workers 4 + + * **io <n>** + Create <n> i/o threads. + + **Example:** io 2 + + * **main-thread-io** + Handle i/o devices from thread 0, hand off traffic to worker threads. + Requires "workers <n>". + + **Example:** main-thread-io + + * **skip-cores <n>** + Sets number of CPU core(s) to be skipped (1 ... N-1). Skipped CPU core(s) + are not used for pinning main thread and working thread(s). The main thread + is automatically pinned to the first available CPU core and worker(s) are + pinned to next free CPU core(s) after core assigned to main threadLeave + the low nn bits of the process affinity mask clear. + + **Example:** skip-cores 4 + +**Manual Pinning:** + + * **main-core <n>** + Assign main thread to a specific core. + + **Example:** main-core 1 + + * **coremask-workers <hex-mask>** + Place worker threads according to the bitmap hex-mask. + + **Example:** coremask-workers 0x0000000000C0000C + + * **corelist-workers <list>** + Same as coremask-workers but accepts a list of cores instead of a bitmap. + + **Example:** corelist-workers 2-3,18-19 + + * **coremask-io <hex-mask>** + Place I/O threads according to the bitmap hex-mask. + + **Example:** coremask-io 0x0000000003000030 + + * **corelist-io <list>** + Same as coremask-io but accepts a list of cores instead of a bitmap. + + **Example:** corelist-io 4-5,20-21 + + * **coremask-hqos-threads <hex-mask>** + Place HQoS threads according to the bitmap hex-mask. A HQoS thread can + run multiple HQoS objects each associated with different output interfaces. + + **Example:** coremask-hqos-threads 0x000000000C0000C0 + + * **corelist-hqos-threads <list>** + Same as coremask-hqos-threads but accepts a list of cores instead of a + bitmap. + + **Example:** corelist-hqos-threads 6-7,22-23 + +**Other:** + + * **use-pthreads** + TBD + + **Example:** use-pthreads + + * **thread-prefix <prefix>** + Set a prefix to be prepended to each thread name. The thread name already + contains an underscore. If not provided, the default is *'vpp'*. + Currently, prefix used on threads: *'vpp_main'*, *'vpp_stats'* + + **Example:** thread-prefix vpp1 + + * **scheduler-policy rr|fifo|batch|idle|other** + TBD + + **Example:** scheduler-policy fifo + + * **scheduler-priority <n>** + Set the scheduler priority. Only valid if the *'scheduler-policy'* is set + to *'fifo'* or *'rr'*. The valid ranges for the scheduler priority depends + on the *'scheduler-policy'* and the current kernel version running. The + range is typically 1 to 99, but see the linux man pages for *'sched'* for + more details. If this value is not set, the current linux kernel default + is left in place. + + **Example:** scheduler-priority 50 + + * **<thread-name> <count>** + Set the number of threads for a given thread (by name). Some threads, like + *'stats'*, have a fixed number of threads and cannot be changed. List of + possible threads include (but not limited too): hqos-threads, workers + + **Example:** hqos-threads 2 + +.. note:: + + The "main" thread always occupies the lowest core-id specified in the + DPDK [process-level] coremask. + +Here's a full-bore manual placement example: + +.. code-block:: console + + /usr/bin/vpp unix interactive tuntap disable cpu { main-thread-io coremask-workers 18 coremask-stats 4 } dpdk { coremask 1e } + + # taskset -a -p <vpe-pid> + pid 16251's current affinity mask: 2 # main thread + pid 16288's current affinity mask: ffffff # DPDK interrupt thread (not bound to a core) + pid 16289's current affinity mask: 4 # stats thread + pid 16290's current affinity mask: 8 # worker thread 0 + pid 16291's current affinity mask: 10 # worker thread 1 + + +.. _acl-plugin: + +"acl-plugin" Parameters +_______________________ + +The following parameters should only be set by those that are familiar with the +interworkings of VPP and the ACL Plugin. + +The first three parameters, *connection hash buckets*, *connection hash memory*, and *connection count max*, set the **connection table per-interface parameters** for modifying how the two bounded-index extensible hash tables for IPv6 (40\*8 bit key and 8\*8 bit value pairs) and IPv4 (16\*8 bit key and 8\*8 bit value pairs) **ACL plugin FA interface sessions** are initialized. + + * **connection hash buckets <n>** + Sets the number of hash buckets (rounded up to a power of 2) in each of the two bi-hash tables. Defaults to 64\*1024 (65536) hash buckets. + + **Example:** connection hash buckets 65536 + + * **connection hash memory <n>** + Sets the number of bytes used for “backing store” allocation in each of the two bi-hash tables. Defaults to 1073741824 bytes. + + **Example:** connection hash memory 1073741824 + + * **connection count max <n>** + Sets the maximum number of pool elements when allocating each per-worker pool of sessions for both bi-hash tables. Defaults to 500000 elements in each pool. + + **Example:** connection count max 500000 + + * **main heap size <n>G|<n>M|<n>K|<n>** + Sets the size of the main memory heap that holds all the ACL module related allocations (other than hash.) Default size is 0, but during ACL heap initialization is equal to *per_worker_size_with_slack * tm->n_vlib_mains + bihash_size + main_slack*. Note that these variables are partially based on the **connection table per-interface parameters** mentioned above. + + **Example:** main heap size 3G + +The next three parameters, *hash lookup heap size*, *hash lookup hash buckets*, and *hash lookup hash memory*, modify the initialization of the bi-hash lookup table used by the ACL plugin. This table is initialized when attempting to apply an ACL to the existing vector of ACLs looked up during packet processing (but it is found that the table does not exist / has not been initialized yet.) + + * **hash lookup heap size <n>G|<n>M|<n>K|<n>** + Sets the size of the memory heap that holds all the miscellaneous allocations related to hash-based lookups. Default size is 67108864 bytes. + + **Example:** hash lookup heap size 70M + + * **hash lookup hash buckets <n>** + Sets the number of hash buckets (rounded up to a power of 2) in the bi-hash lookup table. Defaults to 65536 hash buckets. + + **Example:** hash lookup hash buckets 65536 + + * **hash lookup hash memory <n>** + Sets the number of bytes used for “backing store” allocation in the bi-hash lookup table. Defaults to 67108864 bytes. + + **Example:** hash lookup hash memory 67108864 + + * **use tuple merge <n>** + Sets a boolean value indicating whether or not to use TupleMerge for hash ACL's. Defaults to 1 (true), meaning the default implementation of hashing ACL's **does use** TupleMerge. + + **Example:** use tuple merge 1 + + * **tuple merge split threshold <n>** + Sets the maximum amount of rules (ACE's) that can collide in a bi-hash lookup table before the table is split into two new tables. Splitting ensures less rule collisions by hashing colliding rules based on their common tuple (usually their maximum common tuple.) Splitting occurs when the *length of the colliding rules vector* is greater than this threshold amount. Defaults to a maximum of 39 rule collisions per table. + + **Example:** tuple merge split threshold 30 + + * **reclassify sessions <n>** + Sets a boolean value indicating whether or not to take the epoch of the session into account when dealing with re-applying ACL's or changing already applied ACL's. Defaults to 0 (false), meaning the default implementation **does NOT** take the epoch of the session into account. + + **Example:** reclassify sessions 1 + +.. _api-queue: + +"api-queue" Parameters +______________________ + +The following parameters should only be set by those that are familiar with the +interworkings of VPP. + + * **length <n>** + Sets the api queue length. Minimum valid queue length is 1024, which is + also the default. + + **Example:** length 2048 + +.. _api-segment: + +"api-segment" Parameters +________________________ + +These values control various aspects of the binary API interface to VPP. + + * **prefix <path>** + Sets the prefix prepended to the name used for shared memory (SHM) + segments. The default is empty, meaning shared memory segments are created + directly in the SHM directory *'/dev/shm'*. It is worth noting that on + many systems *'/dev/shm'* is a symbolic link to somewhere else in the file + system; Ubuntu links it to *'/run/shm'*. + + **Example:** prefix /run/shm + + * **uid <number|name>** + Sets the user ID or name that should be used to set the ownership of the + shared memory segments. Defaults to the same user that VPP is started + with, probably root. + + **Example:** uid root + + * **gid <number|name>** + Sets the group ID or name that should be used to set the ownership of the + shared memory segments. Defaults to the same group that VPP is started + with, probably root. + + **Example:** gid vpp + +The following parameters should only be set by those that are familiar with the +interworkings of VPP. + + * **baseva <x>** + Set the base address for SVM global region. If not set, on AArch64, the + code will try to determine the base address. All other default to + 0x30000000. + + **Example:** baseva 0x20000000 + + * **global-size <n>G|<n>M|<n>** + Set the global memory size, memory shared across all router instances, + packet buffers, etc. If not set, defaults to 64M. The input value can be + set in GB, MB or bytes. + + **Example:** global-size 2G + + * **global-pvt-heap-size <n>M|size <n>** + Set the size of the global VM private mheap. If not set, defaults to 128k. + The input value can be set in MB or bytes. + + **Example:** global-pvt-heap-size size 262144 + + * **api-pvt-heap-size <n>M|size <n>** + Set the size of the api private mheap. If not set, defaults to 128k. + The input value can be set in MB or bytes. + + **Example:** api-pvt-heap-size 1M + + * **api-size <n>M|<n>G|<n>** + Set the size of the API region. If not set, defaults to 16M. The input + value can be set in GB, MB or bytes. + + **Example:** api-size 64M + +.. _api-trace: + +"api-trace" Parameters +______________________ + +The ability to trace, dump, and replay control-plane API traces makes all the +difference in the world when trying to understand what the control-plane has +tried to ask the forwarding-plane to do. + + * **on|enable** + Enable API trace capture from the beginning of time, and arrange for a + post-mortem dump of the API trace if the application terminates abnormally. + By default, the (circular) trace buffer will be configured to capture + 256K traces. The default *'startup.conf'* file has trace enabled by default, + and unless there is a very strong reason, it should remain enabled. + + **Example:** on + + * **nitems <n>** + Configure the circular trace buffer to contain the last <n> entries. By + default, the trace buffer captures the last 256K API messages received. + + **Example:** nitems 524288 + + * **save-api-table <filename>** + Dumps the API message table to /tmp/<filename>. + + **Example:** save-api-table apiTrace-07-04.txt + +Typically, one simply enables the API message trace scheme: + + api-trace { on } + +.. _buffers: + +"buffers" Parameters +____________________ + +Command line Buffer configuration controls buffer management. + + * **memory-size-in-mb <n>** + Configure the memory size used for buffers. If not set, VPP defaults + to 32MB. + + **Example:** memory-size-in-mb 64 + + +.. _cj: + +"cj" Parameters +_______________ + +The circular journal (CJ) thread-safe circular log buffer scheme is +occasionally useful when chasing bugs. Calls to it should not be checked in. +See .../vlib/vlib/unix/cj.c. The circular journal is disables by default. +When enabled, the number of records must be provided, there is no default +value. + + * **records <n>** + Configure the number of circular journal records in the circular buffer. + The number of records should be a power of 2. + + **Example:** records 131072 + + * **on** + Turns on logging at the earliest possible moment. + + **Example:** on + +.. _dns: + +"dns" Parameters +________________ + + * **max-cache-size <n>** + TBD + + **Example:** TBD + + * **max-ttl <n>** + TBD + + **Example:** TBD + +.. _heapsize: + +"heapsize" Parameters +_____________________ + +Heapsize configuration controls the size of the main heap. The heap size is +configured very early in the boot sequence, before loading plug-ins or doing +much of anything else. + + * **heapsize <n>M|<n>G** + Specifies the size of the heap in MB or GB. The default is 1GB. Setting the + main heap size to 4GB or more requires recompilation of the entire system + with CLIB_VEC64 > 0. See .../clib/clib/vec_bootstrap.h. + + **Example:** heapsize 2G + +.. _ip: + +"ip" Parameters +_______________ + +IPv4 heap configuration. he heap size is configured very early in the boot +sequence, before loading plug-ins or doing much of anything else. + + * **heap-size <n>G|<n>M|<n>K|<n>** + Set the IPv4 mtrie heap size, which is the amount of memory dedicated to + the destination IP lookup table. The input value can be set in GB, MB, KB + or bytes. The default value is 32MB. + + **Example:** heap-size 64M + +.. _ip6: + +"ip6" Parameters +________________ + +IPv6 heap configuration. he heap size is configured very early in the boot +sequence, before loading plug-ins or doing much of anything else. + + + * **heap-size <n>G|<n>M|<n>K|<n>** + Set the IPv6 forwarding table heap size. The input value can be set in GB, + MB, KB or bytes. The default value is 32MB. + + **Example:** heap-size 64M + + * **hash-buckets <n>** + Set the number of IPv6 forwarding table hash buckets. The default value is + 64K (65536). + + **Example:** hash-buckets 131072 + +.. _l2learn: + +"l2learn" Parameters +____________________ + +Configure Layer 2 MAC Address learning parameters. + + * **limit <n>** + Configures the number of L2 (MAC) addresses in the L2 FIB at any one time, + which limits the size of the L2 FIB to <n> concurrent entries. Defaults to + 4M entries (4194304). + + **Example:** limit 8388608 + +.. _l2tp: + +"l2tp" Parameters +_________________ + +IPv6 Layer 2 Tunnelling Protocol Version 3 (IPv6-L2TPv3) configuration controls +the method used to locate a specific IPv6-L2TPv3 tunnel. The following settings +are mutually exclusive: + + * **lookup-v6-src** + Lookup tunnel by IPv6 source address. + + **Example:** lookup-v6-src + + * **lookup-v6-dst** + Lookup tunnel by IPv6 destination address. + + **Example:** lookup-v6-dst + + * **lookup-session-id** + Lookup tunnel by L2TPv3 session identifier. + + **Example:** lookup-session-id + +.. _logging: + +"logging" Parameters +____________________ + + * **size <n>** + TBD + + **Example:** TBD + + * **unthrottle-time <n>** + TBD + + **Example:** TBD + + * **default-log-level emerg|alertcrit|err|warn|notice|info|debug|disabled** + TBD + + **Example:** TBD + + * **default-syslog-log-level emerg|alertcrit|err|warn|notice|info|debug|disabled** + TBD + + **Example:** TBD + +.. _mactime: + +"mactime" Parameters +____________________ + + * **lookup-table-buckets <n>** + TBD + + **Example:** TBD + + * **lookup-table-memory <n>G|<n>M|<n>K|<n>** + TBD + The input value can be set in GB, MB, KB or bytes. The default value is 256KB. + + **Example:** TBD + + * **timezone_offset <n>** + TBD + + **Example:** TBD + +.. _map: + +"map" Parameters +________________ + + * **customer edge** + TBD + + **Example:** customer edge + +.. _mc: + +"mc" Parameters +_______________ + +MC Test Process. + + * **interface <name>** + TBD + + **Example:** TBD + + * **n-bytes <n>** + TBD + + **Example:** TBD + + * **max-n-bytes <n>** + TBD + + **Example:** TBD + + * **min-n-bytes <n>** + TBD + + **Example:** TBD + + * **seed <n>** + TBD + + **Example:** TBD + + * **window <n>** + TBD + + **Example:** TBD + + * **verbose** + TBD + + **Example:** verbose + + * **no-validate** + TBD + + **Example:** no-validate + + * **min-delay <n.n>** + TBD + + **Example:** TBD + + * **max-delay <n.n>** + TBD + + **Example:** TBD + + * **no-delay** + TBD + + **Example:** no-delay + + * **n-packets <n.n>** + TBD + + **Example:** TBD + +.. _nat: + + +"nat" Parameters +________________ + + * **translation hash buckets <n>** + TBD + + **Example:** TBD + + * **translation hash memory <n>** + TBD + + **Example:** TBD + + * **user hash buckets <n>** + TBD + + **Example:** TBD + + * **user hash memory <n>** + TBD + + **Example:** TBD + + * **max translations per user <n>** + TBD + + **Example:** TBD + + * **outside VRF id <n>** + TBD + + **Example:** TBD + + * **outside ip6 VRF id <n>** + TBD + + **Example:** TBD + + * **inside VRF id <n>** + TBD + + **Example:** TBD + + * **inside VRF id <n>** + TBD + + **Example:** TBD + + * **static mapping only** + TBD + + **Example:** static mapping only + + * **connection tracking** + TBD + + **Example:** connection tracking + + * **deterministic** + TBD + + **Example:** deterministic + + * **nat64 bib hash buckets <n>** + TBD + + **Example:** TBD + + * **nat64 bib hash memory <n>** + TBD + + **Example:** TBD + + * **nat64 st hash buckets <n>** + TBD + + **Example:** TBD + + * **nat64 st hash memory <n>** + TBD + + **Example:** TBD + + * **out2in dpo** + TBD + + **Example:** out2in dpo + + * **dslite ce** + TBD + + **Example:** dslite ce + + * **endpoint-dependent** + TBD + + **Example:** endpoint-dependent + +.. _oam: + +"oam" Parameters +________________ + +OAM configuration controls the (ip4-icmp) interval, and number of misses +allowed before reporting an oam target down to any registered listener. + + * **interval <n.n>** + Interval, floating-point seconds, between sending OAM IPv4 ICMP messages. + Default is 2.04 seconds. + + **Example:** interval 3.5 + + * **misses-allowed <n>** + Number of misses before declaring an OAM target down. Default is 3 misses. + + **Example:** misses-allowed 5 + +.. _plugins: + +"plugins" Parameters +____________________ +A plugin can be disabled by default. It may still be in an experimental phase +or only be needed in special circumstances. If this is the case, the plugin can +be explicitely enabled in *'startup.conf'*. Also, a plugin that is enabled by +default can be explicitely disabled in *'startup.conf'*. + +Another useful use of this section is to disable all the plugins, then enable +only the plugins that are desired. + + * **path <path>** + Adjust the plugin path depending on where the VPP plugins are installed. + + **Example:** path /home/bms/vpp/build-root/install-vpp-native/vpp/lib64/vpp_plugins + + * **name-filter <filter-name>** + TBD + + **Example:** TBD + + * **vat-path <path>** + TBD + + **Example:** TBD + + * **vat-name-filter <filter-name>** + TBD + + **Example:** TBD + + * **plugin <plugin.so> { .. }** + Configure parameters for a given plugin. Valid parameters are as follows: + + * **enable** + Enable the given plugin. + * **disable** + Disable the given plugin. + * **skip-version-check** + In the plugin registration, if *'.version_required'* is set, the + plugin will not be loaded if there is version mismatch between + plugin and VPP. This can be bypassed by setting "skip-version-check" + for specific plugin. + + **Example:** plugin ila_plugin.so { enable skip-version-check } + + * **plugin default { .. }** + Set the default behavior for all plugins. Valid parameters are as follows: + + * **disable** + Disable all plugins. + + **Example:** + | plugin default { disable } + | plugin dpdk_plugin.so { enable } + | plugin acl_plugin.so { enable } + +.. _plugin_path: + +"plugin_path" Parameters +________________________ + +Alternate syntax to choose plugin path. Plugin_path configuration controls the +set of directories searched for vlib plugins. Supply a colon-separated list of +(absolute) directory names: plugin_path dir1:dir2:...:dirN + + **Example:** plugin_path /home/bms/vpp/build-root/install-vpp-native/vpp/lib64/vpp_plugins + +.. _punt: + +"punt" Parameters +_________________ + + * **socket <path>** + TBD + + **Example:** TBD + +.. _session: + +"session" Parameters +____________________ + + * **event-queue-length <n>** + TBD + + **Example:** TBD + + * **preallocated-sessions <n>** + TBD + + **Example:** TBD + + * **v4-session-table-buckets <n>** + TBD + + **Example:** TBD + + * **v4-halfopen-table-buckets <n>** + TBD + + **Example:** TBD + + * **v6-session-table-buckets <n>** + TBD + + **Example:** TBD + + * **v6-halfopen-table-buckets <n>** + TBD + + **Example:** TBD + + * **v4-session-table-memory <n>G|<n>M|<n>K|<n>** + TBD + The input value can be set in GB, MB, KB or bytes. + + **Example:** TBD + + * **v4-halfopen-table-memory <n>G|<n>M|<n>K|<n>** + TBD + The input value can be set in GB, MB, KB or bytes. + + **Example:** TBD + + * **v6-session-table-memory <n>G|<n>M|<n>K|<n>** + TBD + The input value can be set in GB, MB, KB or bytes. + + **Example:** TBD + + * **v6-halfopen-table-memory <n>G|<n>M|<n>K|<n>** + TBD + The input value can be set in GB, MB, KB or bytes. + + **Example:** TBD + + * **local-endpoints-table-memory <n>G|<n>M|<n>K|<n>** + TBD + The input value can be set in GB, MB, KB or bytes. + + **Example:** TBD + + * **local-endpoints-table-buckets <n>** + TBD + + **Example:** TBD + + * **evt_qs_memfd_seg** + TBD + + **Example:** evt_qs_memfd_seg + +.. _socketsvr: + +"socketsvr" Parameters +______________________ + +Create a socket server for API server (.../vlibmemory/socksvr_vlib.c.). +If not set, API server doesn't run. + + * **socket-name <filename>** + Configure API socket filename. + + **Example:** socket-name /run/vpp/vpp-api.sock + + * **default** + Use the default API socket (/run/vpp-api.sock). + + **Example:** default + +.. _stats: + +"stats" Parameters +__________________ + +Create a socket server for *'stats'* poller. If not set, 'stats'* poller +doesn't run. + + * **socket-name <filename>** + Configure *'stats'* socket filename. + + **Example:** socket-name /run/vpp/stats.sock + + * **default** + Use the default *'stats'* socket (/run/vpp/stats.sock). + + **Example:** default + +.. _statseg: + +"statseg" Parameters +____________________ + + * **size <n>G|<n>M|<n>K|<n>** + TBD + The input value can be set in GB, MB, KB or bytes. + + **Example:** TBD + +.. _tapcli: + +"tapcli" Parameters +___________________ + + * **mtu <n>** + TBD + + **Example:** TBD + + * **disable** + TBD + + **Example:** disable + +.. _tcp: + +"tcp" Parameters +________________ + + * **preallocated-connections <n>** + TBD + + **Example:** TBD + + * **preallocated-half-open-connections <n>** + TBD + + **Example:** TBD + + * **buffer-fail-fraction <n.n>** + TBD + + **Example:** TBD + +.. _tls: + +"tls" Parameters +________________ + + * **se-test-cert-in-ca** + TBD + + **Example:** se-test-cert-in-ca + + * **ca-cert-path <filename>** + TBD + If not set, the default is set to *'/etc/ssl/certs/ca-certificates.crt'*. + + **Example:** TBD + +.. _tuntap: + +"tuntap" Parameters +___________________ + +The "tuntap" driver configures a point-to-point interface between the vpp +engine and the local Linux kernel stack. This allows e.g. users to ssh to the +host | VM | container via vpp "revenue" interfaces. It's marginally useful, and +is currently disabled by default. To [dynamically] create TAP interfaces - the +preferred scheme - see the "tap_connect" binary API. The Linux network stack +"vnet" interface needs to manually configure, and VLAN and other settings if +desired. + + * **enable|disable** + Enable or disable the tun/tap driver. + + **Example:** enable + + * **ethernet|ether** + Create a tap device (ethernet MAC) instead of a tun device (point-to-point + tunnel). The two keywords are aliases for the same function. + + **Example:** ethernet + + * **have-normal-interface|have-normal** + Treat the host Linux stack as a routing peer instead of programming VPP + interface L3 addresses onto the tun/tap devices. The two keywords are + aliases for the same function. + + **Example:** have-normal-interface + + * **name <name>** + Assign name to the tun/tap device. + + **Example:** name vpp1 + +Here's a typical multiple parameter invocation: + + | tuntap { ethernet have-normal-interface name vpp1 } + +.. _vhost-user: + +"vhost-user" Parameters +_______________________ + +Vhost-user configuration parameters control the vhost-user driver. + + * **coalesce-frames <n>** + Subject to deadline-timer expiration - see next item - attempt to transmit + at least <n> packet frames. Default is 32 frames. + + **Example:** coalesce-frames 64 + + * **coalesce-time <seconds>** + Hold packets no longer than (floating-point) seconds before transmitting + them. Default is 0.001 seconds + + **Example:** coalesce-time 0.002 + + * **dont-dump-memory** + vhost-user shared-memory segments can add up to a large amount of memory, so + it's handy to avoid adding them to corefiles when using a significant number + of such interfaces. + + **Example:** dont-dump-memory + +.. _vlib: + +"vlib" Parameters +_________________ + + * **memory-trace** + TBD + + **Example:** memory-trace + + * **elog-events <n>** + TBD + + **Example:** TBD + + * **elog-post-mortem-dump** + TBD + + **Example:** elog-post-mortem-dump + diff --git a/docs/gettingstarted/users/configutil/commandfour.rst b/docs/gettingstarted/users/configutil/commandfour.rst new file mode 100644 index 00000000000..27cac824e4a --- /dev/null +++ b/docs/gettingstarted/users/configutil/commandfour.rst @@ -0,0 +1,114 @@ +.. _config-command-four: + +************************** +List/Install/Uninstall VPP +************************** + +With option "4" the user can list, install or uninstall the FD.io VPP packages. If there +are packages already installed, the packages will be listed and then the user will be asked +if the packages should be uninstalled. If no packages are installed the user will be asked if +the FD.io packages should be installed. The packages installed will be the latest released +packages. + +Uninstalling the packages: + +.. code-block:: console + + What would you like to do? + + 1) Show basic system information + 2) Dry Run (Will save the configuration files in /usr/local/vpp/vpp-config/dryrun for inspection) + 3) Full configuration (WARNING: This will change the system configuration) + 4) List/Install/Uninstall VPP. + q) Quit + + Command: 4 + + These packages are installed on node localhost + Name Version + vpp 18.04-release + vpp-api-java 18.04-release + vpp-api-lua 18.04-release + vpp-api-python 18.04-release + vpp-dbg 18.04-release + vpp-dev 18.04-release + vpp-dpdk-dev 17.01.1-release + vpp-dpdk-dkms 17.01.1-release + vpp-lib 18.04-release + vpp-nsh-plugin 18.04 + vpp-nsh-plugin-dbg 18.04 + vpp-nsh-plugin-dev 18.04 + vpp-plugins 18.04-release + + Do you want to uninstall these packages [y/N]? y + INFO:root: Local Command: service vpp stop + INFO:root:Uninstall Ubuntu + INFO:root: Local Command: dpkg -l | grep vpp + .... + What would you like to do? + + 1) Show basic system information + 2) Dry Run (Will save the configuration files in /usr/local/vpp/vpp-config/dryrun for inspection) + 3) Full configuration (WARNING: This will change the system configuration) + 4) List/Install/Uninstall VPP. + q) Quit + + Command: + +Installing the packages: + +.. code-block:: console + + 1) Show basic system information + 2) Dry Run (Will save the configuration files in /usr/local/vpp/vpp-config/dryrun for inspection) + 3) Full configuration (WARNING: This will change the system configuration) + 4) List/Install/Uninstall VPP. + q) Quit + + Command: 4 + + There are no VPP packages on node localhost. + Do you want to install VPP [Y/n]? Y + INFO:root: Ubuntu + INFO:root:Install Ubuntu + INFO:root: Local Command: ls /etc/apt/sources.list.d/99fd.io.list.orig + INFO:root: /etc/apt/sources.list.d/99fd.io.list.orig + .... + + What would you like to do? + + 1) Show basic system information + 2) Dry Run (Will save the configuration files in /usr/local/vpp/vpp-config/dryrun for inspection) + 3) Full configuration (WARNING: This will change the system configuration) + 4) List/Install/Uninstall VPP. + q) Quit + + Command: 4 + + These packages are installed on node localhost + Name Version + vpp 18.04-release + vpp-api-java 18.04-release + vpp-api-lua 18.04-release + vpp-api-python 18.04-release + vpp-dbg 18.04-release + vpp-dev 18.04-release + vpp-dpdk-dev 17.01.1-release + vpp-dpdk-dkms 17.01.1-release + vpp-lib 18.04-release + vpp-nsh-plugin 18.04 + vpp-nsh-plugin-dbg 18.04 + vpp-nsh-plugin-dev 18.04 + vpp-plugins 18.04-release + + Do you want to uninstall these packages [y/N]? N + + What would you like to do? + + 1) Show basic system information + 2) Dry Run (Will save the configuration files in /usr/local/vpp/vpp-config/dryrun for inspection) + 3) Full configuration (WARNING: This will change the system configuration) + 4) List/Install/Uninstall VPP. + q) Quit + + Command: diff --git a/docs/gettingstarted/users/configutil/commandone.rst b/docs/gettingstarted/users/configutil/commandone.rst new file mode 100644 index 00000000000..9d63809b96b --- /dev/null +++ b/docs/gettingstarted/users/configutil/commandone.rst @@ -0,0 +1,70 @@ +.. _config-command-one: + +*********************** +Show System Information +*********************** + +With option "1" the user can inspect the system characteristics. + +This example shows a system that VPP has not yet been installed. + +.. code-block:: console + + What would you like to do? + + 1) Show basic system information + 2) Dry Run (Will save the configuration files in /usr/local/vpp/vpp-config/dryrun for inspection) + 3) Full configuration (WARNING: This will change the system configuration) + 4) List/Install/Uninstall VPP. + q) Quit + + Command: 1 + + ============================== + NODE: DUT1 + + CPU: + Model name: Intel(R) Xeon(R) CPU E5-2667 v3 @ 3.20GHz + CPU(s): 32 + Thread(s) per core: 2 + Core(s) per socket: 8 + Socket(s): 2 + NUMA node0 CPU(s): 0-7,16-23 + NUMA node1 CPU(s): 8-15,24-31 + CPU max MHz: 3600.0000 + CPU min MHz: 1200.0000 + SMT: Enabled + + VPP Threads: (Name: Cpu Number) + + Grub Command Line: + Current: BOOT_IMAGE=/vmlinuz-4.4.0-128-generic root=UUID=9930aeee-b1d3-4cf5-b0de-d95dbb7dec5e ro + Configured: GRUB_CMDLINE_LINUX_DEFAULT="isolcpus=8,9-10 nohz_full=8,9-10 rcu_nocbs=8,9-10" + + Huge Pages: + Total System Memory : 65863384 kB + Total Free Memory : 45911100 kB + Actual Huge Page Total : 1024 + Configured Huge Page Total : 8192 + Huge Pages Free : 896 + Huge Page Size : 2048 kB + + Devices: + Total Number of Buffers: 25600 + + Devices with link up (can not be used with VPP): + 0000:08:00.0 enp8s0f0 I350 Gigabit Network Connection + + Devices bound to kernel drivers: + 0000:90:00.0 enp144s0 VIC Ethernet NIC + 0000:8f:00.0 enp143s0 VIC Ethernet NIC + 0000:84:00.0 enp132s0f0,enp132s0f0d1 Ethernet Controller XL710 for 40GbE QSFP+ + 0000:84:00.1 enp132s0f1,enp132s0f1d1 Ethernet Controller XL710 for 40GbE QSFP+ + 0000:08:00.1 enp8s0f1 I350 Gigabit Network Connection + 0000:02:00.0 enp2s0f0 82599ES 10-Gigabit SFI/SFP+ Network Connection + 0000:02:00.1 enp2s0f1 82599ES 10-Gigabit SFI/SFP+ Network Connection + + No devices bound to DPDK drivers + + VPP Service Status: + Not Installed diff --git a/docs/gettingstarted/users/configutil/commandthree.rst b/docs/gettingstarted/users/configutil/commandthree.rst new file mode 100644 index 00000000000..c4c44292fd0 --- /dev/null +++ b/docs/gettingstarted/users/configutil/commandthree.rst @@ -0,0 +1,80 @@ +.. _config-command-three: + +*********************** +Apply the Configuration +*********************** + +After the configuration files have been examined and are correct. The configuration +can be applied. After the configuration is applied use option "1" to check the +system configuration. Notice the default is NOT to change the grub file. If the option +to change the grub command line is selected a reboot of the system will be required. + +.. code-block:: console + + What would you like to do? + + 1) Show basic system information + 2) Dry Run (Will save the configuration files in /usr/local/vpp/vpp-config/dryrun for inspection) + 3) Full configuration (WARNING: This will change the system configuration) + 4) List/Install/Uninstall VPP. + q) Quit + + Command: 3 + + We are now going to configure your system(s). + + Are you sure you want to do this [Y/n]? y + These are the changes we will apply to + the huge page file (/etc/sysctl.d/80-vpp.conf). + + 1,2d0 + < vm.nr_hugepages=1024 + 4,7c2,3 + < vm.max_map_count=3096 + --- + > vm.nr_hugepages=8192 + > vm.max_map_count=17408 + 8a5 + > kernel.shmmax=17179869184 + 10,15d6 + < kernel.shmmax=2147483648 + + Are you sure you want to apply these changes [Y/n]? + These are the changes we will apply to + the VPP startup file (/etc/vpp/startup.conf). + + --- + > + > main-core 8 + > corelist-workers 9-10 + > + > scheduler-policy fifo + > scheduler-priority 50 + > + 67,68c56,66 + < # dpdk { + --- + > dpdk { + > + > dev 0000:86:00.0 { + > num-rx-queues 2 + > } + > dev 0000:86:00.1 { + > num-rx-queues 2 + > } + > num-mbufs 25600 + > + 124c122 + < # } + --- + > } + + Are you sure you want to apply these changes [Y/n]? + + The configured grub cmdline looks like this: + GRUB_CMDLINE_LINUX_DEFAULT="isolcpus=8,9-10 nohz_full=8,9-10 rcu_nocbs=8,9-10" + + The current boot cmdline looks like this: + BOOT_IMAGE=/boot/vmlinuz-4.4.0-97-generic root=UUID=d760b82f-f37b-47e2-9815-db8d479a3557 ro + + Do you want to keep the current boot cmdline [Y/n]? diff --git a/docs/gettingstarted/users/configutil/commandtwo.rst b/docs/gettingstarted/users/configutil/commandtwo.rst new file mode 100644 index 00000000000..0d06c1410e5 --- /dev/null +++ b/docs/gettingstarted/users/configutil/commandtwo.rst @@ -0,0 +1,124 @@ +.. _config-command-two: + +******* +Dry Run +******* + +With the config utility dry run option the important configuration files are created +so that the user can examine them and then if they look reasonable apply them with +option 3. The files for **Ubuntu** can be found in the root directory /usr/local/vpp/vpp-config/dryrun +and for **Centos** in /usr/vpp/vpp-config/dryrun. + +The important configuration files are **/etc/vpp/startup.conf**, **/etc/sysctl.d/80-vpp.conf**, +and **/etc/default/grub** + +Startup.conf +============ + +FD.io VPP startup parameters are configured in the file **/etc/vpp/startup.conf**. The +utility creates this file under the vpp-config root directory in vpp/startup.conf. +the values in this file come from the questions asked about the devices, cores, rx queues, +and tcp parameters. + +80-vpp.conf +=========== + +The huge page configuration comes by setting values in the file **/etc/sysctl.d/80-vpp.conf**. +The utility creates the file under the root directory in sysctl.d/80-vpp.conf. When asked the +question about huge pages the correct values are put in the dryrin file. + +grub +==== + +CPUs can be isolated for use by VPP or other processes such as VMs using the grub configuration +file. This file is **/etc/default/grub**. This file must be modified with care. It is possible to +make your system unusable if this file is modified incorrectly. The dry run file is located under +the vpp-config root directory and then default. + +********************* +Executing the Dry Run +********************* + +The following is an example of how to execute a dry run. Defaults should be picked first and then +the values increased accordingly. + +.. code-block:: console + + 1) Show basic system information + 2) Dry Run (Will save the configuration files in /usr/local/vpp/vpp-config/dryrun for inspection) + 3) Full configuration (WARNING: This will change the system configuration) + 4) List/Install/Uninstall VPP. + q) Quit + + Command: 2 + + These devices have kernel interfaces, but appear to be safe to use with VPP. + + PCI ID Kernel Interface(s) Description + ------------------------------------------------------------------------------------------ + 0000:8f:00.0 enp143s0 VIC Ethernet NIC + 0000:84:00.0 enp132s0f0,enp132s0f0d1 Ethernet Controller XL710 for 40GbE QSFP+ + 0000:84:00.1 enp132s0f1,enp132s0f1d1 Ethernet Controller XL710 for 40GbE QSFP+ + 0000:08:00.1 enp8s0f1 I350 Gigabit Network Connection + 0000:02:00.0 enp2s0f0 82599ES 10-Gigabit SFI/SFP+ Network Connection + 0000:02:00.1 enp2s0f1 82599ES 10-Gigabit SFI/SFP+ Network Connection + 0000:86:00.0 enp134s0f0 82599ES 10-Gigabit SFI/SFP+ Network Connection + 0000:86:00.1 enp134s0f1 82599ES 10-Gigabit SFI/SFP+ Network Connection + + Would you like to use any of these device(s) for VPP [y/N]? y + Would you like to use device 0000:8f:00.0 for VPP [y/N]? + Would you like to use device 0000:84:00.0 for VPP [y/N]? + Would you like to use device 0000:84:00.1 for VPP [y/N]? + Would you like to use device 0000:08:00.1 for VPP [y/N]? + Would you like to use device 0000:02:00.0 for VPP [y/N]? + Would you like to use device 0000:02:00.1 for VPP [y/N]? + Would you like to use device 0000:86:00.0 for VPP [y/N]? y + Would you like to use device 0000:86:00.1 for VPP [y/N]? y + + These device(s) will be used by VPP. + + PCI ID Description + ---------------------------------------------------------------- + 0000:86:00.0 82599ES 10-Gigabit SFI/SFP+ Network Connection + 0000:86:00.1 82599ES 10-Gigabit SFI/SFP+ Network Connection + 0000:90:00.0 VIC Ethernet NIC + + Would you like to remove any of these device(s) [y/N]? y + Would you like to remove 0000:86:00.0 [y/N]? + Would you like to remove 0000:86:00.1 [y/N]? + Would you like to remove 0000:90:00.0 [y/N]? y + + These device(s) will be used by VPP, please rerun this option if this is incorrect. + + PCI ID Description + ---------------------------------------------------------------- + 0000:86:00.0 82599ES 10-Gigabit SFI/SFP+ Network Connection + 0000:86:00.1 82599ES 10-Gigabit SFI/SFP+ Network Connection + + Your system has 32 core(s) and 2 Numa Nodes. + To begin, we suggest not reserving any cores for VPP or other processes. + Then to improve performance start reserving cores and adding queues as needed. + + How many core(s) shall we reserve for VPP [0-4][0]? 2 + How many core(s) do you want to reserve for processes other than VPP? [0-15][0]? + Should we reserve 1 core for the VPP Main thread? [y/N]? y + How many RX queues per port shall we use for VPP [1-4][1]? 2 + + How many active-open / tcp client sessions are expected [0-10000000][0]? + How many passive-open / tcp server sessions are expected [0-10000000][0]? + + There currently 896 2048 kB huge pages free. + Do you want to reconfigure the number of huge pages [y/N]? y + + There currently a total of 1024 huge pages. + How many huge pages do you want [1024 - 15644][1024]? 8192 + + What would you like to do? + + 1) Show basic system information + 2) Dry Run (Will save the configuration files in /usr/local/vpp/vpp-config/dryrun for inspection) + 3) Full configuration (WARNING: This will change the system configuration) + 4) List/Install/Uninstall VPP. + q) Quit + + Command: diff --git a/docs/gettingstarted/users/configutil/configapplied.rst b/docs/gettingstarted/users/configutil/configapplied.rst new file mode 100644 index 00000000000..70d483b4b7c --- /dev/null +++ b/docs/gettingstarted/users/configutil/configapplied.rst @@ -0,0 +1,85 @@ +.. _config-applied: + +************************* +The Configuration Applied +************************* + +After the configuration is applied the system parameters should be examined. + +.. code-block:: console + + What would you like to do? + + 1) Show basic system information + 2) Dry Run (Will save the configuration files in /usr/local/vpp/vpp-config/dryrun for inspection) + 3) Full configuration (WARNING: This will change the system configuration) + 4) List/Install/Uninstall VPP. + q) Quit + + Command: 1 + + ============================== + NODE: DUT1 + + CPU: + Model name: Intel(R) Xeon(R) CPU E5-2667 v3 @ 3.20GHz + CPU(s): 32 + Thread(s) per core: 2 + Core(s) per socket: 8 + Socket(s): 2 + NUMA node0 CPU(s): 0-7,16-23 + NUMA node1 CPU(s): 8-15,24-31 + CPU max MHz: 3600.0000 + CPU min MHz: 1200.0000 + SMT: Enabled + + VPP Threads: (Name: Cpu Number) + vpp_main : 8 + vpp_wk_1 : 10 + vpp_wk_0 : 9 + vpp_stats : 0 + + Grub Command Line: + Current: BOOT_IMAGE=/vmlinuz-4.4.0-128-generic root=UUID=9930aeee-b1d3-4cf5-b0de-d95dbb7dec5e ro + Configured: GRUB_CMDLINE_LINUX_DEFAULT="isolcpus=1,8,9-10 nohz_full=1,8,9-10 rcu_nocbs=1,8,9-10" + + Huge Pages: + Total System Memory : 65863384 kB + Total Free Memory : 31169292 kB + Actual Huge Page Total : 8196 + Configured Huge Page Total : 8196 + Huge Pages Free : 7942 + Huge Page Size : 2048 kB + + Devices: + Total Number of Buffers: 25600 + + Devices with link up (can not be used with VPP): + 0000:08:00.0 enp8s0f0 I350 Gigabit Network Connection + + Devices bound to kernel drivers: + 0000:90:00.0 enp144s0 VIC Ethernet NIC + 0000:8f:00.0 enp143s0 VIC Ethernet NIC + 0000:84:00.0 enp132s0f0,enp132s0f0d1 Ethernet Controller XL710 for 40GbE QSFP+ + 0000:84:00.1 enp132s0f1,enp132s0f1d1 Ethernet Controller XL710 for 40GbE QSFP+ + 0000:08:00.1 enp8s0f1 I350 Gigabit Network Connection + 0000:02:00.0 enp2s0f0 82599ES 10-Gigabit SFI/SFP+ Network Connection + 0000:02:00.1 enp2s0f1 82599ES 10-Gigabit SFI/SFP+ Network Connection + + Devices bound to DPDK drivers: + 0000:86:00.0 82599ES 10-Gigabit SFI/SFP+ Network Connection + 0000:86:00.1 82599ES 10-Gigabit SFI/SFP+ Network Connection + + Devices in use by VPP: + Name Socket RXQs RXDescs TXQs TXDescs + TenGigabitEthernet86/0/0 1 2 1024 3 1024 + TenGigabitEthernet86/0/1 1 2 1024 3 1024 + + VPP Service Status: + active (running) + +.. toctree:: + + sysinfo + + diff --git a/docs/gettingstarted/users/configutil/index.rst b/docs/gettingstarted/users/configutil/index.rst new file mode 100644 index 00000000000..6cf3a3076f3 --- /dev/null +++ b/docs/gettingstarted/users/configutil/index.rst @@ -0,0 +1,30 @@ +.. _configutil: + +######################### +VPP Configuration Utility +######################### + +This guide provides instructions on how to install and use the vpp configuration +utility. + +The FD.io VPP Configuration Utility, or vpp-config, allows the user to configure +FD.io VPP in a simple and safe manner. The utility takes input from the user and +creates the configuration files in a dry run directory. The user should then examine +these files for correctness. If the configuration files look correct, the user +can then apply the configuration. Once the configuration is applied the user +should then check the system configuration with the utility and see if it was +applied correctly. + +This utility also includes a utility that can be used to install or uninstall FD.io VPP +packages. This should be used to insure the latest tested release is installed. + +.. toctree:: + + installing + usingvppconfig + commandfour + commandone + commandtwo + commandthree + configapplied + diff --git a/docs/gettingstarted/users/configutil/installing.rst b/docs/gettingstarted/users/configutil/installing.rst new file mode 100644 index 00000000000..57929aef648 --- /dev/null +++ b/docs/gettingstarted/users/configutil/installing.rst @@ -0,0 +1,30 @@ +.. _installing: + +.. toctree:: + +********** +Installing +********** + +The FD.io VPP configuration utility uses the `Python Package Index <https://pypi.org>`__ +or "pypi". + +To install FD.io vpp-config first install python pip. + +For Ubuntu execute: + +.. code-block:: console + + $ sudo apt-get install python-pip + +For Centos execute: + +.. code-block:: console + + $ sudo yum install install python-pip + +Then install the config utility itself. + +.. code-block:: console + + $ sudo -H pip install vpp-config diff --git a/docs/gettingstarted/users/configutil/sysinfo.rst b/docs/gettingstarted/users/configutil/sysinfo.rst new file mode 100644 index 00000000000..893f94999ce --- /dev/null +++ b/docs/gettingstarted/users/configutil/sysinfo.rst @@ -0,0 +1,50 @@ +.. _sysinfo: + +CPU +--- + +The CPU section of the system information is a summary of the CPU characteristics of the system. +It is important to understand the CPU topology and frequency in order to understand what the VPP +performance characteristics would be. + +Threads +------- + +It usually is not needed, but VPP can be configured to run on isolated CPUs. In the example shown +VPP is configured with 2 workers. The main thread is also configured to run on a seperate CPU. The +stats thread will always run on CPU 0. This utilty will put the worker threads on CPUs that are +associated with the ports that are configured. + +Grub Command Line +----------------- + +In general the Grub command line does not need to be changed. If the system is running many processes +it may be neccessary to isolate CPUs for VPP or other processes. + +Huge Pages +---------- + +As default when VPP is configured the number of huge pages that will be configured will be 1024. +This may not be enough. This section will show the total system memory and how many are configured. + + +Devices +------- + +In the devices section we have the "Total Number of Buffers". This utility allocates the correct +number of buffers. The number of buffers are calculated from the number of rx queues. + +VPP will not use links that are up. Those devices are shown with this utility. + +The devices bound to the kernel are not being used by VPP, but can be. + +The devices that are being used by VPP are shown with the interface name be used with VPP. The +socket being used by the VPP port is also shown. Notice in this example the worker thread are +on the correct CPU. The number of RX, TX Descriptors and TX queues are calculated from the number +of RX queues. + + +VPP Service Status +------------------ + +The VPP service status, will be installed, not installed, running or not. diff --git a/docs/gettingstarted/users/configutil/usingvppconfig.rst b/docs/gettingstarted/users/configutil/usingvppconfig.rst new file mode 100644 index 00000000000..4f1ce6c3c30 --- /dev/null +++ b/docs/gettingstarted/users/configutil/usingvppconfig.rst @@ -0,0 +1,51 @@ +.. _usingvppconfig.rst: + +******* +Running +******* + +The vpp-config utility provides the user with several different menus. This allows the +user to configure ports, some performance characteristics, the number of huge pages +and install/uninstall the released FD.io packages. + +It is recommended that the menu options are executed in this order. + +#. :ref:`4) List/Install/Uninstall VPP <config-command-four>` +#. :ref:`1) Show basic system information <config-command-one>` +#. :ref:`2) Dry Run <config-command-two>` +#. :ref:`3) Full Configuration <config-command-three>` + +Once vpp-config is installed as a root user execute the following + +.. code-block:: console + + $ sudo -H bash + # vpp-config + + Welcome to the VPP system configuration utility + + These are the files we will modify: + /etc/vpp/startup.conf + /etc/sysctl.d/80-vpp.conf + /etc/default/grub + + Before we change them, we'll create working copies in /usr/local/vpp/vpp-config/dryrun + Please inspect them carefully before applying the actual configuration (option 3)! + + What would you like to do? + + 1) Show basic system information + 2) Dry Run (Will save the configuration files in /usr/local/vpp/vpp-config/dryrun for inspection) + 4) List/Install/Uninstall VPP. + q) Quit + + Command: + +Default Values +============== + +If you do not choose to modify the default for any of the questions prompted by vpp-config, +you may press the ENTER key to select the default options: + +* Questions that ask [Y/n], the capital letter Y is the default answer. +* Numbers have their default within brackets, such as in [1024], the 1024 is the default. diff --git a/docs/gettingstarted/users/index.rst b/docs/gettingstarted/users/index.rst new file mode 100644 index 00000000000..6fd7260650a --- /dev/null +++ b/docs/gettingstarted/users/index.rst @@ -0,0 +1,13 @@ +.. _users: + +##### +Users +##### + +.. toctree:: + :maxdepth: 2 + + installing/index.rst + configuring/index.rst + running/index.rst + configutil/index.rst diff --git a/docs/gettingstarted/users/installing/centos.rst b/docs/gettingstarted/users/installing/centos.rst new file mode 100644 index 00000000000..bb69eb9e797 --- /dev/null +++ b/docs/gettingstarted/users/installing/centos.rst @@ -0,0 +1,247 @@ +.. _centos: + +.. toctree:: + +Setup the fd.io Repository - Centos 7 +===================================== + +Update the OS +------------- + +It is probably a good idea to update and upgrade the OS before starting: + +.. code-block:: console + + $ sudo yum update + + +Point to the Repository +----------------------- + +For CentOS based systems, there are two respositories to pull VPP binaries +from. + +* CentOS NFV SIG Repository +* Nexus Repository + + +CentOS NFV SIG Repository +^^^^^^^^^^^^^^^^^^^^^^^^^ + +VPP is not in the official CentOS 7 distro. However, CentOS has Special +Interest Groups (SIG), which are smaller groups within the CentOS community that +focus on a small set of issues. The CentOS NFV (Network Function Virtualization) +SIG was created to provide a CentOS-based stack that will serve as a platform +for the deployment and testing of virtual network functions (VNFs). VPP has been +included in this SIG. + +To install released packages from the CentOS NFV SIG Repository on an updated +Centos 7 system, first, install the CentOS NFV SIG FIDO repo file: + +.. code-block:: console + + $ sudo yum install centos-release-fdio + +then **'Install VPP RPMs'**, as described below. + +This will install the latest VPP version from the repository. To install an +older version, once the CentOS NFV SIG FDIO repo file has been installed, list +the stored versions: + +.. code-block:: console + + $ sudo yum --showduplicates list vpp* | expand + Loaded plugins: fastestmirror + Loading mirror speeds from cached hostfile + * base: repos-va.psychz.net + * epel: download-ib01.fedoraproject.org + * extras: mirror.siena.edu + * updates: repo1.ash.innoscale.net + Available Packages + vpp.x86_64 17.10-1 centos-fdio + vpp.x86_64 18.01.1-1 centos-fdio + vpp.x86_64 18.01.2-1 centos-fdio + vpp.x86_64 18.04-1 centos-fdio + vpp-api-java.x86_64 17.10-1 centos-fdio + vpp-api-java.x86_64 18.01.1-1 centos-fdio + vpp-api-java.x86_64 18.01.2-1 centos-fdio + vpp-api-java.x86_64 18.04-1 centos-fdio + vpp-api-lua.x86_64 17.10-1 centos-fdio + vpp-api-lua.x86_64 18.01.1-1 centos-fdio + vpp-api-lua.x86_64 18.01.2-1 centos-fdio + vpp-api-lua.x86_64 18.04-1 centos-fdio + vpp-api-python.x86_64 17.10-1 centos-fdio + vpp-api-python.x86_64 18.01.1-1 centos-fdio + vpp-api-python.x86_64 18.01.2-1 centos-fdio + vpp-api-python.x86_64 18.04-1 centos-fdio + vpp-devel.x86_64 17.10-1 centos-fdio + vpp-devel.x86_64 18.01.1-1 centos-fdio + vpp-devel.x86_64 18.01.2-1 centos-fdio + vpp-devel.x86_64 18.04-1 centos-fdio + vpp-lib.x86_64 17.10-1 centos-fdio + vpp-lib.x86_64 18.01.1-1 centos-fdio + vpp-lib.x86_64 18.01.2-1 centos-fdio + vpp-lib.x86_64 18.04-1 centos-fdio + vpp-plugins.x86_64 17.10-1 centos-fdio + vpp-plugins.x86_64 18.01.1-1 centos-fdio + vpp-plugins.x86_64 18.01.2-1 centos-fdio + vpp-plugins.x86_64 18.04-1 centos-fdio + vpp-selinux-policy.x86_64 18.04-1 centos-fdio + +Then install a particular version: + +.. code-block:: console + + $ sudo yum install vpp-17.10-1.x86_64 + + +Nexus Repository +^^^^^^^^^^^^^^^^ + +Build artifacts are also posted to a FD.io Nexus Repository. This includes +official point releases, as well as nightly builds. To use any of these build +artifacts, create a file *'/etc/yum.repos.d/fdio-release.repo'* with the +content that points to the version needed. Below are some common examples of +the content needed: + + +VPP Latest Release +"""""""""""""""""" + +To allow *'yum'* access to the official VPP releases, create the file +*'/etc/yum.repos.d/fdio-release.repo'* with the following content: + +.. code-block:: console + + $ cat /etc/yum.repos.d/fdio-release.repo + [fdio-release] + name=fd.io release branch latest merge + baseurl=https://nexus.fd.io/content/repositories/fd.io.centos7/ + enabled=1 + gpgcheck=0 + +The *'yum install vpp'* command will install the most recent release. To +install older releases, run the following command to get the list of releases +provided: + +.. code-block:: console + + $ sudo yum --showduplicates list vpp* | expand + +Then choose the release to install. See **'CentOS NFV SIG Repository'** for +sample *'yum --showduplicates list'* output and an example of installing a +particular version of the RPMs. + +VPP Stable Branch +""""""""""""""""" + +To allow *yum* access to the build artifacts for a VPP stable branch, create +the file *'/etc/yum.repos.d/fdio-release.repo'* with the following content: + +.. code-block:: console + + $ cat /etc/yum.repos.d/fdio-release.repo + [fdio-stable-1804] + name=fd.io stable/1804 branch latest merge + baseurl=https://nexus.fd.io/content/repositories/fd.io.stable.1804.centos7/ + enabled=1 + gpgcheck=0 + +For other stable branches, replace the *'1804'* from the above content with the +desired release. Examples: 1606, 1609, 1701, 1704, 1707, 1710, 1804, 1807 + +The *'yum install vpp'* command will install the most recent build on the +branch, not the latest offical release. Run the following command to get the +list of images produce by the branch: + +.. code-block:: console + + $ sudo yum --showduplicates list vpp* | expand + +Then choose the image to install. See **'CentOS NFV SIG Repository'** for +sample *'yum --showduplicates list'* output and an example of installing a +particular version of the RPMs. + + +VPP Master Branch +""""""""""""""""" + +To allow *yum* access to the nightly builds from the VPP master branch, create +the file *'/etc/yum.repos.d/fdio-release.repo'* with the following content: + +.. code-block:: console + + $ cat /etc/yum.repos.d/fdio-release.repo + [fdio-master] + name=fd.io master branch latest merge + baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7/ + enabled=1 + gpgcheck=0 + +The *'yum install vpp'* command will install the most recent build on the +branch. Run the following command to get the list of images produce by the +branch: + +.. code-block:: console + + $ sudo yum --showduplicates list vpp* | expand + +Then choose the image to install. See **'CentOS NFV SIG Repository'** for +sample *'yum --showduplicates list'* output and an example of installing a +particular version of the RPMs. + + +Install VPP RPMs +================ + +To install the VPP packet engine, run the following: + +.. code-block:: console + + $ sudo yum install vpp + +The **'vpp'** RPM depend on the **'vpp-lib'** and **'vpp-selinux-policy'** +RPMs, so they will be installed as well. + +.. note:: + + The **'vpp-selinux-policy'** will not enable SELinux on the system. It + will install a Custom VPP SELinux policy that will be used if SELinux is + enabled at any time. + +There are additional packages that are optional. These packages can be +combined with the command above and installed all at once, or installed as +needed: + +.. code-block:: console + + $ sudo yum install vpp-plugins vpp-devel vpp-api-python vpp-api-lua vpp-api-java + +Starting VPP +============ + +Once VPP is installed on the system, to run VPP as a systemd service on CentOS, +run: + +.. code-block:: console + + $ sudo systemctl start vpp + +Then to enable VPP to start on system reboot: + +.. code-block:: console + + $ sudo systemctl enable vpp + + +Outside of running VPP as a systemd service, VPP can be started manually or +made to run within GDB for debugging. See :ref:`running` for more details and +ways to tailor VPP to a specific system. + + +Uninstall the VPP RPMs +====================== + +.. code-block:: console + + $ sudo yum autoremove vpp* diff --git a/docs/gettingstarted/users/installing/index.rst b/docs/gettingstarted/users/installing/index.rst new file mode 100644 index 00000000000..7636ec875fd --- /dev/null +++ b/docs/gettingstarted/users/installing/index.rst @@ -0,0 +1,47 @@ +.. _installing: + +.. toctree:: + +Installing VPP from Packages +============================ + +If you are simply using vpp, it can be convenient to install the binaries from +existing packages. This guide will describe how pull, install and run the VPP +packages. + +.. toctree:: + +Package Descriptions +-------------------- +The following is a brief description of the packages to be installed with VPP. + +.. toctree:: + + packages + +Installing VPP Binaries +----------------------- + +Installing on Ubuntu +^^^^^^^^^^^^^^^^^^^^ +The following are instructions on how to install VPP on Ubuntu. + +.. toctree:: + + ubuntu + +Installing on Centos +^^^^^^^^^^^^^^^^^^^^ +The following are instructions on how to install VPP on Centos. + +.. toctree:: + + centos + +Installing on openSUSE +^^^^^^^^^^^^^^^^^^^^^^ +The following are instructions on how to install VPP on openSUSE. + +.. toctree:: + + opensuse diff --git a/docs/gettingstarted/users/installing/opensuse.rst b/docs/gettingstarted/users/installing/opensuse.rst new file mode 100644 index 00000000000..8e91ebd2f45 --- /dev/null +++ b/docs/gettingstarted/users/installing/opensuse.rst @@ -0,0 +1,51 @@ +.. _opensuse: + +.. toctree:: + +Installing +========== +Top install VPP on openSUSE first pick the following release and execute the appropriate commands. + +openSUSE Tumbleweed (rolling release) +------------------------------------- + +.. code-block:: console + + sudo zypper install vpp vpp-plugins + +openSUSE Leap 42.3 +------------------ + +.. code-block:: console + + sudo zypper addrepo --name network https://download.opensuse.org/repositories/network/openSUSE_Leap_42.3/network.repo + sudo zypper install vpp vpp-plugins + +Uninstall +========= + +.. code-block:: console + + sudo zypper remove -u vpp vpp-plugins + +openSUSE Tumbleweed (rolling release) +------------------------------------- + +.. code-block:: console + + sudo zypper remove -u vpp vpp-plugins + +openSUSE Leap 42.3 +------------------ + +.. code-block:: console + + sudo zypper remove -u vpp vpp-plugins + sudo zypper removerepo network + +For More Information +==================== +For more information on VPP with openSUSE, please look at the following post. + +* https://www.suse.com/communities/blog/vector-packet-processing-vpp-opensuse/ + diff --git a/docs/gettingstarted/users/installing/packages.rst b/docs/gettingstarted/users/installing/packages.rst new file mode 100644 index 00000000000..d67ff605d99 --- /dev/null +++ b/docs/gettingstarted/users/installing/packages.rst @@ -0,0 +1,83 @@ +.. _packages: + +Packages +======== + +.. toctree:: + +vpp +--- + +Vector Packet Processing executables. This is the primary package that must be +installed to use VPP. This package contains: + +* vpp - the vector packet engine +* vpp_api_test - vector packet engine API test tool +* vpp_json_test - vector packet engine JSON test tool + +vpp-lib +------- + +Vector Packet Processing runtime libraries. The *'vpp'* package depends on this +package, so it will always be installed. This package contains the VPP shared +libraries, including: + +* vppinfra - Foundation library supporting vectors, hashes, bitmaps, pools, and string formatting. +* svm - vm library +* vlib - vector processing library +* vlib-api - binary API library +* vnet - network stack library + +vpp-plugins +----------- + +Vector Packet Processing plugin modules. + +* acl +* dpdk +* flowprobe +* gtpu +* ixge +* kubeproxy +* l2e +* lb +* memif +* nat +* pppoe +* sixrd +* stn + +vpp-dbg +------- + +Vector Packet Processing debug symbols. + +vpp-dev +------- + +Vector Packet Processing development support. This package contains +development support files for the VPP libraries. + +vpp-api-java +------------ + +JAVA binding for the VPP Binary API. + +vpp-api-python +-------------- + +Python binding for the VPP Binary API. + +vpp-api-lua +----------- + +Lua binding for the VPP Binary API. + +vpp-selinux-policy +------------------ + +This package contains the VPP Custom SELinux Policy. It is only generated for +Fedora and CentOS distros. For those distros, the *'vpp'* package depends on +this package, so it will always be installed. It will not enable SELinux on +the system. It will install a Custom VPP SELinux policy that will be used if +SELinux is enabled at any time. diff --git a/docs/gettingstarted/users/installing/ubuntu.rst b/docs/gettingstarted/users/installing/ubuntu.rst new file mode 100644 index 00000000000..9c082e667b0 --- /dev/null +++ b/docs/gettingstarted/users/installing/ubuntu.rst @@ -0,0 +1,81 @@ +.. _ubuntu: + +.. toctree:: + +Ubuntu 16.04 - Setup the fd.io Repository +========================================= + +From the following choose one of the releases to install. + + +Update the OS +------------- + +It is probably a good idea to update and upgrade the OS before starting + +.. code-block:: console + + apt-get update + + +Point to the Repository +----------------------- + +Create a file **"/etc/apt/sources.list.d/99fd.io.list"** with the contents that point to +the version needed. The contents needed are shown below. + +.. _install_vpp: + +VPP latest Release +^^^^^^^^^^^^^^^^^^ + +Create the file **/etc/apt/sources.list.d/99fd.io.list** with contents: + +.. code-block:: console + + deb [trusted=yes] https://nexus.fd.io/content/repositories/fd.io.ubuntu.xenial.main/ ./ + + +VPP stable/1804 Branch +^^^^^^^^^^^^^^^^^^^^^^ + +Create the file **/etc/apt/sources.list.d/99fd.io.list** with contents: + +.. code-block:: console + + deb [trusted=yes] https://nexus.fd.io/content/repositories/fd.io.stable.1804.ubuntu.xenial.main/ ./ + + +VPP master Branch +^^^^^^^^^^^^^^^^^ + +Create the file **/etc/apt/sources.list.d/99fd.io.list** with contents: + +.. code-block:: console + + deb [trusted=yes] https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/ ./ + + +Install the Mandatory Packages +============================== + +.. code-block:: console + + sudo apt-get update + sudo apt-get install vpp vpp-lib vpp-plugin + + +Install the Optional Packages +============================= + +.. code-block:: console + + sudo apt-get install vpp-dbg vpp-dev vpp-api-java vpp-api-python vpp-api-lua + + +Uninstall the Packages +====================== + +.. code-block:: console + + sudo apt-get remove --purge vpp* diff --git a/docs/gettingstarted/users/running/index.rst b/docs/gettingstarted/users/running/index.rst new file mode 100644 index 00000000000..b36773e6b43 --- /dev/null +++ b/docs/gettingstarted/users/running/index.rst @@ -0,0 +1,59 @@ +.. _running: + +Running VPP +=========== + +.. toctree:: + +'vpp' Usergroup +--------------- + +When VPP is installed, a new usergroup *'vpp'* is created. To avoid running the +VPP CLI (vppctl) as root, add any existing users to the new group that need to +interact with VPP: + +.. code-block:: console + + $ sudo usermod -a -G vpp user1 + +Update your current session for the group change to take effect: + +.. code-block:: console + + $ newgrp vpp + + +VPP Systemd File - 'vpp.service' +-------------------------------- + +When the VPP is installed, a systemd service files is also installed. This +file, vpp.service (Ubuntu: /lib/systemd/system/vpp.service and CentOS: +/usr/lib/systemd/system/vpp.service), controls how VPP is run as a service. For +example, whether or not to restart on failure and if so, with how much delay. +Also, which UIO driver should be loaded and location of the *'startup.conf'* +file. + +.. code-block:: console + + $ cat /usr/lib/systemd/system/vpp.service + [Unit] + Description=Vector Packet Processing Process + After=syslog.target network.target auditd.service + + [Service] + ExecStartPre=-/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api + ExecStartPre=-/sbin/modprobe uio_pci_generic + ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf + Type=simple + Restart=on-failure + RestartSec=5s + + [Install] + WantedBy=multi-user.target + +.. note:: + + Some older versions of the *'uio_pci_generic'* driver don't bind all + the supported NICs properly, so the *'igb_uio'* driver built from DPDK + needs to be installed. This file controls which driver is loaded at boot. + *'startup.conf'* file controls which driver is used. diff --git a/docs/gettingstarted/writingdocs/buildingrst.rst b/docs/gettingstarted/writingdocs/buildingrst.rst new file mode 100644 index 00000000000..00f051c30b7 --- /dev/null +++ b/docs/gettingstarted/writingdocs/buildingrst.rst @@ -0,0 +1,236 @@ +.. _buildingrst: + +********************** +Building VPP Documents +********************** + +Overview +======== + +These instructions show how the VPP documentation sources are built. + +FD.io VPP Documentation uses `reStructuredText <http://www.sphinx-doc.org/en/master/usage/restructuredtext/index.html>`_ (rst) files, which are used by `Sphinx <http://www.sphinx-doc.org/en/master/>`_. +We will also cover how to view your build on Read the Docs in `Using Read the Docs`_. + + +To build your files, you can either `Create a Virtual Environment using virtualenv`_, which installs all the required applications for you, or you can `Install Sphinx manually`_. + +Create a Virtual Environment using virtualenv +_____________________________________________ + +For more information on how to use the Python virtual environment check out +`Installing packages using pip and virtualenv`_. + +.. _`Installing packages using pip and virtualenv`: https://packaging.python.org/guides/installing-using-pip-and-virtualenv/ + +Get the Documents +^^^^^^^^^^^^^^^^^ + +For example start with a clone of the vpp-docs. + +.. code-block:: console + + $ git clone https://gerrit.fd.io/r/vpp + $ cd vpp + + +Install the virtual environment +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +In your vpp-docs directory, run: + +.. code-block:: console + + $ python -m pip install --user virtualenv + $ python -m virtualenv env + $ source env/bin/activate + $ pip install -r docs/etc/requirements.txt + $ cd docs + +Which installs all the required applications into it's own, isolated, virtual environment, so as to not +interfere with other builds that may use different versions of software. + +Build the html files +^^^^^^^^^^^^^^^^^^^^ + +Be sure you are in your vpp-docs/docs directory, since that is where Sphinx will look for your **conf.py** +file, and build the **.rst** files into an **index.html** file: + +.. code-block:: console + + $ make html + +View the results +^^^^^^^^^^^^^^^^ + +| If there are no errors during the build process, you should now have an **index.html** file in your +| **vpp/docs/_build/html** directory, which you can then view in your browser. + +.. figure:: /_images/htmlBuild.png + :alt: Figure: My directory containing the index.html file + :scale: 35% + :align: center + +Whenever you make changes to your **.rst** files that you want to see, repeat this build process. + +.. note:: + + To exit from the virtual environment execute: + +.. code-block:: console + + $ deactivate + + +Install Sphinx manually +_______________________ + +Skip this step if you created a *virtualenv* in the previous step. If you dont want to create a *virtualenv*, you should install Sphinx `here <http://www.sphinx-doc.org/en/master/usage/installation.html>`_, and follow their `getting started guide <http://www.sphinx-doc.org/en/master/usage/quickstart.html>`_. + +Building these files will generate an **index.html** file, which you can then view in your browser to verify and see your file changes. + + +To *build* your files, make sure you're in your **vpp-docs/docs** directory, where your **conf.py** file is located, and run: + +.. code-block:: console + + $ make html + + +| If there are no errors during the build process, you should now have an **index.html** file in your +| **vpp-docs/docs/_build/html** directory, which you can then view in your browser. + +.. figure:: /_images/htmlBuild.png + :scale: 35% + :align: center + +Whenever you make changes to your **.rst** files that you want to see, repeat this build process. + + +Using Read the Docs +___________________ + +`Read the Docs <https://readthedocs.org/>`_ is a website that "simplifies software documentation by automating building, versioning, and hosting of your docs for you". Essentially, it accesses your Github repo to generate the **index.html** file, and then displays it on its own *Read the Docs* webpage so others can view your documentation. + +Create an account on *Read the Docs* if you haven't already. + +Go to your `dashboard <https://readthedocs.org/dashboard/>`_ , and click on "Import a Project". + +.. figure:: /_images/importReadDocs.png + :scale: 35% + :align: left + + This will bring you to a page where you can choose to import a repo from your Github account (only if you've linked your Github account to your Read the Docs account), or to import a repo manually. In this example, we'll do it manually. Click "Import Manually". + +| +| +| +| +| +| +| + + + +This will bring you to a page that asks for your repo details. Set "Name" to your forked repo name, or whatever you want. Set "Repository URL" to the URL of your forked repo (https://github.com/YOURUSERNAME/vpp-docs). "Repository type" should already be selected to "Git". Then click "Next". + + +.. figure:: /_images/importRTDManually.png + :scale: 35% + :align: left + +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| + + +This will bring you to a project page of your repo on Read the Docs. You can confirm it's the correct repo by checking on the right side of the page the Repository URL. + +Then click on "Build Version". + +.. figure:: /_images/buildVerRTD.png + :scale: 35% + :align: left + +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| + +Which takes you to another page showing your recent builds. + +Then click on "Build Version:". This should "Trigger" a build. After about a minute or so you can refresh the page and see that your build "Passed". + + +.. figure:: /_images/passedBuild.png + :scale: 35% + :align: left + + +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| + + +Now on your builds page from the previous image, you can click "View Docs" at the top-right, which will take you a *readthedocs.io* page of your generated build! + +.. figure:: /_images/rtdWebpage.png + :scale: 30% + :align: left diff --git a/docs/gettingstarted/writingdocs/gitreview.rst b/docs/gettingstarted/writingdocs/gitreview.rst new file mode 100644 index 00000000000..63916e1d752 --- /dev/null +++ b/docs/gettingstarted/writingdocs/gitreview.rst @@ -0,0 +1,72 @@ +.. _gitreview: + +*************************** +Merging FD.io VPP documents +*************************** + +This section describes how to get FD.io VPP documents reviewed and merged. + +Git Review +========== + +The VPP documents use the gerrit server and git review. + +Clone with ssh +-------------- + +To get FD.io VPP documents reviewed the VPP repository should be cloned with ssh. + +Use the following to setup you ssh key + +.. code-block:: console + + $ ssh-keygen -t rsa + $ keychain + $ cat ~/.ssh/id_rsa.pub + +Copy that key to the gerrit server. +Then clone the repo with: + +.. code-block:: console + + $ git clone ssh://gerrit.fd.io:29418/vpp + $ cd vpp + +New patch +-------------- + +To get a new patch reviewed use the following: + +.. code-block:: console + + git status + git add <filename> + git commit -s + git review + +If the patch is a draft use the following: + +.. note:: + + git review -D + + +To get back to the master: + +.. code-block:: console + + git reset --hard origin/master + git checkout master + +Existing patch +-------------- + +To modify an existing patch: + + +.. code-block:: console + + git status + git add <filename> + git commit --amend + git review diff --git a/docs/gettingstarted/writingdocs/index.rst b/docs/gettingstarted/writingdocs/index.rst new file mode 100644 index 00000000000..e1ce767e40e --- /dev/null +++ b/docs/gettingstarted/writingdocs/index.rst @@ -0,0 +1,18 @@ +.. _writingdocs: + +######################### +Writing VPP Documentation +######################### + +.. toctree:: + + buildingrst + gitreview + readthedocs + styleguide/index.rst + styleguidemd/index.rst + todo + pushingapatch + + + diff --git a/docs/gettingstarted/writingdocs/pushingapatch.rst b/docs/gettingstarted/writingdocs/pushingapatch.rst new file mode 100644 index 00000000000..d0d5ec23888 --- /dev/null +++ b/docs/gettingstarted/writingdocs/pushingapatch.rst @@ -0,0 +1,237 @@ +.. _pushingapatch: + +================= +Github Repository +================= + +**The github repository is no longer being used. The gerrit server is being used.** + +To use the gerrit repository refer to :ref:`gitreview`. + +Overview +________ + +This section will cover how to fork your own branch of the `fdioDocs/vpp-docs <https://github.com/fdioDocs/vpp-docs>`_ repository, clone that repo locally to your computer, make changes to it, and how to issue a pull request when you want your changes to be reflected on the main repo. + +.. toctree:: + +Forking your own branch +_______________________ + +In your browser, navigate to the repo you want to branch off of. In this case, the `fdioDocs/vpp-docs <https://github.com/fdioDocs/vpp-docs>`_ repo. At the top right of the page you should see this: + +.. figure:: /_images/ForkButtons.png + :alt: Figure: Repository options on Github + :scale: 50% + :align: right + +| +| +| + +Click on "Fork", and then a pop-up should appear where you should then click your Github username. Once this is done, it should automatically take you to the Github page where your new branch is located, just like in the image below. + +.. figure:: /_images/usernameFork.png + :alt: Figure: Your own branch of the main repo on Github + :scale: 35% + :align: center + + +Now your **own branch** can be **cloned** to your computer using the URL (https://github.com/YOURUSERNAME/vpp-docs) of the Github page where your branch is located. + + +Creating a local repository +___________________________ + +Now that you have your own branch of the main repository on Github, you can store it locally on your computer. In your shell, navigate to the directory where you want to store your branch/repo. Then execute: + +.. code-block:: console + + $ git clone https://github.com/YOURUSERNAME/vpp-docs + +This will create a directory on your computer named **vpp-docs**, the name of the repo. + +Now that your branch is on your computer, you can modify and build files however you wish. + +If you are not on the master branch, move to it. + +.. code-block:: console + + $ git checkout master + + +Keeping your files in sync with the main repo +_____________________________________________ + +The following talks about remote branches, but keep in mind that there are currently *two* branches, your local "master" branch (on your computer), and your remote "origin or origin/master" branch (the one you created using "Fork" on the Github website). + +You can view your *remote* repositories with: + +.. code-block:: console + + $ git remote -v + +At this point, you may only see the remote branch that you cloned from. + +.. code-block:: console + + Macintosh:docs Andrew$ git remote -v + origin https://github.com/a-olechtchouk/vpp-docs (fetch) + origin https://github.com/a-olechtchouk/vpp-docs (push) + +Now you want to create a new remote repository of the main vpp-docs repo (naming it upstream). + +.. code-block:: console + + $ git remote add upstream https://github.com/fdioDocs/vpp-docs + + +You can verify that you have added a remote repo using the previous **git remote -v** command. + +.. code-block:: console + + $ git remote -v + origin https://github.com/a-olechtchouk/vpp-docs (fetch) + origin https://github.com/a-olechtchouk/vpp-docs (push) + upstream https://github.com/fdioDocs/vpp-docs (fetch) + upstream https://github.com/fdioDocs/vpp-docs (push) + + +If there have been any changes to files in the main repo (hopefully not the same files you were working on!), you want to make sure your local branch is in sync with them. + +To do so, fetch any changes that the main repo has made, and then merge them into your local master branch using: + +.. code-block:: console + + $ git fetch upstream + $ git merge upstream/master + + +.. note:: **This is optional, so don't do these commands if you just want one local branch!!!** + + You may want to have multiple branches, where each branch has its own different features, allowing you to have multiple pull requests out at a time. To create a new local branch: + +.. code-block:: shell + + $ git checkout -b cleanup-01 + $ git branch + * cleanup-01 + master + overview + + Now you can redo the previous steps for "Keeping your files in sync with the main repo" for your newly created local branch, and then depending on which branch you want to send out a pull reqest for, proceed below. + + +Pushing to your branch +______________________ + +Now that your files are in sync, you want to add modified files, commit, and push them from *your local branch* to your *personal remote branch* (not the main fdioDocs repo). + +To check the status of your files, run: + +.. code-block:: console + + $ git status + + +In the output example below, I deleted gettingsources.rst, made changes to index.rst and pushingapatch.rst, and have created a new file called buildingrst.rst. + +.. code-block:: console + + Macintosh:docs Andrew$ git status + On branch master + Your branch is up-to-date with 'origin/master'. + Changes to be committed: + (use "git reset HEAD <file>..." to unstage) + + deleted: tasks/writingdocs/gettingsources.rst + + Changes not staged for commit: + (use "git add <file>..." to update what will be committed) + (use "git checkout -- <file>..." to discard changes in working directory) + + modified: tasks/writingdocs/index.rst + modified: tasks/writingdocs/pushingapatch.rst + + Untracked files: + (use "git add <file>..." to include in what will be committed) + + tasks/writingdocs/buildingrst.rst + + + +To add files (use **git add -A** to add all modified files): + +.. code-block:: console + + $ git add FILENAME1 FILENAME2 + +Commit and push using: + +.. code-block:: console + + $ git commit -m 'A descriptive commit message for two files.' + +Push your changes for the branch where your changes were made + +.. code-block:: console + + $ git push origin <branch name> + +Here, your personal remote branch is "origin" and your local branch is "master". + +.. note:: + + Using **git commit** after adding your files saves a "Snapshot" of them, so it's very hard to lose your work if you *commit often*. + + + +Initiating a pull request (Code review) +_______________________________________ + +Once you've pushed your changes to your remote branch, go to your remote branch on Github (https://github.com/YOURUSERNAME/vpp-docs), and click on "New pull request". + +.. figure:: /_images/issuePullReq.png + :alt: Figure: Your own branch of the main repo on Github + :scale: 35% + :align: center + +This will bring you to a "Comparing changes" page. Click "Create new pull request". + +.. figure:: /_images/createNewPullReq.png + :scale: 35% + :align: left + +| +| +| + +Which will open up text fields to add information to your pull request. + +.. figure:: /_images/examplePullReq.png + :scale: 35% + :align: center + + + Then finally click "Create pull request" to complete the pull request. + +Your documents will be reviewed. To this same branch make the changes requested from the review and then push your new changes. There is no need to create another pull request. + +.. code-block:: console + + $ git commit -m 'A descriptive commit message for the new changes' + $ git push origin <branch name> + + +Additional Git commands +_______________________ + +You may find some of these Git commands useful: + +Use **git diff** to quickly show the file changes and repo differences of your commits. + +Use **git rm FILENAME** to stop tracking a file and to remove it from your remote branch and local directory. Use flag **-r** to remove folders/directories. E.g (**git rm -r oldfolder**) + + +.. _fdioDocs: https://github.com/fdioDocs/vpp-docs + diff --git a/docs/gettingstarted/writingdocs/readthedocs.rst b/docs/gettingstarted/writingdocs/readthedocs.rst new file mode 100644 index 00000000000..f97b8d918b6 --- /dev/null +++ b/docs/gettingstarted/writingdocs/readthedocs.rst @@ -0,0 +1,130 @@ +.. _readthedocs: + +******************* +Using Read the Docs +******************* + +`Read the Docs <https://readthedocs.org/>`_ is a website that "simplifies software documentation by automating building, versioning, and hosting of your docs for you". Essentially, it accesses your Github repo to generate the **index.html** file, and then displays it on its own *Read the Docs* webpage so others can view your documentation. + +Create an account on *Read the Docs* if you haven't already. + +Go to your `dashboard <https://readthedocs.org/dashboard/>`_ , and click on "Import a Project". + +.. figure:: /_images/importReadDocs.png + :scale: 35% + :align: left + + This will bring you to a page where you can choose to import a repo from your Github account (only if you've linked your Github account to your Read the Docs account), or to import a repo manually. In this example, we'll do it manually. Click "Import Manually". + +| +| +| +| +| +| +| + + + +This will bring you to a page that asks for your repo details. Set "Name" to your forked repo name, or whatever you want. Set "Repository URL" to the URL of your forked repo (https://github.com/YOURUSERNAME/vpp-docs). "Repository type" should already be selected to "Git". Then click "Next". + + +.. figure:: /_images/importRTDManually.png + :scale: 35% + :align: left + +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| + + +This will bring you to a project page of your repo on Read the Docs. You can confirm it's the correct repo by checking on the right side of the page the Repository URL. + +Then click on "Build Version". + +.. figure:: /_images/buildVerRTD.png + :scale: 35% + :align: left + +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| + +Which takes you to another page showing your recent builds. + +Then click on "Build Version:". This should "Trigger" a build. After about a minute or so you can refresh the page and see that your build "Passed". + + +.. figure:: /_images/passedBuild.png + :scale: 35% + :align: left + + +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| + + +Now on your builds page from the previous image, you can click "View Docs" at the top-right, which will take you a *readthedocs.io* page of your generated build! + +.. figure:: /_images/rtdWebpage.png + :scale: 30% + :align: left diff --git a/docs/gettingstarted/writingdocs/styleguide/index.rst b/docs/gettingstarted/writingdocs/styleguide/index.rst new file mode 100644 index 00000000000..79d28c37493 --- /dev/null +++ b/docs/gettingstarted/writingdocs/styleguide/index.rst @@ -0,0 +1,30 @@ +.. _styleguide: + +############################# +reStructured Text Style Guide +############################# + +Most of the these documents are written ins reStructured Text (rst). This chapter describes some of +the Sphinx Markup Constructs used in these documents. The Sphinx style guide can be found at: +`Sphinx Style Guide <http://documentation-style-guide-sphinx.readthedocs.io/en/latest/style-guide.html>`_ +For a more detailed list of Sphinx Markup Constructs please refer to: +`Sphinx Markup Constructs <http://www.sphinx-doc.org/en/stable/markup/index.html>`_ + +This document is also an example of a directory structure for a document that spans mutliple pages. +Notice we have the file **index.rst** and the then documents that are referenced in index.rst. The +referenced documents are shown at the bottom of this page. + +A label is shown at the top of this page. Then the first construct describes a the document title +**FD.io Style Guide**. Text usually follows under each title or heading. + +A **Table of Contents** structure is shown below. Using **toctree** in this way will show the headings +in a nicely in the generated documents. + +.. toctree:: + + styleguide.rst + styleguide02.rst + styleguide02table.rst + styleguide03.rst + styleguide04.rst + styleguide05.rst diff --git a/docs/gettingstarted/writingdocs/styleguide/iperf-vm.xml b/docs/gettingstarted/writingdocs/styleguide/iperf-vm.xml new file mode 100644 index 00000000000..be354c5f977 --- /dev/null +++ b/docs/gettingstarted/writingdocs/styleguide/iperf-vm.xml @@ -0,0 +1,106 @@ +<domain type='kvm' id='54'> + <name>iperf-server</name> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <memoryBacking> + <hugepages> + <page size='2048' unit='KiB'/> + </hugepages> + </memoryBacking> + <vcpu placement='static'>1</vcpu> + <resource> + <partition>/machine</partition> + </resource> + <os> + <type arch='x86_64' machine='pc-i440fx-xenial'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + </features> + <cpu mode='host-model'> + <model fallback='allow'></model> + <numa> + <cell id='0' cpus='0' memory='262144' unit='KiB' memAccess='shared'/> + </numa> + </cpu> + <clock offset='utc'> + <timer name='rtc' tickpolicy='catchup'/> + <timer name='pit' tickpolicy='delay'/> + <timer name='hpet' present='no'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <pm> + <suspend-to-mem enabled='no'/> + <suspend-to-disk enabled='no'/> + </pm> + <devices> + <emulator>/usr/bin/kvm</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/tmp/xenial-mod.img'/> + <backingStore/> + <target dev='vda' bus='virtio'/> + <alias name='virtio-disk0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/scratch/jdenisco/sae/configs/cloud-config.iso'/> + <backingStore/> + <target dev='hda' bus='ide'/> + <readonly/> + <alias name='ide0-0-0'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0' model='ich9-ehci1'> + <alias name='usb'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/> + </controller> + <controller type='pci' index='0' model='pci-root'> + <alias name='pci.0'/> + </controller> + <controller type='ide' index='0'> + <alias name='ide'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='virtio-serial' index='0'> + <alias name='virtio-serial0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </controller> + <interface type='vhostuser'> + <mac address='52:54:00:4c:47:f2'/> + <source type='unix' path='/tmp//vm00.sock' mode='server'/> + <model type='virtio'/> + <alias name='net1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </interface> + <serial type='pty'> + <source path='/dev/pts/2'/> + <target port='0'/> + <alias name='serial0'/> + </serial> + <console type='pty' tty='/dev/pts/2'> + <source path='/dev/pts/2'/> + <target type='serial' port='0'/> + <alias name='serial0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' port='5900' autoport='yes' listen='127.0.0.1'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <memballoon model='virtio'> + <alias name='balloon0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> + </memballoon> + </devices> + <seclabel type='dynamic' model='apparmor' relabel='yes'> + <label>libvirt-2c4c9317-c7a5-4b37-b789-386ccda7348a</label> + <imagelabel>libvirt-2c4c9317-c7a5-4b37-b789-386ccda7348a</imagelabel> + </seclabel> +</domain> + diff --git a/docs/gettingstarted/writingdocs/styleguide/rawhtml.rst b/docs/gettingstarted/writingdocs/styleguide/rawhtml.rst new file mode 100644 index 00000000000..e94eb452312 --- /dev/null +++ b/docs/gettingstarted/writingdocs/styleguide/rawhtml.rst @@ -0,0 +1,10 @@ +.. _rawhtml01: + +Raw HTML Example +================ + +This example shows how to include include a CSIT performance graph. + +.. raw:: html + + <iframe src="https://docs.fd.io/csit/rls1801/report/_static/vpp/64B-1t1c-l2-sel2-ndrdisc.html" width="850" height="1000" frameborder="0"> diff --git a/docs/gettingstarted/writingdocs/styleguide/styleguide.rst b/docs/gettingstarted/writingdocs/styleguide/styleguide.rst new file mode 100644 index 00000000000..2312ea9c425 --- /dev/null +++ b/docs/gettingstarted/writingdocs/styleguide/styleguide.rst @@ -0,0 +1,20 @@ +.. _styleguide01: + +********* +Heading 1 +********* + +This is the top heading level. More levels are shown below. + +Heading 2 +========= + +Heading 3 +--------- + +Heading 4 +^^^^^^^^^ + +Heading 5 +""""""""" + diff --git a/docs/gettingstarted/writingdocs/styleguide/styleguide02.rst b/docs/gettingstarted/writingdocs/styleguide/styleguide02.rst new file mode 100644 index 00000000000..e2d7649f585 --- /dev/null +++ b/docs/gettingstarted/writingdocs/styleguide/styleguide02.rst @@ -0,0 +1,83 @@ +.. _styleguide02: + +************************* +Bullets, Bold and Italics +************************* + +Bold text can be show with **Bold Text**, Italics with *Italic text*. Bullets like so: + +* Bullet 1 +* Bullet 2 + +#. Numbered Bullet 1 +#. Numbered Bullet 2 + +***** +Notes +***** + +A note can be used to describe something not in the normal flow of the paragragh. This +is an example of a note. + +.. note:: + + Using **git commit** after adding your files saves a "Snapshot" of them, so it's very hard + to lose your work if you *commit often*. + +*********** +Code Blocks +*********** + +This paragraph describes how to do **Console Commands**. When showing VPP commands it is reccomended +that the command be executed from the linux console as shown. The Highlighting in the final documents +shows up nicely this way. + +.. code-block:: console + + $ sudo bash + # vppctl show interface + Name Idx State Counter Count + TenGigabitEthernet86/0/0 1 up rx packets 6569213 + rx bytes 9928352943 + tx packets 50384 + tx bytes 3329279 + TenGigabitEthernet86/0/1 2 down + VirtualEthernet0/0/0 3 up rx packets 50384 + rx bytes 3329279 + tx packets 6569213 + tx bytes 9928352943 + drops 1498 + local0 0 down + # + + +The **code-block** construct is also used for code samples. The following shows how to include a block of +"C" code. + +.. code-block:: c + + #include <vlib/unix/unix.h> + abf_policy_t * + abf_policy_get (u32 index) + { + return (pool_elt_at_index (abf_policy_pool, index)); + } + +Diffs are generated in the final docs nicely with "::" at the end of the description like so:: + + diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c + index 6e136e19..69189c93 100644 + --- a/src/vpp/vnet/main.c + +++ b/src/vpp/vnet/main.c + @@ -18,6 +18,8 @@ + #include <vlib/unix/unix.h> + #include <vnet/plugin/plugin.h> + #include <vnet/ethernet/ethernet.h> + +#include <vnet/ip/ip4_packet.h> + +#include <vnet/ip/format.h> + #include <vpp/app/version.h> + #include <vpp/api/vpe_msg_enum.h> + #include <limits.h> + @@ -400,6 +402,63 @@ VLIB_CLI_COMMAND (test_crash_command, static) = { + + #endif diff --git a/docs/gettingstarted/writingdocs/styleguide/styleguide02table.rst b/docs/gettingstarted/writingdocs/styleguide/styleguide02table.rst new file mode 100644 index 00000000000..742888be760 --- /dev/null +++ b/docs/gettingstarted/writingdocs/styleguide/styleguide02table.rst @@ -0,0 +1,76 @@ +.. _styleguide02table: + +****** +Tables +****** + +There are two types of tables with different syntax, `Grid Tables <http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#grid-tables>`_, and `Simple Tables <http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#simple-tables>`_. + +Grid Tables +___________ + +`Grid Tables <http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#grid-tables>`_ are described with a visual grid made up of the characters "-", "=", "|", and "+". The hyphen ("-") is used for horizontal lines (row separators). The equals sign ("=") may be used to separate optional header rows from the table body. The vertical bar ("|") is used for vertical lines (column separators). The plus sign ("+") is used for intersections of horizontal and vertical lines. + +Here is example code for a grid table in a *.rst* file: + +.. code-block:: console + + +------------------------+------------+----------+----------+ + | Header row, column 1 | Header 2 | Header 3 | Header 4 | + | (header rows optional) | | | | + +========================+============+==========+==========+ + | body row 1, column 1 | column 2 | column 3 | column 4 | + +------------------------+------------+----------+----------+ + | body row 2 | Cells may span columns. | + +------------------------+------------+---------------------+ + | body row 3 | Cells may | - Table cells | + +------------------------+ span rows. | - contain | + | body row 4 | | - body elements. | + +------------------------+------------+---------------------+ + +This example code generates a grid table that looks like this: + ++------------------------+------------+----------+----------+ +| Header row, column 1 | Header 2 | Header 3 | Header 4 | +| (header rows optional) | | | | ++========================+============+==========+==========+ +| body row 1, column 1 | column 2 | column 3 | column 4 | ++------------------------+------------+----------+----------+ +| body row 2 | Cells may span columns. | ++------------------------+------------+---------------------+ +| body row 3 | Cells may | - Table cells | ++------------------------+ span rows. | - contain | +| body row 4 | | - body elements. | ++------------------------+------------+---------------------+ + + +Simple Tables +_____________ + +`Simple tables <http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#simple-tables>`_ are described with horizontal borders made up of "=" and "-" characters. The equals sign ("=") is used for top and bottom table borders, and to separate optional header rows from the table body. The hyphen ("-") is used to indicate column spans in a single row by underlining the joined columns, and may optionally be used to explicitly and/or visually separate rows. + +Simple tables are "simpler" to create than grid tables, but are more limited. + +Here is example code for a simple table in a *.rst* file. + +.. code-block:: console + + ===== ===== ======= + A B A and B + ===== ===== ======= + False False False + True False False + False True False + True True True + ===== ===== ======= + +This example code generates a simple table that looks like this: + +===== ===== ======= + A B A and B +===== ===== ======= +False False False +True False False +False True False +True True True +===== ===== =======
\ No newline at end of file diff --git a/docs/gettingstarted/writingdocs/styleguide/styleguide03.rst b/docs/gettingstarted/writingdocs/styleguide/styleguide03.rst new file mode 100644 index 00000000000..df35643b8a2 --- /dev/null +++ b/docs/gettingstarted/writingdocs/styleguide/styleguide03.rst @@ -0,0 +1,32 @@ +.. _styleguide03: + +****************** +Labels, References +****************** + +A link or reference to other paragraphs within these documents can be done with +following construct. + +In this example the reference points the label **showintcommand**. The label **styleguide03** +is shown at the top of this page. A label used in this way must be above a heading or title. + +:ref:`showintcommand` command. + +************** +External Links +************** + +An external link is done with the following construct: + +`Sphinx Markup Constructs <http://www.sphinx-doc.org/en/stable/markup/index.html>`_ + +****** +Images +****** + +Images should be placed in the directory docs/_images. They can then be referenced with +following construct. This is the image created to show a pull request. + +.. figure:: /_images/examplePullReq.png + :scale: 35% + :align: center diff --git a/docs/gettingstarted/writingdocs/styleguide/styleguide04.rst b/docs/gettingstarted/writingdocs/styleguide/styleguide04.rst new file mode 100644 index 00000000000..1bc4210de78 --- /dev/null +++ b/docs/gettingstarted/writingdocs/styleguide/styleguide04.rst @@ -0,0 +1,12 @@ +.. _styleguide04: + +**************** +Including a file +**************** + +A complete file should be included with the following construct. It is recomended it be included with +it's own .rst file describing the file included. This is an example of an xml file is included. + +.. toctree:: + + xmlexample.rst diff --git a/docs/gettingstarted/writingdocs/styleguide/styleguide05.rst b/docs/gettingstarted/writingdocs/styleguide/styleguide05.rst new file mode 100644 index 00000000000..7ea977358c1 --- /dev/null +++ b/docs/gettingstarted/writingdocs/styleguide/styleguide05.rst @@ -0,0 +1,11 @@ +.. _styleguide05: + +******** +Raw HTML +******** + +An html frame can be included with the following construct. It is recommended that references to raw html be included with it's own .rst file. + +.. toctree:: + + rawhtml.rst diff --git a/docs/gettingstarted/writingdocs/styleguide/xmlexample.rst b/docs/gettingstarted/writingdocs/styleguide/xmlexample.rst new file mode 100644 index 00000000000..575a639579e --- /dev/null +++ b/docs/gettingstarted/writingdocs/styleguide/xmlexample.rst @@ -0,0 +1,11 @@ +.. _xmlexample: + +An XML File +=========== + +An example of an XML file. + +.. literalinclude:: iperf-vm.xml + :language: XML + :emphasize-lines: 42-49, 74-80 + diff --git a/docs/gettingstarted/writingdocs/styleguidemd/index.rst b/docs/gettingstarted/writingdocs/styleguidemd/index.rst new file mode 100644 index 00000000000..5bafb4d1512 --- /dev/null +++ b/docs/gettingstarted/writingdocs/styleguidemd/index.rst @@ -0,0 +1,15 @@ +.. _styleguidemd: + +#################### +Markdown Style Guide +#################### + +Most of these documents are written using :ref:`styleguide` (rst), but pages can also be +written in Markdown. This chapter describes some constructs used to write these documents. +For a more detailed description of Markdown refer to `Markdown Wikipedia <https://en.wikipedia.org/wiki/Markdown>`_ + +.. toctree:: + + styleguide.md + styleguide02.md + styleguide03.md diff --git a/docs/gettingstarted/writingdocs/styleguidemd/styleguide.md b/docs/gettingstarted/writingdocs/styleguidemd/styleguide.md new file mode 100644 index 00000000000..31ea822ca13 --- /dev/null +++ b/docs/gettingstarted/writingdocs/styleguidemd/styleguide.md @@ -0,0 +1,13 @@ +Heading 1 +========= + +This is the top heading level. More levels are shown below. + +Heading 2 +--------- + +### Heading 3 + +#### Heading 4 + +##### Heading 5 diff --git a/docs/gettingstarted/writingdocs/styleguidemd/styleguide02.md b/docs/gettingstarted/writingdocs/styleguidemd/styleguide02.md new file mode 100644 index 00000000000..b297d328082 --- /dev/null +++ b/docs/gettingstarted/writingdocs/styleguidemd/styleguide02.md @@ -0,0 +1,66 @@ +Bullets, Bold and Italics +========================= + +Bold text can be show with **Bold Text**, Italics with *Italic text*. +Bullets like so: + +- Bullet 1 +- Bullet 2 + +Code Blocks +=========== + +This paragraph describes how to do **Console Commands**. When showing +VPP commands it is reccomended that the command be executed from the +linux console as shown. The Highlighting in the final documents shows up +nicely this way. + +``` console +$ sudo bash +# vppctl show interface + Name Idx State Counter Count +TenGigabitEthernet86/0/0 1 up rx packets 6569213 + rx bytes 9928352943 + tx packets 50384 + tx bytes 3329279 +TenGigabitEthernet86/0/1 2 down +VirtualEthernet0/0/0 3 up rx packets 50384 + rx bytes 3329279 + tx packets 6569213 + tx bytes 9928352943 + drops 1498 +local0 0 down +# +``` + +The **code-block** construct is also used for code samples. The +following shows how to include a block of \"C\" code. + +``` c +#include <vlib/unix/unix.h> +abf_policy_t * +abf_policy_get (u32 index) +{ + return (pool_elt_at_index (abf_policy_pool, index)); +} +``` + +Diffs are generated in the final docs nicely with \":\" at the end of +the description like so: + + diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c + index 6e136e19..69189c93 100644 + --- a/src/vpp/vnet/main.c + +++ b/src/vpp/vnet/main.c + @@ -18,6 +18,8 @@ + #include <vlib/unix/unix.h> + #include <vnet/plugin/plugin.h> + #include <vnet/ethernet/ethernet.h> + +#include <vnet/ip/ip4_packet.h> + +#include <vnet/ip/format.h> + #include <vpp/app/version.h> + #include <vpp/api/vpe_msg_enum.h> + #include <limits.h> + @@ -400,6 +402,63 @@ VLIB_CLI_COMMAND (test_crash_command, static) = { + + #endif diff --git a/docs/gettingstarted/writingdocs/styleguidemd/styleguide03.md b/docs/gettingstarted/writingdocs/styleguidemd/styleguide03.md new file mode 100644 index 00000000000..462006fd6f3 --- /dev/null +++ b/docs/gettingstarted/writingdocs/styleguidemd/styleguide03.md @@ -0,0 +1,22 @@ +Labels, References +================== + +A link or reference to other paragraphs within these documents can be +done with following construct. + +External Links +============== + +An external link is done with the following construct: + +[Sphinx Markup +Constructs](http://www.sphinx-doc.org/en/stable/markup/index.html) + +Images +====== + +Images should be placed in the directory docs/\_images. They can then be +referenced with following construct. This is the image created to show a +pull request. + + diff --git a/docs/gettingstarted/writingdocs/todo.rst b/docs/gettingstarted/writingdocs/todo.rst new file mode 100644 index 00000000000..6c722986c24 --- /dev/null +++ b/docs/gettingstarted/writingdocs/todo.rst @@ -0,0 +1,60 @@ +.. _todo: + +***** +To Do +***** + +This section describes pieces of these documents that need some work. + +All Sections +============ + +All the sections need to be spell checked. + +Checked for guidelines. + +:ref:`vhost` +============ + +:ref:`vhosttopo` +---------------- + +Get a better topology picture. + +:ref:`vhost02` +-------------- + +The XML file refers to an iso image, come up with a procedure to build that image. +That should work when used with a cloud image. It should also be mentioned where +to get a cloud image. + +It is mentioned that a queue size of 256 is not large enough. Come up wit a procedure +to change the queue size. + + +:ref:`users` +============ + +The getting started users guide needs an overview + +:ref:`cmdreference` +=================== + +This section should be references to the doxygen links. The doxygen links will need to be cleaned up. +This section could be a quick reference only using commands we have tested. + +:ref:`progressivevpp` +===================== + +This section needs work. It needs to be split up and tested. + +:ref:`vswitchrtr` +================= + +Needs some instructions or be removed. + +:ref:`jvppjar` +============== + +Not sure what value this provides. + |