[COMMIT] branch api-next updated. v1.12.0.0-173-g9fa4b3c
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 9fa4b3c5efa041351ba915ca35b3dfe252ecb34c (commit)
from 983712f43845f8fa7967039d2fd067f9a3ecba20 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/include/odp_buffer_internal.h | 7 +++----
platform/linux-generic/pktio/ipc.c | 7 -------
2 files changed, 3 insertions(+), 11 deletions(-)
hooks/post-receive
--
8 years, 2 months
- 1
- 0
[COMMIT] branch next updated. v1.12.0.0-173-g9fa4b3c
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, next has been updated
via 9fa4b3c5efa041351ba915ca35b3dfe252ecb34c (commit)
from 983712f43845f8fa7967039d2fd067f9a3ecba20 (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 9fa4b3c5efa041351ba915ca35b3dfe252ecb34c
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Fri Dec 16 17:27:35 2016 +0300
linux-gen: pktio ipc: fix clang build
clang is more clever on setting and not using variables,
so it traps compilation. Also buffers header almost everywhere
reference by pointer so size of it should not impact on
performance.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h
index 903f0a7..4cc51d3 100644
--- a/platform/linux-generic/include/odp_buffer_internal.h
+++ b/platform/linux-generic/include/odp_buffer_internal.h
@@ -64,11 +64,10 @@ struct odp_buffer_hdr_t {
struct {
void *hdr;
uint8_t *data;
-#ifdef _ODP_PKTIO_IPC
- /* ipc mapped process can not walk over pointers,
- * offset has to be used */
+ /* Used only if _ODP_PKTIO_IPC is set.
+ * ipc mapped process can not walk over pointers,
+ * offset has to be used */
uint64_t ipc_data_offset;
-#endif
uint32_t len;
} seg[CONFIG_PACKET_MAX_SEGS];
diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c
index 5f26b56..c9df043 100644
--- a/platform/linux-generic/pktio/ipc.c
+++ b/platform/linux-generic/pktio/ipc.c
@@ -459,12 +459,7 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry,
if (odp_unlikely(pool == ODP_POOL_INVALID))
ODP_ABORT("invalid pool");
-#ifdef _ODP_PKTIO_IPC
data_pool_off = phdr->buf_hdr.seg[0].ipc_data_offset;
-#else
- /* compile all function code even if ipc disabled with config */
- data_pool_off = 0;
-#endif
pkt = odp_packet_alloc(pool, phdr->frame_len);
if (odp_unlikely(pkt == ODP_PACKET_INVALID)) {
@@ -590,7 +585,6 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry,
data_pool_off = (uint8_t *)pkt_hdr->buf_hdr.seg[0].data -
(uint8_t *)odp_shm_addr(pool->shm);
-#ifdef _ODP_PKTIO_IPC
/* compile all function code even if ipc disabled with config */
pkt_hdr->buf_hdr.seg[0].ipc_data_offset = data_pool_off;
IPC_ODP_DBG("%d/%d send packet %llx, pool %llx,"
@@ -598,7 +592,6 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry,
i, len,
odp_packet_to_u64(pkt), odp_pool_to_u64(pool_hdl),
pkt_hdr, pkt_hdr->buf_hdr.seg[0].ipc_data_offset);
-#endif
}
/* Put packets to ring to be processed by other process. */
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/include/odp_buffer_internal.h | 7 +++----
platform/linux-generic/pktio/ipc.c | 7 -------
2 files changed, 3 insertions(+), 11 deletions(-)
hooks/post-receive
--
8 years, 2 months
- 1
- 0
[COMMIT] branch next updated. v1.12.0.0-172-g983712f
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, next has been updated
via 983712f43845f8fa7967039d2fd067f9a3ecba20 (commit)
via 7e0461544a5bb9052d84843c5043c68d34b17ba3 (commit)
via 6a45b47fdb150658936a8d2f301dc3309d55050d (commit)
via 9214e4aa94f59fb6c0a193ed7083bb90abba682b (commit)
via f5f8d1b315b050520c1743a29f48c6c9e9675487 (commit)
via 03ec3dcd7ed9d55b91d58d6969114e7de71b88fe (commit)
via e454f36a4a7c70dafd87eab03b3ba740dc10860a (commit)
via 27a05a1d61f3b7e4d58ac0e89db43db069dcc9a3 (commit)
via 362035d60fda8a566636aa5ba58250a8fae9169b (commit)
via eba96af88d36a5cf132c15e0adafb19f92706510 (commit)
via c628e7cbed766a5467fb1ee1fc3113b42e738d08 (commit)
via f1a8dab157c3288d93287a8d6a49f50c84d10342 (commit)
via a05fb250afe4bf6c82d39f28239b08fb7e405b96 (commit)
via c52864e0956c3f57a059af8c90f7ff2b8fb10e6c (commit)
via 9f084f0c90509a354452ef75325c507224c7cd93 (commit)
via b6de862e041b500ade8a94917429f196173d5d90 (commit)
via 87b505031e709ac218eece691bb2e98b2987702a (commit)
via 8acf38df013c6d89e5a2dc3f84fb928e97d27752 (commit)
via dd23be24475a4b96a3f33ea91224fd0fe2c0f083 (commit)
via 9c0fc2112137a07b5265646338a4034662d299b3 (commit)
via 0e2b3a3597d139df1ff5d3f0338aa5cf26e34a43 (commit)
via b5e957111c9cb23737b7ab2a7dfa1389c61c6311 (commit)
via 2048b8030ce1150214123038f275cff1ff8895c9 (commit)
via f759631fb9c373804caeaee27c5ad7de3405e55b (commit)
via 320bb2e9a29256de37bfdb10b9dde3fd0f0d4a5d (commit)
via 65d66b94d66e6b954f3430b90a67eaeca7bf37c6 (commit)
via ba9fedae2040d39f71fa8aee6db9512c5cfe21e4 (commit)
via ed2364544979bbb83f68bf61ea15e9fb86e2e994 (commit)
via 900c9ca3d4099178a328433d32d84a825264aaa1 (commit)
via d660e0e1647d7f1a6c6698b6f1b79b4590b84e1f (commit)
via 42d0b99c453f269fbe21cc92652440bdbbd10ba4 (commit)
via d25d276c649f57021f2bd3575430735ff146a025 (commit)
via f0d6c01a0fb51904d5dd049be8402531ec185dcc (commit)
via 10f2f857f6a38c89afff6bdfcc932e18e49ca9a2 (commit)
via d16d1783b8b01c5a7bbd256567fa226775a4ba93 (commit)
via d762feebade0ac71bbfbfeb31a9ed7c181ff1d91 (commit)
via 2796eef79f73c47e29c0d40d411a5547277836ee (commit)
via d235cfacc743bf0524fbc6c7f0f5810fa85ecd93 (commit)
via 4cfe988cc6e0667928c23a4715eeac8a301396ac (commit)
via a70fa333ebb25a8331bd203440fbe81bf84946b1 (commit)
via 290b6f6464a81d65333657dfff7922203614748c (commit)
via 2f78516616ba40cfa316c739816ef34ef7924a49 (commit)
via b5781eeee0fa56710ea865e67f47ad9b3656b955 (commit)
via b8693f93ee8aa586af5f39111195506d9a826c8a (commit)
via 783ca69b2f6e1ce1d7e2b2e2774d4d475a12cf10 (commit)
via ecf6f8e63c7da7ad020dd3179481d98b86e676f9 (commit)
via e819c669f474bba418c5897b6cdcf945da25c75e (commit)
via 21ddf9b672ed6dd4254d4df1b1a414cb73306833 (commit)
via dd4fce83fe3168e7cc1ca9ae8ecbea0da2665de2 (commit)
via ef13af84fb6e8649679b06585bec9dead71cfbe5 (commit)
via bf4660cc53039e11f11c3bcf5f8c536a23844f52 (commit)
via beaf855847ba00fe180629b4fad1b93b59ca1f0f (commit)
via 32d6c59d28b39dbe1835f19f3ec0d422091ad5b0 (commit)
via 05c128e2550c2deaaab57f043c2bdac295aa0089 (commit)
via b31642f889d6d3b8a3d4ef7abb2efd46722df577 (commit)
via 1caad5bab2e9d74ab7001ee5efe5c3d15f9fda0d (commit)
via 9a4a9bfbbad489077ed35a20b564ef650417fb84 (commit)
via 7b5ba54f3d71ceaca21b988964df4cf8d29b1f02 (commit)
via fb432fef933e276b674a29a24d3ebb9e5c91abbc (commit)
via 02c58efd7bd80ca0d7656e867c0ea70d39e17169 (commit)
via a3013bbd8d534b856693873e46fa95cefa824756 (commit)
via f452a9e04b0da3e71f86d8bb02370b7f86ec0098 (commit)
via 3665147240b4df0b322629f47ca0cd10ed97082d (commit)
via 6794ac225910c56d93fa3cf464644b633ee35f32 (commit)
via 04537e7c3942664fe61fe9adaeb95b6afcb6e36c (commit)
via cc8303560e95a12790103364240e2581cf3213bb (commit)
via ac4ba826d777262b1f25944a4ceb840469ad0bd0 (commit)
via ab531245e61a6a3f4a36dbebba4bb42f2ee65ae9 (commit)
via e28f851c8b5ec257102e63eac0cfb59ad9b30bd5 (commit)
via d551362cbdb427daec14f065259826c2f51784f5 (commit)
via 7b369d43f432053d03077c1ad30f216d2148b009 (commit)
via 39dd766513a0c51ff8747c2a53a0e0ac0f53f434 (commit)
via 3e208bb64df7c2811bb4d04359c35eb7c0a51ddb (commit)
via 8cc2ea83ca6318421bfa67044f0dc39b1a510cda (commit)
via f4d83d4e5b86f655809f97d278f1f6b5bb488849 (commit)
via ce3f91503e397b70e8470b4b61c074756d541ef2 (commit)
via 7daaf31cb033e044f5b241bc00df7d708cbee53f (commit)
via dab3168796ed7809e717d40c12dabd9b24778168 (commit)
via c09d396bd393a6cbc09f668389b6c9e172a53f7f (commit)
via 8f0af9b08006290e35b117a02212b6881987adef (commit)
via 6301ce94a988b2dee431ebbd791cad49cf6772a2 (commit)
via 0e67e186489081513b1fa141461ff44fb74ac7f1 (commit)
via 48681b60b4ccc6fc39b6fd02baec82eefe300830 (commit)
via c8cf1d87783d4b4c628f219803b78731b8d4ade4 (commit)
via 0948333e6bee32cb3de7e872ebb852bbed06e094 (commit)
via 1220a970be53403d86cbdf0be97bad7d54cdc335 (commit)
via b2ce189680ee17d6019b199c0905cb3f608a71a5 (commit)
via c3ab55dc80882b8a1309fdc198abb1ac8f02437d (commit)
via 1ecf0ad51eac59ffb71352573aa99146da2c0649 (commit)
via 64c06865788ad5c58af3c3d42d857a7ceb9f6ab9 (commit)
via 020c91ca5367e971cbfc493c5b92f65ec72a43e7 (commit)
via 90ac2ecbf8aec6d4f876d161b3844c199527c33e (commit)
via 9b29422bde38980e66c8474546727433ce5c2995 (commit)
via eb6efdf362305c0e3045e7fae78fe3558ed3df6f (commit)
via 65ac842c34f26abbed230c857d8d34d7d7635d36 (commit)
via 7b67dfa45578985d847fb76efca47143941e04cc (commit)
via 50ee20cbc2ddac792faee909ed304efde1ab8455 (commit)
via 37b125c76beef9a32b74fd3f1ea754561772efc1 (commit)
via 6dc0b0a60d08ffb3f9b13a2ae6a9a84242bcecf1 (commit)
via 06a01fee4a24433bd83d3e1752456bc7ace8db1e (commit)
via be4c103d0eeaf41422276796829a2191dc71258d (commit)
via f09c70ad34d98c5f834868c04a72733615cef88a (commit)
via cd472652f51881008020a5a56b1ffc774f813ac3 (commit)
via e72f5324c7bd559373b2827f9f8f225beee992fb (commit)
via 192cbb2e987211e0706c315ef2349ddc5b263d3f (commit)
via c710eb38a88d20f4adc2ee377a0fa170fbca1aca (commit)
via e01d879bd344f89d25568d93531d457e87e80f6f (commit)
via b35abec0dbb6fbbe747e1c66223d92fc921279bb (commit)
via 0cc926cea639f5a4538ec8f1f25437f995484e3b (commit)
via eebd6b0bb6cc1f724d8f78c1c419031004adc3e4 (commit)
via 44df10d424bcd3c74b1d662b40e74b8fdbd031a4 (commit)
via 3c78ee3f2c9274ebfd6b51e1ec203218b792fc9b (commit)
via a45b9dad99ea5e50cdafada1bfbb2bef68467263 (commit)
via 91df9eab8dd6ed2aeaf367575c42fe0979435431 (commit)
via 018c59b52d91dc0ef4ded90d4a76a8b053d078b6 (commit)
via 5fff93ce094807c460ab7a1bf9b7af429143a19d (commit)
via f73efb129c474301d6f70d727452c0c69ce0e309 (commit)
via 144a1d8c4d0265ff3ff6ae740b4e99045645e59d (commit)
via e89d5d15852b9a64e3aaf115b59c87d07092717d (commit)
via aaca222d10a3829e4c982a1b4842b0be11860b7d (commit)
via 25f82fc54a78100098eae5b22719571b6991c955 (commit)
via 28d95ca27265aeaf95f06bcc7b937263f96fd826 (commit)
via 6b806e0dc32f28e7c8a15ef4fbb3a3fa215bb0f3 (commit)
via ce4fec46c1f6821afb5d0ef9c3099cd094153fd9 (commit)
via 7af8b884256bbab5070996d7897216ae77b758fe (commit)
via f73250fc93346412b526c97de3554ddc9186d7c0 (commit)
via 79833e86ea0be9e1f337dd4baff096bce7067b51 (commit)
via bf9380296de8cd62c0a8569c1fc775869b8501ab (commit)
via f83b71e6a9c685227615455df1f9e4fefeff19ae (commit)
via a8e5a8f6853ddc998430d112c22994928ddb4070 (commit)
via 09abf90268a0a5a2daf7c7e0ae37a2d7c35e87c5 (commit)
via 88df2613cb91022233f9ec973f6ef338eb060f17 (commit)
via bc65897481d8ce89a55257b22bf93d05abf74f70 (commit)
via e858d688c3ad3ce0d0b3ea22539cac8e6ec844b7 (commit)
via 93718d4ead55bfbaa8e564c24d1f3b76e60235ce (commit)
via 582065e74e2375b5c81ac8fcec9eb02f541f42ff (commit)
via 5f4f2e0da6e04637b6b4bd7aa6bb4d4d32680525 (commit)
via 92336dd2808af4826371d467588dcb81daafe4cf (commit)
via 7bb62b522a5f89d6d19a4c77254222b1c07ab44b (commit)
via 566492d067083e870548c78a89f8c65b02ecde89 (commit)
via cf6425f16f8ee554815f6697a231e398ddb0546c (commit)
via 6085237938d93c68710db69f70014eca2238492a (commit)
via 03626c586519818ef4de9a2f733ebfd46a0bf6be (commit)
via ea0b2211f1c5d90e1699aa94b3192704fbf6ca91 (commit)
via c070eda5f78f9209ef3c7a0fe6dfc0cff210894b (commit)
via 1d43e53c96246c5625ae619d0667b179ea8bd4b2 (commit)
via 032915e5988d0e1da0562193b8bc925600cdb5f6 (commit)
via da7a72e86db0cf83f7b391d8516f9b7504f4e27a (commit)
via a7f5589f81864c71faf18c3d2c3636320cecb1c6 (commit)
via aab7083f4ab4fa2ddd8d1a41a554cead3a0055bb (commit)
via 66d26268065eaae370b402dc5b006121c6931c5c (commit)
via d6260eeec46915b9d90453cc5add6ac0cac74e52 (commit)
via ef8b7b691d4902153a71087ed0f4297cdd8809ff (commit)
via de19d9847b76c90473c474a831800d383865a4ba (commit)
via 2d63311886330e6acddb55674ff7a7b62d711ef5 (commit)
via d96981e81ecbfc54ac8832d3ed2c32f50eaaf9a1 (commit)
via 07bee0be1f22f8a136982935ee06313e5bbc6f3a (commit)
via 1594671cc63d7d1ac0192acb0a8496e7fec9f4a2 (commit)
via b08633c5740311374f509cef5245f19bd53e55f7 (commit)
via 6147511e8b2d8c5ae0a3fda161f346ba40203569 (commit)
via ab82e67f3ea25b392c90557dfc4cad43750c8d94 (commit)
via 6ec6cf6347efec4bf4268c6db37f287b9de35e30 (commit)
via 442b93274d8f24f31557fe678245f65a2c499f97 (commit)
via a4dd0bade1ca02eb91178834a159c9d26f140c38 (commit)
via 4871852cc509ca998802616fadfbb5619e3324da (commit)
via 48ae68961873bb818a75aa8aa1b93d697fe39517 (commit)
via 85c4f0bd3f18900e484b0e71670fc18c555e75b1 (commit)
via 57962f1b9c3a5a41a7dd6146f9666da18e62ec9c (commit)
via 9a45802c94f58d9dd443c10e6dc204a58fa0f9ce (commit)
via 0293146428ef9c6d8d2b24e0bdd6c781486904a5 (commit)
via a6d9960b81c1c5d4dff0c25b43ac5f9de7e36b8a (commit)
via 7cd13f48c935a88d56fd7d393fea6f02e5b0365a (commit)
via ba2298af4f3912598043938c19bfedc5a8c89567 (commit)
via 84c399d72a287115189bc8e8f272e4d7b9eaec47 (commit)
via 645e5ccf90c00c634c29fbb4276a8875699d8893 (commit)
via be6d2d4f3de94cc314d2367f76432306f4c88b94 (commit)
via 95b2d51738e97067f2e2423a83dd077b34c51b8f (commit)
via ffda91e73c9153d7a7b7d7948de2f902c261d36e (commit)
via 40fb071be7c22776a190d1c7fa32b100510e2b82 (commit)
via 6e95b8923cd013f9db4d7198a2add5cc4cdc9e28 (commit)
via 8cc7373f536b86ca56a080f4a4bb67edd03bded3 (commit)
via 9fcbfb975cdc500bf18117c31f54d2c9f77079c4 (commit)
via 01fc389137187cabd79a9e87319cd6c462cc6015 (commit)
via ab57009c2ddcc6ddeb0c180ce8800ebbf723ac8f (commit)
via a8d5848de4cd79122ebb2a831d465e05b77e52a3 (commit)
via e259ced4849018066194b49f723d2d6d2ec559b1 (commit)
via fa657759a41b23b4fd76c30b8f3ca27d709950d2 (commit)
via 179074e0d0771c82d064e29a20531b75d17289d7 (commit)
via 32e95a4ed19e5cd567d02125c4b74bb6e41ee197 (commit)
via b9995659aabf9a20cae2ae6905b84c94b733636c (commit)
via 9c8ab9126181e5457f5711075b97ca9ec9a20fc8 (commit)
via 9ad380fa0a113b90e26518b7d659213f05264841 (commit)
via b3b97530679ed0fe6f975986270a3fa7d4c59a72 (commit)
via 99117760f8bed0d8351c35a2c037e288d5a9280a (commit)
via a560c609e78716421e782aa388805937d177ef0e (commit)
via 524987a32f9873e59ce265ffba6e831e756a2441 (commit)
via ab966018496e7ebb0d1532d6c5c119b9db7d56fa (commit)
via 65ea1213c75e323c4ff8ee2de48ce6dd84b1f7f2 (commit)
via becb0250ea30f65f3beb02f0094197704f450352 (commit)
via 90e456db5f983f3fff9126dd70f6fea907fed361 (commit)
via e45799924207308fcac2928a64e6ecc3ca102a8c (commit)
via a47f5fbb6ed8122a3453f5f5a3fabf53a98d7fdf (commit)
via 414c4c75b0beb8cd4e4d2abe090921bcf058ec69 (commit)
via 2c494b4a67123c838b4b6915679cca06f9e0bdd2 (commit)
via bbb10c23626657723466a42b94612b554858ce1d (commit)
via 5c4d38e42aa63c3d8b30b243f0b58f2cab04a466 (commit)
via ca7d1dd9372957732fc1dc95d0ffe36cf34c23ba (commit)
via 064cdece468e83bb72ef9ece63e8f0e05856eeb7 (commit)
via 8fede35ce4e41dc8a5de3164be40e2e630cd0812 (commit)
via 2151bf694d870493846e02f5d85fbda189008259 (commit)
via d5a6c1289da50b0923e5db7293d21fabb22ffeb3 (commit)
via a3eae446071b31767ea8b1a27ceb412cd36ab66b (commit)
via 1ed6a4fab0cc48e1d1a8978a36b84c4d5334647c (commit)
via c62004cb48ab1cba876ae46d19adbf14641c8476 (commit)
via 8a0b084a61b07aae811df1c4fd7eab74b52a6d75 (commit)
via b39a4f517176d7f65210056026d7f7842467bb20 (commit)
via 283b4a449cefcdf7a9a781b9b126a35598cc9c65 (commit)
via 701f695013218b1bbaf97212bb00b708ec738819 (commit)
via 2deaffd485fec676e29e379451d8f1ebdde79c54 (commit)
via e2bea00c339c2aae29476b436bcd6ee3b9a51342 (commit)
via ff5dd845b8ea8a3ecafeeca366b0d950d1455a25 (commit)
via d82a651c0029a13c27065d57a68fd471785dc97c (commit)
via d01c316a31f02155f55ea898a35381ff5060bfa9 (commit)
via 0e6bdb3fd61c818aed53827e96263fd14ed6edcc (commit)
via 44dc80798aa4fb92f60e1cd38f2f518b7e11946f (commit)
via 309aab7862f8047e96062853729ec709bade5ed6 (commit)
via 70dc2963eaf9e8dbd528607fdd08ac6204c5c13c (commit)
via 3f58ed15a080a4dd9538d0a62afe8d229342249c (commit)
via 77a27212b563299959fb2a609b86bb9117a8f918 (commit)
via ca7514cf4325838ca04c3a21a972cb963efd07a4 (commit)
via 1e919d30be9ecf9683e30bba3f6109d9356b4638 (commit)
via c4aefb88d31452b3add8cf16f9eef152525c3e93 (commit)
via 52dbfc9fc964ca292a777f11336854e88538f46d (commit)
via 1a24b758857eef4caf2a1801851315b6c93edd76 (commit)
via d1e693d7177d10f382d69b659ab359fddee783b5 (commit)
via 449cd8f2c3a694b219fcbb98d7d9948bce583ca1 (commit)
via 093fb17ce654532dc1e6c379aa13a3dbab9407d6 (commit)
via 5db841fb0b0b3e705c3a10345df3d2c41bc0ef5b (commit)
via 55a303143d64b8052bca36903315970287ee0a23 (commit)
via 213835061241618c9d6f235ab0961489a604df8d (commit)
via 7e369c107095687301e55bcbcf14440d68909c37 (commit)
via 5f6132e546717ee55cf2d9d14d3caa934fa2cd07 (commit)
via 730df10b97aa15a5c617e964dabc7633975c1eca (commit)
via b9bb840b831186a412d234a08ce5c42d3af12c2a (commit)
via 4aa246430e2cc0a22b4ffdd817a4a2cdeb0b4f46 (commit)
via 43e06cc36fd00e4b03adc7a6cb4f2ac87e9e8d23 (commit)
via e9d952943ae96007d93e06593916c5cb796a8c68 (commit)
via 84720ea2e37fb9217839dd572ffdd0fa9058441e (commit)
from 972fef8f7202cc90e14d83a217fa19999fac0489 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 -
.travis.yml | 67 +
CHANGELOG | 299 ++++
Makefile.am | 5 +-
configure.ac | 57 +-
doc/Makefile.am | 6 +-
.../.gitignore | 0
doc/driver-api-guide/Doxyfile | 17 +
doc/{helper-guide => driver-api-guide}/Makefile.am | 3 +-
doc/{helper-guide => driver-api-guide}/odp.dox | 10 +-
doc/m4/configure.m4 | 3 +-
doc/platform-api-guide/Doxyfile | 4 +-
doc/users-guide/users-guide.adoc | 76 +-
example/Makefile.am | 12 +-
example/Makefile.inc | 4 +-
example/generator/odp_generator.c | 3 +-
example/ipsec/odp_ipsec.c | 6 +-
example/ipsec/odp_ipsec_cache.c | 4 +-
example/{hello => l3fwd}/.gitignore | 2 +-
example/l3fwd/Makefile.am | 20 +
example/l3fwd/odp_l3fwd.c | 1138 +++++++++++++
example/l3fwd/odp_l3fwd_db.c | 494 ++++++
example/l3fwd/odp_l3fwd_db.h | 141 ++
example/l3fwd/odp_l3fwd_lpm.c | 224 +++
.../cpu_arch.h => example/l3fwd/odp_l3fwd_lpm.h | 14 +-
example/l3fwd/odp_l3fwd_run.sh | 28 +
example/{l2fwd_simple => l3fwd}/udp64.pcap | Bin
example/m4/configure.m4 | 9 +-
example/timer/odp_timer_simple.c | 4 +-
example/traffic_mgmt/odp_traffic_mgmt.c | 20 +-
helper/Makefile.am | 10 +-
helper/cuckootable.c | 757 +++++++++
helper/include/odp/helper/tcp.h | 4 +-
helper/iplookuptable.c | 937 +++++++++++
helper/linux.c | 1 -
helper/odph_cuckootable.h | 82 +
helper/odph_iplookuptable.h | 58 +
helper/test/.gitignore | 2 +
helper/test/Makefile.am | 8 +-
helper/test/cuckootable.c | 573 +++++++
helper/test/iplookuptable.c | 174 ++
include/odp/api/spec/.gitignore | 1 +
include/odp/api/spec/align.h | 4 +-
include/odp/api/spec/atomic.h | 5 +-
include/odp/api/spec/barrier.h | 6 +-
include/odp/api/spec/buffer.h | 4 +-
include/odp/api/spec/byteorder.h | 11 +-
include/odp/api/spec/classification.h | 14 +-
include/odp/api/spec/compiler.h | 4 +-
include/odp/api/spec/cpu.h | 4 +-
include/odp/api/spec/cpumask.h | 4 +-
include/odp/api/spec/crypto.h | 445 ++++--
include/odp/api/spec/debug.h | 4 +-
include/odp/api/spec/errno.h | 4 +-
include/odp/api/spec/event.h | 6 +-
include/odp/api/spec/hash.h | 4 +-
include/odp/api/spec/hints.h | 4 +-
include/odp/api/spec/init.h | 4 +-
include/odp/api/spec/ipsec.h | 883 ++++++++++
include/odp/api/spec/packet.h | 13 +-
include/odp/api/spec/packet_flags.h | 4 +-
include/odp/api/spec/packet_io.h | 4 +-
include/odp/api/spec/packet_io_stats.h | 4 +-
include/odp/api/spec/pool.h | 27 +-
include/odp/api/spec/queue.h | 13 +-
include/odp/api/spec/random.h | 4 +-
include/odp/api/spec/rwlock.h | 4 +-
include/odp/api/spec/rwlock_recursive.h | 4 +-
include/odp/api/spec/schedule.h | 16 +-
include/odp/api/spec/schedule_types.h | 4 +-
include/odp/api/spec/shared_memory.h | 50 +-
include/odp/api/spec/spinlock.h | 11 +-
include/odp/api/spec/spinlock_recursive.h | 4 +-
include/odp/api/spec/std_clib.h | 4 +-
include/odp/api/spec/std_types.h | 4 +-
include/odp/api/spec/sync.h | 5 +-
include/odp/api/spec/system_info.h | 4 +-
include/odp/api/spec/thread.h | 4 +-
include/odp/api/spec/thrmask.h | 4 +-
include/odp/api/spec/ticketlock.h | 4 +-
include/odp/api/spec/time.h | 4 +-
include/odp/api/spec/timer.h | 9 +-
include/odp/api/spec/traffic_mngr.h | 4 +-
include/odp/api/spec/{version.h => version.h.in} | 10 +-
include/odp/{api => drv}/spec/align.h | 31 +-
include/odp/{api => drv}/spec/atomic.h | 203 +--
include/odp/{api => drv}/spec/barrier.h | 28 +-
include/odp/{api => drv}/spec/byteorder.h | 71 +-
include/odp/drv/spec/shm.h | 231 +++
include/odp/{api => drv}/spec/spinlock.h | 37 +-
include/odp/{api => drv}/spec/sync.h | 47 +-
include/odp_api.h | 1 +
include/odp_drv.h | 7 +
platform/Makefile.inc | 20 +-
platform/linux-generic/.gitignore | 1 +
platform/linux-generic/Makefile.am | 58 +-
platform/linux-generic/_fdserver.c | 673 ++++++++
platform/linux-generic/_ishm.c | 1684 ++++++++++++++++++++
platform/linux-generic/_ishmphy.c | 185 +++
platform/linux-generic/arch/arm/odp/api/cpu_arch.h | 25 +-
platform/linux-generic/arch/arm/odp_cpu_arch.c | 49 +-
.../linux-generic/arch/arm/odp_sysinfo_parse.c | 28 +-
platform/linux-generic/arch/powerpc/odp_cpu_arch.c | 49 +-
.../linux-generic/{odp_atomic.c => drv_atomic.c} | 6 +-
.../linux-generic/{odp_barrier.c => drv_barrier.c} | 26 +-
platform/linux-generic/drv_shm.c | 102 ++
.../{odp_spinlock.c => drv_spinlock.c} | 19 +-
.../linux-generic/include/_fdserver_internal.h | 39 +
platform/linux-generic/include/_ishm_internal.h | 52 +
platform/linux-generic/include/_ishmphy_internal.h | 25 +
platform/linux-generic/include/ishmphy_internal.h | 24 +
platform/linux-generic/include/odp/api/atomic.h | 384 +----
platform/linux-generic/include/odp/api/byteorder.h | 114 +-
.../include/odp/{drv/compiler.h => api/ipsec.h} | 12 +-
.../odp/api/{atomic.h => plat/atomic_inlines.h} | 153 +-
.../include/odp/api/plat/atomic_types.h | 5 +-
.../include/odp/api/plat/barrier_types.h | 1 -
.../api/{byteorder.h => plat/byteorder_inlines.h} | 39 +-
.../include/odp/api/plat/byteorder_types.h | 11 +-
.../include/odp/api/plat/event_types.h | 1 +
.../include/odp/api/plat/ipsec_types.h | 39 +
.../include/odp/api/plat/packet_types.h | 6 +-
.../include/odp/api/plat/pool_types.h | 6 -
.../include/odp/api/plat/static_inline.h.in | 43 +
.../api/{std_clib.h => plat/std_clib_inlines.h} | 12 +-
.../odp/api/{sync.h => plat/sync_inlines.h} | 16 +-
.../odp/api/plat/ticketlock_inlines.h} | 56 +-
platform/linux-generic/include/odp/api/std_clib.h | 18 +-
platform/linux-generic/include/odp/api/sync.h | 18 +-
platform/linux-generic/include/odp/drv/align.h | 58 +
.../include/odp/{api => drv}/atomic.h | 178 ++-
platform/linux-generic/include/odp/drv/barrier.h | 30 +
platform/linux-generic/include/odp/drv/byteorder.h | 146 ++
.../include/odp/{api => drv}/plat/atomic_types.h | 25 +-
.../include/odp/drv/plat/barrier_types.h | 38 +
.../include/odp/drv/plat/byteorder_types.h | 84 +
.../linux-generic/include/odp/drv/plat/shm_types.h | 46 +
.../include/odp/drv/plat/spinlock_types.h | 33 +
.../include/odp/drv/plat/strong_types.h | 35 +
.../include/odp/drv/{compiler.h => shm.h} | 12 +-
.../odp/{api/packet_io_stats.h => drv/spinlock.h} | 10 +-
.../linux-generic/include/odp/{api => drv}/sync.h | 18 +-
.../include/odp/{api => }/visibility_begin.h | 0
.../include/odp/{api => }/visibility_end.h | 0
.../linux-generic/include/odp_align_internal.h | 34 +-
.../linux-generic/include/odp_buffer_inlines.h | 167 +-
.../linux-generic/include/odp_buffer_internal.h | 142 +-
.../include/odp_classification_datamodel.h | 2 +-
.../linux-generic/include/odp_config_internal.h | 75 +-
.../linux-generic/include/odp_crypto_internal.h | 21 +-
platform/linux-generic/include/odp_internal.h | 24 +-
platform/linux-generic/include/odp_packet_dpdk.h | 2 +-
.../linux-generic/include/odp_packet_internal.h | 112 +-
.../linux-generic/include/odp_packet_io_internal.h | 2 +
.../include/odp_packet_io_ipc_internal.h | 27 +-
.../linux-generic/include/odp_packet_io_queue.h | 8 +-
platform/linux-generic/include/odp_pool_internal.h | 305 +---
.../linux-generic/include/odp_queue_internal.h | 48 +-
platform/linux-generic/include/odp_ring_internal.h | 176 ++
platform/linux-generic/include/odp_schedule_if.h | 18 +-
.../linux-generic/include/odp_schedule_internal.h | 51 -
.../include/odp_schedule_ordered_internal.h | 25 -
platform/linux-generic/include/odp_shm_internal.h | 4 +-
.../linux-generic/include/odp_timer_internal.h | 4 -
.../include/odp_traffic_mngr_internal.h | 3 +-
platform/linux-generic/include/protocols/ip.h | 2 +
platform/linux-generic/include/protocols/tcp.h | 4 +-
platform/linux-generic/m4/configure.m4 | 3 +-
platform/linux-generic/odp_atomic.c | 3 +
platform/linux-generic/odp_barrier.c | 2 +-
platform/linux-generic/odp_buffer.c | 22 +-
.../linux-generic/odp_byteorder.c | 10 +-
platform/linux-generic/odp_classification.c | 40 +-
platform/linux-generic/odp_cpumask.c | 73 +-
platform/linux-generic/odp_crypto.c | 503 +++---
platform/linux-generic/odp_init.c | 108 +-
platform/linux-generic/odp_packet.c | 1031 +++++++++---
platform/linux-generic/odp_packet_flags.c | 112 +-
platform/linux-generic/odp_packet_io.c | 25 +-
platform/linux-generic/odp_pkt_queue.c | 12 +-
platform/linux-generic/odp_pool.c | 1488 +++++++----------
platform/linux-generic/odp_queue.c | 307 ++--
platform/linux-generic/odp_schedule.c | 812 ++++++----
platform/linux-generic/odp_schedule_ordered.c | 829 ----------
platform/linux-generic/odp_schedule_sp.c | 48 +-
platform/linux-generic/odp_shared_memory.c | 411 +----
platform/linux-generic/odp_spinlock.c | 4 -
.../linux-generic/odp_std_clib.c | 10 +-
.../linux-generic/odp_sync.c | 5 +-
platform/linux-generic/odp_system_info.c | 181 ++-
platform/linux-generic/odp_ticketlock.c | 68 +-
platform/linux-generic/odp_timer.c | 21 +-
platform/linux-generic/odp_traffic_mngr.c | 73 +-
platform/linux-generic/pktio/dpdk.c | 66 +-
platform/linux-generic/pktio/ipc.c | 553 +++----
platform/linux-generic/pktio/loop.c | 4 +-
platform/linux-generic/pktio/netmap.c | 14 +-
platform/linux-generic/pktio/ring.c | 2 +-
platform/linux-generic/pktio/socket.c | 42 +-
platform/linux-generic/pktio/socket_mmap.c | 10 +-
platform/linux-generic/pktio/tap.c | 17 +-
scripts/Makefile.am | 1 -
scripts/get_impl_str.sh | 11 -
scripts/git_hash.sh | 29 -
test/Makefile.inc | 10 +-
test/common_plat/m4/configure.m4 | 7 +-
test/common_plat/performance/.gitignore | 1 +
test/common_plat/performance/Makefile.am | 5 +
test/common_plat/performance/odp_crypto.c | 56 +-
test/common_plat/performance/odp_l2fwd.c | 6 +-
test/common_plat/performance/odp_l2fwd_run.sh | 4 +-
test/common_plat/performance/odp_pktio_perf.c | 21 +-
test/common_plat/performance/odp_sched_latency.c | 767 +++++++++
.../performance/odp_sched_latency_run.sh | 28 +
test/common_plat/performance/odp_scheduling.c | 10 +-
test/common_plat/performance/odp_scheduling_run.sh | 6 +-
test/common_plat/validation/Makefile.am | 3 +-
test/common_plat/validation/{api => }/Makefile.inc | 0
test/common_plat/validation/api/Makefile.inc | 17 +-
test/common_plat/validation/api/buffer/buffer.c | 113 +-
.../api/classification/odp_classification_basic.c | 4 +-
.../api/classification/odp_classification_common.c | 14 +-
.../classification/odp_classification_test_pmr.c | 3 +
test/common_plat/validation/api/crypto/crypto.c | 26 +-
.../validation/api/crypto/odp_crypto_test_inp.c | 120 +-
test/common_plat/validation/api/packet/packet.c | 152 +-
test/common_plat/validation/api/pktio/pktio.c | 57 +-
test/common_plat/validation/api/queue/queue.c | 10 +-
.../validation/api/scheduler/scheduler.c | 9 +-
test/common_plat/validation/api/shmem/shmem.c | 696 +++++++-
test/common_plat/validation/api/shmem/shmem.h | 5 +-
.../validation/api/traffic_mngr/traffic_mngr.c | 116 +-
.../common_plat/validation/{api => drv}/.gitignore | 0
test/common_plat/validation/drv/Makefile.am | 7 +
test/common_plat/validation/drv/Makefile.inc | 1 +
test/common_plat/validation/{api => drv}/README | 4 +-
.../validation/drv/drvatomic/.gitignore | 1 +
.../validation/drv/drvatomic/Makefile.am | 10 +
.../atomic/atomic.c => drv/drvatomic/drvatomic.c} | 275 ++--
.../validation/drv/drvatomic/drvatomic.h | 35 +
.../validation/drv/drvatomic/drvatomic_main.c} | 4 +-
.../common_plat/validation/drv/drvshmem/.gitignore | 1 +
.../validation/drv/drvshmem/Makefile.am | 10 +
.../common_plat/validation/drv/drvshmem/drvshmem.c | 792 +++++++++
.../common_plat/validation/drv/drvshmem/drvshmem.h | 27 +
.../validation/drv/drvshmem/drvshmem_main.c} | 4 +-
test/linux-generic/Makefile.am | 7 +
test/linux-generic/Makefile.inc | 11 +-
test/linux-generic/m4/configure.m4 | 1 +
test/linux-generic/mmap_vlan_ins/.gitignore | 2 +
test/linux-generic/mmap_vlan_ins/Makefile.am | 15 +
.../linux-generic/mmap_vlan_ins/mmap_vlan_ins.c | 2 +-
test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.sh | 82 +
.../api/pktio => mmap_vlan_ins}/pktio_env | 0
test/linux-generic/mmap_vlan_ins/vlan.pcap | Bin 0 -> 9728 bytes
.../performance/odp_scheduling_run_proc.sh | 6 +-
test/linux-generic/pktio_ipc/ipc_common.c | 41 +-
test/linux-generic/pktio_ipc/ipc_common.h | 15 +-
test/linux-generic/pktio_ipc/pktio_ipc1.c | 57 +-
test/linux-generic/pktio_ipc/pktio_ipc2.c | 59 +-
test/linux-generic/pktio_ipc/pktio_ipc_run.sh | 48 +-
test/linux-generic/validation/api/shmem/.gitignore | 3 +-
.../linux-generic/validation/api/shmem/Makefile.am | 22 +-
.../validation/api/shmem/shmem_linux.c | 220 ++-
.../api/shmem/{shmem_odp.c => shmem_odp1.c} | 10 +-
.../api/shmem/{shmem_odp.h => shmem_odp1.h} | 0
.../validation/api/shmem/shmem_odp2.c | 95 ++
.../api/shmem/{shmem_odp.h => shmem_odp2.h} | 2 +-
268 files changed, 18171 insertions(+), 6444 deletions(-)
create mode 100644 .travis.yml
copy doc/{application-api-guide => driver-api-guide}/.gitignore (100%)
create mode 100644 doc/driver-api-guide/Doxyfile
copy doc/{helper-guide => driver-api-guide}/Makefile.am (58%)
copy doc/{helper-guide => driver-api-guide}/odp.dox (55%)
copy example/{hello => l3fwd}/.gitignore (54%)
create mode 100644 example/l3fwd/Makefile.am
create mode 100644 example/l3fwd/odp_l3fwd.c
create mode 100644 example/l3fwd/odp_l3fwd_db.c
create mode 100644 example/l3fwd/odp_l3fwd_db.h
create mode 100644 example/l3fwd/odp_l3fwd_lpm.c
copy platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h => example/l3fwd/odp_l3fwd_lpm.h (52%)
create mode 100755 example/l3fwd/odp_l3fwd_run.sh
copy example/{l2fwd_simple => l3fwd}/udp64.pcap (100%)
create mode 100644 helper/cuckootable.c
create mode 100644 helper/iplookuptable.c
create mode 100644 helper/odph_cuckootable.h
create mode 100644 helper/odph_iplookuptable.h
create mode 100644 helper/test/cuckootable.c
create mode 100644 helper/test/iplookuptable.c
create mode 100644 include/odp/api/spec/.gitignore
create mode 100644 include/odp/api/spec/ipsec.h
rename include/odp/api/spec/{version.h => version.h.in} (91%)
copy include/odp/{api => drv}/spec/align.h (63%)
copy include/odp/{api => drv}/spec/atomic.h (69%)
copy include/odp/{api => drv}/spec/barrier.h (60%)
copy include/odp/{api => drv}/spec/byteorder.h (65%)
create mode 100644 include/odp/drv/spec/shm.h
copy include/odp/{api => drv}/spec/spinlock.h (60%)
copy include/odp/{api => drv}/spec/sync.h (59%)
create mode 100644 platform/linux-generic/.gitignore
create mode 100644 platform/linux-generic/_fdserver.c
create mode 100644 platform/linux-generic/_ishm.c
create mode 100644 platform/linux-generic/_ishmphy.c
mode change 120000 => 100644 platform/linux-generic/arch/arm/odp/api/cpu_arch.h
mode change 120000 => 100644 platform/linux-generic/arch/arm/odp_cpu_arch.c
mode change 120000 => 100644 platform/linux-generic/arch/arm/odp_sysinfo_parse.c
mode change 120000 => 100644 platform/linux-generic/arch/powerpc/odp_cpu_arch.c
copy platform/linux-generic/{odp_atomic.c => drv_atomic.c} (73%)
copy platform/linux-generic/{odp_barrier.c => drv_barrier.c} (59%)
create mode 100644 platform/linux-generic/drv_shm.c
copy platform/linux-generic/{odp_spinlock.c => drv_spinlock.c} (64%)
create mode 100644 platform/linux-generic/include/_fdserver_internal.h
create mode 100644 platform/linux-generic/include/_ishm_internal.h
create mode 100644 platform/linux-generic/include/_ishmphy_internal.h
create mode 100644 platform/linux-generic/include/ishmphy_internal.h
copy platform/linux-generic/include/odp/{drv/compiler.h => api/ipsec.h} (55%)
copy platform/linux-generic/include/odp/api/{atomic.h => plat/atomic_inlines.h} (58%)
copy platform/linux-generic/include/odp/api/{byteorder.h => plat/byteorder_inlines.h} (69%)
create mode 100644 platform/linux-generic/include/odp/api/plat/ipsec_types.h
create mode 100644 platform/linux-generic/include/odp/api/plat/static_inline.h.in
copy platform/linux-generic/include/odp/api/{std_clib.h => plat/std_clib_inlines.h} (52%)
copy platform/linux-generic/include/odp/api/{sync.h => plat/sync_inlines.h} (58%)
copy platform/linux-generic/{odp_ticketlock.c => include/odp/api/plat/ticketlock_inlines.h} (71%)
create mode 100644 platform/linux-generic/include/odp/drv/align.h
copy platform/linux-generic/include/odp/{api => drv}/atomic.h (54%)
create mode 100644 platform/linux-generic/include/odp/drv/barrier.h
create mode 100644 platform/linux-generic/include/odp/drv/byteorder.h
copy platform/linux-generic/include/odp/{api => drv}/plat/atomic_types.h (76%)
create mode 100644 platform/linux-generic/include/odp/drv/plat/barrier_types.h
create mode 100644 platform/linux-generic/include/odp/drv/plat/byteorder_types.h
create mode 100644 platform/linux-generic/include/odp/drv/plat/shm_types.h
create mode 100644 platform/linux-generic/include/odp/drv/plat/spinlock_types.h
create mode 100644 platform/linux-generic/include/odp/drv/plat/strong_types.h
copy platform/linux-generic/include/odp/drv/{compiler.h => shm.h} (56%)
copy platform/linux-generic/include/odp/{api/packet_io_stats.h => drv/spinlock.h} (57%)
copy platform/linux-generic/include/odp/{api => drv}/sync.h (53%)
rename platform/linux-generic/include/odp/{api => }/visibility_begin.h (100%)
rename platform/linux-generic/include/odp/{api => }/visibility_end.h (100%)
create mode 100644 platform/linux-generic/include/odp_ring_internal.h
delete mode 100644 platform/linux-generic/include/odp_schedule_internal.h
delete mode 100644 platform/linux-generic/include/odp_schedule_ordered_internal.h
copy test/linux-generic/ring/ring_main.c => platform/linux-generic/odp_byteorder.c (52%)
delete mode 100644 platform/linux-generic/odp_schedule_ordered.c
copy test/linux-generic/ring/ring_main.c => platform/linux-generic/odp_std_clib.c (52%)
copy test/linux-generic/validation/api/shmem/shmem_odp.h => platform/linux-generic/odp_sync.c (54%)
delete mode 100644 scripts/Makefile.am
delete mode 100755 scripts/get_impl_str.sh
delete mode 100755 scripts/git_hash.sh
create mode 100644 test/common_plat/performance/odp_sched_latency.c
create mode 100755 test/common_plat/performance/odp_sched_latency_run.sh
copy test/common_plat/validation/{api => }/Makefile.inc (100%)
copy test/common_plat/validation/{api => drv}/.gitignore (100%)
create mode 100644 test/common_plat/validation/drv/Makefile.am
create mode 100644 test/common_plat/validation/drv/Makefile.inc
copy test/common_plat/validation/{api => drv}/README (91%)
create mode 100644 test/common_plat/validation/drv/drvatomic/.gitignore
create mode 100644 test/common_plat/validation/drv/drvatomic/Makefile.am
copy test/common_plat/validation/{api/atomic/atomic.c => drv/drvatomic/drvatomic.c} (68%)
create mode 100644 test/common_plat/validation/drv/drvatomic/drvatomic.h
copy test/{linux-generic/ring/ring_main.c => common_plat/validation/drv/drvatomic/drvatomic_main.c} (70%)
create mode 100644 test/common_plat/validation/drv/drvshmem/.gitignore
create mode 100644 test/common_plat/validation/drv/drvshmem/Makefile.am
create mode 100644 test/common_plat/validation/drv/drvshmem/drvshmem.c
create mode 100644 test/common_plat/validation/drv/drvshmem/drvshmem.h
copy test/{linux-generic/ring/ring_main.c => common_plat/validation/drv/drvshmem/drvshmem_main.c} (70%)
create mode 100644 test/linux-generic/mmap_vlan_ins/.gitignore
create mode 100644 test/linux-generic/mmap_vlan_ins/Makefile.am
copy example/l2fwd_simple/odp_l2fwd_simple.c => test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c (99%)
create mode 100755 test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.sh
copy test/linux-generic/{validation/api/pktio => mmap_vlan_ins}/pktio_env (100%)
create mode 100644 test/linux-generic/mmap_vlan_ins/vlan.pcap
rename test/linux-generic/validation/api/shmem/{shmem_odp.c => shmem_odp1.c} (81%)
copy test/linux-generic/validation/api/shmem/{shmem_odp.h => shmem_odp1.h} (100%)
create mode 100644 test/linux-generic/validation/api/shmem/shmem_odp2.c
rename test/linux-generic/validation/api/shmem/{shmem_odp.h => shmem_odp2.h} (76%)
hooks/post-receive
--
8 years, 2 months
- 1
- 0
[COMMIT] branch monarch_lts updated. v1.11.0.0_monarch-5-g164fc32
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, monarch_lts has been updated
via 164fc322a6bb346d6c1f545ac69501b774cc56c2 (commit)
from 2f85d11d7fde36196c731fa468983deb1b32e681 (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 164fc322a6bb346d6c1f545ac69501b774cc56c2
Author: Nicolas Morey-Chaisemartin <nmorey(a)kalray.eu>
Date: Tue Dec 13 17:55:50 2016 +0100
example: traffic_mgmt: use PRIu32 instead of %u
Signed-off-by: Nicolas Morey-Chaisemartin <nmorey(a)kalray.eu>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/traffic_mgmt/odp_traffic_mgmt.c b/example/traffic_mgmt/odp_traffic_mgmt.c
index ff03542..ab82101 100644
--- a/example/traffic_mgmt/odp_traffic_mgmt.c
+++ b/example/traffic_mgmt/odp_traffic_mgmt.c
@@ -13,6 +13,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <signal.h>
+#include <inttypes.h>
#include <sys/resource.h>
#include <execinfo.h>
#include <odp_api.h>
@@ -265,7 +266,8 @@ static uint32_t create_profile_set(profile_params_set_t *profile_params_set,
if (name_idx == 0)
snprintf(name, sizeof(name), "%s", base_name);
else
- snprintf(name, sizeof(name), "%s-%u", base_name, name_idx);
+ snprintf(name, sizeof(name), "%s-%" PRIu32,
+ base_name, name_idx);
odp_tm_shaper_params_init(&shaper_params);
shaper = &profile_params_set->shaper_params;
@@ -293,7 +295,8 @@ static uint32_t create_profile_set(profile_params_set_t *profile_params_set,
err_cnt++;
for (color = 0; color < ODP_NUM_PACKET_COLORS; color++) {
- snprintf(wred_name, sizeof(wred_name), "%s-%u", name, color);
+ snprintf(wred_name, sizeof(wred_name), "%s-%" PRIu32,
+ name, color);
odp_tm_wred_params_init(&wred_params);
wred = &profile_params_set->wred_params[color];
@@ -404,7 +407,7 @@ static int config_example_user(odp_tm_node_t cos_tm_node,
profile_set->wred_profiles[2];
tm_node_params.level = 2;
- snprintf(user_name, sizeof(user_name), "Subscriber-%u", user_num);
+ snprintf(user_name, sizeof(user_name), "Subscriber-%" PRIu32, user_num);
user_tm_node = odp_tm_node_create(odp_tm_test, user_name,
&tm_node_params);
odp_tm_node_connect(user_tm_node, cos_tm_node);
@@ -482,8 +485,8 @@ static int config_company_node(const char *company_name)
tm_node_params.wred_profile[ODP_PACKET_RED] =
profile_set->wred_profiles[ODP_PACKET_RED];
- snprintf(cos_node_name, sizeof(cos_node_name), "%s-Class-%u",
- company_name, cos_idx);
+ snprintf(cos_node_name, sizeof(cos_node_name),
+ "%s-Class-%" PRIu32, company_name, cos_idx);
cos_tm_node = odp_tm_node_create(odp_tm_test, cos_node_name,
&tm_node_params);
odp_tm_node_connect(cos_tm_node, company_tm_node);
@@ -532,7 +535,7 @@ static int create_and_config_tm(void)
odp_tm_test = odp_tm_create("TM test", &requirements, &egress);
err_cnt = init_profile_sets();
if (err_cnt != 0)
- printf("%s init_profile_sets encountered %u errors\n",
+ printf("%s init_profile_sets encountered %" PRIu32 " errors\n",
__func__, err_cnt);
config_company_node("TestCompany");
@@ -648,7 +651,7 @@ static int traffic_generator(uint32_t pkts_to_send)
odp_atomic_inc_u32(&atomic_pkts_into_tm);
}
- printf("%s odp_tm_enq_errs=%u\n", __func__, odp_tm_enq_errs);
+ printf("%s odp_tm_enq_errs=%" PRIu32 "\n", __func__, odp_tm_enq_errs);
/* Wait until the main traffic mgmt worker thread is idle and has no
* outstanding events (i.e. no timers, empty work queue, etc), but
@@ -790,7 +793,8 @@ int main(int argc, char *argv[])
pkts_into_tm = odp_atomic_load_u32(&atomic_pkts_into_tm);
pkts_from_tm = odp_atomic_load_u32(&atomic_pkts_from_tm);
- printf("pkts_into_tm=%u pkts_from_tm=%u\n", pkts_into_tm, pkts_from_tm);
+ printf("pkts_into_tm=%" PRIu32 " pkts_from_tm=%" PRIu32 "\n",
+ pkts_into_tm, pkts_from_tm);
odp_tm_stats_print(odp_tm_test);
return 0;
-----------------------------------------------------------------------
Summary of changes:
example/traffic_mgmt/odp_traffic_mgmt.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
hooks/post-receive
--
8 years, 2 months
- 1
- 0
[COMMIT] branch api-next updated. v1.12.0.0-172-g983712f
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 983712f43845f8fa7967039d2fd067f9a3ecba20 (commit)
from 7e0461544a5bb9052d84843c5043c68d34b17ba3 (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 983712f43845f8fa7967039d2fd067f9a3ecba20
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Wed Dec 14 22:57:57 2016 +0300
linux-gen: pktio ipc: tests: remove comment about master-slave
Implementation take care which process to name master and which
slave. Comment is useless.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/test/linux-generic/pktio_ipc/pktio_ipc1.c b/test/linux-generic/pktio_ipc/pktio_ipc1.c
index 838b672..705c205 100644
--- a/test/linux-generic/pktio_ipc/pktio_ipc1.c
+++ b/test/linux-generic/pktio_ipc/pktio_ipc1.c
@@ -52,9 +52,6 @@ static int pktio_run_loop(odp_pool_t pool)
start_cycle = odp_time_local();
current_cycle = start_cycle;
- /* slave process should always be run after master process to be
- * able to create the same pktio.
- */
for (;;) {
if (run_time_sec) {
cycle = odp_time_local();
diff --git a/test/linux-generic/pktio_ipc/pktio_ipc2.c b/test/linux-generic/pktio_ipc/pktio_ipc2.c
index fb6f994..daf3841 100644
--- a/test/linux-generic/pktio_ipc/pktio_ipc2.c
+++ b/test/linux-generic/pktio_ipc/pktio_ipc2.c
@@ -49,9 +49,6 @@ static int ipc_second_process(int master_pid)
wait = odp_time_local_from_ns(run_time_sec * ODP_TIME_SEC_IN_NS);
start_cycle = odp_time_local();
- /* slave process should always be run after master process to be
- * able to create the same pktio.
- */
for (;;) {
/* exit loop if time specified */
if (run_time_sec) {
-----------------------------------------------------------------------
Summary of changes:
test/linux-generic/pktio_ipc/pktio_ipc1.c | 3 ---
test/linux-generic/pktio_ipc/pktio_ipc2.c | 3 ---
2 files changed, 6 deletions(-)
hooks/post-receive
--
8 years, 2 months
- 1
- 0
[COMMIT] branch api-next updated. v1.12.0.0-171-g7e04615
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 7e0461544a5bb9052d84843c5043c68d34b17ba3 (commit)
via 6a45b47fdb150658936a8d2f301dc3309d55050d (commit)
via 9214e4aa94f59fb6c0a193ed7083bb90abba682b (commit)
via f5f8d1b315b050520c1743a29f48c6c9e9675487 (commit)
from 03ec3dcd7ed9d55b91d58d6969114e7de71b88fe (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 7e0461544a5bb9052d84843c5043c68d34b17ba3
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Wed Dec 14 22:57:56 2016 +0300
linux-gen: pktio ipc: make it work again
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h
index 2064f7c..903f0a7 100644
--- a/platform/linux-generic/include/odp_buffer_internal.h
+++ b/platform/linux-generic/include/odp_buffer_internal.h
@@ -64,6 +64,11 @@ struct odp_buffer_hdr_t {
struct {
void *hdr;
uint8_t *data;
+#ifdef _ODP_PKTIO_IPC
+ /* ipc mapped process can not walk over pointers,
+ * offset has to be used */
+ uint64_t ipc_data_offset;
+#endif
uint32_t len;
} seg[CONFIG_PACKET_MAX_SEGS];
@@ -94,11 +99,6 @@ struct odp_buffer_hdr_t {
uint32_t uarea_size; /* size of user area */
uint32_t segcount; /* segment count */
uint32_t segsize; /* segment size */
-#ifdef _ODP_PKTIO_IPC
- /* ipc mapped process can not walk over pointers,
- * offset has to be used */
- uint64_t ipc_addr_offset[ODP_CONFIG_PACKET_MAX_SEGS];
-#endif
/* Data or next header */
uint8_t data[0];
diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h
index 6a80d9d..b313b1f 100644
--- a/platform/linux-generic/include/odp_internal.h
+++ b/platform/linux-generic/include/odp_internal.h
@@ -50,7 +50,6 @@ struct odp_global_data_s {
odp_cpumask_t control_cpus;
odp_cpumask_t worker_cpus;
int num_cpus_installed;
- int ipc_ns;
};
enum init_stage {
diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h
index bdf6316..2001c42 100644
--- a/platform/linux-generic/include/odp_packet_io_internal.h
+++ b/platform/linux-generic/include/odp_packet_io_internal.h
@@ -102,6 +102,8 @@ typedef struct {
packet, 0 - not yet ready */
void *pinfo;
odp_shm_t pinfo_shm;
+ odp_shm_t remote_pool_shm; /**< shm of remote pool get with
+ _ipc_map_remote_pool() */
} _ipc_pktio_t;
struct pktio_entry {
diff --git a/platform/linux-generic/include/odp_packet_io_ipc_internal.h b/platform/linux-generic/include/odp_packet_io_ipc_internal.h
index 851114d..7cd2948 100644
--- a/platform/linux-generic/include/odp_packet_io_ipc_internal.h
+++ b/platform/linux-generic/include/odp_packet_io_ipc_internal.h
@@ -26,22 +26,31 @@
*/
struct pktio_info {
struct {
- /* number of buffer in remote pool */
- int shm_pool_bufs_num;
- /* size of remote pool */
- size_t shm_pkt_pool_size;
+ /* number of buffer*/
+ int num;
/* size of packet/segment in remote pool */
- uint32_t shm_pkt_size;
+ uint32_t block_size;
/* offset from shared memory block start
- * to pool_mdata_addr (odp-linux pool specific) */
- size_t mdata_offset;
+ * to pool *base_addr in remote process.
+ * (odp-linux pool specific) */
+ size_t base_addr_offset;
char pool_name[ODP_POOL_NAME_LEN];
+ /* 1 if master finished creation of all shared objects */
+ int init_done;
} master;
struct {
/* offset from shared memory block start
- * to pool_mdata_addr in remote process.
+ * to pool *base_addr in remote process.
* (odp-linux pool specific) */
- size_t mdata_offset;
+ size_t base_addr_offset;
+ void *base_addr;
+ uint32_t block_size;
char pool_name[ODP_POOL_NAME_LEN];
+ /* pid of the slave process written to shm and
+ * used by master to look up memory created by
+ * slave
+ */
+ int pid;
+ int init_done;
} slave;
} ODP_PACKED;
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
index d40a83c..1b0d8f8 100644
--- a/platform/linux-generic/odp_init.c
+++ b/platform/linux-generic/odp_init.c
@@ -67,7 +67,7 @@ static int cleanup_files(const char *dirpath, int odp_pid)
int odp_init_global(odp_instance_t *instance,
const odp_init_t *params,
- const odp_platform_init_t *platform_params)
+ const odp_platform_init_t *platform_params ODP_UNUSED)
{
char *hpdir;
@@ -75,9 +75,6 @@ int odp_init_global(odp_instance_t *instance,
odp_global_data.main_pid = getpid();
cleanup_files(_ODP_TMPDIR, odp_global_data.main_pid);
- if (platform_params)
- odp_global_data.ipc_ns = platform_params->ipc_ns;
-
enum init_stage stage = NO_INIT;
odp_global_data.log_fn = odp_override_log;
odp_global_data.abort_fn = odp_override_abort;
diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c
index 0e99c6e..5f26b56 100644
--- a/platform/linux-generic/pktio/ipc.c
+++ b/platform/linux-generic/pktio/ipc.c
@@ -3,150 +3,85 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifdef _ODP_PKTIO_IPC
#include <odp_packet_io_ipc_internal.h>
#include <odp_debug_internal.h>
#include <odp_packet_io_internal.h>
#include <odp/api/system_info.h>
#include <odp_shm_internal.h>
+#include <_ishm_internal.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <fcntl.h>
+#define IPC_ODP_DEBUG_PRINT 0
+
+#define IPC_ODP_DBG(fmt, ...) \
+ do { \
+ if (IPC_ODP_DEBUG_PRINT == 1) \
+ ODP_DBG(fmt, ##__VA_ARGS__);\
+ } while (0)
+
/* MAC address for the "ipc" interface */
static const char pktio_ipc_mac[] = {0x12, 0x12, 0x12, 0x12, 0x12, 0x12};
-static void *_ipc_map_remote_pool(const char *name, size_t size);
+static odp_shm_t _ipc_map_remote_pool(const char *name, int pid);
static const char *_ipc_odp_buffer_pool_shm_name(odp_pool_t pool_hdl)
{
- pool_entry_t *pool;
- uint32_t pool_id;
+ pool_t *pool;
odp_shm_t shm;
odp_shm_info_t info;
- pool_id = pool_handle_to_index(pool_hdl);
- pool = get_pool_entry(pool_id);
- shm = pool->s.pool_shm;
+ pool = pool_entry_from_hdl(pool_hdl);
+ shm = pool->shm;
odp_shm_info(shm, &info);
return info.name;
}
-/**
-* Look up for shared memory object.
-*
-* @param name name of shm object
-*
-* @return 0 on success, otherwise non-zero
-*/
-static int _ipc_shm_lookup(const char *name)
-{
- int shm;
- char shm_devname[SHM_DEVNAME_MAXLEN];
-
- if (!odp_global_data.ipc_ns)
- ODP_ABORT("ipc_ns not set\n");
-
- snprintf(shm_devname, SHM_DEVNAME_MAXLEN,
- SHM_DEVNAME_FORMAT,
- odp_global_data.ipc_ns, name);
-
- shm = shm_open(shm_devname, O_RDWR, S_IRUSR | S_IWUSR);
- if (shm == -1) {
- if (errno == ENOENT) {
- ODP_DBG("no file %s\n", shm_devname);
- return -1;
- }
- ODP_ABORT("shm_open for %s err %s\n",
- shm_devname, strerror(errno));
- }
- close(shm);
- return 0;
-}
-
-static int _ipc_map_pktio_info(pktio_entry_t *pktio_entry,
- const char *dev,
- int *slave)
-{
- struct pktio_info *pinfo;
- char name[ODP_POOL_NAME_LEN + sizeof("_info")];
- uint32_t flags;
- odp_shm_t shm;
-
- /* Create info about remote pktio */
- snprintf(name, sizeof(name), "%s_info", dev);
-
- flags = ODP_SHM_PROC | _ODP_SHM_O_EXCL;
-
- shm = odp_shm_reserve(name, sizeof(struct pktio_info),
- ODP_CACHE_LINE_SIZE,
- flags);
- if (ODP_SHM_INVALID != shm) {
- pinfo = odp_shm_addr(shm);
- pinfo->master.pool_name[0] = 0;
- *slave = 0;
- } else {
- flags = _ODP_SHM_PROC_NOCREAT | _ODP_SHM_O_EXCL;
- shm = odp_shm_reserve(name, sizeof(struct pktio_info),
- ODP_CACHE_LINE_SIZE,
- flags);
- if (ODP_SHM_INVALID == shm)
- ODP_ABORT("can not connect to shm\n");
-
- pinfo = odp_shm_addr(shm);
- *slave = 1;
- }
-
- pktio_entry->s.ipc.pinfo = pinfo;
- pktio_entry->s.ipc.pinfo_shm = shm;
-
- return 0;
-}
-
static int _ipc_master_start(pktio_entry_t *pktio_entry)
{
struct pktio_info *pinfo = pktio_entry->s.ipc.pinfo;
- int ret;
- void *ipc_pool_base;
+ odp_shm_t shm;
- if (pinfo->slave.mdata_offset == 0)
+ if (pinfo->slave.init_done == 0)
return -1;
- ret = _ipc_shm_lookup(pinfo->slave.pool_name);
- if (ret) {
- ODP_DBG("no pool file %s\n", pinfo->slave.pool_name);
+ shm = _ipc_map_remote_pool(pinfo->slave.pool_name,
+ pinfo->slave.pid);
+ if (shm == ODP_SHM_INVALID) {
+ ODP_DBG("no pool file %s for pid %d\n",
+ pinfo->slave.pool_name, pinfo->slave.pid);
return -1;
}
- ipc_pool_base = _ipc_map_remote_pool(pinfo->slave.pool_name,
- pinfo->master.shm_pkt_pool_size);
- pktio_entry->s.ipc.pool_mdata_base = (char *)ipc_pool_base +
- pinfo->slave.mdata_offset;
+ pktio_entry->s.ipc.remote_pool_shm = shm;
+ pktio_entry->s.ipc.pool_base = odp_shm_addr(shm);
+ pktio_entry->s.ipc.pool_mdata_base = (char *)odp_shm_addr(shm) +
+ pinfo->slave.base_addr_offset;
odp_atomic_store_u32(&pktio_entry->s.ipc.ready, 1);
- ODP_DBG("%s started.\n", pktio_entry->s.name);
+ IPC_ODP_DBG("%s started.\n", pktio_entry->s.name);
return 0;
}
static int _ipc_init_master(pktio_entry_t *pktio_entry,
const char *dev,
- odp_pool_t pool)
+ odp_pool_t pool_hdl)
{
char ipc_shm_name[ODP_POOL_NAME_LEN + sizeof("_m_prod")];
- pool_entry_t *pool_entry;
- uint32_t pool_id;
+ pool_t *pool;
struct pktio_info *pinfo;
const char *pool_name;
- pool_id = pool_handle_to_index(pool);
- pool_entry = get_pool_entry(pool_id);
+ pool = pool_entry_from_hdl(pool_hdl);
+ (void)pool;
if (strlen(dev) > (ODP_POOL_NAME_LEN - sizeof("_m_prod"))) {
- ODP_DBG("too big ipc name\n");
+ ODP_ERR("too big ipc name\n");
return -1;
}
@@ -158,7 +93,7 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry,
PKTIO_IPC_ENTRIES,
_RING_SHM_PROC | _RING_NO_LIST);
if (!pktio_entry->s.ipc.tx.send) {
- ODP_DBG("pid %d unable to create ipc ring %s name\n",
+ ODP_ERR("pid %d unable to create ipc ring %s name\n",
getpid(), ipc_shm_name);
return -1;
}
@@ -174,7 +109,7 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry,
PKTIO_IPC_ENTRIES,
_RING_SHM_PROC | _RING_NO_LIST);
if (!pktio_entry->s.ipc.tx.free) {
- ODP_DBG("pid %d unable to create ipc ring %s name\n",
+ ODP_ERR("pid %d unable to create ipc ring %s name\n",
getpid(), ipc_shm_name);
goto free_m_prod;
}
@@ -187,7 +122,7 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry,
PKTIO_IPC_ENTRIES,
_RING_SHM_PROC | _RING_NO_LIST);
if (!pktio_entry->s.ipc.rx.recv) {
- ODP_DBG("pid %d unable to create ipc ring %s name\n",
+ ODP_ERR("pid %d unable to create ipc ring %s name\n",
getpid(), ipc_shm_name);
goto free_m_cons;
}
@@ -200,7 +135,7 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry,
PKTIO_IPC_ENTRIES,
_RING_SHM_PROC | _RING_NO_LIST);
if (!pktio_entry->s.ipc.rx.free) {
- ODP_DBG("pid %d unable to create ipc ring %s name\n",
+ ODP_ERR("pid %d unable to create ipc ring %s name\n",
getpid(), ipc_shm_name);
goto free_s_prod;
}
@@ -210,24 +145,23 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry,
/* Set up pool name for remote info */
pinfo = pktio_entry->s.ipc.pinfo;
- pool_name = _ipc_odp_buffer_pool_shm_name(pool);
+ pool_name = _ipc_odp_buffer_pool_shm_name(pool_hdl);
if (strlen(pool_name) > ODP_POOL_NAME_LEN) {
- ODP_DBG("pid %d ipc pool name %s is too big %d\n",
+ ODP_ERR("pid %d ipc pool name %s is too big %d\n",
getpid(), pool_name, strlen(pool_name));
goto free_s_prod;
}
memcpy(pinfo->master.pool_name, pool_name, strlen(pool_name));
- pinfo->master.shm_pkt_pool_size = pool_entry->s.pool_size;
- pinfo->master.shm_pool_bufs_num = pool_entry->s.buf_num;
- pinfo->master.shm_pkt_size = pool_entry->s.seg_size;
- pinfo->master.mdata_offset = pool_entry->s.pool_mdata_addr -
- pool_entry->s.pool_base_addr;
- pinfo->slave.mdata_offset = 0;
+ pinfo->slave.base_addr_offset = 0;
+ pinfo->slave.base_addr = 0;
+ pinfo->slave.pid = 0;
+ pinfo->slave.init_done = 0;
- pktio_entry->s.ipc.pool = pool;
+ pktio_entry->s.ipc.pool = pool_hdl;
ODP_DBG("Pre init... DONE.\n");
+ pinfo->master.init_done = 1;
_ipc_master_start(pktio_entry);
@@ -246,55 +180,42 @@ free_m_prod:
}
static void _ipc_export_pool(struct pktio_info *pinfo,
- odp_pool_t pool)
+ odp_pool_t pool_hdl)
{
- pool_entry_t *pool_entry;
-
- pool_entry = odp_pool_to_entry(pool);
- if (pool_entry->s.blk_size != pinfo->master.shm_pkt_size)
- ODP_ABORT("pktio for same name should have the same pool size\n");
- if (pool_entry->s.buf_num != (unsigned)pinfo->master.shm_pool_bufs_num)
- ODP_ABORT("pktio for same name should have the same pool size\n");
+ pool_t *pool = pool_entry_from_hdl(pool_hdl);
snprintf(pinfo->slave.pool_name, ODP_POOL_NAME_LEN, "%s",
- pool_entry->s.name);
- pinfo->slave.mdata_offset = pool_entry->s.pool_mdata_addr -
- pool_entry->s.pool_base_addr;
+ _ipc_odp_buffer_pool_shm_name(pool_hdl));
+ pinfo->slave.pid = odp_global_data.main_pid;
+ pinfo->slave.block_size = pool->block_size;
+ pinfo->slave.base_addr = pool->base_addr;
}
-static void *_ipc_map_remote_pool(const char *name, size_t size)
+static odp_shm_t _ipc_map_remote_pool(const char *name, int pid)
{
odp_shm_t shm;
- void *addr;
-
- ODP_DBG("Mapping remote pool %s, size %ld\n", name, size);
- shm = odp_shm_reserve(name,
- size,
- ODP_CACHE_LINE_SIZE,
- _ODP_SHM_PROC_NOCREAT);
- if (shm == ODP_SHM_INVALID)
- ODP_ABORT("unable map %s\n", name);
-
- addr = odp_shm_addr(shm);
- ODP_DBG("MAP master: %p - %p size %ld, pool %s\n",
- addr, (char *)addr + size, size, name);
- return addr;
+ char rname[ODP_SHM_NAME_LEN];
+
+ snprintf(rname, ODP_SHM_NAME_LEN, "remote-%s", name);
+ shm = odp_shm_import(name, pid, rname);
+ if (shm == ODP_SHM_INVALID) {
+ ODP_ERR("unable map %s\n", name);
+ return ODP_SHM_INVALID;
+ }
+
+ IPC_ODP_DBG("Mapped remote pool %s to local %s\n", name, rname);
+ return shm;
}
-static void *_ipc_shm_map(char *name, size_t size)
+static void *_ipc_shm_map(char *name, int pid)
{
odp_shm_t shm;
- int ret;
- ret = _ipc_shm_lookup(name);
- if (ret == -1)
+ shm = odp_shm_import(name, pid, name);
+ if (ODP_SHM_INVALID == shm) {
+ ODP_ERR("unable to map: %s\n", name);
return NULL;
-
- shm = odp_shm_reserve(name, size,
- ODP_CACHE_LINE_SIZE,
- _ODP_SHM_PROC_NOCREAT);
- if (ODP_SHM_INVALID == shm)
- ODP_ABORT("unable to map: %s\n", name);
+ }
return odp_shm_addr(shm);
}
@@ -313,15 +234,21 @@ static int _ipc_init_slave(const char *dev,
static int _ipc_slave_start(pktio_entry_t *pktio_entry)
{
char ipc_shm_name[ODP_POOL_NAME_LEN + sizeof("_slave_r")];
- size_t ring_size = PKTIO_IPC_ENTRIES * sizeof(void *) +
- sizeof(_ring_t);
struct pktio_info *pinfo;
- void *ipc_pool_base;
odp_shm_t shm;
- const char *dev = pktio_entry->s.name;
+ char tail[ODP_POOL_NAME_LEN];
+ char dev[ODP_POOL_NAME_LEN];
+ int pid;
+
+ if (sscanf(pktio_entry->s.name, "ipc:%d:%s", &pid, tail) != 2) {
+ ODP_ERR("wrong pktio name\n");
+ return -1;
+ }
+
+ sprintf(dev, "ipc:%s", tail);
snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_prod", dev);
- pktio_entry->s.ipc.rx.recv = _ipc_shm_map(ipc_shm_name, ring_size);
+ pktio_entry->s.ipc.rx.recv = _ipc_shm_map(ipc_shm_name, pid);
if (!pktio_entry->s.ipc.rx.recv) {
ODP_DBG("pid %d unable to find ipc ring %s name\n",
getpid(), dev);
@@ -333,9 +260,9 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry)
_ring_free_count(pktio_entry->s.ipc.rx.recv));
snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_cons", dev);
- pktio_entry->s.ipc.rx.free = _ipc_shm_map(ipc_shm_name, ring_size);
+ pktio_entry->s.ipc.rx.free = _ipc_shm_map(ipc_shm_name, pid);
if (!pktio_entry->s.ipc.rx.free) {
- ODP_DBG("pid %d unable to find ipc ring %s name\n",
+ ODP_ERR("pid %d unable to find ipc ring %s name\n",
getpid(), dev);
goto free_m_prod;
}
@@ -344,9 +271,9 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry)
_ring_free_count(pktio_entry->s.ipc.rx.free));
snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_prod", dev);
- pktio_entry->s.ipc.tx.send = _ipc_shm_map(ipc_shm_name, ring_size);
+ pktio_entry->s.ipc.tx.send = _ipc_shm_map(ipc_shm_name, pid);
if (!pktio_entry->s.ipc.tx.send) {
- ODP_DBG("pid %d unable to find ipc ring %s name\n",
+ ODP_ERR("pid %d unable to find ipc ring %s name\n",
getpid(), dev);
goto free_m_cons;
}
@@ -355,9 +282,9 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry)
_ring_free_count(pktio_entry->s.ipc.tx.send));
snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", dev);
- pktio_entry->s.ipc.tx.free = _ipc_shm_map(ipc_shm_name, ring_size);
+ pktio_entry->s.ipc.tx.free = _ipc_shm_map(ipc_shm_name, pid);
if (!pktio_entry->s.ipc.tx.free) {
- ODP_DBG("pid %d unable to find ipc ring %s name\n",
+ ODP_ERR("pid %d unable to find ipc ring %s name\n",
getpid(), dev);
goto free_s_prod;
}
@@ -367,15 +294,17 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry)
/* Get info about remote pool */
pinfo = pktio_entry->s.ipc.pinfo;
- ipc_pool_base = _ipc_map_remote_pool(pinfo->master.pool_name,
- pinfo->master.shm_pkt_pool_size);
- pktio_entry->s.ipc.pool_mdata_base = (char *)ipc_pool_base +
- pinfo->master.mdata_offset;
- pktio_entry->s.ipc.pkt_size = pinfo->master.shm_pkt_size;
+ shm = _ipc_map_remote_pool(pinfo->master.pool_name,
+ pid);
+ pktio_entry->s.ipc.remote_pool_shm = shm;
+ pktio_entry->s.ipc.pool_mdata_base = (char *)odp_shm_addr(shm) +
+ pinfo->master.base_addr_offset;
+ pktio_entry->s.ipc.pkt_size = pinfo->master.block_size;
_ipc_export_pool(pinfo, pktio_entry->s.ipc.pool);
odp_atomic_store_u32(&pktio_entry->s.ipc.ready, 1);
+ pinfo->slave.init_done = 1;
ODP_DBG("%s started.\n", pktio_entry->s.name);
return 0;
@@ -401,7 +330,11 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED,
odp_pool_t pool)
{
int ret = -1;
- int slave;
+ int pid ODP_UNUSED;
+ struct pktio_info *pinfo;
+ char name[ODP_POOL_NAME_LEN + sizeof("_info")];
+ char tail[ODP_POOL_NAME_LEN];
+ odp_shm_t shm;
ODP_STATIC_ASSERT(ODP_POOL_NAME_LEN == _RING_NAMESIZE,
"mismatch pool and ring name arrays");
@@ -411,65 +344,59 @@ static int ipc_pktio_open(odp_pktio_t id ODP_UNUSED,
odp_atomic_init_u32(&pktio_entry->s.ipc.ready, 0);
- _ipc_map_pktio_info(pktio_entry, dev, &slave);
- pktio_entry->s.ipc.type = (slave == 0) ? PKTIO_TYPE_IPC_MASTER :
- PKTIO_TYPE_IPC_SLAVE;
+ /* Shared info about remote pktio */
+ if (sscanf(dev, "ipc:%d:%s", &pid, tail) == 2) {
+ pktio_entry->s.ipc.type = PKTIO_TYPE_IPC_SLAVE;
- if (pktio_entry->s.ipc.type == PKTIO_TYPE_IPC_MASTER) {
+ snprintf(name, sizeof(name), "ipc:%s_info", tail);
+ IPC_ODP_DBG("lookup for name %s for pid %d\n", name, pid);
+ shm = odp_shm_import(name, pid, name);
+ if (ODP_SHM_INVALID == shm)
+ return -1;
+ pinfo = odp_shm_addr(shm);
+
+ if (!pinfo->master.init_done) {
+ odp_shm_free(shm);
+ return -1;
+ }
+ pktio_entry->s.ipc.pinfo = pinfo;
+ pktio_entry->s.ipc.pinfo_shm = shm;
+ ODP_DBG("process %d is slave\n", getpid());
+ ret = _ipc_init_slave(name, pktio_entry, pool);
+ } else {
+ pktio_entry->s.ipc.type = PKTIO_TYPE_IPC_MASTER;
+ snprintf(name, sizeof(name), "%s_info", dev);
+ shm = odp_shm_reserve(name, sizeof(struct pktio_info),
+ ODP_CACHE_LINE_SIZE,
+ _ODP_ISHM_EXPORT | _ODP_ISHM_LOCK);
+ if (ODP_SHM_INVALID == shm) {
+ ODP_ERR("can not create shm %s\n", name);
+ return -1;
+ }
+
+ pinfo = odp_shm_addr(shm);
+ pinfo->master.init_done = 0;
+ pinfo->master.pool_name[0] = 0;
+ pktio_entry->s.ipc.pinfo = pinfo;
+ pktio_entry->s.ipc.pinfo_shm = shm;
ODP_DBG("process %d is master\n", getpid());
ret = _ipc_init_master(pktio_entry, dev, pool);
- } else {
- ODP_DBG("process %d is slave\n", getpid());
- ret = _ipc_init_slave(dev, pktio_entry, pool);
}
return ret;
}
-static inline void *_ipc_buffer_map(odp_buffer_hdr_t *buf,
- uint32_t offset,
- uint32_t *seglen,
- uint32_t limit)
+static void _ipc_free_ring_packets(pktio_entry_t *pktio_entry, _ring_t *r)
{
- int seg_index = offset / buf->segsize;
- int seg_offset = offset % buf->segsize;
-#ifdef _ODP_PKTIO_IPC
- void *addr = (char *)buf - buf->ipc_addr_offset[seg_index];
-#else
- /** buf_hdr.ipc_addr_offset defined only when ipc is
- * enabled. */
- void *addr = NULL;
-
- (void)seg_index;
-#endif
- if (seglen) {
- uint32_t buf_left = limit - offset;
- *seglen = seg_offset + buf_left <= buf->segsize ?
- buf_left : buf->segsize - seg_offset;
- }
-
- return (void *)(seg_offset + (uint8_t *)addr);
-}
-
-static inline void *_ipc_packet_map(odp_packet_hdr_t *pkt_hdr,
- uint32_t offset, uint32_t *seglen)
-{
- if (offset > pkt_hdr->frame_len)
- return NULL;
-
- return _ipc_buffer_map(&pkt_hdr->buf_hdr,
- pkt_hdr->headroom + offset, seglen,
- pkt_hdr->headroom + pkt_hdr->frame_len);
-}
-
-static void _ipc_free_ring_packets(_ring_t *r)
-{
- odp_packet_t r_p_pkts[PKTIO_IPC_ENTRIES];
+ uintptr_t offsets[PKTIO_IPC_ENTRIES];
int ret;
void **rbuf_p;
int i;
- rbuf_p = (void *)&r_p_pkts;
+ if (!r)
+ return;
+
+ rbuf_p = (void *)&offsets;
while (1) {
ret = _ring_mc_dequeue_burst(r, rbuf_p,
@@ -477,8 +404,13 @@ static void _ipc_free_ring_packets(_ring_t *r)
if (0 == ret)
break;
for (i = 0; i < ret; i++) {
- if (r_p_pkts[i] != ODP_PACKET_INVALID)
- odp_packet_free(r_p_pkts[i]);
+ odp_packet_hdr_t *phdr;
+ odp_packet_t pkt;
+ void *mbase = pktio_entry->s.ipc.pool_mdata_base;
+
+ phdr = (void *)((uint8_t *)mbase + offsets[i]);
+ pkt = (odp_packet_t)phdr->buf_hdr.handle.handle;
+ odp_packet_free(pkt);
}
}
}
@@ -490,22 +422,23 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry,
int i;
_ring_t *r;
_ring_t *r_p;
+ uintptr_t offsets[PKTIO_IPC_ENTRIES];
+ void **ipcbufs_p = (void *)&offsets;
+ uint32_t ready;
+ int pkts_ring;
- odp_packet_t remote_pkts[PKTIO_IPC_ENTRIES];
- void **ipcbufs_p = (void *)&remote_pkts;
- uint32_t ready = odp_atomic_load_u32(&pktio_entry->s.ipc.ready);
-
+ ready = odp_atomic_load_u32(&pktio_entry->s.ipc.ready);
if (odp_unlikely(!ready)) {
- ODP_DBG("start pktio is missing before usage?\n");
- return -1;
+ IPC_ODP_DBG("start pktio is missing before usage?\n");
+ return 0;
}
- _ipc_free_ring_packets(pktio_entry->s.ipc.tx.free);
+ _ipc_free_ring_packets(pktio_entry, pktio_entry->s.ipc.tx.free);
r = pktio_entry->s.ipc.rx.recv;
pkts = _ring_mc_dequeue_burst(r, ipcbufs_p, len);
if (odp_unlikely(pkts < 0))
- ODP_ABORT("error to dequeue no packets\n");
+ ODP_ABORT("internal error dequeue\n");
/* fast path */
if (odp_likely(0 == pkts))
@@ -514,36 +447,26 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry,
for (i = 0; i < pkts; i++) {
odp_pool_t pool;
odp_packet_t pkt;
- odp_packet_hdr_t phdr;
- void *ptr;
- odp_buffer_bits_t handle;
- int idx; /* Remote packet has coded pool and index.
- * We need only index.*/
+ odp_packet_hdr_t *phdr;
void *pkt_data;
- void *remote_pkt_data;
+ uint64_t data_pool_off;
+ void *rmt_data_ptr;
- if (remote_pkts[i] == ODP_PACKET_INVALID)
- continue;
+ phdr = (void *)((uint8_t *)pktio_entry->s.ipc.pool_mdata_base +
+ offsets[i]);
- handle.handle = _odp_packet_to_buffer(remote_pkts[i]);
- idx = handle.index;
-
- /* Link to packed data. To this line we have Zero-Copy between
- * processes, to simplify use packet copy in that version which
- * can be removed later with more advance buffer management
- * (ref counters).
- */
- /* reverse odp_buf_to_hdr() */
- ptr = (char *)pktio_entry->s.ipc.pool_mdata_base +
- (idx * ODP_CACHE_LINE_SIZE);
- memcpy(&phdr, ptr, sizeof(odp_packet_hdr_t));
-
- /* Allocate new packet. Select*/
pool = pktio_entry->s.ipc.pool;
if (odp_unlikely(pool == ODP_POOL_INVALID))
ODP_ABORT("invalid pool");
- pkt = odp_packet_alloc(pool, phdr.frame_len);
+#ifdef _ODP_PKTIO_IPC
+ data_pool_off = phdr->buf_hdr.seg[0].ipc_data_offset;
+#else
+ /* compile all function code even if ipc disabled with config */
+ data_pool_off = 0;
+#endif
+
+ pkt = odp_packet_alloc(pool, phdr->frame_len);
if (odp_unlikely(pkt == ODP_PACKET_INVALID)) {
/* Original pool might be smaller then
* PKTIO_IPC_ENTRIES. If packet can not be
@@ -562,30 +485,40 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry,
(PKTIO_TYPE_IPC_SLAVE ==
pktio_entry->s.ipc.type));
- remote_pkt_data = _ipc_packet_map(ptr, 0, NULL);
- if (odp_unlikely(!remote_pkt_data))
- ODP_ABORT("unable to map remote_pkt_data, ipc_slave %d\n",
- (PKTIO_TYPE_IPC_SLAVE ==
- pktio_entry->s.ipc.type));
-
/* Copy packet data from shared pool to local pool. */
- memcpy(pkt_data, remote_pkt_data, phdr.frame_len);
+ rmt_data_ptr = (uint8_t *)pktio_entry->s.ipc.pool_mdata_base +
+ data_pool_off;
+ memcpy(pkt_data, rmt_data_ptr, phdr->frame_len);
/* Copy packets L2, L3 parsed offsets and size */
- copy_packet_cls_metadata(&phdr, odp_packet_hdr(pkt));
+ copy_packet_cls_metadata(phdr, odp_packet_hdr(pkt));
+
+ odp_packet_hdr(pkt)->frame_len = phdr->frame_len;
+ odp_packet_hdr(pkt)->headroom = phdr->headroom;
+ odp_packet_hdr(pkt)->tailroom = phdr->tailroom;
+
+ /* Take classification fields */
+ odp_packet_hdr(pkt)->p = phdr->p;
- odp_packet_hdr(pkt)->frame_len = phdr.frame_len;
- odp_packet_hdr(pkt)->headroom = phdr.headroom;
- odp_packet_hdr(pkt)->tailroom = phdr.tailroom;
- odp_packet_hdr(pkt)->input = pktio_entry->s.handle;
pkt_table[i] = pkt;
}
/* Now tell other process that we no longer need that buffers.*/
r_p = pktio_entry->s.ipc.rx.free;
- pkts = _ring_mp_enqueue_burst(r_p, ipcbufs_p, i);
+
+repeat:
+ pkts_ring = _ring_mp_enqueue_burst(r_p, ipcbufs_p, pkts);
if (odp_unlikely(pkts < 0))
ODP_ABORT("ipc: odp_ring_mp_enqueue_bulk r_p fail\n");
+ if (odp_unlikely(pkts != pkts_ring)) {
+ IPC_ODP_DBG("odp_ring_full: %d, odp_ring_count %d,"
+ " _ring_free_count %d\n",
+ _ring_full(r_p), _ring_count(r_p),
+ _ring_free_count(r_p));
+ ipcbufs_p = (void *)&offsets[pkts_ring - 1];
+ pkts = pkts - pkts_ring;
+ goto repeat;
+ }
return pkts;
}
@@ -614,26 +547,23 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry,
uint32_t ready = odp_atomic_load_u32(&pktio_entry->s.ipc.ready);
odp_packet_t pkt_table_mapped[len]; /**< Ready to send packet has to be
* in memory mapped pool. */
+ uintptr_t offsets[len];
if (odp_unlikely(!ready))
return 0;
- _ipc_free_ring_packets(pktio_entry->s.ipc.tx.free);
+ _ipc_free_ring_packets(pktio_entry, pktio_entry->s.ipc.tx.free);
- /* Prepare packets: calculate offset from address. */
+ /* Copy packets to shm shared pool if they are in different */
for (i = 0; i < len; i++) {
- int j;
odp_packet_t pkt = pkt_table[i];
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ pool_t *ipc_pool = pool_entry_from_hdl(pktio_entry->s.ipc.pool);
odp_buffer_bits_t handle;
- uint32_t cur_mapped_pool_id =
- pool_handle_to_index(pktio_entry->s.ipc.pool);
- uint32_t pool_id;
+ uint32_t pkt_pool_id;
- /* do copy if packet was allocated from not mapped pool */
handle.handle = _odp_packet_to_buffer(pkt);
- pool_id = handle.pool_id;
- if (pool_id != cur_mapped_pool_id) {
+ pkt_pool_id = handle.pool_id;
+ if (pkt_pool_id != ipc_pool->pool_idx) {
odp_packet_t newpkt;
newpkt = odp_packet_copy(pkt, pktio_entry->s.ipc.pool);
@@ -645,24 +575,34 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry,
} else {
pkt_table_mapped[i] = pkt;
}
+ }
+
+ /* Set offset to phdr for outgoing packets */
+ for (i = 0; i < len; i++) {
+ uint64_t data_pool_off;
+ odp_packet_t pkt = pkt_table_mapped[i];
+ odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ odp_pool_t pool_hdl = odp_packet_pool(pkt);
+ pool_t *pool = pool_entry_from_hdl(pool_hdl);
+
+ offsets[i] = (uint8_t *)pkt_hdr -
+ (uint8_t *)odp_shm_addr(pool->shm);
+ data_pool_off = (uint8_t *)pkt_hdr->buf_hdr.seg[0].data -
+ (uint8_t *)odp_shm_addr(pool->shm);
- /* buf_hdr.addr can not be used directly in remote process,
- * convert it to offset
- */
- for (j = 0; j < ODP_BUFFER_MAX_SEG; j++) {
#ifdef _ODP_PKTIO_IPC
- pkt_hdr->buf_hdr.ipc_addr_offset[j] = (char *)pkt_hdr -
- (char *)pkt_hdr->buf_hdr.addr[j];
-#else
- /** buf_hdr.ipc_addr_offset defined only when ipc is
- * enabled. */
- (void)pkt_hdr;
+ /* compile all function code even if ipc disabled with config */
+ pkt_hdr->buf_hdr.seg[0].ipc_data_offset = data_pool_off;
+ IPC_ODP_DBG("%d/%d send packet %llx, pool %llx,"
+ "phdr = %p, offset %x\n",
+ i, len,
+ odp_packet_to_u64(pkt), odp_pool_to_u64(pool_hdl),
+ pkt_hdr, pkt_hdr->buf_hdr.seg[0].ipc_data_offset);
#endif
- }
}
/* Put packets to ring to be processed by other process. */
- rbuf_p = (void *)&pkt_table_mapped[0];
+ rbuf_p = (void *)&offsets[0];
r = pktio_entry->s.ipc.tx.send;
ret = _ring_mp_enqueue_burst(r, rbuf_p, len);
if (odp_unlikely(ret < 0)) {
@@ -673,6 +613,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry,
ODP_ERR("odp_ring_full: %d, odp_ring_count %d, _ring_free_count %d\n",
_ring_full(r), _ring_count(r),
_ring_free_count(r));
+ ODP_ABORT("Unexpected!\n");
}
return ret;
@@ -722,22 +663,25 @@ static int ipc_start(pktio_entry_t *pktio_entry)
static int ipc_stop(pktio_entry_t *pktio_entry)
{
- unsigned tx_send, tx_free;
+ unsigned tx_send = 0, tx_free = 0;
odp_atomic_store_u32(&pktio_entry->s.ipc.ready, 0);
- _ipc_free_ring_packets(pktio_entry->s.ipc.tx.send);
+ if (pktio_entry->s.ipc.tx.send)
+ _ipc_free_ring_packets(pktio_entry, pktio_entry->s.ipc.tx.send);
/* other process can transfer packets from one ring to
* other, use delay here to free that packets. */
sleep(1);
- _ipc_free_ring_packets(pktio_entry->s.ipc.tx.free);
+ if (pktio_entry->s.ipc.tx.free)
+ _ipc_free_ring_packets(pktio_entry, pktio_entry->s.ipc.tx.free);
- tx_send = _ring_count(pktio_entry->s.ipc.tx.send);
- tx_free = _ring_count(pktio_entry->s.ipc.tx.free);
+ if (pktio_entry->s.ipc.tx.send)
+ tx_send = _ring_count(pktio_entry->s.ipc.tx.send);
+ if (pktio_entry->s.ipc.tx.free)
+ tx_free = _ring_count(pktio_entry->s.ipc.tx.free);
if (tx_send | tx_free) {
ODP_DBG("IPC rings: tx send %d tx free %d\n",
- _ring_free_count(pktio_entry->s.ipc.tx.send),
- _ring_free_count(pktio_entry->s.ipc.tx.free));
+ tx_send, tx_free);
}
return 0;
@@ -747,23 +691,31 @@ static int ipc_close(pktio_entry_t *pktio_entry)
{
char ipc_shm_name[ODP_POOL_NAME_LEN + sizeof("_m_prod")];
char *dev = pktio_entry->s.name;
+ char name[ODP_POOL_NAME_LEN];
+ char tail[ODP_POOL_NAME_LEN];
+ int pid = 0;
ipc_stop(pktio_entry);
- if (pktio_entry->s.ipc.type == PKTIO_TYPE_IPC_MASTER) {
- /* unlink this pktio info for both master and slave */
- odp_shm_free(pktio_entry->s.ipc.pinfo_shm);
-
- /* destroy rings */
- snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", dev);
- _ring_destroy(ipc_shm_name);
- snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_prod", dev);
- _ring_destroy(ipc_shm_name);
- snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_cons", dev);
- _ring_destroy(ipc_shm_name);
- snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_prod", dev);
- _ring_destroy(ipc_shm_name);
- }
+ odp_shm_free(pktio_entry->s.ipc.remote_pool_shm);
+
+ if (sscanf(dev, "ipc:%d:%s", &pid, tail) == 2)
+ snprintf(name, sizeof(name), "ipc:%s", tail);
+ else
+ snprintf(name, sizeof(name), "%s", dev);
+
+ /* unlink this pktio info for both master and slave */
+ odp_shm_free(pktio_entry->s.ipc.pinfo_shm);
+
+ /* destroy rings */
+ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_cons", name);
+ _ring_destroy(ipc_shm_name);
+ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_s_prod", name);
+ _ring_destroy(ipc_shm_name);
+ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_cons", name);
+ _ring_destroy(ipc_shm_name);
+ snprintf(ipc_shm_name, sizeof(ipc_shm_name), "%s_m_prod", name);
+ _ring_destroy(ipc_shm_name);
return 0;
}
@@ -795,4 +747,3 @@ const pktio_if_ops_t ipc_pktio_ops = {
.pktin_ts_from_ns = NULL,
.config = NULL
};
-#endif
diff --git a/test/linux-generic/pktio_ipc/pktio_ipc_run.sh b/test/linux-generic/pktio_ipc/pktio_ipc_run.sh
index 3cd28f5..52e8d42 100755
--- a/test/linux-generic/pktio_ipc/pktio_ipc_run.sh
+++ b/test/linux-generic/pktio_ipc/pktio_ipc_run.sh
@@ -25,19 +25,23 @@ run()
rm -rf /tmp/odp-* 2>&1 > /dev/null
echo "==== run pktio_ipc1 then pktio_ipc2 ===="
- pktio_ipc1${EXEEXT} -t 30 &
+ pktio_ipc1${EXEEXT} -t 10 &
IPC_PID=$!
- pktio_ipc2${EXEEXT} -p ${IPC_PID} -t 10
+ pktio_ipc2${EXEEXT} -p ${IPC_PID} -t 5
ret=$?
# pktio_ipc1 should do clean up and exit just
# after pktio_ipc2 exited. If it does not happen
# kill him in test.
- sleep 1
- kill ${IPC_PID} 2>&1 > /dev/null
+ sleep 13
+ (kill ${IPC_PID} 2>&1 > /dev/null ) > /dev/null
if [ $? -eq 0 ]; then
- ls -l /tmp/odp*
+ echo "pktio_ipc1${EXEEXT} was killed"
+ ls -l /tmp/odp* 2> /dev/null
rm -rf /tmp/odp-${IPC_PID}* 2>&1 > /dev/null
+ else
+ echo "normal exit of 2 application"
+ ls -l /tmp/odp* 2> /dev/null
fi
if [ $ret -ne 0 ]; then
@@ -47,21 +51,32 @@ run()
echo "First stage PASSED"
fi
-
echo "==== run pktio_ipc2 then pktio_ipc1 ===="
- pktio_ipc2${EXEEXT} -t 20 &
+ pktio_ipc2${EXEEXT} -t 10 &
IPC_PID=$!
- pktio_ipc1${EXEEXT} -p ${IPC_PID} -t 10
+ pktio_ipc1${EXEEXT} -p ${IPC_PID} -t 5
ret=$?
- (kill ${IPC_PID} 2>&1 > /dev/null) > /dev/null || true
+ # pktio_ipc2 do not exit on pktio_ipc1 disconnect
+ # wait until it exits cleanly
+ sleep 13
+ (kill ${IPC_PID} 2>&1 > /dev/null ) > /dev/null
+ if [ $? -eq 0 ]; then
+ echo "pktio_ipc2${EXEEXT} was killed"
+ ls -l /tmp/odp* 2> /dev/null
+ rm -rf /tmp/odp-${IPC_PID}* 2>&1 > /dev/null
+ else
+ echo "normal exit of 2 application"
+ ls -l /tmp/odp* 2> /dev/null
+ fi
if [ $ret -ne 0 ]; then
echo "!!! FAILED !!!"
- ls -l /tmp/odp*
+ ls -l /tmp/odp* 2> /dev/null
rm -rf /tmp/odp-${IPC_PID}* 2>&1 > /dev/null
exit $ret
else
+ ls -l /tmp/odp* 2> /dev/null
echo "Second stage PASSED"
fi
commit 6a45b47fdb150658936a8d2f301dc3309d55050d
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Wed Dec 14 22:57:55 2016 +0300
linux-gen: pktio ipc: update tests
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/test/linux-generic/pktio_ipc/ipc_common.c b/test/linux-generic/pktio_ipc/ipc_common.c
index 387c921..85cbc8b 100644
--- a/test/linux-generic/pktio_ipc/ipc_common.c
+++ b/test/linux-generic/pktio_ipc/ipc_common.c
@@ -8,7 +8,8 @@
/** Run time in seconds */
int run_time_sec;
-int ipc_name_space;
+/** Pid of the master process */
+int master_pid;
int ipc_odp_packet_send_or_free(odp_pktio_t pktio,
odp_packet_t pkt_tbl[], int num)
@@ -33,6 +34,7 @@ int ipc_odp_packet_send_or_free(odp_pktio_t pktio,
while (sent != num) {
ret = odp_pktout_send(pktout, &pkt_tbl[sent], num - sent);
if (ret < 0) {
+ EXAMPLE_ERR("odp_pktout_send return %d\n", ret);
for (i = sent; i < num; i++)
odp_packet_free(pkt_tbl[i]);
return -1;
@@ -43,6 +45,7 @@ int ipc_odp_packet_send_or_free(odp_pktio_t pktio,
if (odp_time_cmp(end_time, odp_time_local()) < 0) {
for (i = sent; i < num; i++)
odp_packet_free(pkt_tbl[i]);
+ EXAMPLE_ERR("Send Timeout!\n");
return -1;
}
}
@@ -50,17 +53,25 @@ int ipc_odp_packet_send_or_free(odp_pktio_t pktio,
return 0;
}
-odp_pktio_t create_pktio(odp_pool_t pool)
+odp_pktio_t create_pktio(odp_pool_t pool, int master_pid)
{
odp_pktio_param_t pktio_param;
odp_pktio_t ipc_pktio;
+ char name[30];
odp_pktio_param_init(&pktio_param);
- printf("pid: %d, create IPC pktio\n", getpid());
- ipc_pktio = odp_pktio_open("ipc_pktio", pool, &pktio_param);
- if (ipc_pktio == ODP_PKTIO_INVALID)
- EXAMPLE_ABORT("Error: ipc pktio create failed.\n");
+ if (master_pid)
+ sprintf(name, TEST_IPC_PKTIO_PID_NAME, master_pid);
+ else
+ sprintf(name, TEST_IPC_PKTIO_NAME);
+
+ printf("pid: %d, create IPC pktio %s\n", getpid(), name);
+ ipc_pktio = odp_pktio_open(name, pool, &pktio_param);
+ if (ipc_pktio == ODP_PKTIO_INVALID) {
+ EXAMPLE_ERR("Error: ipc pktio %s create failed.\n", name);
+ return ODP_PKTIO_INVALID;
+ }
if (odp_pktin_queue_config(ipc_pktio, NULL)) {
EXAMPLE_ERR("Input queue config failed\n");
@@ -88,16 +99,16 @@ void parse_args(int argc, char *argv[])
int long_index;
static struct option longopts[] = {
{"time", required_argument, NULL, 't'},
- {"ns", required_argument, NULL, 'n'}, /* ipc name space */
+ {"pid", required_argument, NULL, 'p'}, /* master process pid */
{"help", no_argument, NULL, 'h'}, /* return 'h' */
{NULL, 0, NULL, 0}
};
run_time_sec = 0; /* loop forever if time to run is 0 */
- ipc_name_space = 0;
+ master_pid = 0;
while (1) {
- opt = getopt_long(argc, argv, "+t:n:h",
+ opt = getopt_long(argc, argv, "+t:p:h",
longopts, &long_index);
if (opt == -1)
@@ -107,24 +118,18 @@ void parse_args(int argc, char *argv[])
case 't':
run_time_sec = atoi(optarg);
break;
- case 'n':
- ipc_name_space = atoi(optarg);
+ case 'p':
+ master_pid = atoi(optarg);
break;
case 'h':
+ default:
usage(argv[0]);
exit(EXIT_SUCCESS);
break;
- default:
- break;
}
}
optind = 1; /* reset 'extern optind' from the getopt lib */
-
- if (!ipc_name_space) {
- usage(argv[0]);
- exit(1);
- }
}
/**
diff --git a/test/linux-generic/pktio_ipc/ipc_common.h b/test/linux-generic/pktio_ipc/ipc_common.h
index 99276b5..8804994 100644
--- a/test/linux-generic/pktio_ipc/ipc_common.h
+++ b/test/linux-generic/pktio_ipc/ipc_common.h
@@ -30,7 +30,7 @@
/** @def SHM_PKT_POOL_BUF_SIZE
* @brief Buffer size of the packet pool buffer
*/
-#define SHM_PKT_POOL_BUF_SIZE 1856
+#define SHM_PKT_POOL_BUF_SIZE 100
/** @def MAX_PKT_BURST
* @brief Maximum number of packet bursts
@@ -46,6 +46,12 @@
#define TEST_ALLOC_MAGIC 0x1234adcd
+#define TEST_IPC_PKTIO_NAME "ipc:ipktio"
+#define TEST_IPC_PKTIO_PID_NAME "ipc:%d:ipktio"
+
+/** Can be any name, same or not the same. */
+#define TEST_IPC_POOL_NAME "ipc_packet_pool"
+
/** magic number and sequence at start of packet payload */
typedef struct ODP_PACKED {
odp_u32be_t magic;
@@ -63,8 +69,8 @@ char *pktio_name;
/** Run time in seconds */
int run_time_sec;
-/** IPC name space id /dev/shm/odp-nsid-objname */
-int ipc_name_space;
+/** PID of the master process */
+int master_pid;
/* helper funcs */
void parse_args(int argc, char *argv[]);
@@ -75,11 +81,12 @@ void usage(char *progname);
* Create a ipc pktio handle.
*
* @param pool Pool to associate with device for packet RX/TX
+ * @param master_pid Pid of master process
*
* @return The handle of the created pktio object.
* @retval ODP_PKTIO_INVALID if the create fails.
*/
-odp_pktio_t create_pktio(odp_pool_t pool);
+odp_pktio_t create_pktio(odp_pool_t pool, int master_pid);
/** Spin and send all packet from table
*
diff --git a/test/linux-generic/pktio_ipc/pktio_ipc1.c b/test/linux-generic/pktio_ipc/pktio_ipc1.c
index 5c1da23..838b672 100644
--- a/test/linux-generic/pktio_ipc/pktio_ipc1.c
+++ b/test/linux-generic/pktio_ipc/pktio_ipc1.c
@@ -23,9 +23,8 @@
*/
static int pktio_run_loop(odp_pool_t pool)
{
- int thr;
int pkts;
- odp_pktio_t ipc_pktio;
+ odp_pktio_t ipc_pktio = ODP_PKTIO_INVALID;
odp_packet_t pkt_tbl[MAX_PKT_BURST];
uint64_t cnt = 0; /* increasing counter on each send packet */
uint64_t cnt_recv = 0; /* increasing counter to validate
@@ -42,22 +41,41 @@ static int pktio_run_loop(odp_pool_t pool)
odp_time_t wait;
int ret;
odp_pktin_queue_t pktin;
+ char name[30];
- thr = odp_thread_id();
-
- ipc_pktio = odp_pktio_lookup("ipc_pktio");
- if (ipc_pktio == ODP_PKTIO_INVALID) {
- EXAMPLE_ERR(" [%02i] Error: lookup of pktio %s failed\n",
- thr, "ipc_pktio");
- return -2;
- }
- printf(" [%02i] looked up ipc_pktio:%02" PRIu64 ", burst mode\n",
- thr, odp_pktio_to_u64(ipc_pktio));
+ if (master_pid)
+ sprintf(name, TEST_IPC_PKTIO_PID_NAME, master_pid);
+ else
+ sprintf(name, TEST_IPC_PKTIO_NAME);
wait = odp_time_local_from_ns(run_time_sec * ODP_TIME_SEC_IN_NS);
start_cycle = odp_time_local();
current_cycle = start_cycle;
+ /* slave process should always be run after master process to be
+ * able to create the same pktio.
+ */
+ for (;;) {
+ if (run_time_sec) {
+ cycle = odp_time_local();
+ diff = odp_time_diff(cycle, start_cycle);
+ if (odp_time_cmp(wait, diff) < 0) {
+ printf("timeout exit, run_time_sec %d\n",
+ run_time_sec);
+ return -1;
+ }
+ }
+
+ ipc_pktio = create_pktio(pool, master_pid);
+ if (ipc_pktio != ODP_PKTIO_INVALID)
+ break;
+ if (!master_pid)
+ break;
+ }
+
+ if (ipc_pktio == ODP_PKTIO_INVALID)
+ return -1;
+
if (odp_pktin_queue(ipc_pktio, &pktin, 1) != 1) {
EXAMPLE_ERR("no input queue\n");
return -1;
@@ -110,8 +128,12 @@ static int pktio_run_loop(odp_pool_t pool)
size_t off;
off = odp_packet_l4_offset(pkt);
- if (off == ODP_PACKET_OFFSET_INVALID)
- EXAMPLE_ABORT("invalid l4 offset\n");
+ if (off == ODP_PACKET_OFFSET_INVALID) {
+ stat_errors++;
+ stat_free++;
+ odp_packet_free(pkt);
+ EXAMPLE_ERR("invalid l4 offset\n");
+ }
off += ODPH_UDPHDR_LEN;
ret = odp_packet_copy_to_mem(pkt, off,
@@ -279,17 +301,13 @@ int main(int argc, char *argv[])
odp_pool_t pool;
odp_pool_param_t params;
odp_instance_t instance;
- odp_platform_init_t plat_idata;
int ret;
/* Parse and store the application arguments */
parse_args(argc, argv);
- memset(&plat_idata, 0, sizeof(odp_platform_init_t));
- plat_idata.ipc_ns = ipc_name_space;
-
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, &plat_idata)) {
+ if (odp_init_global(&instance, NULL, NULL)) {
EXAMPLE_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
@@ -310,7 +328,7 @@ int main(int argc, char *argv[])
params.pkt.num = SHM_PKT_POOL_SIZE;
params.type = ODP_POOL_PACKET;
- pool = odp_pool_create("packet_pool1", ¶ms);
+ pool = odp_pool_create(TEST_IPC_POOL_NAME, ¶ms);
if (pool == ODP_POOL_INVALID) {
EXAMPLE_ERR("Error: packet pool create failed.\n");
exit(EXIT_FAILURE);
@@ -318,8 +336,6 @@ int main(int argc, char *argv[])
odp_pool_print(pool);
- create_pktio(pool);
-
ret = pktio_run_loop(pool);
if (odp_pool_destroy(pool)) {
diff --git a/test/linux-generic/pktio_ipc/pktio_ipc2.c b/test/linux-generic/pktio_ipc/pktio_ipc2.c
index 5c1f142..fb6f994 100644
--- a/test/linux-generic/pktio_ipc/pktio_ipc2.c
+++ b/test/linux-generic/pktio_ipc/pktio_ipc2.c
@@ -16,9 +16,9 @@
#include "ipc_common.h"
-static int ipc_second_process(void)
+static int ipc_second_process(int master_pid)
{
- odp_pktio_t ipc_pktio;
+ odp_pktio_t ipc_pktio = ODP_PKTIO_INVALID;
odp_pool_param_t params;
odp_pool_t pool;
odp_packet_t pkt_tbl[MAX_PKT_BURST];
@@ -40,18 +40,44 @@ static int ipc_second_process(void)
params.pkt.num = SHM_PKT_POOL_SIZE;
params.type = ODP_POOL_PACKET;
- pool = odp_pool_create("packet_pool2", ¶ms);
+ pool = odp_pool_create(TEST_IPC_POOL_NAME, ¶ms);
if (pool == ODP_POOL_INVALID) {
EXAMPLE_ERR("Error: packet pool create failed.\n");
exit(EXIT_FAILURE);
}
- ipc_pktio = create_pktio(pool);
-
wait = odp_time_local_from_ns(run_time_sec * ODP_TIME_SEC_IN_NS);
start_cycle = odp_time_local();
+ /* slave process should always be run after master process to be
+ * able to create the same pktio.
+ */
+ for (;;) {
+ /* exit loop if time specified */
+ if (run_time_sec) {
+ cycle = odp_time_local();
+ diff = odp_time_diff(cycle, start_cycle);
+ if (odp_time_cmp(wait, diff) < 0) {
+ printf("timeout exit, run_time_sec %d\n",
+ run_time_sec);
+ goto not_started;
+ }
+ }
+
+ ipc_pktio = create_pktio(pool, master_pid);
+ if (ipc_pktio != ODP_PKTIO_INVALID)
+ break;
+ if (!master_pid)
+ break;
+ }
+
+ if (ipc_pktio == ODP_PKTIO_INVALID) {
+ odp_pool_destroy(pool);
+ return -1;
+ }
+
if (odp_pktin_queue(ipc_pktio, &pktin, 1) != 1) {
+ odp_pool_destroy(pool);
EXAMPLE_ERR("no input queue\n");
return -1;
}
@@ -97,8 +123,12 @@ static int ipc_second_process(void)
size_t off;
off = odp_packet_l4_offset(pkt);
- if (off == ODP_PACKET_OFFSET_INVALID)
- EXAMPLE_ABORT("invalid l4 offset\n");
+ if (off == ODP_PACKET_OFFSET_INVALID) {
+ EXAMPLE_ERR("invalid l4 offset\n");
+ for (int j = i; j < pkts; j++)
+ odp_packet_free(pkt_tbl[j]);
+ break;
+ }
off += ODPH_UDPHDR_LEN;
ret = odp_packet_copy_to_mem(pkt, off, sizeof(head),
@@ -106,8 +136,12 @@ static int ipc_second_process(void)
if (ret)
EXAMPLE_ABORT("unable copy out head data");
- if (head.magic != TEST_SEQ_MAGIC)
- EXAMPLE_ABORT("Wrong head magic!");
+ if (head.magic != TEST_SEQ_MAGIC) {
+ EXAMPLE_ERR("Wrong head magic! %x", head.magic);
+ for (int j = i; j < pkts; j++)
+ odp_packet_free(pkt_tbl[j]);
+ break;
+ }
/* Modify magic number in packet */
head.magic = TEST_SEQ_MAGIC_2;
@@ -118,7 +152,7 @@ static int ipc_second_process(void)
}
/* send all packets back */
- ret = ipc_odp_packet_send_or_free(ipc_pktio, pkt_tbl, pkts);
+ ret = ipc_odp_packet_send_or_free(ipc_pktio, pkt_tbl, i);
if (ret < 0)
EXAMPLE_ABORT("can not send packets\n");
@@ -176,16 +210,12 @@ not_started:
int main(int argc, char *argv[])
{
odp_instance_t instance;
- odp_platform_init_t plat_idata;
int ret;
/* Parse and store the application arguments */
parse_args(argc, argv);
- memset(&plat_idata, 0, sizeof(odp_platform_init_t));
- plat_idata.ipc_ns = ipc_name_space;
-
- if (odp_init_global(&instance, NULL, &plat_idata)) {
+ if (odp_init_global(&instance, NULL, NULL)) {
EXAMPLE_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
@@ -196,7 +226,7 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
- ret = ipc_second_process();
+ ret = ipc_second_process(master_pid);
if (odp_term_local()) {
EXAMPLE_ERR("Error: odp_term_local() failed.\n");
diff --git a/test/linux-generic/pktio_ipc/pktio_ipc_run.sh b/test/linux-generic/pktio_ipc/pktio_ipc_run.sh
index bd64baf..3cd28f5 100755
--- a/test/linux-generic/pktio_ipc/pktio_ipc_run.sh
+++ b/test/linux-generic/pktio_ipc/pktio_ipc_run.sh
@@ -20,20 +20,15 @@ PATH=.:$PATH
run()
{
local ret=0
- IPC_NS=`expr $$ + 5000`
- IPC_NS=`expr ${IPC_NS} % 65000`
- IPC_NS=`expr ${IPC_NS} + 2`
- echo "Using ns ${IPC_NS}"
-
#if test was interrupted with CTRL+c than files
#might remain in shm. Needed cleanely delete them.
- rm -rf /dev/shm/odp-${IPC_NS}* 2>&1 > /dev/null
+ rm -rf /tmp/odp-* 2>&1 > /dev/null
echo "==== run pktio_ipc1 then pktio_ipc2 ===="
- pktio_ipc1${EXEEXT} -n ${IPC_NS} -t 30 &
+ pktio_ipc1${EXEEXT} -t 30 &
IPC_PID=$!
- pktio_ipc2${EXEEXT} -n ${IPC_NS} -t 10
+ pktio_ipc2${EXEEXT} -p ${IPC_PID} -t 10
ret=$?
# pktio_ipc1 should do clean up and exit just
# after pktio_ipc2 exited. If it does not happen
@@ -41,12 +36,12 @@ run()
sleep 1
kill ${IPC_PID} 2>&1 > /dev/null
if [ $? -eq 0 ]; then
- rm -rf /dev/shm/odp-${IPC_NS}* 2>&1 > /dev/null
+ ls -l /tmp/odp*
+ rm -rf /tmp/odp-${IPC_PID}* 2>&1 > /dev/null
fi
if [ $ret -ne 0 ]; then
echo "!!!First stage FAILED $ret!!!"
- ls -l /dev/shm/
exit $ret
else
echo "First stage PASSED"
@@ -54,19 +49,17 @@ run()
echo "==== run pktio_ipc2 then pktio_ipc1 ===="
- IPC_NS=`expr $IPC_NS - 1`
- echo "Using ns ${IPC_NS}"
-
- pktio_ipc2${EXEEXT} -n ${IPC_NS} -t 10 &
+ pktio_ipc2${EXEEXT} -t 20 &
IPC_PID=$!
- pktio_ipc1${EXEEXT} -n ${IPC_NS} -t 20
+ pktio_ipc1${EXEEXT} -p ${IPC_PID} -t 10
ret=$?
(kill ${IPC_PID} 2>&1 > /dev/null) > /dev/null || true
if [ $ret -ne 0 ]; then
echo "!!! FAILED !!!"
- ls -l /dev/shm/
+ ls -l /tmp/odp*
+ rm -rf /tmp/odp-${IPC_PID}* 2>&1 > /dev/null
exit $ret
else
echo "Second stage PASSED"
commit 9214e4aa94f59fb6c0a193ed7083bb90abba682b
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Wed Dec 14 22:57:54 2016 +0300
linux-gen: pktio ipc: more accurate settings of pool flags
Make code more accurate and nice view, no functional changes.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
index 4be3827..cae2759 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -497,14 +497,17 @@ static int check_params(odp_pool_param_t *params)
odp_pool_t odp_pool_create(const char *name, odp_pool_param_t *params)
{
+ uint32_t shm_flags = 0;
+
+ if (check_params(params))
+ return ODP_POOL_INVALID;
+
#ifdef _ODP_PKTIO_IPC
if (params && (params->type == ODP_POOL_PACKET))
- return pool_create(name, params, ODP_SHM_PROC);
+ shm_flags = ODP_SHM_PROC;
#endif
- if (check_params(params))
- return ODP_POOL_INVALID;
- return pool_create(name, params, 0);
+ return pool_create(name, params, shm_flags);
}
int odp_pool_destroy(odp_pool_t pool_hdl)
commit f5f8d1b315b050520c1743a29f48c6c9e9675487
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Wed Dec 14 22:57:53 2016 +0300
linux-gen: pktio ipc: ring changes
Make rings visible by other processes.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/platform/linux-generic/pktio/ring.c b/platform/linux-generic/pktio/ring.c
index cc84e8a..aeda04b 100644
--- a/platform/linux-generic/pktio/ring.c
+++ b/platform/linux-generic/pktio/ring.c
@@ -160,7 +160,7 @@ _ring_create(const char *name, unsigned count, unsigned flags)
odp_shm_t shm;
if (flags & _RING_SHM_PROC)
- shm_flag = ODP_SHM_PROC;
+ shm_flag = ODP_SHM_PROC | ODP_SHM_EXPORT;
else
shm_flag = 0;
-----------------------------------------------------------------------
Summary of changes:
.../linux-generic/include/odp_buffer_internal.h | 10 +-
platform/linux-generic/include/odp_internal.h | 1 -
.../linux-generic/include/odp_packet_io_internal.h | 2 +
.../include/odp_packet_io_ipc_internal.h | 27 +-
platform/linux-generic/odp_init.c | 5 +-
platform/linux-generic/odp_pool.c | 11 +-
platform/linux-generic/pktio/ipc.c | 545 ++++++++++-----------
platform/linux-generic/pktio/ring.c | 2 +-
test/linux-generic/pktio_ipc/ipc_common.c | 41 +-
test/linux-generic/pktio_ipc/ipc_common.h | 15 +-
test/linux-generic/pktio_ipc/pktio_ipc1.c | 60 ++-
test/linux-generic/pktio_ipc/pktio_ipc2.c | 62 ++-
test/linux-generic/pktio_ipc/pktio_ipc_run.sh | 48 +-
13 files changed, 428 insertions(+), 401 deletions(-)
hooks/post-receive
--
8 years, 2 months
- 1
- 0
[COMMIT] branch api-next updated. v1.12.0.0-167-g03ec3dc
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 03ec3dcd7ed9d55b91d58d6969114e7de71b88fe (commit)
via e454f36a4a7c70dafd87eab03b3ba740dc10860a (commit)
via 27a05a1d61f3b7e4d58ac0e89db43db069dcc9a3 (commit)
from 362035d60fda8a566636aa5ba58250a8fae9169b (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 03ec3dcd7ed9d55b91d58d6969114e7de71b88fe
Merge: 362035d e454f36
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Thu Dec 15 22:28:01 2016 +0300
Merge branch 'master' into api-next
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 1 -
example/traffic_mgmt/odp_traffic_mgmt.c | 20 ++++++++++++--------
2 files changed, 12 insertions(+), 9 deletions(-)
hooks/post-receive
--
8 years, 2 months
- 1
- 0
[COMMIT] branch master updated. v1.12.0.0-12-ge454f36
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 e454f36a4a7c70dafd87eab03b3ba740dc10860a (commit)
from 27a05a1d61f3b7e4d58ac0e89db43db069dcc9a3 (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 e454f36a4a7c70dafd87eab03b3ba740dc10860a
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Tue Dec 13 16:34:31 2016 +0300
configure.ac: do not disable shared lib for non abi mode
After discussion on mailing list there is case to support
shared library for non abi compatibility mode.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/configure.ac b/configure.ac
index 20ec479..54d62f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -253,7 +253,6 @@ AC_ARG_ENABLE([abi-compat],
[if test "x$enableval" = "xno"; then
ODP_ABI_COMPAT=0
abi_compat=no
- enable_shared=no
#if there is no ABI compatibility the .so numbers are meaningless
ODP_LIBSO_VERSION=0:0:0
fi])
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 1 -
1 file changed, 1 deletion(-)
hooks/post-receive
--
8 years, 2 months
- 1
- 0
[COMMIT] branch master updated. v1.12.0.0-11-g27a05a1
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 27a05a1d61f3b7e4d58ac0e89db43db069dcc9a3 (commit)
from 9c0fc2112137a07b5265646338a4034662d299b3 (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 27a05a1d61f3b7e4d58ac0e89db43db069dcc9a3
Author: Nicolas Morey-Chaisemartin <nmorey(a)kalray.eu>
Date: Tue Dec 13 17:55:50 2016 +0100
example: traffic_mgmt: use PRIu32 instead of %u
Signed-off-by: Nicolas Morey-Chaisemartin <nmorey(a)kalray.eu>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/traffic_mgmt/odp_traffic_mgmt.c b/example/traffic_mgmt/odp_traffic_mgmt.c
index c4f5356..c83b615 100644
--- a/example/traffic_mgmt/odp_traffic_mgmt.c
+++ b/example/traffic_mgmt/odp_traffic_mgmt.c
@@ -10,6 +10,7 @@
#include <unistd.h>
#include <signal.h>
+#include <inttypes.h>
#include <sys/resource.h>
#include <execinfo.h>
#include <odp_api.h>
@@ -261,7 +262,8 @@ static uint32_t create_profile_set(profile_params_set_t *profile_params_set,
if (name_idx == 0)
snprintf(name, sizeof(name), "%s", base_name);
else
- snprintf(name, sizeof(name), "%s-%u", base_name, name_idx);
+ snprintf(name, sizeof(name), "%s-%" PRIu32,
+ base_name, name_idx);
odp_tm_shaper_params_init(&shaper_params);
shaper = &profile_params_set->shaper_params;
@@ -289,7 +291,8 @@ static uint32_t create_profile_set(profile_params_set_t *profile_params_set,
err_cnt++;
for (color = 0; color < ODP_NUM_PACKET_COLORS; color++) {
- snprintf(wred_name, sizeof(wred_name), "%s-%u", name, color);
+ snprintf(wred_name, sizeof(wred_name), "%s-%" PRIu32,
+ name, color);
odp_tm_wred_params_init(&wred_params);
wred = &profile_params_set->wred_params[color];
@@ -400,7 +403,7 @@ static int config_example_user(odp_tm_node_t cos_tm_node,
profile_set->wred_profiles[2];
tm_node_params.level = 2;
- snprintf(user_name, sizeof(user_name), "Subscriber-%u", user_num);
+ snprintf(user_name, sizeof(user_name), "Subscriber-%" PRIu32, user_num);
user_tm_node = odp_tm_node_create(odp_tm_test, user_name,
&tm_node_params);
odp_tm_node_connect(user_tm_node, cos_tm_node);
@@ -478,8 +481,8 @@ static int config_company_node(const char *company_name)
tm_node_params.wred_profile[ODP_PACKET_RED] =
profile_set->wred_profiles[ODP_PACKET_RED];
- snprintf(cos_node_name, sizeof(cos_node_name), "%s-Class-%u",
- company_name, cos_idx);
+ snprintf(cos_node_name, sizeof(cos_node_name),
+ "%s-Class-%" PRIu32, company_name, cos_idx);
cos_tm_node = odp_tm_node_create(odp_tm_test, cos_node_name,
&tm_node_params);
odp_tm_node_connect(cos_tm_node, company_tm_node);
@@ -528,7 +531,7 @@ static int create_and_config_tm(void)
odp_tm_test = odp_tm_create("TM test", &requirements, &egress);
err_cnt = init_profile_sets();
if (err_cnt != 0)
- printf("%s init_profile_sets encountered %u errors\n",
+ printf("%s init_profile_sets encountered %" PRIu32 " errors\n",
__func__, err_cnt);
config_company_node("TestCompany");
@@ -644,7 +647,7 @@ static int traffic_generator(uint32_t pkts_to_send)
odp_atomic_inc_u32(&atomic_pkts_into_tm);
}
- printf("%s odp_tm_enq_errs=%u\n", __func__, odp_tm_enq_errs);
+ printf("%s odp_tm_enq_errs=%" PRIu32 "\n", __func__, odp_tm_enq_errs);
/* Wait until the main traffic mgmt worker thread is idle and has no
* outstanding events (i.e. no timers, empty work queue, etc), but
@@ -786,7 +789,8 @@ int main(int argc, char *argv[])
pkts_into_tm = odp_atomic_load_u32(&atomic_pkts_into_tm);
pkts_from_tm = odp_atomic_load_u32(&atomic_pkts_from_tm);
- printf("pkts_into_tm=%u pkts_from_tm=%u\n", pkts_into_tm, pkts_from_tm);
+ printf("pkts_into_tm=%" PRIu32 " pkts_from_tm=%" PRIu32 "\n",
+ pkts_into_tm, pkts_from_tm);
odp_tm_stats_print(odp_tm_test);
return 0;
-----------------------------------------------------------------------
Summary of changes:
example/traffic_mgmt/odp_traffic_mgmt.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
hooks/post-receive
--
8 years, 2 months
- 1
- 0
[COMMIT] branch api-next updated. v1.12.0.0-164-g362035d
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 362035d60fda8a566636aa5ba58250a8fae9169b (commit)
via eba96af88d36a5cf132c15e0adafb19f92706510 (commit)
via c628e7cbed766a5467fb1ee1fc3113b42e738d08 (commit)
via f1a8dab157c3288d93287a8d6a49f50c84d10342 (commit)
via a05fb250afe4bf6c82d39f28239b08fb7e405b96 (commit)
via c52864e0956c3f57a059af8c90f7ff2b8fb10e6c (commit)
via 9f084f0c90509a354452ef75325c507224c7cd93 (commit)
via b6de862e041b500ade8a94917429f196173d5d90 (commit)
via 87b505031e709ac218eece691bb2e98b2987702a (commit)
via 8acf38df013c6d89e5a2dc3f84fb928e97d27752 (commit)
from dd23be24475a4b96a3f33ea91224fd0fe2c0f083 (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 362035d60fda8a566636aa5ba58250a8fae9169b
Author: Petri Savolainen <petri.savolainen(a)nokia.com>
Date: Thu Dec 8 16:28:53 2016 +0200
example: ipsec: use op_param_t instead of op_params_t
Type name odp_crypto_op_params_t is deprecated.
Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Nikhil Agarwal <nikhil.agarwal(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c
index 6a9a9fe..c51922a 100644
--- a/example/ipsec/odp_ipsec.c
+++ b/example/ipsec/odp_ipsec.c
@@ -148,7 +148,7 @@ typedef struct {
uint32_t dst_ip; /**< SA dest IP address */
/* Output only */
- odp_crypto_op_params_t params; /**< Parameters for crypto call */
+ odp_crypto_op_param_t params; /**< Parameters for crypto call */
uint32_t *ah_seq; /**< AH sequence number location */
uint32_t *esp_seq; /**< ESP sequence number location */
uint16_t *tun_hdr_id; /**< Tunnel header ID > */
@@ -644,7 +644,7 @@ pkt_disposition_e do_ipsec_in_classify(odp_packet_t pkt,
odph_ahhdr_t *ah = NULL;
odph_esphdr_t *esp = NULL;
ipsec_cache_entry_t *entry;
- odp_crypto_op_params_t params;
+ odp_crypto_op_param_t params;
odp_bool_t posted = 0;
/* Default to skip IPsec */
@@ -823,7 +823,7 @@ pkt_disposition_e do_ipsec_out_classify(odp_packet_t pkt,
uint16_t ip_data_len = ipv4_data_len(ip);
uint8_t *ip_data = ipv4_data_p(ip);
ipsec_cache_entry_t *entry;
- odp_crypto_op_params_t params;
+ odp_crypto_op_param_t params;
int hdr_len = 0;
int trl_len = 0;
odph_ahhdr_t *ah = NULL;
commit eba96af88d36a5cf132c15e0adafb19f92706510
Author: Petri Savolainen <petri.savolainen(a)nokia.com>
Date: Thu Dec 8 16:05:30 2016 +0200
validation: crypto: use algorithm capability
Use new algorithm enumerations and capability functions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Nikhil Agarwal <nikhil.agarwal(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
index 55fc6aa..de9d6e4 100644
--- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
@@ -11,6 +11,8 @@
#include "odp_crypto_test_inp.h"
#include "crypto.h"
+#define MAX_ALG_CAPA 32
+
struct suite_context_s {
odp_crypto_op_mode_t pref_mode;
odp_pool_t pool;
@@ -42,8 +44,7 @@ static void alg_test(odp_crypto_op_t op,
const uint8_t *ciphertext,
unsigned int ciphertext_len,
const uint8_t *digest,
- unsigned int digest_len
- )
+ uint32_t digest_len)
{
odp_crypto_session_t session;
odp_crypto_capability_t capability;
@@ -57,6 +58,10 @@ static void alg_test(odp_crypto_op_t op,
odp_crypto_op_param_t op_params;
uint8_t *data_addr;
int data_off;
+ odp_crypto_cipher_capability_t cipher_capa[MAX_ALG_CAPA];
+ odp_crypto_auth_capability_t auth_capa[MAX_ALG_CAPA];
+ int num, i;
+ int found;
rc = odp_crypto_capability(&capability);
CU_ASSERT(!rc);
@@ -65,36 +70,36 @@ static void alg_test(odp_crypto_op_t op,
if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC &&
!(capability.hw_ciphers.bit.trides_cbc))
rc = -1;
- if (cipher_alg == ODP_CIPHER_ALG_AES128_CBC &&
- !(capability.hw_ciphers.bit.aes128_cbc))
+ if (cipher_alg == ODP_CIPHER_ALG_AES_CBC &&
+ !(capability.hw_ciphers.bit.aes_cbc))
rc = -1;
- if (cipher_alg == ODP_CIPHER_ALG_AES128_GCM &&
- !(capability.hw_ciphers.bit.aes128_gcm))
+ if (cipher_alg == ODP_CIPHER_ALG_AES_GCM &&
+ !(capability.hw_ciphers.bit.aes_gcm))
rc = -1;
} else {
if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC &&
!(capability.ciphers.bit.trides_cbc))
rc = -1;
- if (cipher_alg == ODP_CIPHER_ALG_AES128_CBC &&
- !(capability.ciphers.bit.aes128_cbc))
+ if (cipher_alg == ODP_CIPHER_ALG_AES_CBC &&
+ !(capability.ciphers.bit.aes_cbc))
rc = -1;
- if (cipher_alg == ODP_CIPHER_ALG_AES128_GCM &&
- !(capability.ciphers.bit.aes128_gcm))
+ if (cipher_alg == ODP_CIPHER_ALG_AES_GCM &&
+ !(capability.ciphers.bit.aes_gcm))
rc = -1;
}
CU_ASSERT(!rc);
if (capability.hw_auths.all_bits) {
- if (auth_alg == ODP_AUTH_ALG_AES128_GCM &&
- !(capability.hw_auths.bit.aes128_gcm))
+ if (auth_alg == ODP_AUTH_ALG_AES_GCM &&
+ !(capability.hw_auths.bit.aes_gcm))
rc = -1;
if (auth_alg == ODP_AUTH_ALG_NULL &&
!(capability.hw_auths.bit.null))
rc = -1;
} else {
- if (auth_alg == ODP_AUTH_ALG_AES128_GCM &&
- !(capability.auths.bit.aes128_gcm))
+ if (auth_alg == ODP_AUTH_ALG_AES_GCM &&
+ !(capability.auths.bit.aes_gcm))
rc = -1;
if (auth_alg == ODP_AUTH_ALG_NULL &&
!(capability.auths.bit.null))
@@ -103,6 +108,59 @@ static void alg_test(odp_crypto_op_t op,
CU_ASSERT(!rc);
+ num = odp_crypto_cipher_capability(cipher_alg, cipher_capa,
+ MAX_ALG_CAPA);
+
+ if (cipher_alg != ODP_CIPHER_ALG_NULL) {
+ CU_ASSERT(num > 0);
+ found = 0;
+ } else {
+ CU_ASSERT(num == 0);
+ found = 1;
+ }
+
+ CU_ASSERT(num <= MAX_ALG_CAPA);
+
+ if (num > MAX_ALG_CAPA)
+ num = MAX_ALG_CAPA;
+
+ /* Search for the test case */
+ for (i = 0; i < num; i++) {
+ if (cipher_capa[i].key_len == cipher_key.length &&
+ cipher_capa[i].iv_len == ses_iv.length) {
+ found = 1;
+ break;
+ }
+ }
+
+ CU_ASSERT(found);
+
+ num = odp_crypto_auth_capability(auth_alg, auth_capa, MAX_ALG_CAPA);
+
+ if (auth_alg != ODP_AUTH_ALG_NULL) {
+ CU_ASSERT(num > 0);
+ found = 0;
+ } else {
+ CU_ASSERT(num == 0);
+ found = 1;
+ }
+
+ CU_ASSERT(num <= MAX_ALG_CAPA);
+
+ if (num > MAX_ALG_CAPA)
+ num = MAX_ALG_CAPA;
+
+ /* Search for the test case */
+ for (i = 0; i < num; i++) {
+ if (auth_capa[i].digest_len == digest_len &&
+ auth_capa[i].key_len == auth_key.length) {
+ found = 1;
+ break;
+ }
+ }
+
+ CU_ASSERT(found);
+
/* Create a crypto session */
odp_crypto_session_param_init(&ses_params);
ses_params.op = op;
@@ -345,11 +403,11 @@ void crypto_test_enc_alg_aes128_gcm(void)
iv.length = sizeof(aes128_gcm_reference_iv[i]);
alg_test(ODP_CRYPTO_OP_ENCODE,
- ODP_CIPHER_ALG_AES128_GCM,
+ ODP_CIPHER_ALG_AES_GCM,
iv,
NULL,
cipher_key,
- ODP_AUTH_ALG_AES128_GCM,
+ ODP_AUTH_ALG_AES_GCM,
auth_key,
&aes128_gcm_cipher_range[i],
&aes128_gcm_auth_range[i],
@@ -381,11 +439,11 @@ void crypto_test_enc_alg_aes128_gcm_ovr_iv(void)
cipher_key.length = sizeof(aes128_gcm_reference_key[i]);
alg_test(ODP_CRYPTO_OP_ENCODE,
- ODP_CIPHER_ALG_AES128_GCM,
+ ODP_CIPHER_ALG_AES_GCM,
iv,
aes128_gcm_reference_iv[i],
cipher_key,
- ODP_AUTH_ALG_AES128_GCM,
+ ODP_AUTH_ALG_AES_GCM,
auth_key,
&aes128_gcm_cipher_range[i],
&aes128_gcm_auth_range[i],
@@ -420,11 +478,11 @@ void crypto_test_dec_alg_aes128_gcm(void)
iv.length = sizeof(aes128_gcm_reference_iv[i]);
alg_test(ODP_CRYPTO_OP_DECODE,
- ODP_CIPHER_ALG_AES128_GCM,
+ ODP_CIPHER_ALG_AES_GCM,
iv,
NULL,
cipher_key,
- ODP_AUTH_ALG_AES128_GCM,
+ ODP_AUTH_ALG_AES_GCM,
auth_key,
&aes128_gcm_cipher_range[i],
&aes128_gcm_auth_range[i],
@@ -457,11 +515,11 @@ void crypto_test_dec_alg_aes128_gcm_ovr_iv(void)
cipher_key.length = sizeof(aes128_gcm_reference_key[i]);
alg_test(ODP_CRYPTO_OP_DECODE,
- ODP_CIPHER_ALG_AES128_GCM,
+ ODP_CIPHER_ALG_AES_GCM,
iv,
aes128_gcm_reference_iv[i],
cipher_key,
- ODP_AUTH_ALG_AES128_GCM,
+ ODP_AUTH_ALG_AES_GCM,
auth_key,
&aes128_gcm_cipher_range[i],
&aes128_gcm_auth_range[i],
@@ -495,7 +553,7 @@ void crypto_test_enc_alg_aes128_cbc(void)
iv.length = sizeof(aes128_cbc_reference_iv[i]);
alg_test(ODP_CRYPTO_OP_ENCODE,
- ODP_CIPHER_ALG_AES128_CBC,
+ ODP_CIPHER_ALG_AES_CBC,
iv,
NULL,
cipher_key,
@@ -526,7 +584,7 @@ void crypto_test_enc_alg_aes128_cbc_ovr_iv(void)
cipher_key.length = sizeof(aes128_cbc_reference_key[i]);
alg_test(ODP_CRYPTO_OP_ENCODE,
- ODP_CIPHER_ALG_AES128_CBC,
+ ODP_CIPHER_ALG_AES_CBC,
iv,
aes128_cbc_reference_iv[i],
cipher_key,
@@ -561,7 +619,7 @@ void crypto_test_dec_alg_aes128_cbc(void)
iv.length = sizeof(aes128_cbc_reference_iv[i]);
alg_test(ODP_CRYPTO_OP_DECODE,
- ODP_CIPHER_ALG_AES128_CBC,
+ ODP_CIPHER_ALG_AES_CBC,
iv,
NULL,
cipher_key,
@@ -594,7 +652,7 @@ void crypto_test_dec_alg_aes128_cbc_ovr_iv(void)
cipher_key.length = sizeof(aes128_cbc_reference_key[i]);
alg_test(ODP_CRYPTO_OP_DECODE,
- ODP_CIPHER_ALG_AES128_CBC,
+ ODP_CIPHER_ALG_AES_CBC,
iv,
aes128_cbc_reference_iv[i],
cipher_key,
@@ -634,7 +692,7 @@ void crypto_test_alg_hmac_md5(void)
iv,
iv.data,
cipher_key,
- ODP_AUTH_ALG_MD5_96,
+ ODP_AUTH_ALG_MD5_HMAC,
auth_key,
NULL, NULL,
hmac_md5_reference_plaintext[i],
@@ -672,7 +730,7 @@ void crypto_test_alg_hmac_sha256(void)
iv,
iv.data,
cipher_key,
- ODP_AUTH_ALG_SHA256_128,
+ ODP_AUTH_ALG_SHA256_HMAC,
auth_key,
NULL, NULL,
hmac_sha256_reference_plaintext[i],
commit c628e7cbed766a5467fb1ee1fc3113b42e738d08
Author: Petri Savolainen <petri.savolainen(a)nokia.com>
Date: Thu Dec 8 16:05:29 2016 +0200
test: crypto: use odp_crypto_session_param_init
Use session param init function instead of memset() to zero.
Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Nikhil Agarwal <nikhil.agarwal(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/ipsec/odp_ipsec_cache.c b/example/ipsec/odp_ipsec_cache.c
index 2bd44cf..b2a91c2 100644
--- a/example/ipsec/odp_ipsec_cache.c
+++ b/example/ipsec/odp_ipsec_cache.c
@@ -44,7 +44,7 @@ int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa,
odp_queue_t completionq,
odp_pool_t out_pool)
{
- odp_crypto_session_params_t params;
+ odp_crypto_session_param_t params;
ipsec_cache_entry_t *entry;
odp_crypto_ses_create_err_t ses_create_rc;
odp_crypto_session_t session;
@@ -60,6 +60,8 @@ int create_ipsec_cache_entry(sa_db_entry_t *cipher_sa,
(cipher_sa->mode != auth_sa->mode))
return -1;
+ odp_crypto_session_param_init(¶ms);
+
/* Setup parameters and call crypto library to create session */
params.op = (in) ? ODP_CRYPTO_OP_DECODE : ODP_CRYPTO_OP_ENCODE;
params.auth_cipher_text = TRUE;
diff --git a/test/common_plat/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c
index 39df78b..9936288 100644
--- a/test/common_plat/performance/odp_crypto.c
+++ b/test/common_plat/performance/odp_crypto.c
@@ -49,7 +49,7 @@ static uint8_t test_key24[24] = { 0x01, 0x02, 0x03, 0x04, 0x05,
*/
typedef struct {
const char *name; /**< Algorithm name */
- odp_crypto_session_params_t session; /**< Prefilled crypto session params */
+ odp_crypto_session_param_t session; /**< Prefilled crypto session params */
unsigned int hash_adjust; /**< Size of hash */
} crypto_alg_config_t;
@@ -420,12 +420,13 @@ create_session_from_config(odp_crypto_session_t *session,
crypto_alg_config_t *config,
crypto_args_t *cargs)
{
- odp_crypto_session_params_t params;
+ odp_crypto_session_param_t params;
odp_crypto_ses_create_err_t ses_create_rc;
odp_pool_t pkt_pool;
odp_queue_t out_queue;
- memcpy(¶ms, &config->session, sizeof(odp_crypto_session_params_t));
+ odp_crypto_session_param_init(¶ms);
+ memcpy(¶ms, &config->session, sizeof(odp_crypto_session_param_t));
params.op = ODP_CRYPTO_OP_ENCODE;
params.pref_mode = ODP_CRYPTO_SYNC;
@@ -468,7 +469,7 @@ run_measure_one(crypto_args_t *cargs,
unsigned int payload_length,
crypto_run_result_t *result)
{
- odp_crypto_op_params_t params;
+ odp_crypto_op_param_t params;
odp_pool_t pkt_pool;
odp_queue_t out_queue;
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
index 4ac4a07..55fc6aa 100644
--- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
@@ -53,8 +53,8 @@ static void alg_test(odp_crypto_op_t op,
odp_event_t event;
odp_crypto_compl_t compl_event;
odp_crypto_op_result_t result;
- odp_crypto_session_params_t ses_params;
- odp_crypto_op_params_t op_params;
+ odp_crypto_session_param_t ses_params;
+ odp_crypto_op_param_t op_params;
uint8_t *data_addr;
int data_off;
@@ -104,7 +104,7 @@ static void alg_test(odp_crypto_op_t op,
CU_ASSERT(!rc);
/* Create a crypto session */
- memset(&ses_params, 0, sizeof(ses_params));
+ odp_crypto_session_param_init(&ses_params);
ses_params.op = op;
ses_params.auth_cipher_text = false;
ses_params.pref_mode = suite_context.pref_mode;
commit f1a8dab157c3288d93287a8d6a49f50c84d10342
Author: Petri Savolainen <petri.savolainen(a)nokia.com>
Date: Thu Dec 8 16:05:28 2016 +0200
api: crypto: documentation clean up
Moved documentation of struct fields over each field. Removed
references to buffers as crypto API works only with packets.
Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Nikhil Agarwal <nikhil.agarwal(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 0fb6d05..9855bf9 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -198,117 +198,166 @@ typedef union odp_crypto_auth_algos_t {
* Crypto API key structure
*/
typedef struct odp_crypto_key {
- uint8_t *data; /**< Key data */
- uint32_t length; /**< Key length in bytes */
+ /** Key data */
+ uint8_t *data;
+
+ /** Key length in bytes */
+ uint32_t length;
+
} odp_crypto_key_t;
/**
* Crypto API IV structure
*/
typedef struct odp_crypto_iv {
- uint8_t *data; /**< IV data */
- uint32_t length; /**< IV length in bytes */
+ /** IV data */
+ uint8_t *data;
+
+ /** IV length in bytes */
+ uint32_t length;
+
} odp_crypto_iv_t;
/**
* Crypto API data range specifier
*/
typedef struct odp_crypto_data_range {
- uint32_t offset; /**< Offset from beginning of buffer (chain) */
- uint32_t length; /**< Length of data to operate on */
+ /** Offset from beginning of packet */
+ uint32_t offset;
+
+ /** Length of data to operate on */
+ uint32_t length;
+
} odp_crypto_data_range_t;
/**
* Crypto API session creation parameters
*/
typedef struct odp_crypto_session_param_t {
- odp_crypto_op_t op; /**< Encode versus decode */
- odp_bool_t auth_cipher_text; /**< Authenticate/cipher ordering */
- odp_crypto_op_mode_t pref_mode; /**< Preferred sync vs async */
- odp_cipher_alg_t cipher_alg; /**< Cipher algorithm */
- odp_crypto_key_t cipher_key; /**< Cipher key */
- odp_crypto_iv_t iv; /**< Cipher Initialization Vector (IV) */
- odp_auth_alg_t auth_alg; /**< Authentication algorithm */
- odp_crypto_key_t auth_key; /**< Authentication key */
- odp_queue_t compl_queue; /**< Async mode completion event queue */
- odp_pool_t output_pool; /**< Output buffer pool */
+ /** Encode vs. decode operation */
+ odp_crypto_op_t op;
+
+ /** Authenticate cipher vs. plain text
+ *
+ * Controls ordering of authentication and cipher operations,
+ * and is relative to the operation (encode vs decode). When encoding,
+ * TRUE indicates the authentication operation should be performed
+ * after the cipher operation else before. When decoding, TRUE
+ * indicates the reverse order of operation.
+ *
+ * true: Authenticate cipher text
+ * false: Authenticate plain text
+ */
+ odp_bool_t auth_cipher_text;
+
+ /** Preferred sync vs. async */
+ odp_crypto_op_mode_t pref_mode;
+
+ /** Cipher algorithm
+ *
+ * Use odp_crypto_capability() for supported algorithms.
+ */
+ odp_cipher_alg_t cipher_alg;
+
+ /** Cipher key
+ *
+ * Use odp_crypto_cipher_capa() for supported key and IV lengths.
+ */
+ odp_crypto_key_t cipher_key;
+
+ /** Cipher Initialization Vector (IV) */
+ odp_crypto_iv_t iv;
+
+ /** Authentication algorithm
+ *
+ * Use odp_crypto_capability() for supported algorithms.
+ */
+ odp_auth_alg_t auth_alg;
+
+ /** Authentication key
+ *
+ * Use odp_crypto_auth_capa() for supported digest and key lengths.
+ */
+ odp_crypto_key_t auth_key;
+
+ /** Async mode completion event queue
+ *
+ * When odp_crypto_operation() is asynchronous, the completion queue is
+ * used to return the completion status of the operation to the
+ * application.
+ */
+ odp_queue_t compl_queue;
+
+ /** Output pool
+ *
+ * When the output packet is not specified during the call to
+ * odp_crypto_operation(), the output packet will be allocated
+ * from this pool.
+ */
+ odp_pool_t output_pool;
+
} odp_crypto_session_param_t;
/** @deprecated Use odp_crypto_session_param_t instead */
typedef odp_crypto_session_param_t odp_crypto_session_params_t;
/**
- * @var odp_crypto_session_params_t::auth_cipher_text
- *
- * Controls ordering of authentication and cipher operations,
- * and is relative to the operation (encode vs decode).
- * When encoding, @c TRUE indicates the authentication operation
- * should be performed @b after the cipher operation else before.
- * When decoding, @c TRUE indicates the reverse order of operation.
- *
- * @var odp_crypto_session_params_t::compl_queue
- *
- * When the API operates asynchronously, the completion queue is
- * used to return the completion status of the operation to the
- * application.
- *
- * @var odp_crypto_session_params_t::output_pool
- *
- * When the output packet is not specified during the call to
- * odp_crypto_operation, the output packet buffer will be allocated
- * from this pool.
- */
-
-/**
* Crypto API per packet operation parameters
*/
typedef struct odp_crypto_op_param_t {
- odp_crypto_session_t session; /**< Session handle from creation */
- void *ctx; /**< User context */
- odp_packet_t pkt; /**< Input packet buffer */
- odp_packet_t out_pkt; /**< Output packet buffer */
- uint8_t *override_iv_ptr; /**< Override session IV pointer */
- uint32_t hash_result_offset; /**< Offset from start of packet buffer for hash result */
- odp_crypto_data_range_t cipher_range; /**< Data range to apply cipher */
- odp_crypto_data_range_t auth_range; /**< Data range to authenticate */
+ /** Session handle from creation */
+ odp_crypto_session_t session;
+
+ /** User context */
+ void *ctx;
+
+ /** Input packet
+ *
+ * Specifies the input packet for the crypto operation. When the
+ * 'out_pkt' variable is set to ODP_PACKET_INVALID (indicating a new
+ * packet should be allocated for the resulting packet).
+ */
+ odp_packet_t pkt;
+
+ /** Output packet
+ *
+ * Both "in place" (the original packet 'pkt' is modified) and
+ * "copy" (the packet is replicated to a new packet which contains
+ * the modified data) modes are supported. The "in place" mode of
+ * operation is indicated by setting 'out_pkt' equal to 'pkt'.
+ * For the copy mode of operation, setting 'out_pkt' to a valid packet
+ * value indicates the caller wishes to specify the destination packet.
+ * Setting 'out_pkt' to ODP_PACKET_INVALID indicates the caller wishes
+ * the destination packet be allocated from the output pool specified
+ * during session creation.
+ */
+ odp_packet_t out_pkt;
+
+ /** Override session IV pointer */
+ uint8_t *override_iv_ptr;
+
+ /** Offset from start of packet for hash result
+ *
+ * Specifies the offset where the hash result is to be stored. In case
+ * of decode sessions, input hash values will be read from this offset,
+ * and overwritten with hash results. If this offset lies within
+ * specified 'auth_range', implementation will mute this field before
+ * calculating the hash result.
+ */
+ uint32_t hash_result_offset;
+
+ /** Data range to apply cipher */
+ odp_crypto_data_range_t cipher_range;
+
+ /** Data range to authenticate */
+ odp_crypto_data_range_t auth_range;
+
} odp_crypto_op_param_t;
/** @deprecated Use odp_crypto_op_param_t instead */
typedef odp_crypto_op_param_t odp_crypto_op_params_t;
/**
- * @var odp_crypto_op_params_t::pkt
- * Specifies the input packet buffer for the crypto operation. When the
- * @c out_pkt variable is set to @c ODP_PACKET_INVALID (indicating a new
- * buffer should be allocated for the resulting packet), the \#define TBD
- * indicates whether the implementation will free the input packet buffer
- * or if it becomes the responsibility of the caller.
- *
- * @var odp_crypto_op_params_t::out_pkt
- *
- * The API supports both "in place" (the original packet "pkt" is
- * modified) and "copy" (the packet is replicated to a new buffer
- * which contains the modified data).
- *
- * The "in place" mode of operation is indicated by setting @c out_pkt
- * equal to @c pkt. For the copy mode of operation, setting @c out_pkt
- * to a valid packet buffer value indicates the caller wishes to specify
- * the destination buffer. Setting @c out_pkt to @c ODP_PACKET_INVALID
- * indicates the caller wishes the destination packet buffer be allocated
- * from the output pool specified during session creation.
- *
- * @var odp_crypto_op_params_t::hash_result_offset
- *
- * Specifies the offset where the hash result is to be stored. In case of
- * decode sessions, input hash values will be read from this offset, and
- * overwritten with hash results. If this offset lies within specified
- * auth_range, implementation will mute this field before calculating the hash
- * result.
- *
- * @sa odp_crypto_session_params_t::output_pool.
- */
-
-/**
* Crypto API session creation return code
*/
typedef enum {
@@ -346,7 +395,7 @@ typedef enum {
ODP_CRYPTO_HW_ERR_NONE,
/** Error detected during DMA of data */
ODP_CRYPTO_HW_ERR_DMA,
- /** Operation failed due to buffer pool depletion */
+ /** Operation failed due to pool depletion */
ODP_CRYPTO_HW_ERR_BP_DEPLETED,
} odp_crypto_hw_err_t;
@@ -354,19 +403,33 @@ typedef enum {
* Cryto API per packet operation completion status
*/
typedef struct odp_crypto_compl_status {
- odp_crypto_alg_err_t alg_err; /**< Algorithm specific return code */
- odp_crypto_hw_err_t hw_err; /**< Hardware specific return code */
+ /** Algorithm specific return code */
+ odp_crypto_alg_err_t alg_err;
+
+ /** Hardware specific return code */
+ odp_crypto_hw_err_t hw_err;
+
} odp_crypto_compl_status_t;
/**
* Crypto API operation result
*/
typedef struct odp_crypto_op_result {
- odp_bool_t ok; /**< Request completed successfully */
- void *ctx; /**< User context from request */
- odp_packet_t pkt; /**< Output packet */
- odp_crypto_compl_status_t cipher_status; /**< Cipher status */
- odp_crypto_compl_status_t auth_status; /**< Authentication status */
+ /** Request completed successfully */
+ odp_bool_t ok;
+
+ /** User context from request */
+ void *ctx;
+
+ /** Output packet */
+ odp_packet_t pkt;
+
+ /** Cipher status */
+ odp_crypto_compl_status_t cipher_status;
+
+ /** Authentication status */
+ odp_crypto_compl_status_t auth_status;
+
} odp_crypto_op_result_t;
/**
commit a05fb250afe4bf6c82d39f28239b08fb7e405b96
Author: Petri Savolainen <petri.savolainen(a)nokia.com>
Date: Thu Dec 8 16:05:27 2016 +0200
api: crypto: added session param init
Added session parameter init function which should be
used to initialize the structure before calling
odp_crypto_session_create().
Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Nikhil Agarwal <nikhil.agarwal(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 4b94824..0fb6d05 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -479,7 +479,11 @@ int odp_crypto_auth_capability(odp_auth_alg_t auth,
odp_crypto_auth_capability_t capa[], int num);
/**
- * Crypto session creation (synchronous)
+ * Crypto session creation
+ *
+ * Create a crypto session according to the session parameters. Use
+ * odp_crypto_session_param_init() to initialize parameters into their
+ * default values.
*
* @param param Session parameters
* @param session Created session else ODP_CRYPTO_SESSION_INVALID
@@ -589,6 +593,16 @@ uint64_t odp_crypto_session_to_u64(odp_crypto_session_t hdl);
uint64_t odp_crypto_compl_to_u64(odp_crypto_compl_t hdl);
/**
+ * Initialize crypto session parameters
+ *
+ * Initialize an odp_crypto_session_param_t to its default values for
+ * all fields.
+ *
+ * @param param Pointer to odp_crypto_session_param_t to be initialized
+ */
+void odp_crypto_session_param_init(odp_crypto_session_param_t *param);
+
+/**
* @}
*/
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index fd121c8..6b7d60e 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -1042,3 +1042,8 @@ odp_crypto_compl_free(odp_crypto_compl_t completion_event)
odp_buffer_from_event((odp_event_t)completion_event),
ODP_EVENT_PACKET);
}
+
+void odp_crypto_session_param_init(odp_crypto_session_param_t *param)
+{
+ memset(param, 0, sizeof(odp_crypto_session_param_t));
+}
commit c52864e0956c3f57a059af8c90f7ff2b8fb10e6c
Author: Petri Savolainen <petri.savolainen(a)nokia.com>
Date: Thu Dec 8 16:05:26 2016 +0200
linux-gen: crypto: add support to new enumerations
Added support for new algorithm enumerations and algorithm
capability functions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Nikhil Agarwal <nikhil.agarwal(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 7b4eb61..c7b893a 100644
--- a/platform/linux-generic/include/odp_crypto_internal.h
+++ b/platform/linux-generic/include/odp_crypto_internal.h
@@ -14,6 +14,7 @@ extern "C" {
#include <openssl/des.h>
#include <openssl/aes.h>
+#define MAX_IV_LEN 64
#define OP_RESULT_MAGIC 0x91919191
/** Forward declaration of session structure */
@@ -31,16 +32,16 @@ odp_crypto_alg_err_t (*crypto_func_t)(odp_crypto_op_param_t *param,
*/
struct odp_crypto_generic_session {
struct odp_crypto_generic_session *next;
- odp_crypto_op_t op;
+
+ /* Session creation parameters */
+ odp_crypto_session_param_t p;
+
odp_bool_t do_cipher_first;
- odp_queue_t compl_queue;
- odp_pool_t output_pool;
+
struct {
- odp_cipher_alg_t alg;
- struct {
- uint8_t *data;
- size_t len;
- } iv;
+ /* Copy of session IV data */
+ uint8_t iv_data[MAX_IV_LEN];
+
union {
struct {
DES_key_schedule ks1;
@@ -56,8 +57,8 @@ struct odp_crypto_generic_session {
} data;
crypto_func_t func;
} cipher;
+
struct {
- odp_auth_alg_t alg;
union {
struct {
uint8_t key[16];
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 44b8e06..fd121c8 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -249,8 +249,8 @@ odp_crypto_alg_err_t aes_encrypt(odp_crypto_op_param_t *param,
if (param->override_iv_ptr)
iv_ptr = param->override_iv_ptr;
- else if (session->cipher.iv.data)
- iv_ptr = session->cipher.iv.data;
+ else if (session->p.iv.data)
+ iv_ptr = session->cipher.iv_data;
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
@@ -281,8 +281,8 @@ odp_crypto_alg_err_t aes_decrypt(odp_crypto_op_param_t *param,
if (param->override_iv_ptr)
iv_ptr = param->override_iv_ptr;
- else if (session->cipher.iv.data)
- iv_ptr = session->cipher.iv.data;
+ else if (session->p.iv.data)
+ iv_ptr = session->cipher.iv_data;
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
@@ -302,22 +302,20 @@ odp_crypto_alg_err_t aes_decrypt(odp_crypto_op_param_t *param,
return ODP_CRYPTO_ALG_ERR_NONE;
}
-static
-int process_aes_param(odp_crypto_generic_session_t *session,
- odp_crypto_session_param_t *param)
+static int process_aes_param(odp_crypto_generic_session_t *session)
{
/* Verify IV len is either 0 or 16 */
- if (!((0 == param->iv.length) || (16 == param->iv.length)))
+ if (!((0 == session->p.iv.length) || (16 == session->p.iv.length)))
return -1;
/* Set function */
- if (ODP_CRYPTO_OP_ENCODE == param->op) {
+ if (ODP_CRYPTO_OP_ENCODE == session->p.op) {
session->cipher.func = aes_encrypt;
- AES_set_encrypt_key(param->cipher_key.data, 128,
+ AES_set_encrypt_key(session->p.cipher_key.data, 128,
&session->cipher.data.aes.key);
} else {
session->cipher.func = aes_decrypt;
- AES_set_decrypt_key(param->cipher_key.data, 128,
+ AES_set_decrypt_key(session->p.cipher_key.data, 128,
&session->cipher.data.aes.key);
}
@@ -340,8 +338,8 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t *param,
if (param->override_iv_ptr)
iv_ptr = param->override_iv_ptr;
- else if (session->cipher.iv.data)
- iv_ptr = session->cipher.iv.data;
+ else if (session->p.iv.data)
+ iv_ptr = session->cipher.iv_data;
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
@@ -405,8 +403,8 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
if (param->override_iv_ptr)
iv_ptr = param->override_iv_ptr;
- else if (session->cipher.iv.data)
- iv_ptr = session->cipher.iv.data;
+ else if (session->p.iv.data)
+ iv_ptr = session->cipher.iv_data;
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
@@ -455,19 +453,17 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
return ODP_CRYPTO_ALG_ERR_NONE;
}
-static
-int process_aes_gcm_param(odp_crypto_generic_session_t *session,
- odp_crypto_session_param_t *param)
+static int process_aes_gcm_param(odp_crypto_generic_session_t *session)
{
/* Verify Key len is 16 */
- if (param->cipher_key.length != 16)
+ if (session->p.cipher_key.length != 16)
return -1;
/* Set function */
EVP_CIPHER_CTX *ctx =
session->cipher.data.aes_gcm.ctx = EVP_CIPHER_CTX_new();
- if (ODP_CRYPTO_OP_ENCODE == param->op) {
+ if (ODP_CRYPTO_OP_ENCODE == session->p.op) {
session->cipher.func = aes_gcm_encrypt;
EVP_EncryptInit_ex(ctx, EVP_aes_128_gcm(), NULL, NULL, NULL);
} else {
@@ -476,13 +472,13 @@ int process_aes_gcm_param(odp_crypto_generic_session_t *session,
}
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN,
- param->iv.length, NULL);
- if (ODP_CRYPTO_OP_ENCODE == param->op) {
+ session->p.iv.length, NULL);
+ if (ODP_CRYPTO_OP_ENCODE == session->p.op) {
EVP_EncryptInit_ex(ctx, NULL, NULL,
- param->cipher_key.data, NULL);
+ session->p.cipher_key.data, NULL);
} else {
EVP_DecryptInit_ex(ctx, NULL, NULL,
- param->cipher_key.data, NULL);
+ session->p.cipher_key.data, NULL);
}
return 0;
@@ -499,8 +495,8 @@ odp_crypto_alg_err_t des_encrypt(odp_crypto_op_param_t *param,
if (param->override_iv_ptr)
iv_ptr = param->override_iv_ptr;
- else if (session->cipher.iv.data)
- iv_ptr = session->cipher.iv.data;
+ else if (session->p.iv.data)
+ iv_ptr = session->cipher.iv_data;
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
@@ -537,8 +533,8 @@ odp_crypto_alg_err_t des_decrypt(odp_crypto_op_param_t *param,
if (param->override_iv_ptr)
iv_ptr = param->override_iv_ptr;
- else if (session->cipher.iv.data)
- iv_ptr = session->cipher.iv.data;
+ else if (session->p.iv.data)
+ iv_ptr = session->cipher.iv_data;
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
@@ -565,38 +561,34 @@ odp_crypto_alg_err_t des_decrypt(odp_crypto_op_param_t *param,
return ODP_CRYPTO_ALG_ERR_NONE;
}
-static
-int process_des_param(odp_crypto_generic_session_t *session,
- odp_crypto_session_param_t *param)
+static int process_des_param(odp_crypto_generic_session_t *session)
{
/* Verify IV len is either 0 or 8 */
- if (!((0 == param->iv.length) || (8 == param->iv.length)))
+ if (!((0 == session->p.iv.length) || (8 == session->p.iv.length)))
return -1;
/* Set function */
- if (ODP_CRYPTO_OP_ENCODE == param->op)
+ if (ODP_CRYPTO_OP_ENCODE == session->p.op)
session->cipher.func = des_encrypt;
else
session->cipher.func = des_decrypt;
/* Convert keys */
- DES_set_key((DES_cblock *)¶m->cipher_key.data[0],
+ DES_set_key((DES_cblock *)&session->p.cipher_key.data[0],
&session->cipher.data.des.ks1);
- DES_set_key((DES_cblock *)¶m->cipher_key.data[8],
+ DES_set_key((DES_cblock *)&session->p.cipher_key.data[8],
&session->cipher.data.des.ks2);
- DES_set_key((DES_cblock *)¶m->cipher_key.data[16],
+ DES_set_key((DES_cblock *)&session->p.cipher_key.data[16],
&session->cipher.data.des.ks3);
return 0;
}
-static
-int process_md5_param(odp_crypto_generic_session_t *session,
- odp_crypto_session_param_t *param,
- uint32_t bits)
+static int process_md5_param(odp_crypto_generic_session_t *session,
+ uint32_t bits)
{
/* Set function */
- if (ODP_CRYPTO_OP_ENCODE == param->op)
+ if (ODP_CRYPTO_OP_ENCODE == session->p.op)
session->auth.func = md5_gen;
else
session->auth.func = md5_check;
@@ -605,18 +597,16 @@ int process_md5_param(odp_crypto_generic_session_t *session,
session->auth.data.md5.bytes = bits / 8;
/* Convert keys */
- memcpy(session->auth.data.md5.key, param->auth_key.data, 16);
+ memcpy(session->auth.data.md5.key, session->p.auth_key.data, 16);
return 0;
}
-static
-int process_sha256_param(odp_crypto_generic_session_t *session,
- odp_crypto_session_param_t *param,
- uint32_t bits)
+static int process_sha256_param(odp_crypto_generic_session_t *session,
+ uint32_t bits)
{
/* Set function */
- if (ODP_CRYPTO_OP_ENCODE == param->op)
+ if (ODP_CRYPTO_OP_ENCODE == session->p.op)
session->auth.func = sha256_gen;
else
session->auth.func = sha256_check;
@@ -625,7 +615,7 @@ int process_sha256_param(odp_crypto_generic_session_t *session,
session->auth.data.sha256.bytes = bits / 8;
/* Convert keys */
- memcpy(session->auth.data.sha256.key, param->auth_key.data, 32);
+ memcpy(session->auth.data.sha256.key, session->p.auth_key.data, 32);
return 0;
}
@@ -638,16 +628,23 @@ int odp_crypto_capability(odp_crypto_capability_t *capa)
/* Initialize crypto capability structure */
memset(capa, 0, sizeof(odp_crypto_capability_t));
- capa->ciphers.bit.null = 1;
- capa->ciphers.bit.des = 1;
- capa->ciphers.bit.trides_cbc = 1;
- capa->ciphers.bit.aes128_cbc = 1;
- capa->ciphers.bit.aes128_gcm = 1;
+ capa->ciphers.bit.null = 1;
+ capa->ciphers.bit.des = 1;
+ capa->ciphers.bit.trides_cbc = 1;
+ capa->ciphers.bit.aes_cbc = 1;
+ capa->ciphers.bit.aes_gcm = 1;
+
+ capa->auths.bit.null = 1;
+ capa->auths.bit.md5_hmac = 1;
+ capa->auths.bit.sha256_hmac = 1;
+ capa->auths.bit.aes_gcm = 1;
- capa->auths.bit.null = 1;
- capa->auths.bit.md5_96 = 1;
- capa->auths.bit.sha256_128 = 1;
- capa->auths.bit.aes128_gcm = 1;
+ /* Deprecated */
+ capa->ciphers.bit.aes128_cbc = 1;
+ capa->ciphers.bit.aes128_gcm = 1;
+ capa->auths.bit.md5_96 = 1;
+ capa->auths.bit.sha256_128 = 1;
+ capa->auths.bit.aes128_gcm = 1;
capa->max_sessions = MAX_SESSIONS;
@@ -749,21 +746,26 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
return -1;
}
+ /* Copy parameters */
+ session->p = *param;
+
+ /* Copy IV data */
+ if (session->p.iv.data) {
+ if (session->p.iv.length > MAX_IV_LEN) {
+ ODP_DBG("Maximum IV length exceeded\n");
+ return -1;
+ }
+
+ memcpy(session->cipher.iv_data, session->p.iv.data,
+ session->p.iv.length);
+ }
+
/* Derive order */
if (ODP_CRYPTO_OP_ENCODE == param->op)
session->do_cipher_first = param->auth_cipher_text;
else
session->do_cipher_first = !param->auth_cipher_text;
- /* Copy stuff over */
- session->op = param->op;
- session->compl_queue = param->compl_queue;
- session->cipher.alg = param->cipher_alg;
- session->cipher.iv.data = param->iv.data;
- session->cipher.iv.len = param->iv.length;
- session->auth.alg = param->auth_alg;
- session->output_pool = param->output_pool;
-
/* Process based on cipher */
switch (param->cipher_alg) {
case ODP_CIPHER_ALG_NULL:
@@ -772,19 +774,23 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
break;
case ODP_CIPHER_ALG_DES:
case ODP_CIPHER_ALG_3DES_CBC:
- rc = process_des_param(session, param);
+ rc = process_des_param(session);
break;
+ case ODP_CIPHER_ALG_AES_CBC:
+ /* deprecated */
case ODP_CIPHER_ALG_AES128_CBC:
- rc = process_aes_param(session, param);
+ rc = process_aes_param(session);
break;
+ case ODP_CIPHER_ALG_AES_GCM:
+ /* deprecated */
case ODP_CIPHER_ALG_AES128_GCM:
/* AES-GCM requires to do both auth and
* cipher at the same time */
- if (param->auth_alg != ODP_AUTH_ALG_AES128_GCM) {
+ if (param->auth_alg == ODP_AUTH_ALG_AES_GCM ||
+ param->auth_alg == ODP_AUTH_ALG_AES128_GCM)
+ rc = process_aes_gcm_param(session);
+ else
rc = -1;
- break;
- }
- rc = process_aes_gcm_param(session, param);
break;
default:
rc = -1;
@@ -802,21 +808,28 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
session->auth.func = null_crypto_routine;
rc = 0;
break;
+ case ODP_AUTH_ALG_MD5_HMAC:
+ /* deprecated */
case ODP_AUTH_ALG_MD5_96:
- rc = process_md5_param(session, param, 96);
+ rc = process_md5_param(session, 96);
break;
+ case ODP_AUTH_ALG_SHA256_HMAC:
+ /* deprecated */
case ODP_AUTH_ALG_SHA256_128:
- rc = process_sha256_param(session, param, 128);
+ rc = process_sha256_param(session, 128);
break;
+ case ODP_AUTH_ALG_AES_GCM:
+ /* deprecated */
case ODP_AUTH_ALG_AES128_GCM:
/* AES-GCM requires to do both auth and
* cipher at the same time */
- if (param->cipher_alg != ODP_CIPHER_ALG_AES128_GCM) {
+ if (param->cipher_alg == ODP_CIPHER_ALG_AES_GCM ||
+ param->cipher_alg == ODP_CIPHER_ALG_AES128_GCM) {
+ session->auth.func = null_crypto_routine;
+ rc = 0;
+ } else {
rc = -1;
- break;
}
- session->auth.func = null_crypto_routine;
- rc = 0;
break;
default:
rc = -1;
@@ -838,7 +851,8 @@ int odp_crypto_session_destroy(odp_crypto_session_t session)
odp_crypto_generic_session_t *generic;
generic = (odp_crypto_generic_session_t *)(intptr_t)session;
- if (generic->cipher.alg == ODP_CIPHER_ALG_AES128_GCM)
+ if (generic->p.cipher_alg == ODP_CIPHER_ALG_AES128_GCM ||
+ generic->p.cipher_alg == ODP_CIPHER_ALG_AES_GCM)
EVP_CIPHER_CTX_free(generic->cipher.data.aes_gcm.ctx);
memset(generic, 0, sizeof(*generic));
free_session(generic);
@@ -859,8 +873,8 @@ odp_crypto_operation(odp_crypto_op_param_t *param,
/* Resolve output buffer */
if (ODP_PACKET_INVALID == param->out_pkt &&
- ODP_POOL_INVALID != session->output_pool)
- param->out_pkt = odp_packet_alloc(session->output_pool,
+ ODP_POOL_INVALID != session->p.output_pool)
+ param->out_pkt = odp_packet_alloc(session->p.output_pool,
odp_packet_len(param->pkt));
if (odp_unlikely(ODP_PACKET_INVALID == param->out_pkt)) {
@@ -900,7 +914,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param,
(rc_auth == ODP_CRYPTO_ALG_ERR_NONE);
/* If specified during creation post event to completion queue */
- if (ODP_QUEUE_INVALID != session->compl_queue) {
+ if (ODP_QUEUE_INVALID != session->p.compl_queue) {
odp_event_t completion_event;
odp_crypto_generic_op_result_t *op_result;
@@ -913,7 +927,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param,
op_result = get_op_result_from_event(completion_event);
op_result->magic = OP_RESULT_MAGIC;
op_result->result = local_result;
- if (odp_queue_enq(session->compl_queue, completion_event)) {
+ if (odp_queue_enq(session->p.compl_queue, completion_event)) {
odp_event_free(completion_event);
return -1;
}
commit 9f084f0c90509a354452ef75325c507224c7cd93
Author: Petri Savolainen <petri.savolainen(a)nokia.com>
Date: Thu Dec 8 16:25:58 2016 +0200
linux-gen: crypto: add algo capability functions
Implemented cipher and authentication algorithm capability
functions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Nikhil Agarwal <nikhil.agarwal(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 70d3a97..44b8e06 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -27,6 +27,37 @@
#define MAX_SESSIONS 32
+/*
+ * Cipher algorithm capabilities
+ *
+ * Keep sorted: first by key length, then by IV length
+ */
+static const odp_crypto_cipher_capability_t cipher_capa_des[] = {
+{.key_len = 24, .iv_len = 8} };
+
+static const odp_crypto_cipher_capability_t cipher_capa_trides_cbc[] = {
+{.key_len = 24, .iv_len = 8} };
+
+static const odp_crypto_cipher_capability_t cipher_capa_aes_cbc[] = {
+{.key_len = 16, .iv_len = 16} };
+
+static const odp_crypto_cipher_capability_t cipher_capa_aes_gcm[] = {
+{.key_len = 16, .iv_len = 12} };
+
+/*
+ * Authentication algorithm capabilities
+ *
+ * Keep sorted: first by digest length, then by key length
+ */
+static const odp_crypto_auth_capability_t auth_capa_md5_hmac[] = {
+{.digest_len = 12, .key_len = 16, .aad_len = {.min = 0, .max = 0, .inc = 0} } };
+
+static const odp_crypto_auth_capability_t auth_capa_sha256_hmac[] = {
+{.digest_len = 16, .key_len = 32, .aad_len = {.min = 0, .max = 0, .inc = 0} } };
+
+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} } };
+
typedef struct odp_crypto_global_s odp_crypto_global_t;
struct odp_crypto_global_s {
@@ -623,6 +654,83 @@ int odp_crypto_capability(odp_crypto_capability_t *capa)
return 0;
}
+int odp_crypto_cipher_capability(odp_cipher_alg_t cipher,
+ odp_crypto_cipher_capability_t dst[],
+ int num_copy)
+{
+ const odp_crypto_cipher_capability_t *src;
+ int num;
+ int size = sizeof(odp_crypto_cipher_capability_t);
+
+ switch (cipher) {
+ case ODP_CIPHER_ALG_NULL:
+ src = NULL;
+ num = 0;
+ break;
+ case ODP_CIPHER_ALG_DES:
+ src = cipher_capa_des;
+ num = sizeof(cipher_capa_des) / size;
+ break;
+ case ODP_CIPHER_ALG_3DES_CBC:
+ src = cipher_capa_trides_cbc;
+ num = sizeof(cipher_capa_trides_cbc) / size;
+ break;
+ case ODP_CIPHER_ALG_AES_CBC:
+ src = cipher_capa_aes_cbc;
+ num = sizeof(cipher_capa_aes_cbc) / size;
+ break;
+ case ODP_CIPHER_ALG_AES_GCM:
+ src = cipher_capa_aes_gcm;
+ num = sizeof(cipher_capa_aes_gcm) / size;
+ break;
+ default:
+ return -1;
+ }
+
+ if (num < num_copy)
+ num_copy = num;
+
+ memcpy(dst, src, num_copy * size);
+
+ return num;
+}
+
+int odp_crypto_auth_capability(odp_auth_alg_t auth,
+ odp_crypto_auth_capability_t dst[], int num_copy)
+{
+ const odp_crypto_auth_capability_t *src;
+ int num;
+ int size = sizeof(odp_crypto_auth_capability_t);
+
+ switch (auth) {
+ case ODP_AUTH_ALG_NULL:
+ src = NULL;
+ num = 0;
+ break;
+ case ODP_AUTH_ALG_MD5_HMAC:
+ src = auth_capa_md5_hmac;
+ num = sizeof(auth_capa_md5_hmac) / size;
+ break;
+ case ODP_AUTH_ALG_SHA256_HMAC:
+ src = auth_capa_sha256_hmac;
+ num = sizeof(auth_capa_sha256_hmac) / size;
+ break;
+ case ODP_AUTH_ALG_AES_GCM:
+ src = auth_capa_aes_gcm;
+ num = sizeof(auth_capa_aes_gcm) / size;
+ break;
+ default:
+ return -1;
+ }
+
+ if (num < num_copy)
+ num_copy = num;
+
+ memcpy(dst, src, num_copy * size);
+
+ return num;
+}
+
int
odp_crypto_session_create(odp_crypto_session_param_t *param,
odp_crypto_session_t *session_out,
commit b6de862e041b500ade8a94917429f196173d5d90
Author: Petri Savolainen <petri.savolainen(a)nokia.com>
Date: Thu Dec 8 16:05:24 2016 +0200
api: crypto: decouple key length from algorithm enumeration
Enumerations for cipher and authentication algorithms grow
fast if key and digest lengths are included into the enum.
Decoupled lengths from algorithm names, only exception is
SHA-2 family of authentication algorithms which has established
naming convention with digest lengths (SHA-224, SHA-256, ...).
Old enumerations are still functional but deprecated.
Algotrithm level capability functions provide a flexible way to
handle all possible key/digest/iv length combinations.
Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Nikhil Agarwal <nikhil.agarwal(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 f24f527..4b94824 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -65,14 +65,28 @@ typedef enum {
typedef enum {
/** No cipher algorithm specified */
ODP_CIPHER_ALG_NULL,
+
/** DES */
ODP_CIPHER_ALG_DES,
+
/** Triple DES with cipher block chaining */
ODP_CIPHER_ALG_3DES_CBC,
- /** AES128 with cipher block chaining */
+
+ /** AES with cipher block chaining */
+ ODP_CIPHER_ALG_AES_CBC,
+
+ /** AES in Galois/Counter Mode
+ *
+ * @note Must be paired with cipher ODP_AUTH_ALG_AES_GCM
+ */
+ ODP_CIPHER_ALG_AES_GCM,
+
+ /** @deprecated Use ODP_CIPHER_ALG_AES_CBC instead */
ODP_CIPHER_ALG_AES128_CBC,
- /** AES128 in Galois/Counter Mode */
- ODP_CIPHER_ALG_AES128_GCM,
+
+ /** @deprecated Use ODP_CIPHER_ALG_AES_GCM instead */
+ ODP_CIPHER_ALG_AES128_GCM
+
} odp_cipher_alg_t;
/**
@@ -81,12 +95,33 @@ typedef enum {
typedef enum {
/** No authentication algorithm specified */
ODP_AUTH_ALG_NULL,
- /** HMAC-MD5 with 96 bit key */
+
+ /** HMAC-MD5
+ *
+ * MD5 algorithm in HMAC mode
+ */
+ ODP_AUTH_ALG_MD5_HMAC,
+
+ /** HMAC-SHA-256
+ *
+ * SHA-256 algorithm in HMAC mode
+ */
+ ODP_AUTH_ALG_SHA256_HMAC,
+
+ /** AES in Galois/Counter Mode
+ *
+ * @note Must be paired with cipher ODP_CIPHER_ALG_AES_GCM
+ */
+ ODP_AUTH_ALG_AES_GCM,
+
+ /** @deprecated Use ODP_AUTH_ALG_MD5_HMAC instead */
ODP_AUTH_ALG_MD5_96,
- /** SHA256 with 128 bit key */
+
+ /** @deprecated Use ODP_AUTH_ALG_SHA256_HMAC instead */
ODP_AUTH_ALG_SHA256_128,
- /** AES128 in Galois/Counter Mode */
- ODP_AUTH_ALG_AES128_GCM,
+
+ /** @deprecated Use ODP_AUTH_ALG_AES_GCM instead */
+ ODP_AUTH_ALG_AES128_GCM
} odp_auth_alg_t;
/**
@@ -96,19 +131,25 @@ typedef union odp_crypto_cipher_algos_t {
/** Cipher algorithms */
struct {
/** ODP_CIPHER_ALG_NULL */
- uint32_t null : 1;
+ uint32_t null : 1;
/** ODP_CIPHER_ALG_DES */
- uint32_t des : 1;
+ uint32_t des : 1;
/** ODP_CIPHER_ALG_3DES_CBC */
- uint32_t trides_cbc : 1;
+ uint32_t trides_cbc : 1;
+
+ /** ODP_CIPHER_ALG_AES_CBC */
+ uint32_t aes_cbc : 1;
- /** ODP_CIPHER_ALG_AES128_CBC */
- uint32_t aes128_cbc : 1;
+ /** ODP_CIPHER_ALG_AES_GCM */
+ uint32_t aes_gcm : 1;
- /** ODP_CIPHER_ALG_AES128_GCM */
- uint32_t aes128_gcm : 1;
+ /** @deprecated Use aes_cbc instead */
+ uint32_t aes128_cbc : 1;
+
+ /** @deprecated Use aes_gcm instead */
+ uint32_t aes128_gcm : 1;
} bit;
/** All bits of the bit field structure
@@ -125,16 +166,25 @@ typedef union odp_crypto_auth_algos_t {
/** Authentication algorithms */
struct {
/** ODP_AUTH_ALG_NULL */
- uint32_t null : 1;
+ uint32_t null : 1;
+
+ /** ODP_AUTH_ALG_MD5_HMAC */
+ uint32_t md5_hmac : 1;
+
+ /** ODP_AUTH_ALG_SHA256_HMAC */
+ uint32_t sha256_hmac : 1;
- /** ODP_AUTH_ALG_MD5_96 */
- uint32_t md5_96 : 1;
+ /** ODP_AUTH_ALG_AES_GCM */
+ uint32_t aes_gcm : 1;
- /** ODP_AUTH_ALG_SHA256_128 */
- uint32_t sha256_128 : 1;
+ /** @deprecated Use md5_hmac instead */
+ uint32_t md5_96 : 1;
- /** ODP_AUTH_ALG_AES128_GCM */
- uint32_t aes128_gcm : 1;
+ /** @deprecated Use sha256_hmac instead */
+ uint32_t sha256_128 : 1;
+
+ /** @deprecated Use aes_gcm instead */
+ uint32_t aes128_gcm : 1;
} bit;
/** All bits of the bit field structure
@@ -341,6 +391,43 @@ typedef struct odp_crypto_capability_t {
} odp_crypto_capability_t;
/**
+ * Cipher algorithm capabilities
+ */
+typedef struct odp_crypto_cipher_capability_t {
+ /** Key length in bytes */
+ uint32_t key_len;
+
+ /** IV length in bytes */
+ uint32_t iv_len;
+
+} odp_crypto_cipher_capability_t;
+
+/**
+ * Authentication algorithm capabilities
+ */
+typedef struct odp_crypto_auth_capability_t {
+ /** Digest length in bytes */
+ uint32_t digest_len;
+
+ /** Key length in bytes */
+ uint32_t key_len;
+
+ /** Additional Authenticated Data (AAD) lengths */
+ struct {
+ /** Minimum AAD length in bytes */
+ uint32_t min;
+
+ /** Maximum AAD length in bytes */
+ uint32_t max;
+
+ /** Increment of supported lengths between min and max
+ * (in bytes) */
+ uint32_t inc;
+ } aad_len;
+
+} odp_crypto_auth_capability_t;
+
+/**
* Query crypto capabilities
*
* Outputs crypto capabilities on success.
@@ -353,6 +440,45 @@ typedef struct odp_crypto_capability_t {
int odp_crypto_capability(odp_crypto_capability_t *capa);
/**
+ * Query supported cipher algorithm capabilities
+ *
+ * Outputs all supported configuration options for the algorithm. Output is
+ * sorted (from the smallest to the largest) first by key length, then by IV
+ * length.
+ *
+ * @param cipher Cipher algorithm
+ * @param[out] capa Array of capability structures for output
+ * @param num Maximum number of capability structures to output
+ *
+ * @return Number of capability structures for the algorithm. If this is larger
+ * than 'num', only 'num' first structures were output and application
+ * may call the function again with a larger value of 'num'.
+ * @retval <0 on failure
+ */
+int odp_crypto_cipher_capability(odp_cipher_alg_t cipher,
+ odp_crypto_cipher_capability_t capa[],
+ int num);
+
+/**
+ * Query supported authentication algorithm capabilities
+ *
+ * Outputs all supported configuration options for the algorithm. Output is
+ * sorted (from the smallest to the largest) first by digest length, then by key
+ * length.
+ *
+ * @param auth Authentication algorithm
+ * @param[out] capa Array of capability structures for output
+ * @param num Maximum number of capability structures to output
+ *
+ * @return Number of capability structures for the algorithm. If this is larger
+ * than 'num', only 'num' first structures were output and application
+ * may call the function again with a larger value of 'num'.
+ * @retval <0 on failure
+ */
+int odp_crypto_auth_capability(odp_auth_alg_t auth,
+ odp_crypto_auth_capability_t capa[], int num);
+
+/**
* Crypto session creation (synchronous)
*
* @param param Session parameters
commit 87b505031e709ac218eece691bb2e98b2987702a
Author: Petri Savolainen <petri.savolainen(a)nokia.com>
Date: Thu Dec 8 16:05:23 2016 +0200
linux-gen: crypto: rename params to param
Use new _param_t type names instead of _params_t.
Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Nikhil Agarwal <nikhil.agarwal(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 7b104af..7b4eb61 100644
--- a/platform/linux-generic/include/odp_crypto_internal.h
+++ b/platform/linux-generic/include/odp_crypto_internal.h
@@ -23,7 +23,7 @@ typedef struct odp_crypto_generic_session odp_crypto_generic_session_t;
* Algorithm handler function prototype
*/
typedef
-odp_crypto_alg_err_t (*crypto_func_t)(odp_crypto_op_params_t *params,
+odp_crypto_alg_err_t (*crypto_func_t)(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session);
/**
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 7e686ff..70d3a97 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -69,24 +69,24 @@ void free_session(odp_crypto_generic_session_t *session)
}
static odp_crypto_alg_err_t
-null_crypto_routine(odp_crypto_op_params_t *params ODP_UNUSED,
+null_crypto_routine(odp_crypto_op_param_t *param ODP_UNUSED,
odp_crypto_generic_session_t *session ODP_UNUSED)
{
return ODP_CRYPTO_ALG_ERR_NONE;
}
static
-odp_crypto_alg_err_t md5_gen(odp_crypto_op_params_t *params,
+odp_crypto_alg_err_t md5_gen(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
- uint8_t *data = odp_packet_data(params->out_pkt);
+ uint8_t *data = odp_packet_data(param->out_pkt);
uint8_t *icv = data;
- uint32_t len = params->auth_range.length;
+ uint32_t len = param->auth_range.length;
uint8_t hash[EVP_MAX_MD_SIZE];
/* Adjust pointer for beginning of area to auth */
- data += params->auth_range.offset;
- icv += params->hash_result_offset;
+ data += param->auth_range.offset;
+ icv += param->hash_result_offset;
/* Hash it */
HMAC(EVP_md5(),
@@ -104,19 +104,19 @@ odp_crypto_alg_err_t md5_gen(odp_crypto_op_params_t *params,
}
static
-odp_crypto_alg_err_t md5_check(odp_crypto_op_params_t *params,
+odp_crypto_alg_err_t md5_check(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
- uint8_t *data = odp_packet_data(params->out_pkt);
+ uint8_t *data = odp_packet_data(param->out_pkt);
uint8_t *icv = data;
- uint32_t len = params->auth_range.length;
+ uint32_t len = param->auth_range.length;
uint32_t bytes = session->auth.data.md5.bytes;
uint8_t hash_in[EVP_MAX_MD_SIZE];
uint8_t hash_out[EVP_MAX_MD_SIZE];
/* Adjust pointer for beginning of area to auth */
- data += params->auth_range.offset;
- icv += params->hash_result_offset;
+ data += param->auth_range.offset;
+ icv += param->hash_result_offset;
/* Copy current value out and clear it before authentication */
memset(hash_in, 0, sizeof(hash_in));
@@ -142,17 +142,17 @@ odp_crypto_alg_err_t md5_check(odp_crypto_op_params_t *params,
}
static
-odp_crypto_alg_err_t sha256_gen(odp_crypto_op_params_t *params,
+odp_crypto_alg_err_t sha256_gen(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
- uint8_t *data = odp_packet_data(params->out_pkt);
+ uint8_t *data = odp_packet_data(param->out_pkt);
uint8_t *icv = data;
- uint32_t len = params->auth_range.length;
+ uint32_t len = param->auth_range.length;
uint8_t hash[EVP_MAX_MD_SIZE];
/* Adjust pointer for beginning of area to auth */
- data += params->auth_range.offset;
- icv += params->hash_result_offset;
+ data += param->auth_range.offset;
+ icv += param->hash_result_offset;
/* Hash it */
HMAC(EVP_sha256(),
@@ -170,19 +170,19 @@ odp_crypto_alg_err_t sha256_gen(odp_crypto_op_params_t *params,
}
static
-odp_crypto_alg_err_t sha256_check(odp_crypto_op_params_t *params,
+odp_crypto_alg_err_t sha256_check(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
- uint8_t *data = odp_packet_data(params->out_pkt);
+ uint8_t *data = odp_packet_data(param->out_pkt);
uint8_t *icv = data;
- uint32_t len = params->auth_range.length;
+ uint32_t len = param->auth_range.length;
uint32_t bytes = session->auth.data.sha256.bytes;
uint8_t hash_in[EVP_MAX_MD_SIZE];
uint8_t hash_out[EVP_MAX_MD_SIZE];
/* Adjust pointer for beginning of area to auth */
- data += params->auth_range.offset;
- icv += params->hash_result_offset;
+ data += param->auth_range.offset;
+ icv += param->hash_result_offset;
/* Copy current value out and clear it before authentication */
memset(hash_in, 0, sizeof(hash_in));
@@ -208,16 +208,16 @@ odp_crypto_alg_err_t sha256_check(odp_crypto_op_params_t *params,
}
static
-odp_crypto_alg_err_t aes_encrypt(odp_crypto_op_params_t *params,
+odp_crypto_alg_err_t aes_encrypt(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
- uint8_t *data = odp_packet_data(params->out_pkt);
- uint32_t len = params->cipher_range.length;
+ uint8_t *data = odp_packet_data(param->out_pkt);
+ uint32_t len = param->cipher_range.length;
unsigned char iv_enc[AES_BLOCK_SIZE];
void *iv_ptr;
- if (params->override_iv_ptr)
- iv_ptr = params->override_iv_ptr;
+ if (param->override_iv_ptr)
+ iv_ptr = param->override_iv_ptr;
else if (session->cipher.iv.data)
iv_ptr = session->cipher.iv.data;
else
@@ -231,7 +231,7 @@ odp_crypto_alg_err_t aes_encrypt(odp_crypto_op_params_t *params,
memcpy(iv_enc, iv_ptr, AES_BLOCK_SIZE);
/* Adjust pointer for beginning of area to cipher */
- data += params->cipher_range.offset;
+ data += param->cipher_range.offset;
/* Encrypt it */
AES_cbc_encrypt(data, data, len, &session->cipher.data.aes.key,
iv_enc, AES_ENCRYPT);
@@ -240,16 +240,16 @@ odp_crypto_alg_err_t aes_encrypt(odp_crypto_op_params_t *params,
}
static
-odp_crypto_alg_err_t aes_decrypt(odp_crypto_op_params_t *params,
+odp_crypto_alg_err_t aes_decrypt(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
- uint8_t *data = odp_packet_data(params->out_pkt);
- uint32_t len = params->cipher_range.length;
+ uint8_t *data = odp_packet_data(param->out_pkt);
+ uint32_t len = param->cipher_range.length;
unsigned char iv_enc[AES_BLOCK_SIZE];
void *iv_ptr;
- if (params->override_iv_ptr)
- iv_ptr = params->override_iv_ptr;
+ if (param->override_iv_ptr)
+ iv_ptr = param->override_iv_ptr;
else if (session->cipher.iv.data)
iv_ptr = session->cipher.iv.data;
else
@@ -263,7 +263,7 @@ odp_crypto_alg_err_t aes_decrypt(odp_crypto_op_params_t *params,
memcpy(iv_enc, iv_ptr, AES_BLOCK_SIZE);
/* Adjust pointer for beginning of area to cipher */
- data += params->cipher_range.offset;
+ data += param->cipher_range.offset;
/* Encrypt it */
AES_cbc_encrypt(data, data, len, &session->cipher.data.aes.key,
iv_enc, AES_DECRYPT);
@@ -272,21 +272,21 @@ odp_crypto_alg_err_t aes_decrypt(odp_crypto_op_params_t *params,
}
static
-int process_aes_params(odp_crypto_generic_session_t *session,
- odp_crypto_session_params_t *params)
+int process_aes_param(odp_crypto_generic_session_t *session,
+ odp_crypto_session_param_t *param)
{
/* Verify IV len is either 0 or 16 */
- if (!((0 == params->iv.length) || (16 == params->iv.length)))
+ if (!((0 == param->iv.length) || (16 == param->iv.length)))
return -1;
/* Set function */
- if (ODP_CRYPTO_OP_ENCODE == params->op) {
+ if (ODP_CRYPTO_OP_ENCODE == param->op) {
session->cipher.func = aes_encrypt;
- AES_set_encrypt_key(params->cipher_key.data, 128,
+ AES_set_encrypt_key(param->cipher_key.data, 128,
&session->cipher.data.aes.key);
} else {
session->cipher.func = aes_decrypt;
- AES_set_decrypt_key(params->cipher_key.data, 128,
+ AES_set_decrypt_key(param->cipher_key.data, 128,
&session->cipher.data.aes.key);
}
@@ -294,30 +294,30 @@ int process_aes_params(odp_crypto_generic_session_t *session,
}
static
-odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_params_t *params,
+odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
- uint8_t *data = odp_packet_data(params->out_pkt);
- uint32_t plain_len = params->cipher_range.length;
- uint8_t *aad_head = data + params->auth_range.offset;
- uint8_t *aad_tail = data + params->cipher_range.offset +
- params->cipher_range.length;
- uint32_t auth_len = params->auth_range.length;
+ uint8_t *data = odp_packet_data(param->out_pkt);
+ uint32_t plain_len = param->cipher_range.length;
+ uint8_t *aad_head = data + param->auth_range.offset;
+ uint8_t *aad_tail = data + param->cipher_range.offset +
+ param->cipher_range.length;
+ uint32_t auth_len = param->auth_range.length;
unsigned char iv_enc[AES_BLOCK_SIZE];
void *iv_ptr;
- uint8_t *tag = data + params->hash_result_offset;
+ uint8_t *tag = data + param->hash_result_offset;
- if (params->override_iv_ptr)
- iv_ptr = params->override_iv_ptr;
+ if (param->override_iv_ptr)
+ iv_ptr = param->override_iv_ptr;
else if (session->cipher.iv.data)
iv_ptr = session->cipher.iv.data;
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
/* All cipher data must be part of the authentication */
- if (params->auth_range.offset > params->cipher_range.offset ||
- params->auth_range.offset + auth_len <
- params->cipher_range.offset + plain_len)
+ if (param->auth_range.offset > param->cipher_range.offset ||
+ param->auth_range.offset + auth_len <
+ param->cipher_range.offset + plain_len)
return ODP_CRYPTO_ALG_ERR_DATA_SIZE;
/*
@@ -328,7 +328,7 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_params_t *params,
memcpy(iv_enc, iv_ptr, AES_BLOCK_SIZE);
/* Adjust pointer for beginning of area to cipher/auth */
- uint8_t *plaindata = data + params->cipher_range.offset;
+ uint8_t *plaindata = data + param->cipher_range.offset;
/* Encrypt it */
EVP_CIPHER_CTX *ctx = session->cipher.data.aes_gcm.ctx;
@@ -359,30 +359,30 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_crypto_op_params_t *params,
}
static
-odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_params_t *params,
+odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
- uint8_t *data = odp_packet_data(params->out_pkt);
- uint32_t cipher_len = params->cipher_range.length;
- uint8_t *aad_head = data + params->auth_range.offset;
- uint8_t *aad_tail = data + params->cipher_range.offset +
- params->cipher_range.length;
- uint32_t auth_len = params->auth_range.length;
+ uint8_t *data = odp_packet_data(param->out_pkt);
+ uint32_t cipher_len = param->cipher_range.length;
+ uint8_t *aad_head = data + param->auth_range.offset;
+ uint8_t *aad_tail = data + param->cipher_range.offset +
+ param->cipher_range.length;
+ uint32_t auth_len = param->auth_range.length;
unsigned char iv_enc[AES_BLOCK_SIZE];
void *iv_ptr;
- uint8_t *tag = data + params->hash_result_offset;
+ uint8_t *tag = data + param->hash_result_offset;
- if (params->override_iv_ptr)
- iv_ptr = params->override_iv_ptr;
+ if (param->override_iv_ptr)
+ iv_ptr = param->override_iv_ptr;
else if (session->cipher.iv.data)
iv_ptr = session->cipher.iv.data;
else
return ODP_CRYPTO_ALG_ERR_IV_INVALID;
/* All cipher data must be part of the authentication */
- if (params->auth_range.offset > params->cipher_range.offset ||
- params->auth_range.offset + auth_len <
- params->cipher_range.offset + cipher_len)
+ if (param->auth_range.offset > param->cipher_range.offset ||
+ param->auth_range.offset + auth_len <
+ param->cipher_range.offset + cipher_len)
return ODP_CRYPTO_ALG_ERR_DATA_SIZE;
/*
@@ -393,7 +393,7 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_params_t *params,
memcpy(iv_enc, iv_ptr, AES_BLOCK_SIZE);
/* Adjust pointer for beginning of area to cipher/auth */
- uint8_t *cipherdata = data + params->cipher_range.offset;
+ uint8_t *cipherdata = data + param->cipher_range.offset;
/* Encrypt it */
EVP_CIPHER_CTX *ctx = session->cipher.data.aes_gcm.ctx;
int plain_len = 0;
@@ -425,18 +425,18 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_crypto_op_params_t *params,
}
static
-int process_aes_gcm_params(odp_crypto_generic_session_t *session,
- odp_crypto_session_params_t *params)
+int process_aes_gcm_param(odp_crypto_generic_session_t *session,
+ odp_crypto_session_param_t *param)
{
/* Verify Key len is 16 */
- if (params->cipher_key.length != 16)
+ if (param->cipher_key.length != 16)
return -1;
/* Set function */
EVP_CIPHER_CTX *ctx =
session->cipher.data.aes_gcm.ctx = EVP_CIPHER_CTX_new();
- if (ODP_CRYPTO_OP_ENCODE == params->op) {
+ if (ODP_CRYPTO_OP_ENCODE == param->op) {
session->cipher.func = aes_gcm_encrypt;
EVP_EncryptInit_ex(ctx, EVP_aes_128_gcm(), NULL, NULL, NULL);
} else {
@@ -445,29 +445,29 @@ int process_aes_gcm_params(odp_crypto_generic_session_t *session,
}
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN,
- params->iv.length, NULL);
- if (ODP_CRYPTO_OP_ENCODE == params->op) {
+ param->iv.length, NULL);
+ if (ODP_CRYPTO_OP_ENCODE == param->op) {
EVP_EncryptInit_ex(ctx, NULL, NULL,
- params->cipher_key.data, NULL);
+ param->cipher_key.data, NULL);
} else {
EVP_DecryptInit_ex(ctx, NULL, NULL,
- params->cipher_key.data, NULL);
+ param->cipher_key.data, NULL);
}
return 0;
}
static
-odp_crypto_alg_err_t des_encrypt(odp_crypto_op_params_t *params,
+odp_crypto_alg_err_t des_encrypt(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
- uint8_t *data = odp_packet_data(params->out_pkt);
- uint32_t len = params->cipher_range.length;
+ uint8_t *data = odp_packet_data(param->out_pkt);
+ uint32_t len = param->cipher_range.length;
DES_cblock iv;
void *iv_ptr;
- if (params->override_iv_ptr)
- iv_ptr = params->override_iv_ptr;
+ if (param->override_iv_ptr)
+ iv_ptr = param->override_iv_ptr;
else if (session->cipher.iv.data)
iv_ptr = session->cipher.iv.data;
else
@@ -481,7 +481,7 @@ odp_crypto_alg_err_t des_encrypt(odp_crypto_op_params_t *params,
memcpy(iv, iv_ptr, sizeof(iv));
/* Adjust pointer for beginning of area to cipher */
- data += params->cipher_range.offset;
+ data += param->cipher_range.offset;
/* Encrypt it */
DES_ede3_cbc_encrypt(data,
data,
@@ -496,16 +496,16 @@ odp_crypto_alg_err_t des_encrypt(odp_crypto_op_params_t *params,
}
static
-odp_crypto_alg_err_t des_decrypt(odp_crypto_op_params_t *params,
+odp_crypto_alg_err_t des_decrypt(odp_crypto_op_param_t *param,
odp_crypto_generic_session_t *session)
{
- uint8_t *data = odp_packet_data(params->out_pkt);
- uint32_t len = params->cipher_range.length;
+ uint8_t *data = odp_packet_data(param->out_pkt);
+ uint32_t len = param->cipher_range.length;
DES_cblock iv;
void *iv_ptr;
- if (params->override_iv_ptr)
- iv_ptr = params->override_iv_ptr;
+ if (param->override_iv_ptr)
+ iv_ptr = param->override_iv_ptr;
else if (session->cipher.iv.data)
iv_ptr = session->cipher.iv.data;
else
@@ -519,7 +519,7 @@ odp_crypto_alg_err_t des_decrypt(odp_crypto_op_params_t *params,
memcpy(iv, iv_ptr, sizeof(iv));
/* Adjust pointer for beginning of area to cipher */
- data += params->cipher_range.offset;
+ data += param->cipher_range.offset;
/* Decrypt it */
DES_ede3_cbc_encrypt(data,
@@ -535,37 +535,37 @@ odp_crypto_alg_err_t des_decrypt(odp_crypto_op_params_t *params,
}
static
-int process_des_params(odp_crypto_generic_session_t *session,
- odp_crypto_session_params_t *params)
+int process_des_param(odp_crypto_generic_session_t *session,
+ odp_crypto_session_param_t *param)
{
/* Verify IV len is either 0 or 8 */
- if (!((0 == params->iv.length) || (8 == params->iv.length)))
+ if (!((0 == param->iv.length) || (8 == param->iv.length)))
return -1;
/* Set function */
- if (ODP_CRYPTO_OP_ENCODE == params->op)
+ if (ODP_CRYPTO_OP_ENCODE == param->op)
session->cipher.func = des_encrypt;
else
session->cipher.func = des_decrypt;
/* Convert keys */
- DES_set_key((DES_cblock *)¶ms->cipher_key.data[0],
+ DES_set_key((DES_cblock *)¶m->cipher_key.data[0],
&session->cipher.data.des.ks1);
- DES_set_key((DES_cblock *)¶ms->cipher_key.data[8],
+ DES_set_key((DES_cblock *)¶m->cipher_key.data[8],
&session->cipher.data.des.ks2);
- DES_set_key((DES_cblock *)¶ms->cipher_key.data[16],
+ DES_set_key((DES_cblock *)¶m->cipher_key.data[16],
&session->cipher.data.des.ks3);
return 0;
}
static
-int process_md5_params(odp_crypto_generic_session_t *session,
- odp_crypto_session_params_t *params,
- uint32_t bits)
+int process_md5_param(odp_crypto_generic_session_t *session,
+ odp_crypto_session_param_t *param,
+ uint32_t bits)
{
/* Set function */
- if (ODP_CRYPTO_OP_ENCODE == params->op)
+ if (ODP_CRYPTO_OP_ENCODE == param->op)
session->auth.func = md5_gen;
else
session->auth.func = md5_check;
@@ -574,18 +574,18 @@ int process_md5_params(odp_crypto_generic_session_t *session,
session->auth.data.md5.bytes = bits / 8;
/* Convert keys */
- memcpy(session->auth.data.md5.key, params->auth_key.data, 16);
+ memcpy(session->auth.data.md5.key, param->auth_key.data, 16);
return 0;
}
static
-int process_sha256_params(odp_crypto_generic_session_t *session,
- odp_crypto_session_params_t *params,
- uint32_t bits)
+int process_sha256_param(odp_crypto_generic_session_t *session,
+ odp_crypto_session_param_t *param,
+ uint32_t bits)
{
/* Set function */
- if (ODP_CRYPTO_OP_ENCODE == params->op)
+ if (ODP_CRYPTO_OP_ENCODE == param->op)
session->auth.func = sha256_gen;
else
session->auth.func = sha256_check;
@@ -594,7 +594,7 @@ int process_sha256_params(odp_crypto_generic_session_t *session,
session->auth.data.sha256.bytes = bits / 8;
/* Convert keys */
- memcpy(session->auth.data.sha256.key, params->auth_key.data, 32);
+ memcpy(session->auth.data.sha256.key, param->auth_key.data, 32);
return 0;
}
@@ -624,7 +624,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa)
}
int
-odp_crypto_session_create(odp_crypto_session_params_t *params,
+odp_crypto_session_create(odp_crypto_session_param_t *param,
odp_crypto_session_t *session_out,
odp_crypto_ses_create_err_t *status)
{
@@ -642,41 +642,41 @@ odp_crypto_session_create(odp_crypto_session_params_t *params,
}
/* Derive order */
- if (ODP_CRYPTO_OP_ENCODE == params->op)
- session->do_cipher_first = params->auth_cipher_text;
+ if (ODP_CRYPTO_OP_ENCODE == param->op)
+ session->do_cipher_first = param->auth_cipher_text;
else
- session->do_cipher_first = !params->auth_cipher_text;
+ session->do_cipher_first = !param->auth_cipher_text;
/* Copy stuff over */
- session->op = params->op;
- session->compl_queue = params->compl_queue;
- session->cipher.alg = params->cipher_alg;
- session->cipher.iv.data = params->iv.data;
- session->cipher.iv.len = params->iv.length;
- session->auth.alg = params->auth_alg;
- session->output_pool = params->output_pool;
+ session->op = param->op;
+ session->compl_queue = param->compl_queue;
+ session->cipher.alg = param->cipher_alg;
+ session->cipher.iv.data = param->iv.data;
+ session->cipher.iv.len = param->iv.length;
+ session->auth.alg = param->auth_alg;
+ session->output_pool = param->output_pool;
/* Process based on cipher */
- switch (params->cipher_alg) {
+ switch (param->cipher_alg) {
case ODP_CIPHER_ALG_NULL:
session->cipher.func = null_crypto_routine;
rc = 0;
break;
case ODP_CIPHER_ALG_DES:
case ODP_CIPHER_ALG_3DES_CBC:
- rc = process_des_params(session, params);
+ rc = process_des_param(session, param);
break;
case ODP_CIPHER_ALG_AES128_CBC:
- rc = process_aes_params(session, params);
+ rc = process_aes_param(session, param);
break;
case ODP_CIPHER_ALG_AES128_GCM:
/* AES-GCM requires to do both auth and
* cipher at the same time */
- if (params->auth_alg != ODP_AUTH_ALG_AES128_GCM) {
+ if (param->auth_alg != ODP_AUTH_ALG_AES128_GCM) {
rc = -1;
break;
}
- rc = process_aes_gcm_params(session, params);
+ rc = process_aes_gcm_param(session, param);
break;
default:
rc = -1;
@@ -689,21 +689,21 @@ odp_crypto_session_create(odp_crypto_session_params_t *params,
}
/* Process based on auth */
- switch (params->auth_alg) {
+ switch (param->auth_alg) {
case ODP_AUTH_ALG_NULL:
session->auth.func = null_crypto_routine;
rc = 0;
break;
case ODP_AUTH_ALG_MD5_96:
- rc = process_md5_params(session, params, 96);
+ rc = process_md5_param(session, param, 96);
break;
case ODP_AUTH_ALG_SHA256_128:
- rc = process_sha256_params(session, params, 128);
+ rc = process_sha256_param(session, param, 128);
break;
case ODP_AUTH_ALG_AES128_GCM:
/* AES-GCM requires to do both auth and
* cipher at the same time */
- if (params->cipher_alg != ODP_CIPHER_ALG_AES128_GCM) {
+ if (param->cipher_alg != ODP_CIPHER_ALG_AES128_GCM) {
rc = -1;
break;
}
@@ -738,7 +738,7 @@ int odp_crypto_session_destroy(odp_crypto_session_t session)
}
int
-odp_crypto_operation(odp_crypto_op_params_t *params,
+odp_crypto_operation(odp_crypto_op_param_t *param,
odp_bool_t *posted,
odp_crypto_op_result_t *result)
{
@@ -747,42 +747,42 @@ odp_crypto_operation(odp_crypto_op_params_t *params,
odp_crypto_generic_session_t *session;
odp_crypto_op_result_t local_result;
- session = (odp_crypto_generic_session_t *)(intptr_t)params->session;
+ session = (odp_crypto_generic_session_t *)(intptr_t)param->session;
/* Resolve output buffer */
- if (ODP_PACKET_INVALID == params->out_pkt &&
+ if (ODP_PACKET_INVALID == param->out_pkt &&
ODP_POOL_INVALID != session->output_pool)
- params->out_pkt = odp_packet_alloc(session->output_pool,
- odp_packet_len(params->pkt));
+ param->out_pkt = odp_packet_alloc(session->output_pool,
+ odp_packet_len(param->pkt));
- if (odp_unlikely(ODP_PACKET_INVALID == params->out_pkt)) {
+ if (odp_unlikely(ODP_PACKET_INVALID == param->out_pkt)) {
ODP_DBG("Alloc failed.\n");
return -1;
}
- if (params->pkt != params->out_pkt) {
- (void)odp_packet_copy_from_pkt(params->out_pkt,
+ if (param->pkt != param->out_pkt) {
+ (void)odp_packet_copy_from_pkt(param->out_pkt,
0,
- params->pkt,
+ param->pkt,
0,
- odp_packet_len(params->pkt));
- _odp_packet_copy_md_to_packet(params->pkt, params->out_pkt);
- odp_packet_free(params->pkt);
- params->pkt = ODP_PACKET_INVALID;
+ odp_packet_len(param->pkt));
+ _odp_packet_copy_md_to_packet(param->pkt, param->out_pkt);
+ odp_packet_free(param->pkt);
+ param->pkt = ODP_PACKET_INVALID;
}
/* Invoke the functions */
if (session->do_cipher_first) {
- rc_cipher = session->cipher.func(params, session);
- rc_auth = session->auth.func(params, session);
+ rc_cipher = session->cipher.func(param, session);
+ rc_auth = session->auth.func(param, session);
} else {
- rc_auth = session->auth.func(params, session);
- rc_cipher = session->cipher.func(params, session);
+ rc_auth = session->auth.func(param, session);
+ rc_cipher = session->cipher.func(param, session);
}
/* Fill in result */
- local_result.ctx = params->ctx;
- local_result.pkt = params->out_pkt;
+ local_result.ctx = param->ctx;
+ local_result.pkt = param->out_pkt;
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;
@@ -797,7 +797,7 @@ odp_crypto_operation(odp_crypto_op_params_t *params,
odp_crypto_generic_op_result_t *op_result;
/* Linux generic will always use packet for completion event */
- completion_event = odp_packet_to_event(params->out_pkt);
+ completion_event = odp_packet_to_event(param->out_pkt);
_odp_buffer_event_type_set(
odp_buffer_from_event(completion_event),
ODP_EVENT_CRYPTO_COMPL);
commit 8acf38df013c6d89e5a2dc3f84fb928e97d27752
Author: Petri Savolainen <petri.savolainen(a)nokia.com>
Date: Thu Dec 8 16:25:32 2016 +0200
api: crypto: rename _params_t to _param_t
The common naming convention for parameter types is _param_t
(without 's'). Old type names remain for backwards compatibility,
but are deprecated.
Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Nikhil Agarwal <nikhil.agarwal(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 0cb8814..f24f527 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -171,7 +171,7 @@ typedef struct odp_crypto_data_range {
/**
* Crypto API session creation parameters
*/
-typedef struct odp_crypto_session_params {
+typedef struct odp_crypto_session_param_t {
odp_crypto_op_t op; /**< Encode versus decode */
odp_bool_t auth_cipher_text; /**< Authenticate/cipher ordering */
odp_crypto_op_mode_t pref_mode; /**< Preferred sync vs async */
@@ -182,7 +182,10 @@ typedef struct odp_crypto_session_params {
odp_crypto_key_t auth_key; /**< Authentication key */
odp_queue_t compl_queue; /**< Async mode completion event queue */
odp_pool_t output_pool; /**< Output buffer pool */
-} odp_crypto_session_params_t;
+} odp_crypto_session_param_t;
+
+/** @deprecated Use odp_crypto_session_param_t instead */
+typedef odp_crypto_session_param_t odp_crypto_session_params_t;
/**
* @var odp_crypto_session_params_t::auth_cipher_text
@@ -209,7 +212,7 @@ typedef struct odp_crypto_session_params {
/**
* Crypto API per packet operation parameters
*/
-typedef struct odp_crypto_op_params {
+typedef struct odp_crypto_op_param_t {
odp_crypto_session_t session; /**< Session handle from creation */
void *ctx; /**< User context */
odp_packet_t pkt; /**< Input packet buffer */
@@ -218,7 +221,10 @@ typedef struct odp_crypto_op_params {
uint32_t hash_result_offset; /**< Offset from start of packet buffer for hash result */
odp_crypto_data_range_t cipher_range; /**< Data range to apply cipher */
odp_crypto_data_range_t auth_range; /**< Data range to authenticate */
-} odp_crypto_op_params_t;
+} odp_crypto_op_param_t;
+
+/** @deprecated Use odp_crypto_op_param_t instead */
+typedef odp_crypto_op_param_t odp_crypto_op_params_t;
/**
* @var odp_crypto_op_params_t::pkt
@@ -349,14 +355,14 @@ int odp_crypto_capability(odp_crypto_capability_t *capa);
/**
* Crypto session creation (synchronous)
*
- * @param params Session parameters
+ * @param param Session parameters
* @param session Created session else ODP_CRYPTO_SESSION_INVALID
* @param status Failure code if unsuccessful
*
* @retval 0 on success
* @retval <0 on failure
*/
-int odp_crypto_session_create(odp_crypto_session_params_t *params,
+int odp_crypto_session_create(odp_crypto_session_param_t *param,
odp_crypto_session_t *session,
odp_crypto_ses_create_err_t *status);
@@ -410,14 +416,14 @@ void odp_crypto_compl_free(odp_crypto_compl_t completion_event);
* If "posted" returns TRUE the result will be delivered via the completion
* queue specified when the session was created.
*
- * @param params Operation parameters
+ * @param param Operation parameters
* @param posted Pointer to return posted, TRUE for async operation
* @param result Results of operation (when posted returns FALSE)
*
* @retval 0 on success
* @retval <0 on failure
*/
-int odp_crypto_operation(odp_crypto_op_params_t *params,
+int odp_crypto_operation(odp_crypto_op_param_t *param,
odp_bool_t *posted,
odp_crypto_op_result_t *result);
-----------------------------------------------------------------------
Summary of changes:
example/ipsec/odp_ipsec.c | 6 +-
example/ipsec/odp_ipsec_cache.c | 4 +-
include/odp/api/spec/crypto.h | 441 ++++++++++++++-----
.../linux-generic/include/odp_crypto_internal.h | 21 +-
platform/linux-generic/odp_crypto.c | 489 +++++++++++++--------
test/common_plat/performance/odp_crypto.c | 9 +-
.../validation/api/crypto/odp_crypto_test_inp.c | 120 +++--
7 files changed, 744 insertions(+), 346 deletions(-)
hooks/post-receive
--
8 years, 2 months
- 1
- 0