From 2e204be9a8c5d6d466da0adc32df5d77e1cc63d2 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Tue, 10 Oct 2017 14:24:41 +0200 Subject: Change image names and toolchain instructions Signed-off-by: Adrian Dudau Signed-off-by: Martin Borg --- doc/book-enea-nfv-access-guide/doc/benchmarks.xml | 14 ++++++------- .../doc/container_virtualization.xml | 8 ++++---- .../doc/getting_started.xml | 19 +++++++++--------- .../doc/hypervisor_virtualization.xml | 13 +++++++----- doc/book-enea-nfv-access-guide/doc/overview.xml | 11 ++++++----- .../doc/using_nfv_access_sdks.xml | 23 ++++++++-------------- 6 files changed, 43 insertions(+), 45 deletions(-) diff --git a/doc/book-enea-nfv-access-guide/doc/benchmarks.xml b/doc/book-enea-nfv-access-guide/doc/benchmarks.xml index cba6150..28b5f20 100644 --- a/doc/book-enea-nfv-access-guide/doc/benchmarks.xml +++ b/doc/book-enea-nfv-access-guide/doc/benchmarks.xml @@ -341,7 +341,7 @@ dpdk0 type=dpdk options:dpdk-devargs=0000:03:00.0 ofport_request=2 ovs-ofctl del-flows ovsbr0 ovs-ofctl add-flow ovsbr0 in_port=1,action=output:2 ovs-ofctl add-flow ovsbr0 in_port=2,action=output:1Import a - Docker container:docker import enea-image-virtualization-guest-qemux86-64.tar.gz el7_guestStart + Docker container:docker import enea-nfv-access-guest-qemux86-64.tar.gz el7_guestStart the Docker container:docker run -it --rm -v /var/run/openvswitch/:/var/run/openvswitch/ / -v /mnt/huge:/mnt/huge el7_guest /bin/bashStart the testpmd application in Docker:testpmd -c 0x30 -n 2 --file-prefix prog1 --socket-mem 512 --no-pci / @@ -598,7 +598,7 @@ type=dpdk options:dpdk-devargs=0000:03:00.0 ofport_request=3 ovs-ofctl del-flows ovsbr0 ovs-ofctl add-flow ovsbr0 in_port=3,action=output:2 ovs-ofctl add-flow ovsbr0 in_port=2,action=output:1Import a - Docker container:docker import enea-image-virtualization-guest-qemux86-64.tar.gz el7_guestStart + Docker container:docker import enea-nfv-access-guest-qemux86-64.tar.gz el7_guestStart the first Docker:docker run -it --rm --cpuset-cpus=4,5 / -v /var/run/openvswitch/:/var/run/openvswitch/ / -v /mnt/huge:/mnt/huge el7_guest /bin/bashStart the testpmd @@ -930,7 +930,7 @@ ovs-ofctl add-flow ovsbr0 in_port=2,action=output:1Launch QEMU:taskset -c 0,1 qemu-system-x86_64 -cpu host,+invtsc,migratable=no / -M q35 -smp cores=2,sockets=1 -vcpu 0,affinity=0 -vcpu 1,affinity=1 / -enable-kvm -nographic -realtime mlock=on -kernel /mnt/qemu/bzImage / --drive file=/mnt/qemu/enea-image-virtualization-guest-qemux86-64.ext4,/ +-drive file=/mnt/qemu/enea-nfv-access-guest-qemux86-64.ext4,/ if=virtio,format=raw -m 4096 -object memory-backend-file,id=mem,/ size=4096M,mem-path=/mnt/huge,share=on -numa node,memdev=mem / -mem-prealloc -chardev socket,id=char0,path=/var/run/openvswitch/vhost-user1 / @@ -1212,7 +1212,7 @@ ovs-ofctl add-flow ovsbr0 in_port=2,action=output:3Launch first QEMU instance, VM1:taskset -c 0,1 qemu-system-x86_64 -cpu host,+invtsc,migratable=no -M q35 / -smp cores=2,sockets=1 -vcpu 0,affinity=0 -vcpu 1,affinity=1 -enable-kvm / -nographic -realtime mlock=on -kernel /home/root/qemu/bzImage / --drive file=/home/root/qemu/enea-image-virtualization-guest-qemux86-64.ext4,/ +-drive file=/home/root/qemu/enea-nfv-access-guest-qemux86-64.ext4,/ if=virtio,format=raw -m 2048 -object memory-backend-file,id=mem,/ size=2048M,mem-path=/mnt/huge,share=on -numa node,memdev=mem / -mem-prealloc -chardev socket,id=char0,path=/var/run/openvswitch/vhost-user1 / @@ -1228,7 +1228,7 @@ processor.max_cstate=0 mce=ignore_ce audit=0'Connect to this VM2:taskset -c 4,5 qemu-system-x86_64 -cpu host,+invtsc,migratable=no / -M q35 -smp cores=2,sockets=1 -vcpu 0,affinity=4 -vcpu 1,affinity=5 / -enable-kvm -nographic -realtime mlock=on -kernel /home/root/qemu2/bzImage / --drive file=/home/root/qemu2/enea-image-virtualization-guest-qemux86-64.ext4,/ +-drive file=/home/root/qemu2/enea-nfv-access-guest-qemux86-64.ext4,/ if=virtio,format=raw -m 2048 -object memory-backend-file,id=mem,size=2048M,/ mem-path=/mnt/huge,share=on -numa node,memdev=mem -mem-prealloc / -chardev socket,id=char1,path=/var/run/openvswitch/vhost-user2 / @@ -1423,7 +1423,7 @@ ip link set eno3 vf 1 mac 0c:c4:7a:BF:52:E7Launch two QEMU instances: taskset -c 4,5 qemu-system-x86_64 -cpu host,+invtsc,migratable=no -M / q35 -smp cores=2,sockets=1 -vcpu 0,affinity=4 -vcpu 1,affinity=5 -enable-kvm / -nographic -kernel /mnt/qemu/bzImage / --drive file=/mnt/qemu/enea-image-virtualization-guest-qemux86-64.ext4,if=virtio,/ +-drive file=/mnt/qemu/enea-nfv-access-guest-qemux86-64.ext4,if=virtio,/ format=raw -m 4096 -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,/ share=on -numa node,memdev=mem -mem-prealloc -device vfio-pci,host=03:10.0 / -append 'root=/dev/vda console=ttyS0 hugepagesz=2M hugepages=1024 / @@ -1435,7 +1435,7 @@ processor.max_cstate=0 mce=ignore_ce audit=0' taskset -c 2,3 qemu-system-x86_64 -cpu host,+invtsc,migratable=no -M / q35 -smp cores=2,sockets=1 -vcpu 0,affinity=2 -vcpu 1,affinity=3 -enable-kvm / -nographic -kernel /mnt/qemu/bzImage / --drive file=/mnt/qemu/enea-image2-virtualization-guest-qemux86-64.ext4,if=virtio,/ +-drive file=/mnt/qemu/enea-nfv-access-guest-qemux86-64.ext4,if=virtio,/ format=raw -m 4096 -object memory-backend-file,id=mem,size=4096M,mem-path=/mnt/huge,/ share=on -numa node,memdev=mem -mem-prealloc -device vfio-pci,host=03:10.2 / -append 'root=/dev/vda console=ttyS0 hugepagesz=2M hugepages=1024 / diff --git a/doc/book-enea-nfv-access-guide/doc/container_virtualization.xml b/doc/book-enea-nfv-access-guide/doc/container_virtualization.xml index 58133ae..2287146 100644 --- a/doc/book-enea-nfv-access-guide/doc/container_virtualization.xml +++ b/doc/book-enea-nfv-access-guide/doc/container_virtualization.xml @@ -46,11 +46,11 @@
Run an Enea NFV Access guest image - Enea NFV Access guest images can run inside Docker as any - other container can. Before starting an Enea NFV Access guest - image, a root filesystem has to be imported in Docker: + Enea NFV Access guest images can run inside Docker as any other + container can. Before starting an Enea NFV Access guest image, a root + filesystem has to be imported in Docker: - docker import enea-linux-virtualization-guest-qemux86-64.tar.gz el7guest + docker import enea-nfv-access-guest-qemux86-64.tar.gz el7guest To check that the Docker image has been imported successfully, run: diff --git a/doc/book-enea-nfv-access-guide/doc/getting_started.xml b/doc/book-enea-nfv-access-guide/doc/getting_started.xml index 6c20d5e..4763281 100644 --- a/doc/book-enea-nfv-access-guide/doc/getting_started.xml +++ b/doc/book-enea-nfv-access-guide/doc/getting_started.xml @@ -7,7 +7,7 @@
NFV Access Release content - The NFV Access 1.0 Release contains along with other items, + The NFV Access 1.1 Release contains along with other items, documentation, pre-built kernels and images, a bootloader and a SDK. @@ -105,7 +105,7 @@ Enea NFV Access ext4 rootfs image - - enea-image-virtualization-host-inteld1521.ext4 + enea-nfv-access-inteld1521.ext4.gz @@ -122,8 +122,9 @@ - Copy bzImage and enea-image-virtualization-host-inteld1521.ext4.gz - images to the tftpserver configured for PXE boot. + Unzip enea-nfv-access-inteld1521.ext4 and copy bzImage and + enea-nfv-access-inteld1521.ext4 images to the tftpserver configured for + PXE boot. Use the following as an example for the PXE configuration file: @@ -135,7 +136,7 @@ timeout 0 label el_ramfs menu label ^EneaLinux_RAMfs kernel bzImage - append root=/dev/ram0 initrd=enea-image-virtualization-host-inteld1521.ext4 / + append root=/dev/ram0 initrd=enea-nfv-access-inteld1521.ext4 / ramdisk_size=1200000 console=ttyS0,115200 eralyprintk=ttyS0,115200 Restart the target. Then enter (F11) in the Boot Menu and select @@ -154,7 +155,7 @@ label el_ramfs grub (grub-efi-bootx64.efi) - availalble as a pre-built artifact under - inteld1521/images/enea-image-virtualization-host. + inteld1521/images/enea-nfv-access. @@ -270,7 +271,7 @@ menuentry "Linux sda7" { Copy your image on target: - server> scp ./enea-image-virtualization-host-inteld1521.tar.gz / + server> scp ./enea-nfv-access-inteld1521.tar.gz / root@<target_ip>:/home/root/ @@ -278,13 +279,13 @@ root@<target_ip>:/home/root/ Extract image onto the desired partition: target> mount /dev/sda3 /mnt/sda -target> tar -pzxf /home/root/enea-image-virtualization-host-inteld1521.tar.gz / +target> tar -pzxf /home/root/enea-nfv-access-inteld1521.tar.gz / -C /mnt/sda Alternately, you can do both steps in one command from the server: - server> cat ./enea-image-virtualization-host-inteld1521.tar.gz | / + server> cat ./enea-nfv-access-inteld1521.tar.gz | / ssh root@<target_ip> "cd /mnt/sda6; tar -zxf -" diff --git a/doc/book-enea-nfv-access-guide/doc/hypervisor_virtualization.xml b/doc/book-enea-nfv-access-guide/doc/hypervisor_virtualization.xml index dce5855..9733544 100644 --- a/doc/book-enea-nfv-access-guide/doc/hypervisor_virtualization.xml +++ b/doc/book-enea-nfv-access-guide/doc/hypervisor_virtualization.xml @@ -33,7 +33,7 @@ -vcpu 0,affinity=0 -vcpu 1,affinity=1 \ -enable-kvm -nographic \ -kernel bzImage \ --drive file=enea-image-virtualization-guest-qemux86-64.ext4,if=virtio,format=raw \ +-drive file=enea-nfv-access-guest-qemux86-64.ext4,if=virtio,format=raw \ -append 'root=/dev/vda console=ttyS0,115200' \ -m 4096 \ -object memory-backend-file,id=mem,size=4096M,mem-path=/dev/hugepages,share=on \ @@ -193,6 +193,9 @@ $ dpdk-devbind.py --bind=vfio-pci 0000:03:10.2
Multi-queue + In order to ensure that network performance scales as the number + of vCPUs increases, multi-queue support can be used in QEMU. +
QEMU multi queue support configuration @@ -342,7 +345,7 @@ $ testpmd -c 0x7 -- -i --rxq=2 --txq=2 --nb-cores=2 ... <devices> <disk type='file' device='disk'> <driver name='qemu' type='raw' cache='none'/> - <source file='enea-image-virtualization-guest-qemux86-64.ext4'/> + <source file='enea-nfv-access-guest-qemux86-64.ext4'/> <target dev='vda' bus='virtio'/> </disk> </devices> @@ -596,7 +599,7 @@ $ dpdk-devbind.py --bind=vfio-pci 0000:03:10.0 <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='file' device='disk'> <driver name='qemu' type='raw' cache='none'/> - <source file='/mnt/qemu/enea-image-virtualization-guest-qemux86-64.ext4'/> + <source file='/mnt/qemu/enea-nfv-access-guest-qemux86-64.ext4'/> <target dev='vda' bus='virtio'/> </disk> <interface type='vhostuser'> @@ -655,7 +658,7 @@ $ dpdk-devbind.py --bind=vfio-pci 0000:03:10.0 <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='file' device='disk'> <driver name='qemu' type='raw' cache='none'/> - <source file='/mnt/qemu/enea-image-virtualization-guest-qemux86-64.ext4'/> + <source file='/mnt/qemu/enea-nfv-access-guest-qemux86-64.ext4'/> <target dev='vda' bus='virtio'/> </disk> <interface type='hostdev' managed='yes'> @@ -718,7 +721,7 @@ $ dpdk-devbind.py --bind=vfio-pci 0000:03:10.0 <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='file' device='disk'> <driver name='qemu' type='raw' cache='none'/> - <source file='/mnt/qemu/enea-image-virtualization-guest-qemux86-64.ext4'/> + <source file='/mnt/qemu/enea-nfv-access-guest-qemux86-64.ext4'/> <target dev='vda' bus='virtio'/> </disk> <interface type='bridge'> diff --git a/doc/book-enea-nfv-access-guide/doc/overview.xml b/doc/book-enea-nfv-access-guide/doc/overview.xml index d3a0d8a..01e70a9 100644 --- a/doc/book-enea-nfv-access-guide/doc/overview.xml +++ b/doc/book-enea-nfv-access-guide/doc/overview.xml @@ -4,16 +4,17 @@ Overview - The NFV Access Guide available with this release of Enea - Linux, seeks to provide further information that will help all intended + The NFV Access Guide available with this release of Enea NFV Access + Platform seeks to provide further information that will help all intended users make the most out of the virtualization features.
NFV Access Description - Enea NFV Access is a lightweight virtualization software - designed for deployment on edge devices at customer premises. Streamlined - for high networking performance and minimal footprints for both and VNFs, it enables very high compute density. + Enea NFV Access is a lightweight virtualization software designed + for deployment on edge devices at customer premises. Streamlined for high + networking performance and minimal footprints for both host platform and + VNFs, it enables very high compute density. ENFV Access also provides a foundation for vCPE agility and innovation, reducing cost and complexity for computing at the network diff --git a/doc/book-enea-nfv-access-guide/doc/using_nfv_access_sdks.xml b/doc/book-enea-nfv-access-guide/doc/using_nfv_access_sdks.xml index e5c28ea..255f733 100644 --- a/doc/book-enea-nfv-access-guide/doc/using_nfv_access_sdks.xml +++ b/doc/book-enea-nfv-access-guide/doc/using_nfv_access_sdks.xml @@ -4,11 +4,11 @@ Using NFV Access SDKs - Enea NFV Access comes with two standard SDKs which can be used to + Enea NFV Access comes with a standard SDKs which can be used to develop user-applications and kernel modules for both host and guest images. - A standard SDK consists of: + The standard SDK consists of: @@ -27,20 +27,13 @@ - To install the SDK on your host development machine, there are two - installation scripts available under the Download section on portal.enea.com. They have self explanatory - names. + To install the SDK on your host development machine, there is an + installation script available under the Download section on portal.enea.com: - inteld1521/sdk/enea-glibc-x86_64-enea-image-virtualization-host-sdkcorei7-64-toolchain-7.0.sh - - for host applications. - - - - qemux86-64/sdk/enea-glibc-x86_64-enea-image-virtualization-guestsdk-core2-64-toolchain-7.0.sh - - for guest applications. + x86_64/install/install-sdk.sh @@ -68,7 +61,7 @@ - $ ./enea-glibc-x86_64-enea-image-virtualization-guest-sdk-core2-64-toolchain-7.0.shWhen + $ ./install-sdk.shWhen prompted, select to install the toolchain in the desired directory, referred to as sdkdir. @@ -87,7 +80,7 @@ Setup the toolchain environment for your target by sourcing the - environment-setup script. Example: $ source sdkdir/environment-setup-core2-64-enea-linux + environment-setup script. Example: $ source sdkdir/environment-setup-corei7-64-enea-linux
-- cgit v1.2.3-54-g00ecf