[COMMIT] branch next updated. v1.19.0.2_tigermoth-324-g8511e88c
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 8511e88c69f5bf7cd251875610370aa334878788 (commit)
via 898d834f8c7164e4ee1a99fbe9115b3c7ca5bd67 (commit)
via 42fd89a1ee51a2535192650a8cffc05c32b0da12 (commit)
via c3a6bf82fa3b2cb742eb33ff66096f6f79be2c32 (commit)
via a9402619bd06f1e1ac9ada694484a104fcfff7d5 (commit)
via 6f9209f69f69ba8cfe51ff440f978b7d82d13245 (commit)
via d24149493d8733fc898fabbd718492717ad0e498 (commit)
via 5de83b54f16d8078b306f4e89e299154eb5972a2 (commit)
via 7d46bfe20a88358546859078cb7d09a1ff49fb6f (commit)
via 4a8039c26c7cc5aaa9b4485315879fba8fadacf7 (commit)
via 51254145370423631b3ac778865e06be2e418141 (commit)
via fa2fb9f553142adaa7526069ce3070814f915c32 (commit)
via 64991d2a01c36513e8c1a9518da9a56cb9f32594 (commit)
via efb3dc0e6524b32442dc50f5ced9ce1f1d6fd948 (commit)
via 02b60f6739a3980cab9cd1afca5dcc1fedd84a1e (commit)
via 406dc695c3fc756bac6ecef3c7d67348699e7a25 (commit)
via 1bb388931c9101f38703142fda4f6b9e0bff52c4 (commit)
via 6fd24dd1f81b2ca5442d19bd66ffd902de651934 (commit)
via 833470a13c2068890bfacdbf99bacce55bed2db2 (commit)
via 374301a2aa5ba6dfa81aa4c70fd24ed59141c012 (commit)
via f913948f5daa4cb1f71467d872b5380974b04f2d (commit)
via f703d49c196a6c6c9d29d3c7b04c02d727795a2c (commit)
via 5eb5837adf64b14e795483a6cdf4e83124c56be8 (commit)
via 4964f08fa748eb61949fff147e930be72555d233 (commit)
via 263a5bb884c3e274174b1d1e4e0ae497143b1f81 (commit)
via 3e007fea33316e1d7d66cd7ea19541a1653b501c (commit)
via f8eda649cd915654175c9723aca75adaae88c3d3 (commit)
via 96a177a6322a9d8fad99d43271d1b98ecd5d12a5 (commit)
via 3529f3b8713021e45c7dbdd81f839d8b9049efcc (commit)
via af055783f975e2b8b9e443565b3abdc9f7946ade (commit)
via 8d9936c45c4a9f8db9142057d8acee41d54e0b51 (commit)
via 2a6485f25dc9b0612cccf40a2360dc6d40becb78 (commit)
via 91fee166b0dbf4949f1a1786e167a6948b1e8f52 (commit)
via 01e4772d22537772001714318d5f501f082b6c5e (commit)
via f8bbdfc98be5d86dea67cc34ee97a4b69c052d61 (commit)
via 295bf070e27323060ba607805dd95ce0353a9461 (commit)
via ae66a05708d04f332d85fb258196d9045ebc303c (commit)
via eb3a816cb0fa6c5e76b25398a0ac280c769dcb49 (commit)
via 1ee7da08721452033dd7b0537e62ec1191291120 (commit)
via eb9f47e9ce077e089575183abbfe00f2fce2fd41 (commit)
via 37bb9253fe0951f6dba10349e4ff472890615006 (commit)
via 70cf3e1941797acc0c3f1e2990f4490c249ee1a8 (commit)
via 7d457a070d8fd304262f28da9f86712b136ab0c0 (commit)
via 5c1c8bca96169bb3ce312b0d5cca39f7d9bc4372 (commit)
via 9bdb18d5ee876212bdac3098266a522f7bd25efb (commit)
via 044b9ed53fa1845d99f0aee3f402a5dcfed3c16e (commit)
via d901665b489d0470af24e757208488011515e0ad (commit)
via f36139ea56706df2534a269039b3effca7169234 (commit)
via 27b0ca668ec90730f6329185e23a026caf0b9064 (commit)
via c290e20364469774d6091426144645e53c257867 (commit)
via 96adbf43bcd91c63dd8c4c248b439ff3150bd1cc (commit)
via 7563bcf7716cdedf82a9a4f2a8121c45f669a45c (commit)
via 55daa2b0c3b024bfe9b17966fe3d7f10aaa27363 (commit)
via bab62d6ee6e1072bedbb49bcf747fecfb99b24df (commit)
via 6cede326ec2f9d9d5965419c1963a7cd541a7802 (commit)
via e93e8c3ea659c9a64aef3f53ae8932b31dfcef95 (commit)
via 5d1f07269026cdc371973a5edb2373113698e3c8 (commit)
via 3bf94540be3400cb741903b9b44ddc62b14cf397 (commit)
via b6e973744e52db038d9e0886fcaef014eff05cb5 (commit)
via f30d79bf8689dda7554b5c3d1025fb9030135ab7 (commit)
via 39502aa8b1a01732b012a424ca6587030d2e0a09 (commit)
via da5d27b57a0a3c8389c0a0f8c5747308419a094a (commit)
via 207efebdb9ca6d329cc89b272865559f5eeff182 (commit)
via 12b368d14e19761b7aabc4cac04918582253052b (commit)
via c73aaee1959377064cecccb6158b225de3f13db5 (commit)
via 7263734ca83fc439d7b491149cf07fa3f569b539 (commit)
via e9e6dcaa53b16b4a081bc87ad971accd45180d8d (commit)
via 33e0abebe03ed2095ff44780241e8b63166e36d9 (commit)
via 9eb433d73e9efae2c7075d4ac51716de5f4c2ac1 (commit)
via 64990e412ef6007ef6257f8b1640245ac630a676 (commit)
via f9c09aa73f0903e969fbbbacbf90fb9b7244edca (commit)
via 4a8115e12dad1f2a522143ded2fabe3f5e5c631c (commit)
via d429c89da5375b6b01b310ee92eeb1d4f07b10b9 (commit)
via cc92704bedc6ee2c940bb858110bbbdac6d7cb30 (commit)
via 8ec09bb45b2f4ea21b56e2d5dc4b804755be8d6e (commit)
via eddcf556d49b1d44e018624b9da8ba9d42fdacb5 (commit)
via 386b4d88d7b6320d60da438c20e92d1e41f5fd82 (commit)
via 01af3741a5cf6909347254cf0a42bccf185dc561 (commit)
via 6459109ccb46369a8d45d531c76e54c4267b30d6 (commit)
via 4dc8160d4897a041a14de578c3fc777fa27e78f5 (commit)
via 13b3e7ee716c9f5a296817b5143542d736ae3595 (commit)
via b68aa21885ec3bdfa914c66d811662efbf380127 (commit)
via f2be51f38a5115b5f5e2d6ee59df645f624adb7a (commit)
via 898d8b479149308de40331bf3a646bca1c99449e (commit)
via 794e94ae421c9587df1a11ff3027e6076974ec23 (commit)
via 93774c205c20951e51b0ed8d9c03bd21f95857bc (commit)
via a83e3c5ce2caa4ba4ba92f6e383c2a28d9aa3956 (commit)
via 97eb06b4cd2f57e9033f5d09a5e2b7a7b9d641b9 (commit)
via 6c0ffbf9689e36cc94d303d5ac30575fef041cbe (commit)
via 7d2f7dbf7d97cea348bb0499b684103fd8ad750f (commit)
via d184c87a690969571734fcd0c135da4f0da8ab55 (commit)
via ae53f9f80ee5fb06c2a3c8512a14bc1e773a58e4 (commit)
via bfb4e078a70e5510c1e3eb9deab5baeadb1c7fc3 (commit)
via 29cf3cb9e63df80849f1b1c59b2174086e7dfe47 (commit)
via 0817968af5f7ceebe96c4ca4661da2734304a329 (commit)
via ec1be8784c85b263f52e763b7890f097b2366212 (commit)
via 45bca0d051dd1f946e2d1ca188c481c1d179ad07 (commit)
via bb2e2a4b2a538cb437f5b3331c95a7b7dc573cb3 (commit)
via 7c8a226008d9f6fc9cd04f87539ab2715fef522a (commit)
via 594a4a0171ab82512b05a06eb34ff7acb73730ab (commit)
via 0b5dfae55a5a16e8c6b820f2458e48210cf9d762 (commit)
via e236795c0941fd7fc01b162a899b5dc42ba1d05e (commit)
via 9f39ccb68e57fa56a6d5e0b968292a2af0abc812 (commit)
via 415e197affb7eb3db5d806911d3e4b8e6ff05779 (commit)
via 3a817119eae94a2eb0c12d3a7e82eda35133b42c (commit)
via 01d1a8db345fed332416b3a6066ae7be1f28f0ad (commit)
via 168d7168447b99097f3bbe397ca76b6cb87d34da (commit)
via ebff1c15f1a0ccad57d26720ba7357a6b194d7fe (commit)
via 07b1c56979139118d47d15ff969365c08814dfd5 (commit)
via fa9fd355c5404b46c3cfaf375666796cc5333aca (commit)
via 173ef79e5306807d994869c7fb62c66ee82e4beb (commit)
via 055da43cde1c7a9acc674a2db3d9d2a7a3d1ff8f (commit)
via 0b880228e5e19bf2446f31f50e6df41c64e9502b (commit)
via fb41b3eb2075505cf2f77fad48a8b6b5ed5da302 (commit)
via d3d950ab1af5d1823a44950ea5a78e41dbe44dde (commit)
via c97618bb548f6b7c5f27f4de497f72f705e184f6 (commit)
via eee3800f367d61ccdb9051d484e133f618aad9e4 (commit)
via d32bca1d3bd13efdef8b01a459fa1ce13042975b (commit)
via 3cd53f15344c8ccf05dcf7812b4e2ff6a0b20961 (commit)
via e40699a6950fedea5ebce172299a9a6aa2dec424 (commit)
via ac4ac579bba217043604c3f4ad21ed0446214572 (commit)
via a0857f0d63bccdc8a16eab5068b63029ea84f005 (commit)
via cb97c894c05ef5a43dce262cf178ce5f54b1c806 (commit)
via 81b8a6b38d3f71102527675529edbe5293bcd30b (commit)
via f11e8bfd0599a717c457f2afd17e1a89febd5f8d (commit)
via aab53b9cd951dc5b4f76e4acee8aa602ddd9ad99 (commit)
via e1656a13f7a4a69dd743fd80c37a461bbdbf7d3f (commit)
via 42146102091d6201399a39eadbb4a897768c27ab (commit)
via 84f5ac969eb50e83cfa87a529e5a59a94196bcba (commit)
via 9c15202e04ce97601d9910ce013da22fc5a3a2b0 (commit)
via 177fc4cce6485a2bb80b99309eb7947e634d37fc (commit)
via 386f6f8932a7897fdf8adc60aed8de7ee0174ad4 (commit)
via 79f23e85b2c7e8f977efc2d10bb06639f08edbaf (commit)
via 602e207726055100b068eff1442c28fba95b8fac (commit)
via fad375346ab5cab78b44e7de8417527ca77e7ca6 (commit)
via 59debc98d1d5ced95da8c95cdbc714184128f1e6 (commit)
via e4f37812327c8bef175ea8425e37bf634dab0528 (commit)
via dad667fca2a4cd1ced4f394c07768f1930a50e40 (commit)
via 94113a141f65678e03017d0e6b78cefead095be4 (commit)
via 267dfa6f866f4864b57e6a60ad7cc5cfcc41aa53 (commit)
via 28b535dfe81390967d55d542e7eabceb082a1851 (commit)
via b2c33de3a7fb8d32b5d21f49889a22e0c91eb78a (commit)
via 855af1eded37fccc2dc5f9f5dc5126fed54bd8fe (commit)
via f77c88791ba1635e05f40d90fe7edcf2f582ab69 (commit)
via b8383f5f99cbd7a9293ccf2fe28dc07e31ef82e3 (commit)
via fbd352708cc471a7dfa5f8f895b26a54bec2524b (commit)
via 7a7b06ec55b16c2ed6a1d42f53bd6aaf66a11102 (commit)
via 49cded97529c9e0d3628ec063e9d6156a132a34d (commit)
via b403d6328379311697ba9b2387b7ed981ee85ce9 (commit)
via 5683fb61ec3e35286b107051db12bd27a4179c8d (commit)
via c536b8e033d4faadf2357c0a0607d835aec8967b (commit)
via 060d1603a92dc4c769dbb2f27994726592e5518a (commit)
via 02621a7c1f16f0ecbe07505e18fbbd0a5064a1af (commit)
via fa1cb86a929cc036865c6638c46fcc6104b65da8 (commit)
via 577dfd844c9a011d54c19ca0bc43b262f43dab01 (commit)
via 317a306c0aa88eea352fdc42c41bf7798ef71504 (commit)
via 63a6d2f1eca6e20537497b20fc8a678a28b1a1fe (commit)
via c660b185883ab00ea0848238d920be1cecb4e8e0 (commit)
via 4eb7a65fcf2c3c3bcbe90ab5906a8fca7d877109 (commit)
via 20cd60d08ac698dd0734d687636f719fad7c9b63 (commit)
via 8a1ec9972f1fffdc72a9ba24c78acd33d42a8874 (commit)
via 56a1a6e4dd4d64ee8461d34ef91d56516ab0211e (commit)
via e7a507396da07e91d561711b89dbe5580899c048 (commit)
via 9e8b303b9ced369cfa6a9a5852a4aed4a35ff7a8 (commit)
via f4f5362b8408c53ac9545fef5544ed47001c4001 (commit)
via d6cb425ff5c3bbc885d2a908107cf1069d508815 (commit)
via 8b012a3a326415bd2137a8de0ceddc9c5ac97e4a (commit)
via a500461abe492173f7e3c5945f5790ab88eff49f (commit)
via b8a7ac79946e1dd3194ca20a01b5b694c5948a66 (commit)
via 09a074866e5d658c22ce189a2997238f22f8707e (commit)
via e88d1474f86da1f2dd41e55589fc45eadced9a9b (commit)
via b7b1cfabcbe0c04ea9305eda0554a3da4caa0b32 (commit)
via 71fc103d575f89bb07f296caf3b4d7c907fbfd60 (commit)
via b691ada8bd0a874614e9f62022a8b4e058dab658 (commit)
via 097142094e58a827fb6667ca98676afd04d390da (commit)
via be1e7e58dcf768530c912321c30e3133ae34d793 (commit)
via 73d947f8bbea36f17875b914245403c712e52c22 (commit)
via 7c37f698f50d77373a8a4d1bfa90b7c5d5784ba8 (commit)
via 9d36a4b14382ce881189d108bd2ff394f326e62d (commit)
via be8708c4939130a34340570c7d4b461980dfef5a (commit)
via a883d385247659b14c69152950a80beb74e47d70 (commit)
via 515313ee8b41bc427381f608bb165269e0a800af (commit)
via a180f2bd8de9a99af5d8f0d1b263f860a6230018 (commit)
via 0e685e208d264343b60c3a7f7928daafa3fd5a3f (commit)
via 3d53088bd7dd81fa00167fa2eaa56ef66d6cc8ac (commit)
via 6e9e1d0c25817853bcc6cdce5914a2ffd75cf9cb (commit)
via ad1a75be390acf2c16f0eb31eb1b98cd73345334 (commit)
via f87c806e2572accd02eb0a85402c3b54dbfab678 (commit)
via c77af280c83828c7f8aead842866cc70d4f45fd1 (commit)
via 3934fb4cc9c8ab4ff0b8e91052f5852ca71f1081 (commit)
via 98cc54322a5fdea0eb4d4ff7974202c94231874f (commit)
via f567073ea8fe810a6e20c0ab66124a55408458c6 (commit)
via 7ab311290c0232508f8c9791a5276a3cfedbc67d (commit)
via 0ee0d5d6a144ece0e614d88495d78f52d869a4c6 (commit)
via b9332dd5a6c7b86a3a8917937506d91061c33e74 (commit)
via 921690d4f9fad7361ac79093fac79c1db9ea66b4 (commit)
via 106079a61b5f6bc891d3b6aebfd96bf633976c5f (commit)
via 0b1672ff74596c9693f4b740cdc3db87106c3c5f (commit)
via 212910cf3c9688ec2306be96db451ea2af1ccc5a (commit)
via e210e8fd270fc07eed3e0aa38baa5a5c5f26c58d (commit)
via 4eb47ad97f91379ee0344a17facac012c34de61d (commit)
via c031e09c293bb5d656d5c4627fc42ca5db8c1a4c (commit)
via 1ac659578d525585078065221fe59bf5f259e0a5 (commit)
via 32c6a55645b59e067d7ca29e748ab359c7adb42d (commit)
via be84c9f694dbfef2c734b2b3cce5dbf0d090d116 (commit)
via 57ea8af13974b6237dc24c7169bc40983a250e76 (commit)
via e92c191b697b13c2e798e9200136c6374a1e6ec9 (commit)
via 2c80790a1cf2ce97c8917eec67583be7af32e328 (commit)
via 3f9e6cfaa3e0c773fca85c4bfadef48ef136dfcc (commit)
via fe3aa0c729c315f5b10e995629f7f6c4991c937a (commit)
via f40fbc735e6e17b05cba3b4dc68528be6e2dbab6 (commit)
via fb883a3f40f7d44cb93785ffee3f80e46a54afa2 (commit)
via ff6e5ec230a706df85f61ee6c93888cf32c0ee35 (commit)
via 2b496a7c7fdfa47fba1f36ee2598b942970c4e00 (commit)
via a422ada1e0724b6924456e0e1d60406f2adb747a (commit)
via 4b4ef72aec3afa47915313c152bfbadf3a1e5898 (commit)
via 738674405168d951ed9d699e917ff3cdc45fcf26 (commit)
via 8642d6726ea6eeffcd383e83b5d59caa63955115 (commit)
via a537e329055f5b3d716f72b0db73a94e0ce7eaa1 (commit)
via 55c88a4277369c07217340277e53cd38164ffe33 (commit)
via f167ad83edbb6b8dfe63160c4fe3c7260b9069ef (commit)
via e7d39ee6096d48f6f860d354caa48cdcf3671c5e (commit)
via 810a3e705e0211dfdbf04d0214f60c85c4de1c12 (commit)
via 10d39299bef01f013f7afcbcfe31ecf790f52fe5 (commit)
via 5bdaa62f65cdca54c9ff0cb0f16255ca968f803e (commit)
via 824a4c4b6424d1614527a3ca7f9eea8383f80a24 (commit)
via 49d227eb8c2e0e1506a0e34da46cc76fca1f9363 (commit)
via 370f6ca2bd8169bbece2cb97acccf7291dfe49d3 (commit)
via a651f4a0db4c57a37d8f190108297926938c6551 (commit)
via 8927aa2638a998a264ae5b74ddff7db8e0d10a59 (commit)
via 991058be9ac114da2060f2e41dc28f86d93751ac (commit)
via fab63578337cf8e1d92c53f09a546536993e603f (commit)
via 174b7a9f86f817432206cdc97e1c75670ae38b83 (commit)
via e48d04b3200c3fdb387442ade824778e8cc69f2e (commit)
via 8073ff7d71dd23f575d91e7b4969d6c0c8570dcd (commit)
via 48f79d39e33ab50d96fba57037d9dd869913745c (commit)
via cb33b0cfae1d20174f4c0b37dad44fa91f9b050d (commit)
via 0b98ee418d7a8867666143744bf803f17f4c7f99 (commit)
via 7ee813622ba89b22518cd8888b782d0262b23d00 (commit)
via 22cdc9521fcb1a0831287bc54c08cb29f419e224 (commit)
via 82b6cf4245ee9a5f33c1c44d79b2f71916b58bdb (commit)
via cceac2df4cf8523a7f448fa1fb0205a0b776dc42 (commit)
via b96e8e0836e1be10aeaf01e83e74ab7df3d4fa8a (commit)
via b967bb5d650bfdaf013521c4adef07b6a1a26d36 (commit)
via 697192b019f998cd1bc7e10b9e9ed6d05c41d2c0 (commit)
via 9ca2e7f68b93464b66ca569dcdbb96aba2a2165b (commit)
via 8419f829bb6a68ca2604cc49a5989ec553a5dd89 (commit)
via b5b88fe7f8e462784721210cc436b14aca3ab670 (commit)
via 41feb446202a20baa4ff3a698af42f1526937809 (commit)
via 23fb460f98bc97eda12fd144d2aaabf6f56ea7af (commit)
via c25686b776de00a7fab5e448dc7962ae685c7480 (commit)
via 6c3ebdc1890fefaaebef113b1dfa1b417f554162 (commit)
via 35bca2da28c076e0746f9d23ffe47f7c99773404 (commit)
via ef7d102f162399e1e14af82c53b6e15bc45e171b (commit)
via 99679775f90f33282bccf7446277ff90fd3bd7d4 (commit)
via 183cee58314f7cf73209244677132f95306a4bc1 (commit)
via 8c1d551158f7e36fa90a0e1df6f7b519bb5d83ff (commit)
via 632f6919c1ce10879e26c572bddbf9f0d75d0bf1 (commit)
via fbda0b1e65c17f2dd82485954041b26d7c1b0bfe (commit)
via 51a915d262a907f7801f793d4a65a3169d60d4e6 (commit)
via fd4e2949e85743730ca7e97d5d132f0217451699 (commit)
via d37d970a5e43263ed689d14ed90f4cf7e5ad9b86 (commit)
via 934fa84965b3eab01b24674f3fe98538739e9f67 (commit)
via 606aad5869c0e74ba9351838a0e8104c9dde9b2f (commit)
via b38895761bc288a7274f6e93df73da455ecda0c2 (commit)
via 64ede2a3e37db9d644f635ad3c0a45d9c6b0d996 (commit)
via a74371e1613d34af34a4af66c1de662bf35cb4c6 (commit)
via 09a00db97834e1f113d241505cef4634543bcda3 (commit)
via 2faee819a96a07d20a4474e74cc55ab20905e3bb (commit)
via dd541f661da61b43b8d7b18e40826d791a035811 (commit)
via b884067f460b9ef4d0f5800850456aad1625bf34 (commit)
via c52905b19e8d9035c81ea8847e532cfa4d45c6f6 (commit)
via 564375702111d0d07fad2b9d8e12ac000fb157bd (commit)
via ff1e59c72f0f6b72772b1e4a93b29e2cfca9e6e8 (commit)
via fd88c7f06b4c7f6b14b25bf2eab5aa80db6d4ed4 (commit)
via f21ec861693109aa2352a0cfac5c7583889cf6e6 (commit)
via b5a7da42c8808f54b1de45d9d2afc22888ffe072 (commit)
via 182b7a46636d4a9c72fa1d57e4ba54c68dfb5dce (commit)
via b9fd2c2714a0e9edafd986522174c505b0465d82 (commit)
via 77b648004d222d8ea06f657678b8ca34ecc6b6f1 (commit)
via 9b0a51c159abb43215a71ab0c107af0a6161e037 (commit)
via 71cd2fba2d739c40bf617e7833612549acee3405 (commit)
via 89269fd0ef5f1620c5b0c85c3af5f11d69d8cc43 (commit)
via eac7ec700ab0a75716881c5a390e890f2950f2e4 (commit)
via faa873cd4780729982f6d7f9d78cc1500f28ab3a (commit)
via d42ef2c5a01d29a9877e0b487694f66e40c43624 (commit)
via a71de69dd1f1defbdc5dc42edb1c8947d82e60fc (commit)
via ad59776ed683d4c019aa0db34b901fcb74a8eaa8 (commit)
via 5d779635ac4cf2c2d3128809cef3409a56716a0e (commit)
via d13f253075bbc08ad5402f61ad0dcecec28f3614 (commit)
via 5b97541db91dbb5beffdfe0d64272206a1507e0b (commit)
via 2722279b31b075586551801eb2860687ff966ea8 (commit)
via 837258c13bfbdd378d0d4fff6a2173a187d6e365 (commit)
via 8d99a23c4f3adaee2df33985b9257c311708218a (commit)
via a90a776079d1027bc360dff0e748a641ede0126e (commit)
via 3320ef784ef768e579689767bb226011c12a4a1e (commit)
via 233e95e4b50767765370aa552f159a9920c0151c (commit)
via 9b2b5a9695ad66977c964c83691cd2fef4c45b85 (commit)
via 067a7054ba44a2c754f1382daf6469c495085639 (commit)
via f5b1a18c53cec7203b4f94541af4b112c459ab74 (commit)
via 09da8929a55e31b5005a3bb1c2c1184c435612cf (commit)
via 7c629241f07aa7509d996c0560a20c5b0c7b371d (commit)
via ee6fdca6b647d1c92ba6d07400c7d1e23c9e0ce3 (commit)
via 0070431f72dacef15d104bcf2baa9d70629d3d31 (commit)
via 5a43e72ba90dc5b4ea4ae3e8875075440e709655 (commit)
via 0ee7d42a7280e7ced1ea2f97e80dc752f28f76b2 (commit)
via c7bbbb603fc4cf2e6590af962e2e255241d18276 (commit)
via c0d530e01e91fbea195993293eed60f1677e6181 (commit)
via 942bbe22b7147e2988aa0b82e094a53421f2c486 (commit)
via d5690aa464880a258f653e1b4d68f150b4c660a8 (commit)
via 8418efbab3fe38ed701d9294800ec85d467763df (commit)
via 6ac9ea26a82c8f71b989d4dc6af22e3e5df62d48 (commit)
via a061f94424cd9cb434a203a04aec4c437dabf251 (commit)
via f7c03ade975b018be0766d5fea300d03642b4b12 (commit)
via 60cc4b660bea6af9b37a14fbf1ad07589b15b34e (commit)
via a9e3b02a54cd9a18baf8042e389ffbdb9266a9c7 (commit)
via ce5951842845b519c7887479c8e4e128e1951add (commit)
via 808acd63c4ec54af93eb5bbf717d4b591df1d904 (commit)
via 6b947deb94b45660a5140472565886e9d5f1203f (commit)
via 0330e7369aa682ac2c2feb2bcb197e52dc1810fb (commit)
via 7c72d611d8d568358d4a7849057e42708cbb10c3 (commit)
via 9ccda90b1788836848ecc5977d9cd8a807ee20c9 (commit)
via 97b316f2342a317843b476094ed7323ca899504c (commit)
via bd2775a49b137034294085b0fc5bf129accc1ea8 (commit)
via 6e741deee25c81429112b82ba54f09205bb7c0ab (commit)
via f48fce7b90cbd7f3efa05d5e7481999bf751e98c (commit)
via a3dccfdd5ffa6d26e00898cb76d3aa25090f983b (commit)
via 838c13654c639baa1c54d19056cd771380ab8a58 (commit)
via abd50139e35c67ddbc1ec09550ea6b6d27861703 (commit)
via 7f5cc90258fe11df6286d9ce562d904e8032c461 (commit)
via 8dd98e227876fbe8f8a0dc0504906975e93c7cd0 (commit)
via 4d9446e1fb4fbc54eee5295dfc9854b2f21bb841 (commit)
via a716bb568dfe2cf4c856786b8fa9006a8a9c3841 (commit)
via 3d591a7970918cee809927595ebf28e554460ca1 (commit)
via bbb0829282ba766e26d334dd7afa05e723ec61e7 (commit)
via 033ae0b58a72f828c608a557cafaf468f8d67b9a (commit)
via eaf3b566293fa2bc10bb5b99b38ad75f4914b1ab (commit)
via 0ebd57ab0ea8e1a95cdb8a564fcaec4cad6231e7 (commit)
via a7c60d702466bc0f9de64993446e8ec39a16de88 (commit)
via 251fd5805122a257060a9de62a4c26bc1862a544 (commit)
via 8813bda68dac4f6ff448cf783b43e6deafff75ae (commit)
via 3d79b95543b6043a9df9f523f81416a30052a9ce (commit)
via 3c335400833959b9a96674984c797e8ec4734566 (commit)
via dd7bcc7dead9bceba895ad877ad3ac7642d4e717 (commit)
via 7c33f29d51082d693c0653df84cb13f2b946eec8 (commit)
via 9ab55a834226a8ae9faea3491f23aa065303cb41 (commit)
via 4e99631dda78212103dc7d6bc9b165f89079e60e (commit)
via 3565cdd101fae3d0ed5aacde80b7d49d8c4c4af8 (commit)
via 719ac4509920bad7d5c8d563426d21f2a0c9e80e (commit)
via b1eadcb681dbe7a3d7db4d3ddb18528ebd15211b (commit)
via ac851856893867331ab9f692a135a40677daa351 (commit)
via 492390a79f20c7aaaf16f232fbd5ecf0d9b700e7 (commit)
via 53f3baf58256c085fa230992eb03c896276fc874 (commit)
via 7266ca2e44705e550ba7c8c1a71fa373eabd7b99 (commit)
via eb021ca3cba9635b861205b2fc94da2a3cdf37bc (commit)
via f8136babc5601068ac0f3ab30414a5cbd99388c3 (commit)
via a01d17348d6c34457a415935e702a24257adcf8a (commit)
via 3e3f0f51da0af53d6161ffa270e1b1c13c88e3e4 (commit)
via 61989fee80f613970445e9658979a7b9f58fe9fb (commit)
via 30114714f7740b3ee309e0be05e679c7e03816ba (commit)
via 40ac22bb63526e9a935d804513204a85a665d13a (commit)
via 3239dd418ff3f02924fa71c0b805e709b6b6db63 (commit)
via bfc31d006406481c26aa851257d643d480507e2c (commit)
via 273fc3e2e0c92bbf22019ea7d686b061d640da78 (commit)
via ff723f791449a5ba156a997459844b4be2e2ab82 (commit)
via 3daf62015014e70b09ea6fc59d20a5facff4fe6d (commit)
via bc2ca16611bdaac49e2ec22ecebe6ba67dd73812 (commit)
via d511479f529fa71e76ff0d2941585f7467276982 (commit)
via dc3746ac97c0dbb8e7b85de909c7356cc05ee8b9 (commit)
via 4a6e7f9c28fe9ad0f90bbfd6d45bcd65b14d15e7 (commit)
via ff0e06546eb8fb49f495c819efec984b70d29102 (commit)
via 3c449bd75224b543de394bf6444c09cfbc6e104f (commit)
via c3c447c96ab63092461dee2bac607f59a21bf8de (commit)
via c7bf6a71fe08f3ba8228eced708c9d05496a825a (commit)
via a832529f5430e0f60fee792a95a35ce7b2bed25d (commit)
via 277cbcf414448fb7fd3fa8171a7cb8ffdcb6262b (commit)
via 953246794f041282cb1a59ccf47f9bde6c369069 (commit)
via 780d15ced4188a38984c656a9fca58fdd5226735 (commit)
via afef45861d081c0722fff71992d45854923c0d0f (commit)
via 75a996cfa0f3e2fa8530ea41ea3857eb86ab4b84 (commit)
via 482da37abf31dc87fbe9bb28258122fa178cec45 (commit)
via 07201e1277cfeb885c7ee2a666575ec9dc8c8d7c (commit)
via 617d56864581c2c26dd03158aa5b60c7f845da4c (commit)
via ff8eea5c2a9f5283a46376d3bb1bbedd8dd034a4 (commit)
via 7cc7193c74553b5f46db482b6d8c7af599d0464a (commit)
via 27de124db6343381c25335e611853b487880e9fc (commit)
via a3e0a9ddf57e165e682700263f1e0a6e65037c04 (commit)
via 9dd6633189cf15ca554cc4ae21996f7db91c6901 (commit)
via bcb01a637648278bbbefcd6cdc3014a98de8ed4f (commit)
via 8460c9c1b5afab84f4279e6e04cfb1e012965c14 (commit)
via 09406916470553a85f30fc14889127443cc4a09b (commit)
via ffc3f2bd0059664273425eb0c34411ac5cd88c3e (commit)
via 6582ff6158b7e8380536f83da9b0fc25659e3c36 (commit)
via fe280bface8fd28a8d0baa3ca95a71f221187fe8 (commit)
via bd5112acbb750723958463cf0328ebb15855f7ab (commit)
via 06b3650b581bf05ea2f015a02635382fb7c38fda (commit)
via 678c2a149a3e7d48c4462fb2e6cc531a3cfed780 (commit)
via c6cc6d3a79976bfe96cbb9ff192cf22daffc18c4 (commit)
via 2a9d3323537d030c1b3385ed14b496bf9e2b20b3 (commit)
via a2fb09b3a4178398a5528eeab2c119cc9a107629 (commit)
via b5982d00b9e2ff6fbcb86d8602ca249236c1f06c (commit)
via 78b552f62a65c6a873ed021d5579675b4fd84e3a (commit)
via 68f26e2a86eb206dcdda9324b20afa208067e6c2 (commit)
via 42a8b2f0dbaee653953170cbd0a7fa659bc32b38 (commit)
via f4f4dcee96e534c0badc28258ad09ef50b35ec76 (commit)
via d6e4b3df266ee1c847763ba50fa802d9e9e62b5e (commit)
via bdc44eae6bac8aed26170d21cf05fe99ba9d84d6 (commit)
via 170e93051d25ac491811f1ed66cd5552a0b26ec8 (commit)
via 744d466a0fe5530bb6c036664413d799a3aeb871 (commit)
via 4eb5acde3012effceaaf9af4318d95b02551fffa (commit)
via 2315e146e19c937ff407f0a5aa0be1f8de655abf (commit)
via 46064619d9bd9d2733089dcff044a9a86277dbdd (commit)
via ec41adeed9884621f242c8153612a3f2eaa5bcee (commit)
via 758fdf094deae51597b5e9f5f70584c3dba92ff1 (commit)
via c5b855df5b9e4388efd387810959b0f81f072fc9 (commit)
via 7299adcc939a3d55b2c694744037ea9ea1dd7835 (commit)
via 455230a4331e25a1bb68e6fe1c0058bd790c9d9b (commit)
via a4d31373e5a0f72d028ff73ca9eae0fd6671f350 (commit)
via 37390a88fd35d972a8e399fc934c612c1043ad77 (commit)
via 4b895826e62b9b6e7512d76d05999752ffc93432 (commit)
via 3ee54c088ec06a65b1ae7ece2dae8cfabfe90d12 (commit)
via 9e1aad1fbffad60e849c9cac613e282fd3f80646 (commit)
via 1da9bcf69a3f2c364eb1674b44ede4c0cf280f06 (commit)
via d61545b5b2ad42d7e9fca34d3b077942fcc04c01 (commit)
via f426dbf3b4dc5be7a1b56d9cc3c0dab00eb9787c (commit)
via 40699694b24cceb86ed441308309393de84c3478 (commit)
via 215069d156f3612ff9e140a7e47232047c6870e6 (commit)
via a459233d0ac535d67e3141e21dee3e805c4e906f (commit)
via 0e81876e6119fd76282f3de4bb50dad9e67ec6f2 (commit)
via 713f9d5dee94b6eb81cdbbb929bf875f414d339c (commit)
via 0034b0c0c63194bd7aa227364b381d6b049631dc (commit)
via 933a59910b2b95f579dbb11729192ccfcc26bcd7 (commit)
via 894b80ee113440037b7899459eeb1c0f5c14b124 (commit)
via 0ee8255c2555ed68721ea5e7679f26a2e53bd8b8 (commit)
via ad3417a6fd2ba93616b937f9a2d8642eceeb0bf8 (commit)
via db62337f2c0a3add91bbdbaa096f2a3c04162c60 (commit)
via df1c292ed40d4c2c480917f1eab06a046c93c3b1 (commit)
via 49c671e80fd2c88b6f36337ebd1cd4748eb8bae1 (commit)
via 11207ff1e211658bfb44c635423ae818a0654239 (commit)
via 3abbe8b729310d29b9a2c84a7d7a11771513908d (commit)
via f49289a7f621ffe5c981caa8531623d9e0a4abd9 (commit)
via cc6d68e1dcf0f4f9b8b7442a4739288892fcb345 (commit)
via 332877d51e773a584d272a03f08446d18cbe1634 (commit)
via bed462d28fa081a0d66dd29a8034f188256c7d04 (commit)
via 2b27f75b587cf23d2687dd37897cbb26ed915890 (commit)
via 79781031e28dee010425f575d1bf5de5b18af0d6 (commit)
via 7d91fbd6c1a40e378b06f9be6dd3ef260c66dba9 (commit)
via d189d704a29f490583057ccb5c762432a4e4b7a7 (commit)
via 122b74c0074329f1758b2ed5d241e0e9a790087b (commit)
via bd37df82b49faefef078558cdb2a54477bec6c5a (commit)
via dea03d0a24117764ea9b8763e640a4836031e82b (commit)
via 5c745f55a160b0a72d8e493604917a0d63dd71a5 (commit)
via 15a30694560ba62160fa3a8ffddeb51b800e351a (commit)
via 27a84cdfc0dfb82e3b86067e473658c091377892 (commit)
via 3600304c30c4a345538f6c06ca50183b14cd12b1 (commit)
via 4ec4a756c7607e3a78878e6699a82ccf6d0a1461 (commit)
via 0f700e1a4b8e66c269081eba64eb5be8c37de868 (commit)
via f0d0fd91978a8127ed270b03853ac0e04492a333 (commit)
via 2ee48570ed824d5caff4f8cb121b7c293a481820 (commit)
via 82499a9a4c80670de20825992478ccd4d764e28c (commit)
via c164ad605422f90f3566e4c4ebed0ea3c2adb3a8 (commit)
via 53dca8426775ed5bf40f2c2708915f02b2dccc74 (commit)
via f69f033da3b6900acdd170668cae07ac6cd959f3 (commit)
via 8d957f16105fa44d483478b2c05bae735680c007 (commit)
via 5028177e4e795305b514d7164ff882dcf1d3622b (commit)
via 24262a9aae62290dfd1a041d0bd5c6943270251d (commit)
via 7e355890905a9195ff1027377991b4134e285a03 (commit)
via 6947621e1b3a3c73c3ee351325f505e5e191474f (commit)
via 29cb860583cb906bc16eddf9a4c98d6bb37333e5 (commit)
via acc05760d5060d1782aa597e44c72ccb9a71b63b (commit)
via c440dfceff97526d2763383afd8da064faef3d0d (commit)
via 93591a6134fbc5655c0cf6a25e0b4e0668357971 (commit)
via fec701841dbe2e963cf3adc7c74c98b41e059b9d (commit)
via 0e24607e3075a573ebe4ac408703c76daac7236c (commit)
via 5d4be5077adeec54d1956c86dcb87b186c39a7cb (commit)
via 3aa3f4352083d159260cebc23b87607e73aa6f2b (commit)
via 0d4271e31fe685a8a82381d21d5166f0398080c1 (commit)
via d324b9de12c510ccf9fa1c1b6ece327c578ee53d (commit)
via e828b4d6f503ff94c40e30b1d8babf0dcbecde91 (commit)
via 1e0ac11c75eee10959d1fa674a05e746476271b3 (commit)
via 8caae505c35444706cff8815c41821d80e791403 (commit)
via 4b6787c84e020c350a03ec47d12e1ef68ddb6300 (commit)
via 4142652b8eb397963bec48610bdb9ab6599e65fb (commit)
via 60777ba4309911df0780bd8de6d96524bc2ca03c (commit)
via b2632ac253a3b9f5ba7a4174acf6abe295ec3550 (commit)
via 79f5c103310c36dc213a552b9534f68ce8df1132 (commit)
via 2c99a9dc1978c9178e711d264aaaca2bc4702352 (commit)
via 88ba35773c76c871a222fe48a0dac05765c39936 (commit)
via 2e96afe0b7c4e7e41fb03bcda605ab704f538ca1 (commit)
via 52ea8d51d522d7013f746748bf84bfc2e9bc042c (commit)
via b7ee13d765e5d8da1ef68f0c0777cb5e40fffbf7 (commit)
via a2cad95118b79f204bc13914acf43a8fc1dd2682 (commit)
via a5340c53957b3174c89d03ecf2c61e9ba98ac57c (commit)
via 813cd2df67ae0591b0f792eff82854c5c9c642ca (commit)
via 48f8503baf847315dda6609abc01f5befe6e0284 (commit)
via b1100fdba29d8f514236dbcfd6f17e7941c0256a (commit)
via f96a21992e13cf401a3494f2caeec9d42f56f0d9 (commit)
via 1e925d0ccc7340575ddcfa07ab7bd372d751e006 (commit)
via c9d31f30ba4fd7818b4ba2ffd7bbaea74761a2d9 (commit)
via cabee48a54a68f333569ee1904bc04d53da7c9c6 (commit)
via 183ce9babe20e161caef6b55eccfd043b334f748 (commit)
via 0fa9977e21010f963892f59a75f03e3ba800bc74 (commit)
via b0b07f403ffc22349ac8dd75f47238bea40891be (commit)
via bd0377ae95427e80f04b0dd5f3a8dcb0b1ab89e3 (commit)
via 5555878edbda765134fbe50f3181f409963037ea (commit)
via 009dab38672eaf8ab6eddc551da41a84e86915a5 (commit)
via 290decaf3259b036c3a402be428b04ba100f0f81 (commit)
via 61d16e162788ac0923c544b4d31bb847fa3d9189 (commit)
via 83fda5a447335b95bdd991187d4efb0a15a5709a (commit)
via 654507c6eeed83dd84210f7e481ded34f5d4cdca (commit)
via 84f8013995d4b96ac9471cc92285c76b50464415 (commit)
via 92ebb26bae583ff864bc4bef6a2776329527a069 (commit)
via ed4e1bfea15d8502e50b6c210f38dd3f13683d2f (commit)
via ef5998dfd0ba1405fef6dd1a7f0e9adf686fca89 (commit)
via a430caf661d4a0ad8d69c67dc7a20911e3169a25 (commit)
via fbe07de54f3768f32bd39a0ea9aa2a79188b1186 (commit)
via 57df98eca15fe64a716f9f555714ef5fb9cd25e9 (commit)
via 674ea087fba016e55f03e3966fe64fc908141f8f (commit)
via a9584da4284c04e45a9584a58c6dbeb404871119 (commit)
via 63123149319eb0e379dc52a3f4691993d026f3bf (commit)
via 9a5a18af733c07109224e328ca0ac640ff49f845 (commit)
via 06321dc028b83ea78b39eb9673859a40f9da37f7 (commit)
via d6de4dfcf1a3a6c861c87d47990f793c71328eda (commit)
via fc0a57306aa68a782e8611a9bd08ae10aaa5274a (commit)
via 2eaf47b69ea5f2095e26e0ea597d3e8702b0da06 (commit)
via 9f3311f92d28ef9fdf6ef3d8ec8b90efe7a832d6 (commit)
via 68b1a52611e6ac9be306e5a17d009a6fd46c455e (commit)
via 59d636481fd1771107f3eb4632c2a9fc868afc11 (commit)
via 0225a8a396ddc7168be096f28b0a711184a48ef9 (commit)
via 72febbae5ea55a5fd051978fbfa0f669cf0e99fc (commit)
via f80f28c4046b650c180bcb9b41c859c0c8e2564e (commit)
via b08aa94548163ae4d4bac2724e68ca9102667f6a (commit)
via 4aacfd4d72b80a22d449d865a6c4f063afa823ab (commit)
via 71ca38c00c11ebb6b4dede6d09ebdd28eb45d890 (commit)
via 7e0c523ad6f209f238277e4116c21ba696edb7f4 (commit)
via 12d238d96318cc9d46dd5a2893894824a633805b (commit)
via bcd246e3a9948a631eb8eb77886ac1b369b13dba (commit)
via c57da8ddc80e0e314957c6d11db288ef11fc1805 (commit)
via 535ad269bfc6581a048d3e844576063be5d19501 (commit)
via d8dd54f2325cf859703721e7a17b6cbe734d857a (commit)
via edc9616a1bbc0fbc2d7f84ddafeb119d689f3f70 (commit)
via 31d3492b50b057df853ad51c909ac21d6e95a4ca (commit)
via 74f7b6d1a003175f1cddf979212631a0d7832399 (commit)
via 3c5cc8070d3bc8b7429f0410de6ef3009ff6a28f (commit)
via 4665f6d2987fb26ad006cb56b02b3ef4c170f371 (commit)
via d3690d4115441dc69d9571cb5261dd005a112d39 (commit)
via 364887331875180c498abb8b7681a228ca21181e (commit)
via eca5df13cf7987d6e3cd3cc930851671b071e4b3 (commit)
via c8dc27d1fb5c890143338439f1cdbe3b2719174c (commit)
via 62ef9d5c92e0f56f45767f4c73df214d4393e158 (commit)
via 41fd242a0685e79cb6f1b1e1826e6734bea2f359 (commit)
via 35a90a547466db90c00d6375d8d9a3573e84e99b (commit)
via 9a1d48b1262d88e55922c4e1ed9f91ed2e3376d7 (commit)
via 1e70adc3ae54b0c4518bdb51d94301f1dafe4ebf (commit)
via 91282a4c578716f157aa8a5e0a9bf9bd25b19a17 (commit)
via e009051a0166fa25e601190354e0333aa30ad58d (commit)
via 36f589b5a84804ce246bcd9a3eb9352801aaf41d (commit)
via 2bbd7ace9e236d27dcfb52acfef991bd5ce39354 (commit)
via 196d8f518071cc8c37dde0835cb7559d6cdd55da (commit)
via 42fc5ebdcd5a1e5fbb7a19a2756a310f23a0cdd5 (commit)
via bb8015d15ca4b0e2033eeca09906032a88e74bff (commit)
via 3e61be54a77ed8ccc2030e88b9a26372d3f76e2c (commit)
via c0da87688187c81039cf81790fed3d6ed00a956e (commit)
via c2a1c48f5fc17cf4dd870057d17059ad668d29ad (commit)
via c67dcec1c034a0c75c093b49e2a172bbd3d50def (commit)
via 80b9a1e4d6a297ac916cbaf360e7b2114ef86a7a (commit)
via 7135eda6854ba60d6379ca5799b4b58959e998b5 (commit)
via 017969502cd0247c9b25e80e002ac563860f5a5d (commit)
via 3a4f369fb2019761af5d4d7ad09d48f1e5d44f82 (commit)
via 962600ecdbe44d386f95a57ac5a91365af0b6c39 (commit)
via 6ea708c0f9f36b9a90f463dd1f7e0332f82e079b (commit)
via 534667daec58ce8b2e417709e788934bea6f8f09 (commit)
via f3cf9c3583364af7625679d0021c4d55c3414994 (commit)
via 8a129029dedcb1e75934cce706762539a60857ad (commit)
via 57961cf6e96472aafafb7b1bb0b6d74fc4dcaae0 (commit)
via af6528a5208c69ad223394fc057f14e29a51471d (commit)
via 14a338c7f19830a084aa411b32639f3acaa99143 (commit)
via 2fbddb94b8d8be47151332ba9e9eab5475e2a669 (commit)
via cb400906ef0e1a59d5844bfb686e816b6d47ca25 (commit)
via e1c0e4570a45d05dd9f2e8e052ce71164209d112 (commit)
via 51856337f0ece1d2f39bc83ff0da2593d41c9b8f (commit)
via ab351369dbc2b38b28394efbaae6384c032a8193 (commit)
via ebdae77ed55530933c330fca0096c7da826233df (commit)
via de36726eadc258956771bbe475273fad796480fc (commit)
via 14aed76e77c9c4866280b89fc0baf6a6cddd0052 (commit)
via 8f4d3cef2d4fef4795aac8d81b921c566827667d (commit)
via d19651e6344026ec885f994790d9a750affb8f8d (commit)
via 66f25e31ccffc8bcce691b683682e8e0d33a72ef (commit)
via f713ed7aeaecde07369c394ce4ff1b8d658c3514 (commit)
via 3706356010de8df9b88dc475a9566c18b445f819 (commit)
via 7375604bb38effe2ccfab5c576a1235bdf5d4e19 (commit)
via 10275023765dbf270388a200eaa3abe8ec8cc600 (commit)
via 65820d219a875a0f78fb8b53e55e72022261e2c0 (commit)
via 284f52d72ec19df3774c7409780f1f9eea33b8e6 (commit)
via c51871cdbf3aeb0d9a7fd1263edde743802e6cb5 (commit)
via 025af44ec6fec843d848215670bb54f578f66e52 (commit)
via 8e52887f394b2b42b9ce6511b379ed32328403e3 (commit)
via 2efa9f9e48d0a64c56c995e7d2a59ccc546d94f5 (commit)
via c1ad4f948f12f3748d76af679922236d5cf1b61e (commit)
via f737af0943b09f756e3b40290ad2e0c8f8101f00 (commit)
via 0307f9337d1061bbd9afc415a592fcb3c8c57c21 (commit)
via f13f74ec048ecf2252d6fef68611e813bc294305 (commit)
via f294fd186fa42b9c5dfa33820c3992230708a2ea (commit)
via e0934ef22cb60d1b27766c1dfea61afc93109e8b (commit)
via 5361c69b7a4ecd50c1b0c30af6d1f08fea28718e (commit)
via 84d072b5c7327437cae7a13333dd35ab9777ce14 (commit)
via c4571009907584a103b878ea5c90ced7a5cac283 (commit)
via 5131f551d8525d3a9235b2944f0fa84546dba120 (commit)
via f5e12df388352b27f09787028a0040afb28564f4 (commit)
via 540051a97034d6e574520256f7b56a51451417e5 (commit)
via 8f0c3fbfe9bb4d51b5e295686fbe247c5c84f569 (commit)
via 6c1aa436a9242750428006258ff48bc68c13c5d4 (commit)
via 5934c2c1c8232fe10b975057d5e8e4701ca3f363 (commit)
via a8d1ed583074a43fd1258f3d3b6e018488173c44 (commit)
via a924494119e6d672181aef529ba01c7e6a67951f (commit)
via 3984ba4cd16a02e3fa98ccd432a06663de3fa993 (commit)
via 9b1578f349a35854af7c5b2875cda5589edbda89 (commit)
via 4ed64972ef6e08588592930b32e8a11da45297f5 (commit)
via 6d634f6a0707b068d6dcaf761bf0b918be3871db (commit)
via 92fd43fcb2e4d6c2cee5655ceb5a62a11f82817b (commit)
via e4178458b1e93766fdad3de25d4694a976af8f23 (commit)
via 4f57d6ac43a050f6c50eb33d348bcf96daf7fddc (commit)
via aeef7d9aa9f99114786af36c4457d3f8f8239121 (commit)
from 0a9c5691c5ea692728851b2f5476670c05d38750 (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:
.checkpatch.conf | 5 +
.codecov.yml | 4 +-
.shippable.yml | 38 +-
.travis.yml | 484 ++----
CHANGELOG | 646 ++++++++
DEPENDENCIES | 47 +-
Makefile.am | 20 +-
Makefile.inc | 1 +
config/README | 10 +
config/odp-linux-generic.conf | 151 ++
configure.ac | 61 +-
doc/Makefile.inc | 3 +-
doc/application-api-guide/Doxyfile | 1 +
doc/platform-api-guide/Doxyfile | 4 +-
doc/users-guide/Makefile.am | 3 +-
doc/users-guide/users-guide-cls.adoc | 2 +-
doc/users-guide/users-guide-crypto.adoc | 2 +-
doc/users-guide/users-guide-ipsec.adoc | 4 +-
doc/users-guide/users-guide-packet.adoc | 35 +
doc/users-guide/users-guide-pktio.adoc | 374 ++++-
doc/users-guide/users-guide-tm.adoc | 8 +-
.../users-guide-utilities-examples.adoc | 19 +
doc/users-guide/users-guide.adoc | 70 +-
example/Makefile.am | 1 +
example/Makefile.inc | 2 +
example/classifier/odp_classifier.c | 41 +-
example/generator/Makefile.am | 8 +
example/generator/generator_null_test.sh | 23 +
example/generator/odp_generator.c | 327 ++--
example/ipsec/Makefile.am | 17 +-
example/ipsec/odp_ipsec.c | 198 ++-
example/ipsec_api/Makefile.am | 17 +-
example/ipsec_api/odp_ipsec.c | 195 ++-
example/ipsec_offload/odp_ipsec_offload.c | 124 +-
example/l2fwd/README | 7 +
example/l2fwd_simple/l2fwd_simple_run.sh | 16 +-
example/l2fwd_simple/odp_l2fwd_simple.c | 147 +-
example/l3fwd/odp_l3fwd.c | 145 +-
example/m4/configure.m4 | 13 +-
example/packet/.gitignore | 1 +
example/packet/Makefile.am | 9 +-
example/packet/odp_packet_dump.c | 685 +++++++++
example/packet/odp_pktio.c | 58 +-
example/packet/packet_dump_run.sh | 20 +
example/switch/odp_switch.c | 58 +-
example/{hello => sysinfo}/.gitignore | 2 +-
example/sysinfo/Makefile.am | 9 +
example/sysinfo/odp_sysinfo.c | 455 ++++++
example/time/time_global_test.c | 17 +-
example/timer/.gitignore | 1 +
example/timer/Makefile.am | 13 +-
example/timer/odp_timer_accuracy.c | 464 ++++++
example/timer/odp_timer_simple.c | 3 +
example/timer/odp_timer_test.c | 35 +-
example/traffic_mgmt/odp_traffic_mgmt.c | 64 +-
helper/Makefile.am | 1 +
helper/chksum.c | 75 +
helper/cuckootable.c | 22 +
helper/include/odp/helper/chksum.h | 42 +
helper/include/odp/helper/ip.h | 2 +
helper/include/odp/helper/odph_api.h | 1 +
helper/include/odp/helper/sctp.h | 49 +
helper/include/odp/helper/threads.h | 97 +-
helper/iplookuptable.c | 73 +-
helper/test/cuckootable.c | 2 +-
helper/test/odpthreads.c | 15 +-
helper/threads.c | 185 +--
include/Makefile.am | 1 +
include/odp/api/abi-default/classification.h | 14 +-
include/odp/api/abi-default/{queue.h => comp.h} | 18 +-
include/odp/api/abi-default/cpumask.h | 3 +-
include/odp/api/abi-default/ipsec.h | 2 +-
include/odp/api/abi-default/packet.h | 66 +-
include/odp/api/abi-default/pool.h | 2 +-
include/odp/api/abi-default/schedule_types.h | 10 +-
include/odp/api/abi-default/shared_memory.h | 1 -
include/odp/api/abi-default/thread.h | 2 +-
include/odp/api/abi-default/timer.h | 13 +-
include/odp/api/spec/classification.h | 9 +-
include/odp/api/spec/comp.h | 613 ++++++++
include/odp/api/spec/cpu.h | 3 +-
include/odp/api/spec/crypto.h | 122 +-
include/odp/api/spec/event.h | 38 +
include/odp/api/spec/init.h | 32 +
include/odp/api/spec/ipsec.h | 50 +-
include/odp/api/spec/packet.h | 122 +-
include/odp/api/spec/packet_io.h | 23 +
include/odp/api/spec/queue.h | 277 +---
include/odp/api/spec/{queue.h => queue_types.h} | 282 +---
include/odp/api/spec/schedule.h | 120 ++
include/odp/api/spec/schedule_types.h | 113 +-
include/odp/api/spec/shared_memory.h | 5 -
include/odp/api/spec/timer.h | 16 +
include/odp/arch/power64-linux/odp/api/abi/cpu.h | 1 +
include/odp/arch/x86_32-linux/odp/api/abi/cpu.h | 9 -
include/odp/arch/x86_64-linux/odp/api/abi/cpu.h | 5 -
m4/ax_check_compile_flag.m4 | 74 -
m4/ax_compiler_vendor.m4 | 87 --
m4/ax_compiler_version.m4 | 492 ------
m4/ax_prog_doxygen.m4 | 177 +--
m4/ax_pthread.m4 | 332 ----
m4/odp_check_flag.m4 | 38 +-
m4/odp_dpdk.m4 | 21 +-
m4/odp_libconfig.m4 | 29 +
m4/odp_pthread.m4 | 23 +-
m4/odp_scheduler.m4 | 11 +
platform/Makefile.inc | 5 +-
platform/linux-generic/.gitignore | 1 +
platform/linux-generic/Makefile.am | 168 ++-
platform/linux-generic/_ishmphy.c | 209 ---
platform/linux-generic/arch/aarch64/odp_atomic.h | 49 +-
.../linux-generic/arch/aarch64/odp_global_time.c | 44 +-
.../linux-generic/arch/aarch64/odp_sysinfo_parse.c | 281 ++++
.../arch/default/odp/api/abi/cpu_inlines.h | 15 +
.../arch/default/odp/api/abi/cpu_time.h | 24 +
.../linux-generic/arch/default/odp_cpu_cycles.c | 6 +
.../linux-generic/arch/default/odp_global_time.c | 12 +-
.../linux-generic/arch/default/odp_sysinfo_parse.c | 14 +-
.../linux-generic/arch/mips64/odp_cpu_cycles.c | 6 +
.../linux-generic/arch/mips64/odp_sysinfo_parse.c | 6 +-
.../linux-generic/arch/odp_arch_time_internal.h | 24 -
.../linux-generic/arch/powerpc/odp/api/abi/cpu.h | 1 +
.../linux-generic/arch/powerpc/odp_sysinfo_parse.c | 6 +-
platform/linux-generic/arch/x86/cpu_flags.c | 12 +-
platform/linux-generic/arch/x86/cpu_flags.h | 1 +
platform/linux-generic/arch/x86/odp/api/abi/cpu.h | 10 +-
.../arch/x86/odp/api/abi/cpu_inlines.h | 37 +
.../{odp_cpu_cycles.c => odp/api/abi/cpu_rdtsc.h} | 19 +-
.../linux-generic/arch/x86/odp/api/abi/cpu_time.h | 29 +
platform/linux-generic/arch/x86/odp_cpu_cycles.c | 31 +-
platform/linux-generic/arch/x86/odp_global_time.c | 14 +-
.../linux-generic/arch/x86/odp_sysinfo_parse.c | 58 +-
platform/linux-generic/dumpconfig/.gitignore | 1 +
platform/linux-generic/dumpconfig/Makefile.am | 10 +
platform/linux-generic/dumpconfig/dumpconfig.c | 43 +
.../include-abi/odp/api/abi/byteorder.h | 2 -
.../include-abi/odp/api/abi/classification.h | 13 +-
.../linux-generic/include-abi/odp/api/abi/event.h | 3 +
.../linux-generic/include-abi/odp/api/abi/ipsec.h | 2 +-
.../linux-generic/include-abi/odp/api/abi/packet.h | 37 +-
.../include-abi/odp/api/abi/packet_flags.h | 1 -
.../include-abi/odp/api/abi/packet_io.h | 2 -
.../linux-generic/include-abi/odp/api/abi/pool.h | 2 +-
.../linux-generic/include-abi/odp/api/abi/queue.h | 3 +
.../include-abi/odp/api/abi/shared_memory.h | 1 -
.../linux-generic/include-abi/odp/api/abi/thread.h | 2 -
.../include-abi/odp/api/abi/ticketlock.h | 2 -
.../linux-generic/include-abi/odp/api/abi/time.h | 3 +
.../linux-generic/include-abi/odp/api/abi/timer.h | 10 +-
platform/linux-generic/include/_ishm_internal.h | 54 -
.../include/odp/api/plat/atomic_inlines.h | 75 +
.../include/odp/api/plat/buffer_inline_types.h | 35 +
.../include/odp/api/plat/byteorder_inlines.h | 51 +-
.../include/odp/api/plat/byteorder_inlines_api.h | 88 --
.../include/odp/api/plat/cpu_inlines.h | 38 +
.../include/odp/api/plat/event_inlines.h | 37 +
.../include/odp/api/plat/packet_flag_inlines.h | 40 +-
.../include/odp/api/plat/packet_flag_inlines_api.h | 41 -
.../include/odp/api/plat/packet_inline_types.h | 10 +-
.../include/odp/api/plat/packet_inlines.h | 167 ++-
.../include/odp/api/plat/packet_inlines_api.h | 181 ---
.../include/odp/api/plat/pktio_inlines.h | 11 +-
.../include/odp/api/plat/pktio_inlines_api.h | 31 -
.../include/odp/api/plat/queue_inline_types.h | 61 +
.../include/odp/api/plat/queue_inlines.h | 63 +
.../include/odp/api/plat/std_clib_inlines.h | 18 +-
.../include/odp/api/plat/sync_inlines.h | 18 +-
.../include/odp/api/plat/thread_inlines.h | 16 +-
.../include/odp/api/plat/thread_inlines_api.h | 41 -
.../include/odp/api/plat/ticketlock_inlines.h | 67 +-
.../include/odp/api/plat/ticketlock_inlines_api.h | 42 -
.../include/odp/api/plat/time_inlines.h | 101 ++
.../linux-generic/include/odp_buffer_inlines.h | 35 -
.../linux-generic/include/odp_buffer_internal.h | 41 +-
.../include/odp_classification_inlines.h | 28 +-
.../include/odp_classification_internal.h | 2 +-
.../linux-generic/include/odp_config_internal.h | 32 +-
.../linux-generic/include/odp_debug_internal.h | 12 +-
platform/linux-generic/include/odp_ethtool_rss.h | 65 +
platform/linux-generic/include/odp_ethtool_stats.h | 25 +
...fdserver_internal.h => odp_fdserver_internal.h} | 0
platform/linux-generic/include/odp_global_data.h | 83 +
.../{odp_internal.h => odp_init_internal.h} | 95 +-
.../linux-generic/include/odp_ipsec_internal.h | 54 +-
...{_ishmphy_internal.h => odp_ishmphy_internal.h} | 6 +-
...ishmpool_internal.h => odp_ishmpool_internal.h} | 1 -
.../linux-generic/include/odp_libconfig_internal.h | 35 +
platform/linux-generic/include/odp_packet_dpdk.h | 89 +-
.../linux-generic/include/odp_packet_internal.h | 27 +-
.../linux-generic/include/odp_packet_io_internal.h | 114 +-
.../include/odp_packet_io_ipc_internal.h | 1 -
.../include/odp_packet_io_ring_internal.h | 191 +--
.../linux-generic/include/odp_packet_io_stats.h | 30 +
.../include/odp_packet_io_stats_common.h | 23 +
platform/linux-generic/include/odp_packet_netmap.h | 66 -
platform/linux-generic/include/odp_packet_null.h | 16 -
platform/linux-generic/include/odp_packet_socket.h | 115 +-
platform/linux-generic/include/odp_packet_tap.h | 21 -
platform/linux-generic/include/odp_pcapng.h | 56 +
platform/linux-generic/include/odp_pool_internal.h | 48 +-
.../include/odp_queue_basic_internal.h | 126 ++
platform/linux-generic/include/odp_queue_if.h | 68 +-
.../linux-generic/include/odp_queue_internal.h | 85 --
platform/linux-generic/include/odp_queue_lf.h | 1 -
.../include/odp_queue_scalable_internal.h | 12 +-
platform/linux-generic/include/odp_ring_internal.h | 86 +-
.../linux-generic/include/odp_ring_mpmc_internal.h | 169 +++
.../linux-generic/include/odp_ring_spsc_internal.h | 121 ++
.../linux-generic/include/odp_ring_st_internal.h | 105 ++
platform/linux-generic/include/odp_schedule_if.h | 48 +-
.../include/odp_schedule_scalable_config.h | 3 +
.../include/odp_schedule_scalable_ordered.h | 3 +-
platform/linux-generic/include/odp_shm_internal.h | 41 +-
platform/linux-generic/include/odp_socket_common.h | 57 +
platform/linux-generic/include/odp_sysfs_stats.h | 23 +
.../linux-generic/include/odp_sysinfo_internal.h | 44 +
.../linux-generic/include/odp_timer_internal.h | 22 +-
.../include/odp_traffic_mngr_internal.h | 3 +-
platform/linux-generic/include/protocols/ip.h | 1 +
.../include/protocols/{udp.h => sctp.h} | 24 +-
platform/linux-generic/include/protocols/thash.h | 8 +-
platform/linux-generic/libodp-linux.pc.in | 1 +
platform/linux-generic/m4/configure.m4 | 23 +-
platform/linux-generic/m4/odp_dpdk.m4 | 8 +
platform/linux-generic/m4/odp_pcapng.m4 | 18 +
platform/linux-generic/m4/odp_schedule.m4 | 23 -
platform/linux-generic/m4/performance.m4 | 10 -
platform/linux-generic/odp_atomic_api.c | 2 +-
platform/linux-generic/odp_barrier.c | 3 +
platform/linux-generic/odp_buffer.c | 12 +-
.../{odp_byteorder.c => odp_byteorder_api.c} | 3 +-
platform/linux-generic/odp_classification.c | 190 ++-
platform/linux-generic/odp_cpu.c | 18 -
platform/linux-generic/odp_cpu_api.c | 13 +
platform/linux-generic/odp_cpumask.c | 44 +-
platform/linux-generic/odp_cpumask_task.c | 16 +-
platform/linux-generic/odp_crypto_null.c | 575 +++++++
.../{odp_crypto.c => odp_crypto_openssl.c} | 294 +++-
platform/linux-generic/odp_errno.c | 1 -
platform/linux-generic/odp_event.c | 12 +-
platform/linux-generic/odp_event_api.c | 13 +
.../linux-generic/{_fdserver.c => odp_fdserver.c} | 153 +-
platform/linux-generic/odp_hash.c | 491 ------
platform/linux-generic/odp_hash_crc32.c | 92 ++
platform/linux-generic/odp_hash_crc32c.c | 409 +++++
platform/linux-generic/odp_hash_crc_gen.c | 248 +++
platform/linux-generic/odp_impl.c | 30 +-
platform/linux-generic/odp_init.c | 485 +++---
platform/linux-generic/odp_ipsec.c | 529 ++++---
platform/linux-generic/odp_ipsec_events.c | 15 +-
platform/linux-generic/odp_ipsec_sad.c | 338 ++++-
platform/linux-generic/{_ishm.c => odp_ishm.c} | 1108 ++++++++------
platform/linux-generic/odp_ishmphy.c | 148 ++
.../linux-generic/{_ishmpool.c => odp_ishmpool.c} | 29 +-
platform/linux-generic/odp_libconfig.c | 187 +++
platform/linux-generic/odp_packet.c | 707 ++++++++-
platform/linux-generic/odp_packet_api.c | 8 +-
platform/linux-generic/odp_packet_flags.c | 5 -
platform/linux-generic/odp_packet_flags_api.c | 5 +-
platform/linux-generic/odp_packet_io.c | 378 +++--
platform/linux-generic/odp_pcapng.c | 434 ++++++
platform/linux-generic/odp_pktio_api.c | 5 +-
platform/linux-generic/odp_pool.c | 175 ++-
platform/linux-generic/odp_queue.c | 831 ----------
platform/linux-generic/odp_queue_api.c | 13 +
platform/linux-generic/odp_queue_basic.c | 1048 +++++++++++++
platform/linux-generic/odp_queue_if.c | 104 +-
platform/linux-generic/odp_queue_lf.c | 186 ++-
platform/linux-generic/odp_queue_scalable.c | 222 +--
platform/linux-generic/odp_queue_spsc.c | 135 ++
platform/linux-generic/odp_random_null.c | 72 +
platform/linux-generic/odp_random_openssl.c | 65 +
platform/linux-generic/odp_rwlock.c | 3 +
platform/linux-generic/odp_rwlock_recursive.c | 10 +-
.../{odp_schedule.c => odp_schedule_basic.c} | 1076 +++++++------
platform/linux-generic/odp_schedule_if.c | 121 +-
platform/linux-generic/odp_schedule_iquery.c | 1580 --------------------
platform/linux-generic/odp_schedule_scalable.c | 331 ++--
.../linux-generic/odp_schedule_scalable_ordered.c | 2 +
platform/linux-generic/odp_schedule_sp.c | 202 ++-
platform/linux-generic/odp_shared_memory.c | 36 +-
platform/linux-generic/odp_spinlock.c | 2 +
platform/linux-generic/odp_spinlock_recursive.c | 6 +-
.../{odp_std_clib.c => odp_std_clib_api.c} | 2 +-
.../linux-generic/{odp_sync.c => odp_sync_api.c} | 2 +-
platform/linux-generic/odp_system_info.c | 96 +-
platform/linux-generic/odp_thread.c | 52 +-
platform/linux-generic/odp_thread_api.c | 5 +-
.../{odp_ticketlock.c => odp_ticketlock_api.c} | 6 +-
platform/linux-generic/odp_time.c | 138 +-
platform/linux-generic/odp_time_api.c | 13 +
platform/linux-generic/odp_timer.c | 397 +++--
platform/linux-generic/odp_traffic_mngr.c | 107 +-
platform/linux-generic/odp_weak.c | 1 -
platform/linux-generic/pktio/dpdk.c | 672 ++++++---
platform/linux-generic/pktio/dpdk_parse.c | 492 ++++++
platform/linux-generic/pktio/ethtool_rss.c | 254 ++++
platform/linux-generic/pktio/ipc.c | 249 +--
platform/linux-generic/pktio/loop.c | 178 ++-
platform/linux-generic/pktio/netmap.c | 220 ++-
platform/linux-generic/pktio/null.c | 19 +-
platform/linux-generic/pktio/pcap.c | 49 +-
platform/linux-generic/pktio/pktio_common.c | 73 -
platform/linux-generic/pktio/ring.c | 263 +---
platform/linux-generic/pktio/socket.c | 421 +-----
platform/linux-generic/pktio/socket_common.c | 140 ++
platform/linux-generic/pktio/socket_mmap.c | 113 +-
.../pktio/{ethtool.c => stats/ethtool_stats.c} | 7 +-
.../linux-generic/pktio/stats/packet_io_stats.c | 97 ++
.../pktio/{sysfs.c => stats/sysfs_stats.c} | 3 +-
platform/linux-generic/pktio/tap.c | 61 +-
platform/linux-generic/test/Makefile.am | 14 +-
platform/linux-generic/test/example/Makefile.am | 1 -
.../test/example/generator/Makefile.am | 4 -
.../test/example/generator/generator_run.sh | 45 -
platform/linux-generic/test/inline-timer.conf | 8 +
.../test/mmap_vlan_ins/mmap_vlan_ins.c | 107 +-
.../test/mmap_vlan_ins/mmap_vlan_ins.sh | 3 +
platform/linux-generic/test/performance/.gitignore | 2 -
.../linux-generic/test/performance/Makefile.am | 13 -
.../test/performance/odp_scheduling_run_proc.sh | 30 -
platform/linux-generic/test/pktio_ipc/pktio_ipc1.c | 10 +-
platform/linux-generic/test/pktio_ipc/pktio_ipc2.c | 3 +
platform/linux-generic/test/process-mode.conf | 9 +
platform/linux-generic/test/ring/Makefile.am | 2 +
platform/linux-generic/test/ring/ring_basic.c | 112 +-
platform/linux-generic/test/ring/ring_stress.c | 61 +-
platform/linux-generic/test/ring/ring_suites.c | 1 -
platform/linux-generic/test/ring/ring_suites.h | 1 -
.../test/validation/api/shmem/shmem_linux.c | 17 +-
scripts/Dockerfile | 28 -
scripts/build-pktio-dpdk | 39 -
scripts/checkpatch.pl | 1556 +++++++++++++++----
scripts/ci-checkpatches.sh | 4 +-
scripts/ci/build.sh | 22 +
scripts/ci/build_arm64.sh | 14 +
scripts/ci/build_armhf.sh | 16 +
scripts/ci/build_i386.sh | 15 +
scripts/ci/build_powerpc.sh | 15 +
scripts/ci/build_x86_64.sh | 8 +
scripts/ci/check.sh | 17 +
scripts/ci/check_inline_timer.sh | 16 +
scripts/ci/coverage.sh | 30 +
scripts/ci/distcheck.sh | 19 +
scripts/shippable-post.sh | 8 +-
test/Makefile.inc | 2 +
test/common/odp_cunit_common.c | 36 +-
test/common/odp_cunit_common.h | 2 +
test/common/test_packet_parser.h | 26 +
test/m4/configure.m4 | 10 +
test/miscellaneous/odp_api_from_cpp.cpp | 6 +-
test/performance/.gitignore | 6 +
test/performance/Makefile.am | 21 +-
test/performance/odp_bench_packet.c | 31 +-
test/performance/odp_cpu_bench.c | 818 ++++++++++
test/performance/odp_crypto.c | 313 +++-
test/performance/{odp_crypto.c => odp_ipsec.c} | 1053 +++++++------
test/performance/odp_l2fwd.c | 284 ++--
test/performance/odp_l2fwd_run.sh | 2 +-
test/performance/odp_pktio_ordered.c | 101 +-
test/performance/odp_pktio_ordered_run.sh | 3 +-
test/performance/odp_pktio_perf.c | 67 +-
test/performance/odp_pool_perf.c | 401 +++++
test/performance/odp_queue_perf.c | 594 ++++++++
test/performance/odp_sched_latency.c | 49 +-
test/performance/odp_sched_perf.c | 641 ++++++++
test/performance/odp_sched_pktio.c | 1564 +++++++++++++++++++
.../{odp_l2fwd_run.sh => odp_sched_pktio_run.sh} | 69 +-
test/performance/odp_scheduling.c | 78 +-
test/performance/odp_scheduling_run.sh | 9 +-
test/validation/api/Makefile.am | 2 +-
test/validation/api/atomic/atomic.c | 237 +--
test/validation/api/barrier/barrier.c | 13 +-
.../api/classification/odp_classification_basic.c | 8 +-
.../api/classification/odp_classification_common.c | 2 +-
.../classification/odp_classification_test_pmr.c | 178 ++-
.../api/classification/odp_classification_tests.c | 97 +-
.../classification/odp_classification_testsuites.h | 12 +
test/validation/api/crypto/odp_crypto_test_inp.c | 692 ++++++++-
test/validation/api/crypto/test_vectors.h | 391 +++++
test/validation/api/crypto/test_vectors_len.h | 37 +
test/validation/api/hash/hash.c | 643 +++++++-
test/validation/api/init/Makefile.am | 6 +-
test/validation/api/init/init.c | 190 ---
test/validation/api/init/init.h | 32 -
test/validation/api/init/init_main_abort.c | 55 +-
test/validation/api/init/init_main_log.c | 75 +-
test/validation/api/init/init_main_ok.c | 49 +-
test/validation/api/ipsec/Makefile.am | 2 +-
test/validation/api/ipsec/ipsec.c | 108 +-
test/validation/api/ipsec/ipsec.h | 8 +-
test/validation/api/ipsec/ipsec_test_in.c | 218 ++-
test/validation/api/ipsec/ipsec_test_out.c | 270 +++-
test/validation/api/ipsec/test_vectors.h | 108 +-
test/validation/api/lock/lock.c | 13 +-
test/validation/api/packet/packet.c | 275 +++-
test/validation/api/pktio/parser.c | 47 +
test/validation/api/pktio/pktio.c | 1098 +++++++++++---
test/validation/api/pool/pool.c | 320 +++-
test/validation/api/queue/queue.c | 401 ++++-
test/validation/api/scheduler/scheduler.c | 413 ++++-
test/validation/api/shmem/shmem.c | 14 +-
test/validation/api/system/system.c | 6 +-
test/validation/api/thread/thread.c | 88 +-
test/validation/api/time/time.c | 4 +-
test/validation/api/timer/timer.c | 580 +++++--
test/validation/api/traffic_mngr/Makefile.am | 5 -
test/validation/api/traffic_mngr/traffic_mngr.c | 124 +-
test/validation/api/traffic_mngr/traffic_mngr.sh | 39 -
409 files changed, 32203 insertions(+), 14379 deletions(-)
create mode 100644 config/odp-linux-generic.conf
create mode 100644 doc/users-guide/users-guide-utilities-examples.adoc
create mode 100755 example/generator/generator_null_test.sh
create mode 100644 example/packet/odp_packet_dump.c
create mode 100755 example/packet/packet_dump_run.sh
copy example/{hello => sysinfo}/.gitignore (50%)
create mode 100644 example/sysinfo/Makefile.am
create mode 100644 example/sysinfo/odp_sysinfo.c
create mode 100644 example/timer/odp_timer_accuracy.c
create mode 100644 helper/include/odp/helper/sctp.h
copy include/odp/api/abi-default/{queue.h => comp.h} (52%)
create mode 100644 include/odp/api/spec/comp.h
copy include/odp/api/spec/{queue.h => queue_types.h} (55%)
delete mode 100644 m4/ax_check_compile_flag.m4
delete mode 100644 m4/ax_compiler_vendor.m4
delete mode 100644 m4/ax_compiler_version.m4
delete mode 100644 m4/ax_pthread.m4
create mode 100644 m4/odp_libconfig.m4
create mode 100644 m4/odp_scheduler.m4
delete mode 100644 platform/linux-generic/_ishmphy.c
create mode 100644 platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c
create mode 100644 platform/linux-generic/arch/default/odp/api/abi/cpu_inlines.h
create mode 100644 platform/linux-generic/arch/default/odp/api/abi/cpu_time.h
delete mode 100644 platform/linux-generic/arch/odp_arch_time_internal.h
create mode 100644 platform/linux-generic/arch/x86/odp/api/abi/cpu_inlines.h
copy platform/linux-generic/arch/x86/{odp_cpu_cycles.c => odp/api/abi/cpu_rdtsc.h} (58%)
create mode 100644 platform/linux-generic/arch/x86/odp/api/abi/cpu_time.h
create mode 100644 platform/linux-generic/dumpconfig/.gitignore
create mode 100644 platform/linux-generic/dumpconfig/Makefile.am
create mode 100644 platform/linux-generic/dumpconfig/dumpconfig.c
delete mode 100644 platform/linux-generic/include/_ishm_internal.h
create mode 100644 platform/linux-generic/include/odp/api/plat/buffer_inline_types.h
delete mode 100644 platform/linux-generic/include/odp/api/plat/byteorder_inlines_api.h
create mode 100644 platform/linux-generic/include/odp/api/plat/cpu_inlines.h
create mode 100644 platform/linux-generic/include/odp/api/plat/event_inlines.h
delete mode 100644 platform/linux-generic/include/odp/api/plat/packet_flag_inlines_api.h
delete mode 100644 platform/linux-generic/include/odp/api/plat/packet_inlines_api.h
delete mode 100644 platform/linux-generic/include/odp/api/plat/pktio_inlines_api.h
create mode 100644 platform/linux-generic/include/odp/api/plat/queue_inline_types.h
create mode 100644 platform/linux-generic/include/odp/api/plat/queue_inlines.h
delete mode 100644 platform/linux-generic/include/odp/api/plat/thread_inlines_api.h
delete mode 100644 platform/linux-generic/include/odp/api/plat/ticketlock_inlines_api.h
create mode 100644 platform/linux-generic/include/odp/api/plat/time_inlines.h
delete mode 100644 platform/linux-generic/include/odp_buffer_inlines.h
create mode 100644 platform/linux-generic/include/odp_ethtool_rss.h
create mode 100644 platform/linux-generic/include/odp_ethtool_stats.h
rename platform/linux-generic/include/{_fdserver_internal.h => odp_fdserver_internal.h} (100%)
create mode 100644 platform/linux-generic/include/odp_global_data.h
rename platform/linux-generic/include/{odp_internal.h => odp_init_internal.h} (50%)
rename platform/linux-generic/include/{_ishmphy_internal.h => odp_ishmphy_internal.h} (65%)
rename platform/linux-generic/include/{_ishmpool_internal.h => odp_ishmpool_internal.h} (96%)
create mode 100644 platform/linux-generic/include/odp_libconfig_internal.h
create mode 100644 platform/linux-generic/include/odp_packet_io_stats.h
create mode 100644 platform/linux-generic/include/odp_packet_io_stats_common.h
delete mode 100644 platform/linux-generic/include/odp_packet_netmap.h
delete mode 100644 platform/linux-generic/include/odp_packet_null.h
delete mode 100644 platform/linux-generic/include/odp_packet_tap.h
create mode 100644 platform/linux-generic/include/odp_pcapng.h
create mode 100644 platform/linux-generic/include/odp_queue_basic_internal.h
delete mode 100644 platform/linux-generic/include/odp_queue_internal.h
create mode 100644 platform/linux-generic/include/odp_ring_mpmc_internal.h
create mode 100644 platform/linux-generic/include/odp_ring_spsc_internal.h
create mode 100644 platform/linux-generic/include/odp_ring_st_internal.h
create mode 100644 platform/linux-generic/include/odp_socket_common.h
create mode 100644 platform/linux-generic/include/odp_sysfs_stats.h
create mode 100644 platform/linux-generic/include/odp_sysinfo_internal.h
copy platform/linux-generic/include/protocols/{udp.h => sctp.h} (52%)
create mode 100644 platform/linux-generic/m4/odp_pcapng.m4
delete mode 100644 platform/linux-generic/m4/odp_schedule.m4
delete mode 100644 platform/linux-generic/m4/performance.m4
rename platform/linux-generic/{odp_byteorder.c => odp_byteorder_api.c} (79%)
delete mode 100644 platform/linux-generic/odp_cpu.c
create mode 100644 platform/linux-generic/odp_cpu_api.c
create mode 100644 platform/linux-generic/odp_crypto_null.c
rename platform/linux-generic/{odp_crypto.c => odp_crypto_openssl.c} (88%)
create mode 100644 platform/linux-generic/odp_event_api.c
rename platform/linux-generic/{_fdserver.c => odp_fdserver.c} (87%)
delete mode 100644 platform/linux-generic/odp_hash.c
create mode 100644 platform/linux-generic/odp_hash_crc32.c
create mode 100644 platform/linux-generic/odp_hash_crc32c.c
create mode 100644 platform/linux-generic/odp_hash_crc_gen.c
rename platform/linux-generic/{_ishm.c => odp_ishm.c} (71%)
create mode 100644 platform/linux-generic/odp_ishmphy.c
rename platform/linux-generic/{_ishmpool.c => odp_ishmpool.c} (97%)
create mode 100644 platform/linux-generic/odp_libconfig.c
create mode 100644 platform/linux-generic/odp_pcapng.c
delete mode 100644 platform/linux-generic/odp_queue.c
create mode 100644 platform/linux-generic/odp_queue_api.c
create mode 100644 platform/linux-generic/odp_queue_basic.c
create mode 100644 platform/linux-generic/odp_queue_spsc.c
create mode 100644 platform/linux-generic/odp_random_null.c
create mode 100644 platform/linux-generic/odp_random_openssl.c
rename platform/linux-generic/{odp_schedule.c => odp_schedule_basic.c} (53%)
delete mode 100644 platform/linux-generic/odp_schedule_iquery.c
rename platform/linux-generic/{odp_std_clib.c => odp_std_clib_api.c} (92%)
rename platform/linux-generic/{odp_sync.c => odp_sync_api.c} (91%)
rename platform/linux-generic/{odp_ticketlock.c => odp_ticketlock_api.c} (64%)
create mode 100644 platform/linux-generic/odp_time_api.c
create mode 100644 platform/linux-generic/pktio/dpdk_parse.c
create mode 100644 platform/linux-generic/pktio/ethtool_rss.c
create mode 100644 platform/linux-generic/pktio/socket_common.c
rename platform/linux-generic/pktio/{ethtool.c => stats/ethtool_stats.c} (97%)
create mode 100644 platform/linux-generic/pktio/stats/packet_io_stats.c
rename platform/linux-generic/pktio/{sysfs.c => stats/sysfs_stats.c} (97%)
delete mode 100644 platform/linux-generic/test/example/Makefile.am
delete mode 100644 platform/linux-generic/test/example/generator/Makefile.am
delete mode 100755 platform/linux-generic/test/example/generator/generator_run.sh
create mode 100644 platform/linux-generic/test/inline-timer.conf
delete mode 100644 platform/linux-generic/test/performance/.gitignore
delete mode 100644 platform/linux-generic/test/performance/Makefile.am
delete mode 100755 platform/linux-generic/test/performance/odp_scheduling_run_proc.sh
create mode 100644 platform/linux-generic/test/process-mode.conf
delete mode 100644 scripts/Dockerfile
delete mode 100755 scripts/build-pktio-dpdk
create mode 100755 scripts/ci/build.sh
create mode 100755 scripts/ci/build_arm64.sh
create mode 100755 scripts/ci/build_armhf.sh
create mode 100755 scripts/ci/build_i386.sh
create mode 100755 scripts/ci/build_powerpc.sh
create mode 100755 scripts/ci/build_x86_64.sh
create mode 100755 scripts/ci/check.sh
create mode 100755 scripts/ci/check_inline_timer.sh
create mode 100755 scripts/ci/coverage.sh
create mode 100755 scripts/ci/distcheck.sh
create mode 100644 test/performance/odp_cpu_bench.c
copy test/performance/{odp_crypto.c => odp_ipsec.c} (54%)
create mode 100644 test/performance/odp_pool_perf.c
create mode 100644 test/performance/odp_queue_perf.c
create mode 100644 test/performance/odp_sched_perf.c
create mode 100644 test/performance/odp_sched_pktio.c
copy test/performance/{odp_l2fwd_run.sh => odp_sched_pktio_run.sh} (50%)
delete mode 100644 test/validation/api/init/init.c
delete mode 100644 test/validation/api/init/init.h
delete mode 100755 test/validation/api/traffic_mngr/traffic_mngr.sh
hooks/post-receive
--
7 years, 9 months
- 1
- 0
[COMMIT] branch master updated. v1.19.0.2_tigermoth-308-gee833c56
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 ee833c56e09b95d8c11217e8a3f614470833f2d5 (commit)
from 6576ed1f000f326a44c636a3e5d832a7a2cfd4f7 (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 ee833c56e09b95d8c11217e8a3f614470833f2d5
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Nov 9 13:01:14 2018 +0300
travis: install graphviz in doxygen test
Install graphviz to stop doxygen from emitting 'missing dot' errors.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/.travis.yml b/.travis.yml
index f2b87b7b..85ab9ae4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -196,6 +196,7 @@ jobs:
- libconfig-dev
- libssl-dev
- cmake
+ - graphviz
install:
# Updated Doxygen
- |
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
7 years, 9 months
- 1
- 0
[COMMIT] branch master updated. v1.19.0.2_tigermoth-307-g6576ed1f
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 6576ed1f000f326a44c636a3e5d832a7a2cfd4f7 (commit)
via 5f95fc513d87d46753cf81a5da20b5ff4852eeff (commit)
via 4fd6b609766aa741617e3fa443dd5d9c0bb9eb71 (commit)
via e9bdfb477cc3c329e443cb8d2ffe5ce6ead7de8b (commit)
via 21bdc8b9d58ba5bf0dd3cb569587f4c53edd7ee3 (commit)
via 0748e9fc9fcc121ceb4e914870145461cc0a87eb (commit)
via 0b511f3fdd3cbea300fa3108c17b1f8fcfe75da4 (commit)
via dbaed696a6409093dc9d387c8ea946362b6ce212 (commit)
via a4d92554bdb13f7aa3a1ab2ef212f080d5b5abcd (commit)
via 1ecf1ddef06e0bb00641f2eb6605c34640c603ff (commit)
via c80718ccd7b16d959a08292bc527f9bd66d5d1a2 (commit)
via 1065c7735a98611308f7430839a62e8a1fab40da (commit)
via 5d002e728f60be318f235cc610b4f1dd631a34ba (commit)
via 48f8e6319df988f70bf9efde1cfab76ca4fa4549 (commit)
via 47d3ace1c522e193cefb9730d046350817d31ecd (commit)
via 0c0a0fc7fba874f14821e096c62b7fbeecd9b25a (commit)
via b277ad28d344aa9bb98c26cc84bc071d57559a41 (commit)
via b2be0e3688db91640882eb9df24a3a9f43cb3d88 (commit)
via ed4270a59273b13619bda3a903fe83bb47ea6087 (commit)
via cc7bc42309d5d1bf844af376f13a981cf57cb76b (commit)
via 20a76096f5bbc87f545f16be72f766d26d5865c5 (commit)
via 8ea3be29a66bd7bfe2776f5117f3c8bac78668ea (commit)
via ec16951089de3ed475570d253f1f0b0746304cc9 (commit)
via 7b23d26816a334804277a87e5ea93f2958e5a6ec (commit)
via 9e1d151f2f308c16ed542a7fa1ab0f0cf1e7a0fc (commit)
via d867eedd6987daba2f03f3b036601708969528f1 (commit)
via 411a07b61019cece7545fb325cc77a328a657f83 (commit)
via 3d1711bc27a819876552e1104a3f2fdfb0760a4e (commit)
via 9504a42688ff7242317b0aa4669dff2bf7aa9d93 (commit)
via e5f7c8fd4249b11a86715cd31394c73145cc674e (commit)
via 3bd31be9ea2f5e96e96a638a081d8223d1734e6c (commit)
via 9cd5b915b1b65e4e5fc83dedf9afa7029f1d3274 (commit)
via 6afbe90158988dc36e25b1954fe1fe9124ae7df1 (commit)
via 48e3615af2cf18136a32b5a0afa0d05303bd4d36 (commit)
via 9b11cef7a44294ec094e508f8090d77c2284728e (commit)
via 0485bc704a497ca482fe47228d6295fac661d947 (commit)
via 7b9a1713a148fffff7095215b661f37ffc2a681b (commit)
via ca71292dbadc5959ebcfaeda0c071ed558359b8b (commit)
via a89e63bb67bfc163ac67aed49a3e3b733aca8384 (commit)
via f9bb28e43836da8183276199f888fb8ee612defa (commit)
via 2411cd30bfc38651860fcc0e9f1331c3a37ccfbe (commit)
via e49af8a47be1f267a9d0a50066f9b7ba2f8bd774 (commit)
via e06d1f6cfb34e13b6a3bc81220f07c1207c04248 (commit)
via 97bb0f3801f2f1692a12e24d9aa4fadf0b8ce477 (commit)
via 62782960967bd58553139d6b20f91a5849a2c288 (commit)
via e6a9fa3c8d910fcc0f31cf5f3334addf3246d482 (commit)
via bfc48dbed3d58f7f3325cd0a05445f2ab537c38e (commit)
via 59a26fc8cc0be0be0e30144389cfee2e55a88ab2 (commit)
via cb5ed2680f28412e72aa59f5769581bdb19d4ebd (commit)
from 686811c2f3961f3fb26c862059fb690443567e73 (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 6576ed1f000f326a44c636a3e5d832a7a2cfd4f7
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Tue Nov 27 18:01:38 2018 +0300
linux-gen: drop performance.m4
performance.m4 which provides --enable-test-perf-proc is
not needed now because process mode is tested with standard
tests.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-and-tested-by Matias Elo <matias.elo(a)nokia.com>
diff --git a/configure.ac b/configure.ac
index 2ce476a6..5dd2e777 100644
--- a/configure.ac
+++ b/configure.ac
@@ -410,7 +410,6 @@ AC_MSG_RESULT([
with_tests: ${with_tests}
test_vald: ${test_vald}
test_perf: ${test_perf}
- test_perf_proc: ${test_perf_proc}
test_cpp: ${test_cpp}
test_helper: ${test_helper}
test_example: ${test_example}
diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4
index c3aa7396..1dd14cd4 100644
--- a/platform/linux-generic/m4/configure.m4
+++ b/platform/linux-generic/m4/configure.m4
@@ -20,8 +20,6 @@ m4_include([platform/linux-generic/m4/odp_netmap.m4])
m4_include([platform/linux-generic/m4/odp_dpdk.m4])
ODP_SCHEDULER
-m4_include([platform/linux-generic/m4/performance.m4])
-
AC_CONFIG_COMMANDS_PRE([dnl
AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC],
[test "${with_platform}" = "linux-generic"])
diff --git a/platform/linux-generic/m4/performance.m4 b/platform/linux-generic/m4/performance.m4
deleted file mode 100644
index f2e7107c..00000000
--- a/platform/linux-generic/m4/performance.m4
+++ /dev/null
@@ -1,10 +0,0 @@
-##########################################################################
-# Enable/disable test-perf-proc
-##########################################################################
-AC_ARG_ENABLE([test-perf-proc],
- [AS_HELP_STRING([--enable-test-perf-proc], [run test in test/performance in process mode])],
- [test_perf_proc=$enableval],
- [test_perf_proc=yes])
-AC_CONFIG_COMMANDS_PRE([dnl
-AM_CONDITIONAL([test_perf_proc], [test x$test_perf_proc = xyes ])
-])
commit 5f95fc513d87d46753cf81a5da20b5ff4852eeff
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Mon Nov 26 15:57:33 2018 +0200
example: generator: add signal handler for SIGINT
Free used resources after receiving SIGINT.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c
index e3d76cb9..1093454c 100644
--- a/example/generator/odp_generator.c
+++ b/example/generator/odp_generator.c
@@ -15,6 +15,7 @@
#include <unistd.h>
#include <inttypes.h>
#include <sys/time.h>
+#include <signal.h>
#include <example_debug.h>
@@ -168,6 +169,14 @@ static void usage(char *progname);
static int scan_ip(char *buf, unsigned int *paddr);
static void print_global_stats(int num_workers);
+static void sig_handler(int signo ODP_UNUSED)
+{
+ int i;
+
+ for (i = 0; i < args->thread_cnt; i++)
+ args->thread[i].stop = 1;
+}
+
/**
* Scan ip
* Parse ip address.
@@ -1105,6 +1114,10 @@ int main(int argc, char *argv[])
odp_init_t init_param;
odph_odpthread_params_t thr_params;
+ /* Signal handler has to be registered before global init in case ODP
+ * implementation creates internal threads/processes. */
+ signal(SIGINT, sig_handler);
+
/* Let helper collect its own arguments (e.g. --odph_proc) */
argc = odph_parse_options(argc, argv);
if (odph_options(&helper_options)) {
diff --git a/test/performance/odp_l2fwd_run.sh b/test/performance/odp_l2fwd_run.sh
index 6166c8b2..5745d327 100755
--- a/test/performance/odp_l2fwd_run.sh
+++ b/test/performance/odp_l2fwd_run.sh
@@ -88,7 +88,7 @@ run_l2fwd()
$STDBUF odp_l2fwd${EXEEXT} -i $IF1,$IF2 -m 0 -t 30 -c 2 | tee $LOG
ret=$?
- kill ${GEN_PID}
+ kill -2 ${GEN_PID}
if [ ! -f $LOG ]; then
echo "FAIL: $LOG not found"
diff --git a/test/performance/odp_sched_pktio_run.sh b/test/performance/odp_sched_pktio_run.sh
index db14fb59..1c8d2945 100755
--- a/test/performance/odp_sched_pktio_run.sh
+++ b/test/performance/odp_sched_pktio_run.sh
@@ -72,7 +72,7 @@ run_sched_pktio()
# Run test for 5 sec
sleep 5
- kill ${GEN_PID}
+ kill -2 ${GEN_PID}
wait ${GEN_PID}
# Kill with SIGINT to output statistics
commit 4fd6b609766aa741617e3fa443dd5d9c0bb9eb71
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Mon Nov 26 17:23:28 2018 +0300
text: perf odp_sched_pktio: try to terminate on failure
try to do clean up even if error was detected (try to remove
openned files for mmap.)
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c
index 4bc5be7b..878dcad0 100644
--- a/test/performance/odp_sched_pktio.c
+++ b/test/performance/odp_sched_pktio.c
@@ -1548,17 +1548,17 @@ quit:
if (odp_shm_free(shm)) {
printf("Error: shm free failed.\n");
- return -1;
+ ret = -1;
}
if (odp_term_local()) {
printf("Error: term local failed.\n");
- return -1;
+ ret = -1;
}
if (odp_term_global(instance)) {
printf("Error: term global failed.\n");
- return -1;
+ ret = -1;
}
return ret;
commit e9bdfb477cc3c329e443cb8d2ffe5ce6ead7de8b
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Mon Nov 26 17:21:00 2018 +0300
linux-gen: ishm: add missing cast to calculate max_memory
Fix integer overflow doing math for max_memory.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index eceadd99..875f9f9d 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -1646,7 +1646,7 @@ int _odp_ishm_init_global(const odp_init_t *init)
ODP_DBG("Shm single VA size: %dkB\n", val_kb);
- max_memory = val_kb * 1024;
+ max_memory = (uint64_t)val_kb * 1024;
internal = max_memory / 8;
if (!_odp_libconfig_lookup_ext_int("shm", NULL, "huge_page_limit_kb",
commit 21bdc8b9d58ba5bf0dd3cb569587f4c53edd7ee3
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Mon Nov 26 12:32:15 2018 +0300
linux-gen: remove performance test for process mode
process mode tests run when process mode config is
specified. Here it has to be dropped.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4
index f9e9c494..c3aa7396 100644
--- a/platform/linux-generic/m4/configure.m4
+++ b/platform/linux-generic/m4/configure.m4
@@ -33,6 +33,5 @@ AC_CONFIG_FILES([platform/linux-generic/Makefile
platform/linux-generic/test/validation/api/pktio/Makefile
platform/linux-generic/test/mmap_vlan_ins/Makefile
platform/linux-generic/test/pktio_ipc/Makefile
- platform/linux-generic/test/ring/Makefile
- platform/linux-generic/test/performance/Makefile])
+ platform/linux-generic/test/ring/Makefile])
])
diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am
index 99934099..03a1474d 100644
--- a/platform/linux-generic/test/Makefile.am
+++ b/platform/linux-generic/test/Makefile.am
@@ -1,7 +1,7 @@
include $(top_srcdir)/test/Makefile.inc
TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation
-SUBDIRS = performance
+SUBDIRS =
if test_vald
TESTS = validation/api/pktio/pktio_run.sh \
@@ -9,10 +9,10 @@ TESTS = validation/api/pktio/pktio_run.sh \
validation/api/shmem/shmem_linux$(EXEEXT)
SUBDIRS += validation/api/pktio\
- validation/api/shmem\
- mmap_vlan_ins\
- pktio_ipc\
- ring
+ validation/api/shmem\
+ mmap_vlan_ins\
+ pktio_ipc\
+ ring
if HAVE_PCAP
TESTS += validation/api/pktio/pktio_run_pcap.sh
diff --git a/platform/linux-generic/test/performance/.gitignore b/platform/linux-generic/test/performance/.gitignore
deleted file mode 100644
index 7e563b8b..00000000
--- a/platform/linux-generic/test/performance/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.log
-*.trs
diff --git a/platform/linux-generic/test/performance/Makefile.am b/platform/linux-generic/test/performance/Makefile.am
deleted file mode 100644
index 0b5da671..00000000
--- a/platform/linux-generic/test/performance/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-include $(top_srcdir)/test/Makefile.inc
-
-TESTS_ENVIRONMENT += TEST_DIR=${builddir}
-
-TESTSCRIPTS = odp_scheduling_run_proc.sh
-
-TEST_EXTENSIONS = .sh
-
-if test_perf_proc
-TESTS = $(TESTSCRIPTS)
-endif
-
-dist_check_SCRIPTS = $(TESTSCRIPTS)
diff --git a/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh b/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh
deleted file mode 100755
index c16bcb86..00000000
--- a/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2016-2018, Linaro Limited
-# All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-# Script that passes command line arguments to odp_scheduling test when
-# launched by 'make check'
-
-TEST_DIR="${TEST_DIR:-$(dirname $0)}"
-PERFORMANCE="$TEST_DIR/../../../../test/performance"
-ret=0
-ALL=0
-
-run()
-{
- echo odp_scheduling_run starts requesting $1 worker threads
- echo =====================================================
-
- $PERFORMANCE/odp_scheduling${EXEEXT} --odph_proc -c $1 || ret=1
-}
-
-run 1
-run 5
-run 8
-run 11
-run $ALL
-
-exit $ret
commit 0748e9fc9fcc121ceb4e914870145461cc0a87eb
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Fri Nov 23 22:34:16 2018 +0300
travis: check.sh request huge pages at early start
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/scripts/ci/check.sh b/scripts/ci/check.sh
index 43168680..85cee498 100755
--- a/scripts/ci/check.sh
+++ b/scripts/ci/check.sh
@@ -1,14 +1,14 @@
#!/bin/bash
set -e
-"`dirname "$0"`"/build_x86_64.sh
-
-cd "$(dirname "$0")"/../..
-
echo 1000 | tee /proc/sys/vm/nr_hugepages
mkdir -p /mnt/huge
mount -t hugetlbfs nodev /mnt/huge
+"`dirname "$0"`"/build_x86_64.sh
+
+cd "$(dirname "$0")"/../..
+
# Ignore possible failures there because these tests depends on measurements
# and systems might differ in performance.
export CI="true"
commit 0b511f3fdd3cbea300fa3108c17b1f8fcfe75da4
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Mon Oct 15 13:45:30 2018 +0300
linux-gen: shm: remove single_va configuration option
Process mode is now enabled by setting odp_init_global() parameter
odp_init_t.mem_model to ODP_MEM_MODEL_PROCESS.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf
index 8a1eddbd..e00e4a51 100644
--- a/config/odp-linux-generic.conf
+++ b/config/odp-linux-generic.conf
@@ -16,7 +16,7 @@
# Mandatory fields
odp_implementation = "linux-generic"
-config_file_version = "0.1.5"
+config_file_version = "0.1.6"
# Shared memory options
shm: {
@@ -39,10 +39,6 @@ shm: {
# reservations are done using normal pages to conserve memory.
huge_page_limit_kb = 64
- # Allocate internal shared memory using a single virtual address space.
- # Set to 1 to enable using process mode.
- single_va = 0
-
# Amount of memory pre-reserved for ODP_SHM_SINGLE_VA usage in kilobytes
single_va_size_kb = 131072
}
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index d02e5ee9..eceadd99 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -298,15 +298,8 @@ static void hp_init(void)
char filename[ISHM_FILENAME_MAXLEN];
char dir[ISHM_FILENAME_MAXLEN];
int count;
- int single_va = 0;
void *addr;
- if (_odp_libconfig_lookup_ext_int("shm", NULL, "single_va",
- &single_va)) {
- odp_global_ro.shm_single_va = single_va;
- ODP_DBG("Shm single VA: %d\n", odp_global_ro.shm_single_va);
- }
-
if (!_odp_libconfig_lookup_ext_int("shm", NULL, "num_cached_hp",
&count)) {
return;
diff --git a/platform/linux-generic/test/inline-timer.conf b/platform/linux-generic/test/inline-timer.conf
index cc9f2037..6cae241d 100644
--- a/platform/linux-generic/test/inline-timer.conf
+++ b/platform/linux-generic/test/inline-timer.conf
@@ -1,6 +1,6 @@
# Mandatory fields
odp_implementation = "linux-generic"
-config_file_version = "0.1.5"
+config_file_version = "0.1.6"
timer: {
# Enable inline timer implementation
diff --git a/platform/linux-generic/test/process-mode.conf b/platform/linux-generic/test/process-mode.conf
index e3e6b55b..fc897494 100644
--- a/platform/linux-generic/test/process-mode.conf
+++ b/platform/linux-generic/test/process-mode.conf
@@ -1,13 +1,9 @@
# Mandatory fields
odp_implementation = "linux-generic"
-config_file_version = "0.1.5"
+config_file_version = "0.1.6"
# Shared memory options
shm: {
- # Override default option and allocate internal shms using single
- # virtual address space.
- single_va = 1
-
# Increase the amount of single VA memory
single_va_size_kb = 1048576
}
commit dbaed696a6409093dc9d387c8ea946362b6ce212
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Mon Oct 15 15:27:11 2018 +0300
validation: use use mem_model from helper options
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common/odp_cunit_common.c b/test/common/odp_cunit_common.c
index 6b9ded4a..4db6c32d 100644
--- a/test/common/odp_cunit_common.c
+++ b/test/common/odp_cunit_common.c
@@ -79,7 +79,18 @@ int odp_cunit_thread_exit(pthrd_arg *arg)
static int tests_global_init(odp_instance_t *inst)
{
- if (0 != odp_init_global(inst, NULL, NULL)) {
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
+
+ if (odph_options(&helper_options)) {
+ fprintf(stderr, "error: odph_options() failed.\n");
+ return -1;
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (0 != odp_init_global(inst, &init_param, NULL)) {
fprintf(stderr, "error: odp_init_global() failed.\n");
return -1;
}
diff --git a/test/validation/api/atomic/atomic.c b/test/validation/api/atomic/atomic.c
index a755aef9..9530df9c 100644
--- a/test/validation/api/atomic/atomic.c
+++ b/test/validation/api/atomic/atomic.c
@@ -8,6 +8,7 @@
#include <malloc.h>
#include <odp_api.h>
+#include <odp/helper/odph_api.h>
#include <CUnit/Basic.h>
#include <odp_cunit_common.h>
#include <unistd.h>
@@ -554,8 +555,18 @@ static int atomic_init(odp_instance_t *inst)
uint32_t workers_count, max_threads;
int ret = 0;
odp_cpumask_t mask;
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
- if (0 != odp_init_global(inst, NULL, NULL)) {
+ if (odph_options(&helper_options)) {
+ fprintf(stderr, "error: odph_options() failed.\n");
+ return -1;
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (0 != odp_init_global(inst, &init_param, NULL)) {
fprintf(stderr, "error: odp_init_global() failed.\n");
return -1;
}
diff --git a/test/validation/api/barrier/barrier.c b/test/validation/api/barrier/barrier.c
index a3be4be4..806f2486 100644
--- a/test/validation/api/barrier/barrier.c
+++ b/test/validation/api/barrier/barrier.c
@@ -8,6 +8,7 @@
#include <malloc.h>
#include <odp_api.h>
+#include <odp/helper/odph_api.h>
#include <CUnit/Basic.h>
#include <odp_cunit_common.h>
#include <unistd.h>
@@ -329,8 +330,18 @@ static int barrier_init(odp_instance_t *inst)
uint32_t workers_count, max_threads;
int ret = 0;
odp_cpumask_t mask;
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
- if (0 != odp_init_global(inst, NULL, NULL)) {
+ if (odph_options(&helper_options)) {
+ fprintf(stderr, "error: odph_options() failed.\n");
+ return -1;
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (0 != odp_init_global(inst, &init_param, NULL)) {
fprintf(stderr, "error: odp_init_global() failed.\n");
return -1;
}
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index 76215bc2..b2f599ec 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -7,6 +7,7 @@
#include "config.h"
#include <odp_api.h>
+#include <odp/helper/odph_api.h>
#include <CUnit/Basic.h>
#include <odp_cunit_common.h>
#include "test_vectors.h"
@@ -2033,8 +2034,18 @@ static int crypto_init(odp_instance_t *inst)
odp_queue_t out_queue;
odp_pool_capability_t pool_capa;
odp_crypto_capability_t crypto_capa;
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
- if (0 != odp_init_global(inst, NULL, NULL)) {
+ if (odph_options(&helper_options)) {
+ fprintf(stderr, "error: odph_options() failed.\n");
+ return -1;
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (0 != odp_init_global(inst, &init_param, NULL)) {
fprintf(stderr, "error: odp_init_global() failed.\n");
return -1;
}
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index f10c4c29..f82c561a 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -910,8 +910,18 @@ int ipsec_init(odp_instance_t *inst)
odp_queue_t out_queue;
odp_pool_capability_t pool_capa;
odp_pktio_t pktio;
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
- if (0 != odp_init_global(inst, NULL, NULL)) {
+ if (odph_options(&helper_options)) {
+ fprintf(stderr, "error: odph_options() failed.\n");
+ return -1;
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (0 != odp_init_global(inst, &init_param, NULL)) {
fprintf(stderr, "error: odp_init_global() failed.\n");
return -1;
}
diff --git a/test/validation/api/lock/lock.c b/test/validation/api/lock/lock.c
index 67e1e3c8..b8502f01 100644
--- a/test/validation/api/lock/lock.c
+++ b/test/validation/api/lock/lock.c
@@ -8,6 +8,7 @@
#include <malloc.h>
#include <odp_api.h>
+#include <odp/helper/odph_api.h>
#include <CUnit/Basic.h>
#include <odp_cunit_common.h>
#include <unistd.h>
@@ -1163,8 +1164,18 @@ static int lock_init(odp_instance_t *inst)
uint32_t workers_count, max_threads;
int ret = 0;
odp_cpumask_t mask;
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
- if (0 != odp_init_global(inst, NULL, NULL)) {
+ if (odph_options(&helper_options)) {
+ fprintf(stderr, "error: odph_options() failed.\n");
+ return -1;
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (0 != odp_init_global(inst, &init_param, NULL)) {
fprintf(stderr, "error: odp_init_global() failed.\n");
return -1;
}
diff --git a/test/validation/api/thread/thread.c b/test/validation/api/thread/thread.c
index d977f977..7b40cda6 100644
--- a/test/validation/api/thread/thread.c
+++ b/test/validation/api/thread/thread.c
@@ -7,6 +7,7 @@
#include "config.h"
#include <odp_api.h>
+#include <odp/helper/odph_api.h>
#include <odp_cunit_common.h>
#include <mask_common.h>
#include <test_debug.h>
@@ -24,8 +25,18 @@ static global_shared_mem_t *global_mem;
static int thread_global_init(odp_instance_t *inst)
{
odp_shm_t global_shm;
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
- if (0 != odp_init_global(inst, NULL, NULL)) {
+ if (odph_options(&helper_options)) {
+ fprintf(stderr, "error: odph_options() failed.\n");
+ return -1;
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (0 != odp_init_global(inst, &init_param, NULL)) {
fprintf(stderr, "error: odp_init_global() failed.\n");
return -1;
}
diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c
index eb8df665..72294c5c 100644
--- a/test/validation/api/timer/timer.c
+++ b/test/validation/api/timer/timer.c
@@ -61,8 +61,18 @@ static global_shared_mem_t *global_mem;
static int timer_global_init(odp_instance_t *inst)
{
odp_shm_t global_shm;
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
- if (0 != odp_init_global(inst, NULL, NULL)) {
+ if (odph_options(&helper_options)) {
+ fprintf(stderr, "error: odph_options() failed.\n");
+ return -1;
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (0 != odp_init_global(inst, &init_param, NULL)) {
fprintf(stderr, "error: odp_init_global() failed.\n");
return -1;
}
commit a4d92554bdb13f7aa3a1ab2ef212f080d5b5abcd
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 12 15:51:07 2018 +0300
example: use mem_model from helper options
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c
index 22dae395..43d40c53 100644
--- a/example/classifier/odp_classifier.c
+++ b/example/classifier/odp_classifier.c
@@ -468,6 +468,7 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args)
*/
int main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
odp_pool_t pool;
int num_workers;
@@ -481,10 +482,21 @@ int main(int argc, char *argv[])
odp_shm_t shm;
int ret;
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ EXAMPLE_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
EXAMPLE_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
@@ -802,9 +814,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+c:t:i:p:m:t:h";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->cpu_count = 1; /* Use one worker by default */
while (1) {
diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c
index 54194c66..e3d76cb9 100644
--- a/example/generator/odp_generator.c
+++ b/example/generator/odp_generator.c
@@ -1090,6 +1090,7 @@ static void print_global_stats(int num_workers)
*/
int main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
odp_pool_t pool;
int num_workers;
@@ -1101,10 +1102,21 @@ int main(int argc, char *argv[])
odp_pool_param_t params;
interface_t *ifs;
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ EXAMPLE_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
EXAMPLE_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
@@ -1424,9 +1436,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+I:a:b:s:d:p:i:m:n:t:w:c:x:he:j:f:k"
":yr:z";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->mode = -1; /* Invalid, must be changed by parsing */
appl_args->number = -1;
appl_args->payload = 56;
diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c
index b45a82d7..52ccce22 100644
--- a/example/ipsec/odp_ipsec.c
+++ b/example/ipsec/odp_ipsec.c
@@ -1186,6 +1186,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED)
int
main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
int num_workers;
int i;
@@ -1195,6 +1196,7 @@ main(int argc, char *argv[])
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
odp_pool_param_t params;
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
/* create by default scheduled queues */
@@ -1207,8 +1209,18 @@ main(int argc, char *argv[])
schedule = polled_odp_schedule_cb;
}
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ EXAMPLE_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
EXAMPLE_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
@@ -1402,9 +1414,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+c:i:m:h:r:p:a:e:t:s:";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
printf("\nParsing command line options\n");
appl_args->cpu_count = 1; /* use one worker by default */
diff --git a/example/ipsec_api/odp_ipsec.c b/example/ipsec_api/odp_ipsec.c
index d72109cf..fb0d9049 100644
--- a/example/ipsec_api/odp_ipsec.c
+++ b/example/ipsec_api/odp_ipsec.c
@@ -885,6 +885,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED)
int
main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
int num_workers;
int i;
@@ -894,6 +895,7 @@ main(int argc, char *argv[])
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
odp_pool_param_t params;
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
/* create by default scheduled queues */
@@ -906,8 +908,18 @@ main(int argc, char *argv[])
schedule = polled_odp_schedule_cb;
}
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ EXAMPLE_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
EXAMPLE_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
@@ -1103,9 +1115,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+c:i:h:lm:r:p:a:e:t:s:";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->cpu_count = 1; /* use one worker by default */
printf("\nParsing command line options\n");
diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c
index 8daeec4c..f7e7ba53 100644
--- a/example/l2fwd_simple/odp_l2fwd_simple.c
+++ b/example/l2fwd_simple/odp_l2fwd_simple.c
@@ -139,17 +139,29 @@ static int run_worker(void *arg ODP_UNUSED)
int main(int argc, char **argv)
{
+ odph_helper_options_t helper_options;
odp_pool_t pool;
odp_pool_param_t params;
odp_cpumask_t cpumask;
odph_odpthread_t thd[MAX_WORKERS];
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
odph_ethaddr_t correct_src;
uint32_t mtu1, mtu2;
odp_shm_t shm;
- if (odp_init_global(&instance, NULL, NULL)) {
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ printf("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (odp_init_global(&instance, &init_param, NULL)) {
printf("Error: ODP global init failed.\n");
exit(1);
}
@@ -171,9 +183,6 @@ int main(int argc, char **argv)
memset(global, 0, sizeof(global_data_t));
global->shm = shm;
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
if (argc > 7 ||
odph_eth_addr_parse(&global->dst, argv[3]) != 0 ||
odph_eth_addr_parse(&global->src, argv[4]) != 0) {
diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c
index 9d96dd2c..e73e903c 100644
--- a/example/packet/odp_pktio.c
+++ b/example/packet/odp_pktio.c
@@ -343,6 +343,7 @@ static int pktio_ifburst_thread(void *arg)
*/
int main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
odp_pool_t pool;
int num_workers;
@@ -352,11 +353,22 @@ int main(int argc, char *argv[])
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
odp_pool_param_t params;
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
odp_shm_t shm;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ EXAMPLE_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
EXAMPLE_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
@@ -582,9 +594,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+c:i:+m:t:h";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->cpu_count = 1; /* use one worker by default */
appl_args->mode = APPL_MODE_PKT_SCHED;
appl_args->time = 0; /**< loop forever */
diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c
index a67fa180..a0162145 100644
--- a/example/switch/odp_switch.c
+++ b/example/switch/odp_switch.c
@@ -758,9 +758,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+c:+t:+a:i:h";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->cpu_count = 1; /* use one worker by default */
appl_args->time = 0; /* loop forever if time to run is 0 */
appl_args->accuracy = 10; /* get and print pps stats second */
@@ -870,6 +867,7 @@ static void gbl_args_init(args_t *args)
int main(int argc, char **argv)
{
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
int i, j;
int cpu;
@@ -882,10 +880,21 @@ int main(int argc, char **argv)
stats_t (*stats)[MAX_PKTIOS];
int if_count;
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ printf("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
printf("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c
index 317f9a27..6c56d6c6 100644
--- a/example/time/time_global_test.c
+++ b/example/time/time_global_test.c
@@ -254,16 +254,25 @@ int main(int argc, char *argv[])
odp_shm_t shm_glbls = ODP_SHM_INVALID;
odp_shm_t shm_log = ODP_SHM_INVALID;
int log_size, log_enries_num;
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
- /* let helper collect its own arguments (e.g. --odph_proc) */
+ printf("\nODP global time test starts\n");
+
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ EXAMPLE_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
- printf("\nODP global time test starts\n");
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
err = 1;
EXAMPLE_ERR("ODP global init failed.\n");
goto end;
diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c
index 9e431b47..192a61d3 100644
--- a/example/timer/odp_timer_test.c
+++ b/example/timer/odp_timer_test.c
@@ -274,9 +274,6 @@ static void parse_args(int argc, char *argv[], test_args_t *args)
static const char *shortopts = "+c:r:m:x:p:t:h";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
/* defaults */
odp_timer_capability(ODP_CLOCK_CPU, &timer_capa);
@@ -334,6 +331,7 @@ static void parse_args(int argc, char *argv[], test_args_t *args)
*/
int main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
int num_workers;
odp_queue_t queue;
@@ -345,6 +343,7 @@ int main(int argc, char *argv[])
odp_cpumask_t cpumask;
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
odp_shm_t shm = ODP_SHM_INVALID;
test_globals_t *gbls = NULL;
@@ -352,7 +351,17 @@ int main(int argc, char *argv[])
printf("\nODP timer example starts\n");
- if (odp_init_global(&instance, NULL, NULL)) {
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ EXAMPLE_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (odp_init_global(&instance, &init_param, NULL)) {
err = 1;
printf("ODP global init failed.\n");
goto err_global;
commit 1ecf1ddef06e0bb00641f2eb6605c34640c603ff
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 12 16:14:26 2018 +0300
test: performance: use mem_model from helper options
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c
index faa51dad..75ea0a7a 100644
--- a/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c
+++ b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c
@@ -135,14 +135,20 @@ int main(int argc, char **argv)
odp_pool_t pool;
odp_pool_param_t params;
odp_cpumask_t cpumask;
+ odph_helper_options_t helper_options;
odph_odpthread_t thd[MAX_WORKERS];
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
odp_shm_t shm;
int ret;
- /* let helper collect its own arguments (e.g. --odph_proc) */
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ printf("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
if (argc < 3) {
printf("Too few arguments (%i).\n"
@@ -150,7 +156,10 @@ int main(int argc, char **argv)
exit(0);
}
- if (odp_init_global(&instance, NULL, NULL)) {
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (odp_init_global(&instance, &init_param, NULL)) {
printf("Error: ODP global init failed.\n");
exit(1);
}
diff --git a/test/performance/odp_bench_packet.c b/test/performance/odp_bench_packet.c
index a4493139..9b779e98 100644
--- a/test/performance/odp_bench_packet.c
+++ b/test/performance/odp_bench_packet.c
@@ -1315,9 +1315,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "b:i:h";
- /* Let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->bench_idx = 0; /* Run all benchmarks */
appl_args->burst_size = TEST_DEF_BURST;
@@ -1511,6 +1508,7 @@ bench_info_t test_suite[] = {
*/
int main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t worker_thread;
int cpu;
odp_shm_t shm;
@@ -1519,11 +1517,22 @@ int main(int argc, char *argv[])
odp_pool_capability_t capa;
odp_pool_param_t params;
odp_instance_t instance;
+ odp_init_t init_param;
uint32_t pkt_num;
uint8_t ret;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ LOG_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
LOG_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
diff --git a/test/performance/odp_cpu_bench.c b/test/performance/odp_cpu_bench.c
index 196af346..402ab4a1 100644
--- a/test/performance/odp_cpu_bench.c
+++ b/test/performance/odp_cpu_bench.c
@@ -382,9 +382,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+a:+c:+l:+t:h";
- /* Let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->accuracy = 1; /* Get and print pps stats second */
appl_args->cpu_count = 1;
appl_args->lookup_tbl_size = DEF_LOOKUP_TBL_SIZE;
@@ -524,6 +521,7 @@ static void gbl_args_init(args_t *args)
int main(int argc, char *argv[])
{
stats_t *stats[MAX_WORKERS];
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
odp_cpumask_t cpumask;
odp_pool_capability_t pool_capa;
@@ -546,6 +544,13 @@ int main(int argc, char *argv[])
int cpu;
int ret = 0;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ LOG_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
odp_init_param_init(&init);
/* List features not to be used (may optimize performance) */
@@ -555,6 +560,8 @@ int main(int argc, char *argv[])
init.not_used.feat.timer = 1;
init.not_used.feat.tm = 1;
+ init.mem_model = helper_options.mem_model;
+
/* Signal handler has to be registered before global init in case ODP
* implementation creates internal threads/processes. */
signal(SIGINT, sig_handler);
diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c
index 61da80e8..d175bb7e 100644
--- a/test/performance/odp_crypto.c
+++ b/test/performance/odp_crypto.c
@@ -1033,20 +1033,32 @@ int main(int argc, char *argv[])
odp_cpumask_t cpumask;
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
int num_workers = 1;
+ odph_helper_options_t helper_options;
odph_odpthread_t thr[num_workers];
odp_instance_t instance;
+ odp_init_t init_param;
odp_pool_capability_t pool_capa;
odp_crypto_capability_t crypto_capa;
uint32_t max_seg_len;
unsigned i;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ app_err("Reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
memset(&cargs, 0, sizeof(cargs));
/* Parse and store the application arguments */
parse_args(argc, argv, &cargs);
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
app_err("ODP global init failed.\n");
exit(EXIT_FAILURE);
}
@@ -1196,9 +1208,6 @@ static void parse_args(int argc, char *argv[], crypto_args_t *cargs)
static const char *shortopts = "+a:c:df:hi:m:nl:spr";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
cargs->in_place = 0;
cargs->in_flight = 1;
cargs->debug_packets = 0;
diff --git a/test/performance/odp_ipsec.c b/test/performance/odp_ipsec.c
index 2184c7a9..5a5824e8 100644
--- a/test/performance/odp_ipsec.c
+++ b/test/performance/odp_ipsec.c
@@ -936,9 +936,6 @@ static void parse_args(int argc, char *argv[], ipsec_args_t *cargs)
static const char *shortopts = "+a:c:df:hi:m:nl:sptu";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
cargs->in_place = 0;
cargs->in_flight = 1;
cargs->debug_packets = 0;
@@ -1020,20 +1017,32 @@ int main(int argc, char *argv[])
odp_cpumask_t cpumask;
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
int num_workers = 1;
+ odph_helper_options_t helper_options;
odph_odpthread_t thr[num_workers];
odp_instance_t instance;
+ odp_init_t init_param;
odp_pool_capability_t capa;
odp_ipsec_config_t config;
uint32_t max_seg_len;
unsigned int i;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ app_err("Reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
memset(&cargs, 0, sizeof(cargs));
/* Parse and store the application arguments */
parse_args(argc, argv, &cargs);
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
app_err("ODP global init failed.\n");
exit(EXIT_FAILURE);
}
diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c
index e1eddb13..c9243184 100644
--- a/test/performance/odp_l2fwd.c
+++ b/test/performance/odp_l2fwd.c
@@ -1184,9 +1184,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+c:+t:+a:i:m:o:r:d:s:e:k:g:vh";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->time = 0; /* loop forever if time to run is 0 */
appl_args->accuracy = 1; /* get and print pps stats second */
appl_args->cpu_count = 1; /* use one worker by default */
@@ -1428,6 +1425,7 @@ static void create_groups(int num, odp_schedule_group_t *group)
*/
int main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
odp_pool_t pool;
int i;
@@ -1449,6 +1447,13 @@ int main(int argc, char *argv[])
odp_pool_capability_t pool_capa;
uint32_t pkt_len, pkt_num;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ LOG_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
odp_init_param_init(&init);
/* List features not to be used (may optimize performance) */
@@ -1458,6 +1463,8 @@ int main(int argc, char *argv[])
init.not_used.feat.timer = 1;
init.not_used.feat.tm = 1;
+ init.mem_model = helper_options.mem_model;
+
/* Signal handler has to be registered before global init in case ODP
* implementation creates internal threads/processes. */
signal(SIGINT, sig_handler);
diff --git a/test/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c
index faf41b02..2e0ff578 100644
--- a/test/performance/odp_pktio_ordered.c
+++ b/test/performance/odp_pktio_ordered.c
@@ -866,9 +866,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+c:+t:+a:i:m:d:r:f:e:h";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->time = 0; /* loop forever if time to run is 0 */
appl_args->accuracy = DEF_STATS_INT;
appl_args->cpu_count = 1; /* use one worker by default */
@@ -1060,12 +1057,14 @@ int main(int argc, char *argv[])
{
odp_cpumask_t cpumask;
odp_instance_t instance;
+ odp_init_t init_param;
odp_pool_t pool;
odp_pool_param_t params;
odp_shm_t shm;
odp_queue_capability_t queue_capa;
odp_pool_capability_t pool_capa;
odph_ethaddr_t new_addr;
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
stats_t *stats;
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
@@ -1077,8 +1076,18 @@ int main(int argc, char *argv[])
int in_mode;
uint32_t queue_size, pool_size;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ LOG_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
LOG_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c
index 7e8a03ee..b86d437e 100644
--- a/test/performance/odp_pktio_perf.c
+++ b/test/performance/odp_pktio_perf.c
@@ -957,9 +957,6 @@ static void parse_args(int argc, char *argv[], test_args_t *args)
static const char *shortopts = "+c:t:b:pR:l:r:i:d:vh";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
args->cpu_count = 2;
args->num_tx_workers = 0; /* defaults to cpu_count+1/2 */
args->tx_batch_len = BATCH_LEN_MAX;
@@ -1040,9 +1037,21 @@ int main(int argc, char **argv)
int ret;
odp_shm_t shm;
int max_thrs;
+ odph_helper_options_t helper_options;
odp_instance_t instance;
+ odp_init_t init_param;
+
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ LOG_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
- if (odp_init_global(&instance, NULL, NULL) != 0)
+ if (odp_init_global(&instance, &init_param, NULL) != 0)
LOG_ABORT("Failed global init.\n");
if (odp_init_local(instance, ODP_THREAD_CONTROL) != 0)
diff --git a/test/performance/odp_sched_latency.c b/test/performance/odp_sched_latency.c
index 873738ef..b6299141 100644
--- a/test/performance/odp_sched_latency.c
+++ b/test/performance/odp_sched_latency.c
@@ -549,9 +549,6 @@ static void parse_args(int argc, char *argv[], test_args_t *args)
static const char *shortopts = "+c:s:l:t:m:n:o:p:rh";
- /* Let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
args->cpu_count = 1;
args->sync_type = ODP_SCHED_SYNC_PARALLEL;
args->sample_per_prio = SAMPLE_EVENT_PER_PRIO;
@@ -637,6 +634,8 @@ static void parse_args(int argc, char *argv[], test_args_t *args)
int main(int argc, char *argv[])
{
odp_instance_t instance;
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
odph_odpthread_t *thread_tbl;
odph_odpthread_params_t thr_params;
odp_cpumask_t cpumask;
@@ -654,11 +653,21 @@ int main(int argc, char *argv[])
printf("\nODP scheduling latency benchmark starts\n\n");
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ LOG_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
memset(&args, 0, sizeof(args));
parse_args(argc, argv, &args);
/* ODP global init */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
LOG_ERR("ODP global init failed.\n");
return -1;
}
diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c
index 82f74422..4bc5be7b 100644
--- a/test/performance/odp_sched_pktio.c
+++ b/test/performance/odp_sched_pktio.c
@@ -578,9 +578,6 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options)
test_options->burst_size = 32;
test_options->pipe_queue_size = 256;
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
while (1) {
opt = getopt_long(argc, argv, shortopts, longopts, &long_index);
@@ -1431,10 +1428,18 @@ int main(int argc, char *argv[])
odp_init_t init;
odp_shm_t shm;
odp_time_t t1, t2;
+ odph_helper_options_t helper_options;
odph_odpthread_t thread[MAX_WORKERS];
test_options_t test_options;
int ret = 0;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ printf("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
signal(SIGINT, sig_handler);
if (parse_options(argc, argv, &test_options))
@@ -1451,6 +1456,8 @@ int main(int argc, char *argv[])
if (test_options.timeout_us)
init.not_used.feat.timer = 0;
+ init.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
if (odp_init_global(&instance, &init, NULL)) {
printf("Error: Global init failed.\n");
diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c
index 5eeb6926..acc401e0 100644
--- a/test/performance/odp_scheduling.c
+++ b/test/performance/odp_scheduling.c
@@ -762,9 +762,6 @@ static void parse_args(int argc, char *argv[], test_args_t *args)
static const char *shortopts = "+c:fh";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
args->cpu_count = 1; /* use one worker by default */
while (1) {
@@ -798,6 +795,7 @@ static void parse_args(int argc, char *argv[], test_args_t *args)
*/
int main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t *thread_tbl;
test_args_t args;
int num_workers;
@@ -811,6 +809,7 @@ int main(int argc, char *argv[])
odp_pool_param_t params;
int ret = 0;
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
odp_queue_capability_t capa;
odp_pool_capability_t pool_capa;
@@ -818,11 +817,21 @@ int main(int argc, char *argv[])
printf("\nODP example starts\n\n");
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ LOG_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
memset(&args, 0, sizeof(args));
parse_args(argc, argv, &args);
/* ODP global init */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
LOG_ERR("ODP global init failed.\n");
return -1;
}
commit c80718ccd7b16d959a08292bc527f9bd66d5d1a2
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 12 13:02:05 2018 +0300
helper: test: add test for new odph_options() function
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/helper/test/odpthreads.c b/helper/test/odpthreads.c
index ad48ec2d..55db37e0 100644
--- a/helper/test/odpthreads.c
+++ b/helper/test/odpthreads.c
@@ -64,18 +64,27 @@ static int worker_fn(void *arg ODPH_UNUSED)
/* Create additional dataplane opdthreads */
int main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_params_t thr_params;
odph_odpthread_t thread_tbl[NUMBER_WORKERS];
odp_cpumask_t cpu_mask;
+ odp_init_t init_param;
int num_workers;
int cpu, affinity;
int ret;
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
- /* let helper collect its own arguments (e.g. --odph_proc) */
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ ODPH_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
- if (odp_init_global(&odp_instance, NULL, NULL)) {
+ if (odp_init_global(&odp_instance, &init_param, NULL)) {
ODPH_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
commit 1065c7735a98611308f7430839a62e8a1fab40da
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 12 10:43:34 2018 +0300
helper: threads: add odph_options() getter function
Add function for reading parsed linux helper options.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/helper/include/odp/helper/threads.h b/helper/include/odp/helper/threads.h
index f4e8a785..6cee2522 100644
--- a/helper/include/odp/helper/threads.h
+++ b/helper/include/odp/helper/threads.h
@@ -88,6 +88,11 @@ typedef struct {
};
} odph_odpthread_t;
+/** Linux helper options */
+typedef struct {
+ odp_mem_model_t mem_model; /**< Process or thread */
+} odph_helper_options_t;
+
/**
* Creates and launches odpthreads (as linux threads or processes)
*
@@ -153,6 +158,18 @@ int odph_odpthread_getaffinity(void);
*/
int odph_parse_options(int argc, char *argv[]);
+/**
+ * Get linux helper options
+ *
+ * Return used ODP helper options. odph_parse_options() must be called before
+ * using this function.
+ *
+ * @param[out] options ODP helper options
+ *
+ * @return 0 on success, -1 on failure
+ */
+int odph_options(odph_helper_options_t *options);
+
/**
* @}
*/
diff --git a/helper/threads.c b/helper/threads.c
index 1e03ce02..01bc33ea 100644
--- a/helper/threads.c
+++ b/helper/threads.c
@@ -23,9 +23,7 @@
#define FAILED_CPU -1
-static struct {
- int proc; /* true when process mode is required, false otherwise */
-} helper_options;
+static odph_helper_options_t helper_options;
/*
* wrapper for odpthreads, either implemented as linux threads or processes.
@@ -181,7 +179,7 @@ int odph_odpthreads_create(odph_odpthread_t *thread_tbl,
cpu = odp_cpumask_first(mask);
for (i = 0; i < num; i++) {
- if (!helper_options.proc) {
+ if (helper_options.mem_model == ODP_MEM_MODEL_THREAD) {
if (odph_linux_thread_create(&thread_tbl[i],
cpu,
thr_params))
@@ -330,19 +328,19 @@ int odph_parse_options(int argc, char *argv[])
char *env;
int i, j;
- helper_options.proc = 0;
+ helper_options.mem_model = ODP_MEM_MODEL_THREAD;
/* Enable process mode using environment variable. Setting environment
* variable is easier for CI testing compared to command line
* argument. */
env = getenv("ODPH_PROC_MODE");
if (env && atoi(env))
- helper_options.proc = 1;
+ helper_options.mem_model = ODP_MEM_MODEL_PROCESS;
/* Find and remove option */
for (i = 0; i < argc;) {
if (strcmp(argv[i], "--odph_proc") == 0) {
- helper_options.proc = 1;
+ helper_options.mem_model = ODP_MEM_MODEL_PROCESS;
for (j = i; j < argc - 1; j++)
argv[j] = argv[j + 1];
@@ -356,3 +354,12 @@ int odph_parse_options(int argc, char *argv[])
return argc;
}
+
+int odph_options(odph_helper_options_t *options)
+{
+ memset(options, 0, sizeof(odph_helper_options_t));
+
+ options->mem_model = helper_options.mem_model;
+
+ return 0;
+}
commit 5d002e728f60be318f235cc610b4f1dd631a34ba
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Thu Oct 11 17:00:27 2018 +0300
helper: threads: replace odph_linux_thread_type_t with odp_mem_model_t
Replace enum odph_odpthread_linuxtype_t with odp_mem_model_t.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/helper/include/odp/helper/threads.h b/helper/include/odp/helper/threads.h
index 9d03c719..f4e8a785 100644
--- a/helper/include/odp/helper/threads.h
+++ b/helper/include/odp/helper/threads.h
@@ -54,13 +54,6 @@ typedef struct {
int status; /**< Process state change status */
} odph_linux_process_t;
-/** odpthread linux type: whether an ODP thread is a linux thread or process */
-typedef enum odph_odpthread_linuxtype_e {
- ODPTHREAD_NOT_STARTED = 0,
- ODPTHREAD_PROCESS,
- ODPTHREAD_PTHREAD
-} odph_odpthread_linuxtype_t;
-
/** odpthread parameters for odp threads (pthreads and processes) */
typedef struct {
int (*start)(void *); /**< Thread entry point function */
@@ -71,7 +64,7 @@ typedef struct {
/** The odpthread starting arguments, used both in process or thread mode */
typedef struct {
- odph_odpthread_linuxtype_t linuxtype; /**< process or pthread */
+ odp_mem_model_t mem_model; /**< process or thread */
odph_odpthread_params_t thr_params; /**< odpthread start parameters */
} odph_odpthread_start_args_t;
diff --git a/helper/threads.c b/helper/threads.c
index f1f63875..1e03ce02 100644
--- a/helper/threads.c
+++ b/helper/threads.c
@@ -21,6 +21,8 @@
#include <odp/helper/threads.h>
#include "odph_debug.h"
+#define FAILED_CPU -1
+
static struct {
int proc; /* true when process mode is required, false otherwise */
} helper_options;
@@ -42,7 +44,7 @@ static void *_odph_thread_run_start_routine(void *arg)
/* ODP thread local init */
if (odp_init_local(thr_params->instance, thr_params->thr_type)) {
ODPH_ERR("Local init failed\n");
- if (start_args->linuxtype == ODPTHREAD_PROCESS)
+ if (start_args->mem_model == ODP_MEM_MODEL_PROCESS)
_exit(EXIT_FAILURE);
return (void *)-1;
}
@@ -50,7 +52,7 @@ static void *_odph_thread_run_start_routine(void *arg)
ODPH_DBG("helper: ODP %s thread started as linux %s. (pid=%d)\n",
thr_params->thr_type == ODP_THREAD_WORKER ?
"worker" : "control",
- (start_args->linuxtype == ODPTHREAD_PTHREAD) ?
+ (start_args->mem_model == ODP_MEM_MODEL_THREAD) ?
"pthread" : "process",
(int)getpid());
@@ -61,7 +63,7 @@ static void *_odph_thread_run_start_routine(void *arg)
ODPH_ERR("Local term failed\n");
/* for process implementation of odp threads, just return status... */
- if (start_args->linuxtype == ODPTHREAD_PROCESS)
+ if (start_args->mem_model == ODP_MEM_MODEL_PROCESS)
_exit(status);
/* threads implementation return void* pointers: cast status to that. */
@@ -81,14 +83,14 @@ static int _odph_linux_process_create(odph_odpthread_t *thread_tbl,
CPU_ZERO(&cpu_set);
CPU_SET(cpu, &cpu_set);
- thread_tbl->start_args.thr_params = *thr_params; /* copy */
- thread_tbl->start_args.linuxtype = ODPTHREAD_PROCESS;
+ thread_tbl->start_args.thr_params = *thr_params; /* copy */
+ thread_tbl->start_args.mem_model = ODP_MEM_MODEL_PROCESS;
thread_tbl->cpu = cpu;
pid = fork();
if (pid < 0) {
ODPH_ERR("fork() failed\n");
- thread_tbl->start_args.linuxtype = ODPTHREAD_NOT_STARTED;
+ thread_tbl->cpu = FAILED_CPU;
return -1;
}
@@ -136,8 +138,8 @@ static int odph_linux_thread_create(odph_odpthread_t *thread_tbl,
pthread_attr_setaffinity_np(&thread_tbl->thread.attr,
sizeof(cpu_set_t), &cpu_set);
- thread_tbl->start_args.thr_params = *thr_params; /* copy */
- thread_tbl->start_args.linuxtype = ODPTHREAD_PTHREAD;
+ thread_tbl->start_args.thr_params = *thr_params; /* copy */
+ thread_tbl->start_args.mem_model = ODP_MEM_MODEL_THREAD;
ret = pthread_create(&thread_tbl->thread.thread_id,
&thread_tbl->thread.attr,
@@ -145,7 +147,7 @@ static int odph_linux_thread_create(odph_odpthread_t *thread_tbl,
&thread_tbl->start_args);
if (ret != 0) {
ODPH_ERR("Failed to start thread on cpu #%d\n", cpu);
- thread_tbl->start_args.linuxtype = ODPTHREAD_NOT_STARTED;
+ thread_tbl->cpu = FAILED_CPU;
return ret;
}
@@ -215,9 +217,13 @@ int odph_odpthreads_join(odph_odpthread_t *thread_tbl)
/* joins linux threads or wait for processes */
do {
+ if (thread_tbl[i].cpu == FAILED_CPU) {
+ ODPH_DBG("ODP thread %d not started.\n", i);
+ continue;
+ }
/* pthreads: */
- switch (thread_tbl[i].start_args.linuxtype) {
- case ODPTHREAD_PTHREAD:
+ if (thread_tbl[i].start_args.mem_model ==
+ ODP_MEM_MODEL_THREAD) {
/* Wait thread to exit */
ret = pthread_join(thread_tbl[i].thread.thread_id,
&thread_ret);
@@ -234,10 +240,7 @@ int odph_odpthreads_join(odph_odpthread_t *thread_tbl)
}
}
pthread_attr_destroy(&thread_tbl[i].thread.attr);
- break;
-
- case ODPTHREAD_PROCESS:
-
+ } else {
/* processes: */
pid = waitpid(thread_tbl[i].proc.pid, &status, 0);
@@ -263,16 +266,7 @@ int odph_odpthreads_join(odph_odpthread_t *thread_tbl)
signo, strsignal(signo), (int)pid);
retval = -1;
}
- break;
-
- case ODPTHREAD_NOT_STARTED:
- ODPH_DBG("No join done on not started ODPthread.\n");
- break;
- default:
- ODPH_DBG("Invalid case statement value!\n");
- break;
}
-
} while (!thread_tbl[i++].last);
return (retval < 0) ? retval : terminated;
commit 48f8e6319df988f70bf9efde1cfab76ca4fa4549
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 12 13:40:33 2018 +0300
validation: init: add test for odp_init_t.mem_model
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/init/init_main_ok.c b/test/validation/api/init/init_main_ok.c
index a97db8e7..651989ae 100644
--- a/test/validation/api/init/init_main_ok.c
+++ b/test/validation/api/init/init_main_ok.c
@@ -14,8 +14,12 @@ static void init_test_odp_init_global(void)
{
int status;
odp_instance_t instance;
+ odp_init_t init_data;
- status = odp_init_global(&instance, NULL, NULL);
+ odp_init_param_init(&init_data);
+ init_data.mem_model = ODP_MEM_MODEL_THREAD;
+
+ status = odp_init_global(&instance, &init_data, NULL);
CU_ASSERT_FATAL(status == 0);
status = odp_term_global(instance);
commit 47d3ace1c522e193cefb9730d046350817d31ecd
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 12 13:07:29 2018 +0300
linux-gen: init: use new odp_init_t.mem_model parameter
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
index 132ada03..9e648075 100644
--- a/platform/linux-generic/odp_init.c
+++ b/platform/linux-generic/odp_init.c
@@ -275,6 +275,8 @@ int odp_init_global(odp_instance_t *instance,
odp_global_ro.log_fn = params->log_fn;
if (params->abort_fn != NULL)
odp_global_ro.abort_fn = params->abort_fn;
+ if (params->mem_model == ODP_MEM_MODEL_PROCESS)
+ odp_global_ro.shm_single_va = 1;
}
if (_odp_libconfig_init_global()) {
commit 0c0a0fc7fba874f14821e096c62b7fbeecd9b25a
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 12 11:08:34 2018 +0300
api: init: add new mem_model member to odp_init_t
Add new odp_mem_model_t enum for configuring application memory model. This
enables an application to operate in process mode without the need to
modify ODP configuration file.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/init.h b/include/odp/api/spec/init.h
index ee33e7cd..c37af464 100644
--- a/include/odp/api/spec/init.h
+++ b/include/odp/api/spec/init.h
@@ -106,6 +106,32 @@ typedef int (*odp_log_func_t)(odp_log_level_t level, const char *fmt, ...);
/** Replaceable abort function */
typedef void (*odp_abort_func_t)(void) ODP_NORETURN;
+/**
+ * Application memory model
+ */
+typedef enum {
+ /** Thread memory model: by default all memory is shareable between
+ * threads.
+ *
+ * Within a single ODP instance all ODP handles and pointers to ODP
+ * allocated data may be shared amongst threads independent of data
+ * allocation time (e.g. before or after thread creation). */
+ ODP_MEM_MODEL_THREAD = 0,
+
+ /** Process memory model: by default all memory is not shareable between
+ * processes.
+ *
+ * Within a single ODP instance all ODP handles and pointers to ODP
+ * allocated data (excluding non-single VA SHM blocks) may be shared
+ * amongst processes independent of data allocation time (e.g. before
+ * or after fork).
+ *
+ * @see ODP_SHM_SINGLE_VA
+ */
+ ODP_MEM_MODEL_PROCESS
+
+} odp_mem_model_t;
+
/**
* Global initialization parameters
*
@@ -172,6 +198,12 @@ typedef struct odp_init_t {
*/
odp_feature_t not_used;
+ /** Application memory model. The main application thread has to call
+ * odp_init_global() and odp_init_local() before creating threads that
+ * share ODP data. The default value is ODP_MEM_MODEL_THREAD.
+ */
+ odp_mem_model_t mem_model;
+
/** Shared memory parameters */
struct {
/** Maximum memory usage in bytes. This is the maximum
commit b277ad28d344aa9bb98c26cc84bc071d57559a41
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Nov 8 14:29:17 2018 +0200
validation: sched: add test case for wait and no_wait
Added a test case for the new odp_schedule_multi_wait() and
_no_wait() functions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c
index 63ceb6ea..2f66f526 100644
--- a/test/validation/api/scheduler/scheduler.c
+++ b/test/validation/api/scheduler/scheduler.c
@@ -291,6 +291,114 @@ static void scheduler_test_queue_destroy(void)
CU_ASSERT_FATAL(odp_pool_destroy(p) == 0);
}
+static void scheduler_test_wait(void)
+{
+ odp_pool_t p;
+ odp_pool_param_t pool_param;
+ odp_queue_param_t queue_param;
+ odp_queue_t queue, from;
+ odp_buffer_t buf;
+ odp_event_t ev;
+ uint32_t *u32;
+ uint32_t i, j, num_enq, retry;
+ int ret;
+ uint32_t num_ev = 50;
+ uint32_t num_retry = 1000;
+
+ odp_pool_param_init(&pool_param);
+ pool_param.buf.size = 10;
+ pool_param.buf.num = num_ev;
+ pool_param.type = ODP_POOL_BUFFER;
+
+ p = odp_pool_create("sched_test_wait", &pool_param);
+
+ CU_ASSERT_FATAL(p != ODP_POOL_INVALID);
+
+ odp_queue_param_init(&queue_param);
+ queue_param.type = ODP_QUEUE_TYPE_SCHED;
+ queue_param.sched.prio = odp_schedule_default_prio();
+ queue_param.sched.sync = ODP_SCHED_SYNC_PARALLEL;
+ queue_param.sched.group = ODP_SCHED_GROUP_ALL;
+
+ queue = odp_queue_create("sched_test_wait", &queue_param);
+
+ CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID);
+
+ for (i = 0; i < 4; i++) {
+ num_enq = 0;
+
+ for (j = 0; j < num_ev; j++) {
+ buf = odp_buffer_alloc(p);
+
+ CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID);
+
+ u32 = odp_buffer_addr(buf);
+ u32[0] = MAGIC;
+
+ ev = odp_buffer_to_event(buf);
+ if (!(CU_ASSERT(odp_queue_enq(queue, ev) == 0))) {
+ odp_buffer_free(buf);
+ continue;
+ }
+
+ num_enq++;
+ }
+
+ CU_ASSERT(num_enq == num_ev);
+
+ for (j = 0; j < num_enq; j++) {
+ if (i == 0) {
+ ev = odp_schedule(&from, ODP_SCHED_WAIT);
+ } else if (i == 1) {
+ ret = odp_schedule_multi_wait(&from, &ev, 1);
+ CU_ASSERT_FATAL(ret == 1);
+ } else if (i == 2) {
+ retry = 0;
+ do {
+ ev = odp_schedule(&from,
+ ODP_SCHED_NO_WAIT);
+ retry++;
+ } while (ev == ODP_EVENT_INVALID &&
+ retry < num_retry);
+ } else {
+ retry = 0;
+ do {
+ ret = odp_schedule_multi_no_wait(&from,
+ &ev,
+ 1);
+ retry++;
+ } while (ret == 0 && retry < num_retry);
+ CU_ASSERT_FATAL(ret == 1);
+ }
+
+ CU_ASSERT_FATAL(ev != ODP_EVENT_INVALID);
+ CU_ASSERT(from == queue);
+
+ buf = odp_buffer_from_event(ev);
+ u32 = odp_buffer_addr(buf);
+
+ CU_ASSERT(u32[0] == MAGIC);
+
+ odp_buffer_free(buf);
+ }
+ }
+
+ /* Make sure that scheduler is empty */
+ retry = 0;
+ do {
+ ret = odp_schedule_multi_no_wait(NULL, &ev, 1);
+ CU_ASSERT(ret == 0 || ret == 1);
+
+ if (ret)
+ odp_event_free(ev);
+ else
+ retry++;
+ } while (ret || retry < num_retry);
+
+ CU_ASSERT_FATAL(odp_queue_destroy(queue) == 0);
+ CU_ASSERT_FATAL(odp_pool_destroy(p) == 0);
+}
+
static void scheduler_test_queue_size(void)
{
odp_queue_capability_t queue_capa;
@@ -1844,6 +1952,7 @@ odp_testinfo_t scheduler_suite[] = {
ODP_TEST_INFO(scheduler_test_wait_time),
ODP_TEST_INFO(scheduler_test_num_prio),
ODP_TEST_INFO(scheduler_test_queue_destroy),
+ ODP_TEST_INFO(scheduler_test_wait),
ODP_TEST_INFO(scheduler_test_queue_size),
ODP_TEST_INFO(scheduler_test_groups),
ODP_TEST_INFO(scheduler_test_pause_resume),
commit b2be0e3688db91640882eb9df24a3a9f43cb3d88
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Nov 6 16:27:44 2018 +0200
linux-gen: sched: implement wait and no_wait functions
Implemented the new odp_schedule_multi_wait() and _no_wait()
functions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h
index 8c00f922..5f7f2c4d 100644
--- a/platform/linux-generic/include/odp_schedule_if.h
+++ b/platform/linux-generic/include/odp_schedule_if.h
@@ -89,9 +89,14 @@ void sched_cb_pktio_stop_finalize(int pktio_index);
/* API functions */
typedef struct {
- uint64_t (*schedule_wait_time)(uint64_t);
- odp_event_t (*schedule)(odp_queue_t *, uint64_t);
- int (*schedule_multi)(odp_queue_t *, uint64_t, odp_event_t [], int);
+ uint64_t (*schedule_wait_time)(uint64_t ns);
+ odp_event_t (*schedule)(odp_queue_t *from, uint64_t wait);
+ int (*schedule_multi)(odp_queue_t *from, uint64_t wait,
+ odp_event_t events[], int num);
+ int (*schedule_multi_wait)(odp_queue_t *from, odp_event_t events[],
+ int num);
+ int (*schedule_multi_no_wait)(odp_queue_t *from, odp_event_t events[],
+ int num);
void (*schedule_pause)(void);
void (*schedule_resume)(void);
void (*schedule_release_atomic)(void);
diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c
index 3ce25147..0b226e4f 100644
--- a/platform/linux-generic/odp_schedule_basic.c
+++ b/platform/linux-generic/odp_schedule_basic.c
@@ -1163,6 +1163,14 @@ static inline int do_schedule(odp_queue_t *out_queue, odp_event_t out_ev[],
return 0;
}
+static inline int schedule_run(odp_queue_t *out_queue, odp_event_t out_ev[],
+ unsigned int max_num)
+{
+ timer_run(1);
+
+ return do_schedule(out_queue, out_ev, max_num);
+}
+
static inline int schedule_loop(odp_queue_t *out_queue, uint64_t wait,
odp_event_t out_ev[], unsigned int max_num)
{
@@ -1216,6 +1224,24 @@ static int schedule_multi(odp_queue_t *out_queue, uint64_t wait,
return schedule_loop(out_queue, wait, events, num);
}
+static int schedule_multi_no_wait(odp_queue_t *out_queue, odp_event_t events[],
+ int num)
+{
+ return schedule_run(out_queue, events, num);
+}
+
+static int schedule_multi_wait(odp_queue_t *out_queue, odp_event_t events[],
+ int num)
+{
+ int ret;
+
+ do {
+ ret = schedule_run(out_queue, events, num);
+ } while (ret == 0);
+
+ return ret;
+}
+
static inline void order_lock(void)
{
if (sched_local.sync_ctx != ODP_SCHED_SYNC_ORDERED)
@@ -1551,6 +1577,8 @@ const schedule_api_t schedule_basic_api = {
.schedule_wait_time = schedule_wait_time,
.schedule = schedule,
.schedule_multi = schedule_multi,
+ .schedule_multi_wait = schedule_multi_wait,
+ .schedule_multi_no_wait = schedule_multi_no_wait,
.schedule_pause = schedule_pause,
.schedule_resume = schedule_resume,
.schedule_release_atomic = schedule_release_atomic,
diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c
index 084dced6..4d50a13f 100644
--- a/platform/linux-generic/odp_schedule_if.c
+++ b/platform/linux-generic/odp_schedule_if.c
@@ -41,6 +41,16 @@ int odp_schedule_multi(odp_queue_t *from, uint64_t wait, odp_event_t events[],
return sched_api->schedule_multi(from, wait, events, num);
}
+int odp_schedule_multi_wait(odp_queue_t *from, odp_event_t events[], int num)
+{
+ return sched_api->schedule_multi_wait(from, events, num);
+}
+
+int odp_schedule_multi_no_wait(odp_queue_t *from, odp_event_t events[], int num)
+{
+ return sched_api->schedule_multi_no_wait(from, events, num);
+}
+
void odp_schedule_pause(void)
{
return sched_api->schedule_pause();
diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c
index 05e28532..957398ca 100644
--- a/platform/linux-generic/odp_schedule_scalable.c
+++ b/platform/linux-generic/odp_schedule_scalable.c
@@ -1341,6 +1341,18 @@ static odp_event_t schedule(odp_queue_t *from, uint64_t wait)
return ev;
}
+static int schedule_multi_wait(odp_queue_t *from, odp_event_t events[],
+ int max_num)
+{
+ return schedule_multi(from, ODP_SCHED_WAIT, events, max_num);
+}
+
+static int schedule_multi_no_wait(odp_queue_t *from, odp_event_t events[],
+ int max_num)
+{
+ return schedule_multi(from, ODP_SCHED_NO_WAIT, events, max_num);
+}
+
static void schedule_pause(void)
{
sched_ts->pause = true;
@@ -2117,6 +2129,8 @@ const schedule_api_t schedule_scalable_api = {
.schedule_wait_time = schedule_wait_time,
.schedule = schedule,
.schedule_multi = schedule_multi,
+ .schedule_multi_wait = schedule_multi_wait,
+ .schedule_multi_no_wait = schedule_multi_no_wait,
.schedule_pause = schedule_pause,
.schedule_resume = schedule_resume,
.schedule_release_atomic = schedule_release_atomic,
diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c
index 055ee35f..f55e2151 100644
--- a/platform/linux-generic/odp_schedule_sp.c
+++ b/platform/linux-generic/odp_schedule_sp.c
@@ -646,6 +646,18 @@ static odp_event_t schedule(odp_queue_t *from, uint64_t wait)
return ODP_EVENT_INVALID;
}
+static int schedule_multi_wait(odp_queue_t *from, odp_event_t events[],
+ int max_num)
+{
+ return schedule_multi(from, ODP_SCHED_WAIT, events, max_num);
+}
+
+static int schedule_multi_no_wait(odp_queue_t *from, odp_event_t events[],
+ int max_num)
+{
+ return schedule_multi(from, ODP_SCHED_NO_WAIT, events, max_num);
+}
+
static void schedule_pause(void)
{
sched_local.pause = 1;
@@ -937,6 +949,8 @@ const schedule_api_t schedule_sp_api = {
.schedule_wait_time = schedule_wait_time,
.schedule = schedule,
.schedule_multi = schedule_multi,
+ .schedule_multi_wait = schedule_multi_wait,
+ .schedule_multi_no_wait = schedule_multi_no_wait,
.schedule_pause = schedule_pause,
.schedule_resume = schedule_resume,
.schedule_release_atomic = schedule_release_atomic,
commit ed4270a59273b13619bda3a903fe83bb47ea6087
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Nov 6 15:09:10 2018 +0200
api: sched: add wait and no_wait schedule functions
Schedule call is one of the most used ODP API calls. Introduce
versions without the wait parameter as wait / no_wait are the
most used wait options. Implementation saves a number of
if-conditions per schedule call.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h
index ae4894fc..d9b868e3 100644
--- a/include/odp/api/spec/schedule.h
+++ b/include/odp/api/spec/schedule.h
@@ -112,6 +112,35 @@ odp_event_t odp_schedule(odp_queue_t *from, uint64_t wait);
int odp_schedule_multi(odp_queue_t *from, uint64_t wait, odp_event_t events[],
int num);
+/**
+ * Schedule, wait for events
+ *
+ * Like odp_schedule_multi(), but waits infinitely for events.
+ *
+ * @param[out] from Output parameter for the source queue (where the event
+ * was dequeued from). Ignored if NULL.
+ * @param[out] events Event array for output
+ * @param num Maximum number of events to output
+ *
+ * @return Number of events outputted (1 ... num)
+ */
+int odp_schedule_multi_wait(odp_queue_t *from, odp_event_t events[], int num);
+
+/**
+ * Schedule, do not wait for events
+ *
+ * Like odp_schedule_multi(), but does not wait for events.
+ *
+ * @param[out] from Output parameter for the source queue (where the event
+ * was dequeued from). Ignored if NULL.
+ * @param[out] events Event array for output
+ * @param num Maximum number of events to output
+ *
+ * @return Number of events outputted (0 ... num)
+ */
+int odp_schedule_multi_no_wait(odp_queue_t *from, odp_event_t events[],
+ int num);
+
/**
* Pause scheduling
*
commit cc7bc42309d5d1bf844af376f13a981cf57cb76b
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Oct 30 17:04:06 2018 +0200
validation: queue: default queue parameter values
Check that queue_param_init sets default queue parameter values
correctly.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c
index 87939c24..cf081a99 100644
--- a/test/validation/api/queue/queue.c
+++ b/test/validation/api/queue/queue.c
@@ -605,8 +605,21 @@ static void queue_test_param(void)
odp_queue_param_t qparams;
odp_buffer_t enbuf;
- /* Schedule type queue */
+ /* Defaults */
odp_queue_param_init(&qparams);
+ CU_ASSERT(qparams.type == ODP_QUEUE_TYPE_PLAIN);
+ CU_ASSERT(qparams.enq_mode == ODP_QUEUE_OP_MT);
+ CU_ASSERT(qparams.deq_mode == ODP_QUEUE_OP_MT);
+ CU_ASSERT(qparams.sched.prio == odp_schedule_default_prio());
+ CU_ASSERT(qparams.sched.sync == ODP_SCHED_SYNC_PARALLEL);
+ CU_ASSERT(qparams.sched.group == ODP_SCHED_GROUP_ALL);
+ CU_ASSERT(qparams.sched.lock_count == 0);
+ CU_ASSERT(qparams.nonblocking == ODP_BLOCKING);
+ CU_ASSERT(qparams.context == NULL);
+ CU_ASSERT(qparams.context_len == 0);
+ CU_ASSERT(qparams.size == 0);
+
+ /* Schedule type queue */
qparams.type = ODP_QUEUE_TYPE_SCHED;
qparams.sched.prio = odp_schedule_min_prio();
qparams.sched.sync = ODP_SCHED_SYNC_PARALLEL;
commit 20a76096f5bbc87f545f16be72f766d26d5865c5
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Oct 30 17:03:07 2018 +0200
validation: sched: add priority function tests
Test priority functions and macros.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c
index 7afd0382..63ceb6ea 100644
--- a/test/validation/api/scheduler/scheduler.c
+++ b/test/validation/api/scheduler/scheduler.c
@@ -206,12 +206,24 @@ static void scheduler_test_wait_time(void)
static void scheduler_test_num_prio(void)
{
- int prio;
+ int num_prio, min_prio, max_prio, default_prio;
- prio = odp_schedule_num_prio();
+ num_prio = odp_schedule_num_prio();
+ CU_ASSERT(num_prio > 0);
- CU_ASSERT(prio > 0);
- CU_ASSERT(prio == odp_schedule_num_prio());
+ min_prio = odp_schedule_min_prio();
+ max_prio = odp_schedule_max_prio();
+ default_prio = odp_schedule_default_prio();
+
+ CU_ASSERT(min_prio <= max_prio);
+ CU_ASSERT(min_prio <= default_prio);
+ CU_ASSERT(default_prio <= max_prio);
+ CU_ASSERT(num_prio == (max_prio - min_prio + 1));
+
+ CU_ASSERT(min_prio == ODP_SCHED_PRIO_LOWEST);
+ CU_ASSERT(max_prio == ODP_SCHED_PRIO_HIGHEST);
+ CU_ASSERT(default_prio == ODP_SCHED_PRIO_DEFAULT);
+ CU_ASSERT(default_prio == ODP_SCHED_PRIO_NORMAL);
}
static void scheduler_test_queue_destroy(void)
commit 8ea3be29a66bd7bfe2776f5117f3c8bac78668ea
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Oct 30 16:40:31 2018 +0200
validation: sched: convert priority macros to function calls
Prefer direct function calls over macros. Macros will be
deprecated.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/classification/odp_classification_common.c b/test/validation/api/classification/odp_classification_common.c
index 7b54ef15..9b5d8ec0 100644
--- a/test/validation/api/classification/odp_classification_common.c
+++ b/test/validation/api/classification/odp_classification_common.c
@@ -201,7 +201,7 @@ odp_queue_t queue_create(const char *queuename, bool sched)
if (sched) {
odp_queue_param_init(&qparam);
qparam.type = ODP_QUEUE_TYPE_SCHED;
- qparam.sched.prio = ODP_SCHED_PRIO_HIGHEST;
+ qparam.sched.prio = odp_schedule_max_prio();
qparam.sched.sync = ODP_SCHED_SYNC_PARALLEL;
qparam.sched.group = ODP_SCHED_GROUP_ALL;
diff --git a/test/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c
index a5de458c..41201d4a 100644
--- a/test/validation/api/classification/odp_classification_tests.c
+++ b/test/validation/api/classification/odp_classification_tests.c
@@ -158,7 +158,7 @@ void configure_cls_pmr_chain(void)
odp_queue_param_init(&qparam);
qparam.type = ODP_QUEUE_TYPE_SCHED;
- qparam.sched.prio = ODP_SCHED_PRIO_NORMAL;
+ qparam.sched.prio = odp_schedule_default_prio();
qparam.sched.sync = ODP_SCHED_SYNC_PARALLEL;
qparam.sched.group = ODP_SCHED_GROUP_ALL;
qparam.sched.lock_count = queue_capa.max_ordered_locks;
@@ -183,7 +183,7 @@ void configure_cls_pmr_chain(void)
odp_queue_param_init(&qparam);
qparam.type = ODP_QUEUE_TYPE_SCHED;
- qparam.sched.prio = ODP_SCHED_PRIO_NORMAL;
+ qparam.sched.prio = odp_schedule_default_prio();
qparam.sched.sync = ODP_SCHED_SYNC_PARALLEL;
qparam.sched.group = ODP_SCHED_GROUP_ALL;
sprintf(queuename, "%s", "DstQueue");
@@ -293,7 +293,7 @@ void configure_pktio_default_cos(void)
odp_queue_param_init(&qparam);
qparam.type = ODP_QUEUE_TYPE_SCHED;
- qparam.sched.prio = ODP_SCHED_PRIO_DEFAULT;
+ qparam.sched.prio = odp_schedule_default_prio();
qparam.sched.sync = ODP_SCHED_SYNC_PARALLEL;
qparam.sched.group = ODP_SCHED_GROUP_ALL;
sprintf(queuename, "%s", "DefaultQueue");
@@ -356,7 +356,7 @@ void configure_pktio_error_cos(void)
odp_queue_param_init(&qparam);
qparam.type = ODP_QUEUE_TYPE_SCHED;
- qparam.sched.prio = ODP_SCHED_PRIO_LOWEST;
+ qparam.sched.prio = odp_schedule_min_prio();
qparam.sched.sync = ODP_SCHED_SYNC_PARALLEL;
qparam.sched.group = ODP_SCHED_GROUP_ALL;
sprintf(queuename, "%s", "ErrorCos");
@@ -468,7 +468,7 @@ void configure_cos_with_l2_priority(void)
qparam.sched.sync = ODP_SCHED_SYNC_PARALLEL;
qparam.sched.group = ODP_SCHED_GROUP_ALL;
for (i = 0; i < num_qos; i++) {
- qparam.sched.prio = ODP_SCHED_PRIO_LOWEST + i;
+ qparam.sched.prio = odp_schedule_min_prio() + i;
sprintf(queuename, "%s_%d", "L2_Queue", i);
queue_tbl[i] = odp_queue_create(queuename, &qparam);
CU_ASSERT_FATAL(queue_tbl[i] != ODP_QUEUE_INVALID);
@@ -544,7 +544,7 @@ void configure_pmr_cos(void)
odp_queue_param_init(&qparam);
qparam.type = ODP_QUEUE_TYPE_SCHED;
- qparam.sched.prio = ODP_SCHED_PRIO_HIGHEST;
+ qparam.sched.prio = odp_schedule_max_prio();
qparam.sched.sync = ODP_SCHED_SYNC_PARALLEL;
qparam.sched.group = ODP_SCHED_GROUP_ALL;
sprintf(queuename, "%s", "PMR_CoS");
@@ -619,7 +619,7 @@ void configure_pktio_pmr_composite(void)
odp_queue_param_init(&qparam);
qparam.type = ODP_QUEUE_TYPE_SCHED;
- qparam.sched.prio = ODP_SCHED_PRIO_HIGHEST;
+ qparam.sched.prio = odp_schedule_max_prio();
qparam.sched.sync = ODP_SCHED_SYNC_PARALLEL;
qparam.sched.group = ODP_SCHED_GROUP_ALL;
sprintf(queuename, "%s", "cos_pmr_composite_queue");
diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c
index 0bd1a06a..87939c24 100644
--- a/test/validation/api/queue/queue.c
+++ b/test/validation/api/queue/queue.c
@@ -608,7 +608,7 @@ static void queue_test_param(void)
/* Schedule type queue */
odp_queue_param_init(&qparams);
qparams.type = ODP_QUEUE_TYPE_SCHED;
- qparams.sched.prio = ODP_SCHED_PRIO_LOWEST;
+ qparams.sched.prio = odp_schedule_min_prio();
qparams.sched.sync = ODP_SCHED_SYNC_PARALLEL;
qparams.sched.group = ODP_SCHED_GROUP_WORKER;
@@ -618,7 +618,7 @@ static void queue_test_param(void)
odp_queue_to_u64(ODP_QUEUE_INVALID));
CU_ASSERT(queue == odp_queue_lookup("test_queue"));
CU_ASSERT(ODP_QUEUE_TYPE_SCHED == odp_queue_type(queue));
- CU_ASSERT(ODP_SCHED_PRIO_LOWEST == odp_queue_sched_prio(queue));
+ CU_ASSERT(odp_schedule_min_prio() == odp_queue_sched_prio(queue));
CU_ASSERT(ODP_SCHED_SYNC_PARALLEL == odp_queue_sched_type(queue));
CU_ASSERT(ODP_SCHED_GROUP_WORKER == odp_queue_sched_group(queue));
@@ -719,7 +719,7 @@ static void queue_test_info(void)
/* Create a scheduled ordered queue with explicitly set params */
odp_queue_param_init(¶m);
param.type = ODP_QUEUE_TYPE_SCHED;
- param.sched.prio = ODP_SCHED_PRIO_NORMAL;
+ param.sched.prio = odp_schedule_default_prio();
param.sched.sync = ODP_SCHED_SYNC_ORDERED;
param.sched.group = ODP_SCHED_GROUP_ALL;
param.sched.lock_count = capability.max_ordered_locks;
diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c
index a4e8e218..7afd0382 100644
--- a/test/validation/api/scheduler/scheduler.c
+++ b/test/validation/api/scheduler/scheduler.c
@@ -158,7 +158,7 @@ static void scheduler_test_wait_time(void)
odp_queue_param_init(&qp);
qp.type = ODP_QUEUE_TYPE_SCHED;
qp.sched.sync = ODP_SCHED_SYNC_PARALLEL;
- qp.sched.prio = ODP_SCHED_PRIO_NORMAL;
+ qp.sched.prio = odp_schedule_default_prio();
qp.sched.group = ODP_SCHED_GROUP_ALL;
queue = odp_queue_create("dummy_queue", &qp);
CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID);
@@ -241,7 +241,7 @@ static void scheduler_test_queue_destroy(void)
for (i = 0; i < 3; i++) {
qp.type = ODP_QUEUE_TYPE_SCHED;
- qp.sched.prio = ODP_SCHED_PRIO_DEFAULT;
+ qp.sched.prio = odp_schedule_default_prio();
qp.sched.sync = sync[i];
qp.sched.group = ODP_SCHED_GROUP_ALL;
@@ -324,7 +324,7 @@ static void scheduler_test_queue_size(void)
odp_queue_param_init(&queue_param);
queue_param.type = ODP_QUEUE_TYPE_SCHED;
- queue_param.sched.prio = ODP_SCHED_PRIO_DEFAULT;
+ queue_param.sched.prio = odp_schedule_default_prio();
queue_param.sched.sync = sync[i];
queue_param.sched.group = ODP_SCHED_GROUP_ALL;
queue_param.size = queue_size;
@@ -483,7 +483,7 @@ static void scheduler_test_groups(void)
odp_queue_param_init(&qp);
qp.type = ODP_QUEUE_TYPE_SCHED;
- qp.sched.prio = ODP_SCHED_PRIO_DEFAULT;
+ qp.sched.prio = odp_schedule_default_prio();
qp.sched.sync = sync[i];
qp.sched.group = mygrp1;
@@ -701,7 +701,7 @@ static void chaos_run(unsigned int qtype)
pool = odp_pool_create("sched_chaos_pool", ¶ms);
CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
qp.type = ODP_QUEUE_TYPE_SCHED;
- qp.sched.prio = ODP_SCHED_PRIO_DEFAULT;
+ qp.sched.prio = odp_schedule_default_prio();
qp.sched.group = ODP_SCHED_GROUP_ALL;
for (i = 0; i < CHAOS_NUM_QUEUES; i++) {
diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c
index 4561e688..eb8df665 100644
--- a/test/validation/api/timer/timer.c
+++ b/test/validation/api/timer/timer.c
@@ -321,7 +321,6 @@ static void timer_test_queue_type(odp_queue_type_t queue_type)
odp_queue_param_init(&queue_param);
if (queue_type == ODP_QUEUE_TYPE_SCHED) {
queue_param.type = ODP_QUEUE_TYPE_SCHED;
- queue_param.sched.prio = ODP_SCHED_PRIO_DEFAULT;
queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC;
queue_param.sched.group = ODP_SCHED_GROUP_ALL;
}
commit ec16951089de3ed475570d253f1f0b0746304cc9
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Oct 30 15:46:52 2018 +0200
linux-gen: sched: implement min/max/default prio functions
Implemented the new functions for all schedulers. API defines now
that priority level increases with the integer value.
Implementations use internally inversed priority levels (max == 0).
Classifier test had wrong assumption about previous API priority
level specification, and needed fixing. Previously, integer values
were implementation specific, i.e. it was possible that value of
PRIO_LOWEST < PRIO_HIGHEST, or PRIO_LOWEST > PRIO_HIGHEST.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/abi-default/schedule_types.h b/include/odp/api/abi-default/schedule_types.h
index e7258f0c..6c7730cd 100644
--- a/include/odp/api/abi-default/schedule_types.h
+++ b/include/odp/api/abi-default/schedule_types.h
@@ -21,13 +21,13 @@ extern "C" {
* @{
*/
-#define ODP_SCHED_PRIO_HIGHEST 0
+#define ODP_SCHED_PRIO_HIGHEST (odp_schedule_max_prio())
-#define ODP_SCHED_PRIO_NORMAL 4
+#define ODP_SCHED_PRIO_NORMAL (odp_schedule_default_prio())
-#define ODP_SCHED_PRIO_LOWEST 7
+#define ODP_SCHED_PRIO_LOWEST (odp_schedule_min_prio())
-#define ODP_SCHED_PRIO_DEFAULT ODP_SCHED_PRIO_NORMAL
+#define ODP_SCHED_PRIO_DEFAULT (odp_schedule_default_prio())
typedef int odp_schedule_sync_t;
diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h
index a131b6eb..8c00f922 100644
--- a/platform/linux-generic/include/odp_schedule_if.h
+++ b/platform/linux-generic/include/odp_schedule_if.h
@@ -97,6 +97,9 @@ typedef struct {
void (*schedule_release_atomic)(void);
void (*schedule_release_ordered)(void);
void (*schedule_prefetch)(int);
+ int (*schedule_min_prio)(void);
+ int (*schedule_max_prio)(void);
+ int (*schedule_default_prio)(void);
int (*schedule_num_prio)(void);
odp_schedule_group_t (*schedule_group_create)(const char *,
const odp_thrmask_t *);
diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c
index 5790e1c3..f02a9a32 100644
--- a/platform/linux-generic/odp_queue_basic.c
+++ b/platform/linux-generic/odp_queue_basic.c
@@ -270,21 +270,31 @@ static odp_queue_t queue_create(const char *name,
uint32_t i;
queue_entry_t *queue;
void *queue_lf;
- odp_queue_t handle = ODP_QUEUE_INVALID;
- odp_queue_type_t type = ODP_QUEUE_TYPE_PLAIN;
+ odp_queue_type_t type;
odp_queue_param_t default_param;
+ odp_queue_t handle = ODP_QUEUE_INVALID;
if (param == NULL) {
odp_queue_param_init(&default_param);
param = &default_param;
}
+ type = param->type;
+
+ if (type == ODP_QUEUE_TYPE_SCHED) {
+ if (param->sched.prio < odp_schedule_min_prio() ||
+ param->sched.prio > odp_schedule_max_prio()) {
+ ODP_ERR("Bad queue priority: %i\n", param->sched.prio);
+ return ODP_QUEUE_INVALID;
+ }
+ }
+
if (param->nonblocking == ODP_BLOCKING) {
if (param->size > queue_glb->config.max_queue_size)
return ODP_QUEUE_INVALID;
} else if (param->nonblocking == ODP_NONBLOCKING_LF) {
/* Only plain type lock-free queues supported */
- if (param->type != ODP_QUEUE_TYPE_PLAIN)
+ if (type != ODP_QUEUE_TYPE_PLAIN)
return ODP_QUEUE_INVALID;
if (param->size > queue_glb->queue_lf_size)
return ODP_QUEUE_INVALID;
@@ -327,8 +337,6 @@ static odp_queue_t queue_create(const char *name,
queue->s.orig_dequeue_multi = lf_fn->deq_multi;
}
- type = queue->s.type;
-
if (type == ODP_QUEUE_TYPE_SCHED)
queue->s.status = QUEUE_STATUS_NOTSCHED;
else
@@ -607,7 +615,7 @@ static void queue_param_init(odp_queue_param_t *params)
params->enq_mode = ODP_QUEUE_OP_MT;
params->deq_mode = ODP_QUEUE_OP_MT;
params->nonblocking = ODP_BLOCKING;
- params->sched.prio = ODP_SCHED_PRIO_DEFAULT;
+ params->sched.prio = odp_schedule_default_prio();
params->sched.sync = ODP_SCHED_SYNC_PARALLEL;
params->sched.group = ODP_SCHED_GROUP_ALL;
}
diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c
index 4f2c1b6c..5bff1354 100644
--- a/platform/linux-generic/odp_queue_scalable.c
+++ b/platform/linux-generic/odp_queue_scalable.c
@@ -167,6 +167,8 @@ static int queue_init(queue_entry_t *queue, const char *name,
/* Queue initialized successfully, add it to the sched group */
if (queue->s.type == ODP_QUEUE_TYPE_SCHED) {
+ int prio = odp_schedule_max_prio() - param->sched.prio;
+
if (queue->s.param.sched.sync == ODP_SCHED_SYNC_ORDERED) {
sched_elem->rwin =
rwin_alloc(queue_shm_pool,
@@ -177,9 +179,9 @@ static int queue_init(queue_entry_t *queue, const char *name,
}
}
sched_elem->sched_grp = param->sched.group;
- sched_elem->sched_prio = param->sched.prio;
+ sched_elem->sched_prio = prio;
sched_elem->schedq =
- sched_queue_add(param->sched.group, param->sched.prio);
+ sched_queue_add(param->sched.group, prio);
ODP_ASSERT(sched_elem->schedq != NULL);
}
@@ -356,15 +358,26 @@ static odp_queue_t queue_create(const char *name,
const odp_queue_param_t *param)
{
int queue_idx;
- odp_queue_t handle = ODP_QUEUE_INVALID;
queue_entry_t *queue;
+ odp_queue_type_t type;
odp_queue_param_t default_param;
+ odp_queue_t handle = ODP_QUEUE_INVALID;
if (param == NULL) {
odp_queue_param_init(&default_param);
param = &default_param;
}
+ type = param->type;
+
+ if (type == ODP_QUEUE_TYPE_SCHED) {
+ if (param->sched.prio < odp_schedule_min_prio() ||
+ param->sched.prio > odp_schedule_max_prio()) {
+ ODP_ERR("Bad queue priority: %i\n", param->sched.prio);
+ return ODP_QUEUE_INVALID;
+ }
+ }
+
for (queue_idx = 0; queue_idx < ODP_CONFIG_QUEUES; queue_idx++) {
queue = &queue_tbl->queue[queue_idx];
@@ -872,7 +885,7 @@ static void queue_param_init(odp_queue_param_t *params)
params->enq_mode = ODP_QUEUE_OP_MT;
params->deq_mode = ODP_QUEUE_OP_MT;
params->nonblocking = ODP_BLOCKING;
- params->sched.prio = ODP_SCHED_PRIO_DEFAULT;
+ params->sched.prio = odp_schedule_default_prio();
params->sched.sync = ODP_SCHED_SYNC_PARALLEL;
params->sched.group = ODP_SCHED_GROUP_ALL;
}
diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c
index 22eb6ff1..3ce25147 100644
--- a/platform/linux-generic/odp_schedule_basic.c
+++ b/platform/linux-generic/odp_schedule_basic.c
@@ -36,13 +36,6 @@
/* Number of priority levels */
#define NUM_PRIO 8
-ODP_STATIC_ASSERT(ODP_SCHED_PRIO_LOWEST == (NUM_PRIO - 1),
- "lowest_prio_does_not_match_with_num_prios");
-
-ODP_STATIC_ASSERT((ODP_SCHED_PRIO_NORMAL > 0) &&
- (ODP_SCHED_PRIO_NORMAL < (NUM_PRIO - 1)),
- "normal_prio_is_not_between_highest_and_lowest");
-
/* Number of scheduling groups */
#define NUM_SCHED_GRPS 32
@@ -195,6 +188,7 @@ typedef struct {
struct {
uint8_t grp;
+ /* Inverted prio value (max = 0) vs API (min = 0)*/
uint8_t prio;
uint8_t spread;
uint8_t sync;
@@ -537,6 +531,31 @@ static uint32_t schedule_max_ordered_locks(void)
return CONFIG_QUEUE_MAX_ORD_LOCKS;
}
+static int schedule_min_prio(void)
+{
+ return 0;
+}
+
+static int schedule_max_prio(void)
+{
+ return NUM_PRIO - 1;
+}
+
+static int schedule_default_prio(void)
+{
+ return schedule_max_prio() / 2;
+}
+
+static int schedule_num_prio(void)
+{
+ return NUM_PRIO;
+}
+
+static inline int prio_level_from_api(int api_prio)
+{
+ return schedule_max_prio() - api_prio;
+}
+
static void pri_set(int id, int prio)
{
odp_spinlock_lock(&sched->mask_lock);
@@ -576,7 +595,7 @@ static int schedule_init_queue(uint32_t queue_index,
{
uint32_t ring_size;
int i;
- int prio = sched_param->prio;
+ int prio = prio_level_from_api(sched_param->prio);
pri_set_queue(queue_index, prio);
sched->queue[queue_index].grp = sched_param->group;
@@ -1289,11 +1308,6 @@ static uint64_t schedule_wait_time(uint64_t ns)
return ns;
}
-static int schedule_num_prio(void)
-{
- return NUM_PRIO;
-}
-
static odp_schedule_group_t schedule_group_create(const char *name,
const odp_thrmask_t *mask)
{
@@ -1542,6 +1556,9 @@ const schedule_api_t schedule_basic_api = {
.schedule_release_atomic = schedule_release_atomic,
.schedule_release_ordered = schedule_release_ordered,
.schedule_prefetch = schedule_prefetch,
+ .schedule_min_prio = schedule_min_prio,
+ .schedule_max_prio = schedule_max_prio,
+ .schedule_default_prio = schedule_default_prio,
.schedule_num_prio = schedule_num_prio,
.schedule_group_create = schedule_group_create,
.schedule_group_destroy = schedule_group_destroy,
diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c
index c88b35fd..084dced6 100644
--- a/platform/linux-generic/odp_schedule_if.c
+++ b/platform/linux-generic/odp_schedule_if.c
@@ -66,6 +66,21 @@ void odp_schedule_prefetch(int num)
return sched_api->schedule_prefetch(num);
}
+int odp_schedule_min_prio(void)
+{
+ return sched_api->schedule_min_prio();
+}
+
+int odp_schedule_max_prio(void)
+{
+ return sched_api->schedule_max_prio();
+}
+
+int odp_schedule_default_prio(void)
+{
+ return sched_api->schedule_default_prio();
+}
+
int odp_schedule_num_prio(void)
{
return sched_api->schedule_num_prio();
diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c
index ccafcb77..05e28532 100644
--- a/platform/linux-generic/odp_schedule_scalable.c
+++ b/platform/linux-generic/odp_schedule_scalable.c
@@ -46,13 +46,6 @@
#define FLAG_PKTIN 0x80
-ODP_STATIC_ASSERT(ODP_SCHED_PRIO_LOWEST == (ODP_SCHED_PRIO_NUM - 2),
- "lowest_prio_does_not_match_with_num_prios");
-
-ODP_STATIC_ASSERT((ODP_SCHED_PRIO_NORMAL > 0) &&
- (ODP_SCHED_PRIO_NORMAL < (ODP_SCHED_PRIO_NUM - 2)),
- "normal_prio_is_not_between_highest_and_lowest");
-
ODP_STATIC_ASSERT(CHECK_IS_POWER2(ODP_CONFIG_QUEUES),
"Number_of_queues_is_not_power_of_two");
@@ -1368,6 +1361,21 @@ static int schedule_num_prio(void)
return ODP_SCHED_PRIO_NUM - 1; /* Discount the pktin priority level */
}
+static int schedule_min_prio(void)
+{
+ return 0;
+}
+
+static int schedule_max_prio(void)
+{
+ return schedule_num_prio() - 1;
+}
+
+static int schedule_default_prio(void)
+{
+ return schedule_max_prio() / 2;
+}
+
static int schedule_group_update(sched_group_t *sg,
uint32_t sgi,
const odp_thrmask_t *mask,
@@ -2114,6 +2122,9 @@ const schedule_api_t schedule_scalable_api = {
.schedule_release_atomic = schedule_release_atomic,
.schedule_release_ordered = schedule_release_ordered,
.schedule_prefetch = schedule_prefetch,
+ .schedule_min_prio = schedule_min_prio,
+ .schedule_max_prio = schedule_max_prio,
+ .schedule_default_prio = schedule_default_prio,
.schedule_num_prio = schedule_num_prio,
.schedule_group_create = schedule_group_create,
.schedule_group_destroy = schedule_group_destroy,
diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c
index 52c8873c..055ee35f 100644
--- a/platform/linux-generic/odp_schedule_sp.c
+++ b/platform/linux-generic/odp_schedule_sp.c
@@ -26,11 +26,12 @@
#define NUM_QUEUE ODP_CONFIG_QUEUES
#define NUM_PKTIO ODP_CONFIG_PKTIO_ENTRIES
#define NUM_ORDERED_LOCKS 1
-#define NUM_PRIO 3
#define NUM_STATIC_GROUP 3
#define NUM_GROUP (NUM_STATIC_GROUP + 9)
#define NUM_PKTIN 32
-#define LOWEST_QUEUE_PRIO (NUM_PRIO - 2)
+#define NUM_PRIO 3
+#define MAX_API_PRIO (NUM_PRIO - 2)
+/* Lowest internal priority */
#define PKTIN_PRIO (NUM_PRIO - 1)
#define CMD_QUEUE 0
#define CMD_PKTIO 1
@@ -367,8 +368,8 @@ static int init_queue(uint32_t qi, const odp_schedule_param_t *sched_param)
if (!sched_group->s.group[group].allocated)
return -1;
- if (sched_param->prio > 0)
- prio = LOWEST_QUEUE_PRIO;
+ /* Inverted prio value (max = 0) vs API */
+ prio = MAX_API_PRIO - sched_param->prio;
sched_global->queue_cmd[qi].s.prio = prio;
sched_global->queue_cmd[qi].s.group = group;
@@ -668,6 +669,21 @@ static void schedule_prefetch(int num)
(void)num;
}
+static int schedule_min_prio(void)
+{
+ return 0;
+}
+
+static int schedule_max_prio(void)
+{
+ return MAX_API_PRIO;
+}
+
+static int schedule_default_prio(void)
+{
+ return schedule_max_prio() / 2;
+}
+
static int schedule_num_prio(void)
{
/* Lowest priority is used for pktin polling and is internal
@@ -926,6 +942,9 @@ const schedule_api_t schedule_sp_api = {
.schedule_release_atomic = schedule_release_atomic,
.schedule_release_ordered = schedule_release_ordered,
.schedule_prefetch = schedule_prefetch,
+ .schedule_min_prio = schedule_min_prio,
+ .schedule_max_prio = schedule_max_prio,
+ .schedule_default_prio = schedule_default_prio,
.schedule_num_prio = schedule_num_prio,
.schedule_group_create = schedule_group_create,
.schedule_group_destroy = schedule_group_destroy,
diff --git a/test/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c
index 3b9e0276..a5de458c 100644
--- a/test/validation/api/classification/odp_classification_tests.c
+++ b/test/validation/api/classification/odp_classification_tests.c
@@ -18,6 +18,7 @@ static odp_pool_t pool_list[CLS_ENTRIES];
static odp_pool_t pool_default;
static odp_pktio_t pktio_loop;
static odp_cls_testcase_u tc;
+static int global_num_l2_qos;
#define NUM_COS_PMR_CHAIN 2
#define NUM_COS_DEFAULT 1
@@ -457,12 +458,17 @@ void configure_cos_with_l2_priority(void)
for (i = 0; i < CLS_L2_QOS_MAX; i++)
qos_tbl[i] = 0;
+ if (odp_schedule_num_prio() < num_qos)
+ num_qos = odp_schedule_num_prio();
+
+ global_num_l2_qos = num_qos;
+
odp_queue_param_init(&qparam);
qparam.type = ODP_QUEUE_TYPE_SCHED;
qparam.sched.sync = ODP_SCHED_SYNC_PARALLEL;
qparam.sched.group = ODP_SCHED_GROUP_ALL;
for (i = 0; i < num_qos; i++) {
- qparam.sched.prio = ODP_SCHED_PRIO_LOWEST - i;
+ qparam.sched.prio = ODP_SCHED_PRIO_LOWEST + i;
sprintf(queuename, "%s_%d", "L2_Queue", i);
queue_tbl[i] = odp_queue_create(queuename, &qparam);
CU_ASSERT_FATAL(queue_tbl[i] != ODP_QUEUE_INVALID);
@@ -506,7 +512,7 @@ void test_cos_with_l2_priority(void)
pkt_info.udp = true;
pkt_info.vlan = true;
- for (i = 0; i < CLS_L2_QOS_MAX; i++) {
+ for (i = 0; i < global_num_l2_qos; i++) {
pkt = create_packet(pkt_info);
CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
seqno = cls_pkt_get_seq(pkt);
commit 7b23d26816a334804277a87e5ea93f2958e5a6ec
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Oct 30 16:27:24 2018 +0200
api: sched: favor priority functions over macros
Priority macros will be deprecated, function calls should be used
instead.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/schedule_types.h b/include/odp/api/spec/schedule_types.h
index 24663f69..76afc6dd 100644
--- a/include/odp/api/spec/schedule_types.h
+++ b/include/odp/api/spec/schedule_types.h
@@ -24,24 +24,26 @@ extern "C" {
/**
* @def ODP_SCHED_PRIO_HIGHEST
- * Highest scheduling priority
+ * This macro is equivalent of calling odp_schedule_max_prio() and will be
+ * deprecated. Use direct function call instead.
*/
/**
* @def ODP_SCHED_PRIO_NORMAL
- * Normal scheduling priority
+ * This macro is equivalent of calling odp_schedule_default_prio() and will be
+ * deprecated. Use direct function call instead.
*/
/**
* @def ODP_SCHED_PRIO_LOWEST
- * Lowest scheduling priority
+ * This macro is equivalent of calling odp_schedule_min_prio() and will be
+ * deprecated. Use direct function call instead.
*/
/**
* @def ODP_SCHED_PRIO_DEFAULT
- * Default scheduling priority. User does not care about the selected priority
- * level - throughput, load balancing and synchronization features are more
- * important than priority scheduling.
+ * This macro is equivalent of calling odp_schedule_default_prio() and will be
+ * deprecated. Use direct function call instead.
*/
/**
@@ -144,7 +146,7 @@ typedef int odp_schedule_prio_t;
typedef struct odp_schedule_param_t {
/** Priority level
*
- * Default value is ODP_SCHED_PRIO_DEFAULT. */
+ * Default value is returned by odp_schedule_default_prio(). */
odp_schedule_prio_t prio;
/** Synchronization method
commit 9e1d151f2f308c16ed542a7fa1ab0f0cf1e7a0fc
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Oct 30 12:31:45 2018 +0200
api: sched: odp_schedule_prio_t is an integer
Change odp_schedule_prio_t from an implementation specific type
to integer. Application needs to be able to calculate priority
values between min/default/max, so the type cannot be abstract.
Since type is used in slow path (queue creation), a fixed type
does not harm performance. A fixed type helps in portability
(ABI compatibility).
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/abi-default/schedule_types.h b/include/odp/api/abi-default/schedule_types.h
index 31ee27f1..e7258f0c 100644
--- a/include/odp/api/abi-default/schedule_types.h
+++ b/include/odp/api/abi-default/schedule_types.h
@@ -21,8 +21,6 @@ extern "C" {
* @{
*/
-typedef int odp_schedule_prio_t;
-
#define ODP_SCHED_PRIO_HIGHEST 0
#define ODP_SCHED_PRIO_NORMAL 4
diff --git a/include/odp/api/spec/schedule_types.h b/include/odp/api/spec/schedule_types.h
index 44eb663a..24663f69 100644
--- a/include/odp/api/spec/schedule_types.h
+++ b/include/odp/api/spec/schedule_types.h
@@ -22,11 +22,6 @@ extern "C" {
* @{
*/
-/**
- * @typedef odp_schedule_prio_t
- * Scheduler priority level
- */
-
/**
* @def ODP_SCHED_PRIO_HIGHEST
* Highest scheduling priority
@@ -136,6 +131,15 @@ extern "C" {
* Predefined scheduler group of all control threads
*/
+/**
+ * Scheduling priority level
+ *
+ * Priority level is an integer value between odp_schedule_min_prio() and
+ * odp_schedule_max_prio(). Queues with a higher priority value are served with
+ * higher priority than queues with a lower priority value.
+ */
+typedef int odp_schedule_prio_t;
+
/** Scheduler parameters */
typedef struct odp_schedule_param_t {
/** Priority level
commit d867eedd6987daba2f03f3b036601708969528f1
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Oct 30 12:17:34 2018 +0200
api: sched: add priority min/max/default functions
Added functions to read min/max/default priority levels.
Priority level is an integer, higher value means higher
priority and thus max >= min.
Functions are needed to allow number of priorities to be
dynamic. Especially, ABI compat mode needs functions instead
of macros (#defines).
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h
index bbc74983..ae4894fc 100644
--- a/include/odp/api/spec/schedule.h
+++ b/include/odp/api/spec/schedule.h
@@ -180,9 +180,50 @@ void odp_schedule_release_ordered(void);
*/
void odp_schedule_prefetch(int num);
+/**
+ * Maximum scheduling priority level
+ *
+ * This is the maximum value that can be set to 'prio' field in
+ * odp_schedule_param_t (e.g. @see odp_queue_create()). Queues with a higher
+ * priority value are served with higher priority than queues with a lower
+ * priority value.
+ *
+ * @return Maximum scheduling priority level
+ */
+int odp_schedule_max_prio(void);
+
+/**
+ * Minimum scheduling priority level
+ *
+ * This is the minimum value that can be set to 'prio' field in
+ * odp_schedule_param_t (e.g. @see odp_queue_create()). Queues with a higher
+ * priority value are served with higher priority than queues with a lower
+ * priority value.
+ *
+ * @return Minimum scheduling priority level
+ */
+int odp_schedule_min_prio(void);
+
+/**
+ * Default scheduling priority level
+ *
+ * This is the default value of 'prio' field in odp_schedule_param_t
+ * (e.g. @see odp_queue_param_init()). The default value should be suitable for
+ * an application that uses single priority level for all its queues (uses
+ * scheduler only for load balancing and synchronization). Typically,
+ * the default value is between minimum and maximum values, but with a few
+ * priority levels it may be close or equal to those.
+ *
+ * @return Default scheduling priority level
+ */
+int odp_schedule_default_prio(void);
+
/**
* Number of scheduling priorities
*
+ * The number of priority levels support by the scheduler. It equals to
+ * odp_schedule_max_prio() - odp_schedule_min_prio() + 1.
+ *
* @return Number of scheduling priorities
*/
int odp_schedule_num_prio(void);
commit 411a07b61019cece7545fb325cc77a328a657f83
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Nov 5 15:44:05 2018 +0200
linux-gen: ipsec: use new auth_key_extra
Change implementation and validation test to use the new
authentication algorithm extra keying material. It is set only
in GMAC test cases.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index 630af5a4..6eb12f95 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -582,7 +582,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
ipsec_sa->esp_block_len = 16;
crypto_param.auth_iv.length = 12;
ipsec_sa->salt_length = 4;
- salt_param = ¶m->crypto.cipher_key_extra;
+ salt_param = ¶m->crypto.auth_key_extra;
break;
case ODP_AUTH_ALG_CHACHA20_POLY1305:
crypto_param.auth_aad_len = sizeof(ipsec_aad_t);
diff --git a/test/performance/odp_ipsec.c b/test/performance/odp_ipsec.c
index 28903af7..2184c7a9 100644
--- a/test/performance/odp_ipsec.c
+++ b/test/performance/odp_ipsec.c
@@ -345,7 +345,7 @@ static ipsec_alg_config_t algs_config[] = {
.data = test_key16,
.length = sizeof(test_key16)
},
- .cipher_key_extra = {
+ .auth_key_extra = {
.data = test_salt,
.length = 4,
},
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index aece2115..f10c4c29 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -345,7 +345,8 @@ void ipsec_sa_param_fill(odp_ipsec_sa_param_t *param,
const odp_crypto_key_t *cipher_key,
odp_auth_alg_t auth_alg,
const odp_crypto_key_t *auth_key,
- const odp_crypto_key_t *extra_key)
+ const odp_crypto_key_t *cipher_key_extra,
+ const odp_crypto_key_t *auth_key_extra)
{
odp_ipsec_sa_param_init(param);
param->dir = in ? ODP_IPSEC_DIR_INBOUND :
@@ -378,8 +379,11 @@ void ipsec_sa_param_fill(odp_ipsec_sa_param_t *param,
if (auth_key)
param->crypto.auth_key = *auth_key;
- if (extra_key)
- param->crypto.cipher_key_extra = *extra_key;
+ if (cipher_key_extra)
+ param->crypto.cipher_key_extra = *cipher_key_extra;
+
+ if (auth_key_extra)
+ param->crypto.auth_key_extra = *auth_key_extra;
}
void ipsec_sa_destroy(odp_ipsec_sa_t sa)
diff --git a/test/validation/api/ipsec/ipsec.h b/test/validation/api/ipsec/ipsec.h
index b2d6df69..2a6713d1 100644
--- a/test/validation/api/ipsec/ipsec.h
+++ b/test/validation/api/ipsec/ipsec.h
@@ -68,7 +68,8 @@ void ipsec_sa_param_fill(odp_ipsec_sa_param_t *param,
const odp_crypto_key_t *cipher_key,
odp_auth_alg_t auth_alg,
const odp_crypto_key_t *auth_key,
- const odp_crypto_key_t *extra_key);
+ const odp_crypto_key_t *cipher_key_extra,
+ const odp_crypto_key_t *auth_key_extra);
void ipsec_sa_destroy(odp_ipsec_sa_t sa);
odp_packet_t ipsec_packet(const ipsec_test_packet *itp);
diff --git a/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c
index 9c111200..51533148 100644
--- a/test/validation/api/ipsec/ipsec_test_in.c
+++ b/test/validation/api/ipsec/ipsec_test_in.c
@@ -19,7 +19,7 @@ static void test_in_ipv4_ah_sha256(void)
true, true, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -52,7 +52,7 @@ static void test_in_ipv4_ah_sha256_tun_ipv4(void)
true, true, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -85,7 +85,7 @@ static void test_in_ipv4_ah_sha256_tun_ipv6(void)
true, true, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -117,7 +117,7 @@ static void test_in_ipv4_ah_sha256_tun_ipv4_notun(void)
true, true, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -150,7 +150,7 @@ static void test_in_ipv4_esp_null_sha256(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -182,7 +182,7 @@ static void test_in_ipv4_esp_aes_cbc_null(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_AES_CBC, &key_a5_128,
ODP_AUTH_ALG_NULL, NULL,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -214,7 +214,7 @@ static void test_in_ipv4_esp_aes_cbc_sha256(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_AES_CBC, &key_a5_128,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -246,7 +246,7 @@ static void test_in_ipv4_esp_aes_ctr_null(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_AES_CTR, &key_a5_128,
ODP_AUTH_ALG_NULL, NULL,
- &key_mcgrew_gcm_salt_3);
+ &key_mcgrew_gcm_salt_3, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -278,7 +278,7 @@ static void test_in_ipv4_ah_sha256_lookup(void)
true, true, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -311,7 +311,7 @@ static void test_in_ipv4_esp_null_sha256_lookup(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -345,7 +345,7 @@ static void test_in_ipv4_esp_null_sha256_tun_ipv4(void)
true, false, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -378,7 +378,7 @@ static void test_in_ipv4_esp_null_sha256_tun_ipv6(void)
true, false, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -410,7 +410,7 @@ static void test_in_ipv4_esp_udp_null_sha256(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
param.opt.udp_encap = 1;
sa = odp_ipsec_sa_create(¶m);
@@ -443,7 +443,7 @@ static void test_in_ipv4_esp_udp_null_sha256_lookup(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
param.opt.udp_encap = 1;
sa = odp_ipsec_sa_create(¶m);
@@ -477,7 +477,7 @@ static void test_in_ipv4_ah_sha256_noreplay(void)
true, true, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
param.inbound.antireplay_ws = 0;
sa = odp_ipsec_sa_create(¶m);
@@ -525,7 +525,7 @@ static void test_in_ipv4_ah_sha256_replay(void)
true, true, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
param.inbound.antireplay_ws = 32;
sa = odp_ipsec_sa_create(¶m);
@@ -583,7 +583,7 @@ static void test_in_ipv4_esp_null_sha256_noreplay(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
param.inbound.antireplay_ws = 0;
sa = odp_ipsec_sa_create(¶m);
@@ -631,7 +631,7 @@ static void test_in_ipv4_esp_null_sha256_replay(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
param.inbound.antireplay_ws = 32;
sa = odp_ipsec_sa_create(¶m);
@@ -694,7 +694,7 @@ static void test_in_ipv4_ah_esp_pkt(void)
true, true, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -729,7 +729,7 @@ static void test_in_ipv4_esp_ah_pkt(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -759,7 +759,7 @@ static void test_in_ipv4_ah_esp_pkt_lookup(void)
true, true, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -790,7 +790,7 @@ static void test_in_ipv4_esp_ah_pkt_lookup(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -821,7 +821,7 @@ static void test_in_ipv4_ah_sha256_bad1(void)
true, true, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -851,7 +851,7 @@ static void test_in_ipv4_ah_sha256_bad2(void)
true, true, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -881,7 +881,7 @@ static void test_in_ipv4_esp_null_sha256_bad1(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -911,7 +911,7 @@ static void test_in_ipv4_rfc3602_5_esp(void)
true, false, 0x4321, NULL,
ODP_CIPHER_ALG_AES_CBC, &key_rfc3602,
ODP_AUTH_ALG_NULL, NULL,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -943,7 +943,7 @@ static void test_in_ipv4_rfc3602_6_esp(void)
true, false, 0x4321, NULL,
ODP_CIPHER_ALG_AES_CBC, &key_rfc3602,
ODP_AUTH_ALG_NULL, NULL,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -976,7 +976,7 @@ static void test_in_ipv4_rfc3602_7_esp(void)
true, false, 0x8765, &tunnel,
ODP_CIPHER_ALG_AES_CBC, &key_rfc3602_2,
ODP_AUTH_ALG_NULL, NULL,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -1009,7 +1009,7 @@ static void test_in_ipv4_rfc3602_8_esp(void)
true, false, 0x8765, &tunnel,
ODP_CIPHER_ALG_AES_CBC, &key_rfc3602_2,
ODP_AUTH_ALG_NULL, NULL,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -1042,7 +1042,7 @@ static void test_in_ipv4_mcgrew_gcm_2_esp(void)
true, false, 0xa5f8, &tunnel,
ODP_CIPHER_ALG_AES_GCM, &key_mcgrew_gcm_2,
ODP_AUTH_ALG_AES_GCM, NULL,
- &key_mcgrew_gcm_salt_2);
+ &key_mcgrew_gcm_salt_2, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -1075,7 +1075,7 @@ static void test_in_ipv4_mcgrew_gcm_3_esp(void)
true, false, 0x4a2cbfe3, &tunnel,
ODP_CIPHER_ALG_AES_GCM, &key_mcgrew_gcm_3,
ODP_AUTH_ALG_AES_GCM, NULL,
- &key_mcgrew_gcm_salt_3);
+ &key_mcgrew_gcm_salt_3, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -1108,7 +1108,7 @@ static void test_in_ipv4_mcgrew_gcm_4_esp(void)
true, false, 0x00000000, &tunnel,
ODP_CIPHER_ALG_AES_GCM, &key_mcgrew_gcm_4,
ODP_AUTH_ALG_AES_GCM, NULL,
- &key_mcgrew_gcm_salt_4);
+ &key_mcgrew_gcm_salt_4, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -1146,7 +1146,7 @@ static void test_in_ipv4_mcgrew_gcm_12_esp(void)
true, false, 0x335467ae, &tunnel,
ODP_CIPHER_ALG_AES_GCM, &key_mcgrew_gcm_12,
ODP_AUTH_ALG_AES_GCM, NULL,
- &key_mcgrew_gcm_salt_12);
+ &key_mcgrew_gcm_salt_12, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -1178,7 +1178,7 @@ static void test_in_ipv4_mcgrew_gcm_12_esp_notun(void)
true, false, 0x335467ae, NULL,
ODP_CIPHER_ALG_AES_GCM, &key_mcgrew_gcm_12,
ODP_AUTH_ALG_AES_GCM, NULL,
- &key_mcgrew_gcm_salt_12);
+ &key_mcgrew_gcm_salt_12, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -1211,7 +1211,7 @@ static void test_in_ipv4_mcgrew_gcm_15_esp(void)
true, false, 0x00004321, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_AES_GMAC, &key_mcgrew_gcm_15,
- &key_mcgrew_gcm_salt_15);
+ NULL, &key_mcgrew_gcm_salt_15);
sa = odp_ipsec_sa_create(¶m);
@@ -1244,7 +1244,7 @@ static void test_in_ipv4_rfc7634_chacha(void)
true, false, 0x01020304, &tunnel,
ODP_CIPHER_ALG_CHACHA20_POLY1305, &key_rfc7634,
ODP_AUTH_ALG_CHACHA20_POLY1305, NULL,
- &key_rfc7634_salt);
+ &key_rfc7634_salt, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -1276,7 +1276,7 @@ static void test_in_ipv4_ah_aes_gmac_128(void)
true, true, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_AES_GMAC, &key_a5_128,
- &key_mcgrew_gcm_salt_2);
+ NULL, &key_mcgrew_gcm_salt_2);
sa = odp_ipsec_sa_create(¶m);
@@ -1308,7 +1308,7 @@ static void test_in_ipv4_esp_null_aes_gmac_128(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_AES_GMAC, &key_a5_128,
- &key_mcgrew_gcm_salt_2);
+ NULL, &key_mcgrew_gcm_salt_2);
sa = odp_ipsec_sa_create(¶m);
@@ -1340,7 +1340,7 @@ static void test_in_ipv6_ah_sha256(void)
true, true, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -1373,7 +1373,7 @@ static void test_in_ipv6_ah_sha256_tun_ipv4(void)
true, true, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -1406,7 +1406,7 @@ static void test_in_ipv6_ah_sha256_tun_ipv6(void)
true, true, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -1438,7 +1438,7 @@ static void test_in_ipv6_esp_null_sha256(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -1471,7 +1471,7 @@ static void test_in_ipv6_esp_null_sha256_tun_ipv4(void)
true, false, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -1504,7 +1504,7 @@ static void test_in_ipv6_esp_null_sha256_tun_ipv6(void)
true, false, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -1536,7 +1536,7 @@ static void test_in_ipv6_esp_udp_null_sha256(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
param.opt.udp_encap = 1;
sa = odp_ipsec_sa_create(¶m);
@@ -1569,7 +1569,7 @@ static void test_in_ipv6_esp_udp_null_sha256_lookup(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
param.opt.udp_encap = 1;
sa = odp_ipsec_sa_create(¶m);
diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c
index 59c631b5..ee3fd43f 100644
--- a/test/validation/api/ipsec/ipsec_test_out.c
+++ b/test/validation/api/ipsec/ipsec_test_out.c
@@ -19,7 +19,7 @@ static void test_out_ipv4_ah_sha256(void)
false, true, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -62,7 +62,7 @@ static void test_out_ipv4_ah_sha256_tun_ipv4(void)
false, true, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -106,7 +106,7 @@ static void test_out_ipv4_ah_sha256_tun_ipv6(void)
false, true, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -136,7 +136,7 @@ static void test_out_ipv4_esp_null_sha256(void)
false, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -174,7 +174,7 @@ static void test_out_ipv4_esp_null_sha256_tun_ipv4(void)
false, false, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -219,7 +219,7 @@ static void test_out_ipv4_esp_null_sha256_tun_ipv6(void)
false, false, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -251,7 +251,7 @@ static void test_out_ipv4_esp_aes_cbc_null(void)
false, false, 123, NULL,
ODP_CIPHER_ALG_AES_CBC, &key_a5_128,
ODP_AUTH_ALG_NULL, NULL,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -261,7 +261,7 @@ static void test_out_ipv4_esp_aes_cbc_null(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_AES_CBC, &key_a5_128,
ODP_AUTH_ALG_NULL, NULL,
- NULL);
+ NULL, NULL);
sa2 = odp_ipsec_sa_create(¶m);
@@ -294,7 +294,7 @@ static void test_out_ipv4_esp_udp_null_sha256(void)
false, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
param.opt.udp_encap = 1;
sa = odp_ipsec_sa_create(¶m);
@@ -326,7 +326,7 @@ static void test_out_ipv4_esp_aes_cbc_sha256(void)
false, false, 123, NULL,
ODP_CIPHER_ALG_AES_CBC, &key_a5_128,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -336,7 +336,7 @@ static void test_out_ipv4_esp_aes_cbc_sha256(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_AES_CBC, &key_a5_128,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa2 = odp_ipsec_sa_create(¶m);
@@ -370,7 +370,7 @@ static void test_out_ipv4_esp_aes_ctr_null(void)
false, false, 123, NULL,
ODP_CIPHER_ALG_AES_CTR, &key_a5_128,
ODP_AUTH_ALG_NULL, NULL,
- &key_mcgrew_gcm_salt_3);
+ &key_mcgrew_gcm_salt_3, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -380,7 +380,7 @@ static void test_out_ipv4_esp_aes_ctr_null(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_AES_CTR, &key_a5_128,
ODP_AUTH_ALG_NULL, NULL,
- &key_mcgrew_gcm_salt_3);
+ &key_mcgrew_gcm_salt_3, NULL);
sa2 = odp_ipsec_sa_create(¶m);
@@ -414,7 +414,7 @@ static void test_out_ipv4_esp_aes_gcm128(void)
false, false, 123, NULL,
ODP_CIPHER_ALG_AES_GCM, &key_a5_128,
ODP_AUTH_ALG_AES_GCM, &key_a5_128,
- &key_mcgrew_gcm_salt_2);
+ &key_mcgrew_gcm_salt_2, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -424,7 +424,7 @@ static void test_out_ipv4_esp_aes_gcm128(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_AES_GCM, &key_a5_128,
ODP_AUTH_ALG_AES_GCM, &key_a5_128,
- &key_mcgrew_gcm_salt_2);
+ &key_mcgrew_gcm_salt_2, NULL);
sa2 = odp_ipsec_sa_create(¶m);
@@ -457,7 +457,7 @@ static void test_out_ipv4_ah_aes_gmac_128(void)
false, true, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_AES_GMAC, &key_a5_128,
- &key_mcgrew_gcm_salt_2);
+ NULL, &key_mcgrew_gcm_salt_2);
sa = odp_ipsec_sa_create(¶m);
@@ -487,7 +487,7 @@ static void test_out_ipv4_esp_null_aes_gmac_128(void)
false, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_AES_GMAC, &key_a5_128,
- &key_mcgrew_gcm_salt_2);
+ NULL, &key_mcgrew_gcm_salt_2);
sa = odp_ipsec_sa_create(¶m);
@@ -518,7 +518,7 @@ static void test_out_ipv4_esp_chacha20_poly1305(void)
false, false, 123, NULL,
ODP_CIPHER_ALG_CHACHA20_POLY1305, &key_rfc7634,
ODP_AUTH_ALG_CHACHA20_POLY1305, NULL,
- &key_rfc7634_salt);
+ &key_rfc7634_salt, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -528,7 +528,7 @@ static void test_out_ipv4_esp_chacha20_poly1305(void)
true, false, 123, NULL,
ODP_CIPHER_ALG_CHACHA20_POLY1305, &key_rfc7634,
ODP_AUTH_ALG_CHACHA20_POLY1305, NULL,
- &key_rfc7634_salt);
+ &key_rfc7634_salt, NULL);
sa2 = odp_ipsec_sa_create(¶m);
@@ -561,7 +561,7 @@ static void test_out_ipv4_ah_sha256_frag_check(void)
false, true, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
param.outbound.frag_mode = ODP_IPSEC_FRAG_CHECK;
param.outbound.mtu = 100;
@@ -608,7 +608,7 @@ static void test_out_ipv4_ah_sha256_frag_check_2(void)
false, true, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
param.outbound.frag_mode = ODP_IPSEC_FRAG_CHECK;
param.outbound.mtu = 100;
@@ -654,7 +654,7 @@ static void test_out_ipv4_esp_null_sha256_frag_check(void)
false, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
param.outbound.frag_mode = ODP_IPSEC_FRAG_CHECK;
param.outbound.mtu = 100;
@@ -702,7 +702,7 @@ static void test_out_ipv4_esp_null_sha256_frag_check_2(void)
false, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
param.outbound.frag_mode = ODP_IPSEC_FRAG_CHECK;
param.outbound.mtu = 100;
@@ -749,7 +749,7 @@ static void test_out_ipv6_ah_sha256(void)
false, true, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -787,7 +787,7 @@ static void test_out_ipv6_ah_sha256_tun_ipv4(void)
false, true, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -831,7 +831,7 @@ static void test_out_ipv6_ah_sha256_tun_ipv6(void)
false, true, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -861,7 +861,7 @@ static void test_out_ipv6_esp_null_sha256(void)
false, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -899,7 +899,7 @@ static void test_out_ipv6_esp_null_sha256_tun_ipv4(void)
false, false, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -944,7 +944,7 @@ static void test_out_ipv6_esp_null_sha256_tun_ipv6(void)
false, false, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -975,7 +975,7 @@ static void test_out_ipv6_esp_udp_null_sha256(void)
false, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
param.opt.udp_encap = 1;
sa = odp_ipsec_sa_create(¶m);
@@ -1020,7 +1020,7 @@ static void test_out_dummy_esp_null_sha256_tun_ipv4(void)
false, false, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -1030,7 +1030,7 @@ static void test_out_dummy_esp_null_sha256_tun_ipv4(void)
true, false, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa2 = odp_ipsec_sa_create(¶m);
@@ -1102,7 +1102,7 @@ static void test_out_dummy_esp_null_sha256_tun_ipv6(void)
false, false, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
@@ -1112,7 +1112,7 @@ static void test_out_dummy_esp_null_sha256_tun_ipv6(void)
true, false, 123, &tunnel,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa2 = odp_ipsec_sa_create(¶m);
@@ -1164,7 +1164,7 @@ static void test_out_ipv4_udp_esp_null_sha256(void)
false, false, 123, NULL,
ODP_CIPHER_ALG_NULL, NULL,
ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
- NULL);
+ NULL, NULL);
sa = odp_ipsec_sa_create(¶m);
commit 3d1711bc27a819876552e1104a3f2fdfb0760a4e
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Nov 1 10:06:25 2018 +0200
api: ipsec: add auth_key_extra IPSEC crypto param
IPSEC needs salt (extra keying material) when GMAC authentication
algorithm is used. Added auth_key_extra for that use case.
Also improved algorithm, key and key_extra usage documentation.
All algorithms that need salt/nonce are now listed. Cipher side
key information need to be set always when algorithm is not NULL.
Authentication side key information is ignored when a single
algorithm (AEAD) does both cipher and authentication.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h
index 2d1c4d9b..1b65e8d0 100644
--- a/include/odp/api/spec/ipsec.h
+++ b/include/odp/api/spec/ipsec.h
@@ -364,27 +364,65 @@ typedef enum odp_ipsec_tunnel_type_t {
* IPSEC crypto parameters
*/
typedef struct odp_ipsec_crypto_param_t {
- /** Cipher algorithm */
+ /** Cipher algorithm
+ *
+ * Select cipher algorithm to be used. ODP_CIPHER_ALG_NULL indicates
+ * that ciphering is disabled. See 'ciphers' field of
+ * odp_ipsec_capability_t for supported cipher algorithms. Algorithm
+ * descriptions can be found from odp_cipher_alg_t documentation. Note
+ * that some algorithms restrict choice of the pairing authentication
+ * algorithm. When ciphering is enabled, cipher key and potential extra
+ * key material (cipher_key_extra) need to be set. The default value
+ * is ODP_CIPHER_ALG_NULL.
+ */
odp_cipher_alg_t cipher_alg;
/** Cipher key */
odp_crypto_key_t cipher_key;
- /** Extra keying material for cipher key
+ /** Extra keying material for cipher algorithm
*
* Additional data used as salt or nonce if the algorithm requires it,
* other algorithms ignore this field. These algorithms require this
- * field set:
- * - AES_GCM: 4 bytes of salt
- **/
+ * field to be set:
+ * - ODP_CIPHER_ALG_AES_CTR: 4 bytes of nonce
+ * - ODP_CIPHER_ALG_AES_GCM: 4 bytes of salt
+ * - ODP_CIPHER_ALG_AES_CCM: 3 bytes of salt
+ * - ODP_CIPHER_ALG_CHACHA20_POLY1305: 4 bytes of salt
+ */
odp_crypto_key_t cipher_key_extra;
- /** Authentication algorithm */
+ /** Authentication algorithm
+ *
+ * Select authentication algorithm to be used. ODP_AUTH_ALG_NULL
+ * indicates that authentication is disabled. See 'auths' field of
+ * odp_ipsec_capability_t for supported authentication algorithms.
+ * Algorithm descriptions can be found from odp_auth_alg_t
+ * documentation. Note that some algorithms restrict choice of the
+ * pairing cipher algorithm. When single algorithm provides both
+ * ciphering and authentication (i.e. Authenticated Encryption),
+ * authentication side key information ('auth_key' and
+ * 'auth_key_extra') is ignored, and cipher side values are
+ * used instead. These algorithms ignore authentication side key
+ * information: ODP_AUTH_ALG_AES_GCM, ODP_AUTH_ALG_AES_CCM and
+ * ODP_AUTH_ALG_CHACHA20_POLY1305. Otherwise, authentication side
+ * parameters must be set when authentication is enabled. The default
+ * value is ODP_AUTH_ALG_NULL.
+ */
odp_auth_alg_t auth_alg;
/** Authentication key */
odp_crypto_key_t auth_key;
+ /** Extra keying material for authentication algorithm
+ *
+ * Additional data used as salt or nonce if the algorithm requires it,
+ * other algorithms ignore this field. These algorithms require this
+ * field to be set:
+ * - ODP_AUTH_ALG_AES_GMAC: 4 bytes of salt
+ */
+ odp_crypto_key_t auth_key_extra;
+
} odp_ipsec_crypto_param_t;
/** IPv4 header parameters */
commit 9504a42688ff7242317b0aa4669dff2bf7aa9d93
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Nov 2 14:09:59 2018 +0200
api: crypto: improve odp_crypto_session_param_t documentation
Added default values. Documented when key and IV parameters
need to be set. AEAD algorithm use cipher side key/IV and
ignore authentication side key/IV. These specification updates
confirm current reference implementation and validation test
cases.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h
index 843fdefe..cfb2bc42 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -422,7 +422,10 @@ typedef odp_packet_data_range_t ODP_DEPRECATE(odp_crypto_data_range_t);
* Crypto API session creation parameters
*/
typedef struct odp_crypto_session_param_t {
- /** Encode vs. decode operation */
+ /** Encode vs. decode operation
+ *
+ * The default value is ODP_CRYPTO_OP_ENCODE.
+ */
odp_crypto_op_t op;
/** Authenticate cipher vs. plain text
@@ -435,18 +438,31 @@ typedef struct odp_crypto_session_param_t {
*
* true: Authenticate cipher text
* false: Authenticate plain text
+ *
+ * The default value is false.
*/
odp_bool_t auth_cipher_text;
- /** Preferred sync vs. async for odp_crypto_operation() */
+ /** Preferred sync vs. async for odp_crypto_operation()
+ *
+ * The default value is ODP_CRYPTO_SYNC.
+ */
odp_crypto_op_mode_t pref_mode;
- /** Operation mode when using packet interface: sync or async */
+ /** Operation mode when using packet interface: sync or async
+ *
+ * The default value is ODP_CRYPTO_SYNC.
+ */
odp_crypto_op_mode_t op_mode;
/** Cipher algorithm
*
- * Use odp_crypto_capability() for supported algorithms.
+ * Select cipher algorithm to be used. ODP_CIPHER_ALG_NULL indicates
+ * that ciphering is disabled. Use odp_crypto_capability() for
+ * supported algorithms. Note that some algorithms restrict choice of
+ * the pairing authentication algorithm. When ciphering is enabled
+ * cipher key and IV need to be set. The default value is
+ * ODP_CIPHER_ALG_NULL.
*/
odp_cipher_alg_t cipher_alg;
@@ -467,7 +483,18 @@ typedef struct odp_crypto_session_param_t {
/** Authentication algorithm
*
- * Use odp_crypto_capability() for supported algorithms.
+ * Select authentication algorithm to be used. ODP_AUTH_ALG_NULL
+ * indicates that authentication is disabled. Use
+ * odp_crypto_capability() for supported algorithms. Note that some
+ * algorithms restrict choice of the pairing cipher algorithm. When
+ * single algorithm provides both ciphering and authentication
+ * (i.e. Authenticated Encryption), authentication side key
+ * (auth_key) and IV (auth_iv) are ignored, and cipher side values are
+ * used instead. These algorithms ignore authentication side key
+ * and IV: ODP_AUTH_ALG_AES_GCM, ODP_AUTH_ALG_AES_CCM and
+ * ODP_AUTH_ALG_CHACHA20_POLY1305. Otherwise, all authentication side
+ * parameters must be set when authentication is enabled. The default
+ * value is ODP_AUTH_ALG_NULL.
*/
odp_auth_alg_t auth_alg;
commit e5f7c8fd4249b11a86715cd31394c73145cc674e
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Aug 1 10:30:51 2018 +0300
validation: timer: use new timer pool capabilities
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed by Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c
index 281e02c5..4561e688 100644
--- a/test/validation/api/timer/timer.c
+++ b/test/validation/api/timer/timer.c
@@ -828,6 +828,7 @@ static void timer_test_odp_timer_all(void)
odp_timer_capability_t timer_capa;
odp_pool_t tbp;
odp_timer_pool_t tp;
+ uint32_t num_timers;
/* Reserve at least one core for running other processes so the timer
* test hopefully can run undisturbed and thus get better timing
@@ -842,10 +843,15 @@ static void timer_test_odp_timer_all(void)
if (num_workers < 1)
num_workers = 1;
+ num_timers = num_workers * NTIMERS;
+ CU_ASSERT_FATAL(!odp_timer_capability(ODP_CLOCK_CPU, &timer_capa));
+ if (timer_capa.max_timers && timer_capa.max_timers < num_timers)
+ num_timers = timer_capa.max_timers;
+
/* Create timeout pools */
odp_pool_param_init(¶ms);
params.type = ODP_POOL_TIMEOUT;
- params.tmo.num = (NTIMERS + 1) * num_workers;
+ params.tmo.num = num_timers + num_workers;
global_mem->tbp = odp_pool_create("tmo_pool", ¶ms);
if (global_mem->tbp == ODP_POOL_INVALID)
@@ -853,14 +859,11 @@ static void timer_test_odp_timer_all(void)
tbp = global_mem->tbp;
/* Create a timer pool */
- if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa))
- CU_FAIL("Error: get timer capacity failed.\n");
-
resolution_ns = MAX(RES, timer_capa.highest_res_ns);
tparam.res_ns = resolution_ns;
tparam.min_tmo = MIN_TMO;
tparam.max_tmo = MAX_TMO;
- tparam.num_timers = num_workers * NTIMERS;
+ tparam.num_timers = num_timers;
tparam.priv = 0;
tparam.clk_src = ODP_CLOCK_CPU;
global_mem->tp = odp_timer_pool_create(NAME, &tparam);
@@ -884,9 +887,13 @@ static void timer_test_odp_timer_all(void)
LOG_DBG("Resolution: %" PRIu64 "\n", tparam.res_ns);
LOG_DBG("Min timeout: %" PRIu64 "\n", tparam.min_tmo);
LOG_DBG("Max timeout: %" PRIu64 "\n", tparam.max_tmo);
- LOG_DBG("Num timers..: %u\n", tparam.num_timers);
- LOG_DBG("Tmo range: %u ms (%" PRIu64 " ticks)\n", RANGE_MS,
+ LOG_DBG("Num timers: %u\n", tparam.num_timers);
+ LOG_DBG("Tmo range: %u ms (%" PRIu64 " ticks)\n", RANGE_MS,
odp_timer_ns_to_tick(tp, 1000000ULL * RANGE_MS));
+ LOG_DBG("Max timers: %" PRIu32 "\n", timer_capa.max_timers);
+ LOG_DBG("Max timer pools: %" PRIu32 "\n", timer_capa.max_pools);
+ LOG_DBG("Max timer pools combined: %" PRIu32 "\n",
+ timer_capa.max_pools_combined);
tick = odp_timer_ns_to_tick(tp, 0);
CU_ASSERT(tick == 0);
@@ -932,7 +939,7 @@ static void timer_test_odp_timer_all(void)
/* Check some statistics after the test */
if (odp_timer_pool_info(tp, &tpinfo) != 0)
CU_FAIL("odp_timer_pool_info");
- CU_ASSERT(tpinfo.param.num_timers == (unsigned)num_workers * NTIMERS);
+ CU_ASSERT(tpinfo.param.num_timers == num_timers);
CU_ASSERT(tpinfo.cur_timers == 0);
timers_allocated = odp_atomic_load_u32(&global_mem->timers_allocated);
CU_ASSERT(tpinfo.hwm_timers == timers_allocated);
commit 3bd31be9ea2f5e96e96a638a081d8223d1734e6c
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Aug 1 10:44:46 2018 +0300
linux-gen: timer: implement new timer pool capabilities
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed by Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index 3fb50a91..6446b1c9 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -1117,6 +1117,9 @@ int odp_timer_capability(odp_timer_clk_src_t clk_src,
int ret = 0;
if (clk_src == ODP_CLOCK_CPU) {
+ capa->max_pools_combined = MAX_TIMER_POOLS;
+ capa->max_pools = MAX_TIMER_POOLS;
+ capa->max_timers = 0;
capa->highest_res_ns = timer_global->highest_res_ns;
} else {
ODP_ERR("ODP timer system doesn't support external clock source currently\n");
commit 9cd5b915b1b65e4e5fc83dedf9afa7029f1d3274
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Aug 1 09:05:39 2018 +0300
api: timer: add timer pool capabilities
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed by Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/timer.h b/include/odp/api/spec/timer.h
index d88faaae..c5c85514 100644
--- a/include/odp/api/spec/timer.h
+++ b/include/odp/api/spec/timer.h
@@ -135,6 +135,22 @@ typedef struct {
* Timer capability
*/
typedef struct {
+ /** Maximum number of timer pools over all clock sources
+ *
+ * The total number of timer pools that can be created combining
+ * different clock sources.
+ */
+ uint32_t max_pools_combined;
+
+ /** Maximum number of timer pools for the requested clock source */
+ uint32_t max_pools;
+
+ /** Maximum number of timers in a pool
+ *
+ * The value of zero means that limited only by the available
+ * memory size for the pool. */
+ uint32_t max_timers;
+
/** Highest timer resolution in nanoseconds.
*
* This defines the highest resolution supported by a timer.
commit 6afbe90158988dc36e25b1954fe1fe9124ae7df1
Author: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Date: Thu Aug 23 10:06:02 2018 +0300
validation: pktio: test per queue pktin configuration
Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c
index 3f082674..a4f7cecd 100644
--- a/test/validation/api/pktio/pktio.c
+++ b/test/validation/api/pktio/pktio.c
@@ -1482,6 +1482,42 @@ static void pktio_test_pktin_queue_config_sched(void)
CU_ASSERT_FATAL(odp_pktio_close(pktio) == 0);
}
+static void pktio_test_pktin_queue_config_multi_sched(void)
+{
+ odp_pktio_t pktio;
+ odp_pktio_capability_t capa;
+ odp_pktin_queue_param_t queue_param;
+ odp_queue_t in_queues[MAX_QUEUES];
+ odp_pktin_queue_param_ovr_t queue_param_ovr[MAX_QUEUES];
+ int num_queues, i;
+
+ pktio = create_pktio(0, ODP_PKTIN_MODE_SCHED, ODP_PKTOUT_MODE_DIRECT);
+ CU_ASSERT_FATAL(pktio != ODP_PKTIO_INVALID);
+
+ CU_ASSERT_FATAL(odp_pktio_capability(pktio, &capa) == 0 &&
+ capa.max_input_queues > 0);
+ num_queues = (capa.max_input_queues < MAX_QUEUES) ?
+ capa.max_input_queues : MAX_QUEUES;
+
+ odp_pktin_queue_param_init(&queue_param);
+
+ queue_param.hash_enable = 0;
+ queue_param.num_queues = num_queues;
+ queue_param.queue_param.sched.group = ODP_SCHED_GROUP_ALL;
+ queue_param.queue_param.sched.sync = ODP_SCHED_SYNC_ATOMIC;
+
+ for (i = 0; i < num_queues; i++)
+ queue_param_ovr[i].group = ODP_SCHED_GROUP_ALL;
+ queue_param.queue_param_ovr = queue_param_ovr;
+
+ CU_ASSERT_FATAL(odp_pktin_queue_config(pktio, &queue_param) == 0);
+
+ CU_ASSERT(odp_pktin_event_queue(pktio, in_queues, MAX_QUEUES)
+ == num_queues);
+
+ CU_ASSERT_FATAL(odp_pktio_close(pktio) == 0);
+}
+
static void pktio_test_pktin_queue_config_queue(void)
{
odp_pktio_t pktio;
@@ -2794,6 +2830,7 @@ odp_testinfo_t pktio_suite_unsegmented[] = {
ODP_TEST_INFO(pktio_test_info),
ODP_TEST_INFO(pktio_test_pktin_queue_config_direct),
ODP_TEST_INFO(pktio_test_pktin_queue_config_sched),
+ ODP_TEST_INFO(pktio_test_pktin_queue_config_multi_sched),
ODP_TEST_INFO(pktio_test_pktin_queue_config_queue),
ODP_TEST_INFO(pktio_test_pktout_queue_config),
ODP_TEST_INFO(pktio_test_plain_queue),
commit 48e3615af2cf18136a32b5a0afa0d05303bd4d36
Author: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Date: Fri Aug 10 10:45:43 2018 +0300
linux-gen: pktio: implement per queue pktin configuration
Enables advanced usecases where heterogeneous settings are needed
on input queues of the same interface.
Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
index 3a788f04..4954d5f0 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -1441,15 +1441,23 @@ int odp_pktin_queue_config(odp_pktio_t pktio,
odp_queue_param_t queue_param;
char name[ODP_QUEUE_NAME_LEN];
int pktio_id = odp_pktio_index(pktio);
+ odp_pktin_queue_param_ovr_t *queue_param_ovr = NULL;
+
+ if (param->queue_param_ovr)
+ queue_param_ovr = param->queue_param_ovr + i;
snprintf(name, sizeof(name), "odp-pktin-%i-%i",
pktio_id, i);
- if (param->classifier_enable)
+ if (param->classifier_enable) {
odp_queue_param_init(&queue_param);
- else
+ } else {
memcpy(&queue_param, ¶m->queue_param,
sizeof(odp_queue_param_t));
+ if (queue_param_ovr)
+ queue_param.sched.group =
+ queue_param_ovr->group;
+ }
queue_param.type = ODP_QUEUE_TYPE_PLAIN;
commit 9b11cef7a44294ec094e508f8090d77c2284728e
Author: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Date: Fri Aug 10 10:30:08 2018 +0300
api: pktio: extend odp_pktin_queue_param_t to support per queue configuration
Per queue configuration enables advanced usecases where input queues
of the same interface may belong to different scheduler groups.
Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h
index a55c2678..d3e1d405 100644
--- a/include/odp/api/spec/packet_io.h
+++ b/include/odp/api/spec/packet_io.h
@@ -148,6 +148,17 @@ typedef enum odp_pktio_op_mode_t {
} odp_pktio_op_mode_t;
+/**
+ * Packet input queue parameters override
+ */
+typedef struct odp_pktin_queue_param_ovr_t {
+ /** Override for schedule group in odp_schedule_param_t
+ *
+ * This parameter is considered only when queue type is
+ * ODP_QUEUE_TYPE_SCHED. */
+ odp_schedule_group_t group;
+} odp_pktin_queue_param_ovr_t;
+
/**
* Packet input queue parameters
*/
@@ -203,6 +214,18 @@ typedef struct odp_pktin_queue_param_t {
* value is ignored. */
odp_queue_param_t queue_param;
+ /** Queue parameters override
+ *
+ * When the override array is defined, the same parameter value
+ * in 'queue_param' is ignored and these per queue parameter
+ * values are used instead. Array elements are used in order
+ * (i.e. the first queue gets parameters from the first array
+ * element, etc).
+ * Must point to an array of num_queues elements or NULL to
+ * disable queue parameters override. The default value is
+ * NULL.
+ */
+ odp_pktin_queue_param_ovr_t *queue_param_ovr;
} odp_pktin_queue_param_t;
/**
commit 0485bc704a497ca482fe47228d6295fac661d947
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Aug 10 15:06:37 2018 +0300
validation: packet: add parse result test
Test new parse result functions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c
index ea67f3cd..0f019f6c 100644
--- a/test/validation/api/packet/packet.c
+++ b/test/validation/api/packet/packet.c
@@ -3383,6 +3383,114 @@ static void parse_eth_ipv4_rr_nop_icmp(void)
odp_packet_free_multi(pkt, num_pkt);
}
+static void parse_result(void)
+{
+ odp_packet_parse_param_t parse;
+ int i;
+ int num_pkt = PARSE_TEST_NUM_PKT;
+ odp_packet_t pkt[num_pkt];
+ odp_packet_parse_result_t result[num_pkt];
+ odp_packet_parse_result_t *result_ptr[num_pkt];
+
+ /* Ethernet/VLAN/IPv6/UDP */
+ parse_test_alloc(pkt, test_packet_vlan_ipv6_udp,
+ sizeof(test_packet_vlan_ipv6_udp), num_pkt);
+
+ parse.proto = ODP_PROTO_ETH;
+ parse.last_layer = ODP_PROTO_LAYER_ALL;
+ parse.chksums.all_chksum = 0;
+
+ CU_ASSERT(odp_packet_parse(pkt[0], 0, &parse) == 0);
+ CU_ASSERT(odp_packet_parse_multi(&pkt[1], parse_test.offset_zero,
+ num_pkt - 1, &parse) == (num_pkt - 1));
+
+ for (i = 0; i < num_pkt; i++) {
+ result_ptr[i] = &result[i];
+ memset(&result[i], 0, sizeof(odp_packet_parse_result_t));
+ }
+
+ odp_packet_parse_result(pkt[0], result_ptr[0]);
+ odp_packet_parse_result_multi(&pkt[1], &result_ptr[1], num_pkt - 1);
+
+ for (i = 0; i < num_pkt; i++) {
+ CU_ASSERT(odp_packet_has_eth(pkt[i]));
+ CU_ASSERT(odp_packet_has_vlan(pkt[i]));
+ CU_ASSERT(odp_packet_has_ipv6(pkt[i]));
+ CU_ASSERT(odp_packet_has_udp(pkt[i]));
+ CU_ASSERT(!odp_packet_has_ipv4(pkt[i]));
+ CU_ASSERT(!odp_packet_has_tcp(pkt[i]));
+ CU_ASSERT(odp_packet_l2_type(pkt[i]) == ODP_PROTO_L2_TYPE_ETH);
+ CU_ASSERT(odp_packet_l3_type(pkt[i]) == ODP_PROTO_L3_TYPE_IPV6);
+ CU_ASSERT(odp_packet_l4_type(pkt[i]) == ODP_PROTO_L4_TYPE_UDP);
+
+ CU_ASSERT(result[i].flag.all != 0);
+ CU_ASSERT(result[i].flag.has_error ==
+ odp_packet_has_error(pkt[i]));
+ CU_ASSERT(result[i].flag.has_l2_error ==
+ odp_packet_has_l2_error(pkt[i]));
+ CU_ASSERT(result[i].flag.has_l3_error ==
+ odp_packet_has_l3_error(pkt[i]));
+ CU_ASSERT(result[i].flag.has_l4_error ==
+ odp_packet_has_l4_error(pkt[i]));
+ CU_ASSERT(result[i].flag.has_l2 ==
+ odp_packet_has_l2(pkt[i]));
+ CU_ASSERT(result[i].flag.has_l3 ==
+ odp_packet_has_l3(pkt[i]));
+ CU_ASSERT(result[i].flag.has_l4 ==
+ odp_packet_has_l4(pkt[i]));
+ CU_ASSERT(result[i].flag.has_eth ==
+ odp_packet_has_eth(pkt[i]));
+ CU_ASSERT(result[i].flag.has_eth_bcast ==
+ odp_packet_has_eth_bcast(pkt[i]));
+ CU_ASSERT(result[i].flag.has_eth_mcast ==
+ odp_packet_has_eth_mcast(pkt[i]));
+ CU_ASSERT(result[i].flag.has_jumbo ==
+ odp_packet_has_jumbo(pkt[i]));
+ CU_ASSERT(result[i].flag.has_vlan ==
+ odp_packet_has_vlan(pkt[i]));
+ CU_ASSERT(result[i].flag.has_vlan_qinq ==
+ odp_packet_has_vlan_qinq(pkt[i]));
+ CU_ASSERT(result[i].flag.has_arp ==
+ odp_packet_has_arp(pkt[i]));
+ CU_ASSERT(result[i].flag.has_ipv4 ==
+ odp_packet_has_ipv4(pkt[i]));
+ CU_ASSERT(result[i].flag.has_ipv6 ==
+ odp_packet_has_ipv6(pkt[i]));
+ CU_ASSERT(result[i].flag.has_ip_bcast ==
+ odp_packet_has_ip_bcast(pkt[i]));
+ CU_ASSERT(result[i].flag.has_ip_mcast ==
+ odp_packet_has_ip_mcast(pkt[i]));
+ CU_ASSERT(result[i].flag.has_ipfrag ==
+ odp_packet_has_ipfrag(pkt[i]));
+ CU_ASSERT(result[i].flag.has_ipopt ==
+ odp_packet_has_ipopt(pkt[i]));
+ CU_ASSERT(result[i].flag.has_ipsec ==
+ odp_packet_has_ipsec(pkt[i]));
+ CU_ASSERT(result[i].flag.has_udp ==
+ odp_packet_has_udp(pkt[i]));
+ CU_ASSERT(result[i].flag.has_tcp ==
+ odp_packet_has_tcp(pkt[i]));
+ CU_ASSERT(result[i].flag.has_sctp ==
+ odp_packet_has_sctp(pkt[i]));
+ CU_ASSERT(result[i].flag.has_icmp ==
+ odp_packet_has_icmp(pkt[i]));
+
+ CU_ASSERT(result[i].packet_len == odp_packet_len(pkt[i]));
+ CU_ASSERT(result[i].l2_offset == odp_packet_l2_offset(pkt[i]));
+ CU_ASSERT(result[i].l3_offset == odp_packet_l3_offset(pkt[i]));
+ CU_ASSERT(result[i].l4_offset == odp_packet_l4_offset(pkt[i]));
+ CU_ASSERT(result[i].l3_chksum_status ==
+ odp_packet_l3_chksum_status(pkt[i]));
+ CU_ASSERT(result[i].l4_chksum_status ==
+ odp_packet_l4_chksum_status(pkt[i]));
+ CU_ASSERT(result[i].l2_type == odp_packet_l2_type(pkt[i]));
+ CU_ASSERT(result[i].l3_type == odp_packet_l3_type(pkt[i]));
+ CU_ASSERT(result[i].l4_type == odp_packet_l4_type(pkt[i]));
+ }
+
+ odp_packet_free_multi(pkt, num_pkt);
+}
+
odp_testinfo_t packet_suite[] = {
ODP_TEST_INFO(packet_test_alloc_free),
ODP_TEST_INFO(packet_test_alloc_free_multi),
@@ -3441,6 +3549,7 @@ odp_testinfo_t packet_parse_suite[] = {
ODP_TEST_INFO(parse_eth_ipv4_udp_first_frag),
ODP_TEST_INFO(parse_eth_ipv4_udp_last_frag),
ODP_TEST_INFO(parse_eth_ipv4_rr_nop_icmp),
+ ODP_TEST_INFO(parse_result),
ODP_TEST_INFO_NULL,
};
commit 7b9a1713a148fffff7095215b661f37ffc2a681b
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Aug 10 14:31:38 2018 +0300
validation: packet: add num_pkt parameter to parse_test_alloc
It's more robust to use a parameter instead of assuming that
a fixed number of packets are allocated.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c
index f1ec4f46..ea67f3cd 100644
--- a/test/validation/api/packet/packet.c
+++ b/test/validation/api/packet/packet.c
@@ -2638,10 +2638,9 @@ static int packet_parse_suite_term(void)
}
static void parse_test_alloc(odp_packet_t pkt[], const uint8_t test_packet[],
- uint32_t len)
+ uint32_t len, int num_pkt)
{
int ret, i;
- int num_pkt = PARSE_TEST_NUM_PKT;
ret = odp_packet_alloc_multi(parse_test.pool, len, pkt, num_pkt);
CU_ASSERT_FATAL(ret == num_pkt);
@@ -2662,7 +2661,7 @@ static void parse_eth_ipv4_udp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_ipv4_udp,
- sizeof(test_packet_ipv4_udp));
+ sizeof(test_packet_ipv4_udp), num_pkt);
for (i = 0; i < num_pkt; i++) {
chksum_status = odp_packet_l3_chksum_status(pkt[i]);
@@ -2706,7 +2705,7 @@ static void parse_ipv4_udp(void)
uint32_t offset[num_pkt];
parse_test_alloc(pkt, test_packet_ipv4_udp,
- sizeof(test_packet_ipv4_udp));
+ sizeof(test_packet_ipv4_udp), num_pkt);
for (i = 0; i < num_pkt; i++)
offset[i] = 14;
@@ -2742,7 +2741,7 @@ static void parse_eth_ipv4_tcp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_ipv4_tcp,
- sizeof(test_packet_ipv4_tcp));
+ sizeof(test_packet_ipv4_tcp), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -2778,7 +2777,7 @@ static void parse_eth_ipv6_udp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_ipv6_udp,
- sizeof(test_packet_ipv6_udp));
+ sizeof(test_packet_ipv6_udp), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -2808,7 +2807,7 @@ static void parse_eth_ipv6_tcp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_ipv6_tcp,
- sizeof(test_packet_ipv6_tcp));
+ sizeof(test_packet_ipv6_tcp), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_ALL;
@@ -2838,7 +2837,7 @@ static void parse_eth_vlan_ipv4_udp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_vlan_ipv4_udp,
- sizeof(test_packet_vlan_ipv4_udp));
+ sizeof(test_packet_vlan_ipv4_udp), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -2869,7 +2868,7 @@ static void parse_eth_vlan_ipv6_udp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_vlan_ipv6_udp,
- sizeof(test_packet_vlan_ipv6_udp));
+ sizeof(test_packet_vlan_ipv6_udp), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -2906,7 +2905,7 @@ static void parse_eth_vlan_qinq_ipv4_udp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_vlan_qinq_ipv4_udp,
- sizeof(test_packet_vlan_qinq_ipv4_udp));
+ sizeof(test_packet_vlan_qinq_ipv4_udp), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -2938,7 +2937,7 @@ static void parse_eth_arp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_arp,
- sizeof(test_packet_arp));
+ sizeof(test_packet_arp), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -2970,7 +2969,7 @@ static void parse_eth_ipv4_icmp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_ipv4_icmp,
- sizeof(test_packet_ipv4_icmp));
+ sizeof(test_packet_ipv4_icmp), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -3001,7 +3000,7 @@ static void parse_eth_ipv6_icmp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_ipv6_icmp,
- sizeof(test_packet_ipv6_icmp));
+ sizeof(test_packet_ipv6_icmp), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -3032,7 +3031,7 @@ static void parse_eth_ipv4_sctp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_ipv4_sctp,
- sizeof(test_packet_ipv4_sctp));
+ sizeof(test_packet_ipv4_sctp), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -3063,7 +3062,7 @@ static void parse_eth_ipv4_ipsec_ah(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_ipv4_ipsec_ah,
- sizeof(test_packet_ipv4_ipsec_ah));
+ sizeof(test_packet_ipv4_ipsec_ah), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -3094,7 +3093,7 @@ static void parse_eth_ipv4_ipsec_esp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_ipv4_ipsec_esp,
- sizeof(test_packet_ipv4_ipsec_esp));
+ sizeof(test_packet_ipv4_ipsec_esp), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -3125,7 +3124,7 @@ static void parse_eth_ipv6_ipsec_ah(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_ipv6_ipsec_ah,
- sizeof(test_packet_ipv6_ipsec_ah));
+ sizeof(test_packet_ipv6_ipsec_ah), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -3162,7 +3161,7 @@ static void parse_eth_ipv6_ipsec_esp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_ipv6_ipsec_esp,
- sizeof(test_packet_ipv6_ipsec_esp));
+ sizeof(test_packet_ipv6_ipsec_esp), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -3193,7 +3192,7 @@ static void parse_mcast_eth_ipv4_udp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_mcast_eth_ipv4_udp,
- sizeof(test_packet_mcast_eth_ipv4_udp));
+ sizeof(test_packet_mcast_eth_ipv4_udp), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -3227,7 +3226,7 @@ static void parse_bcast_eth_ipv4_udp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_bcast_eth_ipv4_udp,
- sizeof(test_packet_bcast_eth_ipv4_udp));
+ sizeof(test_packet_bcast_eth_ipv4_udp), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -3262,7 +3261,7 @@ static void parse_mcast_eth_ipv6_udp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_mcast_eth_ipv6_udp,
- sizeof(test_packet_mcast_eth_ipv6_udp));
+ sizeof(test_packet_mcast_eth_ipv6_udp), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -3296,7 +3295,7 @@ static void parse_eth_ipv4_udp_first_frag(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_ipv4_udp_first_frag,
- sizeof(test_packet_ipv4_udp_first_frag));
+ sizeof(test_packet_ipv4_udp_first_frag), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -3328,7 +3327,7 @@ static void parse_eth_ipv4_udp_last_frag(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_ipv4_udp_last_frag,
- sizeof(test_packet_ipv4_udp_last_frag));
+ sizeof(test_packet_ipv4_udp_last_frag), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
@@ -3360,7 +3359,7 @@ static void parse_eth_ipv4_rr_nop_icmp(void)
odp_packet_t pkt[num_pkt];
parse_test_alloc(pkt, test_packet_ipv4_rr_nop_icmp,
- sizeof(test_packet_ipv4_rr_nop_icmp));
+ sizeof(test_packet_ipv4_rr_nop_icmp), num_pkt);
parse.proto = ODP_PROTO_ETH;
parse.last_layer = ODP_PROTO_LAYER_L4;
commit ca71292dbadc5959ebcfaeda0c071ed558359b8b
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Aug 10 14:10:59 2018 +0300
linux-gen: packet: implement packet result calls
Simple implementation of the new packet result calls. Especially,
flag copy needs to be optimized by storing flag bits directly into
API defined format (packet_parse_result_flag_t) in the packet
header.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 356ba5e6..f4c99ce1 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -2835,6 +2835,59 @@ int odp_packet_parse_multi(const odp_packet_t pkt[], const uint32_t offset[],
return num;
}
+void odp_packet_parse_result(odp_packet_t pkt,
+ odp_packet_parse_result_t *result)
+{
+ /* TODO: optimize to single word copy when packet header stores bits
+ * directly into odp_packet_parse_result_flag_t */
+ result->flag.all = 0;
+ result->flag.has_error = odp_packet_has_error(pkt);
+ result->flag.has_l2_error = odp_packet_has_l2_error(pkt);
+ result->flag.has_l3_error = odp_packet_has_l3_error(pkt);
+ result->flag.has_l4_error = odp_packet_has_l4_error(pkt);
+ result->flag.has_l2 = odp_packet_has_l2(pkt);
+ result->flag.has_l3 = odp_packet_has_l3(pkt);
+ result->flag.has_l4 = odp_packet_has_l4(pkt);
+ result->flag.has_eth = odp_packet_has_eth(pkt);
+ result->flag.has_eth_bcast = odp_packet_has_eth_bcast(pkt);
+ result->flag.has_eth_mcast = odp_packet_has_eth_mcast(pkt);
+ result->flag.has_jumbo = odp_packet_has_jumbo(pkt);
+ result->flag.has_vlan = odp_packet_has_vlan(pkt);
+ result->flag.has_vlan_qinq = odp_packet_has_vlan_qinq(pkt);
+ result->flag.has_arp = odp_packet_has_arp(pkt);
+ result->flag.has_ipv4 = odp_packet_has_ipv4(pkt);
+ result->flag.has_ipv6 = odp_packet_has_ipv6(pkt);
+ result->flag.has_ip_bcast = odp_packet_has_ip_bcast(pkt);
+ result->flag.has_ip_mcast = odp_packet_has_ip_mcast(pkt);
+ result->flag.has_ipfrag = odp_packet_has_ipfrag(pkt);
+ result->flag.has_ipopt = odp_packet_has_ipopt(pkt);
+ result->flag.has_ipsec = odp_packet_has_ipsec(pkt);
+ result->flag.has_udp = odp_packet_has_udp(pkt);
+ result->flag.has_tcp = odp_packet_has_tcp(pkt);
+ result->flag.has_sctp = odp_packet_has_sctp(pkt);
+ result->flag.has_icmp = odp_packet_has_icmp(pkt);
+
+ result->packet_len = odp_packet_len(pkt);
+ result->l2_offset = odp_packet_l2_offset(pkt);
+ result->l3_offset = odp_packet_l3_offset(pkt);
+ result->l4_offset = odp_packet_l4_offset(pkt);
+ result->l3_chksum_status = odp_packet_l3_chksum_status(pkt);
+ result->l4_chksum_status = odp_packet_l4_chksum_status(pkt);
+ result->l2_type = odp_packet_l2_type(pkt);
+ result->l3_type = odp_packet_l3_type(pkt);
+ result->l4_type = odp_packet_l4_type(pkt);
+}
+
+void odp_packet_parse_result_multi(const odp_packet_t pkt[],
+ odp_packet_parse_result_t *result[],
+ int num)
+{
+ int i;
+
+ for (i = 0; i < num; i++)
+ odp_packet_parse_result(pkt[i], result[i]);
+}
+
uint64_t odp_packet_to_u64(odp_packet_t hdl)
{
return _odp_pri(hdl);
commit a89e63bb67bfc163ac67aed49a3e3b733aca8384
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Aug 10 11:04:29 2018 +0300
api: packet: add parse result call
This enables application to read all commonly used packet parser
results with a single function call. This may improve performance
when multiple results are needed, especially in ABI compatible
builds where function inlining is likely disabled.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/abi-default/packet.h b/include/odp/api/abi-default/packet.h
index b5380b04..c8eecbac 100644
--- a/include/odp/api/abi-default/packet.h
+++ b/include/odp/api/abi-default/packet.h
@@ -72,6 +72,70 @@ typedef enum {
#define ODP_NUM_PACKET_COLORS 3
+/** Parse result flags */
+typedef struct odp_packet_parse_result_flag_t {
+ /** Flags union */
+ union {
+ /** All flags as a 64 bit word */
+ uint64_t all;
+
+ /** Flags as a bitfield struct */
+ struct {
+ /** @see odp_packet_has_error() */
+ uint64_t has_error : 1;
+ /** @see odp_packet_has_l2_error() */
+ uint64_t has_l2_error : 1;
+ /** @see odp_packet_has_l3_error() */
+ uint64_t has_l3_error : 1;
+ /** @see odp_packet_has_l4_error() */
+ uint64_t has_l4_error : 1;
+ /** @see odp_packet_has_l2() */
+ uint64_t has_l2 : 1;
+ /** @see odp_packet_has_l3() */
+ uint64_t has_l3 : 1;
+ /** @see odp_packet_has_l4() */
+ uint64_t has_l4 : 1;
+ /** @see odp_packet_has_eth() */
+ uint64_t has_eth : 1;
+ /** @see odp_packet_has_eth_bcast() */
+ uint64_t has_eth_bcast : 1;
+ /** @see odp_packet_has_eth_mcast() */
+ uint64_t has_eth_mcast : 1;
+ /** @see odp_packet_has_jumbo() */
+ uint64_t has_jumbo : 1;
+ /** @see odp_packet_has_vlan() */
+ uint64_t has_vlan : 1;
+ /** @see odp_packet_has_vlan_qinq() */
+ uint64_t has_vlan_qinq : 1;
+ /** @see odp_packet_has_arp() */
+ uint64_t has_arp : 1;
+ /** @see odp_packet_has_ipv4() */
+ uint64_t has_ipv4 : 1;
+ /** @see odp_packet_has_ipv6() */
+ uint64_t has_ipv6 : 1;
+ /** @see odp_packet_has_ip_bcast() */
+ uint64_t has_ip_bcast : 1;
+ /** @see odp_packet_has_ip_mcast() */
+ uint64_t has_ip_mcast : 1;
+ /** @see odp_packet_has_ipfrag() */
+ uint64_t has_ipfrag : 1;
+ /** @see odp_packet_has_ipopt() */
+ uint64_t has_ipopt : 1;
+ /** @see odp_packet_has_ipsec() */
+ uint64_t has_ipsec : 1;
+ /** @see odp_packet_has_udp() */
+ uint64_t has_udp : 1;
+ /** @see odp_packet_has_tcp() */
+ uint64_t has_tcp : 1;
+ /** @see odp_packet_has_sctp() */
+ uint64_t has_sctp : 1;
+ /** @see odp_packet_has_icmp() */
+ uint64_t has_icmp : 1;
+ };
+ };
+
+} odp_packet_parse_result_flag_t;
+
/**
* @}
*/
diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h
index 78e519ac..3fd571a3 100644
--- a/include/odp/api/spec/packet.h
+++ b/include/odp/api/spec/packet.h
@@ -1428,6 +1428,62 @@ int odp_packet_parse(odp_packet_t pkt, uint32_t offset,
int odp_packet_parse_multi(const odp_packet_t pkt[], const uint32_t offset[],
int num, const odp_packet_parse_param_t *param);
+/** Packet parse results */
+typedef struct odp_packet_parse_result_t {
+ /** Parse result flags */
+ odp_packet_parse_result_flag_t flag;
+
+ /** @see odp_packet_len() */
+ uint32_t packet_len;
+
+ /** @see odp_packet_l2_offset() */
+ uint32_t l2_offset;
+ /** @see odp_packet_l3_offset() */
+ uint32_t l3_offset;
+ /** @see odp_packet_l4_offset() */
+ uint32_t l4_offset;
+
+ /** @see odp_packet_l3_chksum_status() */
+ odp_packet_chksum_status_t l3_chksum_status;
+ /** @see odp_packet_l4_chksum_status() */
+ odp_packet_chksum_status_t l4_chksum_status;
+
+ /** @see odp_packet_l2_type() */
+ odp_proto_l2_type_t l2_type;
+ /** @see odp_packet_l3_type() */
+ odp_proto_l3_type_t l3_type;
+ /** @see odp_packet_l4_type() */
+ odp_proto_l4_type_t l4_type;
+
+} odp_packet_parse_result_t;
+
+/**
+ * Read parse results
+ *
+ * Read out the most commonly used packet parse results. The same information is
+ * available through individual function calls, but this call may be more
+ * efficient when reading multiple results from a packet.
+ *
+ * @param pkt Packet handle
+ * @param[out] result Pointer for parse result output
+ */
+void odp_packet_parse_result(odp_packet_t pkt,
+ odp_packet_parse_result_t *result);
+
+/**
+ * Read parse results from multiple packets
+ *
+ * Otherwise same functionality as odp_packet_parse_result() but handles
+ * multiple packets.
+ *
+ * @param pkt Packet handle array
+ * @param[out] result Parse result array for output
+ * @param num Number of packets and results
+ */
+void odp_packet_parse_result_multi(const odp_packet_t pkt[],
+ odp_packet_parse_result_t *result[],
+ int num);
+
/**
* Packet pool
*
diff --git a/platform/linux-generic/include-abi/odp/api/abi/packet.h b/platform/linux-generic/include-abi/odp/api/abi/packet.h
index fe21c7d9..e11aed97 100644
--- a/platform/linux-generic/include-abi/odp/api/abi/packet.h
+++ b/platform/linux-generic/include-abi/odp/api/abi/packet.h
@@ -89,6 +89,41 @@ typedef enum {
#define ODP_NUM_PACKET_COLORS 3
+typedef struct odp_packet_parse_result_flag_t {
+ union {
+ uint64_t all;
+
+ struct {
+ uint64_t has_error : 1;
+ uint64_t has_l2_error : 1;
+ uint64_t has_l3_error : 1;
+ uint64_t has_l4_error : 1;
+ uint64_t has_l2 : 1;
+ uint64_t has_l3 : 1;
+ uint64_t has_l4 : 1;
+ uint64_t has_eth : 1;
+ uint64_t has_eth_bcast : 1;
+ uint64_t has_eth_mcast : 1;
+ uint64_t has_jumbo : 1;
+ uint64_t has_vlan : 1;
+ uint64_t has_vlan_qinq : 1;
+ uint64_t has_arp : 1;
+ uint64_t has_ipv4 : 1;
+ uint64_t has_ipv6 : 1;
+ uint64_t has_ip_bcast : 1;
+ uint64_t has_ip_mcast : 1;
+ uint64_t has_ipfrag : 1;
+ uint64_t has_ipopt : 1;
+ uint64_t has_ipsec : 1;
+ uint64_t has_udp : 1;
+ uint64_t has_tcp : 1;
+ uint64_t has_sctp : 1;
+ uint64_t has_icmp : 1;
+ };
+ };
+
+} odp_packet_parse_result_flag_t;
+
#include <odp/api/plat/packet_inlines.h>
/**
commit f9bb28e43836da8183276199f888fb8ee612defa
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Aug 9 14:11:53 2018 +0300
validation: packet: add packet subtype tests
Check that packet subtype is correct.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index 29563552..76215bc2 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -225,6 +225,7 @@ static int alg_packet_op(odp_packet_t pkt,
CU_ASSERT(ODP_EVENT_PACKET ==
odp_event_types(odp_packet_to_event(pkt), &subtype));
CU_ASSERT(ODP_EVENT_PACKET_CRYPTO == subtype);
+ CU_ASSERT(odp_packet_subtype(pkt) == ODP_EVENT_PACKET_CRYPTO);
rc = odp_crypto_result(&result, pkt);
if (rc < 0) {
@@ -298,6 +299,7 @@ static int alg_packet_op_enq(odp_packet_t pkt,
CU_ASSERT(ODP_EVENT_PACKET ==
odp_event_types(odp_packet_to_event(pkt), &subtype));
CU_ASSERT(ODP_EVENT_PACKET_CRYPTO == subtype);
+ CU_ASSERT(odp_packet_subtype(pkt) == ODP_EVENT_PACKET_CRYPTO);
rc = odp_crypto_result(&result, pkt);
if (rc < 0) {
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index b50a5ef9..aece2115 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -538,6 +538,7 @@ static int ipsec_send_in_one(const ipsec_test_part *part,
pkto, &num_out,
¶m));
CU_ASSERT_EQUAL(num_out, part->out_pkt);
+ CU_ASSERT(odp_packet_subtype(*pkto) == ODP_EVENT_PACKET_IPSEC);
} else if (ODP_IPSEC_OP_MODE_ASYNC == suite_context.inbound_op_mode) {
CU_ASSERT_EQUAL(1, odp_ipsec_in_enq(&pkt, 1, ¶m));
@@ -553,6 +554,8 @@ static int ipsec_send_in_one(const ipsec_test_part *part,
odp_event_types(event, &subtype));
CU_ASSERT_EQUAL(ODP_EVENT_PACKET_IPSEC, subtype);
pkto[i] = odp_ipsec_packet_from_event(event);
+ CU_ASSERT(odp_packet_subtype(pkto[i]) ==
+ ODP_EVENT_PACKET_IPSEC);
}
} else {
odp_queue_t queue;
@@ -591,7 +594,10 @@ static int ipsec_send_in_one(const ipsec_test_part *part,
subtype);
CU_ASSERT(!part->out[i].status.error.sa_lookup);
- pkto[i++] = odp_ipsec_packet_from_event(ev);
+ pkto[i] = odp_ipsec_packet_from_event(ev);
+ CU_ASSERT(odp_packet_subtype(pkto[i]) ==
+ ODP_EVENT_PACKET_IPSEC);
+ i++;
continue;
}
}
@@ -622,6 +628,8 @@ static int ipsec_send_out_one(const ipsec_test_part *part,
pkto, &num_out,
¶m));
CU_ASSERT_EQUAL(num_out, part->out_pkt);
+ CU_ASSERT(odp_packet_subtype(*pkto) ==
+ ODP_EVENT_PACKET_IPSEC);
} else if (ODP_IPSEC_OP_MODE_ASYNC == suite_context.outbound_op_mode) {
CU_ASSERT_EQUAL(1, odp_ipsec_out_enq(&pkt, 1, ¶m));
@@ -637,6 +645,8 @@ static int ipsec_send_out_one(const ipsec_test_part *part,
odp_event_types(event, &subtype));
CU_ASSERT_EQUAL(ODP_EVENT_PACKET_IPSEC, subtype);
pkto[i] = odp_ipsec_packet_from_event(event);
+ CU_ASSERT(odp_packet_subtype(pkto[i]) ==
+ ODP_EVENT_PACKET_IPSEC);
}
} else {
struct odp_ipsec_out_inline_param_t inline_param;
@@ -693,7 +703,10 @@ static int ipsec_send_out_one(const ipsec_test_part *part,
subtype);
CU_ASSERT(part->out[i].status.error.all);
- pkto[i++] = odp_ipsec_packet_from_event(ev);
+ pkto[i] = odp_ipsec_packet_from_event(ev);
+ CU_ASSERT(odp_packet_subtype(pkto[i]) ==
+ ODP_EVENT_PACKET_IPSEC);
+ i++;
continue;
}
}
diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c
index a6e44f45..f1ec4f46 100644
--- a/test/validation/api/packet/packet.c
+++ b/test/validation/api/packet/packet.c
@@ -332,6 +332,7 @@ static void packet_test_alloc_free(void)
CU_ASSERT(odp_event_types(odp_packet_to_event(packet), &subtype) ==
ODP_EVENT_PACKET);
CU_ASSERT(subtype == ODP_EVENT_PACKET_BASIC);
+ CU_ASSERT(odp_packet_subtype(packet) == ODP_EVENT_PACKET_BASIC);
CU_ASSERT(odp_packet_to_u64(packet) !=
odp_packet_to_u64(ODP_PACKET_INVALID));
@@ -415,6 +416,8 @@ static void packet_test_alloc_free_multi(void)
&subtype) ==
ODP_EVENT_PACKET);
CU_ASSERT(subtype == ODP_EVENT_PACKET_BASIC);
+ CU_ASSERT(odp_packet_subtype(packet[i]) ==
+ ODP_EVENT_PACKET_BASIC);
CU_ASSERT(odp_packet_to_u64(packet[i]) !=
odp_packet_to_u64(ODP_PACKET_INVALID));
commit 2411cd30bfc38651860fcc0e9f1331c3a37ccfbe
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Aug 9 11:44:20 2018 +0300
linux-gen: packet: implementation subtype api
Add inlined implementation of the new subtype API call and use
that internally.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h
index 25510298..71065172 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h
@@ -45,6 +45,7 @@ typedef struct _odp_packet_inline_offset_t {
uint16_t timestamp;
uint16_t input_flags;
uint16_t flags;
+ uint16_t subtype;
} _odp_packet_inline_offset_t;
diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
index 602d3344..3851af4c 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
@@ -19,6 +19,7 @@
#include <odp/api/hints.h>
#include <odp/api/time.h>
#include <odp/api/abi/buffer.h>
+#include <odp/api/abi/event.h>
#include <odp/api/plat/packet_inline_types.h>
#include <odp/api/plat/pool_inline_types.h>
@@ -64,6 +65,7 @@
#define odp_packet_to_event __odp_packet_to_event
#define odp_packet_from_event_multi __odp_packet_from_event_multi
#define odp_packet_to_event_multi __odp_packet_to_event_multi
+ #define odp_packet_subtype __odp_packet_subtype
#else
#undef _ODP_INLINE
#define _ODP_INLINE
@@ -355,6 +357,11 @@ _ODP_INLINE void odp_packet_to_event_multi(const odp_packet_t pkt[],
ev[i] = odp_packet_to_event(pkt[i]);
}
+_ODP_INLINE odp_event_subtype_t odp_packet_subtype(odp_packet_t pkt)
+{
+ return (odp_event_subtype_t)_odp_pkt_get(pkt, int8_t, subtype);
+}
+
/** @endcond */
#endif
diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index d17a61a0..b9b11770 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -147,11 +147,6 @@ static inline seg_entry_t *seg_entry_last(odp_packet_hdr_t *hdr)
return &last->buf_hdr.seg[last_seg];
}
-static inline odp_event_subtype_t packet_subtype(odp_packet_t pkt)
-{
- return packet_hdr(pkt)->subtype;
-}
-
static inline void packet_subtype_set(odp_packet_t pkt, int ev)
{
packet_hdr(pkt)->subtype = ev;
diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c
index fa20af5f..bb378528 100644
--- a/platform/linux-generic/odp_event.c
+++ b/platform/linux-generic/odp_event.c
@@ -19,6 +19,7 @@
/* Inlined API functions */
#include <odp/api/plat/event_inlines.h>
+#include <odp/api/plat/packet_inlines.h>
odp_event_subtype_t odp_event_subtype(odp_event_t event)
{
@@ -26,7 +27,7 @@ odp_event_subtype_t odp_event_subtype(odp_event_t event)
ODP_EVENT_PACKET)
return ODP_EVENT_NO_SUBTYPE;
- return packet_subtype(odp_packet_from_event(event));
+ return odp_packet_subtype(odp_packet_from_event(event));
}
odp_event_type_t odp_event_types(odp_event_t event,
@@ -36,7 +37,7 @@ odp_event_type_t odp_event_types(odp_event_t event,
odp_event_type_t event_type = _odp_buffer_event_type(buf);
*subtype = event_type == ODP_EVENT_PACKET ?
- packet_subtype(odp_packet_from_event(event)) :
+ odp_packet_subtype(odp_packet_from_event(event)) :
ODP_EVENT_NO_SUBTYPE;
return event_type;
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index ae63ef4a..356ba5e6 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -51,7 +51,8 @@ const _odp_packet_inline_offset_t ODP_ALIGNED_CACHE _odp_packet_inline = {
.flow_hash = offsetof(odp_packet_hdr_t, flow_hash),
.timestamp = offsetof(odp_packet_hdr_t, timestamp),
.input_flags = offsetof(odp_packet_hdr_t, p.input_flags),
- .flags = offsetof(odp_packet_hdr_t, p.flags)
+ .flags = offsetof(odp_packet_hdr_t, p.flags),
+ .subtype = offsetof(odp_packet_hdr_t, subtype)
};
diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c
index e01dd458..206f43f6 100644
--- a/platform/linux-generic/pktio/loop.c
+++ b/platform/linux-generic/pktio/loop.c
@@ -319,7 +319,7 @@ static int loopback_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED,
for (i = 0; i < nb_tx; ++i) {
odp_ipsec_packet_result_t result;
- if (packet_subtype(pkt_tbl[i]) ==
+ if (odp_packet_subtype(pkt_tbl[i]) ==
ODP_EVENT_PACKET_IPSEC &&
pktio_entry->s.config.outbound_ipsec) {
commit e49af8a47be1f267a9d0a50066f9b7ba2f8bd774
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Aug 9 10:59:25 2018 +0300
api: packet: add subtype call
This call is useful when packet subtype needs to be checked sometime
after an event has been converted into a packet. The first
application stage (receiving and converting events) does not have to
record packet subtype for following application stages that process
only packets, not events.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h
index 66665e12..78e519ac 100644
--- a/include/odp/api/spec/packet.h
+++ b/include/odp/api/spec/packet.h
@@ -224,6 +224,19 @@ typedef enum odp_packet_chksum_status_t {
} odp_packet_chksum_status_t;
+/**
+ * Event subtype of a packet
+ *
+ * Returns the subtype of a packet event. Subtype tells if the packet contains
+ * only basic metadata (ODP_EVENT_PACKET_BASIC) or in addition to that some
+ * specific metadata (e.g. ODP_EVENT_PACKET_CRYPTO or ODP_EVENT_PACKET_IPSEC).
+ *
+ * @param packet Packet handle
+ *
+ * @return Packet subtype
+ */
+odp_event_subtype_t odp_packet_subtype(odp_packet_t packet);
+
/*
*
* Alloc and free
commit e06d1f6cfb34e13b6a3bc81220f07c1207c04248
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Thu Aug 9 13:28:48 2018 +0300
api: classifier: rename ODP_PMR_INVAL to ODP_PMR_INVALID
Deprecates ODP_PMR_INVAL.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c
index 26ad67ee..22dae395 100644
--- a/example/classifier/odp_classifier.c
+++ b/example/classifier/odp_classifier.c
@@ -453,7 +453,7 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args)
stats->pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos,
stats->cos);
- if (stats->pmr == ODP_PMR_INVAL) {
+ if (stats->pmr == ODP_PMR_INVALID) {
EXAMPLE_ERR("odp_pktio_pmr_cos failed");
exit(EXIT_FAILURE);
}
diff --git a/include/odp/api/abi-default/classification.h b/include/odp/api/abi-default/classification.h
index ef102731..e0573fd4 100644
--- a/include/odp/api/abi-default/classification.h
+++ b/include/odp/api/abi-default/classification.h
@@ -11,6 +11,8 @@
extern "C" {
#endif
+#include <odp/api/deprecated.h>
+
/** @internal Dummy type for strong typing */
typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_cos_t;
@@ -25,7 +27,15 @@ typedef _odp_abi_cos_t *odp_cos_t;
typedef _odp_abi_pmr_t *odp_pmr_t;
#define ODP_COS_INVALID ((odp_cos_t)0)
-#define ODP_PMR_INVAL ((odp_pmr_t)0)
+#define ODP_PMR_INVALID ((odp_pmr_t)0)
+
+#if ODP_DEPRECATED_API
+#define ODP_PMR_INVAL ODP_PMR_INVALID
+#else
+/* Required to prevent Doxygen warning */
+#define ODP_PMR_INVAL
+#undef ODP_PMR_INVAL
+#endif
#define ODP_COS_NAME_LEN 32
diff --git a/include/odp/api/spec/classification.h b/include/odp/api/spec/classification.h
index 38389301..043059fa 100644
--- a/include/odp/api/spec/classification.h
+++ b/include/odp/api/spec/classification.h
@@ -44,12 +44,17 @@ extern "C" {
*/
/**
- * @def ODP_PMR_INVAL
+ * @def ODP_PMR_INVALID
* Invalid odp_pmr_t value.
* This value is returned from odp_cls_pmr_create()
* function on failure.
*/
+/**
+ * @def ODP_PMR_INVAL
+ * @deprecated Use ODP_PMR_INVALID instead
+ */
+
/**
* Supported PMR term values
*
@@ -558,7 +563,7 @@ void odp_cls_pmr_param_init(odp_pmr_param_t *param);
* @param dst_cos destination CoS handle
*
* @return Handle to the Packet Match Rule.
- * @retval ODP_PMR_INVAL on failure
+ * @retval ODP_PMR_INVALID on failure
*/
odp_pmr_t odp_cls_pmr_create(const odp_pmr_param_t *terms, int num_terms,
odp_cos_t src_cos, odp_cos_t dst_cos);
diff --git a/platform/linux-generic/include-abi/odp/api/abi/classification.h b/platform/linux-generic/include-abi/odp/api/abi/classification.h
index 92b926cd..843e15f6 100644
--- a/platform/linux-generic/include-abi/odp/api/abi/classification.h
+++ b/platform/linux-generic/include-abi/odp/api/abi/classification.h
@@ -18,6 +18,7 @@ extern "C" {
#endif
#include <odp/api/plat/strong_types.h>
+#include <odp/api/deprecated.h>
/** @ingroup odp_classification
* @{
@@ -27,7 +28,15 @@ typedef ODP_HANDLE_T(odp_cos_t);
#define ODP_COS_INVALID _odp_cast_scalar(odp_cos_t, 0)
typedef ODP_HANDLE_T(odp_pmr_t);
-#define ODP_PMR_INVAL _odp_cast_scalar(odp_pmr_t, 0)
+#define ODP_PMR_INVALID _odp_cast_scalar(odp_pmr_t, 0)
+
+#if ODP_DEPRECATED_API
+#define ODP_PMR_INVAL ODP_PMR_INVALID
+#else
+/* Required to prevent Doxygen warning */
+#define ODP_PMR_INVAL
+#undef ODP_PMR_INVAL
+#endif
#define ODP_COS_NAME_LEN 32
diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c
index c7007fb7..e3f1cc6e 100644
--- a/platform/linux-generic/odp_classification.c
+++ b/platform/linux-generic/odp_classification.c
@@ -287,7 +287,7 @@ odp_pmr_t alloc_pmr(pmr_t **pmr)
UNLOCK(&pmr_tbl->pmr[i].s.lock);
}
ODP_ERR("CLS_PMR_MAX_ENTRY reached");
- return ODP_PMR_INVAL;
+ return ODP_PMR_INVALID;
}
static
@@ -307,7 +307,8 @@ pmr_t *get_pmr_entry(odp_pmr_t pmr)
{
uint32_t pmr_id = _odp_pmr_to_ndx(pmr);
- if (pmr_id >= CLS_PMR_MAX_ENTRY || pmr == ODP_PMR_INVAL)
+ if (pmr_id >= CLS_PMR_MAX_ENTRY ||
+ pmr == ODP_PMR_INVALID)
return NULL;
if (pmr_tbl->pmr[pmr_id].s.valid == 0)
return NULL;
@@ -652,20 +653,20 @@ odp_pmr_t odp_cls_pmr_create(const odp_pmr_param_t *terms, int num_terms,
if (NULL == cos_src || NULL == cos_dst) {
ODP_ERR("Invalid input handle");
- return ODP_PMR_INVAL;
+ return ODP_PMR_INVALID;
}
if (num_terms > CLS_PMRTERM_MAX) {
ODP_ERR("no of terms greater than supported CLS_PMRTERM_MAX");
- return ODP_PMR_INVAL;
+ return ODP_PMR_INVALID;
}
if (CLS_PMR_PER_COS_MAX == odp_atomic_load_u32(&cos_src->s.num_rule))
- return ODP_PMR_INVAL;
+ return ODP_PMR_INVALID;
id = alloc_pmr(&pmr);
/*if alloc_pmr is successful it returns with the acquired lock*/
- if (id == ODP_PMR_INVAL)
+ if (id == ODP_PMR_INVALID)
return id;
pmr->s.num_pmr = num_terms;
@@ -673,12 +674,12 @@ odp_pmr_t odp_cls_pmr_create(const odp_pmr_param_t *terms, int num_terms,
val_sz = terms[i].val_sz;
if (val_sz > CLS_PMR_TERM_BYTES_MAX) {
pmr->s.valid = 0;
- return ODP_PMR_INVAL;
+ return ODP_PMR_INVALID;
}
if (0 > odp_pmr_create_term(&pmr->s.pmr_term_value[i],
&terms[i])) {
UNLOCK(&pmr->s.lock);
- return ODP_PMR_INVAL;
+ return ODP_PMR_INVALID;
}
}
diff --git a/test/validation/api/classification/odp_classification_basic.c b/test/validation/api/classification/odp_classification_basic.c
index 31067345..8a4e21d3 100644
--- a/test/validation/api/classification/odp_classification_basic.c
+++ b/test/validation/api/classification/odp_classification_basic.c
@@ -119,14 +119,14 @@ static void classification_test_create_pmr_match(void)
pmr_param.val_sz = sizeof(val);
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT(pmr != ODP_PMR_INVAL);
- CU_ASSERT(odp_pmr_to_u64(pmr) != odp_pmr_to_u64(ODP_PMR_INVAL));
+ CU_ASSERT(pmr != ODP_PMR_INVALID);
+ CU_ASSERT(odp_pmr_to_u64(pmr) != odp_pmr_to_u64(ODP_PMR_INVALID));
/* destroy the created PMR */
retval = odp_cls_pmr_destroy(pmr);
CU_ASSERT(retval == 0);
/* destroy an INVALID PMR */
- retval = odp_cls_pmr_destroy(ODP_PMR_INVAL);
+ retval = odp_cls_pmr_destroy(ODP_PMR_INVALID);
CU_ASSERT(retval < 0);
odp_queue_destroy(queue);
@@ -309,7 +309,7 @@ static void classification_test_pmr_composite_create(void)
pmr_composite = odp_cls_pmr_create(pmr_terms, PMR_SET_NUM,
default_cos, cos);
CU_ASSERT(odp_pmr_to_u64(pmr_composite) !=
- odp_pmr_to_u64(ODP_PMR_INVAL));
+ odp_pmr_to_u64(ODP_PMR_INVALID));
retval = odp_cls_pmr_destroy(pmr_composite);
CU_ASSERT(retval == 0);
diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c
index 4b90d783..55a86f5b 100644
--- a/test/validation/api/classification/odp_classification_test_pmr.c
+++ b/test/validation/api/classification/odp_classification_test_pmr.c
@@ -146,7 +146,7 @@ static void classification_test_pktin_classifier_flag(void)
pmr_param.val_sz = sizeof(val);
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT(pmr != ODP_PMR_INVAL);
+ CU_ASSERT(pmr != ODP_PMR_INVALID);
pkt = create_packet(default_pkt_info);
CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
@@ -240,7 +240,7 @@ static void _classification_test_pmr_term_tcp_dport(int num_pkt)
pmr_param.val_sz = sizeof(val);
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT(pmr != ODP_PMR_INVAL);
+ CU_ASSERT(pmr != ODP_PMR_INVALID);
for (i = 0; i < num_pkt; i++) {
pkt = create_packet(default_pkt_info);
@@ -412,7 +412,7 @@ static void classification_test_pmr_term_tcp_sport(void)
pmr_param.val_sz = sizeof(val);
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT(pmr != ODP_PMR_INVAL);
+ CU_ASSERT(pmr != ODP_PMR_INVALID);
pkt = create_packet(default_pkt_info);
CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
@@ -525,7 +525,7 @@ static void classification_test_pmr_term_udp_dport(void)
pmr_param.val_sz = sizeof(val);
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT(pmr != ODP_PMR_INVAL);
+ CU_ASSERT(pmr != ODP_PMR_INVALID);
pkt_info = default_pkt_info;
pkt_info.udp = true;
@@ -641,7 +641,7 @@ static void classification_test_pmr_term_udp_sport(void)
pmr_param.val_sz = sizeof(val);
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT(pmr != ODP_PMR_INVAL);
+ CU_ASSERT(pmr != ODP_PMR_INVALID);
pkt_info = default_pkt_info;
pkt_info.udp = true;
@@ -755,7 +755,7 @@ static void classification_test_pmr_term_ipproto(void)
pmr_param.val_sz = sizeof(val);
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT(pmr != ODP_PMR_INVAL);
+ CU_ASSERT(pmr != ODP_PMR_INVALID);
pkt_info = default_pkt_info;
pkt_info.udp = true;
@@ -864,7 +864,7 @@ static void classification_test_pmr_term_dmac(void)
pmr_param.val_sz = ODPH_ETHADDR_LEN;
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT(pmr != ODP_PMR_INVAL);
+ CU_ASSERT(pmr != ODP_PMR_INVALID);
pkt_info = default_pkt_info;
pkt_info.udp = true;
@@ -971,7 +971,7 @@ static void classification_test_pmr_term_packet_len(void)
pmr_param.val_sz = sizeof(val);
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT(pmr != ODP_PMR_INVAL);
+ CU_ASSERT(pmr != ODP_PMR_INVALID);
/* create packet of payload length 1024 */
pkt_info = default_pkt_info;
@@ -1083,7 +1083,7 @@ static void classification_test_pmr_term_vlan_id_0(void)
pmr_param.val_sz = sizeof(val);
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT(pmr != ODP_PMR_INVAL);
+ CU_ASSERT(pmr != ODP_PMR_INVALID);
/* create packet of payload length 1024 */
pkt_info = default_pkt_info;
@@ -1196,7 +1196,7 @@ static void classification_test_pmr_term_vlan_id_x(void)
pmr_param.val_sz = sizeof(val);
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT(pmr != ODP_PMR_INVAL);
+ CU_ASSERT(pmr != ODP_PMR_INVALID);
/* create packet of payload length 1024 */
pkt_info = default_pkt_info;
@@ -1309,7 +1309,7 @@ static void classification_test_pmr_term_eth_type_0(void)
pmr_param.val_sz = sizeof(val);
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT(pmr != ODP_PMR_INVAL);
+ CU_ASSERT(pmr != ODP_PMR_INVALID);
pkt_info = default_pkt_info;
pkt_info.vlan = true;
@@ -1419,7 +1419,7 @@ static void classification_test_pmr_term_eth_type_x(void)
pmr_param.val_sz = sizeof(val);
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT(pmr != ODP_PMR_INVAL);
+ CU_ASSERT(pmr != ODP_PMR_INVALID);
/* create packet of payload length 1024 */
pkt_info = default_pkt_info;
@@ -1539,7 +1539,7 @@ static void classification_test_pmr_pool_set(void)
pmr_param.val_sz = sizeof(val);
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT(pmr != ODP_PMR_INVAL);
+ CU_ASSERT(pmr != ODP_PMR_INVALID);
pkt_info = default_pkt_info;
pkt_info.udp = true;
@@ -1638,7 +1638,7 @@ static void classification_test_pmr_queue_set(void)
pmr_param.val_sz = sizeof(val);
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT(pmr != ODP_PMR_INVAL);
+ CU_ASSERT(pmr != ODP_PMR_INVALID);
pkt_info = default_pkt_info;
pkt_info.udp = true;
pkt = create_packet(pkt_info);
@@ -1724,7 +1724,7 @@ static void classification_test_pmr_term_daddr(void)
pmr_param.val_sz = sizeof(addr);
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT_FATAL(pmr != ODP_PMR_INVAL);
+ CU_ASSERT_FATAL(pmr != ODP_PMR_INVALID);
/* packet with dst ip address matching PMR rule to be
received in the CoS queue*/
@@ -1834,7 +1834,7 @@ static void classification_test_pmr_term_ipv6daddr(void)
pmr_param.val_sz = ODPH_IPV6ADDR_LEN;
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT_FATAL(pmr != ODP_PMR_INVAL);
+ CU_ASSERT_FATAL(pmr != ODP_PMR_INVALID);
/* packet with dst ip address matching PMR rule to be
received in the CoS queue*/
@@ -1944,7 +1944,7 @@ static void classification_test_pmr_term_ipv6saddr(void)
pmr_param.val_sz = ODPH_IPV6ADDR_LEN;
pmr = odp_cls_pmr_create(&pmr_param, 1, default_cos, cos);
- CU_ASSERT_FATAL(pmr != ODP_PMR_INVAL);
+ CU_ASSERT_FATAL(pmr != ODP_PMR_INVALID);
/* packet with dst ip address matching PMR rule to be
received in the CoS queue*/
diff --git a/test/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c
index 42d0c412..3b9e0276 100644
--- a/test/validation/api/classification/odp_classification_tests.c
+++ b/test/validation/api/classification/odp_classification_tests.c
@@ -79,7 +79,7 @@ int classification_suite_init(void)
cos_list[i] = ODP_COS_INVALID;
for (i = 0; i < CLS_ENTRIES; i++)
- pmr_list[i] = ODP_PMR_INVAL;
+ pmr_list[i] = ODP_PMR_INVALID;
for (i = 0; i < CLS_ENTRIES; i++)
queue_list[i] = ODP_QUEUE_INVALID;
@@ -211,7 +211,7 @@ void configure_cls_pmr_chain(void)
pmr_list[CLS_PMR_CHAIN_SRC] =
odp_cls_pmr_create(&pmr_param, 1, cos_list[CLS_DEFAULT],
cos_list[CLS_PMR_CHAIN_SRC]);
- CU_ASSERT_FATAL(pmr_list[CLS_PMR_CHAIN_SRC] != ODP_PMR_INVAL);
+ CU_ASSERT_FATAL(pmr_list[CLS_PMR_CHAIN_SRC] != ODP_PMR_INVALID);
val = CLS_PMR_CHAIN_PORT;
maskport = 0xffff;
@@ -223,7 +223,7 @@ void configure_cls_pmr_chain(void)
pmr_list[CLS_PMR_CHAIN_DST] =
odp_cls_pmr_create(&pmr_param, 1, cos_list[CLS_PMR_CHAIN_SRC],
cos_list[CLS_PMR_CHAIN_DST]);
- CU_ASSERT_FATAL(pmr_list[CLS_PMR_CHAIN_DST] != ODP_PMR_INVAL);
+ CU_ASSERT_FATAL(pmr_list[CLS_PMR_CHAIN_DST] != ODP_PMR_INVALID);
}
void test_cls_pmr_chain(void)
@@ -569,7 +569,7 @@ void configure_pmr_cos(void)
pmr_list[CLS_PMR] = odp_cls_pmr_create(&pmr_param, 1,
cos_list[CLS_DEFAULT],
cos_list[CLS_PMR]);
- CU_ASSERT_FATAL(pmr_list[CLS_PMR] != ODP_PMR_INVAL);
+ CU_ASSERT_FATAL(pmr_list[CLS_PMR] != ODP_PMR_INVALID);
}
void test_pmr_cos(void)
@@ -652,7 +652,7 @@ void configure_pktio_pmr_composite(void)
pmr_list[CLS_PMR_SET] = odp_cls_pmr_create(pmr_params, num_terms,
cos_list[CLS_DEFAULT],
cos_list[CLS_PMR_SET]);
- CU_ASSERT_FATAL(pmr_list[CLS_PMR_SET] != ODP_PMR_INVAL);
+ CU_ASSERT_FATAL(pmr_list[CLS_PMR_SET] != ODP_PMR_INVALID);
}
void test_pktio_pmr_composite_cos(void)
commit 97bb0f3801f2f1692a12e24d9aa4fadf0b8ce477
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Aug 10 13:49:20 2018 +0300
abi: timer: use strong type for odp_timer_pool_t
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/abi-default/timer.h b/include/odp/api/abi-default/timer.h
index a7da8ff7..566d199e 100644
--- a/include/odp/api/abi-default/timer.h
+++ b/include/odp/api/abi-default/timer.h
@@ -23,13 +23,14 @@ typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_timer_t;
/** @internal Dummy type for strong typing */
typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_timeout_t;
+/** @internal Dummy type for strong typing */
+typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_timer_pool_t;
+
/** @addtogroup odp_timer
* @{
**/
-struct timer_pool_s; /**< Forward declaration */
-
-typedef struct timer_pool_s *odp_timer_pool_t;
+typedef _odp_abi_timer_pool_t *odp_timer_pool_t;
#define ODP_TIMER_POOL_INVALID ((odp_timer_pool_t)0)
diff --git a/platform/linux-generic/include-abi/odp/api/abi/timer.h b/platform/linux-generic/include-abi/odp/api/abi/timer.h
index 48138f72..c08da1ce 100644
--- a/platform/linux-generic/include-abi/odp/api/abi/timer.h
+++ b/platform/linux-generic/include-abi/odp/api/abi/timer.h
@@ -24,9 +24,7 @@ extern "C" {
* @{
**/
-struct timer_pool_s; /**< Forward declaration */
-
-typedef struct timer_pool_s *odp_timer_pool_t;
+typedef ODP_HANDLE_T(odp_timer_pool_t);
#define ODP_TIMER_POOL_INVALID _odp_cast_scalar(odp_timer_pool_t, 0)
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index 7e2848c7..3fb50a91 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -224,6 +224,16 @@ typedef struct timer_global_t {
static timer_global_t *timer_global;
+static inline timer_pool_t *timer_pool_from_hdl(odp_timer_pool_t hdl)
+{
+ return (timer_pool_t *)(uintptr_t)hdl;
+}
+
+static inline odp_timer_pool_t timer_pool_to_hdl(timer_pool_t *tp)
+{
+ return (odp_timer_pool_t)tp;
+}
+
static inline timer_pool_t *handle_to_tp(odp_timer_t hdl)
{
uint32_t tp_idx = _odp_typeval(hdl) >> INDEX_BITS;
@@ -315,8 +325,10 @@ static odp_timer_pool_t timer_pool_new(const char *name,
}
tp->shm = shm;
tp->param = *param;
- tp->min_rel_tck = odp_timer_ns_to_tick(tp, param->min_tmo);
- tp->max_rel_tck = odp_timer_ns_to_tick(tp, param->max_tmo);
+ tp->min_rel_tck = odp_timer_ns_to_tick(timer_pool_to_hdl(tp),
+ param->min_tmo);
+ tp->max_rel_tck = odp_timer_ns_to_tick(timer_pool_to_hdl(tp),
+ param->max_tmo);
tp->num_alloc = 0;
odp_atomic_init_u32(&tp->high_wm, 0);
tp->first_free = 0;
@@ -349,7 +361,7 @@ static odp_timer_pool_t timer_pool_new(const char *name,
if (tp->param.clk_src == ODP_CLOCK_CPU)
itimer_init(tp);
}
- return tp;
+ return timer_pool_to_hdl(tp);
}
static void block_sigalarm(void)
@@ -798,13 +810,14 @@ static unsigned timer_expire(timer_pool_t *tp, uint32_t idx, uint64_t tick)
static unsigned odp_timer_pool_expire(odp_timer_pool_t tpid, uint64_t tick)
{
- tick_buf_t *array = &tpid->tick_buf[0];
- uint32_t high_wm = _odp_atomic_u32_load_mm(&tpid->high_wm,
+ timer_pool_t *tp = timer_pool_from_hdl(tpid);
+ tick_buf_t *array = &tp->tick_buf[0];
+ uint32_t high_wm = _odp_atomic_u32_load_mm(&tp->high_wm,
_ODP_MEMMODEL_ACQ);
unsigned nexp = 0;
uint32_t i;
- ODP_ASSERT(high_wm <= tpid->param.num_timers);
+ ODP_ASSERT(high_wm <= tp->param.num_timers);
for (i = 0; i < high_wm;) {
/* As a rare occurrence, we can outsmart the HW prefetcher
* and the compiler (GCC -fprefetch-loop-arrays) with some
@@ -815,7 +828,7 @@ static unsigned odp_timer_pool_expire(odp_timer_pool_t tpid, uint64_t tick)
uint64_t exp_tck = array[i++].exp_tck.v;
if (odp_unlikely(exp_tck <= tick)) {
/* Attempt to expire timer */
- nexp += timer_expire(tpid, i - 1, tick);
+ nexp += timer_expire(tp, i - 1, tick);
}
}
return nexp;
@@ -863,7 +876,8 @@ static unsigned process_timer_pools(void)
nticks - 1, tp->name);
tp->notify_overrun = 0;
}
- nexp += odp_timer_pool_expire(tp, tp_tick + nticks);
+ nexp += odp_timer_pool_expire(timer_pool_to_hdl(tp),
+ tp_tick + nticks);
}
}
return nexp;
@@ -924,7 +938,7 @@ static void timer_notify(timer_pool_t *tp)
prev_tick = odp_atomic_fetch_inc_u64(&tp->cur_tick);
/* Scan timer array, looking for timers to expire */
- (void)odp_timer_pool_expire(tp, prev_tick + 1);
+ (void)odp_timer_pool_expire(timer_pool_to_hdl(tp), prev_tick + 1);
/* Else skip scan of timers. cur_tick was updated and next itimer
* invocation will process older expiration ticks as well */
@@ -1140,32 +1154,40 @@ void odp_timer_pool_start(void)
void odp_timer_pool_destroy(odp_timer_pool_t tpid)
{
- odp_timer_pool_del(tpid);
+ odp_timer_pool_del(timer_pool_from_hdl(tpid));
}
uint64_t odp_timer_tick_to_ns(odp_timer_pool_t tpid, uint64_t ticks)
{
- return ticks * tpid->param.res_ns;
+ timer_pool_t *tp = timer_pool_from_hdl(tpid);
+
+ return ticks * tp->param.res_ns;
}
uint64_t odp_timer_ns_to_tick(odp_timer_pool_t tpid, uint64_t ns)
{
- return (uint64_t)(ns / tpid->param.res_ns);
+ timer_pool_t *tp = timer_pool_from_hdl(tpid);
+
+ return (uint64_t)(ns / tp->param.res_ns);
}
uint64_t odp_timer_current_tick(odp_timer_pool_t tpid)
{
+ timer_pool_t *tp = timer_pool_from_hdl(tpid);
+
/* Relaxed atomic read for lowest overhead */
- return odp_atomic_load_u64(&tpid->cur_tick);
+ return odp_atomic_load_u64(&tp->cur_tick);
}
int odp_timer_pool_info(odp_timer_pool_t tpid,
odp_timer_pool_info_t *buf)
{
- buf->param = tpid->param;
- buf->cur_timers = tpid->num_alloc;
- buf->hwm_timers = odp_atomic_load_u32(&tpid->high_wm);
- buf->name = tpid->name;
+ timer_pool_t *tp = timer_pool_from_hdl(tpid);
+
+ buf->param = tp->param;
+ buf->cur_timers = tp->num_alloc;
+ buf->hwm_timers = odp_atomic_load_u32(&tp->high_wm);
+ buf->name = tp->name;
return 0;
}
@@ -1178,18 +1200,20 @@ odp_timer_t odp_timer_alloc(odp_timer_pool_t tpid,
odp_queue_t queue,
void *user_ptr)
{
+ timer_pool_t *tp = timer_pool_from_hdl(tpid);
+
if (odp_unlikely(tpid == ODP_TIMER_POOL_INVALID)) {
ODP_ERR("Invalid timer pool.\n");
return ODP_TIMER_INVALID;
}
if (odp_unlikely(queue == ODP_QUEUE_INVALID)) {
- ODP_ERR("%s: Invalid queue handle\n", tpid->name);
+ ODP_ERR("%s: Invalid queue handle\n", tp->name);
return ODP_TIMER_INVALID;
}
/* We don't care about the validity of user_ptr because we will not
* attempt to dereference it */
- return timer_alloc(tpid, queue, user_ptr);
+ return timer_alloc(tp, queue, user_ptr);
}
odp_event_t odp_timer_free(odp_timer_t hdl)
commit 62782960967bd58553139d6b20f91a5849a2c288
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Thu Aug 9 11:19:28 2018 +0300
api: shm: remove unused ODP_SHM_NULL define
ODP_SHM_INVALID should be used instead.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/abi-default/shared_memory.h b/include/odp/api/abi-default/shared_memory.h
index 888e140b..fdc93ea1 100644
--- a/include/odp/api/abi-default/shared_memory.h
+++ b/include/odp/api/abi-default/shared_memory.h
@@ -21,7 +21,6 @@ typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_shm_t;
typedef _odp_abi_shm_t *odp_shm_t;
#define ODP_SHM_INVALID ((odp_shm_t)0)
-#define ODP_SHM_NULL ODP_SHM_INVALID
#define ODP_SHM_NAME_LEN 32
/**
diff --git a/include/odp/api/spec/shared_memory.h b/include/odp/api/spec/shared_memory.h
index 898f4123..c18275cb 100644
--- a/include/odp/api/spec/shared_memory.h
+++ b/include/odp/api/spec/shared_memory.h
@@ -35,11 +35,6 @@ extern "C" {
* Invalid shared memory block
*/
-/**
- * @def ODP_SHM_NULL
- * Synonym for buffer pool use
- */
-
/**
* @def ODP_SHM_NAME_LEN
* Maximum shared memory block name length in chars including null char
diff --git a/platform/linux-generic/include-abi/odp/api/abi/shared_memory.h b/platform/linux-generic/include-abi/odp/api/abi/shared_memory.h
index 4e6d4805..648bd1ee 100644
--- a/platform/linux-generic/include-abi/odp/api/abi/shared_memory.h
+++ b/platform/linux-generic/include-abi/odp/api/abi/shared_memory.h
@@ -28,7 +28,6 @@ extern "C" {
typedef ODP_HANDLE_T(odp_shm_t);
#define ODP_SHM_INVALID _odp_cast_scalar(odp_shm_t, 0)
-#define ODP_SHM_NULL ODP_SHM_INVALID
#define ODP_SHM_NAME_LEN 32
commit e6a9fa3c8d910fcc0f31cf5f3334addf3246d482
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Dec 26 01:27:07 2017 +0300
validation: crypto: 3GPP crypto algorightms support
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index 8c73f49e..29563552 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -61,6 +61,12 @@ static const char *auth_alg_name(odp_auth_alg_t auth)
return "ODP_AUTH_ALG_AES_CMAC";
case ODP_AUTH_ALG_CHACHA20_POLY1305:
return "ODP_AUTH_ALG_CHACHA20_POLY1305";
+ case ODP_AUTH_ALG_KASUMI_F9:
+ return "ODP_AUTH_ALG_KASUMI_F9";
+ case ODP_AUTH_ALG_SNOW3G_UIA2:
+ return "ODP_AUTH_ALG_SNOW3G_UIA2";
+ case ODP_AUTH_ALG_ZUC_EIA3:
+ return "ODP_AUTH_ALG_ZUC_EIA3";
default:
return "Unknown";
}
@@ -85,6 +91,12 @@ static const char *cipher_alg_name(odp_cipher_alg_t cipher)
return "ODP_CIPHER_ALG_AES_CCM";
case ODP_CIPHER_ALG_CHACHA20_POLY1305:
return "ODP_CIPHER_ALG_CHACHA20_POLY1305";
+ case ODP_CIPHER_ALG_KASUMI_F8:
+ return "ODP_CIPHER_ALG_KASUMI_F8";
+ case ODP_CIPHER_ALG_SNOW3G_UEA2:
+ return "ODP_CIPHER_ALG_SNOW3G_UEA2";
+ case ODP_CIPHER_ALG_ZUC_EEA3:
+ return "ODP_CIPHER_ALG_ZUC_EEA3";
default:
return "Unknown";
}
@@ -507,6 +519,15 @@ static void check_alg(odp_crypto_op_t op,
if (cipher_alg == ODP_CIPHER_ALG_CHACHA20_POLY1305 &&
!(capa.ciphers.bit.chacha20_poly1305))
rc = -1;
+ if (cipher_alg == ODP_CIPHER_ALG_KASUMI_F8 &&
+ !(capa.ciphers.bit.kasumi_f8))
+ rc = -1;
+ if (cipher_alg == ODP_CIPHER_ALG_SNOW3G_UEA2 &&
+ !(capa.ciphers.bit.snow3g_uea2))
+ rc = -1;
+ if (cipher_alg == ODP_CIPHER_ALG_ZUC_EEA3 &&
+ !(capa.ciphers.bit.zuc_eea3))
+ rc = -1;
if (cipher_alg == ODP_CIPHER_ALG_DES &&
!(capa.ciphers.bit.des))
rc = -1;
@@ -532,6 +553,15 @@ static void check_alg(odp_crypto_op_t op,
if (auth_alg == ODP_AUTH_ALG_CHACHA20_POLY1305 &&
!(capa.auths.bit.chacha20_poly1305))
rc = -1;
+ if (auth_alg == ODP_AUTH_ALG_KASUMI_F9 &&
+ !(capa.auths.bit.kasumi_f9))
+ rc = -1;
+ if (auth_alg == ODP_AUTH_ALG_SNOW3G_UIA2 &&
+ !(capa.auths.bit.snow3g_uia2))
+ rc = -1;
+ if (auth_alg == ODP_AUTH_ALG_ZUC_EIA3 &&
+ !(capa.auths.bit.zuc_eia3))
+ rc = -1;
if (auth_alg == ODP_AUTH_ALG_MD5_HMAC &&
!(capa.auths.bit.md5_hmac))
rc = -1;
@@ -712,6 +742,18 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth)
if (!capability.ciphers.bit.chacha20_poly1305)
return ODP_TEST_INACTIVE;
break;
+ case ODP_CIPHER_ALG_KASUMI_F8:
+ if (!capability.ciphers.bit.kasumi_f8)
+ return ODP_TEST_INACTIVE;
+ break;
+ case ODP_CIPHER_ALG_SNOW3G_UEA2:
+ if (!capability.ciphers.bit.snow3g_uea2)
+ return ODP_TEST_INACTIVE;
+ break;
+ case ODP_CIPHER_ALG_ZUC_EEA3:
+ if (!capability.ciphers.bit.zuc_eea3)
+ return ODP_TEST_INACTIVE;
+ break;
default:
fprintf(stderr, "Unsupported cipher algorithm\n");
return ODP_TEST_INACTIVE;
@@ -767,6 +809,18 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth)
if (!capability.auths.bit.chacha20_poly1305)
return ODP_TEST_INACTIVE;
break;
+ case ODP_AUTH_ALG_KASUMI_F9:
+ if (!capability.auths.bit.kasumi_f9)
+ return ODP_TEST_INACTIVE;
+ break;
+ case ODP_AUTH_ALG_SNOW3G_UIA2:
+ if (!capability.auths.bit.snow3g_uia2)
+ return ODP_TEST_INACTIVE;
+ break;
+ case ODP_AUTH_ALG_ZUC_EIA3:
+ if (!capability.auths.bit.zuc_eia3)
+ return ODP_TEST_INACTIVE;
+ break;
default:
fprintf(stderr, "Unsupported authentication algorithm\n");
return ODP_TEST_INACTIVE;
@@ -1167,6 +1221,153 @@ static void crypto_test_dec_alg_aes_ctr_ovr_iv(void)
false);
}
+static int check_alg_kasumi_f8(void)
+{
+ return check_alg_support(ODP_CIPHER_ALG_KASUMI_F8, ODP_AUTH_ALG_NULL);
+}
+
+static void crypto_test_enc_alg_kasumi_f8(void)
+{
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_KASUMI_F8,
+ ODP_AUTH_ALG_NULL,
+ kasumi_f8_reference,
+ ARRAY_SIZE(kasumi_f8_reference),
+ false,
+ true);
+}
+
+static void crypto_test_enc_alg_kasumi_f8_ovr_iv(void)
+{
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_KASUMI_F8,
+ ODP_AUTH_ALG_NULL,
+ kasumi_f8_reference,
+ ARRAY_SIZE(kasumi_f8_reference),
+ true,
+ true);
+}
+
+static void crypto_test_dec_alg_kasumi_f8(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_KASUMI_F8,
+ ODP_AUTH_ALG_NULL,
+ kasumi_f8_reference,
+ ARRAY_SIZE(kasumi_f8_reference),
+ false,
+ true);
+}
+
+static void crypto_test_dec_alg_kasumi_f8_ovr_iv(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_KASUMI_F8,
+ ODP_AUTH_ALG_NULL,
+ kasumi_f8_reference,
+ ARRAY_SIZE(kasumi_f8_reference),
+ true,
+ true);
+}
+
+static int check_alg_snow3g_uea2(void)
+{
+ return check_alg_support(ODP_CIPHER_ALG_SNOW3G_UEA2, ODP_AUTH_ALG_NULL);
+}
+
+static void crypto_test_enc_alg_snow3g_uea2(void)
+{
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_SNOW3G_UEA2,
+ ODP_AUTH_ALG_NULL,
+ snow3g_uea2_reference,
+ ARRAY_SIZE(snow3g_uea2_reference),
+ false,
+ true);
+}
+
+static void crypto_test_enc_alg_snow3g_uea2_ovr_iv(void)
+{
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_SNOW3G_UEA2,
+ ODP_AUTH_ALG_NULL,
+ snow3g_uea2_reference,
+ ARRAY_SIZE(snow3g_uea2_reference),
+ true,
+ true);
+}
+
+static void crypto_test_dec_alg_snow3g_uea2(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_SNOW3G_UEA2,
+ ODP_AUTH_ALG_NULL,
+ snow3g_uea2_reference,
+ ARRAY_SIZE(snow3g_uea2_reference),
+ false,
+ true);
+}
+
+static void crypto_test_dec_alg_snow3g_uea2_ovr_iv(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_SNOW3G_UEA2,
+ ODP_AUTH_ALG_NULL,
+ snow3g_uea2_reference,
+ ARRAY_SIZE(snow3g_uea2_reference),
+ true,
+ true);
+}
+
+static int check_alg_zuc_eea3(void)
+{
+ return check_alg_support(ODP_CIPHER_ALG_ZUC_EEA3, ODP_AUTH_ALG_NULL);
+}
+
+static void crypto_test_enc_alg_zuc_eea3(void)
+{
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_ZUC_EEA3,
+ ODP_AUTH_ALG_NULL,
+ zuc_eea3_reference,
+ ARRAY_SIZE(zuc_eea3_reference),
+ false,
+ true);
+}
+
+static void crypto_test_enc_alg_zuc_eea3_ovr_iv(void)
+{
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_ZUC_EEA3,
+ ODP_AUTH_ALG_NULL,
+ zuc_eea3_reference,
+ ARRAY_SIZE(zuc_eea3_reference),
+ true,
+ true);
+}
+
+static void crypto_test_dec_alg_zuc_eea3(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_ZUC_EEA3,
+ ODP_AUTH_ALG_NULL,
+ zuc_eea3_reference,
+ ARRAY_SIZE(zuc_eea3_reference),
+ false,
+ true);
+}
+
+static void crypto_test_dec_alg_zuc_eea3_ovr_iv(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_ZUC_EEA3,
+ ODP_AUTH_ALG_NULL,
+ zuc_eea3_reference,
+ ARRAY_SIZE(zuc_eea3_reference),
+ true,
+ true);
+}
+
static int check_alg_hmac_md5(void)
{
return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_MD5_HMAC);
@@ -1448,6 +1649,153 @@ static void crypto_test_check_alg_aes_cmac(void)
false);
}
+static int check_alg_kasumi_f9(void)
+{
+ return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_KASUMI_F9);
+}
+
+static void crypto_test_gen_alg_kasumi_f9(void)
+{
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_KASUMI_F9,
+ kasumi_f9_reference,
+ ARRAY_SIZE(kasumi_f9_reference),
+ false,
+ true);
+}
+
+static void crypto_test_gen_alg_kasumi_f9_ovr_iv(void)
+{
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_KASUMI_F9,
+ kasumi_f9_reference,
+ ARRAY_SIZE(kasumi_f9_reference),
+ true,
+ true);
+}
+
+static void crypto_test_check_alg_kasumi_f9(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_KASUMI_F9,
+ kasumi_f9_reference,
+ ARRAY_SIZE(kasumi_f9_reference),
+ false,
+ true);
+}
+
+static void crypto_test_check_alg_kasumi_f9_ovr_iv(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_KASUMI_F9,
+ kasumi_f9_reference,
+ ARRAY_SIZE(kasumi_f9_reference),
+ true,
+ true);
+}
+
+static int check_alg_snow3g_uia2(void)
+{
+ return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_SNOW3G_UIA2);
+}
+
+static void crypto_test_gen_alg_snow3g_uia2(void)
+{
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_SNOW3G_UIA2,
+ snow3g_uia2_reference,
+ ARRAY_SIZE(snow3g_uia2_reference),
+ false,
+ true);
+}
+
+static void crypto_test_gen_alg_snow3g_uia2_ovr_iv(void)
+{
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_SNOW3G_UIA2,
+ snow3g_uia2_reference,
+ ARRAY_SIZE(snow3g_uia2_reference),
+ true,
+ true);
+}
+
+static void crypto_test_check_alg_snow3g_uia2(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_SNOW3G_UIA2,
+ snow3g_uia2_reference,
+ ARRAY_SIZE(snow3g_uia2_reference),
+ false,
+ true);
+}
+
+static void crypto_test_check_alg_snow3g_uia2_ovr_iv(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_SNOW3G_UIA2,
+ snow3g_uia2_reference,
+ ARRAY_SIZE(snow3g_uia2_reference),
+ true,
+ true);
+}
+
+static int check_alg_zuc_eia3(void)
+{
+ return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_ZUC_EIA3);
+}
+
+static void crypto_test_gen_alg_zuc_eia3(void)
+{
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_ZUC_EIA3,
+ zuc_eia3_reference,
+ ARRAY_SIZE(zuc_eia3_reference),
+ false,
+ true);
+}
+
+static void crypto_test_gen_alg_zuc_eia3_ovr_iv(void)
+{
+ check_alg(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_ZUC_EIA3,
+ zuc_eia3_reference,
+ ARRAY_SIZE(zuc_eia3_reference),
+ true,
+ true);
+}
+
+static void crypto_test_check_alg_zuc_eia3(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_ZUC_EIA3,
+ zuc_eia3_reference,
+ ARRAY_SIZE(zuc_eia3_reference),
+ false,
+ true);
+}
+
+static void crypto_test_check_alg_zuc_eia3_ovr_iv(void)
+{
+ check_alg(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_NULL,
+ ODP_AUTH_ALG_ZUC_EIA3,
+ zuc_eia3_reference,
+ ARRAY_SIZE(zuc_eia3_reference),
+ true,
+ true);
+}
+
static int crypto_suite_sync_init(void)
{
suite_context.pool = odp_pool_lookup("packet_pool");
@@ -1529,6 +1877,30 @@ odp_testinfo_t crypto_suite[] = {
check_alg_aes_ctr),
ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ctr_ovr_iv,
check_alg_aes_ctr),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_kasumi_f8,
+ check_alg_kasumi_f8),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_kasumi_f8,
+ check_alg_kasumi_f8),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_kasumi_f8_ovr_iv,
+ check_alg_kasumi_f8),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_kasumi_f8_ovr_iv,
+ check_alg_kasumi_f8),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_snow3g_uea2,
+ check_alg_snow3g_uea2),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_snow3g_uea2,
+ check_alg_snow3g_uea2),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_snow3g_uea2_ovr_iv,
+ check_alg_snow3g_uea2),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_snow3g_uea2_ovr_iv,
+ check_alg_snow3g_uea2),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_zuc_eea3,
+ check_alg_zuc_eea3),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_zuc_eea3,
+ check_alg_zuc_eea3),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_zuc_eea3_ovr_iv,
+ check_alg_zuc_eea3),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_zuc_eea3_ovr_iv,
+ check_alg_zuc_eea3),
ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_gcm,
check_alg_aes_gcm),
ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_gcm_ovr_iv,
@@ -1589,6 +1961,30 @@ odp_testinfo_t crypto_suite[] = {
check_alg_aes_cmac),
ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_aes_cmac,
check_alg_aes_cmac),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_kasumi_f9,
+ check_alg_kasumi_f9),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_kasumi_f9,
+ check_alg_kasumi_f9),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_kasumi_f9_ovr_iv,
+ check_alg_kasumi_f9),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_kasumi_f9_ovr_iv,
+ check_alg_kasumi_f9),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_snow3g_uia2,
+ check_alg_snow3g_uia2),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_snow3g_uia2,
+ check_alg_snow3g_uia2),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_snow3g_uia2_ovr_iv,
+ check_alg_snow3g_uia2),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_snow3g_uia2_ovr_iv,
+ check_alg_snow3g_uia2),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_zuc_eia3,
+ check_alg_zuc_eia3),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_zuc_eia3,
+ check_alg_zuc_eia3),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_zuc_eia3_ovr_iv,
+ check_alg_zuc_eia3),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_zuc_eia3_ovr_iv,
+ check_alg_zuc_eia3),
ODP_TEST_INFO_NULL,
};
diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h
index 9adb4332..3e40d708 100644
--- a/test/validation/api/crypto/test_vectors.h
+++ b/test/validation/api/crypto/test_vectors.h
@@ -1534,4 +1534,186 @@ static crypto_test_reference_t aes_xcbc_reference[] = {
}
};
+/*
+ * Kasumi F8 and F9 test vectors are taken from
+ * 3GPP TS 35.203 V9.0.0 (2009-12)
+ * 3rd Generation Partnership Project;
+ * Technical Specification Group Services and System Aspects;
+ * 3G Security;
+ * Specification of the 3GPP Confidentiality
+ * and Integrity Algorithms;
+ * Document 3: Implementors' Test Data
+ * (Release 9)
+ */
+static crypto_test_reference_t kasumi_f8_reference[] = {
+ {
+ .cipher_key_length = KASUMI_F8_KEY_LEN,
+ .cipher_key = { 0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20,
+ 0x4e, 0xa5, 0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+ .cipher_iv_length = KASUMI_F8_IV_LEN,
+ .cipher_iv = { 0xfa, 0x55, 0x6b, 0x26, 0x1c, 0x00, 0x00, 0x00},
+ .length = 120, /* 15 bytes */
+ .plaintext = { 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+ 0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8 },
+ .ciphertext = { 0x9b, 0xc9, 0x2c, 0xa8, 0x03, 0xc6, 0x7b, 0x28,
+ 0xa1, 0x1a, 0x4b, 0xee, 0x5a, 0x0c, 0x25 }
+ }
+};
+
+static crypto_test_reference_t kasumi_f9_reference[] = {
+ {
+ .auth_key_length = KASUMI_F9_KEY_LEN,
+ .auth_key = { 0xc7, 0x36, 0xc6, 0xaa, 0xb2, 0x2b, 0xff, 0xf9,
+ 0x1e, 0x26, 0x98, 0xd2, 0xe2, 0x2a, 0xd5, 0x7e },
+ .auth_iv_length = KASUMI_F9_IV_LEN,
+ .auth_iv = { 0x14, 0x79, 0x3e, 0x41, 0x03, 0x97, 0xe8, 0xfd,
+ 0x01, },
+ .length = 384, /* 48 bytes */
+ .plaintext = { 0xd0, 0xa7, 0xd4, 0x63, 0xdf, 0x9f, 0xb2, 0xb2,
+ 0x78, 0x83, 0x3f, 0xa0, 0x2e, 0x23, 0x5a, 0xa1,
+ 0x72, 0xbd, 0x97, 0x0c, 0x14, 0x73, 0xe1, 0x29,
+ 0x07, 0xfb, 0x64, 0x8b, 0x65, 0x99, 0xaa, 0xa0,
+ 0xb2, 0x4a, 0x03, 0x86, 0x65, 0x42, 0x2b, 0x20,
+ 0xa4, 0x99, 0x27, 0x6a, 0x50, 0x42, 0x70, 0x09},
+ .ciphertext = { 0xd0, 0xa7, 0xd4, 0x63, 0xdf, 0x9f, 0xb2, 0xb2,
+ 0x78, 0x83, 0x3f, 0xa0, 0x2e, 0x23, 0x5a, 0xa1,
+ 0x72, 0xbd, 0x97, 0x0c, 0x14, 0x73, 0xe1, 0x29,
+ 0x07, 0xfb, 0x64, 0x8b, 0x65, 0x99, 0xaa, 0xa0,
+ 0xb2, 0x4a, 0x03, 0x86, 0x65, 0x42, 0x2b, 0x20,
+ 0xa4, 0x99, 0x27, 0x6a, 0x50, 0x42, 0x70, 0x09},
+ .digest_length = KASUMI_F9_DIGEST_LEN,
+ .digest = { 0xdd, 0x7d, 0xfa, 0xdd },
+ }
+};
+
+/*
+ * Snow3G UEA2 & UIA2 test vectors are taken from
+ * Specification of the 3GPP Confidentiality and
+ * Integrity Algorithms UEA2 & UIA2
+ * Document 3: Implementors’ Test Data
+ * Version: 1.1
+ * Date: 25 th October 2012
+ */
+static crypto_test_reference_t snow3g_uea2_reference[] = {
+ {
+ .cipher_key_length = SNOW3G_UEA2_KEY_LEN,
+ .cipher_key = { 0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20,
+ 0x4e, 0xa5, 0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+ .cipher_iv_length = SNOW3G_UEA2_IV_LEN,
+ .cipher_iv = { 0xfa, 0x55, 0x6b, 0x26, 0x1c, 0x00, 0x00, 0x00,
+ 0xfa, 0x55, 0x6b, 0x26, 0x1c, 0x00, 0x00, 0x00},
+ .length = 120, /* 15 bytes */
+ .plaintext = { 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+ 0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8 },
+ .ciphertext = { 0xba, 0x0f, 0x31, 0x30, 0x03, 0x34, 0xc5, 0x6b,
+ 0x52, 0xa7, 0x49, 0x7c, 0xba, 0xc0, 0x46 }
+ }
+};
+
+static crypto_test_reference_t snow3g_uia2_reference[] = {
+ {
+ .auth_key_length = SNOW3G_UIA2_KEY_LEN,
+ .auth_key = { 0xc7, 0x36, 0xc6, 0xaa, 0xb2, 0x2b, 0xff, 0xf9,
+ 0x1e, 0x26, 0x98, 0xd2, 0xe2, 0x2a, 0xd5, 0x7e},
+ .auth_iv_length = SNOW3G_UIA2_IV_LEN,
+ .auth_iv = { 0x14, 0x79, 0x3e, 0x41, 0x03, 0x97, 0xe8, 0xfd,
+ 0x94, 0x79, 0x3e, 0x41, 0x03, 0x97, 0x68, 0xfd },
+ .length = 384, /* 48 bytes */
+ .plaintext = { 0xd0, 0xa7, 0xd4, 0x63, 0xdf, 0x9f, 0xb2, 0xb2,
+ 0x78, 0x83, 0x3f, 0xa0, 0x2e, 0x23, 0x5a, 0xa1,
+ 0x72, 0xbd, 0x97, 0x0c, 0x14, 0x73, 0xe1, 0x29,
+ 0x07, 0xfb, 0x64, 0x8b, 0x65, 0x99, 0xaa, 0xa0,
+ 0xb2, 0x4a, 0x03, 0x86, 0x65, 0x42, 0x2b, 0x20,
+ 0xa4, 0x99, 0x27, 0x6a, 0x50, 0x42, 0x70, 0x09},
+ .ciphertext = { 0xd0, 0xa7, 0xd4, 0x63, 0xdf, 0x9f, 0xb2, 0xb2,
+ 0x78, 0x83, 0x3f, 0xa0, 0x2e, 0x23, 0x5a, 0xa1,
+ 0x72, 0xbd, 0x97, 0x0c, 0x14, 0x73, 0xe1, 0x29,
+ 0x07, 0xfb, 0x64, 0x8b, 0x65, 0x99, 0xaa, 0xa0,
+ 0xb2, 0x4a, 0x03, 0x86, 0x65, 0x42, 0x2b, 0x20,
+ 0xa4, 0x99, 0x27, 0x6a, 0x50, 0x42, 0x70, 0x09},
+ .digest_length = SNOW3G_UIA2_DIGEST_LEN,
+ .digest = { 0x38, 0xb5, 0x54, 0xc0 }
+ }
+};
+
+/*
+ * ZUC EEA3 and EIA3 test vectors from
+ * Specification of the 3GPP Confidentiality and Integrity
+ * Algorithms 128-EEA3 & 128-EIA3
+ * Document 3: Implementor’s Test Data
+ * Version: 1.1
+ * Date: 4 th Jan. 2011
+ */
+static crypto_test_reference_t zuc_eea3_reference[] = {
+ {
+ .cipher_key_length = ZUC_EIA3_KEY_LEN,
+ .cipher_key = { 0xe5, 0xbd, 0x3e, 0xa0, 0xeb, 0x55, 0xad, 0xe8,
+ 0x66, 0xc6, 0xac, 0x58, 0xbd, 0x54, 0x30, 0x2a},
+ .cipher_iv_length = ZUC_EEA3_IV_LEN,
+ .cipher_iv = { 0x00, 0x05, 0x68, 0x23, 0xc4, 0x00, 0x00, 0x00,
+ 0x00, 0x05, 0x68, 0x23, 0xc4, 0x00, 0x00, 0x00 },
+ .length = 800, /* 100 bytes */
+ .plaintext = { 0x14, 0xa8, 0xef, 0x69, 0x3d, 0x67, 0x85, 0x07,
+ 0xbb, 0xe7, 0x27, 0x0a, 0x7f, 0x67, 0xff, 0x50,
+ 0x06, 0xc3, 0x52, 0x5b, 0x98, 0x07, 0xe4, 0x67,
+ 0xc4, 0xe5, 0x60, 0x00, 0xba, 0x33, 0x8f, 0x5d,
+ 0x42, 0x95, 0x59, 0x03, 0x67, 0x51, 0x82, 0x22,
+ 0x46, 0xc8, 0x0d, 0x3b, 0x38, 0xf0, 0x7f, 0x4b,
+ 0xe2, 0xd8, 0xff, 0x58, 0x05, 0xf5, 0x13, 0x22,
+ 0x29, 0xbd, 0xe9, 0x3b, 0xbb, 0xdc, 0xaf, 0x38,
+ 0x2b, 0xf1, 0xee, 0x97, 0x2f, 0xbf, 0x99, 0x77,
+ 0xba, 0xda, 0x89, 0x45, 0x84, 0x7a, 0x2a, 0x6c,
+ 0x9a, 0xd3, 0x4a, 0x66, 0x75, 0x54, 0xe0, 0x4d,
+ 0x1f, 0x7f, 0xa2, 0xc3, 0x32, 0x41, 0xbd, 0x8f,
+ 0x01, 0xba, 0x22, 0x0d },
+ .ciphertext = { 0x13, 0x1d, 0x43, 0xe0, 0xde, 0xa1, 0xbe, 0x5c,
+ 0x5a, 0x1b, 0xfd, 0x97, 0x1d, 0x85, 0x2c, 0xbf,
+ 0x71, 0x2d, 0x7b, 0x4f, 0x57, 0x96, 0x1f, 0xea,
+ 0x32, 0x08, 0xaf, 0xa8, 0xbc, 0xa4, 0x33, 0xf4,
+ 0x56, 0xad, 0x09, 0xc7, 0x41, 0x7e, 0x58, 0xbc,
+ 0x69, 0xcf, 0x88, 0x66, 0xd1, 0x35, 0x3f, 0x74,
+ 0x86, 0x5e, 0x80, 0x78, 0x1d, 0x20, 0x2d, 0xfb,
+ 0x3e, 0xcf, 0xf7, 0xfc, 0xbc, 0x3b, 0x19, 0x0f,
+ 0xe8, 0x2a, 0x20, 0x4e, 0xd0, 0xe3, 0x50, 0xfc,
+ 0x0f, 0x6f, 0x26, 0x13, 0xb2, 0xf2, 0xbc, 0xa6,
+ 0xdf, 0x5a, 0x47, 0x3a, 0x57, 0xa4, 0xa0, 0x0d,
+ 0x98, 0x5e, 0xba, 0xd8, 0x80, 0xd6, 0xf2, 0x38,
+ 0x64, 0xa0, 0x7b, 0x01 }
+ }
+};
+
+static crypto_test_reference_t zuc_eia3_reference[] = {
+ {
+ .auth_key_length = ZUC_EIA3_KEY_LEN,
+ .auth_key = { 0xc9, 0xe6, 0xce, 0xc4, 0x60, 0x7c, 0x72, 0xdb,
+ 0x00, 0x0a, 0xef, 0xa8, 0x83, 0x85, 0xab, 0x0a },
+ .auth_iv_length = ZUC_EIA3_IV_LEN,
+ .auth_iv = { 0xa9, 0x40, 0x59, 0xda, 0x50, 0x00, 0x00, 0x00,
+ 0x29, 0x40, 0x59, 0xda, 0x50, 0x00, 0x80, 0x00 },
+ .length = 584, /* 73 bytes */
+ .plaintext = { 0x98, 0x3b, 0x41, 0xd4, 0x7d, 0x78, 0x0c, 0x9e,
+ 0x1a, 0xd1, 0x1d, 0x7e, 0xb7, 0x03, 0x91, 0xb1,
+ 0xde, 0x0b, 0x35, 0xda, 0x2d, 0xc6, 0x2f, 0x83,
+ 0xe7, 0xb7, 0x8d, 0x63, 0x06, 0xca, 0x0e, 0xa0,
+ 0x7e, 0x94, 0x1b, 0x7b, 0xe9, 0x13, 0x48, 0xf9,
+ 0xfc, 0xb1, 0x70, 0xe2, 0x21, 0x7f, 0xec, 0xd9,
+ 0x7f, 0x9f, 0x68, 0xad, 0xb1, 0x6e, 0x5d, 0x7d,
+ 0x21, 0xe5, 0x69, 0xd2, 0x80, 0xed, 0x77, 0x5c,
+ 0xeb, 0xde, 0x3f, 0x40, 0x93, 0xc5, 0x38, 0x81,
+ 0x00, 0x00, 0x00, 0x00 },
+ .ciphertext = { 0x98, 0x3b, 0x41, 0xd4, 0x7d, 0x78, 0x0c, 0x9e,
+ 0x1a, 0xd1, 0x1d, 0x7e, 0xb7, 0x03, 0x91, 0xb1,
+ 0xde, 0x0b, 0x35, 0xda, 0x2d, 0xc6, 0x2f, 0x83,
+ 0xe7, 0xb7, 0x8d, 0x63, 0x06, 0xca, 0x0e, 0xa0,
+ 0x7e, 0x94, 0x1b, 0x7b, 0xe9, 0x13, 0x48, 0xf9,
+ 0xfc, 0xb1, 0x70, 0xe2, 0x21, 0x7f, 0xec, 0xd9,
+ 0x7f, 0x9f, 0x68, 0xad, 0xb1, 0x6e, 0x5d, 0x7d,
+ 0x21, 0xe5, 0x69, 0xd2, 0x80, 0xed, 0x77, 0x5c,
+ 0xeb, 0xde, 0x3f, 0x40, 0x93, 0xc5, 0x38, 0x81,
+ 0x00, 0x00, 0x00, 0x00 },
+ .digest_length = ZUC_EIA3_DIGEST_LEN,
+ .digest = { 0x24, 0xa8, 0x42, 0xb3 }
+ }
+};
+
#endif
diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h
index 95d202b6..3418ef27 100644
--- a/test/validation/api/crypto/test_vectors_len.h
+++ b/test/validation/api/crypto/test_vectors_len.h
@@ -70,4 +70,31 @@
#define AES_XCBC_MAC_96_CHECK_LEN 12
#define AES_XCBC_MAC_CHECK_LEN 16
+/* KASUMI_F8 */
+#define KASUMI_F8_KEY_LEN 16
+#define KASUMI_F8_IV_LEN 8
+
+/* SNOW3G_UEA2 */
+#define SNOW3G_UEA2_KEY_LEN 16
+#define SNOW3G_UEA2_IV_LEN 16
+
+/* ZUC_EEA3 */
+#define ZUC_EEA3_KEY_LEN 16
+#define ZUC_EEA3_IV_LEN 16
+
+/* KASUMI_F9 */
+#define KASUMI_F9_KEY_LEN 16
+#define KASUMI_F9_IV_LEN 9
+#define KASUMI_F9_DIGEST_LEN 4
+
+/* SNOW3G_UIA2 */
+#define SNOW3G_UIA2_KEY_LEN 16
+#define SNOW3G_UIA2_IV_LEN 16
+#define SNOW3G_UIA2_DIGEST_LEN 4
+
+/* ZUC_EIA3 */
+#define ZUC_EIA3_KEY_LEN 16
+#define ZUC_EIA3_IV_LEN 16
+#define ZUC_EIA3_DIGEST_LEN 4
+
#endif
commit bfc48dbed3d58f7f3325cd0a05445f2ab537c38e
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Mon Jul 16 15:34:54 2018 +0300
validation: crypto: add support for bit mode algorithm testing
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index 361e6ac9..8c73f49e 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -320,13 +320,15 @@ static void alg_test(odp_crypto_op_t op,
odp_cipher_alg_t cipher_alg,
odp_auth_alg_t auth_alg,
crypto_test_reference_t *ref,
- odp_bool_t ovr_iv)
+ odp_bool_t ovr_iv,
+ odp_bool_t bit_mode)
{
odp_crypto_session_t session;
int rc;
odp_crypto_ses_create_err_t status;
odp_bool_t ok = false;
int iteration;
+ uint32_t reflength;
odp_crypto_session_param_t ses_params;
odp_packet_data_range_t cipher_range;
odp_packet_data_range_t auth_range;
@@ -375,9 +377,14 @@ static void alg_test(odp_crypto_op_t op,
auth_range.offset = 0;
auth_range.length = ref->length;
+ if (bit_mode)
+ reflength = (ref->length + 7) / 8;
+ else
+ reflength = ref->length;
+
/* Prepare input data */
odp_packet_t pkt = odp_packet_alloc(suite_context.pool,
- ref->length + ref->digest_length);
+ reflength + ref->digest_length);
CU_ASSERT(pkt != ODP_PACKET_INVALID);
if (pkt == ODP_PACKET_INVALID)
goto cleanup;
@@ -391,18 +398,18 @@ static void alg_test(odp_crypto_op_t op,
continue;
if (op == ODP_CRYPTO_OP_ENCODE) {
- odp_packet_copy_from_mem(pkt, 0, ref->length,
+ odp_packet_copy_from_mem(pkt, 0, reflength,
ref->plaintext);
} else {
- odp_packet_copy_from_mem(pkt, 0, ref->length,
+ odp_packet_copy_from_mem(pkt, 0, reflength,
ref->ciphertext);
- odp_packet_copy_from_mem(pkt, ref->length,
+ odp_packet_copy_from_mem(pkt, reflength,
ref->digest_length,
ref->digest);
if (iteration == WRONG_DIGEST_TEST) {
uint8_t byte = ~ref->digest[0];
- odp_packet_copy_from_mem(pkt, ref->length,
+ odp_packet_copy_from_mem(pkt, reflength,
1, &byte);
}
}
@@ -412,19 +419,19 @@ static void alg_test(odp_crypto_op_t op,
ovr_iv ? ref->cipher_iv : NULL,
ovr_iv ? ref->auth_iv : NULL,
&cipher_range, &auth_range,
- ref->aad, ref->length);
+ ref->aad, reflength);
else if (ODP_CRYPTO_ASYNC == suite_context.op_mode)
rc = alg_packet_op_enq(pkt, &ok, session,
ovr_iv ? ref->cipher_iv : NULL,
ovr_iv ? ref->auth_iv : NULL,
&cipher_range, &auth_range,
- ref->aad, ref->length);
+ ref->aad, reflength);
else
rc = alg_packet_op(pkt, &ok, session,
ovr_iv ? ref->cipher_iv : NULL,
ovr_iv ? ref->auth_iv : NULL,
&cipher_range, &auth_range,
- ref->aad, ref->length);
+ ref->aad, reflength);
if (rc < 0)
break;
@@ -438,14 +445,14 @@ static void alg_test(odp_crypto_op_t op,
if (op == ODP_CRYPTO_OP_ENCODE) {
CU_ASSERT(!packet_cmp_mem(pkt, 0,
ref->ciphertext,
- ref->length));
- CU_ASSERT(!packet_cmp_mem(pkt, ref->length,
+ reflength));
+ CU_ASSERT(!packet_cmp_mem(pkt, reflength,
ref->digest,
ref->digest_length));
} else {
CU_ASSERT(!packet_cmp_mem(pkt, 0,
ref->plaintext,
- ref->length));
+ reflength));
}
}
@@ -461,7 +468,8 @@ static void check_alg(odp_crypto_op_t op,
odp_auth_alg_t auth_alg,
crypto_test_reference_t *ref,
size_t count,
- odp_bool_t ovr_iv)
+ odp_bool_t ovr_iv,
+ odp_bool_t bit_mode)
{
odp_crypto_capability_t capa;
int rc, i;
@@ -565,7 +573,9 @@ static void check_alg(odp_crypto_op_t op,
if (cipher_capa[i].key_len ==
ref[idx].cipher_key_length &&
cipher_capa[i].iv_len ==
- ref[idx].cipher_iv_length) {
+ ref[idx].cipher_iv_length &&
+ cipher_capa[i].bit_mode ==
+ bit_mode) {
cipher_idx = i;
break;
}
@@ -573,10 +583,11 @@ static void check_alg(odp_crypto_op_t op,
if (cipher_idx < 0) {
printf("\n Unsupported: alg=%s, key_len=%" PRIu32
- ", iv_len=%" PRIu32 "\n",
+ ", iv_len=%" PRIu32 "%s\n",
cipher_alg_name(cipher_alg),
ref[idx].cipher_key_length,
- ref[idx].cipher_iv_length);
+ ref[idx].cipher_iv_length,
+ bit_mode ? " using bits" : "");
continue;
}
@@ -586,7 +597,9 @@ static void check_alg(odp_crypto_op_t op,
auth_capa[i].iv_len ==
ref[idx].auth_iv_length &&
auth_capa[i].key_len ==
- ref[idx].auth_key_length) {
+ ref[idx].auth_key_length &&
+ auth_capa[i].bit_mode ==
+ bit_mode) {
auth_idx = i;
break;
}
@@ -594,15 +607,17 @@ static void check_alg(odp_crypto_op_t op,
if (auth_idx < 0) {
printf("\n Unsupported: alg=%s, key_len=%" PRIu32
- ", iv_len=%" PRIu32 ", digest_len=%" PRIu32 "\n",
+ ", iv_len=%" PRIu32 ", digest_len=%" PRIu32
+ "%s\n",
auth_alg_name(auth_alg),
ref[idx].auth_key_length,
ref[idx].auth_iv_length,
- ref[idx].digest_length);
+ ref[idx].digest_length,
+ bit_mode ? " using bits" : "");
continue;
}
- alg_test(op, cipher_alg, auth_alg, &ref[idx], ovr_iv);
+ alg_test(op, cipher_alg, auth_alg, &ref[idx], ovr_iv, bit_mode);
cipher_tested[cipher_idx] = true;
auth_tested[auth_idx] = true;
@@ -610,23 +625,24 @@ static void check_alg(odp_crypto_op_t op,
for (i = 0; i < cipher_num; i++) {
cipher_ok |= cipher_tested[i];
- if (!cipher_tested[i]) {
+ if (!cipher_tested[i] && cipher_capa[i].bit_mode == bit_mode)
printf("\n Untested: alg=%s, key_len=%" PRIu32 ", "
- "iv_len=%" PRIu32 "\n",
+ "iv_len=%" PRIu32 "%s\n",
cipher_alg_name(cipher_alg),
cipher_capa[i].key_len,
- cipher_capa[i].iv_len);
- }
+ cipher_capa[i].iv_len,
+ cipher_capa[i].bit_mode ? " using bits" : "");
}
for (i = 0; i < auth_num; i++) {
auth_ok |= auth_tested[i];
- if (!auth_tested[i])
+ if (!auth_tested[i] && auth_capa[i].bit_mode == bit_mode)
printf("\n Untested: alg=%s, key_len=%" PRIu32 ", "
- "digest_len=%" PRIu32 "\n",
+ "digest_len=%" PRIu32 "%s\n",
auth_alg_name(auth_alg),
auth_capa[i].key_len,
- auth_capa[i].digest_len);
+ auth_capa[i].digest_len,
+ auth_capa[i].bit_mode ? " using bits" : "");
}
/* Verify that we were able to run at least several tests */
@@ -772,6 +788,7 @@ static void crypto_test_enc_alg_null(void)
ODP_AUTH_ALG_NULL,
null_reference,
ARRAY_SIZE(null_reference),
+ false,
false);
}
@@ -782,6 +799,7 @@ static void crypto_test_dec_alg_null(void)
ODP_AUTH_ALG_NULL,
null_reference,
ARRAY_SIZE(null_reference),
+ false,
false);
}
@@ -801,6 +819,7 @@ static void crypto_test_enc_alg_3des_cbc(void)
ODP_AUTH_ALG_NULL,
tdes_cbc_reference,
ARRAY_SIZE(tdes_cbc_reference),
+ false,
false);
}
@@ -814,7 +833,8 @@ static void crypto_test_enc_alg_3des_cbc_ovr_iv(void)
ODP_AUTH_ALG_NULL,
tdes_cbc_reference,
ARRAY_SIZE(tdes_cbc_reference),
- true);
+ true,
+ false);
}
/* This test verifies the correctness of decode (ciphertext -> plaintext)
@@ -829,6 +849,7 @@ static void crypto_test_dec_alg_3des_cbc(void)
ODP_AUTH_ALG_NULL,
tdes_cbc_reference,
ARRAY_SIZE(tdes_cbc_reference),
+ false,
false);
}
@@ -844,7 +865,8 @@ static void crypto_test_dec_alg_3des_cbc_ovr_iv(void)
ODP_AUTH_ALG_NULL,
tdes_cbc_reference,
ARRAY_SIZE(tdes_cbc_reference),
- true);
+ true,
+ false);
}
static int check_alg_chacha20_poly1305(void)
@@ -860,6 +882,7 @@ static void crypto_test_enc_alg_chacha20_poly1305(void)
ODP_AUTH_ALG_CHACHA20_POLY1305,
chacha20_poly1305_reference,
ARRAY_SIZE(chacha20_poly1305_reference),
+ false,
false);
}
@@ -870,7 +893,8 @@ static void crypto_test_enc_alg_chacha20_poly1305_ovr_iv(void)
ODP_AUTH_ALG_CHACHA20_POLY1305,
chacha20_poly1305_reference,
ARRAY_SIZE(chacha20_poly1305_reference),
- true);
+ true,
+ false);
}
static void crypto_test_dec_alg_chacha20_poly1305(void)
@@ -880,6 +904,7 @@ static void crypto_test_dec_alg_chacha20_poly1305(void)
ODP_AUTH_ALG_CHACHA20_POLY1305,
chacha20_poly1305_reference,
ARRAY_SIZE(chacha20_poly1305_reference),
+ false,
false);
}
@@ -890,7 +915,8 @@ static void crypto_test_dec_alg_chacha20_poly1305_ovr_iv(void)
ODP_AUTH_ALG_CHACHA20_POLY1305,
chacha20_poly1305_reference,
ARRAY_SIZE(chacha20_poly1305_reference),
- true);
+ true,
+ false);
}
static int check_alg_aes_gcm(void)
@@ -909,6 +935,7 @@ static void crypto_test_enc_alg_aes_gcm(void)
ODP_AUTH_ALG_AES_GCM,
aes_gcm_reference,
ARRAY_SIZE(aes_gcm_reference),
+ false,
false);
}
@@ -923,7 +950,8 @@ static void crypto_test_enc_alg_aes_gcm_ovr_iv(void)
ODP_AUTH_ALG_AES_GCM,
aes_gcm_reference,
ARRAY_SIZE(aes_gcm_reference),
- true);
+ true,
+ false);
}
/* This test verifies the correctness of decode (ciphertext -> plaintext)
@@ -938,6 +966,7 @@ static void crypto_test_dec_alg_aes_gcm(void)
ODP_AUTH_ALG_AES_GCM,
aes_gcm_reference,
ARRAY_SIZE(aes_gcm_reference),
+ false,
false);
}
@@ -953,7 +982,8 @@ static void crypto_test_dec_alg_aes_gcm_ovr_iv(void)
ODP_AUTH_ALG_AES_GCM,
aes_gcm_reference,
ARRAY_SIZE(aes_gcm_reference),
- true);
+ true,
+ false);
}
static int check_alg_aes_ccm(void)
@@ -968,6 +998,7 @@ static void crypto_test_enc_alg_aes_ccm(void)
ODP_AUTH_ALG_AES_CCM,
aes_ccm_reference,
ARRAY_SIZE(aes_ccm_reference),
+ false,
false);
}
@@ -978,7 +1009,8 @@ static void crypto_test_enc_alg_aes_ccm_ovr_iv(void)
ODP_AUTH_ALG_AES_CCM,
aes_ccm_reference,
ARRAY_SIZE(aes_ccm_reference),
- true);
+ true,
+ false);
}
static void crypto_test_dec_alg_aes_ccm(void)
@@ -988,6 +1020,7 @@ static void crypto_test_dec_alg_aes_ccm(void)
ODP_AUTH_ALG_AES_CCM,
aes_ccm_reference,
ARRAY_SIZE(aes_ccm_reference),
+ false,
false);
}
@@ -998,7 +1031,8 @@ static void crypto_test_dec_alg_aes_ccm_ovr_iv(void)
ODP_AUTH_ALG_AES_CCM,
aes_ccm_reference,
ARRAY_SIZE(aes_ccm_reference),
- true);
+ true,
+ false);
}
static int check_alg_aes_cbc(void)
@@ -1017,6 +1051,7 @@ static void crypto_test_enc_alg_aes_cbc(void)
ODP_AUTH_ALG_NULL,
aes_cbc_reference,
ARRAY_SIZE(aes_cbc_reference),
+ false,
false);
}
@@ -1030,7 +1065,8 @@ static void crypto_test_enc_alg_aes_cbc_ovr_iv(void)
ODP_AUTH_ALG_NULL,
aes_cbc_reference,
ARRAY_SIZE(aes_cbc_reference),
- true);
+ true,
+ false);
}
/* This test verifies the correctness of decode (ciphertext -> plaintext)
@@ -1045,6 +1081,7 @@ static void crypto_test_dec_alg_aes_cbc(void)
ODP_AUTH_ALG_NULL,
aes_cbc_reference,
ARRAY_SIZE(aes_cbc_reference),
+ false,
false);
}
@@ -1060,7 +1097,8 @@ static void crypto_test_dec_alg_aes_cbc_ovr_iv(void)
ODP_AUTH_ALG_NULL,
aes_cbc_reference,
ARRAY_SIZE(aes_cbc_reference),
- true);
+ true,
+ false);
}
static int check_alg_aes_ctr(void)
@@ -1079,6 +1117,7 @@ static void crypto_test_enc_alg_aes_ctr(void)
ODP_AUTH_ALG_NULL,
aes_ctr_reference,
ARRAY_SIZE(aes_ctr_reference),
+ false,
false);
}
@@ -1092,7 +1131,8 @@ static void crypto_test_enc_alg_aes_ctr_ovr_iv(void)
ODP_AUTH_ALG_NULL,
aes_ctr_reference,
ARRAY_SIZE(aes_ctr_reference),
- true);
+ true,
+ false);
}
/* This test verifies the correctness of decode (ciphertext -> plaintext)
@@ -1107,6 +1147,7 @@ static void crypto_test_dec_alg_aes_ctr(void)
ODP_AUTH_ALG_NULL,
aes_ctr_reference,
ARRAY_SIZE(aes_ctr_reference),
+ false,
false);
}
@@ -1122,7 +1163,8 @@ static void crypto_test_dec_alg_aes_ctr_ovr_iv(void)
ODP_AUTH_ALG_NULL,
aes_ctr_reference,
ARRAY_SIZE(aes_ctr_reference),
- true);
+ true,
+ false);
}
static int check_alg_hmac_md5(void)
@@ -1144,6 +1186,7 @@ static void crypto_test_gen_alg_hmac_md5(void)
ODP_AUTH_ALG_MD5_HMAC,
hmac_md5_reference,
ARRAY_SIZE(hmac_md5_reference),
+ false,
false);
}
@@ -1154,6 +1197,7 @@ static void crypto_test_check_alg_hmac_md5(void)
ODP_AUTH_ALG_MD5_HMAC,
hmac_md5_reference,
ARRAY_SIZE(hmac_md5_reference),
+ false,
false);
}
@@ -1176,6 +1220,7 @@ static void crypto_test_gen_alg_hmac_sha1(void)
ODP_AUTH_ALG_SHA1_HMAC,
hmac_sha1_reference,
ARRAY_SIZE(hmac_sha1_reference),
+ false,
false);
}
@@ -1186,6 +1231,7 @@ static void crypto_test_check_alg_hmac_sha1(void)
ODP_AUTH_ALG_SHA1_HMAC,
hmac_sha1_reference,
ARRAY_SIZE(hmac_sha1_reference),
+ false,
false);
}
@@ -1208,6 +1254,7 @@ static void crypto_test_gen_alg_hmac_sha256(void)
ODP_AUTH_ALG_SHA256_HMAC,
hmac_sha256_reference,
ARRAY_SIZE(hmac_sha256_reference),
+ false,
false);
}
@@ -1218,6 +1265,7 @@ static void crypto_test_check_alg_hmac_sha256(void)
ODP_AUTH_ALG_SHA256_HMAC,
hmac_sha256_reference,
ARRAY_SIZE(hmac_sha256_reference),
+ false,
false);
}
@@ -1240,6 +1288,7 @@ static void crypto_test_gen_alg_hmac_sha384(void)
ODP_AUTH_ALG_SHA384_HMAC,
hmac_sha384_reference,
ARRAY_SIZE(hmac_sha384_reference),
+ false,
false);
}
@@ -1250,6 +1299,7 @@ static void crypto_test_check_alg_hmac_sha384(void)
ODP_AUTH_ALG_SHA384_HMAC,
hmac_sha384_reference,
ARRAY_SIZE(hmac_sha384_reference),
+ false,
false);
}
@@ -1272,6 +1322,7 @@ static void crypto_test_gen_alg_hmac_sha512(void)
ODP_AUTH_ALG_SHA512_HMAC,
hmac_sha512_reference,
ARRAY_SIZE(hmac_sha512_reference),
+ false,
false);
}
@@ -1282,6 +1333,7 @@ static void crypto_test_check_alg_hmac_sha512(void)
ODP_AUTH_ALG_SHA512_HMAC,
hmac_sha512_reference,
ARRAY_SIZE(hmac_sha512_reference),
+ false,
false);
}
@@ -1305,6 +1357,7 @@ static void crypto_test_gen_alg_aes_xcbc(void)
ODP_AUTH_ALG_AES_XCBC_MAC,
aes_xcbc_reference,
ARRAY_SIZE(aes_xcbc_reference),
+ false,
false);
}
@@ -1315,6 +1368,7 @@ static void crypto_test_check_alg_aes_xcbc(void)
ODP_AUTH_ALG_AES_XCBC_MAC,
aes_xcbc_reference,
ARRAY_SIZE(aes_xcbc_reference),
+ false,
false);
}
@@ -1330,6 +1384,7 @@ static void crypto_test_gen_alg_aes_gmac(void)
ODP_AUTH_ALG_AES_GMAC,
aes_gmac_reference,
ARRAY_SIZE(aes_gmac_reference),
+ false,
false);
}
@@ -1340,7 +1395,8 @@ static void crypto_test_gen_alg_aes_gmac_ovr_iv(void)
ODP_AUTH_ALG_AES_GMAC,
aes_gmac_reference,
ARRAY_SIZE(aes_gmac_reference),
- true);
+ true,
+ false);
}
static void crypto_test_check_alg_aes_gmac(void)
@@ -1350,6 +1406,7 @@ static void crypto_test_check_alg_aes_gmac(void)
ODP_AUTH_ALG_AES_GMAC,
aes_gmac_reference,
ARRAY_SIZE(aes_gmac_reference),
+ false,
false);
}
@@ -1360,6 +1417,7 @@ static void crypto_test_check_alg_aes_gmac_ovr_iv(void)
ODP_AUTH_ALG_AES_GMAC,
aes_gmac_reference,
ARRAY_SIZE(aes_gmac_reference),
+ false,
false);
}
@@ -1375,6 +1433,7 @@ static void crypto_test_gen_alg_aes_cmac(void)
ODP_AUTH_ALG_AES_CMAC,
aes_cmac_reference,
ARRAY_SIZE(aes_cmac_reference),
+ false,
false);
}
@@ -1385,6 +1444,7 @@ static void crypto_test_check_alg_aes_cmac(void)
ODP_AUTH_ALG_AES_CMAC,
aes_cmac_reference,
ARRAY_SIZE(aes_cmac_reference),
+ false,
false);
}
commit 59a26fc8cc0be0be0e30144389cfee2e55a88ab2
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sat Feb 3 05:27:10 2018 +0300
api: crypto: add bitstring operation capability
For several wireless communication algorithms it is expected that they
operate on bit strings, which are not byte-aligned. Add cipher and auth
flags, denoting that this cipher/auth can be enabled to work in
bit-string mode.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h
index 654ae7bb..843fdefe 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -755,6 +755,22 @@ typedef struct odp_crypto_cipher_capability_t {
/** IV length in bytes */
uint32_t iv_len;
+ /** Cipher is operating in bitwise mode
+ *
+ * This cipher works on series of bits, rather than sequences of bytes:
+ * cipher_range in odp_crypto_op_param_t and
+ * odp_crypto_packet_op_param_t will use bits, rather than bytes.
+ *
+ * Note: data buffer MUST start on the byte boundary, using offset
+ * which is not divisible by 8 is unsupported and will result in
+ * unspecified behaviour.
+ *
+ * Note2: currently data length MUST be divisible by 8. Specifying data
+ * which does not consist of full bytes will result in unspecified
+ * behaviour.
+ */
+ odp_bool_t bit_mode;
+
} odp_crypto_cipher_capability_t;
/**
@@ -783,6 +799,18 @@ typedef struct odp_crypto_auth_capability_t {
uint32_t inc;
} aad_len;
+ /** Auth is operating in bitstring mode
+ *
+ * This auth works on series of bits, rather than sequences of bytes:
+ * auth_range in odp_crypto_op_param_t and
+ * odp_crypto_packet_op_param_t will use bits, rather than bytes.
+ *
+ * Note: data buffer MUST start on the byte boundary, using offset
+ * which is not divisible by 8 is unsupported and will result in
+ * unpredictable behaviour.
+ */
+ odp_bool_t bit_mode;
+
} odp_crypto_auth_capability_t;
/**
commit cb5ed2680f28412e72aa59f5769581bdb19d4ebd
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Dec 26 01:26:25 2017 +0300
api: crypto: provide definitions for 3GPP crypto algorithms
Add enumeration definitions for KASUMI F8/F9, SNOW 3G UEA2/UIA2 and ZUC
128-EEA3/128-EIA3 algorithms.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h
index c59f6602..654ae7bb 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -110,6 +110,24 @@ typedef enum {
*/
ODP_CIPHER_ALG_CHACHA20_POLY1305,
+ /** Confidentiality F8 algorithm (UEA1)
+ *
+ * KASUMI-based F8 algorithm (also known as UEA1).
+ */
+ ODP_CIPHER_ALG_KASUMI_F8,
+
+ /** Confidentiality UEA2 algorithm (128-EEA1)
+ *
+ * SNOW 3G-based UEA2 algorithm (also known as 128-EEA1).
+ */
+ ODP_CIPHER_ALG_SNOW3G_UEA2,
+
+ /** Confidentiality 128-EEA3 algorithm
+ *
+ * ZUC-based 128-EEA3 algorithm.
+ */
+ ODP_CIPHER_ALG_ZUC_EEA3,
+
/** @deprecated Use ODP_CIPHER_ALG_AES_CBC instead */
ODP_DEPRECATE(ODP_CIPHER_ALG_AES128_CBC),
@@ -214,6 +232,27 @@ typedef enum {
*/
ODP_AUTH_ALG_CHACHA20_POLY1305,
+ /** Integrity F9 algorithm (UIA1)
+ *
+ * KASUMI-based F9 algorithm (also known as UIA1).
+ *
+ * IV (9 bytes) is a concatenation of COUNT (32b), FRESH (32b) and
+ * DIRECTION (LSB-aligned, 1b).
+ */
+ ODP_AUTH_ALG_KASUMI_F9,
+
+ /** Integrity UIA2 algorithm (128-EEA1)
+ *
+ * SNOW 3G-based UIA2 algorithm (also known as 128-EIA1).
+ */
+ ODP_AUTH_ALG_SNOW3G_UIA2,
+
+ /** Integrity 128-EIA3 algorithm
+ *
+ * ZUC-based 128-EIA3 algorithm.
+ */
+ ODP_AUTH_ALG_ZUC_EIA3,
+
/** @deprecated Use ODP_AUTH_ALG_MD5_HMAC instead */
ODP_DEPRECATE(ODP_AUTH_ALG_MD5_96),
@@ -255,6 +294,15 @@ typedef union odp_crypto_cipher_algos_t {
/** ODP_CIPHER_ALG_CHACHA20_POLY1305 */
uint32_t chacha20_poly1305 : 1;
+ /** ODP_CIPHER_ALG_KASUMI_F8 */
+ uint32_t kasumi_f8 : 1;
+
+ /** ODP_CIPHER_ALG_SNOW3G_UEA2 */
+ uint32_t snow3g_uea2 : 1;
+
+ /** ODP_CIPHER_ALG_ZUC_EEA3 */
+ uint32_t zuc_eea3 : 1;
+
/** @deprecated Use aes_cbc instead */
uint32_t ODP_DEPRECATE(aes128_cbc) : 1;
@@ -312,6 +360,15 @@ typedef union odp_crypto_auth_algos_t {
/** ODP_AUTH_ALG_CHACHA20_POLY1305 */
uint32_t chacha20_poly1305 : 1;
+ /** ODP_AUTH_ALG_KASUMI_F9 */
+ uint32_t kasumi_f9 : 1;
+
+ /** ODP_AUTH_ALG_SNOW3G_UIA2 */
+ uint32_t snow3g_uia2 : 1;
+
+ /** ODP_AUTH_ALG_ZUC_EIA3 */
+ uint32_t zuc_eia3 : 1;
+
/** @deprecated Use md5_hmac instead */
uint32_t ODP_DEPRECATE(md5_96) : 1;
-----------------------------------------------------------------------
Summary of changes:
config/odp-linux-generic.conf | 6 +-
configure.ac | 1 -
example/classifier/odp_classifier.c | 19 +-
example/generator/odp_generator.c | 30 +-
example/ipsec/odp_ipsec.c | 17 +-
example/ipsec_api/odp_ipsec.c | 17 +-
example/l2fwd_simple/odp_l2fwd_simple.c | 17 +-
example/packet/odp_pktio.c | 17 +-
example/switch/odp_switch.c | 17 +-
example/time/time_global_test.c | 15 +-
example/timer/odp_timer_test.c | 17 +-
helper/include/odp/helper/threads.h | 26 +-
helper/test/odpthreads.c | 13 +-
helper/threads.c | 63 +--
include/odp/api/abi-default/classification.h | 12 +-
include/odp/api/abi-default/packet.h | 64 +++
include/odp/api/abi-default/schedule_types.h | 10 +-
include/odp/api/abi-default/shared_memory.h | 1 -
include/odp/api/abi-default/timer.h | 7 +-
include/odp/api/spec/classification.h | 9 +-
include/odp/api/spec/crypto.h | 122 ++++-
include/odp/api/spec/init.h | 32 ++
include/odp/api/spec/ipsec.h | 50 +-
include/odp/api/spec/packet.h | 69 +++
include/odp/api/spec/packet_io.h | 23 +
include/odp/api/spec/schedule.h | 70 +++
include/odp/api/spec/schedule_types.h | 30 +-
include/odp/api/spec/shared_memory.h | 5 -
include/odp/api/spec/timer.h | 16 +
.../include-abi/odp/api/abi/classification.h | 11 +-
.../linux-generic/include-abi/odp/api/abi/packet.h | 35 ++
.../include-abi/odp/api/abi/shared_memory.h | 1 -
.../linux-generic/include-abi/odp/api/abi/timer.h | 4 +-
.../include/odp/api/plat/packet_inline_types.h | 1 +
.../include/odp/api/plat/packet_inlines.h | 7 +
.../linux-generic/include/odp_packet_internal.h | 5 -
platform/linux-generic/include/odp_schedule_if.h | 14 +-
platform/linux-generic/m4/configure.m4 | 5 +-
platform/linux-generic/m4/performance.m4 | 10 -
platform/linux-generic/odp_classification.c | 17 +-
platform/linux-generic/odp_event.c | 5 +-
platform/linux-generic/odp_init.c | 2 +
platform/linux-generic/odp_ipsec_sad.c | 2 +-
platform/linux-generic/odp_ishm.c | 9 +-
platform/linux-generic/odp_packet.c | 56 ++-
platform/linux-generic/odp_packet_io.c | 12 +-
platform/linux-generic/odp_queue_basic.c | 20 +-
platform/linux-generic/odp_queue_scalable.c | 21 +-
platform/linux-generic/odp_schedule_basic.c | 71 ++-
platform/linux-generic/odp_schedule_if.c | 25 +
platform/linux-generic/odp_schedule_scalable.c | 39 +-
platform/linux-generic/odp_schedule_sp.c | 41 +-
platform/linux-generic/odp_timer.c | 65 ++-
platform/linux-generic/pktio/loop.c | 2 +-
platform/linux-generic/test/Makefile.am | 10 +-
platform/linux-generic/test/inline-timer.conf | 2 +-
.../test/mmap_vlan_ins/mmap_vlan_ins.c | 13 +-
platform/linux-generic/test/performance/.gitignore | 2 -
.../linux-generic/test/performance/Makefile.am | 13 -
.../test/performance/odp_scheduling_run_proc.sh | 30 --
platform/linux-generic/test/process-mode.conf | 6 +-
scripts/ci/check.sh | 8 +-
test/common/odp_cunit_common.c | 13 +-
test/performance/odp_bench_packet.c | 17 +-
test/performance/odp_cpu_bench.c | 13 +-
test/performance/odp_crypto.c | 17 +-
test/performance/odp_ipsec.c | 19 +-
test/performance/odp_l2fwd.c | 13 +-
test/performance/odp_l2fwd_run.sh | 2 +-
test/performance/odp_pktio_ordered.c | 17 +-
test/performance/odp_pktio_perf.c | 17 +-
test/performance/odp_sched_latency.c | 17 +-
test/performance/odp_sched_pktio.c | 19 +-
test/performance/odp_sched_pktio_run.sh | 2 +-
test/performance/odp_scheduling.c | 17 +-
test/validation/api/atomic/atomic.c | 13 +-
test/validation/api/barrier/barrier.c | 13 +-
.../api/classification/odp_classification_basic.c | 8 +-
.../api/classification/odp_classification_common.c | 2 +-
.../classification/odp_classification_test_pmr.c | 34 +-
.../api/classification/odp_classification_tests.c | 32 +-
test/validation/api/crypto/odp_crypto_test_inp.c | 549 +++++++++++++++++++--
test/validation/api/crypto/test_vectors.h | 182 +++++++
test/validation/api/crypto/test_vectors_len.h | 27 +
test/validation/api/init/init_main_ok.c | 6 +-
test/validation/api/ipsec/ipsec.c | 39 +-
test/validation/api/ipsec/ipsec.h | 3 +-
test/validation/api/ipsec/ipsec_test_in.c | 92 ++--
test/validation/api/ipsec/ipsec_test_out.c | 70 +--
test/validation/api/lock/lock.c | 13 +-
test/validation/api/packet/packet.c | 159 +++++-
test/validation/api/pktio/pktio.c | 37 ++
test/validation/api/queue/queue.c | 21 +-
test/validation/api/scheduler/scheduler.c | 139 +++++-
test/validation/api/thread/thread.c | 13 +-
test/validation/api/timer/timer.c | 36 +-
96 files changed, 2482 insertions(+), 548 deletions(-)
delete mode 100644 platform/linux-generic/m4/performance.m4
delete mode 100644 platform/linux-generic/test/performance/.gitignore
delete mode 100644 platform/linux-generic/test/performance/Makefile.am
delete mode 100755 platform/linux-generic/test/performance/odp_scheduling_run_proc.sh
hooks/post-receive
--
7 years, 9 months
- 1
- 0
[COMMIT] branch api-next updated. v1.19.0.2_tigermoth-324-g8511e88c
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 8511e88c69f5bf7cd251875610370aa334878788 (commit)
via 898d834f8c7164e4ee1a99fbe9115b3c7ca5bd67 (commit)
via 42fd89a1ee51a2535192650a8cffc05c32b0da12 (commit)
via c3a6bf82fa3b2cb742eb33ff66096f6f79be2c32 (commit)
via a9402619bd06f1e1ac9ada694484a104fcfff7d5 (commit)
via 6f9209f69f69ba8cfe51ff440f978b7d82d13245 (commit)
via d24149493d8733fc898fabbd718492717ad0e498 (commit)
via 5de83b54f16d8078b306f4e89e299154eb5972a2 (commit)
via 7d46bfe20a88358546859078cb7d09a1ff49fb6f (commit)
via 4a8039c26c7cc5aaa9b4485315879fba8fadacf7 (commit)
via 51254145370423631b3ac778865e06be2e418141 (commit)
via fa2fb9f553142adaa7526069ce3070814f915c32 (commit)
via 64991d2a01c36513e8c1a9518da9a56cb9f32594 (commit)
via efb3dc0e6524b32442dc50f5ced9ce1f1d6fd948 (commit)
via 02b60f6739a3980cab9cd1afca5dcc1fedd84a1e (commit)
via 406dc695c3fc756bac6ecef3c7d67348699e7a25 (commit)
via 1bb388931c9101f38703142fda4f6b9e0bff52c4 (commit)
via 6fd24dd1f81b2ca5442d19bd66ffd902de651934 (commit)
via 833470a13c2068890bfacdbf99bacce55bed2db2 (commit)
via 374301a2aa5ba6dfa81aa4c70fd24ed59141c012 (commit)
via f913948f5daa4cb1f71467d872b5380974b04f2d (commit)
via f703d49c196a6c6c9d29d3c7b04c02d727795a2c (commit)
via 5eb5837adf64b14e795483a6cdf4e83124c56be8 (commit)
via 4964f08fa748eb61949fff147e930be72555d233 (commit)
via 263a5bb884c3e274174b1d1e4e0ae497143b1f81 (commit)
via 3e007fea33316e1d7d66cd7ea19541a1653b501c (commit)
via f8eda649cd915654175c9723aca75adaae88c3d3 (commit)
via 96a177a6322a9d8fad99d43271d1b98ecd5d12a5 (commit)
via 3529f3b8713021e45c7dbdd81f839d8b9049efcc (commit)
via af055783f975e2b8b9e443565b3abdc9f7946ade (commit)
via 8d9936c45c4a9f8db9142057d8acee41d54e0b51 (commit)
via 2a6485f25dc9b0612cccf40a2360dc6d40becb78 (commit)
via 91fee166b0dbf4949f1a1786e167a6948b1e8f52 (commit)
via 01e4772d22537772001714318d5f501f082b6c5e (commit)
via f8bbdfc98be5d86dea67cc34ee97a4b69c052d61 (commit)
via 295bf070e27323060ba607805dd95ce0353a9461 (commit)
via ae66a05708d04f332d85fb258196d9045ebc303c (commit)
via eb3a816cb0fa6c5e76b25398a0ac280c769dcb49 (commit)
from 1ee7da08721452033dd7b0537e62ec1191291120 (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 8511e88c69f5bf7cd251875610370aa334878788
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Tue Nov 27 18:01:38 2018 +0300
linux-gen: drop performance.m4
performance.m4 which provides --enable-test-perf-proc is
not needed now because process mode is tested with standard
tests.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4
index c3aa7396..1dd14cd4 100644
--- a/platform/linux-generic/m4/configure.m4
+++ b/platform/linux-generic/m4/configure.m4
@@ -20,8 +20,6 @@ m4_include([platform/linux-generic/m4/odp_netmap.m4])
m4_include([platform/linux-generic/m4/odp_dpdk.m4])
ODP_SCHEDULER
-m4_include([platform/linux-generic/m4/performance.m4])
-
AC_CONFIG_COMMANDS_PRE([dnl
AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC],
[test "${with_platform}" = "linux-generic"])
diff --git a/platform/linux-generic/m4/performance.m4 b/platform/linux-generic/m4/performance.m4
deleted file mode 100644
index f2e7107c..00000000
--- a/platform/linux-generic/m4/performance.m4
+++ /dev/null
@@ -1,10 +0,0 @@
-##########################################################################
-# Enable/disable test-perf-proc
-##########################################################################
-AC_ARG_ENABLE([test-perf-proc],
- [AS_HELP_STRING([--enable-test-perf-proc], [run test in test/performance in process mode])],
- [test_perf_proc=$enableval],
- [test_perf_proc=yes])
-AC_CONFIG_COMMANDS_PRE([dnl
-AM_CONDITIONAL([test_perf_proc], [test x$test_perf_proc = xyes ])
-])
commit 898d834f8c7164e4ee1a99fbe9115b3c7ca5bd67
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Mon Nov 26 15:57:33 2018 +0200
example: generator: add signal handler for SIGINT
Free used resources after receiving SIGINT.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c
index 98a89211..bd6af795 100644
--- a/example/generator/odp_generator.c
+++ b/example/generator/odp_generator.c
@@ -15,6 +15,7 @@
#include <unistd.h>
#include <inttypes.h>
#include <sys/time.h>
+#include <signal.h>
#include <example_debug.h>
@@ -168,6 +169,14 @@ static void usage(char *progname);
static int scan_ip(char *buf, unsigned int *paddr);
static void print_global_stats(int num_workers);
+static void sig_handler(int signo ODP_UNUSED)
+{
+ int i;
+
+ for (i = 0; i < args->thread_cnt; i++)
+ args->thread[i].stop = 1;
+}
+
/**
* Scan ip
* Parse ip address.
@@ -1105,6 +1114,10 @@ int main(int argc, char *argv[])
odp_init_t init_param;
odph_odpthread_params_t thr_params;
+ /* Signal handler has to be registered before global init in case ODP
+ * implementation creates internal threads/processes. */
+ signal(SIGINT, sig_handler);
+
/* Let helper collect its own arguments (e.g. --odph_proc) */
argc = odph_parse_options(argc, argv);
if (odph_options(&helper_options)) {
diff --git a/test/performance/odp_l2fwd_run.sh b/test/performance/odp_l2fwd_run.sh
index 6166c8b2..5745d327 100755
--- a/test/performance/odp_l2fwd_run.sh
+++ b/test/performance/odp_l2fwd_run.sh
@@ -88,7 +88,7 @@ run_l2fwd()
$STDBUF odp_l2fwd${EXEEXT} -i $IF1,$IF2 -m 0 -t 30 -c 2 | tee $LOG
ret=$?
- kill ${GEN_PID}
+ kill -2 ${GEN_PID}
if [ ! -f $LOG ]; then
echo "FAIL: $LOG not found"
diff --git a/test/performance/odp_sched_pktio_run.sh b/test/performance/odp_sched_pktio_run.sh
index db14fb59..1c8d2945 100755
--- a/test/performance/odp_sched_pktio_run.sh
+++ b/test/performance/odp_sched_pktio_run.sh
@@ -72,7 +72,7 @@ run_sched_pktio()
# Run test for 5 sec
sleep 5
- kill ${GEN_PID}
+ kill -2 ${GEN_PID}
wait ${GEN_PID}
# Kill with SIGINT to output statistics
commit 42fd89a1ee51a2535192650a8cffc05c32b0da12
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Mon Nov 26 17:23:28 2018 +0300
text: perf odp_sched_pktio: try to terminate on failure
try to do clean up even if error was detected (try to remove
openned files for mmap.)
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c
index 239e12e9..393ea352 100644
--- a/test/performance/odp_sched_pktio.c
+++ b/test/performance/odp_sched_pktio.c
@@ -1547,17 +1547,17 @@ quit:
if (odp_shm_free(shm)) {
printf("Error: shm free failed.\n");
- return -1;
+ ret = -1;
}
if (odp_term_local()) {
printf("Error: term local failed.\n");
- return -1;
+ ret = -1;
}
if (odp_term_global(instance)) {
printf("Error: term global failed.\n");
- return -1;
+ ret = -1;
}
return ret;
commit c3a6bf82fa3b2cb742eb33ff66096f6f79be2c32
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Mon Nov 26 17:21:00 2018 +0300
linux-gen: ishm: add missing cast to calculate max_memory
Fix integer overflow doing math for max_memory.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index eceadd99..875f9f9d 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -1646,7 +1646,7 @@ int _odp_ishm_init_global(const odp_init_t *init)
ODP_DBG("Shm single VA size: %dkB\n", val_kb);
- max_memory = val_kb * 1024;
+ max_memory = (uint64_t)val_kb * 1024;
internal = max_memory / 8;
if (!_odp_libconfig_lookup_ext_int("shm", NULL, "huge_page_limit_kb",
commit a9402619bd06f1e1ac9ada694484a104fcfff7d5
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Mon Nov 26 12:32:15 2018 +0300
linux-gen: remove performance test for process mode
process mode tests run when process mode config is
specified. Here it has to be dropped.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4
index f9e9c494..c3aa7396 100644
--- a/platform/linux-generic/m4/configure.m4
+++ b/platform/linux-generic/m4/configure.m4
@@ -33,6 +33,5 @@ AC_CONFIG_FILES([platform/linux-generic/Makefile
platform/linux-generic/test/validation/api/pktio/Makefile
platform/linux-generic/test/mmap_vlan_ins/Makefile
platform/linux-generic/test/pktio_ipc/Makefile
- platform/linux-generic/test/ring/Makefile
- platform/linux-generic/test/performance/Makefile])
+ platform/linux-generic/test/ring/Makefile])
])
diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am
index 99934099..03a1474d 100644
--- a/platform/linux-generic/test/Makefile.am
+++ b/platform/linux-generic/test/Makefile.am
@@ -1,7 +1,7 @@
include $(top_srcdir)/test/Makefile.inc
TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation
-SUBDIRS = performance
+SUBDIRS =
if test_vald
TESTS = validation/api/pktio/pktio_run.sh \
@@ -9,10 +9,10 @@ TESTS = validation/api/pktio/pktio_run.sh \
validation/api/shmem/shmem_linux$(EXEEXT)
SUBDIRS += validation/api/pktio\
- validation/api/shmem\
- mmap_vlan_ins\
- pktio_ipc\
- ring
+ validation/api/shmem\
+ mmap_vlan_ins\
+ pktio_ipc\
+ ring
if HAVE_PCAP
TESTS += validation/api/pktio/pktio_run_pcap.sh
diff --git a/platform/linux-generic/test/performance/.gitignore b/platform/linux-generic/test/performance/.gitignore
deleted file mode 100644
index 7e563b8b..00000000
--- a/platform/linux-generic/test/performance/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.log
-*.trs
diff --git a/platform/linux-generic/test/performance/Makefile.am b/platform/linux-generic/test/performance/Makefile.am
deleted file mode 100644
index 0b5da671..00000000
--- a/platform/linux-generic/test/performance/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-include $(top_srcdir)/test/Makefile.inc
-
-TESTS_ENVIRONMENT += TEST_DIR=${builddir}
-
-TESTSCRIPTS = odp_scheduling_run_proc.sh
-
-TEST_EXTENSIONS = .sh
-
-if test_perf_proc
-TESTS = $(TESTSCRIPTS)
-endif
-
-dist_check_SCRIPTS = $(TESTSCRIPTS)
diff --git a/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh b/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh
deleted file mode 100755
index c16bcb86..00000000
--- a/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2016-2018, Linaro Limited
-# All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-# Script that passes command line arguments to odp_scheduling test when
-# launched by 'make check'
-
-TEST_DIR="${TEST_DIR:-$(dirname $0)}"
-PERFORMANCE="$TEST_DIR/../../../../test/performance"
-ret=0
-ALL=0
-
-run()
-{
- echo odp_scheduling_run starts requesting $1 worker threads
- echo =====================================================
-
- $PERFORMANCE/odp_scheduling${EXEEXT} --odph_proc -c $1 || ret=1
-}
-
-run 1
-run 5
-run 8
-run 11
-run $ALL
-
-exit $ret
commit 6f9209f69f69ba8cfe51ff440f978b7d82d13245
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Fri Nov 23 22:34:16 2018 +0300
travis: check.sh request huge pages at early start
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/scripts/ci/check.sh b/scripts/ci/check.sh
index 43168680..85cee498 100755
--- a/scripts/ci/check.sh
+++ b/scripts/ci/check.sh
@@ -1,14 +1,14 @@
#!/bin/bash
set -e
-"`dirname "$0"`"/build_x86_64.sh
-
-cd "$(dirname "$0")"/../..
-
echo 1000 | tee /proc/sys/vm/nr_hugepages
mkdir -p /mnt/huge
mount -t hugetlbfs nodev /mnt/huge
+"`dirname "$0"`"/build_x86_64.sh
+
+cd "$(dirname "$0")"/../..
+
# Ignore possible failures there because these tests depends on measurements
# and systems might differ in performance.
export CI="true"
commit d24149493d8733fc898fabbd718492717ad0e498
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Nov 16 16:32:19 2018 +0300
shippable: switch to using official Shippable image
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/.shippable.yml b/.shippable.yml
index 5696be1e..0bf68f33 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -14,18 +14,9 @@ env:
# - CROSS_ARCH="i386"
build:
- pre_ci:
- # use Dockerfile to install additional CI dependencies
- - docker build -t=odp/dev ./scripts
-
- # use image built in 'pre_ci' for CI job
- pre_ci_boot:
- image_name: odp/dev
- image_tag: latest
- pull: false
- options:
-
ci:
+ - apt-get update
+ - apt-get install --no-install-recommends -yy asciidoctor autoconf automake build-essential ccache clang doxygen gcc graphviz libconfig-dev libcunit1-dev libnuma-dev libpcap-dev libssl-dev libtool mscgen xsltproc
- mkdir -p $HOME/odp-shmdir
- export CI=true ODP_SHM_DIR=$HOME/odp-shmdir ODP_TEST_OUT_XML=yes
- ./bootstrap
diff --git a/scripts/Dockerfile b/scripts/Dockerfile
deleted file mode 100644
index b4c03ca4..00000000
--- a/scripts/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM drydockaarch64/u16:v5.10.1
-
-RUN if $(sudo update-alternatives --list gcc); \
- then sudo update-alternatives --remove-all gcc; \
- fi
-
-RUN sudo apt-get update && sudo apt-get install -yy \
- autoconf \
- automake \
- ccache \
- clang-4.0 \
- gcc-4.8 \
- graphviz \
- kmod \
- libconfig-dev \
- libcunit1-dev \
- libnuma-dev \
- libpcap-dev \
- libssl-dev \
- libtool \
- linux-headers-`uname -r` \
- mscgen \
- ruby-dev \
- xsltproc
-
-RUN sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 10
-RUN sudo ln -s /usr/bin/clang-4.0 /usr/bin/clang
-RUN sudo ln -s /usr/bin/clang++-4.0 /usr/bin/clang++
commit 5de83b54f16d8078b306f4e89e299154eb5972a2
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Mon Nov 19 17:53:46 2018 +0300
configure: disable -march=native for clang
for clang we see strange optimizations for TM code which breaks
code flow execution. There might be number of such places. For
now it's better to disable march=native until we completely
test and validate clang support for this.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
diff --git a/configure.ac b/configure.ac
index 6715a7ef..2ce476a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,7 +200,12 @@ AC_ARG_ENABLE([abi-compat],
abi_compat=no
#if there is no ABI compatibility the .so numbers are meaningless
ODP_LIBSO_VERSION=0:0:0
- ODP_CHECK_CFLAG([-march=native])
+ # do not try -march=native for clang due to possible failures on
+ # clang optimizations
+ $CC --version | grep -q clang
+ if test $? -ne 0; then
+ ODP_CHECK_CFLAG([-march=native])
+ fi
fi])
AM_CONDITIONAL(ODP_ABI_COMPAT, [test "x$ODP_ABI_COMPAT" = "x1"])
commit 7d46bfe20a88358546859078cb7d09a1ff49fb6f
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Fri Nov 16 16:47:02 2018 +0300
travis: define compiler for clang test
without specifying compiler CC falls back to default gcc
after it was initialized to clang. Current change forces
test to use clang.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
diff --git a/.travis.yml b/.travis.yml
index 848cfd61..85ab9ae4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -232,7 +232,8 @@ jobs:
-e CC="${CC}"
${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${ARCH}.sh
- stage: "build only"
- env: ARCH=x86_64 CC=clang
+ env: ARCH=x86_64
+ compiler: clang
install:
- true
script:
commit 4a8039c26c7cc5aaa9b4485315879fba8fadacf7
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Nov 14 14:28:53 2018 +0200
linux-gen: ishm: add config option for selecting huge page usage limit
Add configuration option for selecting huge page usage limit in kilobytes.
Memory reservations larger than this value are done using huge pages (if
available), whereas smaller reservations are done using normal pages to
conserve memory. The default value is still 64 kilobytes.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf
index 8f39ff7c..895f996b 100644
--- a/config/odp-linux-generic.conf
+++ b/config/odp-linux-generic.conf
@@ -34,6 +34,11 @@ shm: {
# because the current implementation won't work properly otherwise.
num_cached_hp = 0
+ # Huge page usage limit in kilobytes. Memory reservations larger than
+ # this value are done using huge pages (if available). Smaller
+ # reservations are done using normal pages to conserve memory.
+ huge_page_limit_kb = 64
+
# Amount of memory pre-reserved for ODP_SHM_SINGLE_VA usage in kilobytes
single_va_size_kb = 131072
}
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index eea527db..eceadd99 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -113,13 +113,6 @@
*/
#define ISHM_NB_FRAGMNTS (ISHM_MAX_NB_BLOCKS * 2 + 1)
-/*
- * Memory reservations larger than ISHM_HUGE_PAGE_LIMIT (bytes) are allocated
- * using huge pages (if available). Smaller reservations are done using normal
- * pages to conserve memory.
- */
-#define ISHM_HUGE_PAGE_LIMIT (64 * 1024)
-
/*
* when a memory block is to be exported outside its ODP instance,
* an block 'attribute file' is created in /dev/shm/odp-<pid>-shm-<name>.
@@ -190,6 +183,8 @@ typedef struct ishm_block {
typedef struct {
odp_spinlock_t lock;
uint64_t dev_seq; /* used when creating device names */
+ /* limit for reserving memory using huge pages */
+ uint64_t huge_page_limit;
uint32_t odpthread_cnt; /* number of running ODP threads */
ishm_block_t block[ISHM_MAX_NB_BLOCKS];
void *single_va_start; /* start of single VA memory */
@@ -1101,7 +1096,7 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd,
/* Otherwise, Try first huge pages when possible and needed: */
if ((fd < 0) && page_hp_size && ((flags & _ODP_ISHM_USE_HP) ||
- size > ISHM_HUGE_PAGE_LIMIT)) {
+ size > ishm_tbl->huge_page_limit)) {
/* at least, alignment in VA should match page size, but user
* can request more: If the user requirement exceeds the page
* size then we have to make sure the block will be mapped at
@@ -1636,23 +1631,33 @@ int _odp_ishm_init_global(const odp_init_t *init)
void *addr;
void *spce_addr = NULL;
int i;
- int single_va_size_kb = 0;
+ int val_kb;
uid_t uid;
char *hp_dir = odp_global_ro.hugepage_info.default_huge_page_dir;
uint64_t max_memory;
uint64_t internal;
+ uint64_t huge_page_limit;
if (!_odp_libconfig_lookup_ext_int("shm", NULL, "single_va_size_kb",
- &single_va_size_kb)) {
+ &val_kb)) {
ODP_ERR("Unable to read single VA size from config\n");
return -1;
}
- ODP_DBG("Shm single VA size: %dkB\n", single_va_size_kb);
+ ODP_DBG("Shm single VA size: %dkB\n", val_kb);
- max_memory = single_va_size_kb * 1024;
+ max_memory = val_kb * 1024;
internal = max_memory / 8;
+ if (!_odp_libconfig_lookup_ext_int("shm", NULL, "huge_page_limit_kb",
+ &val_kb)) {
+ ODP_ERR("Unable to read huge page usage limit from config\n");
+ return -1;
+ }
+ huge_page_limit = (uint64_t)val_kb * 1024;
+
+ ODP_DBG("Shm huge page usage limit: %dkB\n", val_kb);
+
/* user requested memory size + some extra for internal use */
if (init && init->shm.max_memory)
max_memory = init->shm.max_memory + internal;
@@ -1703,6 +1708,7 @@ int _odp_ishm_init_global(const odp_init_t *init)
memset(ishm_tbl, 0, sizeof(ishm_table_t));
ishm_tbl->dev_seq = 0;
ishm_tbl->odpthread_cnt = 0;
+ ishm_tbl->huge_page_limit = huge_page_limit;
odp_spinlock_init(&ishm_tbl->lock);
/* allocate space for the internal shared mem fragment table: */
commit 51254145370423631b3ac778865e06be2e418141
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Nov 13 16:11:17 2018 +0200
linux-gen: timer: decrease inline timer polling interval under load
Decrease inline timer polling interval after receiving events to
compansate for event processing delay.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_timer_internal.h b/platform/linux-generic/include/odp_timer_internal.h
index 1f612448..cd80778a 100644
--- a/platform/linux-generic/include/odp_timer_internal.h
+++ b/platform/linux-generic/include/odp_timer_internal.h
@@ -36,12 +36,14 @@ typedef struct {
odp_timer_t timer;
} odp_timeout_hdr_t;
-unsigned _timer_run(void);
+/* A larger decrement value should be used after receiving events compared to
+ * an 'empty' call. */
+unsigned int _timer_run(int dec);
/* Static inline wrapper to minimize modification of schedulers. */
-static inline unsigned timer_run(void)
+static inline unsigned int timer_run(int dec)
{
- return odp_global_rw->inline_timers ? _timer_run() : 0;
+ return odp_global_rw->inline_timers ? _timer_run(dec) : 0;
}
#endif
diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c
index c3654884..37a2fad1 100644
--- a/platform/linux-generic/odp_queue_basic.c
+++ b/platform/linux-generic/odp_queue_basic.c
@@ -984,27 +984,30 @@ static int queue_api_enq(odp_queue_t handle, odp_event_t ev)
static int queue_api_deq_multi(odp_queue_t handle, odp_event_t ev[], int num)
{
queue_entry_t *queue = qentry_from_handle(handle);
-
- if (odp_global_rw->inline_timers &&
- odp_atomic_load_u64(&queue->s.num_timers))
- timer_run();
+ int ret;
if (num > QUEUE_MULTI_MAX)
num = QUEUE_MULTI_MAX;
- return queue->s.dequeue_multi(handle,
- (odp_buffer_hdr_t **)ev, num);
+ ret = queue->s.dequeue_multi(handle, (odp_buffer_hdr_t **)ev, num);
+
+ if (odp_global_rw->inline_timers &&
+ odp_atomic_load_u64(&queue->s.num_timers))
+ timer_run(ret ? 2 : 1);
+
+ return ret;
}
static odp_event_t queue_api_deq(odp_queue_t handle)
{
queue_entry_t *queue = qentry_from_handle(handle);
+ odp_event_t ev = (odp_event_t)queue->s.dequeue(handle);
if (odp_global_rw->inline_timers &&
odp_atomic_load_u64(&queue->s.num_timers))
- timer_run();
+ timer_run(ev != ODP_EVENT_INVALID ? 2 : 1);
- return (odp_event_t)queue->s.dequeue(handle);
+ return ev;
}
/* API functions */
diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c
index 2de4d52d..88abe8c7 100644
--- a/platform/linux-generic/odp_queue_scalable.c
+++ b/platform/linux-generic/odp_queue_scalable.c
@@ -850,30 +850,32 @@ static odp_buffer_hdr_t *_queue_deq(odp_queue_t handle)
static int queue_deq_multi(odp_queue_t handle, odp_event_t ev[], int num)
{
queue_entry_t *queue;
+ int ret;
if (num > QUEUE_MULTI_MAX)
num = QUEUE_MULTI_MAX;
queue = qentry_from_ext(handle);
+ ret = queue->s.dequeue_multi(handle, (odp_buffer_hdr_t **)ev, num);
+
if (odp_global_rw->inline_timers &&
odp_atomic_load_u64(&queue->s.num_timers))
- timer_run();
+ timer_run(ret ? 2 : 1);
- return queue->s.dequeue_multi(handle, (odp_buffer_hdr_t **)ev, num);
+ return ret;
}
static odp_event_t queue_deq(odp_queue_t handle)
{
- queue_entry_t *queue;
-
- queue = qentry_from_ext(handle);
+ queue_entry_t *queue = qentry_from_ext(handle);
+ odp_event_t ev = (odp_event_t)queue->s.dequeue(handle);
if (odp_global_rw->inline_timers &&
odp_atomic_load_u64(&queue->s.num_timers))
- timer_run();
+ timer_run(ev != ODP_EVENT_INVALID ? 2 : 1);
- return (odp_event_t)queue->s.dequeue(handle);
+ return ev;
}
static void queue_param_init(odp_queue_param_t *params)
diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c
index cf566eb8..48f232e6 100644
--- a/platform/linux-generic/odp_schedule_basic.c
+++ b/platform/linux-generic/odp_schedule_basic.c
@@ -1181,7 +1181,7 @@ static inline int do_schedule(odp_queue_t *out_queue, odp_event_t out_ev[],
static inline int schedule_run(odp_queue_t *out_queue, odp_event_t out_ev[],
unsigned int max_num)
{
- timer_run();
+ timer_run(1);
return do_schedule(out_queue, out_ev, max_num);
}
@@ -1194,10 +1194,13 @@ static inline int schedule_loop(odp_queue_t *out_queue, uint64_t wait,
int ret;
while (1) {
- ret = schedule_run(out_queue, out_ev, max_num);
- if (ret)
+ ret = do_schedule(out_queue, out_ev, max_num);
+ if (ret) {
+ timer_run(2);
break;
+ }
+ timer_run(1);
if (wait == ODP_SCHED_WAIT)
continue;
diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c
index 5d83ed08..4e9dd771 100644
--- a/platform/linux-generic/odp_schedule_scalable.c
+++ b/platform/linux-generic/odp_schedule_scalable.c
@@ -883,7 +883,7 @@ static int _schedule(odp_queue_t *from, odp_event_t ev[], int num_evts)
ts = sched_ts;
atomq = ts->atomq;
- timer_run();
+ timer_run(1);
/* Once an atomic queue has been scheduled to a thread, it will stay
* on that thread until empty or 'rotated' by WRR
diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c
index b8f805ac..eec88a60 100644
--- a/platform/linux-generic/odp_schedule_sp.c
+++ b/platform/linux-generic/odp_schedule_sp.c
@@ -571,8 +571,6 @@ static int schedule_multi(odp_queue_t *from, uint64_t wait,
uint32_t qi;
int num;
- timer_run();
-
cmd = sched_cmd();
if (cmd && cmd->s.type == CMD_PKTIO) {
@@ -612,6 +610,7 @@ static int schedule_multi(odp_queue_t *from, uint64_t wait,
}
if (cmd == NULL) {
+ timer_run(1);
/* All priority queues are empty */
if (wait == ODP_SCHED_NO_WAIT)
return 0;
@@ -636,6 +635,7 @@ static int schedule_multi(odp_queue_t *from, uint64_t wait,
num = sched_queue_deq(qi, events, 1, 1);
if (num <= 0) {
+ timer_run(1);
/* Destroyed or empty queue. Remove empty queue from
* scheduling. A dequeue operation to on an already
* empty queue moves it to NOTSCHED state and
@@ -643,6 +643,8 @@ static int schedule_multi(odp_queue_t *from, uint64_t wait,
continue;
}
+ timer_run(2);
+
sched_local.cmd = cmd;
if (from)
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index d502c21f..6446b1c9 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -883,10 +883,10 @@ static unsigned process_timer_pools(void)
return nexp;
}
-unsigned _timer_run(void)
+unsigned int _timer_run(int dec)
{
static __thread odp_time_t last_timer_run;
- static __thread unsigned timer_run_cnt = 1;
+ static __thread int timer_run_cnt = 1;
odp_time_t now;
if (timer_global->num_timer_pools == 0)
@@ -895,7 +895,8 @@ unsigned _timer_run(void)
/* Rate limit how often this thread checks the timer pools. */
if (timer_global->inline_poll_interval > 1) {
- if (--timer_run_cnt)
+ timer_run_cnt -= dec;
+ if (timer_run_cnt > 0)
return 0;
timer_run_cnt = timer_global->inline_poll_interval;
}
commit fa2fb9f553142adaa7526069ce3070814f915c32
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Nov 13 15:08:02 2018 +0200
linux-gen: timer: add config option for inline timer poll frequency
Add configure option 'timer.inline_poll_interval' for adjusting inline
timer polling frequency.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf
index 2ac6c44d..8f39ff7c 100644
--- a/config/odp-linux-generic.conf
+++ b/config/odp-linux-generic.conf
@@ -136,4 +136,11 @@ timer: {
#
# Set to 1 to enable
inline = 0
+
+ # Inline timer poll interval
+ #
+ # When set to 1 inline timers are polled during every schedule round.
+ # Increasing the value reduces timer processing overhead while
+ # decreasing accuracy. Ignored when inline timer is not enabled.
+ inline_poll_interval = 10
}
diff --git a/platform/linux-generic/include/odp_timer_internal.h b/platform/linux-generic/include/odp_timer_internal.h
index 02ba92e0..1f612448 100644
--- a/platform/linux-generic/include/odp_timer_internal.h
+++ b/platform/linux-generic/include/odp_timer_internal.h
@@ -21,9 +21,6 @@
#include <odp/api/timer.h>
#include <odp_global_data.h>
-/* Minimum number of scheduling rounds between checking timer pools. */
-#define CONFIG_TIMER_RUN_RATELIMIT_ROUNDS 1
-
/**
* Internal Timeout header
*/
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index 35bb0482..d502c21f 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -219,6 +219,7 @@ typedef struct timer_global_t {
_odp_atomic_flag_t ODP_ALIGNED_CACHE locks[NUM_LOCKS];
#endif
odp_bool_t use_inline_timers;
+ int inline_poll_interval;
} timer_global_t;
static timer_global_t *timer_global;
@@ -885,8 +886,7 @@ static unsigned process_timer_pools(void)
unsigned _timer_run(void)
{
static __thread odp_time_t last_timer_run;
- static __thread unsigned timer_run_cnt =
- CONFIG_TIMER_RUN_RATELIMIT_ROUNDS;
+ static __thread unsigned timer_run_cnt = 1;
odp_time_t now;
if (timer_global->num_timer_pools == 0)
@@ -894,10 +894,10 @@ unsigned _timer_run(void)
/* Rate limit how often this thread checks the timer pools. */
- if (CONFIG_TIMER_RUN_RATELIMIT_ROUNDS > 1) {
+ if (timer_global->inline_poll_interval > 1) {
if (--timer_run_cnt)
return 0;
- timer_run_cnt = CONFIG_TIMER_RUN_RATELIMIT_ROUNDS;
+ timer_run_cnt = timer_global->inline_poll_interval;
}
now = odp_time_global();
@@ -1381,6 +1381,14 @@ int odp_timer_init_global(const odp_init_t *params)
}
timer_global->use_inline_timers = val;
+ conf_str = "timer.inline_poll_interval";
+ if (!_odp_libconfig_lookup_int(conf_str, &val)) {
+ ODP_ERR("Config option '%s' not found.\n", conf_str);
+ odp_shm_free(shm);
+ return -1;
+ }
+ timer_global->inline_poll_interval = val;
+
if (params && params->not_used.feat.timer)
timer_global->use_inline_timers = false;
commit 64991d2a01c36513e8c1a9518da9a56cb9f32594
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Nov 13 15:07:40 2018 +0200
travis: test inline timer implementation
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/.travis.yml b/.travis.yml
index ec307645..848cfd61 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -154,6 +154,19 @@ jobs:
-e ODP_CONFIG_FILE=/odp/platform/linux-generic/test/process-mode.conf
-e ODPH_PROC_MODE=1
${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/check.sh
+ - stage: test
+ env: TEST=inline_timer
+ install:
+ - true
+ compiler: gcc
+ script:
+ - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
+ - docker run --privileged -i -t
+ -v `pwd`:/odp --shm-size 8g
+ -e CC="${CC}"
+ -e CONF=""
+ -e ODP_CONFIG_FILE=/odp/platform/linux-generic/test/inline-timer.conf
+ ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/check_inline_timer.sh
- stage: test
env: TEST=distcheck
compiler: gcc
diff --git a/platform/linux-generic/test/inline-timer.conf b/platform/linux-generic/test/inline-timer.conf
new file mode 100644
index 00000000..cc9f2037
--- /dev/null
+++ b/platform/linux-generic/test/inline-timer.conf
@@ -0,0 +1,8 @@
+# Mandatory fields
+odp_implementation = "linux-generic"
+config_file_version = "0.1.5"
+
+timer: {
+ # Enable inline timer implementation
+ inline = 1
+}
diff --git a/scripts/ci/check_inline_timer.sh b/scripts/ci/check_inline_timer.sh
new file mode 100755
index 00000000..d2eff714
--- /dev/null
+++ b/scripts/ci/check_inline_timer.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+
+"`dirname "$0"`"/build_x86_64.sh
+
+cd "$(dirname "$0")"/../..
+
+echo 1000 | tee /proc/sys/vm/nr_hugepages
+mkdir -p /mnt/huge
+mount -t hugetlbfs nodev /mnt/huge
+
+ODP_SCHEDULER=basic ./test/validation/api/timer/timer_main
+ODP_SCHEDULER=sp ./test/validation/api/timer/timer_main
+ODP_SCHEDULER=scalable ./test/validation/api/timer/timer_main
+
+umount /mnt/huge
commit efb3dc0e6524b32442dc50f5ced9ce1f1d6fd948
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Nov 13 13:01:26 2018 +0200
linux-gen: timer: enable inline timer implementation using config file
Add configure option 'timer.inline' for enabling inline timer
implementation.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf
index 2be1fee7..2ac6c44d 100644
--- a/config/odp-linux-generic.conf
+++ b/config/odp-linux-generic.conf
@@ -16,7 +16,7 @@
# Mandatory fields
odp_implementation = "linux-generic"
-config_file_version = "0.1.4"
+config_file_version = "0.1.5"
# Shared memory options
shm: {
@@ -125,3 +125,15 @@ sched_basic: {
control = 1
}
}
+
+timer: {
+ # Use inline timer implementation
+ #
+ # By default, timer processing is done in background threads (thread per
+ # timer pool). With inline implementation timers are processed on worker
+ # cores instead. When using inline timers the application has to call
+ # odp_schedule() or odp_queue_deq() to actuate timer processing.
+ #
+ # Set to 1 to enable
+ inline = 0
+}
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index 49901ae0..35bb0482 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -55,6 +55,7 @@
#include <odp/api/time.h>
#include <odp/api/plat/time_inlines.h>
#include <odp/api/timer.h>
+#include <odp_libconfig_internal.h>
#include <odp_queue_if.h>
#include <odp_timer_internal.h>
#include <odp/api/plat/queue_inlines.h>
@@ -217,7 +218,7 @@ typedef struct timer_global_t {
/* Multiple locks per cache line! */
_odp_atomic_flag_t ODP_ALIGNED_CACHE locks[NUM_LOCKS];
#endif
-
+ odp_bool_t use_inline_timers;
} timer_global_t;
static timer_global_t *timer_global;
@@ -351,22 +352,8 @@ static odp_timer_pool_t timer_pool_new(const char *name,
odp_ticketlock_lock(&timer_global->lock);
timer_global->timer_pool[tp_idx] = tp;
- if (timer_global->num_timer_pools == 1) {
- odp_bool_t inline_tim;
-
- /*
- * Whether to run timer pool processing 'inline' (on worker
- * cores) or in background threads (thread-per-timerpool).
- *
- * If the application will use scheduler this flag is set to
- * true, otherwise false. This application conveys this
- * information via the 'not_used' bits in odp_init_t which are
- * passed to odp_global_init().
- */
- inline_tim = !odp_global_ro.init_param.not_used.feat.schedule;
-
- odp_global_rw->inline_timers = inline_tim;
- }
+ if (timer_global->num_timer_pools == 1)
+ odp_global_rw->inline_timers = timer_global->use_inline_timers;
odp_ticketlock_unlock(&timer_global->lock);
if (!odp_global_rw->inline_timers) {
@@ -1360,7 +1347,8 @@ void odp_timeout_free(odp_timeout_t tmo)
int odp_timer_init_global(const odp_init_t *params)
{
odp_shm_t shm;
- odp_bool_t inline_timers = false;
+ const char *conf_str;
+ int val = 0;
shm = odp_shm_reserve("_odp_timer", sizeof(timer_global_t),
ODP_CACHE_LINE_SIZE, 0);
@@ -1385,16 +1373,21 @@ int odp_timer_init_global(const odp_init_t *params)
#else
ODP_DBG("Using lock-less timer implementation\n");
#endif
+ conf_str = "timer.inline";
+ if (!_odp_libconfig_lookup_int(conf_str, &val)) {
+ ODP_ERR("Config option '%s' not found.\n", conf_str);
+ odp_shm_free(shm);
+ return -1;
+ }
+ timer_global->use_inline_timers = val;
- if (params)
- inline_timers =
- !params->not_used.feat.schedule &&
- !params->not_used.feat.timer;
+ if (params && params->not_used.feat.timer)
+ timer_global->use_inline_timers = false;
timer_global->time_per_ratelimit_period =
odp_time_global_from_ns(timer_global->min_res_ns / 2);
- if (!inline_timers) {
+ if (!timer_global->use_inline_timers) {
timer_res_init();
block_sigalarm();
}
diff --git a/platform/linux-generic/test/process-mode.conf b/platform/linux-generic/test/process-mode.conf
index fffddcc5..a5ad3f96 100644
--- a/platform/linux-generic/test/process-mode.conf
+++ b/platform/linux-generic/test/process-mode.conf
@@ -1,6 +1,6 @@
# Mandatory fields
odp_implementation = "linux-generic"
-config_file_version = "0.1.4"
+config_file_version = "0.1.5"
# Shared memory options
shm: {
commit 02b60f6739a3980cab9cd1afca5dcc1fedd84a1e
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Thu Nov 15 17:18:22 2018 +0200
linux-gen: timer: zero timer pool memory on reserve
Fixes timer thread failing due to uninitialized variables.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index 1e1eb019..49901ae0 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -270,6 +270,7 @@ static odp_timer_pool_t timer_pool_new(const char *name,
{
uint32_t i, tp_idx;
size_t sz0, sz1, sz2;
+ uint64_t tp_size;
uint32_t flags = ODP_SHM_SW_ONLY;
if (odp_global_ro.shm_single_va)
@@ -299,12 +300,17 @@ static odp_timer_pool_t timer_pool_new(const char *name,
sz1 = ROUNDUP_CACHE_LINE(sizeof(tick_buf_t) * param->num_timers);
sz2 = ROUNDUP_CACHE_LINE(sizeof(_odp_timer_t) *
param->num_timers);
- odp_shm_t shm = odp_shm_reserve(name, sz0 + sz1 + sz2,
- ODP_CACHE_LINE_SIZE, flags);
+ tp_size = sz0 + sz1 + sz2;
+
+ odp_shm_t shm = odp_shm_reserve(name, tp_size, ODP_CACHE_LINE_SIZE,
+ flags);
if (odp_unlikely(shm == ODP_SHM_INVALID))
ODP_ABORT("%s: timer pool shm-alloc(%zuKB) failed\n",
name, (sz0 + sz1 + sz2) / 1024);
timer_pool_t *tp = (timer_pool_t *)odp_shm_addr(shm);
+
+ memset(tp, 0, tp_size);
+
tp->prev_scan = odp_time_global();
tp->time_per_tick = odp_time_global_from_ns(param->res_ns);
odp_atomic_init_u64(&tp->cur_tick, 0);
commit 406dc695c3fc756bac6ecef3c7d67348699e7a25
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Nov 16 10:18:09 2018 +0200
linux-gen: init: always initialize odp_global_ro.init_param
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
index 98b46fca..9e648075 100644
--- a/platform/linux-generic/odp_init.c
+++ b/platform/linux-generic/odp_init.c
@@ -267,6 +267,7 @@ int odp_init_global(odp_instance_t *instance,
odp_global_ro.log_fn = odp_override_log;
odp_global_ro.abort_fn = odp_override_abort;
+ odp_init_param_init(&odp_global_ro.init_param);
if (params != NULL) {
odp_global_ro.init_param = *params;
commit 1bb388931c9101f38703142fda4f6b9e0bff52c4
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Wed Nov 14 09:53:54 2018 +0200
linux-gen: build: enable CPU arch specific optimization
When not building in ABI compatible mode, enable compiler
optimizations for the CPU architecture of the local machine.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/configure.ac b/configure.ac
index 68da20df..6715a7ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,6 +200,7 @@ AC_ARG_ENABLE([abi-compat],
abi_compat=no
#if there is no ABI compatibility the .so numbers are meaningless
ODP_LIBSO_VERSION=0:0:0
+ ODP_CHECK_CFLAG([-march=native])
fi])
AM_CONDITIONAL(ODP_ABI_COMPAT, [test "x$ODP_ABI_COMPAT" = "x1"])
commit 6fd24dd1f81b2ca5442d19bd66ffd902de651934
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Wed Nov 14 14:39:21 2018 +0200
linux-gen: arm atomic: fix register numbering with casp
ARMv8.1 specific casp() function failed to build due to
register numbering issues. CASP instructions require that the
first register of a pair is even. Force register numbering
to start from even numbers (x0 and x2).
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/arch/aarch64/odp_atomic.h b/platform/linux-generic/arch/aarch64/odp_atomic.h
index 8b6c3aec..8a0e7ce2 100644
--- a/platform/linux-generic/arch/aarch64/odp_atomic.h
+++ b/platform/linux-generic/arch/aarch64/odp_atomic.h
@@ -108,32 +108,45 @@ static inline __int128 __lockfree_fetch_or_16(__int128 *var, __int128 mask,
#else
-static inline __int128 casp(__int128 *var, __int128 old, __int128 neu, int mo)
+static inline __int128_t cas_u128(__int128_t *ptr, __int128_t old_val,
+ __int128_t new_val, int mo)
{
+ /* CASP instructions require that the first register number is paired */
+ register uint64_t old0 __asm__ ("x0");
+ register uint64_t old1 __asm__ ("x1");
+ register uint64_t new0 __asm__ ("x2");
+ register uint64_t new1 __asm__ ("x3");
+
+ old0 = (uint64_t)old_val;
+ old1 = (uint64_t)(old_val >> 64);
+ new0 = (uint64_t)new_val;
+ new1 = (uint64_t)(new_val >> 64);
+
if (mo == __ATOMIC_RELAXED) {
- __asm__ volatile("casp %0, %H0, %1, %H1, [%2]"
- : "+r" (old)
- : "r" (neu), "r" (var)
+ __asm__ volatile("casp %[old0], %[old1], %[new0], %[new1], [%[ptr]]"
+ : [old0] "+r" (old0), [old1] "+r" (old1)
+ : [new0] "r" (new0), [new1] "r" (new1), [ptr] "r" (ptr)
: "memory");
} else if (mo == __ATOMIC_ACQUIRE) {
- __asm__ volatile("caspa %0, %H0, %1, %H1, [%2]"
- : "+r" (old)
- : "r" (neu), "r" (var)
+ __asm__ volatile("caspa %[old0], %[old1], %[new0], %[new1], [%[ptr]]"
+ : [old0] "+r" (old0), [old1] "+r" (old1)
+ : [new0] "r" (new0), [new1] "r" (new1), [ptr] "r" (ptr)
: "memory");
} else if (mo == __ATOMIC_ACQ_REL) {
- __asm__ volatile("caspal %0, %H0, %1, %H1, [%2]"
- : "+r" (old)
- : "r" (neu), "r" (var)
+ __asm__ volatile("caspal %[old0], %[old1], %[new0], %[new1], [%[ptr]]"
+ : [old0] "+r" (old0), [old1] "+r" (old1)
+ : [new0] "r" (new0), [new1] "r" (new1), [ptr] "r" (ptr)
: "memory");
} else if (mo == __ATOMIC_RELEASE) {
- __asm__ volatile("caspl %0, %H0, %1, %H1, [%2]"
- : "+r" (old)
- : "r" (neu), "r" (var)
+ __asm__ volatile("caspl %[old0], %[old1], %[new0], %[new1], [%[ptr]]"
+ : [old0] "+r" (old0), [old1] "+r" (old1)
+ : [new0] "r" (new0), [new1] "r" (new1), [ptr] "r" (ptr)
: "memory");
} else {
abort();
}
- return old;
+
+ return ((__int128)old0) | (((__int128)old1) << 64);
}
static inline bool
@@ -147,7 +160,7 @@ __lockfree_compare_exchange_16(register __int128 *var, __int128 *exp,
__int128 expected;
expected = *exp;
- old = casp(var, expected, neu, mo_success);
+ old = cas_u128(var, expected, neu, mo_success);
*exp = old; /* Always update, atomically read value */
return old == expected;
}
@@ -160,7 +173,7 @@ static inline __int128 __lockfree_exchange_16(__int128 *var, __int128 neu,
do {
expected = *var;
- old = casp(var, expected, neu, mo);
+ old = cas_u128(var, expected, neu, mo);
} while (old != expected);
return old;
}
@@ -173,7 +186,7 @@ static inline __int128 __lockfree_fetch_and_16(__int128 *var, __int128 mask,
do {
expected = *var;
- old = casp(var, expected, expected & mask, mo);
+ old = cas_u128(var, expected, expected & mask, mo);
} while (old != expected);
return old;
}
@@ -186,7 +199,7 @@ static inline __int128 __lockfree_fetch_or_16(__int128 *var, __int128 mask,
do {
expected = *var;
- old = casp(var, expected, expected | mask, mo);
+ old = cas_u128(var, expected, expected | mask, mo);
} while (old != expected);
return old;
}
commit 833470a13c2068890bfacdbf99bacce55bed2db2
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Nov 13 16:44:07 2018 +0200
linux-gen: sysinfo: print out ARM build time features
Print out feature flags that were used in build time. The
output may be used to check e.g. if binary was built with
ARMv8.0 or >= ARMv8.1 instructions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c b/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c
index bcdc2373..3a1486dd 100644
--- a/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c
@@ -201,6 +201,76 @@ int cpuinfo_parser(FILE *file, system_info_t *sysinfo)
void sys_info_print_arch(void)
{
+ const char *ndef = "n/a";
+
+ /* Avoid compiler warning about unused variable */
+ (void)ndef;
+
+ /* See ARM C Language Extensions documentation for details */
+ printf("ARM FEATURES:\n");
+
+ printf(" __ARM_ARCH ");
+#ifdef __ARM_ARCH
+ printf("%i\n", __ARM_ARCH);
+#else
+ printf("%s\n", ndef);
+#endif
+
+ printf(" __ARM_ARCH_ISA_A64 ");
+#ifdef __ARM_ARCH_ISA_A64
+ printf("%i\n", __ARM_ARCH_ISA_A64);
+#else
+ printf("%s\n", ndef);
+#endif
+
+#if defined(__ARM_ARCH) && __ARM_ARCH >= 8
+ /* Actually, this checks for new NEON instructions in
+ * v8.1, but is currently the only way to distinguish
+ * v8.0 and >=v8.1. */
+ printf(" ARMv8 ISA version ");
+#ifdef __ARM_FEATURE_QRDMX
+ printf("v8.1 or higher\n");
+#else
+ printf("v8.0\n");
+#endif
+#endif
+
+#ifdef __ARM_FEATURE_QRDMX
+ /* Actually, this checks for new NEON instructions in
+ * v8.1, but is currently the only way to distinguish
+ * v8.0 and >=v8.1. */
+ printf(" ARMv8.1 instructions\n");
+#endif
+
+ printf(" __ARM_NEON ");
+#ifdef __ARM_NEON
+ printf("%i\n", __ARM_NEON);
+#else
+ printf("%s\n", ndef);
+#endif
+
+ printf(" __ARM_FEATURE_IDIV ");
+#ifdef __ARM_FEATURE_IDIV
+ printf("%i\n", __ARM_FEATURE_IDIV);
+#else
+ printf("%s\n", ndef);
+#endif
+
+ printf(" __ARM_FEATURE_CRYPTO ");
+#ifdef __ARM_FEATURE_CRYPTO
+ printf("%i\n", __ARM_FEATURE_CRYPTO);
+#else
+ printf("%s\n", ndef);
+#endif
+
+ printf(" __ARM_FEATURE_CRC32 ");
+#ifdef __ARM_FEATURE_CRC32
+ printf("%i\n", __ARM_FEATURE_CRC32);
+#else
+ printf("%s\n", ndef);
+#endif
+
+ printf("\n");
}
uint64_t odp_cpu_arch_hz_current(int id)
commit 374301a2aa5ba6dfa81aa4c70fd24ed59141c012
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Tue Nov 13 12:17:47 2018 +0300
linux-gen: run without /proc mounted
Some systems may have /proc interface not mounted, let
odp linux generic run there with dummy values.
https://bugs.linaro.org/show_bug.cgi?id=3989
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
diff --git a/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c b/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c
index 85aec6a6..bcdc2373 100644
--- a/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c
@@ -12,7 +12,6 @@
#include <odp_sysinfo_internal.h>
#include <odp_debug_internal.h>
-#define DUMMY_MAX_MHZ 1000
#define TMP_STR_LEN 64
static void aarch64_impl_str(char *str, int maxlen, int implementer)
diff --git a/platform/linux-generic/arch/default/odp_sysinfo_parse.c b/platform/linux-generic/arch/default/odp_sysinfo_parse.c
index b9378887..da3f2eb3 100644
--- a/platform/linux-generic/arch/default/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/default/odp_sysinfo_parse.c
@@ -7,24 +7,10 @@
#include "config.h"
#include <odp_sysinfo_internal.h>
-#include <odp_debug_internal.h>
-#include <string.h>
-
-#define DUMMY_MAX_MHZ 1400
int cpuinfo_parser(FILE *file ODP_UNUSED, system_info_t *sysinfo)
{
- int i;
-
- ODP_DBG("Warning: use dummy values for freq and model string\n");
- for (i = 0; i < CONFIG_NUM_CPU; i++) {
- ODP_PRINT("WARN: cpu[%i] uses dummy max frequency %u MHz\n",
- i, DUMMY_MAX_MHZ);
- sysinfo->cpu_hz_max[i] = DUMMY_MAX_MHZ * 1000000;
- strcpy(sysinfo->model_str[i], "UNKNOWN");
- }
-
- return 0;
+ return _odp_dummy_cpuinfo(sysinfo);
}
void sys_info_print_arch(void)
diff --git a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c
index 5084e6b5..7124e84f 100644
--- a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c
@@ -83,6 +83,8 @@ uint64_t odp_cpu_arch_hz_current(int id)
double mhz = 0.0;
file = fopen("/proc/cpuinfo", "rt");
+ if (!file)
+ return 0;
/* find the correct processor instance */
while (fgets(str, sizeof(str), file) != NULL) {
diff --git a/platform/linux-generic/include/odp_sysinfo_internal.h b/platform/linux-generic/include/odp_sysinfo_internal.h
index 2f01d18e..49254230 100644
--- a/platform/linux-generic/include/odp_sysinfo_internal.h
+++ b/platform/linux-generic/include/odp_sysinfo_internal.h
@@ -12,12 +12,31 @@ extern "C" {
#endif
#include <odp_global_data.h>
+#include <odp_debug_internal.h>
+#include <string.h>
+
+#define DUMMY_MAX_MHZ 1400
int cpuinfo_parser(FILE *file, system_info_t *sysinfo);
uint64_t odp_cpu_hz_current(int id);
uint64_t odp_cpu_arch_hz_current(int id);
void sys_info_print_arch(void);
+static inline int _odp_dummy_cpuinfo(system_info_t *sysinfo)
+{
+ int i;
+
+ ODP_DBG("Warning: use dummy values for freq and model string\n");
+ for (i = 0; i < CONFIG_NUM_CPU; i++) {
+ ODP_PRINT("WARN: cpu[%i] uses dummy max frequency %u MHz\n",
+ i, DUMMY_MAX_MHZ);
+ sysinfo->cpu_hz_max[i] = DUMMY_MAX_MHZ * 1000000;
+ strcpy(sysinfo->model_str[i], "UNKNOWN");
+ }
+
+ return 0;
+}
+
#ifdef __cplusplus
}
#endif
diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c
index 733c3528..a7a78d27 100644
--- a/platform/linux-generic/odp_system_info.c
+++ b/platform/linux-generic/odp_system_info.c
@@ -96,6 +96,8 @@ static uint64_t default_huge_page_size(void)
FILE *file;
file = fopen("/proc/meminfo", "rt");
+ if (!file)
+ return 0;
while (fgets(str, sizeof(str), file) != NULL) {
if (sscanf(str, "Hugepagesize: %8lu kB", &sz) == 1) {
@@ -352,16 +354,15 @@ int odp_system_info_init(void)
}
file = fopen("/proc/cpuinfo", "rt");
- if (file == NULL) {
- ODP_ERR("Failed to open /proc/cpuinfo\n");
- return -1;
+ if (file != NULL) {
+ /* Read CPU model, and set max cpu frequency
+ * if not set from cpufreq. */
+ cpuinfo_parser(file, &odp_global_ro.system_info);
+ fclose(file);
+ } else {
+ _odp_dummy_cpuinfo(&odp_global_ro.system_info);
}
- /* Read CPU model, and set max cpu frequency if not set from cpufreq. */
- cpuinfo_parser(file, &odp_global_ro.system_info);
-
- fclose(file);
-
if (systemcpu(&odp_global_ro.system_info)) {
ODP_ERR("systemcpu failed\n");
return -1;
commit f913948f5daa4cb1f71467d872b5380974b04f2d
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Oct 24 09:12:20 2018 +0300
linux-gen: ishm: use pre-reserved single va memory
Reserve single VA memory in global init instead of only allocating the
address space. Allocating only the address space doesn't work if shm blocks
are reserved after ODP process has been forked.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/.travis.yml b/.travis.yml
index 5d958cb4..ec307645 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -215,7 +215,7 @@ jobs:
- true
script:
- if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
- - docker run -i -t -v `pwd`:/odp
+ - docker run -i -t -v `pwd`:/odp --shm-size 8g
-e CC="${CC}"
${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${ARCH}.sh
- stage: "build only"
@@ -224,7 +224,7 @@ jobs:
- true
script:
- if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
- - docker run -i -t -v `pwd`:/odp
+ - docker run -i -t -v `pwd`:/odp --shm-size 8g
-e CC="${CC}"
${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${ARCH}.sh
- stage: "build only"
@@ -233,7 +233,7 @@ jobs:
- true
script:
- if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
- - docker run -i -t -v `pwd`:/odp
+ - docker run -i -t -v `pwd`:/odp
-e CC="${CC}"
${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${ARCH}.sh
- stage: "build only"
@@ -242,7 +242,7 @@ jobs:
- true
script:
- if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
- - docker run -i -t -v `pwd`:/odp
+ - docker run -i -t -v `pwd`:/odp --shm-size 8g
-e CC="${CC}"
${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${ARCH}.sh
- stage: test
diff --git a/platform/linux-generic/include/odp_ishmphy_internal.h b/platform/linux-generic/include/odp_ishmphy_internal.h
index 05e3fcec..2bc9911c 100644
--- a/platform/linux-generic/include/odp_ishmphy_internal.h
+++ b/platform/linux-generic/include/odp_ishmphy_internal.h
@@ -13,9 +13,9 @@ extern "C" {
#include <stdint.h>
-void *_odp_ishmphy_book_va(uintptr_t len, intptr_t align);
-int _odp_ishmphy_unbook_va(void);
-void *_odp_ishmphy_map(int fd, void *start, uint64_t size, int flags);
+void *_odp_ishmphy_reserve_single_va(uint64_t len, int fd);
+int _odp_ishmphy_free_single_va(void);
+void *_odp_ishmphy_map(int fd, uint64_t size, uint64_t offset, int flags);
int _odp_ishmphy_unmap(void *start, uint64_t len, int flags);
#ifdef __cplusplus
diff --git a/platform/linux-generic/include/odp_shm_internal.h b/platform/linux-generic/include/odp_shm_internal.h
index 9da5082d..c98f07de 100644
--- a/platform/linux-generic/include/odp_shm_internal.h
+++ b/platform/linux-generic/include/odp_shm_internal.h
@@ -38,7 +38,7 @@ odp_shm_t _odp_shm_reserve(const char *name, uint64_t size, uint32_t align,
uint32_t flags, uint32_t extra_flags);
int _odp_ishm_reserve(const char *name, uint64_t size, int fd, uint32_t align,
- uint32_t flags, uint32_t user_flags);
+ uint64_t offset, uint32_t flags, uint32_t user_flags);
int _odp_ishm_free_by_index(int block_index);
int _odp_ishm_lookup_by_name(const char *name);
int _odp_ishm_find_exported(const char *remote_name,
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index 816f5fb0..eea527db 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -14,32 +14,20 @@
* internal shared memory is guaranteed to always be located at the same virtual
* address, i.e. pointers to internal shared memory are fully shareable
* between odp threads (regardless of thread type or fork time) in that case.
- * Internal shared memory is mainly meant to be used internaly within ODP
+ * Internal shared memory is mainly meant to be used internally within ODP
* (hence its name), but may also be allocated by odp applications and drivers,
* in the future (through these interfaces).
* To guarantee this full pointer shareability (when reserved with the
- * _ODP_ISHM_SINGLE_VA flag) internal shared memory is handled as follows:
- * At global_init time, a huge virtual address space reservation is performed.
- * Note that this is just reserving virtual space, not physical memory.
+ * _ODP_ISHM_SINGLE_VA flag) the whole internal shared memory area is reserved
+ * at global_init time.
* Because all ODP threads (pthreads or processes) are descendants of the ODP
- * instantiation process, this VA space is inherited by all ODP threads.
- * When internal shmem reservation actually occurs, and
- * when reserved with the _ODP_ISHM_SINGLE_VA flag, physical memory is
- * allocated, and mapped (MAP_FIXED) to some part in the huge preallocated
- * address space area:
- * because this virtual address space is common to all ODP threads, we
- * know this mapping will succeed, and not clash with anything else.
- * Hence, an ODP threads which perform a lookup for the same ishm block
- * can map it at the same VA address.
- * When internal shared memory is released, the physical memory is released
- * and the corresponding virtual space returned to its "pool" of preallocated
- * virtual space (assuming it was allocated from there).
- * Note, though, that, if 2 linux processes share the same ishm block,
- * the virtual space is marked as released as soon as one of the processes
- * releases the ishm block, but the physical memory space is actually released
- * by the kernel once all processes have done a ishm operation (i,e. a sync).
- * This is due to the fact that linux does not contain any syscall to unmap
- * memory from a different process.
+ * instantiation process, this address space is inherited by all ODP threads.
+ * When internal shmem reservation actually occurs, and when reserved with the
+ * _ODP_ISHM_SINGLE_VA flag, memory is allocated from the pre-reserved single
+ * VA memory.
+ * When an internal shared memory block is released, the memory is returned to
+ * its "pool" of pre-reserved memory (assuming it was allocated from there). The
+ * memory is not returned back to kernel until odp_term_global().
*
* This file contains functions to handle the VA area (handling fragmentation
* and defragmentation resulting from different allocs/release) and also
@@ -145,6 +133,8 @@
#define EXPORT_FILE_LINE6_FMT "user_length: %" PRIu64
#define EXPORT_FILE_LINE7_FMT "user_flags: %" PRIu32
#define EXPORT_FILE_LINE8_FMT "align: %" PRIu32
+#define EXPORT_FILE_LINE9_FMT "offset: %" PRIu64
+
/*
* A fragment describes a piece of the shared virtual address space,
* and is allocated only when allocation is done with the _ODP_ISHM_SINGLE_VA
@@ -181,6 +171,7 @@ typedef struct ishm_block {
uint32_t flags; /* block creation flags. */
uint32_t external_fd:1; /* block FD was externally provided */
uint64_t user_len; /* length, as requested at reserve time. */
+ uint64_t offset; /* offset from beginning of the fd */
void *start; /* only valid if _ODP_ISHM_SINGLE_VA is set*/
uint64_t len; /* length. multiple of page size. 0 if free*/
ishm_fragment_t *fragment; /* used when _ODP_ISHM_SINGLE_VA is used */
@@ -201,6 +192,10 @@ typedef struct {
uint64_t dev_seq; /* used when creating device names */
uint32_t odpthread_cnt; /* number of running ODP threads */
ishm_block_t block[ISHM_MAX_NB_BLOCKS];
+ void *single_va_start; /* start of single VA memory */
+ int single_va_fd; /* single VA memory file descriptor */
+ odp_bool_t single_va_huge; /* single VA memory from huge pages */
+ char single_va_filename[ISHM_FILENAME_MAXLEN];
} ishm_table_t;
static ishm_table_t *ishm_tbl;
@@ -290,7 +285,7 @@ static int hp_create_file(uint64_t len, const char *filename)
}
/* commit huge page */
- addr = _odp_ishmphy_map(fd, NULL, len, 0);
+ addr = _odp_ishmphy_map(fd, len, 0, 0);
if (addr == NULL) {
/* no more pages available */
close(fd);
@@ -457,7 +452,8 @@ static void *alloc_fragment(uintptr_t size, int block_index, intptr_t align,
}
if (!(*best_fragmnt)) {
- ODP_ERR("unable to get virtual address for shmem block!\n.");
+ ODP_ERR("Out of single VA memory. Try increasing "
+ "'shm.single_va_size_kb' in ODP config.\n");
return NULL;
}
@@ -579,31 +575,84 @@ static void free_fragment(ishm_fragment_t *fragmnt)
}
}
+static char *create_seq_string(char *output, size_t size)
+{
+ snprintf(output, size, "%08" PRIu64, ishm_tbl->dev_seq++);
+
+ return output;
+}
+
+static int create_export_file(ishm_block_t *new_block, const char *name,
+ uint64_t len, uint32_t flags, uint32_t align,
+ odp_bool_t single_va, uint64_t offset)
+{
+ FILE *export_file;
+
+ snprintf(new_block->exptname, ISHM_FILENAME_MAXLEN,
+ ISHM_EXPTNAME_FORMAT,
+ odp_global_ro.shm_dir,
+ odp_global_ro.uid,
+ odp_global_ro.main_pid,
+ name);
+ export_file = fopen(new_block->exptname, "w");
+ if (export_file == NULL) {
+ ODP_ERR("open failed: err=%s.\n",
+ strerror(errno));
+ new_block->exptname[0] = 0;
+ return -1;
+ }
+
+ fprintf(export_file, EXPORT_FILE_LINE1_FMT "\n");
+ fprintf(export_file, EXPORT_FILE_LINE2_FMT "\n", new_block->name);
+ if (single_va)
+ fprintf(export_file, EXPORT_FILE_LINE3_FMT "\n",
+ ishm_tbl->single_va_filename);
+ else
+ fprintf(export_file, EXPORT_FILE_LINE3_FMT "\n",
+ new_block->filename);
+
+ fprintf(export_file, EXPORT_FILE_LINE4_FMT "\n", len);
+ fprintf(export_file, EXPORT_FILE_LINE5_FMT "\n", flags);
+ fprintf(export_file, EXPORT_FILE_LINE6_FMT "\n",
+ new_block->user_len);
+ fprintf(export_file, EXPORT_FILE_LINE7_FMT "\n",
+ new_block->user_flags);
+ fprintf(export_file, EXPORT_FILE_LINE8_FMT "\n", align);
+ fprintf(export_file, EXPORT_FILE_LINE9_FMT "\n", offset);
+
+ fclose(export_file);
+
+ return 0;
+}
+
/*
* Create file with size len. returns -1 on error
* Creates a file to /dev/shm/odp-<pid>-<sequence_or_name> (for normal pages)
- * or /mnt/huge/odp-<pid>-<sequence_or_name> (for huge pages)
+ * or /mnt/huge/odp-<pid>-<sequence_or_name> (for huge pages).
* Return the new file descriptor, or -1 on error.
*/
static int create_file(int block_index, huge_flag_t huge, uint64_t len,
- uint32_t flags, uint32_t align)
+ uint32_t flags, uint32_t align, odp_bool_t single_va)
{
char *name;
int fd;
- ishm_block_t *new_block; /* entry in the main block table */
+ ishm_block_t *new_block = NULL; /* entry in the main block table */
char seq_string[ISHM_FILENAME_MAXLEN]; /* used to construct filename*/
char filename[ISHM_FILENAME_MAXLEN]; /* filename in /dev/shm or
* /mnt/huge */
int oflag = O_RDWR | O_CREAT | O_TRUNC; /* flags for open */
- FILE *export_file;
char dir[ISHM_FILENAME_MAXLEN];
- new_block = &ishm_tbl->block[block_index];
- name = new_block->name;
-
- /* create the filename: */
- snprintf(seq_string, ISHM_FILENAME_MAXLEN, "%08" PRIu64,
- ishm_tbl->dev_seq++);
+ /* No ishm_block_t for the master single VA memory file */
+ if (single_va) {
+ name = (char *)(uintptr_t)"single_va";
+ } else {
+ new_block = &ishm_tbl->block[block_index];
+ name = new_block->name;
+ if (!name || !name[0])
+ name = create_seq_string(seq_string,
+ ISHM_FILENAME_MAXLEN);
+ }
/* huge dir must be known to create files there!: */
if ((huge == HUGE) &&
@@ -619,11 +668,8 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len,
odp_global_ro.shm_dir,
odp_global_ro.uid);
- snprintf(filename, ISHM_FILENAME_MAXLEN,
- ISHM_FILENAME_FORMAT,
- dir,
- odp_global_ro.main_pid,
- (name && name[0]) ? name : seq_string);
+ snprintf(filename, ISHM_FILENAME_MAXLEN, ISHM_FILENAME_FORMAT, dir,
+ odp_global_ro.main_pid, name);
mkdir(dir, 0744);
@@ -643,38 +689,21 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len,
return -1;
}
+ /* No export file is created since this is only for internal use.*/
+ if (single_va) {
+ snprintf(ishm_tbl->single_va_filename, ISHM_FILENAME_MAXLEN,
+ "%s", filename);
+ return fd;
+ }
/* if _ODP_ISHM_EXPORT is set, create a description file for
* external ref:
*/
if (flags & _ODP_ISHM_EXPORT) {
memcpy(new_block->filename, filename, ISHM_FILENAME_MAXLEN);
- snprintf(new_block->exptname, ISHM_FILENAME_MAXLEN,
- ISHM_EXPTNAME_FORMAT,
- odp_global_ro.shm_dir,
- odp_global_ro.uid,
- odp_global_ro.main_pid,
- (name && name[0]) ? name : seq_string);
- export_file = fopen(new_block->exptname, "w");
- if (export_file == NULL) {
- ODP_ERR("open failed: err=%s.\n",
- strerror(errno));
- new_block->exptname[0] = 0;
- } else {
- fprintf(export_file, EXPORT_FILE_LINE1_FMT "\n");
- fprintf(export_file, EXPORT_FILE_LINE2_FMT "\n", name);
- fprintf(export_file, EXPORT_FILE_LINE3_FMT "\n",
- new_block->filename);
- fprintf(export_file, EXPORT_FILE_LINE4_FMT "\n", len);
- fprintf(export_file, EXPORT_FILE_LINE5_FMT "\n", flags);
- fprintf(export_file, EXPORT_FILE_LINE6_FMT "\n",
- new_block->user_len);
- fprintf(export_file, EXPORT_FILE_LINE7_FMT "\n",
- new_block->user_flags);
- fprintf(export_file, EXPORT_FILE_LINE8_FMT "\n", align);
-
- fclose(export_file);
- }
+
+ create_export_file(new_block, name, len, flags, align, false,
+ 0);
} else {
new_block->exptname[0] = 0;
/* remove the file from the filesystem, keeping its fd open */
@@ -687,8 +716,9 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len,
/* delete the files related to a given ishm block: */
static void delete_file(ishm_block_t *block)
{
- /* remove the .../odp-* file, unless fd was external: */
- if (block->filename[0] != 0)
+ /* remove the .../odp-* file, unless fd was external or single va */
+ if (block->filename[0] != 0 &&
+ strcmp(block->filename, ishm_tbl->single_va_filename))
unlink(block->filename);
/* also remove possible description file (if block was exported): */
if (block->exptname[0] != 0)
@@ -696,20 +726,18 @@ static void delete_file(ishm_block_t *block)
}
/*
- * performs the mapping, possibly allocating a fragment of the pre-reserved
- * VA space if the _ODP_ISHM_SINGLE_VA flag was given.
- * Sets fd, and returns the mapping address.
- * This function will also set the _ODP_ISHM_SINGLE_VA flag if the alignment
- * requires it
+ * Performs the mapping.
+ * Sets fd, and returns the mapping address. Not to be used with
+ * _ODP_ISHM_SINGLE_VA blocks.
* Mutex must be assured by the caller.
*/
static void *do_map(int block_index, uint64_t len, uint32_t align,
- uint32_t flags, huge_flag_t huge, int *fd)
+ uint64_t offset, uint32_t flags, huge_flag_t huge, int *fd)
{
ishm_block_t *new_block; /* entry in the main block table */
- void *addr = NULL;
void *mapped_addr;
- ishm_fragment_t *fragment = NULL;
+
+ ODP_ASSERT(!(flags & _ODP_ISHM_SINGLE_VA));
new_block = &ishm_tbl->block[block_index];
@@ -719,33 +747,16 @@ static void *do_map(int block_index, uint64_t len, uint32_t align,
* unless a fd was already given
*/
if (*fd < 0) {
- *fd = create_file(block_index, huge, len, flags, align);
+ *fd = create_file(block_index, huge, len, flags, align, false);
if (*fd < 0)
return NULL;
} else {
new_block->filename[0] = 0;
}
- /* allocate an address range in the prebooked VA area if needed */
- if (flags & _ODP_ISHM_SINGLE_VA) {
- addr = alloc_fragment(len, block_index, align, &fragment);
- if (!addr) {
- ODP_ERR("alloc_fragment failed.\n");
- if (!new_block->external_fd) {
- close(*fd);
- *fd = -1;
- delete_file(new_block);
- }
- return NULL;
- }
- new_block->fragment = fragment;
- }
-
/* try to mmap: */
- mapped_addr = _odp_ishmphy_map(*fd, addr, len, flags);
+ mapped_addr = _odp_ishmphy_map(*fd, len, offset, flags);
if (mapped_addr == NULL) {
- if (flags & _ODP_ISHM_SINGLE_VA)
- free_fragment(fragment);
if (!new_block->external_fd) {
close(*fd);
*fd = -1;
@@ -757,37 +768,87 @@ static void *do_map(int block_index, uint64_t len, uint32_t align,
return mapped_addr;
}
+/*
+ * Allocate block from pre-reserved single VA memory
+ */
+static void *alloc_single_va(const char *name, int new_index, uint64_t size,
+ uint32_t align, uint32_t flags, int *fd,
+ uint64_t *len_out)
+{
+ uint64_t len;
+ uint64_t page_sz;
+ char *file_name = (char *)(uintptr_t)name;
+ void *addr;
+ ishm_block_t *new_block = &ishm_tbl->block[new_index];
+ ishm_fragment_t *fragment = NULL;
+ char seq_string[ISHM_FILENAME_MAXLEN];
+
+ if (!file_name || !file_name[0])
+ file_name = create_seq_string(seq_string, ISHM_FILENAME_MAXLEN);
+
+ /* Common fd for all single VA blocks */
+ *fd = ishm_tbl->single_va_fd;
+
+ if (ishm_tbl->single_va_huge) {
+ page_sz = odp_sys_huge_page_size();
+ new_block->huge = HUGE;
+ } else {
+ page_sz = odp_sys_page_size();
+ new_block->huge = NORMAL;
+ }
+ new_block->filename[0] = 0;
+
+ len = (size + (page_sz - 1)) & (-page_sz);
+
+ if (align < page_sz)
+ align = page_sz;
+
+ /* Allocate memory from the pre-reserved single VA space */
+ addr = alloc_fragment(len, new_index, align, &fragment);
+ if (!addr) {
+ ODP_ERR("alloc_fragment failed.\n");
+ return NULL;
+ }
+ new_block->fragment = fragment;
+
+ /* Create export info file */
+ if (flags & _ODP_ISHM_EXPORT) {
+ uint64_t offset = (uintptr_t)addr -
+ (uintptr_t)ishm_tbl->single_va_start;
+ memcpy(new_block->filename, ishm_tbl->single_va_filename,
+ ISHM_FILENAME_MAXLEN);
+
+ create_export_file(new_block, file_name, len, flags, align,
+ true, offset);
+ } else {
+ new_block->exptname[0] = 0;
+ }
+
+ *len_out = len;
+ return addr;
+}
+
/*
* Performs an extra mapping (for a process trying to see an existing block
- * i.e. performing a lookup).
+ * i.e. performing a lookup). Not to be used with _ODP_ISHM_SINGLE_VA blocks.
* Mutex must be assured by the caller.
*/
static void *do_remap(int block_index, int fd)
{
void *mapped_addr;
- ishm_fragment_t *fragment;
uint64_t len;
+ uint64_t offset;
uint32_t flags;
len = ishm_tbl->block[block_index].len;
+ offset = ishm_tbl->block[block_index].offset;
flags = ishm_tbl->block[block_index].flags;
- if (flags & _ODP_ISHM_SINGLE_VA) {
- fragment = ishm_tbl->block[block_index].fragment;
- if (!fragment) {
- ODP_ERR("invalid fragment failure.\n");
- return NULL;
- }
-
- /* try to mmap: */
- mapped_addr = _odp_ishmphy_map(fd, fragment->start, len, flags);
- if (mapped_addr == NULL)
- return NULL;
- return mapped_addr;
- }
+ ODP_ASSERT(!(flags & _ODP_ISHM_SINGLE_VA));
/* try to mmap: */
- mapped_addr = _odp_ishmphy_map(fd, NULL, len, flags);
+ mapped_addr = _odp_ishmphy_map(fd, len, offset, flags);
+
if (mapped_addr == NULL)
return NULL;
@@ -795,8 +856,8 @@ static void *do_remap(int block_index, int fd)
}
/*
- * Performs unmapping, possibly freeing a prereserved VA space fragment,
- * if the _ODP_ISHM_SINGLE_VA flag was set at alloc time
+ * Performs unmapping, possibly freeing a pre-reserved single VA memory
+ * fragment, if the _ODP_ISHM_SINGLE_VA flag was set at alloc time.
* Mutex must be assured by the caller.
*/
static int do_unmap(void *start, uint64_t size, uint32_t flags,
@@ -876,7 +937,9 @@ static void procsync(void)
block = &ishm_tbl->block[ishm_proctable->entry[i].block_index];
if (ishm_proctable->entry[i].seq != block->seq) {
/* obsolete entry: free memory and remove proc entry */
- close(ishm_proctable->entry[i].fd);
+ if (ishm_proctable->entry[i].fd !=
+ ishm_tbl->single_va_fd)
+ close(ishm_proctable->entry[i].fd);
_odp_ishmphy_unmap(ishm_proctable->entry[i].start,
ishm_proctable->entry[i].len,
ishm_proctable->entry[i].flags);
@@ -912,6 +975,8 @@ static int block_free_internal(int block_index, int close_fd, int deregister)
proc_index = procfind_block(block_index);
if (proc_index >= 0) {
+ int fd = ishm_proctable->entry[proc_index].fd;
+
/* remove the mapping and possible fragment */
do_unmap(ishm_proctable->entry[proc_index].start,
block->len,
@@ -919,9 +984,7 @@ static int block_free_internal(int block_index, int close_fd, int deregister)
block_index);
/* close the related fd */
- if (close_fd) {
- int fd = ishm_proctable->entry[proc_index].fd;
-
+ if (close_fd && (fd != ishm_tbl->single_va_fd)) {
if (block->huge == CACHED)
hp_put_cached(fd);
else
@@ -966,7 +1029,8 @@ static int block_free_internal(int block_index, int close_fd, int deregister)
* main block table (>=0) or -1 on error.
*/
int _odp_ishm_reserve(const char *name, uint64_t size, int fd,
- uint32_t align, uint32_t flags, uint32_t user_flags)
+ uint32_t align, uint64_t offset, uint32_t flags,
+ uint32_t user_flags)
{
int new_index; /* index in the main block table*/
ishm_block_t *new_block; /* entry in the main block table*/
@@ -976,7 +1040,6 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd,
uint64_t len = 0; /* mapped length */
void *addr = NULL; /* mapping address */
int new_proc_entry;
- struct stat statbuf;
static int huge_error_printed; /* to avoid millions of error...*/
odp_spinlock_lock(&ishm_tbl->lock);
@@ -1011,24 +1074,20 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd,
else
new_block->name[0] = 0;
+ new_block->offset = 0;
+
/* save user data: */
new_block->user_flags = user_flags;
new_block->user_len = size;
/* If a file descriptor is provided, get the real size and map: */
if (fd >= 0) {
- if (fstat(fd, &statbuf) < 0) {
- odp_spinlock_unlock(&ishm_tbl->lock);
- ODP_ERR("_ishm_reserve failed (fstat failed: %s).\n",
- strerror(errno));
- __odp_errno = errno;
- return -1;
- }
- len = statbuf.st_size;
new_block->external_fd = 1;
- /* note that the huge page flag is meningless here as huge
+ len = size;
+ /* note that the huge page flag is meaningless here as huge
* page is determined by the provided file descriptor: */
- addr = do_map(new_index, len, align, flags, EXTERNAL, &fd);
+ addr = do_map(new_index, len, align, offset, flags, EXTERNAL,
+ &fd);
if (addr == NULL) {
odp_spinlock_unlock(&ishm_tbl->lock);
ODP_ERR("_ishm_reserve failed.\n");
@@ -1054,28 +1113,30 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd,
else
flags |= _ODP_ISHM_SINGLE_VA;
+ if (flags & _ODP_ISHM_SINGLE_VA)
+ goto use_single_va;
+
/* roundup to page size */
len = (size + (page_hp_size - 1)) & (-page_hp_size);
- if (!(flags & _ODP_ISHM_SINGLE_VA)) {
- /* try pre-allocated pages */
- fd = hp_get_cached(len);
- if (fd != -1) {
- /* do as if user provided a fd */
- new_block->external_fd = 1;
- addr = do_map(new_index, len, hp_align, flags,
- CACHED, &fd);
- if (addr == NULL) {
- ODP_ERR("Could not use cached hp %d\n",
- fd);
- hp_put_cached(fd);
- fd = -1;
- } else {
- new_block->huge = CACHED;
- }
+
+ /* try pre-allocated pages */
+ fd = hp_get_cached(len);
+ if (fd != -1) {
+ /* do as if user provided a fd */
+ new_block->external_fd = 1;
+ addr = do_map(new_index, len, hp_align, 0, flags,
+ CACHED, &fd);
+ if (addr == NULL) {
+ ODP_ERR("Could not use cached hp %d\n",
+ fd);
+ hp_put_cached(fd);
+ fd = -1;
+ } else {
+ new_block->huge = CACHED;
}
}
if (fd == -1) {
- addr = do_map(new_index, len, hp_align, flags, HUGE,
+ addr = do_map(new_index, len, hp_align, 0, flags, HUGE,
&fd);
if (addr == NULL) {
@@ -1103,18 +1164,27 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd,
else
flags |= _ODP_ISHM_SINGLE_VA;
+ if (flags & _ODP_ISHM_SINGLE_VA)
+ goto use_single_va;
+
/* roundup to page size */
len = (size + (page_sz - 1)) & (-page_sz);
- addr = do_map(new_index, len, align, flags, NORMAL, &fd);
+ addr = do_map(new_index, len, align, 0, flags, NORMAL, &fd);
new_block->huge = NORMAL;
}
+use_single_va:
+ /* Reserve memory from single VA space */
+ if (fd < 0 && (flags & _ODP_ISHM_SINGLE_VA))
+ addr = alloc_single_va(name, new_index, size, align, flags, &fd,
+ &len);
+
/* if neither huge pages or normal pages works, we cannot proceed: */
if ((fd < 0) || (addr == NULL) || (len == 0)) {
if (new_block->external_fd) {
if (new_block->huge == CACHED)
hp_put_cached(fd);
- } else if (fd >= 0) {
+ } else if (fd >= 0 && (fd != ishm_tbl->single_va_fd)) {
close(fd);
}
delete_file(new_block);
@@ -1151,6 +1221,65 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd,
return new_index;
}
+/*
+ * Pre-reserve all single VA memory. Called only in global init.
+ */
+static void *reserve_single_va(uint64_t size, int *fd_out)
+{
+ uint64_t page_sz; /* normal page size. usually 4K*/
+ uint64_t page_hp_size; /* huge page size */
+ uint64_t len; /* mapped length */
+ int fd = -1;
+ void *addr = NULL;
+
+ /* Get system page sizes: page_hp_size is 0 if no huge page available*/
+ page_sz = odp_sys_page_size();
+ page_hp_size = odp_sys_huge_page_size();
+
+ /* Try first huge pages when possible and needed: */
+ if (page_hp_size && (size > page_sz)) {
+ /* roundup to page size */
+ len = (size + (page_hp_size - 1)) & (-page_hp_size);
+ fd = create_file(-1, HUGE, len, 0, 0, true);
+ if (fd >= 0) {
+ addr = _odp_ishmphy_reserve_single_va(len, fd);
+ if (!addr) {
+ close(fd);
+ unlink(ishm_tbl->single_va_filename);
+ fd = -1;
+ }
+ }
+ if (fd < 0)
+ ODP_ERR("No huge pages, fall back to normal pages. "
+ "Check: /proc/sys/vm/nr_hugepages.\n");
+ ishm_tbl->single_va_huge = true;
+ }
+
+ /* Fall back to normal pages if necessary */
+ if (fd < 0) {
+ /* roundup to page size */
+ len = (size + (page_sz - 1)) & (-page_sz);
+
+ fd = create_file(-1, NORMAL, len, 0, 0, true);
+ if (fd >= 0)
+ addr = _odp_ishmphy_reserve_single_va(len, fd);
+ ishm_tbl->single_va_huge = false;
+ }
+
+ /* If neither huge pages or normal pages works, we cannot proceed: */
+ if ((fd < 0) || (len == 0) || !addr) {
+ if (fd >= 0) {
+ close(fd);
+ unlink(ishm_tbl->single_va_filename);
+ }
+ ODP_ERR("Reserving single VA memory failed.\n");
+ return NULL;
+ }
+
+ *fd_out = fd;
+ return addr;
+}
+
/*
* Try to map an memory block mapped by another ODP instance into the
* current ODP instance.
@@ -1166,6 +1295,7 @@ int _odp_ishm_find_exported(const char *remote_name, pid_t external_odp_pid,
uint64_t len;
uint32_t flags;
uint64_t user_len;
+ uint64_t offset;
uint32_t user_flags;
uint32_t align;
int fd;
@@ -1210,6 +1340,9 @@ int _odp_ishm_find_exported(const char *remote_name, pid_t external_odp_pid,
if (fscanf(export_file, EXPORT_FILE_LINE8_FMT " ", &align) != 1)
goto error_exp_file;
+ if (fscanf(export_file, EXPORT_FILE_LINE9_FMT " ", &offset) != 1)
+ goto error_exp_file;
+
fclose(export_file);
/* now open the filename given in the description file: */
@@ -1220,16 +1353,22 @@ int _odp_ishm_find_exported(const char *remote_name, pid_t external_odp_pid,
return -1;
}
- /* clear the _ODP_ISHM_EXPORT flag so we don't export that again*/
+ /* Clear the _ODP_ISHM_EXPORT flag so we don't export again. Single
+ * VA doesn't hold up after export. */
flags &= ~(uint32_t)_ODP_ISHM_EXPORT;
+ flags &= ~(uint32_t)_ODP_ISHM_SINGLE_VA;
/* reserve the memory, providing the opened file descriptor: */
- block_index = _odp_ishm_reserve(local_name, 0, fd, align, flags, 0);
+ block_index = _odp_ishm_reserve(local_name, len, fd, align, offset,
+ flags, 0);
if (block_index < 0) {
close(fd);
return block_index;
}
+ /* Offset is required to remap the block to other processes */
+ ishm_tbl->block[block_index].offset = offset;
+
/* set inherited info: */
ishm_tbl->block[block_index].user_flags = user_flags;
ishm_tbl->block[block_index].user_len = user_len;
@@ -1307,7 +1446,12 @@ static void *block_lookup(int block_index)
/* perform the mapping */
block = &ishm_tbl->block[block_index];
- mapped_addr = do_remap(block_index, fd);
+ /* No need to remap single VA */
+ if (block->flags & _ODP_ISHM_SINGLE_VA)
+ mapped_addr = block->start;
+ else
+ mapped_addr = do_remap(block_index, fd);
+
if (mapped_addr == NULL) {
ODP_ERR(" lookup: Could not map existing shared memory!\n");
return NULL;
@@ -1490,12 +1634,11 @@ int _odp_ishm_cleanup_files(const char *dirpath)
int _odp_ishm_init_global(const odp_init_t *init)
{
void *addr;
- void *spce_addr;
+ void *spce_addr = NULL;
int i;
int single_va_size_kb = 0;
uid_t uid;
char *hp_dir = odp_global_ro.hugepage_info.default_huge_page_dir;
- uint64_t align;
uint64_t max_memory;
uint64_t internal;
@@ -1542,11 +1685,9 @@ int _odp_ishm_init_global(const odp_init_t *init)
if (!hp_dir) {
ODP_DBG("NOTE: No support for huge pages\n");
- align = odp_sys_page_size();
} else {
ODP_DBG("Huge pages mount point is: %s\n", hp_dir);
_odp_ishm_cleanup_files(hp_dir);
- align = odp_sys_huge_page_size();
}
_odp_ishm_cleanup_files(odp_global_ro.shm_dir);
@@ -1574,14 +1715,16 @@ int _odp_ishm_init_global(const odp_init_t *init)
ishm_ftbl = addr;
memset(ishm_ftbl, 0, sizeof(ishm_ftable_t));
- /*
- *reserve the address space for _ODP_ISHM_SINGLE_VA reserved blocks,
- * only address space!
- */
- spce_addr = _odp_ishmphy_book_va(max_memory, align);
- if (!spce_addr) {
- ODP_ERR("unable to reserve virtual space\n.");
- goto init_glob_err3;
+ /* Reserve memory for _ODP_ISHM_SINGLE_VA reserved blocks */
+ ishm_tbl->single_va_fd = -1;
+ if (max_memory) {
+ spce_addr = reserve_single_va(max_memory,
+ &ishm_tbl->single_va_fd);
+ if (!spce_addr) {
+ ODP_ERR("unable to reserve single VA memory\n.");
+ goto init_glob_err3;
+ }
+ ishm_tbl->single_va_start = spce_addr;
}
/* use the first fragment descriptor to describe to whole VA space: */
@@ -1621,8 +1764,8 @@ int _odp_ishm_init_global(const odp_init_t *init)
return 0;
init_glob_err4:
- if (_odp_ishmphy_unbook_va())
- ODP_ERR("unable to unbook virtual space\n.");
+ if (_odp_ishmphy_free_single_va())
+ ODP_ERR("unable to free single VA memory\n.");
init_glob_err3:
if (munmap(ishm_ftbl, sizeof(ishm_ftable_t)) < 0)
ODP_ERR("unable to munmap main fragment table\n.");
@@ -1720,6 +1863,7 @@ int _odp_ishm_term_global(void)
{
int ret = 0;
int index;
+ int fd = ishm_tbl->single_va_fd;
ishm_block_t *block;
if ((getpid() != odp_global_ro.main_pid) ||
@@ -1741,6 +1885,9 @@ int _odp_ishm_term_global(void)
/* perform the last thread terminate which was postponed: */
ret = do_odp_ishm_term_local();
+ /* remove the file from the filesystem, keeping its fd open */
+ unlink(ishm_tbl->single_va_filename);
+
/* free the fragment table */
if (munmap(ishm_ftbl, sizeof(ishm_ftable_t)) < 0) {
ret |= -1;
@@ -1752,9 +1899,13 @@ int _odp_ishm_term_global(void)
ODP_ERR("unable to munmap main table\n.");
}
- /* free the reserved VA space */
- if (_odp_ishmphy_unbook_va())
+ /* free the reserved single VA memory */
+ if (_odp_ishmphy_free_single_va())
ret |= -1;
+ if ((fd >= 0) && close(fd)) {
+ ret |= -1;
+ ODP_ERR("unable to close single VA\n.");
+ }
if (!odp_global_ro.shm_dir_from_env)
free(odp_global_ro.shm_dir);
diff --git a/platform/linux-generic/odp_ishmphy.c b/platform/linux-generic/odp_ishmphy.c
index 556c8e14..65e0cc82 100644
--- a/platform/linux-generic/odp_ishmphy.c
+++ b/platform/linux-generic/odp_ishmphy.c
@@ -30,6 +30,7 @@
#include <fcntl.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <inttypes.h>
#include <odp_ishmphy_internal.h>
static void *common_va_address;
@@ -39,112 +40,72 @@ static uint64_t common_va_len;
#define MAP_ANONYMOUS MAP_ANON
#endif
-/* Book some virtual address space
- * This function is called at odp_init_global() time to pre-book some
- * virtual address space inherited by all odpthreads (i.e. descendant
- * processes and threads) and later used to guarantee the unicity the
- * the mapping VA address when memory is reserver with the _ODP_ISHM_SINGLE_VA
- * flag.
+/* Reserve single VA memory
+ * This function is called at odp_init_global() time to pre-reserve some memory
+ * which is inherited by all odpthreads (i.e. descendant processes and threads).
+ * This memory block is later used when memory is reserved with
+ * _ODP_ISHM_SINGLE_VA flag.
* returns the address of the mapping or NULL on error.
*/
-void *_odp_ishmphy_book_va(uintptr_t len, intptr_t align)
+void *_odp_ishmphy_reserve_single_va(uint64_t len, int fd)
{
void *addr;
- addr = mmap(NULL, len + align, PROT_NONE,
- MAP_SHARED | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);
+ addr = mmap(NULL, len, PROT_READ | PROT_WRITE,
+ MAP_SHARED | MAP_POPULATE, fd, 0);
if (addr == MAP_FAILED) {
- ODP_ERR("_ishmphy_book_va failure\n");
+ ODP_ERR("mmap failed: %s\n", strerror(errno));
return NULL;
}
- if (mprotect(addr, len, PROT_NONE))
- ODP_ERR("failure for protect\n");
+ if (mprotect(addr, len, PROT_READ | PROT_WRITE))
+ ODP_ERR("mprotect failed: %s\n", strerror(errno));
- ODP_DBG("VA Reserved: %p, len=%p\n", addr, len + align);
+ ODP_DBG("VA Reserved: %p, len=%" PRIu64 "\n", addr, len);
common_va_address = addr;
common_va_len = len;
- /* return the nearest aligned address: */
- return (void *)(((uintptr_t)addr + align - 1) & (-align));
+ return addr;
}
-/* Un-book some virtual address space
- * This function is called at odp_term_global() time to unbook
- * the virtual address space booked by _ishmphy_book_va()
+/* Free single VA memory
+ * This function is called at odp_term_global() time to free the memory reserved
+ * by _odp_ishmphy_reserve_single_va()
*/
-int _odp_ishmphy_unbook_va(void)
+int _odp_ishmphy_free_single_va(void)
{
int ret;
+ if (!common_va_address)
+ return 0;
+
ret = munmap(common_va_address, common_va_len);
if (ret)
- ODP_ERR("_unishmphy_book_va failure\n");
+ ODP_ERR("munmap failed: %s\n", strerror(errno));
return ret;
}
/*
* do a mapping:
* Performs a mapping of the provided file descriptor to the process VA
- * space. If the _ODP_ISHM_SINGLE_VA flag is set, 'start' is assumed to be
- * the VA address where the mapping is to be done.
- * If the flag is not set, a new VA address is taken.
+ * space. Not to be used with _ODP_ISHM_SINGLE_VA blocks.
* returns the address of the mapping or NULL on error.
*/
-void *_odp_ishmphy_map(int fd, void *start, uint64_t size,
- int flags)
+void *_odp_ishmphy_map(int fd, uint64_t size, uint64_t offset, int flags)
{
- void *mapped_addr_tmp, *mapped_addr;
+ void *mapped_addr;
int mmap_flags = MAP_POPULATE;
- if (flags & _ODP_ISHM_SINGLE_VA) {
- if (!start) {
- ODP_ERR("failure: missing address\n");
- return NULL;
- }
- /* maps over fragment of reserved VA: */
- /* first, try a normal map. If that works, remap it where it
- * should (on the prereverved space), and remove the initial
- * normal mapping:
- * This is because it turned out that if a mapping fails
- * on a the prereserved virtual address space, then
- * the prereserved address space which was tried to be mapped
- * on becomes available to the kernel again! This was not
- * according to expectations: the assumption was that if a
- * mapping fails, the system should remain unchanged, but this
- * is obvioulsy not true (at least for huge pages when
- * exhausted).
- * So the strategy is to first map at a non reserved place
- * (which can then be freed and returned to the kernel on
- * failure) and peform a new map to the prereserved space on
- * success (which is then guaranteed to work).
- * The initial free maping can then be removed.
- */
- mapped_addr = MAP_FAILED;
- mapped_addr_tmp = mmap(NULL, size, PROT_READ | PROT_WRITE,
- MAP_SHARED | mmap_flags, fd, 0);
- if (mapped_addr_tmp != MAP_FAILED) {
- /* If OK, do new map at right fixed location... */
- mapped_addr = mmap(start,
- size, PROT_READ | PROT_WRITE,
- MAP_SHARED | MAP_FIXED | mmap_flags,
- fd, 0);
- if (mapped_addr != start)
- ODP_ERR("new map failed:%s\n", strerror(errno));
- /* ... and remove initial mapping: */
- if (munmap(mapped_addr_tmp, size))
- ODP_ERR("munmap failed:%s\n", strerror(errno));
- }
- } else {
- /* just do a new mapping in the VA space: */
- mapped_addr = mmap(NULL, size, PROT_READ | PROT_WRITE,
- MAP_SHARED | mmap_flags, fd, 0);
- if ((mapped_addr >= common_va_address) &&
- ((char *)mapped_addr <
- (char *)common_va_address + common_va_len)) {
- ODP_ERR("VA SPACE OVERLAP!\n");
- }
+ ODP_ASSERT(!(flags & _ODP_ISHM_SINGLE_VA));
+
+ /* do a new mapping in the VA space: */
+ mapped_addr = mmap(NULL, size, PROT_READ | PROT_WRITE,
+ MAP_SHARED | mmap_flags, fd, offset);
+ if ((mapped_addr >= common_va_address) &&
+ ((char *)mapped_addr <
+ (char *)common_va_address + common_va_len)) {
+ ODP_ERR("VA SPACE OVERLAP!\n");
}
if (mapped_addr == MAP_FAILED)
@@ -153,9 +114,9 @@ void *_odp_ishmphy_map(int fd, void *start, uint64_t size,
/* if locking is requested, lock it...*/
if (flags & _ODP_ISHM_LOCK) {
if (mlock(mapped_addr, size)) {
+ ODP_ERR("mlock failed: %s\n", strerror(errno));
if (munmap(mapped_addr, size))
- ODP_ERR("munmap failed:%s\n", strerror(errno));
- ODP_ERR("mlock failed:%s\n", strerror(errno));
+ ODP_ERR("munmap failed: %s\n", strerror(errno));
return NULL;
}
}
@@ -163,44 +124,25 @@ void *_odp_ishmphy_map(int fd, void *start, uint64_t size,
}
/* free a mapping:
- * If the _ODP_ISHM_SINGLE_VA flag was given at creation time the virtual
- * address range must be returned to the preoallocated "pool". this is
- * done by mapping non accessibly memory there (hence blocking the VA but
- * releasing the physical memory).
- * If the _ODP_ISHM_SINGLE_VA flag was not given, both physical memory and
- * virtual address space are realeased by calling the normal munmap.
+ * _ODP_ISHM_SINGLE_VA memory is not returned back to linux until global
+ * terminate. If the _ODP_ISHM_SINGLE_VA flag was not given, both physical
+ * memory and virtual address space are released by calling the normal munmap.
* return 0 on success or -1 on error.
*/
int _odp_ishmphy_unmap(void *start, uint64_t len, int flags)
{
- void *addr;
int ret;
- int mmap_flgs;
-
- mmap_flgs = MAP_SHARED | MAP_FIXED | MAP_ANONYMOUS | MAP_NORESERVE;
/* if locking was requested, unlock...*/
if (flags & _ODP_ISHM_LOCK)
munlock(start, len);
- if (flags & _ODP_ISHM_SINGLE_VA) {
- /* map unnaccessible memory overwrites previous mapping
- * and free the physical memory, but guarantees to block
- * the VA range from other mappings
- */
- addr = mmap(start, len, PROT_NONE, mmap_flgs, -1, 0);
- if (addr == MAP_FAILED) {
- ODP_ERR("_ishmphy_free failure for ISHM_SINGLE_VA\n");
- return -1;
- }
- if (mprotect(start, len, PROT_NONE))
- ODP_ERR("_ishmphy_free failure for protect\n");
+ if (flags & _ODP_ISHM_SINGLE_VA)
return 0;
- }
/* just release the mapping */
ret = munmap(start, len);
if (ret)
- ODP_ERR("_ishmphy_free failure: %s\n", strerror(errno));
+ ODP_ERR("munmap failed: %s\n", strerror(errno));
return ret;
}
diff --git a/platform/linux-generic/odp_ishmpool.c b/platform/linux-generic/odp_ishmpool.c
index 56e59f33..9a4e08fa 100644
--- a/platform/linux-generic/odp_ishmpool.c
+++ b/platform/linux-generic/odp_ishmpool.c
@@ -223,7 +223,7 @@ static pool_t *_odp_ishmbud_pool_create(const char *pool_name, int store_idx,
/* allocate required memory: */
blk_idx = _odp_ishm_reserve(pool_name, total_sz, -1,
- ODP_CACHE_LINE_SIZE, flags, 0);
+ ODP_CACHE_LINE_SIZE, 0, flags, 0);
if (blk_idx < 0) {
ODP_ERR("_odp_ishm_reserve failed.");
return NULL;
@@ -558,7 +558,7 @@ static pool_t *_odp_ishmslab_pool_create(const char *pool_name, int store_idx,
/* allocate required memory: */
blk_idx = _odp_ishm_reserve(pool_name, total_sz, -1,
- ODP_CACHE_LINE_SIZE, flags, 0);
+ ODP_CACHE_LINE_SIZE, 0, flags, 0);
if (blk_idx < 0) {
ODP_ERR("_odp_ishm_reserve failed.");
return NULL;
diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c
index 4e92c9f2..b1bbdeb7 100644
--- a/platform/linux-generic/odp_shared_memory.c
+++ b/platform/linux-generic/odp_shared_memory.c
@@ -53,7 +53,7 @@ odp_shm_t _odp_shm_reserve(const char *name, uint64_t size, uint32_t align,
flgs = get_ishm_flags(flags);
flgs |= extra_flags;
- block_index = _odp_ishm_reserve(name, size, -1, align, flgs, flags);
+ block_index = _odp_ishm_reserve(name, size, -1, align, 0, flgs, flags);
if (block_index >= 0)
return to_handle(block_index);
else
diff --git a/platform/linux-generic/test/validation/api/shmem/shmem_linux.c b/platform/linux-generic/test/validation/api/shmem/shmem_linux.c
index 2bc7f1bd..6b09c1de 100644
--- a/platform/linux-generic/test/validation/api/shmem/shmem_linux.c
+++ b/platform/linux-generic/test/validation/api/shmem/shmem_linux.c
@@ -110,7 +110,8 @@
static int read_shmem_attribues(uint64_t ext_odp_pid, const char *blockname,
char *filename, uint64_t *len,
uint32_t *flags, uint64_t *user_len,
- uint32_t *user_flags, uint32_t *align)
+ uint32_t *user_flags, uint32_t *align,
+ uint64_t *offset)
{
char shm_attr_filename[PATH_MAX];
FILE *export_file;
@@ -151,6 +152,9 @@ static int read_shmem_attribues(uint64_t ext_odp_pid, const char *blockname,
if (fscanf(export_file, "align: %" PRIu32 " ", align) != 1)
goto export_file_read_err;
+ if (fscanf(export_file, "offset: %" PRIu64 " ", offset) != 1)
+ goto export_file_read_err;
+
fclose(export_file);
return 0;
@@ -209,6 +213,7 @@ int main(int argc __attribute__((unused)), char *argv[])
int fifo_fd = -1;
char shm_filename[PATH_MAX];/* shared mem device name, under /dev/shm */
uint64_t len;
+ uint64_t offset;
uint32_t flags;
uint64_t user_len;
uint32_t user_flags;
@@ -260,8 +265,9 @@ int main(int argc __attribute__((unused)), char *argv[])
/* read the shared memory attributes (includes the shm filename): */
if (read_shmem_attribues(odp_app1, SHM_NAME,
shm_filename, &len, &flags,
- &user_len, &user_flags, &align) != 0) {
- printf("erorr read_shmem_attribues\n");
+ &user_len, &user_flags, &align,
+ &offset) != 0) {
+ printf("error read_shmem_attribues\n");
test_failure(fifo_name, fifo_fd, odp_app1);
}
@@ -281,9 +287,10 @@ int main(int argc __attribute__((unused)), char *argv[])
*/
size = sizeof(test_shared_linux_data_t);
- addr = mmap(NULL, size, PROT_READ, MAP_SHARED, shm_fd, 0);
+ addr = mmap(NULL, size, PROT_READ, MAP_SHARED, shm_fd, offset);
if (addr == MAP_FAILED) {
- fprintf(stderr, "shmem_linux: map failed!\n");
+ fprintf(stderr, "shmem_linux: mmap failed: %s\n",
+ strerror(errno));
test_failure(fifo_name, fifo_fd, odp_app1);
}
commit f703d49c196a6c6c9d29d3c7b04c02d727795a2c
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Thu Nov 1 16:50:43 2018 +0200
linux-gen: ishm: read single va size from config
Simplify adjusting single VA memory size by moving the value to ODP config
(shm.single_va_size). The default size is dropped to 128MB to save memory.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf
index bca123bc..2be1fee7 100644
--- a/config/odp-linux-generic.conf
+++ b/config/odp-linux-generic.conf
@@ -33,6 +33,9 @@ shm: {
# When using process mode threads, this value should be set to 0
# because the current implementation won't work properly otherwise.
num_cached_hp = 0
+
+ # Amount of memory pre-reserved for ODP_SHM_SINGLE_VA usage in kilobytes
+ single_va_size_kb = 131072
}
# Pool options
diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h
index ae6426ef..b6c4329a 100644
--- a/platform/linux-generic/include/odp_config_internal.h
+++ b/platform/linux-generic/include/odp_config_internal.h
@@ -133,16 +133,6 @@ extern "C" {
*/
#define ODP_CONFIG_SHM_BLOCKS (ODP_CONFIG_POOLS + 48)
-/*
- * Size of the virtual address space pre-reserver for ISHM
- *
- * This is just virtual space preallocation size, not memory allocation.
- * This address space is used by ISHM to map things at a common address in
- * all ODP threads (when the _ODP_ISHM_SINGLE_VA flag is used).
- * In bytes.
- */
-#define ODP_CONFIG_ISHM_VA_PREALLOC_SZ (1024 * 1024 * 1024L)
-
/*
* Maximum event burst size
*
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index 78f1b183..816f5fb0 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -1492,11 +1492,23 @@ int _odp_ishm_init_global(const odp_init_t *init)
void *addr;
void *spce_addr;
int i;
+ int single_va_size_kb = 0;
uid_t uid;
char *hp_dir = odp_global_ro.hugepage_info.default_huge_page_dir;
uint64_t align;
- uint64_t max_memory = ODP_CONFIG_ISHM_VA_PREALLOC_SZ;
- uint64_t internal = ODP_CONFIG_ISHM_VA_PREALLOC_SZ / 8;
+ uint64_t max_memory;
+ uint64_t internal;
+
+ if (!_odp_libconfig_lookup_ext_int("shm", NULL, "single_va_size_kb",
+ &single_va_size_kb)) {
+ ODP_ERR("Unable to read single VA size from config\n");
+ return -1;
+ }
+
+ ODP_DBG("Shm single VA size: %dkB\n", single_va_size_kb);
+
+ max_memory = single_va_size_kb * 1024;
+ internal = max_memory / 8;
/* user requested memory size + some extra for internal use */
if (init && init->shm.max_memory)
diff --git a/platform/linux-generic/test/process-mode.conf b/platform/linux-generic/test/process-mode.conf
index 4bda6933..fffddcc5 100644
--- a/platform/linux-generic/test/process-mode.conf
+++ b/platform/linux-generic/test/process-mode.conf
@@ -4,4 +4,6 @@ config_file_version = "0.1.4"
# Shared memory options
shm: {
+ # Increase the amount of single VA memory
+ single_va_size_kb = 1048576
}
commit 5eb5837adf64b14e795483a6cdf4e83124c56be8
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Mon Nov 5 10:25:41 2018 +0200
validation: shmem: reduce the number of workers in single VA alloc test
Reduce the maximum number of threads in run_test_singleva_after_fork() test
to three (number of test cases). As each worker performs shm allocation the
test would fail eventually on high core count systems. The CU asserts are
changed to FATAL as the following check would cause segfault.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/shmem/shmem.c b/test/validation/api/shmem/shmem.c
index 5a262daf..91235851 100644
--- a/test/validation/api/shmem/shmem.c
+++ b/test/validation/api/shmem/shmem.c
@@ -468,7 +468,7 @@ static int run_test_singleva_after_fork(void *arg ODP_UNUSED)
size = sizeof(shared_test_data_small_t);
shm = odp_shm_reserve(glob_data->name[thr_index], size,
0, ODP_SHM_SINGLE_VA);
- CU_ASSERT(ODP_SHM_INVALID != shm);
+ CU_ASSERT_FATAL(ODP_SHM_INVALID != shm);
glob_data->shm[thr_index] = shm;
pattern_small = odp_shm_addr(shm);
CU_ASSERT_PTR_NOT_NULL(pattern_small);
@@ -480,7 +480,7 @@ static int run_test_singleva_after_fork(void *arg ODP_UNUSED)
size = sizeof(shared_test_data_medium_t);
shm = odp_shm_reserve(glob_data->name[thr_index], size,
0, ODP_SHM_SINGLE_VA);
- CU_ASSERT(ODP_SHM_INVALID != shm);
+ CU_ASSERT_FATAL(ODP_SHM_INVALID != shm);
glob_data->shm[thr_index] = shm;
pattern_medium = odp_shm_addr(shm);
CU_ASSERT_PTR_NOT_NULL(pattern_medium);
@@ -492,7 +492,7 @@ static int run_test_singleva_after_fork(void *arg ODP_UNUSED)
size = sizeof(shared_test_data_big_t);
shm = odp_shm_reserve(glob_data->name[thr_index], size,
0, ODP_SHM_SINGLE_VA);
- CU_ASSERT(ODP_SHM_INVALID != shm);
+ CU_ASSERT_FATAL(ODP_SHM_INVALID != shm);
glob_data->shm[thr_index] = shm;
pattern_big = odp_shm_addr(shm);
CU_ASSERT_PTR_NOT_NULL(pattern_big);
@@ -550,7 +550,7 @@ static void shmem_test_singleva_after_fork(void)
glob_data = odp_shm_addr(shm);
CU_ASSERT_PTR_NOT_NULL(glob_data);
- thrdarg.numthrds = odp_cpumask_default_worker(&unused, 0);
+ thrdarg.numthrds = odp_cpumask_default_worker(&unused, 3);
if (thrdarg.numthrds > MAX_WORKERS)
thrdarg.numthrds = MAX_WORKERS;
@@ -578,21 +578,21 @@ static void shmem_test_singleva_after_fork(void)
case 0:
pattern_small =
odp_shm_addr(glob_data->shm[thr_index]);
- CU_ASSERT_PTR_NOT_NULL(pattern_small);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(pattern_small);
for (i = 0; i < SMALL_MEM; i++)
CU_ASSERT(pattern_small->data[i] == i);
break;
case 1:
pattern_medium =
odp_shm_addr(glob_data->shm[thr_index]);
- CU_ASSERT_PTR_NOT_NULL(pattern_medium);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(pattern_medium);
for (i = 0; i < MEDIUM_MEM; i++)
CU_ASSERT(pattern_medium->data[i] == (i << 2));
break;
case 2:
pattern_big =
odp_shm_addr(glob_data->shm[thr_index]);
- CU_ASSERT_PTR_NOT_NULL(pattern_big);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(pattern_big);
for (i = 0; i < BIG_MEM; i++)
CU_ASSERT(pattern_big->data[i] == (i >> 2));
break;
commit 4964f08fa748eb61949fff147e930be72555d233
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 26 11:23:28 2018 +0300
validation: pool: add test for creating and using a pool after fork
Add a new test case where pool is created after a process has been already
forked. The created pool is shared amongst all test threads.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/pool/pool.c b/test/validation/api/pool/pool.c
index 71a1a284..0dbdd0dd 100644
--- a/test/validation/api/pool/pool.c
+++ b/test/validation/api/pool/pool.c
@@ -13,6 +13,15 @@
#define PKT_NUM 500
#define MAX_NUM_DEFAULT (10 * 1024 * 1024)
+typedef struct {
+ odp_barrier_t init_barrier;
+ odp_atomic_u32_t index;
+ uint32_t nb_threads;
+ odp_pool_t pool;
+} global_shared_mem_t;
+
+static global_shared_mem_t *global_mem;
+
static const int default_buffer_size = 1500;
static const int default_buffer_num = 1000;
@@ -424,6 +433,99 @@ static void pool_test_tmo_max_num(void)
CU_ASSERT(odp_pool_destroy(pool) == 0);
}
+static void buffer_alloc_loop(odp_pool_t pool, int num, int buffer_size)
+{
+ int allocs;
+
+ /* Allocate, modify, and free buffers */
+ for (allocs = 0; allocs < num;) {
+ odp_buffer_t buf;
+ uint8_t *data;
+ int i;
+
+ buf = odp_buffer_alloc(pool);
+ if (buf == ODP_BUFFER_INVALID)
+ continue;
+
+ data = odp_buffer_addr(buf);
+
+ for (i = 0; i < buffer_size; i++)
+ data[i] = i;
+
+ odp_buffer_free(buf);
+ allocs++;
+ }
+}
+
+static int run_pool_test_create_after_fork(void *arg ODP_UNUSED)
+{
+ int thr_index;
+
+ thr_index = odp_atomic_fetch_inc_u32(&global_mem->index);
+
+ /* Thread 0 allocates the shared pool */
+ if (thr_index == 0) {
+ odp_pool_t pool;
+ odp_pool_param_t param;
+
+ odp_pool_param_init(¶m);
+
+ param.type = ODP_POOL_BUFFER;
+ param.buf.size = default_buffer_size;
+ param.buf.align = ODP_CACHE_LINE_SIZE;
+ param.buf.num = default_buffer_num;
+
+ pool = odp_pool_create(NULL, ¶m);
+ CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+ global_mem->pool = pool;
+ }
+
+ odp_barrier_wait(&global_mem->init_barrier);
+
+ buffer_alloc_loop(global_mem->pool, default_buffer_num,
+ default_buffer_size);
+
+ return CU_get_number_of_failures();
+}
+
+static void pool_test_create_after_fork(void)
+{
+ odp_shm_t shm;
+ odp_cpumask_t unused;
+ pthrd_arg thrdarg;
+
+ /* No single VA required since reserve is done before fork */
+ shm = odp_shm_reserve(NULL, sizeof(global_shared_mem_t), 0, 0);
+ CU_ASSERT_FATAL(shm != ODP_SHM_INVALID);
+ global_mem = odp_shm_addr(shm);
+ CU_ASSERT_PTR_NOT_NULL_FATAL(global_mem);
+
+ thrdarg.numthrds = odp_cpumask_default_worker(&unused, 0);
+ if (thrdarg.numthrds > MAX_WORKERS)
+ thrdarg.numthrds = MAX_WORKERS;
+
+ global_mem->nb_threads = thrdarg.numthrds;
+ global_mem->pool = ODP_POOL_INVALID;
+ odp_barrier_init(&global_mem->init_barrier, thrdarg.numthrds + 1);
+ odp_atomic_init_u32(&global_mem->index, 0);
+
+ /* Fork here */
+ odp_cunit_thread_create(run_pool_test_create_after_fork, &thrdarg);
+
+ /* Wait until thread 0 has created the test pool */
+ odp_barrier_wait(&global_mem->init_barrier);
+
+ buffer_alloc_loop(global_mem->pool, default_buffer_num,
+ default_buffer_size);
+
+ /* Wait for all thread endings */
+ CU_ASSERT(odp_cunit_thread_exit(&thrdarg) >= 0);
+
+ CU_ASSERT(!odp_pool_destroy(global_mem->pool));
+
+ CU_ASSERT(!odp_shm_free(shm));
+}
+
odp_testinfo_t pool_suite[] = {
ODP_TEST_INFO(pool_test_create_destroy_buffer),
ODP_TEST_INFO(pool_test_create_destroy_packet),
@@ -436,6 +538,7 @@ odp_testinfo_t pool_suite[] = {
ODP_TEST_INFO(pool_test_buf_max_num),
ODP_TEST_INFO(pool_test_pkt_max_num),
ODP_TEST_INFO(pool_test_tmo_max_num),
+ ODP_TEST_INFO(pool_test_create_after_fork),
ODP_TEST_INFO_NULL,
};
commit 263a5bb884c3e274174b1d1e4e0ae497143b1f81
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Thu Oct 25 13:44:12 2018 +0300
linux-gen: ishm: move block memory mapping into _odp_ishm_address()
Move internal block memory mapping from odp_shm_lookup() to odp_shm_addr().
Calling odp_shm_addr() is mandatory when sharing shm blocks
(not ODP_SHM_SINGLE_VA) between ODP processes. Calling odp_shm_lookup() is
optional.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index f73aea37..78f1b183 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -1328,9 +1328,8 @@ static void *block_lookup(int block_index)
/*
* Lookup for an ishm shared memory, identified by its block name.
- * Map this ishm area in the process VA (if not already present).
- * Return the block index, or -1 if the index
- * does not match any known ishm blocks.
+ * Return the block index, or -1 if the index does not match any known ishm
+ * blocks.
*/
int _odp_ishm_lookup_by_name(const char *name)
{
@@ -1341,42 +1340,25 @@ int _odp_ishm_lookup_by_name(const char *name)
/* search the block in main ishm table: return -1 if not found: */
block_index = find_block_by_name(name);
- if ((block_index < 0) || (!block_lookup(block_index))) {
- odp_spinlock_unlock(&ishm_tbl->lock);
- return -1;
- }
odp_spinlock_unlock(&ishm_tbl->lock);
return block_index;
}
/*
- * Returns the VA address of a given block (which has to be known in the current
- * process). Returns NULL if the block is unknown.
+ * Returns the VA address of a given block. Maps this ishm area in the process
+ * VA (if not already present).
+ * Returns NULL if the block is unknown.
*/
void *_odp_ishm_address(int block_index)
{
- int proc_index;
void *addr;
odp_spinlock_lock(&ishm_tbl->lock);
procsync();
- if ((block_index < 0) ||
- (block_index >= ISHM_MAX_NB_BLOCKS) ||
- (ishm_tbl->block[block_index].len == 0)) {
- ODP_ERR("Request for address on an invalid block\n");
- odp_spinlock_unlock(&ishm_tbl->lock);
- return NULL;
- }
-
- proc_index = procfind_block(block_index);
- if (proc_index < 0) {
- odp_spinlock_unlock(&ishm_tbl->lock);
- return NULL;
- }
+ addr = block_lookup(block_index);
- addr = ishm_proctable->entry[proc_index].start;
odp_spinlock_unlock(&ishm_tbl->lock);
return addr;
}
commit 3e007fea33316e1d7d66cd7ea19541a1653b501c
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Nov 2 09:57:39 2018 +0200
linux-gen: queue scalable: remove _ODP_ISHM_SINGLE_VA from pool create
ishm pool create is done during global init so no need to use
_ODP_ISHM_SINGLE_VA flag.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c
index 4f5d8b21..2de4d52d 100644
--- a/platform/linux-generic/odp_queue_scalable.c
+++ b/platform/linux-generic/odp_queue_scalable.c
@@ -225,8 +225,7 @@ static int queue_init_global(void)
max_alloc = CONFIG_SCAL_QUEUE_SIZE * sizeof(odp_buffer_hdr_t *);
queue_shm_pool = _odp_ishm_pool_create("queue_shm_pool",
pool_size,
- min_alloc, max_alloc,
- _ODP_ISHM_SINGLE_VA);
+ min_alloc, max_alloc, 0);
if (queue_shm_pool == NULL) {
ODP_ERR("Failed to allocate shared memory pool for"
" queues\n");
commit f8eda649cd915654175c9723aca75adaae88c3d3
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 26 14:34:58 2018 +0300
linux-gen: ishm: remove unused internal functions
Ease code maintenance by removing the following unused functions:
find_block_by_address(void *addr)
_odp_ishm_free_by_name(const char *name)
_odp_ishm_free_by_address(void *addr)
_odp_ishm_lookup_by_index(int block_index)
_odp_ishm_lookup_by_address(void *addr)
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_shm_internal.h b/platform/linux-generic/include/odp_shm_internal.h
index a1bd2439..9da5082d 100644
--- a/platform/linux-generic/include/odp_shm_internal.h
+++ b/platform/linux-generic/include/odp_shm_internal.h
@@ -40,11 +40,7 @@ odp_shm_t _odp_shm_reserve(const char *name, uint64_t size, uint32_t align,
int _odp_ishm_reserve(const char *name, uint64_t size, int fd, uint32_t align,
uint32_t flags, uint32_t user_flags);
int _odp_ishm_free_by_index(int block_index);
-int _odp_ishm_free_by_name(const char *name);
-int _odp_ishm_free_by_address(void *addr);
-void *_odp_ishm_lookup_by_index(int block_index);
int _odp_ishm_lookup_by_name(const char *name);
-int _odp_ishm_lookup_by_address(void *addr);
int _odp_ishm_find_exported(const char *remote_name,
pid_t external_odp_pid,
const char *local_name);
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index d89f0930..f73aea37 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -839,56 +839,6 @@ static int find_block_by_name(const char *name)
return -1;
}
-/*
- * Search for a block by address (only works when flag _ODP_ISHM_SINGLE_VA
- * was set at reserve() time, or if the block is already known by this
- * process).
- * Search is performed in the process table and in the global ishm table.
- * The provided address does not have to be at start: any address
- * within the fragment is OK.
- * Returns the index to the found block (if any) or -1 if none.
- * Mutex must be assured by the caller.
- */
-static int find_block_by_address(void *addr)
-{
- int block_index;
- int i;
- ishm_fragment_t *fragmnt;
-
- /*
- * first check if there is already a process known block for this
- * address
- */
- for (i = 0; i < ishm_proctable->nb_entries; i++) {
- block_index = ishm_proctable->entry[i].block_index;
- if ((addr > ishm_proctable->entry[i].start) &&
- ((char *)addr < ((char *)ishm_proctable->entry[i].start +
- ishm_tbl->block[block_index].len)))
- return block_index;
- }
-
- /*
- * then check if there is a existing single VA block known by some other
- * process and containing the given address
- */
- for (i = 0; i < ISHM_MAX_NB_BLOCKS; i++) {
- if ((!ishm_tbl->block[i].len) ||
- (!(ishm_tbl->block[i].flags & _ODP_ISHM_SINGLE_VA)))
- continue;
- fragmnt = ishm_tbl->block[i].fragment;
- if (!fragmnt) {
- ODP_ERR("find_fragment: invalid NULL fragment\n");
- return -1;
- }
- if ((addr >= fragmnt->start) &&
- ((char *)addr < ((char *)fragmnt->start + fragmnt->len)))
- return i;
- }
-
- /* address does not belong to any accessible block: */
- return -1;
-}
-
/*
* Search a given ishm block in the process local table. Return its index
* in the process table or -1 if not found (meaning that the ishm table
@@ -1320,59 +1270,6 @@ int _odp_ishm_free_by_index(int block_index)
return ret;
}
-/*
- * free and unmap internal shared memory, identified by its block name:
- * return -1 on error. 0 if OK.
- */
-int _odp_ishm_free_by_name(const char *name)
-{
- int block_index;
- int ret;
-
- odp_spinlock_lock(&ishm_tbl->lock);
- procsync();
-
- /* search the block in main ishm table */
- block_index = find_block_by_name(name);
- if (block_index < 0) {
- ODP_ERR("Request to free an non existing block..."
- " (double free?)\n");
- odp_spinlock_unlock(&ishm_tbl->lock);
- return -1;
- }
-
- ret = block_free(block_index);
- odp_spinlock_unlock(&ishm_tbl->lock);
- return ret;
-}
-
-/*
- * Free and unmap internal shared memory identified by address:
- * return -1 on error. 0 if OK.
- */
-int _odp_ishm_free_by_address(void *addr)
-{
- int block_index;
- int ret;
-
- odp_spinlock_lock(&ishm_tbl->lock);
- procsync();
-
- /* search the block in main ishm table */
- block_index = find_block_by_address(addr);
- if (block_index < 0) {
- ODP_ERR("Request to free an non existing block..."
- " (double free?)\n");
- odp_spinlock_unlock(&ishm_tbl->lock);
- return -1;
- }
-
- ret = block_free(block_index);
-
- odp_spinlock_unlock(&ishm_tbl->lock);
- return ret;
-}
-
/*
* Lookup for an ishm shared memory, identified by its block index
* in the main ishm block table.
@@ -1429,24 +1326,6 @@ static void *block_lookup(int block_index)
return mapped_addr;
}
-/*
- * Lookup for an ishm shared memory, identified by its block_index.
- * Maps this ishmem area in the process VA (if not already present).
- * Returns the block user address, or NULL if the index
- * does not match any known ishm blocks.
- */
-void *_odp_ishm_lookup_by_index(int block_index)
-{
- void *ret;
-
- odp_spinlock_lock(&ishm_tbl->lock);
- procsync();
-
- ret = block_lookup(block_index);
- odp_spinlock_unlock(&ishm_tbl->lock);
- return ret;
-}
-
/*
* Lookup for an ishm shared memory, identified by its block name.
* Map this ishm area in the process VA (if not already present).
@@ -1471,32 +1350,6 @@ int _odp_ishm_lookup_by_name(const char *name)
return block_index;
}
-/*
- * Lookup for an ishm shared memory block, identified by its VA address.
- * This works only if the block has already been looked-up (mapped) by the
- * current process or it it was created with the _ODP_ISHM_SINGLE_VA flag.
- * Map this ishm area in the process VA (if not already present).
- * Return the block index, or -1 if the address
- * does not match any known ishm blocks.
- */
-int _odp_ishm_lookup_by_address(void *addr)
-{
- int block_index;
-
- odp_spinlock_lock(&ishm_tbl->lock);
- procsync();
-
- /* search the block in main ishm table: return -1 if not found: */
- block_index = find_block_by_address(addr);
- if ((block_index < 0) || (!block_lookup(block_index))) {
- odp_spinlock_unlock(&ishm_tbl->lock);
- return -1;
- }
-
- odp_spinlock_unlock(&ishm_tbl->lock);
- return block_index;
-}
-
/*
* Returns the VA address of a given block (which has to be known in the current
* process). Returns NULL if the block is unknown.
commit 96a177a6322a9d8fad99d43271d1b98ecd5d12a5
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 26 13:11:12 2018 +0300
linux-gen: ishm: remove unnecessary _odp_ishm_pool_lookup() function
Ease code maintenance by removing unnecessary code.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_ishmpool_internal.h b/platform/linux-generic/include/odp_ishmpool_internal.h
index 94bcddae..9db5a2b4 100644
--- a/platform/linux-generic/include/odp_ishmpool_internal.h
+++ b/platform/linux-generic/include/odp_ishmpool_internal.h
@@ -46,7 +46,6 @@ int _odp_ishm_pool_destroy(_odp_ishm_pool_t *pool);
void *_odp_ishm_pool_alloc(_odp_ishm_pool_t *pool, uint64_t size);
int _odp_ishm_pool_free(_odp_ishm_pool_t *pool, void *addr);
int _odp_ishm_pool_status(const char *title, _odp_ishm_pool_t *pool);
-_odp_ishm_pool_t *_odp_ishm_pool_lookup(const char *pool_name);
void _odp_ishm_pool_init(void);
#ifdef __cplusplus
diff --git a/platform/linux-generic/odp_ishmpool.c b/platform/linux-generic/odp_ishmpool.c
index a3a1c059..56e59f33 100644
--- a/platform/linux-generic/odp_ishmpool.c
+++ b/platform/linux-generic/odp_ishmpool.c
@@ -784,23 +784,3 @@ void _odp_ishm_pool_init(void)
for (i = 0; i < MAX_NB_POOL; i++)
pool_blk_idx[i] = -1;
}
-
-_odp_ishm_pool_t *_odp_ishm_pool_lookup(const char *pool_name)
-{
- int block_idx;
- int store_idx;
-
- /* search for a _ishm block with the given name */
- block_idx = _odp_ishm_lookup_by_name(pool_name);
- if (block_idx < 0)
- return NULL;
-
- /* a block with that name exists: make sure it is within
- * the registered pools */
- for (store_idx = 0; store_idx < MAX_NB_POOL; store_idx++) {
- if (pool_blk_idx[store_idx] == block_idx)
- return _odp_ishm_address(block_idx);
- }
-
- return NULL;
-}
diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c
index 1fa0ce4f..4f5d8b21 100644
--- a/platform/linux-generic/odp_queue_scalable.c
+++ b/platform/linux-generic/odp_queue_scalable.c
@@ -207,34 +207,30 @@ static int queue_init_global(void)
_odp_queue_inline_offset.context = offsetof(queue_entry_t,
s.param.context);
- /* Attach to the pool if it exists */
- queue_shm_pool = _odp_ishm_pool_lookup("queue_shm_pool");
+ /* Create shared memory pool to allocate shared memory for the
+ * queues. Use the default queue size.
+ */
+ /* Add size of the array holding the queues */
+ pool_size = sizeof(queue_table_t);
+ /* Add storage required for queues */
+ pool_size += (CONFIG_SCAL_QUEUE_SIZE *
+ sizeof(odp_buffer_hdr_t *)) * ODP_CONFIG_QUEUES;
+
+ /* Add the reorder window size */
+ pool_size += sizeof(reorder_window_t) * ODP_CONFIG_QUEUES;
+ /* Choose min_alloc and max_alloc such that buddy allocator is
+ * is selected.
+ */
+ min_alloc = 0;
+ max_alloc = CONFIG_SCAL_QUEUE_SIZE * sizeof(odp_buffer_hdr_t *);
+ queue_shm_pool = _odp_ishm_pool_create("queue_shm_pool",
+ pool_size,
+ min_alloc, max_alloc,
+ _ODP_ISHM_SINGLE_VA);
if (queue_shm_pool == NULL) {
- /* Create shared memory pool to allocate shared memory for the
- * queues. Use the default queue size.
- */
- /* Add size of the array holding the queues */
- pool_size = sizeof(queue_table_t);
- /* Add storage required for queues */
- pool_size += (CONFIG_SCAL_QUEUE_SIZE *
- sizeof(odp_buffer_hdr_t *)) * ODP_CONFIG_QUEUES;
-
- /* Add the reorder window size */
- pool_size += sizeof(reorder_window_t) * ODP_CONFIG_QUEUES;
- /* Choose min_alloc and max_alloc such that buddy allocator is
- * is selected.
- */
- min_alloc = 0;
- max_alloc = CONFIG_SCAL_QUEUE_SIZE * sizeof(odp_buffer_hdr_t *);
- queue_shm_pool = _odp_ishm_pool_create("queue_shm_pool",
- pool_size,
- min_alloc, max_alloc,
- _ODP_ISHM_SINGLE_VA);
- if (queue_shm_pool == NULL) {
- ODP_ERR("Failed to allocate shared memory pool for"
- " queues\n");
- goto queue_shm_pool_create_failed;
- }
+ ODP_ERR("Failed to allocate shared memory pool for"
+ " queues\n");
+ goto queue_shm_pool_create_failed;
}
queue_tbl = (queue_table_t *)
diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c
index 83a2a41b..5d83ed08 100644
--- a/platform/linux-generic/odp_schedule_scalable.c
+++ b/platform/linux-generic/odp_schedule_scalable.c
@@ -1790,6 +1790,7 @@ static int schedule_init_global(void)
odp_schedule_group_t tmp_wrkr;
odp_schedule_group_t tmp_ctrl;
odp_shm_t shm;
+ _odp_ishm_pool_t *pool;
uint32_t bits;
uint32_t pool_size;
uint64_t min_alloc;
@@ -1808,34 +1809,28 @@ static int schedule_init_global(void)
memset(global, 0, sizeof(sched_global_t));
global->shm = shm;
- /* Attach to the pool if it exists */
- global->sched_shm_pool = _odp_ishm_pool_lookup("sched_shm_pool");
- if (global->sched_shm_pool == NULL) {
- _odp_ishm_pool_t *pool;
-
- /* Add storage required for sched groups. Assume worst case
- * xfactor of MAXTHREADS.
- */
- pool_size = (sizeof(sched_group_t) +
- (ODP_SCHED_PRIO_NUM * MAXTHREADS - 1) *
- sizeof(sched_queue_t)) * MAX_SCHED_GROUP;
- /* Choose min_alloc and max_alloc such that slab allocator
- * is selected.
- */
- min_alloc = sizeof(sched_group_t) +
- (ODP_SCHED_PRIO_NUM * MAXTHREADS - 1) *
- sizeof(sched_queue_t);
- max_alloc = min_alloc;
- pool = _odp_ishm_pool_create("sched_shm_pool", pool_size,
- min_alloc, max_alloc,
- _ODP_ISHM_SINGLE_VA);
- if (pool == NULL) {
- ODP_ERR("Failed to allocate shared memory pool "
- "for sched\n");
- goto failed_sched_shm_pool_create;
- }
- global->sched_shm_pool = pool;
- }
+ /* Add storage required for sched groups. Assume worst case
+ * xfactor of MAXTHREADS.
+ */
+ pool_size = (sizeof(sched_group_t) +
+ (ODP_SCHED_PRIO_NUM * MAXTHREADS - 1) *
+ sizeof(sched_queue_t)) * MAX_SCHED_GROUP;
+ /* Choose min_alloc and max_alloc such that slab allocator
+ * is selected.
+ */
+ min_alloc = sizeof(sched_group_t) +
+ (ODP_SCHED_PRIO_NUM * MAXTHREADS - 1) *
+ sizeof(sched_queue_t);
+ max_alloc = min_alloc;
+ pool = _odp_ishm_pool_create("sched_shm_pool", pool_size,
+ min_alloc, max_alloc,
+ _ODP_ISHM_SINGLE_VA);
+ if (pool == NULL) {
+ ODP_ERR("Failed to allocate shared memory pool "
+ "for sched\n");
+ goto failed_sched_shm_pool_create;
+ }
+ global->sched_shm_pool = pool;
odp_spinlock_init(&global->sched_grp_lock);
commit 3529f3b8713021e45c7dbdd81f839d8b9049efcc
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Nov 9 15:05:56 2018 +0200
linux-gen: cls: simplify shm usage
Combine three shm reservations into one reservation. This
simplifies shm usage and results less ODP internally
allocated SHM blocks. Also one combined block is more memory
efficient than multiple (saves memory and page mappings).
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c
index fd20e3e0..e6d75cb6 100644
--- a/platform/linux-generic/odp_classification.c
+++ b/platform/linux-generic/odp_classification.c
@@ -35,6 +35,16 @@ static cos_tbl_t *cos_tbl;
static pmr_tbl_t *pmr_tbl;
static _cls_queue_grp_tbl_t *queue_grp_tbl;
+typedef struct cls_global_t {
+ cos_tbl_t cos_tbl;
+ pmr_tbl_t pmr_tbl;
+ _cls_queue_grp_tbl_t queue_grp_tbl;
+ odp_shm_t shm;
+
+} cls_global_t;
+
+static cls_global_t *cls_global;
+
static const rss_key default_rss = {
.u8 = {
0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2,
@@ -79,102 +89,45 @@ pmr_t *get_pmr_entry_internal(odp_pmr_t pmr)
int odp_classification_init_global(void)
{
- odp_shm_t cos_shm;
- odp_shm_t pmr_shm;
- odp_shm_t queue_grp_shm;
+ odp_shm_t shm;
int i;
- cos_shm = odp_shm_reserve("_odp_shm_odp_cos_tbl",
- sizeof(cos_tbl_t),
- sizeof(cos_t),
- 0);
+ shm = odp_shm_reserve("_odp_cls_global", sizeof(cls_global_t),
+ ODP_CACHE_LINE_SIZE, 0);
+ if (shm == ODP_SHM_INVALID)
+ return -1;
- if (cos_shm == ODP_SHM_INVALID) {
- ODP_ERR("shm allocation failed for shm_odp_cos_tbl");
- goto error;
- }
+ cls_global = odp_shm_addr(shm);
+ memset(cls_global, 0, sizeof(cls_global_t));
- cos_tbl = odp_shm_addr(cos_shm);
- if (cos_tbl == NULL)
- goto error_cos;
+ cls_global->shm = shm;
+ cos_tbl = &cls_global->cos_tbl;
+ pmr_tbl = &cls_global->pmr_tbl;
+ queue_grp_tbl = &cls_global->queue_grp_tbl;
- memset(cos_tbl, 0, sizeof(cos_tbl_t));
for (i = 0; i < CLS_COS_MAX_ENTRY; i++) {
/* init locks */
cos_t *cos = get_cos_entry_internal(_odp_cos_from_ndx(i));
LOCK_INIT(&cos->s.lock);
}
- pmr_shm = odp_shm_reserve("_odp_shm_odp_pmr_tbl",
- sizeof(pmr_tbl_t),
- sizeof(pmr_t),
- 0);
-
- if (pmr_shm == ODP_SHM_INVALID) {
- ODP_ERR("shm allocation failed for shm_odp_pmr_tbl");
- goto error_cos;
- }
-
- pmr_tbl = odp_shm_addr(pmr_shm);
- if (pmr_tbl == NULL)
- goto error_pmr;
-
- memset(pmr_tbl, 0, sizeof(pmr_tbl_t));
for (i = 0; i < CLS_PMR_MAX_ENTRY; i++) {
/* init locks */
pmr_t *pmr = get_pmr_entry_internal(_odp_pmr_from_ndx(i));
LOCK_INIT(&pmr->s.lock);
}
- queue_grp_shm = odp_shm_reserve("_odp_shm_cls_queue_grp_tbl",
- sizeof(_cls_queue_grp_tbl_t),
- sizeof(queue_entry_t *),
- 0);
-
- if (queue_grp_shm == ODP_SHM_INVALID) {
- ODP_ERR("shm allocation failed for queue_grp_tbl");
- goto error_queue_grp;
- }
-
- queue_grp_tbl = odp_shm_addr(queue_grp_shm);
- memset(queue_grp_tbl, 0, sizeof(_cls_queue_grp_tbl_t));
-
return 0;
-
-error_queue_grp:
- odp_shm_free(queue_grp_shm);
-error_pmr:
- odp_shm_free(pmr_shm);
-error_cos:
- odp_shm_free(cos_shm);
-error:
- return -1;
}
int odp_classification_term_global(void)
{
- int ret = 0;
- int rc = 0;
-
- ret = odp_shm_free(odp_shm_lookup("_odp_shm_odp_cos_tbl"));
- if (ret < 0) {
- ODP_ERR("shm free failed for shm_odp_cos_tbl");
- rc = -1;
- }
-
- ret = odp_shm_free(odp_shm_lookup("_odp_shm_odp_pmr_tbl"));
- if (ret < 0) {
- ODP_ERR("shm free failed for shm_odp_pmr_tbl");
- rc = -1;
- }
-
- ret = odp_shm_free(odp_shm_lookup("_odp_shm_cls_queue_grp_tbl"));
- if (ret < 0) {
- ODP_ERR("shm free failed for shm_odp_cls_queue_grp_tbl");
- rc = -1;
+ if (cls_global && odp_shm_free(cls_global->shm)) {
+ ODP_ERR("shm free failed");
+ return -1;
}
- return rc;
+ return 0;
}
void odp_cls_cos_param_init(odp_cls_cos_param_t *param)
commit af055783f975e2b8b9e443565b3abdc9f7946ade
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Nov 9 14:35:53 2018 +0200
linux-gen: shm: modify shm print header string
Highlight that printed values are from ODP SHM only, i.e. it's
not generic memory allocation status of the entire system.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c
index d2f31458..4e92c9f2 100644
--- a/platform/linux-generic/odp_shared_memory.c
+++ b/platform/linux-generic/odp_shared_memory.c
@@ -122,7 +122,7 @@ int odp_shm_info(odp_shm_t shm, odp_shm_info_t *info)
void odp_shm_print_all(void)
{
- _odp_ishm_status("Memory allocation status:");
+ _odp_ishm_status("ODP shared memory allocation status:");
}
void odp_shm_print(odp_shm_t shm)
commit 8d9936c45c4a9f8db9142057d8acee41d54e0b51
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Nov 9 14:31:14 2018 +0200
example: sysinfo: print shm blocks
It's useful to see how many shm blocks and which kind of memory
(huge or normal pages, etc) ODP implementation itself allocates.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/sysinfo/odp_sysinfo.c b/example/sysinfo/odp_sysinfo.c
index 9f55872b..709f25d9 100644
--- a/example/sysinfo/odp_sysinfo.c
+++ b/example/sysinfo/odp_sysinfo.c
@@ -432,6 +432,10 @@ int main(void)
print_auth_algos(crypto_capa.auths);
printf("\n");
print_auth_caps(crypto_capa.auths);
+ printf("\n");
+
+ printf(" SHM MEMORY BLOCKS:\n");
+ odp_shm_print_all();
printf("\n");
printf("***********************************************************\n");
commit 2a6485f25dc9b0612cccf40a2360dc6d40becb78
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Nov 9 12:17:28 2018 +0200
linux-gen: ishm: allocate small shm blocks using normal pages
Only memory reservations larger than ISHM_HUGE_PAGE_LIMIT (64kB) are
allocated using huge pages (if available). Smaller reservations are done
using normal pages to conserve memory.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index 57b2d417..d89f0930 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -125,6 +125,13 @@
*/
#define ISHM_NB_FRAGMNTS (ISHM_MAX_NB_BLOCKS * 2 + 1)
+/*
+ * Memory reservations larger than ISHM_HUGE_PAGE_LIMIT (bytes) are allocated
+ * using huge pages (if available). Smaller reservations are done using normal
+ * pages to conserve memory.
+ */
+#define ISHM_HUGE_PAGE_LIMIT (64 * 1024)
+
/*
* when a memory block is to be exported outside its ODP instance,
* an block 'attribute file' is created in /dev/shm/odp-<pid>-shm-<name>.
@@ -1085,7 +1092,7 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd,
/* Otherwise, Try first huge pages when possible and needed: */
if ((fd < 0) && page_hp_size && ((flags & _ODP_ISHM_USE_HP) ||
- size > page_sz)) {
+ size > ISHM_HUGE_PAGE_LIMIT)) {
/* at least, alignment in VA should match page size, but user
* can request more: If the user requirement exceeds the page
* size then we have to make sure the block will be mapped at
commit 91fee166b0dbf4949f1a1786e167a6948b1e8f52
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Mon Nov 12 14:51:28 2018 +0200
linux-gen: ishm: add internal _ODP_ISHM_USE_HP flag
Add internal shm flag for allocating shm memory always from huge pages.
This is required by zero-copy dpdk packet pool. Internal _odp_shm_reserve()
function is added for passing extra shm flags.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_shm_internal.h b/platform/linux-generic/include/odp_shm_internal.h
index 93146a51..a1bd2439 100644
--- a/platform/linux-generic/include/odp_shm_internal.h
+++ b/platform/linux-generic/include/odp_shm_internal.h
@@ -14,10 +14,13 @@ extern "C" {
#include <sys/types.h>
#include <inttypes.h>
+#include <odp/api/shared_memory.h>
+
/* flags available at ishm_reserve: */
#define _ODP_ISHM_SINGLE_VA 1
#define _ODP_ISHM_LOCK 2
-#define _ODP_ISHM_EXPORT 4 /*create export descr file in /tmp */
+#define _ODP_ISHM_EXPORT 4 /* create export descr file in /tmp */
+#define _ODP_ISHM_USE_HP 8 /* allocate memory from huge pages */
/**
* Shared memory block info
@@ -31,6 +34,9 @@ typedef struct _odp_ishm_info_t {
uint32_t user_flags;/**< user specific flags */
} _odp_ishm_info_t;
+odp_shm_t _odp_shm_reserve(const char *name, uint64_t size, uint32_t align,
+ uint32_t flags, uint32_t extra_flags);
+
int _odp_ishm_reserve(const char *name, uint64_t size, int fd, uint32_t align,
uint32_t flags, uint32_t user_flags);
int _odp_ishm_free_by_index(int block_index);
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index 669377a0..57b2d417 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -1016,7 +1016,7 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd,
uint64_t page_sz; /* normal page size. usually 4K*/
uint64_t page_hp_size; /* huge page size */
uint32_t hp_align;
- uint64_t len; /* mapped length */
+ uint64_t len = 0; /* mapped length */
void *addr = NULL; /* mapping address */
int new_proc_entry;
struct stat statbuf;
@@ -1084,7 +1084,8 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd,
}
/* Otherwise, Try first huge pages when possible and needed: */
- if ((fd < 0) && page_hp_size && (size > page_sz)) {
+ if ((fd < 0) && page_hp_size && ((flags & _ODP_ISHM_USE_HP) ||
+ size > page_sz)) {
/* at least, alignment in VA should match page size, but user
* can request more: If the user requirement exceeds the page
* size then we have to make sure the block will be mapped at
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
index 10382c4c..2262f355 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -22,6 +22,7 @@
#include <odp_ring_internal.h>
#include <odp_global_data.h>
#include <odp_libconfig_internal.h>
+#include <odp_shm_internal.h>
#include <string.h>
#include <stdio.h>
@@ -378,6 +379,7 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params,
uint32_t max_len;
uint32_t ring_size;
uint32_t num_extra = 0;
+ uint32_t extra_shm_flags = 0;
int name_len;
const char *postfix = "_uarea";
char uarea_name[ODP_POOL_NAME_LEN + sizeof(postfix)];
@@ -487,11 +489,16 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params,
* headers. NOP if zero-copy is disabled. */
pool->block_offset = 0;
if (params->type == ODP_POOL_PACKET) {
- block_size = _odp_dpdk_pool_obj_size(pool, block_size);
- if (!block_size) {
+ uint32_t dpdk_obj_size;
+
+ dpdk_obj_size = _odp_dpdk_pool_obj_size(pool, block_size);
+ if (!dpdk_obj_size) {
ODP_ERR("Calculating DPDK mempool obj size failed\n");
return ODP_POOL_INVALID;
}
+ if (dpdk_obj_size != block_size)
+ extra_shm_flags |= _ODP_ISHM_USE_HP;
+ block_size = dpdk_obj_size;
}
/* Allocate extra memory for skipping packet buffers which cross huge
@@ -524,8 +531,8 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params,
pool->ext_desc = NULL;
pool->ext_destroy = NULL;
- shm = odp_shm_reserve(pool->name, pool->shm_size,
- ODP_PAGE_SIZE, shmflags);
+ shm = _odp_shm_reserve(pool->name, pool->shm_size,
+ ODP_PAGE_SIZE, shmflags, extra_shm_flags);
pool->shm = shm;
diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c
index 7d405d13..d2f31458 100644
--- a/platform/linux-generic/odp_shared_memory.c
+++ b/platform/linux-generic/odp_shared_memory.c
@@ -44,6 +44,22 @@ static uint32_t get_ishm_flags(uint32_t flags)
return f;
}
+odp_shm_t _odp_shm_reserve(const char *name, uint64_t size, uint32_t align,
+ uint32_t flags, uint32_t extra_flags)
+{
+ int block_index;
+ uint32_t flgs = 0; /* internal ishm flags */
+
+ flgs = get_ishm_flags(flags);
+ flgs |= extra_flags;
+
+ block_index = _odp_ishm_reserve(name, size, -1, align, flgs, flags);
+ if (block_index >= 0)
+ return to_handle(block_index);
+ else
+ return ODP_SHM_INVALID;
+}
+
int odp_shm_capability(odp_shm_capability_t *capa)
{
memset(capa, 0, sizeof(odp_shm_capability_t));
@@ -58,16 +74,7 @@ int odp_shm_capability(odp_shm_capability_t *capa)
odp_shm_t odp_shm_reserve(const char *name, uint64_t size, uint64_t align,
uint32_t flags)
{
- int block_index;
- uint32_t flgs = 0; /* internal ishm flags */
-
- flgs = get_ishm_flags(flags);
-
- block_index = _odp_ishm_reserve(name, size, -1, align, flgs, flags);
- if (block_index >= 0)
- return to_handle(block_index);
- else
- return ODP_SHM_INVALID;
+ return _odp_shm_reserve(name, size, align, flags, 0);
}
odp_shm_t odp_shm_import(const char *remote_name,
commit 01e4772d22537772001714318d5f501f082b6c5e
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Mon Nov 12 13:36:27 2018 +0200
linux-gen: ishm: remove unused odp_shm_internal header
odp_shm_internal.h contents were not used so delete the file and rename
odp_ishm_internal.h to odp_shm_internal.h.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index b973bc30..f21fbf70 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -99,7 +99,6 @@ noinst_HEADERS = \
include/odp_global_data.h \
include/odp_init_internal.h \
include/odp_ipsec_internal.h \
- include/odp_ishm_internal.h \
include/odp_ishmphy_internal.h \
include/odp_ishmpool_internal.h \
include/odp_libconfig_internal.h \
diff --git a/platform/linux-generic/include/odp_ishm_internal.h b/platform/linux-generic/include/odp_ishm_internal.h
deleted file mode 100644
index 56c7f5a9..00000000
--- a/platform/linux-generic/include/odp_ishm_internal.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright (c) 2016-2018, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef ODP_ISHM_INTERNAL_H_
-#define ODP_ISHM_INTERNAL_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <sys/types.h>
-
-/* flags available at ishm_reserve: */
-#define _ODP_ISHM_SINGLE_VA 1
-#define _ODP_ISHM_LOCK 2
-#define _ODP_ISHM_EXPORT 4 /*create export descr file in /tmp */
-
-/**
- * Shared memory block info
- */
-typedef struct _odp_ishm_info_t {
- const char *name; /**< Block name */
- void *addr; /**< Block address */
- uint64_t size; /**< Block size in bytes */
- uint64_t page_size; /**< Memory page size */
- uint32_t flags; /**< _ODP_ISHM_* flags */
- uint32_t user_flags;/**< user specific flags */
-} _odp_ishm_info_t;
-
-int _odp_ishm_reserve(const char *name, uint64_t size, int fd, uint32_t align,
- uint32_t flags, uint32_t user_flags);
-int _odp_ishm_free_by_index(int block_index);
-int _odp_ishm_free_by_name(const char *name);
-int _odp_ishm_free_by_address(void *addr);
-void *_odp_ishm_lookup_by_index(int block_index);
-int _odp_ishm_lookup_by_name(const char *name);
-int _odp_ishm_lookup_by_address(void *addr);
-int _odp_ishm_find_exported(const char *remote_name,
- pid_t external_odp_pid,
- const char *local_name);
-void *_odp_ishm_address(int block_index);
-int _odp_ishm_info(int block_index, _odp_ishm_info_t *info);
-int _odp_ishm_status(const char *title);
-int _odp_ishm_cleanup_files(const char *dirpath);
-void _odp_ishm_print(int block_index);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/platform/linux-generic/include/odp_shm_internal.h b/platform/linux-generic/include/odp_shm_internal.h
index ab58973b..93146a51 100644
--- a/platform/linux-generic/include/odp_shm_internal.h
+++ b/platform/linux-generic/include/odp_shm_internal.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2018, Linaro Limited
+/* Copyright (c) 2016-2018, Linaro Limited
* All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
@@ -11,13 +11,42 @@
extern "C" {
#endif
-#include <odp/api/shared_memory.h>
+#include <sys/types.h>
+#include <inttypes.h>
-#define SHM_DEVNAME_MAXLEN (ODP_SHM_NAME_LEN + 16)
-#define SHM_DEVNAME_FORMAT "/odp-%d-%s" /* /dev/shm/odp-<pid>-<name> */
+/* flags available at ishm_reserve: */
+#define _ODP_ISHM_SINGLE_VA 1
+#define _ODP_ISHM_LOCK 2
+#define _ODP_ISHM_EXPORT 4 /*create export descr file in /tmp */
-#define _ODP_SHM_PROC_NOCREAT (1 << 6) /**< Do not create shm if not exist */
-#define _ODP_SHM_O_EXCL (1 << 7) /**< Do not create shm if exist */
+/**
+ * Shared memory block info
+ */
+typedef struct _odp_ishm_info_t {
+ const char *name; /**< Block name */
+ void *addr; /**< Block address */
+ uint64_t size; /**< Block size in bytes */
+ uint64_t page_size; /**< Memory page size */
+ uint32_t flags; /**< _ODP_ISHM_* flags */
+ uint32_t user_flags;/**< user specific flags */
+} _odp_ishm_info_t;
+
+int _odp_ishm_reserve(const char *name, uint64_t size, int fd, uint32_t align,
+ uint32_t flags, uint32_t user_flags);
+int _odp_ishm_free_by_index(int block_index);
+int _odp_ishm_free_by_name(const char *name);
+int _odp_ishm_free_by_address(void *addr);
+void *_odp_ishm_lookup_by_index(int block_index);
+int _odp_ishm_lookup_by_name(const char *name);
+int _odp_ishm_lookup_by_address(void *addr);
+int _odp_ishm_find_exported(const char *remote_name,
+ pid_t external_odp_pid,
+ const char *local_name);
+void *_odp_ishm_address(int block_index);
+int _odp_ishm_info(int block_index, _odp_ishm_info_t *info);
+int _odp_ishm_status(const char *title);
+int _odp_ishm_cleanup_files(const char *dirpath);
+void _odp_ishm_print(int block_index);
#ifdef __cplusplus
}
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index 07cd2ecb..669377a0 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -60,7 +60,7 @@
#include <odp_debug_internal.h>
#include <odp_align_internal.h>
#include <odp_fdserver_internal.h>
-#include <odp_ishm_internal.h>
+#include <odp_shm_internal.h>
#include <odp_ishmphy_internal.h>
#include <odp_ishmpool_internal.h>
#include <odp_libconfig_internal.h>
diff --git a/platform/linux-generic/odp_ishmphy.c b/platform/linux-generic/odp_ishmphy.c
index 94a20f8f..556c8e14 100644
--- a/platform/linux-generic/odp_ishmphy.c
+++ b/platform/linux-generic/odp_ishmphy.c
@@ -17,7 +17,7 @@
#include <odp/api/debug.h>
#include <odp_debug_internal.h>
#include <odp_align_internal.h>
-#include <odp_ishm_internal.h>
+#include <odp_shm_internal.h>
#include <odp_ishmphy_internal.h>
#include <stdlib.h>
diff --git a/platform/linux-generic/odp_ishmpool.c b/platform/linux-generic/odp_ishmpool.c
index 46865371..a3a1c059 100644
--- a/platform/linux-generic/odp_ishmpool.c
+++ b/platform/linux-generic/odp_ishmpool.c
@@ -50,7 +50,7 @@
#include <odp_shm_internal.h>
#include <odp_debug_internal.h>
#include <odp_align_internal.h>
-#include <odp_ishm_internal.h>
+#include <odp_shm_internal.h>
#include <odp_ishmpool_internal.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c
index 8b89a227..1fa0ce4f 100644
--- a/platform/linux-generic/odp_queue_scalable.c
+++ b/platform/linux-generic/odp_queue_scalable.c
@@ -25,7 +25,7 @@
#include <odp_queue_scalable_internal.h>
#include <odp_schedule_if.h>
#include <odp_timer_internal.h>
-#include <odp_ishm_internal.h>
+#include <odp_shm_internal.h>
#include <odp_ishmpool_internal.h>
#include <odp/api/plat/queue_inline_types.h>
#include <odp_global_data.h>
diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c
index fc82b65b..83a2a41b 100644
--- a/platform/linux-generic/odp_schedule_scalable.c
+++ b/platform/linux-generic/odp_schedule_scalable.c
@@ -22,7 +22,7 @@
#include <odp_config_internal.h>
#include <odp_debug_internal.h>
-#include <odp_ishm_internal.h>
+#include <odp_shm_internal.h>
#include <odp_ishmpool_internal.h>
#include <odp_align_internal.h>
diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c
index 9c9139bb..7d405d13 100644
--- a/platform/linux-generic/odp_shared_memory.c
+++ b/platform/linux-generic/odp_shared_memory.c
@@ -11,7 +11,7 @@
#include <odp/api/std_types.h>
#include <odp/api/shared_memory.h>
#include <odp/api/plat/strong_types.h>
-#include <odp_ishm_internal.h>
+#include <odp_shm_internal.h>
#include <odp_init_internal.h>
#include <odp_global_data.h>
#include <string.h>
diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c
index fc565443..cd438ad3 100644
--- a/platform/linux-generic/pktio/ipc.c
+++ b/platform/linux-generic/pktio/ipc.c
@@ -11,7 +11,7 @@
#include <odp_packet_io_internal.h>
#include <odp/api/system_info.h>
#include <odp_shm_internal.h>
-#include <odp_ishm_internal.h>
+#include <odp_shm_internal.h>
#include <sys/mman.h>
#include <sys/stat.h>
commit f8bbdfc98be5d86dea67cc34ee97a4b69c052d61
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Nov 9 11:48:41 2018 +0200
linux-gen: ishm: remove _ODP_SHM_NO_HP flag
Reserving large shm blocks without huge pages increases page misses.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_shm_internal.h b/platform/linux-generic/include/odp_shm_internal.h
index 9827af75..ab58973b 100644
--- a/platform/linux-generic/include/odp_shm_internal.h
+++ b/platform/linux-generic/include/odp_shm_internal.h
@@ -18,7 +18,6 @@ extern "C" {
#define _ODP_SHM_PROC_NOCREAT (1 << 6) /**< Do not create shm if not exist */
#define _ODP_SHM_O_EXCL (1 << 7) /**< Do not create shm if exist */
-#define _ODP_SHM_NO_HP (1 << 8) /**< Do not use huge pages */
#ifdef __cplusplus
}
diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c
index 3310dc7f..fd20e3e0 100644
--- a/platform/linux-generic/odp_classification.c
+++ b/platform/linux-generic/odp_classification.c
@@ -11,7 +11,6 @@
#include <odp/api/queue.h>
#include <odp/api/debug.h>
#include <odp_init_internal.h>
-#include <odp_shm_internal.h>
#include <odp_debug_internal.h>
#include <odp_packet_internal.h>
#include <odp/api/packet_io.h>
@@ -88,7 +87,7 @@ int odp_classification_init_global(void)
cos_shm = odp_shm_reserve("_odp_shm_odp_cos_tbl",
sizeof(cos_tbl_t),
sizeof(cos_t),
- _ODP_SHM_NO_HP);
+ 0);
if (cos_shm == ODP_SHM_INVALID) {
ODP_ERR("shm allocation failed for shm_odp_cos_tbl");
@@ -109,7 +108,7 @@ int odp_classification_init_global(void)
pmr_shm = odp_shm_reserve("_odp_shm_odp_pmr_tbl",
sizeof(pmr_tbl_t),
sizeof(pmr_t),
- _ODP_SHM_NO_HP);
+ 0);
if (pmr_shm == ODP_SHM_INVALID) {
ODP_ERR("shm allocation failed for shm_odp_pmr_tbl");
@@ -130,7 +129,7 @@ int odp_classification_init_global(void)
queue_grp_shm = odp_shm_reserve("_odp_shm_cls_queue_grp_tbl",
sizeof(_cls_queue_grp_tbl_t),
sizeof(queue_entry_t *),
- _ODP_SHM_NO_HP);
+ 0);
if (queue_grp_shm == ODP_SHM_INVALID) {
ODP_ERR("shm allocation failed for queue_grp_tbl");
diff --git a/platform/linux-generic/odp_crypto_null.c b/platform/linux-generic/odp_crypto_null.c
index 939b2fbb..4dd1f832 100644
--- a/platform/linux-generic/odp_crypto_null.c
+++ b/platform/linux-generic/odp_crypto_null.c
@@ -21,7 +21,6 @@
#include <odp/api/plat/thread_inlines.h>
#include <odp_packet_internal.h>
#include <odp/api/plat/queue_inlines.h>
-#include <odp_shm_internal.h>
/* Inlined API functions */
#include <odp/api/plat/event_inlines.h>
@@ -319,7 +318,7 @@ odp_crypto_init_global(void)
/* Allocate our globally shared memory */
shm = odp_shm_reserve("_odp_crypto_pool_null", mem_size,
ODP_CACHE_LINE_SIZE,
- _ODP_SHM_NO_HP);
+ 0);
if (ODP_SHM_INVALID == shm) {
ODP_ERR("unable to allocate crypto pool\n");
return -1;
diff --git a/platform/linux-generic/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c
index ec3e85bf..8feebefb 100644
--- a/platform/linux-generic/odp_crypto_openssl.c
+++ b/platform/linux-generic/odp_crypto_openssl.c
@@ -21,7 +21,6 @@
#include <odp/api/plat/thread_inlines.h>
#include <odp_packet_internal.h>
#include <odp/api/plat/queue_inlines.h>
-#include <odp_shm_internal.h>
/* Inlined API functions */
#include <odp/api/plat/event_inlines.h>
@@ -1859,7 +1858,7 @@ odp_crypto_init_global(void)
/* Allocate our globally shared memory */
shm = odp_shm_reserve("_odp_crypto_pool_ssl", mem_size,
ODP_CACHE_LINE_SIZE,
- _ODP_SHM_NO_HP);
+ 0);
if (ODP_SHM_INVALID == shm) {
ODP_ERR("unable to allocate crypto pool\n");
return -1;
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index 17930092..6eb12f95 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -14,7 +14,6 @@
#include <odp_init_internal.h>
#include <odp_debug_internal.h>
#include <odp_ipsec_internal.h>
-#include <odp_shm_internal.h>
#include <odp_ring_mpmc_internal.h>
#include <odp/api/plat/atomic_inlines.h>
@@ -141,7 +140,7 @@ int _odp_ipsec_sad_init_global(void)
shm = odp_shm_reserve("_odp_ipsec_sa_table",
sizeof(ipsec_sa_table_t),
ODP_CACHE_LINE_SIZE,
- _ODP_SHM_NO_HP);
+ 0);
if (shm == ODP_SHM_INVALID)
return -1;
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index 4a481397..07cd2ecb 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -1029,8 +1029,7 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd,
/* Get system page sizes: page_hp_size is 0 if no huge page available*/
page_sz = odp_sys_page_size();
- page_hp_size = user_flags & _ODP_SHM_NO_HP ?
- 0 : odp_sys_huge_page_size();
+ page_hp_size = odp_sys_huge_page_size();
/* grab a new entry: */
for (new_index = 0; new_index < ISHM_MAX_NB_BLOCKS; new_index++) {
diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
index c5efdc42..4954d5f0 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -29,7 +29,6 @@
#include <odp/api/plat/time_inlines.h>
#include <odp_pcapng.h>
#include <odp/api/plat/queue_inlines.h>
-#include <odp_shm_internal.h>
#include <string.h>
#include <inttypes.h>
@@ -69,7 +68,7 @@ int odp_pktio_init_global(void)
shm = odp_shm_reserve("_odp_pktio_entries",
sizeof(pktio_table_t),
sizeof(pktio_entry_t),
- _ODP_SHM_NO_HP);
+ 0);
if (shm == ODP_SHM_INVALID)
return -1;
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
index d08be437..10382c4c 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -20,7 +20,6 @@
#include <odp_config_internal.h>
#include <odp_debug_internal.h>
#include <odp_ring_internal.h>
-#include <odp_shm_internal.h>
#include <odp_global_data.h>
#include <odp_libconfig_internal.h>
@@ -119,7 +118,7 @@ int odp_pool_init_global(void)
shm = odp_shm_reserve("_odp_pool_table",
sizeof(pool_table_t),
ODP_CACHE_LINE_SIZE,
- _ODP_SHM_NO_HP);
+ 0);
pool_tbl = odp_shm_addr(shm);
diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c
index 0d50c764..c3654884 100644
--- a/platform/linux-generic/odp_queue_basic.c
+++ b/platform/linux-generic/odp_queue_basic.c
@@ -15,7 +15,6 @@
#include <odp_buffer_internal.h>
#include <odp_pool_internal.h>
#include <odp_init_internal.h>
-#include <odp_shm_internal.h>
#include <odp_timer_internal.h>
#include <odp/api/shared_memory.h>
#include <odp/api/schedule.h>
@@ -138,7 +137,7 @@ static int queue_init_global(void)
shm = odp_shm_reserve("_odp_queue_gbl",
sizeof(queue_global_t),
sizeof(queue_entry_t),
- _ODP_SHM_NO_HP);
+ 0);
if (shm == ODP_SHM_INVALID)
return -1;
@@ -165,7 +164,7 @@ static int queue_init_global(void)
shm = odp_shm_reserve("_odp_queue_rings", mem_size,
ODP_CACHE_LINE_SIZE,
- _ODP_SHM_NO_HP);
+ 0);
if (shm == ODP_SHM_INVALID) {
odp_shm_free(queue_glb->queue_gbl_shm);
diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c
index ac8b4226..3e156a08 100644
--- a/platform/linux-generic/odp_queue_lf.c
+++ b/platform/linux-generic/odp_queue_lf.c
@@ -9,7 +9,6 @@
#include <odp/api/plat/atomic_inlines.h>
#include <odp/api/shared_memory.h>
#include <odp_queue_basic_internal.h>
-#include <odp_shm_internal.h>
#include <string.h>
#include <stdio.h>
@@ -321,7 +320,7 @@ uint32_t queue_lf_init_global(uint32_t *queue_lf_size,
shm = odp_shm_reserve("_odp_queues_lf", sizeof(queue_lf_global_t),
ODP_CACHE_LINE_SIZE,
- _ODP_SHM_NO_HP);
+ 0);
if (shm == ODP_SHM_INVALID)
return 0;
diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c
index 9cf00acb..cf566eb8 100644
--- a/platform/linux-generic/odp_schedule_basic.c
+++ b/platform/linux-generic/odp_schedule_basic.c
@@ -29,7 +29,6 @@
#include <odp_queue_basic_internal.h>
#include <odp_libconfig_internal.h>
#include <odp/api/plat/queue_inlines.h>
-#include <odp_shm_internal.h>
/* No synchronization context */
#define NO_SYNC_CONTEXT ODP_SCHED_SYNC_PARALLEL
@@ -397,7 +396,7 @@ static int schedule_init_global(void)
shm = odp_shm_reserve("_odp_scheduler",
sizeof(sched_global_t),
ODP_CACHE_LINE_SIZE,
- _ODP_SHM_NO_HP);
+ 0);
if (shm == ODP_SHM_INVALID) {
ODP_ERR("Schedule init: Shm reserve failed.\n");
return -1;
diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c
index 92a5c72b..fc82b65b 100644
--- a/platform/linux-generic/odp_schedule_scalable.c
+++ b/platform/linux-generic/odp_schedule_scalable.c
@@ -32,7 +32,6 @@
#include <odp_schedule_if.h>
#include <odp_bitset.h>
#include <odp_packet_io_internal.h>
-#include <odp_shm_internal.h>
#include <odp_timer_internal.h>
#include <limits.h>
@@ -1798,7 +1797,7 @@ static int schedule_init_global(void)
shm = odp_shm_reserve("_odp_sched_scalable",
sizeof(sched_global_t),
- ODP_CACHE_LINE_SIZE, _ODP_SHM_NO_HP);
+ ODP_CACHE_LINE_SIZE, 0);
global = odp_shm_addr(shm);
if (global == NULL) {
diff --git a/platform/linux-generic/pktio/ring.c b/platform/linux-generic/pktio/ring.c
index 6a354cb1..2cf0231c 100644
--- a/platform/linux-generic/pktio/ring.c
+++ b/platform/linux-generic/pktio/ring.c
@@ -80,7 +80,6 @@
#include <odp_packet_io_ring_internal.h>
#include <odp_errno_define.h>
#include <odp_global_data.h>
-#include <odp_shm_internal.h>
#include <odp/api/plat/cpu_inlines.h>
@@ -164,7 +163,7 @@ int _ring_tailq_init(void)
/* Allocate globally shared memory */
shm = odp_shm_reserve("_odp_ring_global", sizeof(global_data_t),
- ODP_CACHE_LINE_SIZE, _ODP_SHM_NO_HP);
+ ODP_CACHE_LINE_SIZE, 0);
if (ODP_SHM_INVALID == shm) {
ODP_ERR("Shm reserve failed for pktio ring\n");
return -1;
commit 295bf070e27323060ba607805dd95ce0353a9461
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Mon Nov 12 14:20:15 2018 +0200
test: queue_perf: fix lockfree support check
Exit application when -l/-w option is used, but lockfree/waitfree
queues are not supported.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/performance/odp_queue_perf.c b/test/performance/odp_queue_perf.c
index 09c8592b..80d0f154 100644
--- a/test/performance/odp_queue_perf.c
+++ b/test/performance/odp_queue_perf.c
@@ -205,7 +205,7 @@ static int create_queues(test_global_t *global)
} else if (nonblock == ODP_NONBLOCKING_LF) {
if (queue_capa.plain.lockfree.max_num == 0) {
printf("Lockfree queues not supported\n");
- return 0;
+ return -1;
}
if (num_queue > queue_capa.plain.lockfree.max_num) {
@@ -223,7 +223,7 @@ static int create_queues(test_global_t *global)
} else if (nonblock == ODP_NONBLOCKING_WF) {
if (queue_capa.plain.waitfree.max_num == 0) {
printf("Waitfree queues not supported\n");
- return 0;
+ return -1;
}
if (num_queue > queue_capa.plain.waitfree.max_num) {
@@ -327,8 +327,7 @@ static int destroy_queues(test_global_t *global)
for (i = 0; i < num_queue; i++) {
if (queue[i] == ODP_QUEUE_INVALID) {
- printf("Error: Invalid queue handle %u.\n", i);
- ret = -1;
+ printf("Error: Invalid queue handle (i: %u).\n", i);
break;
}
@@ -346,7 +345,7 @@ static int destroy_queues(test_global_t *global)
}
}
- if (odp_pool_destroy(pool)) {
+ if (pool != ODP_POOL_INVALID && odp_pool_destroy(pool)) {
printf("Error: Pool destroy failed.\n");
ret = -1;
}
commit ae66a05708d04f332d85fb258196d9045ebc303c
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Sun Oct 28 10:14:20 2018 +0300
linuxgen: add dumpconfig utility
it might be useful to package small binary which prints
platform default builtin config file.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
diff --git a/Makefile.am b/Makefile.am
index e4dab7e3..f651e9ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,12 +5,14 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-user-guides \
if PLATFORM_IS_LINUX_GENERIC
PLATFORM_DIR = platform/linux-generic
+PLATFORM_DUMPCONF_DIR = platform/linux-generic/dumpconfig
PLATFORM_TEST_DIR = platform/linux-generic/test
endif
SUBDIRS = \
include \
$(PLATFORM_DIR) \
+ $(PLATFORM_DUMPCONF_DIR) \
helper \
doc
diff --git a/platform/linux-generic/dumpconfig/.gitignore b/platform/linux-generic/dumpconfig/.gitignore
new file mode 100644
index 00000000..44752b56
--- /dev/null
+++ b/platform/linux-generic/dumpconfig/.gitignore
@@ -0,0 +1 @@
+odp_linuxgen_dumpconfig
diff --git a/platform/linux-generic/dumpconfig/Makefile.am b/platform/linux-generic/dumpconfig/Makefile.am
new file mode 100644
index 00000000..933424f0
--- /dev/null
+++ b/platform/linux-generic/dumpconfig/Makefile.am
@@ -0,0 +1,10 @@
+include $(top_srcdir)/Makefile.inc
+
+AM_CPPFLAGS = -I$(top_builddir)/platform/$(with_platform)/include
+AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/include
+
+bin_PROGRAMS = odp_linuxgen_dumpconfig
+
+odp_linuxgen_dumpconfig_SOURCES = dumpconfig.c
+
+TESTS = odp_linuxgen_dumpconfig
diff --git a/platform/linux-generic/dumpconfig/dumpconfig.c b/platform/linux-generic/dumpconfig/dumpconfig.c
new file mode 100644
index 00000000..a04f5c2d
--- /dev/null
+++ b/platform/linux-generic/dumpconfig/dumpconfig.c
@@ -0,0 +1,43 @@
+/* Copyright (c) 2018, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <odp_libconfig_config.h>
+
+int main(void)
+{
+ unsigned int i;
+ const char *filename;
+ FILE *f;
+ char c;
+
+ printf("# Builtin platform config\n\n");
+ for (i = 0; i < sizeof(config_builtin); i++)
+ printf("%c", config_builtin[i]);
+
+ filename = getenv("ODP_CONFIG_FILE");
+ if (filename == NULL)
+ return 0;
+
+ printf("# Overridden section with ODP_CONFIG_FILE=%s\n\n", filename);
+
+ f = fopen(filename, "r");
+ if (f == NULL) {
+ fprintf(stderr, "Error: open file %s\n", filename);
+ return -1;
+ }
+
+ while (1) {
+ c = fgetc(f);
+ if (feof(f))
+ break;
+ printf("%c", c);
+ }
+
+ fclose(f);
+ return 0;
+}
diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4
index e0fd099b..f9e9c494 100644
--- a/platform/linux-generic/m4/configure.m4
+++ b/platform/linux-generic/m4/configure.m4
@@ -27,6 +27,7 @@ AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC],
[test "${with_platform}" = "linux-generic"])
AC_CONFIG_FILES([platform/linux-generic/Makefile
platform/linux-generic/libodp-linux.pc
+ platform/linux-generic/dumpconfig/Makefile
platform/linux-generic/test/Makefile
platform/linux-generic/test/validation/api/shmem/Makefile
platform/linux-generic/test/validation/api/pktio/Makefile
commit eb3a816cb0fa6c5e76b25398a0ac280c769dcb49
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Wed Nov 7 10:44:00 2018 +0200
validation: crypto: capability call should not fail
Capability call should always succeed. It's possible that no
algorithms are supported, but also then the call should succeed.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index e8cc1547..b2f599ec 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -696,8 +696,11 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth)
{
odp_crypto_capability_t capability;
- if (odp_crypto_capability(&capability))
+ memset(&capability, 0, sizeof(odp_crypto_capability_t));
+ if (odp_crypto_capability(&capability)) {
+ fprintf(stderr, "odp_crypto_capability() failed\n");
return ODP_TEST_INACTIVE;
+ }
if (suite_context.packet) {
if (suite_context.op_mode == ODP_CRYPTO_SYNC &&
@@ -2030,6 +2033,7 @@ static int crypto_init(odp_instance_t *inst)
odp_pool_t pool;
odp_queue_t out_queue;
odp_pool_capability_t pool_capa;
+ odp_crypto_capability_t crypto_capa;
odp_init_t init_param;
odph_helper_options_t helper_options;
@@ -2051,6 +2055,11 @@ static int crypto_init(odp_instance_t *inst)
return -1;
}
+ if (odp_crypto_capability(&crypto_capa)) {
+ fprintf(stderr, "error: odp_crypto_capability() failed.\n");
+ return -1;
+ }
+
if (odp_pool_capability(&pool_capa) < 0) {
fprintf(stderr, "error: odp_pool_capability() failed.\n");
return -1;
-----------------------------------------------------------------------
Summary of changes:
.shippable.yml | 13 +-
.travis.yml | 24 +-
Makefile.am | 2 +
config/odp-linux-generic.conf | 29 +-
configure.ac | 6 +
example/generator/odp_generator.c | 13 +
example/sysinfo/odp_sysinfo.c | 4 +
platform/linux-generic/Makefile.am | 1 -
platform/linux-generic/arch/aarch64/odp_atomic.h | 49 +-
.../linux-generic/arch/aarch64/odp_sysinfo_parse.c | 71 ++-
.../linux-generic/arch/default/odp_sysinfo_parse.c | 16 +-
.../linux-generic/arch/x86/odp_sysinfo_parse.c | 2 +
platform/linux-generic/dumpconfig/.gitignore | 1 +
platform/linux-generic/dumpconfig/Makefile.am | 10 +
platform/linux-generic/dumpconfig/dumpconfig.c | 43 ++
.../linux-generic/include/odp_config_internal.h | 10 -
platform/linux-generic/include/odp_ishm_internal.h | 54 --
.../linux-generic/include/odp_ishmphy_internal.h | 6 +-
.../linux-generic/include/odp_ishmpool_internal.h | 1 -
platform/linux-generic/include/odp_shm_internal.h | 42 +-
.../linux-generic/include/odp_sysinfo_internal.h | 19 +
.../linux-generic/include/odp_timer_internal.h | 11 +-
platform/linux-generic/m4/configure.m4 | 6 +-
platform/linux-generic/m4/performance.m4 | 10 -
platform/linux-generic/odp_classification.c | 98 +--
platform/linux-generic/odp_crypto_null.c | 3 +-
platform/linux-generic/odp_crypto_openssl.c | 3 +-
platform/linux-generic/odp_init.c | 1 +
platform/linux-generic/odp_ipsec_sad.c | 3 +-
platform/linux-generic/odp_ishm.c | 699 +++++++++++----------
platform/linux-generic/odp_ishmphy.c | 142 ++---
platform/linux-generic/odp_ishmpool.c | 26 +-
platform/linux-generic/odp_packet_io.c | 3 +-
platform/linux-generic/odp_pool.c | 18 +-
platform/linux-generic/odp_queue_basic.c | 24 +-
platform/linux-generic/odp_queue_lf.c | 3 +-
platform/linux-generic/odp_queue_scalable.c | 67 +-
platform/linux-generic/odp_schedule_basic.c | 12 +-
platform/linux-generic/odp_schedule_scalable.c | 58 +-
platform/linux-generic/odp_schedule_sp.c | 6 +-
platform/linux-generic/odp_shared_memory.c | 31 +-
platform/linux-generic/odp_system_info.c | 17 +-
platform/linux-generic/odp_timer.c | 70 ++-
platform/linux-generic/pktio/ipc.c | 2 +-
platform/linux-generic/pktio/ring.c | 3 +-
platform/linux-generic/test/Makefile.am | 10 +-
platform/linux-generic/test/inline-timer.conf | 8 +
platform/linux-generic/test/performance/.gitignore | 2 -
.../linux-generic/test/performance/Makefile.am | 13 -
.../test/performance/odp_scheduling_run_proc.sh | 30 -
platform/linux-generic/test/process-mode.conf | 4 +-
.../test/validation/api/shmem/shmem_linux.c | 17 +-
scripts/Dockerfile | 28 -
scripts/ci/check.sh | 8 +-
scripts/ci/{check.sh => check_inline_timer.sh} | 7 +-
test/performance/odp_l2fwd_run.sh | 2 +-
test/performance/odp_queue_perf.c | 9 +-
test/performance/odp_sched_pktio.c | 6 +-
test/performance/odp_sched_pktio_run.sh | 2 +-
test/validation/api/crypto/odp_crypto_test_inp.c | 11 +-
test/validation/api/pool/pool.c | 103 +++
test/validation/api/shmem/shmem.c | 14 +-
62 files changed, 1055 insertions(+), 951 deletions(-)
create mode 100644 platform/linux-generic/dumpconfig/.gitignore
create mode 100644 platform/linux-generic/dumpconfig/Makefile.am
create mode 100644 platform/linux-generic/dumpconfig/dumpconfig.c
delete mode 100644 platform/linux-generic/include/odp_ishm_internal.h
delete mode 100644 platform/linux-generic/m4/performance.m4
create mode 100644 platform/linux-generic/test/inline-timer.conf
delete mode 100644 platform/linux-generic/test/performance/.gitignore
delete mode 100644 platform/linux-generic/test/performance/Makefile.am
delete mode 100755 platform/linux-generic/test/performance/odp_scheduling_run_proc.sh
delete mode 100644 scripts/Dockerfile
copy scripts/ci/{check.sh => check_inline_timer.sh} (51%)
hooks/post-receive
--
7 years, 9 months
- 1
- 0
[COMMIT] branch api-next updated. v1.19.0.2_tigermoth-286-g1ee7da08
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 1ee7da08721452033dd7b0537e62ec1191291120 (commit)
via eb9f47e9ce077e089575183abbfe00f2fce2fd41 (commit)
via 37bb9253fe0951f6dba10349e4ff472890615006 (commit)
via 70cf3e1941797acc0c3f1e2990f4490c249ee1a8 (commit)
via 7d457a070d8fd304262f28da9f86712b136ab0c0 (commit)
via 5c1c8bca96169bb3ce312b0d5cca39f7d9bc4372 (commit)
via 9bdb18d5ee876212bdac3098266a522f7bd25efb (commit)
via 044b9ed53fa1845d99f0aee3f402a5dcfed3c16e (commit)
via d901665b489d0470af24e757208488011515e0ad (commit)
via f36139ea56706df2534a269039b3effca7169234 (commit)
from 27b0ca668ec90730f6329185e23a026caf0b9064 (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 1ee7da08721452033dd7b0537e62ec1191291120
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Mon Oct 15 13:45:30 2018 +0300
linux-gen: shm: remove single_va configuration option
Process mode is now enabled by setting odp_init_global() parameter
odp_init_t.mem_model to ODP_MEM_MODEL_PROCESS.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf
index 4585a896..bca123bc 100644
--- a/config/odp-linux-generic.conf
+++ b/config/odp-linux-generic.conf
@@ -16,7 +16,7 @@
# Mandatory fields
odp_implementation = "linux-generic"
-config_file_version = "0.1.3"
+config_file_version = "0.1.4"
# Shared memory options
shm: {
@@ -33,10 +33,6 @@ shm: {
# When using process mode threads, this value should be set to 0
# because the current implementation won't work properly otherwise.
num_cached_hp = 0
-
- # Allocate internal shared memory using a single virtual address space.
- # Set to 1 to enable using process mode.
- single_va = 0
}
# Pool options
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index cf37bd9b..4a481397 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -301,15 +301,8 @@ static void hp_init(void)
char filename[ISHM_FILENAME_MAXLEN];
char dir[ISHM_FILENAME_MAXLEN];
int count;
- int single_va = 0;
void *addr;
- if (_odp_libconfig_lookup_ext_int("shm", NULL, "single_va",
- &single_va)) {
- odp_global_ro.shm_single_va = single_va;
- ODP_DBG("Shm single VA: %d\n", odp_global_ro.shm_single_va);
- }
-
if (!_odp_libconfig_lookup_ext_int("shm", NULL, "num_cached_hp",
&count)) {
return;
diff --git a/platform/linux-generic/test/process-mode.conf b/platform/linux-generic/test/process-mode.conf
index f631f54b..4bda6933 100644
--- a/platform/linux-generic/test/process-mode.conf
+++ b/platform/linux-generic/test/process-mode.conf
@@ -1,10 +1,7 @@
# Mandatory fields
odp_implementation = "linux-generic"
-config_file_version = "0.1.3"
+config_file_version = "0.1.4"
# Shared memory options
shm: {
- # Override default option and allocate internal shms using single
- # virtual address space.
- single_va = 1
}
commit eb9f47e9ce077e089575183abbfe00f2fce2fd41
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Mon Oct 15 15:27:11 2018 +0300
validation: use use mem_model from helper options
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common/odp_cunit_common.c b/test/common/odp_cunit_common.c
index ed0651ad..7f345fba 100644
--- a/test/common/odp_cunit_common.c
+++ b/test/common/odp_cunit_common.c
@@ -79,7 +79,18 @@ int odp_cunit_thread_exit(pthrd_arg *arg)
static int tests_global_init(odp_instance_t *inst)
{
- if (0 != odp_init_global(inst, NULL, NULL)) {
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
+
+ if (odph_options(&helper_options)) {
+ fprintf(stderr, "error: odph_options() failed.\n");
+ return -1;
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (0 != odp_init_global(inst, &init_param, NULL)) {
fprintf(stderr, "error: odp_init_global() failed.\n");
return -1;
}
diff --git a/test/validation/api/atomic/atomic.c b/test/validation/api/atomic/atomic.c
index a755aef9..9530df9c 100644
--- a/test/validation/api/atomic/atomic.c
+++ b/test/validation/api/atomic/atomic.c
@@ -8,6 +8,7 @@
#include <malloc.h>
#include <odp_api.h>
+#include <odp/helper/odph_api.h>
#include <CUnit/Basic.h>
#include <odp_cunit_common.h>
#include <unistd.h>
@@ -554,8 +555,18 @@ static int atomic_init(odp_instance_t *inst)
uint32_t workers_count, max_threads;
int ret = 0;
odp_cpumask_t mask;
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
- if (0 != odp_init_global(inst, NULL, NULL)) {
+ if (odph_options(&helper_options)) {
+ fprintf(stderr, "error: odph_options() failed.\n");
+ return -1;
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (0 != odp_init_global(inst, &init_param, NULL)) {
fprintf(stderr, "error: odp_init_global() failed.\n");
return -1;
}
diff --git a/test/validation/api/barrier/barrier.c b/test/validation/api/barrier/barrier.c
index a3be4be4..806f2486 100644
--- a/test/validation/api/barrier/barrier.c
+++ b/test/validation/api/barrier/barrier.c
@@ -8,6 +8,7 @@
#include <malloc.h>
#include <odp_api.h>
+#include <odp/helper/odph_api.h>
#include <CUnit/Basic.h>
#include <odp_cunit_common.h>
#include <unistd.h>
@@ -329,8 +330,18 @@ static int barrier_init(odp_instance_t *inst)
uint32_t workers_count, max_threads;
int ret = 0;
odp_cpumask_t mask;
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
- if (0 != odp_init_global(inst, NULL, NULL)) {
+ if (odph_options(&helper_options)) {
+ fprintf(stderr, "error: odph_options() failed.\n");
+ return -1;
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (0 != odp_init_global(inst, &init_param, NULL)) {
fprintf(stderr, "error: odp_init_global() failed.\n");
return -1;
}
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index 5b395c2a..e8cc1547 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -7,6 +7,7 @@
#include "config.h"
#include <odp_api.h>
+#include <odp/helper/odph_api.h>
#include <CUnit/Basic.h>
#include <odp_cunit_common.h>
#include "test_vectors.h"
@@ -2029,8 +2030,18 @@ static int crypto_init(odp_instance_t *inst)
odp_pool_t pool;
odp_queue_t out_queue;
odp_pool_capability_t pool_capa;
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
- if (0 != odp_init_global(inst, NULL, NULL)) {
+ if (odph_options(&helper_options)) {
+ fprintf(stderr, "error: odph_options() failed.\n");
+ return -1;
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (0 != odp_init_global(inst, &init_param, NULL)) {
fprintf(stderr, "error: odp_init_global() failed.\n");
return -1;
}
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index f10c4c29..f82c561a 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -910,8 +910,18 @@ int ipsec_init(odp_instance_t *inst)
odp_queue_t out_queue;
odp_pool_capability_t pool_capa;
odp_pktio_t pktio;
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
- if (0 != odp_init_global(inst, NULL, NULL)) {
+ if (odph_options(&helper_options)) {
+ fprintf(stderr, "error: odph_options() failed.\n");
+ return -1;
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (0 != odp_init_global(inst, &init_param, NULL)) {
fprintf(stderr, "error: odp_init_global() failed.\n");
return -1;
}
diff --git a/test/validation/api/lock/lock.c b/test/validation/api/lock/lock.c
index 67e1e3c8..b8502f01 100644
--- a/test/validation/api/lock/lock.c
+++ b/test/validation/api/lock/lock.c
@@ -8,6 +8,7 @@
#include <malloc.h>
#include <odp_api.h>
+#include <odp/helper/odph_api.h>
#include <CUnit/Basic.h>
#include <odp_cunit_common.h>
#include <unistd.h>
@@ -1163,8 +1164,18 @@ static int lock_init(odp_instance_t *inst)
uint32_t workers_count, max_threads;
int ret = 0;
odp_cpumask_t mask;
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
- if (0 != odp_init_global(inst, NULL, NULL)) {
+ if (odph_options(&helper_options)) {
+ fprintf(stderr, "error: odph_options() failed.\n");
+ return -1;
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (0 != odp_init_global(inst, &init_param, NULL)) {
fprintf(stderr, "error: odp_init_global() failed.\n");
return -1;
}
diff --git a/test/validation/api/thread/thread.c b/test/validation/api/thread/thread.c
index d977f977..7b40cda6 100644
--- a/test/validation/api/thread/thread.c
+++ b/test/validation/api/thread/thread.c
@@ -7,6 +7,7 @@
#include "config.h"
#include <odp_api.h>
+#include <odp/helper/odph_api.h>
#include <odp_cunit_common.h>
#include <mask_common.h>
#include <test_debug.h>
@@ -24,8 +25,18 @@ static global_shared_mem_t *global_mem;
static int thread_global_init(odp_instance_t *inst)
{
odp_shm_t global_shm;
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
- if (0 != odp_init_global(inst, NULL, NULL)) {
+ if (odph_options(&helper_options)) {
+ fprintf(stderr, "error: odph_options() failed.\n");
+ return -1;
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (0 != odp_init_global(inst, &init_param, NULL)) {
fprintf(stderr, "error: odp_init_global() failed.\n");
return -1;
}
diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c
index 968812c8..ab5bc2de 100644
--- a/test/validation/api/timer/timer.c
+++ b/test/validation/api/timer/timer.c
@@ -61,8 +61,18 @@ static global_shared_mem_t *global_mem;
static int timer_global_init(odp_instance_t *inst)
{
odp_shm_t global_shm;
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
- if (0 != odp_init_global(inst, NULL, NULL)) {
+ if (odph_options(&helper_options)) {
+ fprintf(stderr, "error: odph_options() failed.\n");
+ return -1;
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (0 != odp_init_global(inst, &init_param, NULL)) {
fprintf(stderr, "error: odp_init_global() failed.\n");
return -1;
}
commit 37bb9253fe0951f6dba10349e4ff472890615006
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 12 15:51:07 2018 +0300
example: use mem_model from helper options
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c
index b8e1c897..274ffaf4 100644
--- a/example/classifier/odp_classifier.c
+++ b/example/classifier/odp_classifier.c
@@ -468,6 +468,7 @@ static void configure_cos(odp_cos_t default_cos, appl_args_t *args)
*/
int main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
odp_pool_t pool;
int num_workers;
@@ -481,10 +482,21 @@ int main(int argc, char *argv[])
odp_shm_t shm;
int ret;
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ EXAMPLE_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
EXAMPLE_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
@@ -805,9 +817,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+c:t:i:p:m:t:h";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->cpu_count = 1; /* Use one worker by default */
while (1) {
diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c
index 34543cd2..98a89211 100644
--- a/example/generator/odp_generator.c
+++ b/example/generator/odp_generator.c
@@ -1090,6 +1090,7 @@ static void print_global_stats(int num_workers)
*/
int main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
odp_pool_t pool;
int num_workers;
@@ -1101,10 +1102,21 @@ int main(int argc, char *argv[])
odp_pool_param_t params;
interface_t *ifs;
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ EXAMPLE_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
EXAMPLE_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
@@ -1427,9 +1439,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+I:a:b:s:d:p:i:m:n:t:w:c:x:he:j:f:k"
":yr:z";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->mode = -1; /* Invalid, must be changed by parsing */
appl_args->number = -1;
appl_args->payload = 56;
diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c
index aff6de0a..1bbf7a00 100644
--- a/example/ipsec/odp_ipsec.c
+++ b/example/ipsec/odp_ipsec.c
@@ -1186,6 +1186,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED)
int
main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
int num_workers;
int i;
@@ -1195,6 +1196,7 @@ main(int argc, char *argv[])
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
odp_pool_param_t params;
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
/* create by default scheduled queues */
@@ -1207,8 +1209,18 @@ main(int argc, char *argv[])
schedule = polled_odp_schedule_cb;
}
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ EXAMPLE_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
EXAMPLE_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
@@ -1405,9 +1417,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+c:i:m:h:r:p:a:e:t:s:";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
printf("\nParsing command line options\n");
appl_args->cpu_count = 1; /* use one worker by default */
diff --git a/example/ipsec_api/odp_ipsec.c b/example/ipsec_api/odp_ipsec.c
index 08840d63..ab0fa3c5 100644
--- a/example/ipsec_api/odp_ipsec.c
+++ b/example/ipsec_api/odp_ipsec.c
@@ -885,6 +885,7 @@ int pktio_thread(void *arg EXAMPLE_UNUSED)
int
main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
int num_workers;
int i;
@@ -894,6 +895,7 @@ main(int argc, char *argv[])
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
odp_pool_param_t params;
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
/* create by default scheduled queues */
@@ -906,8 +908,18 @@ main(int argc, char *argv[])
schedule = polled_odp_schedule_cb;
}
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ EXAMPLE_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
EXAMPLE_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
@@ -1106,9 +1118,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+c:i:h:lm:r:p:a:e:t:s:";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->cpu_count = 1; /* use one worker by default */
printf("\nParsing command line options\n");
diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c
index 8daeec4c..f7e7ba53 100644
--- a/example/l2fwd_simple/odp_l2fwd_simple.c
+++ b/example/l2fwd_simple/odp_l2fwd_simple.c
@@ -139,17 +139,29 @@ static int run_worker(void *arg ODP_UNUSED)
int main(int argc, char **argv)
{
+ odph_helper_options_t helper_options;
odp_pool_t pool;
odp_pool_param_t params;
odp_cpumask_t cpumask;
odph_odpthread_t thd[MAX_WORKERS];
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
odph_ethaddr_t correct_src;
uint32_t mtu1, mtu2;
odp_shm_t shm;
- if (odp_init_global(&instance, NULL, NULL)) {
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ printf("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (odp_init_global(&instance, &init_param, NULL)) {
printf("Error: ODP global init failed.\n");
exit(1);
}
@@ -171,9 +183,6 @@ int main(int argc, char **argv)
memset(global, 0, sizeof(global_data_t));
global->shm = shm;
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
if (argc > 7 ||
odph_eth_addr_parse(&global->dst, argv[3]) != 0 ||
odph_eth_addr_parse(&global->src, argv[4]) != 0) {
diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c
index f71ae537..b1c4a79c 100644
--- a/example/packet/odp_pktio.c
+++ b/example/packet/odp_pktio.c
@@ -343,6 +343,7 @@ static int pktio_ifburst_thread(void *arg)
*/
int main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
odp_pool_t pool;
int num_workers;
@@ -352,11 +353,22 @@ int main(int argc, char *argv[])
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
odp_pool_param_t params;
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
odp_shm_t shm;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ EXAMPLE_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
EXAMPLE_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
@@ -585,9 +597,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+c:i:+m:t:h";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->cpu_count = 1; /* use one worker by default */
appl_args->mode = APPL_MODE_PKT_SCHED;
appl_args->time = 0; /**< loop forever */
diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c
index a67fa180..a0162145 100644
--- a/example/switch/odp_switch.c
+++ b/example/switch/odp_switch.c
@@ -758,9 +758,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+c:+t:+a:i:h";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->cpu_count = 1; /* use one worker by default */
appl_args->time = 0; /* loop forever if time to run is 0 */
appl_args->accuracy = 10; /* get and print pps stats second */
@@ -870,6 +867,7 @@ static void gbl_args_init(args_t *args)
int main(int argc, char **argv)
{
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
int i, j;
int cpu;
@@ -882,10 +880,21 @@ int main(int argc, char **argv)
stats_t (*stats)[MAX_PKTIOS];
int if_count;
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ printf("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
printf("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c
index 317f9a27..6c56d6c6 100644
--- a/example/time/time_global_test.c
+++ b/example/time/time_global_test.c
@@ -254,16 +254,25 @@ int main(int argc, char *argv[])
odp_shm_t shm_glbls = ODP_SHM_INVALID;
odp_shm_t shm_log = ODP_SHM_INVALID;
int log_size, log_enries_num;
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
- /* let helper collect its own arguments (e.g. --odph_proc) */
+ printf("\nODP global time test starts\n");
+
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ EXAMPLE_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
- printf("\nODP global time test starts\n");
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
err = 1;
EXAMPLE_ERR("ODP global init failed.\n");
goto end;
diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c
index 68970078..ca3e8ddf 100644
--- a/example/timer/odp_timer_test.c
+++ b/example/timer/odp_timer_test.c
@@ -274,9 +274,6 @@ static void parse_args(int argc, char *argv[], test_args_t *args)
static const char *shortopts = "+c:r:m:x:p:t:h";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
/* defaults */
odp_timer_capability(ODP_CLOCK_CPU, &timer_capa);
@@ -334,6 +331,7 @@ static void parse_args(int argc, char *argv[], test_args_t *args)
*/
int main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
int num_workers;
odp_queue_t queue;
@@ -345,6 +343,7 @@ int main(int argc, char *argv[])
odp_cpumask_t cpumask;
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
odp_shm_t shm = ODP_SHM_INVALID;
test_globals_t *gbls = NULL;
@@ -352,7 +351,17 @@ int main(int argc, char *argv[])
printf("\nODP timer example starts\n");
- if (odp_init_global(&instance, NULL, NULL)) {
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ EXAMPLE_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (odp_init_global(&instance, &init_param, NULL)) {
err = 1;
printf("ODP global init failed.\n");
goto err_global;
commit 70cf3e1941797acc0c3f1e2990f4490c249ee1a8
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 12 16:14:26 2018 +0300
test: performance: use mem_model from helper options
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c
index faa51dad..75ea0a7a 100644
--- a/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c
+++ b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c
@@ -135,14 +135,20 @@ int main(int argc, char **argv)
odp_pool_t pool;
odp_pool_param_t params;
odp_cpumask_t cpumask;
+ odph_helper_options_t helper_options;
odph_odpthread_t thd[MAX_WORKERS];
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
odp_shm_t shm;
int ret;
- /* let helper collect its own arguments (e.g. --odph_proc) */
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ printf("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
if (argc < 3) {
printf("Too few arguments (%i).\n"
@@ -150,7 +156,10 @@ int main(int argc, char **argv)
exit(0);
}
- if (odp_init_global(&instance, NULL, NULL)) {
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
+ if (odp_init_global(&instance, &init_param, NULL)) {
printf("Error: ODP global init failed.\n");
exit(1);
}
diff --git a/test/performance/odp_bench_packet.c b/test/performance/odp_bench_packet.c
index a4493139..9b779e98 100644
--- a/test/performance/odp_bench_packet.c
+++ b/test/performance/odp_bench_packet.c
@@ -1315,9 +1315,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "b:i:h";
- /* Let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->bench_idx = 0; /* Run all benchmarks */
appl_args->burst_size = TEST_DEF_BURST;
@@ -1511,6 +1508,7 @@ bench_info_t test_suite[] = {
*/
int main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t worker_thread;
int cpu;
odp_shm_t shm;
@@ -1519,11 +1517,22 @@ int main(int argc, char *argv[])
odp_pool_capability_t capa;
odp_pool_param_t params;
odp_instance_t instance;
+ odp_init_t init_param;
uint32_t pkt_num;
uint8_t ret;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ LOG_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
LOG_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
diff --git a/test/performance/odp_cpu_bench.c b/test/performance/odp_cpu_bench.c
index ceabc5b8..852ed308 100644
--- a/test/performance/odp_cpu_bench.c
+++ b/test/performance/odp_cpu_bench.c
@@ -382,9 +382,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+a:+c:+l:+t:h";
- /* Let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->accuracy = 1; /* Get and print pps stats second */
appl_args->cpu_count = 1;
appl_args->lookup_tbl_size = DEF_LOOKUP_TBL_SIZE;
@@ -524,6 +521,7 @@ static void gbl_args_init(args_t *args)
int main(int argc, char *argv[])
{
stats_t *stats[MAX_WORKERS];
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
odp_cpumask_t cpumask;
odp_pool_capability_t pool_capa;
@@ -546,6 +544,13 @@ int main(int argc, char *argv[])
int cpu;
int ret = 0;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ LOG_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
odp_init_param_init(&init);
/* List features not to be used (may optimize performance) */
@@ -555,6 +560,8 @@ int main(int argc, char *argv[])
init.not_used.feat.timer = 1;
init.not_used.feat.tm = 1;
+ init.mem_model = helper_options.mem_model;
+
/* Signal handler has to be registered before global init in case ODP
* implementation creates internal threads/processes. */
signal(SIGINT, sig_handler);
diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c
index 635b69f7..665268be 100644
--- a/test/performance/odp_crypto.c
+++ b/test/performance/odp_crypto.c
@@ -1033,20 +1033,32 @@ int main(int argc, char *argv[])
odp_cpumask_t cpumask;
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
int num_workers = 1;
+ odph_helper_options_t helper_options;
odph_odpthread_t thr[num_workers];
odp_instance_t instance;
+ odp_init_t init_param;
odp_pool_capability_t pool_capa;
odp_crypto_capability_t crypto_capa;
uint32_t max_seg_len;
unsigned i;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ app_err("Reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
memset(&cargs, 0, sizeof(cargs));
/* Parse and store the application arguments */
parse_args(argc, argv, &cargs);
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
app_err("ODP global init failed.\n");
exit(EXIT_FAILURE);
}
@@ -1197,9 +1209,6 @@ static void parse_args(int argc, char *argv[], crypto_args_t *cargs)
static const char *shortopts = "+a:c:df:hi:m:nl:spr";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
cargs->in_place = 0;
cargs->in_flight = 1;
cargs->debug_packets = 0;
diff --git a/test/performance/odp_ipsec.c b/test/performance/odp_ipsec.c
index e5d53931..e388916c 100644
--- a/test/performance/odp_ipsec.c
+++ b/test/performance/odp_ipsec.c
@@ -936,9 +936,6 @@ static void parse_args(int argc, char *argv[], ipsec_args_t *cargs)
static const char *shortopts = "+a:c:df:hi:m:nl:sptu";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
cargs->in_place = 0;
cargs->in_flight = 1;
cargs->debug_packets = 0;
@@ -1020,20 +1017,32 @@ int main(int argc, char *argv[])
odp_cpumask_t cpumask;
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
int num_workers = 1;
+ odph_helper_options_t helper_options;
odph_odpthread_t thr[num_workers];
odp_instance_t instance;
+ odp_init_t init_param;
odp_pool_capability_t capa;
odp_ipsec_config_t config;
uint32_t max_seg_len;
unsigned int i;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ app_err("Reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
memset(&cargs, 0, sizeof(cargs));
/* Parse and store the application arguments */
parse_args(argc, argv, &cargs);
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
app_err("ODP global init failed.\n");
exit(EXIT_FAILURE);
}
diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c
index cdd67206..78e3920f 100644
--- a/test/performance/odp_l2fwd.c
+++ b/test/performance/odp_l2fwd.c
@@ -1184,9 +1184,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+c:+t:+a:i:m:o:r:d:s:e:k:g:vh";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->time = 0; /* loop forever if time to run is 0 */
appl_args->accuracy = 1; /* get and print pps stats second */
appl_args->cpu_count = 1; /* use one worker by default */
@@ -1428,6 +1425,7 @@ static void create_groups(int num, odp_schedule_group_t *group)
*/
int main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
odp_pool_t pool;
int i;
@@ -1449,6 +1447,13 @@ int main(int argc, char *argv[])
odp_pool_capability_t pool_capa;
uint32_t pkt_len, pkt_num;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ LOG_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
odp_init_param_init(&init);
/* List features not to be used (may optimize performance) */
@@ -1458,6 +1463,8 @@ int main(int argc, char *argv[])
init.not_used.feat.timer = 1;
init.not_used.feat.tm = 1;
+ init.mem_model = helper_options.mem_model;
+
/* Signal handler has to be registered before global init in case ODP
* implementation creates internal threads/processes. */
signal(SIGINT, sig_handler);
diff --git a/test/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c
index ce4925f5..15229aeb 100644
--- a/test/performance/odp_pktio_ordered.c
+++ b/test/performance/odp_pktio_ordered.c
@@ -866,9 +866,6 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args)
static const char *shortopts = "+c:+t:+a:i:m:d:r:f:e:h";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
appl_args->time = 0; /* loop forever if time to run is 0 */
appl_args->accuracy = DEF_STATS_INT;
appl_args->cpu_count = 1; /* use one worker by default */
@@ -1060,6 +1057,7 @@ int main(int argc, char *argv[])
{
odp_cpumask_t cpumask;
odp_instance_t instance;
+ odp_init_t init_param;
odp_pool_t pool;
odp_pool_param_t params;
odp_shm_t shm;
@@ -1067,6 +1065,7 @@ int main(int argc, char *argv[])
odp_schedule_config_t schedule_config;
odp_pool_capability_t pool_capa;
odph_ethaddr_t new_addr;
+ odph_helper_options_t helper_options;
odph_odpthread_t thread_tbl[MAX_WORKERS];
stats_t *stats;
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
@@ -1078,8 +1077,18 @@ int main(int argc, char *argv[])
int in_mode;
uint32_t queue_size, pool_size;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ LOG_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
LOG_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c
index 0e1af0c4..2ed2c352 100644
--- a/test/performance/odp_pktio_perf.c
+++ b/test/performance/odp_pktio_perf.c
@@ -960,9 +960,6 @@ static void parse_args(int argc, char *argv[], test_args_t *args)
static const char *shortopts = "+c:t:b:pR:l:r:i:d:vh";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
args->cpu_count = 2;
args->num_tx_workers = 0; /* defaults to cpu_count+1/2 */
args->tx_batch_len = BATCH_LEN_MAX;
@@ -1043,9 +1040,21 @@ int main(int argc, char **argv)
int ret;
odp_shm_t shm;
int max_thrs;
+ odph_helper_options_t helper_options;
odp_instance_t instance;
+ odp_init_t init_param;
+
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ LOG_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
- if (odp_init_global(&instance, NULL, NULL) != 0)
+ if (odp_init_global(&instance, &init_param, NULL) != 0)
LOG_ABORT("Failed global init.\n");
if (odp_init_local(instance, ODP_THREAD_CONTROL) != 0)
diff --git a/test/performance/odp_sched_latency.c b/test/performance/odp_sched_latency.c
index c0792fa4..b5be1a16 100644
--- a/test/performance/odp_sched_latency.c
+++ b/test/performance/odp_sched_latency.c
@@ -549,9 +549,6 @@ static void parse_args(int argc, char *argv[], test_args_t *args)
static const char *shortopts = "+c:s:l:t:m:n:o:p:rh";
- /* Let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
args->cpu_count = 1;
args->sync_type = ODP_SCHED_SYNC_PARALLEL;
args->sample_per_prio = SAMPLE_EVENT_PER_PRIO;
@@ -637,6 +634,8 @@ static void parse_args(int argc, char *argv[], test_args_t *args)
int main(int argc, char *argv[])
{
odp_instance_t instance;
+ odp_init_t init_param;
+ odph_helper_options_t helper_options;
odph_odpthread_t *thread_tbl;
odph_odpthread_params_t thr_params;
odp_cpumask_t cpumask;
@@ -654,11 +653,21 @@ int main(int argc, char *argv[])
printf("\nODP scheduling latency benchmark starts\n\n");
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ LOG_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
memset(&args, 0, sizeof(args));
parse_args(argc, argv, &args);
/* ODP global init */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
LOG_ERR("ODP global init failed.\n");
return -1;
}
diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c
index 42f879eb..239e12e9 100644
--- a/test/performance/odp_sched_pktio.c
+++ b/test/performance/odp_sched_pktio.c
@@ -580,9 +580,6 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options)
test_options->burst_size = 32;
test_options->pipe_queue_size = 256;
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
while (1) {
opt = getopt_long(argc, argv, shortopts, longopts, &long_index);
@@ -1430,10 +1427,18 @@ int main(int argc, char *argv[])
odp_init_t init;
odp_shm_t shm;
odp_time_t t1, t2;
+ odph_helper_options_t helper_options;
odph_odpthread_t thread[MAX_WORKERS];
test_options_t test_options;
int ret = 0;
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ printf("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
signal(SIGINT, sig_handler);
if (parse_options(argc, argv, &test_options))
@@ -1450,6 +1455,8 @@ int main(int argc, char *argv[])
if (test_options.timeout_us)
init.not_used.feat.timer = 0;
+ init.mem_model = helper_options.mem_model;
+
/* Init ODP before calling anything else */
if (odp_init_global(&instance, &init, NULL)) {
printf("Error: Global init failed.\n");
diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c
index f17e1aed..afe5b73b 100644
--- a/test/performance/odp_scheduling.c
+++ b/test/performance/odp_scheduling.c
@@ -762,9 +762,6 @@ static void parse_args(int argc, char *argv[], test_args_t *args)
static const char *shortopts = "+c:fh";
- /* let helper collect its own arguments (e.g. --odph_proc) */
- argc = odph_parse_options(argc, argv);
-
args->cpu_count = 1; /* use one worker by default */
while (1) {
@@ -798,6 +795,7 @@ static void parse_args(int argc, char *argv[], test_args_t *args)
*/
int main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_t *thread_tbl;
test_args_t args;
int num_workers;
@@ -811,6 +809,7 @@ int main(int argc, char *argv[])
odp_pool_param_t params;
int ret = 0;
odp_instance_t instance;
+ odp_init_t init_param;
odph_odpthread_params_t thr_params;
odp_queue_capability_t capa;
odp_pool_capability_t pool_capa;
@@ -819,11 +818,21 @@ int main(int argc, char *argv[])
printf("\nODP example starts\n\n");
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
+ argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ LOG_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
+
memset(&args, 0, sizeof(args));
parse_args(argc, argv, &args);
/* ODP global init */
- if (odp_init_global(&instance, NULL, NULL)) {
+ if (odp_init_global(&instance, &init_param, NULL)) {
LOG_ERR("ODP global init failed.\n");
return -1;
}
commit 7d457a070d8fd304262f28da9f86712b136ab0c0
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 12 13:02:05 2018 +0300
helper: test: add test for new odph_options() function
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/helper/test/odpthreads.c b/helper/test/odpthreads.c
index ad48ec2d..55db37e0 100644
--- a/helper/test/odpthreads.c
+++ b/helper/test/odpthreads.c
@@ -64,18 +64,27 @@ static int worker_fn(void *arg ODPH_UNUSED)
/* Create additional dataplane opdthreads */
int main(int argc, char *argv[])
{
+ odph_helper_options_t helper_options;
odph_odpthread_params_t thr_params;
odph_odpthread_t thread_tbl[NUMBER_WORKERS];
odp_cpumask_t cpu_mask;
+ odp_init_t init_param;
int num_workers;
int cpu, affinity;
int ret;
char cpumaskstr[ODP_CPUMASK_STR_SIZE];
- /* let helper collect its own arguments (e.g. --odph_proc) */
+ /* Let helper collect its own arguments (e.g. --odph_proc) */
argc = odph_parse_options(argc, argv);
+ if (odph_options(&helper_options)) {
+ ODPH_ERR("Error: reading ODP helper options failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ odp_init_param_init(&init_param);
+ init_param.mem_model = helper_options.mem_model;
- if (odp_init_global(&odp_instance, NULL, NULL)) {
+ if (odp_init_global(&odp_instance, &init_param, NULL)) {
ODPH_ERR("Error: ODP global init failed.\n");
exit(EXIT_FAILURE);
}
commit 5c1c8bca96169bb3ce312b0d5cca39f7d9bc4372
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 12 10:43:34 2018 +0300
helper: threads: add odph_options() getter function
Add function for reading parsed linux helper options.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/helper/include/odp/helper/threads.h b/helper/include/odp/helper/threads.h
index f4e8a785..6cee2522 100644
--- a/helper/include/odp/helper/threads.h
+++ b/helper/include/odp/helper/threads.h
@@ -88,6 +88,11 @@ typedef struct {
};
} odph_odpthread_t;
+/** Linux helper options */
+typedef struct {
+ odp_mem_model_t mem_model; /**< Process or thread */
+} odph_helper_options_t;
+
/**
* Creates and launches odpthreads (as linux threads or processes)
*
@@ -153,6 +158,18 @@ int odph_odpthread_getaffinity(void);
*/
int odph_parse_options(int argc, char *argv[]);
+/**
+ * Get linux helper options
+ *
+ * Return used ODP helper options. odph_parse_options() must be called before
+ * using this function.
+ *
+ * @param[out] options ODP helper options
+ *
+ * @return 0 on success, -1 on failure
+ */
+int odph_options(odph_helper_options_t *options);
+
/**
* @}
*/
diff --git a/helper/threads.c b/helper/threads.c
index 1e03ce02..01bc33ea 100644
--- a/helper/threads.c
+++ b/helper/threads.c
@@ -23,9 +23,7 @@
#define FAILED_CPU -1
-static struct {
- int proc; /* true when process mode is required, false otherwise */
-} helper_options;
+static odph_helper_options_t helper_options;
/*
* wrapper for odpthreads, either implemented as linux threads or processes.
@@ -181,7 +179,7 @@ int odph_odpthreads_create(odph_odpthread_t *thread_tbl,
cpu = odp_cpumask_first(mask);
for (i = 0; i < num; i++) {
- if (!helper_options.proc) {
+ if (helper_options.mem_model == ODP_MEM_MODEL_THREAD) {
if (odph_linux_thread_create(&thread_tbl[i],
cpu,
thr_params))
@@ -330,19 +328,19 @@ int odph_parse_options(int argc, char *argv[])
char *env;
int i, j;
- helper_options.proc = 0;
+ helper_options.mem_model = ODP_MEM_MODEL_THREAD;
/* Enable process mode using environment variable. Setting environment
* variable is easier for CI testing compared to command line
* argument. */
env = getenv("ODPH_PROC_MODE");
if (env && atoi(env))
- helper_options.proc = 1;
+ helper_options.mem_model = ODP_MEM_MODEL_PROCESS;
/* Find and remove option */
for (i = 0; i < argc;) {
if (strcmp(argv[i], "--odph_proc") == 0) {
- helper_options.proc = 1;
+ helper_options.mem_model = ODP_MEM_MODEL_PROCESS;
for (j = i; j < argc - 1; j++)
argv[j] = argv[j + 1];
@@ -356,3 +354,12 @@ int odph_parse_options(int argc, char *argv[])
return argc;
}
+
+int odph_options(odph_helper_options_t *options)
+{
+ memset(options, 0, sizeof(odph_helper_options_t));
+
+ options->mem_model = helper_options.mem_model;
+
+ return 0;
+}
commit 9bdb18d5ee876212bdac3098266a522f7bd25efb
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Thu Oct 11 17:00:27 2018 +0300
helper: threads: replace odph_linux_thread_type_t with odp_mem_model_t
Replace enum odph_odpthread_linuxtype_t with odp_mem_model_t.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/helper/include/odp/helper/threads.h b/helper/include/odp/helper/threads.h
index 9d03c719..f4e8a785 100644
--- a/helper/include/odp/helper/threads.h
+++ b/helper/include/odp/helper/threads.h
@@ -54,13 +54,6 @@ typedef struct {
int status; /**< Process state change status */
} odph_linux_process_t;
-/** odpthread linux type: whether an ODP thread is a linux thread or process */
-typedef enum odph_odpthread_linuxtype_e {
- ODPTHREAD_NOT_STARTED = 0,
- ODPTHREAD_PROCESS,
- ODPTHREAD_PTHREAD
-} odph_odpthread_linuxtype_t;
-
/** odpthread parameters for odp threads (pthreads and processes) */
typedef struct {
int (*start)(void *); /**< Thread entry point function */
@@ -71,7 +64,7 @@ typedef struct {
/** The odpthread starting arguments, used both in process or thread mode */
typedef struct {
- odph_odpthread_linuxtype_t linuxtype; /**< process or pthread */
+ odp_mem_model_t mem_model; /**< process or thread */
odph_odpthread_params_t thr_params; /**< odpthread start parameters */
} odph_odpthread_start_args_t;
diff --git a/helper/threads.c b/helper/threads.c
index f1f63875..1e03ce02 100644
--- a/helper/threads.c
+++ b/helper/threads.c
@@ -21,6 +21,8 @@
#include <odp/helper/threads.h>
#include "odph_debug.h"
+#define FAILED_CPU -1
+
static struct {
int proc; /* true when process mode is required, false otherwise */
} helper_options;
@@ -42,7 +44,7 @@ static void *_odph_thread_run_start_routine(void *arg)
/* ODP thread local init */
if (odp_init_local(thr_params->instance, thr_params->thr_type)) {
ODPH_ERR("Local init failed\n");
- if (start_args->linuxtype == ODPTHREAD_PROCESS)
+ if (start_args->mem_model == ODP_MEM_MODEL_PROCESS)
_exit(EXIT_FAILURE);
return (void *)-1;
}
@@ -50,7 +52,7 @@ static void *_odph_thread_run_start_routine(void *arg)
ODPH_DBG("helper: ODP %s thread started as linux %s. (pid=%d)\n",
thr_params->thr_type == ODP_THREAD_WORKER ?
"worker" : "control",
- (start_args->linuxtype == ODPTHREAD_PTHREAD) ?
+ (start_args->mem_model == ODP_MEM_MODEL_THREAD) ?
"pthread" : "process",
(int)getpid());
@@ -61,7 +63,7 @@ static void *_odph_thread_run_start_routine(void *arg)
ODPH_ERR("Local term failed\n");
/* for process implementation of odp threads, just return status... */
- if (start_args->linuxtype == ODPTHREAD_PROCESS)
+ if (start_args->mem_model == ODP_MEM_MODEL_PROCESS)
_exit(status);
/* threads implementation return void* pointers: cast status to that. */
@@ -81,14 +83,14 @@ static int _odph_linux_process_create(odph_odpthread_t *thread_tbl,
CPU_ZERO(&cpu_set);
CPU_SET(cpu, &cpu_set);
- thread_tbl->start_args.thr_params = *thr_params; /* copy */
- thread_tbl->start_args.linuxtype = ODPTHREAD_PROCESS;
+ thread_tbl->start_args.thr_params = *thr_params; /* copy */
+ thread_tbl->start_args.mem_model = ODP_MEM_MODEL_PROCESS;
thread_tbl->cpu = cpu;
pid = fork();
if (pid < 0) {
ODPH_ERR("fork() failed\n");
- thread_tbl->start_args.linuxtype = ODPTHREAD_NOT_STARTED;
+ thread_tbl->cpu = FAILED_CPU;
return -1;
}
@@ -136,8 +138,8 @@ static int odph_linux_thread_create(odph_odpthread_t *thread_tbl,
pthread_attr_setaffinity_np(&thread_tbl->thread.attr,
sizeof(cpu_set_t), &cpu_set);
- thread_tbl->start_args.thr_params = *thr_params; /* copy */
- thread_tbl->start_args.linuxtype = ODPTHREAD_PTHREAD;
+ thread_tbl->start_args.thr_params = *thr_params; /* copy */
+ thread_tbl->start_args.mem_model = ODP_MEM_MODEL_THREAD;
ret = pthread_create(&thread_tbl->thread.thread_id,
&thread_tbl->thread.attr,
@@ -145,7 +147,7 @@ static int odph_linux_thread_create(odph_odpthread_t *thread_tbl,
&thread_tbl->start_args);
if (ret != 0) {
ODPH_ERR("Failed to start thread on cpu #%d\n", cpu);
- thread_tbl->start_args.linuxtype = ODPTHREAD_NOT_STARTED;
+ thread_tbl->cpu = FAILED_CPU;
return ret;
}
@@ -215,9 +217,13 @@ int odph_odpthreads_join(odph_odpthread_t *thread_tbl)
/* joins linux threads or wait for processes */
do {
+ if (thread_tbl[i].cpu == FAILED_CPU) {
+ ODPH_DBG("ODP thread %d not started.\n", i);
+ continue;
+ }
/* pthreads: */
- switch (thread_tbl[i].start_args.linuxtype) {
- case ODPTHREAD_PTHREAD:
+ if (thread_tbl[i].start_args.mem_model ==
+ ODP_MEM_MODEL_THREAD) {
/* Wait thread to exit */
ret = pthread_join(thread_tbl[i].thread.thread_id,
&thread_ret);
@@ -234,10 +240,7 @@ int odph_odpthreads_join(odph_odpthread_t *thread_tbl)
}
}
pthread_attr_destroy(&thread_tbl[i].thread.attr);
- break;
-
- case ODPTHREAD_PROCESS:
-
+ } else {
/* processes: */
pid = waitpid(thread_tbl[i].proc.pid, &status, 0);
@@ -263,16 +266,7 @@ int odph_odpthreads_join(odph_odpthread_t *thread_tbl)
signo, strsignal(signo), (int)pid);
retval = -1;
}
- break;
-
- case ODPTHREAD_NOT_STARTED:
- ODPH_DBG("No join done on not started ODPthread.\n");
- break;
- default:
- ODPH_DBG("Invalid case statement value!\n");
- break;
}
-
} while (!thread_tbl[i++].last);
return (retval < 0) ? retval : terminated;
commit 044b9ed53fa1845d99f0aee3f402a5dcfed3c16e
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 12 13:40:33 2018 +0300
validation: init: add test for odp_init_t.mem_model
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/init/init_main_ok.c b/test/validation/api/init/init_main_ok.c
index a97db8e7..651989ae 100644
--- a/test/validation/api/init/init_main_ok.c
+++ b/test/validation/api/init/init_main_ok.c
@@ -14,8 +14,12 @@ static void init_test_odp_init_global(void)
{
int status;
odp_instance_t instance;
+ odp_init_t init_data;
- status = odp_init_global(&instance, NULL, NULL);
+ odp_init_param_init(&init_data);
+ init_data.mem_model = ODP_MEM_MODEL_THREAD;
+
+ status = odp_init_global(&instance, &init_data, NULL);
CU_ASSERT_FATAL(status == 0);
status = odp_term_global(instance);
commit d901665b489d0470af24e757208488011515e0ad
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 12 13:07:29 2018 +0300
linux-gen: init: use new odp_init_t.mem_model parameter
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
index 0f7e0df2..98b46fca 100644
--- a/platform/linux-generic/odp_init.c
+++ b/platform/linux-generic/odp_init.c
@@ -274,6 +274,8 @@ int odp_init_global(odp_instance_t *instance,
odp_global_ro.log_fn = params->log_fn;
if (params->abort_fn != NULL)
odp_global_ro.abort_fn = params->abort_fn;
+ if (params->mem_model == ODP_MEM_MODEL_PROCESS)
+ odp_global_ro.shm_single_va = 1;
}
if (_odp_libconfig_init_global()) {
commit f36139ea56706df2534a269039b3effca7169234
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Oct 12 11:08:34 2018 +0300
api: init: add new mem_model member to odp_init_t
Add new odp_mem_model_t enum for configuring application memory model. This
enables an application to operate in process mode without the need to
modify ODP configuration file.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/init.h b/include/odp/api/spec/init.h
index ee33e7cd..c37af464 100644
--- a/include/odp/api/spec/init.h
+++ b/include/odp/api/spec/init.h
@@ -106,6 +106,32 @@ typedef int (*odp_log_func_t)(odp_log_level_t level, const char *fmt, ...);
/** Replaceable abort function */
typedef void (*odp_abort_func_t)(void) ODP_NORETURN;
+/**
+ * Application memory model
+ */
+typedef enum {
+ /** Thread memory model: by default all memory is shareable between
+ * threads.
+ *
+ * Within a single ODP instance all ODP handles and pointers to ODP
+ * allocated data may be shared amongst threads independent of data
+ * allocation time (e.g. before or after thread creation). */
+ ODP_MEM_MODEL_THREAD = 0,
+
+ /** Process memory model: by default all memory is not shareable between
+ * processes.
+ *
+ * Within a single ODP instance all ODP handles and pointers to ODP
+ * allocated data (excluding non-single VA SHM blocks) may be shared
+ * amongst processes independent of data allocation time (e.g. before
+ * or after fork).
+ *
+ * @see ODP_SHM_SINGLE_VA
+ */
+ ODP_MEM_MODEL_PROCESS
+
+} odp_mem_model_t;
+
/**
* Global initialization parameters
*
@@ -172,6 +198,12 @@ typedef struct odp_init_t {
*/
odp_feature_t not_used;
+ /** Application memory model. The main application thread has to call
+ * odp_init_global() and odp_init_local() before creating threads that
+ * share ODP data. The default value is ODP_MEM_MODEL_THREAD.
+ */
+ odp_mem_model_t mem_model;
+
/** Shared memory parameters */
struct {
/** Maximum memory usage in bytes. This is the maximum
-----------------------------------------------------------------------
Summary of changes:
config/odp-linux-generic.conf | 6 +--
example/classifier/odp_classifier.c | 17 ++++--
example/generator/odp_generator.c | 17 ++++--
example/ipsec/odp_ipsec.c | 17 ++++--
example/ipsec_api/odp_ipsec.c | 17 ++++--
example/l2fwd_simple/odp_l2fwd_simple.c | 17 ++++--
example/packet/odp_pktio.c | 17 ++++--
example/switch/odp_switch.c | 17 ++++--
example/time/time_global_test.c | 15 ++++--
example/timer/odp_timer_test.c | 17 ++++--
helper/include/odp/helper/threads.h | 26 ++++++---
helper/test/odpthreads.c | 13 ++++-
helper/threads.c | 63 +++++++++++-----------
include/odp/api/spec/init.h | 32 +++++++++++
platform/linux-generic/odp_init.c | 2 +
platform/linux-generic/odp_ishm.c | 7 ---
.../test/mmap_vlan_ins/mmap_vlan_ins.c | 13 ++++-
platform/linux-generic/test/process-mode.conf | 5 +-
test/common/odp_cunit_common.c | 13 ++++-
test/performance/odp_bench_packet.c | 17 ++++--
test/performance/odp_cpu_bench.c | 13 +++--
test/performance/odp_crypto.c | 17 ++++--
test/performance/odp_ipsec.c | 17 ++++--
test/performance/odp_l2fwd.c | 13 +++--
test/performance/odp_pktio_ordered.c | 17 ++++--
test/performance/odp_pktio_perf.c | 17 ++++--
test/performance/odp_sched_latency.c | 17 ++++--
test/performance/odp_sched_pktio.c | 13 +++--
test/performance/odp_scheduling.c | 17 ++++--
test/validation/api/atomic/atomic.c | 13 ++++-
test/validation/api/barrier/barrier.c | 13 ++++-
test/validation/api/crypto/odp_crypto_test_inp.c | 13 ++++-
test/validation/api/init/init_main_ok.c | 6 ++-
test/validation/api/ipsec/ipsec.c | 12 ++++-
test/validation/api/lock/lock.c | 13 ++++-
test/validation/api/thread/thread.c | 13 ++++-
test/validation/api/timer/timer.c | 12 ++++-
37 files changed, 444 insertions(+), 140 deletions(-)
hooks/post-receive
--
7 years, 9 months
- 1
- 0
[COMMIT] branch master updated. v1.19.0.2_tigermoth-258-g686811c2
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 686811c2f3961f3fb26c862059fb690443567e73 (commit)
via d63f90cf86c4f531007122fff497537dab81c088 (commit)
from 6c2c1bbf83a2a69b99d28baecfc8bd3421b651d6 (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 686811c2f3961f3fb26c862059fb690443567e73
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Nov 16 16:32:19 2018 +0300
shippable: switch to using official Shippable image
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/.shippable.yml b/.shippable.yml
index 5696be1e..0bf68f33 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -14,18 +14,9 @@ env:
# - CROSS_ARCH="i386"
build:
- pre_ci:
- # use Dockerfile to install additional CI dependencies
- - docker build -t=odp/dev ./scripts
-
- # use image built in 'pre_ci' for CI job
- pre_ci_boot:
- image_name: odp/dev
- image_tag: latest
- pull: false
- options:
-
ci:
+ - apt-get update
+ - apt-get install --no-install-recommends -yy asciidoctor autoconf automake build-essential ccache clang doxygen gcc graphviz libconfig-dev libcunit1-dev libnuma-dev libpcap-dev libssl-dev libtool mscgen xsltproc
- mkdir -p $HOME/odp-shmdir
- export CI=true ODP_SHM_DIR=$HOME/odp-shmdir ODP_TEST_OUT_XML=yes
- ./bootstrap
diff --git a/scripts/Dockerfile b/scripts/Dockerfile
deleted file mode 100644
index b4c03ca4..00000000
--- a/scripts/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM drydockaarch64/u16:v5.10.1
-
-RUN if $(sudo update-alternatives --list gcc); \
- then sudo update-alternatives --remove-all gcc; \
- fi
-
-RUN sudo apt-get update && sudo apt-get install -yy \
- autoconf \
- automake \
- ccache \
- clang-4.0 \
- gcc-4.8 \
- graphviz \
- kmod \
- libconfig-dev \
- libcunit1-dev \
- libnuma-dev \
- libpcap-dev \
- libssl-dev \
- libtool \
- linux-headers-`uname -r` \
- mscgen \
- ruby-dev \
- xsltproc
-
-RUN sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 10
-RUN sudo ln -s /usr/bin/clang-4.0 /usr/bin/clang
-RUN sudo ln -s /usr/bin/clang++-4.0 /usr/bin/clang++
commit d63f90cf86c4f531007122fff497537dab81c088
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Mon Nov 19 17:53:46 2018 +0300
configure: disable -march=native for clang
for clang we see strange optimizations for TM code which breaks
code flow execution. There might be number of such places. For
now it's better to disable march=native until we completely
test and validate clang support for this.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
diff --git a/configure.ac b/configure.ac
index 6715a7ef..2ce476a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,7 +200,12 @@ AC_ARG_ENABLE([abi-compat],
abi_compat=no
#if there is no ABI compatibility the .so numbers are meaningless
ODP_LIBSO_VERSION=0:0:0
- ODP_CHECK_CFLAG([-march=native])
+ # do not try -march=native for clang due to possible failures on
+ # clang optimizations
+ $CC --version | grep -q clang
+ if test $? -ne 0; then
+ ODP_CHECK_CFLAG([-march=native])
+ fi
fi])
AM_CONDITIONAL(ODP_ABI_COMPAT, [test "x$ODP_ABI_COMPAT" = "x1"])
-----------------------------------------------------------------------
Summary of changes:
.shippable.yml | 13 ++-----------
configure.ac | 7 ++++++-
scripts/Dockerfile | 28 ----------------------------
3 files changed, 8 insertions(+), 40 deletions(-)
delete mode 100644 scripts/Dockerfile
hooks/post-receive
--
7 years, 9 months
- 1
- 0
[COMMIT] branch master updated. v1.19.0.2_tigermoth-256-g6c2c1bbf
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 6c2c1bbf83a2a69b99d28baecfc8bd3421b651d6 (commit)
from 35525f70aa68e55dca6b05cf59a515c50e7dcba2 (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 6c2c1bbf83a2a69b99d28baecfc8bd3421b651d6
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Fri Nov 16 16:47:02 2018 +0300
travis: define compiler for clang test
without specifying compiler CC falls back to default gcc
after it was initialized to clang. Current change forces
test to use clang.
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
diff --git a/.travis.yml b/.travis.yml
index d06530ce..f2b87b7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -231,7 +231,8 @@ jobs:
-e CC="${CC}"
${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/build_${ARCH}.sh
- stage: "build only"
- env: ARCH=x86_64 CC=clang
+ env: ARCH=x86_64
+ compiler: clang
install:
- true
script:
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
7 years, 9 months
- 1
- 0
[COMMIT] branch api-next updated. v1.19.0.2_tigermoth-276-g27b0ca66
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 27b0ca668ec90730f6329185e23a026caf0b9064 (commit)
via c290e20364469774d6091426144645e53c257867 (commit)
via 96adbf43bcd91c63dd8c4c248b439ff3150bd1cc (commit)
via 7563bcf7716cdedf82a9a4f2a8121c45f669a45c (commit)
via 55daa2b0c3b024bfe9b17966fe3d7f10aaa27363 (commit)
via bab62d6ee6e1072bedbb49bcf747fecfb99b24df (commit)
via 6cede326ec2f9d9d5965419c1963a7cd541a7802 (commit)
via e93e8c3ea659c9a64aef3f53ae8932b31dfcef95 (commit)
via 5d1f07269026cdc371973a5edb2373113698e3c8 (commit)
via 3bf94540be3400cb741903b9b44ddc62b14cf397 (commit)
via b6e973744e52db038d9e0886fcaef014eff05cb5 (commit)
via f30d79bf8689dda7554b5c3d1025fb9030135ab7 (commit)
via 39502aa8b1a01732b012a424ca6587030d2e0a09 (commit)
via da5d27b57a0a3c8389c0a0f8c5747308419a094a (commit)
via 207efebdb9ca6d329cc89b272865559f5eeff182 (commit)
via 12b368d14e19761b7aabc4cac04918582253052b (commit)
from c73aaee1959377064cecccb6158b225de3f13db5 (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 27b0ca668ec90730f6329185e23a026caf0b9064
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Nov 15 20:34:27 2018 +0300
validation: scheduler use schedule_config instead of capabilities
Since ODP test suite will use default configuration for scheduler, all
comparisons should be done against it rather than maximum possible
values returned by capabilities.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c
index 4fdfc243..27377580 100644
--- a/test/validation/api/scheduler/scheduler.c
+++ b/test/validation/api/scheduler/scheduler.c
@@ -418,7 +418,7 @@ static void scheduler_test_wait(void)
static void scheduler_test_queue_size(void)
{
odp_queue_capability_t queue_capa;
- odp_scheduler_config_t default_config;
+ odp_schedule_config_t default_config;
odp_pool_t pool;
odp_pool_param_t pool_param;
odp_queue_param_t queue_param;
@@ -432,8 +432,8 @@ static void scheduler_test_queue_size(void)
ODP_SCHED_SYNC_ORDERED};
CU_ASSERT_FATAL(odp_queue_capability(&queue_capa) == 0);
- odp_scheduler_config_init(&default_config);
queue_size = TEST_QUEUE_SIZE_NUM_EV;
+ odp_schedule_config_init(&default_config);
if (default_config.queue_size &&
queue_size > default_config.queue_size)
queue_size = default_config.queue_size;
@@ -1662,6 +1662,7 @@ static int create_queues(test_globals_t *globals)
int i, j, prios, rc;
odp_queue_capability_t capa;
odp_schedule_capability_t sched_capa;
+ odp_schedule_config_t default_config;
odp_pool_t queue_ctx_pool;
odp_pool_param_t params;
odp_buffer_t queue_ctx_buf;
@@ -1691,10 +1692,11 @@ static int create_queues(test_globals_t *globals)
}
globals->max_sched_queue_size = BUFS_PER_QUEUE_EXCL;
- if (sched_capa.max_queue_size && sched_capa.max_queue_size <
- BUFS_PER_QUEUE_EXCL) {
- printf("Max sched queue size %u\n", sched_capa.max_queue_size);
- globals->max_sched_queue_size = sched_capa.max_queue_size;
+ odp_schedule_config_init(&default_config);
+ if (default_config.queue_size &&
+ globals->max_sched_queue_size > default_config.queue_size) {
+ printf("Max sched queue size %u\n", default_config.queue_size);
+ globals->max_sched_queue_size = default_config.queue_size;
}
prios = odp_schedule_num_prio();
@@ -1704,7 +1706,7 @@ static int create_queues(test_globals_t *globals)
queues_per_prio = QUEUES_PER_PRIO;
num_sched = (prios * queues_per_prio * sched_types) + CHAOS_NUM_QUEUES;
num_plain = (prios * queues_per_prio);
- while ((num_sched > sched_capa.max_queues ||
+ while ((num_sched > default_config.num_queues ||
num_plain > capa.plain.max_num ||
num_sched + num_plain > capa.max_queues) && queues_per_prio) {
queues_per_prio--;
commit c290e20364469774d6091426144645e53c257867
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Nov 9 13:01:14 2018 +0300
travis: install graphviz in doxygen test
Install graphviz to stop doxygen from emitting 'missing dot' errors.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/.travis.yml b/.travis.yml
index 4e29102f..5d958cb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -183,6 +183,7 @@ jobs:
- libconfig-dev
- libssl-dev
- cmake
+ - graphviz
install:
# Updated Doxygen
- |
commit 96adbf43bcd91c63dd8c4c248b439ff3150bd1cc
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 7 17:41:04 2018 +0300
examples: add calls to odp_schedule_config()
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c
index 22dae395..b8e1c897 100644
--- a/example/classifier/odp_classifier.c
+++ b/example/classifier/odp_classifier.c
@@ -544,6 +544,9 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
+ /* Configure scheduler */
+ odp_schedule_config(NULL);
+
/* odp_pool_print(pool); */
odp_atomic_init_u64(&args->total_packets, 0);
diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c
index 54194c66..34543cd2 100644
--- a/example/generator/odp_generator.c
+++ b/example/generator/odp_generator.c
@@ -1174,6 +1174,9 @@ int main(int argc, char *argv[])
args->rx_burst_size = args->appl.rx_burst;
}
+ /* Configure scheduler */
+ odp_schedule_config(NULL);
+
/* Create packet pool */
odp_pool_param_init(¶ms);
params.pkt.seg_len = POOL_PKT_LEN;
diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c
index b45a82d7..aff6de0a 100644
--- a/example/ipsec/odp_ipsec.c
+++ b/example/ipsec/odp_ipsec.c
@@ -1285,6 +1285,9 @@ main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
+ /* Configure scheduler */
+ odp_schedule_config(NULL);
+
/* Populate our IPsec cache */
printf("Using %s mode for crypto API\n\n",
(CRYPTO_API_SYNC == global->appl.mode) ? "SYNC" :
diff --git a/example/ipsec_api/odp_ipsec.c b/example/ipsec_api/odp_ipsec.c
index d72109cf..08840d63 100644
--- a/example/ipsec_api/odp_ipsec.c
+++ b/example/ipsec_api/odp_ipsec.c
@@ -984,6 +984,9 @@ main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
+ /* Configure scheduler */
+ odp_schedule_config(NULL);
+
/* Populate our IPsec cache */
printf("Using %s mode for IPsec API\n\n",
(ODP_IPSEC_OP_MODE_SYNC == global->appl.mode) ? "SYNC" :
diff --git a/example/ipsec_offload/odp_ipsec_offload.c b/example/ipsec_offload/odp_ipsec_offload.c
index 90b3f640..4d95b2e5 100644
--- a/example/ipsec_offload/odp_ipsec_offload.c
+++ b/example/ipsec_offload/odp_ipsec_offload.c
@@ -606,6 +606,9 @@ main(int argc, char *argv[])
ipsec_init_post();
+ /* Configure scheduler */
+ odp_schedule_config(NULL);
+
/* Initialize interfaces (which resolves FWD DB entries */
for (i = 0; i < global->appl.if_count; i++)
initialize_intf(global->appl.if_names[i],
diff --git a/example/packet/odp_packet_dump.c b/example/packet/odp_packet_dump.c
index 5dcb7893..4e3aec8f 100644
--- a/example/packet/odp_packet_dump.c
+++ b/example/packet/odp_packet_dump.c
@@ -640,6 +640,8 @@ int main(int argc, char *argv[])
global->pool = ODP_POOL_INVALID;
+ odp_schedule_config(NULL);
+
odp_sys_info_print();
if (open_pktios(global)) {
diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c
index 9d96dd2c..f71ae537 100644
--- a/example/packet/odp_pktio.c
+++ b/example/packet/odp_pktio.c
@@ -412,6 +412,9 @@ int main(int argc, char *argv[])
}
odp_pool_print(pool);
+ /* Config and start scheduler */
+ odp_schedule_config(NULL);
+
/* Create a pktio instance for each interface */
for (i = 0; i < args->appl.if_count; ++i)
create_pktio(args->appl.if_names[i], pool, args->appl.mode);
diff --git a/example/timer/odp_timer_accuracy.c b/example/timer/odp_timer_accuracy.c
index 3b0d7e38..9409e340 100644
--- a/example/timer/odp_timer_accuracy.c
+++ b/example/timer/odp_timer_accuracy.c
@@ -426,6 +426,9 @@ int main(int argc, char *argv[])
odp_sys_info_print();
+ /* Configure scheduler */
+ odp_schedule_config(NULL);
+
num = test_global.opt.num;
test_global.timer = calloc(num, sizeof(odp_timer_t));
diff --git a/example/timer/odp_timer_simple.c b/example/timer/odp_timer_simple.c
index 116f8ba6..ddefb0d2 100644
--- a/example/timer/odp_timer_simple.c
+++ b/example/timer/odp_timer_simple.c
@@ -81,6 +81,9 @@ int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED)
goto err;
}
+ /* Configure scheduler */
+ odp_schedule_config(NULL);
+
/*
* Create a queue for timer test
*/
diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c
index 9e431b47..68970078 100644
--- a/example/timer/odp_timer_test.c
+++ b/example/timer/odp_timer_test.c
@@ -409,6 +409,9 @@ int main(int argc, char *argv[])
printf("period: %i usec\n", gbls->args.period_us);
printf("timeouts: %i\n", gbls->args.tmo_count);
+ /* Configure scheduler */
+ odp_schedule_config(NULL);
+
/*
* Create pool for timeouts
*/
commit 7563bcf7716cdedf82a9a4f2a8121c45f669a45c
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 7 17:41:04 2018 +0300
performance: add calls to odp_schedule_config()
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/performance/odp_cpu_bench.c b/test/performance/odp_cpu_bench.c
index 0d0a23eb..ceabc5b8 100644
--- a/test/performance/odp_cpu_bench.c
+++ b/test/performance/odp_cpu_bench.c
@@ -528,7 +528,7 @@ int main(int argc, char *argv[])
odp_cpumask_t cpumask;
odp_pool_capability_t pool_capa;
odp_pool_t pool;
- odp_schedule_capability_t schedule_capa;
+ odp_schedule_config_t schedule_config;
odp_shm_t shm;
odp_shm_t lookup_tbl_shm;
odp_pool_param_t params;
@@ -607,26 +607,24 @@ int main(int argc, char *argv[])
printf("first CPU: %i\n", odp_cpumask_first(&cpumask));
printf("cpu mask: %s\n", cpumaskstr);
- if (odp_schedule_capability(&schedule_capa)) {
- printf("Error: Schedule capa failed.\n");
- return -1;
- }
+ odp_schedule_config_init(&schedule_config);
+ odp_schedule_config(&schedule_config);
/* Make sure a single queue can store all the packets in a group */
pkts_per_group = QUEUES_PER_GROUP * PKTS_PER_QUEUE;
- if (schedule_capa.max_queue_size &&
- schedule_capa.max_queue_size < pkts_per_group)
- pkts_per_group = schedule_capa.max_queue_size;
+ if (schedule_config.queue_size &&
+ schedule_config.queue_size < pkts_per_group)
+ pkts_per_group = schedule_config.queue_size;
/* Divide queues evenly into groups */
- if (schedule_capa.max_queues < QUEUES_PER_GROUP) {
+ if (schedule_config.num_queues < QUEUES_PER_GROUP) {
LOG_ERR("Error: min %d queues required\n", QUEUES_PER_GROUP);
return -1;
}
- num_queues = num_workers > schedule_capa.max_queues ?
- schedule_capa.max_queues : num_workers;
+ num_queues = num_workers > schedule_config.num_queues ?
+ schedule_config.num_queues : num_workers;
num_groups = (num_queues + QUEUES_PER_GROUP - 1) / QUEUES_PER_GROUP;
- if (num_groups * QUEUES_PER_GROUP > schedule_capa.max_queues)
+ if (num_groups * QUEUES_PER_GROUP > schedule_config.num_queues)
num_groups--;
num_queues = num_groups * QUEUES_PER_GROUP;
diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c
index 61da80e8..635b69f7 100644
--- a/test/performance/odp_crypto.c
+++ b/test/performance/odp_crypto.c
@@ -1089,6 +1089,7 @@ int main(int argc, char *argv[])
odp_queue_param_init(&qparam);
if (cargs.schedule) {
+ odp_schedule_config(NULL);
qparam.type = ODP_QUEUE_TYPE_SCHED;
qparam.sched.prio = ODP_SCHED_PRIO_DEFAULT;
qparam.sched.sync = ODP_SCHED_SYNC_PARALLEL;
diff --git a/test/performance/odp_ipsec.c b/test/performance/odp_ipsec.c
index 2184c7a9..e5d53931 100644
--- a/test/performance/odp_ipsec.c
+++ b/test/performance/odp_ipsec.c
@@ -1079,6 +1079,7 @@ int main(int argc, char *argv[])
odp_queue_param_init(&qparam);
if (cargs.schedule) {
+ odp_schedule_config(NULL);
qparam.type = ODP_QUEUE_TYPE_SCHED;
qparam.sched.prio = ODP_SCHED_PRIO_DEFAULT;
qparam.sched.sync = ODP_SCHED_SYNC_PARALLEL;
diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c
index e1eddb13..cdd67206 100644
--- a/test/performance/odp_l2fwd.c
+++ b/test/performance/odp_l2fwd.c
@@ -1561,6 +1561,8 @@ int main(int argc, char *argv[])
bind_workers();
+ odp_schedule_config(NULL);
+
/* Default */
if (num_groups == 0) {
group[0] = ODP_SCHED_GROUP_ALL;
diff --git a/test/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c
index 5f647923..ce4925f5 100644
--- a/test/performance/odp_pktio_ordered.c
+++ b/test/performance/odp_pktio_ordered.c
@@ -1064,6 +1064,7 @@ int main(int argc, char *argv[])
odp_pool_param_t params;
odp_shm_t shm;
odp_schedule_capability_t schedule_capa;
+ odp_schedule_config_t schedule_config;
odp_pool_capability_t pool_capa;
odph_ethaddr_t new_addr;
odph_odpthread_t thread_tbl[MAX_WORKERS];
@@ -1120,6 +1121,8 @@ int main(int argc, char *argv[])
/* Parse and store the application arguments */
parse_args(argc, argv, &gbl_args->appl);
+ odp_schedule_config(NULL);
+
if (gbl_args->appl.in_mode == SCHED_ORDERED) {
/* At least one ordered lock required */
if (schedule_capa.max_ordered_locks < 1) {
@@ -1149,9 +1152,9 @@ int main(int argc, char *argv[])
pool_size = pool_capa.pkt.max_num;
queue_size = MAX_NUM_PKT;
- if (schedule_capa.max_queue_size &&
- schedule_capa.max_queue_size < MAX_NUM_PKT)
- queue_size = schedule_capa.max_queue_size;
+ if (schedule_config.queue_size &&
+ schedule_config.queue_size < MAX_NUM_PKT)
+ queue_size = schedule_config.queue_size;
/* Pool should not be larger than queue, otherwise queue enqueues at
* packet input may fail. */
diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c
index 7e8a03ee..0e1af0c4 100644
--- a/test/performance/odp_pktio_perf.c
+++ b/test/performance/odp_pktio_perf.c
@@ -759,6 +759,9 @@ static int test_init(void)
iface = gbl_args->args.ifaces[0];
schedule = gbl_args->args.schedule;
+ if (schedule)
+ odp_schedule_config(NULL);
+
/* create pktios and associate input/output queues */
gbl_args->pktio_tx = create_pktio(iface, schedule);
if (gbl_args->args.num_ifaces > 1) {
diff --git a/test/performance/odp_sched_latency.c b/test/performance/odp_sched_latency.c
index 873738ef..c0792fa4 100644
--- a/test/performance/odp_sched_latency.c
+++ b/test/performance/odp_sched_latency.c
@@ -705,6 +705,8 @@ int main(int argc, char *argv[])
memset(globals, 0, sizeof(test_globals_t));
memcpy(&globals->args, &args, sizeof(test_args_t));
+ odp_schedule_config(NULL);
+
/*
* Create event pool
*/
diff --git a/test/performance/odp_sched_perf.c b/test/performance/odp_sched_perf.c
index b25c3e19..c301263e 100644
--- a/test/performance/odp_sched_perf.c
+++ b/test/performance/odp_sched_perf.c
@@ -43,6 +43,7 @@ typedef struct test_stat_t {
typedef struct test_global_t {
test_options_t test_options;
+ odp_schedule_config_t schedule_config;
odp_barrier_t barrier;
odp_pool_t pool;
odp_cpumask_t cpumask;
@@ -251,7 +252,6 @@ static int create_pool(test_global_t *global)
static int create_queues(test_global_t *global)
{
- odp_schedule_capability_t schedule_capa;
odp_queue_param_t queue_param;
odp_queue_t queue;
odp_buffer_t buf;
@@ -279,20 +279,16 @@ static int create_queues(test_global_t *global)
printf(" queue type %s\n\n", type_str);
- if (odp_schedule_capability(&schedule_capa)) {
- printf("Error: Schedule capa failed.\n");
- return -1;
- }
-
- if (tot_queue > schedule_capa.max_queues) {
+ if (tot_queue > global->schedule_config.num_queues) {
printf("Max queues supported %u\n",
- schedule_capa.max_queues);
+ global->schedule_config.num_queues);
return -1;
}
- if (schedule_capa.max_queue_size &&
- queue_size > schedule_capa.max_queue_size) {
- printf("Max queue size %u\n", schedule_capa.max_queue_size);
+ if (global->schedule_config.queue_size &&
+ queue_size > global->schedule_config.queue_size) {
+ printf("Max queue size %u\n",
+ global->schedule_config.queue_size);
return -1;
}
@@ -603,6 +599,9 @@ int main(int argc, char **argv)
return -1;
}
+ odp_schedule_config_init(&global->schedule_config);
+ odp_schedule_config(&global->schedule_config);
+
if (set_num_cpu(global))
return -1;
diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c
index ef5fb015..42f879eb 100644
--- a/test/performance/odp_sched_pktio.c
+++ b/test/performance/odp_sched_pktio.c
@@ -127,6 +127,8 @@ typedef struct {
uint64_t rx_pkt_sum;
uint64_t tx_pkt_sum;
+ odp_schedule_config_t schedule_config;
+
} test_global_t;
static test_global_t *test_global;
@@ -726,6 +728,9 @@ static int config_setup(test_global_t *test_global)
cpu = odp_cpumask_next(cpumask, cpu);
}
+ odp_schedule_config_init(&test_global->schedule_config);
+ odp_schedule_config(&test_global->schedule_config);
+
if (odp_pool_capability(&pool_capa)) {
printf("Error: Pool capability failed.\n");
return -1;
@@ -1112,15 +1117,9 @@ static int create_pipeline_queues(test_global_t *test_global)
int i, j, k, num_pktio, stages, queues, ctx_size;
pipe_queue_context_t *ctx;
odp_queue_param_t queue_param;
- odp_schedule_capability_t schedule_capa;
odp_schedule_sync_t sched_sync;
int ret = 0;
- if (odp_schedule_capability(&schedule_capa)) {
- printf("Error: Schedule capa failed.\n");
- return -1;
- }
-
num_pktio = test_global->opt.num_pktio;
stages = test_global->opt.pipe_stages;
queues = test_global->opt.pipe_queues;
@@ -1133,10 +1132,10 @@ static int create_pipeline_queues(test_global_t *test_global)
queue_param.sched.group = ODP_SCHED_GROUP_ALL;
queue_param.size = test_global->opt.pipe_queue_size;
- if (schedule_capa.max_queue_size &&
- queue_param.size > schedule_capa.max_queue_size) {
+ if (test_global->schedule_config.queue_size &&
+ queue_param.size > test_global->schedule_config.queue_size) {
printf("Error: Pipeline queue max size is %u\n",
- schedule_capa.max_queue_size);
+ test_global->schedule_config.queue_size);
return -1;
}
diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c
index 5e74b172..f17e1aed 100644
--- a/test/performance/odp_scheduling.c
+++ b/test/performance/odp_scheduling.c
@@ -814,7 +814,7 @@ int main(int argc, char *argv[])
odph_odpthread_params_t thr_params;
odp_queue_capability_t capa;
odp_pool_capability_t pool_capa;
- odp_schedule_capability_t schedule_capa;
+ odp_schedule_config_t schedule_config;
uint32_t num_queues, num_buf;
printf("\nODP example starts\n\n");
@@ -900,15 +900,14 @@ int main(int argc, char *argv[])
return -1;
}
- if (odp_schedule_capability(&schedule_capa)) {
- printf("Error: Schedule capa failed.\n");
- return -1;
- }
+ odp_schedule_config_init(&schedule_config);
+ odp_schedule_config(&schedule_config);
globals->queues_per_prio = QUEUES_PER_PRIO;
num_queues = globals->queues_per_prio * NUM_PRIOS;
- if (num_queues > schedule_capa.max_queues)
- globals->queues_per_prio = schedule_capa.max_queues /
+ if (schedule_config.num_queues &&
+ num_queues > schedule_config.num_queues)
+ globals->queues_per_prio = schedule_config.num_queues /
NUM_PRIOS;
/* One plain queue is also used */
commit 55daa2b0c3b024bfe9b17966fe3d7f10aaa27363
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 7 17:41:04 2018 +0300
validation: add calls to odp_schedule_config()
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common/odp_cunit_common.c b/test/common/odp_cunit_common.c
index 6b9ded4a..ed0651ad 100644
--- a/test/common/odp_cunit_common.c
+++ b/test/common/odp_cunit_common.c
@@ -87,6 +87,10 @@ static int tests_global_init(odp_instance_t *inst)
fprintf(stderr, "error: odp_init_local() failed.\n");
return -1;
}
+ if (0 != odp_schedule_config(NULL)) {
+ fprintf(stderr, "error: odp_schedule_config(NULL) failed.\n");
+ return -1;
+ }
return 0;
}
diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c
index 197ad2d2..968812c8 100644
--- a/test/validation/api/timer/timer.c
+++ b/test/validation/api/timer/timer.c
@@ -82,6 +82,9 @@ static int timer_global_init(odp_instance_t *inst)
global_mem = odp_shm_addr(global_shm);
memset(global_mem, 0, sizeof(global_shared_mem_t));
+ /* Configure scheduler */
+ odp_schedule_config(NULL);
+
return 0;
}
commit bab62d6ee6e1072bedbb49bcf747fecfb99b24df
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 7 17:39:48 2018 +0300
linux-gen: implement odp_schedule_config() API call
Add odp_schedule_config() stub, which does nothing at this point. Use it
to actually check (in debug mode) that application call it in proper
place.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h
index abc64d0d..15c91590 100644
--- a/platform/linux-generic/include/odp_schedule_if.h
+++ b/platform/linux-generic/include/odp_schedule_if.h
@@ -87,10 +87,17 @@ int sched_cb_pktin_poll(int pktio_index, int pktin_index,
int sched_cb_pktin_poll_one(int pktio_index, int rx_queue, odp_event_t evts[]);
void sched_cb_pktio_stop_finalize(int pktio_index);
+/* For debugging */
+#ifdef ODP_DEBUG
+extern int _odp_schedule_configured;
+#endif
+
/* API functions */
typedef struct {
uint64_t (*schedule_wait_time)(uint64_t ns);
int (*schedule_capability)(odp_schedule_capability_t *capa);
+ void (*schedule_config_init)(odp_schedule_config_t *config);
+ int (*schedule_config)(const odp_schedule_config_t *config);
odp_event_t (*schedule)(odp_queue_t *from, uint64_t wait);
int (*schedule_multi)(odp_queue_t *from, uint64_t wait,
odp_event_t events[], int num);
diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c
index 4bc5b4ab..9cf00acb 100644
--- a/platform/linux-generic/odp_schedule_basic.c
+++ b/platform/linux-generic/odp_schedule_basic.c
@@ -598,6 +598,8 @@ static int schedule_init_queue(uint32_t queue_index,
int i;
int prio = prio_level_from_api(sched_param->prio);
+ ODP_ASSERT(_odp_schedule_configured);
+
pri_set_queue(queue_index, prio);
sched->queue[queue_index].grp = sched_param->group;
sched->queue[queue_index].prio = prio;
@@ -798,6 +800,19 @@ static int schedule_term_local(void)
return 0;
}
+static void schedule_config_init(odp_schedule_config_t *config)
+{
+ config->num_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES;
+ config->queue_size = queue_glb->config.max_queue_size;
+}
+
+static int schedule_config(const odp_schedule_config_t *config)
+{
+ (void)config;
+
+ return 0;
+}
+
static inline int copy_from_stash(odp_event_t out_ev[], unsigned int max)
{
int i = 0;
@@ -1587,6 +1602,8 @@ const schedule_fn_t schedule_basic_fn = {
const schedule_api_t schedule_basic_api = {
.schedule_wait_time = schedule_wait_time,
.schedule_capability = schedule_capability,
+ .schedule_config_init = schedule_config_init,
+ .schedule_config = schedule_config,
.schedule = schedule,
.schedule_multi = schedule_multi,
.schedule_multi_wait = schedule_multi_wait,
diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c
index 92e0a62f..cb52f155 100644
--- a/platform/linux-generic/odp_schedule_if.c
+++ b/platform/linux-generic/odp_schedule_if.c
@@ -25,6 +25,10 @@ extern const schedule_api_t schedule_scalable_api;
const schedule_fn_t *sched_fn;
const schedule_api_t *sched_api;
+#ifdef ODP_DEBUG
+int _odp_schedule_configured;
+#endif
+
uint64_t odp_schedule_wait_time(uint64_t ns)
{
return sched_api->schedule_wait_time(ns);
@@ -35,14 +39,46 @@ int odp_schedule_capability(odp_schedule_capability_t *capa)
return sched_api->schedule_capability(capa);
}
+void odp_schedule_config_init(odp_schedule_config_t *config)
+{
+ memset(config, 0, sizeof(*config));
+
+ sched_api->schedule_config_init(config);
+}
+
+int odp_schedule_config(const odp_schedule_config_t *config)
+{
+ int ret;
+ odp_schedule_config_t defconfig;
+
+ ODP_ASSERT(!_odp_schedule_configured);
+
+ if (!config) {
+ odp_schedule_config_init(&defconfig);
+ config = &defconfig;
+ }
+
+ ret = sched_api->schedule_config(config);
+#ifdef ODP_DEBUG
+ if (ret >= 0)
+ _odp_schedule_configured = 1;
+#endif
+
+ return ret;
+}
+
odp_event_t odp_schedule(odp_queue_t *from, uint64_t wait)
{
+ ODP_ASSERT(_odp_schedule_configured);
+
return sched_api->schedule(from, wait);
}
int odp_schedule_multi(odp_queue_t *from, uint64_t wait, odp_event_t events[],
int num)
{
+ ODP_ASSERT(_odp_schedule_configured);
+
return sched_api->schedule_multi(from, wait, events, num);
}
diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c
index b426ca67..92a5c72b 100644
--- a/platform/linux-generic/odp_schedule_scalable.c
+++ b/platform/linux-generic/odp_schedule_scalable.c
@@ -2000,6 +2000,19 @@ static int schedule_term_local(void)
return rc;
}
+static void schedule_config_init(odp_schedule_config_t *config)
+{
+ config->num_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES;
+ config->queue_size = 0; /* FIXME ? */
+}
+
+static int schedule_config(const odp_schedule_config_t *config)
+{
+ (void)config;
+
+ return 0;
+}
+
static int num_grps(void)
{
return MAX_SCHED_GROUP;
@@ -2147,6 +2160,8 @@ const schedule_fn_t schedule_scalable_fn = {
const schedule_api_t schedule_scalable_api = {
.schedule_wait_time = schedule_wait_time,
.schedule_capability = schedule_capability,
+ .schedule_config_init = schedule_config_init,
+ .schedule_config = schedule_config,
.schedule = schedule,
.schedule_multi = schedule_multi,
.schedule_multi_wait = schedule_multi_wait,
diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c
index e748699d..b8f805ac 100644
--- a/platform/linux-generic/odp_schedule_sp.c
+++ b/platform/linux-generic/odp_schedule_sp.c
@@ -257,6 +257,19 @@ static int term_local(void)
return 0;
}
+static void schedule_config_init(odp_schedule_config_t *config)
+{
+ config->num_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES;
+ config->queue_size = queue_glb->config.max_queue_size;
+}
+
+static int schedule_config(const odp_schedule_config_t *config)
+{
+ (void)config;
+
+ return 0;
+}
+
static uint32_t max_ordered_locks(void)
{
return NUM_ORDERED_LOCKS;
@@ -362,6 +375,11 @@ static int init_queue(uint32_t qi, const odp_schedule_param_t *sched_param)
odp_schedule_group_t group = sched_param->group;
int prio = 0;
+#ifdef ODP_DEBUG
+ if (!_odp_schedule_configured)
+ ODP_ABORT("Scheduler not configured!\n");
+#endif
+
if (group < 0 || group >= NUM_GROUP)
return -1;
@@ -959,6 +977,8 @@ const schedule_fn_t schedule_sp_fn = {
const schedule_api_t schedule_sp_api = {
.schedule_wait_time = schedule_wait_time,
.schedule_capability = schedule_capability,
+ .schedule_config_init = schedule_config_init,
+ .schedule_config = schedule_config,
.schedule = schedule,
.schedule_multi = schedule_multi,
.schedule_multi_wait = schedule_multi_wait,
commit 6cede326ec2f9d9d5965419c1963a7cd541a7802
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 7 16:46:50 2018 +0300
linux-gen: schedule: rename config to get_config
Rename config function to get_config to avoid collisions.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h
index 88961269..abc64d0d 100644
--- a/platform/linux-generic/include/odp_schedule_if.h
+++ b/platform/linux-generic/include/odp_schedule_if.h
@@ -53,7 +53,7 @@ typedef void (*schedule_order_unlock_lock_fn_t)(void);
typedef void (*schedule_order_lock_start_fn_t)(void);
typedef void (*schedule_order_lock_wait_fn_t)(void);
typedef uint32_t (*schedule_max_ordered_locks_fn_t)(void);
-typedef void (*schedule_config_fn_t)(schedule_config_t *config);
+typedef void (*schedule_get_config_fn_t)(schedule_config_t *config);
typedef struct schedule_fn_t {
schedule_pktio_start_fn_t pktio_start;
@@ -74,7 +74,7 @@ typedef struct schedule_fn_t {
schedule_order_lock_wait_fn_t wait_order_lock;
schedule_order_unlock_lock_fn_t order_unlock_lock;
schedule_max_ordered_locks_fn_t max_ordered_locks;
- schedule_config_fn_t config;
+ schedule_get_config_fn_t get_config;
} schedule_fn_t;
diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c
index 116cbc5c..4bc5b4ab 100644
--- a/platform/linux-generic/odp_schedule_basic.c
+++ b/platform/linux-generic/odp_schedule_basic.c
@@ -1545,7 +1545,7 @@ static int schedule_num_grps(void)
return NUM_SCHED_GRPS;
}
-static void schedule_config(schedule_config_t *config)
+static void schedule_get_config(schedule_config_t *config)
{
*config = *(&sched->config_if);
};
@@ -1580,7 +1580,7 @@ const schedule_fn_t schedule_basic_fn = {
.order_lock = order_lock,
.order_unlock = order_unlock,
.max_ordered_locks = schedule_max_ordered_locks,
- .config = schedule_config
+ .get_config = schedule_get_config
};
/* Fill in scheduler API calls */
diff --git a/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c
index 7728929b..b30174dd 100644
--- a/platform/linux-generic/odp_thread.c
+++ b/platform/linux-generic/odp_thread.c
@@ -142,10 +142,10 @@ int odp_thread_init_local(odp_thread_type_t type)
group_worker = 1;
group_control = 1;
- if (sched_fn->config) {
+ if (sched_fn->get_config) {
schedule_config_t schedule_config;
- sched_fn->config(&schedule_config);
+ sched_fn->get_config(&schedule_config);
group_all = schedule_config.group_enable.all;
group_worker = schedule_config.group_enable.worker;
group_control = schedule_config.group_enable.control;
@@ -196,10 +196,10 @@ int odp_thread_term_local(void)
group_worker = 1;
group_control = 1;
- if (sched_fn->config) {
+ if (sched_fn->get_config) {
schedule_config_t schedule_config;
- sched_fn->config(&schedule_config);
+ sched_fn->get_config(&schedule_config);
group_all = schedule_config.group_enable.all;
group_worker = schedule_config.group_enable.worker;
group_control = schedule_config.group_enable.control;
commit e93e8c3ea659c9a64aef3f53ae8932b31dfcef95
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Oct 31 13:45:09 2018 +0300
api: schedule: add scheduler flow aware mode
ODP scheduler configuration to support flow aware mode
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/event.h b/include/odp/api/spec/event.h
index d9f7ab73..affdc7b0 100644
--- a/include/odp/api/spec/event.h
+++ b/include/odp/api/spec/event.h
@@ -209,6 +209,44 @@ void odp_event_free_multi(const odp_event_t event[], int num);
*/
void odp_event_free_sp(const odp_event_t event[], int num);
+/**
+ * Event flow id value
+ *
+ * Returns the flow id value set in the event.
+ * Usage of flow id enables scheduler to maintain multiple synchronization
+ * contexts per single queue. For example, when multiple flows are assigned to
+ * an atomic queue, events of a single flow (events from the same queue with
+ * the same flow id value) are guaranteed to be processed by only single thread
+ * at a time. For packets received through packet input initial
+ * event flow id will be same as flow hash generated for packets. The hash
+ * algorithm and therefore the resulting flow id value is implementation
+ * specific. Use pktio API configuration options to select the fields used for
+ * initial flow id calculation. For all other events initial flow id is zero
+ * An application can change event flow id using odp_event_flow_id_set().
+ *
+ * @param event Event handle
+ *
+ * @return Flow id of the event
+ *
+ */
+uint32_t odp_event_flow_id(odp_event_t event);
+
+/**
+ * Set event flow id value
+ *
+ * Store the event flow id for the event and sets the flow id flag.
+ * When scheduler is configured as flow aware, scheduled queue synchronization
+ * will be based on this id within each queue.
+ * When scheduler is configured as flow unaware, event flow id is ignored by
+ * the implementation.
+ * The value of flow id must be less than the number of flows configured in the
+ * scheduler.
+ *
+ * @param event Event handle
+ * @param flow_id Flow event id to be set.
+ */
+void odp_event_flow_id_set(odp_event_t event, uint32_t flow_id);
+
/**
* @}
*/
diff --git a/include/odp/api/spec/schedule_types.h b/include/odp/api/spec/schedule_types.h
index 0b75d17d..3648c64e 100644
--- a/include/odp/api/spec/schedule_types.h
+++ b/include/odp/api/spec/schedule_types.h
@@ -78,6 +78,9 @@ extern "C" {
* requests another event from the scheduler, which implicitly releases the
* context. User may allow the scheduler to release the context earlier than
* that by calling odp_schedule_release_atomic().
+ * When scheduler is enabled as flow-aware, the event flow id value affects
+ * scheduling of the event and synchronization is maintained per flow within
+ * each queue.
*/
/**
@@ -104,6 +107,9 @@ extern "C" {
* (e.g. freed or stored) within the context are considered missing from
* reordering and are skipped at this time (but can be ordered again within
* another context).
+ * When scheduler is enabled as flow-aware, the event flow id value affects
+ * scheduling of the event and synchronization is maintained per flow within
+ * each queue.
*/
/**
@@ -190,6 +196,13 @@ typedef struct odp_schedule_capability_t {
* events. */
uint32_t max_queue_size;
+ /** Maximum supported flows per queue.
+ * Specifies the maximum number of flows per queue supported by the
+ * implementation. A value of 0 indicates flow aware mode is not
+ * supported.
+ */
+ uint32_t max_flows;
+
/** Lock-free (ODP_NONBLOCKING_LF) queues support.
* The specification is the same as for the blocking implementation. */
odp_support_t lockfree_queues;
@@ -217,6 +230,22 @@ typedef struct odp_schedule_config_t {
*/
uint32_t queue_size;
+ /** Number of flows per queue to be supported. Scheduler enables flow
+ * aware mode when flow count is configured greater than 1 (up to
+ * 'max_flows' capability).
+ *
+ * Flows are lightweight entities and events can be assigned to
+ * specific flows by the application using odp_event_flow_id_set()
+ * before enqueuing the event into the scheduler. This value is ignored
+ * unless scheduler supports flow aware mode.
+ *
+ * This number should be less than maximum flow supported by the
+ * implementation. The default value is zero.
+ *
+ * @see odp_schedule_capability_t
+ */
+ uint32_t num_flows;
+
} odp_schedule_config_t;
/**
commit 5d1f07269026cdc371973a5edb2373113698e3c8
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Oct 24 17:55:18 2018 +0300
api: schedule: add scheduler config and start API
Add API calls to configure and start scheduler subsystem.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h
index 6538c509..43292124 100644
--- a/include/odp/api/spec/schedule.h
+++ b/include/odp/api/spec/schedule.h
@@ -257,6 +257,44 @@ int odp_schedule_default_prio(void);
*/
int odp_schedule_num_prio(void);
+/**
+ * Initialize schedule configuration options
+ *
+ * Initialize an odp_schedule_config_t to its default values.
+ *
+ * @param[out] config Pointer to schedule configuration structure
+ */
+void odp_schedule_config_init(odp_schedule_config_t *config);
+
+/**
+ * Global schedule configuration
+ *
+ * Initialize and configure scheduler with global configuration options
+ * to schedule events across different scheduled queues.
+ * This function must be called before scheduler is used (any other scheduler
+ * function is called except odp_schedule_capability() and
+ * odp_schedule_config_init()) or any queues are created (by application itself
+ * or by other ODP modules).
+ * An application can pass NULL value to use default configuration. It will
+ * have the same result as filling the structure with
+ * odp_schedule_config_init() and then passing it to odp_schedule_config().
+ *
+ * The initialization sequeunce should be,
+ * odp_schedule_capability()
+ * odp_schedule_config_init()
+ * odp_schedule_config()
+ * odp_schedule()
+ *
+ * @param config Pointer to scheduler configuration structure or NULL for the
+ * default configuration
+ *
+ * @retval 0 on success
+ * @retval <0 on failure
+ *
+ * @see odp_schedule_capability(), odp_schedule_config_init()
+ */
+int odp_schedule_config(const odp_schedule_config_t *config);
+
/**
* Query scheduler capabilities
*
diff --git a/include/odp/api/spec/schedule_types.h b/include/odp/api/spec/schedule_types.h
index e7cc0479..0b75d17d 100644
--- a/include/odp/api/spec/schedule_types.h
+++ b/include/odp/api/spec/schedule_types.h
@@ -200,6 +200,25 @@ typedef struct odp_schedule_capability_t {
} odp_schedule_capability_t;
+/**
+ * Schedule configuration
+ */
+typedef struct odp_schedule_config_t {
+ /** Maximum number of scheduled queues to be supported.
+ *
+ * @see odp_schedule_capability_t
+ */
+ uint32_t num_queues;
+
+ /** Maximum number of events required to be stored simultaneously in
+ * scheduled queue. This number must not exceed 'max_queue_size'
+ * capability. A value of 0 configures default queue size supported by
+ * the implementation.
+ */
+ uint32_t queue_size;
+
+} odp_schedule_config_t;
+
/**
* @}
*/
commit 3bf94540be3400cb741903b9b44ddc62b14cf397
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Oct 31 13:47:52 2018 +0300
example, tests: move scheduled queue capabilities to sched
Move scheduled queue capabilities to odp_schedule_capability_t
structure, as they logically belong to ODP scheduler module, rather than
queue module.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/sysinfo/odp_sysinfo.c b/example/sysinfo/odp_sysinfo.c
index f0b0241d..9f55872b 100644
--- a/example/sysinfo/odp_sysinfo.c
+++ b/example/sysinfo/odp_sysinfo.c
@@ -401,19 +401,15 @@ int main(void)
printf(" max ordered locks: %" PRIu32 "\n",
schedule_capa.max_ordered_locks);
printf(" max groups: %u\n", schedule_capa.max_groups);
- printf(" priorities: %u\n", schedule_capa.prios);
- printf(" sched.max_num: %" PRIu32 "\n",
- queue_capa.sched.max_num);
- printf(" sched.max_size: %" PRIu32 "\n",
- queue_capa.sched.max_size);
- printf(" sched.lf.max_num: %" PRIu32 "\n",
- queue_capa.sched.lockfree.max_num);
- printf(" sched.lf.max_size: %" PRIu32 "\n",
- queue_capa.sched.lockfree.max_size);
- printf(" sched.wf.max_num: %" PRIu32 "\n",
- queue_capa.sched.waitfree.max_num);
- printf(" sched.wf.max_size: %" PRIu32 "\n",
- queue_capa.sched.waitfree.max_size);
+ printf(" priorities: %u\n", schedule_capa.max_prios);
+ printf(" sched.max_queues: %" PRIu32 "\n",
+ schedule_capa.max_queues);
+ printf(" sched.max_queue_size: %" PRIu32 "\n",
+ schedule_capa.max_queue_size);
+ printf(" sched.lf_queues: %ssupported\n",
+ schedule_capa.lockfree_queues ? "" : "not ");
+ printf(" sched.wf_queues: %ssupported\n",
+ schedule_capa.waitfree_queues ? "" : "not ");
printf("\n");
printf(" TIMER\n");
diff --git a/test/performance/odp_cpu_bench.c b/test/performance/odp_cpu_bench.c
index 196af346..0d0a23eb 100644
--- a/test/performance/odp_cpu_bench.c
+++ b/test/performance/odp_cpu_bench.c
@@ -528,7 +528,7 @@ int main(int argc, char *argv[])
odp_cpumask_t cpumask;
odp_pool_capability_t pool_capa;
odp_pool_t pool;
- odp_queue_capability_t queue_capa;
+ odp_schedule_capability_t schedule_capa;
odp_shm_t shm;
odp_shm_t lookup_tbl_shm;
odp_pool_param_t params;
@@ -607,27 +607,26 @@ int main(int argc, char *argv[])
printf("first CPU: %i\n", odp_cpumask_first(&cpumask));
printf("cpu mask: %s\n", cpumaskstr);
- /* Create application queues */
- if (odp_queue_capability(&queue_capa)) {
- LOG_ERR("Error: odp_queue_capability() failed\n");
- exit(EXIT_FAILURE);
+ if (odp_schedule_capability(&schedule_capa)) {
+ printf("Error: Schedule capa failed.\n");
+ return -1;
}
/* Make sure a single queue can store all the packets in a group */
pkts_per_group = QUEUES_PER_GROUP * PKTS_PER_QUEUE;
- if (queue_capa.sched.max_size &&
- queue_capa.sched.max_size < pkts_per_group)
- pkts_per_group = queue_capa.sched.max_size;
+ if (schedule_capa.max_queue_size &&
+ schedule_capa.max_queue_size < pkts_per_group)
+ pkts_per_group = schedule_capa.max_queue_size;
/* Divide queues evenly into groups */
- if (queue_capa.sched.max_num < QUEUES_PER_GROUP) {
+ if (schedule_capa.max_queues < QUEUES_PER_GROUP) {
LOG_ERR("Error: min %d queues required\n", QUEUES_PER_GROUP);
return -1;
}
- num_queues = num_workers > queue_capa.sched.max_num ?
- queue_capa.sched.max_num : num_workers;
+ num_queues = num_workers > schedule_capa.max_queues ?
+ schedule_capa.max_queues : num_workers;
num_groups = (num_queues + QUEUES_PER_GROUP - 1) / QUEUES_PER_GROUP;
- if (num_groups * QUEUES_PER_GROUP > queue_capa.sched.max_num)
+ if (num_groups * QUEUES_PER_GROUP > schedule_capa.max_queues)
num_groups--;
num_queues = num_groups * QUEUES_PER_GROUP;
diff --git a/test/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c
index f0939eb5..5f647923 100644
--- a/test/performance/odp_pktio_ordered.c
+++ b/test/performance/odp_pktio_ordered.c
@@ -1063,7 +1063,6 @@ int main(int argc, char *argv[])
odp_pool_t pool;
odp_pool_param_t params;
odp_shm_t shm;
- odp_queue_capability_t queue_capa;
odp_schedule_capability_t schedule_capa;
odp_pool_capability_t pool_capa;
odph_ethaddr_t new_addr;
@@ -1090,11 +1089,6 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
- if (odp_queue_capability(&queue_capa)) {
- LOG_ERR("Error: Queue capa failed\n");
- exit(EXIT_FAILURE);
- }
-
if (odp_schedule_capability(&schedule_capa)) {
printf("Error: Schedule capa failed.\n");
return -1;
@@ -1155,9 +1149,9 @@ int main(int argc, char *argv[])
pool_size = pool_capa.pkt.max_num;
queue_size = MAX_NUM_PKT;
- if (queue_capa.sched.max_size &&
- queue_capa.sched.max_size < MAX_NUM_PKT)
- queue_size = queue_capa.sched.max_size;
+ if (schedule_capa.max_queue_size &&
+ schedule_capa.max_queue_size < MAX_NUM_PKT)
+ queue_size = schedule_capa.max_queue_size;
/* Pool should not be larger than queue, otherwise queue enqueues at
* packet input may fail. */
diff --git a/test/performance/odp_sched_perf.c b/test/performance/odp_sched_perf.c
index bbd76c86..b25c3e19 100644
--- a/test/performance/odp_sched_perf.c
+++ b/test/performance/odp_sched_perf.c
@@ -251,7 +251,7 @@ static int create_pool(test_global_t *global)
static int create_queues(test_global_t *global)
{
- odp_queue_capability_t queue_capa;
+ odp_schedule_capability_t schedule_capa;
odp_queue_param_t queue_param;
odp_queue_t queue;
odp_buffer_t buf;
@@ -279,19 +279,20 @@ static int create_queues(test_global_t *global)
printf(" queue type %s\n\n", type_str);
- if (odp_queue_capability(&queue_capa)) {
- printf("Error: Queue capa failed.\n");
+ if (odp_schedule_capability(&schedule_capa)) {
+ printf("Error: Schedule capa failed.\n");
return -1;
}
- if (tot_queue > queue_capa.sched.max_num) {
- printf("Max queues supported %u\n", queue_capa.sched.max_num);
+ if (tot_queue > schedule_capa.max_queues) {
+ printf("Max queues supported %u\n",
+ schedule_capa.max_queues);
return -1;
}
- if (queue_capa.sched.max_size &&
- queue_size > queue_capa.sched.max_size) {
- printf("Max queue size %u\n", queue_capa.sched.max_size);
+ if (schedule_capa.max_queue_size &&
+ queue_size > schedule_capa.max_queue_size) {
+ printf("Max queue size %u\n", schedule_capa.max_queue_size);
return -1;
}
diff --git a/test/performance/odp_sched_pktio.c b/test/performance/odp_sched_pktio.c
index 82f74422..ef5fb015 100644
--- a/test/performance/odp_sched_pktio.c
+++ b/test/performance/odp_sched_pktio.c
@@ -1112,12 +1112,12 @@ static int create_pipeline_queues(test_global_t *test_global)
int i, j, k, num_pktio, stages, queues, ctx_size;
pipe_queue_context_t *ctx;
odp_queue_param_t queue_param;
- odp_queue_capability_t queue_capa;
+ odp_schedule_capability_t schedule_capa;
odp_schedule_sync_t sched_sync;
int ret = 0;
- if (odp_queue_capability(&queue_capa)) {
- printf("Error: Queue capability failed\n");
+ if (odp_schedule_capability(&schedule_capa)) {
+ printf("Error: Schedule capa failed.\n");
return -1;
}
@@ -1133,10 +1133,10 @@ static int create_pipeline_queues(test_global_t *test_global)
queue_param.sched.group = ODP_SCHED_GROUP_ALL;
queue_param.size = test_global->opt.pipe_queue_size;
- if (queue_capa.sched.max_size &&
- queue_param.size > queue_capa.sched.max_size) {
+ if (schedule_capa.max_queue_size &&
+ queue_param.size > schedule_capa.max_queue_size) {
printf("Error: Pipeline queue max size is %u\n",
- queue_capa.sched.max_size);
+ schedule_capa.max_queue_size);
return -1;
}
diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c
index 5eeb6926..5e74b172 100644
--- a/test/performance/odp_scheduling.c
+++ b/test/performance/odp_scheduling.c
@@ -814,6 +814,7 @@ int main(int argc, char *argv[])
odph_odpthread_params_t thr_params;
odp_queue_capability_t capa;
odp_pool_capability_t pool_capa;
+ odp_schedule_capability_t schedule_capa;
uint32_t num_queues, num_buf;
printf("\nODP example starts\n\n");
@@ -899,10 +900,16 @@ int main(int argc, char *argv[])
return -1;
}
+ if (odp_schedule_capability(&schedule_capa)) {
+ printf("Error: Schedule capa failed.\n");
+ return -1;
+ }
+
globals->queues_per_prio = QUEUES_PER_PRIO;
num_queues = globals->queues_per_prio * NUM_PRIOS;
- if (num_queues > capa.sched.max_num)
- globals->queues_per_prio = capa.sched.max_num / NUM_PRIOS;
+ if (num_queues > schedule_capa.max_queues)
+ globals->queues_per_prio = schedule_capa.max_queues /
+ NUM_PRIOS;
/* One plain queue is also used */
num_queues = (globals->queues_per_prio * NUM_PRIOS) + 1;
diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c
index 99acc4bf..aab95bab 100644
--- a/test/validation/api/queue/queue.c
+++ b/test/validation/api/queue/queue.c
@@ -127,18 +127,15 @@ static void queue_test_capa(void)
odp_queue_param_t qparams;
char name[ODP_QUEUE_NAME_LEN];
odp_queue_t queue[MAX_QUEUES];
- uint32_t num_queues, min, i, j;
+ uint32_t num_queues, min, i;
memset(&capa, 0, sizeof(odp_queue_capability_t));
CU_ASSERT(odp_queue_capability(&capa) == 0);
CU_ASSERT(capa.max_queues != 0);
CU_ASSERT(capa.plain.max_num != 0);
- CU_ASSERT(capa.sched.max_num != 0);
min = capa.plain.max_num;
- if (min > capa.sched.max_num)
- min = capa.sched.max_num;
CU_ASSERT(capa.max_queues >= min);
@@ -150,33 +147,26 @@ static void queue_test_capa(void)
odp_queue_param_init(&qparams);
CU_ASSERT(qparams.nonblocking == ODP_BLOCKING);
- for (j = 0; j < 2; j++) {
- if (j == 0) {
- num_queues = capa.plain.max_num;
- } else {
- num_queues = capa.sched.max_num;
- qparams.type = ODP_QUEUE_TYPE_SCHED;
- }
+ num_queues = capa.plain.max_num;
- if (num_queues > MAX_QUEUES)
- num_queues = MAX_QUEUES;
+ if (num_queues > MAX_QUEUES)
+ num_queues = MAX_QUEUES;
- for (i = 0; i < num_queues; i++) {
- generate_name(name, i);
- queue[i] = odp_queue_create(name, &qparams);
+ for (i = 0; i < num_queues; i++) {
+ generate_name(name, i);
+ queue[i] = odp_queue_create(name, &qparams);
- if (queue[i] == ODP_QUEUE_INVALID) {
- CU_FAIL("Queue create failed");
- num_queues = i;
- break;
- }
-
- CU_ASSERT(odp_queue_lookup(name) != ODP_QUEUE_INVALID);
+ if (queue[i] == ODP_QUEUE_INVALID) {
+ CU_FAIL("Queue create failed");
+ num_queues = i;
+ break;
}
- for (i = 0; i < num_queues; i++)
- CU_ASSERT(odp_queue_destroy(queue[i]) == 0);
+ CU_ASSERT(odp_queue_lookup(name) != ODP_QUEUE_INVALID);
}
+
+ for (i = 0; i < num_queues; i++)
+ CU_ASSERT(odp_queue_destroy(queue[i]) == 0);
}
static void queue_test_mode(void)
diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c
index 35c38751..4fdfc243 100644
--- a/test/validation/api/scheduler/scheduler.c
+++ b/test/validation/api/scheduler/scheduler.c
@@ -20,6 +20,7 @@
#define NUM_BUFS_PAUSE 1000
#define NUM_BUFS_BEFORE_PAUSE 10
#define NUM_GROUPS 2
+#define MAX_QUEUES (64 * 1024)
#define TEST_QUEUE_SIZE_NUM_EV 50
@@ -144,12 +145,16 @@ static void release_context(odp_schedule_sync_t sync)
static void scheduler_test_capa(void)
{
odp_schedule_capability_t capa;
+ odp_queue_capability_t queue_capa;
memset(&capa, 0, sizeof(odp_schedule_capability_t));
CU_ASSERT_FATAL(odp_schedule_capability(&capa) == 0);
+ CU_ASSERT_FATAL(odp_queue_capability(&queue_capa) == 0);
CU_ASSERT(capa.max_groups != 0);
CU_ASSERT(capa.max_prios != 0);
+ CU_ASSERT(capa.max_queues != 0);
+ CU_ASSERT(queue_capa.max_queues >= capa.max_queues);
}
static void scheduler_test_wait_time(void)
@@ -413,6 +418,7 @@ static void scheduler_test_wait(void)
static void scheduler_test_queue_size(void)
{
odp_queue_capability_t queue_capa;
+ odp_scheduler_config_t default_config;
odp_pool_t pool;
odp_pool_param_t pool_param;
odp_queue_param_t queue_param;
@@ -426,10 +432,11 @@ static void scheduler_test_queue_size(void)
ODP_SCHED_SYNC_ORDERED};
CU_ASSERT_FATAL(odp_queue_capability(&queue_capa) == 0);
+ odp_scheduler_config_init(&default_config);
queue_size = TEST_QUEUE_SIZE_NUM_EV;
- if (queue_capa.sched.max_size &&
- queue_size > queue_capa.sched.max_size)
- queue_size = queue_capa.sched.max_size;
+ if (default_config.queue_size &&
+ queue_size > default_config.queue_size)
+ queue_size = default_config.queue_size;
odp_pool_param_init(&pool_param);
pool_param.buf.size = 100;
@@ -1684,9 +1691,10 @@ static int create_queues(test_globals_t *globals)
}
globals->max_sched_queue_size = BUFS_PER_QUEUE_EXCL;
- if (capa.sched.max_size && capa.sched.max_size < BUFS_PER_QUEUE_EXCL) {
- printf("Max sched queue size %u\n", capa.sched.max_size);
- globals->max_sched_queue_size = capa.sched.max_size;
+ if (sched_capa.max_queue_size && sched_capa.max_queue_size <
+ BUFS_PER_QUEUE_EXCL) {
+ printf("Max sched queue size %u\n", sched_capa.max_queue_size);
+ globals->max_sched_queue_size = sched_capa.max_queue_size;
}
prios = odp_schedule_num_prio();
@@ -1696,7 +1704,7 @@ static int create_queues(test_globals_t *globals)
queues_per_prio = QUEUES_PER_PRIO;
num_sched = (prios * queues_per_prio * sched_types) + CHAOS_NUM_QUEUES;
num_plain = (prios * queues_per_prio);
- while ((num_sched > capa.sched.max_num ||
+ while ((num_sched > sched_capa.max_queues ||
num_plain > capa.plain.max_num ||
num_sched + num_plain > capa.max_queues) && queues_per_prio) {
queues_per_prio--;
commit b6e973744e52db038d9e0886fcaef014eff05cb5
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Oct 31 13:47:52 2018 +0300
linux-gen: queue, schedule: move scheduled queue capabilities to sched
Move scheduled queue capabilities to odp_schedule_capability_t
structure, as they logically belong to ODP scheduler module, rather than
queue module.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c
index e40ce399..0d50c764 100644
--- a/platform/linux-generic/odp_queue_basic.c
+++ b/platform/linux-generic/odp_queue_basic.c
@@ -58,10 +58,10 @@ static int queue_capa(odp_queue_capability_t *capa, int sched ODP_UNUSED)
capa->plain.max_size = queue_glb->config.max_queue_size;
capa->plain.lockfree.max_num = queue_glb->queue_lf_num;
capa->plain.lockfree.max_size = queue_glb->queue_lf_size;
+#if ODP_DEPRECATED_API
capa->sched.max_num = capa->max_queues;
capa->sched.max_size = queue_glb->config.max_queue_size;
-#if ODP_DEPRECATED_API
if (sched) {
capa->max_ordered_locks = sched_fn->max_ordered_locks();
capa->max_sched_groups = sched_fn->num_grps();
diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c
index 0fdf7cda..8b89a227 100644
--- a/platform/linux-generic/odp_queue_scalable.c
+++ b/platform/linux-generic/odp_queue_scalable.c
@@ -322,11 +322,11 @@ static int queue_capability(odp_queue_capability_t *capa)
capa->max_ordered_locks = sched_fn->max_ordered_locks();
capa->max_sched_groups = sched_fn->num_grps();
capa->sched_prios = odp_schedule_num_prio();
+ capa->sched.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES;
+ capa->sched.max_size = 0;
#endif
capa->plain.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES;
capa->plain.max_size = 0;
- capa->sched.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES;
- capa->sched.max_size = 0;
return 0;
}
diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c
index e9edb7d0..116cbc5c 100644
--- a/platform/linux-generic/odp_schedule_basic.c
+++ b/platform/linux-generic/odp_schedule_basic.c
@@ -1557,6 +1557,8 @@ static int schedule_capability(odp_schedule_capability_t *capa)
capa->max_ordered_locks = schedule_max_ordered_locks();
capa->max_groups = schedule_num_grps();
capa->max_prios = schedule_num_prio();
+ capa->max_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES;
+ capa->max_queue_size = queue_glb->config.max_queue_size;
return 0;
}
diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c
index 7f42fead..b426ca67 100644
--- a/platform/linux-generic/odp_schedule_scalable.c
+++ b/platform/linux-generic/odp_schedule_scalable.c
@@ -2120,6 +2120,8 @@ static int schedule_capability(odp_schedule_capability_t *capa)
capa->max_ordered_locks = schedule_max_ordered_locks();
capa->max_groups = num_grps();
capa->max_prios = schedule_num_prio();
+ capa->max_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES;
+ capa->max_queue_size = 0;
return 0;
}
diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c
index b4ae638d..e748699d 100644
--- a/platform/linux-generic/odp_schedule_sp.c
+++ b/platform/linux-generic/odp_schedule_sp.c
@@ -930,6 +930,8 @@ static int schedule_capability(odp_schedule_capability_t *capa)
capa->max_ordered_locks = max_ordered_locks();
capa->max_groups = num_grps();
capa->max_prios = schedule_num_prio();
+ capa->max_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES;
+ capa->max_queue_size = queue_glb->config.max_queue_size;
return 0;
}
commit f30d79bf8689dda7554b5c3d1025fb9030135ab7
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Oct 24 17:50:54 2018 +0300
api: queue, schedule: move scheduled queue capabilities to sched
Move scheduled queue capabilities to odp_schedule_capability_t
structure, as they logically belong to ODP scheduler module, rather than
queue module.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/queue_types.h b/include/odp/api/spec/queue_types.h
index 9c7c7de9..c8f31046 100644
--- a/include/odp/api/spec/queue_types.h
+++ b/include/odp/api/spec/queue_types.h
@@ -139,7 +139,8 @@ typedef struct odp_queue_capability_t {
* instead */
unsigned int ODP_DEPRECATE(max_sched_groups);
- /** @deprecated Use prios field of odp_schedule_capability_t instead */
+ /** @deprecated Use max_prios field of odp_schedule_capability_t
+ * instead */
unsigned int ODP_DEPRECATE(sched_prios);
/** Plain queue capabilities */
@@ -182,7 +183,8 @@ typedef struct odp_queue_capability_t {
} plain;
- /** Scheduled queue capabilities */
+ /** @deprecated Use queue capabilities in odp_schedule_capability_t
+ * instead */
struct {
/** Maximum number of scheduled (ODP_BLOCKING) queues of the
* default size. */
@@ -220,7 +222,7 @@ typedef struct odp_queue_capability_t {
} waitfree;
- } sched;
+ } ODP_DEPRECATE(sched);
} odp_queue_capability_t;
diff --git a/include/odp/api/spec/schedule_types.h b/include/odp/api/spec/schedule_types.h
index f55e53f3..e7cc0479 100644
--- a/include/odp/api/spec/schedule_types.h
+++ b/include/odp/api/spec/schedule_types.h
@@ -14,6 +14,8 @@
#define ODP_API_SPEC_SCHEDULE_TYPES_H_
#include <odp/visibility_begin.h>
+#include <odp/api/support.h>
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -178,6 +180,24 @@ typedef struct odp_schedule_capability_t {
/** Number of scheduling priorities */
uint32_t max_prios;
+ /** Maximum number of scheduled (ODP_BLOCKING) queues of the default
+ * size. */
+ uint32_t max_queues;
+
+ /** Maximum number of events a scheduled (ODP_BLOCKING) queue can store
+ * simultaneously. The value of zero means that scheduled queues do not
+ * have a size limit, but a single queue can store all available
+ * events. */
+ uint32_t max_queue_size;
+
+ /** Lock-free (ODP_NONBLOCKING_LF) queues support.
+ * The specification is the same as for the blocking implementation. */
+ odp_support_t lockfree_queues;
+
+ /** Wait-free (ODP_NONBLOCKING_WF) queues support.
+ * The specification is the same as for the blocking implementation. */
+ odp_support_t waitfree_queues;
+
} odp_schedule_capability_t;
/**
commit 39502aa8b1a01732b012a424ca6587030d2e0a09
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Oct 24 17:49:29 2018 +0300
example, tests: move scheduler capabilities to scheduler
Add odp_schedule_capability() call to query scheduler capabilities. Move
basic scheduler capabilities to new odp_schedule_capability_t structure.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/sysinfo/odp_sysinfo.c b/example/sysinfo/odp_sysinfo.c
index 120910b6..f0b0241d 100644
--- a/example/sysinfo/odp_sysinfo.c
+++ b/example/sysinfo/odp_sysinfo.c
@@ -238,6 +238,7 @@ int main(void)
odp_queue_capability_t queue_capa;
odp_timer_capability_t timer_capa;
odp_crypto_capability_t crypto_capa;
+ odp_schedule_capability_t schedule_capa;
uint64_t huge_page[MAX_HUGE_PAGES];
char ava_mask_str[ODP_CPUMASK_STR_SIZE];
char work_mask_str[ODP_CPUMASK_STR_SIZE];
@@ -293,6 +294,11 @@ int main(void)
return -1;
}
+ if (odp_schedule_capability(&schedule_capa)) {
+ printf("schedule capability failed\n");
+ return -1;
+ }
+
if (odp_timer_capability(ODP_CLOCK_CPU, &timer_capa)) {
printf("timer capability failed\n");
return -1;
@@ -393,9 +399,9 @@ int main(void)
printf("\n");
printf(" SCHEDULER\n");
printf(" max ordered locks: %" PRIu32 "\n",
- queue_capa.max_ordered_locks);
- printf(" max groups: %u\n", queue_capa.max_sched_groups);
- printf(" priorities: %u\n", queue_capa.sched_prios);
+ schedule_capa.max_ordered_locks);
+ printf(" max groups: %u\n", schedule_capa.max_groups);
+ printf(" priorities: %u\n", schedule_capa.prios);
printf(" sched.max_num: %" PRIu32 "\n",
queue_capa.sched.max_num);
printf(" sched.max_size: %" PRIu32 "\n",
diff --git a/test/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c
index faf41b02..f0939eb5 100644
--- a/test/performance/odp_pktio_ordered.c
+++ b/test/performance/odp_pktio_ordered.c
@@ -1064,6 +1064,7 @@ int main(int argc, char *argv[])
odp_pool_param_t params;
odp_shm_t shm;
odp_queue_capability_t queue_capa;
+ odp_schedule_capability_t schedule_capa;
odp_pool_capability_t pool_capa;
odph_ethaddr_t new_addr;
odph_odpthread_t thread_tbl[MAX_WORKERS];
@@ -1094,6 +1095,11 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
+ if (odp_schedule_capability(&schedule_capa)) {
+ printf("Error: Schedule capa failed.\n");
+ return -1;
+ }
+
if (odp_pool_capability(&pool_capa)) {
LOG_ERR("Error: Pool capa failed\n");
exit(EXIT_FAILURE);
@@ -1122,7 +1128,7 @@ int main(int argc, char *argv[])
if (gbl_args->appl.in_mode == SCHED_ORDERED) {
/* At least one ordered lock required */
- if (queue_capa.max_ordered_locks < 1) {
+ if (schedule_capa.max_ordered_locks < 1) {
LOG_ERR("Error: Ordered locks not available.\n");
exit(EXIT_FAILURE);
}
diff --git a/test/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c
index 41201d4a..4f722140 100644
--- a/test/validation/api/classification/odp_classification_tests.c
+++ b/test/validation/api/classification/odp_classification_tests.c
@@ -152,16 +152,16 @@ void configure_cls_pmr_chain(void)
uint32_t addr;
uint32_t mask;
odp_pmr_param_t pmr_param;
- odp_queue_capability_t queue_capa;
+ odp_schedule_capability_t schedule_capa;
- CU_ASSERT_FATAL(odp_queue_capability(&queue_capa) == 0);
+ CU_ASSERT_FATAL(odp_schedule_capability(&schedule_capa) == 0);
odp_queue_param_init(&qparam);
qparam.type = ODP_QUEUE_TYPE_SCHED;
qparam.sched.prio = odp_schedule_default_prio();
qparam.sched.sync = ODP_SCHED_SYNC_PARALLEL;
qparam.sched.group = ODP_SCHED_GROUP_ALL;
- qparam.sched.lock_count = queue_capa.max_ordered_locks;
+ qparam.sched.lock_count = schedule_capa.max_ordered_locks;
sprintf(queuename, "%s", "SrcQueue");
queue_list[CLS_PMR_CHAIN_SRC] = odp_queue_create(queuename, &qparam);
diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c
index cf081a99..99acc4bf 100644
--- a/test/validation/api/queue/queue.c
+++ b/test/validation/api/queue/queue.c
@@ -133,8 +133,6 @@ static void queue_test_capa(void)
CU_ASSERT(odp_queue_capability(&capa) == 0);
CU_ASSERT(capa.max_queues != 0);
- CU_ASSERT(capa.max_sched_groups != 0);
- CU_ASSERT(capa.sched_prios != 0);
CU_ASSERT(capa.plain.max_num != 0);
CU_ASSERT(capa.sched.max_num != 0);
@@ -715,6 +713,7 @@ static void queue_test_info(void)
odp_queue_info_t info;
odp_queue_param_t param;
odp_queue_capability_t capability;
+ odp_schedule_capability_t sched_capa;
char q_plain_ctx[] = "test_q_plain context data";
char q_order_ctx[] = "test_q_order context data";
uint32_t lock_count;
@@ -729,13 +728,14 @@ static void queue_test_info(void)
memset(&capability, 0, sizeof(odp_queue_capability_t));
CU_ASSERT(odp_queue_capability(&capability) == 0);
+ CU_ASSERT(odp_schedule_capability(&sched_capa) == 0);
/* Create a scheduled ordered queue with explicitly set params */
odp_queue_param_init(¶m);
param.type = ODP_QUEUE_TYPE_SCHED;
param.sched.prio = odp_schedule_default_prio();
param.sched.sync = ODP_SCHED_SYNC_ORDERED;
param.sched.group = ODP_SCHED_GROUP_ALL;
- param.sched.lock_count = capability.max_ordered_locks;
+ param.sched.lock_count = sched_capa.max_ordered_locks;
if (param.sched.lock_count == 0)
printf("\n Ordered locks NOT supported\n");
param.context = q_order_ctx;
diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c
index 2f66f526..35c38751 100644
--- a/test/validation/api/scheduler/scheduler.c
+++ b/test/validation/api/scheduler/scheduler.c
@@ -141,6 +141,17 @@ static void release_context(odp_schedule_sync_t sync)
odp_schedule_release_ordered();
}
+static void scheduler_test_capa(void)
+{
+ odp_schedule_capability_t capa;
+
+ memset(&capa, 0, sizeof(odp_schedule_capability_t));
+ CU_ASSERT_FATAL(odp_schedule_capability(&capa) == 0);
+
+ CU_ASSERT(capa.max_groups != 0);
+ CU_ASSERT(capa.max_prios != 0);
+}
+
static void scheduler_test_wait_time(void)
{
int i;
@@ -1643,6 +1654,7 @@ static int create_queues(test_globals_t *globals)
{
int i, j, prios, rc;
odp_queue_capability_t capa;
+ odp_schedule_capability_t sched_capa;
odp_pool_t queue_ctx_pool;
odp_pool_param_t params;
odp_buffer_t queue_ctx_buf;
@@ -1659,11 +1671,16 @@ static int create_queues(test_globals_t *globals)
return -1;
}
+ if (odp_schedule_capability(&sched_capa) < 0) {
+ printf("Queue capability query failed\n");
+ return -1;
+ }
+
/* Limit to test maximum */
- if (capa.max_ordered_locks > MAX_ORDERED_LOCKS) {
- capa.max_ordered_locks = MAX_ORDERED_LOCKS;
+ if (sched_capa.max_ordered_locks > MAX_ORDERED_LOCKS) {
+ sched_capa.max_ordered_locks = MAX_ORDERED_LOCKS;
printf("Testing only %u ordered locks\n",
- capa.max_ordered_locks);
+ sched_capa.max_ordered_locks);
}
globals->max_sched_queue_size = BUFS_PER_QUEUE_EXCL;
@@ -1764,7 +1781,7 @@ static int create_queues(test_globals_t *globals)
snprintf(name, sizeof(name), "sched_%d_%d_o", i, j);
p.sched.sync = ODP_SCHED_SYNC_ORDERED;
- p.sched.lock_count = capa.max_ordered_locks;
+ p.sched.lock_count = sched_capa.max_ordered_locks;
p.size = 0;
q = odp_queue_create(name, &p);
@@ -1773,12 +1790,12 @@ static int create_queues(test_globals_t *globals)
return -1;
}
if (odp_queue_lock_count(q) !=
- capa.max_ordered_locks) {
+ sched_capa.max_ordered_locks) {
printf("Queue %" PRIu64 " created with "
"%d locks instead of expected %d\n",
odp_queue_to_u64(q),
odp_queue_lock_count(q),
- capa.max_ordered_locks);
+ sched_capa.max_ordered_locks);
return -1;
}
@@ -1795,7 +1812,7 @@ static int create_queues(test_globals_t *globals)
qctx->sequence = 0;
for (ndx = 0;
- ndx < capa.max_ordered_locks;
+ ndx < sched_capa.max_ordered_locks;
ndx++) {
qctx->lock_sequence[ndx] = 0;
}
@@ -1949,6 +1966,7 @@ static int scheduler_suite_term(void)
}
odp_testinfo_t scheduler_suite[] = {
+ ODP_TEST_INFO(scheduler_test_capa),
ODP_TEST_INFO(scheduler_test_wait_time),
ODP_TEST_INFO(scheduler_test_num_prio),
ODP_TEST_INFO(scheduler_test_queue_destroy),
commit da5d27b57a0a3c8389c0a0f8c5747308419a094a
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Oct 26 03:00:43 2018 +0300
linux-gen: queue, schedule: move scheduler capabilities to scheduler
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h
index 5f7f2c4d..88961269 100644
--- a/platform/linux-generic/include/odp_schedule_if.h
+++ b/platform/linux-generic/include/odp_schedule_if.h
@@ -90,6 +90,7 @@ void sched_cb_pktio_stop_finalize(int pktio_index);
/* API functions */
typedef struct {
uint64_t (*schedule_wait_time)(uint64_t ns);
+ int (*schedule_capability)(odp_schedule_capability_t *capa);
odp_event_t (*schedule)(odp_queue_t *from, uint64_t wait);
int (*schedule_multi)(odp_queue_t *from, uint64_t wait,
odp_event_t events[], int num);
diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c
index 88c810ca..e40ce399 100644
--- a/platform/linux-generic/odp_queue_basic.c
+++ b/platform/linux-generic/odp_queue_basic.c
@@ -48,7 +48,7 @@ static int queue_init(queue_entry_t *queue, const char *name,
queue_global_t *queue_glb;
extern _odp_queue_inline_offset_t _odp_queue_inline_offset;
-static int queue_capa(odp_queue_capability_t *capa, int sched)
+static int queue_capa(odp_queue_capability_t *capa, int sched ODP_UNUSED)
{
memset(capa, 0, sizeof(odp_queue_capability_t));
@@ -61,11 +61,13 @@ static int queue_capa(odp_queue_capability_t *capa, int sched)
capa->sched.max_num = capa->max_queues;
capa->sched.max_size = queue_glb->config.max_queue_size;
+#if ODP_DEPRECATED_API
if (sched) {
capa->max_ordered_locks = sched_fn->max_ordered_locks();
capa->max_sched_groups = sched_fn->num_grps();
capa->sched_prios = odp_schedule_num_prio();
}
+#endif
return 0;
}
diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c
index 64068ed4..0fdf7cda 100644
--- a/platform/linux-generic/odp_queue_scalable.c
+++ b/platform/linux-generic/odp_queue_scalable.c
@@ -318,9 +318,11 @@ static int queue_capability(odp_queue_capability_t *capa)
/* Reserve some queues for internal use */
capa->max_queues = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES;
+#if ODP_DEPRECATED_API
capa->max_ordered_locks = sched_fn->max_ordered_locks();
capa->max_sched_groups = sched_fn->num_grps();
capa->sched_prios = odp_schedule_num_prio();
+#endif
capa->plain.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES;
capa->plain.max_size = 0;
capa->sched.max_num = ODP_CONFIG_QUEUES - NUM_INTERNAL_QUEUES;
diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c
index a2db156f..e9edb7d0 100644
--- a/platform/linux-generic/odp_schedule_basic.c
+++ b/platform/linux-generic/odp_schedule_basic.c
@@ -1548,6 +1548,17 @@ static int schedule_num_grps(void)
static void schedule_config(schedule_config_t *config)
{
*config = *(&sched->config_if);
+};
+
+static int schedule_capability(odp_schedule_capability_t *capa)
+{
+ memset(capa, 0, sizeof(odp_schedule_capability_t));
+
+ capa->max_ordered_locks = schedule_max_ordered_locks();
+ capa->max_groups = schedule_num_grps();
+ capa->max_prios = schedule_num_prio();
+
+ return 0;
}
/* Fill in scheduler interface */
@@ -1573,6 +1584,7 @@ const schedule_fn_t schedule_basic_fn = {
/* Fill in scheduler API calls */
const schedule_api_t schedule_basic_api = {
.schedule_wait_time = schedule_wait_time,
+ .schedule_capability = schedule_capability,
.schedule = schedule,
.schedule_multi = schedule_multi,
.schedule_multi_wait = schedule_multi_wait,
diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c
index 4d50a13f..92e0a62f 100644
--- a/platform/linux-generic/odp_schedule_if.c
+++ b/platform/linux-generic/odp_schedule_if.c
@@ -30,6 +30,11 @@ uint64_t odp_schedule_wait_time(uint64_t ns)
return sched_api->schedule_wait_time(ns);
}
+int odp_schedule_capability(odp_schedule_capability_t *capa)
+{
+ return sched_api->schedule_capability(capa);
+}
+
odp_event_t odp_schedule(odp_queue_t *from, uint64_t wait)
{
return sched_api->schedule(from, wait);
diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c
index 1f301bf4..7f42fead 100644
--- a/platform/linux-generic/odp_schedule_scalable.c
+++ b/platform/linux-generic/odp_schedule_scalable.c
@@ -2113,6 +2113,17 @@ static uint32_t schedule_max_ordered_locks(void)
return CONFIG_QUEUE_MAX_ORD_LOCKS;
}
+static int schedule_capability(odp_schedule_capability_t *capa)
+{
+ memset(capa, 0, sizeof(odp_schedule_capability_t));
+
+ capa->max_ordered_locks = schedule_max_ordered_locks();
+ capa->max_groups = num_grps();
+ capa->max_prios = schedule_num_prio();
+
+ return 0;
+}
+
const schedule_fn_t schedule_scalable_fn = {
.pktio_start = pktio_start,
.thr_add = thr_add,
@@ -2133,6 +2144,7 @@ const schedule_fn_t schedule_scalable_fn = {
const schedule_api_t schedule_scalable_api = {
.schedule_wait_time = schedule_wait_time,
+ .schedule_capability = schedule_capability,
.schedule = schedule,
.schedule_multi = schedule_multi,
.schedule_multi_wait = schedule_multi_wait,
diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c
index c93c5e02..b4ae638d 100644
--- a/platform/linux-generic/odp_schedule_sp.c
+++ b/platform/linux-generic/odp_schedule_sp.c
@@ -923,6 +923,17 @@ static void order_unlock(void)
{
}
+static int schedule_capability(odp_schedule_capability_t *capa)
+{
+ memset(capa, 0, sizeof(odp_schedule_capability_t));
+
+ capa->max_ordered_locks = max_ordered_locks();
+ capa->max_groups = num_grps();
+ capa->max_prios = schedule_num_prio();
+
+ return 0;
+}
+
/* Fill in scheduler interface */
const schedule_fn_t schedule_sp_fn = {
.pktio_start = pktio_start,
@@ -945,6 +956,7 @@ const schedule_fn_t schedule_sp_fn = {
/* Fill in scheduler API calls */
const schedule_api_t schedule_sp_api = {
.schedule_wait_time = schedule_wait_time,
+ .schedule_capability = schedule_capability,
.schedule = schedule,
.schedule_multi = schedule_multi,
.schedule_multi_wait = schedule_multi_wait,
commit 207efebdb9ca6d329cc89b272865559f5eeff182
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Oct 26 02:50:26 2018 +0300
linux-gen: move NUM_INTERNAL_QUEUES to config
It is really a config value, that allows one to select amount of queues
to be reserved for platform internal use, so move it to config header.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h
index 65f75197..ae6426ef 100644
--- a/platform/linux-generic/include/odp_config_internal.h
+++ b/platform/linux-generic/include/odp_config_internal.h
@@ -26,6 +26,11 @@ extern "C" {
*/
#define ODP_CONFIG_QUEUES 1024
+/*
+ * Queues reserved for ODP internal use
+ */
+#define NUM_INTERNAL_QUEUES 64
+
/*
* Maximum number of ordered locks per queue
*/
diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c
index 1b1ee651..88c810ca 100644
--- a/platform/linux-generic/odp_queue_basic.c
+++ b/platform/linux-generic/odp_queue_basic.c
@@ -31,8 +31,6 @@
#include <odp/api/plat/queue_inline_types.h>
#include <odp_global_data.h>
-#define NUM_INTERNAL_QUEUES 64
-
#include <odp/api/plat/ticketlock_inlines.h>
#define LOCK(queue_ptr) odp_ticketlock_lock(&((queue_ptr)->s.lock))
#define UNLOCK(queue_ptr) odp_ticketlock_unlock(&((queue_ptr)->s.lock))
diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c
index f48fbd86..64068ed4 100644
--- a/platform/linux-generic/odp_queue_scalable.c
+++ b/platform/linux-generic/odp_queue_scalable.c
@@ -33,8 +33,6 @@
#include <string.h>
#include <inttypes.h>
-#define NUM_INTERNAL_QUEUES 64
-
#define MIN(a, b) \
({ \
__typeof__(a) tmp_a = (a); \
commit 12b368d14e19761b7aabc4cac04918582253052b
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Oct 24 17:49:29 2018 +0300
api: queue, schedule: move scheduler capabilities to scheduler
Add odp_schedule_capability() call to query scheduler capabilities. Move
basic scheduler capabilities to new odp_schedule_capability_t structure.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/queue_types.h b/include/odp/api/spec/queue_types.h
index be7e79a8..9c7c7de9 100644
--- a/include/odp/api/spec/queue_types.h
+++ b/include/odp/api/spec/queue_types.h
@@ -19,6 +19,7 @@ extern "C" {
#endif
#include <odp/api/schedule_types.h>
+#include <odp/api/deprecated.h>
/** @addtogroup odp_queue
* @{
@@ -130,14 +131,16 @@ typedef struct odp_queue_capability_t {
* types are used simultaneously. */
uint32_t max_queues;
- /** Maximum number of ordered locks per queue */
- uint32_t max_ordered_locks;
+ /** @deprecated Use max_ordered_locks field of
+ * odp_schedule_capability_t instead */
+ uint32_t ODP_DEPRECATE(max_ordered_locks);
- /** Maximum number of scheduling groups */
- unsigned max_sched_groups;
+ /** @deprecated Use max_groups field of odp_schedule_capability_t
+ * instead */
+ unsigned int ODP_DEPRECATE(max_sched_groups);
- /** Number of scheduling priorities */
- unsigned sched_prios;
+ /** @deprecated Use prios field of odp_schedule_capability_t instead */
+ unsigned int ODP_DEPRECATE(sched_prios);
/** Plain queue capabilities */
struct {
diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h
index d9b868e3..6538c509 100644
--- a/include/odp/api/spec/schedule.h
+++ b/include/odp/api/spec/schedule.h
@@ -257,6 +257,18 @@ int odp_schedule_default_prio(void);
*/
int odp_schedule_num_prio(void);
+/**
+ * Query scheduler capabilities
+ *
+ * Outputs schedule capabilities on success.
+ *
+ * @param[out] capa Pointer to capability structure for output
+ *
+ * @retval 0 on success
+ * @retval <0 on failure
+ */
+int odp_schedule_capability(odp_schedule_capability_t *capa);
+
/**
* Schedule group create
*
diff --git a/include/odp/api/spec/schedule_types.h b/include/odp/api/spec/schedule_types.h
index 76afc6dd..f55e53f3 100644
--- a/include/odp/api/spec/schedule_types.h
+++ b/include/odp/api/spec/schedule_types.h
@@ -165,6 +165,21 @@ typedef struct odp_schedule_param_t {
uint32_t lock_count;
} odp_schedule_param_t;
+/**
+ * Scheduler capabilities
+ */
+typedef struct odp_schedule_capability_t {
+ /** Maximum number of ordered locks per queue */
+ uint32_t max_ordered_locks;
+
+ /** Maximum number of scheduling groups */
+ uint32_t max_groups;
+
+ /** Number of scheduling priorities */
+ uint32_t max_prios;
+
+} odp_schedule_capability_t;
+
/**
* @}
*/
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 1 +
example/classifier/odp_classifier.c | 3 +
example/generator/odp_generator.c | 3 +
example/ipsec/odp_ipsec.c | 3 +
example/ipsec_api/odp_ipsec.c | 3 +
example/ipsec_offload/odp_ipsec_offload.c | 3 +
example/packet/odp_packet_dump.c | 2 +
example/packet/odp_pktio.c | 3 +
example/sysinfo/odp_sysinfo.c | 32 +++++----
example/timer/odp_timer_accuracy.c | 3 +
example/timer/odp_timer_simple.c | 3 +
example/timer/odp_timer_test.c | 3 +
include/odp/api/spec/event.h | 38 ++++++++++
include/odp/api/spec/queue_types.h | 21 +++---
include/odp/api/spec/schedule.h | 50 +++++++++++++
include/odp/api/spec/schedule_types.h | 83 ++++++++++++++++++++++
.../linux-generic/include/odp_config_internal.h | 5 ++
platform/linux-generic/include/odp_schedule_if.h | 12 +++-
platform/linux-generic/odp_queue_basic.c | 6 +-
platform/linux-generic/odp_queue_scalable.c | 8 +--
platform/linux-generic/odp_schedule_basic.c | 35 ++++++++-
platform/linux-generic/odp_schedule_if.c | 41 +++++++++++
platform/linux-generic/odp_schedule_scalable.c | 29 ++++++++
platform/linux-generic/odp_schedule_sp.c | 34 +++++++++
platform/linux-generic/odp_thread.c | 8 +--
test/common/odp_cunit_common.c | 4 ++
test/performance/odp_cpu_bench.c | 23 +++---
test/performance/odp_crypto.c | 1 +
test/performance/odp_ipsec.c | 1 +
test/performance/odp_l2fwd.c | 2 +
test/performance/odp_pktio_ordered.c | 19 ++---
test/performance/odp_pktio_perf.c | 3 +
test/performance/odp_sched_latency.c | 2 +
test/performance/odp_sched_perf.c | 22 +++---
test/performance/odp_sched_pktio.c | 17 +++--
test/performance/odp_scheduling.c | 10 ++-
.../api/classification/odp_classification_tests.c | 6 +-
test/validation/api/queue/queue.c | 46 +++++-------
test/validation/api/scheduler/scheduler.c | 56 +++++++++++----
test/validation/api/timer/timer.c | 3 +
40 files changed, 521 insertions(+), 126 deletions(-)
hooks/post-receive
--
7 years, 9 months
- 1
- 0
[COMMIT] branch master updated. v1.19.0.2_tigermoth-255-g35525f70
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 35525f70aa68e55dca6b05cf59a515c50e7dcba2 (commit)
via 56f0435d26ad16fdb4c8b6ea874cf88b15a5ddf9 (commit)
via 12c4ca508b07b8d2366b0c37bee5f866019e94c2 (commit)
via 9ddeaaf7a3226ab03e57cc49775fd234b8d44a2b (commit)
via 0dcbdecc871783b5669dc9cb8cf68b7f4d7ffb76 (commit)
via d89f772686dba6b331515be41aeefe345a207575 (commit)
via 132dff6387e441c7019a8366c681941ee6173452 (commit)
from fd383ebb6ea70350c28227d0b133c4e9c7075997 (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 35525f70aa68e55dca6b05cf59a515c50e7dcba2
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Wed Nov 14 14:28:53 2018 +0200
linux-gen: ishm: add config option for selecting huge page usage limit
Add configuration option for selecting huge page usage limit in kilobytes.
Memory reservations larger than this value are done using huge pages (if
available), whereas smaller reservations are done using normal pages to
conserve memory. The default value is still 64 kilobytes.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf
index 9969860d..8a1eddbd 100644
--- a/config/odp-linux-generic.conf
+++ b/config/odp-linux-generic.conf
@@ -34,6 +34,11 @@ shm: {
# because the current implementation won't work properly otherwise.
num_cached_hp = 0
+ # Huge page usage limit in kilobytes. Memory reservations larger than
+ # this value are done using huge pages (if available). Smaller
+ # reservations are done using normal pages to conserve memory.
+ huge_page_limit_kb = 64
+
# Allocate internal shared memory using a single virtual address space.
# Set to 1 to enable using process mode.
single_va = 0
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index a66d9fab..d02e5ee9 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -113,13 +113,6 @@
*/
#define ISHM_NB_FRAGMNTS (ISHM_MAX_NB_BLOCKS * 2 + 1)
-/*
- * Memory reservations larger than ISHM_HUGE_PAGE_LIMIT (bytes) are allocated
- * using huge pages (if available). Smaller reservations are done using normal
- * pages to conserve memory.
- */
-#define ISHM_HUGE_PAGE_LIMIT (64 * 1024)
-
/*
* when a memory block is to be exported outside its ODP instance,
* an block 'attribute file' is created in /dev/shm/odp-<pid>-shm-<name>.
@@ -190,6 +183,8 @@ typedef struct ishm_block {
typedef struct {
odp_spinlock_t lock;
uint64_t dev_seq; /* used when creating device names */
+ /* limit for reserving memory using huge pages */
+ uint64_t huge_page_limit;
uint32_t odpthread_cnt; /* number of running ODP threads */
ishm_block_t block[ISHM_MAX_NB_BLOCKS];
void *single_va_start; /* start of single VA memory */
@@ -1108,7 +1103,7 @@ int _odp_ishm_reserve(const char *name, uint64_t size, int fd,
/* Otherwise, Try first huge pages when possible and needed: */
if ((fd < 0) && page_hp_size && ((flags & _ODP_ISHM_USE_HP) ||
- size > ISHM_HUGE_PAGE_LIMIT)) {
+ size > ishm_tbl->huge_page_limit)) {
/* at least, alignment in VA should match page size, but user
* can request more: If the user requirement exceeds the page
* size then we have to make sure the block will be mapped at
@@ -1643,23 +1638,33 @@ int _odp_ishm_init_global(const odp_init_t *init)
void *addr;
void *spce_addr = NULL;
int i;
- int single_va_size_kb = 0;
+ int val_kb;
uid_t uid;
char *hp_dir = odp_global_ro.hugepage_info.default_huge_page_dir;
uint64_t max_memory;
uint64_t internal;
+ uint64_t huge_page_limit;
if (!_odp_libconfig_lookup_ext_int("shm", NULL, "single_va_size_kb",
- &single_va_size_kb)) {
+ &val_kb)) {
ODP_ERR("Unable to read single VA size from config\n");
return -1;
}
- ODP_DBG("Shm single VA size: %dkB\n", single_va_size_kb);
+ ODP_DBG("Shm single VA size: %dkB\n", val_kb);
- max_memory = single_va_size_kb * 1024;
+ max_memory = val_kb * 1024;
internal = max_memory / 8;
+ if (!_odp_libconfig_lookup_ext_int("shm", NULL, "huge_page_limit_kb",
+ &val_kb)) {
+ ODP_ERR("Unable to read huge page usage limit from config\n");
+ return -1;
+ }
+ huge_page_limit = (uint64_t)val_kb * 1024;
+
+ ODP_DBG("Shm huge page usage limit: %dkB\n", val_kb);
+
/* user requested memory size + some extra for internal use */
if (init && init->shm.max_memory)
max_memory = init->shm.max_memory + internal;
@@ -1710,6 +1715,7 @@ int _odp_ishm_init_global(const odp_init_t *init)
memset(ishm_tbl, 0, sizeof(ishm_table_t));
ishm_tbl->dev_seq = 0;
ishm_tbl->odpthread_cnt = 0;
+ ishm_tbl->huge_page_limit = huge_page_limit;
odp_spinlock_init(&ishm_tbl->lock);
/* allocate space for the internal shared mem fragment table: */
commit 56f0435d26ad16fdb4c8b6ea874cf88b15a5ddf9
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Nov 13 16:11:17 2018 +0200
linux-gen: timer: decrease inline timer polling interval under load
Decrease inline timer polling interval after receiving events to
compansate for event processing delay.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_timer_internal.h b/platform/linux-generic/include/odp_timer_internal.h
index 1f612448..cd80778a 100644
--- a/platform/linux-generic/include/odp_timer_internal.h
+++ b/platform/linux-generic/include/odp_timer_internal.h
@@ -36,12 +36,14 @@ typedef struct {
odp_timer_t timer;
} odp_timeout_hdr_t;
-unsigned _timer_run(void);
+/* A larger decrement value should be used after receiving events compared to
+ * an 'empty' call. */
+unsigned int _timer_run(int dec);
/* Static inline wrapper to minimize modification of schedulers. */
-static inline unsigned timer_run(void)
+static inline unsigned int timer_run(int dec)
{
- return odp_global_rw->inline_timers ? _timer_run() : 0;
+ return odp_global_rw->inline_timers ? _timer_run(dec) : 0;
}
#endif
diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c
index c49db740..5790e1c3 100644
--- a/platform/linux-generic/odp_queue_basic.c
+++ b/platform/linux-generic/odp_queue_basic.c
@@ -976,27 +976,30 @@ static int queue_api_enq(odp_queue_t handle, odp_event_t ev)
static int queue_api_deq_multi(odp_queue_t handle, odp_event_t ev[], int num)
{
queue_entry_t *queue = qentry_from_handle(handle);
-
- if (odp_global_rw->inline_timers &&
- odp_atomic_load_u64(&queue->s.num_timers))
- timer_run();
+ int ret;
if (num > QUEUE_MULTI_MAX)
num = QUEUE_MULTI_MAX;
- return queue->s.dequeue_multi(handle,
- (odp_buffer_hdr_t **)ev, num);
+ ret = queue->s.dequeue_multi(handle, (odp_buffer_hdr_t **)ev, num);
+
+ if (odp_global_rw->inline_timers &&
+ odp_atomic_load_u64(&queue->s.num_timers))
+ timer_run(ret ? 2 : 1);
+
+ return ret;
}
static odp_event_t queue_api_deq(odp_queue_t handle)
{
queue_entry_t *queue = qentry_from_handle(handle);
+ odp_event_t ev = (odp_event_t)queue->s.dequeue(handle);
if (odp_global_rw->inline_timers &&
odp_atomic_load_u64(&queue->s.num_timers))
- timer_run();
+ timer_run(ev != ODP_EVENT_INVALID ? 2 : 1);
- return (odp_event_t)queue->s.dequeue(handle);
+ return ev;
}
/* API functions */
diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c
index a3288456..4f2c1b6c 100644
--- a/platform/linux-generic/odp_queue_scalable.c
+++ b/platform/linux-generic/odp_queue_scalable.c
@@ -837,30 +837,32 @@ static odp_buffer_hdr_t *_queue_deq(odp_queue_t handle)
static int queue_deq_multi(odp_queue_t handle, odp_event_t ev[], int num)
{
queue_entry_t *queue;
+ int ret;
if (num > QUEUE_MULTI_MAX)
num = QUEUE_MULTI_MAX;
queue = qentry_from_ext(handle);
+ ret = queue->s.dequeue_multi(handle, (odp_buffer_hdr_t **)ev, num);
+
if (odp_global_rw->inline_timers &&
odp_atomic_load_u64(&queue->s.num_timers))
- timer_run();
+ timer_run(ret ? 2 : 1);
- return queue->s.dequeue_multi(handle, (odp_buffer_hdr_t **)ev, num);
+ return ret;
}
static odp_event_t queue_deq(odp_queue_t handle)
{
- queue_entry_t *queue;
-
- queue = qentry_from_ext(handle);
+ queue_entry_t *queue = qentry_from_ext(handle);
+ odp_event_t ev = (odp_event_t)queue->s.dequeue(handle);
if (odp_global_rw->inline_timers &&
odp_atomic_load_u64(&queue->s.num_timers))
- timer_run();
+ timer_run(ev != ODP_EVENT_INVALID ? 2 : 1);
- return (odp_event_t)queue->s.dequeue(handle);
+ return ev;
}
static void queue_param_init(odp_queue_param_t *params)
diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c
index bc46d6a6..22eb6ff1 100644
--- a/platform/linux-generic/odp_schedule_basic.c
+++ b/platform/linux-generic/odp_schedule_basic.c
@@ -1152,12 +1152,13 @@ static inline int schedule_loop(odp_queue_t *out_queue, uint64_t wait,
int ret;
while (1) {
- timer_run();
ret = do_schedule(out_queue, out_ev, max_num);
-
- if (ret)
+ if (ret) {
+ timer_run(2);
break;
+ }
+ timer_run(1);
if (wait == ODP_SCHED_WAIT)
continue;
diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c
index 05c0fcaf..ccafcb77 100644
--- a/platform/linux-generic/odp_schedule_scalable.c
+++ b/platform/linux-generic/odp_schedule_scalable.c
@@ -890,7 +890,7 @@ static int _schedule(odp_queue_t *from, odp_event_t ev[], int num_evts)
ts = sched_ts;
atomq = ts->atomq;
- timer_run();
+ timer_run(1);
/* Once an atomic queue has been scheduled to a thread, it will stay
* on that thread until empty or 'rotated' by WRR
diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c
index 8dcf9b0e..52c8873c 100644
--- a/platform/linux-generic/odp_schedule_sp.c
+++ b/platform/linux-generic/odp_schedule_sp.c
@@ -552,8 +552,6 @@ static int schedule_multi(odp_queue_t *from, uint64_t wait,
uint32_t qi;
int num;
- timer_run();
-
cmd = sched_cmd();
if (cmd && cmd->s.type == CMD_PKTIO) {
@@ -593,6 +591,7 @@ static int schedule_multi(odp_queue_t *from, uint64_t wait,
}
if (cmd == NULL) {
+ timer_run(1);
/* All priority queues are empty */
if (wait == ODP_SCHED_NO_WAIT)
return 0;
@@ -617,6 +616,7 @@ static int schedule_multi(odp_queue_t *from, uint64_t wait,
num = sched_queue_deq(qi, events, 1, 1);
if (num <= 0) {
+ timer_run(1);
/* Destroyed or empty queue. Remove empty queue from
* scheduling. A dequeue operation to on an already
* empty queue moves it to NOTSCHED state and
@@ -624,6 +624,8 @@ static int schedule_multi(odp_queue_t *from, uint64_t wait,
continue;
}
+ timer_run(2);
+
sched_local.cmd = cmd;
if (from)
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index 6307ae4f..7e2848c7 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -869,10 +869,10 @@ static unsigned process_timer_pools(void)
return nexp;
}
-unsigned _timer_run(void)
+unsigned int _timer_run(int dec)
{
static __thread odp_time_t last_timer_run;
- static __thread unsigned timer_run_cnt = 1;
+ static __thread int timer_run_cnt = 1;
odp_time_t now;
if (timer_global->num_timer_pools == 0)
@@ -881,7 +881,8 @@ unsigned _timer_run(void)
/* Rate limit how often this thread checks the timer pools. */
if (timer_global->inline_poll_interval > 1) {
- if (--timer_run_cnt)
+ timer_run_cnt -= dec;
+ if (timer_run_cnt > 0)
return 0;
timer_run_cnt = timer_global->inline_poll_interval;
}
commit 12c4ca508b07b8d2366b0c37bee5f866019e94c2
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Nov 13 15:08:02 2018 +0200
linux-gen: timer: add config option for inline timer poll frequency
Add configure option 'timer.inline_poll_interval' for adjusting inline
timer polling frequency.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf
index d123e773..9969860d 100644
--- a/config/odp-linux-generic.conf
+++ b/config/odp-linux-generic.conf
@@ -140,4 +140,11 @@ timer: {
#
# Set to 1 to enable
inline = 0
+
+ # Inline timer poll interval
+ #
+ # When set to 1 inline timers are polled during every schedule round.
+ # Increasing the value reduces timer processing overhead while
+ # decreasing accuracy. Ignored when inline timer is not enabled.
+ inline_poll_interval = 10
}
diff --git a/platform/linux-generic/include/odp_timer_internal.h b/platform/linux-generic/include/odp_timer_internal.h
index 02ba92e0..1f612448 100644
--- a/platform/linux-generic/include/odp_timer_internal.h
+++ b/platform/linux-generic/include/odp_timer_internal.h
@@ -21,9 +21,6 @@
#include <odp/api/timer.h>
#include <odp_global_data.h>
-/* Minimum number of scheduling rounds between checking timer pools. */
-#define CONFIG_TIMER_RUN_RATELIMIT_ROUNDS 1
-
/**
* Internal Timeout header
*/
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index fcda6e39..6307ae4f 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -219,6 +219,7 @@ typedef struct timer_global_t {
_odp_atomic_flag_t ODP_ALIGNED_CACHE locks[NUM_LOCKS];
#endif
odp_bool_t use_inline_timers;
+ int inline_poll_interval;
} timer_global_t;
static timer_global_t *timer_global;
@@ -871,8 +872,7 @@ static unsigned process_timer_pools(void)
unsigned _timer_run(void)
{
static __thread odp_time_t last_timer_run;
- static __thread unsigned timer_run_cnt =
- CONFIG_TIMER_RUN_RATELIMIT_ROUNDS;
+ static __thread unsigned timer_run_cnt = 1;
odp_time_t now;
if (timer_global->num_timer_pools == 0)
@@ -880,10 +880,10 @@ unsigned _timer_run(void)
/* Rate limit how often this thread checks the timer pools. */
- if (CONFIG_TIMER_RUN_RATELIMIT_ROUNDS > 1) {
+ if (timer_global->inline_poll_interval > 1) {
if (--timer_run_cnt)
return 0;
- timer_run_cnt = CONFIG_TIMER_RUN_RATELIMIT_ROUNDS;
+ timer_run_cnt = timer_global->inline_poll_interval;
}
now = odp_time_global();
@@ -1354,6 +1354,14 @@ int odp_timer_init_global(const odp_init_t *params)
}
timer_global->use_inline_timers = val;
+ conf_str = "timer.inline_poll_interval";
+ if (!_odp_libconfig_lookup_int(conf_str, &val)) {
+ ODP_ERR("Config option '%s' not found.\n", conf_str);
+ odp_shm_free(shm);
+ return -1;
+ }
+ timer_global->inline_poll_interval = val;
+
if (params && params->not_used.feat.timer)
timer_global->use_inline_timers = false;
commit 9ddeaaf7a3226ab03e57cc49775fd234b8d44a2b
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Nov 13 15:07:40 2018 +0200
travis: test inline timer implementation
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/.travis.yml b/.travis.yml
index 3510d380..d06530ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -154,6 +154,19 @@ jobs:
-e ODP_CONFIG_FILE=/odp/platform/linux-generic/test/process-mode.conf
-e ODPH_PROC_MODE=1
${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/check.sh
+ - stage: test
+ env: TEST=inline_timer
+ install:
+ - true
+ compiler: gcc
+ script:
+ - if [ -z "${DOCKER_NAMESPACE}" ] ; then export DOCKER_NAMESPACE="opendataplane"; fi
+ - docker run --privileged -i -t
+ -v `pwd`:/odp --shm-size 8g
+ -e CC="${CC}"
+ -e CONF=""
+ -e ODP_CONFIG_FILE=/odp/platform/linux-generic/test/inline-timer.conf
+ ${DOCKER_NAMESPACE}/travis-odp-lng-ubuntu_16.04 /odp/scripts/ci/check_inline_timer.sh
- stage: test
env: TEST=distcheck
compiler: gcc
diff --git a/platform/linux-generic/test/inline-timer.conf b/platform/linux-generic/test/inline-timer.conf
new file mode 100644
index 00000000..cc9f2037
--- /dev/null
+++ b/platform/linux-generic/test/inline-timer.conf
@@ -0,0 +1,8 @@
+# Mandatory fields
+odp_implementation = "linux-generic"
+config_file_version = "0.1.5"
+
+timer: {
+ # Enable inline timer implementation
+ inline = 1
+}
diff --git a/scripts/ci/check_inline_timer.sh b/scripts/ci/check_inline_timer.sh
new file mode 100755
index 00000000..d2eff714
--- /dev/null
+++ b/scripts/ci/check_inline_timer.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+
+"`dirname "$0"`"/build_x86_64.sh
+
+cd "$(dirname "$0")"/../..
+
+echo 1000 | tee /proc/sys/vm/nr_hugepages
+mkdir -p /mnt/huge
+mount -t hugetlbfs nodev /mnt/huge
+
+ODP_SCHEDULER=basic ./test/validation/api/timer/timer_main
+ODP_SCHEDULER=sp ./test/validation/api/timer/timer_main
+ODP_SCHEDULER=scalable ./test/validation/api/timer/timer_main
+
+umount /mnt/huge
commit 0dcbdecc871783b5669dc9cb8cf68b7f4d7ffb76
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Tue Nov 13 13:01:26 2018 +0200
linux-gen: timer: enable inline timer implementation using config file
Add configure option 'timer.inline' for enabling inline timer
implementation.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/config/odp-linux-generic.conf b/config/odp-linux-generic.conf
index 33938289..d123e773 100644
--- a/config/odp-linux-generic.conf
+++ b/config/odp-linux-generic.conf
@@ -16,7 +16,7 @@
# Mandatory fields
odp_implementation = "linux-generic"
-config_file_version = "0.1.4"
+config_file_version = "0.1.5"
# Shared memory options
shm: {
@@ -129,3 +129,15 @@ sched_basic: {
control = 1
}
}
+
+timer: {
+ # Use inline timer implementation
+ #
+ # By default, timer processing is done in background threads (thread per
+ # timer pool). With inline implementation timers are processed on worker
+ # cores instead. When using inline timers the application has to call
+ # odp_schedule() or odp_queue_deq() to actuate timer processing.
+ #
+ # Set to 1 to enable
+ inline = 0
+}
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index 84da5774..fcda6e39 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -55,6 +55,7 @@
#include <odp/api/time.h>
#include <odp/api/plat/time_inlines.h>
#include <odp/api/timer.h>
+#include <odp_libconfig_internal.h>
#include <odp_queue_if.h>
#include <odp_timer_internal.h>
#include <odp/api/plat/queue_inlines.h>
@@ -217,7 +218,7 @@ typedef struct timer_global_t {
/* Multiple locks per cache line! */
_odp_atomic_flag_t ODP_ALIGNED_CACHE locks[NUM_LOCKS];
#endif
-
+ odp_bool_t use_inline_timers;
} timer_global_t;
static timer_global_t *timer_global;
@@ -339,22 +340,8 @@ static odp_timer_pool_t timer_pool_new(const char *name,
odp_ticketlock_lock(&timer_global->lock);
timer_global->timer_pool[tp_idx] = tp;
- if (timer_global->num_timer_pools == 1) {
- odp_bool_t inline_tim;
-
- /*
- * Whether to run timer pool processing 'inline' (on worker
- * cores) or in background threads (thread-per-timerpool).
- *
- * If the application will use scheduler this flag is set to
- * true, otherwise false. This application conveys this
- * information via the 'not_used' bits in odp_init_t which are
- * passed to odp_global_init().
- */
- inline_tim = !odp_global_ro.init_param.not_used.feat.schedule;
-
- odp_global_rw->inline_timers = inline_tim;
- }
+ if (timer_global->num_timer_pools == 1)
+ odp_global_rw->inline_timers = timer_global->use_inline_timers;
odp_ticketlock_unlock(&timer_global->lock);
if (!odp_global_rw->inline_timers) {
@@ -1333,7 +1320,8 @@ void odp_timeout_free(odp_timeout_t tmo)
int odp_timer_init_global(const odp_init_t *params)
{
odp_shm_t shm;
- odp_bool_t inline_timers = false;
+ const char *conf_str;
+ int val = 0;
shm = odp_shm_reserve("_odp_timer", sizeof(timer_global_t),
ODP_CACHE_LINE_SIZE, 0);
@@ -1358,16 +1346,21 @@ int odp_timer_init_global(const odp_init_t *params)
#else
ODP_DBG("Using lock-less timer implementation\n");
#endif
+ conf_str = "timer.inline";
+ if (!_odp_libconfig_lookup_int(conf_str, &val)) {
+ ODP_ERR("Config option '%s' not found.\n", conf_str);
+ odp_shm_free(shm);
+ return -1;
+ }
+ timer_global->use_inline_timers = val;
- if (params)
- inline_timers =
- !params->not_used.feat.schedule &&
- !params->not_used.feat.timer;
+ if (params && params->not_used.feat.timer)
+ timer_global->use_inline_timers = false;
timer_global->time_per_ratelimit_period =
odp_time_global_from_ns(timer_global->min_res_ns / 2);
- if (!inline_timers) {
+ if (!timer_global->use_inline_timers) {
timer_res_init();
block_sigalarm();
}
diff --git a/platform/linux-generic/test/process-mode.conf b/platform/linux-generic/test/process-mode.conf
index a86562f6..e3e6b55b 100644
--- a/platform/linux-generic/test/process-mode.conf
+++ b/platform/linux-generic/test/process-mode.conf
@@ -1,6 +1,6 @@
# Mandatory fields
odp_implementation = "linux-generic"
-config_file_version = "0.1.4"
+config_file_version = "0.1.5"
# Shared memory options
shm: {
commit d89f772686dba6b331515be41aeefe345a207575
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Thu Nov 15 17:18:22 2018 +0200
linux-gen: timer: zero timer pool memory on reserve
Fixes timer thread failing due to uninitialized variables.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index a2261755..84da5774 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -260,6 +260,7 @@ static odp_timer_pool_t timer_pool_new(const char *name,
{
uint32_t i, tp_idx;
size_t sz0, sz1, sz2;
+ uint64_t tp_size;
uint32_t flags = ODP_SHM_SW_ONLY;
if (odp_global_ro.shm_single_va)
@@ -289,12 +290,17 @@ static odp_timer_pool_t timer_pool_new(const char *name,
sz1 = ROUNDUP_CACHE_LINE(sizeof(tick_buf_t) * param->num_timers);
sz2 = ROUNDUP_CACHE_LINE(sizeof(_odp_timer_t) *
param->num_timers);
- odp_shm_t shm = odp_shm_reserve(name, sz0 + sz1 + sz2,
- ODP_CACHE_LINE_SIZE, flags);
+ tp_size = sz0 + sz1 + sz2;
+
+ odp_shm_t shm = odp_shm_reserve(name, tp_size, ODP_CACHE_LINE_SIZE,
+ flags);
if (odp_unlikely(shm == ODP_SHM_INVALID))
ODP_ABORT("%s: timer pool shm-alloc(%zuKB) failed\n",
name, (sz0 + sz1 + sz2) / 1024);
timer_pool_t *tp = (timer_pool_t *)odp_shm_addr(shm);
+
+ memset(tp, 0, tp_size);
+
tp->prev_scan = odp_time_global();
tp->time_per_tick = odp_time_global_from_ns(param->res_ns);
odp_atomic_init_u64(&tp->cur_tick, 0);
commit 132dff6387e441c7019a8366c681941ee6173452
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Fri Nov 16 10:18:09 2018 +0200
linux-gen: init: always initialize odp_global_ro.init_param
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
index 0f7e0df2..132ada03 100644
--- a/platform/linux-generic/odp_init.c
+++ b/platform/linux-generic/odp_init.c
@@ -267,6 +267,7 @@ int odp_init_global(odp_instance_t *instance,
odp_global_ro.log_fn = odp_override_log;
odp_global_ro.abort_fn = odp_override_abort;
+ odp_init_param_init(&odp_global_ro.init_param);
if (params != NULL) {
odp_global_ro.init_param = *params;
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 13 ++++
config/odp-linux-generic.conf | 26 +++++++-
.../linux-generic/include/odp_timer_internal.h | 11 ++--
platform/linux-generic/odp_init.c | 1 +
platform/linux-generic/odp_ishm.c | 30 ++++++----
platform/linux-generic/odp_queue_basic.c | 19 +++---
platform/linux-generic/odp_queue_scalable.c | 16 ++---
platform/linux-generic/odp_schedule_basic.c | 7 ++-
platform/linux-generic/odp_schedule_scalable.c | 2 +-
platform/linux-generic/odp_schedule_sp.c | 6 +-
platform/linux-generic/odp_timer.c | 70 ++++++++++++----------
platform/linux-generic/test/inline-timer.conf | 8 +++
platform/linux-generic/test/process-mode.conf | 2 +-
scripts/ci/{check.sh => check_inline_timer.sh} | 7 +--
14 files changed, 142 insertions(+), 76 deletions(-)
create mode 100644 platform/linux-generic/test/inline-timer.conf
copy scripts/ci/{check.sh => check_inline_timer.sh} (51%)
hooks/post-receive
--
7 years, 9 months
- 1
- 0
[COMMIT] branch master updated. v1.19.0.2_tigermoth-248-gfd383ebb
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 fd383ebb6ea70350c28227d0b133c4e9c7075997 (commit)
via a78ae2b646fa194a3e148c8577e5c4d4857002da (commit)
via c3e8fb83ed8b5d9017c4fc72ac8ad03bea04b753 (commit)
from 1c1118ee10c209bac716f9368bbbbd47a74b62ef (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 fd383ebb6ea70350c28227d0b133c4e9c7075997
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Wed Nov 14 09:53:54 2018 +0200
linux-gen: build: enable CPU arch specific optimization
When not building in ABI compatible mode, enable compiler
optimizations for the CPU architecture of the local machine.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/configure.ac b/configure.ac
index 68da20df..6715a7ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,6 +200,7 @@ AC_ARG_ENABLE([abi-compat],
abi_compat=no
#if there is no ABI compatibility the .so numbers are meaningless
ODP_LIBSO_VERSION=0:0:0
+ ODP_CHECK_CFLAG([-march=native])
fi])
AM_CONDITIONAL(ODP_ABI_COMPAT, [test "x$ODP_ABI_COMPAT" = "x1"])
commit a78ae2b646fa194a3e148c8577e5c4d4857002da
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Wed Nov 14 14:39:21 2018 +0200
linux-gen: arm atomic: fix register numbering with casp
ARMv8.1 specific casp() function failed to build due to
register numbering issues. CASP instructions require that the
first register of a pair is even. Force register numbering
to start from even numbers (x0 and x2).
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/arch/aarch64/odp_atomic.h b/platform/linux-generic/arch/aarch64/odp_atomic.h
index 8b6c3aec..8a0e7ce2 100644
--- a/platform/linux-generic/arch/aarch64/odp_atomic.h
+++ b/platform/linux-generic/arch/aarch64/odp_atomic.h
@@ -108,32 +108,45 @@ static inline __int128 __lockfree_fetch_or_16(__int128 *var, __int128 mask,
#else
-static inline __int128 casp(__int128 *var, __int128 old, __int128 neu, int mo)
+static inline __int128_t cas_u128(__int128_t *ptr, __int128_t old_val,
+ __int128_t new_val, int mo)
{
+ /* CASP instructions require that the first register number is paired */
+ register uint64_t old0 __asm__ ("x0");
+ register uint64_t old1 __asm__ ("x1");
+ register uint64_t new0 __asm__ ("x2");
+ register uint64_t new1 __asm__ ("x3");
+
+ old0 = (uint64_t)old_val;
+ old1 = (uint64_t)(old_val >> 64);
+ new0 = (uint64_t)new_val;
+ new1 = (uint64_t)(new_val >> 64);
+
if (mo == __ATOMIC_RELAXED) {
- __asm__ volatile("casp %0, %H0, %1, %H1, [%2]"
- : "+r" (old)
- : "r" (neu), "r" (var)
+ __asm__ volatile("casp %[old0], %[old1], %[new0], %[new1], [%[ptr]]"
+ : [old0] "+r" (old0), [old1] "+r" (old1)
+ : [new0] "r" (new0), [new1] "r" (new1), [ptr] "r" (ptr)
: "memory");
} else if (mo == __ATOMIC_ACQUIRE) {
- __asm__ volatile("caspa %0, %H0, %1, %H1, [%2]"
- : "+r" (old)
- : "r" (neu), "r" (var)
+ __asm__ volatile("caspa %[old0], %[old1], %[new0], %[new1], [%[ptr]]"
+ : [old0] "+r" (old0), [old1] "+r" (old1)
+ : [new0] "r" (new0), [new1] "r" (new1), [ptr] "r" (ptr)
: "memory");
} else if (mo == __ATOMIC_ACQ_REL) {
- __asm__ volatile("caspal %0, %H0, %1, %H1, [%2]"
- : "+r" (old)
- : "r" (neu), "r" (var)
+ __asm__ volatile("caspal %[old0], %[old1], %[new0], %[new1], [%[ptr]]"
+ : [old0] "+r" (old0), [old1] "+r" (old1)
+ : [new0] "r" (new0), [new1] "r" (new1), [ptr] "r" (ptr)
: "memory");
} else if (mo == __ATOMIC_RELEASE) {
- __asm__ volatile("caspl %0, %H0, %1, %H1, [%2]"
- : "+r" (old)
- : "r" (neu), "r" (var)
+ __asm__ volatile("caspl %[old0], %[old1], %[new0], %[new1], [%[ptr]]"
+ : [old0] "+r" (old0), [old1] "+r" (old1)
+ : [new0] "r" (new0), [new1] "r" (new1), [ptr] "r" (ptr)
: "memory");
} else {
abort();
}
- return old;
+
+ return ((__int128)old0) | (((__int128)old1) << 64);
}
static inline bool
@@ -147,7 +160,7 @@ __lockfree_compare_exchange_16(register __int128 *var, __int128 *exp,
__int128 expected;
expected = *exp;
- old = casp(var, expected, neu, mo_success);
+ old = cas_u128(var, expected, neu, mo_success);
*exp = old; /* Always update, atomically read value */
return old == expected;
}
@@ -160,7 +173,7 @@ static inline __int128 __lockfree_exchange_16(__int128 *var, __int128 neu,
do {
expected = *var;
- old = casp(var, expected, neu, mo);
+ old = cas_u128(var, expected, neu, mo);
} while (old != expected);
return old;
}
@@ -173,7 +186,7 @@ static inline __int128 __lockfree_fetch_and_16(__int128 *var, __int128 mask,
do {
expected = *var;
- old = casp(var, expected, expected & mask, mo);
+ old = cas_u128(var, expected, expected & mask, mo);
} while (old != expected);
return old;
}
@@ -186,7 +199,7 @@ static inline __int128 __lockfree_fetch_or_16(__int128 *var, __int128 mask,
do {
expected = *var;
- old = casp(var, expected, expected | mask, mo);
+ old = cas_u128(var, expected, expected | mask, mo);
} while (old != expected);
return old;
}
commit c3e8fb83ed8b5d9017c4fc72ac8ad03bea04b753
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Tue Nov 13 16:44:07 2018 +0200
linux-gen: sysinfo: print out ARM build time features
Print out feature flags that were used in build time. The
output may be used to check e.g. if binary was built with
ARMv8.0 or >= ARMv8.1 instructions.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c b/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c
index bcdc2373..3a1486dd 100644
--- a/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c
@@ -201,6 +201,76 @@ int cpuinfo_parser(FILE *file, system_info_t *sysinfo)
void sys_info_print_arch(void)
{
+ const char *ndef = "n/a";
+
+ /* Avoid compiler warning about unused variable */
+ (void)ndef;
+
+ /* See ARM C Language Extensions documentation for details */
+ printf("ARM FEATURES:\n");
+
+ printf(" __ARM_ARCH ");
+#ifdef __ARM_ARCH
+ printf("%i\n", __ARM_ARCH);
+#else
+ printf("%s\n", ndef);
+#endif
+
+ printf(" __ARM_ARCH_ISA_A64 ");
+#ifdef __ARM_ARCH_ISA_A64
+ printf("%i\n", __ARM_ARCH_ISA_A64);
+#else
+ printf("%s\n", ndef);
+#endif
+
+#if defined(__ARM_ARCH) && __ARM_ARCH >= 8
+ /* Actually, this checks for new NEON instructions in
+ * v8.1, but is currently the only way to distinguish
+ * v8.0 and >=v8.1. */
+ printf(" ARMv8 ISA version ");
+#ifdef __ARM_FEATURE_QRDMX
+ printf("v8.1 or higher\n");
+#else
+ printf("v8.0\n");
+#endif
+#endif
+
+#ifdef __ARM_FEATURE_QRDMX
+ /* Actually, this checks for new NEON instructions in
+ * v8.1, but is currently the only way to distinguish
+ * v8.0 and >=v8.1. */
+ printf(" ARMv8.1 instructions\n");
+#endif
+
+ printf(" __ARM_NEON ");
+#ifdef __ARM_NEON
+ printf("%i\n", __ARM_NEON);
+#else
+ printf("%s\n", ndef);
+#endif
+
+ printf(" __ARM_FEATURE_IDIV ");
+#ifdef __ARM_FEATURE_IDIV
+ printf("%i\n", __ARM_FEATURE_IDIV);
+#else
+ printf("%s\n", ndef);
+#endif
+
+ printf(" __ARM_FEATURE_CRYPTO ");
+#ifdef __ARM_FEATURE_CRYPTO
+ printf("%i\n", __ARM_FEATURE_CRYPTO);
+#else
+ printf("%s\n", ndef);
+#endif
+
+ printf(" __ARM_FEATURE_CRC32 ");
+#ifdef __ARM_FEATURE_CRC32
+ printf("%i\n", __ARM_FEATURE_CRC32);
+#else
+ printf("%s\n", ndef);
+#endif
+
+ printf("\n");
}
uint64_t odp_cpu_arch_hz_current(int id)
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 1 +
platform/linux-generic/arch/aarch64/odp_atomic.h | 49 +++++++++------
.../linux-generic/arch/aarch64/odp_sysinfo_parse.c | 70 ++++++++++++++++++++++
3 files changed, 102 insertions(+), 18 deletions(-)
hooks/post-receive
--
7 years, 9 months
- 1
- 0