Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/30734/?format=api
{ "id": 30734, "url": "https://patches.dpdk.org/api/patches/30734/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1508780456-27837-1-git-send-email-pbhagavatula@caviumnetworks.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1508780456-27837-1-git-send-email-pbhagavatula@caviumnetworks.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1508780456-27837-1-git-send-email-pbhagavatula@caviumnetworks.com", "date": "2017-10-23T17:40:54", "name": "[dpdk-dev,v3,1/3] evendev: fix inconsistency in event queue config", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "8399417def25e9d232c920b73c071aee0b459d5a", "submitter": { "id": 768, "url": "https://patches.dpdk.org/api/people/768/?format=api", "name": "Pavan Nikhilesh", "email": "pbhagavatula@caviumnetworks.com" }, "delegate": { "id": 310, "url": "https://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1508780456-27837-1-git-send-email-pbhagavatula@caviumnetworks.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/30734/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/30734/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 051971B6A7;\n\tMon, 23 Oct 2017 19:41:24 +0200 (CEST)", "from NAM01-BY2-obe.outbound.protection.outlook.com\n\t(mail-by2nam01on0046.outbound.protection.outlook.com [104.47.34.46])\n\tby dpdk.org (Postfix) with ESMTP id D24461B6A6\n\tfor <dev@dpdk.org>; Mon, 23 Oct 2017 19:41:21 +0200 (CEST)", "from localhost.localdomain (103.16.71.47) by\n\tMWHPR07MB3471.namprd07.prod.outlook.com (10.164.192.22) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id\n\t15.20.156.4; Mon, 23 Oct 2017 17:41:17 +0000" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com;\n\th=From:Date:Subject:Message-ID:Content-Type:MIME-Version;\n\tbh=ZXBTRnYbSEpCTJYjFiWo5/WzLHFtGgdVaMhSR2EIGS4=;\n\tb=hBB2N4C2cI6JL2vzO93p2nr2croDzJFmy2OJeeKqJ1qWUpL0q2/5CfUv3p5qctcY1hRBUjO75hF9KuUEgD1W2EMjY7S71z8aGT7//oSAhr1wp12sdovogZG45QNTpawSOr6UfAxcDloErGngwppz1bTOL2uuKj4IPm9/IUuSgIs=", "Authentication-Results": "spf=none (sender IP is )\n\tsmtp.mailfrom=Pavan.Bhagavatula@cavium.com; ", "From": "Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>", "To": "harry.van.haaren@intel.com, hemant.agrawal@nxp.com,\n\tjerin.jacob@caviumnetworks.com", "Cc": "dev@dpdk.org,\n\tPavan Bhagavatula <pbhagavatula@caviumnetworks.com>", "Date": "Mon, 23 Oct 2017 23:10:54 +0530", "Message-Id": "<1508780456-27837-1-git-send-email-pbhagavatula@caviumnetworks.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1507814147-8223-1-git-send-email-pbhagavatula@caviumnetworks.com>", "References": "<1507814147-8223-1-git-send-email-pbhagavatula@caviumnetworks.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[103.16.71.47]", "X-ClientProxiedBy": "HK2PR04CA0048.apcprd04.prod.outlook.com (10.170.154.16) To\n\tMWHPR07MB3471.namprd07.prod.outlook.com (10.164.192.22)", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "6eb342ca-1687-447b-2051-08d51a3d44fa", "X-Microsoft-Antispam": "UriScan:; BCL:0; PCL:0;\n\tRULEID:(22001)(4534020)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603199);\n\tSRVR:MWHPR07MB3471; ", "X-Microsoft-Exchange-Diagnostics": [ "1; MWHPR07MB3471;\n\t3:vGKs8q6wKrQ6hD+Pm8uyS3rIKN/Pp1sjLZMnPnfCD2nHFs3Q5ftZrTYYJZDDg9ZIsGCOGs+Q9ovHT+dGERS3JcSEyB2QYpgVSA+EAy4MttGNTktsARkwfL4d8f0dMgPzqcjAQJbeBI+DovK56UwoRzrmvGr5uGvLEcoDE7m3417LlacJsRkJHbMOvaJD5JjX4HDfokZMFc0KlmOIvorsUfvtEMyyg2efC0yughMf9lo8TcEwARAzMh1A56TzvNq1;\n\t25:EwA0ZkomsJMoEVIBETdYinrEMNyVmNDeuieroVu6JvIxeCg67vLpaj4z8JVdlByCBSYEP28AtVogkzjqm/V0AYQFpTgO0ck+cNTAAidGgWEKufoVxHDj/3xkSmkwik88Danz8doiXFAynj96CnGOX2zTSEYMjMJEdAy9E5LJZaY1tzUeDlXBduFF7XQ2zQZsttwieBf0k0dFO22GkrRpqzGjwucnRYhyb6h30YRAXurRMVXKTkxz0FB7sfiKTPaGNVVb7noO/ylit/17QCZ1JmDVQhrtKCsTogeGMdAPBFML9VUyHDKKKGdrS6N08K1VfjEA69wekxzDD8zBaXOdyw==;\n\t31:uowh05zrF9ymCSm71K5fxDyVlEVkfy1gweTkJ7N8rGTyH89FZEpKeM4GWg74U9EO+9TcUCU3pmg79ZbPst7/l+iyKUWjXPF39/PpRa1s93WI/j4f4BUQGvq6SSg6gatJHUPck5Kd300ZueYxKaFpp9yJTKMZ8ixPv261rah76kydC1pCgG8ffgNEfn7TvdPwjhdU8S9SIpKkz0FhaCEuiEfE7wMH8eKM+UV/wcntqNI=", "1; MWHPR07MB3471;\n\t20:zO/HTOfVd4aWeHaXcq1MlNI69hJeBEvisYZWuAtkghorWvQTmn4ef2RpjHFNXS7RZIVhzQks1xXIo0+1660fuVpfgMHxt582cnkac3gZyYni9zC87JoAxNqhkYuazlGGJc+za2PpsNYST0FN9Of22VF3D/TN8RTmS2F39b3A82ZqtKWyHYRMaTPCLeniZxPafNhwLgLroro4fUky3Ne/LnDLT3ROBntho0HhhpzyCEX+uvqN/1wYz4ZZs9r9GDWDevpsz3rQZ7o2yT/vvmEiU8jJmRr5G9HKzUCY4KDAGkcJLLvciPWCZAQ9SqjQlGfOCTH6d6A5QCS4w9q/H8+fUoPX+ZDwNhg7no+0HDMcoKIdqQZcGx7GReuASXJKYSRefnH1aNpM2Yo0Z+DTOdnRaQzYWTGFuOuVZ2uP2WzyumdM1ghK26tMrRceRlppof1SitAZ7jWUe5dM+j1hfFpCOrRDKIIk717oq+XLbYRlh6ObjQH/5d/yKsYIKHeDzPb6Zsod6mW46AxbXONcIuTzYs4to5SSVj23FcaoNhQDSHgRjfeKQR5nbnaG8izo3EYP67g9I+BP3gH04Oico6q5k932WwDD8zPxZJUGYfB2ckY=;\n\t4:RzbpPUZ84oIxnCXYuJYwferf2BudlLiiLMHQkQ8CxxcuJM1ocFJE/+OYiWsza91WEeWLMElNCq2KIqdceqA1o9WV+vpQgf6s/JGTrJ+GY7cGURT2fFGWPO3Pg33FKyrWy2UwkgUfSizHSEHdRWg9PRTLxk9GqmkksGzSx/SWbyRhfIOH2QHYCqG+dDaa6dD8Gk8LMed3Wec81d2F5U30qbZQvHZpN+0T84MOQ6X/UbhB3iRB6Hjv7mGymQZjlUqd", "=?us-ascii?Q?1; MWHPR07MB3471;\n\t23:tZgDHhI5ftDa5wKzx0bmKGY6DLDqvlXp7YumuEC6v?=\n\t1QuzOu1qeGFhaPM4sWJ7vaPWl18eI2EHWT3YIrzMY4bmQzLciHMi8NZqWPWlQrelrXt3nCGOb2YxSngTM6ZHkQcbxHh5LKyXjpMVTgtY3QJBeZ0JlQy0FVIXbbutSHSdBVQCTs0y/pR6U3M58scqjTleexTE7uGN98jUhKYTU+wvfBlgrl35eWTRSRUC6+LhCXWgDlllz6pn+cG0EF7hr1Z90s67xRkmjfTZ0Y2ONLQZhmVG7q0FTalTrg1Q26NPgndytVX8OklIHY7CIWVzs+yjPYRxUL2AAYmtsn4hw6GoIIlbdlVKgii7n/R89tCwV+tGvhUCCM9vFFO5hkyC0R56YD8FtB3qt2AxOJlclWSHM010BV7bq0W1+6Kp+p988/4AWE63+sfn8uzhzLUOXJYh7xMH7svYYdNRlNuGpkBwjHpM62Op7U6aiCwGMjt6Yb0NvEGyh3RQ8ES0siGVfsMKrDoJ2cKVqsC5s9veMobNLwqKFeV0A8aWGY+0H1ROmtGFqPMOkTsM/h3+lain8n/xqanAwcoqYP65cD2MLSA0HNbWiUTtqZ+YR3woEJoiOlI0oqXY8HHld7nVUbHazQapK8NsH/QxHrvL9a7s2RpO8RDbTIfYxxPdrc+R64ynfPEig7xBg0XMP74LBfqk0zllmIKHS4Ix3j+T33hTgfe4zzBvhWb+k1Nm3BvWoyApsEFWtPO37NXCB3uXZZmxMUFZxLIA8kOFNFhFRUkdFqB4jAtx+JgyBzowhQzHHXdYGj1LIgYSEwcUknA8etVE9A/eEqS9JtN0aB1eNVS92igxUe4h2l7rxfhT7cSl2YXsYnRERSU5tE/L73SGiowRIaHJR0x50SMgEYy4E4V73rHyhfFMqdhgN6ZGDtgX0meODkuQl/PrboL89dVQgSXJ0hMZesT1paHmDO7DrafA/IxlKYNUFddT2tBNGRXLKYS+gvuALLGfNMX2pH+35wB+MyfC2/DLa/2NDkEaySvlXqRiUG8UDupBFEdydwxZjnHW2Z5h2Um1cyXksQqURHy6QWepmfERGQmtoAdzT2T8RqibQf5RGto9Uez/5qQEy8VMlvIWJoCeftJkjCle7WLfDzcIvTUW63wLa6xejnkhoadQmuGCztYEwt2aRGPAtRw0pk=", "1; MWHPR07MB3471;\n\t6:DiW9Q9Dvfh0BWoYR3fwCjUO9VKpByT0ec8aSPA9Iu+H4QQB65nJyIbGQubvomofTQgzA4+IDiJiKv9ZKWgD6OgAVSGFpsiHV/m2zf8K505mPNBOR3SDmDQd2WxEnbWdmW18sn0LOH43wnnZYKpnzVLs85PBao6ADALDPJaQK4DrT8qb8saYEXWQIahIuDCyXQTrW14d23qBYYoV8h1orWfi2G051FWqEvnvWbnF6RrkDvQqv/+n4m7Gvmw6B2Ic3wV57rXuWaVlVY4qZ+72lBpbuthSA92/Q2vv/eZjrHJe4FB7Bcr4tGlvZ5zdBmqN8Lch639YG1jrBCxTL6pHw9g==;\n\t5:WQcNQob5l4v3Xcu+ld1NzIqokB2oteJjJtwGymtdmy58/gVofzRY5z9DgAz1goe+Q2XMexYil/nPY7gJEs6TVSokXeBTNFaeBiUX6hqchBaHuqOfRuR0MGmQxIS3Yb/0c2efMYWcbPomNtKZT9dvHA==;\n\t24:QC/EFnabVQJVXhJxqI7X2a6MWvsIYDoFMM+KDqcI13RuWW7oY1Ob4/8ASM6DPgbYASqm+WejTYgOh5Be+HcpbN5fay45sNFaCYALT0DXURg=;\n\t7:LgZB8eetzus2kiv2L1wnzuRi1QGZXbIPMuLse6GW7ju6DYz3f0ZerSP8Ei4jCnC0c9qT2Ub7tbdn086OOwyUjbCWufIOlcYi87q7ZGe59qXORXE2ixaqTsZhdGBPJE3bzxj0gY4PgTlaj2LUBOKAK75nPcg1E4M4ZJwjNqK7N+1XuAKYaKsqPCoSIJSeIMtYYDf6d8IvD1bGMAqshZNm6yJQ84XF34UYuALnZNF7k0g=" ], "X-MS-TrafficTypeDiagnostic": "MWHPR07MB3471:", "X-Exchange-Antispam-Report-Test": "UriScan:;", "X-Microsoft-Antispam-PRVS": "<MWHPR07MB347172EB188CFACC82BCF6A380460@MWHPR07MB3471.namprd07.prod.outlook.com>", "X-Exchange-Antispam-Report-CFA-Test": "BCL:0; PCL:0;\n\tRULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(100000703101)(100105400095)(10201501046)(3002001)(3231020)(6041248)(20161123564025)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);\n\tSRVR:MWHPR07MB3471; BCL:0; PCL:0;\n\tRULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);\n\tSRVR:MWHPR07MB3471; ", "X-Forefront-PRVS": "046985391D", "X-Forefront-Antispam-Report": "SFV:NSPM;\n\tSFS:(10009020)(6009001)(6069001)(346002)(376002)(199003)(189002)(8656005)(8656005)(6666003)(2950100002)(42882006)(6636002)(101416001)(47776003)(68736007)(106356001)(5660300001)(33646002)(105586002)(6116002)(16526018)(189998001)(6486002)(107886003)(97736004)(6506006)(3846002)(5003940100001)(4326008)(6512007)(53936002)(7736002)(305945005)(36756003)(8676002)(2906002)(66066001)(81166006)(81156014)(8936002)(76176999)(50226002)(50986999)(50466002)(478600001)(25786009)(16586007)(316002)(48376002)(72206003)(42262002);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR07MB3471; H:localhost.localdomain;\n\tFPR:; \n\tSPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; ", "Received-SPF": "None (protection.outlook.com: cavium.com does not designate\n\tpermitted sender hosts)", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-OriginatorOrg": "caviumnetworks.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "23 Oct 2017 17:41:17.9894\n\t(UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "6eb342ca-1687-447b-2051-08d51a3d44fa", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "711e4ccf-2e9b-4bcf-a551-4094005b6194", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MWHPR07MB3471", "Subject": "[dpdk-dev] [PATCH v3 1/3] evendev: fix inconsistency in event queue\n\tconfig", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Pavan Bhagavatula <pbhagavatula@caviumnetworks.com>\n\nWith the current scheme of event queue configuration the cfg schedule\ntype macros (RTE_EVENT_QUEUE_CFG_*_ONLY) are inconsistent with the\nevent schedule type (RTE_SCHED_TYPE_*) this requires unnecessary\nconversion between the fastpath and slowpath API's while scheduling\nevents or configuring event queues.\n\nThis patch aims to fix such inconsistency by using event schedule\ntypes (RTE_SCHED_TYPE_*) for event queue configuration.\n\nThis patch also fixes example/eventdev_pipeline_sw_pmd as it doesn't\nconvert RTE_EVENT_QUEUE_CFG_*_ONLY to RTE_SCHED_TYPE_* which leads to\nimproper events being enqueued to the eventdev.\n\nFixes: adb5d5486c39 (\"examples/eventdev_pipeline_sw_pmd: add sample app\")\n\nSigned-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>\n---\n\n v3 changes:\n - fix app/test_perf_queue using invalid queue configuration i.e. setting\n schedule type in event_queue_cfg instead of schedule_type.\n\n app/test-eventdev/evt_common.h | 21 -------------\n app/test-eventdev/test_order_queue.c | 4 +--\n app/test-eventdev/test_perf_queue.c | 4 +--\n drivers/event/dpaa2/dpaa2_eventdev.c | 4 +--\n drivers/event/sw/sw_evdev.c | 28 +++++------------\n examples/eventdev_pipeline_sw_pmd/main.c | 18 +++++------\n lib/librte_eventdev/rte_eventdev.c | 20 +++++-------\n lib/librte_eventdev/rte_eventdev.h | 54 ++++++++++----------------------\n test/test/test_eventdev.c | 12 +++----\n test/test/test_eventdev_sw.c | 16 +++++-----\n 10 files changed, 60 insertions(+), 121 deletions(-)\n\n--\n2.7.4", "diff": "diff --git a/app/test-eventdev/evt_common.h b/app/test-eventdev/evt_common.h\nindex 4102076..ee896a2 100644\n--- a/app/test-eventdev/evt_common.h\n+++ b/app/test-eventdev/evt_common.h\n@@ -92,25 +92,4 @@ evt_has_all_types_queue(uint8_t dev_id)\n \t\t\ttrue : false;\n }\n\n-static inline uint32_t\n-evt_sched_type2queue_cfg(uint8_t sched_type)\n-{\n-\tuint32_t ret;\n-\n-\tswitch (sched_type) {\n-\tcase RTE_SCHED_TYPE_ATOMIC:\n-\t\tret = RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY;\n-\t\tbreak;\n-\tcase RTE_SCHED_TYPE_ORDERED:\n-\t\tret = RTE_EVENT_QUEUE_CFG_ORDERED_ONLY;\n-\t\tbreak;\n-\tcase RTE_SCHED_TYPE_PARALLEL:\n-\t\tret = RTE_EVENT_QUEUE_CFG_PARALLEL_ONLY;\n-\t\tbreak;\n-\tdefault:\n-\t\trte_panic(\"Invalid sched_type %d\\n\", sched_type);\n-\t}\n-\treturn ret;\n-}\n-\n #endif /* _EVT_COMMON_*/\ndiff --git a/app/test-eventdev/test_order_queue.c b/app/test-eventdev/test_order_queue.c\nindex beadd9c..1fa4082 100644\n--- a/app/test-eventdev/test_order_queue.c\n+++ b/app/test-eventdev/test_order_queue.c\n@@ -164,7 +164,7 @@ order_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt)\n \t/* q0 (ordered queue) configuration */\n \tstruct rte_event_queue_conf q0_ordered_conf = {\n \t\t\t.priority = RTE_EVENT_DEV_PRIORITY_NORMAL,\n-\t\t\t.event_queue_cfg = RTE_EVENT_QUEUE_CFG_ORDERED_ONLY,\n+\t\t\t.schedule_type = RTE_SCHED_TYPE_ORDERED,\n \t\t\t.nb_atomic_flows = opt->nb_flows,\n \t\t\t.nb_atomic_order_sequences = opt->nb_flows,\n \t};\n@@ -177,7 +177,7 @@ order_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt)\n \t/* q1 (atomic queue) configuration */\n \tstruct rte_event_queue_conf q1_atomic_conf = {\n \t\t\t.priority = RTE_EVENT_DEV_PRIORITY_NORMAL,\n-\t\t\t.event_queue_cfg = RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY,\n+\t\t\t.schedule_type = RTE_SCHED_TYPE_ATOMIC,\n \t\t\t.nb_atomic_flows = opt->nb_flows,\n \t\t\t.nb_atomic_order_sequences = opt->nb_flows,\n \t};\ndiff --git a/app/test-eventdev/test_perf_queue.c b/app/test-eventdev/test_perf_queue.c\nindex 658c08a..a7a2b1f 100644\n--- a/app/test-eventdev/test_perf_queue.c\n+++ b/app/test-eventdev/test_perf_queue.c\n@@ -205,8 +205,8 @@ perf_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt)\n \t};\n \t/* queue configurations */\n \tfor (queue = 0; queue < perf_queue_nb_event_queues(opt); queue++) {\n-\t\tq_conf.event_queue_cfg = evt_sched_type2queue_cfg\n-\t\t\t\t(opt->sched_type_list[queue % nb_stages]);\n+\t\tq_conf.schedule_type =\n+\t\t\t(opt->sched_type_list[queue % nb_stages]);\n\n \t\tif (opt->q_priority) {\n \t\t\tuint8_t stage_pos = queue % nb_stages;\ndiff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c\nindex 81286a8..3dbc337 100644\n--- a/drivers/event/dpaa2/dpaa2_eventdev.c\n+++ b/drivers/event/dpaa2/dpaa2_eventdev.c\n@@ -378,8 +378,8 @@ dpaa2_eventdev_queue_def_conf(struct rte_eventdev *dev, uint8_t queue_id,\n \tRTE_SET_USED(queue_conf);\n\n \tqueue_conf->nb_atomic_flows = DPAA2_EVENT_QUEUE_ATOMIC_FLOWS;\n-\tqueue_conf->event_queue_cfg = RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY |\n-\t\t\t\t RTE_EVENT_QUEUE_CFG_PARALLEL_ONLY;\n+\tqueue_conf->schedule_type = RTE_SCHED_TYPE_ATOMIC |\n+\t\t\t\t RTE_SCHED_TYPE_PARALLEL;\n \tqueue_conf->priority = RTE_EVENT_DEV_PRIORITY_NORMAL;\n }\n\ndiff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c\nindex aed8b72..522cd71 100644\n--- a/drivers/event/sw/sw_evdev.c\n+++ b/drivers/event/sw/sw_evdev.c\n@@ -345,28 +345,14 @@ sw_queue_setup(struct rte_eventdev *dev, uint8_t queue_id,\n {\n \tint type;\n\n-\t/* SINGLE_LINK can be OR-ed with other types, so handle first */\n+\ttype = conf->schedule_type;\n+\n \tif (RTE_EVENT_QUEUE_CFG_SINGLE_LINK & conf->event_queue_cfg) {\n \t\ttype = SW_SCHED_TYPE_DIRECT;\n-\t} else {\n-\t\tswitch (conf->event_queue_cfg) {\n-\t\tcase RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY:\n-\t\t\ttype = RTE_SCHED_TYPE_ATOMIC;\n-\t\t\tbreak;\n-\t\tcase RTE_EVENT_QUEUE_CFG_ORDERED_ONLY:\n-\t\t\ttype = RTE_SCHED_TYPE_ORDERED;\n-\t\t\tbreak;\n-\t\tcase RTE_EVENT_QUEUE_CFG_PARALLEL_ONLY:\n-\t\t\ttype = RTE_SCHED_TYPE_PARALLEL;\n-\t\t\tbreak;\n-\t\tcase RTE_EVENT_QUEUE_CFG_ALL_TYPES:\n-\t\t\tSW_LOG_ERR(\"QUEUE_CFG_ALL_TYPES not supported\\n\");\n-\t\t\treturn -ENOTSUP;\n-\t\tdefault:\n-\t\t\tSW_LOG_ERR(\"Unknown queue type %d requested\\n\",\n-\t\t\t\t conf->event_queue_cfg);\n-\t\t\treturn -EINVAL;\n-\t\t}\n+\t} else if (RTE_EVENT_QUEUE_CFG_ALL_TYPES\n+\t\t\t& conf->event_queue_cfg) {\n+\t\tSW_LOG_ERR(\"QUEUE_CFG_ALL_TYPES not supported\\n\");\n+\t\treturn -ENOTSUP;\n \t}\n\n \tstruct sw_evdev *sw = sw_pmd_priv(dev);\n@@ -400,7 +386,7 @@ sw_queue_def_conf(struct rte_eventdev *dev, uint8_t queue_id,\n \tstatic const struct rte_event_queue_conf default_conf = {\n \t\t.nb_atomic_flows = 4096,\n \t\t.nb_atomic_order_sequences = 1,\n-\t\t.event_queue_cfg = RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY,\n+\t\t.schedule_type = RTE_SCHED_TYPE_ATOMIC,\n \t\t.priority = RTE_EVENT_DEV_PRIORITY_NORMAL,\n \t};\n\ndiff --git a/examples/eventdev_pipeline_sw_pmd/main.c b/examples/eventdev_pipeline_sw_pmd/main.c\nindex 09b90c3..2e6787b 100644\n--- a/examples/eventdev_pipeline_sw_pmd/main.c\n+++ b/examples/eventdev_pipeline_sw_pmd/main.c\n@@ -108,7 +108,7 @@ struct config_data {\n static struct config_data cdata = {\n \t.num_packets = (1L << 25), /* do ~32M packets */\n \t.num_fids = 512,\n-\t.queue_type = RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY,\n+\t.queue_type = RTE_SCHED_TYPE_ATOMIC,\n \t.next_qid = {-1},\n \t.qid = {-1},\n \t.num_stages = 1,\n@@ -490,10 +490,10 @@ parse_app_args(int argc, char **argv)\n \t\t\tcdata.enable_queue_priorities = 1;\n \t\t\tbreak;\n \t\tcase 'o':\n-\t\t\tcdata.queue_type = RTE_EVENT_QUEUE_CFG_ORDERED_ONLY;\n+\t\t\tcdata.queue_type = RTE_SCHED_TYPE_ORDERED;\n \t\t\tbreak;\n \t\tcase 'p':\n-\t\t\tcdata.queue_type = RTE_EVENT_QUEUE_CFG_PARALLEL_ONLY;\n+\t\t\tcdata.queue_type = RTE_SCHED_TYPE_PARALLEL;\n \t\t\tbreak;\n \t\tcase 'q':\n \t\t\tcdata.quiet = 1;\n@@ -684,7 +684,7 @@ setup_eventdev(struct prod_data *prod_data,\n \t\t\t.new_event_threshold = 4096,\n \t};\n \tstruct rte_event_queue_conf wkr_q_conf = {\n-\t\t\t.event_queue_cfg = cdata.queue_type,\n+\t\t\t.schedule_type = cdata.queue_type,\n \t\t\t.priority = RTE_EVENT_DEV_PRIORITY_NORMAL,\n \t\t\t.nb_atomic_flows = 1024,\n \t\t\t.nb_atomic_order_sequences = 1024,\n@@ -751,11 +751,11 @@ setup_eventdev(struct prod_data *prod_data,\n \t\t}\n\n \t\tconst char *type_str = \"Atomic\";\n-\t\tswitch (wkr_q_conf.event_queue_cfg) {\n-\t\tcase RTE_EVENT_QUEUE_CFG_ORDERED_ONLY:\n+\t\tswitch (wkr_q_conf.schedule_type) {\n+\t\tcase RTE_SCHED_TYPE_ORDERED:\n \t\t\ttype_str = \"Ordered\";\n \t\t\tbreak;\n-\t\tcase RTE_EVENT_QUEUE_CFG_PARALLEL_ONLY:\n+\t\tcase RTE_SCHED_TYPE_PARALLEL:\n \t\t\ttype_str = \"Parallel\";\n \t\t\tbreak;\n \t\t}\n@@ -907,9 +907,9 @@ main(int argc, char **argv)\n \t\tprintf(\"\\tworkers: %u\\n\", cdata.num_workers);\n \t\tprintf(\"\\tpackets: %\"PRIi64\"\\n\", cdata.num_packets);\n \t\tprintf(\"\\tQueue-prio: %u\\n\", cdata.enable_queue_priorities);\n-\t\tif (cdata.queue_type == RTE_EVENT_QUEUE_CFG_ORDERED_ONLY)\n+\t\tif (cdata.queue_type == RTE_SCHED_TYPE_ORDERED)\n \t\t\tprintf(\"\\tqid0 type: ordered\\n\");\n-\t\tif (cdata.queue_type == RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY)\n+\t\tif (cdata.queue_type == RTE_SCHED_TYPE_ATOMIC)\n \t\t\tprintf(\"\\tqid0 type: atomic\\n\");\n \t\tprintf(\"\\tCores available: %u\\n\", rte_lcore_count());\n \t\tprintf(\"\\tCores used: %u\\n\", cores_needed);\ndiff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c\nindex 378ccb5..db96552 100644\n--- a/lib/librte_eventdev/rte_eventdev.c\n+++ b/lib/librte_eventdev/rte_eventdev.c\n@@ -517,13 +517,11 @@ is_valid_atomic_queue_conf(const struct rte_event_queue_conf *queue_conf)\n {\n \tif (queue_conf &&\n \t\t!(queue_conf->event_queue_cfg &\n-\t\t RTE_EVENT_QUEUE_CFG_SINGLE_LINK) && (\n+\t\t RTE_EVENT_QUEUE_CFG_SINGLE_LINK) &&\n \t\t((queue_conf->event_queue_cfg &\n-\t\t\tRTE_EVENT_QUEUE_CFG_TYPE_MASK)\n-\t\t\t== RTE_EVENT_QUEUE_CFG_ALL_TYPES) ||\n-\t\t((queue_conf->event_queue_cfg &\n-\t\t\tRTE_EVENT_QUEUE_CFG_TYPE_MASK)\n-\t\t\t== RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY)\n+\t\t\t RTE_EVENT_QUEUE_CFG_ALL_TYPES) ||\n+\t\t(queue_conf->schedule_type\n+\t\t\t== RTE_SCHED_TYPE_ATOMIC)\n \t\t))\n \t\treturn 1;\n \telse\n@@ -535,13 +533,11 @@ is_valid_ordered_queue_conf(const struct rte_event_queue_conf *queue_conf)\n {\n \tif (queue_conf &&\n \t\t!(queue_conf->event_queue_cfg &\n-\t\t RTE_EVENT_QUEUE_CFG_SINGLE_LINK) && (\n-\t\t((queue_conf->event_queue_cfg &\n-\t\t\tRTE_EVENT_QUEUE_CFG_TYPE_MASK)\n-\t\t\t== RTE_EVENT_QUEUE_CFG_ALL_TYPES) ||\n+\t\t RTE_EVENT_QUEUE_CFG_SINGLE_LINK) &&\n \t\t((queue_conf->event_queue_cfg &\n-\t\t\tRTE_EVENT_QUEUE_CFG_TYPE_MASK)\n-\t\t\t== RTE_EVENT_QUEUE_CFG_ORDERED_ONLY)\n+\t\t\t RTE_EVENT_QUEUE_CFG_ALL_TYPES) ||\n+\t\t(queue_conf->schedule_type\n+\t\t\t== RTE_SCHED_TYPE_ORDERED)\n \t\t))\n \t\treturn 1;\n \telse\ndiff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/librte_eventdev/rte_eventdev.h\nindex 1dbc872..fa16f82 100644\n--- a/lib/librte_eventdev/rte_eventdev.h\n+++ b/lib/librte_eventdev/rte_eventdev.h\n@@ -270,9 +270,9 @@ struct rte_mbuf; /* we just use mbuf pointers; no need to include rte_mbuf.h */\n #define RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES (1ULL << 3)\n /**< Event device is capable of enqueuing events of any type to any queue.\n * If this capability is not set, the queue only supports events of the\n- * *RTE_EVENT_QUEUE_CFG_* type that it was created with.\n+ * *RTE_SCHED_TYPE_* type that it was created with.\n *\n- * @see RTE_EVENT_QUEUE_CFG_* values\n+ * @see RTE_SCHED_TYPE_* values\n */\n #define RTE_EVENT_DEV_CAP_BURST_MODE (1ULL << 4)\n /**< Event device is capable of operating in burst mode for enqueue(forward,\n@@ -515,39 +515,13 @@ rte_event_dev_configure(uint8_t dev_id,\n /* Event queue specific APIs */\n\n /* Event queue configuration bitmap flags */\n-#define RTE_EVENT_QUEUE_CFG_TYPE_MASK (3ULL << 0)\n-/**< Mask for event queue schedule type configuration request */\n-#define RTE_EVENT_QUEUE_CFG_ALL_TYPES (0ULL << 0)\n+#define RTE_EVENT_QUEUE_CFG_ALL_TYPES (1ULL << 0)\n /**< Allow ATOMIC,ORDERED,PARALLEL schedule type enqueue\n *\n * @see RTE_SCHED_TYPE_ORDERED, RTE_SCHED_TYPE_ATOMIC, RTE_SCHED_TYPE_PARALLEL\n * @see rte_event_enqueue_burst()\n */\n-#define RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY (1ULL << 0)\n-/**< Allow only ATOMIC schedule type enqueue\n- *\n- * The rte_event_enqueue_burst() result is undefined if the queue configured\n- * with ATOMIC only and sched_type != RTE_SCHED_TYPE_ATOMIC\n- *\n- * @see RTE_SCHED_TYPE_ATOMIC, rte_event_enqueue_burst()\n- */\n-#define RTE_EVENT_QUEUE_CFG_ORDERED_ONLY (2ULL << 0)\n-/**< Allow only ORDERED schedule type enqueue\n- *\n- * The rte_event_enqueue_burst() result is undefined if the queue configured\n- * with ORDERED only and sched_type != RTE_SCHED_TYPE_ORDERED\n- *\n- * @see RTE_SCHED_TYPE_ORDERED, rte_event_enqueue_burst()\n- */\n-#define RTE_EVENT_QUEUE_CFG_PARALLEL_ONLY (3ULL << 0)\n-/**< Allow only PARALLEL schedule type enqueue\n- *\n- * The rte_event_enqueue_burst() result is undefined if the queue configured\n- * with PARALLEL only and sched_type != RTE_SCHED_TYPE_PARALLEL\n- *\n- * @see RTE_SCHED_TYPE_PARALLEL, rte_event_enqueue_burst()\n- */\n-#define RTE_EVENT_QUEUE_CFG_SINGLE_LINK (1ULL << 2)\n+#define RTE_EVENT_QUEUE_CFG_SINGLE_LINK (1ULL << 1)\n /**< This event queue links only to a single event port.\n *\n * @see rte_event_port_setup(), rte_event_port_link()\n@@ -558,8 +532,8 @@ struct rte_event_queue_conf {\n \tuint32_t nb_atomic_flows;\n \t/**< The maximum number of active flows this queue can track at any\n \t * given time. If the queue is configured for atomic scheduling (by\n-\t * applying the RTE_EVENT_QUEUE_CFG_ALL_TYPES or\n-\t * RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY flags to event_queue_cfg), then the\n+\t * applying the RTE_EVENT_QUEUE_CFG_ALL_TYPES flag to event_queue_cfg\n+\t * or RTE_SCHED_TYPE_ATOMIC flag to schedule_type), then the\n \t * value must be in the range of [1, nb_event_queue_flows], which was\n \t * previously provided in rte_event_dev_configure().\n \t */\n@@ -572,12 +546,18 @@ struct rte_event_queue_conf {\n \t * event will be returned from dequeue until one or more entries are\n \t * freed up/released.\n \t * If the queue is configured for ordered scheduling (by applying the\n-\t * RTE_EVENT_QUEUE_CFG_ALL_TYPES or RTE_EVENT_QUEUE_CFG_ORDERED_ONLY\n-\t * flags to event_queue_cfg), then the value must be in the range of\n-\t * [1, nb_event_queue_flows], which was previously supplied to\n-\t * rte_event_dev_configure().\n+\t * RTE_EVENT_QUEUE_CFG_ALL_TYPES flag to event_queue_cfg or\n+\t * RTE_SCHED_TYPE_ORDERED flag to schedule_type), then the value must\n+\t * be in the range of [1, nb_event_queue_flows], which was\n+\t * previously supplied to rte_event_dev_configure().\n+\t */\n+\tuint32_t event_queue_cfg;\n+\t/**< Queue cfg flags(EVENT_QUEUE_CFG_) */\n+\tuint8_t schedule_type;\n+\t/**< Queue schedule type(RTE_SCHED_TYPE_*).\n+\t * Valid when RTE_EVENT_QUEUE_CFG_ALL_TYPES bit is not set in\n+\t * event_queue_cfg.\n \t */\n-\tuint32_t event_queue_cfg; /**< Queue cfg flags(EVENT_QUEUE_CFG_) */\n \tuint8_t priority;\n \t/**< Priority for this event queue relative to other event queues.\n \t * The requested priority should in the range of\ndiff --git a/test/test/test_eventdev.c b/test/test/test_eventdev.c\nindex d6ade78..4118b75 100644\n--- a/test/test/test_eventdev.c\n+++ b/test/test/test_eventdev.c\n@@ -300,15 +300,13 @@ test_eventdev_queue_setup(void)\n \t/* Negative cases */\n \tret = rte_event_queue_default_conf_get(TEST_DEV_ID, 0, &qconf);\n \tTEST_ASSERT_SUCCESS(ret, \"Failed to get queue0 info\");\n-\tqconf.event_queue_cfg =\t(RTE_EVENT_QUEUE_CFG_ALL_TYPES &\n-\t\t RTE_EVENT_QUEUE_CFG_TYPE_MASK);\n+\tqconf.event_queue_cfg =\tRTE_EVENT_QUEUE_CFG_ALL_TYPES;\n \tqconf.nb_atomic_flows = info.max_event_queue_flows + 1;\n \tret = rte_event_queue_setup(TEST_DEV_ID, 0, &qconf);\n \tTEST_ASSERT(ret == -EINVAL, \"Expected -EINVAL, %d\", ret);\n\n \tqconf.nb_atomic_flows = info.max_event_queue_flows;\n-\tqconf.event_queue_cfg =\t(RTE_EVENT_QUEUE_CFG_ORDERED_ONLY &\n-\t\t RTE_EVENT_QUEUE_CFG_TYPE_MASK);\n+\tqconf.schedule_type = RTE_SCHED_TYPE_ORDERED;\n \tqconf.nb_atomic_order_sequences = info.max_event_queue_flows + 1;\n \tret = rte_event_queue_setup(TEST_DEV_ID, 0, &qconf);\n \tTEST_ASSERT(ret == -EINVAL, \"Expected -EINVAL, %d\", ret);\n@@ -423,7 +421,7 @@ test_eventdev_queue_attr_nb_atomic_flows(void)\n \t\t/* Assume PMD doesn't support atomic flows, return early */\n \t\treturn -ENOTSUP;\n\n-\tqconf.event_queue_cfg = RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY;\n+\tqconf.schedule_type = RTE_SCHED_TYPE_ATOMIC;\n\n \tfor (i = 0; i < (int)queue_count; i++) {\n \t\tret = rte_event_queue_setup(TEST_DEV_ID, i, &qconf);\n@@ -466,7 +464,7 @@ test_eventdev_queue_attr_nb_atomic_order_sequences(void)\n \t\t/* Assume PMD doesn't support reordering */\n \t\treturn -ENOTSUP;\n\n-\tqconf.event_queue_cfg = RTE_EVENT_QUEUE_CFG_ORDERED_ONLY;\n+\tqconf.schedule_type = RTE_SCHED_TYPE_ORDERED;\n\n \tfor (i = 0; i < (int)queue_count; i++) {\n \t\tret = rte_event_queue_setup(TEST_DEV_ID, i, &qconf);\n@@ -507,7 +505,7 @@ test_eventdev_queue_attr_event_queue_cfg(void)\n \tret = rte_event_queue_default_conf_get(TEST_DEV_ID, 0, &qconf);\n \tTEST_ASSERT_SUCCESS(ret, \"Failed to get queue0 def conf\");\n\n-\tqconf.event_queue_cfg = RTE_EVENT_QUEUE_CFG_PARALLEL_ONLY;\n+\tqconf.event_queue_cfg = RTE_EVENT_QUEUE_CFG_SINGLE_LINK;\n\n \tfor (i = 0; i < (int)queue_count; i++) {\n \t\tret = rte_event_queue_setup(TEST_DEV_ID, i, &qconf);\ndiff --git a/test/test/test_eventdev_sw.c b/test/test/test_eventdev_sw.c\nindex 7219886..dea302f 100644\n--- a/test/test/test_eventdev_sw.c\n+++ b/test/test/test_eventdev_sw.c\n@@ -219,7 +219,7 @@ create_lb_qids(struct test *t, int num_qids, uint32_t flags)\n\n \t/* Q creation */\n \tconst struct rte_event_queue_conf conf = {\n-\t\t\t.event_queue_cfg = flags,\n+\t\t\t.schedule_type = flags,\n \t\t\t.priority = RTE_EVENT_DEV_PRIORITY_NORMAL,\n \t\t\t.nb_atomic_flows = 1024,\n \t\t\t.nb_atomic_order_sequences = 1024,\n@@ -242,20 +242,20 @@ create_lb_qids(struct test *t, int num_qids, uint32_t flags)\n static inline int\n create_atomic_qids(struct test *t, int num_qids)\n {\n-\treturn create_lb_qids(t, num_qids, RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY);\n+\treturn create_lb_qids(t, num_qids, RTE_SCHED_TYPE_ATOMIC);\n }\n\n static inline int\n create_ordered_qids(struct test *t, int num_qids)\n {\n-\treturn create_lb_qids(t, num_qids, RTE_EVENT_QUEUE_CFG_ORDERED_ONLY);\n+\treturn create_lb_qids(t, num_qids, RTE_SCHED_TYPE_ORDERED);\n }\n\n\n static inline int\n create_unordered_qids(struct test *t, int num_qids)\n {\n-\treturn create_lb_qids(t, num_qids, RTE_EVENT_QUEUE_CFG_PARALLEL_ONLY);\n+\treturn create_lb_qids(t, num_qids, RTE_SCHED_TYPE_PARALLEL);\n }\n\n static inline int\n@@ -1238,7 +1238,7 @@ port_reconfig_credits(struct test *t)\n \tconst uint32_t NUM_ITERS = 32;\n \tfor (i = 0; i < NUM_ITERS; i++) {\n \t\tconst struct rte_event_queue_conf conf = {\n-\t\t\t.event_queue_cfg = RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY,\n+\t\t\t.schedule_type = RTE_SCHED_TYPE_ATOMIC,\n \t\t\t.priority = RTE_EVENT_DEV_PRIORITY_NORMAL,\n \t\t\t.nb_atomic_flows = 1024,\n \t\t\t.nb_atomic_order_sequences = 1024,\n@@ -1320,7 +1320,7 @@ port_single_lb_reconfig(struct test *t)\n\n \tstatic const struct rte_event_queue_conf conf_lb_atomic = {\n \t\t.priority = RTE_EVENT_DEV_PRIORITY_NORMAL,\n-\t\t.event_queue_cfg = RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY,\n+\t\t.schedule_type = RTE_SCHED_TYPE_ATOMIC,\n \t\t.nb_atomic_flows = 1024,\n \t\t.nb_atomic_order_sequences = 1024,\n \t};\n@@ -1818,7 +1818,7 @@ ordered_reconfigure(struct test *t)\n \t}\n\n \tconst struct rte_event_queue_conf conf = {\n-\t\t\t.event_queue_cfg = RTE_EVENT_QUEUE_CFG_ORDERED_ONLY,\n+\t\t\t.schedule_type = RTE_SCHED_TYPE_ORDERED,\n \t\t\t.priority = RTE_EVENT_DEV_PRIORITY_NORMAL,\n \t\t\t.nb_atomic_flows = 1024,\n \t\t\t.nb_atomic_order_sequences = 1024,\n@@ -1865,7 +1865,7 @@ qid_priorities(struct test *t)\n \tfor (i = 0; i < 3; i++) {\n \t\t/* Create QID */\n \t\tconst struct rte_event_queue_conf conf = {\n-\t\t\t.event_queue_cfg = RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY,\n+\t\t\t.schedule_type = RTE_SCHED_TYPE_ATOMIC,\n \t\t\t/* increase priority (0 == highest), as we go */\n \t\t\t.priority = RTE_EVENT_DEV_PRIORITY_NORMAL - i,\n \t\t\t.nb_atomic_flows = 1024,\n", "prefixes": [ "dpdk-dev", "v3", "1/3" ] }