[COMMIT] branch devel/native-drivers updated. v1.15.0.0-944-g4bd60804
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, devel/native-drivers has been updated
via 4bd608048e6fa77d3154b8d90b85fc2b66c6bf1a (commit)
via 9411a5b8adb5a704155602546ac0afcb975c69fa (commit)
via c87b85e87e80462e52e2e7d6a827ae8948ac92ac (commit)
via 46ccbc95c13ae7e61462467e1fe60fb00ba09620 (commit)
via d073f151fd711ea3bf39711f1d235b8e89d52522 (commit)
via c3cda8e1dfbe5a8665d52b167700590bcbfae488 (commit)
via 13a5240a9a4035c8c4fb1f03f2113799390c305b (commit)
via b339fbc523120497346298d95c5c1102e70c1826 (commit)
via 3c372d43de115af127c6fd2d34f365b73b87734b (commit)
via 539b29acce1ba915a7c8c65c56a4e5fc9be1ff44 (commit)
via 04af087d3523f6db809b979d2a23975de0cc4de8 (commit)
via 77f6dd878c4095e9cbb7c9237a0564c62ebc92c3 (commit)
via 606b19d60c015a6ac14ef83146ca1019530de4a0 (commit)
via 41cfdd1f67e0a44aa3aed04f4ddbaa53b5c43b38 (commit)
via 485779a031f467eb242dec0a164b7380612494a4 (commit)
via 6cd43041e55bd73a02ca202f835e590b3ad5c354 (commit)
via 65419c16086369f86dea068e54ce492526fa4f41 (commit)
via d22c949cc466bf28de559855a1cb525740578137 (commit)
via 637353bbd96770741cbb58711c78c9dc01e4ea34 (commit)
via 387b402c4f2fc0694b6e0fe68ee4be8a2bd42442 (commit)
via ebdf6e27af66a58fff6a17a1c6c2cd6ae85909f1 (commit)
via cc97d3ae6d6d4c07ec77e7b33e2529154fb0ed24 (commit)
via 94cb17b703f1efba6a89207b893d9f4ef5297d8d (commit)
via c04eff910a7b18f47365f90fadb6133474e9cae5 (commit)
via 201a96f9bbcbabd904362ba05a179c72689a578e (commit)
via 3edee38da55876e36f654a5d1a4b87c2ea5b8bfe (commit)
via 8d22e0e2013596403ae6a35457cdf30b0a0c559b (commit)
via d61d32590d1772b70b8dcd0d0ec44d29029d7443 (commit)
via 66b363634fe1bba003cdb9e4e49a5980fc8c79f4 (commit)
via bd1b1adf37dd8d252f7daf761d4ae9a6d1ef156a (commit)
via 4fafec8378b6e7d0b353d851e724ab27eb002b27 (commit)
via 63d92eb289261d1534b5b9e1e04291faa5e45d30 (commit)
via 82419a31e6d1846e0676edfa7fb511a23098f5a9 (commit)
via c0aeacf23dddfb7feae47fef6e4d10d6bdb9c812 (commit)
via dd0498bb104c7319e2ec56b61e4d585167ea6c53 (commit)
via e826613858543e50a2ec74598f8c2c6fd4bfa064 (commit)
via 503722802274ff5de09144613d9262e2cfdb3077 (commit)
via 5329228e260d36de62c3edf3c1a3f08ab95fd558 (commit)
via 74d880d7e20ab4825868bd2013b164d4bc90eb45 (commit)
via 825f75ed8644ef57c5648961e7982daf13cd9375 (commit)
via 18977d0684ef7a26ddd6777ca341f7b1ca9e5c3e (commit)
via f4d54b8831df52878b66bb145124a9adb4beab28 (commit)
via e733d6ba6382ccbf9d6c84a6a10bf720c2e16c0d (commit)
via ec6510b33e8b96d6d6670efb9dc3c9101baed6c6 (commit)
via af4565caa0f9d171db466554ee631338b9844cbe (commit)
via f5120355753ae3d69f81010cb9131abffdfb03fc (commit)
via afa7e20ab3b7a6e68a556f00b49aa19ea4a29be6 (commit)
via e3108af2f0b58c2ceca422b418439bba5de04b11 (commit)
via 54228421977f94d9da752290540c6ec4dc5306a0 (commit)
via 605e77187211dbb0716e4124f249c7f0f88567f7 (commit)
via 940c54bbd1c0c16ea2b6a6f6737d151deeba1e43 (commit)
via 91ceea49a975c6fcd61ab1c992a502350d673eeb (commit)
via b46702e5ef368c9aaf9d6cea7d32b07adb881ce3 (commit)
via 48dfcade1602e9cc9bb8cd3251037508aef146cd (commit)
via 2aa9a05b11bdfac0c0126384d4677b3f9c561a78 (commit)
via df978d9b4e766c8e1cb1a88a28d98318840fee22 (commit)
via cd196cf12f957456b24c844b2c38be5062130cf1 (commit)
via dee4a7512c21a8b7f15a4a05e6736de373df92f0 (commit)
via f70ff3bc542961d52f9b0f867298014650c8e49e (commit)
via 700c0ac917fedf532e9a7e21c42624faa4b09a5f (commit)
via 20aba9a17664fb8d5261bece23a1c20f1a3465f7 (commit)
via ce4bd52afcef245b069acfe8dc53bd62aec576fd (commit)
via 01b5f7e0c0bcec5beb58c99573906b1a4ee8e5f0 (commit)
via 5e8f87ae22ca0c3e6137f91f15c967aec958a67e (commit)
via 9e10a562dfb67b7a37c67fecff3de00be798961a (commit)
via 86d651b86c10dd77603354110644ad346dfb3e26 (commit)
via bc3cad50ec6668064bae1af164875c93832caff8 (commit)
via 9c747985d4c448ef737376c5c8180b78ae1e7378 (commit)
via 698f370e71db55624e1bd78063569369f86db389 (commit)
via 482eeee380d40596131826c1103ed89247bd17e5 (commit)
via 254190ffcdb51549ee23846f33fd45513656b78c (commit)
via 52877c96e12bf62614df0482175384565a851083 (commit)
via 133e7fc06147486fff5ab3393b1a791ab97d19d3 (commit)
via 8c9ce8c63eed9d01fec54c09bd17040914abd623 (commit)
via 2b57c7d7b96eef16c36b8b0020b3dd78acc82660 (commit)
via cbced85824c4c03c0b35396d559ebfb187237569 (commit)
via 1217fbaed0aee2ee395c131bb7fd2e201214ed31 (commit)
via 927b57f21124f31e23fd7f72dddcc93a5248ed53 (commit)
via 1bcf171f00973bcc21baadf9919a61cd6abdf713 (commit)
via edca8cd1e55898826f79383b689c2c4bd2c28b3a (commit)
via ec0c3145fcafa09ae3a79875e7e07dd4794583cc (commit)
via aa64630294bed950641e99fa1c87725f521a0002 (commit)
via 53b4c4aed8cc6e9caf379725e9ed1d2d36f04f10 (commit)
via 77f9451a2acf4465e6a64f24b1dfdca56787f0ce (commit)
via fce14d1496e7da19e2f0eb53339eea5a4204c03d (commit)
via cc33578e327d5f6787711a71a60500c4be98bf63 (commit)
via 4ab7a7b22b15011eb69c3e473278db13319aba52 (commit)
via 53b735f14a9a1df23b054f15ce148e2fa36abe0f (commit)
via 4df71d3f5450452a654bb7e94f8b3fed948ed31e (commit)
via 326192cd87888abbea6c0dbdd3dc972db41f3325 (commit)
via 55e6afa29bdc2ae314bada7ac5648049909e1775 (commit)
via ff51f6363c9fad843f7872ad8048740d10368dd1 (commit)
via 6a119c79b59de3c8ee9e51f3ceba9d26f24c3ce4 (commit)
via 7d162deafa22535f8fab9ea39dcb4e3e0e7850b0 (commit)
via adaa3b434086346402999d09c2223681aba4b1a4 (commit)
via c657f3f3d9b2c5832b42a4344a526bf7d0c76a5d (commit)
via e02f5545f97f90a75f2595bb1e9068f64bff133e (commit)
via d0d0bd9787ee43db39ad4e7e9b224e70664d5663 (commit)
via 7dc5f21c7ca88e6c19d34dc1933eddef190add7a (commit)
via 209c3a2e255de7aa82c4f08f8abb41c04bb3d86d (commit)
via ae4f1d82ed704992c1d8284c23795b9e076b33b9 (commit)
via d2b3aa9a7ffc3028eedc7dbeb6257d7efd91bc05 (commit)
via 66305f01a57741dc5eca061364e65a5f4da8584f (commit)
via afeda4d14bb6f449cb269680cdbd56b26726eedf (commit)
via 1b259a7a4e573080f4debc542cab7a0b996f4c88 (commit)
via 4ce7bdf3d99cc1d7634a80f961fc0e9e7523a0ac (commit)
via 55fd230da7d8515452c08256f8fd8471d32d7601 (commit)
via b529f843814f70068de2090e02df632113afa800 (commit)
via fa78c11ad2de706ce07a7691168bdb5b58d060d4 (commit)
via 5a2376365df984e160b92463be37740786a10bd6 (commit)
via 3f3d7651c7cd7ba3b941904bbcbdabcac9a7dfd0 (commit)
via 72a4e9f9bad9dfeaafba4e29a7450ee7edca5d1c (commit)
via 7f3624154ff59ab85352c35e1c6df3c9597f9f51 (commit)
via bbefeae66a2a6ac6c9386bb8a083022b7f323fc9 (commit)
via a08dba6c24af81142efc6176eae2bdd561b478e3 (commit)
via 1c02e217fac2ed2d015205ad36bd86c4924ce6cc (commit)
via a3bc051085b95170101a3f81379e78c48e5a636c (commit)
via fa281989523b82177f974abe7b4adfec47705dfa (commit)
via 3bacbfd55edf76b897a4b2e5c62b59ca6fa95331 (commit)
via 37b430cb9e8f6834a3c76ab108489cec719b9e32 (commit)
via 4d38a376cd9976dfbeb565e509c028d07dfb1ed8 (commit)
via c16af6486eea240609f334b1bdc81a11404275de (commit)
from c0f99c441feadd1566b7e92789b11c30c6ee3f64 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4bd608048e6fa77d3154b8d90b85fc2b66c6bf1a
Author: Christophe Milard <christophe.milard(a)linaro.org>
Date: Thu Nov 3 14:24:49 2016 +0100
linux-gen: _ishmphy: adding function for physical address query
The function _odp_ishmphy_getphy() is added to query for physical
addresses (given a virtual address)
This function is meant to be used to populate the physical address
of packet segments which are to be used by drivers (without iommu).
The function _odp_ishmphy_can_getphy(), also added, return true if
_odp_ishmphy_getphy() is able to works (as it requires specific
permission)
Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org>
diff --git a/platform/linux-generic/_ishmphy.c b/platform/linux-generic/_ishmphy.c
index 76ec5728..fb4c97c9 100644
--- a/platform/linux-generic/_ishmphy.c
+++ b/platform/linux-generic/_ishmphy.c
@@ -40,6 +40,8 @@ static uint64_t common_va_len;
#define MAP_ANONYMOUS MAP_ANON
#endif
+#define PAGEMAP_FILE "/proc/self/pagemap"
+
/* Book some virtual address space
* This function is called at odp_init_global() time to pre-book some
* virtual address space inherited by all odpthreads (i.e. descendant
@@ -207,3 +209,82 @@ int _odp_ishmphy_unmap(void *start, uint64_t len, int flags)
ODP_ERR("_ishmphy_free failure: %s\n", strerror(errno));
return ret;
}
+
+/*
+ * Get physical address from virtual address addr.
+ */
+phys_addr_t _odp_ishmphy_getphy(const void *addr)
+{
+ unsigned int page_sz;
+ int fd;
+ off_t offset;
+ int read_bytes;
+ uint64_t page;
+ phys_addr_t phys_addr;
+
+ /* get normal page sizes: */
+ page_sz = odp_sys_page_size();
+
+ /* read 8 bytes (uint64_t) at position N*8, where N is addr/page_sz */
+ fd = open(PAGEMAP_FILE, O_RDONLY);
+ if (fd < 0) {
+ ODP_ERR("cannot open " PAGEMAP_FILE ": %s\n",
+ strerror(errno));
+ return PHYS_ADDR_INVALID;
+ }
+
+ offset = ((unsigned long)addr / page_sz) * sizeof(uint64_t);
+ if (lseek(fd, offset, SEEK_SET) == (off_t)-1) {
+ ODP_ERR("cannot seek " PAGEMAP_FILE ": %s\n",
+ strerror(errno));
+ close(fd);
+ return PHYS_ADDR_INVALID;
+ }
+
+ read_bytes = read(fd, &page, sizeof(uint64_t));
+ close(fd);
+ if (read_bytes < 0) {
+ ODP_ERR("cannot read " PAGEMAP_FILE ": %s\n",
+ strerror(errno));
+ return PHYS_ADDR_INVALID;
+ } else if (read_bytes != sizeof(uint64_t)) {
+ ODP_ERR("read %d bytes from " PAGEMAP_FILE " "
+ "but expected %d:\n",
+ read_bytes, sizeof(uint64_t));
+ return PHYS_ADDR_INVALID;
+ }
+
+ /* some kernel return PFN zero when permission is denied: */
+ if (!(page & 0x7fffffffffffffULL))
+ return PHYS_ADDR_INVALID;
+
+ /*
+ * the pfn (page frame number) are bits 0-54 (see
+ * pagemap.txt in linux Documentation)
+ */
+ phys_addr = ((page & 0x7fffffffffffffULL) * page_sz)
+ + ((unsigned long)addr % page_sz);
+
+ return phys_addr;
+}
+
+/*
+ * check if physical address are readable
+ * return true if physical addresses can be retrieved.
+ * Just do a test to see if it works
+ */
+int _odp_ishmphy_can_getphy(void)
+{
+ int block_index;
+ phys_addr_t phy;
+
+ /* allocate a block, locked in memory and try to grab its phy address */
+ block_index = _odp_ishm_reserve(NULL, 10, -1, 0, _ODP_ISHM_LOCK, 0);
+ phy = _odp_ishmphy_getphy((void *)_odp_ishm_address(block_index));
+ _odp_ishm_free_by_index(block_index);
+
+ if (phy == PHYS_ADDR_INVALID)
+ return 0;
+
+ return 1;
+}
diff --git a/platform/linux-generic/include/_ishmphy_internal.h b/platform/linux-generic/include/_ishmphy_internal.h
index 4fe560fd..31b154bd 100644
--- a/platform/linux-generic/include/_ishmphy_internal.h
+++ b/platform/linux-generic/include/_ishmphy_internal.h
@@ -13,11 +13,25 @@ extern "C" {
#include <stdint.h>
+typedef uint64_t phys_addr_t; /* Physical address definition. */
+#define PHYS_ADDR_INVALID ((phys_addr_t)-1)
+
void *_odp_ishmphy_book_va(uintptr_t len, intptr_t align);
int _odp_ishmphy_unbook_va(void);
void *_odp_ishmphy_map(int fd, void *start, uint64_t size, int flags);
int _odp_ishmphy_unmap(void *start, uint64_t len, int flags);
+/*
+ * check if physical address are readable
+ * return true if physical addresses can be retrieved.
+ */
+int _odp_ishmphy_can_getphy(void);
+
+/*
+ * Get physical address from virtual address addr.
+ */
+phys_addr_t _odp_ishmphy_getphy(const void *addr);
+
#ifdef __cplusplus
}
#endif
commit 9411a5b8adb5a704155602546ac0afcb975c69fa
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Fri Sep 22 13:56:47 2017 +0200
virtio_pci: read configuration layout functions
Functions for reading virtio-net's configuration layout.
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
diff --git a/platform/linux-generic/pktio/virtio_pci.c b/platform/linux-generic/pktio/virtio_pci.c
index 1203887f..376ddbea 100644
--- a/platform/linux-generic/pktio/virtio_pci.c
+++ b/platform/linux-generic/pktio/virtio_pci.c
@@ -451,6 +451,42 @@ static void virtio_get_hwaddr(struct virtio_hw *hw)
}
}
+static void virtio_get_status(struct virtio_hw *hw)
+{
+ struct virtio_net_config config;
+
+ if (!vtpci_with_feature(hw, VIRTIO_NET_F_STATUS)) {
+ ODP_PRINT("No support for VIRTIO_NET_F_STATUS\n");
+ return;
+ }
+
+ vtpci_read_dev_config(hw,
+ ODPDRV_OFFSETOF(struct virtio_net_config,
+ status),
+ &config.status, sizeof(config.status));
+
+ ODP_PRINT("Status is %u\n", config.status);
+}
+
+static uint16_t virtio_get_num_queues(struct virtio_hw *hw)
+{
+ uint16_t max_pairs;
+
+ if (!vtpci_with_feature(hw, VIRTIO_NET_F_MQ)) {
+ ODP_PRINT("No support for VIRTIO_NET_F_MQ\n");
+ return 1;
+ }
+
+ vtpci_read_dev_config(hw,
+ ODPDRV_OFFSETOF(struct virtio_net_config,
+ max_virtqueue_pairs),
+ &max_pairs, sizeof(max_pairs));
+
+ ODP_PRINT("Device supports maximum of %u virtqueue pairs\n", max_pairs);
+
+ return max_pairs;
+}
+
static int virtio_init_ethdev(struct virtio_hw *hw)
{
const struct virtio_pci_ops *ops = hw->vtpci_ops;
@@ -481,6 +517,21 @@ static int virtio_init_ethdev(struct virtio_hw *hw)
}
virtio_get_hwaddr(hw);
+ virtio_get_status(hw);
+
+ /* some features depend on F_CTRL_VQ being available */
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_VQ)) {
+ uint16_t num_pairs;
+
+ num_pairs = virtio_get_num_queues(hw);
+ /* FIXME: find out minimum available */
+ hw->max_tx_queues = num_pairs;
+ hw->max_rx_queues = num_pairs;
+ } else {
+ hw->cvq = NULL;
+ hw->max_tx_queues = 1;
+ hw->max_rx_queues = 1;
+ }
return 0;
}
commit c87b85e87e80462e52e2e7d6a827ae8948ac92ac
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Fri Sep 22 11:14:26 2017 +0200
virtio_pci: function to show features
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
diff --git a/platform/linux-generic/pktio/virtio_pci.c b/platform/linux-generic/pktio/virtio_pci.c
index 0c780309..1203887f 100644
--- a/platform/linux-generic/pktio/virtio_pci.c
+++ b/platform/linux-generic/pktio/virtio_pci.c
@@ -63,6 +63,50 @@
1u << VIRTIO_NET_F_MRG_RXBUF | \
1ULL << VIRTIO_F_VERSION_1)
+static void virtio_print_features(const struct virtio_hw *hw)
+{
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_CSUM))
+ ODP_PRINT("VIRTIO_NET_F_CSUM\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_GUEST_CSUM))
+ ODP_PRINT("VIRTIO_NET_F_GUEST_CSUM\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_MAC))
+ ODP_PRINT("VIRTIO_NET_F_MAC\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_GUEST_TSO4))
+ ODP_PRINT("VIRTIO_NET_F_GUEST_TSO4\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_GUEST_TSO6))
+ ODP_PRINT("VIRTIO_NET_F_GUEST_TSO6\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_GUEST_ECN))
+ ODP_PRINT("VIRTIO_NET_F_GUEST_ECN\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_GUEST_UFO))
+ ODP_PRINT("VIRTIO_NET_F_GUEST_UFO\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_HOST_TSO4))
+ ODP_PRINT("VIRTIO_NET_F_HOST_TSO4\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_HOST_TSO6))
+ ODP_PRINT("VIRTIO_NET_F_HOST_TSO6\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_HOST_ECN))
+ ODP_PRINT("VIRTIO_NET_F_HOST_ECN\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_HOST_UFO))
+ ODP_PRINT("VIRTIO_NET_F_HOST_UFO\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF))
+ ODP_PRINT("VIRTIO_NET_F_MRG_RXBUF\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_STATUS))
+ ODP_PRINT("VIRTIO_NET_F_STATUS\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_VQ))
+ ODP_PRINT("VIRTIO_NET_F_CTRL_VQ\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_RX))
+ ODP_PRINT("VIRTIO_NET_F_CTRL_RX\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_VLAN))
+ ODP_PRINT("VIRTIO_NET_F_CTRL_VLAN\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_RX_EXTRA))
+ ODP_PRINT("VIRTIO_NET_F_CTRL_RX_EXTRA\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_GUEST_ANNOUNCE))
+ ODP_PRINT("VIRTIO_NET_F_GUEST_ANNOUNCE\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_MQ))
+ ODP_PRINT("VIRTIO_NET_F_MQ\n");
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_MAC_ADDR))
+ ODP_PRINT("VIRTIO_NET_F_CTRL_MAC_ADDR\n");
+}
+
static inline uint8_t io_read8(uint8_t *addr)
{
return *(volatile uint8_t *)addr;
@@ -428,6 +472,7 @@ static int virtio_init_ethdev(struct virtio_hw *hw)
}
ops->set_features(hw, hw->guest_features);
+ virtio_print_features(hw);
ops->set_status(hw, VIRTIO_CONFIG_STATUS_FEATURES_OK);
if (!(ops->get_status(hw) & VIRTIO_CONFIG_STATUS_FEATURES_OK)) {
commit 46ccbc95c13ae7e61462467e1fe60fb00ba09620
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Tue Aug 29 14:48:16 2017 +0200
virtio_pci: common functions for virtio PCI devices
Port from DPDK and François work from branch pci-uio-virtio:
https://git.linaro.org/people/francois.ozog/odp.git
(removing support for legacy virtio devices)
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 4d3d3610..2b1e4143 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -260,6 +260,7 @@ __LIB__libodp_linux_la_SOURCES = \
pktio/sysfs.c \
pktio/tap.c \
pktio/virtio.c \
+ pktio/virtio_pci.c \
pktio/ring.c \
pool/generic.c \
pool/subsystem.c \
diff --git a/platform/linux-generic/include/drv_pci_internal.h b/platform/linux-generic/include/drv_pci_internal.h
index ccd61606..fca7d2ef 100644
--- a/platform/linux-generic/include/drv_pci_internal.h
+++ b/platform/linux-generic/include/drv_pci_internal.h
@@ -11,6 +11,9 @@
extern "C" {
#endif
+#define PCI_CAPABILITY_LIST 0x34
+#define PCI_CAP_ID_VNDR 0x09
+
/* Nb. of values in PCI resource file format. */
#define PCI_RESOURCE_FMT_NVAL 3
/** Nb. of values in PCI device address string. */
@@ -106,6 +109,7 @@ typedef struct user_access_ops_t {
const void *data, size_t len, off_t offset);
} user_access_ops_t;
+
/* structure for PCI device: */
typedef struct pci_dev_t {
struct pci_dev_t *next;
@@ -116,6 +120,8 @@ typedef struct pci_dev_t {
enum pci_kernel_driver kdrv; /* Kernel driver */
struct user_access_context_t *user_access_context;
const struct user_access_ops_t *user_access_ops;
+ void *driver_data;
+ void *device_data;
} pci_dev_t;
/* path where PCI devices are shown in sysfs: */
diff --git a/platform/linux-generic/pktio/virtio.c b/platform/linux-generic/pktio/virtio.c
index 9b15c2d3..ddeb46f1 100644
--- a/platform/linux-generic/pktio/virtio.c
+++ b/platform/linux-generic/pktio/virtio.c
@@ -25,6 +25,8 @@
#include <drv_pci_internal.h>
#include <odp_pktio_ops_virtio.h>
+#include "virtio_pci.h"
+
#define PCI_PKTIO_PREFIX "pci:"
#define PCI_PKTIO_PREFIX_LEN (sizeof(PCI_PKTIO_PREFIX) - 1)
@@ -59,19 +61,8 @@ static int virtio_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry,
return -1;
}
- /* Find suitable DevIO DDF module to work with the driver. */
- if (pci_dev->kdrv == PCI_KDRV_UIO_GENERIC) {
- /* probing would be done for each possible DevIO */
- if (uio_access_ops.probe(pci_dev)) {
- ODP_ERR("Could not enable DevIO for device %s\n",
- devname);
- pci_close_device(pci_dev);
- return -1;
- }
- pci_dev->user_access_ops = &uio_access_ops;
- } else {
- ODP_ERR("Could not find suitable DevIO for device %s\n",
- devname);
+ if (virtio_pci_init(pci_dev)) {
+ ODP_ERR("virtio: Could not open device %s\n", devname);
pci_close_device(pci_dev);
return -1;
}
diff --git a/platform/linux-generic/pktio/virtio_pci.c b/platform/linux-generic/pktio/virtio_pci.c
new file mode 100644
index 00000000..0c780309
--- /dev/null
+++ b/platform/linux-generic/pktio/virtio_pci.c
@@ -0,0 +1,505 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Intel Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#ifdef ODP_PKTIO_VIRTIO
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include <stdint.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <string.h>
+#include <inttypes.h>
+
+#include <config.h>
+#include <odp_drv.h>
+#include <odp_debug_internal.h>
+#include <drv_pci_internal.h>
+
+#include "virtio_pci.h"
+
+/* Features desired/implemented by this driver. */
+#define VIRTIO_NET_DRIVER_FEATURES \
+ (1u << VIRTIO_NET_F_MAC | \
+ 1u << VIRTIO_NET_F_STATUS | \
+ 1u << VIRTIO_NET_F_MQ | \
+ 1u << VIRTIO_NET_F_CTRL_MAC_ADDR | \
+ 1u << VIRTIO_NET_F_CTRL_VQ | \
+ 1u << VIRTIO_NET_F_CTRL_RX | \
+ 1u << VIRTIO_NET_F_CTRL_VLAN | \
+ 1u << VIRTIO_NET_F_MRG_RXBUF | \
+ 1ULL << VIRTIO_F_VERSION_1)
+
+static inline uint8_t io_read8(uint8_t *addr)
+{
+ return *(volatile uint8_t *)addr;
+}
+
+static inline void io_write8(uint8_t val, uint8_t *addr)
+{
+ *(volatile uint8_t *)addr = val;
+}
+
+static inline uint16_t io_read16(uint16_t *addr)
+{
+ return *(volatile uint16_t *)addr;
+}
+
+static inline void io_write16(uint16_t val, uint16_t *addr)
+{
+ *(volatile uint16_t *)addr = val;
+}
+
+static inline uint32_t io_read32(uint32_t *addr)
+{
+ return *(volatile uint32_t *)addr;
+}
+
+static inline void io_write32(uint32_t val, uint32_t *addr)
+{
+ *(volatile uint32_t *)addr = val;
+}
+
+static inline void io_write64_twopart(uint64_t val, uint32_t *lo, uint32_t *hi)
+{
+ io_write32(val & ((1ULL << 32) - 1), lo);
+ io_write32(val >> 32, hi);
+}
+
+static void modern_read_dev_config(struct virtio_hw *hw, size_t offset,
+ void *dst, int length)
+{
+ int i;
+ uint8_t *p;
+ uint8_t old_gen, new_gen;
+
+ do {
+ old_gen = io_read8(&hw->common_cfg->config_generation);
+
+ p = dst;
+ for (i = 0; i < length; i++)
+ *p++ = io_read8((uint8_t *)hw->dev_cfg + offset + i);
+
+ new_gen = io_read8(&hw->common_cfg->config_generation);
+ } while (old_gen != new_gen);
+}
+
+static void modern_write_dev_config(struct virtio_hw *hw, size_t offset,
+ const void *src, int length)
+{
+ int i;
+ const uint8_t *p = src;
+
+ for (i = 0; i < length; i++)
+ io_write8(*p++, (uint8_t *)hw->dev_cfg + offset + i);
+}
+
+static uint64_t modern_get_features(struct virtio_hw *hw)
+{
+ uint32_t features_lo, features_hi;
+
+ io_write32(0, &hw->common_cfg->device_feature_select);
+ features_lo = io_read32(&hw->common_cfg->device_feature);
+
+ io_write32(1, &hw->common_cfg->device_feature_select);
+ features_hi = io_read32(&hw->common_cfg->device_feature);
+
+ return ((uint64_t)features_hi << 32) | features_lo;
+}
+
+static void modern_set_features(struct virtio_hw *hw, uint64_t features)
+{
+ io_write32(0, &hw->common_cfg->guest_feature_select);
+ io_write32(features & ((1ULL << 32) - 1),
+ &hw->common_cfg->guest_feature);
+
+ io_write32(1, &hw->common_cfg->guest_feature_select);
+ io_write32(features >> 32,
+ &hw->common_cfg->guest_feature);
+}
+
+static uint8_t modern_get_status(struct virtio_hw *hw)
+{
+ return io_read8(&hw->common_cfg->device_status);
+}
+
+static void modern_set_status(struct virtio_hw *hw, uint8_t status)
+{
+ io_write8(status, &hw->common_cfg->device_status);
+}
+
+static void modern_reset(struct virtio_hw *hw)
+{
+ modern_set_status(hw, VIRTIO_CONFIG_STATUS_RESET);
+ modern_get_status(hw);
+}
+
+static uint8_t modern_get_isr(struct virtio_hw *hw)
+{
+ return io_read8(hw->isr);
+}
+
+static uint16_t modern_set_config_irq(struct virtio_hw *hw, uint16_t vec)
+{
+ io_write16(vec, &hw->common_cfg->msix_config);
+ return io_read16(&hw->common_cfg->msix_config);
+}
+
+static uint16_t modern_get_queue_num(struct virtio_hw *hw, uint16_t queue_id)
+{
+ io_write16(queue_id, &hw->common_cfg->queue_select);
+ return io_read16(&hw->common_cfg->queue_size);
+}
+
+static int modern_setup_queue(struct virtio_hw *hw, struct virtqueue *vq)
+{
+ (void)hw;
+ (void)vq;
+ return 0;
+}
+
+static void modern_del_queue(struct virtio_hw *hw, struct virtqueue *vq)
+{
+ (void)hw;
+ (void)vq;
+}
+
+static void modern_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)
+{
+ (void)hw;
+ (void)vq;
+}
+
+static const struct virtio_pci_ops modern_ops = {
+ .read_dev_cfg = modern_read_dev_config,
+ .write_dev_cfg = modern_write_dev_config,
+ .reset = modern_reset,
+ .get_status = modern_get_status,
+ .set_status = modern_set_status,
+ .get_features = modern_get_features,
+ .set_features = modern_set_features,
+ .get_isr = modern_get_isr,
+ .set_config_irq = modern_set_config_irq,
+ .get_queue_num = modern_get_queue_num,
+ .setup_queue = modern_setup_queue,
+ .del_queue = modern_del_queue,
+ .notify_queue = modern_notify_queue,
+};
+
+
+void vtpci_read_dev_config(struct virtio_hw *hw, size_t offset,
+ void *dst, int length)
+{
+ hw->vtpci_ops->read_dev_cfg(hw, offset, dst, length);
+}
+
+void vtpci_write_dev_config(struct virtio_hw *hw, size_t offset,
+ const void *src, int length)
+{
+ hw->vtpci_ops->write_dev_cfg(hw, offset, src, length);
+}
+
+uint64_t vtpci_negotiate_features(struct virtio_hw *hw, uint64_t host_features)
+{
+ uint64_t features;
+
+ /*
+ * Limit negotiated features to what the driver, virtqueue, and
+ * host all support.
+ */
+ features = host_features & hw->guest_features;
+ hw->vtpci_ops->set_features(hw, features);
+
+ return features;
+}
+
+void vtpci_reset(struct virtio_hw *hw)
+{
+ hw->vtpci_ops->set_status(hw, VIRTIO_CONFIG_STATUS_RESET);
+ /* flush status write */
+ hw->vtpci_ops->get_status(hw);
+}
+
+void vtpci_reinit_complete(struct virtio_hw *hw)
+{
+ vtpci_set_status(hw, VIRTIO_CONFIG_STATUS_DRIVER_OK);
+}
+
+void vtpci_set_status(struct virtio_hw *hw, uint8_t status)
+{
+ if (status != VIRTIO_CONFIG_STATUS_RESET)
+ status |= hw->vtpci_ops->get_status(hw);
+
+ hw->vtpci_ops->set_status(hw, status);
+}
+
+uint8_t vtpci_get_status(struct virtio_hw *hw)
+{
+ return hw->vtpci_ops->get_status(hw);
+}
+
+uint8_t vtpci_isr(struct virtio_hw *hw)
+{
+ return hw->vtpci_ops->get_isr(hw);
+}
+
+
+/* Enable one vector (0) for Link State Intrerrupt */
+uint16_t vtpci_irq_config(struct virtio_hw *hw, uint16_t vec)
+{
+ return hw->vtpci_ops->set_config_irq(hw, vec);
+}
+
+static void *get_cfg_addr(pci_dev_t *dev, struct virtio_pci_cap *cap)
+{
+ uint8_t bar = cap->bar;
+ uint32_t length = cap->length;
+ uint32_t offset = cap->offset;
+ uint8_t *base;
+
+ if (bar > 5) {
+ ODP_ERR("invalid bar: %u\n", bar);
+ return NULL;
+ }
+
+ if (offset + length < offset) {
+ ODP_ERR("offset(%u) + length(%u) overflows\n",
+ offset, length);
+ return NULL;
+ }
+
+ if (offset + length > dev->bar[bar].len) {
+ ODP_ERR("invalid cap: overflows bar space: %u > %\n" PRIu64,
+ offset + length, dev->bar[bar].len);
+ return NULL;
+ }
+
+ base = dev->bar[bar].addr;
+ if (base == NULL) {
+ ODP_ERR("bar %u base addr is NULL\n", bar);
+ return NULL;
+ }
+
+ return base + offset;
+}
+
+static int virtio_read_caps(pci_dev_t *dev, struct virtio_hw *hw)
+{
+ uint8_t pos;
+ struct virtio_pci_cap cap;
+ int ret;
+
+ if (dev->user_access_ops->map_resource(dev)) {
+ ODP_DBG("failed to map pci device!\n");
+ return -1;
+ }
+
+ ret = pci_read_config(dev, &pos, 1, PCI_CAPABILITY_LIST);
+ if (ret < 0) {
+ ODP_DBG("failed to read pci capability list\n");
+ return -1;
+ }
+
+ while (pos) {
+ ret = pci_read_config(dev, &cap, sizeof(cap), pos);
+ if (ret < 0) {
+ ODP_ERR("failed to read pci cap at pos: %x\n", pos);
+ break;
+ }
+
+ if (cap.cap_vndr != PCI_CAP_ID_VNDR) {
+ ODP_DBG("[%2x] skipping non VNDR cap id: %02x\n",
+ pos, cap.cap_vndr);
+ goto next;
+ }
+
+ ODP_DBG("[%2x] cfg type: %u, bar: %u, offset: %04x, len: %u\n",
+ pos, cap.cfg_type, cap.bar, cap.offset, cap.length);
+
+ switch (cap.cfg_type) {
+ case VIRTIO_PCI_CAP_COMMON_CFG:
+ hw->common_cfg = get_cfg_addr(dev, &cap);
+ break;
+ case VIRTIO_PCI_CAP_NOTIFY_CFG:
+ pci_read_config(dev, &hw->notify_off_multiplier,
+ 4, pos + sizeof(cap));
+ hw->notify_base = get_cfg_addr(dev, &cap);
+ break;
+ case VIRTIO_PCI_CAP_DEVICE_CFG:
+ hw->dev_cfg = get_cfg_addr(dev, &cap);
+ break;
+ case VIRTIO_PCI_CAP_ISR_CFG:
+ hw->isr = get_cfg_addr(dev, &cap);
+ break;
+ }
+
+next:
+ pos = cap.cap_next;
+ }
+
+ if (hw->common_cfg == NULL || hw->notify_base == NULL ||
+ hw->dev_cfg == NULL || hw->isr == NULL) {
+ ODP_DBG("no modern virtio pci device found.\n");
+ return -1;
+ }
+
+ ODP_DBG("found modern virtio pci device.\n");
+
+ ODP_DBG("common cfg mapped at: %p\n", hw->common_cfg);
+ ODP_DBG("device cfg mapped at: %p\n", hw->dev_cfg);
+ ODP_DBG("isr cfg mapped at: %p\n", hw->isr);
+ ODP_DBG("notify base: %p, notify off multiplier: %u\n",
+ hw->notify_base, hw->notify_off_multiplier);
+
+ return 0;
+}
+
+static void virtio_get_hwaddr(struct virtio_hw *hw)
+{
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_MAC)) {
+ vtpci_read_dev_config(hw,
+ ODPDRV_OFFSETOF(struct virtio_net_config,
+ mac),
+ &hw->mac_addr,
+ 6);
+ ODP_PRINT("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+ hw->mac_addr[0],
+ hw->mac_addr[1],
+ hw->mac_addr[2],
+ hw->mac_addr[3],
+ hw->mac_addr[4],
+ hw->mac_addr[5]);
+ } else {
+ ODP_PRINT("No support for VIRTIO_NET_F_MAC\n");
+ }
+}
+
+static int virtio_init_ethdev(struct virtio_hw *hw)
+{
+ const struct virtio_pci_ops *ops = hw->vtpci_ops;
+ uint64_t device_features = 0;
+
+ ODP_PRINT("Init VirtIO Net device\n");
+
+ ops->reset(hw);
+ ops->set_status(hw, VIRTIO_CONFIG_STATUS_ACK);
+ ops->set_status(hw, VIRTIO_CONFIG_STATUS_DRIVER);
+ device_features = ops->get_features(hw);
+
+ /* accept only those feature this driver also supports */
+ hw->guest_features = device_features & VIRTIO_NET_DRIVER_FEATURES;
+
+ if (!vtpci_with_feature(hw, VIRTIO_F_VERSION_1)) {
+ ODP_ERR("VirtIO device does not comply with VirtIO 1.0 spec\n");
+ return -1;
+ }
+
+ ops->set_features(hw, hw->guest_features);
+
+ ops->set_status(hw, VIRTIO_CONFIG_STATUS_FEATURES_OK);
+ if (!(ops->get_status(hw) & VIRTIO_CONFIG_STATUS_FEATURES_OK)) {
+ ODP_ERR("VirtIO device error negotiationg features\n");
+ return -1;
+ }
+
+ virtio_get_hwaddr(hw);
+
+ return 0;
+}
+
+/* FIXME: this should be registered as a DevIO */
+extern const user_access_ops_t uio_access_ops;
+
+/*
+ * Return -1:
+ * if there is error mapping with VFIO/UIO.
+ * if port map error when driver type is KDRV_NONE.
+ * if whitelisted but driver type is KDRV_UNKNOWN.
+ * Return 1 if kernel driver is managing the device.
+ * Return 0 on success.
+ */
+int virtio_pci_init(pci_dev_t *dev)
+{
+ struct virtio_hw *hw = NULL;
+
+ if (dev->id.vendor_id != VIRTIO_PCI_VENDOR_ID)
+ return -1;
+
+ if (dev->id.device_id != VIRTIO_PCI_LEGACY_DEVICE_ID_NET &&
+ dev->id.device_id != VIRTIO_PCI_MODERN_DEVICE_ID_NET)
+ return -1;
+
+ hw = malloc(sizeof(struct virtio_hw));
+ if (hw == NULL)
+ return -1;
+ memset(hw, 0, sizeof(struct virtio_hw));
+
+ /* Find suitable DevIO module that works with this device */
+ if (dev->kdrv == PCI_KDRV_UIO_GENERIC) {
+ /* probing would be done for each possible DevIO */
+ if (uio_access_ops.probe(dev) != 0)
+ goto err_free;
+ dev->user_access_ops = &uio_access_ops;
+ } else {
+ ODP_ERR("Could not find suitable DevIO for device\n");
+ goto err_free;
+ }
+
+ /*
+ * Try if we can succeed reading virtio pci caps, which exists
+ * only on modern pci device.
+ */
+ if (virtio_read_caps(dev, hw) != 0) {
+ /* we only support modern interface */
+ ODP_ERR("virtio_pci: could not read device capabilities\n");
+ goto err_free;
+ }
+
+ hw->dev = dev;
+ hw->vtpci_ops = &modern_ops;
+ hw->modern = 1;
+ if (virtio_init_ethdev(hw) != 0)
+ goto err_free;
+ dev->driver_data = (void *)hw;
+
+ return 0;
+
+err_free:
+ free(hw);
+ return -1;
+}
+
+#endif
diff --git a/platform/linux-generic/pktio/virtio_pci.h b/platform/linux-generic/pktio/virtio_pci.h
new file mode 100644
index 00000000..3e176315
--- /dev/null
+++ b/platform/linux-generic/pktio/virtio_pci.h
@@ -0,0 +1,320 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Intel Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _VIRTIO_PCI_H_
+#define _VIRTIO_PCI_H_
+
+#include <stdint.h>
+
+#include <drv_pci_internal.h>
+
+struct virtqueue;
+struct virtnet_ctl;
+
+/* VirtIO PCI vendor/device ID. */
+#define VIRTIO_PCI_VENDOR_ID 0x1AF4
+#define VIRTIO_PCI_LEGACY_DEVICE_ID_NET 0x1000
+#define VIRTIO_PCI_MODERN_DEVICE_ID_NET 0x1041
+
+/* VirtIO ABI version, this must match exactly. */
+#define VIRTIO_PCI_ABI_VERSION 0
+
+/*
+ * VirtIO Header, located in BAR 0.
+ */
+#define VIRTIO_PCI_HOST_FEATURES 0 /* host's supported features (32bit, RO)*/
+#define VIRTIO_PCI_GUEST_FEATURES 4 /* guest's supported features (32, RW) */
+#define VIRTIO_PCI_QUEUE_PFN 8 /* physical address of VQ (32, RW) */
+#define VIRTIO_PCI_QUEUE_NUM 12 /* number of ring entries (16, RO) */
+#define VIRTIO_PCI_QUEUE_SEL 14 /* current VQ selection (16, RW) */
+#define VIRTIO_PCI_QUEUE_NOTIFY 16 /* notify host regarding VQ (16, RW) */
+#define VIRTIO_PCI_STATUS 18 /* device status register (8, RW) */
+#define VIRTIO_PCI_ISR 19 /* interrupt status register, reading
+ * also clears the register (8, RO) */
+/* Only if MSIX is enabled: */
+#define VIRTIO_MSI_CONFIG_VECTOR 20 /* configuration change vector (16, RW) */
+#define VIRTIO_MSI_QUEUE_VECTOR 22 /* vector for selected VQ notifications
+ (16, RW) */
+
+/* The bit of the ISR which indicates a device has an interrupt. */
+#define VIRTIO_PCI_ISR_INTR 0x1
+/* The bit of the ISR which indicates a device configuration change. */
+#define VIRTIO_PCI_ISR_CONFIG 0x2
+/* Vector value used to disable MSI for queue. */
+#define VIRTIO_MSI_NO_VECTOR 0xFFFF
+
+/* VirtIO device IDs. */
+#define VIRTIO_ID_NETWORK 0x01
+#define VIRTIO_ID_BLOCK 0x02
+#define VIRTIO_ID_CONSOLE 0x03
+#define VIRTIO_ID_ENTROPY 0x04
+#define VIRTIO_ID_BALLOON 0x05
+#define VIRTIO_ID_IOMEMORY 0x06
+#define VIRTIO_ID_9P 0x09
+
+/* Status byte for guest to report progress. */
+#define VIRTIO_CONFIG_STATUS_RESET 0x00
+#define VIRTIO_CONFIG_STATUS_ACK 0x01
+#define VIRTIO_CONFIG_STATUS_DRIVER 0x02
+#define VIRTIO_CONFIG_STATUS_DRIVER_OK 0x04
+#define VIRTIO_CONFIG_STATUS_FEATURES_OK 0x08
+#define VIRTIO_CONFIG_STATUS_FAILED 0x80
+
+/*
+ * Each virtqueue indirect descriptor list must be physically contiguous.
+ * To allow us to malloc(9) each list individually, limit the number
+ * supported to what will fit in one page. With 4KB pages, this is a limit
+ * of 256 descriptors. If there is ever a need for more, we can switch to
+ * contigmalloc(9) for the larger allocations, similar to what
+ * bus_dmamem_alloc(9) does.
+ *
+ * Note the sizeof(struct vring_desc) is 16 bytes.
+ */
+#define VIRTIO_MAX_INDIRECT ((int) (PAGE_SIZE / 16))
+
+/* The feature bitmap for virtio net */
+#define VIRTIO_NET_F_CSUM 0 /* Host handles pkts w/ partial csum */
+#define VIRTIO_NET_F_GUEST_CSUM 1 /* Guest handles pkts w/ partial csum */
+#define VIRTIO_NET_F_MAC 5 /* Host has given MAC address. */
+#define VIRTIO_NET_F_GUEST_TSO4 7 /* Guest can handle TSOv4 in. */
+#define VIRTIO_NET_F_GUEST_TSO6 8 /* Guest can handle TSOv6 in. */
+#define VIRTIO_NET_F_GUEST_ECN 9 /* Guest can handle TSO[6] w/ ECN in. */
+#define VIRTIO_NET_F_GUEST_UFO 10 /* Guest can handle UFO in. */
+#define VIRTIO_NET_F_HOST_TSO4 11 /* Host can handle TSOv4 in. */
+#define VIRTIO_NET_F_HOST_TSO6 12 /* Host can handle TSOv6 in. */
+#define VIRTIO_NET_F_HOST_ECN 13 /* Host can handle TSO[6] w/ ECN in. */
+#define VIRTIO_NET_F_HOST_UFO 14 /* Host can handle UFO in. */
+#define VIRTIO_NET_F_MRG_RXBUF 15 /* Host can merge receive buffers. */
+#define VIRTIO_NET_F_STATUS 16 /* virtio_net_config.status available */
+#define VIRTIO_NET_F_CTRL_VQ 17 /* Control channel available */
+#define VIRTIO_NET_F_CTRL_RX 18 /* Control channel RX mode support */
+#define VIRTIO_NET_F_CTRL_VLAN 19 /* Control channel VLAN filtering */
+#define VIRTIO_NET_F_CTRL_RX_EXTRA 20 /* Extra RX mode control support */
+#define VIRTIO_NET_F_GUEST_ANNOUNCE 21 /* Guest can announce device on the
+ * network */
+#define VIRTIO_NET_F_MQ 22 /* Device supports Receive Flow
+ * Steering */
+#define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */
+
+/* Do we get callbacks when the ring is completely used, even if we've
+ * suppressed them? */
+#define VIRTIO_F_NOTIFY_ON_EMPTY 24
+
+/* Can the device handle any descriptor layout? */
+#define VIRTIO_F_ANY_LAYOUT 27
+
+/* We support indirect buffer descriptors */
+#define VIRTIO_RING_F_INDIRECT_DESC 28
+
+#define VIRTIO_F_VERSION_1 32
+
+/*
+ * Some VirtIO feature bits (currently bits 28 through 31) are
+ * reserved for the transport being used (eg. virtio_ring), the
+ * rest are per-device feature bits.
+ */
+#define VIRTIO_TRANSPORT_F_START 28
+#define VIRTIO_TRANSPORT_F_END 32
+
+/* The Guest publishes the used index for which it expects an interrupt
+ * at the end of the avail ring. Host should ignore the avail->flags field. */
+/* The Host publishes the avail index for which it expects a kick
+ * at the end of the used ring. Guest should ignore the used->flags field. */
+#define VIRTIO_RING_F_EVENT_IDX 29
+
+#define VIRTIO_NET_S_LINK_UP 1 /* Link is up */
+#define VIRTIO_NET_S_ANNOUNCE 2 /* Announcement is needed */
+
+/*
+ * Maximum number of virtqueues per device.
+ */
+#define VIRTIO_MAX_VIRTQUEUES 8
+
+/* Common configuration */
+#define VIRTIO_PCI_CAP_COMMON_CFG 1
+/* Notifications */
+#define VIRTIO_PCI_CAP_NOTIFY_CFG 2
+/* ISR Status */
+#define VIRTIO_PCI_CAP_ISR_CFG 3
+/* Device specific configuration */
+#define VIRTIO_PCI_CAP_DEVICE_CFG 4
+/* PCI configuration access */
+#define VIRTIO_PCI_CAP_PCI_CFG 5
+
+/* This is the PCI capability header: */
+struct virtio_pci_cap {
+ uint8_t cap_vndr; /* Generic PCI field: PCI_CAP_ID_VNDR */
+ uint8_t cap_next; /* Generic PCI field: next ptr. */
+ uint8_t cap_len; /* Generic PCI field: capability length */
+ uint8_t cfg_type; /* Identifies the structure. */
+ uint8_t bar; /* Where to find it. */
+ uint8_t padding[3]; /* Pad to full dword. */
+ uint32_t offset; /* Offset within bar. */
+ uint32_t length; /* Length of the structure, in bytes. */
+};
+
+struct virtio_pci_notify_cap {
+ struct virtio_pci_cap cap;
+ uint32_t notify_off_multiplier; /* Multiplier for queue_notify_off. */
+};
+
+/* Fields in VIRTIO_PCI_CAP_COMMON_CFG: */
+struct virtio_pci_common_cfg {
+ /* About the whole device. */
+ uint32_t device_feature_select; /* read-write */
+ uint32_t device_feature; /* read-only */
+ uint32_t guest_feature_select; /* read-write */
+ uint32_t guest_feature; /* read-write */
+ uint16_t msix_config; /* read-write */
+ uint16_t num_queues; /* read-only */
+ uint8_t device_status; /* read-write */
+ uint8_t config_generation; /* read-only */
+
+ /* About a specific virtqueue. */
+ uint16_t queue_select; /* read-write */
+ uint16_t queue_size; /* read-write, power of 2. */
+ uint16_t queue_msix_vector; /* read-write */
+ uint16_t queue_enable; /* read-write */
+ uint16_t queue_notify_off; /* read-only */
+ uint32_t queue_desc_lo; /* read-write */
+ uint32_t queue_desc_hi; /* read-write */
+ uint32_t queue_avail_lo; /* read-write */
+ uint32_t queue_avail_hi; /* read-write */
+ uint32_t queue_used_lo; /* read-write */
+ uint32_t queue_used_hi; /* read-write */
+};
+
+struct virtio_hw;
+
+struct virtio_pci_ops {
+ void (*read_dev_cfg)(struct virtio_hw *hw, size_t offset,
+ void *dst, int len);
+ void (*write_dev_cfg)(struct virtio_hw *hw, size_t offset,
+ const void *src, int len);
+ void (*reset)(struct virtio_hw *hw);
+
+ uint8_t (*get_status)(struct virtio_hw *hw);
+ void (*set_status)(struct virtio_hw *hw, uint8_t status);
+
+ uint64_t (*get_features)(struct virtio_hw *hw);
+ void (*set_features)(struct virtio_hw *hw, uint64_t features);
+
+ uint8_t (*get_isr)(struct virtio_hw *hw);
+
+ uint16_t (*set_config_irq)(struct virtio_hw *hw, uint16_t vec);
+
+ uint16_t (*get_queue_num)(struct virtio_hw *hw, uint16_t queue_id);
+ int (*setup_queue)(struct virtio_hw *hw, struct virtqueue *vq);
+ void (*del_queue)(struct virtio_hw *hw, struct virtqueue *vq);
+ void (*notify_queue)(struct virtio_hw *hw, struct virtqueue *vq);
+};
+
+struct virtio_net_config;
+
+/* it's ugly, and it will be fixed */
+#define driver_data_t virtio_hw
+
+struct driver_data_t {
+ struct virtnet_ctl *cvq;
+ pci_ioport_t io;
+ uint64_t guest_features;
+ uint32_t max_tx_queues;
+ uint32_t max_rx_queues;
+ uint16_t vtnet_hdr_size;
+ uint8_t vlan_strip;
+ uint8_t use_msix;
+ uint8_t started;
+ uint8_t modern;
+ uint8_t mac_addr[6];
+ uint32_t notify_off_multiplier;
+ uint8_t *isr;
+ uint16_t *notify_base;
+ pci_dev_t *dev;
+ struct virtio_pci_common_cfg *common_cfg;
+ struct virtio_net_config *dev_cfg;
+ const struct virtio_pci_ops *vtpci_ops;
+ void *virtio_user_dev;
+};
+
+/*
+ * This structure is just a reference to read
+ * net device specific config space; it just a chodu structure
+ *
+ */
+struct virtio_net_config {
+ /* The config defining mac address (if VIRTIO_NET_F_MAC) */
+ uint8_t mac[6];
+ /* See VIRTIO_NET_F_STATUS and VIRTIO_NET_S_* above */
+ uint16_t status;
+ uint16_t max_virtqueue_pairs;
+} __attribute__((packed));
+
+/*
+ * How many bits to shift physical queue address written to QUEUE_PFN.
+ * 12 is historical, and due to x86 page size.
+ */
+#define VIRTIO_PCI_QUEUE_ADDR_SHIFT 12
+
+/* The alignment to use between consumer and producer parts of vring. */
+#define VIRTIO_PCI_VRING_ALIGN 4096
+
+static inline int
+vtpci_with_feature(const struct virtio_hw *hw, uint64_t bit)
+{
+ return (hw->guest_features & (1ULL << bit)) != 0;
+}
+
+/*
+ * Function declaration from virtio_pci.c
+ */
+int vtpci_init(pci_dev_t *, struct virtio_hw *);
+void vtpci_reset(struct virtio_hw *);
+
+void vtpci_reinit_complete(struct virtio_hw *);
+
+uint8_t vtpci_get_status(struct virtio_hw *);
+void vtpci_set_status(struct virtio_hw *, uint8_t);
+
+uint64_t vtpci_negotiate_features(struct virtio_hw *, uint64_t);
+
+void vtpci_write_dev_config(struct virtio_hw *, size_t, const void *, int);
+
+void vtpci_read_dev_config(struct virtio_hw *, size_t, void *, int);
+
+uint8_t vtpci_isr(struct virtio_hw *);
+
+uint16_t vtpci_irq_config(struct virtio_hw *, uint16_t);
+
+int virtio_pci_init(pci_dev_t *dev);
+
+#endif /* _VIRTIO_PCI_H_ */
commit d073f151fd711ea3bf39711f1d235b8e89d52522
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Tue Aug 29 14:02:46 2017 +0200
drv_pci: port ioport operations from DPDK.
This is ported from DPDK, copied from initial port by François at:
https://git.linaro.org/people/francois.ozog/odp.git (27237321a)
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
diff --git a/platform/linux-generic/drv_pci.c b/platform/linux-generic/drv_pci.c
index d90bfa6e..065ba33d 100644
--- a/platform/linux-generic/drv_pci.c
+++ b/platform/linux-generic/drv_pci.c
@@ -652,6 +652,84 @@ int _odp_pci_term_global(void)
return 0;
}
+int pci_ioport_map(pci_dev_t *dev , int idx, pci_ioport_t *p)
+{
+ int ret = -1;
+
+ if (dev == NULL || dev->user_access_ops == NULL) {
+ ODP_DBG("Called pci_unmap_device with NULL device or "
+ "dev->user_access_ops.\n");
+ return -1;
+ }
+
+ if (dev->user_access_ops->ioport_map == NULL) {
+ ODP_DBG("Called pci_unmap_device with ioport_map==NULL.\n");
+ return -1;
+ }
+
+ ret = dev->user_access_ops->ioport_map(dev, idx, p);
+
+ if (!ret)
+ p->dev = dev;
+
+ return ret;
+}
+
+int pci_ioport_unmap(pci_dev_t *dev, pci_ioport_t *p )
+{
+ int ret = -1;
+
+ if (dev == NULL || dev->user_access_ops == NULL) {
+ ODP_DBG("Called pci_unmap_device with NULL device or "
+ "dev->user_access_ops.\n");
+ return -1;
+ }
+
+ if (dev->user_access_ops->ioport_unmap == NULL) {
+ ODP_DBG("Called pci_unmap_device with "
+ "pci_ioport_unmap==NULL.\n");
+ return -1;
+ }
+
+ ret = dev->user_access_ops->ioport_unmap(dev, p);
+
+ return ret;
+}
+
+void pci_ioport_read(pci_dev_t *dev, pci_ioport_t *p, void *data, size_t len,
+ off_t offset)
+{
+ if (dev == NULL || dev->user_access_ops == NULL) {
+ ODP_DBG("Called pci_unmap_device with NULL device or "
+ "dev->user_access_ops.\n");
+ return ;
+ }
+
+ if (dev->user_access_ops->ioport_read == NULL) {
+ ODP_DBG("Called pci_unmap_device with ioport_read==NULL.\n");
+ return ;
+ }
+
+ dev->user_access_ops->ioport_read(dev, p, data, len, offset);
+}
+
+void pci_ioport_write(pci_dev_t *dev, pci_ioport_t *p ODP_UNUSED,
+ const void *data ODP_UNUSED, size_t len ODP_UNUSED,
+ off_t offset ODP_UNUSED)
+{
+ if (dev == NULL || dev->user_access_ops == NULL) {
+ ODP_DBG("Called pci_unmap_device with NULL device or "
+ "dev->user_access_ops.\n");
+ return ;
+ }
+
+ if (dev->user_access_ops->ioport_write == NULL) {
+ ODP_DBG("Called pci_unmap_device with ioport_write==NULL.\n");
+ return ;
+ }
+
+ dev->user_access_ops->ioport_write(dev, p, data, len, offset);
+}
/* pci drivers use this function to open a PCI device from the /sys/bus filesystem
* It returns a pci_dev_t struct with several fields filled in. The driver can
diff --git a/platform/linux-generic/include/drv_pci_internal.h b/platform/linux-generic/include/drv_pci_internal.h
index 7fab1375..ccd61606 100644
--- a/platform/linux-generic/include/drv_pci_internal.h
+++ b/platform/linux-generic/include/drv_pci_internal.h
@@ -67,7 +67,7 @@ enum pci_kernel_driver {
/**
* A structure used to access io resources for a pci device.
- * rte_pci_ioport is arch, os, driver specific, and should not be used outside
+ * pci_ioport_t is arch, os, driver specific, and should not be used outside
* of pci ioport api.
*/
typedef struct pci_ioport_t {
@@ -120,8 +120,18 @@ typedef struct pci_dev_t {
/* path where PCI devices are shown in sysfs: */
const char *pci_get_sysfs_path(void);
+
+/* read from PCI configuration area len bytes at offset */
int pci_read_config(pci_dev_t *dev, void *buf, size_t len, off_t offset);
+/* IO port operations */
+int pci_ioport_map(pci_dev_t *dev, int bar, pci_ioport_t *p);
+int pci_ioport_unmap(pci_dev_t *dev, pci_ioport_t *p);
+void pci_ioport_read(pci_dev_t *dev, pci_ioport_t *p, void *data, size_t len,
+ off_t offset);
+void pci_ioport_write(pci_dev_t *dev, pci_ioport_t *p,const void *data,
+ size_t len, off_t offset);
+
struct pci_dev_t *pci_open_device(const char *);
int pci_close_device(pci_dev_t *);
commit c3cda8e1dfbe5a8665d52b167700590bcbfae488
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Tue Aug 22 14:02:44 2017 +0200
drv_pci: add pci_read_config method.
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
diff --git a/platform/linux-generic/drv_pci.c b/platform/linux-generic/drv_pci.c
index c75c1768..d90bfa6e 100644
--- a/platform/linux-generic/drv_pci.c
+++ b/platform/linux-generic/drv_pci.c
@@ -157,6 +157,21 @@ const char *pci_get_sysfs_path(void)
return path;
}
+int pci_read_config(pci_dev_t *dev, void *buf, size_t len, off_t offset)
+{
+ if (dev == NULL || dev->user_access_ops == NULL) {
+ ODP_DBG("Called pci_read_config with NULL device or dev->user_access_ops.\n");
+ return -1;
+ }
+
+ if (dev->user_access_ops->read_config == NULL) {
+ ODP_DBG("Called pci_read_config with read_config==NULL.\n");
+ return -1;
+ }
+
+ return dev->user_access_ops->read_config(dev, buf, len, offset);
+}
+
/*
* parse a sysfs (or other) file containing one integer value
* return this positive integer, or -1 on error
diff --git a/platform/linux-generic/include/drv_pci_internal.h b/platform/linux-generic/include/drv_pci_internal.h
index b1095c03..7fab1375 100644
--- a/platform/linux-generic/include/drv_pci_internal.h
+++ b/platform/linux-generic/include/drv_pci_internal.h
@@ -120,6 +120,7 @@ typedef struct pci_dev_t {
/* path where PCI devices are shown in sysfs: */
const char *pci_get_sysfs_path(void);
+int pci_read_config(pci_dev_t *dev, void *buf, size_t len, off_t offset);
struct pci_dev_t *pci_open_device(const char *);
int pci_close_device(pci_dev_t *);
commit 13a5240a9a4035c8c4fb1f03f2113799390c305b
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Tue Aug 22 09:32:06 2017 +0200
uio_pci: initial port from DPDK
This is a modified version of an initial UIO driver from:
https://git.linaro.org/people/francois.ozog/odp.git
in turn taken from DPDK
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 11b03b60..4d3d3610 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -290,6 +290,7 @@ __LIB__libodp_linux_la_SOURCES = \
drv_barrier.c \
drv_driver.c \
drv_pci.c \
+ drv_pci_uio.c \
drv_shm.c \
drv_spinlock.c
diff --git a/platform/linux-generic/drv_pci.c b/platform/linux-generic/drv_pci.c
index 04a73772..c75c1768 100644
--- a/platform/linux-generic/drv_pci.c
+++ b/platform/linux-generic/drv_pci.c
@@ -637,6 +637,7 @@ int _odp_pci_term_global(void)
return 0;
}
+
/* pci drivers use this function to open a PCI device from the /sys/bus filesystem
* It returns a pci_dev_t struct with several fields filled in. The driver can
* then decide if it can handle the device or not based on device ID.
@@ -669,3 +670,13 @@ pci_dev_t *pci_open_device(const char *dev)
return pci_dev;
}
+
+int pci_close_device(pci_dev_t *dev)
+{
+ if (dev->user_access_ops != NULL)
+ dev->user_access_ops->unmap_resource(dev);
+
+ free_dev(dev);
+
+ return 0;
+}
diff --git a/platform/linux-generic/drv_pci_uio.c b/platform/linux-generic/drv_pci_uio.c
new file mode 100644
index 00000000..d11c868c
--- /dev/null
+++ b/platform/linux-generic/drv_pci_uio.c
@@ -0,0 +1,622 @@
+#/* Copyright (c) 2016, Linaro Limited
+* All rights reserved.
+*
+* SPDX-License-Identifier: BSD-3-Clause
+*/
+
+/* Many of this functions have been inspired by their dpdk counterpart,
+ * hence the following copyright and license:
+ */
+
+/*
+ * BSD LICENSE
+ *
+ * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ */
+
+/**
+ * @file
+ * PCI interface for UIO drivers
+ */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include <stdio.h>
+
+#if !defined (ARM_ARCHITECTURE)
+#include <sys/io.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dirent.h>
+#include <linux/limits.h>
+#include <unistd.h>
+#include <errno.h>
+#include <malloc.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <linux/pci_regs.h>
+#include <_str_functions_internal.h>
+
+#include <odp_posix_extensions.h>
+#include <odp_config_internal.h>
+#include <odp_internal.h>
+#include <odp/drv/shm.h>
+#include <odp_debug_internal.h>
+
+#include <drv_pci_internal.h>
+
+typedef struct user_access_context_t {
+ int uio_num; /**< device number assigned by UIO: /dev/uioX */
+ int uio_fd; /**< file descriptor for /dev/uioX */
+ int uio_cfg_fd; /**< file descriptor for accessing device's config space */
+ int nb_maps;
+ struct pci_map maps[PCI_MAX_RESOURCE];
+ char path[PATH_MAX];
+} user_access_context_t;
+
+void *pci_map_addr = NULL;
+
+
+/* map a particular resource from a file */
+static void *pci_uio_map_resource(void *requested_addr, int fd, off_t offset,
+ size_t size, int additional_flags)
+{
+ void *mapaddr;
+
+ /* Map the PCI memory resource of device */
+ mapaddr = mmap(requested_addr, size, PROT_READ | PROT_WRITE,
+ MAP_SHARED | additional_flags, fd, offset);
+ if (mapaddr == MAP_FAILED) {
+ ODP_ERR("%s(): cannot mmap(%d, %p, 0x%lx, 0x%lx): %s (%p)\n",
+ __func__, fd, requested_addr,
+ (unsigned long)size, (unsigned long)offset,
+ strerror(errno), mapaddr);
+ } else {
+ ODP_ERR(" PCI memory mapped at %p\n", mapaddr);
+ }
+
+ return mapaddr;
+}
+
+static int pci_uio_set_bus_master(pci_dev_t *dev)
+{
+ uint16_t reg;
+ int ret;
+ int cfg_fd = dev->user_access_context->uio_cfg_fd;
+
+ ret = pread(cfg_fd, ®, sizeof(reg), PCI_COMMAND);
+ if (ret != sizeof(reg)) {
+ ODP_ERR("Cannot read command from PCI config space!\n");
+ return -1;
+ }
+
+ /* return if bus mastering is already on */
+ if (reg & PCI_COMMAND_MASTER)
+ return 0;
+
+ reg |= PCI_COMMAND_MASTER;
+
+ ret = pwrite(cfg_fd, ®, sizeof(reg), PCI_COMMAND);
+ if (ret != sizeof(reg)) {
+ ODP_ERR("Cannot write command to PCI config space!\n");
+ return -1;
+ }
+
+ return 0;
+}
+
+/*
+ * Return the uioX char device used for a pci device. On success, return
+ * the UIO number and fill dstbuf string with the path of the device in
+ * sysfs. On error, return a negative value. In this case dstbuf is
+ * invalid.
+ */
+static int pci_uio_get_uio_dev(pci_dev_t *dev, char *dstbuf,
+ unsigned int buflen)
+{
+ struct pci_addr_t *loc = &dev->addr;
+ unsigned int uio_num;
+ struct dirent *e;
+ DIR *dir;
+ char dirname[PATH_MAX];
+
+ /* depending on kernel version, uio can be located in uio/uioX
+ * or uio:uioX */
+
+ snprintf(dirname, sizeof(dirname),
+ "%s/" PCI_PRI_FMT "/uio", pci_get_sysfs_path(),
+ loc->domain, loc->bus, loc->devid, loc->function);
+
+ dir = opendir(dirname);
+ if (dir == NULL) {
+ /* retry with the parent directory */
+ snprintf(dirname, sizeof(dirname),
+ "%s/" PCI_PRI_FMT, pci_get_sysfs_path(),
+ loc->domain, loc->bus, loc->devid, loc->function);
+ dir = opendir(dirname);
+
+ if (dir == NULL) {
+ ODP_ERR("Cannot opendir %s\n", dirname);
+ return -1;
+ }
+ }
+
+ /* take the first file starting with "uio" */
+ while ((e = readdir(dir)) != NULL) {
+ /* format could be uio%d ...*/
+ int shortprefix_len = sizeof("uio") - 1;
+ /* ... or uio:uio%d */
+ int longprefix_len = sizeof("uio:uio") - 1;
+ char *endptr;
+
+ if (strncmp(e->d_name, "uio", 3) != 0)
+ continue;
+
+ /* first try uio%d */
+ errno = 0;
+ uio_num = strtoull(e->d_name + shortprefix_len, &endptr, 10);
+ if (errno == 0 && endptr != (e->d_name + shortprefix_len)) {
+ snprintf(dstbuf, buflen, "%s/uio%u", dirname, uio_num);
+ break;
+ }
+
+ /* then try uio:uio%d */
+ errno = 0;
+ uio_num = strtoull(e->d_name + longprefix_len, &endptr, 10);
+ if (errno == 0 && endptr != (e->d_name + longprefix_len)) {
+ snprintf(dstbuf, buflen, "%s/uio:uio%u", dirname,
+ uio_num);
+ break;
+ }
+ }
+ closedir(dir);
+
+ /* No uio resource found */
+ if (e == NULL)
+ return -1;
+
+ return uio_num;
+}
+
+static void pci_uio_free_context(struct pci_dev_t *dev)
+{
+ user_access_context_t *ctx = dev->user_access_context;
+
+ if (ctx->uio_cfg_fd >= 0) {
+ close(ctx->uio_cfg_fd);
+ }
+ if (ctx->uio_fd >= 0) {
+ close(ctx->uio_fd);
+ }
+
+ dev->user_access_context = NULL;
+ free(ctx);
+}
+
+static int pci_uio_prepare_context(pci_dev_t *dev)
+{
+ char dirname[PATH_MAX];
+ char cfgname[PATH_MAX];
+ int uio_num;
+ struct pci_addr_t *loc;
+ user_access_context_t *ctx;
+
+ ctx = malloc(sizeof(user_access_context_t));
+ if (ctx == NULL)
+ return -1;
+
+ memset(ctx, 0, sizeof(user_access_context_t));
+
+ loc = &dev->addr;
+
+ /* find uio resource */
+ uio_num = pci_uio_get_uio_dev(dev, dirname, sizeof(dirname));
+ if (uio_num < 0) {
+ ODP_ERR(" "PCI_PRI_FMT" not managed by UIO driver, "
+ "skipping\n", loc->domain, loc->bus, loc->devid,
+ loc->function);
+ return 1;
+ }
+
+ ctx->uio_num = uio_num;
+ snprintf(ctx->path, sizeof(dev->user_access_context->path),
+ "/dev/uio%u", uio_num);
+ dev->user_access_context = ctx;
+
+ ctx->uio_fd = open(ctx->path, O_RDWR);
+ if (ctx->uio_fd < 0) {
+ ODP_ERR("Cannot open %s: %s\n", ctx->path, strerror(errno));
+ goto error;
+ }
+
+ snprintf(cfgname, sizeof(cfgname),
+ "/sys/class/uio/uio%u/device/config", uio_num);
+ ctx->uio_cfg_fd = open(cfgname, O_RDWR);
+ if (ctx->uio_cfg_fd < 0) {
+ ODP_ERR("Cannot open %s: %s\n", cfgname, strerror(errno));
+ goto error;
+ }
+
+ /* set bus master that is not done by uio_pci_generic */
+ if (pci_uio_set_bus_master(dev)) {
+ ODP_ERR("Cannot set up bus mastering!\n");
+ goto error;
+ }
+
+ return 0;
+
+error:
+ pci_uio_free_context(dev);
+ return -1;
+}
+
+
+static int pci_uio_map_resource_by_index(pci_dev_t *dev, int res_idx,
+ int map_idx)
+{
+ int fd;
+ char devname[PATH_MAX];
+ void *mapaddr;
+ struct pci_addr_t *loc;
+ user_access_context_t *ctx;
+
+ loc = &dev->addr;
+ ctx = dev->user_access_context;
+
+ /* update devname for mmap */
+ snprintf(devname, sizeof(devname),
+ "%s/" PCI_PRI_FMT "/resource%d",
+ pci_get_sysfs_path(),
+ loc->domain, loc->bus, loc->devid,
+ loc->function, res_idx);
+
+ /* allocate memory to keep path */
+ ctx->maps[map_idx].path = malloc(strlen(devname) + 1);
+ if (ctx->maps[map_idx].path == NULL) {
+ ODP_ERR("Cannot allocate memory for path: %s\n",
+ strerror(errno));
+ return -ENOMEM;
+ }
+
+ /*
+ * open resource file, to mmap it
+ */
+ fd = open(devname, O_RDWR);
+ if (fd < 0) {
+ ODP_ERR("Cannot open %s: %s\n",
+ devname, strerror(errno));
+ goto error;
+ }
+
+ /* try mapping somewhere close to the end of hugepages */
+ //if (pci_map_addr == NULL) pci_map_addr = pci_find_max_end_va();
+
+ mapaddr = pci_uio_map_resource(pci_map_addr, fd, 0,
+ (size_t)dev->bar[res_idx].len, 0);
+ close(fd);
+ if (mapaddr == MAP_FAILED)
+ goto error;
+
+ //pci_map_addr = (void*)((uintptr_t)mapaddr + (size_t)dev->bar[res_idx].len);
+
+ ctx->maps[map_idx].phaddr = dev->bar[res_idx].phys_addr;
+ ctx->maps[map_idx].size = dev->bar[res_idx].len;
+ ctx->maps[map_idx].addr = mapaddr;
+ ctx->maps[map_idx].offset = 0;
+ strcpy(ctx->maps[map_idx].path, devname);
+ dev->bar[res_idx].addr = mapaddr;
+
+ return 0;
+
+error:
+ free(ctx->maps[map_idx].path);
+ ctx->maps[map_idx].path = NULL;
+ return -1;
+}
+
+
+static int pci_uio_map_resources(pci_dev_t *dev)
+{
+ int map_idx = 0;
+
+ /* don't call before probing*/
+ if (dev->user_access_context == NULL)
+ return -1;
+
+ /* we've been here before, no need to try again */
+ if (dev->user_access_context->nb_maps != 0)
+ return 0;
+
+ /* Map all BARs */
+ for (int i = 0; i != PCI_MAX_RESOURCE; i++) {
+ uint64_t phaddr = dev->bar[i].phys_addr;
+
+ /* skip empty BAR */
+ if (phaddr == 0)
+ continue;
+
+ if (pci_uio_map_resource_by_index(dev, i, map_idx))
+ goto error;
+
+ map_idx++;
+ }
+
+ dev->user_access_context->nb_maps = map_idx;
+
+ return 0;
+
+error:
+#ifdef ACTIVATED
+ for (i = 0; i < map_idx; i++) {
+ pci_unmap_resource(uio_res->maps[i].addr,
+ (size_t)uio_res->maps[i].size);
+ rte_free(uio_res->maps[i].path);
+ }
+ pci_uio_free_resource(dev, uio_res);
+ dev->user_access_context->nb_maps = 0;
+#endif
+ return -1;
+}
+
+static int pci_uio_unmap_resources(pci_dev_t *dev)
+{
+ if (dev == NULL)
+ return -1;
+#ifdef ACTIVATED
+ /* find an entry for the device */
+ uio_res = pci_uio_find_resource(dev);
+ if (uio_res == NULL)
+ return;
+
+ /* unmap all resources */
+ pci_uio_unmap(uio_res);
+
+ /* free uio resource */
+ free(uio_res);
+
+ /* close fd if in primary process */
+ if (dev->user_access_context->uio_cfg_fd >= 0) {
+ close(dev->user_access_context->uio_cfg_fd);
+ }
+#endif
+ return 0;
+}
+
+static int pci_uio_read_config(pci_dev_t *dev, void *buf, size_t len,
+ off_t offset)
+{
+ return pread(dev->user_access_context->uio_cfg_fd, buf, len, offset);
+}
+
+static int pci_uio_write_config(pci_dev_t *dev, void *buf, size_t len,
+ off_t offset)
+{
+ return pwrite(dev->user_access_context->uio_cfg_fd, buf, len, offset);
+}
+
+#if !defined(ARM_ARCHITECTURE)
+static int pci_uio_ioport_map(pci_dev_t* dev, int idx ODP_UNUSED,
+ pci_ioport_t *p)
+{
+ uint16_t start, end;
+ FILE *fp;
+ char *line = NULL;
+ char pci_id[16];
+ int found = 0;
+ size_t linesz;
+
+ snprintf(pci_id, sizeof(pci_id), PCI_PRI_FMT,
+ dev->addr.domain, dev->addr.bus,
+ dev->addr.devid, dev->addr.function);
+
+ fp = fopen("/proc/ioports", "r");
+ if (fp == NULL) {
+ ODP_ERR("%s(): can't open ioports\n", __func__);
+ return -1;
+ }
+
+ while (getdelim(&line, &linesz, '\n', fp) > 0) {
+ char *ptr = line;
+ char *left;
+ int n;
+
+ n = strcspn(ptr, ":");
+ ptr[n] = 0;
+ left = &ptr[n + 1];
+
+ while (*left && isspace(*left))
+ left++;
+
+ if (!strncmp(left, pci_id, strlen(pci_id))) {
+ found = 1;
+
+ while (*ptr && isspace(*ptr))
+ ptr++;
+
+ sscanf(ptr, "%04hx-%04hx", &start, &end);
+
+ break;
+ }
+ }
+
+ free(line);
+ fclose(fp);
+
+ if (!found)
+ return -1;
+
+ p->base = start;
+ ODP_PRINT("PCI Port IO found start=0x%x\n", start);
+
+ return 0;
+}
+#else
+int pci_uio_ioport_map(struct rte_pci_device *dev, int bar,
+ struct rte_pci_ioport *p)
+{
+ FILE *f;
+ char buf[BUFSIZ];
+ char filename[PATH_MAX];
+ uint64_t phys_addr, end_addr, flags;
+ int fd, i;
+ void *addr;
+
+ /* open and read addresses of the corresponding resource in sysfs */
+ snprintf(filename, sizeof(filename), "%s/" PCI_PRI_FMT "/resource",
+ pci_get_sysfs_path(), dev->addr.domain, dev->addr.bus,
+ dev->addr.devid, dev->addr.function);
+ f = fopen(filename, "r");
+ if (f == NULL) {
+ RTE_LOG(ERR, EAL, "Cannot open sysfs resource: %s\n",
+ strerror(errno));
+ return -1;
+ }
+ for (i = 0; i < bar + 1; i++) {
+ if (fgets(buf, sizeof(buf), f) == NULL) {
+ RTE_LOG(ERR, EAL, "Cannot read sysfs resource\n");
+ goto error;
+ }
+ }
+ if (pci_parse_one_sysfs_resource(buf, sizeof(buf), &phys_addr,
+ &end_addr, &flags) < 0)
+ goto error;
+ if ((flags & IORESOURCE_IO) == 0) {
+ RTE_LOG(ERR, EAL, "BAR %d is not an IO resource\n", bar);
+ goto error;
+ }
+ snprintf(filename, sizeof(filename), "%s/" PCI_PRI_FMT "/resource%d",
+ pci_get_sysfs_path(), dev->addr.domain, dev->addr.bus,
+ dev->addr.devid, dev->addr.function, bar);
+
+ /* mmap the pci resource */
+ fd = open(filename, O_RDWR);
+ if (fd < 0) {
+ RTE_LOG(ERR, EAL, "Cannot open %s: %s\n", filename,
+ strerror(errno));
+ goto error;
+ }
+ addr = mmap(NULL, end_addr + 1, PROT_READ | PROT_WRITE,
+ MAP_SHARED, fd, 0);
+ close(fd);
+ if (addr == MAP_FAILED) {
+ RTE_LOG(ERR, EAL, "Cannot mmap IO port resource: %s\n",
+ strerror(errno));
+ goto error;
+ }
+
+ /* strangely, the base address is mmap addr + phys_addr */
+ p->base = (uintptr_t)addr + phys_addr;
+ p->len = end_addr + 1;
+ RTE_LOG(DEBUG, EAL, "PCI Port IO found start=0x%"PRIx64"\n", p->base);
+ fclose(f);
+
+ return 0;
+
+error:
+ fclose(f);
+ return -1;
+}
+#endif
+
+static int pci_uio_ioport_unmap(pci_dev_t* dev ODP_UNUSED, pci_ioport_t *p ODP_UNUSED)
+{
+ int ret = -1;
+ return ret;
+}
+
+
+static void pci_uio_ioport_read(pci_dev_t* dev ODP_UNUSED, pci_ioport_t *p,
+ void *data, size_t len, off_t offset)
+{
+ uint8_t *d;
+ int size;
+ uintptr_t reg = p->base + offset;
+
+ for (d = data; len > 0; d += size, reg += size, len -= size) {
+ if (len >= 4) {
+ size = 4;
+#if !defined(ARM_ARCHITECTURE)
+ *(uint32_t *)d = inl(reg);
+#else
+ *(uint32_t *)d = *(volatile uint32_t *)reg;
+#endif
+ } else if (len >= 2) {
+ size = 2;
+#if !defined(ARM_ARCHITECTURE)
+ *(uint16_t *)d = inw(reg);
+#else
+ *(uint16_t *)d = *(volatile uint16_t *)reg;
+#endif
+ } else {
+ size = 1;
+#if !defined(ARM_ARCHITECTURE)
+ *d = inb(reg);
+#else
+ *d = *(volatile uint8_t *)reg;
+#endif
+ }
+ }
+}
+
+static void pci_uio_ioport_write(pci_dev_t* dev ODP_UNUSED, pci_ioport_t *p,
+ const void *data, size_t len, off_t offset)
+{
+ const uint8_t *s;
+ int size;
+ uintptr_t reg = p->base + offset;
+
+ for (s = data; len > 0; s += size, reg += size, len -= size) {
+ if (len >= 4) {
+ size = 4;
+#if !defined(ARM_ARCHITECTURE)
+ outl_p(*(const uint32_t *)s, reg);
+#else
+ *(volatile uint32_t *)reg = *(const uint32_t *)s;
+#endif
+ } else if (len >= 2) {
+ size = 2;
+#if !defined(ARM_ARCHITECTURE)
+ outw_p(*(const uint16_t *)s, reg);
+#else
+ *(volatile uint16_t *)reg = *(const uint16_t *)s;
+#endif
+ } else {
+ size = 1;
+#if !defined(ARM_ARCHITECTURE)
+ outb_p(*s, reg);
+#else
+ *(volatile uint8_t *)reg = *s;
+#endif
+ }
+ }
+}
+
+static int pci_uio_probe(struct pci_dev_t *dev)
+{
+ int ret;
+
+ ret = pci_uio_prepare_context(dev);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+const user_access_ops_t uio_access_ops = {
+ .probe = pci_uio_probe,
+ .map_resource = pci_uio_map_resources,
+ .unmap_resource = pci_uio_unmap_resources,
+ .read_config = pci_uio_read_config,
+ .write_config = pci_uio_write_config,
+ .ioport_map = pci_uio_ioport_map,
+ .ioport_unmap = pci_uio_ioport_unmap,
+ .ioport_read = pci_uio_ioport_read,
+ .ioport_write = pci_uio_ioport_write
+};
diff --git a/platform/linux-generic/include/drv_pci_internal.h b/platform/linux-generic/include/drv_pci_internal.h
index ec4ec029..b1095c03 100644
--- a/platform/linux-generic/include/drv_pci_internal.h
+++ b/platform/linux-generic/include/drv_pci_internal.h
@@ -122,6 +122,7 @@ typedef struct pci_dev_t {
const char *pci_get_sysfs_path(void);
struct pci_dev_t *pci_open_device(const char *);
+int pci_close_device(pci_dev_t *);
#ifdef __cplusplus
}
diff --git a/platform/linux-generic/pktio/virtio.c b/platform/linux-generic/pktio/virtio.c
index 9767c1a2..9b15c2d3 100644
--- a/platform/linux-generic/pktio/virtio.c
+++ b/platform/linux-generic/pktio/virtio.c
@@ -28,6 +28,9 @@
#define PCI_PKTIO_PREFIX "pci:"
#define PCI_PKTIO_PREFIX_LEN (sizeof(PCI_PKTIO_PREFIX) - 1)
+/* FIXME: this should be registered as a DevIO */
+extern const user_access_ops_t uio_access_ops;
+
static int virtio_init_global(void)
{
ODP_PRINT("PKTIO: initialized pci interface.\n");
@@ -56,6 +59,23 @@ static int virtio_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry,
return -1;
}
+ /* Find suitable DevIO DDF module to work with the driver. */
+ if (pci_dev->kdrv == PCI_KDRV_UIO_GENERIC) {
+ /* probing would be done for each possible DevIO */
+ if (uio_access_ops.probe(pci_dev)) {
+ ODP_ERR("Could not enable DevIO for device %s\n",
+ devname);
+ pci_close_device(pci_dev);
+ return -1;
+ }
+ pci_dev->user_access_ops = &uio_access_ops;
+ } else {
+ ODP_ERR("Could not find suitable DevIO for device %s\n",
+ devname);
+ pci_close_device(pci_dev);
+ return -1;
+ }
+
virtio_entry = odp_ops_data(pktio_entry, virtio);
memset(virtio_entry, 0, sizeof(pktio_ops_virtio_data_t));
snprintf(virtio_entry->name, sizeof(virtio_entry->name),
commit b339fbc523120497346298d95c5c1102e70c1826
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Thu Aug 17 14:40:10 2017 +0200
drv_pci: define methods for PCI device access
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Signed-off-by: François Ozog <francois.ozog(a)linaro.org>
diff --git a/platform/linux-generic/include/drv_pci_internal.h b/platform/linux-generic/include/drv_pci_internal.h
index 85c3f72e..ec4ec029 100644
--- a/platform/linux-generic/include/drv_pci_internal.h
+++ b/platform/linux-generic/include/drv_pci_internal.h
@@ -29,6 +29,8 @@ extern "C" {
/* name of the shmem area containing the list of enumerated PCI devices: */
#define PCI_ENUMED_DEV "_ODP_PCI_ENUMERATED_DEVICES"
+#define PCI_PRI_FMT "%.4" PRIx16 ":%.2" PRIx8 ":%.2" PRIx8 ".%" PRIx8
+
/* structure describing a PCI address: */
typedef struct pci_addr_t {
uint16_t domain; /* Device domain */
@@ -63,6 +65,47 @@ enum pci_kernel_driver {
PCI_KDRV_NONE,
};
+/**
+ * A structure used to access io resources for a pci device.
+ * rte_pci_ioport is arch, os, driver specific, and should not be used outside
+ * of pci ioport api.
+ */
+typedef struct pci_ioport_t {
+ struct pci_dev_t *dev;
+ uint64_t base;
+ uint64_t len; /* only filled for memory mapped ports */
+} pci_ioport_t;
+
+/**
+ * A structure describing a PCI mapping.
+ */
+struct pci_map {
+ void *addr;
+ char *path;
+ uint64_t offset;
+ uint64_t size;
+ uint64_t phaddr;
+};
+
+/* Opaque type defined by each user access implementation */
+typedef struct user_access_context_t user_access_context;
+
+typedef struct user_access_ops_t {
+ int(*probe)(struct pci_dev_t *dev);
+ int(*map_resource)(struct pci_dev_t *dev);
+ int(*unmap_resource)(struct pci_dev_t *dev);
+ int(*read_config)(struct pci_dev_t *dev, void *buf, size_t len,
+ off_t offset);
+ int(*write_config)(struct pci_dev_t *dev, void *buf, size_t len,
+ off_t offset);
+ int(*ioport_map)(struct pci_dev_t *dev, int idx, pci_ioport_t *p);
+ int(*ioport_unmap)(struct pci_dev_t *dev, pci_ioport_t *p);
+ void(*ioport_read)(struct pci_dev_t *dev, pci_ioport_t *p,
+ void *data, size_t len, off_t offset);
+ void(*ioport_write)(struct pci_dev_t *dev, pci_ioport_t *p,
+ const void *data, size_t len, off_t offset);
+} user_access_ops_t;
+
/* structure for PCI device: */
typedef struct pci_dev_t {
struct pci_dev_t *next;
@@ -71,6 +114,8 @@ typedef struct pci_dev_t {
pci_resource_t bar[PCI_MAX_RESOURCE]; /* PCI Resources */
uint16_t max_vfs; /* sriov enable if not zero */
enum pci_kernel_driver kdrv; /* Kernel driver */
+ struct user_access_context_t *user_access_context;
+ const struct user_access_ops_t *user_access_ops;
} pci_dev_t;
/* path where PCI devices are shown in sysfs: */
commit 3c372d43de115af127c6fd2d34f365b73b87734b
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Mon Aug 14 15:39:24 2017 +0200
virtio: update pktio structure
Add device id and pci device structure to pktio's.
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_pktio_ops_virtio.h b/platform/linux-generic/include/odp_pktio_ops_virtio.h
index a8ace414..93e7f000 100644
--- a/platform/linux-generic/include/odp_pktio_ops_virtio.h
+++ b/platform/linux-generic/include/odp_pktio_ops_virtio.h
@@ -7,7 +7,11 @@
#ifndef ODP_PACKET_VIRTIO_H
#define ODP_PACKET_VIRTIO_H
+#include <drv_pci_internal.h>
+
typedef struct {
+ struct pci_dev_t *pci_dev;
+ int dev_id;
char name[32]; /**< Unique identifier name */
} pktio_ops_virtio_data_t;
commit 539b29acce1ba915a7c8c65c56a4e5fc9be1ff44
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Thu Aug 10 16:25:47 2017 +0200
drv_pci.c: scan devices on demand
Only the devices required by PacketIO open are scanned and added to the
list of known devices.
The pci interface now adds a function to open the device on-demand.
The pci_dump_all() function has been updated to report the current
kernel driver and BARs.
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
diff --git a/platform/linux-generic/drv_pci.c b/platform/linux-generic/drv_pci.c
index 07b1786b..04a73772 100644
--- a/platform/linux-generic/drv_pci.c
+++ b/platform/linux-generic/drv_pci.c
@@ -106,6 +106,7 @@ static pci_dev_t *alloc_dev(void)
return NULL;
admin_data->d.avail = dev->next;
+ dev->next = NULL;
return dev;
}
@@ -143,6 +144,19 @@ do_exit:
* in sysfs.
*/
+#define SYSFS_PCI_DEVICES "/sys/bus/pci/devices"
+
+const char *pci_get_sysfs_path(void)
+{
+ const char *path = NULL;
+
+ path = getenv("SYSFS_PCI_DEVICES");
+ if (path == NULL)
+ return SYSFS_PCI_DEVICES;
+
+ return path;
+}
+
/*
* parse a sysfs (or other) file containing one integer value
* return this positive integer, or -1 on error
@@ -366,8 +380,9 @@ error:
* the given device (dev) is filled with the data from the sysfs entry.
* returns 0 on success, -1 on failure.
*/
-static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
- uint8_t devid, uint8_t function, pci_dev_t **devlist)
+static pci_dev_t *pci_scan_one(const char *dirname, uint16_t domain,
+ uint8_t bus, uint8_t devid, uint8_t function,
+ pci_dev_t **devlist)
{
char filename[PATH_MAX];
unsigned long tmp;
@@ -378,7 +393,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
dev = alloc_dev();
if (dev == NULL)
- return -1;
+ return NULL;
memset(dev, 0, sizeof(*dev));
dev->addr.domain = domain;
@@ -390,7 +405,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
snprintf(filename, sizeof(filename), "%s/vendor", dirname);
if (pci_parse_sysfs_value(filename, &tmp) < 0) {
free_dev(dev);
- return -1;
+ return NULL;
}
dev->id.vendor_id = (uint16_t)tmp;
@@ -398,7 +413,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
snprintf(filename, sizeof(filename), "%s/device", dirname);
if (pci_parse_sysfs_value(filename, &tmp) < 0) {
free_dev(dev);
- return -1;
+ return NULL;
}
dev->id.device_id = (uint16_t)tmp;
@@ -407,7 +422,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
dirname);
if (pci_parse_sysfs_value(filename, &tmp) < 0) {
free_dev(dev);
- return -1;
+ return NULL;
}
dev->id.subsystem_vendor_id = (uint16_t)tmp;
@@ -416,7 +431,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
dirname);
if (pci_parse_sysfs_value(filename, &tmp) < 0) {
free_dev(dev);
- return -1;
+ return NULL;
}
dev->id.subsystem_device_id = (uint16_t)tmp;
@@ -425,7 +440,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
dirname);
if (pci_parse_sysfs_value(filename, &tmp) < 0) {
free_dev(dev);
- return -1;
+ return NULL;
}
/* the least 24 bits are valid: class, subclass, program interface */
dev->id.class_id = (uint32_t)tmp & PCI_CLASS_ANY_ID;
@@ -449,7 +464,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
if (pci_parse_sysfs_resource(filename, dev) < 0) {
ODP_ERR("cannot parse resource\n");
free_dev(dev);
- return -1;
+ return NULL;
}
/* parse driver */
@@ -458,7 +473,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
if (ret < 0) {
ODP_ERR("Fail to get kernel driver\n");
free_dev(dev);
- return -1;
+ return NULL;
}
if (!ret) {
if (!strcmp(driver, "vfio-pci"))
@@ -477,12 +492,12 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
if (!(*devlist)) {
*devlist = dev;
dev->next = NULL;
- return 0;
+ return dev;
}
if (pci_address_compare(&dev->addr, &(*devlist)->addr) < 0) {
dev->next = *devlist;
*devlist = dev;
- return 0;
+ return dev;
}
for (dev2 = *devlist; dev2->next; dev2 = dev2->next) {
ret = pci_address_compare(&dev->addr,
@@ -499,13 +514,15 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
memmove(dev2->bar, dev->bar, sizeof(dev->bar));
free_dev(dev);
}
- return 0;
+ return dev;
}
dev2->next = dev;
dev->next = NULL;
- return 0;
+ return dev;
}
+#if 0 /* FIXME */
+
/*
* Scan the content of the PCI bus, and fill the PCI enumerated device list
*/
@@ -517,7 +534,7 @@ static int pci_scan(void)
uint16_t domain;
uint8_t bus, devid, function;
- dir = opendir(PCI_SYSFS_DEVICES_ROOT);
+ dir = opendir(pci_get_sysfs_path());
if (dir == NULL) {
ODP_DBG("opendir failed: %s\n", strerror(errno));
@@ -542,12 +559,15 @@ static int pci_scan(void)
return 0;
}
+#endif
+
/*
* output a printout of the scanned PCI devices (debug purpose)
*/
static int pci_dump_scanned(void)
{
pci_dev_t *dev;
+ const char *driver;
if (admin_data == NULL)
return -1;
@@ -603,12 +623,6 @@ int _odp_pci_init_global(void)
if (alloc_admin_data())
return -1;
- /* scan for PCI devices: */
- pci_scan();
-
- /* print (debug) the list of scanned devices: */
- pci_dump_scanned();
-
ODP_DBG("PCI interface initialized\n");
return 0;
@@ -623,20 +637,35 @@ int _odp_pci_term_global(void)
return 0;
}
-/* returns a device ID, currently only "advisable" as there are not checks
- * for duplicates.
- * On error it returns a negative number.
+/* pci drivers use this function to open a PCI device from the /sys/bus filesystem
+ * It returns a pci_dev_t struct with several fields filled in. The driver can
+ * then decide if it can handle the device or not based on device ID.
+ * On error it returns NULL.
*/
-int pci_open_device(const char *dev)
+pci_dev_t *pci_open_device(const char *dev)
{
uint16_t domain;
uint8_t bus, device, function;
- static int id = 0;
+ char dirname[PATH_MAX];
+ pci_dev_t *pci_dev;
+
+ if (admin_data == NULL || admin_data->d.avail == NULL)
+ return NULL;
if (parse_pci_addr_format(dev, &domain, &bus, &device, &function)) {
ODP_ERR("Error in device: %s\n", dev);
- return -1;
+ return NULL;
}
- return id++;
+ snprintf(dirname, sizeof(dirname), "%s/%s",
+ pci_get_sysfs_path(), dev);
+ pci_dev = pci_scan_one(dirname, domain, bus, device, function,
+ &admin_data->d.used);
+ if (pci_dev == NULL)
+ return NULL;
+
+ if (pci_dump_scanned())
+ ODP_ERR("Could not dump\n");
+
+ return pci_dev;
}
diff --git a/platform/linux-generic/include/drv_pci_internal.h b/platform/linux-generic/include/drv_pci_internal.h
index 14b4aa63..85c3f72e 100644
--- a/platform/linux-generic/include/drv_pci_internal.h
+++ b/platform/linux-generic/include/drv_pci_internal.h
@@ -11,9 +11,6 @@
extern "C" {
#endif
-/* path where PCI devices are shown in sysfs: */
-#define PCI_SYSFS_DEVICES_ROOT "/sys/bus/pci/devices"
-
/* Nb. of values in PCI resource file format. */
#define PCI_RESOURCE_FMT_NVAL 3
/** Nb. of values in PCI device address string. */
@@ -76,7 +73,10 @@ typedef struct pci_dev_t {
enum pci_kernel_driver kdrv; /* Kernel driver */
} pci_dev_t;
-int pci_open_device(const char *dev);
+/* path where PCI devices are shown in sysfs: */
+const char *pci_get_sysfs_path(void);
+
+struct pci_dev_t *pci_open_device(const char *);
#ifdef __cplusplus
}
diff --git a/platform/linux-generic/pktio/virtio.c b/platform/linux-generic/pktio/virtio.c
index 435569e3..9767c1a2 100644
--- a/platform/linux-generic/pktio/virtio.c
+++ b/platform/linux-generic/pktio/virtio.c
@@ -40,6 +40,7 @@ static int virtio_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry,
static unsigned int dev_id = 0;
pktio_ops_virtio_data_t *virtio_entry;
const char *pci_device;
+ pci_dev_t *pci_dev;
if (strncmp(devname, PCI_PKTIO_PREFIX, PCI_PKTIO_PREFIX_LEN))
return -1;
@@ -48,7 +49,8 @@ static int virtio_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry,
ODP_PRINT("virtio_open: %s\n", pci_device);
- if (pci_open_device(pci_device) < 0) {
+ pci_dev = pci_open_device(pci_device);
+ if (pci_dev == NULL) {
ODP_ERR("pci: could not open PCI device %s as a VirtIO device\n",
pci_device);
return -1;
commit 04af087d3523f6db809b979d2a23975de0cc4de8
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Tue Nov 14 00:35:37 2017 +0100
drv_pci: use preallocated shm
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
diff --git a/platform/linux-generic/drv_pci.c b/platform/linux-generic/drv_pci.c
index 26408fca..07b1786b 100644
--- a/platform/linux-generic/drv_pci.c
+++ b/platform/linux-generic/drv_pci.c
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <inttypes.h>
#include <dirent.h>
#include <linux/limits.h>
#include <unistd.h>
@@ -39,11 +40,103 @@
#include <odp_posix_extensions.h>
#include <odp_config_internal.h>
#include <odp_internal.h>
-#include <odp/drv/shm.h>
+#include <odp/api/shared_memory.h>
#include <odp_debug_internal.h>
+#include <odp_align_internal.h>
#include <drv_pci_internal.h>
+#define MAX_PCI_DEVICES 16
+
+typedef union {
+ pci_dev_t d;
+ uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(pci_dev_t))];
+} pci_dev_item_t;
+
+typedef struct pci_admin_data {
+ pci_dev_t *avail;
+ pci_dev_t *used;
+ odp_shm_t shm;
+} pci_admin_data_t;
+
+typedef union {
+ struct pci_admin_data d;
+ uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct pci_admin_data))];
+} pci_admin_data_u;
+
+static pci_admin_data_u *admin_data;
+
+static int alloc_admin_data(void)
+{
+ uint64_t size;
+ pci_dev_item_t *item;
+ odp_shm_t shm;
+
+ size = sizeof(pci_admin_data_u) +
+ sizeof(pci_dev_item_t) * MAX_PCI_DEVICES;
+
+ shm = odp_shm_reserve(PCI_ENUMED_DEV, size, 0, ODP_SHM_SINGLE_VA);
+ if (shm == ODP_SHM_INVALID)
+ return -1;
+
+ admin_data = odp_shm_addr(shm);
+ if (!admin_data)
+ return -1;
+
+ item = (pci_dev_item_t *)((uint8_t *)admin_data +
+ sizeof(pci_admin_data_u));
+ admin_data->d.avail = (pci_dev_t *)item;
+ admin_data->d.used = NULL;
+ admin_data->d.shm = shm;
+
+ for (int i = 0; i < MAX_PCI_DEVICES - 1; ++i)
+ item[i].d.next = (pci_dev_t *)&item[i + 1];
+
+ item[MAX_PCI_DEVICES - 1].d.next = NULL;
+
+ return 0;
+}
+
+static pci_dev_t *alloc_dev(void)
+{
+ pci_dev_t *dev;
+
+ dev = admin_data->d.avail;
+ if (admin_data->d.avail == NULL)
+ return NULL;
+
+ admin_data->d.avail = dev->next;
+
+ return dev;
+}
+
+static void free_dev(pci_dev_t *dev)
+{
+ if (dev == NULL)
+ return;
+
+ if (admin_data->d.used == NULL)
+ goto do_exit;
+
+ if (dev == admin_data->d.used) {
+ admin_data->d.used = dev->next;
+ } else {
+ pci_dev_t *prev = admin_data->d.used;
+ pci_dev_t *curr = prev->next;
+
+ while (curr != NULL && curr != dev) {
+ curr = curr->next;
+ prev = prev->next;
+ }
+ if (curr == dev)
+ prev->next = curr->next;
+ }
+
+do_exit:
+ dev->next = admin_data->d.avail;
+ admin_data->d.avail = dev;
+}
+
/*
* PCI probing:
* these functions are used to simulate a PCI probe by parsing information
@@ -283,7 +376,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
pci_dev_t *dev;
pci_dev_t *dev2;
- dev = malloc(sizeof(*dev));
+ dev = alloc_dev();
if (dev == NULL)
return -1;
@@ -296,7 +389,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
/* get vendor id */
snprintf(filename, sizeof(filename), "%s/vendor", dirname);
if (pci_parse_sysfs_value(filename, &tmp) < 0) {
- free(dev);
+ free_dev(dev);
return -1;
}
dev->id.vendor_id = (uint16_t)tmp;
@@ -304,7 +397,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
/* get device id */
snprintf(filename, sizeof(filename), "%s/device", dirname);
if (pci_parse_sysfs_value(filename, &tmp) < 0) {
- free(dev);
+ free_dev(dev);
return -1;
}
dev->id.device_id = (uint16_t)tmp;
@@ -313,7 +406,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
snprintf(filename, sizeof(filename), "%s/subsystem_vendor",
dirname);
if (pci_parse_sysfs_value(filename, &tmp) < 0) {
- free(dev);
+ free_dev(dev);
return -1;
}
dev->id.subsystem_vendor_id = (uint16_t)tmp;
@@ -322,7 +415,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
snprintf(filename, sizeof(filename), "%s/subsystem_device",
dirname);
if (pci_parse_sysfs_value(filename, &tmp) < 0) {
- free(dev);
+ free_dev(dev);
return -1;
}
dev->id.subsystem_device_id = (uint16_t)tmp;
@@ -331,7 +424,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
snprintf(filename, sizeof(filename), "%s/class",
dirname);
if (pci_parse_sysfs_value(filename, &tmp) < 0) {
- free(dev);
+ free_dev(dev);
return -1;
}
/* the least 24 bits are valid: class, subclass, program interface */
@@ -355,7 +448,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
snprintf(filename, sizeof(filename), "%s/resource", dirname);
if (pci_parse_sysfs_resource(filename, dev) < 0) {
ODP_ERR("cannot parse resource\n");
- free(dev);
+ free_dev(dev);
return -1;
}
@@ -364,7 +457,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
ret = pci_get_kernel_driver_by_path(filename, driver);
if (ret < 0) {
ODP_ERR("Fail to get kernel driver\n");
- free(dev);
+ free_dev(dev);
return -1;
}
if (!ret) {
@@ -404,7 +497,7 @@ static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
dev2->kdrv = dev->kdrv;
dev2->max_vfs = dev->max_vfs;
memmove(dev2->bar, dev->bar, sizeof(dev->bar));
- free(dev);
+ free_dev(dev);
}
return 0;
}
@@ -422,15 +515,7 @@ static int pci_scan(void)
DIR *dir;
char dirname[PATH_MAX];
uint16_t domain;
- uint16_t devcount = 0;
uint8_t bus, devid, function;
- pci_dev_t *dev;
- pci_dev_t *dev2;
- pci_dev_t *devlist = NULL; /* temporary malloc'd list head */
- pci_dev_t *pci_enumerated_dev; /* final list head */
- int size;
- int index;
- odpdrv_shm_t shm;
dir = opendir(PCI_SYSFS_DEVICES_ROOT);
@@ -449,61 +534,12 @@ static int pci_scan(void)
snprintf(dirname, sizeof(dirname), "%s/%s",
PCI_SYSFS_DEVICES_ROOT, e->d_name);
- if (pci_scan_one(dirname, domain, bus, devid, function,
- &devlist) < 0)
- goto error;
- devcount++;
+ pci_scan_one(dirname, domain, bus, devid, function,
+ &(admin_data->d.used));
}
closedir(dir);
- /*
- * At this point devlist is the malloc'd ordered PCI device list:
- * We can now allocate the final list, as we now know the needed
- * size, and copy the scanned devices in it, as none of them are
- * referenced by pointers at this stage.
- * The allocated memory is allocated as shared and SINGLE_VA'd so
- * that any odp thread (i.e. pthread or process) can refer pci
- * dev as pointers
- */
- size = sizeof(pci_dev_t) * devcount;
- shm = odpdrv_shm_reserve(PCI_ENUMED_DEV, size, 0, ODPDRV_SHM_SINGLE_VA);
- if (shm == ODPDRV_SHM_INVALID)
- goto error;
-
- pci_enumerated_dev = odpdrv_shm_addr(shm);
-
- for (index = 0, dev = devlist; dev != NULL; dev = dev->next, index++) {
- memcpy(&pci_enumerated_dev[index],
- dev,
- sizeof(pci_dev_t));
- pci_enumerated_dev[index].next = &pci_enumerated_dev[index + 1];
- }
- pci_enumerated_dev[index - 1].next = NULL;
-
- if (index != devcount)
- ODP_ERR("pci enumeration error (bug!)\n");
-
- /* free the malloc'd list: */
- dev = devlist;
- while (dev != NULL) {
- dev2 = dev->next;
- free(dev);
- dev = dev2;
- }
-
return 0;
-
-error:
- closedir(dir);
-
- /* free the malloc'd list: */
- dev = devlist;
- while (dev != NULL) {
- dev2 = dev->next;
- free(dev);
- dev = dev2;
- }
- return -1;
}
/*
@@ -511,40 +547,62 @@ error:
*/
static int pci_dump_scanned(void)
{
- odpdrv_shm_t shm;
pci_dev_t *dev;
- pci_dev_t *devlist;
- shm = odpdrv_shm_lookup_by_name(PCI_ENUMED_DEV);
- if (shm == ODPDRV_SHM_INVALID)
- return -1;
-
- devlist = odpdrv_shm_addr(shm);
- if (!devlist)
+ if (admin_data == NULL)
return -1;
ODP_DBG("list of scanned PCI devices:\n");
- for (dev = devlist; dev != NULL; dev = dev->next)
- ODP_DBG("%04" PRIx16 ":"
- "%02" PRIx8 ":"
- "%02" PRIx8 ":"
- "%02" PRIx8 ": "
- "vendor:%04" PRIx16 ", "
- "device:%04" PRIx16 ", "
- "class:%04" PRIx16 "\n",
- dev->addr.domain,
- dev->addr.bus,
- dev->addr.devid,
- dev->addr.function,
- dev->id.vendor_id,
- dev->id.device_id,
- dev->id.class_id);
+ for (dev = admin_data->d.used; dev != NULL; dev = dev->next) {
+ switch (dev->kdrv) {
+ case PCI_KDRV_VFIO:
+ driver = "vfio";
+ break;
+ case PCI_KDRV_IGB_UIO:
+ driver = "igb_uio";
+ break;
+ case PCI_KDRV_UIO_GENERIC:
+ driver = "uio_pci_generic";
+ break;
+ default:
+ driver = "unknown";
+ }
+ ODP_PRINT("PCI DEVICE:"
+ "%04" PRIx16 ":"
+ "%02" PRIx8 ":"
+ "%02" PRIx8 ":"
+ "%02" PRIx8 ": "
+ "vendor:%04" PRIx16 ", "
+ "device:%04" PRIx16 ", "
+ "class:%04" PRIx16 ", "
+ "driver: %s\n",
+ dev->addr.domain,
+ dev->addr.bus,
+ dev->addr.devid,
+ dev->addr.function,
+ dev->id.vendor_id,
+ dev->id.device_id,
+ dev->id.class_id,
+ driver);
+ for (int i = 0; i < PCI_MAX_RESOURCE; i++) {
+ if (dev->bar[i].phys_addr == 0)
+ continue;
+ ODP_PRINT("\tBAR_%d: phys_addr: %" PRIx64 " -> "
+ "%p, %" PRIx64 " bytes\n",
+ i, dev->bar[i].phys_addr,
+ dev->bar[i].addr,
+ dev->bar[i].len);
+ }
+ }
return 0;
}
int _odp_pci_init_global(void)
{
+ if (alloc_admin_data())
+ return -1;
+
/* scan for PCI devices: */
pci_scan();
@@ -559,7 +617,8 @@ int _odp_pci_init_global(void)
int _odp_pci_term_global(void)
{
/* free the enumarated PCI device list (if any) */
- odpdrv_shm_free_by_name(PCI_ENUMED_DEV);
+ if (admin_data)
+ odp_shm_free(admin_data->d.shm);
return 0;
}
commit 77f6dd878c4095e9cbb7c9237a0564c62ebc92c3
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Wed Aug 9 17:18:33 2017 +0200
virtio/pci: create device on demand
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
diff --git a/platform/linux-generic/drv_pci.c b/platform/linux-generic/drv_pci.c
index 6b74a0a6..26408fca 100644
--- a/platform/linux-generic/drv_pci.c
+++ b/platform/linux-generic/drv_pci.c
@@ -507,7 +507,7 @@ error:
}
/*
- *output a printout of the scanned PCI devices (debug purpose)
+ * output a printout of the scanned PCI devices (debug purpose)
*/
static int pci_dump_scanned(void)
{
@@ -551,6 +551,8 @@ int _odp_pci_init_global(void)
/* print (debug) the list of scanned devices: */
pci_dump_scanned();
+ ODP_DBG("PCI interface initialized\n");
+
return 0;
}
@@ -561,3 +563,21 @@ int _odp_pci_term_global(void)
return 0;
}
+
+/* returns a device ID, currently only "advisable" as there are not checks
+ * for duplicates.
+ * On error it returns a negative number.
+ */
+int pci_open_device(const char *dev)
+{
+ uint16_t domain;
+ uint8_t bus, device, function;
+ static int id = 0;
+
+ if (parse_pci_addr_format(dev, &domain, &bus, &device, &function)) {
+ ODP_ERR("Error in device: %s\n", dev);
+ return -1;
+ }
+
+ return id++;
+}
diff --git a/platform/linux-generic/include/drv_pci_internal.h b/platform/linux-generic/include/drv_pci_internal.h
index 24be1e29..14b4aa63 100644
--- a/platform/linux-generic/include/drv_pci_internal.h
+++ b/platform/linux-generic/include/drv_pci_internal.h
@@ -76,6 +76,8 @@ typedef struct pci_dev_t {
enum pci_kernel_driver kdrv; /* Kernel driver */
} pci_dev_t;
+int pci_open_device(const char *dev);
+
#ifdef __cplusplus
}
#endif
diff --git a/platform/linux-generic/pktio/virtio.c b/platform/linux-generic/pktio/virtio.c
index b46a642a..435569e3 100644
--- a/platform/linux-generic/pktio/virtio.c
+++ b/platform/linux-generic/pktio/virtio.c
@@ -22,6 +22,7 @@
#include <odp_debug_internal.h>
#include <odp/api/hints.h>
+#include <drv_pci_internal.h>
#include <odp_pktio_ops_virtio.h>
#define PCI_PKTIO_PREFIX "pci:"
@@ -34,20 +35,29 @@ static int virtio_init_global(void)
}
static int virtio_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry,
- const char *devname, odp_pool_t pool ODP_UNUSED)
+ const char *devname, odp_pool_t pool ODP_UNUSED)
{
static unsigned int dev_id = 0;
- pktio_ops_virtio_data_t *virtio_entry = odp_ops_data(pktio_entry,
- virtio);
+ pktio_ops_virtio_data_t *virtio_entry;
+ const char *pci_device;
if (strncmp(devname, PCI_PKTIO_PREFIX, PCI_PKTIO_PREFIX_LEN))
return -1;
+ pci_device = devname + PCI_PKTIO_PREFIX_LEN;
+
+ ODP_PRINT("virtio_open: %s\n", pci_device);
+
+ if (pci_open_device(pci_device) < 0) {
+ ODP_ERR("pci: could not open PCI device %s as a VirtIO device\n",
+ pci_device);
+ return -1;
+ }
+
+ virtio_entry = odp_ops_data(pktio_entry, virtio);
memset(virtio_entry, 0, sizeof(pktio_ops_virtio_data_t));
- snprintf(virtio_entry->name,
- sizeof(virtio_entry->name),
- "virtio_%u",
- dev_id++);
+ snprintf(virtio_entry->name, sizeof(virtio_entry->name),
+ "virtio_%u", dev_id++);
ODP_PRINT("virtio: opened %s\n", virtio_entry->name);
@@ -60,13 +70,13 @@ static int virtio_close(pktio_entry_t *pktio_entry ODP_UNUSED)
}
static int virtio_recv(pktio_entry_t *pktio_entry ODP_UNUSED, int index ODP_UNUSED,
- odp_packet_t pkts[] ODP_UNUSED, int len ODP_UNUSED)
+ odp_packet_t pkts[] ODP_UNUSED, int len ODP_UNUSED)
{
return 0;
}
static int virtio_send(pktio_entry_t *pktio_entry ODP_UNUSED, int index ODP_UNUSED,
- const odp_packet_t pkt_tbl[] ODP_UNUSED, int len)
+ const odp_packet_t pkt_tbl[] ODP_UNUSED, int len)
{
return len;
}
commit 606b19d60c015a6ac14ef83146ca1019530de4a0
Author: Christophe Milard <christophe.milard(a)linaro.org>
Date: Wed Sep 14 13:55:43 2016 +0200
drv_pci: PCI scanning and parsing functions
Utility functions for scanning the PCI bus, parsing BFD strings and
other useful functionality.
Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 4dbdb813..11b03b60 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -155,6 +155,7 @@ noinst_HEADERS = \
include/_ishmpool_internal.h \
include/_str_functions_internal.h \
include/drv_driver_internal.h \
+ include/drv_pci_internal.h \
include/odp_align_internal.h \
include/odp_atomic_internal.h \
include/odp_buffer_inlines.h \
@@ -288,6 +289,7 @@ __LIB__libodp_linux_la_SOURCES = \
drv_atomic.c \
drv_barrier.c \
drv_driver.c \
+ drv_pci.c \
drv_shm.c \
drv_spinlock.c
diff --git a/platform/linux-generic/drv_pci.c b/platform/linux-generic/drv_pci.c
new file mode 100644
index 00000000..6b74a0a6
--- /dev/null
+++ b/platform/linux-generic/drv_pci.c
@@ -0,0 +1,563 @@
+/* Copyright (c) 2016, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/* Many of this functions have been inspired by their dpdk counterpart,
+ * hence the following license:
+ */
+
+/*
+ * BSD LICENSE
+ *
+ * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ */
+
+/**
+ * @file
+ * PCI interface for drivers
+ */
+
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dirent.h>
+#include <linux/limits.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include <config.h>
+#include <_str_functions_internal.h>
+#include <odp_posix_extensions.h>
+#include <odp_config_internal.h>
+#include <odp_internal.h>
+#include <odp/drv/shm.h>
+#include <odp_debug_internal.h>
+
+#include <drv_pci_internal.h>
+
+/*
+ * PCI probing:
+ * these functions are used to simulate a PCI probe by parsing information
+ * in sysfs.
+ */
+
+/*
+ * parse a sysfs (or other) file containing one integer value
+ * return this positive integer, or -1 on error
+ */
+static int pci_parse_sysfs_value(const char *filename, unsigned long *val)
+{
+ FILE *f;
+ char buf[BUFSIZ];
+ char *end = NULL;
+
+ f = fopen(filename, "r");
+ if (f == NULL) {
+ ODP_ERR("cannot open sysfs file %s\n", filename);
+ return -1;
+ }
+
+ if (fgets(buf, sizeof(buf), f) == NULL) {
+ ODP_ERR("cannot read sysfs file %s\n", filename);
+ fclose(f);
+ return -1;
+ }
+ *val = strtoul(buf, &end, 0);
+ if ((buf[0] == '\0') || (end == NULL) || (*end != '\n')) {
+ ODP_ERR("cannot parse sysfs value %s\n", filename);
+ fclose(f);
+ return -1;
+ }
+ fclose(f);
+ return 0;
+}
+
+/*
+ * given a path (filename) such as "/sys/bus/pci/devices/0000:23:00.0/driver",
+ * returns the driver name (a string) in dri_name.
+ * The returned name is simply what the "driver" links points to.
+ * returns 0 on success, -1 on failure.
+ */
+static int pci_get_kernel_driver_by_path(const char *filename, char *dri_name)
+{
+ char path[PATH_MAX];
+ char *name;
+
+ if (!filename || !dri_name)
+ return -1;
+
+ if (realpath(filename, path) == NULL)
+ return -1;
+
+ name = strrchr(path, '/');
+ if (name) {
+ strncpy(dri_name, name + 1, strlen(name + 1) + 1);
+ return 0;
+ }
+
+ return -1;
+}
+
+/*
+ * parse one line of the "resource" sysfs file (note that the 'line'
+ * string is modified)
+ * Sets phys_addr, end_addr, and flags as read from the given line.
+ * returns 0 on success, -1 on failure.
+ */
+static int pci_parse_one_sysfs_resource(char *line, size_t len,
+ uint64_t *phys_addr,
+ uint64_t *end_addr, uint64_t *flags)
+{
+ union pci_resource_info {
+ struct {
+ char *phys_addr;
+ char *end_addr;
+ char *flags;
+ };
+ char *ptrs[PCI_RESOURCE_FMT_NVAL];
+ } res_info;
+
+ if (_odp_strsplit(line, len, res_info.ptrs, 3, ' ') != 3) {
+ ODP_ERR("bad PCI resource format!\n");
+ return -1;
+ }
+ errno = 0;
+ *phys_addr = strtoull(res_info.phys_addr, NULL, 16);
+ *end_addr = strtoull(res_info.end_addr, NULL, 16);
+ *flags = strtoull(res_info.flags, NULL, 16);
+ if (errno != 0) {
+ ODP_ERR("bad PCI resource format!\n");
+ return -1;
+ }
+
+ return 0;
+}
+
+/*
+ * parse the "resource" sysfs file
+ * filename is expected to be something like:
+ * /sys/bus/pci/devices/0000:23:00.0/resource
+ * returns 0 on success, -1 on failure.
+ */
+static int pci_parse_sysfs_resource(const char *filename, pci_dev_t *dev)
+{
+ FILE *f;
+ char buf[BUFSIZ];
+ int i;
+ uint64_t phys_addr, end_addr, flags;
+
+ f = fopen(filename, "r");
+ if (f == NULL) {
+ ODP_ERR("Cannot open sysfs resource!\n");
+ return -1;
+ }
+
+ for (i = 0; i < PCI_MAX_RESOURCE; i++) {
+ if (fgets(buf, sizeof(buf), f) == NULL) {
+ ODP_ERR("cannot read resource\n");
+ goto error;
+ }
+ if (pci_parse_one_sysfs_resource(buf, sizeof(buf), &phys_addr,
+ &end_addr, &flags) < 0)
+ goto error;
+
+ if (flags & IORESOURCE_MEM) {
+ dev->bar[i].phys_addr = phys_addr;
+ dev->bar[i].len = end_addr - phys_addr + 1;
+ /* not mapped for now */
+ dev->bar[i].addr = NULL;
+ }
+ }
+ fclose(f);
+ return 0;
+
+error:
+ fclose(f);
+ return -1;
+}
+
+/*
+ * compare two PCI device addresses.
+ * Returns:
+ * 0 on equal PCI address.
+ * Positive on addr is greater than addr2.
+ * Negative on addr is less than addr2, or error.
+ */
+static inline int pci_address_compare(const struct pci_addr_t *addr,
+ const struct pci_addr_t *addr2)
+{
+ uint64_t dev_addr, dev_addr2;
+
+ if ((addr == NULL) || (addr2 == NULL))
+ return -1;
+
+ dev_addr = (addr->domain << 24) | (addr->bus << 16) |
+ (addr->devid << 8) | addr->function;
+ dev_addr2 = (addr2->domain << 24) | (addr2->bus << 16) |
+ (addr2->devid << 8) | addr2->function;
+
+ if (dev_addr > dev_addr2)
+ return 1;
+ else if (dev_addr < dev_addr2)
+ return -1;
+ else
+ return 0;
+}
+
+/*
+ * split up a pci address into its constituent parts.
+ */
+static int parse_pci_addr_format(const char *buf, uint16_t *domain,
+ uint8_t *bus, uint8_t *devid,
+ uint8_t *function)
+{
+ int bufsize;
+ char *buf_copy;
+ union splitaddr {
+ struct {
+ char *domain;
+ char *bus;
+ char *devid;
+ char *function;
+ };
+ char *str[PCI_FMT_NVAL]; /* last separator is "." not ":" */
+ } splitaddr;
+
+ /* copy original address to avoid damaging it with _odp_strsplit: */
+ bufsize = strlen(buf) + 1;
+ buf_copy = malloc(bufsize);
+ strcpy(buf_copy, buf);
+
+ if (buf_copy == NULL)
+ return -1;
+
+ /* first split on ':' */
+ if (_odp_strsplit(buf_copy, bufsize, splitaddr.str, PCI_FMT_NVAL, ':')
+ != PCI_FMT_NVAL - 1)
+ goto error;
+ /* final split is on '.' between devid and function */
+ splitaddr.function = strchr(splitaddr.devid, '.');
+ if (splitaddr.function == NULL)
+ goto error;
+ *splitaddr.function++ = '\0';
+
+ /* now convert to int values */
+ errno = 0;
+ *domain = (uint16_t)strtoul(splitaddr.domain, NULL, 16);
+ *bus = (uint8_t)strtoul(splitaddr.bus, NULL, 16);
+ *devid = (uint8_t)strtoul(splitaddr.devid, NULL, 16);
+ *function = (uint8_t)strtoul(splitaddr.function, NULL, 10);
+ if (errno != 0)
+ goto error;
+
+ free(buf_copy); /* free the copy made with strdup */
+ return 0;
+error:
+ free(buf_copy);
+ return -1;
+}
+
+/*
+ * Scan one pci sysfs entry, and fill the device list from it.
+ * dirname should point to a sysfs pci dev entry, e.g.
+ * /sys/bus/pci/devices/0000:23:00.0
+ * the given device (dev) is filled with the data from the sysfs entry.
+ * returns 0 on success, -1 on failure.
+ */
+static int pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
+ uint8_t devid, uint8_t function, pci_dev_t **devlist)
+{
+ char filename[PATH_MAX];
+ unsigned long tmp;
+ char driver[PATH_MAX];
+ int ret;
+ pci_dev_t *dev;
+ pci_dev_t *dev2;
+
+ dev = malloc(sizeof(*dev));
+ if (dev == NULL)
+ return -1;
+
+ memset(dev, 0, sizeof(*dev));
+ dev->addr.domain = domain;
+ dev->addr.bus = bus;
+ dev->addr.devid = devid;
+ dev->addr.function = function;
+
+ /* get vendor id */
+ snprintf(filename, sizeof(filename), "%s/vendor", dirname);
+ if (pci_parse_sysfs_value(filename, &tmp) < 0) {
+ free(dev);
+ return -1;
+ }
+ dev->id.vendor_id = (uint16_t)tmp;
+
+ /* get device id */
+ snprintf(filename, sizeof(filename), "%s/device", dirname);
+ if (pci_parse_sysfs_value(filename, &tmp) < 0) {
+ free(dev);
+ return -1;
+ }
+ dev->id.device_id = (uint16_t)tmp;
+
+ /* get subsystem_vendor id */
+ snprintf(filename, sizeof(filename), "%s/subsystem_vendor",
+ dirname);
+ if (pci_parse_sysfs_value(filename, &tmp) < 0) {
+ free(dev);
+ return -1;
+ }
+ dev->id.subsystem_vendor_id = (uint16_t)tmp;
+
+ /* get subsystem_device id */
+ snprintf(filename, sizeof(filename), "%s/subsystem_device",
+ dirname);
+ if (pci_parse_sysfs_value(filename, &tmp) < 0) {
+ free(dev);
+ return -1;
+ }
+ dev->id.subsystem_device_id = (uint16_t)tmp;
+
+ /* get class_id */
+ snprintf(filename, sizeof(filename), "%s/class",
+ dirname);
+ if (pci_parse_sysfs_value(filename, &tmp) < 0) {
+ free(dev);
+ return -1;
+ }
+ /* the least 24 bits are valid: class, subclass, program interface */
+ dev->id.class_id = (uint32_t)tmp & PCI_CLASS_ANY_ID;
+
+ /* get max_vfs */
+ dev->max_vfs = 0;
+ snprintf(filename, sizeof(filename), "%s/max_vfs", dirname);
+ if (!access(filename, F_OK) &&
+ pci_parse_sysfs_value(filename, &tmp) == 0)
+ dev->max_vfs = (uint16_t)tmp;
+ else {
+ snprintf(filename, sizeof(filename),
+ "%s/sriov_numvfs", dirname);
+ if (!access(filename, F_OK) &&
+ pci_parse_sysfs_value(filename, &tmp) == 0)
+ dev->max_vfs = (uint16_t)tmp;
+ }
+
+ /* parse resources */
+ snprintf(filename, sizeof(filename), "%s/resource", dirname);
+ if (pci_parse_sysfs_resource(filename, dev) < 0) {
+ ODP_ERR("cannot parse resource\n");
+ free(dev);
+ return -1;
+ }
+
+ /* parse driver */
+ snprintf(filename, sizeof(filename), "%s/driver", dirname);
+ ret = pci_get_kernel_driver_by_path(filename, driver);
+ if (ret < 0) {
+ ODP_ERR("Fail to get kernel driver\n");
+ free(dev);
+ return -1;
+ }
+ if (!ret) {
+ if (!strcmp(driver, "vfio-pci"))
+ dev->kdrv = PCI_KDRV_VFIO;
+ else if (!strcmp(driver, "igb_uio"))
+ dev->kdrv = PCI_KDRV_IGB_UIO;
+ else if (!strcmp(driver, "uio_pci_generic"))
+ dev->kdrv = PCI_KDRV_UIO_GENERIC;
+ else
+ dev->kdrv = PCI_KDRV_UNKNOWN;
+ } else {
+ dev->kdrv = PCI_KDRV_NONE;
+ }
+
+ /* device is valid, add in list (sorted): */
+ if (!(*devlist)) {
+ *devlist = dev;
+ dev->next = NULL;
+ return 0;
+ }
+ if (pci_address_compare(&dev->addr, &(*devlist)->addr) < 0) {
+ dev->next = *devlist;
+ *devlist = dev;
+ return 0;
+ }
+ for (dev2 = *devlist; dev2->next; dev2 = dev2->next) {
+ ret = pci_address_compare(&dev->addr,
+ &dev2->next->addr);
+ if (ret > 0)
+ continue;
+
+ if (ret < 0) {
+ dev->next = dev2->next;
+ dev2->next = dev;
+ } else { /* already registered */
+ dev2->kdrv = dev->kdrv;
+ dev2->max_vfs = dev->max_vfs;
+ memmove(dev2->bar, dev->bar, sizeof(dev->bar));
+ free(dev);
+ }
+ return 0;
+ }
+ dev2->next = dev;
+ dev->next = NULL;
+ return 0;
+}
+
+/*
+ * Scan the content of the PCI bus, and fill the PCI enumerated device list
+ */
+static int pci_scan(void)
+{
+ struct dirent *e;
+ DIR *dir;
+ char dirname[PATH_MAX];
+ uint16_t domain;
+ uint16_t devcount = 0;
+ uint8_t bus, devid, function;
+ pci_dev_t *dev;
+ pci_dev_t *dev2;
+ pci_dev_t *devlist = NULL; /* temporary malloc'd list head */
+ pci_dev_t *pci_enumerated_dev; /* final list head */
+ int size;
+ int index;
+ odpdrv_shm_t shm;
+
+ dir = opendir(PCI_SYSFS_DEVICES_ROOT);
+
+ if (dir == NULL) {
+ ODP_DBG("opendir failed: %s\n", strerror(errno));
+ return -1;
+ }
+
+ while ((e = readdir(dir)) != NULL) {
+ if (e->d_name[0] == '.')
+ continue;
+
+ if (parse_pci_addr_format(e->d_name, &domain,
+ &bus, &devid, &function) != 0)
+ continue;
+
+ snprintf(dirname, sizeof(dirname), "%s/%s",
+ PCI_SYSFS_DEVICES_ROOT, e->d_name);
+ if (pci_scan_one(dirname, domain, bus, devid, function,
+ &devlist) < 0)
+ goto error;
+ devcount++;
+ }
+ closedir(dir);
+
+ /*
+ * At this point devlist is the malloc'd ordered PCI device list:
+ * We can now allocate the final list, as we now know the needed
+ * size, and copy the scanned devices in it, as none of them are
+ * referenced by pointers at this stage.
+ * The allocated memory is allocated as shared and SINGLE_VA'd so
+ * that any odp thread (i.e. pthread or process) can refer pci
+ * dev as pointers
+ */
+ size = sizeof(pci_dev_t) * devcount;
+ shm = odpdrv_shm_reserve(PCI_ENUMED_DEV, size, 0, ODPDRV_SHM_SINGLE_VA);
+ if (shm == ODPDRV_SHM_INVALID)
+ goto error;
+
+ pci_enumerated_dev = odpdrv_shm_addr(shm);
+
+ for (index = 0, dev = devlist; dev != NULL; dev = dev->next, index++) {
+ memcpy(&pci_enumerated_dev[index],
+ dev,
+ sizeof(pci_dev_t));
+ pci_enumerated_dev[index].next = &pci_enumerated_dev[index + 1];
+ }
+ pci_enumerated_dev[index - 1].next = NULL;
+
+ if (index != devcount)
+ ODP_ERR("pci enumeration error (bug!)\n");
+
+ /* free the malloc'd list: */
+ dev = devlist;
+ while (dev != NULL) {
+ dev2 = dev->next;
+ free(dev);
+ dev = dev2;
+ }
+
+ return 0;
+
+error:
+ closedir(dir);
+
+ /* free the malloc'd list: */
+ dev = devlist;
+ while (dev != NULL) {
+ dev2 = dev->next;
+ free(dev);
+ dev = dev2;
+ }
+ return -1;
+}
+
+/*
+ *output a printout of the scanned PCI devices (debug purpose)
+ */
+static int pci_dump_scanned(void)
+{
+ odpdrv_shm_t shm;
+ pci_dev_t *dev;
+ pci_dev_t *devlist;
+
+ shm = odpdrv_shm_lookup_by_name(PCI_ENUMED_DEV);
+ if (shm == ODPDRV_SHM_INVALID)
+ return -1;
+
+ devlist = odpdrv_shm_addr(shm);
+ if (!devlist)
+ return -1;
+
+ ODP_DBG("list of scanned PCI devices:\n");
+ for (dev = devlist; dev != NULL; dev = dev->next)
+ ODP_DBG("%04" PRIx16 ":"
+ "%02" PRIx8 ":"
+ "%02" PRIx8 ":"
+ "%02" PRIx8 ": "
+ "vendor:%04" PRIx16 ", "
+ "device:%04" PRIx16 ", "
+ "class:%04" PRIx16 "\n",
+ dev->addr.domain,
+ dev->addr.bus,
+ dev->addr.devid,
+ dev->addr.function,
+ dev->id.vendor_id,
+ dev->id.device_id,
+ dev->id.class_id);
+
+ return 0;
+}
+
+int _odp_pci_init_global(void)
+{
+ /* scan for PCI devices: */
+ pci_scan();
+
+ /* print (debug) the list of scanned devices: */
+ pci_dump_scanned();
+
+ return 0;
+}
+
+int _odp_pci_term_global(void)
+{
+ /* free the enumarated PCI device list (if any) */
+ odpdrv_shm_free_by_name(PCI_ENUMED_DEV);
+
+ return 0;
+}
diff --git a/platform/linux-generic/include/drv_pci_internal.h b/platform/linux-generic/include/drv_pci_internal.h
new file mode 100644
index 00000000..24be1e29
--- /dev/null
+++ b/platform/linux-generic/include/drv_pci_internal.h
@@ -0,0 +1,83 @@
+/* Copyright (c) 2016, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef DRV_PCI_INTERNAL_H_
+#define DRV_PCI_INTERNAL_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* path where PCI devices are shown in sysfs: */
+#define PCI_SYSFS_DEVICES_ROOT "/sys/bus/pci/devices"
+
+/* Nb. of values in PCI resource file format. */
+#define PCI_RESOURCE_FMT_NVAL 3
+/** Nb. of values in PCI device address string. */
+#define PCI_FMT_NVAL 4
+
+/* Maximum number of PCI resources (BAR regions). */
+#define PCI_MAX_RESOURCE 6
+
+/* IO resource type (flag section of PCI resource file): */
+#define IORESOURCE_IO 0x00000100
+#define IORESOURCE_MEM 0x00000200
+
+/* Any PCI device identifier (vendor, device, ...) */
+#define PCI_CLASS_ANY_ID (0xffffff)
+
+/* name of the shmem area containing the list of enumerated PCI devices: */
+#define PCI_ENUMED_DEV "_ODP_PCI_ENUMERATED_DEVICES"
+
+/* structure describing a PCI address: */
+typedef struct pci_addr_t {
+ uint16_t domain; /* Device domain */
+ uint8_t bus; /* Device bus */
+ uint8_t devid; /* Device ID */
+ uint8_t function; /* Device function. */
+} pci_addr_t;
+
+/* structure describing an ID for a PCI device: */
+typedef struct pci_id_t {
+ uint32_t class_id; /* Class ID */
+ uint16_t vendor_id; /* Vendor ID or PCI_ANY_ID. */
+ uint16_t device_id; /* Device ID or PCI_ANY_ID. */
+ uint16_t subsystem_vendor_id; /* Subsystem vendor ID or PCI_ANY_ID. */
+ uint16_t subsystem_device_id; /* Subsystem device ID or PCI_ANY_ID. */
+} pci_id_t;
+
+/* structure describing a PCI resource (BAR region): */
+typedef struct pci_resource_t {
+ uint64_t phys_addr;/* Physical address, 0 if no resource. */
+ void *addr; /* address (virtual, user space) of the BAR region */
+ uint64_t len; /* size of the region, in bytes */
+} pci_resource_t;
+
+/* enum telling which kernel driver is currentely bound to the pci device: */
+enum pci_kernel_driver {
+ PCI_KDRV_UNKNOWN = 0,
+ PCI_KDRV_IGB_UIO,
+ PCI_KDRV_VFIO,
+ PCI_KDRV_UIO_GENERIC,
+ PCI_KDRV_NIC_UIO,
+ PCI_KDRV_NONE,
+};
+
+/* structure for PCI device: */
+typedef struct pci_dev_t {
+ struct pci_dev_t *next;
+ pci_addr_t addr; /* PCI location. */
+ pci_id_t id; /* PCI ID. */
+ pci_resource_t bar[PCI_MAX_RESOURCE]; /* PCI Resources */
+ uint16_t max_vfs; /* sriov enable if not zero */
+ enum pci_kernel_driver kdrv; /* Kernel driver */
+} pci_dev_t;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h
index 6811d8d0..b2a27ba6 100644
--- a/platform/linux-generic/include/odp_internal.h
+++ b/platform/linux-generic/include/odp_internal.h
@@ -78,6 +78,7 @@ enum init_stage {
IPSEC_EVENTS_INIT,
IPSEC_SAD_INIT,
MODULES_INIT,
+ PCI_INIT,
ALL_INIT /* All init stages completed */
};
@@ -155,6 +156,9 @@ int _odp_ipsec_events_term_global(void);
int _odp_modules_init_global(void);
+int _odp_pci_init_global(void);
+int _odp_pci_term_global(void);
+
int cpuinfo_parser(FILE *file, system_info_t *sysinfo);
uint64_t odp_cpufreq_id(const char *filename, int id);
uint64_t odp_cpu_hz_current(int id);
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
index 0268a3bd..c93475f0 100644
--- a/platform/linux-generic/odp_init.c
+++ b/platform/linux-generic/odp_init.c
@@ -217,6 +217,12 @@ int odp_init_global(odp_instance_t *instance,
}
stage = TRAFFIC_MNGR_INIT;
+ if (_odp_pci_init_global()) {
+ ODP_ERR("ODP pci init failed.\n");
+ goto init_failed;
+ }
+ stage = PCI_INIT;
+
if (_odp_int_name_tbl_init_global()) {
ODP_ERR("ODP name table init failed\n");
goto init_failed;
@@ -292,6 +298,13 @@ int _odp_term_global(enum init_stage stage)
}
/* Fall through */
+ case PCI_INIT:
+ if (_odp_pci_term_global()) {
+ ODP_ERR("PCI term failed.\n");
+ rc = -1;
+ }
+ /* Fall through */
+
case NAME_TABLE_INIT:
if (_odp_int_name_tbl_term_global()) {
ODP_ERR("Name table term failed.\n");
commit 41cfdd1f67e0a44aa3aed04f4ddbaa53b5c43b38
Author: Christophe Milard <christophe.milard(a)linaro.org>
Date: Wed Sep 14 14:51:08 2016 +0200
linux-gen: _str_functions: string handling functions
String handlling functions (which were originally part of
odp_system_info.c) are gathered in a separated file,
so they can be reused by others
Signed-off-by: Christophe Milard <christophe.milard(a)linaro.org>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 9b9936dd..4dbdb813 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -153,6 +153,7 @@ noinst_HEADERS = \
include/_ishm_internal.h \
include/_ishmphy_internal.h \
include/_ishmpool_internal.h \
+ include/_str_functions_internal.h \
include/drv_driver_internal.h \
include/odp_align_internal.h \
include/odp_atomic_internal.h \
@@ -221,6 +222,7 @@ __LIB__libodp_linux_la_SOURCES = \
_ishmphy.c \
_ishmpool.c \
_modules.c \
+ _str_functions.c \
odp_atomic.c \
odp_barrier.c \
odp_bitmap.c \
diff --git a/platform/linux-generic/_str_functions.c b/platform/linux-generic/_str_functions.c
new file mode 100644
index 00000000..eeb664bc
--- /dev/null
+++ b/platform/linux-generic/_str_functions.c
@@ -0,0 +1,102 @@
+/* Copyright (c) 2016, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*
+ * BSD LICENSE
+ *
+ * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ */
+
+#include <odp_posix_extensions.h>
+
+#include <odp_internal.h>
+#include <odp_debug_internal.h>
+#include <_str_functions_internal.h>
+#include <odp/api/align.h>
+#include <errno.h>
+#include <string.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <ctype.h>
+
+/*
+ * split string into tokens. largely "inspired" by dpdk:
+ * lib/librte_eal/common/eal_common_string_fns.c: rte_strsplit
+ */
+int _odp_strsplit(char *string, int stringlen,
+ char **tokens, int maxtokens, char delim)
+{
+ int i, tok = 0;
+ int tokstart = 1; /* first token is right at start of string */
+
+ if (string == NULL || tokens == NULL)
+ return -1;
+
+ for (i = 0; i < stringlen; i++) {
+ if (string[i] == '\0' || tok >= maxtokens)
+ break;
+ if (tokstart) {
+ tokstart = 0;
+ tokens[tok++] = &string[i];
+ }
+ if (string[i] == delim) {
+ string[i] = '\0';
+ tokstart = 1;
+ }
+ }
+ return tok;
+}
+
+/*
+ * Converts a numeric string to the equivalent uint64_t value.
+ * As well as straight number conversion, also recognises the suffixes
+ * k, m and g for kilobytes, megabytes and gigabytes respectively.
+ *
+ * If a negative number is passed in i.e. a string with the first non-black
+ * character being "-", zero is returned. Zero is also returned in the case of
+ * an error with the strtoull call in the function.
+ * largely "inspired" by dpdk:
+ * lib/librte_eal/common/include/rte_common.h: rte_str_to_size
+ *
+ * param str
+ * String containing number to convert.
+ * return
+ * Number.
+ */
+uint64_t _odp_str_to_size(const char *str)
+{
+ char *endptr;
+ unsigned long long size;
+
+ while (isspace((int)*str))
+ str++;
+ if (*str == '-')
+ return 0;
+
+ errno = 0;
+ size = strtoull(str, &endptr, 0);
+ if (errno)
+ return 0;
+
+ if (*endptr == ' ')
+ endptr++; /* allow 1 space gap */
+
+ switch (*endptr) {
+ case 'G':
+ case 'g':
+ size *= 1024; /* fall-through */
+ case 'M':
+ case 'm':
+ size *= 1024; /* fall-through */
+ case 'K':
+ case 'k':
+ size *= 1024; /* fall-through */
+ default:
+ break;
+ }
+ return size;
+}
diff --git a/platform/linux-generic/include/_str_functions_internal.h b/platform/linux-generic/include/_str_functions_internal.h
new file mode 100644
index 00000000..403b97ae
--- /dev/null
+++ b/platform/linux-generic/include/_str_functions_internal.h
@@ -0,0 +1,25 @@
+/* Copyright (c) 2016, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _STR_FUNCTIONS_INTERNAL_H
+#define _STR_FUNCTIONS_INTERNAL_H
+
+#include <string.h>
+#include <odp_internal.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+uint64_t _odp_str_to_size(const char *str);
+int _odp_strsplit(char *string, int stringlen,
+ char **tokens, int maxtokens, char delim);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c
index 3cbe1d3d..fbc011de 100644
--- a/platform/linux-generic/odp_system_info.c
+++ b/platform/linux-generic/odp_system_info.c
@@ -19,6 +19,7 @@
#include <odp/api/version.h>
#include <odp_internal.h>
#include <odp_debug_internal.h>
+#include <_str_functions_internal.h>
#include <odp/api/align.h>
#include <odp/api/cpu.h>
#include <errno.h>
@@ -108,84 +109,6 @@ static uint64_t default_huge_page_size(void)
return 0;
}
-/*
- * split string into tokens. largely "inspired" by dpdk:
- * lib/librte_eal/common/eal_common_string_fns.c: rte_strsplit
- */
-static int strsplit(char *string, int stringlen,
- char **tokens, int maxtokens, char delim)
-{
- int i, tok = 0;
- int tokstart = 1; /* first token is right at start of string */
-
- if (string == NULL || tokens == NULL)
- return -1;
-
- for (i = 0; i < stringlen; i++) {
- if (string[i] == '\0' || tok >= maxtokens)
- break;
- if (tokstart) {
- tokstart = 0;
- tokens[tok++] = &string[i];
- }
- if (string[i] == delim) {
- string[i] = '\0';
- tokstart = 1;
- }
- }
- return tok;
-}
-
-/*
- * Converts a numeric string to the equivalent uint64_t value.
- * As well as straight number conversion, also recognises the suffixes
- * k, m and g for kilobytes, megabytes and gigabytes respectively.
- *
- * If a negative number is passed in i.e. a string with the first non-black
- * character being "-", zero is returned. Zero is also returned in the case of
- * an error with the strtoull call in the function.
- * largely "inspired" by dpdk:
- * lib/librte_eal/common/include/rte_common.h: rte_str_to_size
- *
- * param str
- * String containing number to convert.
- * return
- * Number.
- */
-static inline uint64_t str_to_size(const char *str)
-{
- char *endptr;
- unsigned long long size;
-
- while (isspace((int)*str))
- str++;
- if (*str == '-')
- return 0;
-
- errno = 0;
- size = strtoull(str, &endptr, 0);
- if (errno)
- return 0;
-
- if (*endptr == ' ')
- endptr++; /* allow 1 space gap */
-
- switch (*endptr) {
- case 'G':
- case 'g':
- size *= 1024; /* fall-through */
- case 'M':
- case 'm':
- size *= 1024; /* fall-through */
- case 'K':
- case 'k':
- size *= 1024; /* fall-through */
- default:
- break;
- }
- return size;
-}
-
/*
* returns a malloced string containing the name of the directory for
* huge pages of a given size (0 for default)
@@ -227,8 +150,9 @@ static char *get_hugepage_dir(uint64_t hugepage_sz)
hugepage_sz = default_size;
while (fgets(buf, sizeof(buf), fd)) {
- if (strsplit(buf, sizeof(buf), tokens,
- _FIELDNAME_MAX, split_tok) != _FIELDNAME_MAX) {
+ if (_odp_strsplit(buf, sizeof(buf), tokens,
+ _FIELDNAME_MAX,
+ split_tok) != _FIELDNAME_MAX) {
ODP_ERR("Error parsing %s\n", proc_mounts);
break; /* return NULL */
}
@@ -247,7 +171,7 @@ static char *get_hugepage_dir(uint64_t hugepage_sz)
/* there is an explicit page size, so check it */
else {
pagesz =
- str_to_size(&pagesz_str[pagesize_opt_len]);
+ _odp_str_to_size(&pagesz_str[pagesize_opt_len]);
if (pagesz == hugepage_sz) {
retval = strdup(tokens[MOUNTPT]);
break;
commit 485779a031f467eb242dec0a164b7380612494a4
Author: Josep Puigdemont <josep.puigdemont(a)linaro.org>
Date: Wed Jun 28 10:30:09 2017 +0200
pktio: virtio: stub for a VirtIO-based packet IO
Signed-off-by: Josep Puigdemont <josep.puigdemont(a)linaro.org>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 56ef03c6..9b9936dd 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -186,6 +186,7 @@ noinst_HEADERS = \
include/odp_pktio_ops_pcap.h \
include/odp_pktio_ops_socket.h \
include/odp_pktio_ops_tap.h \
+ include/odp_pktio_ops_virtio.h \
include/odp_pktio_ops_subsystem.h \
include/odp_pkt_queue_internal.h \
include/odp_queue_subsystem.h \
@@ -255,6 +256,7 @@ __LIB__libodp_linux_la_SOURCES = \
pktio/socket_mmap.c \
pktio/sysfs.c \
pktio/tap.c \
+ pktio/virtio.c \
pktio/ring.c \
pool/generic.c \
pool/subsystem.c \
diff --git a/platform/linux-generic/include/odp_pktio_ops_virtio.h b/platform/linux-generic/include/odp_pktio_ops_virtio.h
new file mode 100644
index 00000000..a8ace414
--- /dev/null
+++ b/platform/linux-generic/include/odp_pktio_ops_virtio.h
@@ -0,0 +1,14 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef ODP_PACKET_VIRTIO_H
+#define ODP_PACKET_VIRTIO_H
+
+typedef struct {
+ char name[32]; /**< Unique identifier name */
+} pktio_ops_virtio_data_t;
+
+#endif
diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4
index fc29f9cb..61a43fb8 100644
--- a/platform/linux-generic/m4/configure.m4
+++ b/platform/linux-generic/m4/configure.m4
@@ -47,3 +47,6 @@ AC_DEFINE([ODP_PKTIO_SOCKET], [1],
AC_DEFINE([ODP_PKTIO_SOCKET_MMAP], [1],
[Define to 1 to enable SOCKET_MMAP packet I/O support])
+
+AC_DEFINE([ODP_PKTIO_VIRTIO], [1],
+ [Define to 1 to enable VirtIO packet I/O support])
diff --git a/platform/linux-generic/pktio/subsystem.c b/platform/linux-generic/pktio/subsystem.c
index a3b36c14..17bc1164 100644
--- a/platform/linux-generic/pktio/subsystem.c
+++ b/platform/linux-generic/pktio/subsystem.c
@@ -44,6 +44,9 @@ extern int enable_link_socket_mmap_pktio_ops;
#ifdef ODP_PKTIO_TAP
extern int enable_link_tap_pktio_ops;
#endif
+#ifdef ODP_PKTIO_VIRTIO
+extern int enable_link_virtio_pktio_ops;
+#endif
ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops)
{
@@ -73,4 +76,7 @@ ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops)
#ifdef ODP_PKTIO_TAP
enable_link_tap_pktio_ops = 1;
#endif
+#ifdef ODP_PKTIO_VIRTIO
+ enable_link_virtio_pktio_ops = 1;
+#endif
}
diff --git a/platform/linux-generic/pktio/virtio.c b/platform/linux-generic/pktio/virtio.c
new file mode 100644
index 00000000..b46a642a
--- /dev/null
+++ b/platform/linux-generic/pktio/virtio.c
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2017, Linaro Limited
+ *
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * devices are spcified as: pci:domain:bus:device.function
+ */
+
+#include "config.h"
+
+#ifdef ODP_PKTIO_VIRTIO
+
+#include <stdio.h>
+
+#include <odp_api.h>
+#include <odp_packet_internal.h>
+#include <odp_packet_io_internal.h>
+
+#include <odp_classification_internal.h>
+#include <odp_debug_internal.h>
+#include <odp/api/hints.h>
+
+#include <odp_pktio_ops_virtio.h>
+
+#define PCI_PKTIO_PREFIX "pci:"
+#define PCI_PKTIO_PREFIX_LEN (sizeof(PCI_PKTIO_PREFIX) - 1)
+
+static int virtio_init_global(void)
+{
+ ODP_PRINT("PKTIO: initialized pci interface.\n");
+ return 0;
+}
+
+static int virtio_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry,
+ const char *devname, odp_pool_t pool ODP_UNUSED)
+{
+ static unsigned int dev_id = 0;
+ pktio_ops_virtio_data_t *virtio_entry = odp_ops_data(pktio_entry,
+ virtio);
+
+ if (strncmp(devname, PCI_PKTIO_PREFIX, PCI_PKTIO_PREFIX_LEN))
+ return -1;
+
+ memset(virtio_entry, 0, sizeof(pktio_ops_virtio_data_t));
+ snprintf(virtio_entry->name,
+ sizeof(virtio_entry->name),
+ "virtio_%u",
+ dev_id++);
+
+ ODP_PRINT("virtio: opened %s\n", virtio_entry->name);
+
+ return 0;
+}
+
+static int virtio_close(pktio_entry_t *pktio_entry ODP_UNUSED)
+{
+ return 0;
+}
+
+static int virtio_recv(pktio_entry_t *pktio_entry ODP_UNUSED, int index ODP_UNUSED,
+ odp_packet_t pkts[] ODP_UNUSED, int len ODP_UNUSED)
+{
+ return 0;
+}
+
+static int virtio_send(pktio_entry_t *pktio_entry ODP_UNUSED, int index ODP_UNUSED,
+ const odp_packet_t pkt_tbl[] ODP_UNUSED, int len)
+{
+ return len;
+}
+
+static pktio_ops_module_t virtio_pktio_ops = {
+ .base = {
+ .name = "virtio-net",
+ .init_local = NULL,
+ .term_local = NULL,
+ .init_global = virtio_init_global,
+ .term_global = NULL,
+ },
+ .open = virtio_open,
+ .close = virtio_close,
+ .start = NULL,
+ .stop = NULL,
+ .stats = NULL,
+ .stats_reset = NULL,
+ .pktin_ts_res = NULL,
+ .pktin_ts_from_ns = NULL,
+ .recv = virtio_recv,
+ .send = virtio_send,
+ .mtu_get = NULL,
+ .promisc_mode_set = NULL,
+ .promisc_mode_get = NULL,
+ .mac_get = NULL,
+ .link_status = NULL,
+ .capability = NULL,
+ .config = NULL,
+ .input_queues_config = NULL,
+ .output_queues_config = NULL,
+ .print = NULL,
+};
+
+ODP_MODULE_CONSTRUCTOR(virtio_pktio_ops)
+{
+ odp_module_constructor(&virtio_pktio_ops);
+
+ odp_subsystem_register_module(pktio_ops, &virtio_pktio_ops);
+}
+
+/* Temporary variable to enable linking this module in,
+ * shall be removed later
+ */
+int enable_link_virtio_pktio_ops = 0;
+
+#endif
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 4 +-
.shippable.yml | 45 +
.travis.yml | 36 +-
DEPENDENCIES | 6 +-
Makefile.am | 20 +-
configure.ac | 23 +-
doc/users-guide/users-guide.adoc | 18 +
example/Makefile.am | 2 +
example/Makefile.inc | 4 +-
example/classifier/Makefile.am | 9 +-
example/classifier/odp_classifier.c | 14 +-
example/generator/Makefile.am | 9 +-
example/generator/odp_generator.c | 12 +-
example/hello/Makefile.am | 6 +-
example/ipfragreass/Makefile.am | 27 +-
example/ipsec/Makefile.am | 53 +-
example/ipsec/odp_ipsec.c | 12 +-
example/l2fwd/odp_l2fwd.c | 2 +-
example/l2fwd_simple/Makefile.am | 9 +-
example/l2fwd_simple/l2fwd_simple_run.sh | 3 +-
example/l3fwd/Makefile.am | 15 +-
example/l3fwd/odp_l3fwd.c | 63 +-
example/l3fwd/odp_l3fwd_run.sh | 2 +-
example/packet/Makefile.am | 9 +-
example/packet/odp_pktio.c | 12 +-
example/packet/pktio_run.sh | 8 +-
example/switch/Makefile.am | 9 +-
example/switch/odp_switch.c | 14 +-
example/switch/switch_run.sh | 2 +-
example/time/Makefile.am | 9 +-
example/timer/Makefile.am | 15 +-
example/timer/odp_timer_test.c | 10 +-
example/traffic_mgmt/Makefile.am | 10 +-
example/traffic_mgmt/odp_traffic_mgmt.c | 30 +-
helper/.gitignore | 1 +
helper/Makefile.am | 57 +-
{pkgconfig => helper}/libodphelper.pc.in | 0
helper/m4/configure.m4 | 3 +-
helper/test/Makefile.am | 18 +-
helper/test/linux/Makefile.am | 5 -
helper/test/odpthreads_as_processes | 2 +-
helper/test/odpthreads_as_pthreads | 2 +-
include/Makefile.am | 163 +++
include/odp/api/spec/ipsec.h | 20 +-
include/odp/api/spec/packet.h | 25 +-
include/odp/api/spec/pool.h | 16 +
include/odp/api/spec/shared_memory.h | 74 +-
m4/ax_valgrind_check.m4 | 23 +-
m4/odp_atomic.m4 | 95 ++
m4/odp_openssl.m4 | 60 +
{platform/linux-generic/m4 => m4}/odp_timer.m4 | 7 +-
m4/odp_visibility.m4 | 21 +
platform/Makefile.inc | 90 --
platform/linux-dpdk/Makefile.am | 6 +
.../linux-dpdk/include/odp/api/plat/timer_types.h | 4 +-
platform/linux-dpdk/include/odp_packet_internal.h | 15 +
.../linux-dpdk}/libodp-dpdk.pc.in | 0
platform/linux-dpdk/m4/configure.m4 | 16 +-
platform/linux-dpdk/m4/odp_openssl.m4 | 1 -
platform/linux-dpdk/m4/odp_timer.m4 | 1 -
platform/linux-dpdk/m4/performance.m4 | 1 +
platform/linux-dpdk/odp_init.c | 36 +-
platform/linux-dpdk/odp_packet.c | 325 +++--
.../linux-dpdk/test}/.gitignore | 0
platform/linux-dpdk/test/Makefile.am | 35 +
.../linux-dpdk/test}/Makefile.inc | 13 +-
.../test/validation/api/pktio/.gitignore | 1 +
.../test}/validation/api/pktio/Makefile.am | 0
.../linux-dpdk/test/validation/api/pktio/pktio_env | 1 +
.../test}/validation/api/pktio/pktio_run.sh | 0
.../linux-dpdk/test}/wrapper-script.sh | 0
platform/linux-generic/.gitignore | 1 +
platform/linux-generic/Makefile.am | 438 +++----
platform/linux-generic/_ishm.c | 118 +-
platform/linux-generic/_ishmphy.c | 81 ++
platform/linux-generic/_str_functions.c | 102 ++
.../linux-generic/arch/default/odp_sysinfo_parse.c | 5 +
.../linux-generic/arch/mips64/odp_sysinfo_parse.c | 5 +
.../linux-generic/arch/powerpc/odp_sysinfo_parse.c | 5 +
.../linux-generic/arch/x86/odp_sysinfo_parse.c | 36 +
platform/linux-generic/drv_pci.c | 775 ++++++++++++
platform/linux-generic/drv_pci_uio.c | 622 ++++++++++
platform/linux-generic/include/_ishm_internal.h | 1 +
platform/linux-generic/include/_ishmphy_internal.h | 14 +
.../include/_str_functions_internal.h | 25 +
platform/linux-generic/include/drv_pci_internal.h | 148 +++
.../include/odp/api/plat/timer_types.h | 4 +-
.../linux-generic/include/odp_buffer_internal.h | 9 +-
.../linux-generic/include/odp_config_internal.h | 17 +-
.../linux-generic/include/odp_debug_internal.h | 2 +-
platform/linux-generic/include/odp_internal.h | 13 +
.../linux-generic/include/odp_ipsec_internal.h | 201 ++++
.../linux-generic/include/odp_packet_internal.h | 21 +-
.../linux-generic/include/odp_pktio_ops_virtio.h | 18 +
platform/linux-generic/include/odp_pool_internal.h | 3 +-
platform/linux-generic/include/protocols/ip.h | 1 +
.../linux-generic}/libodp-linux.pc.in | 0
platform/linux-generic/m4/configure.m4 | 101 +-
platform/linux-generic/m4/odp_dpdk.m4 | 4 +-
platform/linux-generic/m4/odp_netmap.m4 | 4 +-
platform/linux-generic/m4/odp_openssl.m4 | 37 -
platform/linux-generic/m4/odp_pcap.m4 | 4 +-
{test => platform}/linux-generic/m4/performance.m4 | 2 +
platform/linux-generic/odp_event.c | 4 +
platform/linux-generic/odp_init.c | 39 +
platform/linux-generic/odp_ipsec.c | 1251 ++++++++++++++++++--
platform/linux-generic/odp_ipsec_events.c | 156 +++
platform/linux-generic/odp_ipsec_sad.c | 500 ++++++++
platform/linux-generic/odp_packet.c | 413 +++++--
platform/linux-generic/odp_packet_io.c | 34 +-
platform/linux-generic/odp_pkt_queue.c | 22 +-
platform/linux-generic/odp_shared_memory.c | 5 +
platform/linux-generic/odp_sorted_list.c | 12 +-
platform/linux-generic/odp_system_info.c | 93 +-
platform/linux-generic/odp_timer.c | 110 +-
platform/linux-generic/odp_timer_wheel.c | 44 +-
platform/linux-generic/odp_traffic_mngr.c | 42 +-
platform/linux-generic/pktio/dpdk.c | 105 +-
platform/linux-generic/pktio/loopback.c | 25 +
platform/linux-generic/pktio/netmap.c | 17 +-
platform/linux-generic/pktio/socket_mmap.c | 2 +-
platform/linux-generic/pktio/subsystem.c | 6 +
platform/linux-generic/pktio/tap.c | 117 +-
platform/linux-generic/pktio/virtio.c | 139 +++
platform/linux-generic/pktio/virtio_pci.c | 601 ++++++++++
platform/linux-generic/pktio/virtio_pci.h | 320 +++++
platform/linux-generic/pool/generic.c | 103 +-
.../linux-generic/test}/.gitignore | 1 +
platform/linux-generic/test/Makefile.am | 57 +
.../linux-generic/test}/Makefile.inc | 4 +-
.../linux-generic/test}/mmap_vlan_ins/.gitignore | 0
.../linux-generic/test}/mmap_vlan_ins/Makefile.am | 2 +-
.../test}/mmap_vlan_ins/mmap_vlan_ins.c | 0
.../test}/mmap_vlan_ins/mmap_vlan_ins.sh | 0
.../linux-generic/test/mmap_vlan_ins}/pktio_env | 0
.../linux-generic/test}/mmap_vlan_ins/vlan.pcap | Bin
.../linux-generic/test/performance}/.gitignore | 0
.../linux-generic/test}/performance/Makefile.am | 0
.../test}/performance/odp_scheduling_run_proc.sh | 2 +-
.../linux-generic/test}/pktio_ipc/.gitignore | 0
.../linux-generic/test}/pktio_ipc/Makefile.am | 0
.../linux-generic/test}/pktio_ipc/ipc_common.c | 8 +-
.../linux-generic/test}/pktio_ipc/ipc_common.h | 0
.../linux-generic/test}/pktio_ipc/pktio_ipc1.c | 0
.../linux-generic/test}/pktio_ipc/pktio_ipc2.c | 0
.../linux-generic/test}/pktio_ipc/pktio_ipc_run.sh | 0
.../linux-generic/test}/ring/.gitignore | 0
.../linux-generic/test}/ring/Makefile.am | 2 +-
.../linux-generic/test}/ring/ring_basic.c | 0
.../linux-generic/test}/ring/ring_main.c | 0
.../linux-generic/test}/ring/ring_stress.c | 0
.../linux-generic/test}/ring/ring_suites.c | 0
.../linux-generic/test}/ring/ring_suites.h | 0
.../linux-generic/test/validation/Makefile.inc | 1 +
.../linux-generic/test/validation/api/Makefile.inc | 1 +
.../test/validation/api/pktio}/.gitignore | 0
.../test}/validation/api/pktio/Makefile.am | 0
.../test/validation/api/pktio}/pktio_env | 0
.../test}/validation/api/pktio/pktio_run.sh | 2 +-
.../test}/validation/api/pktio/pktio_run_dpdk.sh | 4 +-
.../test}/validation/api/pktio/pktio_run_netmap.sh | 2 +-
.../test}/validation/api/pktio/pktio_run_pcap.sh | 2 +-
.../test}/validation/api/pktio/pktio_run_tap.sh | 2 +-
.../test}/validation/api/shmem/.gitignore | 0
.../test}/validation/api/shmem/Makefile.am | 2 +-
.../test}/validation/api/shmem/shmem_common.h | 0
.../test}/validation/api/shmem/shmem_linux.c | 8 +-
.../test}/validation/api/shmem/shmem_linux.h | 0
.../test}/validation/api/shmem/shmem_odp1.c | 0
.../test}/validation/api/shmem/shmem_odp1.h | 0
.../test}/validation/api/shmem/shmem_odp2.c | 0
.../test}/validation/api/shmem/shmem_odp2.h | 0
scripts/Dockerfile | 26 +
scripts/build-pktio-dpdk | 8 +-
scripts/ci-checkpatches.sh | 22 +-
test/Makefile.am | 2 +-
test/Makefile.inc | 3 +-
test/README | 2 +-
test/{common_plat => }/common/Makefile.am | 7 +
test/{common_plat => }/common/mask_common.c | 0
test/{common_plat => }/common/mask_common.h | 0
test/{common_plat => }/common/odp_cunit_common.c | 0
test/{common_plat => }/common/odp_cunit_common.h | 0
.../{linux-generic/run-test => common/run-test.sh} | 0
test/{ => common}/test_debug.h | 0
test/common_plat/Makefile.am | 7 -
test/common_plat/m4/configure.m4 | 39 -
test/common_plat/validation/api/Makefile.am | 27 -
test/common_plat/validation/api/Makefile.inc | 13 -
test/common_plat/validation/api/ipsec/.gitignore | 1 -
test/common_plat/validation/api/ipsec/Makefile.am | 10 -
test/common_plat/validation/api/ipsec/ipsec.c | 44 -
test/common_plat/validation/api/ipsec/ipsec.h | 24 -
test/common_plat/validation/api/ipsec/ipsec_main.c | 12 -
test/common_plat/validation/drv/Makefile.inc | 1 -
test/linux-dpdk/Makefile.am | 56 -
test/linux-dpdk/m4/configure.m4 | 4 -
test/linux-dpdk/run-test | 1 -
test/linux-dpdk/validation/api/pktio/.gitignore | 1 -
test/linux-dpdk/validation/api/pktio/pktio_env | 1 -
test/linux-generic/Makefile.am | 90 --
test/linux-generic/m4/configure.m4 | 9 -
test/linux-generic/validation/Makefile.inc | 1 -
test/linux-generic/validation/api/Makefile.inc | 1 -
test/linux-generic/validation/api/pktio/.gitignore | 2 -
test/m4/configure.m4 | 40 +-
test/{common_plat => }/m4/miscellaneous.m4 | 0
test/{common_plat => }/m4/performance.m4 | 0
test/{common_plat => }/m4/validation.m4 | 2 +-
test/{common_plat => }/miscellaneous/.gitignore | 0
test/{common_plat => }/miscellaneous/Makefile.am | 4 +-
.../miscellaneous/odp_api_from_cpp.cpp | 0
test/{common_plat => }/performance/.gitignore | 0
test/{common_plat => }/performance/Makefile.am | 17 +-
test/{common_plat => }/performance/dummy_crc.h | 0
.../performance/odp_bench_packet.c | 14 +-
test/{common_plat => }/performance/odp_crypto.c | 0
test/{common_plat => }/performance/odp_l2fwd.c | 14 +-
.../{common_plat => }/performance/odp_l2fwd_run.sh | 5 +-
.../performance/odp_pktio_ordered.c | 14 +-
.../performance/odp_pktio_ordered_run.sh | 0
.../{common_plat => }/performance/odp_pktio_perf.c | 42 +-
.../performance/odp_sched_latency.c | 0
.../performance/odp_sched_latency_run.sh | 0
.../{common_plat => }/performance/odp_scheduling.c | 12 +-
.../performance/odp_scheduling_run.sh | 0
test/{common_plat => }/performance/udp64.pcap | Bin
test/{common_plat => }/validation/Makefile.am | 0
test/{common_plat => }/validation/Makefile.inc | 4 +-
test/{linux-generic => validation/api}/.gitignore | 0
test/validation/api/Makefile.am | 79 ++
test/validation/api/Makefile.inc | 6 +
test/{common_plat => }/validation/api/README | 0
.../validation/api/atomic/.gitignore | 0
.../validation/api/atomic/Makefile.am | 2 +-
.../validation/api/atomic/atomic.c | 0
.../validation/api/atomic/atomic.h | 0
.../validation/api/atomic/atomic_main.c | 0
.../validation/api/barrier/.gitignore | 0
.../validation/api/barrier/Makefile.am | 2 +-
.../validation/api/barrier/barrier.c | 0
.../validation/api/barrier/barrier.h | 0
.../validation/api/barrier/barrier_main.c | 0
.../validation/api/buffer/.gitignore | 0
.../validation/api/buffer/Makefile.am | 2 +-
.../validation/api/buffer/buffer.c | 0
.../validation/api/buffer/buffer.h | 0
.../validation/api/buffer/buffer_main.c | 0
.../validation/api/chksum/.gitignore | 0
.../validation/api/chksum/Makefile.am | 0
.../validation/api/chksum/chksum.c | 0
.../validation/api/chksum/chksum.h | 0
.../validation/api/chksum/chksum_main.c | 0
.../validation/api/classification/.gitignore | 0
.../validation/api/classification/Makefile.am | 2 +-
.../validation/api/classification/classification.c | 0
.../validation/api/classification/classification.h | 0
.../api/classification/classification_main.c | 0
.../api/classification/odp_classification_basic.c | 0
.../api/classification/odp_classification_common.c | 0
.../classification/odp_classification_test_pmr.c | 0
.../api/classification/odp_classification_tests.c | 0
.../classification/odp_classification_testsuites.h | 0
.../validation/api/cpumask/.gitignore | 0
.../validation/api/cpumask/Makefile.am | 2 +-
.../validation/api/cpumask/cpumask.c | 0
.../validation/api/cpumask/cpumask.h | 0
.../validation/api/cpumask/cpumask_main.c | 0
.../validation/api/crypto/.gitignore | 0
.../validation/api/crypto/Makefile.am | 2 +-
.../validation/api/crypto/crypto.c | 0
.../validation/api/crypto/crypto.h | 0
.../validation/api/crypto/crypto_main.c | 0
.../validation/api/crypto/odp_crypto_test_inp.c | 0
.../validation/api/crypto/odp_crypto_test_inp.h | 0
.../validation/api/crypto/test_vectors.h | 0
.../validation/api/crypto/test_vectors_len.h | 0
.../validation/api/errno/.gitignore | 0
.../validation/api/errno/Makefile.am | 2 +-
.../{common_plat => }/validation/api/errno/errno.c | 0
.../{common_plat => }/validation/api/errno/errno.h | 0
.../validation/api/errno/errno_main.c | 0
.../validation/api/hash/.gitignore | 0
.../validation/api/hash/Makefile.am | 2 +-
test/{common_plat => }/validation/api/hash/hash.c | 0
test/{common_plat => }/validation/api/hash/hash.h | 0
.../validation/api/hash/hash_main.c | 0
.../validation/api/init/.gitignore | 0
.../validation/api/init/Makefile.am | 2 +-
test/{common_plat => }/validation/api/init/init.c | 0
test/{common_plat => }/validation/api/init/init.h | 0
.../validation/api/init/init_main_abort.c | 0
.../validation/api/init/init_main_log.c | 0
.../validation/api/init/init_main_ok.c | 0
test/validation/api/ipsec/.gitignore | 4 +
test/validation/api/ipsec/Makefile.am | 27 +
test/validation/api/ipsec/ipsec.c | 887 ++++++++++++++
test/validation/api/ipsec/ipsec.h | 89 ++
test/validation/api/ipsec/ipsec_async.c | 55 +
test/validation/api/ipsec/ipsec_inline_in.c | 56 +
test/validation/api/ipsec/ipsec_inline_out.c | 56 +
test/validation/api/ipsec/ipsec_sync.c | 53 +
test/validation/api/ipsec/ipsec_sync_in.c | 27 +
test/validation/api/ipsec/ipsec_test_in.c | 815 +++++++++++++
test/validation/api/ipsec/ipsec_test_out.c | 348 ++++++
test/validation/api/ipsec/test_vectors.h | 965 +++++++++++++++
.../validation/api/lock/.gitignore | 0
.../validation/api/lock/Makefile.am | 2 +-
test/{common_plat => }/validation/api/lock/lock.c | 0
test/{common_plat => }/validation/api/lock/lock.h | 0
.../validation/api/lock/lock_main.c | 0
.../validation/api/packet/.gitignore | 0
.../validation/api/packet/Makefile.am | 2 +-
.../validation/api/packet/packet.c | 36 +-
.../validation/api/packet/packet.h | 0
.../validation/api/packet/packet_main.c | 0
.../validation/api/pktio/.gitignore | 0
.../validation/api/pktio/Makefile.am | 2 +-
.../validation/api/pktio/parser.c | 0
.../validation/api/pktio/parser.h | 0
.../{common_plat => }/validation/api/pktio/pktio.c | 0
.../{common_plat => }/validation/api/pktio/pktio.h | 0
.../validation/api/pktio/pktio_main.c | 0
.../validation/api/pool/.gitignore | 0
.../validation/api/pool/Makefile.am | 2 +-
test/{common_plat => }/validation/api/pool/pool.c | 0
test/{common_plat => }/validation/api/pool/pool.h | 0
.../validation/api/pool/pool_main.c | 0
.../validation/api/queue/.gitignore | 0
.../validation/api/queue/Makefile.am | 2 +-
.../{common_plat => }/validation/api/queue/queue.c | 0
.../{common_plat => }/validation/api/queue/queue.h | 0
.../validation/api/queue/queue_main.c | 0
.../validation/api/random/.gitignore | 0
.../validation/api/random/Makefile.am | 2 +-
.../validation/api/random/random.c | 0
.../validation/api/random/random.h | 0
.../validation/api/random/random_main.c | 0
.../validation/api/scheduler/.gitignore | 0
.../validation/api/scheduler/Makefile.am | 2 +-
.../validation/api/scheduler/scheduler.c | 0
.../validation/api/scheduler/scheduler.h | 0
.../validation/api/scheduler/scheduler_main.c | 0
.../validation/api/shmem/.gitignore | 0
.../validation/api/shmem/Makefile.am | 2 +-
.../{common_plat => }/validation/api/shmem/shmem.c | 26 +-
.../{common_plat => }/validation/api/shmem/shmem.h | 0
.../validation/api/shmem/shmem_main.c | 0
.../validation/api/std_clib/.gitignore | 0
.../validation/api/std_clib/Makefile.am | 2 +-
.../validation/api/std_clib/std_clib.c | 0
.../validation/api/std_clib/std_clib.h | 0
.../validation/api/std_clib/std_clib_main.c | 0
.../validation/api/system/.gitignore | 0
.../validation/api/system/Makefile.am | 2 +-
.../validation/api/system/system.c | 0
.../validation/api/system/system.h | 0
.../validation/api/system/system_main.c | 0
.../validation/api/thread/.gitignore | 0
.../validation/api/thread/Makefile.am | 2 +-
.../validation/api/thread/thread.c | 0
.../validation/api/thread/thread.h | 0
.../validation/api/thread/thread_main.c | 0
.../validation/api/time/.gitignore | 0
.../validation/api/time/Makefile.am | 2 +-
test/{common_plat => }/validation/api/time/time.c | 0
test/{common_plat => }/validation/api/time/time.sh | 2 +-
.../validation/api/time/time_main.c | 0
.../validation/api/time/time_test.h | 0
.../validation/api/timer/.gitignore | 0
.../validation/api/timer/Makefile.am | 2 +-
.../{common_plat => }/validation/api/timer/timer.c | 0
.../{common_plat => }/validation/api/timer/timer.h | 0
.../validation/api/timer/timer_main.c | 0
.../validation/api/traffic_mngr/.gitignore | 0
.../validation/api/traffic_mngr/Makefile.am | 2 +-
.../validation/api/traffic_mngr/traffic_mngr.c | 0
.../validation/api/traffic_mngr/traffic_mngr.h | 0
.../validation/api/traffic_mngr/traffic_mngr.sh | 2 +-
.../api/traffic_mngr/traffic_mngr_main.c | 0
.../performance => validation/drv}/.gitignore | 0
test/{common_plat => }/validation/drv/Makefile.am | 0
test/validation/drv/Makefile.inc | 1 +
test/{common_plat => }/validation/drv/README | 0
.../validation/drv/drvatomic/.gitignore | 0
.../validation/drv/drvatomic/Makefile.am | 0
.../validation/drv/drvatomic/drvatomic.c | 0
.../validation/drv/drvatomic/drvatomic.h | 0
.../validation/drv/drvatomic/drvatomic_main.c | 0
.../validation/drv/drvdriver/.gitignore | 0
.../validation/drv/drvdriver/Makefile.am | 0
.../validation/drv/drvdriver/drvdriver_device.c | 0
.../validation/drv/drvdriver/drvdriver_device.h | 0
.../drv/drvdriver/drvdriver_device_main.c | 0
.../validation/drv/drvdriver/drvdriver_devio.c | 0
.../validation/drv/drvdriver/drvdriver_devio.h | 0
.../drv/drvdriver/drvdriver_devio_main.c | 0
.../validation/drv/drvdriver/drvdriver_driver.c | 0
.../validation/drv/drvdriver/drvdriver_driver.h | 0
.../drv/drvdriver/drvdriver_driver_main.c | 0
.../validation/drv/drvdriver/drvdriver_enumr.c | 0
.../validation/drv/drvdriver/drvdriver_enumr.h | 0
.../drv/drvdriver/drvdriver_enumr_class.c | 0
.../drv/drvdriver/drvdriver_enumr_class.h | 0
.../drv/drvdriver/drvdriver_enumr_class_main.c | 0
.../drv/drvdriver/drvdriver_enumr_main.c | 0
.../validation/drv/drvshmem/.gitignore | 0
.../validation/drv/drvshmem/Makefile.am | 0
.../validation/drv/drvshmem/drvshmem.c | 0
.../validation/drv/drvshmem/drvshmem.h | 0
.../validation/drv/drvshmem/drvshmem_main.c | 0
411 files changed, 11000 insertions(+), 1898 deletions(-)
create mode 100644 .shippable.yml
create mode 100644 helper/.gitignore
rename {pkgconfig => helper}/libodphelper.pc.in (100%)
delete mode 100644 helper/test/linux/Makefile.am
create mode 100644 include/Makefile.am
create mode 100644 m4/odp_atomic.m4
create mode 100644 m4/odp_openssl.m4
rename {platform/linux-generic/m4 => m4}/odp_timer.m4 (63%)
create mode 100644 m4/odp_visibility.m4
rename {pkgconfig => platform/linux-dpdk}/libodp-dpdk.pc.in (100%)
delete mode 120000 platform/linux-dpdk/m4/odp_openssl.m4
delete mode 120000 platform/linux-dpdk/m4/odp_timer.m4
create mode 120000 platform/linux-dpdk/m4/performance.m4
copy {test/linux-dpdk => platform/linux-dpdk/test}/.gitignore (100%)
create mode 100644 platform/linux-dpdk/test/Makefile.am
rename {test/linux-dpdk => platform/linux-dpdk/test}/Makefile.inc (61%)
create mode 120000 platform/linux-dpdk/test/validation/api/pktio/.gitignore
rename {test/linux-dpdk => platform/linux-dpdk/test}/validation/api/pktio/Makefile.am (100%)
create mode 120000 platform/linux-dpdk/test/validation/api/pktio/pktio_env
rename {test/linux-dpdk => platform/linux-dpdk/test}/validation/api/pktio/pktio_run.sh (100%)
rename {test/linux-dpdk => platform/linux-dpdk/test}/wrapper-script.sh (100%)
create mode 100644 platform/linux-generic/_str_functions.c
create mode 100644 platform/linux-generic/drv_pci.c
create mode 100644 platform/linux-generic/drv_pci_uio.c
create mode 100644 platform/linux-generic/include/_str_functions_internal.h
create mode 100644 platform/linux-generic/include/drv_pci_internal.h
create mode 100644 platform/linux-generic/include/odp_ipsec_internal.h
create mode 100644 platform/linux-generic/include/odp_pktio_ops_virtio.h
rename {pkgconfig => platform/linux-generic}/libodp-linux.pc.in (100%)
delete mode 100644 platform/linux-generic/m4/odp_openssl.m4
rename {test => platform}/linux-generic/m4/performance.m4 (93%)
create mode 100644 platform/linux-generic/odp_ipsec_events.c
create mode 100644 platform/linux-generic/odp_ipsec_sad.c
create mode 100644 platform/linux-generic/pktio/virtio.c
create mode 100644 platform/linux-generic/pktio/virtio_pci.c
create mode 100644 platform/linux-generic/pktio/virtio_pci.h
rename {test/linux-dpdk => platform/linux-generic/test}/.gitignore (57%)
create mode 100644 platform/linux-generic/test/Makefile.am
rename {test/linux-generic => platform/linux-generic/test}/Makefile.inc (82%)
rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/.gitignore (100%)
rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/Makefile.am (88%)
rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/mmap_vlan_ins.c (100%)
rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/mmap_vlan_ins.sh (100%)
rename {test/linux-generic/validation/api/pktio => platform/linux-generic/test/mmap_vlan_ins}/pktio_env (100%)
rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/vlan.pcap (100%)
rename {test/common_plat/validation/api => platform/linux-generic/test/performance}/.gitignore (100%)
rename {test/linux-generic => platform/linux-generic/test}/performance/Makefile.am (100%)
rename {test/linux-generic => platform/linux-generic/test}/performance/odp_scheduling_run_proc.sh (90%)
rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/.gitignore (100%)
rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/Makefile.am (100%)
rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/ipc_common.c (94%)
rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/ipc_common.h (100%)
rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/pktio_ipc1.c (100%)
rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/pktio_ipc2.c (100%)
rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/pktio_ipc_run.sh (100%)
rename {test/linux-generic => platform/linux-generic/test}/ring/.gitignore (100%)
rename {test/linux-generic => platform/linux-generic/test}/ring/Makefile.am (89%)
rename {test/linux-generic => platform/linux-generic/test}/ring/ring_basic.c (100%)
rename {test/linux-generic => platform/linux-generic/test}/ring/ring_main.c (100%)
rename {test/linux-generic => platform/linux-generic/test}/ring/ring_stress.c (100%)
rename {test/linux-generic => platform/linux-generic/test}/ring/ring_suites.c (100%)
rename {test/linux-generic => platform/linux-generic/test}/ring/ring_suites.h (100%)
create mode 100644 platform/linux-generic/test/validation/Makefile.inc
create mode 100644 platform/linux-generic/test/validation/api/Makefile.inc
rename {test/common_plat/validation/drv => platform/linux-generic/test/validation/api/pktio}/.gitignore (100%)
rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/Makefile.am (100%)
rename {test/linux-generic/mmap_vlan_ins => platform/linux-generic/test/validation/api/pktio}/pktio_env (100%)
rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run.sh (97%)
rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run_dpdk.sh (92%)
rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run_netmap.sh (97%)
rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run_pcap.sh (93%)
rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run_tap.sh (97%)
rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/.gitignore (100%)
rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/Makefile.am (90%)
rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_common.h (100%)
rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_linux.c (97%)
rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_linux.h (100%)
rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_odp1.c (100%)
rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_odp1.h (100%)
rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_odp2.c (100%)
rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_odp2.h (100%)
create mode 100644 scripts/Dockerfile
rename test/{common_plat => }/common/Makefile.am (82%)
rename test/{common_plat => }/common/mask_common.c (100%)
rename test/{common_plat => }/common/mask_common.h (100%)
rename test/{common_plat => }/common/odp_cunit_common.c (100%)
rename test/{common_plat => }/common/odp_cunit_common.h (100%)
rename test/{linux-generic/run-test => common/run-test.sh} (100%)
rename test/{ => common}/test_debug.h (100%)
delete mode 100644 test/common_plat/Makefile.am
delete mode 100644 test/common_plat/m4/configure.m4
delete mode 100644 test/common_plat/validation/api/Makefile.am
delete mode 100644 test/common_plat/validation/api/Makefile.inc
delete mode 100644 test/common_plat/validation/api/ipsec/.gitignore
delete mode 100644 test/common_plat/validation/api/ipsec/Makefile.am
delete mode 100644 test/common_plat/validation/api/ipsec/ipsec.c
delete mode 100644 test/common_plat/validation/api/ipsec/ipsec.h
delete mode 100644 test/common_plat/validation/api/ipsec/ipsec_main.c
delete mode 100644 test/common_plat/validation/drv/Makefile.inc
delete mode 100644 test/linux-dpdk/Makefile.am
delete mode 100644 test/linux-dpdk/m4/configure.m4
delete mode 120000 test/linux-dpdk/run-test
delete mode 120000 test/linux-dpdk/validation/api/pktio/.gitignore
delete mode 120000 test/linux-dpdk/validation/api/pktio/pktio_env
delete mode 100644 test/linux-generic/Makefile.am
delete mode 100644 test/linux-generic/m4/configure.m4
delete mode 100644 test/linux-generic/validation/Makefile.inc
delete mode 100644 test/linux-generic/validation/api/Makefile.inc
delete mode 100644 test/linux-generic/validation/api/pktio/.gitignore
rename test/{common_plat => }/m4/miscellaneous.m4 (100%)
rename test/{common_plat => }/m4/performance.m4 (100%)
rename test/{common_plat => }/m4/validation.m4 (96%)
rename test/{common_plat => }/miscellaneous/.gitignore (100%)
rename test/{common_plat => }/miscellaneous/Makefile.am (58%)
rename test/{common_plat => }/miscellaneous/odp_api_from_cpp.cpp (100%)
rename test/{common_plat => }/performance/.gitignore (100%)
rename test/{common_plat => }/performance/Makefile.am (69%)
rename test/{common_plat => }/performance/dummy_crc.h (100%)
rename test/{common_plat => }/performance/odp_bench_packet.c (98%)
rename test/{common_plat => }/performance/odp_crypto.c (100%)
rename test/{common_plat => }/performance/odp_l2fwd.c (98%)
rename test/{common_plat => }/performance/odp_l2fwd_run.sh (94%)
rename test/{common_plat => }/performance/odp_pktio_ordered.c (98%)
rename test/{common_plat => }/performance/odp_pktio_ordered_run.sh (100%)
rename test/{common_plat => }/performance/odp_pktio_perf.c (97%)
rename test/{common_plat => }/performance/odp_sched_latency.c (100%)
rename test/{common_plat => }/performance/odp_sched_latency_run.sh (100%)
rename test/{common_plat => }/performance/odp_scheduling.c (97%)
rename test/{common_plat => }/performance/odp_scheduling_run.sh (100%)
rename test/{common_plat => }/performance/udp64.pcap (100%)
rename test/{common_plat => }/validation/Makefile.am (100%)
rename test/{common_plat => }/validation/Makefile.inc (83%)
rename test/{linux-generic => validation/api}/.gitignore (100%)
create mode 100644 test/validation/api/Makefile.am
create mode 100644 test/validation/api/Makefile.inc
rename test/{common_plat => }/validation/api/README (100%)
rename test/{common_plat => }/validation/api/atomic/.gitignore (100%)
rename test/{common_plat => }/validation/api/atomic/Makefile.am (77%)
rename test/{common_plat => }/validation/api/atomic/atomic.c (100%)
rename test/{common_plat => }/validation/api/atomic/atomic.h (100%)
rename test/{common_plat => }/validation/api/atomic/atomic_main.c (100%)
rename test/{common_plat => }/validation/api/barrier/.gitignore (100%)
rename test/{common_plat => }/validation/api/barrier/Makefile.am (77%)
rename test/{common_plat => }/validation/api/barrier/barrier.c (100%)
rename test/{common_plat => }/validation/api/barrier/barrier.h (100%)
rename test/{common_plat => }/validation/api/barrier/barrier_main.c (100%)
rename test/{common_plat => }/validation/api/buffer/.gitignore (100%)
rename test/{common_plat => }/validation/api/buffer/Makefile.am (77%)
rename test/{common_plat => }/validation/api/buffer/buffer.c (100%)
rename test/{common_plat => }/validation/api/buffer/buffer.h (100%)
rename test/{common_plat => }/validation/api/buffer/buffer_main.c (100%)
rename test/{common_plat => }/validation/api/chksum/.gitignore (100%)
rename test/{common_plat => }/validation/api/chksum/Makefile.am (100%)
rename test/{common_plat => }/validation/api/chksum/chksum.c (100%)
rename test/{common_plat => }/validation/api/chksum/chksum.h (100%)
rename test/{common_plat => }/validation/api/chksum/chksum_main.c (100%)
rename test/{common_plat => }/validation/api/classification/.gitignore (100%)
rename test/{common_plat => }/validation/api/classification/Makefile.am (89%)
rename test/{common_plat => }/validation/api/classification/classification.c (100%)
rename test/{common_plat => }/validation/api/classification/classification.h (100%)
rename test/{common_plat => }/validation/api/classification/classification_main.c (100%)
rename test/{common_plat => }/validation/api/classification/odp_classification_basic.c (100%)
rename test/{common_plat => }/validation/api/classification/odp_classification_common.c (100%)
rename test/{common_plat => }/validation/api/classification/odp_classification_test_pmr.c (100%)
rename test/{common_plat => }/validation/api/classification/odp_classification_tests.c (100%)
rename test/{common_plat => }/validation/api/classification/odp_classification_testsuites.h (100%)
rename test/{common_plat => }/validation/api/cpumask/.gitignore (100%)
rename test/{common_plat => }/validation/api/cpumask/Makefile.am (80%)
rename test/{common_plat => }/validation/api/cpumask/cpumask.c (100%)
rename test/{common_plat => }/validation/api/cpumask/cpumask.h (100%)
rename test/{common_plat => }/validation/api/cpumask/cpumask_main.c (100%)
rename test/{common_plat => }/validation/api/crypto/.gitignore (100%)
rename test/{common_plat => }/validation/api/crypto/Makefile.am (87%)
rename test/{common_plat => }/validation/api/crypto/crypto.c (100%)
rename test/{common_plat => }/validation/api/crypto/crypto.h (100%)
rename test/{common_plat => }/validation/api/crypto/crypto_main.c (100%)
rename test/{common_plat => }/validation/api/crypto/odp_crypto_test_inp.c (100%)
rename test/{common_plat => }/validation/api/crypto/odp_crypto_test_inp.h (100%)
rename test/{common_plat => }/validation/api/crypto/test_vectors.h (100%)
rename test/{common_plat => }/validation/api/crypto/test_vectors_len.h (100%)
rename test/{common_plat => }/validation/api/errno/.gitignore (100%)
rename test/{common_plat => }/validation/api/errno/Makefile.am (77%)
rename test/{common_plat => }/validation/api/errno/errno.c (100%)
rename test/{common_plat => }/validation/api/errno/errno.h (100%)
rename test/{common_plat => }/validation/api/errno/errno_main.c (100%)
rename test/{common_plat => }/validation/api/hash/.gitignore (100%)
rename test/{common_plat => }/validation/api/hash/Makefile.am (77%)
rename test/{common_plat => }/validation/api/hash/hash.c (100%)
rename test/{common_plat => }/validation/api/hash/hash.h (100%)
rename test/{common_plat => }/validation/api/hash/hash_main.c (100%)
rename test/{common_plat => }/validation/api/init/.gitignore (100%)
rename test/{common_plat => }/validation/api/init/Makefile.am (85%)
rename test/{common_plat => }/validation/api/init/init.c (100%)
rename test/{common_plat => }/validation/api/init/init.h (100%)
rename test/{common_plat => }/validation/api/init/init_main_abort.c (100%)
rename test/{common_plat => }/validation/api/init/init_main_log.c (100%)
rename test/{common_plat => }/validation/api/init/init_main_ok.c (100%)
create mode 100644 test/validation/api/ipsec/.gitignore
create mode 100644 test/validation/api/ipsec/Makefile.am
create mode 100644 test/validation/api/ipsec/ipsec.c
create mode 100644 test/validation/api/ipsec/ipsec.h
create mode 100644 test/validation/api/ipsec/ipsec_async.c
create mode 100644 test/validation/api/ipsec/ipsec_inline_in.c
create mode 100644 test/validation/api/ipsec/ipsec_inline_out.c
create mode 100644 test/validation/api/ipsec/ipsec_sync.c
create mode 100644 test/validation/api/ipsec/ipsec_sync_in.c
create mode 100644 test/validation/api/ipsec/ipsec_test_in.c
create mode 100644 test/validation/api/ipsec/ipsec_test_out.c
create mode 100644 test/validation/api/ipsec/test_vectors.h
rename test/{common_plat => }/validation/api/lock/.gitignore (100%)
rename test/{common_plat => }/validation/api/lock/Makefile.am (77%)
rename test/{common_plat => }/validation/api/lock/lock.c (100%)
rename test/{common_plat => }/validation/api/lock/lock.h (100%)
rename test/{common_plat => }/validation/api/lock/lock_main.c (100%)
rename test/{common_plat => }/validation/api/packet/.gitignore (100%)
rename test/{common_plat => }/validation/api/packet/Makefile.am (77%)
rename test/{common_plat => }/validation/api/packet/packet.c (98%)
rename test/{common_plat => }/validation/api/packet/packet.h (100%)
rename test/{common_plat => }/validation/api/packet/packet_main.c (100%)
rename test/{common_plat => }/validation/api/pktio/.gitignore (100%)
rename test/{common_plat => }/validation/api/pktio/Makefile.am (79%)
rename test/{common_plat => }/validation/api/pktio/parser.c (100%)
rename test/{common_plat => }/validation/api/pktio/parser.h (100%)
rename test/{common_plat => }/validation/api/pktio/pktio.c (100%)
rename test/{common_plat => }/validation/api/pktio/pktio.h (100%)
rename test/{common_plat => }/validation/api/pktio/pktio_main.c (100%)
rename test/{common_plat => }/validation/api/pool/.gitignore (100%)
rename test/{common_plat => }/validation/api/pool/Makefile.am (77%)
rename test/{common_plat => }/validation/api/pool/pool.c (100%)
rename test/{common_plat => }/validation/api/pool/pool.h (100%)
rename test/{common_plat => }/validation/api/pool/pool_main.c (100%)
rename test/{common_plat => }/validation/api/queue/.gitignore (100%)
rename test/{common_plat => }/validation/api/queue/Makefile.am (77%)
rename test/{common_plat => }/validation/api/queue/queue.c (100%)
rename test/{common_plat => }/validation/api/queue/queue.h (100%)
rename test/{common_plat => }/validation/api/queue/queue_main.c (100%)
rename test/{common_plat => }/validation/api/random/.gitignore (100%)
rename test/{common_plat => }/validation/api/random/Makefile.am (77%)
rename test/{common_plat => }/validation/api/random/random.c (100%)
rename test/{common_plat => }/validation/api/random/random.h (100%)
rename test/{common_plat => }/validation/api/random/random_main.c (100%)
rename test/{common_plat => }/validation/api/scheduler/.gitignore (100%)
rename test/{common_plat => }/validation/api/scheduler/Makefile.am (78%)
rename test/{common_plat => }/validation/api/scheduler/scheduler.c (100%)
rename test/{common_plat => }/validation/api/scheduler/scheduler.h (100%)
rename test/{common_plat => }/validation/api/scheduler/scheduler_main.c (100%)
rename test/{common_plat => }/validation/api/shmem/.gitignore (100%)
rename test/{common_plat => }/validation/api/shmem/Makefile.am (77%)
rename test/{common_plat => }/validation/api/shmem/shmem.c (97%)
rename test/{common_plat => }/validation/api/shmem/shmem.h (100%)
rename test/{common_plat => }/validation/api/shmem/shmem_main.c (100%)
rename test/{common_plat => }/validation/api/std_clib/.gitignore (100%)
rename test/{common_plat => }/validation/api/std_clib/Makefile.am (77%)
rename test/{common_plat => }/validation/api/std_clib/std_clib.c (100%)
rename test/{common_plat => }/validation/api/std_clib/std_clib.h (100%)
rename test/{common_plat => }/validation/api/std_clib/std_clib_main.c (100%)
rename test/{common_plat => }/validation/api/system/.gitignore (100%)
rename test/{common_plat => }/validation/api/system/Makefile.am (77%)
rename test/{common_plat => }/validation/api/system/system.c (100%)
rename test/{common_plat => }/validation/api/system/system.h (100%)
rename test/{common_plat => }/validation/api/system/system_main.c (100%)
rename test/{common_plat => }/validation/api/thread/.gitignore (100%)
rename test/{common_plat => }/validation/api/thread/Makefile.am (84%)
rename test/{common_plat => }/validation/api/thread/thread.c (100%)
rename test/{common_plat => }/validation/api/thread/thread.h (100%)
rename test/{common_plat => }/validation/api/thread/thread_main.c (100%)
rename test/{common_plat => }/validation/api/time/.gitignore (100%)
rename test/{common_plat => }/validation/api/time/Makefile.am (89%)
rename test/{common_plat => }/validation/api/time/time.c (100%)
rename test/{common_plat => }/validation/api/time/time.sh (93%)
rename test/{common_plat => }/validation/api/time/time_main.c (100%)
rename test/{common_plat => }/validation/api/time/time_test.h (100%)
rename test/{common_plat => }/validation/api/timer/.gitignore (100%)
rename test/{common_plat => }/validation/api/timer/Makefile.am (77%)
rename test/{common_plat => }/validation/api/timer/timer.c (100%)
rename test/{common_plat => }/validation/api/timer/timer.h (100%)
rename test/{common_plat => }/validation/api/timer/timer_main.c (100%)
rename test/{common_plat => }/validation/api/traffic_mngr/.gitignore (100%)
rename test/{common_plat => }/validation/api/traffic_mngr/Makefile.am (89%)
rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr.c (100%)
rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr.h (100%)
rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr.sh (93%)
rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr_main.c (100%)
rename test/{linux-generic/performance => validation/drv}/.gitignore (100%)
rename test/{common_plat => }/validation/drv/Makefile.am (100%)
create mode 100644 test/validation/drv/Makefile.inc
rename test/{common_plat => }/validation/drv/README (100%)
rename test/{common_plat => }/validation/drv/drvatomic/.gitignore (100%)
rename test/{common_plat => }/validation/drv/drvatomic/Makefile.am (100%)
rename test/{common_plat => }/validation/drv/drvatomic/drvatomic.c (100%)
rename test/{common_plat => }/validation/drv/drvatomic/drvatomic.h (100%)
rename test/{common_plat => }/validation/drv/drvatomic/drvatomic_main.c (100%)
rename test/{common_plat => }/validation/drv/drvdriver/.gitignore (100%)
rename test/{common_plat => }/validation/drv/drvdriver/Makefile.am (100%)
rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_device.c (100%)
rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_device.h (100%)
rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_device_main.c (100%)
rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_devio.c (100%)
rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_devio.h (100%)
rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_devio_main.c (100%)
rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_driver.c (100%)
rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_driver.h (100%)
rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_driver_main.c (100%)
rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_enumr.c (100%)
rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_enumr.h (100%)
rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_enumr_class.c (100%)
rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_enumr_class.h (100%)
rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_enumr_class_main.c (100%)
rename test/{common_plat => }/validation/drv/drvdriver/drvdriver_enumr_main.c (100%)
rename test/{common_plat => }/validation/drv/drvshmem/.gitignore (100%)
rename test/{common_plat => }/validation/drv/drvshmem/Makefile.am (100%)
rename test/{common_plat => }/validation/drv/drvshmem/drvshmem.c (100%)
rename test/{common_plat => }/validation/drv/drvshmem/drvshmem.h (100%)
rename test/{common_plat => }/validation/drv/drvshmem/drvshmem_main.c (100%)
hooks/post-receive
--
6 years, 5 months
- 1
- 0
[COMMIT] branch master updated. v1.16.0.0-12-g5329e521
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via 5329e5211c447b9b823149baf76112eedfeb07fb (commit)
via ce058b8fdde37cc302bcf589f458dab7b8d3e365 (commit)
via 5d6a9f036cdeeb79215328a63b2dc63962e292a0 (commit)
via 4459e1bd35534dd1b6a313890c74086c0e86c617 (commit)
via 163f57de92d66336433cf5638538828e10053655 (commit)
via fe1f56c168423800534b85d61f319d1dc327b49b (commit)
from 9163719bd4c04321592dad9da7f26539f49c8b7a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5329e5211c447b9b823149baf76112eedfeb07fb
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Nov 15 12:52:42 2017 +0200
linux-gen: pktio: add pktio capability to pktio_entry_t
Since odp_pktio_capability_t is common for all pktio implementations move
it inside pktio_entry_t.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h
index 7f0e2853..05f00ad3 100644
--- a/platform/linux-generic/include/odp_packet_dpdk.h
+++ b/platform/linux-generic/include/odp_packet_dpdk.h
@@ -60,7 +60,6 @@ typedef struct {
uint8_t lockless_tx; /**< no locking for tx */
uint8_t port_id; /**< DPDK port identifier */
/* --- 34 bytes --- */
- odp_pktio_capability_t capa; /**< interface capabilities */
odp_ticketlock_t rx_lock[PKTIO_MAX_QUEUES]; /**< RX queue locks */
odp_ticketlock_t tx_lock[PKTIO_MAX_QUEUES]; /**< TX queue locks */
/** cache for storing extra RX packets */
diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h
index 1a4e345f..83c449e8 100644
--- a/platform/linux-generic/include/odp_packet_io_internal.h
+++ b/platform/linux-generic/include/odp_packet_io_internal.h
@@ -159,6 +159,7 @@ struct pktio_entry {
odp_pool_t pool;
odp_pktio_param_t param;
+ odp_pktio_capability_t capa; /**< Packet IO capabilities */
/* Storage for queue handles
* Multi-queue support is pktio driver specific */
diff --git a/platform/linux-generic/include/odp_packet_netmap.h b/platform/linux-generic/include/odp_packet_netmap.h
index a6f68d56..876c7e46 100644
--- a/platform/linux-generic/include/odp_packet_netmap.h
+++ b/platform/linux-generic/include/odp_packet_netmap.h
@@ -52,7 +52,6 @@ typedef struct {
char nm_name[IF_NAMESIZE + 7]; /**< netmap:<ifname> */
char if_name[IF_NAMESIZE]; /**< interface name used in ioctl */
odp_bool_t is_virtual; /**< nm virtual port (VALE/pipe) */
- odp_pktio_capability_t capa; /**< interface capabilities */
uint32_t num_rx_rings; /**< number of nm rx rings */
uint32_t num_tx_rings; /**< number of nm tx rings */
unsigned num_rx_desc_rings; /**< number of rx descriptor rings */
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index e9f71257..07671e62 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -1122,7 +1122,7 @@ static void dpdk_init_capability(pktio_entry_t *pktio_entry,
struct rte_eth_dev_info *dev_info)
{
pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk;
- odp_pktio_capability_t *capa = &pkt_dpdk->capa;
+ odp_pktio_capability_t *capa = &pktio_entry->s.capa;
int ptype_cnt;
int ptype_l3_ipv4 = 0;
int ptype_l4_tcp = 0;
@@ -1545,7 +1545,7 @@ static int dpdk_promisc_mode_get(pktio_entry_t *pktio_entry)
static int dpdk_capability(pktio_entry_t *pktio_entry,
odp_pktio_capability_t *capa)
{
- *capa = pktio_entry->s.pkt_dpdk.capa;
+ *capa = pktio_entry->s.capa;
return 0;
}
diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c
index 297d54dc..cbcf7789 100644
--- a/platform/linux-generic/pktio/netmap.c
+++ b/platform/linux-generic/pktio/netmap.c
@@ -267,9 +267,9 @@ static inline int netmap_wait_for_link(pktio_entry_t *pktio_entry)
static void netmap_init_capability(pktio_entry_t *pktio_entry)
{
pkt_netmap_t *pkt_nm = &pktio_entry->s.pkt_nm;
- odp_pktio_capability_t *capa = &pkt_nm->capa;
+ odp_pktio_capability_t *capa = &pktio_entry->s.capa;
- memset(&pkt_nm->capa, 0, sizeof(odp_pktio_capability_t));
+ memset(capa, 0, sizeof(odp_pktio_capability_t));
capa->max_input_queues = PKTIO_MAX_QUEUES;
if (pkt_nm->num_rx_rings < PKTIO_MAX_QUEUES)
@@ -395,8 +395,8 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry,
ODP_DBG("Unable to fetch thread ID. VALE port MAC "
"addresses may not be unique.\n");
- pkt_nm->capa.max_input_queues = 1;
- pkt_nm->capa.set_op.op.promisc_mode = 0;
+ pktio_entry->s.capa.max_input_queues = 1;
+ pktio_entry->s.capa.set_op.op.promisc_mode = 0;
pkt_nm->mtu = buf_size;
pktio_entry->s.stats_type = STATS_UNSUPPORTED;
/* Set MAC address for virtual interface */
@@ -430,7 +430,7 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry,
/* Check if RSS is supported. If not, set 'max_input_queues' to 1. */
if (rss_conf_get_supported_fd(sockfd, netdev, &hash_proto) == 0) {
ODP_DBG("RSS not supported\n");
- pkt_nm->capa.max_input_queues = 1;
+ pktio_entry->s.capa.max_input_queues = 1;
}
err = netmap_do_ioctl(pktio_entry, SIOCGIFFLAGS, 0);
@@ -897,7 +897,7 @@ static int netmap_promisc_mode_get(pktio_entry_t *pktio_entry)
static int netmap_capability(pktio_entry_t *pktio_entry,
odp_pktio_capability_t *capa)
{
- *capa = pktio_entry->s.pkt_nm.capa;
+ *capa = pktio_entry->s.capa;
return 0;
}
commit ce058b8fdde37cc302bcf589f458dab7b8d3e365
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Nov 7 11:03:14 2017 +0200
linux-gen: pool: add inlined accessors for selected pool parameters
Add inlined accessors for pool_t members pool_hdl and uarea_size. This
enables removing the matching members from odp_buffer_hdr_t, and thus
reduces per buffer overhead.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
index 1804fa6f..c808f2d6 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
@@ -21,6 +21,9 @@
/** @internal Inline function offsets */
extern const _odp_packet_inline_offset_t _odp_packet_inline;
+/** @internal Pool inline function offsets */
+extern const _odp_pool_inline_offset_t _odp_pool_inline;
+
#if ODP_ABI_COMPAT == 1
/** @internal Inline function @param seg @return */
static inline uint32_t _odp_packet_seg_to_ndx(odp_packet_seg_t seg)
@@ -68,7 +71,9 @@ static inline uint32_t _odp_packet_tailroom(odp_packet_t pkt)
/** @internal Inline function @param pkt @return */
static inline odp_pool_t _odp_packet_pool(odp_packet_t pkt)
{
- return _odp_pkt_get(pkt, odp_pool_t, pool);
+ void *pool = _odp_pkt_get(pkt, void *, pool);
+
+ return _odp_pool_get(pool, odp_pool_t, pool_hdl);
}
/** @internal Inline function @param pkt @return */
@@ -98,7 +103,9 @@ static inline void *_odp_packet_user_area(odp_packet_t pkt)
/** @internal Inline function @param pkt @return */
static inline uint32_t _odp_packet_user_area_size(odp_packet_t pkt)
{
- return _odp_pkt_get(pkt, uint32_t, user_area_size);
+ void *pool = _odp_pkt_get(pkt, void *, pool);
+
+ return _odp_pool_get(pool, uint32_t, uarea_size);
}
/** @internal Inline function @param pkt @return */
diff --git a/platform/linux-generic/include/odp/api/plat/packet_types.h b/platform/linux-generic/include/odp/api/plat/packet_types.h
index 68c66312..009a3aa7 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_types.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_types.h
@@ -94,8 +94,6 @@ typedef struct _odp_packet_inline_offset_t {
/** @internal field offset */
uint16_t user_area;
/** @internal field offset */
- uint16_t user_area_size;
- /** @internal field offset */
uint16_t flow_hash;
/** @internal field offset */
uint16_t timestamp;
diff --git a/platform/linux-generic/include/odp/api/plat/pool_types.h b/platform/linux-generic/include/odp/api/plat/pool_types.h
index 8bc816d4..9a26dde5 100644
--- a/platform/linux-generic/include/odp/api/plat/pool_types.h
+++ b/platform/linux-generic/include/odp/api/plat/pool_types.h
@@ -48,6 +48,19 @@ typedef enum odp_pool_type_t {
#endif
+/** @internal Pool field accessor */
+#define _odp_pool_get(pool, cast, field) \
+ (*(cast *)(uintptr_t)((uint8_t *)pool + _odp_pool_inline.field))
+
+/** @internal Pool header field offsets for inline functions */
+typedef struct _odp_pool_inline_offset_t {
+ /** @internal field offset */
+ uint16_t pool_hdl;
+ /** @internal field offset */
+ uint16_t uarea_size;
+
+} _odp_pool_inline_offset_t;
+
#ifdef __cplusplus
}
#endif
diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h
index ac189301..c56c5b01 100644
--- a/platform/linux-generic/include/odp_buffer_internal.h
+++ b/platform/linux-generic/include/odp_buffer_internal.h
@@ -104,17 +104,10 @@ struct odp_buffer_hdr_t {
/* User area pointer */
void *uarea_addr;
- /* User area size */
- uint32_t uarea_size;
-
/* ipc mapped process can not walk over pointers,
* offset has to be used */
uint64_t ipc_data_offset;
- /* Pool handle: will be removed, used only for odp_packet_pool()
- * inlining */
- odp_pool_t pool_hdl;
-
/* Data or next header */
uint8_t data[0];
} ODP_ALIGNED_CACHE;
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index ca706b2e..04f1f33b 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -32,12 +32,11 @@ const _odp_packet_inline_offset_t _odp_packet_inline ODP_ALIGNED_CACHE = {
.frame_len = offsetof(odp_packet_hdr_t, frame_len),
.headroom = offsetof(odp_packet_hdr_t, headroom),
.tailroom = offsetof(odp_packet_hdr_t, tailroom),
- .pool = offsetof(odp_packet_hdr_t, buf_hdr.pool_hdl),
+ .pool = offsetof(odp_packet_hdr_t, buf_hdr.pool_ptr),
.input = offsetof(odp_packet_hdr_t, input),
.segcount = offsetof(odp_packet_hdr_t, buf_hdr.segcount),
.user_ptr = offsetof(odp_packet_hdr_t, buf_hdr.buf_ctx),
.user_area = offsetof(odp_packet_hdr_t, buf_hdr.uarea_addr),
- .user_area_size = offsetof(odp_packet_hdr_t, buf_hdr.uarea_size),
.flow_hash = offsetof(odp_packet_hdr_t, flow_hash),
.timestamp = offsetof(odp_packet_hdr_t, timestamp),
.input_flags = offsetof(odp_packet_hdr_t, p.input_flags)
@@ -266,7 +265,6 @@ static inline void packet_seg_copy_md(odp_packet_hdr_t *dst,
/* buffer header side packet metadata */
dst->buf_hdr.buf_u64 = src->buf_hdr.buf_u64;
dst->buf_hdr.uarea_addr = src->buf_hdr.uarea_addr;
- dst->buf_hdr.uarea_size = src->buf_hdr.uarea_size;
/* segmentation data is not copied:
* buf_hdr.seg[]
@@ -1837,18 +1835,20 @@ int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt)
{
odp_packet_hdr_t *srchdr = packet_hdr(srcpkt);
odp_packet_hdr_t *dsthdr = packet_hdr(dstpkt);
+ pool_t *src_pool = srchdr->buf_hdr.pool_ptr;
+ pool_t *dst_pool = dsthdr->buf_hdr.pool_ptr;
+ uint32_t src_uarea_size = src_pool->params.pkt.uarea_size;
+ uint32_t dst_uarea_size = dst_pool->params.pkt.uarea_size;
dsthdr->input = srchdr->input;
dsthdr->dst_queue = srchdr->dst_queue;
dsthdr->buf_hdr.buf_u64 = srchdr->buf_hdr.buf_u64;
if (dsthdr->buf_hdr.uarea_addr != NULL &&
- srchdr->buf_hdr.uarea_addr != NULL)
- memcpy(dsthdr->buf_hdr.uarea_addr,
- srchdr->buf_hdr.uarea_addr,
- dsthdr->buf_hdr.uarea_size <=
- srchdr->buf_hdr.uarea_size ?
- dsthdr->buf_hdr.uarea_size :
- srchdr->buf_hdr.uarea_size);
+ srchdr->buf_hdr.uarea_addr != NULL) {
+ memcpy(dsthdr->buf_hdr.uarea_addr, srchdr->buf_hdr.uarea_addr,
+ dst_uarea_size <= src_uarea_size ? dst_uarea_size :
+ src_uarea_size);
+ }
copy_packet_parser_metadata(srchdr, dsthdr);
@@ -1856,7 +1856,7 @@ int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt)
* user area was truncated in the process. Note this can only
* happen when copying between different pools.
*/
- return dsthdr->buf_hdr.uarea_size < srchdr->buf_hdr.uarea_size;
+ return dst_uarea_size < src_uarea_size;
}
/**
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
index 7d7a423b..c0dd41eb 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -57,6 +57,16 @@ typedef struct pool_local_t {
pool_table_t *pool_tbl;
static __thread pool_local_t local;
+#include <odp/visibility_begin.h>
+
+/* Fill in pool header field offsets for inline functions */
+const _odp_pool_inline_offset_t _odp_pool_inline ODP_ALIGNED_CACHE = {
+ .pool_hdl = offsetof(pool_t, pool_hdl),
+ .uarea_size = offsetof(pool_t, params.pkt.uarea_size)
+};
+
+#include <odp/visibility_end.h>
+
static inline odp_pool_t pool_index_to_handle(uint32_t pool_idx)
{
return _odp_cast_scalar(odp_pool_t, pool_idx);
@@ -288,11 +298,8 @@ static void init_buffers(pool_t *pool)
buf_hdr->index = i;
buf_hdr->type = type;
buf_hdr->event_type = type;
- buf_hdr->pool_hdl = pool->pool_hdl;
buf_hdr->pool_ptr = pool;
buf_hdr->uarea_addr = uarea;
- /* Show user requested size through API */
- buf_hdr->uarea_size = pool->params.pkt.uarea_size;
buf_hdr->segcount = 1;
buf_hdr->num_seg = 1;
buf_hdr->next_seg = NULL;
commit 5d6a9f036cdeeb79215328a63b2dc63962e292a0
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Mon Nov 6 16:15:54 2017 +0200
linux-gen: pool: remove unnecessary pool_entry_from_hdl() calls
Pool entry pointer is already stored in the odp_buffer_hdr_t struct.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index 89fb34b6..fb3d4449 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -193,7 +193,7 @@ static inline seg_entry_t *seg_entry_last(odp_packet_hdr_t *hdr)
*/
static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len)
{
- pool_t *pool = pool_entry_from_hdl(pkt_hdr->buf_hdr.pool_hdl);
+ pool_t *pool = pkt_hdr->buf_hdr.pool_ptr;
uint32_t seg_len;
int num = pkt_hdr->buf_hdr.segcount;
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 6d1f1bd0..ca706b2e 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -338,7 +338,7 @@ static inline void link_segments(odp_packet_hdr_t *pkt_hdr[], int num)
int cur, i;
odp_packet_hdr_t *hdr;
odp_packet_hdr_t *head = pkt_hdr[0];
- uint32_t seg_len = pool_entry_from_hdl(head->buf_hdr.pool_hdl)->seg_len;
+ uint32_t seg_len = ((pool_t *)(head->buf_hdr.pool_ptr))->seg_len;
cur = 0;
@@ -385,7 +385,7 @@ static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num)
/* First segment is the packet descriptor */
hdr = pkt_hdr[0];
- seg_len = pool_entry_from_hdl(hdr->buf_hdr.pool_hdl)->seg_len;
+ seg_len = ((pool_t *)(hdr->buf_hdr.pool_ptr))->seg_len;
/* Defaults for single segment packet */
hdr->buf_hdr.seg[0].data = hdr->buf_hdr.base_data;
@@ -416,7 +416,7 @@ static inline void reset_seg(odp_packet_hdr_t *pkt_hdr, int first, int num)
void *base;
int i;
seg_entry_t *seg;
- uint32_t seg_len = pool_entry_from_hdl(hdr->buf_hdr.pool_hdl)->seg_len;
+ uint32_t seg_len = ((pool_t *)(hdr->buf_hdr.pool_ptr))->seg_len;
uint8_t idx;
seg_entry_find_idx(&hdr, &idx, first);
commit 4459e1bd35534dd1b6a313890c74086c0e86c617
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Mon Nov 6 12:52:04 2017 +0200
linux-gen: buffer: remove data size member from odp_buffer_hdr_t
Data size is constant for all buffers from the same pool, so there is no
need to store the value in the buffer header.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h
index aefb1352..ac189301 100644
--- a/platform/linux-generic/include/odp_buffer_internal.h
+++ b/platform/linux-generic/include/odp_buffer_internal.h
@@ -107,9 +107,6 @@ struct odp_buffer_hdr_t {
/* User area size */
uint32_t uarea_size;
- /* Max data size */
- uint32_t size;
-
/* ipc mapped process can not walk over pointers,
* offset has to be used */
uint64_t ipc_data_offset;
diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h
index 48945ee1..61ec5ccc 100644
--- a/platform/linux-generic/include/odp_pool_internal.h
+++ b/platform/linux-generic/include/odp_pool_internal.h
@@ -61,6 +61,7 @@ typedef struct pool_t {
uint32_t headroom;
uint32_t tailroom;
uint32_t seg_len;
+ uint32_t max_seg_len;
uint32_t max_len;
uint32_t uarea_size;
uint32_t block_size;
diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c
index 1b148489..a0e0cd10 100644
--- a/platform/linux-generic/odp_buffer.c
+++ b/platform/linux-generic/odp_buffer.c
@@ -36,8 +36,9 @@ void *odp_buffer_addr(odp_buffer_t buf)
uint32_t odp_buffer_size(odp_buffer_t buf)
{
odp_buffer_hdr_t *hdr = buf_hdl_to_hdr(buf);
+ pool_t *pool = hdr->pool_ptr;
- return hdr->size;
+ return pool->seg_len;
}
int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf)
@@ -62,7 +63,7 @@ int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf)
len += snprintf(&str[len], n-len,
" addr %p\n", hdr->seg[0].data);
len += snprintf(&str[len], n-len,
- " size %" PRIu32 "\n", hdr->size);
+ " size %" PRIu32 "\n", odp_buffer_size(buf));
len += snprintf(&str[len], n-len,
" type %i\n", hdr->type);
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 68a6eef5..6d1f1bd0 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -957,8 +957,9 @@ odp_event_t odp_packet_to_event(odp_packet_t pkt)
uint32_t odp_packet_buf_len(odp_packet_t pkt)
{
odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
+ pool_t *pool = pkt_hdr->buf_hdr.pool_ptr;
- return pkt_hdr->buf_hdr.size * pkt_hdr->buf_hdr.segcount;
+ return pool->max_seg_len * pkt_hdr->buf_hdr.segcount;
}
void *odp_packet_tail(odp_packet_t pkt)
@@ -1404,6 +1405,7 @@ int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len,
uint32_t shift;
uint32_t seglen = 0; /* GCC */
odp_packet_hdr_t *pkt_hdr = packet_hdr(*pkt);
+ pool_t *pool = pkt_hdr->buf_hdr.pool_ptr;
void *addr = packet_map(pkt_hdr, offset, &seglen, NULL);
uint64_t uaddr = (uint64_t)(uintptr_t)addr;
uint64_t misalign;
@@ -1420,7 +1422,7 @@ int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len,
return 0;
shift = align - misalign;
} else {
- if (len > pkt_hdr->buf_hdr.size)
+ if (len > pool->max_seg_len)
return -1;
shift = len - seglen;
uaddr -= shift;
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
index 3e47993c..7d7a423b 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -236,7 +236,6 @@ static void init_buffers(pool_t *pool)
ring_t *ring;
uint32_t mask;
int type;
- uint32_t seg_size;
uint64_t page_size;
int skipped_blocks = 0;
@@ -285,11 +284,8 @@ static void init_buffers(pool_t *pool)
memset(buf_hdr, 0, (uintptr_t)data - (uintptr_t)buf_hdr);
- seg_size = pool->headroom + pool->seg_len + pool->tailroom;
-
/* Initialize buffer metadata */
buf_hdr->index = i;
- buf_hdr->size = seg_size;
buf_hdr->type = type;
buf_hdr->event_type = type;
buf_hdr->pool_hdl = pool->pool_hdl;
@@ -469,6 +465,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params,
pool->align = align;
pool->headroom = headroom;
pool->seg_len = seg_len;
+ pool->max_seg_len = headroom + seg_len + tailroom;
pool->max_len = max_len;
pool->tailroom = tailroom;
pool->block_size = block_size;
commit 163f57de92d66336433cf5638538828e10053655
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Mon Nov 6 14:50:33 2017 +0200
linux-gen: dpdk: reorganize pkt_dpdk_t struct
Reorder pkt_dpdk_t members so that all struct members used in fast path
are located on the same cache line.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h
index d4c4f02c..7f0e2853 100644
--- a/platform/linux-generic/include/odp_packet_dpdk.h
+++ b/platform/linux-generic/include/odp_packet_dpdk.h
@@ -50,20 +50,21 @@ typedef union {
typedef struct {
odp_pool_t pool; /**< pool to alloc packets from */
struct rte_mempool *pkt_pool; /**< DPDK packet pool */
- odp_pktio_capability_t capa; /**< interface capabilities */
uint32_t data_room; /**< maximum packet length */
- uint16_t mtu; /**< maximum transmission unit */
- /** Use system call to get/set vdev promisc mode */
- odp_bool_t vdev_sysc_promisc;
- uint8_t port_id; /**< DPDK port identifier */
unsigned min_rx_burst; /**< minimum RX burst size */
odp_pktin_hash_proto_t hash; /**< Packet input hash protocol */
- odp_bool_t lockless_rx; /**< no locking for rx */
- odp_bool_t lockless_tx; /**< no locking for tx */
+ uint16_t mtu; /**< maximum transmission unit */
+ /** Use system call to get/set vdev promisc mode */
+ uint8_t vdev_sysc_promisc;
+ uint8_t lockless_rx; /**< no locking for rx */
+ uint8_t lockless_tx; /**< no locking for tx */
+ uint8_t port_id; /**< DPDK port identifier */
+ /* --- 34 bytes --- */
+ odp_pktio_capability_t capa; /**< interface capabilities */
odp_ticketlock_t rx_lock[PKTIO_MAX_QUEUES]; /**< RX queue locks */
odp_ticketlock_t tx_lock[PKTIO_MAX_QUEUES]; /**< TX queue locks */
/** cache for storing extra RX packets */
pkt_cache_t rx_cache[PKTIO_MAX_QUEUES];
-} pkt_dpdk_t;
+} pkt_dpdk_t ODP_ALIGNED_CACHE;
#endif
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index b5a87b82..e9f71257 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -1083,7 +1083,7 @@ static int dpdk_input_queues_config(pktio_entry_t *pktio_entry,
const odp_pktin_queue_param_t *p)
{
odp_pktin_mode_t mode = pktio_entry->s.param.in_mode;
- odp_bool_t lockless;
+ uint8_t lockless;
/**
* Scheduler synchronizes input queue polls. Only single thread
@@ -1106,7 +1106,7 @@ static int dpdk_output_queues_config(pktio_entry_t *pktio_entry,
const odp_pktout_queue_param_t *p)
{
pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk;
- odp_bool_t lockless;
+ uint8_t lockless;
if (p->op_mode == ODP_PKTIO_OP_MT_UNSAFE)
lockless = 1;
commit fe1f56c168423800534b85d61f319d1dc327b49b
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Nov 1 14:47:05 2017 +0200
configure: disable debug by default and print configured value
Disable debug checks by default for optimal performance.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/configure.ac b/configure.ac
index 459ea231..95e31602 100644
--- a/configure.ac
+++ b/configure.ac
@@ -227,7 +227,8 @@ DX_INIT_DOXYGEN($PACKAGE_NAME,
AC_ARG_ENABLE([debug],
[AS_HELP_STRING([--enable-debug],
[include additional debugging code ]
- [(set to 'full' to enable all --enable-*-debug-* options)])])
+ [(set to 'full' to enable all --enable-*-debug-* options)])],
+ [], [enable_debug=no])
AS_IF([test "x$enable_debug" != "xno"], [ODP_DEBUG=1],
[ODP_DEBUG=0])
@@ -380,6 +381,7 @@ AC_MSG_RESULT([
shared libraries: ${enable_shared}
ABI compatible: ${abi_compat}
Deprecated APIs: ${deprecated}
+ debug: ${enable_debug}
cunit: ${cunit_support}
test_vald: ${test_vald}
test_perf: ${test_perf}
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 4 ++-
.../include/odp/api/plat/packet_inlines.h | 11 +++++--
.../include/odp/api/plat/packet_types.h | 2 --
.../include/odp/api/plat/pool_types.h | 13 +++++++++
.../linux-generic/include/odp_buffer_internal.h | 10 -------
platform/linux-generic/include/odp_packet_dpdk.h | 16 +++++-----
.../linux-generic/include/odp_packet_internal.h | 2 +-
.../linux-generic/include/odp_packet_io_internal.h | 1 +
platform/linux-generic/include/odp_packet_netmap.h | 1 -
platform/linux-generic/include/odp_pool_internal.h | 1 +
platform/linux-generic/odp_buffer.c | 5 ++--
platform/linux-generic/odp_packet.c | 34 ++++++++++++----------
platform/linux-generic/odp_pool.c | 18 +++++++-----
platform/linux-generic/pktio/dpdk.c | 8 ++---
platform/linux-generic/pktio/netmap.c | 12 ++++----
15 files changed, 78 insertions(+), 60 deletions(-)
hooks/post-receive
--
6 years, 5 months
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-600-gd4b36484
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, api-next has been updated
via d4b364849c4abb4c71e0c5260e1a793ebb8dc97d (commit)
via 4ddb329e3ed4401c9e5ebd42a2e54af28a1c4df6 (commit)
via 0d50939e19104a179af57de555c35d209e5d7ae6 (commit)
from f052591a39aa7c08d4868face4e6be17696ee946 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d4b364849c4abb4c71e0c5260e1a793ebb8dc97d
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sun Nov 12 17:15:05 2017 +0300
validation: crypto: check error flag being set
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index fdc0db8e..87f0ed93 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -203,6 +203,9 @@ static int alg_packet_op(odp_packet_t pkt,
return rc;
}
+ if (!result.ok)
+ CU_ASSERT(odp_packet_has_error(pkt));
+
*ok = result.ok;
return 0;
@@ -272,6 +275,8 @@ static int alg_packet_op_enq(odp_packet_t pkt,
return rc;
}
+ CU_ASSERT((!odp_packet_has_error(pkt)) == result.ok);
+
*ok = result.ok;
return 0;
commit 4ddb329e3ed4401c9e5ebd42a2e54af28a1c4df6
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sun Nov 12 17:13:44 2017 +0300
linux-gen: crypto: set packet error flag depending on crypto result operation
To speed up fast path of crypto packet operations, set error flag
depending on the crypto result operation. This allows applications to
fast-forward packets w/o errors and inspect crypto result only for
erroneous packets.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index 1ebe4690..6506a1db 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -55,6 +55,7 @@ typedef union {
uint32_t udp_err:1; /**< UDP error, checks TBD */
uint32_t l4_chksum:1; /**< L4 checksum error */
uint32_t ipsec_err:1; /**< IPsec error */
+ uint32_t crypto_err:1; /**< Crypto packet operation error */
};
} error_flags_t;
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 2fc611ed..67dd3249 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -1309,6 +1309,7 @@ int odp_crypto_int(odp_packet_t pkt_in,
odp_bool_t allocated = false;
odp_packet_t out_pkt = *pkt_out;
odp_crypto_packet_result_t *op_result;
+ odp_packet_hdr_t *pkt_hdr;
session = (odp_crypto_generic_session_t *)(intptr_t)param->session;
@@ -1362,6 +1363,9 @@ int odp_crypto_int(odp_packet_t pkt_in,
(rc_cipher == ODP_CRYPTO_ALG_ERR_NONE) &&
(rc_auth == ODP_CRYPTO_ALG_ERR_NONE);
+ pkt_hdr = odp_packet_hdr(out_pkt);
+ pkt_hdr->p.error_flags.crypto_err = !op_result->ok;
+
/* Synchronous, simply return results */
*pkt_out = out_pkt;
commit 0d50939e19104a179af57de555c35d209e5d7ae6
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sun Nov 12 17:13:05 2017 +0300
linux-gen: crypto: drop extra memcpy on result return
There is no need to fill local struct and then copy it to packet. Just
fill packet data directly, saving one memcpy call.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 6d0ad709..2fc611ed 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -1306,7 +1306,6 @@ int odp_crypto_int(odp_packet_t pkt_in,
odp_crypto_alg_err_t rc_cipher = ODP_CRYPTO_ALG_ERR_NONE;
odp_crypto_alg_err_t rc_auth = ODP_CRYPTO_ALG_ERR_NONE;
odp_crypto_generic_session_t *session;
- odp_crypto_packet_result_t local_result;
odp_bool_t allocated = false;
odp_packet_t out_pkt = *pkt_out;
odp_crypto_packet_result_t *op_result;
@@ -1352,18 +1351,16 @@ int odp_crypto_int(odp_packet_t pkt_in,
}
/* Fill in result */
- local_result.cipher_status.alg_err = rc_cipher;
- local_result.cipher_status.hw_err = ODP_CRYPTO_HW_ERR_NONE;
- local_result.auth_status.alg_err = rc_auth;
- local_result.auth_status.hw_err = ODP_CRYPTO_HW_ERR_NONE;
- local_result.ok =
- (rc_cipher == ODP_CRYPTO_ALG_ERR_NONE) &&
- (rc_auth == ODP_CRYPTO_ALG_ERR_NONE);
-
_odp_buffer_event_subtype_set(packet_to_buffer(out_pkt),
ODP_EVENT_PACKET_CRYPTO);
op_result = get_op_result_from_packet(out_pkt);
- *op_result = local_result;
+ op_result->cipher_status.alg_err = rc_cipher;
+ op_result->cipher_status.hw_err = ODP_CRYPTO_HW_ERR_NONE;
+ op_result->auth_status.alg_err = rc_auth;
+ op_result->auth_status.hw_err = ODP_CRYPTO_HW_ERR_NONE;
+ op_result->ok =
+ (rc_cipher == ODP_CRYPTO_ALG_ERR_NONE) &&
+ (rc_auth == ODP_CRYPTO_ALG_ERR_NONE);
/* Synchronous, simply return results */
*pkt_out = out_pkt;
-----------------------------------------------------------------------
Summary of changes:
.../linux-generic/include/odp_packet_internal.h | 1 +
platform/linux-generic/odp_crypto.c | 21 +++++++++++----------
test/validation/api/crypto/odp_crypto_test_inp.c | 5 +++++
3 files changed, 17 insertions(+), 10 deletions(-)
hooks/post-receive
--
6 years, 5 months
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-597-gf052591a
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, api-next has been updated
via f052591a39aa7c08d4868face4e6be17696ee946 (commit)
via b8ca2afddff13fb79dabc9b04748dde24afb53e5 (commit)
via b571aebe37d22c2ec1642b51a05aedcb73f83247 (commit)
via 34b945c77b9d88ce3b984d2703e9a69883b565c9 (commit)
via c4c795f20e7b726b820481a1130847a30f55aab8 (commit)
via 871e5ba93165c5f46a339989018549fffc483299 (commit)
via 12a572044af7311bc900ec8819b6221aca6f90a4 (commit)
via a975690536d3e78bd7d6aa8a27a22f58a0c7d4ea (commit)
via 718b5ce6e5871dafab4e198f0429bd2047a0eee7 (commit)
via a3c129506c5a08c50af4722148c698ad6b575011 (commit)
from ba93e355ddf151215aa18b59cbfca08fe175fe65 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f052591a39aa7c08d4868face4e6be17696ee946
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Mon Nov 13 16:38:15 2017 +0300
linux-gen: drop unnecessary odp_crypto_internal include
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index e62854b1..1ebe4690 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -25,7 +25,6 @@ extern "C" {
#include <odp/api/packet.h>
#include <odp/api/packet_io.h>
#include <odp/api/crypto.h>
-#include <odp_crypto_internal.h>
#include <odp_ipsec_internal.h>
#include <odp/api/plat/packet_types.h>
#include <odp_queue_if.h>
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index d54ec328..0ebc6534 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -264,7 +264,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
unsigned stats_length;
uint16_t ipsec_offset; /**< Offset of IPsec header from
buffer start */
- uint8_t iv[MAX_IV_LEN]; /**< ESP IV storage */
+ uint8_t iv[IPSEC_MAX_IV_LEN]; /**< ESP IV storage */
ipsec_aad_t aad; /**< AAD, note ESN is not fully supported */
unsigned hdr_len; /**< Length of IPsec headers */
unsigned trl_len; /**< Length of IPsec trailers */
@@ -628,7 +628,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
int rc;
uint16_t ipsec_offset; /**< Offset of IPsec header from
buffer start */
- uint8_t iv[MAX_IV_LEN]; /**< ESP IV storage */
+ uint8_t iv[IPSEC_MAX_IV_LEN]; /**< ESP IV storage */
ipsec_aad_t aad; /**< AAD, note ESN is not fully supported */
unsigned hdr_len; /**< Length of IPsec headers */
unsigned trl_len; /**< Length of IPsec trailers */
commit b8ca2afddff13fb79dabc9b04748dde24afb53e5
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Mon Nov 13 16:36:53 2017 +0300
linux-gen: crypto: drop duplicate authentication field
session->auth.bytes duplicates session->p.auth_digest_len, so let's drop
first field.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_crypto_internal.h b/platform/linux-generic/include/odp_crypto_internal.h
index 21174daa..32178d9d 100644
--- a/platform/linux-generic/include/odp_crypto_internal.h
+++ b/platform/linux-generic/include/odp_crypto_internal.h
@@ -50,7 +50,6 @@ struct odp_crypto_generic_session {
struct {
uint8_t key[EVP_MAX_KEY_LENGTH];
uint32_t key_length;
- uint32_t bytes;
union {
const EVP_MD *evp_md;
const EVP_CIPHER *evp_cipher;
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 1cc2d701..6d0ad709 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -207,7 +207,7 @@ odp_crypto_alg_err_t auth_gen(odp_packet_t pkt,
/* Copy to the output location */
odp_packet_copy_from_mem(pkt,
param->hash_result_offset,
- session->auth.bytes,
+ session->p.auth_digest_len,
hash);
return ODP_CRYPTO_ALG_ERR_NONE;
@@ -218,7 +218,7 @@ odp_crypto_alg_err_t auth_check(odp_packet_t pkt,
const odp_crypto_packet_op_param_t *param,
odp_crypto_generic_session_t *session)
{
- uint32_t bytes = session->auth.bytes;
+ uint32_t bytes = session->p.auth_digest_len;
uint8_t hash_in[EVP_MAX_MD_SIZE];
uint8_t hash_out[EVP_MAX_MD_SIZE];
@@ -703,8 +703,7 @@ static int process_auth_param(odp_crypto_generic_session_t *session,
session->auth.evp_md = evp_md;
/* Number of valid bytes */
- session->auth.bytes = session->p.auth_digest_len;
- if (session->auth.bytes < (unsigned)EVP_MD_size(evp_md) / 2)
+ if (session->p.auth_digest_len < (unsigned)EVP_MD_size(evp_md) / 2)
return -1;
/* Convert keys */
commit b571aebe37d22c2ec1642b51a05aedcb73f83247
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Mon Nov 13 16:33:32 2017 +0300
validation: api: add AES-GMAC-AH testcases
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index 5a267200..7b39c2c5 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -301,6 +301,12 @@ int ipsec_check_esp_aes_gcm_256(void)
ODP_AUTH_ALG_AES_GCM, 0);
}
+int ipsec_check_ah_aes_gmac_128(void)
+{
+ return ipsec_check_esp(ODP_CIPHER_ALG_NULL, 0,
+ ODP_AUTH_ALG_AES_GMAC, 128);
+}
+
int ipsec_check_esp_null_aes_gmac_128(void)
{
return ipsec_check_esp(ODP_CIPHER_ALG_NULL, 0,
diff --git a/test/validation/api/ipsec/ipsec.h b/test/validation/api/ipsec/ipsec.h
index 16608fe0..9a24dd38 100644
--- a/test/validation/api/ipsec/ipsec.h
+++ b/test/validation/api/ipsec/ipsec.h
@@ -87,6 +87,7 @@ int ipsec_check_esp_aes_cbc_128_sha256(void);
int ipsec_check_esp_aes_ctr_128_null(void);
int ipsec_check_esp_aes_gcm_128(void);
int ipsec_check_esp_aes_gcm_256(void);
+int ipsec_check_ah_aes_gmac_128(void);
int ipsec_check_esp_null_aes_gmac_128(void);
#endif
diff --git a/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c
index 0f7148d7..294e4a5d 100644
--- a/test/validation/api/ipsec/ipsec_test_in.c
+++ b/test/validation/api/ipsec/ipsec_test_in.c
@@ -1009,6 +1009,36 @@ static void test_in_mcgrew_gcm_15_esp(void)
ipsec_sa_destroy(sa);
}
+static void test_in_ah_aes_gmac_128(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, true, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_AES_GMAC, &key_a5_128,
+ &key_mcgrew_gcm_salt_2);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_icmp_0_ah_aes_gmac_128_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void test_in_esp_null_aes_gmac_128(void)
{
odp_ipsec_sa_param_t param;
@@ -1110,6 +1140,8 @@ odp_testinfo_t ipsec_in_suite[] = {
ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_sha256_bad1,
ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ah_aes_gmac_128,
+ ipsec_check_ah_aes_gmac_128),
ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_aes_gmac_128,
ipsec_check_esp_null_aes_gmac_128),
ODP_TEST_INFO_NULL,
diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c
index a498b663..7d4ea4a7 100644
--- a/test/validation/api/ipsec/ipsec_test_out.c
+++ b/test/validation/api/ipsec/ipsec_test_out.c
@@ -361,6 +361,36 @@ static void test_out_esp_aes_gcm128(void)
ipsec_sa_destroy(sa);
}
+static void test_out_ah_aes_gmac_128(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ false, true, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_AES_GMAC, &key_a5_128,
+ &key_mcgrew_gcm_salt_2);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0_ah_aes_gmac_128_1 },
+ },
+ };
+
+ ipsec_check_out_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void test_out_esp_null_aes_gmac_128(void)
{
odp_ipsec_sa_param_t param;
@@ -418,6 +448,8 @@ odp_testinfo_t ipsec_out_suite[] = {
ipsec_check_esp_aes_ctr_128_null),
ODP_TEST_INFO_CONDITIONAL(test_out_esp_aes_gcm128,
ipsec_check_esp_aes_gcm_128),
+ ODP_TEST_INFO_CONDITIONAL(test_out_ah_aes_gmac_128,
+ ipsec_check_ah_aes_gmac_128),
ODP_TEST_INFO_CONDITIONAL(test_out_esp_null_aes_gmac_128,
ipsec_check_esp_null_aes_gmac_128),
ODP_TEST_INFO_NULL,
diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec/test_vectors.h
index 09823e63..7fb7d5a8 100644
--- a/test/validation/api/ipsec/test_vectors.h
+++ b/test/validation/api/ipsec/test_vectors.h
@@ -625,6 +625,46 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_aes_ctr_null_1 = {
},
};
+static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_aes_gmac_128_1 = {
+ .len = 178,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 34,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00,
+
+ /* IP */
+ 0x45, 0x00, 0x00, 0xa4, 0x00, 0x00, 0x00, 0x00,
+ 0x40, 0x33, 0xab, 0xd1, 0xc0, 0xa8, 0x6f, 0x02,
+ 0xc0, 0xa8, 0xde, 0x02,
+
+ /* AH */
+ 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7b,
+ 0x00, 0x00, 0x00, 0x01,
+ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xd6, 0x0e, 0xcc, 0x22, 0x31, 0x79, 0x59, 0x72,
+ 0x68, 0xc9, 0x58, 0xfb, 0x8b, 0xb0, 0xbb, 0xd5,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00,
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b,
+ },
+};
+
static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_aes_gmac_128_1 = {
.len = 178,
.l2_offset = 0,
commit 34b945c77b9d88ce3b984d2703e9a69883b565c9
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Mon Nov 13 16:30:44 2017 +0300
linux-gen: ipsec: implement AES-GMAC-AH
Implement AES-GMAC authentication support for AH.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 9533ca42..d54ec328 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -400,6 +400,16 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
}
}
+ memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length);
+ if (odp_packet_copy_to_mem(pkt,
+ ipsec_offset + _ODP_AHHDR_LEN,
+ ipsec_sa->esp_iv_len,
+ iv + ipsec_sa->salt_length) < 0) {
+ status->error.alg = 1;
+ goto err;
+ }
+ param.override_iv_ptr = iv;
+
hdr_len = (ah.ah_len + 2) * 4;
trl_len = 0;
@@ -425,7 +435,8 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
param.auth_range.offset = ip_offset;
param.auth_range.length = odp_be_to_cpu_16(ip->tot_len);
- param.hash_result_offset = ipsec_offset + _ODP_AHHDR_LEN;
+ param.hash_result_offset = ipsec_offset + _ODP_AHHDR_LEN +
+ ipsec_sa->esp_iv_len;
stats_length = param.auth_range.length;
} else {
@@ -826,7 +837,8 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
} else if (ipsec_sa->proto == ODP_IPSEC_AH) {
_odp_ahhdr_t ah;
- hdr_len = _ODP_AHHDR_LEN + ipsec_sa->icv_len;
+ hdr_len = _ODP_AHHDR_LEN + ipsec_sa->esp_iv_len +
+ ipsec_sa->icv_len;
trl_len = 0;
/* Save IPv4 stuff */
@@ -853,7 +865,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
memset(&ah, 0, sizeof(ah));
ah.spi = odp_cpu_to_be_32(ipsec_sa->spi);
- ah.ah_len = 1 + (ipsec_sa->icv_len / 4);
+ ah.ah_len = 1 + (ipsec_sa->esp_iv_len + ipsec_sa->icv_len) / 4;
ah.seq_no = odp_cpu_to_be_32(ipsec_seq_no(ipsec_sa));
ah.next_header = ip->proto;
ip->proto = _ODP_IPPROTO_AH;
@@ -864,11 +876,34 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
param.aad.ptr = (uint8_t *)&aad;
param.aad.length = sizeof(aad);
+ /* For GMAC */
+ if (ipsec_sa->use_counter_iv) {
+ uint64_t ctr;
+
+ ODP_ASSERT(sizeof(ctr) == ipsec_sa->esp_iv_len);
+
+ ctr = odp_atomic_fetch_add_u64(&ipsec_sa->out.counter,
+ 1);
+ /* Check for overrun */
+ if (ctr == 0)
+ goto err;
+
+ memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length);
+ memcpy(iv + ipsec_sa->salt_length, &ctr,
+ ipsec_sa->esp_iv_len);
+ param.override_iv_ptr = iv;
+ }
+
odp_packet_copy_from_mem(pkt,
ipsec_offset, _ODP_AHHDR_LEN,
&ah);
+ odp_packet_copy_from_mem(pkt,
+ ipsec_offset + _ODP_AHHDR_LEN,
+ ipsec_sa->esp_iv_len,
+ iv + ipsec_sa->salt_length);
_odp_packet_set_data(pkt,
- ipsec_offset + _ODP_AHHDR_LEN,
+ ipsec_offset + _ODP_AHHDR_LEN +
+ ipsec_sa->esp_iv_len,
0, ipsec_sa->icv_len);
ip->chksum = 0;
@@ -878,7 +913,8 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
param.auth_range.offset = ip_offset;
param.auth_range.length = odp_be_to_cpu_16(ip->tot_len);
- param.hash_result_offset = ipsec_offset + _ODP_AHHDR_LEN;
+ param.hash_result_offset = ipsec_offset + _ODP_AHHDR_LEN +
+ ipsec_sa->esp_iv_len;
stats_length = param.auth_range.length;
} else {
commit c4c795f20e7b726b820481a1130847a30f55aab8
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 8 20:09:10 2017 +0300
validation: ipsec: support AES-GMAC-ESP validation
Add AES-GMAC-ESP testcase based on draft-mcgrew-gcm-test-01.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index e6a22a1a..5a267200 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -208,6 +208,10 @@ int ipsec_check(odp_bool_t ah,
if (!capa.auths.bit.aes_gcm)
return ODP_TEST_INACTIVE;
break;
+ case ODP_AUTH_ALG_AES_GMAC:
+ if (!capa.auths.bit.aes_gmac)
+ return ODP_TEST_INACTIVE;
+ break;
default:
fprintf(stderr, "Unsupported authentication algorithm\n");
return ODP_TEST_INACTIVE;
@@ -297,6 +301,12 @@ int ipsec_check_esp_aes_gcm_256(void)
ODP_AUTH_ALG_AES_GCM, 0);
}
+int ipsec_check_esp_null_aes_gmac_128(void)
+{
+ return ipsec_check_esp(ODP_CIPHER_ALG_NULL, 0,
+ ODP_AUTH_ALG_AES_GMAC, 128);
+}
+
void ipsec_sa_param_fill(odp_ipsec_sa_param_t *param,
odp_bool_t in,
odp_bool_t ah,
diff --git a/test/validation/api/ipsec/ipsec.h b/test/validation/api/ipsec/ipsec.h
index 3d4e5bcd..16608fe0 100644
--- a/test/validation/api/ipsec/ipsec.h
+++ b/test/validation/api/ipsec/ipsec.h
@@ -87,5 +87,6 @@ int ipsec_check_esp_aes_cbc_128_sha256(void);
int ipsec_check_esp_aes_ctr_128_null(void);
int ipsec_check_esp_aes_gcm_128(void);
int ipsec_check_esp_aes_gcm_256(void);
+int ipsec_check_esp_null_aes_gmac_128(void);
#endif
diff --git a/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c
index 8c883262..0f7148d7 100644
--- a/test/validation/api/ipsec/ipsec_test_in.c
+++ b/test/validation/api/ipsec/ipsec_test_in.c
@@ -978,6 +978,67 @@ static void test_in_mcgrew_gcm_12_esp(void)
ipsec_sa_destroy(sa);
}
+static void test_in_mcgrew_gcm_15_esp(void)
+{
+ odp_ipsec_tunnel_param_t tunnel = {};
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 0x00004321, &tunnel,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_AES_GMAC, &key_mcgrew_gcm_15,
+ &key_mcgrew_gcm_salt_15);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_mcgrew_gcm_test_15_esp,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_mcgrew_gcm_test_15},
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_in_esp_null_aes_gmac_128(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_AES_GMAC, &key_a5_128,
+ &key_mcgrew_gcm_salt_2);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_icmp_0_esp_null_aes_gmac_128_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void ipsec_test_capability(void)
{
odp_ipsec_capability_t capa;
@@ -1005,6 +1066,8 @@ odp_testinfo_t ipsec_in_suite[] = {
ipsec_check_esp_aes_gcm_128),
ODP_TEST_INFO_CONDITIONAL(test_in_mcgrew_gcm_12_esp,
ipsec_check_esp_aes_gcm_128),
+ ODP_TEST_INFO_CONDITIONAL(test_in_mcgrew_gcm_15_esp,
+ ipsec_check_esp_null_aes_gmac_128),
ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256,
ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256_tun,
@@ -1047,5 +1110,7 @@ odp_testinfo_t ipsec_in_suite[] = {
ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_sha256_bad1,
ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_aes_gmac_128,
+ ipsec_check_esp_null_aes_gmac_128),
ODP_TEST_INFO_NULL,
};
diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c
index b543271b..a498b663 100644
--- a/test/validation/api/ipsec/ipsec_test_out.c
+++ b/test/validation/api/ipsec/ipsec_test_out.c
@@ -361,6 +361,36 @@ static void test_out_esp_aes_gcm128(void)
ipsec_sa_destroy(sa);
}
+static void test_out_esp_null_aes_gmac_128(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ false, false, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_AES_GMAC, &key_a5_128,
+ &key_mcgrew_gcm_salt_2);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0_esp_null_aes_gmac_128_1 },
+ },
+ };
+
+ ipsec_check_out_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void ipsec_test_capability(void)
{
odp_ipsec_capability_t capa;
@@ -388,5 +418,7 @@ odp_testinfo_t ipsec_out_suite[] = {
ipsec_check_esp_aes_ctr_128_null),
ODP_TEST_INFO_CONDITIONAL(test_out_esp_aes_gcm128,
ipsec_check_esp_aes_gcm_128),
+ ODP_TEST_INFO_CONDITIONAL(test_out_esp_null_aes_gmac_128,
+ ipsec_check_esp_null_aes_gmac_128),
ODP_TEST_INFO_NULL,
};
diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec/test_vectors.h
index fbf7d366..09823e63 100644
--- a/test/validation/api/ipsec/test_vectors.h
+++ b/test/validation/api/ipsec/test_vectors.h
@@ -45,6 +45,9 @@ KEY(key_mcgrew_gcm_salt_4, 0x00, 0x00, 0x00, 0x00);
KEY(key_mcgrew_gcm_12, 0x7d, 0x77, 0x3d, 0x00, 0xc1, 0x44, 0xc5, 0x25,
0xac, 0x61, 0x9d, 0x18, 0xc8, 0x4a, 0x3f, 0x47);
KEY(key_mcgrew_gcm_salt_12, 0xd9, 0x66, 0x42, 0x67);
+KEY(key_mcgrew_gcm_15, 0x4c, 0x80, 0xcd, 0xef, 0xbb, 0x5d, 0x10, 0xda,
+ 0x90, 0x6a, 0xc7, 0x3c, 0x36, 0x13, 0xa6, 0x34);
+KEY(key_mcgrew_gcm_salt_15, 0x22, 0x43, 0x3c, 0x64);
static const ODP_UNUSED ipsec_test_packet pkt_icmp_0 = {
.len = 142,
@@ -622,6 +625,52 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_aes_ctr_null_1 = {
},
};
+static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_aes_gmac_128_1 = {
+ .len = 178,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 34,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00,
+
+ /* IP */
+ 0x45, 0x00, 0x00, 0xa4, 0x00, 0x00, 0x00, 0x00,
+ 0x40, 0x32, 0xab, 0xd2, 0xc0, 0xa8, 0x6f, 0x02,
+ 0xc0, 0xa8, 0xde, 0x02,
+
+ /* ESP */
+ 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01,
+
+ /* IV */
+ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00,
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b,
+
+ /* ESP TRL */
+ 0x01, 0x02, 0x02, 0x01,
+
+ /* ICV */
+ 0x16, 0x0e, 0xa6, 0x8f, 0xb3, 0xa6, 0x8c, 0x74,
+ 0x19, 0x59, 0x72, 0x80, 0x91, 0x98, 0x77, 0x5e,
+ },
+};
+
static const ODP_UNUSED ipsec_test_packet pkt_rfc3602_5 = {
.len = 98,
.l2_offset = 0,
@@ -1088,4 +1137,61 @@ static const ipsec_test_packet pkt_mcgrew_gcm_test_12_esp = {
},
};
+static const ipsec_test_packet pkt_mcgrew_gcm_test_15 = {
+ .len = 62,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 34,
+ .data = {
+ /* ETH - not a part of RFC, added for simplicity */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00,
+
+ /* IP */
+ 0x45, 0x00, 0x00, 0x30, 0xda, 0x3a, 0x00, 0x00,
+ 0x80, 0x01, 0xdf, 0x3b, 0xc0, 0xa8, 0x00, 0x05,
+ 0xc0, 0xa8, 0x00, 0x01,
+
+ /* ICMP */
+ 0x08, 0x00, 0xc6, 0xcd, 0x02, 0x00, 0x07, 0x00,
+ 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
+ 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70,
+ 0x71, 0x72, 0x73, 0x74,
+ },
+};
+
+static const ipsec_test_packet pkt_mcgrew_gcm_test_15_esp = {
+ .len = 118,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 34,
+ .data = {
+ /* ETH - not a part of RFC, added for simplicity */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00,
+
+ /* IP - not a part of RFC, added for simplicity */
+ 0x45, 0x00, 0x00, 0x68, 0x69, 0x8f, 0x00, 0x00,
+ 0x80, 0x32, 0x4d, 0xb2, 0xc0, 0xa8, 0x01, 0x02,
+ 0xc0, 0xa8, 0x01, 0x01,
+
+ /* ESP */
+ 0x00, 0x00, 0x43, 0x21, 0x00, 0x00, 0x00, 0x07,
+
+ /* IV */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+ /* IP */
+ 0x45, 0x00, 0x00, 0x30, 0xda, 0x3a, 0x00, 0x00,
+ 0x80, 0x01, 0xdf, 0x3b, 0xc0, 0xa8, 0x00, 0x05,
+ 0xc0, 0xa8, 0x00, 0x01, 0x08, 0x00, 0xc6, 0xcd,
+ 0x02, 0x00, 0x07, 0x00, 0x61, 0x62, 0x63, 0x64,
+ 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c,
+ 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74,
+ 0x01, 0x02, 0x02, 0x01, 0xf2, 0xa9, 0xa8, 0x36,
+ 0xe1, 0x55, 0x10, 0x6a, 0xa8, 0xdc, 0xd6, 0x18,
+ 0xe4, 0x09, 0x9a, 0xaa,
+ },
+};
+
#endif
commit 871e5ba93165c5f46a339989018549fffc483299
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 8 20:08:12 2017 +0300
validation: ipsec: check authentication key length is supported
Add check through auth capabilities, verifying that key length is
supported.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index 277d393a..e6a22a1a 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -122,13 +122,14 @@ static void pktio_stop(odp_pktio_t pktio)
int ipsec_check(odp_bool_t ah,
odp_cipher_alg_t cipher,
uint32_t cipher_bits,
- odp_auth_alg_t auth)
+ odp_auth_alg_t auth,
+ uint32_t auth_bits)
{
odp_ipsec_capability_t capa;
odp_crypto_cipher_capability_t cipher_capa[MAX_ALG_CAPA];
odp_crypto_auth_capability_t auth_capa[MAX_ALG_CAPA];
int i, num;
- odp_bool_t found = false;
+ odp_bool_t found;
if (odp_ipsec_capability(&capa) < 0)
return ODP_TEST_INACTIVE;
@@ -219,6 +220,7 @@ int ipsec_check(odp_bool_t ah,
}
/* Search for the test case */
+ found = false;
for (i = 0; i < num; i++) {
if (cipher_capa[i].key_len == cipher_bits / 8) {
found = 1;
@@ -237,48 +239,62 @@ int ipsec_check(odp_bool_t ah,
return ODP_TEST_INACTIVE;
}
+ /* Search for the test case */
+ found = false;
+ for (i = 0; i < num; i++) {
+ if (auth_capa[i].key_len == auth_bits / 8) {
+ found = 1;
+ break;
+ }
+ }
+
+ if (!found) {
+ fprintf(stderr, "Unsupported auth key length\n");
+ return ODP_TEST_INACTIVE;
+ }
+
return ODP_TEST_ACTIVE;
}
int ipsec_check_ah_sha256(void)
{
- return ipsec_check_ah(ODP_AUTH_ALG_SHA256_HMAC);
+ return ipsec_check_ah(ODP_AUTH_ALG_SHA256_HMAC, 256);
}
int ipsec_check_esp_null_sha256(void)
{
return ipsec_check_esp(ODP_CIPHER_ALG_NULL, 0,
- ODP_AUTH_ALG_SHA256_HMAC);
+ ODP_AUTH_ALG_SHA256_HMAC, 256);
}
int ipsec_check_esp_aes_cbc_128_null(void)
{
return ipsec_check_esp(ODP_CIPHER_ALG_AES_CBC, 128,
- ODP_AUTH_ALG_NULL);
+ ODP_AUTH_ALG_NULL, 0);
}
int ipsec_check_esp_aes_cbc_128_sha256(void)
{
return ipsec_check_esp(ODP_CIPHER_ALG_AES_CBC, 128,
- ODP_AUTH_ALG_SHA256_HMAC);
+ ODP_AUTH_ALG_SHA256_HMAC, 256);
}
int ipsec_check_esp_aes_ctr_128_null(void)
{
return ipsec_check_esp(ODP_CIPHER_ALG_AES_CTR, 128,
- ODP_AUTH_ALG_NULL);
+ ODP_AUTH_ALG_NULL, 0);
}
int ipsec_check_esp_aes_gcm_128(void)
{
return ipsec_check_esp(ODP_CIPHER_ALG_AES_GCM, 128,
- ODP_AUTH_ALG_AES_GCM);
+ ODP_AUTH_ALG_AES_GCM, 0);
}
int ipsec_check_esp_aes_gcm_256(void)
{
return ipsec_check_esp(ODP_CIPHER_ALG_AES_GCM, 256,
- ODP_AUTH_ALG_AES_GCM);
+ ODP_AUTH_ALG_AES_GCM, 0);
}
void ipsec_sa_param_fill(odp_ipsec_sa_param_t *param,
diff --git a/test/validation/api/ipsec/ipsec.h b/test/validation/api/ipsec/ipsec.h
index d4506367..3d4e5bcd 100644
--- a/test/validation/api/ipsec/ipsec.h
+++ b/test/validation/api/ipsec/ipsec.h
@@ -74,11 +74,12 @@ void ipsec_check_out_in_one(const ipsec_test_part *part,
int ipsec_check(odp_bool_t ah,
odp_cipher_alg_t cipher,
uint32_t cipher_bits,
- odp_auth_alg_t auth);
-#define ipsec_check_ah(auth) \
- ipsec_check(true, ODP_CIPHER_ALG_NULL, 0, auth)
-#define ipsec_check_esp(cipher, cipher_bits, auth) \
- ipsec_check(false, cipher, cipher_bits, auth)
+ odp_auth_alg_t auth,
+ uint32_t auth_bits);
+#define ipsec_check_ah(auth, auth_bits) \
+ ipsec_check(true, ODP_CIPHER_ALG_NULL, 0, auth, auth_bits)
+#define ipsec_check_esp(cipher, cipher_bits, auth, auth_bits) \
+ ipsec_check(false, cipher, cipher_bits, auth, auth_bits)
int ipsec_check_ah_sha256(void);
int ipsec_check_esp_null_sha256(void);
int ipsec_check_esp_aes_cbc_128_null(void);
commit 12a572044af7311bc900ec8819b6221aca6f90a4
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 8 20:09:56 2017 +0300
linux-gen: ipsec: add support for AES-GMAC-ESP
Implement AES-GMAC-ESP support.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index 8eaa4f90..f1fde5e6 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -267,38 +267,6 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
crypto_param.auth_alg = param->crypto.auth_alg;
crypto_param.auth_key = param->crypto.auth_key;
- switch (crypto_param.auth_alg) {
- case ODP_AUTH_ALG_NULL:
- ipsec_sa->icv_len = 0;
- break;
-#if ODP_DEPRECATED_API
- case ODP_AUTH_ALG_MD5_96:
-#endif
- case ODP_AUTH_ALG_MD5_HMAC:
- ipsec_sa->icv_len = 12;
- break;
- case ODP_AUTH_ALG_SHA1_HMAC:
- ipsec_sa->icv_len = 12;
- break;
-#if ODP_DEPRECATED_API
- case ODP_AUTH_ALG_SHA256_128:
-#endif
- case ODP_AUTH_ALG_SHA256_HMAC:
- ipsec_sa->icv_len = 16;
- break;
- case ODP_AUTH_ALG_SHA512_HMAC:
- ipsec_sa->icv_len = 32;
- break;
-#if ODP_DEPRECATED_API
- case ODP_AUTH_ALG_AES128_GCM:
-#endif
- case ODP_AUTH_ALG_AES_GCM:
- ipsec_sa->icv_len = 16;
- break;
- default:
- goto error;
- }
-
switch (crypto_param.cipher_alg) {
case ODP_CIPHER_ALG_NULL:
ipsec_sa->esp_iv_len = 0;
@@ -339,6 +307,47 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
goto error;
}
+ switch (crypto_param.auth_alg) {
+ case ODP_AUTH_ALG_NULL:
+ ipsec_sa->icv_len = 0;
+ break;
+#if ODP_DEPRECATED_API
+ case ODP_AUTH_ALG_MD5_96:
+#endif
+ case ODP_AUTH_ALG_MD5_HMAC:
+ ipsec_sa->icv_len = 12;
+ break;
+ case ODP_AUTH_ALG_SHA1_HMAC:
+ ipsec_sa->icv_len = 12;
+ break;
+#if ODP_DEPRECATED_API
+ case ODP_AUTH_ALG_SHA256_128:
+#endif
+ case ODP_AUTH_ALG_SHA256_HMAC:
+ ipsec_sa->icv_len = 16;
+ break;
+ case ODP_AUTH_ALG_SHA512_HMAC:
+ ipsec_sa->icv_len = 32;
+ break;
+#if ODP_DEPRECATED_API
+ case ODP_AUTH_ALG_AES128_GCM:
+#endif
+ case ODP_AUTH_ALG_AES_GCM:
+ ipsec_sa->icv_len = 16;
+ break;
+ case ODP_AUTH_ALG_AES_GMAC:
+ if (ODP_CIPHER_ALG_NULL != crypto_param.cipher_alg)
+ return ODP_IPSEC_SA_INVALID;
+ ipsec_sa->use_counter_iv = 1;
+ ipsec_sa->esp_iv_len = 8;
+ ipsec_sa->esp_block_len = 16;
+ ipsec_sa->icv_len = 16;
+ crypto_param.iv.length = 12;
+ break;
+ default:
+ goto error;
+ }
+
if (1 == ipsec_sa->use_counter_iv &&
ODP_IPSEC_DIR_OUTBOUND == param->dir)
odp_atomic_init_u64(&ipsec_sa->out.counter, 1);
commit a975690536d3e78bd7d6aa8a27a22f58a0c7d4ea
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 8 20:06:50 2017 +0300
linux-gen: crypto: add AES-GMAC implementation
Implement AES-GMAC on top of OpenSSL AES-GCM with all text going into
AAD part.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_crypto_internal.h b/platform/linux-generic/include/odp_crypto_internal.h
index 12d1720b..21174daa 100644
--- a/platform/linux-generic/include/odp_crypto_internal.h
+++ b/platform/linux-generic/include/odp_crypto_internal.h
@@ -51,7 +51,10 @@ struct odp_crypto_generic_session {
uint8_t key[EVP_MAX_KEY_LENGTH];
uint32_t key_length;
uint32_t bytes;
- const EVP_MD *evp_md;
+ union {
+ const EVP_MD *evp_md;
+ const EVP_CIPHER *evp_cipher;
+ };
crypto_func_t func;
} auth;
};
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index f34863bf..1cc2d701 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -37,7 +37,9 @@
* Keep sorted: first by key length, then by IV length
*/
static const odp_crypto_cipher_capability_t cipher_capa_null[] = {
-{.key_len = 0, .iv_len = 0} };
+{.key_len = 0, .iv_len = 0},
+/* Special case for GMAC */
+{.key_len = 0, .iv_len = 12} };
static const odp_crypto_cipher_capability_t cipher_capa_trides_cbc[] = {
{.key_len = 24, .iv_len = 8} };
@@ -84,6 +86,9 @@ static const odp_crypto_auth_capability_t auth_capa_sha512_hmac[] = {
static const odp_crypto_auth_capability_t auth_capa_aes_gcm[] = {
{.digest_len = 16, .key_len = 0, .aad_len = {.min = 8, .max = 12, .inc = 4} } };
+static const odp_crypto_auth_capability_t auth_capa_aes_gmac[] = {
+{.digest_len = 16, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0} } };
+
typedef struct odp_crypto_global_s odp_crypto_global_t;
struct odp_crypto_global_s {
@@ -235,6 +240,33 @@ odp_crypto_alg_err_t auth_check(odp_packet_t pkt,
return ODP_CRYPTO_ALG_ERR_NONE;
}
+static
+int internal_aad(EVP_CIPHER_CTX *ctx,
+ odp_packet_t pkt,
+ const odp_crypto_packet_op_param_t *param)
+{
+ uint32_t offset = param->auth_range.offset;
+ uint32_t len = param->auth_range.length;
+ int dummy_len;
+ int ret;
+
+ ODP_ASSERT(offset + len <= odp_packet_len(pkt));
+
+ while (len > 0) {
+ uint32_t seglen = 0; /* GCC */
+ void *mapaddr = odp_packet_offset(pkt, offset, &seglen, NULL);
+ uint32_t maclen = len > seglen ? seglen : len;
+
+ EVP_EncryptUpdate(ctx, NULL, &dummy_len, mapaddr, maclen);
+ offset += maclen;
+ len -= maclen;
+ }
+
+ ret = EVP_EncryptFinal_ex(ctx, NULL, &dummy_len);
+
+ return ret;
+}
+
static
int internal_encrypt(EVP_CIPHER_CTX *ctx,
odp_packet_t pkt,
@@ -556,6 +588,108 @@ static int process_aes_gcm_param(odp_crypto_generic_session_t *session,
return 0;
}
+static
+odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt,
+ const odp_crypto_packet_op_param_t *param,
+ odp_crypto_generic_session_t *session)
+{
+ EVP_CIPHER_CTX *ctx;
+ void *iv_ptr;
+ uint8_t block[EVP_MAX_MD_SIZE];
+ int ret;
+
+ if (param->override_iv_ptr)
+ iv_ptr = param->override_iv_ptr;
+ else if (session->p.iv.data)
+ iv_ptr = session->cipher.iv_data;
+ else
+ return ODP_CRYPTO_ALG_ERR_IV_INVALID;
+
+ /* Encrypt it */
+ ctx = EVP_CIPHER_CTX_new();
+ EVP_EncryptInit_ex(ctx, session->auth.evp_cipher, NULL,
+ session->auth.key, NULL);
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN,
+ session->p.iv.length, NULL);
+ EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
+ EVP_CIPHER_CTX_set_padding(ctx, 0);
+
+ ret = internal_aad(ctx, pkt, param);
+
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_GET_TAG,
+ session->p.auth_digest_len, block);
+ odp_packet_copy_from_mem(pkt, param->hash_result_offset,
+ session->p.auth_digest_len, block);
+
+ EVP_CIPHER_CTX_free(ctx);
+
+ return ret <= 0 ? ODP_CRYPTO_ALG_ERR_DATA_SIZE :
+ ODP_CRYPTO_ALG_ERR_NONE;
+}
+
+static
+odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt,
+ const odp_crypto_packet_op_param_t *param,
+ odp_crypto_generic_session_t *session)
+{
+ EVP_CIPHER_CTX *ctx;
+ void *iv_ptr;
+ uint8_t block[EVP_MAX_MD_SIZE];
+ int ret;
+
+ if (param->override_iv_ptr)
+ iv_ptr = param->override_iv_ptr;
+ else if (session->p.iv.data)
+ iv_ptr = session->cipher.iv_data;
+ else
+ return ODP_CRYPTO_ALG_ERR_IV_INVALID;
+
+ /* Decrypt it */
+ ctx = EVP_CIPHER_CTX_new();
+ EVP_DecryptInit_ex(ctx, session->auth.evp_cipher, NULL,
+ session->auth.key, NULL);
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN,
+ session->p.iv.length, NULL);
+ EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr);
+ EVP_CIPHER_CTX_set_padding(ctx, 0);
+
+ odp_packet_copy_to_mem(pkt, param->hash_result_offset,
+ session->p.auth_digest_len, block);
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG,
+ session->p.auth_digest_len, block);
+ _odp_packet_set_data(pkt, param->hash_result_offset,
+ 0, session->p.auth_digest_len);
+
+ ret = internal_aad(ctx, pkt, param);
+
+ EVP_CIPHER_CTX_free(ctx);
+
+ return ret <= 0 ? ODP_CRYPTO_ALG_ERR_ICV_CHECK :
+ ODP_CRYPTO_ALG_ERR_NONE;
+}
+
+static int process_aes_gmac_param(odp_crypto_generic_session_t *session,
+ const EVP_CIPHER *cipher)
+{
+ /* Verify Key len is valid */
+ if ((uint32_t)EVP_CIPHER_key_length(cipher) !=
+ session->p.auth_key.length)
+ return -1;
+
+ memcpy(session->auth.key, session->p.auth_key.data,
+ session->p.auth_key.length);
+
+ session->auth.evp_cipher = cipher;
+
+ /* Set function */
+ if (ODP_CRYPTO_OP_ENCODE == session->p.op)
+ session->auth.func = aes_gmac_gen;
+ else
+ session->auth.func = aes_gmac_check;
+
+ return 0;
+}
+
static int process_auth_param(odp_crypto_generic_session_t *session,
uint32_t key_length,
const EVP_MD *evp_md)
@@ -601,6 +735,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa)
capa->auths.bit.sha256_hmac = 1;
capa->auths.bit.sha512_hmac = 1;
capa->auths.bit.aes_gcm = 1;
+ capa->auths.bit.aes_gmac = 1;
#if ODP_DEPRECATED_API
capa->ciphers.bit.aes128_cbc = 1;
@@ -688,6 +823,10 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth,
src = auth_capa_aes_gcm;
num = sizeof(auth_capa_aes_gcm) / size;
break;
+ case ODP_AUTH_ALG_AES_GMAC:
+ src = auth_capa_aes_gmac;
+ num = sizeof(auth_capa_aes_gmac) / size;
+ break;
default:
return -1;
}
@@ -859,6 +998,16 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
rc = -1;
}
break;
+ case ODP_AUTH_ALG_AES_GMAC:
+ if (param->auth_key.length == 16)
+ rc = process_aes_gmac_param(session, EVP_aes_128_gcm());
+ else if (param->auth_key.length == 24)
+ rc = process_aes_gmac_param(session, EVP_aes_192_gcm());
+ else if (param->auth_key.length == 32)
+ rc = process_aes_gmac_param(session, EVP_aes_256_gcm());
+ else
+ rc = -1;
+ break;
default:
rc = -1;
}
commit 718b5ce6e5871dafab4e198f0429bd2047a0eee7
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 8 20:04:17 2017 +0300
validation: crypto: add AES-GMAC testcase
Add AES-GMAC test vector based on draft-mcgrew-gcm-test-01.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/crypto/crypto.h b/test/validation/api/crypto/crypto.h
index ba1058f3..078a1909 100644
--- a/test/validation/api/crypto/crypto.h
+++ b/test/validation/api/crypto/crypto.h
@@ -36,6 +36,8 @@ void crypto_test_gen_alg_hmac_sha256(void);
void crypto_test_check_alg_hmac_sha256(void);
void crypto_test_gen_alg_hmac_sha512(void);
void crypto_test_check_alg_hmac_sha512(void);
+void crypto_test_gen_alg_aes_gmac(void);
+void crypto_test_check_alg_aes_gmac(void);
/* test arrays: */
extern odp_testinfo_t crypto_suite[];
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index 1f7523de..fdc0db8e 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -50,6 +50,8 @@ static const char *auth_alg_name(odp_auth_alg_t auth)
return "ODP_AUTH_ALG_SHA512_HMAC";
case ODP_AUTH_ALG_AES_GCM:
return "ODP_AUTH_ALG_AES_GCM";
+ case ODP_AUTH_ALG_AES_GMAC:
+ return "ODP_AUTH_ALG_AES_GMAC";
default:
return "Unknown";
}
@@ -344,6 +346,9 @@ static void alg_test(odp_crypto_op_t op,
if (auth_alg == ODP_AUTH_ALG_AES_GCM &&
!(capa.auths.bit.aes_gcm))
rc = -1;
+ if (auth_alg == ODP_AUTH_ALG_AES_GMAC &&
+ !(capa.auths.bit.aes_gmac))
+ rc = -1;
if (auth_alg == ODP_AUTH_ALG_MD5_HMAC &&
!(capa.auths.bit.md5_hmac))
rc = -1;
@@ -588,6 +593,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth)
if (!capability.auths.bit.aes_gcm)
return ODP_TEST_INACTIVE;
break;
+ case ODP_AUTH_ALG_AES_GMAC:
+ if (!capability.auths.bit.aes_gmac)
+ return ODP_TEST_INACTIVE;
+ break;
default:
fprintf(stderr, "Unsupported authentication algorithm\n");
return ODP_TEST_INACTIVE;
@@ -1114,6 +1123,39 @@ void crypto_test_check_alg_hmac_sha512(void)
false);
}
+static int check_alg_aes_gmac(void)
+{
+ return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_AES_GMAC);
+}
+
+void crypto_test_gen_alg_aes_gmac(void)
+{
+ unsigned int test_vec_num = (sizeof(aes_gmac_reference) /
+ sizeof(aes_gmac_reference[0]));
+ unsigned int i;
+
+ for (i = 0; i < test_vec_num; i++)
+ alg_test(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_AES_GMAC,
+ &aes_gmac_reference[i],
+ false);
+}
+
+void crypto_test_check_alg_aes_gmac(void)
+{
+ unsigned int test_vec_num = (sizeof(aes_gmac_reference) /
+ sizeof(aes_gmac_reference[0]));
+ unsigned int i;
+
+ for (i = 0; i < test_vec_num; i++)
+ alg_test(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_AES_GMAC,
+ &aes_gmac_reference[i],
+ false);
+}
+
int crypto_suite_sync_init(void)
{
suite_context.pool = odp_pool_lookup("packet_pool");
@@ -1219,6 +1261,10 @@ odp_testinfo_t crypto_suite[] = {
check_alg_hmac_sha512),
ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_sha512,
check_alg_hmac_sha512),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_aes_gmac,
+ check_alg_aes_gmac),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_aes_gmac,
+ check_alg_aes_gmac),
ODP_TEST_INFO_NULL,
};
diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h
index 63103227..f2ce9eb2 100644
--- a/test/validation/api/crypto/test_vectors.h
+++ b/test/validation/api/crypto/test_vectors.h
@@ -442,6 +442,39 @@ static crypto_test_reference_t aes_gcm_reference[] = {
}
};
+static crypto_test_reference_t aes_gmac_reference[] = {
+ {
+ .auth_key_length = AES128_GCM_KEY_LEN,
+ .auth_key = { 0x4c, 0x80, 0xcd, 0xef, 0xbb, 0x5d, 0x10, 0xda,
+ 0x90, 0x6a, 0xc7, 0x3c, 0x36, 0x13, 0xa6, 0x34},
+ .iv_length = AES_GCM_IV_LEN,
+ .iv = { 0x22, 0x43, 0x3c, 0x64, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00 },
+ .length = 68,
+ .plaintext = { 0x00, 0x00, 0x43, 0x21, 0x00, 0x00, 0x00, 0x07,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x45, 0x00, 0x00, 0x30, 0xda, 0x3a, 0x00, 0x00,
+ 0x80, 0x01, 0xdf, 0x3b, 0xc0, 0xa8, 0x00, 0x05,
+ 0xc0, 0xa8, 0x00, 0x01, 0x08, 0x00, 0xc6, 0xcd,
+ 0x02, 0x00, 0x07, 0x00, 0x61, 0x62, 0x63, 0x64,
+ 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c,
+ 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74,
+ 0x01, 0x02, 0x02, 0x01 },
+ .ciphertext = { 0x00, 0x00, 0x43, 0x21, 0x00, 0x00, 0x00, 0x07,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x45, 0x00, 0x00, 0x30, 0xda, 0x3a, 0x00, 0x00,
+ 0x80, 0x01, 0xdf, 0x3b, 0xc0, 0xa8, 0x00, 0x05,
+ 0xc0, 0xa8, 0x00, 0x01, 0x08, 0x00, 0xc6, 0xcd,
+ 0x02, 0x00, 0x07, 0x00, 0x61, 0x62, 0x63, 0x64,
+ 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c,
+ 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74,
+ 0x01, 0x02, 0x02, 0x01 },
+ .digest_length = AES_GCM_DIGEST_LEN,
+ .digest = { 0xf2, 0xa9, 0xa8, 0x36, 0xe1, 0x55, 0x10, 0x6a,
+ 0xa8, 0xdc, 0xd6, 0x18, 0xe4, 0x09, 0x9a, 0xaa }
+ },
+};
+
static crypto_test_reference_t hmac_md5_reference[] = {
{
.auth_key_length = HMAC_MD5_KEY_LEN,
commit a3c129506c5a08c50af4722148c698ad6b575011
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 8 20:02:59 2017 +0300
api: crypto: add AES-GMAC declarations
Add AES-GMAC declarations to support RFC4543.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h
index ed1fd678..6a4304d8 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -134,6 +134,20 @@ typedef enum {
*/
ODP_AUTH_ALG_AES_GCM,
+ /** AES in Galois/Counter MAC Mode
+ *
+ * NIST and RFC specifications of GCM/GMAC refer to all data to be
+ * authenticated as AAD. In constrast to that, ODP API specifies the
+ * bulk of authenticated data to be located in packet payload for all
+ * authentication algorithms, including GMAC. Thus for GMAC application
+ * should also pass all data to be authenticated as packet data. AAD is
+ * not used for GMAC. GMAC IV should be passed via session IV or
+ * per-packet IV override.
+ *
+ * @note Must be paired with cipher ODP_CIPHER_ALG_NULL
+ */
+ ODP_AUTH_ALG_AES_GMAC,
+
/** @deprecated Use ODP_AUTH_ALG_MD5_HMAC instead */
ODP_DEPRECATE(ODP_AUTH_ALG_MD5_96),
@@ -208,6 +222,9 @@ typedef union odp_crypto_auth_algos_t {
/** ODP_AUTH_ALG_AES_GCM */
uint32_t aes_gcm : 1;
+ /** ODP_AUTH_ALG_AES_GMAC*/
+ uint32_t aes_gmac : 1;
+
/** @deprecated Use md5_hmac instead */
uint32_t ODP_DEPRECATE(md5_96) : 1;
-----------------------------------------------------------------------
Summary of changes:
include/odp/api/spec/crypto.h | 17 +++
.../linux-generic/include/odp_crypto_internal.h | 6 +-
.../linux-generic/include/odp_packet_internal.h | 1 -
platform/linux-generic/odp_crypto.c | 158 ++++++++++++++++++++-
platform/linux-generic/odp_ipsec.c | 50 ++++++-
platform/linux-generic/odp_ipsec_sad.c | 73 +++++-----
test/validation/api/crypto/crypto.h | 2 +
test/validation/api/crypto/odp_crypto_test_inp.c | 46 ++++++
test/validation/api/crypto/test_vectors.h | 33 +++++
test/validation/api/ipsec/ipsec.c | 50 +++++--
test/validation/api/ipsec/ipsec.h | 13 +-
test/validation/api/ipsec/ipsec_test_in.c | 97 +++++++++++++
test/validation/api/ipsec/ipsec_test_out.c | 64 +++++++++
test/validation/api/ipsec/test_vectors.h | 146 +++++++++++++++++++
14 files changed, 695 insertions(+), 61 deletions(-)
hooks/post-receive
--
6 years, 5 months
- 1
- 0
[COMMIT] branch master updated. v1.16.0.0-6-g9163719b
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via 9163719bd4c04321592dad9da7f26539f49c8b7a (commit)
from 7e9004e87bab2eacd82d449286a84ae7a8cb75ab (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9163719bd4c04321592dad9da7f26539f49c8b7a
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Thu Nov 9 15:14:32 2017 +0200
travis: add build only test stage
Add basic build only test stage to the beginning of test run. This way
potential build errors are caught early on without having to wait for the
longer test jobs to finish.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/.travis.yml b/.travis.yml
index 6bd03a0c..b5c1b641 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,9 @@ language: c
sudo: required
dist: trusty
group: deprecated-2017Q2
+stages:
+ - "build only"
+ - test
env:
global:
# COVERITY_SCAN_TOKEN
@@ -256,7 +259,7 @@ jobs:
- ./configure --prefix=$HOME/odp-install
--enable-user-guides
- sudo PATH="$PATH" LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" make distcheck
- - stage: test
+ - stage: "build only"
env: TEST=doxygen
compiler: gcc
install:
@@ -282,6 +285,38 @@ jobs:
- echo ${TRAVIS_COMMIT_RANGE};
- ODP_PATCHES=`echo ${TRAVIS_COMMIT_RANGE} | sed 's/\.//'`;
- ./scripts/ci-checkpatches.sh ${ODP_PATCHES};
+ - stage: "build only"
+ env: CONF=""
+ compiler: gcc
+ install: true
+ script:
+ - ./bootstrap
+ - ./configure --enable-helper-linux
+ - make
+ - stage: "build only"
+ env: CONF=""
+ compiler: clang-3.8
+ install: true
+ script:
+ - ./bootstrap
+ - ./configure --enable-helper-linux
+ - make
+ - stage: "build only"
+ env: CROSS_ARCH="i386"
+ compiler: gcc
+ install: true
+ script:
+ - ./bootstrap
+ - ./configure --enable-helper-linux $CROSS
+ - make
+ - stage: "build only"
+ env: CROSS_ARCH="arm64"
+ compiler: gcc
+ install: true
+ script:
+ - ./bootstrap
+ - ./configure --enable-helper-linux $CROSS
+ - make
after_failure:
- cat config.log
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 37 ++++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
hooks/post-receive
--
6 years, 5 months
- 1
- 0
[COMMIT] branch master updated. v1.16.0.0-5-g7e9004e8
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via 7e9004e87bab2eacd82d449286a84ae7a8cb75ab (commit)
via d593398b2d55faf1e07f124a4c807c006eb856ea (commit)
via 4af5396e77ff170c80ec3720028493ed2c9f4826 (commit)
from fc020907bee7ec2ba976bc02399f6fd47f110d65 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7e9004e87bab2eacd82d449286a84ae7a8cb75ab
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Nov 8 14:40:46 2017 +0200
linux-gen: dpdk: call packet parse function only when necessary
Not calling packet_parse_layer() when packet input parsing is disabled
removes two unnecessary function calls from fast path.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index d7e9fcd4..b5a87b82 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -439,7 +439,7 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry,
if (pktio_cls_enabled(pktio_entry))
copy_packet_cls_metadata(&parsed_hdr, pkt_hdr);
- else
+ else if (pktio_entry->s.config.parser.layer)
packet_parse_layer(pkt_hdr,
pktio_entry->s.config.parser.layer);
@@ -654,7 +654,7 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry,
if (pktio_cls_enabled(pktio_entry))
copy_packet_cls_metadata(&parsed_hdr, pkt_hdr);
- else
+ else if (pktio_entry->s.config.parser.layer)
packet_parse_layer(pkt_hdr,
pktio_entry->s.config.parser.layer);
commit d593398b2d55faf1e07f124a4c807c006eb856ea
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri May 19 16:01:17 2017 +0300
linux-gen: dpdk: fix max_input_queues value for ixgbe devices
The RSS functionality is limited to max 16 queues on devices using ixgbe
driver even though dpdk rte_eth_dev_info may return a larger value.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 3684ca5c..d7e9fcd4 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -1135,6 +1135,13 @@ static void dpdk_init_capability(pktio_entry_t *pktio_entry,
rte_eth_dev_info_get(pkt_dpdk->port_id, dev_info);
capa->max_input_queues = RTE_MIN(dev_info->max_rx_queues,
PKTIO_MAX_QUEUES);
+
+ /* ixgbe devices support only 16 rx queues in RSS mode */
+ if (!strncmp(dev_info->driver_name, IXGBE_DRV_NAME,
+ strlen(IXGBE_DRV_NAME)))
+ capa->max_input_queues = RTE_MIN((unsigned)16,
+ capa->max_input_queues);
+
capa->max_output_queues = RTE_MIN(dev_info->max_tx_queues,
PKTIO_MAX_QUEUES);
capa->set_op.op.promisc_mode = 1;
commit 4af5396e77ff170c80ec3720028493ed2c9f4826
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Thu May 11 15:13:25 2017 +0300
linux-gen: dpdk: handle minimum rx burst size
Both ixgbe and i40e dpdk drivers have a minimum supported rx burst size of
four. Additionally, update driver names to match dpdk v17.08.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h
index 5d80d84a..d4c4f02c 100644
--- a/platform/linux-generic/include/odp_packet_dpdk.h
+++ b/platform/linux-generic/include/odp_packet_dpdk.h
@@ -30,12 +30,13 @@ ODP_STATIC_ASSERT((DPDK_NB_MBUF % DPDK_MEMPOOL_CACHE_SIZE == 0) &&
, "DPDK mempool cache size failure");
#endif
-#define DPDK_IXGBE_MIN_RX_BURST 4
+/* Minimum RX burst size */
+#define DPDK_MIN_RX_BURST 4
/** Cache for storing packets */
struct pkt_cache_t {
/** array for storing extra RX packets */
- struct rte_mbuf *pkt[DPDK_IXGBE_MIN_RX_BURST];
+ struct rte_mbuf *pkt[DPDK_MIN_RX_BURST];
unsigned idx; /**< head of cache */
unsigned count; /**< packets in cache */
};
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index de9295c4..3684ca5c 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -45,6 +45,10 @@ ODP_STATIC_ASSERT(PKT_EXTRA_LEN >= sizeof(struct rte_mbuf),
"DPDK rte_mbuf won't fit in odp_packet_hdr_t.extra!");
#endif
+/* DPDK poll mode drivers requiring minimum RX burst size DPDK_MIN_RX_BURST */
+#define IXGBE_DRV_NAME "net_ixgbe"
+#define I40E_DRV_NAME "net_i40e"
+
static int disable_pktio; /** !0 this pktio disabled, 0 enabled */
/* Has dpdk_pktio_init() been called */
@@ -1249,10 +1253,16 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED,
pkt_dpdk->vdev_sysc_promisc = 1;
rte_eth_promiscuous_disable(pkt_dpdk->port_id);
- if (!strcmp(dev_info.driver_name, "rte_ixgbe_pmd"))
- pkt_dpdk->min_rx_burst = DPDK_IXGBE_MIN_RX_BURST;
+ /* Drivers requiring minimum burst size. Supports also *_vf versions
+ * of the drivers. */
+ if (!strncmp(dev_info.driver_name, IXGBE_DRV_NAME,
+ strlen(IXGBE_DRV_NAME)) ||
+ !strncmp(dev_info.driver_name, I40E_DRV_NAME,
+ strlen(I40E_DRV_NAME)))
+ pkt_dpdk->min_rx_burst = DPDK_MIN_RX_BURST;
else
pkt_dpdk->min_rx_burst = 0;
+
if (ODP_DPDK_ZERO_COPY) {
if (pool_entry->ext_desc != NULL)
pkt_pool = (struct rte_mempool *)pool_entry->ext_desc;
@@ -1372,10 +1382,10 @@ static int dpdk_recv(pktio_entry_t *pktio_entry, int index,
if (!pkt_dpdk->lockless_rx)
odp_ticketlock_lock(&pkt_dpdk->rx_lock[index]);
/**
- * ixgbe_pmd has a minimum supported RX burst size ('min_rx_burst'). If
- * 'num' < 'min_rx_burst', 'min_rx_burst' is used as rte_eth_rx_burst()
- * argument and the possibly received extra packets are cached for the
- * next dpdk_recv_queue() call to use.
+ * ixgbe and i40e drivers have a minimum supported RX burst size
+ * ('min_rx_burst'). If 'num' < 'min_rx_burst', 'min_rx_burst' is used
+ * as rte_eth_rx_burst() argument and the possibly received extra
+ * packets are cached for the next dpdk_recv_queue() call to use.
*
* Either use cached packets or receive new ones. Not both during the
* same call. */
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/include/odp_packet_dpdk.h | 5 ++--
platform/linux-generic/pktio/dpdk.c | 33 ++++++++++++++++++------
2 files changed, 28 insertions(+), 10 deletions(-)
hooks/post-receive
--
6 years, 5 months
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-587-gba93e355
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, api-next has been updated
via ba93e355ddf151215aa18b59cbfca08fe175fe65 (commit)
via c5ff08b1496abd9a5fcbb1944f49e54a4e9bbabe (commit)
from be65d81a9342e322b70376adab69270c5c9bb9e2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ba93e355ddf151215aa18b59cbfca08fe175fe65
Author: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Date: Fri Oct 20 11:19:51 2017 +0300
linux-gen: pktio: dpdk: implement checksum insertion override
Add checksum insertion override functionality to dpdk pktio.
Override is applied based on L3/L4 checksum insert override output flags
from the packet.
Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 764ed37d..99b79e32 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -526,7 +526,11 @@ static inline uint16_t phdr_csum(odp_bool_t ipv4, void *l3_hdr,
return rte_ipv6_phdr_cksum(l3_hdr, ol_flags);
}
+#define OL_TX_CHKSUM_PKT(_cfg, _capa, _proto, _ovr_set, _ovr) \
+ (_capa && _proto && (_ovr_set ? _ovr : _cfg))
+
static inline void pkt_set_ol_tx(odp_pktout_config_opt_t *pktout_cfg,
+ odp_pktout_config_opt_t *pktout_capa,
odp_packet_hdr_t *pkt_hdr,
struct rte_mbuf *mbuf,
char *mbuf_data)
@@ -542,11 +546,21 @@ static inline void pkt_set_ol_tx(odp_pktout_config_opt_t *pktout_cfg,
if (check_proto(l3_hdr, &l3_proto_v4, &l4_proto))
return;
- ipv4_chksum_pkt = pktout_cfg->bit.ipv4_chksum && l3_proto_v4;
- udp_chksum_pkt = pktout_cfg->bit.udp_chksum &&
- (l4_proto == _ODP_IPPROTO_UDP);
- tcp_chksum_pkt = pktout_cfg->bit.tcp_chksum &&
- (l4_proto == _ODP_IPPROTO_TCP);
+ ipv4_chksum_pkt = OL_TX_CHKSUM_PKT(pktout_cfg->bit.ipv4_chksum,
+ pktout_capa->bit.ipv4_chksum,
+ l3_proto_v4,
+ pkt_p->output_flags.l3_chksum_set,
+ pkt_p->output_flags.l3_chksum);
+ udp_chksum_pkt = OL_TX_CHKSUM_PKT(pktout_cfg->bit.udp_chksum,
+ pktout_capa->bit.udp_chksum,
+ (l4_proto == _ODP_IPPROTO_UDP),
+ pkt_p->output_flags.l4_chksum_set,
+ pkt_p->output_flags.l4_chksum);
+ tcp_chksum_pkt = OL_TX_CHKSUM_PKT(pktout_cfg->bit.tcp_chksum,
+ pktout_capa->bit.tcp_chksum,
+ (l4_proto == _ODP_IPPROTO_TCP),
+ pkt_p->output_flags.l4_chksum_set,
+ pkt_p->output_flags.l4_chksum);
if (!ipv4_chksum_pkt && !udp_chksum_pkt && !tcp_chksum_pkt)
return;
@@ -589,6 +603,8 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry,
char *data;
uint16_t pkt_len;
odp_pktout_config_opt_t *pktout_cfg = &pktio_entry->s.config.pktout;
+ odp_pktout_config_opt_t *pktout_capa =
+ &pktio_entry->s.pkt_dpdk.capa.config.pktout;
if (odp_unlikely((rte_pktmbuf_alloc_bulk(pkt_dpdk->pkt_pool,
mbuf_table, num)))) {
@@ -609,8 +625,8 @@ static inline int pkt_to_mbuf(pktio_entry_t *pktio_entry,
odp_packet_copy_to_mem(pkt_table[i], 0, pkt_len, data);
- if (pktout_cfg->all_bits)
- pkt_set_ol_tx(pktout_cfg,
+ if (pktout_capa->all_bits)
+ pkt_set_ol_tx(pktout_cfg, pktout_capa,
odp_packet_hdr(pkt_table[i]),
mbuf_table[i], data);
}
@@ -702,6 +718,8 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry,
{
pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk;
odp_pktout_config_opt_t *pktout_cfg = &pktio_entry->s.config.pktout;
+ odp_pktout_config_opt_t *pktout_capa =
+ &pktio_entry->s.pkt_dpdk.capa.config.pktout;
int i;
*copy_count = 0;
@@ -719,8 +737,8 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry,
pkt_hdr->extra_type == PKT_EXTRA_TYPE_DPDK)) {
mbuf_update(mbuf, pkt_hdr, pkt_len);
- if (pktout_cfg->all_bits)
- pkt_set_ol_tx(pktout_cfg, pkt_hdr,
+ if (pktout_capa->all_bits)
+ pkt_set_ol_tx(pktout_cfg, pktout_capa, pkt_hdr,
mbuf, odp_packet_data(pkt));
} else {
pool_t *pool_entry = pkt_hdr->buf_hdr.pool_ptr;
@@ -742,8 +760,9 @@ static inline int pkt_to_mbuf_zero(pktio_entry_t *pktio_entry,
mbuf_init((struct rte_mempool *)
pool_entry->ext_desc, mbuf, pkt_hdr);
mbuf_update(mbuf, pkt_hdr, pkt_len);
- if (pktout_cfg->all_bits)
- pkt_set_ol_tx(pktout_cfg, pkt_hdr,
+ if (pktout_capa->all_bits)
+ pkt_set_ol_tx(pktout_cfg, pktout_capa,
+ pkt_hdr,
mbuf,
odp_packet_data(pkt));
}
commit c5ff08b1496abd9a5fcbb1944f49e54a4e9bbabe
Author: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Date: Fri Oct 20 11:16:39 2017 +0300
linux-gen: chksum: implement checksum insertion override functions
The functions set L3/L4 checksum override output flags on the packet.
Checksum calculation, if requested, is perfromed at packet output time,
depending on interface capabilities.
Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 61162932..32c9f525 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -1292,6 +1292,22 @@ uint16_t odp_packet_ones_comp(odp_packet_t pkt, odp_packet_data_range_t *range)
return 0;
}
+void odp_packet_l3_chksum_insert(odp_packet_t pkt, int insert)
+{
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
+
+ pkt_hdr->p.output_flags.l3_chksum_set = 1;
+ pkt_hdr->p.output_flags.l3_chksum = insert;
+}
+
+void odp_packet_l4_chksum_insert(odp_packet_t pkt, int insert)
+{
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
+
+ pkt_hdr->p.output_flags.l4_chksum_set = 1;
+ pkt_hdr->p.output_flags.l4_chksum = insert;
+}
+
odp_packet_chksum_status_t odp_packet_l3_chksum_status(odp_packet_t pkt)
{
odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/odp_packet.c | 16 +++++++++++++++
platform/linux-generic/pktio/dpdk.c | 41 +++++++++++++++++++++++++++----------
2 files changed, 46 insertions(+), 11 deletions(-)
hooks/post-receive
--
6 years, 5 months
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-585-gbe65d81a
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, api-next has been updated
via be65d81a9342e322b70376adab69270c5c9bb9e2 (commit)
via 71b8cfcecb99c8416200f1f54ab5d6dab004a69a (commit)
via dae20519a6825217dbe27842f1a24b1401410836 (commit)
via 5a5a8148fcd174cffd3e9140bed3259ac1af2d9f (commit)
via c54180d65bc9b86200f46b4f0ac540f74b884ee8 (commit)
via 7c665557d21db3ba7c4dd3d3845e7175a4a2acb6 (commit)
via 774f242c72008eecf5b07b341b76f577445fb4fb (commit)
via a4165611e5aa58b138946e17a079f8a7f065d08c (commit)
via fee9e59ca4a53ac30fea62d6b2f4b22a53042fe1 (commit)
via ad863d29c6e46487ed1ef3fad0766037faac919f (commit)
via 44f8d1421361c3238fed85a1a3d5ebff8f39cc88 (commit)
via 412235594802aa4e4b3f63efc464de18955265c5 (commit)
via 11620182599921c91e2d4f764b0ef921c171523b (commit)
via 043db6742a8dfc218409aba0e456365163b8b249 (commit)
via 16568d747ba2eb4a91962641e19b5da1d7a6091c (commit)
via cf17398302b4114b17d92d41de4dd4fe7d72a16a (commit)
from 26a556e03e07e62e4bcdf3dec6c76ebb02aa5efd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit be65d81a9342e322b70376adab69270c5c9bb9e2
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Nov 3 13:58:57 2017 +0300
validation: ipsec: add AES-CTR tests
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index 6c562358..277d393a 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -168,6 +168,10 @@ int ipsec_check(odp_bool_t ah,
if (!capa.ciphers.bit.aes_cbc)
return ODP_TEST_INACTIVE;
break;
+ case ODP_CIPHER_ALG_AES_CTR:
+ if (!capa.ciphers.bit.aes_ctr)
+ return ODP_TEST_INACTIVE;
+ break;
case ODP_CIPHER_ALG_AES_GCM:
if (!capa.ciphers.bit.aes_gcm)
return ODP_TEST_INACTIVE;
@@ -259,6 +263,12 @@ int ipsec_check_esp_aes_cbc_128_sha256(void)
ODP_AUTH_ALG_SHA256_HMAC);
}
+int ipsec_check_esp_aes_ctr_128_null(void)
+{
+ return ipsec_check_esp(ODP_CIPHER_ALG_AES_CTR, 128,
+ ODP_AUTH_ALG_NULL);
+}
+
int ipsec_check_esp_aes_gcm_128(void)
{
return ipsec_check_esp(ODP_CIPHER_ALG_AES_GCM, 128,
diff --git a/test/validation/api/ipsec/ipsec.h b/test/validation/api/ipsec/ipsec.h
index d1c6854b..d4506367 100644
--- a/test/validation/api/ipsec/ipsec.h
+++ b/test/validation/api/ipsec/ipsec.h
@@ -83,6 +83,7 @@ int ipsec_check_ah_sha256(void);
int ipsec_check_esp_null_sha256(void);
int ipsec_check_esp_aes_cbc_128_null(void);
int ipsec_check_esp_aes_cbc_128_sha256(void);
+int ipsec_check_esp_aes_ctr_128_null(void);
int ipsec_check_esp_aes_gcm_128(void);
int ipsec_check_esp_aes_gcm_256(void);
diff --git a/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c
index 598a83e3..8c883262 100644
--- a/test/validation/api/ipsec/ipsec_test_in.c
+++ b/test/validation/api/ipsec/ipsec_test_in.c
@@ -191,6 +191,36 @@ static void test_in_esp_aes_cbc_sha256(void)
ipsec_sa_destroy(sa);
}
+static void test_in_esp_aes_ctr_null(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, NULL,
+ ODP_CIPHER_ALG_AES_CTR, &key_a5_128,
+ ODP_AUTH_ALG_NULL, NULL,
+ &key_mcgrew_gcm_salt_3);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_icmp_0_esp_aes_ctr_null_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void test_in_lookup_ah_sha256(void)
{
odp_ipsec_sa_param_t param;
@@ -987,6 +1017,8 @@ odp_testinfo_t ipsec_in_suite[] = {
ipsec_check_esp_aes_cbc_128_null),
ODP_TEST_INFO_CONDITIONAL(test_in_esp_aes_cbc_sha256,
ipsec_check_esp_aes_cbc_128_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_esp_aes_ctr_null,
+ ipsec_check_esp_aes_ctr_128_null),
ODP_TEST_INFO_CONDITIONAL(test_in_lookup_ah_sha256,
ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_lookup_esp_null_sha256,
diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c
index 39a3c30f..b543271b 100644
--- a/test/validation/api/ipsec/ipsec_test_out.c
+++ b/test/validation/api/ipsec/ipsec_test_out.c
@@ -277,6 +277,48 @@ static void test_out_esp_aes_cbc_sha256(void)
ipsec_sa_destroy(sa);
}
+static void test_out_esp_aes_ctr_null(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+ odp_ipsec_sa_t sa2;
+
+ ipsec_sa_param_fill(¶m,
+ false, false, 123, NULL,
+ ODP_CIPHER_ALG_AES_CTR, &key_a5_128,
+ ODP_AUTH_ALG_NULL, NULL,
+ &key_mcgrew_gcm_salt_3);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, NULL,
+ ODP_CIPHER_ALG_AES_CTR, &key_a5_128,
+ ODP_AUTH_ALG_NULL, NULL,
+ &key_mcgrew_gcm_salt_3);
+
+ sa2 = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_check_out_in_one(&test, sa, sa2);
+
+ ipsec_sa_destroy(sa2);
+ ipsec_sa_destroy(sa);
+}
+
static void test_out_esp_aes_gcm128(void)
{
odp_ipsec_sa_param_t param;
@@ -342,6 +384,8 @@ odp_testinfo_t ipsec_out_suite[] = {
ipsec_check_esp_aes_cbc_128_null),
ODP_TEST_INFO_CONDITIONAL(test_out_esp_aes_cbc_sha256,
ipsec_check_esp_aes_cbc_128_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_out_esp_aes_ctr_null,
+ ipsec_check_esp_aes_ctr_128_null),
ODP_TEST_INFO_CONDITIONAL(test_out_esp_aes_gcm128,
ipsec_check_esp_aes_gcm_128),
ODP_TEST_INFO_NULL,
diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec/test_vectors.h
index 593a8f45..fbf7d366 100644
--- a/test/validation/api/ipsec/test_vectors.h
+++ b/test/validation/api/ipsec/test_vectors.h
@@ -583,6 +583,45 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_aes_cbc_sha256_1 = {
},
};
+static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_aes_ctr_null_1 = {
+ .len = 162,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 34,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00,
+
+ /* IP */
+ 0x45, 0x00, 0x00, 0x94, 0x00, 0x00, 0x00, 0x00,
+ 0x40, 0x32, 0xab, 0xe2, 0xc0, 0xa8, 0x6f, 0x02,
+ 0xc0, 0xa8, 0xde, 0x02,
+
+ /* ESP */
+ 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01,
+
+ /* IV */
+ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+ /* data */
+ 0x39, 0xab, 0xe5, 0xae, 0x74, 0x57, 0x76, 0x7f,
+ 0x1d, 0x1f, 0xce, 0xe8, 0xca, 0xf1, 0x87, 0xf5,
+ 0xfd, 0x9e, 0x1d, 0x20, 0x38, 0x30, 0x8a, 0xe5,
+ 0xb9, 0x55, 0x80, 0x7b, 0xfd, 0x9d, 0xb9, 0x99,
+ 0x85, 0xcd, 0xb5, 0x30, 0x86, 0xaa, 0xe1, 0x7a,
+ 0x69, 0xe5, 0xfa, 0x38, 0xf3, 0x0f, 0x91, 0x18,
+ 0x75, 0x7b, 0x5f, 0x4e, 0x69, 0x17, 0xaa, 0xe7,
+ 0x84, 0x6c, 0x40, 0x31, 0xec, 0x87, 0x4c, 0x8c,
+ 0xb3, 0xb4, 0x9f, 0x7e, 0xea, 0x83, 0x6f, 0xc6,
+ 0x11, 0xd5, 0xce, 0xbe, 0x65, 0x37, 0x1c, 0xb6,
+ 0xd3, 0xcb, 0x51, 0xa8, 0xa4, 0x0e, 0x3e, 0xe6,
+ 0x26, 0xd8, 0x17, 0xec, 0x8b, 0xca, 0x79, 0x96,
+ 0xa0, 0xcd, 0x6f, 0xdd, 0x9e, 0xe9, 0x6a, 0xc0,
+ 0xf2, 0x6c, 0xdb, 0xfd, 0x99, 0xa2, 0xb5, 0xbf,
+ },
+};
+
static const ODP_UNUSED ipsec_test_packet pkt_rfc3602_5 = {
.len = 98,
.l2_offset = 0,
commit 71b8cfcecb99c8416200f1f54ab5d6dab004a69a
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Nov 3 13:59:44 2017 +0300
linux-gen: ipsec: add AES-CTR cipher support
Add support for encrypting packets with AES-CTR cipher.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h
index 0a7f9625..b50b65be 100644
--- a/platform/linux-generic/include/odp_ipsec_internal.h
+++ b/platform/linux-generic/include/odp_ipsec_internal.h
@@ -127,6 +127,7 @@ struct ipsec_sa_s {
unsigned dec_ttl : 1;
unsigned copy_dscp : 1;
unsigned copy_df : 1;
+ unsigned aes_ctr_iv : 1;
/* Only for outbound */
unsigned use_counter_iv : 1;
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 4c032b9c..9533ca42 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -337,6 +337,13 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
goto err;
}
+ if (ipsec_sa->aes_ctr_iv) {
+ iv[12] = 0;
+ iv[13] = 0;
+ iv[14] = 0;
+ iv[15] = 1;
+ }
+
hdr_len = _ODP_ESPHDR_LEN + ipsec_sa->esp_iv_len;
trl_len = _ODP_ESPTRL_LEN + ipsec_sa->icv_len;
@@ -729,6 +736,12 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
memcpy(iv + ipsec_sa->salt_length, &ctr,
ipsec_sa->esp_iv_len);
+ if (ipsec_sa->aes_ctr_iv) {
+ iv[12] = 0;
+ iv[13] = 0;
+ iv[14] = 0;
+ iv[15] = 1;
+ }
} else if (ipsec_sa->esp_iv_len) {
uint32_t len;
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index 42517569..8eaa4f90 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -319,6 +319,13 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
ipsec_sa->esp_block_len = 16;
crypto_param.iv.length = 16;
break;
+ case ODP_CIPHER_ALG_AES_CTR:
+ ipsec_sa->use_counter_iv = 1;
+ ipsec_sa->aes_ctr_iv = 1;
+ ipsec_sa->esp_iv_len = 8;
+ ipsec_sa->esp_block_len = 16;
+ crypto_param.iv.length = 16;
+ break;
#if ODP_DEPRECATED_API
case ODP_CIPHER_ALG_AES128_GCM:
#endif
commit dae20519a6825217dbe27842f1a24b1401410836
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 8 20:12:37 2017 +0300
linux-gen: ipsec: don't leak SA on creation error
Some paths during odp_ipsec_sa_create() can lead to SA leakage. Fix
them by always releasing SA in error case.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index c3011924..42517569 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -296,7 +296,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
ipsec_sa->icv_len = 16;
break;
default:
- return ODP_IPSEC_SA_INVALID;
+ goto error;
}
switch (crypto_param.cipher_alg) {
@@ -329,7 +329,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
crypto_param.iv.length = 12;
break;
default:
- return ODP_IPSEC_SA_INVALID;
+ goto error;
}
if (1 == ipsec_sa->use_counter_iv &&
commit 5a5a8148fcd174cffd3e9140bed3259ac1af2d9f
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 1 11:00:27 2017 +0300
linux-gen: ipsec: correct frag_offset for tunneled packets
Generated outer header should have frag_offset = 0, MF = 0. Change code
accordingly.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index aadc671f..4c032b9c 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -663,10 +663,10 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
out_ip.id = odp_atomic_fetch_add_u32(&ipsec_sa->out.tun_hdr_id,
1);
if (ipsec_sa->copy_df)
- out_ip.frag_offset = ip->frag_offset;
+ out_ip.frag_offset = ip->frag_offset & 0x4000;
else
- out_ip.frag_offset = (ip->frag_offset & ~0x4000) |
- (ipsec_sa->out.tun_df << 14);
+ out_ip.frag_offset =
+ ((uint16_t)ipsec_sa->out.tun_df) << 14;
out_ip.ttl = ipsec_sa->out.tun_ttl;
out_ip.proto = _ODP_IPV4;
/* Will be filled later by packet checksum update */
commit c54180d65bc9b86200f46b4f0ac540f74b884ee8
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Nov 3 13:57:27 2017 +0300
linux-gen: ipsec: validate ip header total length
Check that IP packet length from the header is not bogus.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index f8085756..aadc671f 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -286,6 +286,11 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
ipsec_offset = ip_offset + ip_hdr_len;
+ if (odp_be_to_cpu_16(ip->tot_len) + ip_offset > odp_packet_len(pkt)) {
+ status->error.alg = 1;
+ goto err;
+ }
+
if (_ODP_IPV4HDR_IS_FRAGMENT(odp_be_to_cpu_16(ip->frag_offset))) {
status->error.proto = 1;
goto err;
@@ -634,6 +639,11 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
goto err;
}
+ if (odp_be_to_cpu_16(ip->tot_len) + ip_offset > odp_packet_len(pkt)) {
+ status->error.alg = 1;
+ goto err;
+ }
+
if (ODP_IPSEC_MODE_TUNNEL == ipsec_sa->mode) {
_odp_ipv4hdr_t out_ip;
uint16_t tot_len;
commit 7c665557d21db3ba7c4dd3d3845e7175a4a2acb6
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Oct 31 18:04:35 2017 +0300
validation: check that erroneous IPsec packets have error flag set
Verify that odp_packet_has_error() returns true for IPsec packets with
error status in result.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index 853bd88a..6c562358 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -613,6 +613,8 @@ void ipsec_check_in_one(const ipsec_test_part *part, odp_ipsec_sa_t sa)
CU_ASSERT_EQUAL(0, odp_ipsec_result(&result, pkto[i]));
CU_ASSERT_EQUAL(part->out[i].status.error.all,
result.status.error.all);
+ CU_ASSERT(!result.status.error.all ==
+ !odp_packet_has_error(pkto[i]));
CU_ASSERT_EQUAL(suite_context.inbound_op_mode ==
ODP_IPSEC_OP_MODE_INLINE,
result.flag.inline_mode);
@@ -652,6 +654,8 @@ void ipsec_check_out_one(const ipsec_test_part *part, odp_ipsec_sa_t sa)
CU_ASSERT_EQUAL(0, odp_ipsec_result(&result, pkto[i]));
CU_ASSERT_EQUAL(part->out[i].status.error.all,
result.status.error.all);
+ CU_ASSERT(!result.status.error.all ==
+ !odp_packet_has_error(pkto[i]));
CU_ASSERT_EQUAL(sa, result.sa);
CU_ASSERT_EQUAL(IPSEC_SA_CTX,
odp_ipsec_sa_context(sa));
commit 774f242c72008eecf5b07b341b76f577445fb4fb
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Oct 31 18:02:50 2017 +0300
linux-gen: ipsec: mark IPsec packets with errors with error flag
Add new ipsec_err error flag, which is set by IPsec code if there was an
error during IPsec packet processing. This allow application code to
quickly check packets using odp_packet_has_error() function and use fast
path if there was none.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index fc10d61c..e62854b1 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -55,6 +55,7 @@ typedef union {
uint32_t tcp_err:1; /**< TCP error, checks TBD */
uint32_t udp_err:1; /**< UDP error, checks TBD */
uint32_t l4_chksum:1; /**< L4 checksum error */
+ uint32_t ipsec_err:1; /**< IPsec error */
};
} error_flags_t;
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 1f9d410d..f8085756 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -272,6 +272,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
uint8_t ip_ttl; /**< Saved IP TTL value */
uint16_t ip_frag_offset; /**< Saved IP flags value */
odp_crypto_packet_result_t crypto; /**< Crypto operation result */
+ odp_packet_hdr_t *pkt_hdr;
ODP_ASSERT(ODP_PACKET_OFFSET_INVALID != ip_offset);
ODP_ASSERT(NULL != ip);
@@ -287,7 +288,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (_ODP_IPV4HDR_IS_FRAGMENT(odp_be_to_cpu_16(ip->frag_offset))) {
status->error.proto = 1;
- goto out;
+ goto err;
}
/* Check IP header for IPSec protocols and look it up */
@@ -297,7 +298,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (odp_packet_copy_to_mem(pkt, ipsec_offset,
sizeof(esp), &esp) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
if (ODP_IPSEC_SA_INVALID == sa) {
@@ -310,7 +311,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
ipsec_sa = _odp_ipsec_sa_lookup(&lookup);
if (NULL == ipsec_sa) {
status->error.sa_lookup = 1;
- goto out;
+ goto err;
}
} else {
ipsec_sa = _odp_ipsec_sa_use(sa);
@@ -318,7 +319,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (ipsec_sa->proto != ODP_IPSEC_ESP ||
ipsec_sa->spi != odp_be_to_cpu_32(esp.spi)) {
status->error.proto = 1;
- goto out;
+ goto err;
}
}
@@ -328,7 +329,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
ipsec_sa->esp_iv_len,
iv + ipsec_sa->salt_length) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
hdr_len = _ODP_ESPHDR_LEN + ipsec_sa->esp_iv_len;
@@ -362,7 +363,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (odp_packet_copy_to_mem(pkt, ipsec_offset,
sizeof(ah), &ah) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
if (ODP_IPSEC_SA_INVALID == sa) {
@@ -375,7 +376,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
ipsec_sa = _odp_ipsec_sa_lookup(&lookup);
if (NULL == ipsec_sa) {
status->error.sa_lookup = 1;
- goto out;
+ goto err;
}
} else {
ipsec_sa = _odp_ipsec_sa_use(sa);
@@ -383,7 +384,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (ipsec_sa->proto != ODP_IPSEC_AH ||
ipsec_sa->spi != odp_be_to_cpu_32(ah.spi)) {
status->error.proto = 1;
- goto out;
+ goto err;
}
}
@@ -417,16 +418,16 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
stats_length = param.auth_range.length;
} else {
status->error.proto = 1;
- goto out;
+ goto err;
}
if (_odp_ipsec_sa_replay_precheck(ipsec_sa,
odp_be_to_cpu_32(aad.seq_no),
status) < 0)
- goto out;
+ goto err;
if (_odp_ipsec_sa_stats_precheck(ipsec_sa, status) < 0)
- goto out;
+ goto err;
param.session = ipsec_sa->session;
@@ -434,14 +435,14 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (rc < 0) {
ODP_DBG("Crypto failed\n");
status->error.alg = 1;
- goto out;
+ goto err;
}
rc = odp_crypto_result(&crypto, pkt);
if (rc < 0) {
ODP_DBG("Crypto failed\n");
status->error.alg = 1;
- goto out;
+ goto err;
}
if (!crypto.ok) {
@@ -457,16 +458,16 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
ODP_CRYPTO_HW_ERR_NONE))
status->error.auth = 1;
- goto out;
+ goto err;
}
if (_odp_ipsec_sa_stats_update(ipsec_sa, stats_length, status) < 0)
- goto out;
+ goto err;
if (_odp_ipsec_sa_replay_update(ipsec_sa,
odp_be_to_cpu_32(aad.seq_no),
status) < 0)
- goto out;
+ goto err;
ip_offset = odp_packet_l3_offset(pkt);
ip = odp_packet_l3_ptr(pkt, NULL);
@@ -484,18 +485,18 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (odp_packet_copy_to_mem(pkt, esptrl_offset,
sizeof(esptrl), &esptrl) < 0) {
status->error.proto = 1;
- goto out;
+ goto err;
}
if (ip_offset + esptrl.pad_len > esptrl_offset) {
status->error.proto = 1;
- goto out;
+ goto err;
}
if (_odp_packet_cmp_data(pkt, esptrl_offset - esptrl.pad_len,
ipsec_padding, esptrl.pad_len) != 0) {
status->error.proto = 1;
- goto out;
+ goto err;
}
ip->proto = esptrl.next_header;
@@ -509,7 +510,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (odp_packet_copy_to_mem(pkt, ipsec_offset,
sizeof(ah), &ah) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
ip->proto = ah.next_header;
@@ -520,12 +521,12 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
ip->frag_offset = odp_cpu_to_be_16(ip_frag_offset);
} else {
status->error.proto = 1;
- goto out;
+ goto err;
}
if (odp_packet_trunc_tail(&pkt, trl_len, NULL, NULL) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
if (ODP_IPSEC_MODE_TUNNEL == ipsec_sa->mode) {
@@ -536,7 +537,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (odp_packet_trunc_head(&pkt, ip_hdr_len + hdr_len,
NULL, NULL) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
} else {
odp_packet_move_data(pkt, hdr_len, 0,
@@ -544,7 +545,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (odp_packet_trunc_head(&pkt, hdr_len,
NULL, NULL) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
}
@@ -559,15 +560,21 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
_odp_ipv4_csum_update(pkt);
}
- if (!status->error.all) {
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ pkt_hdr = odp_packet_hdr(pkt);
+
+ packet_parse_reset(pkt_hdr);
- packet_parse_reset(pkt_hdr);
+ packet_parse_l3_l4(pkt_hdr, parse_layer(ipsec_config.inbound.parse),
+ ip_offset, _ODP_ETHTYPE_IPV4);
+
+ *pkt_out = pkt;
+
+ return ipsec_sa;
+
+err:
+ pkt_hdr = odp_packet_hdr(pkt);
+ pkt_hdr->p.error_flags.ipsec_err = 1;
- packet_parse_l3_l4(pkt_hdr, parse_layer(ipsec_config.inbound.parse),
- ip_offset, _ODP_ETHTYPE_IPV4);
- }
-out:
*pkt_out = pkt;
return ipsec_sa;
@@ -606,6 +613,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
uint8_t ip_ttl; /**< Saved IP TTL value */
uint16_t ip_frag_offset; /**< Saved IP flags value */
odp_crypto_packet_result_t crypto; /**< Crypto operation result */
+ odp_packet_hdr_t *pkt_hdr;
ODP_ASSERT(ODP_PACKET_OFFSET_INVALID != ip_offset);
ODP_ASSERT(NULL != ip);
@@ -623,7 +631,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode &&
_ODP_IPV4HDR_IS_FRAGMENT(odp_be_to_cpu_16(ip->frag_offset))) {
status->error.alg = 1;
- goto out;
+ goto err;
}
if (ODP_IPSEC_MODE_TUNNEL == ipsec_sa->mode) {
@@ -659,7 +667,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
if (odp_packet_extend_head(&pkt, _ODP_IPV4HDR_LEN,
NULL, NULL) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
odp_packet_move_data(pkt, 0, _ODP_IPV4HDR_LEN, ip_offset);
@@ -705,7 +713,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
1);
/* Check for overrun */
if (ctr == 0)
- goto out;
+ goto err;
memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length);
memcpy(iv + ipsec_sa->salt_length, &ctr,
@@ -719,7 +727,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
if (len != ipsec_sa->esp_iv_len) {
status->error.alg = 1;
- goto out;
+ goto err;
}
}
@@ -727,12 +735,12 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
if (odp_packet_extend_tail(&pkt, trl_len, NULL, NULL) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
if (odp_packet_extend_head(&pkt, hdr_len, NULL, NULL) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
odp_packet_move_data(pkt, 0, hdr_len, ipsec_offset);
@@ -805,12 +813,12 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
if (odp_packet_extend_tail(&pkt, trl_len, NULL, NULL) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
if (odp_packet_extend_head(&pkt, hdr_len, NULL, NULL) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
odp_packet_move_data(pkt, 0, hdr_len, ipsec_offset);
@@ -852,12 +860,12 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
stats_length = param.auth_range.length;
} else {
status->error.alg = 1;
- goto out;
+ goto err;
}
/* No need to run precheck here, we know that packet is authentic */
if (_odp_ipsec_sa_stats_update(ipsec_sa, stats_length, status) < 0)
- goto out;
+ goto err;
param.session = ipsec_sa->session;
@@ -865,14 +873,14 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
if (rc < 0) {
ODP_DBG("Crypto failed\n");
status->error.alg = 1;
- goto out;
+ goto err;
}
rc = odp_crypto_result(&crypto, pkt);
if (rc < 0) {
ODP_DBG("Crypto failed\n");
status->error.alg = 1;
- goto out;
+ goto err;
}
if (!crypto.ok) {
@@ -888,7 +896,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
ODP_CRYPTO_HW_ERR_NONE))
status->error.auth = 1;
- goto out;
+ goto err;
}
ip = odp_packet_l3_ptr(pkt, NULL);
@@ -902,7 +910,13 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
_odp_ipv4_csum_update(pkt);
-out:
+ *pkt_out = pkt;
+ return ipsec_sa;
+
+err:
+ pkt_hdr = odp_packet_hdr(pkt);
+
+ pkt_hdr->p.error_flags.ipsec_err = 1;
*pkt_out = pkt;
return ipsec_sa;
commit a4165611e5aa58b138946e17a079f8a7f065d08c
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sun Oct 15 08:15:04 2017 +0300
validation: ipsec: add replay window checks
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c
index 25fc00e1..598a83e3 100644
--- a/test/validation/api/ipsec/ipsec_test_in.c
+++ b/test/validation/api/ipsec/ipsec_test_in.c
@@ -284,6 +284,202 @@ static void test_in_esp_null_sha256_tun(void)
ipsec_sa_destroy(sa);
}
+static void test_in_ah_sha256_noreplay(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, true, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+ param.inbound.antireplay_ws = 0;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_icmp_0_ah_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_test_part test_1235 = {
+ .pkt_in = &pkt_icmp_0_ah_sha256_1235,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+ ipsec_check_in_one(&test, sa);
+ ipsec_check_in_one(&test_1235, sa);
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_in_ah_sha256_replay(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, true, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+ param.inbound.antireplay_ws = 32;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_icmp_0_ah_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_test_part test_repl = {
+ .pkt_in = &pkt_icmp_0_ah_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.antireplay = 1,
+ .pkt_out = NULL },
+ },
+ };
+
+ ipsec_test_part test_1235 = {
+ .pkt_in = &pkt_icmp_0_ah_sha256_1235,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+ ipsec_check_in_one(&test_repl, sa);
+ ipsec_check_in_one(&test_1235, sa);
+ ipsec_check_in_one(&test_repl, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_in_esp_null_sha256_noreplay(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+ param.inbound.antireplay_ws = 0;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_icmp_0_esp_null_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_test_part test_1235 = {
+ .pkt_in = &pkt_icmp_0_esp_null_sha256_1235,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+ ipsec_check_in_one(&test, sa);
+ ipsec_check_in_one(&test_1235, sa);
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_in_esp_null_sha256_replay(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+ param.inbound.antireplay_ws = 32;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_icmp_0_esp_null_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_test_part test_repl = {
+ .pkt_in = &pkt_icmp_0_esp_null_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.antireplay = 1,
+ .pkt_out = NULL },
+ },
+ };
+
+ ipsec_test_part test_1235 = {
+ .pkt_in = &pkt_icmp_0_esp_null_sha256_1235,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+ ipsec_check_in_one(&test_repl, sa);
+ ipsec_check_in_one(&test_1235, sa);
+ ipsec_check_in_one(&test_repl, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void test_in_ah_esp_pkt(void)
{
odp_ipsec_sa_param_t param;
@@ -797,6 +993,14 @@ odp_testinfo_t ipsec_in_suite[] = {
ipsec_check_esp_null_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_sha256_tun,
ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256_noreplay,
+ ipsec_check_ah_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256_replay,
+ ipsec_check_ah_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_sha256_noreplay,
+ ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_sha256_replay,
+ ipsec_check_esp_null_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_ah_esp_pkt,
ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_esp_ah_pkt,
diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec/test_vectors.h
index 2fb06b2b..593a8f45 100644
--- a/test/validation/api/ipsec/test_vectors.h
+++ b/test/validation/api/ipsec/test_vectors.h
@@ -278,6 +278,50 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_sha256_1_bad2 = {
},
};
+static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_sha256_1235 = {
+ .len = 170,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 34,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00,
+
+ /* IP */
+ 0x45, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00,
+ 0x40, 0x33, 0xab, 0xd9, 0xc0, 0xa8, 0x6f, 0x02,
+ 0xc0, 0xa8, 0xde, 0x02,
+
+ /* AH */
+ 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7b,
+ 0x00, 0x00, 0x12, 0x35,
+ 0x04, 0xef, 0x71, 0x73, 0xa1, 0xd4, 0x71, 0x3f,
+ 0xd6, 0x78, 0xfe, 0xa2, 0x59, 0xe9, 0x93, 0x70,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37,
+
+ /* ICMP echo */
+ 0x12, 0x34, 0x00, 0x00,
+
+ /* data */
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b
+ },
+};
+
static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_sha256_1 = {
.len = 170,
.l2_offset = 0,
@@ -412,6 +456,49 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_sha256_1_bad1 = {
},
};
+static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_sha256_1235 = {
+ .len = 170,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 34,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00,
+
+ /* IP */
+ 0x45, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00,
+ 0x40, 0x32, 0xab, 0xda, 0xc0, 0xa8, 0x6f, 0x02,
+ 0xc0, 0xa8, 0xde, 0x02,
+
+ /* ESP */
+ 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x12, 0x35,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00,
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b,
+
+ /* ESP TRL */
+ 0x01, 0x02, 0x02, 0x01,
+
+ /* ICV */
+ 0x2f, 0xfb, 0xdd, 0x9d, 0xc0, 0xca, 0xb8, 0x0a,
+ 0xaa, 0xf1, 0x59, 0x31, 0x4e, 0xef, 0x62, 0x50,
+ },
+};
+
static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_aes_cbc_null_1 = {
.len = 170,
.l2_offset = 0,
commit fee9e59ca4a53ac30fea62d6b2f4b22a53042fe1
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sun Oct 15 08:12:01 2017 +0300
linux-gen: ipsec: support replay window checks
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index dc6359d6..1f9d410d 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -42,6 +42,8 @@ int odp_ipsec_capability(odp_ipsec_capability_t *capa)
capa->max_num_sa = ODP_CONFIG_IPSEC_SAS;
+ capa->max_antireplay_ws = IPSEC_ANTIREPLAY_WS;
+
rc = odp_crypto_capability(&crypto_capa);
if (rc < 0)
return rc;
@@ -402,6 +404,12 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
ip->frag_offset = 0;
ip->ttl = 0;
+ aad.spi = ah.spi;
+ aad.seq_no = ah.seq_no;
+
+ param.aad.ptr = (uint8_t *)&aad;
+ param.aad.length = sizeof(aad);
+
param.auth_range.offset = ip_offset;
param.auth_range.length = odp_be_to_cpu_16(ip->tot_len);
param.hash_result_offset = ipsec_offset + _ODP_AHHDR_LEN;
@@ -412,6 +420,11 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
goto out;
}
+ if (_odp_ipsec_sa_replay_precheck(ipsec_sa,
+ odp_be_to_cpu_32(aad.seq_no),
+ status) < 0)
+ goto out;
+
if (_odp_ipsec_sa_stats_precheck(ipsec_sa, status) < 0)
goto out;
@@ -450,6 +463,11 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (_odp_ipsec_sa_stats_update(ipsec_sa, stats_length, status) < 0)
goto out;
+ if (_odp_ipsec_sa_replay_update(ipsec_sa,
+ odp_be_to_cpu_32(aad.seq_no),
+ status) < 0)
+ goto out;
+
ip_offset = odp_packet_l3_offset(pkt);
ip = odp_packet_l3_ptr(pkt, NULL);
ip_hdr_len = ipv4_hdr_len(ip);
@@ -809,6 +827,12 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
ah.next_header = ip->proto;
ip->proto = _ODP_IPPROTO_AH;
+ aad.spi = ah.spi;
+ aad.seq_no = ah.seq_no;
+
+ param.aad.ptr = (uint8_t *)&aad;
+ param.aad.length = sizeof(aad);
+
odp_packet_copy_from_mem(pkt,
ipsec_offset, _ODP_AHHDR_LEN,
&ah);
commit ad863d29c6e46487ed1ef3fad0766037faac919f
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sun Oct 15 08:11:28 2017 +0300
linux-gen: ipsec: add replay window support to SAD
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h
index 68ab195c..0a7f9625 100644
--- a/platform/linux-generic/include/odp_ipsec_internal.h
+++ b/platform/linux-generic/include/odp_ipsec_internal.h
@@ -81,6 +81,9 @@ int _odp_ipsec_status_send(odp_queue_t queue,
#define IPSEC_MAX_SALT_LEN 4 /**< Maximum salt length in bytes */
+/* 32 is minimum required by the standard. We do not support more */
+#define IPSEC_ANTIREPLAY_WS 32
+
/**
* Maximum number of available SAs
*/
@@ -127,6 +130,9 @@ struct ipsec_sa_s {
/* Only for outbound */
unsigned use_counter_iv : 1;
+
+ /* Only for inbound */
+ unsigned antireplay : 1;
};
};
@@ -134,6 +140,7 @@ struct ipsec_sa_s {
struct {
odp_ipsec_lookup_mode_t lookup_mode;
odp_u32be_t lookup_dst_ip;
+ odp_atomic_u64_t antireplay;
} in;
struct {
@@ -200,6 +207,19 @@ int _odp_ipsec_sa_stats_precheck(ipsec_sa_t *ipsec_sa,
int _odp_ipsec_sa_stats_update(ipsec_sa_t *ipsec_sa, uint32_t len,
odp_ipsec_op_status_t *status);
+/* Run pre-check on sequence number of the packet.
+ *
+ * @retval <0 if the packet falls out of window
+ */
+int _odp_ipsec_sa_replay_precheck(ipsec_sa_t *ipsec_sa, uint32_t seq,
+ odp_ipsec_op_status_t *status);
+
+/* Run check on sequence number of the packet and update window if necessary.
+ *
+ * @retval <0 if the packet falls out of window
+ */
+int _odp_ipsec_sa_replay_update(ipsec_sa_t *ipsec_sa, uint32_t seq,
+ odp_ipsec_op_status_t *status);
/**
* Try inline IPsec processing of provided packet.
*
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index e42bf94e..c3011924 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -215,6 +215,10 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
param->inbound.lookup_param.dst_addr,
sizeof(ipsec_sa->in.lookup_dst_ip));
+ if (param->inbound.antireplay_ws > IPSEC_ANTIREPLAY_WS)
+ return ODP_IPSEC_SA_INVALID;
+ ipsec_sa->antireplay = (param->inbound.antireplay_ws != 0);
+ odp_atomic_init_u64(&ipsec_sa->in.antireplay, 0);
} else {
odp_atomic_store_u32(&ipsec_sa->out.seq, 1);
}
@@ -528,3 +532,59 @@ int _odp_ipsec_sa_stats_update(ipsec_sa_t *ipsec_sa, uint32_t len,
return rc;
}
+
+int _odp_ipsec_sa_replay_precheck(ipsec_sa_t *ipsec_sa, uint32_t seq,
+ odp_ipsec_op_status_t *status)
+{
+ /* Try to be as quick as possible, we will discard packets later */
+ if (ipsec_sa->antireplay &&
+ seq + IPSEC_ANTIREPLAY_WS <=
+ (odp_atomic_load_u64(&ipsec_sa->in.antireplay) & 0xffffffff)) {
+ status->error.antireplay = 1;
+ return -1;
+ }
+
+ return 0;
+}
+
+int _odp_ipsec_sa_replay_update(ipsec_sa_t *ipsec_sa, uint32_t seq,
+ odp_ipsec_op_status_t *status)
+{
+ int cas = 0;
+ uint64_t state, new_state;
+
+ if (!ipsec_sa->antireplay)
+ return 0;
+
+ state = odp_atomic_load_u64(&ipsec_sa->in.antireplay);
+
+ while (0 == cas) {
+ uint32_t max_seq = state & 0xffffffff;
+ uint32_t mask = state >> 32;
+
+ if (seq + IPSEC_ANTIREPLAY_WS <= max_seq) {
+ status->error.antireplay = 1;
+ return -1;
+ }
+
+ if (seq > max_seq) {
+ mask <<= seq - max_seq;
+ mask |= 1;
+ max_seq = seq;
+ } else {
+ if (mask & (1U << (max_seq - seq))) {
+ status->error.antireplay = 1;
+ return -1;
+ }
+
+ mask |= (1U << (max_seq - seq));
+ }
+
+ new_state = (((uint64_t)mask) << 32) | max_seq;
+
+ cas = odp_atomic_cas_acq_rel_u64(&ipsec_sa->in.antireplay,
+ &state, new_state);
+ }
+
+ return 0;
+}
commit 44f8d1421361c3238fed85a1a3d5ebff8f39cc88
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sun Oct 15 08:04:30 2017 +0300
linux-gen: ipsec: fix soft/hard limits check
Split count expiration check into two phases:
- optional precheck, run before crypto, which fails only if hard limit
is already breached
- update, run after crypto in INBOUND case, so that limits will not be
updated for packets failing ICV check.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h
index afc2f686..68ab195c 100644
--- a/platform/linux-generic/include/odp_ipsec_internal.h
+++ b/platform/linux-generic/include/odp_ipsec_internal.h
@@ -184,12 +184,20 @@ void _odp_ipsec_sa_unuse(ipsec_sa_t *ipsec_sa);
*/
ipsec_sa_t *_odp_ipsec_sa_lookup(const ipsec_sa_lookup_t *lookup);
+/**
+ * Run pre-check on SA usage statistics.
+ *
+ * @retval <0 if hard limits were breached
+ */
+int _odp_ipsec_sa_stats_precheck(ipsec_sa_t *ipsec_sa,
+ odp_ipsec_op_status_t *status);
+
/**
* Update SA usage statistics, filling respective status for the packet.
*
* @retval <0 if hard limits were breached
*/
-int _odp_ipsec_sa_update_stats(ipsec_sa_t *ipsec_sa, uint32_t len,
+int _odp_ipsec_sa_stats_update(ipsec_sa_t *ipsec_sa, uint32_t len,
odp_ipsec_op_status_t *status);
/**
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index f49fc465..dc6359d6 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -412,9 +412,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
goto out;
}
- if (_odp_ipsec_sa_update_stats(ipsec_sa,
- stats_length,
- status) < 0)
+ if (_odp_ipsec_sa_stats_precheck(ipsec_sa, status) < 0)
goto out;
param.session = ipsec_sa->session;
@@ -449,6 +447,9 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
goto out;
}
+ if (_odp_ipsec_sa_stats_update(ipsec_sa, stats_length, status) < 0)
+ goto out;
+
ip_offset = odp_packet_l3_offset(pkt);
ip = odp_packet_l3_ptr(pkt, NULL);
ip_hdr_len = ipv4_hdr_len(ip);
@@ -830,9 +831,8 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
goto out;
}
- if (_odp_ipsec_sa_update_stats(ipsec_sa,
- stats_length,
- status) < 0)
+ /* No need to run precheck here, we know that packet is authentic */
+ if (_odp_ipsec_sa_stats_update(ipsec_sa, stats_length, status) < 0)
goto out;
param.session = ipsec_sa->session;
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index dc338bfc..e42bf94e 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -479,7 +479,28 @@ ipsec_sa_t *_odp_ipsec_sa_lookup(const ipsec_sa_lookup_t *lookup)
return best;
}
-int _odp_ipsec_sa_update_stats(ipsec_sa_t *ipsec_sa, uint32_t len,
+int _odp_ipsec_sa_stats_precheck(ipsec_sa_t *ipsec_sa,
+ odp_ipsec_op_status_t *status)
+{
+ int rc = 0;
+
+ if (ipsec_sa->hard_limit_bytes > 0 &&
+ odp_atomic_load_u64(&ipsec_sa->bytes) >
+ ipsec_sa->hard_limit_bytes) {
+ status->error.hard_exp_bytes = 1;
+ rc = -1;
+ }
+ if (ipsec_sa->hard_limit_packets > 0 &&
+ odp_atomic_load_u64(&ipsec_sa->packets) >
+ ipsec_sa->hard_limit_packets) {
+ status->error.hard_exp_packets = 1;
+ rc = -1;
+ }
+
+ return rc;
+}
+
+int _odp_ipsec_sa_stats_update(ipsec_sa_t *ipsec_sa, uint32_t len,
odp_ipsec_op_status_t *status)
{
uint64_t bytes = odp_atomic_fetch_add_u64(&ipsec_sa->bytes, len) + len;
commit 412235594802aa4e4b3f63efc464de18955265c5
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Oct 17 21:27:03 2017 +0300
validation: ipsec: verify odp_ipsec_sa_context
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index ac0a083b..853bd88a 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -19,6 +19,9 @@ struct suite_context_s suite_context;
#define PKT_POOL_NUM 64
#define PKT_POOL_LEN (1 * 1024)
+#define PACKET_USER_PTR ((void *)0x1212fefe)
+#define IPSEC_SA_CTX ((void *)0xfefefafa)
+
static odp_pktio_t pktio_create(odp_pool_t pool)
{
odp_pktio_t pktio;
@@ -300,6 +303,8 @@ void ipsec_sa_param_fill(odp_ipsec_sa_param_t *param,
param->dest_queue = suite_context.queue;
+ param->context = IPSEC_SA_CTX;
+
param->crypto.cipher_alg = cipher_alg;
if (cipher_key)
param->crypto.cipher_key = *cipher_key;
@@ -317,6 +322,8 @@ void ipsec_sa_destroy(odp_ipsec_sa_t sa)
odp_event_t event;
odp_ipsec_status_t status;
+ CU_ASSERT_EQUAL(IPSEC_SA_CTX, odp_ipsec_sa_context(sa));
+
CU_ASSERT_EQUAL(ODP_IPSEC_OK, odp_ipsec_sa_disable(sa));
if (ODP_QUEUE_INVALID != suite_context.queue) {
@@ -339,8 +346,6 @@ void ipsec_sa_destroy(odp_ipsec_sa_t sa)
CU_ASSERT_EQUAL(ODP_IPSEC_OK, odp_ipsec_sa_destroy(sa));
}
-#define PACKET_USER_PTR ((void *)0x1212fefe)
-
odp_packet_t ipsec_packet(const ipsec_test_packet *itp)
{
odp_packet_t pkt = odp_packet_alloc(suite_context.pool, itp->len);
@@ -612,6 +617,9 @@ void ipsec_check_in_one(const ipsec_test_part *part, odp_ipsec_sa_t sa)
ODP_IPSEC_OP_MODE_INLINE,
result.flag.inline_mode);
CU_ASSERT_EQUAL(sa, result.sa);
+ if (ODP_IPSEC_SA_INVALID != sa)
+ CU_ASSERT_EQUAL(IPSEC_SA_CTX,
+ odp_ipsec_sa_context(sa));
}
ipsec_check_packet(part->out[i].pkt_out,
pkto[i]);
@@ -645,6 +653,8 @@ void ipsec_check_out_one(const ipsec_test_part *part, odp_ipsec_sa_t sa)
CU_ASSERT_EQUAL(part->out[i].status.error.all,
result.status.error.all);
CU_ASSERT_EQUAL(sa, result.sa);
+ CU_ASSERT_EQUAL(IPSEC_SA_CTX,
+ odp_ipsec_sa_context(sa));
}
ipsec_check_packet(part->out[i].pkt_out,
pkto[i]);
@@ -682,6 +692,8 @@ void ipsec_check_out_in_one(const ipsec_test_part *part,
CU_ASSERT_EQUAL(part->out[i].status.error.all,
result.status.error.all);
CU_ASSERT_EQUAL(sa, result.sa);
+ CU_ASSERT_EQUAL(IPSEC_SA_CTX,
+ odp_ipsec_sa_context(sa));
}
CU_ASSERT_FATAL(odp_packet_len(pkto[i]) <=
sizeof(pkt_in.data));
commit 11620182599921c91e2d4f764b0ef921c171523b
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Oct 20 11:29:39 2017 +0300
validation: ipsec: drop unused file
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec_sync_in.c b/test/validation/api/ipsec/ipsec_sync_in.c
deleted file mode 100644
index 8a7fc468..00000000
--- a/test/validation/api/ipsec/ipsec_sync_in.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "config.h"
-
-#include "ipsec.h"
-
-int main(int argc, char *argv[])
-{
- int ret;
-
- /* parse common options: */
- if (odp_cunit_parse_options(argc, argv))
- return -1;
-
- odp_cunit_register_global_init(ipsec_init);
- odp_cunit_register_global_term(ipsec_term);
-
- ret = odp_cunit_register(ipsec_suites);
- if (ret == 0)
- ret = odp_cunit_run();
-
- return ret;
-}
commit 043db6742a8dfc218409aba0e456365163b8b249
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Mon Nov 13 16:15:13 2017 +0300
validation: ipsec: verify inline_mode flag
Verify inline_mode flag being set for inbound inline packets.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index a8fdf2b1..ac0a083b 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -608,6 +608,9 @@ void ipsec_check_in_one(const ipsec_test_part *part, odp_ipsec_sa_t sa)
CU_ASSERT_EQUAL(0, odp_ipsec_result(&result, pkto[i]));
CU_ASSERT_EQUAL(part->out[i].status.error.all,
result.status.error.all);
+ CU_ASSERT_EQUAL(suite_context.inbound_op_mode ==
+ ODP_IPSEC_OP_MODE_INLINE,
+ result.flag.inline_mode);
CU_ASSERT_EQUAL(sa, result.sa);
}
ipsec_check_packet(part->out[i].pkt_out,
commit 16568d747ba2eb4a91962641e19b5da1d7a6091c
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Mon Nov 13 16:13:23 2017 +0300
linux-gen: ipsec: set inline_mode flag for inline inbound packets
Set IPsec inline_mode_flag for inbound inline packets according to the
API specification.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 6a731e99..f49fc465 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -1131,6 +1131,7 @@ int _odp_ipsec_try_inline(odp_packet_t pkt)
memset(result, 0, sizeof(*result));
result->status = status;
result->sa = ipsec_sa->ipsec_sa_hdl;
+ result->flag.inline_mode = 1;
pkt_hdr = odp_packet_hdr(pkt);
pkt_hdr->p.input_flags.dst_queue = 1;
commit cf17398302b4114b17d92d41de4dd4fe7d72a16a
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Oct 20 12:11:25 2017 +0300
linux-gen: ipsec: use counter instead of random IV for GCM
Reusing IV block with GCM results in disastrous consequences. Use
counter instead of random-generated IV to remove possibility for IV
reuse.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h
index 1340ca7b..afc2f686 100644
--- a/platform/linux-generic/include/odp_ipsec_internal.h
+++ b/platform/linux-generic/include/odp_ipsec_internal.h
@@ -118,9 +118,17 @@ struct ipsec_sa_s {
uint8_t salt[IPSEC_MAX_SALT_LEN];
uint32_t salt_length;
- unsigned dec_ttl : 1;
- unsigned copy_dscp : 1;
- unsigned copy_df : 1;
+ union {
+ unsigned flags;
+ struct {
+ unsigned dec_ttl : 1;
+ unsigned copy_dscp : 1;
+ unsigned copy_df : 1;
+
+ /* Only for outbound */
+ unsigned use_counter_iv : 1;
+ };
+ };
union {
struct {
@@ -136,6 +144,8 @@ struct ipsec_sa_s {
odp_atomic_u32_t tun_hdr_id;
odp_atomic_u32_t seq;
+ odp_atomic_u64_t counter; /* for CTR/GCM */
+
uint8_t tun_ttl;
uint8_t tun_dscp;
uint8_t tun_df;
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index e57736c2..6a731e99 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -676,23 +676,36 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
ip_data_len +
ipsec_sa->icv_len;
- if (ipsec_sa->esp_iv_len) {
+ if (ipsec_sa->use_counter_iv) {
+ uint64_t ctr;
+
+ /* Both GCM and CTR use 8-bit counters */
+ ODP_ASSERT(sizeof(ctr) == ipsec_sa->esp_iv_len);
+
+ ctr = odp_atomic_fetch_add_u64(&ipsec_sa->out.counter,
+ 1);
+ /* Check for overrun */
+ if (ctr == 0)
+ goto out;
+
+ memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length);
+ memcpy(iv + ipsec_sa->salt_length, &ctr,
+ ipsec_sa->esp_iv_len);
+
+ } else if (ipsec_sa->esp_iv_len) {
uint32_t len;
- len = odp_random_data(iv + ipsec_sa->salt_length,
- ipsec_sa->esp_iv_len,
+ len = odp_random_data(iv, ipsec_sa->esp_iv_len,
ODP_RANDOM_CRYPTO);
if (len != ipsec_sa->esp_iv_len) {
status->error.alg = 1;
goto out;
}
-
- memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length);
-
- param.override_iv_ptr = iv;
}
+ param.override_iv_ptr = iv;
+
if (odp_packet_extend_tail(&pkt, trl_len, NULL, NULL) < 0) {
status->error.alg = 1;
goto out;
@@ -734,7 +747,6 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
odp_packet_copy_from_mem(pkt,
ipsec_offset, _ODP_ESPHDR_LEN,
&esp);
- memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length);
odp_packet_copy_from_mem(pkt,
ipsec_offset + _ODP_ESPHDR_LEN,
ipsec_sa->esp_iv_len,
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index f0b5b9e4..dc338bfc 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -207,6 +207,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
ipsec_sa->context = param->context;
ipsec_sa->queue = param->dest_queue;
ipsec_sa->mode = param->mode;
+ ipsec_sa->flags = 0;
if (ODP_IPSEC_DIR_INBOUND == param->dir) {
ipsec_sa->in.lookup_mode = param->inbound.lookup_mode;
if (ODP_IPSEC_LOOKUP_DSTADDR_SPI == ipsec_sa->in.lookup_mode)
@@ -298,11 +299,13 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
case ODP_CIPHER_ALG_NULL:
ipsec_sa->esp_iv_len = 0;
ipsec_sa->esp_block_len = 1;
+ crypto_param.iv.length = 0;
break;
case ODP_CIPHER_ALG_DES:
case ODP_CIPHER_ALG_3DES_CBC:
ipsec_sa->esp_iv_len = 8;
ipsec_sa->esp_block_len = 8;
+ crypto_param.iv.length = 8;
break;
#if ODP_DEPRECATED_API
case ODP_CIPHER_ALG_AES128_CBC:
@@ -310,11 +313,13 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
case ODP_CIPHER_ALG_AES_CBC:
ipsec_sa->esp_iv_len = 16;
ipsec_sa->esp_block_len = 16;
+ crypto_param.iv.length = 16;
break;
#if ODP_DEPRECATED_API
case ODP_CIPHER_ALG_AES128_GCM:
#endif
case ODP_CIPHER_ALG_AES_GCM:
+ ipsec_sa->use_counter_iv = 1;
ipsec_sa->esp_iv_len = 8;
ipsec_sa->esp_block_len = 16;
crypto_param.iv.length = 12;
@@ -323,6 +328,10 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
return ODP_IPSEC_SA_INVALID;
}
+ if (1 == ipsec_sa->use_counter_iv &&
+ ODP_IPSEC_DIR_OUTBOUND == param->dir)
+ odp_atomic_init_u64(&ipsec_sa->out.counter, 1);
+
crypto_param.auth_digest_len = ipsec_sa->icv_len;
if (param->crypto.cipher_key_extra.length) {
-----------------------------------------------------------------------
Summary of changes:
.../linux-generic/include/odp_ipsec_internal.h | 47 +++-
.../linux-generic/include/odp_packet_internal.h | 1 +
platform/linux-generic/odp_ipsec.c | 190 ++++++++++++-----
platform/linux-generic/odp_ipsec_sad.c | 103 ++++++++-
test/validation/api/ipsec/ipsec.c | 33 ++-
test/validation/api/ipsec/ipsec.h | 1 +
test/validation/api/ipsec/ipsec_sync_in.c | 27 ---
test/validation/api/ipsec/ipsec_test_in.c | 236 +++++++++++++++++++++
test/validation/api/ipsec/ipsec_test_out.c | 44 ++++
test/validation/api/ipsec/test_vectors.h | 126 +++++++++++
10 files changed, 714 insertions(+), 94 deletions(-)
delete mode 100644 test/validation/api/ipsec/ipsec_sync_in.c
hooks/post-receive
--
6 years, 5 months
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-569-g26a556e0
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, api-next has been updated
via 26a556e03e07e62e4bcdf3dec6c76ebb02aa5efd (commit)
via 12403213da9cd4600f4e3b61a10e2369219061f0 (commit)
via 5cbb3749e3478d9ed22423399c2339b7fa39442f (commit)
from a908a4dead95321e84d6a8a23de060051dcd8969 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 26a556e03e07e62e4bcdf3dec6c76ebb02aa5efd
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Wed Sep 20 13:40:04 2017 -0500
doc: userguide: add ipsec user documentation
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am
index d88d7f9e..54f87bb6 100644
--- a/doc/users-guide/Makefile.am
+++ b/doc/users-guide/Makefile.am
@@ -3,6 +3,7 @@ include ../Makefile.inc
SRC = users-guide.adoc \
users-guide-cls.adoc \
users-guide-crypto.adoc \
+ users-guide-ipsec.adoc \
users-guide-packet.adoc \
users-guide-pktio.adoc \
users-guide-timer.adoc \
diff --git a/doc/users-guide/users-guide-ipsec.adoc b/doc/users-guide/users-guide-ipsec.adoc
new file mode 100644
index 00000000..d560df9c
--- /dev/null
+++ b/doc/users-guide/users-guide-ipsec.adoc
@@ -0,0 +1,466 @@
+== IPsec services
+
+In addition to general cryptographic services, ODP offers offload support for
+the IPsec protocol. IPsec is a general term referencing a suite of protocols
+and packet formats and as such a full discussion of IPsec is beyond the scope
+of this document. See https://tools.ietf.org/html/rfc4301[RFC 4301] and
+related RFCs for more detail. This section assumes the reader is already
+familiar with IPsec and focuses on explaining the ODP APIs that support it.
+
+ODP provides APIs for the following IPsec services:
+
+* General IPsec configuration
+* Security Association (SA) configuration and lifecycle management
+* Synchronous and Asynchronous IPsec lookaside processing
+* Inline processing for full IPsec RX and/or TX offload
+* Pipelining for RX traffic
+* Fragmentation support for TX traffic
+* IPsec event management
+
+=== IPsec Capabilities and Configuration
+As with other features, ODP provides APIs that permit applications to query
+platform-specific IPsec capabilities. The `odp_ipsec_capability()` API queries
+the general IPsec features available while the `odp_ipsec_cipher_capability()`
+and `odp_ipsec_auth_capability()` APIs provide detail on the range of
+cipher and authentication algorithms supported by IPsec on this platform.
+
+General IPsec capabilities that are reported include:
+
+* The IPsec operation modes supported by this implementation. Different
+operation modes may be _not supported_, _supported_, or _preferred_. A
+preferred form means that this mode takes advantage of hardware
+acceleration features to achieve best performance.
+* Whether IPsec AH processing is supported. All ODP platforms must provide
+support for IPsec ESP processing, however since AH is relatively rare, it
+may not be supported, or supported only via software emulation (_e.g.,_ be
+non-preferred).
+* Whether IPsec headers can be retained on decrypt for inbound inline
+operations.
+* Whether classification pipelining is supported (to be discussed below).
+
+In addition, capabilities also inform the application of the maximum number
+of destination queues and classification CoS targets supported. These
+will be discussed further later.
+
+==== IPsec Operation Modes
+IPsec operates in one of three modes: Synchronous, Asynchronous, and Inline.
+
+==== Lookaside Processing
+Synchronous and Asynchronous are types of _lookaside_ processing. Which of
+these forms may be used depends on the IPsec operation mode. So synchronous
+APIs may only be used when operating in synchronous mode, and asynchronous
+APIs may only be used when operating in asynchronous mode.
+
+In lookaside mode, the application receives (or creates) an IPsec packet and
+then uses ODP to perform one of two functions:
+
+* To decrypt an IPsec packet into a "normal" packet
+* To take a "normal" packet and encrypt it into an IPsec packet.
+
+This process may be performed _synchronously_ with the APIs `odp_ipsec_in()`
+(to decrypt) and `odp_ipsec_out()` (to encrypt). Upon return from these calls
+the requested packet transformation is complete, or an error return code
+indicates that it could not be performed (_e.g.,_ packet decryption failed).
+
+Synchronous processing may be preferred if the application has a large number
+of worker threads so that blocking any individual worker while IPsec processing
+is performed represents a reasonable design. The alternative is to use
+_asynchronous_ forms of these APIs:
+
+* `odp_ipsec_in_enq()` for decrypt
+* `odp_ipsec_out_enq()` for encrypt
+
+These simply pass packets to IPsec for processing. When this processing is
+complete, the resulting packets are sent to the completion queue associated
+with the SA used by the operation, serving as IPsec completion events as
+shown here:
+
+image::ipsec-lookaside.svg[align="center"]
+
+If the operation fails because SA lookup failed for inbound processing, then
+these result packets are sent to the default queue specified as part of the
+`odp_ipsec_inbound_config_t` used in the `odp_ipsec_config()` call.
+
+Following an asynchronous IPsec call, the worker thread moves on to process
+other events until the IPsec completion shows up. At that point the worker
+thread sees whether the operation was successful or not and continues
+processing for that packet. These events may be direct-polled with
+`odp_queue_deq()` if the completion queue was created as a plain queue, or
+processed via the ODP scheduler if the completion queue was created as a
+scheduled queue.
+
+==== Inline Processing
+While lookaside processing offers flexibility, it still requires extra
+processing steps not required by modern hardware. To avoid this overhead
+ODP also offers _inline_ processing support for IPsec. In this mode the
+processing of IPsec packets on the RX and TX paths is fully offloaded as
+shown here:
+
+image::ipsec-inline.svg[align="center"]
+
+It is worth noting that, depending on the implementation and application
+needs, inline processing may be enabled only for one direction (inbound or
+outbound) or for both directions.
+
+On the receive side, once configured for inline processing, arriving IPsec
+packets that are recognized at the PktIO interface are decrypted automatically
+before the application ever sees them. On the transmit side, the application
+calls `odp_ipsec_out_inline()` and the packet is encrypted and queued for
+transmission as a single operation without further application involvement.
+Note that if an inbound IPsec packet is not recognized (_e.g.,_ it belongs to
+an unknown SA) then it will be presented to the application as-is without
+further processing. The application may then use a lookaside call to process
+the packet if it is able to supply a matching SA by other means.
+
+On the receive side, after an IPsec packet is decrypted, it may be
+_pipelined_ to the ODP classifier or added to a poll queue, as the
+application wishes. The advantage of classification pipelining is that inbound
+IPsec traffic is automatically decrypted and classified into appropriate
+flow-based queues for ease of processing.
+
+On the transmit side, since IPsec encryption and tunneling may exceed an
+output MTU, ODP also offers support for MTU configuration and automatic IPsec
+TX fragmentation.
+
+Both classification pipelining and TX fragmentation support are support
+features that are indicated by `odp_ipsec_capability()`.
+
+Note that at present inline IPsec output support sends resulting packets
+directly to an output PktIO. If it's desired to send them to the ODP
+Traffic Manager for shaping prior to transmission, use the lookaside APIs
+to perform the IPsec encrypt and then call `odp_tm_enq()` on the resulting
+packet.
+
+=== IPsec Configuration
+Prior to making use of IPsec services, the `odp_ipsec_config()` API is used to
+configure IPsec processing options. This API takes a pointer to an
+`odp_ipsec_config_t` struct as its argument.
+
+The `odp_ipsec_config_t` struct specifies the inbound and outbound processing
+modes (SYNC, ASYNC, or INLINE) that the application plans to use, the maximum
+number of Security Associations it will use, and sets inbound and outbound
+processing options.
+
+==== IPsec Inbound Configuration
+Inbound configuration options for IPsec specify the default `odp_queue_t` to
+be used for processing global events like SA lookup failures, how Security
+Parameter Index (SPI) lookup is to be performed, and whether the application
+requires ODP to retain outer headers for decrypted IPsec packets.
+
+Parsing options specify how "deep" decrypted packets are to be parsed
+after IPsec processing by specifying the packet layers of interest to the
+application (None, L2, L3, L4, or All). And which checksums should be verified
+on decrypted packets.
+
+==== IPsec Outbound Configuration
+Outbound configuration options for IPsec specify checksum insertion processing
+that should be performed prior to encryption.
+
+=== IPsec Events
+IPsec introduces one new event type and one new event subtype. These are:
+
+* IPsec packet events. These are events of type `ODP_EVENT_PACKET` that have
+subtype `ODP_EVENT_PACKET_IPSEC`. These are packets that carry additional
+IPsec-related metadata in the form of an `odp_ipsec_packet_result_t` struct
+that can be retrieved from the packet via the `odp_ipsec_result()` API.
+
+* IPsec status notifications. These are events of type `ODP_EVENT_IPSEC_STATUS`
+that indicate status events not associated with any particular IPsec
+packet. Such events carry status in the form of an `odp_ipsec_status_t`
+struct that is retrieved from the event via the `odp_ipsec_status()` API.
+
+IPsec-related events are thus part of normal and exception processing when
+working with IPsec.
+
+=== Security Associations (SAs)
+The fundamental "building block" for IPsec processing is the _Security
+Association (SA)_. Similar to a crypto session, the SA encapsulates the keying
+material and context needed to perform IPsec protocol processing for inbound
+or outbound packets on a given flow, as well as additional processing options
+that control how IPsec is to be used for packets processed under this
+SA. Security Associations are unidirectional (RX or TX) so a flow that
+requires both inbound (decrypt) and outbound (encrypt) IPsec functions will
+have two SAs associated with it. SAs in ODP are represented by the
+abstract type `odp_ipsec_sa_t`.
+
+After ODP initialization, IPsec support is dormant until it is configured
+by a call to `odp_ipsec_config()` as described earlier. Once configured,
+SAs may be created by calling `odp_ipsec_sa_create()`.
+
+==== SA Creation and Configuration
+The `odp_ipsec_sa_create()` API takes an `odp_ipsec_sa_param_t` argument that
+describes the SA to be created. Use the `odp_ipsec_sa_param_init()` API to
+initialize this to its default state and then override selected fields within
+the param struct as needed.
+
+Items specified in the `odp_ipsec_sa_param_t` struct include:
+
+* The direction of the SA (inbound or outbound).
+
+* The IPsec protocol being used (ESP or AH).
+
+* The IPsec protocol mode (Transport or Tunnel).
+
+* The parameters needed for the crypto and authentication algorithms to be
+used by this SA.
+
+* Miscellaneous SA options that control behavior such as use of Extended
+Sequence Numbers (ESNs), the use of UDP encapsulation, various copy
+options for header fields, and whether the TTL (Hop Limit) field should be
+decremented when operating in tunnel mode.
+
+* Parameters controlling the SA lifetime.
+
+* The Security Parameter Index (SPI) that packets will use to indicate that
+they belong to this SA.
+
+* The pipeline mode used by this SA.
+
+* The destination `odp_queue_t` to be used for events associated with this SA.
+
+* The user context pointer (and length) associated with this SA for
+application use.
+
+In addition, there are specific direction-specific parameters that vary
+based on whether the SA is for inbound or outbound use. For inbound SAs:
+
+* Controls for how this SA is to be looked up.
+
+* The minimum size of the anti-replay window to be used.
+
+* The default CoS to use when classification pipelining packets matching this
+SA.
+
+For outbound SAs:
+
+* Tunnel parameters to use when doing outbound processing in tunnel mode.
+
+* The fragmentation mode to be used.
+
+* The MTU to be used to control the maximum length IP packets that outbound
+IPsec operations may produce. This can be changed dynamically by the
+`odp_ipsec_sa_mtu_update()` API.
+
+As can be seen, SAs have a large degree of configurability.
+
+==== SA Lifecycle Management
+In discussing the lifecycle of an SA, it is useful to refer to the following
+state diagram:
+
+image::ipsec_fsm.svg[align="center"]
+
+After creation, IPsec services are active for this Security Association. The
+specific APIs that can be used on this SA depends on the IPsec operating mode
+that has been configured.
+
+===== IPsec Lookaside Processing
+If IPsec is operating in lookaside mode for the SA's direction (the
+`odp_ipsec_op_mode_t` is `ODP_IPSEC_OP_MODE_SYNC` or `ODP_IPSEC_OP_MODE_ASYNC`),
+then inbound or outbound lookaside operations may be performed. Asynchronous
+lookaside operations are also permitted if the SA is operating in inline
+mode, as described in the next section.
+
+The synchronous forms of these APIs are:
+
+* `odp_ipsec_in()`
+* `odp_ipsec_out()`
+
+Upon return from these calls, the return code tells the application the number
+of number of input packets that were consumed by the operation. The result of
+the operation is determined by calling the `odp_ipsec_result()` API for each
+output packet to retrieve its associated `odp_ipsec_result_t`.
+
+The asynchronous forms of these APIs are:
+
+* `odp_ipsec_in_enq()`
+* `odp_ipsec_out_enq()`
+
+Here again, the return code indicates how many input packets were
+processed. The success or failure is determined by inspecting the
+`odp_ipsec_result_t` associated with each packet completion event. These are
+presented as events of type `ODP_EVENT_PACKET` with subtype
+`ODP_EVENT_PACKET_IPSEC`.
+
+For both synchronous and asynchronous IPsec operations an input packet array
+is transformed into an output packet array as specified by a controlling
+parameter struct. For inbound operations, the `odp_ipsec_in_param_t` is
+used to specify how SA processing is to be performed for the requested
+operation. The caller may say that SA lookup processing should be performed
+for each input packet, a single (specified) SA should be used for all packets,
+or that each packet has a specified individual SA.
+
+For outbound lookaside operations, a corresponding `odp_ipsec_out_param_t`
+serves a similar role, but here the SA must be specified since the input
+packet(s) are non-IPsec packets. Again the option is to use a single SA for
+all input packets or one per input packet.
+
+For outbound operations, an associated array of `odp_ipsec_out_opt_t` structs
+is also used to control the fragmentation mode to be used as part of the
+outbound processing. Options here are to not fragment, to fragment before
+IPsec processing, after IPsec processing, or to only check whether IP
+fragmentation is needed but not to perform it. For check processing, the `mtu`
+status error bit in the `odp_ipsec_packet_result_t` is set if check processing
+detects that the resulting packet will not fit into the configured MTU. Note
+that the MTU associated with a given SA is set at SA creation and can be
+changed at any time via the `odp_ipsec_sa_mtu_update()` API.
+
+Once an asynchronous lookaside operation has been initiated, the worker thread
+that issued the asynchronous call can handle other events while waiting for
+the operation to complete. Completion of an asynchronous operation is
+indicated by the worker receiving an `ODP_EVENT_PACKET` that has subtype
+`ODP_EVENT_PACKET_IPSEC`. These events can be retrieved directly by polling
+the completion queue associated with the SA, or (more typically) via the ODP
+scheduler. Typical code for such completion processing would look as follows:
+
+[source,c]
+-----
+while (1) {
+ ev = odp_schedule(&queue, ODP_SCHED_WAIT);
+ ev_type = odp_event_types(ev, &ev_subtype);
+
+ switch (ev_type) {
+ case ODP_EVENT_PACKET:
+
+ switch (ev_subtype) {
+ case ODP_EVENT_PACKET_IPSEC:
+ pkt = odp_packet_from_event(ev);
+
+ if (odp_unlikely(odp_ipsec_result(&result, pkt) != 0)) {
+ /* Stale event, discard */
+ odp_event_free(ev);
+ continue;
+ }
+
+ if (odp_unlikely(result.status.all != ODP_IPSEC_OK)) {
+ if (result.status.error != ODP_IPSEC_OK) {
+ ...process error result
+ odp_event_free(ev);
+ continue;
+ } else {
+ ...process packet warnings
+ }
+ }
+
+ my_context = odp_ipsec_sa_context(result.sa);
+
+ if (result.flag.inline_mode) {
+ ...process inline inbound packet
+ } else {
+ ...process the async completion event
+ }
+
+ ...
+ break;
+
+ case ...
+ }
+ break;
+
+ case ODP_EVENT_IPSEC_STATUS:
+ ...process IPsec status event
+ break;
+
+ }
+}
+-----
+
+===== IPsec Inline Processing
+When IPsec is configured to operate in `ODP_IPSEC_OP_MODE_INLINE` mode,
+inbound processing is implicit. The application never sees these packets until
+after IPsec has already decrypted them. As shown in the code sketch above,
+such packets appear as events of subtype `ODP_EVENT_PACKET_IPSEC` and the
+`flag` field in the associated `odp_ipsec_packet_result_t` indicates
+`inline_mode`.
+
+For outbound IPsec processing, the `odp_ipsec_out_inline()` API operates as
+a "fire and forget" API. A success return code from this call indicates that
+the packet will be encrypted and transmitted to the `odp_pktio_t` indicated
+in the `odp_ipsec_out_inline_param_t` specified at the time of the call without
+any further application involvement. Only if a problem arises will the packet
+be returned to the application with an `odp_ipsec_packet_result_t` indicating
+the nature of the problem.
+
+Note that while operating in inline mode, asychronous lookaside operations are
+also permitted. This provide the application with additional flexibility if,
+for example, some packets need additional handling that cannot be supported
+directly with inline IPsec processing.
+
+==== SA Lifetimes
+A fundamental principle of good security is that the keying material
+associated with sessions has a limited lifetime. In effect, keys grow "stale"
+over time or due to being used to encrypt too much data. The metrics used
+to limit effective SA lifetimes are:
+
+* Duration (time)
+* Usage (volume of traffic using the keys)
+
+Associated with each of these metrics are "soft" and "hard" limits. When a
+hard limit is reached, the SA is expired and cannot be used further. To support
+graceful transition to a replacement SA, soft limits are used. A soft limit is
+similar to a "low fuel" warning light on a car. It alerts the application that
+the SA is nearing the end of its useful life and should be renegotiated even
+as the SA continues to work normally.
+
+ODP support for SA limits is based on packet/byte counts. Applications that
+wish to use time-based SA limits may do so on their own using the timing
+facilities that ODP provides. However, since especially with inline IPsec
+processing, the application may not have explicit knowledge of the traffic
+volumes associated with a given SA, support for usage-based limits is
+integrated into ODP IPsec support.
+
+At `odp_ipsec_sa_create()` time, one of the fields in the
+`odp_ipsec_sa_param_t` struct is the `odp_ipsec_lifetime_t` sub-structure.
+This struct allows hard and/or soft limits to be specified in terms of total
+bytes encrypted/decrypted, total packet count, or both. A limit specification
+of 0 indicates no limit for that metric. If either is specified, the limit
+is triggered on whichever occurs first. Given the defined behavior of hard vs.
+soft limits, the soft limits, if used, should always be specified as lower
+than the hard limits. These should be sufficiently lower to enable adequate
+time to switch over to a replacement SA before the hard limit is reached.
+
+As noted, when an SA hard limit is reached the SA immediately enters the
+expired state and attempts to use it further are failed with an
+`odp_ipsec_result_t` that indicates a hard expiration limit. When a soft
+limit is reached for packets sent via `odp_ipsec_out_inline()`, this results
+in an `ODP_EVENT_IPSEC_STATUS` event being sent to the application on the
+queue associated with the SA that has reached the soft limit. This status
+event has an `odp_ipsec_status_id_t` of `ODP_IPSEC_STATUS_WARN` with a
+`odp_ipsec_warn_t` bits set to indicate the type of soft expiration reached.
+Receipt of this event alerts the application that the SA is nearing the end of
+its useful life and that it should be replaced. It is the application's
+responsibility to heed this warning. It is implementation-defined how many
+such warnings are issued when a soft limit is exceeded (once, first N packets,
+or all packets beyond the limit), so applications should be written to
+allow for possible repeated warnings.
+
+When operating in lookaside mode, expiration limits are carried as a warning
+in the `odp_op_status_t` section of the `odp_ipsec_result_t` struct. The same
+is true for inline inbound packets. When the soft limit is reached, these
+packets will carry a warning flag indicating this condition.
+
+==== SA Disablement and Destruction
+When it is time to retire an SA, the application does so by first issuing a
+call to the `odp_ipsec_sa_disable()` API. This call initiates termination
+processing for an SA by stopping use of the SA for new operations while still
+allowing those that are "in flight" to complete processing. Following this call
+the application continues to receive and process IPsec events as normal.
+
+Disable completion is indicated by the application seeing an event of type
+`ODP_EVENT_IPSEC_STATUS` for this SA that contains an `odp_ipsec_status_id_t`
+of `ODP_IPSEC_STATUS_SA_DISABLE`. For inbound SAs, receipt of this event means
+that the application has seen all IPsec packets associatd with this SA that
+were pending at the time of the disable call. For outbound SAs, receipt of
+this event means that the application has seen all result events associated
+with packets sent via this SA.
+
+Note that once a packet has been "seen" by the application, it becomes the
+application's responsibility to ensure that it is fully processed before
+attempting to destroy its associated SA. The disable call exists to give
+the application assurance that there are no pending IPsec events for this
+SA associated with packets that it has not seen before.
+
+So after disabling the SA, the application can process pending packets
+normally until it sees the disable status event. At that point it knows that
+all pending packets that arrived before the disable have been seen and it is
+safe for the application to destroy it via `odp_ipsec_sa_destroy()`, thus
+completing the SA lifecycle.
diff --git a/doc/users-guide/users-guide.adoc b/doc/users-guide/users-guide.adoc
index 0c7d3f77..7f2ad69e 100644
--- a/doc/users-guide/users-guide.adoc
+++ b/doc/users-guide/users-guide.adoc
@@ -1192,6 +1192,8 @@ include::users-guide-timer.adoc[]
include::users-guide-crypto.adoc[]
+include::users-guide-ipsec.adoc[]
+
include::users-guide-tm.adoc[]
include::users-guide-cls.adoc[]
commit 12403213da9cd4600f4e3b61a10e2369219061f0
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Wed Sep 20 13:39:26 2017 -0500
doc: images: add graphviz source for ipsec fsm
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/doc/images/.gitignore b/doc/images/.gitignore
index 003dbe65..0aa34793 100644
--- a/doc/images/.gitignore
+++ b/doc/images/.gitignore
@@ -1,4 +1,5 @@
resource_management.svg
+ipsec_fsm.svg
pktio_fsm.svg
timer_fsm.svg
timeout_fsm.svg
diff --git a/doc/images/ipsec_fsm.gv b/doc/images/ipsec_fsm.gv
new file mode 100644
index 00000000..1e78c8b8
--- /dev/null
+++ b/doc/images/ipsec_fsm.gv
@@ -0,0 +1,32 @@
+digraph ipsec_state_machine {
+ rankdir=LR;
+ size="12,12";
+ node [fontsize=28];
+ edge [fontsize=28];
+ node [shape=doublecircle]; Unconfigured Configured SA_Ready SA_Expired;
+ node [shape=circle];
+ Unconfigured -> Configured [label="odp_ipsec_config()"
+ constraint=false];
+ Configured -> SA_Ready [label="odp_ipsec_sa_create()"];
+ SA_Ready -> Disable_Pending [label="odp_ipsec_sa_disable()"];
+ Disable_Pending -> Disable_Check [label="odp_queue_deq()"];
+ Disable_Pending -> Disable_Check [label="odp_schedule()"];
+ SA_Disabled -> Configured [label="odp_ipsec_sa_destroy()"
+ constraint=false];
+ SA_Ready -> Processing [label="odp_ipsec_in_enq()"];
+ SA_Ready -> Processing [label="odp_ipsec_out_enq()"];
+ Processing -> Op_Complete [label="odp_queue_deq()"];
+ Processing -> Op_Complete [label="odp_schedule()"];
+ Op_Complete -> SA_Expired [label="hard limit reached" constraint=false];
+ SA_Ready -> SA_Ready [label="odp_ipsec_in()"];
+ SA_Ready -> SA_Ready [label="odp_ipsec_out()"];
+ SA_Ready -> SA_Ready [label="odp_ipsec_out_inline()"];
+ SA_Ready -> SA_Expired [label="hard limit reached"];
+ Op_Complete -> SA_Ready [label="odp_ipsec_result()"]
+ Op_Complete -> SA_Ready [label="odp_ipsec_status()"]
+ Disable_Check -> SA_Disabled [label="odp_ipsec_status()"
+ constraint=false];
+ Disable_Check -> Disable_Pending [label="odp_ipsec_result()"
+ constraint=false];
+ SA_Expired -> Disable_Pending [label="odp_ipsec_sa_disable()"];
+}
diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am
index e6a44d98..d88d7f9e 100644
--- a/doc/users-guide/Makefile.am
+++ b/doc/users-guide/Makefile.am
@@ -10,6 +10,7 @@ SRC = users-guide.adoc \
TARGET = users-guide.html
IMAGES = $(IMAGES_DIR)/overview.svg \
$(IMAGES_DIR)/atomic_queue.svg \
+ $(IMAGES_DIR)/ipsec_fsm.svg \
$(IMAGES_DIR)/odp_components.svg \
$(IMAGES_DIR)/ODP-Logo-HQ.svg \
$(IMAGES_DIR)/odp_rx_processing.svg \
@@ -46,6 +47,7 @@ IMAGES += $(IMAGES_DIR)/resource_management.svg
endif
IMAGES_SRCS = \
+ $(IMAGES_DIR)/ipsec_fsm.gv \
$(IMAGES_DIR)/pktio_fsm.gv \
$(IMAGES_DIR)/resource_management.msc \
$(IMAGES_DIR)/timeout_fsm.gv \
commit 5cbb3749e3478d9ed22423399c2339b7fa39442f
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Wed Sep 20 13:36:42 2017 -0500
doc: images: add diagrams used for ipsec documentation
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/doc/images/ipsec-inline.svg b/doc/images/ipsec-inline.svg
new file mode 100644
index 00000000..e5b160b1
--- /dev/null
+++ b/doc/images/ipsec-inline.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:ooo="http://xml.openoffice.org/svg/export" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.2" width="471.92221mm" height="171.72112mm" viewBox="0 0 47192.222 17172.112" preserveAspectRatio="xMidYMid" xml:space="preserve" id="svg1189" sodipodi:docname="ipsec-inline.svg" style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" inkscape:version="0.92.1 r15371"><metadata id="metadata1193"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10"
gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1407" inkscape:window-height="722" id="namedview1191" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:zoom="0.55044522" inkscape:cx="939.7648" inkscape:cy="333.33699" inkscape:window-x="65" inkscape:window-y="24" inkscape:window-maximized="0" inkscape:current-layer="svg1189"/><defs class="ClipPathGroup" id="defs8"><clipPath id="presentation_clip_path" clipPathUnits="userSpaceOnUse"><rect x="0" y="0" width="59411" height="42012" id="rect2"/></clipPath><clipPath id="presentation_clip_path_shrink" clipPathUnits="userSpaceOnUse"><rect x="59" y="42" width="59293" height="41928" id="rect5"/></clipPath></defs><defs id="defs93"><font id="EmbeddedFont_1" horiz-adv-x="2048" horiz-origin-x="0" horiz-origin-y="0" vert-origin-x="45" vert-origin-y="90" vert-adv-y="90"><font-face font-family="Liberation Sans embedded" units-per-e
m="2048" font-weight="normal" font-style="normal" ascent="1826" descent="423" id="font-face10"/><missing-glyph horiz-adv-x="2048" d="M 0,0 L 2047,0 2047,2047 0,2047 0,0 Z" id="missing-glyph12"/><glyph unicode="y" horiz-adv-x="1059" d="M 604,1 C 579,-64 553,-123 527,-175 500,-227 471,-272 438,-309 405,-346 369,-374 329,-394 289,-413 243,-423 191,-423 168,-423 147,-423 128,-423 109,-423 88,-420 67,-414 L 67,-279 C 80,-282 94,-284 110,-284 126,-284 140,-284 151,-284 204,-284 253,-264 298,-225 343,-186 383,-124 417,-38 L 434,5 5,1082 197,1082 425,484 C 432,466 440,442 451,412 461,382 471,352 482,322 492,292 501,265 509,241 517,217 522,202 523,196 525,203 530,218 538,240 545,261 554,285 564,312 573,339 583,366 593,393 603,420 611,444 618,464 L 830,1082 1020,1082 604,1 Z" id="glyph14"/><glyph unicode="v" horiz-adv-x="1059" d="M 613,0 L 400,0 7,1082 199,1082 437,378 C 442,363 447,346 454,325 460,304 466,282 473,259 480,236 486,215 492,194 497,173 502,155 506,141 510,155 515,173 522,194 528
,215 534,236 541,258 548,280 555,302 562,323 569,344 575,361 580,376 L 826,1082 1017,1082 613,0 Z" id="glyph16"/><glyph unicode="u" horiz-adv-x="901" d="M 314,1082 L 314,396 C 314,343 318,299 326,264 333,229 346,200 363,179 380,157 403,142 432,133 460,124 495,119 537,119 580,119 618,127 653,142 687,157 716,178 741,207 765,235 784,270 797,312 810,353 817,401 817,455 L 817,1082 997,1082 997,228 C 997,205 997,181 998,156 998,131 998,107 999,85 1000,62 1000,43 1001,27 1002,11 1002,3 1003,3 L 833,3 C 832,6 832,15 831,30 830,44 830,61 829,79 828,98 827,117 826,136 825,156 825,172 825,185 L 822,185 C 805,154 786,125 765,100 744,75 720,53 693,36 666,18 634,4 599,-6 564,-15 523,-20 476,-20 416,-20 364,-13 321,2 278,17 242,39 214,70 186,101 166,140 153,188 140,236 133,294 133,361 L 133,1082 314,1082 Z" id="glyph18"/><glyph unicode="t" horiz-adv-x="531" d="M 554,8 C 527,1 499,-5 471,-10 442,-14 409,-16 372,-16 228,-16 156,66 156,229 L 156,951 31,951 31,1082 163,1082 216,1324 336,1324 336,1082
536,1082 536,951 336,951 336,268 C 336,216 345,180 362,159 379,138 408,127 450,127 467,127 484,128 501,131 517,134 535,137 554,141 L 554,8 Z" id="glyph20"/><glyph unicode="s" horiz-adv-x="927" d="M 950,299 C 950,248 940,203 921,164 901,124 872,91 835,64 798,37 752,16 698,2 643,-13 581,-20 511,-20 448,-20 392,-15 342,-6 291,4 247,20 209,41 171,62 139,91 114,126 88,161 69,203 57,254 L 216,285 C 231,227 263,185 311,158 359,131 426,117 511,117 550,117 585,120 618,125 650,130 678,140 701,153 724,166 743,183 756,205 769,226 775,253 775,285 775,318 767,345 752,366 737,387 715,404 688,418 661,432 628,444 589,455 550,465 507,476 460,489 417,500 374,513 331,527 288,541 250,560 216,583 181,606 153,634 132,668 111,702 100,745 100,796 100,895 135,970 206,1022 276,1073 378,1099 513,1099 632,1099 727,1078 798,1036 868,994 912,927 931,834 L 769,814 C 763,842 752,866 736,885 720,904 701,919 678,931 655,942 630,951 602,956 573,961 544,963 513,963 432,963 372,951 333,926 294,901 275,864 275,814 275,78
5 282,761 297,742 311,723 331,707 357,694 382,681 413,669 449,660 485,650 525,640 568,629 597,622 626,614 656,606 686,597 715,587 744,576 772,564 799,550 824,535 849,519 870,500 889,478 908,456 923,430 934,401 945,372 950,338 950,299 Z" id="glyph22"/><glyph unicode="r" horiz-adv-x="556" d="M 142,0 L 142,830 C 142,853 142,876 142,900 141,923 141,946 140,968 139,990 139,1011 138,1030 137,1049 137,1067 136,1082 L 306,1082 C 307,1067 308,1049 309,1030 310,1010 311,990 312,969 313,948 313,929 314,910 314,891 314,874 314,861 L 318,861 C 331,902 344,938 359,969 373,999 390,1024 409,1044 428,1063 451,1078 478,1088 505,1097 537,1102 575,1102 590,1102 604,1101 617,1099 630,1096 641,1094 648,1092 L 648,927 C 636,930 622,933 606,935 590,936 572,937 552,937 511,937 476,928 447,909 418,890 394,865 376,832 357,799 344,759 335,714 326,668 322,618 322,564 L 322,0 142,0 Z" id="glyph24"/><glyph unicode="p" horiz-adv-x="953" d="M 1053,546 C 1053,464 1046,388 1033,319 1020,250 998,190 967,140 936,90 895
,51 844,23 793,-6 730,-20 655,-20 578,-20 510,-5 452,24 394,53 350,101 319,168 L 314,168 C 315,167 315,161 316,150 316,139 316,126 317,110 317,94 317,76 318,57 318,37 318,17 318,-2 L 318,-425 138,-425 138,864 C 138,891 138,916 138,940 137,964 137,986 136,1005 135,1025 135,1042 134,1056 133,1070 133,1077 132,1077 L 306,1077 C 307,1075 308,1068 309,1057 310,1045 311,1031 312,1014 313,998 314,980 315,961 316,943 316,925 316,908 L 320,908 C 337,943 356,972 377,997 398,1021 423,1041 450,1057 477,1072 508,1084 542,1091 575,1098 613,1101 655,1101 730,1101 793,1088 844,1061 895,1034 936,997 967,949 998,900 1020,842 1033,774 1046,705 1053,629 1053,546 Z M 864,542 C 864,609 860,668 852,720 844,772 830,816 811,852 791,888 765,915 732,934 699,953 658,962 609,962 569,962 531,956 496,945 461,934 430,912 404,880 377,848 356,804 341,748 326,691 318,618 318,528 318,451 324,387 337,334 350,281 368,238 393,205 417,172 447,149 483,135 519,120 560,113 607,113 657,113 699,123 732,142 765,161 791,189 811,
226 830,263 844,308 852,361 860,414 864,474 864,542 Z" id="glyph26"/><glyph unicode="o" horiz-adv-x="980" d="M 1053,542 C 1053,353 1011,212 928,119 845,26 724,-20 565,-20 490,-20 422,-9 363,14 304,37 254,71 213,118 172,165 140,223 119,294 97,364 86,447 86,542 86,915 248,1102 571,1102 655,1102 728,1090 789,1067 850,1044 900,1009 939,962 978,915 1006,857 1025,787 1044,717 1053,635 1053,542 Z M 864,542 C 864,626 858,695 845,750 832,805 813,848 788,881 763,914 732,937 696,950 660,963 619,969 574,969 528,969 487,962 450,949 413,935 381,912 355,879 329,846 309,802 296,747 282,692 275,624 275,542 275,458 282,389 297,334 312,279 332,235 358,202 383,169 414,146 449,133 484,120 522,113 563,113 609,113 651,120 688,133 725,146 757,168 783,201 809,234 829,278 843,333 857,388 864,458 864,542 Z" id="glyph28"/><glyph unicode="n" horiz-adv-x="900" d="M 825,0 L 825,686 C 825,739 821,783 814,818 806,853 793,882 776,904 759,925 736,941 708,950 679,959 644,963 602,963 559,963 521,956 487,941 452,926 423
,904 399,876 374,847 355,812 342,771 329,729 322,681 322,627 L 322,0 142,0 142,853 C 142,876 142,900 142,925 141,950 141,974 140,996 139,1019 139,1038 138,1054 137,1070 137,1078 136,1078 L 306,1078 C 307,1075 307,1066 308,1052 309,1037 310,1021 311,1002 312,984 312,965 313,945 314,926 314,910 314,897 L 317,897 C 334,928 353,957 374,982 395,1007 419,1029 446,1047 473,1064 505,1078 540,1088 575,1097 616,1102 663,1102 723,1102 775,1095 818,1080 861,1065 897,1043 925,1012 953,981 974,942 987,894 1000,845 1006,788 1006,721 L 1006,0 825,0 Z" id="glyph30"/><glyph unicode="m" horiz-adv-x="1456" d="M 768,0 L 768,686 C 768,739 765,783 758,818 751,853 740,882 725,904 709,925 688,941 663,950 638,959 607,963 570,963 532,963 498,956 467,941 436,926 410,904 389,876 367,847 350,812 339,771 327,729 321,681 321,627 L 321,0 142,0 142,853 C 142,876 142,900 142,925 141,950 141,974 140,996 139,1019 139,1038 138,1054 137,1070 137,1078 136,1078 L 306,1078 C 307,1075 307,1066 308,1052 309,1037 310,1021 311,
1002 312,984 312,965 313,945 314,926 314,910 314,897 L 317,897 C 333,928 350,957 369,982 388,1007 410,1029 435,1047 460,1064 488,1078 521,1088 553,1097 590,1102 633,1102 715,1102 780,1086 828,1053 875,1020 908,968 927,897 L 930,897 C 946,928 964,957 984,982 1004,1007 1027,1029 1054,1047 1081,1064 1111,1078 1144,1088 1177,1097 1215,1102 1258,1102 1313,1102 1360,1095 1400,1080 1439,1065 1472,1043 1497,1012 1522,981 1541,942 1553,894 1565,845 1571,788 1571,721 L 1571,0 1393,0 1393,686 C 1393,739 1390,783 1383,818 1376,853 1365,882 1350,904 1334,925 1313,941 1288,950 1263,959 1232,963 1195,963 1157,963 1123,956 1092,942 1061,927 1035,906 1014,878 992,850 975,815 964,773 952,731 946,682 946,627 L 946,0 768,0 Z" id="glyph32"/><glyph unicode="l" horiz-adv-x="187" d="M 138,0 L 138,1484 318,1484 318,0 138,0 Z" id="glyph34"/><glyph unicode="k" horiz-adv-x="927" d="M 816,0 L 450,494 318,385 318,0 138,0 138,1484 318,1484 318,557 793,1082 1004,1082 565,617 1027,0 816,0 Z" id="glyph36"/><glyph un
icode="i" horiz-adv-x="187" d="M 137,1312 L 137,1484 317,1484 317,1312 137,1312 Z M 137,0 L 137,1082 317,1082 317,0 137,0 Z" id="glyph38"/><glyph unicode="h" horiz-adv-x="874" d="M 317,897 C 337,934 359,965 382,991 405,1016 431,1037 459,1054 487,1071 518,1083 551,1091 584,1098 622,1102 663,1102 732,1102 789,1093 834,1074 878,1055 913,1029 939,996 964,962 982,922 992,875 1001,828 1006,777 1006,721 L 1006,0 825,0 825,686 C 825,732 822,772 817,807 811,842 800,871 784,894 768,917 745,934 716,946 687,957 649,963 602,963 559,963 521,955 487,940 452,925 423,903 399,875 374,847 355,813 342,773 329,733 322,688 322,638 L 322,0 142,0 142,1484 322,1484 322,1098 C 322,1076 322,1054 321,1032 320,1010 320,990 319,971 318,952 317,937 316,924 315,911 315,902 314,897 L 317,897 Z" id="glyph40"/><glyph unicode="g" horiz-adv-x="954" d="M 548,-425 C 486,-425 431,-419 383,-406 335,-393 294,-375 260,-352 226,-328 198,-300 177,-267 156,-234 140,-198 131,-158 L 312,-132 C 324,-182 351,-220 392,-248 433,-274
486,-288 553,-288 594,-288 631,-282 664,-271 697,-260 726,-241 749,-217 772,-191 790,-159 803,-119 816,-79 822,-30 822,27 L 822,201 820,201 C 807,174 790,148 771,123 751,98 727,75 699,56 670,37 637,21 600,10 563,-2 520,-8 472,-8 403,-8 345,4 296,27 247,50 207,84 176,130 145,176 122,233 108,302 93,370 86,449 86,539 86,626 93,704 108,773 122,842 145,901 178,950 210,998 252,1035 304,1061 355,1086 418,1099 492,1099 569,1099 635,1082 692,1047 748,1012 791,962 822,897 L 824,897 C 824,914 825,933 826,953 827,974 828,994 829,1012 830,1031 831,1046 832,1060 833,1073 835,1080 836,1080 L 1007,1080 C 1006,1074 1006,1064 1005,1050 1004,1035 1004,1018 1003,998 1002,978 1002,956 1002,932 1001,907 1001,882 1001,856 L 1001,30 C 1001,-121 964,-234 890,-311 815,-387 701,-425 548,-425 Z M 822,541 C 822,616 814,681 798,735 781,788 760,832 733,866 706,900 676,925 642,941 607,957 572,965 536,965 490,965 451,957 418,941 385,925 357,900 336,866 314,831 298,787 288,734 277,680 272,616 272,541 272,463 277,398
288,345 298,292 314,249 335,216 356,183 383,160 416,146 449,132 488,125 533,125 569,125 604,133 639,148 673,163 704,188 731,221 758,254 780,297 797,350 814,403 822,466 822,541 Z" id="glyph42"/><glyph unicode="f" horiz-adv-x="557" d="M 361,951 L 361,0 181,0 181,951 29,951 29,1082 181,1082 181,1204 C 181,1243 185,1280 192,1314 199,1347 213,1377 233,1402 252,1427 279,1446 313,1461 347,1475 391,1482 445,1482 466,1482 489,1481 512,1479 535,1477 555,1474 572,1470 L 572,1333 C 561,1335 548,1337 533,1339 518,1340 504,1341 492,1341 465,1341 444,1337 427,1330 410,1323 396,1312 387,1299 377,1285 370,1268 367,1248 363,1228 361,1205 361,1179 L 361,1082 572,1082 572,951 361,951 Z" id="glyph44"/><glyph unicode="e" horiz-adv-x="980" d="M 276,503 C 276,446 282,394 294,347 305,299 323,258 348,224 372,189 403,163 441,144 479,125 525,115 578,115 656,115 719,131 766,162 813,193 844,233 861,281 L 1019,236 C 1008,206 992,176 972,146 951,115 924,88 890,64 856,39 814,19 763,4 712,-12 650,-20 578,-20 418,-2
0 296,28 213,123 129,218 87,360 87,548 87,649 100,735 125,806 150,876 185,933 229,977 273,1021 324,1053 383,1073 442,1092 504,1102 571,1102 662,1102 738,1087 799,1058 860,1029 909,988 946,937 983,885 1009,824 1025,754 1040,684 1048,608 1048,527 L 1048,503 276,503 Z M 862,641 C 852,755 823,838 775,891 727,943 658,969 568,969 538,969 507,964 474,955 441,945 410,928 382,903 354,878 330,845 311,803 292,760 281,706 278,641 L 862,641 Z" id="glyph46"/><glyph unicode="d" horiz-adv-x="954" d="M 821,174 C 788,105 744,55 689,25 634,-5 565,-20 484,-20 347,-20 247,26 183,118 118,210 86,349 86,536 86,913 219,1102 484,1102 566,1102 634,1087 689,1057 744,1027 788,979 821,914 L 823,914 C 823,921 823,931 823,946 822,960 822,975 822,991 821,1006 821,1021 821,1035 821,1049 821,1059 821,1065 L 821,1484 1001,1484 1001,219 C 1001,193 1001,168 1002,143 1002,119 1002,97 1003,77 1004,57 1004,40 1005,26 1006,11 1006,4 1007,4 L 835,4 C 834,11 833,20 832,32 831,44 830,58 829,73 828,89 827,105 826,123 825,140 82
5,157 825,174 L 821,174 Z M 275,542 C 275,467 280,403 289,350 298,297 313,253 334,219 355,184 381,159 413,143 445,127 484,119 530,119 577,119 619,127 656,142 692,157 722,182 747,217 771,251 789,296 802,351 815,406 821,474 821,554 821,631 815,696 802,749 789,802 771,844 746,877 721,910 691,933 656,948 620,962 579,969 532,969 488,969 450,961 418,946 386,931 359,906 338,872 317,838 301,794 291,740 280,685 275,619 275,542 Z" id="glyph48"/><glyph unicode="c" horiz-adv-x="875" d="M 275,546 C 275,484 280,427 289,375 298,323 313,278 334,241 355,203 384,174 419,153 454,132 497,122 548,122 612,122 666,139 709,173 752,206 778,258 788,328 L 970,328 C 964,283 951,239 931,197 911,155 884,118 850,86 815,54 773,28 724,9 675,-10 618,-20 553,-20 468,-20 396,-6 337,23 278,52 230,91 193,142 156,192 129,251 112,320 95,388 87,462 87,542 87,615 93,679 105,735 117,790 134,839 156,881 177,922 203,957 232,986 261,1014 293,1037 328,1054 362,1071 398,1083 436,1091 474,1098 512,1102 551,1102 612,1102 666,1094 7
13,1077 760,1060 801,1038 836,1009 870,980 898,945 919,906 940,867 955,824 964,779 L 779,765 C 770,825 746,873 708,908 670,943 616,961 546,961 495,961 452,953 418,936 383,919 355,893 334,859 313,824 298,781 289,729 280,677 275,616 275,546 Z" id="glyph50"/><glyph unicode="b" horiz-adv-x="953" d="M 1053,546 C 1053,169 920,-20 655,-20 573,-20 505,-5 451,25 396,54 352,102 318,168 L 316,168 C 316,150 316,132 315,113 314,94 313,77 312,61 311,45 310,31 309,19 308,8 307,2 306,2 L 132,2 C 133,8 133,18 134,32 135,47 135,64 136,84 137,104 137,126 138,150 138,174 138,199 138,225 L 138,1484 318,1484 318,1061 C 318,1041 318,1022 318,1004 317,985 317,969 316,955 315,938 315,923 314,908 L 318,908 C 351,977 396,1027 451,1057 506,1087 574,1102 655,1102 792,1102 892,1056 957,964 1021,872 1053,733 1053,546 Z M 864,540 C 864,615 859,679 850,732 841,785 826,829 805,864 784,898 758,923 726,939 694,955 655,963 609,963 562,963 520,955 484,940 447,925 417,900 393,866 368,832 350,787 337,732 324,677 318,609 3
18,529 318,452 324,387 337,334 350,281 368,239 393,206 417,173 447,149 483,135 519,120 560,113 607,113 651,113 689,121 721,136 753,151 780,176 801,210 822,244 838,288 849,343 859,397 864,463 864,540 Z" id="glyph52"/><glyph unicode="a" horiz-adv-x="1060" d="M 414,-20 C 305,-20 224,9 169,66 114,124 87,203 87,303 87,375 101,434 128,480 155,526 190,562 234,588 277,614 327,632 383,642 439,652 496,657 554,657 L 797,657 797,717 C 797,762 792,800 783,832 774,863 759,889 740,908 721,928 697,942 668,951 639,960 604,965 565,965 530,965 499,963 471,958 443,953 419,944 398,931 377,918 361,900 348,878 335,855 327,827 323,793 L 135,810 C 142,853 154,892 173,928 192,963 218,994 253,1020 287,1046 330,1066 382,1081 433,1095 496,1102 569,1102 705,1102 807,1071 876,1009 945,946 979,856 979,738 L 979,272 C 979,219 986,179 1000,152 1014,125 1041,111 1080,111 1090,111 1100,112 1110,113 1120,114 1130,116 1139,118 L 1139,6 C 1116,1 1094,-3 1072,-6 1049,-9 1025,-10 1000,-10 966,-10 937,-5 913,4 888,13 868,26
853,45 838,63 826,86 818,113 810,140 805,171 803,207 L 797,207 C 778,172 757,141 734,113 711,85 684,61 653,42 622,22 588,7 549,-4 510,-15 465,-20 414,-20 Z M 455,115 C 512,115 563,125 606,146 649,167 684,194 713,226 741,259 762,294 776,332 790,371 797,408 797,443 L 797,531 600,531 C 556,531 514,528 475,522 435,517 400,506 370,489 340,472 316,449 299,418 281,388 272,349 272,300 272,241 288,195 320,163 351,131 396,115 455,115 Z" id="glyph54"/><glyph unicode="_" horiz-adv-x="1191" d="M -31,-407 L -31,-277 1162,-277 1162,-407 -31,-407 Z" id="glyph56"/><glyph unicode="X" horiz-adv-x="1324" d="M 1112,0 L 689,616 257,0 46,0 582,732 87,1409 298,1409 690,856 1071,1409 1282,1409 800,739 1323,0 1112,0 Z" id="glyph58"/><glyph unicode="T" horiz-adv-x="1139" d="M 720,1253 L 720,0 530,0 530,1253 46,1253 46,1409 1204,1409 1204,1253 720,1253 Z" id="glyph60"/><glyph unicode="S" horiz-adv-x="1139" d="M 1272,389 C 1272,330 1261,275 1238,225 1215,175 1179,132 1131,96 1083,59 1023,31 950,11 877,-10 790,
-20 690,-20 515,-20 378,11 280,72 182,133 120,222 93,338 L 278,375 C 287,338 302,305 321,275 340,245 367,219 400,198 433,176 473,159 522,147 571,135 629,129 697,129 754,129 806,134 853,144 900,153 941,168 975,188 1009,208 1036,234 1055,266 1074,297 1083,335 1083,379 1083,425 1073,462 1052,491 1031,520 1001,543 963,562 925,581 880,596 827,609 774,622 716,635 652,650 613,659 573,668 534,679 494,689 456,701 420,716 383,730 349,747 317,766 285,785 257,809 234,836 211,863 192,894 179,930 166,965 159,1006 159,1053 159,1120 173,1177 200,1225 227,1272 264,1311 312,1342 360,1373 417,1395 482,1409 547,1423 618,1430 694,1430 781,1430 856,1423 918,1410 980,1396 1032,1375 1075,1348 1118,1321 1152,1287 1178,1247 1203,1206 1224,1159 1239,1106 L 1051,1073 C 1042,1107 1028,1137 1011,1164 993,1191 970,1213 941,1231 912,1249 878,1263 837,1272 796,1281 747,1286 692,1286 627,1286 572,1280 528,1269 483,1257 448,1241 421,1221 394,1201 374,1178 363,1151 351,1124 345,1094 345,1063 345,1021 356,987 377,960 3
98,933 426,910 462,892 498,874 540,859 587,847 634,835 685,823 738,811 781,801 825,791 868,781 911,770 952,758 991,744 1030,729 1067,712 1102,693 1136,674 1166,650 1191,622 1216,594 1236,561 1251,523 1265,485 1272,440 1272,389 Z" id="glyph62"/><glyph unicode="R" horiz-adv-x="1218" d="M 1164,0 L 798,585 359,585 359,0 168,0 168,1409 831,1409 C 911,1409 982,1400 1044,1382 1105,1363 1157,1337 1199,1302 1241,1267 1273,1225 1295,1175 1317,1125 1328,1069 1328,1006 1328,961 1322,917 1309,874 1296,831 1275,791 1247,755 1219,719 1183,688 1140,662 1097,636 1045,618 984,607 L 1384,0 1164,0 Z M 1136,1004 C 1136,1047 1129,1084 1114,1115 1099,1146 1078,1173 1050,1194 1022,1215 988,1230 948,1241 908,1251 863,1256 812,1256 L 359,1256 359,736 820,736 C 875,736 922,743 962,757 1002,770 1035,789 1061,813 1086,837 1105,865 1118,898 1130,931 1136,966 1136,1004 Z" id="glyph64"/><glyph unicode="Q" horiz-adv-x="1377" d="M 1495,711 C 1495,612 1482,521 1457,439 1431,356 1394,284 1346,222 1297,160 1238,110 116
8,71 1097,32 1017,6 928,-6 942,-49 958,-85 976,-115 993,-145 1013,-169 1036,-189 1059,-207 1084,-221 1112,-231 1139,-239 1170,-244 1204,-244 1223,-244 1243,-243 1264,-240 1285,-237 1304,-234 1319,-231 L 1319,-365 C 1294,-371 1266,-376 1236,-381 1205,-385 1174,-387 1141,-387 1084,-387 1034,-378 991,-361 948,-344 911,-319 879,-287 846,-255 818,-216 795,-170 772,-123 751,-71 733,-12 628,-12 535,7 456,46 376,84 310,136 257,200 204,265 164,340 137,427 110,513 97,607 97,709 97,819 112,919 143,1008 174,1097 219,1172 278,1235 337,1297 411,1346 498,1379 585,1413 684,1430 797,1430 909,1430 1009,1413 1096,1379 1183,1345 1256,1297 1315,1234 1374,1171 1418,1096 1449,1007 1480,918 1495,820 1495,711 Z M 1300,711 C 1300,796 1289,873 1268,942 1246,1011 1214,1071 1172,1120 1129,1169 1077,1207 1014,1234 951,1261 879,1274 797,1274 713,1274 639,1261 576,1234 513,1207 460,1169 418,1120 375,1071 344,1011 323,942 302,873 291,796 291,711 291,626 302,549 324,479 345,408 377,348 420,297 462,246 515,206 578,17
8 641,149 713,135 795,135 883,135 959,149 1023,178 1086,207 1139,247 1180,298 1221,349 1251,409 1271,480 1290,551 1300,628 1300,711 Z" id="glyph66"/><glyph unicode="P" horiz-adv-x="1086" d="M 1258,985 C 1258,924 1248,867 1228,814 1207,761 1177,715 1137,676 1096,637 1046,606 985,583 924,560 854,549 773,549 L 359,549 359,0 168,0 168,1409 761,1409 C 844,1409 917,1399 979,1379 1041,1358 1093,1330 1134,1293 1175,1256 1206,1211 1227,1159 1248,1106 1258,1048 1258,985 Z M 1066,983 C 1066,1072 1039,1140 984,1187 929,1233 847,1256 738,1256 L 359,1256 359,700 746,700 C 856,700 937,724 989,773 1040,822 1066,892 1066,983 Z" id="glyph68"/><glyph unicode="O" horiz-adv-x="1377" d="M 1495,711 C 1495,601 1479,501 1448,411 1416,321 1370,244 1310,180 1250,116 1177,67 1090,32 1003,-3 905,-20 795,-20 679,-20 577,-2 490,35 403,71 330,122 272,187 214,252 170,329 141,418 112,507 97,605 97,711 97,821 112,920 143,1009 174,1098 219,1173 278,1236 337,1298 411,1346 498,1380 585,1413 684,1430 797,1430 909,1430 10
09,1413 1096,1379 1183,1345 1256,1297 1315,1234 1374,1171 1418,1096 1449,1007 1480,918 1495,820 1495,711 Z M 1300,711 C 1300,796 1289,873 1268,942 1246,1011 1214,1071 1172,1120 1129,1169 1077,1207 1014,1234 951,1261 879,1274 797,1274 713,1274 639,1261 576,1234 513,1207 460,1169 418,1120 375,1071 344,1011 323,942 302,873 291,796 291,711 291,626 302,549 324,479 345,408 377,348 420,297 462,246 515,206 578,178 641,149 713,135 795,135 883,135 959,149 1023,178 1086,207 1139,247 1180,298 1221,349 1251,409 1271,480 1290,551 1300,628 1300,711 Z" id="glyph70"/><glyph unicode="M" horiz-adv-x="1324" d="M 1366,0 L 1366,940 C 1366,974 1366,1009 1367,1044 1368,1079 1369,1112 1370,1141 1371,1175 1373,1208 1375,1240 1366,1206 1356,1172 1346,1139 1337,1110 1328,1080 1318,1048 1307,1015 1297,986 1287,960 L 923,0 789,0 420,960 C 416,970 412,982 408,995 403,1008 399,1023 394,1038 389,1053 384,1068 379,1084 374,1099 369,1115 364,1130 353,1165 342,1202 331,1240 332,1203 333,1166 334,1129 335,1098 336,1065
337,1031 338,996 338,966 338,940 L 338,0 168,0 168,1409 419,1409 794,432 C 799,419 804,402 811,381 818,360 824,338 830,316 836,294 842,273 847,254 852,234 855,219 857,208 859,219 863,234 868,254 873,274 880,295 887,317 894,339 900,360 907,381 914,402 920,419 925,432 L 1293,1409 1538,1409 1538,0 1366,0 Z" id="glyph72"/><glyph unicode="L" horiz-adv-x="900" d="M 168,0 L 168,1409 359,1409 359,156 1071,156 1071,0 168,0 Z" id="glyph74"/><glyph unicode="K" horiz-adv-x="1191" d="M 1106,0 L 543,680 359,540 359,0 168,0 168,1409 359,1409 359,703 1038,1409 1263,1409 663,797 1343,0 1106,0 Z" id="glyph76"/><glyph unicode="I" horiz-adv-x="186" d="M 189,0 L 189,1409 380,1409 380,0 189,0 Z" id="glyph78"/><glyph unicode="E" horiz-adv-x="1112" d="M 168,0 L 168,1409 1237,1409 1237,1253 359,1253 359,801 1177,801 1177,647 359,647 359,156 1278,156 1278,0 168,0 Z" id="glyph80"/><glyph unicode="D" horiz-adv-x="1218" d="M 1381,719 C 1381,602 1363,498 1328,409 1293,319 1244,244 1183,184 1122,123 1049,78 966,
47 882,16 792,0 695,0 L 168,0 168,1409 634,1409 C 743,1409 843,1396 935,1369 1026,1342 1105,1300 1171,1244 1237,1187 1289,1116 1326,1029 1363,942 1381,839 1381,719 Z M 1189,719 C 1189,814 1175,896 1148,964 1121,1031 1082,1087 1033,1130 984,1173 925,1205 856,1226 787,1246 712,1256 630,1256 L 359,1256 359,153 673,153 C 747,153 816,165 879,189 942,213 996,249 1042,296 1088,343 1124,402 1150,473 1176,544 1189,626 1189,719 Z" id="glyph82"/><glyph unicode="C" horiz-adv-x="1297" d="M 792,1274 C 712,1274 641,1261 580,1234 518,1207 466,1169 425,1120 383,1071 351,1011 330,942 309,873 298,796 298,711 298,626 310,549 333,479 356,408 389,348 432,297 475,246 527,207 590,179 652,151 722,137 800,137 855,137 905,144 950,159 995,173 1035,193 1072,219 1108,245 1140,276 1169,312 1198,347 1223,387 1245,430 L 1401,352 C 1376,299 1344,250 1307,205 1270,160 1226,120 1176,87 1125,54 1068,28 1005,9 941,-10 870,-20 791,-20 677,-20 577,-2 492,35 406,71 334,122 277,187 219,252 176,329 147,418 118,507 104,605 10
4,711 104,821 119,920 150,1009 180,1098 224,1173 283,1236 341,1298 413,1346 498,1380 583,1413 681,1430 790,1430 940,1430 1065,1401 1166,1342 1267,1283 1341,1196 1388,1081 L 1207,1021 C 1194,1054 1176,1086 1153,1117 1130,1147 1102,1174 1068,1197 1034,1220 994,1239 949,1253 903,1267 851,1274 792,1274 Z" id="glyph84"/><glyph unicode="B" horiz-adv-x="1086" d="M 1258,397 C 1258,326 1244,265 1216,215 1188,164 1150,123 1103,92 1056,60 1001,37 938,22 875,7 809,0 740,0 L 168,0 168,1409 680,1409 C 758,1409 828,1403 889,1390 950,1377 1002,1356 1045,1328 1088,1300 1120,1265 1143,1222 1165,1179 1176,1127 1176,1067 1176,1028 1171,991 1160,956 1149,921 1132,890 1110,862 1087,833 1059,809 1026,789 992,768 953,753 908,743 965,736 1015,723 1059,704 1102,685 1139,660 1168,630 1197,600 1220,565 1235,526 1250,486 1258,443 1258,397 Z M 984,1044 C 984,1120 958,1174 906,1207 854,1240 779,1256 680,1256 L 359,1256 359,810 680,810 C 736,810 783,816 822,827 861,838 892,853 916,874 940,894 957,918 968,947 979,9
76 984,1008 984,1044 Z M 1065,412 C 1065,457 1057,495 1041,526 1024,557 1001,583 970,603 939,623 903,638 860,647 817,656 768,661 715,661 L 359,661 359,153 730,153 C 779,153 824,157 865,165 906,173 941,187 971,207 1000,227 1023,254 1040,287 1057,320 1065,362 1065,412 Z" id="glyph86"/><glyph unicode="A" horiz-adv-x="1350" d="M 1167,0 L 1006,412 364,412 202,0 4,0 579,1409 796,1409 1362,0 1167,0 Z M 768,1026 C 757,1053 747,1080 738,1107 728,1134 719,1159 712,1182 705,1204 699,1223 694,1238 689,1253 686,1262 685,1265 684,1262 681,1252 676,1237 671,1222 665,1203 658,1180 650,1157 641,1132 632,1105 622,1078 612,1051 602,1024 L 422,561 949,561 768,1026 Z" id="glyph88"/><glyph unicode=" " horiz-adv-x="556" id="glyph90"/></font></defs><defs class="TextShapeIndex" id="defs97"><g ooo:slide="id1" ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10 id11 id12 id13 id14 id15 id16 id17 id18 id19 id20 id21 id22 id23 id24 id25 id26 id27 id28 id29 id30 id31 id32 id33 id34 id35 id36 id37 id38 id39 id40 id41 i
d42 id43 id44 id45 id46 id47 id48 id49 id50 id51 id52 id53 id54 id55 id56 id57 id58 id59 id60 id61 id62 id63 id64 id65" id="g95"/></defs><defs class="EmbeddedBulletChars" id="defs129"><g id="bullet-char-template(57356)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 580,1141 1163,571 580,0 -4,571 Z" id="path99" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(57354)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 8,1128 H 1137 V 0 H 8 Z" id="path102" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(10146)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 174,0 602,739 174,1481 1456,739 Z M 1358,739 309,1346 659,739 Z" id="path105" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(10132)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 2015,739 1276,0 H 717 l 543,543 H 174 v 393 h 1086 l -543,545 h 557 z" id="path108" inkscape:connector-curvature="0"/></g><g id="
bullet-char-template(10007)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="m 0,-2 c -7,16 -16,29 -25,39 l 381,530 c -94,256 -141,385 -141,387 0,25 13,38 40,38 9,0 21,-2 34,-5 21,4 42,12 65,25 l 27,-13 111,-251 280,301 64,-25 24,25 c 21,-10 41,-24 62,-43 C 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 c 0,-27 -21,-55 -63,-84 l 16,-20 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 c -22,-34 -53,-51 -92,-51 -42,0 -63,17 -64,51 -7,9 -10,24 -10,44 0,9 1,19 2,30 z" id="path111" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(10004)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 c 0,78 14,145 41,201 34,71 87,106 158,106 53,0 88,-31 106,-94 l 23,-176 c 8,-64 28,-97 59,-98 l 735,706 c 11,11 33,17 66,17 42,0 63,-15 63,-46 V 965 c 0,-36 -10,-64 -30,-84 L 442,47 C 390,-6 338,-33 285,-33 Z" id="path114" inkscape:connector-curvature="0"/></g><g id="bullet-char-template
(9679)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 c 0,181 53,324 160,431 106,107 249,161 430,161 179,0 323,-54 432,-161 108,-107 162,-251 162,-431 0,-180 -54,-324 -162,-431 C 1136,54 992,0 813,0 Z" id="path117" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(8226)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="m 346,457 c -73,0 -137,26 -191,78 -54,51 -81,114 -81,188 0,73 27,136 81,188 54,52 118,78 191,78 73,0 134,-26 185,-79 51,-51 77,-114 77,-187 0,-75 -25,-137 -76,-188 -50,-52 -112,-78 -186,-78 z" id="path120" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(8211)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M -4,459 H 1135 V 606 H -4 Z" id="path123" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(61548)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="m 173,740 c 0,163 58,303 173,419 116,115 255,173
419,173 163,0 302,-58 418,-173 116,-116 174,-256 174,-419 0,-163 -58,-303 -174,-418 C 1067,206 928,148 765,148 601,148 462,206 346,322 231,437 173,577 173,740 Z" id="path126" inkscape:connector-curvature="0"/></g></defs><defs class="TextEmbeddedBitmaps" id="defs131"/><g id="g136" transform="translate(-4840.889,-3040)"><g id="id2" class="Master_Slide"><g id="bg-id2" class="Background"/><g id="bo-id2" class="BackgroundObjects"/></g></g><g class="SlideGroup" id="g1187" transform="translate(-4840.889,-3040)"><g id="g1185"><g id="container-id1"><g id="id1" class="Slide" clip-path="url(#presentation_clip_path)"><g class="Page" id="g1181"><g class="com.sun.star.drawing.CustomShape" id="g157"><g id="id3"><rect class="BoundingBox" x="7530" y="7229" width="3561" height="1654" id="rect138" style="fill:none;stroke:none"/><path d="m 7806,7230 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 7505 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z"
id="path140" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 7806,7230 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 7505 c 0,-138 -138,-275 -276,-275 z" id="path142" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 7531,7230 Z" id="path144" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 11089,8881 Z" id="path146" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text154"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan152" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="7773" y="8276" id="tspan150"><tspan id="tspan148" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g178"><g id="id4"><rect class="BoundingBox" x="7785" y="7611" width="3561" height="1654" id="rect159" style="fill:none;stroke:none"/><path d="m 8061,7612 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 7887 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path161" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 8061,7612 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 7887 c 0,-138 -138,-275 -276,-275 z" id="path163" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 7786,7612 Z" id="path165" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 11344,9263 Z" id="path167" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text175"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1
73" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="8028" y="8658" id="tspan171"><tspan id="tspan169" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g199"><g id="id5"><rect class="BoundingBox" x="8037" y="7991" width="3561" height="1654" id="rect180" style="fill:none;stroke:none"/><path d="m 8313,7992 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8267 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path182" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 8313,7992 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8267 c 0,-138 -138,-275 -276,-275 z" id="path184" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 8038,7992 Z" id="path186" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 11596,9643 Z" id="path188" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text196"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1
94" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="8773" y="9038" id="tspan192"><tspan id="tspan190" style="fill:#000000;stroke:none">PKTIO </tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g220"><g id="id6"><rect class="BoundingBox" x="8037" y="10151" width="3561" height="1654" id="rect201" style="fill:none;stroke:none"/><path d="m 8313,10152 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path203" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 8313,10152 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path205" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 8038,10152 Z" id="path207" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 11596,11803 Z" id="path209" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text217"><tspan class="TextParagraph" font-size="635px" font-weight="400" id=
"tspan215" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="8818" y="11198" id="tspan213"><tspan id="tspan211" style="fill:#000000;stroke:none">Buffers</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g241"><g id="id7"><rect class="BoundingBox" x="12610" y="8691" width="4322" height="1654" id="rect222" style="fill:none;stroke:none"/><path d="m 12886,8692 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3768 c 138,0 276,-138 276,-276 V 8967 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 4319,1651 z" id="path224" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 12886,8692 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3768 c 138,0 276,-138 276,-276 V 8967 c 0,-138 -138,-275 -276,-275 z" id="path226" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 12611,8692 Z" id="path228" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 16930,10343 Z" id="path230" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text238"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="t
span236" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="12905" y="9738" id="tspan234"><tspan id="tspan232" style="fill:#000000;stroke:none">Classification</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g266"><g id="id8"><rect class="BoundingBox" x="18072" y="7228" width="1909" height="639" id="rect243" style="fill:none;stroke:none"/><path d="m 18073,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path245" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path247" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,7229 Z" id="path249" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,7865 Z" id="path251" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path253" inkscape:connector-curvature="0" style="fill:n
one;stroke:#3465a4"/><path d="M 18708,7229 Z" id="path255" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,7865 Z" id="path257" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path259" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,7229 Z" id="path261" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,7865 Z" id="path263" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g291"><g id="id9"><rect class="BoundingBox" x="18072" y="8245" width="1909" height="639" id="rect268" style="fill:none;stroke:none"/><path d="m 18073,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318
z m 0,0 z m 636,636 z" id="path270" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path272" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,8246 Z" id="path274" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,8882 Z" id="path276" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path278" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,8246 Z" id="path280" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,8882 Z" id="path282" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path284" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,8246 Z" id="
path286" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,8882 Z" id="path288" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g316"><g id="id10"><rect class="BoundingBox" x="18072" y="9262" width="1909" height="639" id="rect293" style="fill:none;stroke:none"/><path d="m 18073,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path295" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path297" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,9263 Z" id="path299" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,9899 Z" id="path301" inkscape:con
nector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path303" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,9263 Z" id="path305" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,9899 Z" id="path307" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path309" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,9263 Z" id="path311" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,9899 Z" id="path313" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g341"><g id="id11"><rect class="BoundingBox" x="18072" y="10404" width="1909" height="639" id="rect318" style="fill:none;stroke:none"/><path d="m 18073,10405 h 477 l
159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path320" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path322" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,10405 Z" id="path324" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,11041 Z" id="path326" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path328" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,10405 Z" id="path330" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,11041 Z" id="path332" inkscape:connector-curvature="0" style="fill:none;str
oke:#3465a4"/><path d="m 19343,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path334" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,10405 Z" id="path336" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,11041 Z" id="path338" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g350"><g id="id12"><rect class="BoundingBox" x="11595" y="7398" width="6479" height="1421" id="rect343" style="fill:none;stroke:none"/><path d="m 11596,8817 c 1822,0 -1285,-1218 6005,-1268" id="path345" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,7547 -451,-148 2,300 z" id="path347" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g359"><g id="id13"><rect class="BoundingBox" x="16928" y="8564" width="1146" height="955" id="rect352" style="fil
l:none;stroke:none"/><path d="m 16929,9517 c 859,0 474,-567 747,-827" id="path354" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,8564 -474,4 97,284 z" id="path356" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g368"><g id="id14"><rect class="BoundingBox" x="16928" y="9418" width="1146" height="302" id="rect361" style="fill:none;stroke:none"/><path d="m 16929,9517 c 859,0 491,34 710,53" id="path363" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,9581 -446,-163 -8,300 z" id="path365" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g377"><g id="id15"><rect class="BoundingBox" x="16928" y="9516" width="1146" height="1208" id="rect370" style="fill:none;stroke:none"/><path d="m 16929,9517 c 859,0 469,738 759,1060" id="path372" inkscape:connector-curvature="0"
style="fill:none;stroke:#000000"/><path d="m 18073,10723 -361,-308 -112,278 z" id="path374" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g386"><g id="id16"><rect class="BoundingBox" x="11595" y="8816" width="1017" height="702" id="rect379" style="fill:none;stroke:none"/><path d="m 11596,8817 c 762,0 439,365 621,568" id="path381" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 12611,9517 -372,-294 -102,282 z" id="path383" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g407"><g id="id17"><rect class="BoundingBox" x="21501" y="8246" width="4322" height="1654" id="rect388" style="fill:none;stroke:none"/><path d="m 21777,8247 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3768 c 138,0 276,-138 276,-276 V 8522 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 4319,1651 z" id="path390" inkscape:conn
ector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 21777,8247 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3768 c 138,0 276,-138 276,-276 V 8522 c 0,-138 -138,-275 -276,-275 z" id="path392" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 21502,8247 Z" id="path394" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 25821,9898 Z" id="path396" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text404"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan402" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="22237" y="9293" id="tspan400"><tspan id="tspan398" style="fill:#000000;stroke:none">Scheduler</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g416"><g id="id18"><rect class="BoundingBox" x="19978" y="7546" width="6859" height="1257" id="rect409" style="fill:none;stroke:none"/><path d="m 19979,7547 c 8298,0 5408,934 6428,1108" id="path411" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 26836,8683 -439,-181 -20,300 z" id="path413" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g425"><g id="id19"><rect class="BoundingBox" x="19978" y="8563" width="1525" height="617" id="rect418" style="fill:none;stroke:none"/><path d="m 19979,8564 c 1143,0 584,351 1090,470" id="path420" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 21502,9072 -434,-192 -28,299 z" id="path422" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g434"><g id="id20"><rect class="BoundingBox"
x="19978" y="8965" width="1525" height="618" id="rect427" style="fill:none;stroke:none"/><path d="m 19979,9581 c 1143,0 584,-352 1090,-470" id="path429" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 21502,9072 -462,-107 28,299 z" id="path431" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g443"><g id="id21"><rect class="BoundingBox" x="19978" y="9047" width="1525" height="1678" id="rect436" style="fill:none;stroke:none"/><path d="m 19979,10723 c 1143,0 572,-1180 1116,-1545" id="path438" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 21502,9072 -474,-24 81,289 z" id="path440" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.TextShape" id="g456"><g id="id22"><rect class="BoundingBox" x="17808" y="5933" width="3569" height="1214" id="rect445" style="fill:none;stroke:none"/><text class="Text
Shape" id="text453"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan451" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="18058" y="6630" id="tspan449"><tspan id="tspan447" style="fill:#000000;stroke:none">Queue</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g477"><g id="id23"><rect class="BoundingBox" x="26834" y="7857" width="3561" height="1654" id="rect458" style="fill:none;stroke:none"/><path d="m 27110,7858 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8133 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path460" inkscape:connector-curvature="0" style="fill:#ffff00;stroke:none"/><path d="m 27110,7858 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8133 c 0,-138 -138,-275 -276,-275 z" id="path462" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 26835,7858 Z" id="path464" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30393,9509 Z" id="path466" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text474"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="t
span472" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="27077" y="8904" id="tspan470"><tspan id="tspan468" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g498"><g id="id24"><rect class="BoundingBox" x="27088" y="8237" width="3561" height="1654" id="rect479" style="fill:none;stroke:none"/><path d="m 27364,8238 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8513 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path481" inkscape:connector-curvature="0" style="fill:#ffff00;stroke:none"/><path d="m 27364,8238 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8513 c 0,-138 -138,-275 -276,-275 z" id="path483" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27089,8238 Z" id="path485" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30647,9889 Z" id="path487" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text495"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="t
span493" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="27331" y="9284" id="tspan491"><tspan id="tspan489" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g519"><g id="id25"><rect class="BoundingBox" x="27343" y="8619" width="3561" height="1654" id="rect500" style="fill:none;stroke:none"/><path d="m 27619,8620 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8895 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path502" inkscape:connector-curvature="0" style="fill:#ffff00;stroke:none"/><path d="m 27619,8620 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8895 c 0,-138 -138,-275 -276,-275 z" id="path504" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27344,8620 Z" id="path506" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30902,10271 Z" id="path508" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text516"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="
tspan514" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="27522" y="9666" id="tspan512"><tspan id="tspan510" style="fill:#000000;stroke:none">odp_thread</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g528"><g id="id26"><rect class="BoundingBox" x="25819" y="8914" width="1272" height="302" id="rect521" style="fill:none;stroke:none"/><path d="m 25820,9072 c 952,0 521,-5 836,-8" id="path523" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 27090,9063 -450,-149 v 300 z" id="path525" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g537"><g id="id27"><rect class="BoundingBox" x="25819" y="9071" width="1527" height="494" id="rect530" style="fill:none;stroke:none"/><path d="m 25820,9072 c 1144,0 585,257 1090,345" id="path532" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 27345,9445 -438,-181 -21,299 z" id="path534" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g562"><g id="id28"><rect class="BoundingBox" x="1807
2" y="7228" width="1909" height="639" id="rect539" style="fill:none;stroke:none"/><path d="m 18073,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path541" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path543" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,7229 Z" id="path545" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,7865 Z" id="path547" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path549" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,7229 Z" id="path551" inkscape:connector-curvature="0" style="fill:none;str
oke:#3465a4"/><path d="M 19344,7865 Z" id="path553" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path555" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,7229 Z" id="path557" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,7865 Z" id="path559" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g587"><g id="id29"><rect class="BoundingBox" x="18072" y="8245" width="1909" height="639" id="rect564" style="fill:none;stroke:none"/><path d="m 18073,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path566" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d
="m 18073,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path568" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,8246 Z" id="path570" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,8882 Z" id="path572" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path574" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,8246 Z" id="path576" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,8882 Z" id="path578" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path580" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,8246 Z" id="path582" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,8882 Z" id="path58
4" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g612"><g id="id30"><rect class="BoundingBox" x="18072" y="9262" width="1909" height="639" id="rect589" style="fill:none;stroke:none"/><path d="m 18073,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path591" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path593" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,9263 Z" id="path595" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,9899 Z" id="path597" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,9263 h 477 l 159,318 -159,318 h -477 l
159,-318 z" id="path599" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,9263 Z" id="path601" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,9899 Z" id="path603" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path605" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,9263 Z" id="path607" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,9899 Z" id="path609" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g637"><g id="id31"><rect class="BoundingBox" x="18072" y="10404" width="1909" height="639" id="rect614" style="fill:none;stroke:none"/><path d="m 18073,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318
z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path616" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path618" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,10405 Z" id="path620" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,11041 Z" id="path622" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path624" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,10405 Z" id="path626" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,11041 Z" id="path628" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path630" inkscape:connec
tor-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,10405 Z" id="path632" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,11041 Z" id="path634" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g662"><g id="id32"><rect class="BoundingBox" x="35089" y="7471" width="1909" height="639" id="rect639" style="fill:none;stroke:none"/><path d="m 35090,7472 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path641" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 35090,7472 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path643" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35090,7472 Z" id="path645" inkscape:connector-curvature="0" s
tyle="fill:none;stroke:#3465a4"/><path d="M 35726,8108 Z" id="path647" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 35725,7472 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path649" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35725,7472 Z" id="path651" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36361,8108 Z" id="path653" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 36360,7472 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path655" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36360,7472 Z" id="path657" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36996,8108 Z" id="path659" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g687"><g id="id33"><rect class="BoundingBox" x="35089" y="8787" width="1909" heigh
t="639" id="rect664" style="fill:none;stroke:none"/><path d="m 35090,8788 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path666" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 35090,8788 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path668" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35090,8788 Z" id="path670" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35726,9424 Z" id="path672" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 35725,8788 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path674" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35725,8788 Z" id="path676" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36361
,9424 Z" id="path678" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 36360,8788 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path680" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36360,8788 Z" id="path682" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36996,9424 Z" id="path684" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g712"><g id="id34"><rect class="BoundingBox" x="35089" y="9930" width="1909" height="639" id="rect689" style="fill:none;stroke:none"/><path d="m 35090,9931 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path691" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 35090,9931 h 477 l 159,318
-159,318 h -477 l 159,-318 z" id="path693" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35090,9931 Z" id="path695" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35726,10567 Z" id="path697" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 35725,9931 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path699" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35725,9931 Z" id="path701" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36361,10567 Z" id="path703" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 36360,9931 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path705" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36360,9931 Z" id="path707" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36996,10567 Z" id="path709" inkscape:connector-curva
ture="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g721"><g id="id35"><rect class="BoundingBox" x="30901" y="9444" width="4190" height="950" id="rect714" style="fill:none;stroke:none"/><path d="m 30902,9445 c 3141,0 1257,720 3726,797" id="path716" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 35090,10249 -448,-157 -4,300 z" id="path718" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g730"><g id="id36"><rect class="BoundingBox" x="30901" y="8958" width="4190" height="489" id="rect723" style="fill:none;stroke:none"/><path d="m 30902,9445 c 3141,0 1258,-303 3724,-336" id="path725" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 35090,9106 -451,-147 2,300 z" id="path727" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g73
9"><g id="id37"><rect class="BoundingBox" x="30901" y="7653" width="4190" height="1794" id="rect732" style="fill:none;stroke:none"/><path d="m 30902,9445 c 3141,0 1254,-1485 3732,-1642" id="path734" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 35090,7790 -454,-136 9,300 z" id="path736" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g760"><g id="id38"><rect class="BoundingBox" x="38898" y="8872" width="4577" height="1654" id="rect741" style="fill:none;stroke:none"/><path d="m 39174,8873 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 4023 c 137,0 275,-138 275,-276 V 9148 c 0,-138 -138,-275 -275,-275 z m -275,0 z m 4574,1651 z" id="path743" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 39174,8873 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 4023 c 137,0 275,-138 275,-276 V 9148 c 0,-138 -138,-275 -275,-275 z" id="path74
5" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 38899,8873 Z" id="path747" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 43473,10524 Z" id="path749" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text757"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan755" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="39511" y="9919" id="tspan753"><tspan id="tspan751" style="fill:#000000;stroke:none">Traffic Mngr</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g781"><g id="id39"><rect class="BoundingBox" x="30771" y="12437" width="3561" height="1654" id="rect762" style="fill:none;stroke:none"/><path d="m 31047,12438 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path764" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 31047,12438 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path766" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30772,12438 Z" id="path768" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 34330,14089 Z" id="path770" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text778"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan776" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="31581" y="13484" id="tspan774"><tspan id="tspan772" style="fill:#000000;stroke:none">Packet</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g802"><g id="id40"><rect class="BoundingBox" x="27214" y="17390" width="3561" height="1654" id="rect783" style="fill:none;stroke:none"/><path d="m 27490,17391 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path785" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 27490,17391 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path787" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27215,17391 Z" id="path789" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30773,19042 Z" id="path791" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text799"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan797" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="28200" y="18437" id="tspan795"><tspan id="tspan793" style="fill:#000000;stroke:none">IPsec</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g823"><g id="id41"><rect class="BoundingBox" x="30771" y="14087" width="3561" height="1654" id="rect804" style="fill:none;stroke:none"/><path d="m 31047,14088 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path806" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 31047,14088 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path808" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30772,14088 Z" id="path810" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 34330,15739 Z" id="path812" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text820"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan818" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="31459" y="15134" id="tspan816"><tspan id="tspan814" style="fill:#000000;stroke:none">Shmem</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g844"><g id="id42"><rect class="BoundingBox" x="27214" y="15738" width="3561" height="1654" id="rect825" style="fill:none;stroke:none"/><path d="m 27490,15739 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path827" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 27490,15739 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path829" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27215,15739 Z" id="path831" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30773,17390 Z" id="path833" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text841"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan839" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="28289" y="16785" id="tspan837"><tspan id="tspan835" style="fill:#000000;stroke:none">Sync</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g865"><g id="id43"><rect class="BoundingBox" x="30771" y="15738" width="3561" height="1654" id="rect846" style="fill:none;stroke:none"/><path d="m 31047,15739 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path848" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 31047,15739 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path850" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30772,15739 Z" id="path852" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 34330,17390 Z" id="path854" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text862"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan860" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="31552" y="16785" id="tspan858"><tspan id="tspan856" style="fill:#000000;stroke:none">Buffers</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g874"><g id="id44"><rect class="BoundingBox" x="36995" y="9105" width="1906" height="716" id="rect867" style="fill:none;stroke:none"/><path d="m 36996,9106 c 1428,0 678,452 1468,566" id="path869" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 38900,9698 -440,-178 -19,299 z" id="path871" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g883"><g id="id45"><rect class="BoundingBox" x="36995" y="9574" width="1906" height="677" id="rect876" style="fill:none;stroke:none"/><path d="m 36996,10249 c 1428,0 678,-421 1468,-527" id="path878" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 38900,9698 -458,-123 18,299 z" id="path880" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g904"><g id="id46"><rect class="BoundingBox" x="4
5376" y="7811" width="3561" height="1654" id="rect885" style="fill:none;stroke:none"/><path d="m 45652,7812 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8087 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path887" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 45652,7812 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8087 c 0,-138 -138,-275 -276,-275 z" id="path889" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 45377,7812 Z" id="path891" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 48935,9463 Z" id="path893" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text901"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan899" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="
TextPosition" x="45619" y="8858" id="tspan897"><tspan id="tspan895" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g925"><g id="id47"><rect class="BoundingBox" x="45631" y="8191" width="3561" height="1654" id="rect906" style="fill:none;stroke:none"/><path d="m 45907,8192 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8467 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path908" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 45907,8192 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8467 c 0,-138 -138,-275 -276,-275 z" id="path910" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 45632,8192 Z" id="path912" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 49190,9843 Z" id="path914" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text922"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="t
span920" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="45874" y="9238" id="tspan918"><tspan id="tspan916" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g946"><g id="id48"><rect class="BoundingBox" x="45883" y="8572" width="3561" height="1654" id="rect927" style="fill:none;stroke:none"/><path d="m 46159,8573 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8848 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path929" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 46159,8573 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8848 c 0,-138 -138,-275 -276,-275 z" id="path931" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 45884,8573 Z" id="path933" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 49442,10224 Z" id="path935" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text943"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="
tspan941" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="46708" y="9619" id="tspan939"><tspan id="tspan937" style="fill:#000000;stroke:none">PKTIO</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g955"><g id="id49"><rect class="BoundingBox" x="43472" y="9256" width="2414" height="444" id="rect948" style="fill:none;stroke:none"/><path d="m 43473,9698 c 1809,0 802,-246 1978,-293" id="path950" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 45885,9398 -453,-142 6,300 z" id="path952" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g976"><g id="id50"><rect class="BoundingBox" x="27214" y="12437" width="3561" height="1654" id="rect957" style="fill:none;stroke:none"/><path d="m 27490,12438 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path959" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 27490,12438 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-
138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path961" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27215,12438 Z" id="path963" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30773,14089 Z" id="path965" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text973"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan971" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="28037" y="13484" id="tspan969"><tspan id="tspan967" style="fill:#000000;stroke:none">Timers</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g997"><g id="id51"><rect class="BoundingBox" x="27214" y="14087" width="3561" height="1654" id="rect978" style="fill:none;stroke:none"/><path d="m 27490,14088 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path980" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 27490,14088 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path982" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27215,14088 Z" id="path984" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30773,15739 Z" id="path986" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text994"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan992" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="28183" y="15134" id="tspan990"><tspan id="tspan988" style="fill:#000000;stroke:none">Event</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g1006"><g id="id52"><rect class="BoundingBox" x="9223" y="3801" width="37935" height="4013" id="rect999" style="fill:none;stroke:none"/><path d="M 47156,7812 C 47156,2457 10447,2740 9336,7029" id="path1001" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 9310,7230 210,-425 -297,-41 z" id="path1003" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.TextShape" id="g1019"><g id="id53"><rect class="BoundingBox" x="26705" y="3040" width="5335" height="1017" id="rect1008" style="fill:none;stroke:none"/><text class="TextShape" id="text1016"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1014" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="26955" y="3737" id="tspan1012"><tspan id="tspan1010" style="fill:#000000;stroke:none">Loopback</tspan></tspan></tspan><
/text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g1040"><g id="id54"><rect class="BoundingBox" x="4854" y="8465" width="1967" height="1066" id="rect1021" style="fill:none;stroke:none"/><path d="m 4855,8731 h 1473 v -265 l 491,531 -491,532 V 9263 H 4855 Z m 0,-265 z m 1964,1063 z" id="path1023" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 4855,8731 h 1473 v -265 l 491,531 -491,532 V 9263 H 4855 Z" id="path1025" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 4855,8466 Z" id="path1027" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 6819,9529 Z" id="path1029" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text1037"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1035" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="5274" y="9218" id="tspan1033"><tspa
n id="tspan1031" style="fill:#000000;stroke:none">RX</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g1049"><g id="id55"><rect class="BoundingBox" x="36995" y="7789" width="8384" height="994" id="rect1042" style="fill:none;stroke:none"/><path d="m 36996,7790 c 8817,0 4991,769 7903,842" id="path1044" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 45378,8637 -448,-155 -4,300 z" id="path1046" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g1070"><g id="id56"><rect class="BoundingBox" x="50054" y="8465" width="1967" height="1066" id="rect1051" style="fill:none;stroke:none"/><path d="m 50055,8731 h 1473 v -265 l 491,531 -491,532 v -266 h -1473 z m 0,-265 z m 1964,1063 z" id="path1053" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 50055,8731 h 1473 v -265 l 491,531 -491,532 v -266 h -1473 z" id="path1055" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 50055,8466
Z" id="path1057" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 52019,9529 Z" id="path1059" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text1067"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1065" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="50508" y="9218" id="tspan1063"><tspan id="tspan1061" style="fill:#000000;stroke:none">TX</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g1091"><g id="id57"><rect class="BoundingBox" x="30842" y="17383" width="3561" height="1654" id="rect1072" style="fill:none;stroke:none"/><path d="m 31118,17384 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path1074" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 31118,17384 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path1076" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30843,17384 Z" id="path1078" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 34401,19035 Z" id="path1080" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text1088"><tspan class="TextParagraph" font-size="635px" font-weig
ht="400" id="tspan1086" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="31688" y="18430" id="tspan1084"><tspan id="tspan1082" style="fill:#000000;stroke:none">Crypto</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g1100"><g id="id58"><rect class="BoundingBox" x="26672" y="10239" width="2453" height="7978" id="rect1093" style="fill:none;stroke:none"/><path d="m 29123,10270 c 0,-96 -1205,-81 -1870,1930 -665,2011 -739,4834 -323,5755" id="path1095" inkscape:connector-curvature="0" style="fill:none;stroke:#0000ff"/><path d="m 27216,18216 -222,-419 -207,217 z" id="path1097" inkscape:connector-curvature="0" style="fill:#0000ff;stroke:none"/></g></g><g class="com.sun.star.drawing.TextShape" id="g1113"><g id="id59"><rect class="BoundingBox" x="21574" y="18877" width="4448" height="1144" id="rect1102" style="fill:none;stroke:none"/><text class="TextShape" id="text1110"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1108" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="21824" y="19669" id="tspan1106"><tspan id="tspan1104" style="fill:#000000;stroke:none">
RX Decrypted</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.TextShape" id="g1126"><g id="id60"><rect class="BoundingBox" x="26287" y="10977" width="3822" height="1144" id="rect1115" style="fill:none;stroke:none"/><text class="TextShape" id="text1123"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1121" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="26537" y="11769" id="tspan1119"><tspan id="tspan1117" style="fill:#000000;stroke:none">TX Encrypt</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.TextShape" id="g1139"><g id="id61"><rect class="BoundingBox" x="21925" y="16777" width="3746" height="1144" id="rect1128" style="fill:none;stroke:none"/><text class="TextShape" id="text1136"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1134" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="22175" y="17569" id="tspan1132"><tspan id="tspan1130" style="fill:#000000;stroke:none">RX Decrypt</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.TextShape" id="g1152"><g id="id62"><rect class="BoundingBox" x="33336" y="10978" width="4525" height="1144" id="rect1141" style="fill:none;stroke:none"/><text class="TextShape" id="text1149"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1147" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="33586" y="11770" id="tspan1145"><tspan id="tspan1143" style="fill:#000000;stroke:none">TX Encrypted</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g1161"><g id="id63"><rect class="BoundingBox" x="11595" y="8816" width="15622" height="9550" id="rect1154" style="fill:none;stroke:none"/><path d="m 11596,8817 c 2775,0 -4933,9276 15215,9398" id="path1156" inkscape:connector-curvature="0" style="fill:none;stroke:#ff3333"/><path d="m 27216,18216 -450,-151 v 300 z" id="path1158" inkscape:connector-curvature="0" style="fill:#ff3333;stroke:none"/></g></g><g class="com.sun.star.drawing.OpenBezierShape" id="g1170"><g id="id64"><rect class="BoundingBox" x="31861" y="9540" width="3208" height="8671" id="rect1163" style="fill:none;stroke:none"/><path d="m 34401,18209 c 876,0 543,-4495 666,-4495 0,-2304 -3205,-1018 -3205,-2572 0,-1576 176,-1044 286,-1182" id="path1165" inkscape:connector-curvature="0" style="fill:none;stroke:#6666ff"/><path d="m 32235,9540 -251,412 297,68 z" id="path1167" inkscape:connector-curvature="0" style="fill:#6666ff;stroke:none"/></g></g><g class="com.sun.star
.drawing.OpenBezierShape" id="g1179"><g id="id65"><rect class="BoundingBox" x="11769" y="8874" width="23215" height="11326" id="rect1172" style="fill:none;stroke:none"/><path d="m 11922,9364 c 8,5473 152,2277 152,7144 0,2460 7353,3690 22061,3690 1150,0 1017,-1989 266,-1989" id="path1174" inkscape:connector-curvature="0" style="fill:none;stroke:#ff3333"/><path d="m 11922,8874 -152,458 305,-1 z" id="path1176" inkscape:connector-curvature="0" style="fill:#ff3333;stroke:none"/></g></g></g></g></g></g></g></svg>
diff --git a/doc/images/ipsec-lookaside.svg b/doc/images/ipsec-lookaside.svg
new file mode 100644
index 00000000..0cab3f4d
--- /dev/null
+++ b/doc/images/ipsec-lookaside.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:ooo="http://xml.openoffice.org/svg/export" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.2" width="471.92221mm" height="188.64999mm" viewBox="0 0 47192.222 18865" preserveAspectRatio="xMidYMid" xml:space="preserve" id="svg3797" sodipodi:docname="ipsec-lookaside.svg" style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" inkscape:version="0.92.1 r15371"><metadata id="metadata3801"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" g
ridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" id="namedview3799" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:zoom="0.1304858" inkscape:cx="939.7648" inkscape:cy="33.977951" inkscape:window-x="65" inkscape:window-y="24" inkscape:window-maximized="0" inkscape:current-layer="svg3797"/><defs class="ClipPathGroup" id="defs2637"><clipPath id="presentation_clip_path" clipPathUnits="userSpaceOnUse"><rect x="0" y="0" width="59411" height="42012" id="rect2631"/></clipPath><clipPath id="presentation_clip_path_shrink" clipPathUnits="userSpaceOnUse"><rect x="59" y="42" width="59293" height="41928" id="rect2634"/></clipPath></defs><defs id="defs2726"><font id="EmbeddedFont_1" horiz-adv-x="2048" horiz-origin-x="0" horiz-origin-y="0" vert-origin-x="45" vert-origin-y="90" vert-adv-y="90"><font-face font-family="Liberation Sans embedded" uni
ts-per-em="2048" font-weight="normal" font-style="normal" ascent="1826" descent="423" id="font-face2639"/><missing-glyph horiz-adv-x="2048" d="M 0,0 L 2047,0 2047,2047 0,2047 0,0 Z" id="missing-glyph2641"/><glyph unicode="y" horiz-adv-x="1059" d="M 604,1 C 579,-64 553,-123 527,-175 500,-227 471,-272 438,-309 405,-346 369,-374 329,-394 289,-413 243,-423 191,-423 168,-423 147,-423 128,-423 109,-423 88,-420 67,-414 L 67,-279 C 80,-282 94,-284 110,-284 126,-284 140,-284 151,-284 204,-284 253,-264 298,-225 343,-186 383,-124 417,-38 L 434,5 5,1082 197,1082 425,484 C 432,466 440,442 451,412 461,382 471,352 482,322 492,292 501,265 509,241 517,217 522,202 523,196 525,203 530,218 538,240 545,261 554,285 564,312 573,339 583,366 593,393 603,420 611,444 618,464 L 830,1082 1020,1082 604,1 Z" id="glyph2643"/><glyph unicode="v" horiz-adv-x="1059" d="M 613,0 L 400,0 7,1082 199,1082 437,378 C 442,363 447,346 454,325 460,304 466,282 473,259 480,236 486,215 492,194 497,173 502,155 506,141 510,155 515,1
73 522,194 528,215 534,236 541,258 548,280 555,302 562,323 569,344 575,361 580,376 L 826,1082 1017,1082 613,0 Z" id="glyph2645"/><glyph unicode="u" horiz-adv-x="901" d="M 314,1082 L 314,396 C 314,343 318,299 326,264 333,229 346,200 363,179 380,157 403,142 432,133 460,124 495,119 537,119 580,119 618,127 653,142 687,157 716,178 741,207 765,235 784,270 797,312 810,353 817,401 817,455 L 817,1082 997,1082 997,228 C 997,205 997,181 998,156 998,131 998,107 999,85 1000,62 1000,43 1001,27 1002,11 1002,3 1003,3 L 833,3 C 832,6 832,15 831,30 830,44 830,61 829,79 828,98 827,117 826,136 825,156 825,172 825,185 L 822,185 C 805,154 786,125 765,100 744,75 720,53 693,36 666,18 634,4 599,-6 564,-15 523,-20 476,-20 416,-20 364,-13 321,2 278,17 242,39 214,70 186,101 166,140 153,188 140,236 133,294 133,361 L 133,1082 314,1082 Z" id="glyph2647"/><glyph unicode="t" horiz-adv-x="531" d="M 554,8 C 527,1 499,-5 471,-10 442,-14 409,-16 372,-16 228,-16 156,66 156,229 L 156,951 31,951 31,1082 163,1082 216,1324
336,1324 336,1082 536,1082 536,951 336,951 336,268 C 336,216 345,180 362,159 379,138 408,127 450,127 467,127 484,128 501,131 517,134 535,137 554,141 L 554,8 Z" id="glyph2649"/><glyph unicode="s" horiz-adv-x="927" d="M 950,299 C 950,248 940,203 921,164 901,124 872,91 835,64 798,37 752,16 698,2 643,-13 581,-20 511,-20 448,-20 392,-15 342,-6 291,4 247,20 209,41 171,62 139,91 114,126 88,161 69,203 57,254 L 216,285 C 231,227 263,185 311,158 359,131 426,117 511,117 550,117 585,120 618,125 650,130 678,140 701,153 724,166 743,183 756,205 769,226 775,253 775,285 775,318 767,345 752,366 737,387 715,404 688,418 661,432 628,444 589,455 550,465 507,476 460,489 417,500 374,513 331,527 288,541 250,560 216,583 181,606 153,634 132,668 111,702 100,745 100,796 100,895 135,970 206,1022 276,1073 378,1099 513,1099 632,1099 727,1078 798,1036 868,994 912,927 931,834 L 769,814 C 763,842 752,866 736,885 720,904 701,919 678,931 655,942 630,951 602,956 573,961 544,963 513,963 432,963 372,951 333,926 294,901 27
5,864 275,814 275,785 282,761 297,742 311,723 331,707 357,694 382,681 413,669 449,660 485,650 525,640 568,629 597,622 626,614 656,606 686,597 715,587 744,576 772,564 799,550 824,535 849,519 870,500 889,478 908,456 923,430 934,401 945,372 950,338 950,299 Z" id="glyph2651"/><glyph unicode="r" horiz-adv-x="556" d="M 142,0 L 142,830 C 142,853 142,876 142,900 141,923 141,946 140,968 139,990 139,1011 138,1030 137,1049 137,1067 136,1082 L 306,1082 C 307,1067 308,1049 309,1030 310,1010 311,990 312,969 313,948 313,929 314,910 314,891 314,874 314,861 L 318,861 C 331,902 344,938 359,969 373,999 390,1024 409,1044 428,1063 451,1078 478,1088 505,1097 537,1102 575,1102 590,1102 604,1101 617,1099 630,1096 641,1094 648,1092 L 648,927 C 636,930 622,933 606,935 590,936 572,937 552,937 511,937 476,928 447,909 418,890 394,865 376,832 357,799 344,759 335,714 326,668 322,618 322,564 L 322,0 142,0 Z" id="glyph2653"/><glyph unicode="p" horiz-adv-x="953" d="M 1053,546 C 1053,464 1046,388 1033,319 1020,250 99
8,190 967,140 936,90 895,51 844,23 793,-6 730,-20 655,-20 578,-20 510,-5 452,24 394,53 350,101 319,168 L 314,168 C 315,167 315,161 316,150 316,139 316,126 317,110 317,94 317,76 318,57 318,37 318,17 318,-2 L 318,-425 138,-425 138,864 C 138,891 138,916 138,940 137,964 137,986 136,1005 135,1025 135,1042 134,1056 133,1070 133,1077 132,1077 L 306,1077 C 307,1075 308,1068 309,1057 310,1045 311,1031 312,1014 313,998 314,980 315,961 316,943 316,925 316,908 L 320,908 C 337,943 356,972 377,997 398,1021 423,1041 450,1057 477,1072 508,1084 542,1091 575,1098 613,1101 655,1101 730,1101 793,1088 844,1061 895,1034 936,997 967,949 998,900 1020,842 1033,774 1046,705 1053,629 1053,546 Z M 864,542 C 864,609 860,668 852,720 844,772 830,816 811,852 791,888 765,915 732,934 699,953 658,962 609,962 569,962 531,956 496,945 461,934 430,912 404,880 377,848 356,804 341,748 326,691 318,618 318,528 318,451 324,387 337,334 350,281 368,238 393,205 417,172 447,149 483,135 519,120 560,113 607,113 657,113 699,123 732,
142 765,161 791,189 811,226 830,263 844,308 852,361 860,414 864,474 864,542 Z" id="glyph2655"/><glyph unicode="o" horiz-adv-x="980" d="M 1053,542 C 1053,353 1011,212 928,119 845,26 724,-20 565,-20 490,-20 422,-9 363,14 304,37 254,71 213,118 172,165 140,223 119,294 97,364 86,447 86,542 86,915 248,1102 571,1102 655,1102 728,1090 789,1067 850,1044 900,1009 939,962 978,915 1006,857 1025,787 1044,717 1053,635 1053,542 Z M 864,542 C 864,626 858,695 845,750 832,805 813,848 788,881 763,914 732,937 696,950 660,963 619,969 574,969 528,969 487,962 450,949 413,935 381,912 355,879 329,846 309,802 296,747 282,692 275,624 275,542 275,458 282,389 297,334 312,279 332,235 358,202 383,169 414,146 449,133 484,120 522,113 563,113 609,113 651,120 688,133 725,146 757,168 783,201 809,234 829,278 843,333 857,388 864,458 864,542 Z" id="glyph2657"/><glyph unicode="n" horiz-adv-x="900" d="M 825,0 L 825,686 C 825,739 821,783 814,818 806,853 793,882 776,904 759,925 736,941 708,950 679,959 644,963 602,963 559,963
521,956 487,941 452,926 423,904 399,876 374,847 355,812 342,771 329,729 322,681 322,627 L 322,0 142,0 142,853 C 142,876 142,900 142,925 141,950 141,974 140,996 139,1019 139,1038 138,1054 137,1070 137,1078 136,1078 L 306,1078 C 307,1075 307,1066 308,1052 309,1037 310,1021 311,1002 312,984 312,965 313,945 314,926 314,910 314,897 L 317,897 C 334,928 353,957 374,982 395,1007 419,1029 446,1047 473,1064 505,1078 540,1088 575,1097 616,1102 663,1102 723,1102 775,1095 818,1080 861,1065 897,1043 925,1012 953,981 974,942 987,894 1000,845 1006,788 1006,721 L 1006,0 825,0 Z" id="glyph2659"/><glyph unicode="m" horiz-adv-x="1456" d="M 768,0 L 768,686 C 768,739 765,783 758,818 751,853 740,882 725,904 709,925 688,941 663,950 638,959 607,963 570,963 532,963 498,956 467,941 436,926 410,904 389,876 367,847 350,812 339,771 327,729 321,681 321,627 L 321,0 142,0 142,853 C 142,876 142,900 142,925 141,950 141,974 140,996 139,1019 139,1038 138,1054 137,1070 137,1078 136,1078 L 306,1078 C 307,1075 307,1066 3
08,1052 309,1037 310,1021 311,1002 312,984 312,965 313,945 314,926 314,910 314,897 L 317,897 C 333,928 350,957 369,982 388,1007 410,1029 435,1047 460,1064 488,1078 521,1088 553,1097 590,1102 633,1102 715,1102 780,1086 828,1053 875,1020 908,968 927,897 L 930,897 C 946,928 964,957 984,982 1004,1007 1027,1029 1054,1047 1081,1064 1111,1078 1144,1088 1177,1097 1215,1102 1258,1102 1313,1102 1360,1095 1400,1080 1439,1065 1472,1043 1497,1012 1522,981 1541,942 1553,894 1565,845 1571,788 1571,721 L 1571,0 1393,0 1393,686 C 1393,739 1390,783 1383,818 1376,853 1365,882 1350,904 1334,925 1313,941 1288,950 1263,959 1232,963 1195,963 1157,963 1123,956 1092,942 1061,927 1035,906 1014,878 992,850 975,815 964,773 952,731 946,682 946,627 L 946,0 768,0 Z" id="glyph2661"/><glyph unicode="l" horiz-adv-x="187" d="M 138,0 L 138,1484 318,1484 318,0 138,0 Z" id="glyph2663"/><glyph unicode="k" horiz-adv-x="927" d="M 816,0 L 450,494 318,385 318,0 138,0 138,1484 318,1484 318,557 793,1082 1004,1082 565,617 1027,
0 816,0 Z" id="glyph2665"/><glyph unicode="i" horiz-adv-x="187" d="M 137,1312 L 137,1484 317,1484 317,1312 137,1312 Z M 137,0 L 137,1082 317,1082 317,0 137,0 Z" id="glyph2667"/><glyph unicode="h" horiz-adv-x="874" d="M 317,897 C 337,934 359,965 382,991 405,1016 431,1037 459,1054 487,1071 518,1083 551,1091 584,1098 622,1102 663,1102 732,1102 789,1093 834,1074 878,1055 913,1029 939,996 964,962 982,922 992,875 1001,828 1006,777 1006,721 L 1006,0 825,0 825,686 C 825,732 822,772 817,807 811,842 800,871 784,894 768,917 745,934 716,946 687,957 649,963 602,963 559,963 521,955 487,940 452,925 423,903 399,875 374,847 355,813 342,773 329,733 322,688 322,638 L 322,0 142,0 142,1484 322,1484 322,1098 C 322,1076 322,1054 321,1032 320,1010 320,990 319,971 318,952 317,937 316,924 315,911 315,902 314,897 L 317,897 Z" id="glyph2669"/><glyph unicode="g" horiz-adv-x="954" d="M 548,-425 C 486,-425 431,-419 383,-406 335,-393 294,-375 260,-352 226,-328 198,-300 177,-267 156,-234 140,-198 131,-158 L 312,-13
2 C 324,-182 351,-220 392,-248 433,-274 486,-288 553,-288 594,-288 631,-282 664,-271 697,-260 726,-241 749,-217 772,-191 790,-159 803,-119 816,-79 822,-30 822,27 L 822,201 820,201 C 807,174 790,148 771,123 751,98 727,75 699,56 670,37 637,21 600,10 563,-2 520,-8 472,-8 403,-8 345,4 296,27 247,50 207,84 176,130 145,176 122,233 108,302 93,370 86,449 86,539 86,626 93,704 108,773 122,842 145,901 178,950 210,998 252,1035 304,1061 355,1086 418,1099 492,1099 569,1099 635,1082 692,1047 748,1012 791,962 822,897 L 824,897 C 824,914 825,933 826,953 827,974 828,994 829,1012 830,1031 831,1046 832,1060 833,1073 835,1080 836,1080 L 1007,1080 C 1006,1074 1006,1064 1005,1050 1004,1035 1004,1018 1003,998 1002,978 1002,956 1002,932 1001,907 1001,882 1001,856 L 1001,30 C 1001,-121 964,-234 890,-311 815,-387 701,-425 548,-425 Z M 822,541 C 822,616 814,681 798,735 781,788 760,832 733,866 706,900 676,925 642,941 607,957 572,965 536,965 490,965 451,957 418,941 385,925 357,900 336,866 314,831 298,787 288,734
277,680 272,616 272,541 272,463 277,398 288,345 298,292 314,249 335,216 356,183 383,160 416,146 449,132 488,125 533,125 569,125 604,133 639,148 673,163 704,188 731,221 758,254 780,297 797,350 814,403 822,466 822,541 Z" id="glyph2671"/><glyph unicode="f" horiz-adv-x="557" d="M 361,951 L 361,0 181,0 181,951 29,951 29,1082 181,1082 181,1204 C 181,1243 185,1280 192,1314 199,1347 213,1377 233,1402 252,1427 279,1446 313,1461 347,1475 391,1482 445,1482 466,1482 489,1481 512,1479 535,1477 555,1474 572,1470 L 572,1333 C 561,1335 548,1337 533,1339 518,1340 504,1341 492,1341 465,1341 444,1337 427,1330 410,1323 396,1312 387,1299 377,1285 370,1268 367,1248 363,1228 361,1205 361,1179 L 361,1082 572,1082 572,951 361,951 Z" id="glyph2673"/><glyph unicode="e" horiz-adv-x="980" d="M 276,503 C 276,446 282,394 294,347 305,299 323,258 348,224 372,189 403,163 441,144 479,125 525,115 578,115 656,115 719,131 766,162 813,193 844,233 861,281 L 1019,236 C 1008,206 992,176 972,146 951,115 924,88 890,64 856,39
814,19 763,4 712,-12 650,-20 578,-20 418,-20 296,28 213,123 129,218 87,360 87,548 87,649 100,735 125,806 150,876 185,933 229,977 273,1021 324,1053 383,1073 442,1092 504,1102 571,1102 662,1102 738,1087 799,1058 860,1029 909,988 946,937 983,885 1009,824 1025,754 1040,684 1048,608 1048,527 L 1048,503 276,503 Z M 862,641 C 852,755 823,838 775,891 727,943 658,969 568,969 538,969 507,964 474,955 441,945 410,928 382,903 354,878 330,845 311,803 292,760 281,706 278,641 L 862,641 Z" id="glyph2675"/><glyph unicode="d" horiz-adv-x="954" d="M 821,174 C 788,105 744,55 689,25 634,-5 565,-20 484,-20 347,-20 247,26 183,118 118,210 86,349 86,536 86,913 219,1102 484,1102 566,1102 634,1087 689,1057 744,1027 788,979 821,914 L 823,914 C 823,921 823,931 823,946 822,960 822,975 822,991 821,1006 821,1021 821,1035 821,1049 821,1059 821,1065 L 821,1484 1001,1484 1001,219 C 1001,193 1001,168 1002,143 1002,119 1002,97 1003,77 1004,57 1004,40 1005,26 1006,11 1006,4 1007,4 L 835,4 C 834,11 833,20 832,32 831,44 8
30,58 829,73 828,89 827,105 826,123 825,140 825,157 825,174 L 821,174 Z M 275,542 C 275,467 280,403 289,350 298,297 313,253 334,219 355,184 381,159 413,143 445,127 484,119 530,119 577,119 619,127 656,142 692,157 722,182 747,217 771,251 789,296 802,351 815,406 821,474 821,554 821,631 815,696 802,749 789,802 771,844 746,877 721,910 691,933 656,948 620,962 579,969 532,969 488,969 450,961 418,946 386,931 359,906 338,872 317,838 301,794 291,740 280,685 275,619 275,542 Z" id="glyph2677"/><glyph unicode="c" horiz-adv-x="875" d="M 275,546 C 275,484 280,427 289,375 298,323 313,278 334,241 355,203 384,174 419,153 454,132 497,122 548,122 612,122 666,139 709,173 752,206 778,258 788,328 L 970,328 C 964,283 951,239 931,197 911,155 884,118 850,86 815,54 773,28 724,9 675,-10 618,-20 553,-20 468,-20 396,-6 337,23 278,52 230,91 193,142 156,192 129,251 112,320 95,388 87,462 87,542 87,615 93,679 105,735 117,790 134,839 156,881 177,922 203,957 232,986 261,1014 293,1037 328,1054 362,1071 398,1083 436,109
1 474,1098 512,1102 551,1102 612,1102 666,1094 713,1077 760,1060 801,1038 836,1009 870,980 898,945 919,906 940,867 955,824 964,779 L 779,765 C 770,825 746,873 708,908 670,943 616,961 546,961 495,961 452,953 418,936 383,919 355,893 334,859 313,824 298,781 289,729 280,677 275,616 275,546 Z" id="glyph2679"/><glyph unicode="b" horiz-adv-x="953" d="M 1053,546 C 1053,169 920,-20 655,-20 573,-20 505,-5 451,25 396,54 352,102 318,168 L 316,168 C 316,150 316,132 315,113 314,94 313,77 312,61 311,45 310,31 309,19 308,8 307,2 306,2 L 132,2 C 133,8 133,18 134,32 135,47 135,64 136,84 137,104 137,126 138,150 138,174 138,199 138,225 L 138,1484 318,1484 318,1061 C 318,1041 318,1022 318,1004 317,985 317,969 316,955 315,938 315,923 314,908 L 318,908 C 351,977 396,1027 451,1057 506,1087 574,1102 655,1102 792,1102 892,1056 957,964 1021,872 1053,733 1053,546 Z M 864,540 C 864,615 859,679 850,732 841,785 826,829 805,864 784,898 758,923 726,939 694,955 655,963 609,963 562,963 520,955 484,940 447,925 417,900
393,866 368,832 350,787 337,732 324,677 318,609 318,529 318,452 324,387 337,334 350,281 368,239 393,206 417,173 447,149 483,135 519,120 560,113 607,113 651,113 689,121 721,136 753,151 780,176 801,210 822,244 838,288 849,343 859,397 864,463 864,540 Z" id="glyph2681"/><glyph unicode="a" horiz-adv-x="1060" d="M 414,-20 C 305,-20 224,9 169,66 114,124 87,203 87,303 87,375 101,434 128,480 155,526 190,562 234,588 277,614 327,632 383,642 439,652 496,657 554,657 L 797,657 797,717 C 797,762 792,800 783,832 774,863 759,889 740,908 721,928 697,942 668,951 639,960 604,965 565,965 530,965 499,963 471,958 443,953 419,944 398,931 377,918 361,900 348,878 335,855 327,827 323,793 L 135,810 C 142,853 154,892 173,928 192,963 218,994 253,1020 287,1046 330,1066 382,1081 433,1095 496,1102 569,1102 705,1102 807,1071 876,1009 945,946 979,856 979,738 L 979,272 C 979,219 986,179 1000,152 1014,125 1041,111 1080,111 1090,111 1100,112 1110,113 1120,114 1130,116 1139,118 L 1139,6 C 1116,1 1094,-3 1072,-6 1049,-9
1025,-10 1000,-10 966,-10 937,-5 913,4 888,13 868,26 853,45 838,63 826,86 818,113 810,140 805,171 803,207 L 797,207 C 778,172 757,141 734,113 711,85 684,61 653,42 622,22 588,7 549,-4 510,-15 465,-20 414,-20 Z M 455,115 C 512,115 563,125 606,146 649,167 684,194 713,226 741,259 762,294 776,332 790,371 797,408 797,443 L 797,531 600,531 C 556,531 514,528 475,522 435,517 400,506 370,489 340,472 316,449 299,418 281,388 272,349 272,300 272,241 288,195 320,163 351,131 396,115 455,115 Z" id="glyph2683"/><glyph unicode="_" horiz-adv-x="1191" d="M -31,-407 L -31,-277 1162,-277 1162,-407 -31,-407 Z" id="glyph2685"/><glyph unicode="X" horiz-adv-x="1324" d="M 1112,0 L 689,616 257,0 46,0 582,732 87,1409 298,1409 690,856 1071,1409 1282,1409 800,739 1323,0 1112,0 Z" id="glyph2687"/><glyph unicode="T" horiz-adv-x="1139" d="M 720,1253 L 720,0 530,0 530,1253 46,1253 46,1409 1204,1409 1204,1253 720,1253 Z" id="glyph2689"/><glyph unicode="S" horiz-adv-x="1139" d="M 1272,389 C 1272,330 1261,275 1238,225 1
215,175 1179,132 1131,96 1083,59 1023,31 950,11 877,-10 790,-20 690,-20 515,-20 378,11 280,72 182,133 120,222 93,338 L 278,375 C 287,338 302,305 321,275 340,245 367,219 400,198 433,176 473,159 522,147 571,135 629,129 697,129 754,129 806,134 853,144 900,153 941,168 975,188 1009,208 1036,234 1055,266 1074,297 1083,335 1083,379 1083,425 1073,462 1052,491 1031,520 1001,543 963,562 925,581 880,596 827,609 774,622 716,635 652,650 613,659 573,668 534,679 494,689 456,701 420,716 383,730 349,747 317,766 285,785 257,809 234,836 211,863 192,894 179,930 166,965 159,1006 159,1053 159,1120 173,1177 200,1225 227,1272 264,1311 312,1342 360,1373 417,1395 482,1409 547,1423 618,1430 694,1430 781,1430 856,1423 918,1410 980,1396 1032,1375 1075,1348 1118,1321 1152,1287 1178,1247 1203,1206 1224,1159 1239,1106 L 1051,1073 C 1042,1107 1028,1137 1011,1164 993,1191 970,1213 941,1231 912,1249 878,1263 837,1272 796,1281 747,1286 692,1286 627,1286 572,1280 528,1269 483,1257 448,1241 421,1221 394,1201 374,1178 36
3,1151 351,1124 345,1094 345,1063 345,1021 356,987 377,960 398,933 426,910 462,892 498,874 540,859 587,847 634,835 685,823 738,811 781,801 825,791 868,781 911,770 952,758 991,744 1030,729 1067,712 1102,693 1136,674 1166,650 1191,622 1216,594 1236,561 1251,523 1265,485 1272,440 1272,389 Z" id="glyph2691"/><glyph unicode="R" horiz-adv-x="1218" d="M 1164,0 L 798,585 359,585 359,0 168,0 168,1409 831,1409 C 911,1409 982,1400 1044,1382 1105,1363 1157,1337 1199,1302 1241,1267 1273,1225 1295,1175 1317,1125 1328,1069 1328,1006 1328,961 1322,917 1309,874 1296,831 1275,791 1247,755 1219,719 1183,688 1140,662 1097,636 1045,618 984,607 L 1384,0 1164,0 Z M 1136,1004 C 1136,1047 1129,1084 1114,1115 1099,1146 1078,1173 1050,1194 1022,1215 988,1230 948,1241 908,1251 863,1256 812,1256 L 359,1256 359,736 820,736 C 875,736 922,743 962,757 1002,770 1035,789 1061,813 1086,837 1105,865 1118,898 1130,931 1136,966 1136,1004 Z" id="glyph2693"/><glyph unicode="Q" horiz-adv-x="1377" d="M 1495,711 C 1495,612 14
82,521 1457,439 1431,356 1394,284 1346,222 1297,160 1238,110 1168,71 1097,32 1017,6 928,-6 942,-49 958,-85 976,-115 993,-145 1013,-169 1036,-189 1059,-207 1084,-221 1112,-231 1139,-239 1170,-244 1204,-244 1223,-244 1243,-243 1264,-240 1285,-237 1304,-234 1319,-231 L 1319,-365 C 1294,-371 1266,-376 1236,-381 1205,-385 1174,-387 1141,-387 1084,-387 1034,-378 991,-361 948,-344 911,-319 879,-287 846,-255 818,-216 795,-170 772,-123 751,-71 733,-12 628,-12 535,7 456,46 376,84 310,136 257,200 204,265 164,340 137,427 110,513 97,607 97,709 97,819 112,919 143,1008 174,1097 219,1172 278,1235 337,1297 411,1346 498,1379 585,1413 684,1430 797,1430 909,1430 1009,1413 1096,1379 1183,1345 1256,1297 1315,1234 1374,1171 1418,1096 1449,1007 1480,918 1495,820 1495,711 Z M 1300,711 C 1300,796 1289,873 1268,942 1246,1011 1214,1071 1172,1120 1129,1169 1077,1207 1014,1234 951,1261 879,1274 797,1274 713,1274 639,1261 576,1234 513,1207 460,1169 418,1120 375,1071 344,1011 323,942 302,873 291,796 291,711 291,62
6 302,549 324,479 345,408 377,348 420,297 462,246 515,206 578,178 641,149 713,135 795,135 883,135 959,149 1023,178 1086,207 1139,247 1180,298 1221,349 1251,409 1271,480 1290,551 1300,628 1300,711 Z" id="glyph2695"/><glyph unicode="P" horiz-adv-x="1086" d="M 1258,985 C 1258,924 1248,867 1228,814 1207,761 1177,715 1137,676 1096,637 1046,606 985,583 924,560 854,549 773,549 L 359,549 359,0 168,0 168,1409 761,1409 C 844,1409 917,1399 979,1379 1041,1358 1093,1330 1134,1293 1175,1256 1206,1211 1227,1159 1248,1106 1258,1048 1258,985 Z M 1066,983 C 1066,1072 1039,1140 984,1187 929,1233 847,1256 738,1256 L 359,1256 359,700 746,700 C 856,700 937,724 989,773 1040,822 1066,892 1066,983 Z" id="glyph2697"/><glyph unicode="O" horiz-adv-x="1377" d="M 1495,711 C 1495,601 1479,501 1448,411 1416,321 1370,244 1310,180 1250,116 1177,67 1090,32 1003,-3 905,-20 795,-20 679,-20 577,-2 490,35 403,71 330,122 272,187 214,252 170,329 141,418 112,507 97,605 97,711 97,821 112,920 143,1009 174,1098 219,1173 278,12
36 337,1298 411,1346 498,1380 585,1413 684,1430 797,1430 909,1430 1009,1413 1096,1379 1183,1345 1256,1297 1315,1234 1374,1171 1418,1096 1449,1007 1480,918 1495,820 1495,711 Z M 1300,711 C 1300,796 1289,873 1268,942 1246,1011 1214,1071 1172,1120 1129,1169 1077,1207 1014,1234 951,1261 879,1274 797,1274 713,1274 639,1261 576,1234 513,1207 460,1169 418,1120 375,1071 344,1011 323,942 302,873 291,796 291,711 291,626 302,549 324,479 345,408 377,348 420,297 462,246 515,206 578,178 641,149 713,135 795,135 883,135 959,149 1023,178 1086,207 1139,247 1180,298 1221,349 1251,409 1271,480 1290,551 1300,628 1300,711 Z" id="glyph2699"/><glyph unicode="M" horiz-adv-x="1324" d="M 1366,0 L 1366,940 C 1366,974 1366,1009 1367,1044 1368,1079 1369,1112 1370,1141 1371,1175 1373,1208 1375,1240 1366,1206 1356,1172 1346,1139 1337,1110 1328,1080 1318,1048 1307,1015 1297,986 1287,960 L 923,0 789,0 420,960 C 416,970 412,982 408,995 403,1008 399,1023 394,1038 389,1053 384,1068 379,1084 374,1099 369,1115 364,1130 3
53,1165 342,1202 331,1240 332,1203 333,1166 334,1129 335,1098 336,1065 337,1031 338,996 338,966 338,940 L 338,0 168,0 168,1409 419,1409 794,432 C 799,419 804,402 811,381 818,360 824,338 830,316 836,294 842,273 847,254 852,234 855,219 857,208 859,219 863,234 868,254 873,274 880,295 887,317 894,339 900,360 907,381 914,402 920,419 925,432 L 1293,1409 1538,1409 1538,0 1366,0 Z" id="glyph2701"/><glyph unicode="L" horiz-adv-x="900" d="M 168,0 L 168,1409 359,1409 359,156 1071,156 1071,0 168,0 Z" id="glyph2703"/><glyph unicode="K" horiz-adv-x="1191" d="M 1106,0 L 543,680 359,540 359,0 168,0 168,1409 359,1409 359,703 1038,1409 1263,1409 663,797 1343,0 1106,0 Z" id="glyph2705"/><glyph unicode="I" horiz-adv-x="186" d="M 189,0 L 189,1409 380,1409 380,0 189,0 Z" id="glyph2707"/><glyph unicode="E" horiz-adv-x="1112" d="M 168,0 L 168,1409 1237,1409 1237,1253 359,1253 359,801 1177,801 1177,647 359,647 359,156 1278,156 1278,0 168,0 Z" id="glyph2709"/><glyph unicode="D" horiz-adv-x="1218" d="M 1381,7
19 C 1381,602 1363,498 1328,409 1293,319 1244,244 1183,184 1122,123 1049,78 966,47 882,16 792,0 695,0 L 168,0 168,1409 634,1409 C 743,1409 843,1396 935,1369 1026,1342 1105,1300 1171,1244 1237,1187 1289,1116 1326,1029 1363,942 1381,839 1381,719 Z M 1189,719 C 1189,814 1175,896 1148,964 1121,1031 1082,1087 1033,1130 984,1173 925,1205 856,1226 787,1246 712,1256 630,1256 L 359,1256 359,153 673,153 C 747,153 816,165 879,189 942,213 996,249 1042,296 1088,343 1124,402 1150,473 1176,544 1189,626 1189,719 Z" id="glyph2711"/><glyph unicode="C" horiz-adv-x="1297" d="M 792,1274 C 712,1274 641,1261 580,1234 518,1207 466,1169 425,1120 383,1071 351,1011 330,942 309,873 298,796 298,711 298,626 310,549 333,479 356,408 389,348 432,297 475,246 527,207 590,179 652,151 722,137 800,137 855,137 905,144 950,159 995,173 1035,193 1072,219 1108,245 1140,276 1169,312 1198,347 1223,387 1245,430 L 1401,352 C 1376,299 1344,250 1307,205 1270,160 1226,120 1176,87 1125,54 1068,28 1005,9 941,-10 870,-20 791,-20 677,-
20 577,-2 492,35 406,71 334,122 277,187 219,252 176,329 147,418 118,507 104,605 104,711 104,821 119,920 150,1009 180,1098 224,1173 283,1236 341,1298 413,1346 498,1380 583,1413 681,1430 790,1430 940,1430 1065,1401 1166,1342 1267,1283 1341,1196 1388,1081 L 1207,1021 C 1194,1054 1176,1086 1153,1117 1130,1147 1102,1174 1068,1197 1034,1220 994,1239 949,1253 903,1267 851,1274 792,1274 Z" id="glyph2713"/><glyph unicode="B" horiz-adv-x="1086" d="M 1258,397 C 1258,326 1244,265 1216,215 1188,164 1150,123 1103,92 1056,60 1001,37 938,22 875,7 809,0 740,0 L 168,0 168,1409 680,1409 C 758,1409 828,1403 889,1390 950,1377 1002,1356 1045,1328 1088,1300 1120,1265 1143,1222 1165,1179 1176,1127 1176,1067 1176,1028 1171,991 1160,956 1149,921 1132,890 1110,862 1087,833 1059,809 1026,789 992,768 953,753 908,743 965,736 1015,723 1059,704 1102,685 1139,660 1168,630 1197,600 1220,565 1235,526 1250,486 1258,443 1258,397 Z M 984,1044 C 984,1120 958,1174 906,1207 854,1240 779,1256 680,1256 L 359,1256 359,810 680
,810 C 736,810 783,816 822,827 861,838 892,853 916,874 940,894 957,918 968,947 979,976 984,1008 984,1044 Z M 1065,412 C 1065,457 1057,495 1041,526 1024,557 1001,583 970,603 939,623 903,638 860,647 817,656 768,661 715,661 L 359,661 359,153 730,153 C 779,153 824,157 865,165 906,173 941,187 971,207 1000,227 1023,254 1040,287 1057,320 1065,362 1065,412 Z" id="glyph2715"/><glyph unicode="A" horiz-adv-x="1350" d="M 1167,0 L 1006,412 364,412 202,0 4,0 579,1409 796,1409 1362,0 1167,0 Z M 768,1026 C 757,1053 747,1080 738,1107 728,1134 719,1159 712,1182 705,1204 699,1223 694,1238 689,1253 686,1262 685,1265 684,1262 681,1252 676,1237 671,1222 665,1203 658,1180 650,1157 641,1132 632,1105 622,1078 612,1051 602,1024 L 422,561 949,561 768,1026 Z" id="glyph2717"/><glyph unicode=")" horiz-adv-x="557" d="M 555,528 C 555,435 548,346 534,262 520,177 498,96 468,18 438,-60 400,-136 353,-209 306,-282 251,-354 186,-424 L 12,-424 C 75,-354 129,-282 175,-209 220,-136 258,-60 287,19 316,98 338,179 353,264 367
,349 374,437 374,530 374,623 367,711 353,796 338,881 316,962 287,1041 258,1119 220,1195 175,1269 129,1342 75,1414 12,1484 L 186,1484 C 251,1414 306,1342 353,1269 400,1196 438,1120 468,1042 498,964 520,883 534,798 548,713 555,625 555,532 L 555,528 Z" id="glyph2719"/><glyph unicode="(" horiz-adv-x="557" d="M 127,532 C 127,625 134,713 148,798 162,883 184,964 214,1042 244,1120 282,1196 329,1269 376,1342 431,1414 496,1484 L 670,1484 C 607,1414 553,1342 508,1269 462,1195 424,1119 395,1041 366,962 344,881 330,796 315,711 308,623 308,530 308,437 315,349 330,264 344,179 366,98 395,19 424,-60 462,-136 508,-209 553,-282 607,-354 670,-424 L 496,-424 C 431,-354 376,-282 329,-209 282,-136 244,-60 214,18 184,96 162,177 148,262 134,346 127,435 127,528 L 127,532 Z" id="glyph2721"/><glyph unicode=" " horiz-adv-x="556" id="glyph2723"/></font></defs><defs class="TextShapeIndex" id="defs2730"><g ooo:slide="id1" ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10 id11 id12 id13 id14 id15 id16 id17 id18 id19 id
20 id21 id22 id23 id24 id25 id26 id27 id28 id29 id30 id31 id32 id33 id34 id35 id36 id37 id38 id39 id40 id41 id42 id43 id44 id45 id46 id47 id48 id49 id50 id51 id52 id53 id54 id55 id56 id57 id58 id59 id60 id61 id62" id="g2728"/></defs><defs class="EmbeddedBulletChars" id="defs2762"><g id="bullet-char-template(57356)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 580,1141 1163,571 580,0 -4,571 Z" id="path2732" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(57354)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 8,1128 H 1137 V 0 H 8 Z" id="path2735" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(10146)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 174,0 602,739 174,1481 1456,739 Z M 1358,739 309,1346 659,739 Z" id="path2738" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(10132)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 2015,739 1276,0 H 717 l 543,
543 H 174 v 393 h 1086 l -543,545 h 557 z" id="path2741" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(10007)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="m 0,-2 c -7,16 -16,29 -25,39 l 381,530 c -94,256 -141,385 -141,387 0,25 13,38 40,38 9,0 21,-2 34,-5 21,4 42,12 65,25 l 27,-13 111,-251 280,301 64,-25 24,25 c 21,-10 41,-24 62,-43 C 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 c 0,-27 -21,-55 -63,-84 l 16,-20 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 c -22,-34 -53,-51 -92,-51 -42,0 -63,17 -64,51 -7,9 -10,24 -10,44 0,9 1,19 2,30 z" id="path2744" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(10004)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 c 0,78 14,145 41,201 34,71 87,106 158,106 53,0 88,-31 106,-94 l 23,-176 c 8,-64 28,-97 59,-98 l 735,706 c 11,11 33,17 66,17 42,0 63,-15 63,-46 V 965 c 0,-36 -10,-64 -30,-84 L 442,47 C 3
90,-6 338,-33 285,-33 Z" id="path2747" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(9679)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 c 0,181 53,324 160,431 106,107 249,161 430,161 179,0 323,-54 432,-161 108,-107 162,-251 162,-431 0,-180 -54,-324 -162,-431 C 1136,54 992,0 813,0 Z" id="path2750" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(8226)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="m 346,457 c -73,0 -137,26 -191,78 -54,51 -81,114 -81,188 0,73 27,136 81,188 54,52 118,78 191,78 73,0 134,-26 185,-79 51,-51 77,-114 77,-187 0,-75 -25,-137 -76,-188 -50,-52 -112,-78 -186,-78 z" id="path2753" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(8211)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M -4,459 H 1135 V 606 H -4 Z" id="path2756" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(61548)" trans
form="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="m 173,740 c 0,163 58,303 173,419 116,115 255,173 419,173 163,0 302,-58 418,-173 116,-116 174,-256 174,-419 0,-163 -58,-303 -174,-418 C 1067,206 928,148 765,148 601,148 462,206 346,322 231,437 173,577 173,740 Z" id="path2759" inkscape:connector-curvature="0"/></g></defs><defs class="TextEmbeddedBitmaps" id="defs2764"/><g id="g2769" transform="translate(-4840.889,-3040)"><g id="id2" class="Master_Slide"><g id="bg-id2" class="Background"/><g id="bo-id2" class="BackgroundObjects"/></g></g><g class="SlideGroup" id="g3795" transform="translate(-4840.889,-3040)"><g id="g3793"><g id="container-id1"><g id="id1" class="Slide" clip-path="url(#presentation_clip_path)"><g class="Page" id="g3789"><g class="com.sun.star.drawing.CustomShape" id="g2790"><g id="id3"><rect class="BoundingBox" x="7530" y="7229" width="3561" height="1654" id="rect2771" style="fill:none;stroke:none"/><path d="m 7806,7230 c -138,0 -275,137 -275,275 v 1100 c 0,138
137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 7505 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path2773" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 7806,7230 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 7505 c 0,-138 -138,-275 -276,-275 z" id="path2775" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 7531,7230 Z" id="path2777" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 11089,8881 Z" id="path2779" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text2787"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan2785" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="7773" y="8276" id="tspan2783"><tspan id="tspan2781" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g2811"><g id="id4"><rect class="BoundingBox" x="7785" y="7611" width="3561" height="1654" id="rect2792" style="fill:none;stroke:none"/><path d="m 8061,7612 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 7887 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path2794" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 8061,7612 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 7887 c 0,-138 -138,-275 -276,-275 z" id="path2796" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 7786,7612 Z" id="path2798" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 11344,9263 Z" id="path2800" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text2808"><tspan class="TextParagraph" font-size="635px" font-weight="400" id=
"tspan2806" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="8028" y="8658" id="tspan2804"><tspan id="tspan2802" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g2832"><g id="id5"><rect class="BoundingBox" x="8037" y="7991" width="3561" height="1654" id="rect2813" style="fill:none;stroke:none"/><path d="m 8313,7992 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8267 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path2815" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 8313,7992 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8267 c 0,-138 -138,-275 -276,-275 z" id="path2817" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 8038,7992 Z" id="path2819" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 11596,9643 Z" id="path2821" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text2829"><tspan class="TextParagraph" font-size="635px" font-weight="400" id=
"tspan2827" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="8773" y="9038" id="tspan2825"><tspan id="tspan2823" style="fill:#000000;stroke:none">PKTIO </tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g2853"><g id="id6"><rect class="BoundingBox" x="8037" y="10151" width="3561" height="1654" id="rect2834" style="fill:none;stroke:none"/><path d="m 8313,10152 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path2836" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 8313,10152 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path2838" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 8038,10152 Z" id="path2840" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 11596,11803 Z" id="path2842" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text2850"><tspan class="TextParagraph" font-size="635px" font-weight="4
00" id="tspan2848" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="8818" y="11198" id="tspan2846"><tspan id="tspan2844" style="fill:#000000;stroke:none">Buffers</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g2874"><g id="id7"><rect class="BoundingBox" x="12610" y="8691" width="4322" height="1654" id="rect2855" style="fill:none;stroke:none"/><path d="m 12886,8692 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3768 c 138,0 276,-138 276,-276 V 8967 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 4319,1651 z" id="path2857" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 12886,8692 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3768 c 138,0 276,-138 276,-276 V 8967 c 0,-138 -138,-275 -276,-275 z" id="path2859" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 12611,8692 Z" id="path2861" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 16930,10343 Z" id="path2863" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text2871"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan2869" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="12905" y="9738" id="tspan2867"><tspan id="tspan2865" style="fill:#000000;stroke:none">Classification</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g2899"><g id="id8"><rect class="BoundingBox" x="18072" y="7228" width="1909" height="639" id="rect2876" style="fill:none;stroke:none"/><path d="m 18073,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path2878" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2880" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,7229 Z" id="path2882" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,7865 Z" id="path2884" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2886" inkscape:connector-curvature="0" style=
"fill:none;stroke:#3465a4"/><path d="M 18708,7229 Z" id="path2888" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,7865 Z" id="path2890" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2892" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,7229 Z" id="path2894" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,7865 Z" id="path2896" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g2924"><g id="id9"><rect class="BoundingBox" x="18072" y="8245" width="1909" height="639" id="rect2901" style="fill:none;stroke:none"/><path d="m 18073,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -
477 l 159,-318 z m 0,0 z m 636,636 z" id="path2903" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2905" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,8246 Z" id="path2907" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,8882 Z" id="path2909" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2911" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,8246 Z" id="path2913" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,8882 Z" id="path2915" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2917" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d
="M 19343,8246 Z" id="path2919" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,8882 Z" id="path2921" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g2949"><g id="id10"><rect class="BoundingBox" x="18072" y="9262" width="1909" height="639" id="rect2926" style="fill:none;stroke:none"/><path d="m 18073,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path2928" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2930" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,9263 Z" id="path2932" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,9899
Z" id="path2934" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2936" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,9263 Z" id="path2938" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,9899 Z" id="path2940" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2942" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,9263 Z" id="path2944" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,9899 Z" id="path2946" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g2974"><g id="id11"><rect class="BoundingBox" x="18072" y="10404" width="1909" height="639" id="rect2951" style="fill:none;stroke
:none"/><path d="m 18073,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path2953" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2955" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,10405 Z" id="path2957" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,11041 Z" id="path2959" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2961" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,10405 Z" id="path2963" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,11041 Z" id="path2965" inkscape
:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2967" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,10405 Z" id="path2969" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,11041 Z" id="path2971" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g2983"><g id="id12"><rect class="BoundingBox" x="11595" y="7398" width="6479" height="1421" id="rect2976" style="fill:none;stroke:none"/><path d="m 11596,8817 c 1822,0 -1285,-1218 6005,-1268" id="path2978" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,7547 -451,-148 2,300 z" id="path2980" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g2992"><g id="id13"><rect class="BoundingBox" x="16928" y="85
64" width="1146" height="955" id="rect2985" style="fill:none;stroke:none"/><path d="m 16929,9517 c 859,0 474,-567 747,-827" id="path2987" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,8564 -474,4 97,284 z" id="path2989" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3001"><g id="id14"><rect class="BoundingBox" x="16928" y="9418" width="1146" height="302" id="rect2994" style="fill:none;stroke:none"/><path d="m 16929,9517 c 859,0 491,34 710,53" id="path2996" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,9581 -446,-163 -8,300 z" id="path2998" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3010"><g id="id15"><rect class="BoundingBox" x="16928" y="9516" width="1146" height="1208" id="rect3003" style="fill:none;stroke:none"/><path d="m 16929,9517 c 859,0 46
9,738 759,1060" id="path3005" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,10723 -361,-308 -112,278 z" id="path3007" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3019"><g id="id16"><rect class="BoundingBox" x="11595" y="8816" width="1017" height="702" id="rect3012" style="fill:none;stroke:none"/><path d="m 11596,8817 c 762,0 439,365 621,568" id="path3014" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 12611,9517 -372,-294 -102,282 z" id="path3016" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g3040"><g id="id17"><rect class="BoundingBox" x="21501" y="8246" width="4322" height="1654" id="rect3021" style="fill:none;stroke:none"/><path d="m 21777,8247 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3768 c 138,0 276,-138 276,-276 V 8522 c 0,-138 -138
,-275 -276,-275 z m -275,0 z m 4319,1651 z" id="path3023" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 21777,8247 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3768 c 138,0 276,-138 276,-276 V 8522 c 0,-138 -138,-275 -276,-275 z" id="path3025" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 21502,8247 Z" id="path3027" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 25821,9898 Z" id="path3029" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3037"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3035" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="22237" y="9293" id="tspan3033"><tspan id="tspan3031" style="fill:#000000;stroke:none">Scheduler</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3049"><g id="id18"><rect class="BoundingBox" x="19978" y="7546" width="6859" height="1257" id="rect3042" style="fill:none;stroke:none"/><path d="m 19979,7547 c 8298,0 5408,934 6428,1108" id="path3044" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 26836,8683 -439,-181 -20,300 z" id="path3046" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3058"><g id="id19"><rect class="BoundingBox" x="19978" y="8563" width="1525" height="617" id="rect3051" style="fill:none;stroke:none"/><path d="m 19979,8564 c 1143,0 584,351 1090,470" id="path3053" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 21502,9072 -434,-192 -28,299 z" id="path3055" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3067"><g id="id20"><rect class="Boun
dingBox" x="19978" y="8965" width="1525" height="618" id="rect3060" style="fill:none;stroke:none"/><path d="m 19979,9581 c 1143,0 584,-352 1090,-470" id="path3062" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 21502,9072 -462,-107 28,299 z" id="path3064" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3076"><g id="id21"><rect class="BoundingBox" x="19978" y="9047" width="1525" height="1678" id="rect3069" style="fill:none;stroke:none"/><path d="m 19979,10723 c 1143,0 572,-1180 1116,-1545" id="path3071" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 21502,9072 -474,-24 81,289 z" id="path3073" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.TextShape" id="g3089"><g id="id22"><rect class="BoundingBox" x="17808" y="5933" width="3569" height="1214" id="rect3078" style="fill:none;stroke:none"/
><text class="TextShape" id="text3086"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3084" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="18058" y="6630" id="tspan3082"><tspan id="tspan3080" style="fill:#000000;stroke:none">Queue</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3110"><g id="id23"><rect class="BoundingBox" x="26834" y="7857" width="3561" height="1654" id="rect3091" style="fill:none;stroke:none"/><path d="m 27110,7858 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8133 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3093" inkscape:connector-curvature="0" style="fill:#ffff00;stroke:none"/><path d="m 27110,7858 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8133 c 0,-138 -138,-275 -276,-275 z" id="path3095" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 26835,7858 Z" id="path3097" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30393,9509 Z" id="path3099" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3107"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan3105" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="27077" y="8904" id="tspan3103"><tspan id="tspan3101" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3131"><g id="id24"><rect class="BoundingBox" x="27088" y="8237" width="3561" height="1654" id="rect3112" style="fill:none;stroke:none"/><path d="m 27364,8238 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8513 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3114" inkscape:connector-curvature="0" style="fill:#ffff00;stroke:none"/><path d="m 27364,8238 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8513 c 0,-138 -138,-275 -276,-275 z" id="path3116" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27089,8238 Z" id="path3118" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30647,9889 Z" id="path3120" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3128"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan3126" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="27331" y="9284" id="tspan3124"><tspan id="tspan3122" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3152"><g id="id25"><rect class="BoundingBox" x="27343" y="8619" width="3561" height="1654" id="rect3133" style="fill:none;stroke:none"/><path d="m 27619,8620 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8895 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3135" inkscape:connector-curvature="0" style="fill:#ffff00;stroke:none"/><path d="m 27619,8620 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8895 c 0,-138 -138,-275 -276,-275 z" id="path3137" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27344,8620 Z" id="path3139" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30902,10271 Z" id="path3141" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3149"><tspan class="TextParagraph" font-size="635px" font-weight="40
0" id="tspan3147" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="27522" y="9666" id="tspan3145"><tspan id="tspan3143" style="fill:#000000;stroke:none">odp_thread</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3161"><g id="id26"><rect class="BoundingBox" x="25819" y="8914" width="1272" height="302" id="rect3154" style="fill:none;stroke:none"/><path d="m 25820,9072 c 952,0 521,-5 836,-8" id="path3156" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 27090,9063 -450,-149 v 300 z" id="path3158" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3170"><g id="id27"><rect class="BoundingBox" x="25819" y="9071" width="1527" height="494" id="rect3163" style="fill:none;stroke:none"/><path d="m 25820,9072 c 1144,0 585,257 1090,345" id="path3165" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 27345,9445 -438,-181 -21,299 z" id="path3167" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g3195"><g id="id28"><rect class="BoundingBox
" x="18072" y="7228" width="1909" height="639" id="rect3172" style="fill:none;stroke:none"/><path d="m 18073,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path3174" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3176" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,7229 Z" id="path3178" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,7865 Z" id="path3180" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3182" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,7229 Z" id="path3184" inkscape:connector-curvature="0" styl
e="fill:none;stroke:#3465a4"/><path d="M 19344,7865 Z" id="path3186" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3188" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,7229 Z" id="path3190" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,7865 Z" id="path3192" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g3220"><g id="id29"><rect class="BoundingBox" x="18072" y="8245" width="1909" height="639" id="rect3197" style="fill:none;stroke:none"/><path d="m 18073,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path3199" inkscape:connector-curvature="0" style="fill:#729fc
f;stroke:none"/><path d="m 18073,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3201" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,8246 Z" id="path3203" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,8882 Z" id="path3205" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3207" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,8246 Z" id="path3209" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,8882 Z" id="path3211" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3213" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,8246 Z" id="path3215" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><pat
h d="M 19979,8882 Z" id="path3217" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g3245"><g id="id30"><rect class="BoundingBox" x="18072" y="9262" width="1909" height="639" id="rect3222" style="fill:none;stroke:none"/><path d="m 18073,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path3224" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3226" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,9263 Z" id="path3228" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,9899 Z" id="path3230" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,9
263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3232" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,9263 Z" id="path3234" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,9899 Z" id="path3236" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3238" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,9263 Z" id="path3240" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,9899 Z" id="path3242" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g3270"><g id="id31"><rect class="BoundingBox" x="18072" y="10404" width="1909" height="639" id="rect3247" style="fill:none;stroke:none"/><path d="m 18073,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-6
36 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path3249" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3251" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,10405 Z" id="path3253" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,11041 Z" id="path3255" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3257" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,10405 Z" id="path3259" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,11041 Z" id="path3261" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,10405 h 477 l 159,318 -159,
318 h -477 l 159,-318 z" id="path3263" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,10405 Z" id="path3265" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,11041 Z" id="path3267" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g3295"><g id="id32"><rect class="BoundingBox" x="35089" y="7471" width="1909" height="639" id="rect3272" style="fill:none;stroke:none"/><path d="m 35090,7472 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path3274" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 35090,7472 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3276" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 3
5090,7472 Z" id="path3278" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35726,8108 Z" id="path3280" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 35725,7472 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3282" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35725,7472 Z" id="path3284" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36361,8108 Z" id="path3286" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 36360,7472 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3288" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36360,7472 Z" id="path3290" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36996,8108 Z" id="path3292" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g3320"><g id="
id33"><rect class="BoundingBox" x="35089" y="8787" width="1909" height="639" id="rect3297" style="fill:none;stroke:none"/><path d="m 35090,8788 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path3299" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 35090,8788 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3301" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35090,8788 Z" id="path3303" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35726,9424 Z" id="path3305" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 35725,8788 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3307" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35725,8788 Z" id="path3309" inkscap
e:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36361,9424 Z" id="path3311" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 36360,8788 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3313" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36360,8788 Z" id="path3315" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36996,9424 Z" id="path3317" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g3345"><g id="id34"><rect class="BoundingBox" x="35089" y="9930" width="1909" height="639" id="rect3322" style="fill:none;stroke:none"/><path d="m 35090,9931 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path3324" inkscape:connector-cu
rvature="0" style="fill:#729fcf;stroke:none"/><path d="m 35090,9931 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3326" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35090,9931 Z" id="path3328" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35726,10567 Z" id="path3330" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 35725,9931 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3332" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35725,9931 Z" id="path3334" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36361,10567 Z" id="path3336" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 36360,9931 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3338" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36360,9931 Z" id="path3340" inkscape:connector-curvature="0" style=
"fill:none;stroke:#3465a4"/><path d="M 36996,10567 Z" id="path3342" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3354"><g id="id35"><rect class="BoundingBox" x="30901" y="9444" width="4190" height="950" id="rect3347" style="fill:none;stroke:none"/><path d="m 30902,9445 c 3141,0 1257,720 3726,797" id="path3349" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 35090,10249 -448,-157 -4,300 z" id="path3351" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3363"><g id="id36"><rect class="BoundingBox" x="30901" y="8958" width="4190" height="489" id="rect3356" style="fill:none;stroke:none"/><path d="m 30902,9445 c 3141,0 1258,-303 3724,-336" id="path3358" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 35090,9106 -451,-147 2,300 z" id="path3360" inkscape:connector-curvature=
"0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3372"><g id="id37"><rect class="BoundingBox" x="30901" y="7653" width="4190" height="1794" id="rect3365" style="fill:none;stroke:none"/><path d="m 30902,9445 c 3141,0 1254,-1485 3732,-1642" id="path3367" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 35090,7790 -454,-136 9,300 z" id="path3369" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3381"><g id="id38"><rect class="BoundingBox" x="17459" y="9444" width="13734" height="2353" id="rect3374" style="fill:none;stroke:none"/><path d="m 30902,9445 c 751,0 502,2350 -6573,2350 -7074,0 -7217,-778 -6677,-1009" id="path3376" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,10723 -468,-76 48,296 z" id="path3378" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.s
un.star.drawing.CustomShape" id="g3402"><g id="id39"><rect class="BoundingBox" x="38898" y="8872" width="4577" height="1654" id="rect3383" style="fill:none;stroke:none"/><path d="m 39174,8873 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 4023 c 137,0 275,-138 275,-276 V 9148 c 0,-138 -138,-275 -275,-275 z m -275,0 z m 4574,1651 z" id="path3385" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 39174,8873 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 4023 c 137,0 275,-138 275,-276 V 9148 c 0,-138 -138,-275 -275,-275 z" id="path3387" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 38899,8873 Z" id="path3389" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 43473,10524 Z" id="path3391" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3399"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3397" style
="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="39511" y="9919" id="tspan3395"><tspan id="tspan3393" style="fill:#000000;stroke:none">Traffic Mngr</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3423"><g id="id40"><rect class="BoundingBox" x="30771" y="12437" width="3561" height="1654" id="rect3404" style="fill:none;stroke:none"/><path d="m 31047,12438 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3406" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 31047,12438 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path3408" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30772,12438 Z" id="path3410" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 34330,14089 Z" id="path3412" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3420"><tspan class="TextParagraph" font-size="635px" font-weig
ht="400" id="tspan3418" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="31581" y="13484" id="tspan3416"><tspan id="tspan3414" style="fill:#000000;stroke:none">Packet</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3444"><g id="id41"><rect class="BoundingBox" x="27214" y="17390" width="3561" height="1654" id="rect3425" style="fill:none;stroke:none"/><path d="m 27490,17391 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3427" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 27490,17391 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path3429" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27215,17391 Z" id="path3431" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30773,19042 Z" id="path3433" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3441"><tspan class="TextParagraph" font-size="635px" font-weig
ht="400" id="tspan3439" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="28200" y="18437" id="tspan3437"><tspan id="tspan3435" style="fill:#000000;stroke:none">IPsec</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3465"><g id="id42"><rect class="BoundingBox" x="30771" y="14087" width="3561" height="1654" id="rect3446" style="fill:none;stroke:none"/><path d="m 31047,14088 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3448" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 31047,14088 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path3450" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30772,14088 Z" id="path3452" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 34330,15739 Z" id="path3454" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3462"><tspan class="TextParagraph" font-size="635px" font-weig
ht="400" id="tspan3460" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="31459" y="15134" id="tspan3458"><tspan id="tspan3456" style="fill:#000000;stroke:none">Shmem</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3486"><g id="id43"><rect class="BoundingBox" x="27214" y="15738" width="3561" height="1654" id="rect3467" style="fill:none;stroke:none"/><path d="m 27490,15739 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3469" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 27490,15739 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path3471" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27215,15739 Z" id="path3473" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30773,17390 Z" id="path3475" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3483"><tspan class="TextParagraph" font-size="635px" font-weig
ht="400" id="tspan3481" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="28289" y="16785" id="tspan3479"><tspan id="tspan3477" style="fill:#000000;stroke:none">Sync</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3507"><g id="id44"><rect class="BoundingBox" x="30771" y="15738" width="3561" height="1654" id="rect3488" style="fill:none;stroke:none"/><path d="m 31047,15739 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3490" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 31047,15739 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path3492" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30772,15739 Z" id="path3494" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 34330,17390 Z" id="path3496" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3504"><tspan class="TextParagraph" font-size="635px" font-weig
ht="400" id="tspan3502" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="31552" y="16785" id="tspan3500"><tspan id="tspan3498" style="fill:#000000;stroke:none">Buffers</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3516"><g id="id45"><rect class="BoundingBox" x="24597" y="9444" width="6944" height="8898" id="rect3509" style="fill:none;stroke:none"/><path d="m 30902,9445 c 1251,0 834,2604 -2827,2604 -3661,0 -4961,5742 -1281,6145" id="path3511" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 27216,18216 -441,-175 -17,300 z" id="path3513" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3525"><g id="id46"><rect class="BoundingBox" x="36995" y="9105" width="1906" height="716" id="rect3518" style="fill:none;stroke:none"/><path d="m 36996,9106 c 1428,0 678,452 1468,566" id="path3520" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 38900,9698 -440,-178 -19,299 z" id="path3522" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3534
"><g id="id47"><rect class="BoundingBox" x="36995" y="9574" width="1906" height="677" id="rect3527" style="fill:none;stroke:none"/><path d="m 36996,10249 c 1428,0 678,-421 1468,-527" id="path3529" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 38900,9698 -458,-123 18,299 z" id="path3531" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g3555"><g id="id48"><rect class="BoundingBox" x="45376" y="7811" width="3561" height="1654" id="rect3536" style="fill:none;stroke:none"/><path d="m 45652,7812 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8087 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3538" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 45652,7812 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8087 c 0,-138 -138,-275 -276,-275 z" id="pat
h3540" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 45377,7812 Z" id="path3542" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 48935,9463 Z" id="path3544" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3552"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3550" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="45619" y="8858" id="tspan3548"><tspan id="tspan3546" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3576"><g id="id49"><rect class="BoundingBox" x="45631" y="8191" width="3561" height="1654" id="rect3557" style="fill:none;stroke:none"/><path d="m 45907,8192 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8467 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3559" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 45907,8192 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8467 c 0,-138 -138,-275 -276,-275 z" id="path3561" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 45632,8192 Z" id="path3563" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 49190,9843 Z" id="path3565" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3573"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan3571" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="45874" y="9238" id="tspan3569"><tspan id="tspan3567" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3597"><g id="id50"><rect class="BoundingBox" x="45883" y="8572" width="3561" height="1654" id="rect3578" style="fill:none;stroke:none"/><path d="m 46159,8573 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8848 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3580" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 46159,8573 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8848 c 0,-138 -138,-275 -276,-275 z" id="path3582" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 45884,8573 Z" id="path3584" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 49442,10224 Z" id="path3586" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3594"><tspan class="TextParagraph" font-size="635px" font-weight="40
0" id="tspan3592" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="46708" y="9619" id="tspan3590"><tspan id="tspan3588" style="fill:#000000;stroke:none">PKTIO</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3606"><g id="id51"><rect class="BoundingBox" x="43472" y="9256" width="2414" height="444" id="rect3599" style="fill:none;stroke:none"/><path d="m 43473,9698 c 1809,0 802,-246 1978,-293" id="path3601" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 45885,9398 -453,-142 6,300 z" id="path3603" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g3627"><g id="id52"><rect class="BoundingBox" x="27214" y="12437" width="3561" height="1654" id="rect3608" style="fill:none;stroke:none"/><path d="m 27490,12438 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3610" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 27490,12438 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,
0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path3612" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27215,12438 Z" id="path3614" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30773,14089 Z" id="path3616" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3624"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3622" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="28037" y="13484" id="tspan3620"><tspan id="tspan3618" style="fill:#000000;stroke:none">Timers</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3648"><g id="id53"><rect class="BoundingBox" x="27214" y="14087" width="3561" height="1654" id="rect3629" style="fill:none;stroke:none"/><path d="m 27490,14088 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3631" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 27490,14088 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path3633" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27215,14088 Z" id="path3635" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30773,15739 Z" id="path3637" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3645"><tspan class="TextParagraph" font-size="635px" font-weig
ht="400" id="tspan3643" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="28183" y="15134" id="tspan3641"><tspan id="tspan3639" style="fill:#000000;stroke:none">Event</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3657"><g id="id54"><rect class="BoundingBox" x="9223" y="3801" width="37935" height="4013" id="rect3650" style="fill:none;stroke:none"/><path d="M 47156,7812 C 47156,2457 10447,2740 9336,7029" id="path3652" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 9310,7230 210,-425 -297,-41 z" id="path3654" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3666"><g id="id55"><rect class="BoundingBox" x="17708" y="10723" width="17467" height="9710" id="rect3659" style="fill:none;stroke:none"/><path d="m 34412,18264 c 1701,0 1134,2167 -7853,2167 -8987,0 -9083,-7740 -8683,-9398" id="path3661" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,10723 -364,304 255,158 z" id="path3663" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.TextShape" i
d="g3679"><g id="id56"><rect class="BoundingBox" x="21199" y="20231" width="9901" height="1674" id="rect3668" style="fill:none;stroke:none"/><text class="TextShape" id="text3676"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3674" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="21449" y="20928" id="tspan3672"><tspan id="tspan3670" style="fill:#000000;stroke:none">Lookaside IPsec Op Completion</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.TextShape" id="g3692"><g id="id57"><rect class="BoundingBox" x="26705" y="3040" width="5335" height="1017" id="rect3681" style="fill:none;stroke:none"/><text class="TextShape" id="text3689"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3687" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="26955" y="3737" id="tspan3685"><tspan id="tspan3683" style="fill:#000000;stroke:none">Loopback</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.TextShape" id="g3715"><g id="id58"><rect class="BoundingBox" x="21128" y="14616" width="3684" height="2385" id="rect3694" style="fill:none;stroke:none"/><text class="TextShape" id="text3712"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3700" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="21378" y="15313" id="tspan3698"><tspan id="tspan3696" style="fill:#000000;stroke:none">IPsec Op</tspan></tspan></tspan><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3710" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="21378" y="16016" id="tspan3704"><tspan id="tspan3702" style="fill:#000000;stroke:none">(Encrypt or </tspan></tspan><tspan class="TextPosition" x="21378" y="16719" id="tspan3708"><tspan id="tspan3706" style="fill:#000000;stroke:none">Decrypt)</tspan></tspan></tsp
an></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3736"><g id="id59"><rect class="BoundingBox" x="4854" y="8465" width="1967" height="1066" id="rect3717" style="fill:none;stroke:none"/><path d="m 4855,8731 h 1473 v -265 l 491,531 -491,532 V 9263 H 4855 Z m 0,-265 z m 1964,1063 z" id="path3719" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 4855,8731 h 1473 v -265 l 491,531 -491,532 V 9263 H 4855 Z" id="path3721" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 4855,8466 Z" id="path3723" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 6819,9529 Z" id="path3725" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3733"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3731" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="5274" y="9218" id="tspan3729"><tspa
n id="tspan3727" style="fill:#000000;stroke:none">RX</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3745"><g id="id60"><rect class="BoundingBox" x="36995" y="7789" width="8384" height="994" id="rect3738" style="fill:none;stroke:none"/><path d="m 36996,7790 c 8817,0 4991,769 7903,842" id="path3740" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 45378,8637 -448,-155 -4,300 z" id="path3742" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g3766"><g id="id61"><rect class="BoundingBox" x="50054" y="8465" width="1967" height="1066" id="rect3747" style="fill:none;stroke:none"/><path d="m 50055,8731 h 1473 v -265 l 491,531 -491,532 v -266 h -1473 z m 0,-265 z m 1964,1063 z" id="path3749" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 50055,8731 h 1473 v -265 l 491,531 -491,532 v -266 h -1473 z" id="path3751" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 50055,8466
Z" id="path3753" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 52019,9529 Z" id="path3755" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3763"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3761" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="50508" y="9218" id="tspan3759"><tspan id="tspan3757" style="fill:#000000;stroke:none">TX</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3787"><g id="id62"><rect class="BoundingBox" x="30853" y="17438" width="3561" height="1654" id="rect3768" style="fill:none;stroke:none"/><path d="m 31129,17439 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3770" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 31129,17439 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path3772" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30854,17439 Z" id="path3774" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 34412,19090 Z" id="path3776" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3784"><tspan class="TextParagraph" font-size="635px" font-weig
ht="400" id="tspan3782" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="31699" y="18485" id="tspan3780"><tspan id="tspan3778" style="fill:#000000;stroke:none">Crypto</tspan></tspan></tspan></text>
+</g></g></g></g></g></g></g></svg>
diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am
index 55fe7e92..e6a44d98 100644
--- a/doc/users-guide/Makefile.am
+++ b/doc/users-guide/Makefile.am
@@ -33,6 +33,8 @@ IMAGES = $(IMAGES_DIR)/overview.svg \
$(IMAGES_DIR)/release_git.svg \
$(IMAGES_DIR)/segment.svg \
$(IMAGES_DIR)/simple_release_git.svg \
+ $(IMAGES_DIR)/ipsec-lookaside.svg \
+ $(IMAGES_DIR)/ipsec-inline.svg \
$(IMAGES_DIR)/timeout_fsm.svg \
$(IMAGES_DIR)/timer_fsm.svg \
$(IMAGES_DIR)/tm_hierarchy.svg \
-----------------------------------------------------------------------
Summary of changes:
doc/images/.gitignore | 1 +
doc/images/ipsec-inline.svg | 31 +++
doc/images/ipsec-lookaside.svg | 29 ++
doc/images/ipsec_fsm.gv | 32 +++
doc/users-guide/Makefile.am | 5 +
doc/users-guide/users-guide-ipsec.adoc | 466 +++++++++++++++++++++++++++++++++
doc/users-guide/users-guide.adoc | 2 +
7 files changed, 566 insertions(+)
create mode 100644 doc/images/ipsec-inline.svg
create mode 100644 doc/images/ipsec-lookaside.svg
create mode 100644 doc/images/ipsec_fsm.gv
create mode 100644 doc/users-guide/users-guide-ipsec.adoc
hooks/post-receive
--
6 years, 5 months
- 1
- 0
[COMMIT] branch 2.0 updated. v1.15.0.0-929-g6cd43041
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, 2.0 has been updated
via 6cd43041e55bd73a02ca202f835e590b3ad5c354 (commit)
from 65419c16086369f86dea068e54ce492526fa4f41 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6cd43041e55bd73a02ca202f835e590b3ad5c354
Author: Kevin Wang <kevin.wang(a)arm.com>
Date: Fri Nov 10 17:12:32 2017 +0800
linux-gen: buffer: remove burst metadata from odp_buffer_hdr_t
The total packet meta data size was 7 cache lines for Linux-generic.
For scalable scheduler, the burst metadata is not required. So just
remove it for scalable scheduler. After the changes, the size of
the meta data is 4 cache lines for Linux-generic.
Signed-off-by: Kevin Wang <kevin.wang(a)arm.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com>
Reviewed-by: Brian Brooks <brian.brooks(a)arm.com>
Reviewed-by: Yi He <yi.he(a)linaro.org>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 3c505495..56ef03c6 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -261,16 +261,9 @@ __LIB__libodp_linux_la_SOURCES = \
odp_pkt_queue.c \
odp_queue_if.c \
queue/subsystem.c \
- queue/generic.c \
- queue/scalable.c \
odp_rwlock.c \
odp_rwlock_recursive.c \
odp_schedule_if.c \
- schedule/generic.c \
- schedule/iquery.c \
- schedule/scalable.c \
- schedule/scalable_ordered.c \
- schedule/sp.c \
schedule/subsystem.c \
odp_shared_memory.c \
odp_sorted_list.c \
@@ -359,19 +352,29 @@ endif
pool/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
buffer/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
if ODP_SCHEDULE_SCALABLE
+__LIB__libodp_linux_la_SOURCES += schedule/scalable.c \
+ schedule/scalable_ordered.c
schedule/scalable.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
else
-schedule/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
-endif
if ODP_SCHEDULE_SP
+__LIB__libodp_linux_la_SOURCES += schedule/sp.c
schedule/sp.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
-endif
+else
if ODP_SCHEDULE_IQUERY
+__LIB__libodp_linux_la_SOURCES += schedule/iquery.c
schedule/iquery.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
+else
+__LIB__libodp_linux_la_SOURCES += schedule/generic.c
+schedule/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
+endif
endif
+endif
+
if ODP_SCHEDULE_SCALABLE
+__LIB__libodp_linux_la_SOURCES += queue/scalable.c
queue/scalable.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
else
+__LIB__libodp_linux_la_SOURCES += queue/generic.c
queue/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
endif
diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h
index 86f6208f..514e2479 100644
--- a/platform/linux-generic/include/odp_buffer_internal.h
+++ b/platform/linux-generic/include/odp_buffer_internal.h
@@ -73,6 +73,7 @@ struct odp_buffer_hdr_t {
/* Segments */
seg_entry_t seg[CONFIG_PACKET_SEGS_PER_HDR];
+#ifndef ODP_SCHEDULE_SCALABLE
/* Burst counts */
uint8_t burst_num;
uint8_t burst_first;
@@ -82,7 +83,7 @@ struct odp_buffer_hdr_t {
/* Burst table */
struct odp_buffer_hdr_t *burst[BUFFER_BURST_SIZE];
-
+#endif
/* --- Mostly read only data --- */
/* User context pointer or u64 */
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/Makefile.am | 23 ++++++++++++----------
.../linux-generic/include/odp_buffer_internal.h | 3 ++-
2 files changed, 15 insertions(+), 11 deletions(-)
hooks/post-receive
--
6 years, 5 months
- 1
- 0