Skip to content

Latest commit

 

History

History
223 lines (157 loc) · 6.6 KB

README.md

File metadata and controls

223 lines (157 loc) · 6.6 KB
Raw

1 Introduction

This repository is to provide an optimized NGINX based on VPP host stack. We provide two ways of VPP host stack integration, i.e. LDP and VCL. LDP is basically un-modified NGINX with VPP via LD_PRELOAD, while VCL NGINX is to integrate VPP host stack directly with NGINX code change. This repository provides the nginx build, as well as the integration of VPP host stacks, namely the LDP and VCL VPP and nginx builds, and generates the installation deb packages to the specified location.

2 Repository Layout

configs: configuration files for VPP, NGINX and VCL

nginx_patches: VCL patches for NGINX

vpp_patches: lock-free LDP and pinned-VPP patches

scripts: scripts for VPP, NGINX and client test

packages: Makefiles for building and downloading

3 Building on top of distinct patches

You can choose to use the Makefile to build automatically, and there are some Makefile options for you.

$ git clone https://gerrit.fd.io/r/vsap
$ cd vsap
$ git submodule init
$ git submodule update

Help
$ make help

Install software dependencies
$ make dep

Build vcl DEB package and store the DEB files in folder '/path/to/this/repo/deb-vcl'
$ make deb-vcl

Build vcl vpp and vcl nginx
Nginx is in folder '/path/to/this/repo/_build/usr/local/nginx'
Vpp is in '/path/to/this/repo/vpp'
$ make build-vcl

Build ldp DEB package and store the DEB files in folder '/path/to/this/repo/deb-ldp'
$ make deb-ldp

Build ldp vpp and ldp nginx
Nginx is in folder '/path/to/this/repo/_build/usr/local/nginx'
Vpp is in '/path/to/this/repo/vpp'
$ make build-ldp

In addition,VPP can select master and 2001 branches.
For example:
$ make deb-vcl vpp=2001

If you don't take the parameter, the default is master.
For example:
$ make deb-vcl

You can choose whether openssl3.0.0 is supported or not.
$ make deb-vcl openssl3_enable=1

If you already have OpensSL3.0 and don't want to compile Openssl3.0,
you can add the option 'openssl3_lib_ready'
$ make deb-vcl openssl3_enable=1 openssl3_lib_ready=1

Verify that vcl starts properly
$ make verify-vcl

Verify that ldp starts properly
$ make verify-ldp

Clean up build vcl environment, remove _build/.*vcl*. for example: rm _build/.vpp_vcl.build.ok and so on
$ make clean-vcl

Clean up build ldp environment, remove _build/.*vcl*. for example: rm _build/.vpp_ldp.build.ok and so on
$ make clean-ldp

Clean up build environment
$ make clean

3.0 Basic patch

3.0.1 Application Worker Partition

Functionality

For both VCL and LDP, it requires to add a patch to app worker optimization.

Instructions

$ cd /path/to/vpp
$ patch -p1 < /path/to/this/repo/vpp_patches/common/0001-session-pinning.patch
$ make build && make build-release

3.1 VCL NGINX

3.1.1 VPP side setting

VCL NGINX integration requires a patch inside VPP first.

$ cd /path/to/vpp
$ patch -p1 < /path/to/this/repo/vpp_patches/vcl/0001-ngxvcl-api.patch
$ make build && make build-release

3.1.2 NGINX side setting

Our repo has provided the modified code based on NGINX 1.14.2. You can either directly use our modified Nginx version or patch NGINX 1.14.2 by the provided patch.

$ cd /path/to/this/repo
$ cd nginx

or

$ cd path/to/your/own/nginx-1.14.2
$ patch -p2 < path/to/this/repo/nginx_patches/0001-ngxvcl.patch

Now the original NGINX code has been modified to VCL-supporting code.

Then you can configure and build NGINX.

$ ./configure --with-vcl --vpp-lib-path=/path/to/this/repo/vpp/build-root/install-vpp-native/vpp/lib --vpp-src-path=/path/to/this/repo/vpp/src
$ sudo make install

3.1.3 Run NgxVCL

  • Run VPP first

    • Refer to startup.conf provided in "configs" to start VPP. (learn how to use startup.conf in section 4.1.1)
    • If you choose to use the Makefile to build automatically, the VPP is stored in '/path/to/this/repo/vpp'
    ./vpp -c /path/to/this/repo/configs/startup.conf

    Start NGINX

    • refer to vcl.conf and nginx.conf provided under "configs"
    • If you choose to use the Makefile to build automatically, the NGINX is stored in '/path/to/this/repo/_build/usr/local/nginx'
    # export VCL_CONFIG=/path/to/this/repo/configs/vcl.conf
# export LD_LIBRARY_PATH=/path/to/this/repo/vpp/build-root/install-vpp-native/vpp/lib
# /path/to/this/repo/_build/usr/local/nginx/sbin/nginx -c /path/to/this/repo/configs/nginx.conf

3.2 LDP NGINX

3.2.1 Removing VLS Locks

Functionality

This patch removes VLS session locks for saving approximately 100% CPU cycles one core of applications, especially for the application which is CPU-intensive.

Instructions

You may need root privilege.

$ cd /path/to/this/repo/vpp
$ make build && make build-release

Start NGINX If you choose to use the Makefile to build automatically, the VPP is stored in '/path/to/this/repo/vpp' If you choose to use the Makefile to build automatically, the NGINX is stored in '/path/to/this/repo/_build/usr/local/nginx'

$ export VCL_CONFIG=path/to/this/repo/vcl.conf
$ LD_PRELOAD=/path/to/this/repo/vpp/build-root/install-vpp-native/vpp/lib/libvcl_ldpreload.so /path/to/this/repo/_build/usr/local/nginx/sbin/nginx -c path/to/this/repo/configs/nginx.conf

3.3 Enable VPP TLS

3.3.1 Enable VPP TLS for VCL NGINX

If TLS is supproted, then before you run VCL NGINX, export following environment variables.

$ export NGXVCL_TLS_ON=1
$ export NGXVCL_TLS_CERT=/path/to/this/repo/configs/tls-test-cert
$ export NGXVCL_TLS_KEY=/path/to/this/repo/configs/tls-test-key

3.3.2 Enable VPP TLS for LDP NGINX

Before you run LDP NGINX, export following environment variables.

$ export LDP_TRANSPARENT_TLS=1
$ export LDP_TLS_CERT_FILE=/path/to/this/repo/configs/tls-test-cert
$ export LDP_TLS_KEY_FILE=/path/to/this/repo/configs/tls-test-key

4 Instances

4.1 NGINX + VPP

4.1.1 Used startup.conf

Inside startup.conf, you need to configure the following several directives:

  • pci-address: the pci address of NIC. Refer to dpdk_bind_driver to bind NIC to the vfio-pci driver at first.
  • socket-name path/to/vpp-api.sock: socket which would be used to connect VPP and NGINX. This sock should also be configured in vcl.conf.

4.1.2 Notes

Please ensure that the processes of NGINX and VPP run on same NUMA node as the used NIC.

VPP

The core number could be selected via two arguments:

main-core 0             ##set vpp master on core 0
corelist-workers 1-4    ##set the four vpp worker threads on core 1-4,
                        ##If start 8 VPP worker, the value should be 1-8 or x-(x+7)
num-rx-queues 4         ##Assign each VPP worker one rx queue.