Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/138461/?format=api
{ "id": 138461, "url": "http://patches.dpdk.org/api/patches/138461/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20240318173146.24303-5-sivaprasad.tummala@amd.com/", "project": { "id": 1, "url": "http://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": "<20240318173146.24303-5-sivaprasad.tummala@amd.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20240318173146.24303-5-sivaprasad.tummala@amd.com", "date": "2024-03-18T17:31:43", "name": "[v5,4/6] examples/ipsec-secgw: fix lcore ID restriction", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "fb9116e7d52d2eb0ce44ccfd7bf772716397620c", "submitter": { "id": 2510, "url": "http://patches.dpdk.org/api/people/2510/?format=api", "name": "Sivaprasad Tummala", "email": "Sivaprasad.Tummala@amd.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20240318173146.24303-5-sivaprasad.tummala@amd.com/mbox/", "series": [ { "id": 31546, "url": "http://patches.dpdk.org/api/series/31546/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31546", "date": "2024-03-18T17:31:40", "name": "fix lcore ID restriction", "version": 5, "mbox": "http://patches.dpdk.org/series/31546/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/138461/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/138461/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id DC84D43CE8;\n\tMon, 18 Mar 2024 18:32:59 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id A2AFE40A81;\n\tMon, 18 Mar 2024 18:32:26 +0100 (CET)", "from NAM11-BN8-obe.outbound.protection.outlook.com\n (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41])\n by mails.dpdk.org (Postfix) with ESMTP id 3332040DCB;\n Mon, 18 Mar 2024 18:32:25 +0100 (CET)", "from CH2PR02CA0028.namprd02.prod.outlook.com (2603:10b6:610:4e::38)\n by IA1PR12MB7638.namprd12.prod.outlook.com (2603:10b6:208:426::9)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.27; Mon, 18 Mar\n 2024 17:32:22 +0000", "from CH1PEPF0000AD79.namprd04.prod.outlook.com\n (2603:10b6:610:4e:cafe::af) by CH2PR02CA0028.outlook.office365.com\n (2603:10b6:610:4e::38) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.19 via Frontend\n Transport; Mon, 18 Mar 2024 17:32:22 +0000", "from SATLEXMB04.amd.com (165.204.84.17) by\n CH1PEPF0000AD79.mail.protection.outlook.com (10.167.244.57) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id\n 15.20.7409.10 via Frontend Transport; Mon, 18 Mar 2024 17:32:22 +0000", "from ubuntu2004.linuxvmimages.local (10.180.168.240) by\n SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id\n 15.1.2507.35; Mon, 18 Mar 2024 12:32:18 -0500" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=A4j8dQw0zt8X1Bas6bfc47vhcDo2I3akxkhtzos/796vnh6zB8rktF2YHgwLRoknmsPzGn0kUFycNrqXk5kUpKaQ/+AayeNrqNIaG/lRpa5xcyJAK4smGTmvh+ne68xkbjoPiZI+OF/yotZkL6zvXrHBzBrs8JmIi1TMPkCS1VCA5dAhyLDjHy2LcanpeHXtcH7KVlpMg5P+U32WCByrIPwrGYooFqNn2zGTLucueSM3vBHDrBNQ6gNOiXDVHD+El0pDRdoP3rWQRlpWMNd4t4HNBpiYWGqz6b0nmVSwP/BwieBJG180uIK0AZaURcE7Hy8IRz7dcOc7PM/JNW/GyQ==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=s0XMAVPNXoiXHRddejmmS2DSqjX7LbwK5+ZhrdIkj6k=;\n b=h+IEZYEL0wOPEU6jDGfVZJ3VRbKl74Ld3jwcWG+ZN/VEDzGQarePr6TcETCuZ6XqaEkPFd2WNt7lJ9v+DyIanye7PSgnhwSzbdK0eIAnCptoj8E2nACkHx+gIX3jpEs0/JsKdol3V2lT+sT+9IQRJBFjGmFOL59BRCzyfKu+zc+h5TJ2/EPaVfDklBN69Ar5YwbFJMCcxvdc+N5qoBm7Tl5QNLtIby0EekLCoUHbAHtQAIEFzIl33FnyHK0LV9bsxwCRQvpZby4h2Xmd4zkszjeQhMbfb4xSj75mwcGkbW0KLXkCA+rp2PtUyLrHTY+a8lCWkERs2RAW796t3JXFfg==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 165.204.84.17) smtp.rcpttodomain=intel.com smtp.mailfrom=amd.com; dmarc=pass\n (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com;\n dkim=none (message not signed); arc=none (0)", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=s0XMAVPNXoiXHRddejmmS2DSqjX7LbwK5+ZhrdIkj6k=;\n b=404MNj0KeaQbGzY0XL8/h4NLhtC3OzVBrSgO3SDhdq0h29dH4O2IzL29nIfB1JlRF1BMu8Fuj8GSQujLQBRq3kccYQTkPEoN6EnPdinoTH+Od1O/J18NEZyNKt2WDCPBHwIjfiqpwaFpBe/D4VsKhBasu+xNvixOotCJpEkexvY=", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 165.204.84.17)\n smtp.mailfrom=amd.com; dkim=none (message not signed)\n header.d=none;dmarc=pass action=none header.from=amd.com;", "Received-SPF": "Pass (protection.outlook.com: domain of amd.com designates\n 165.204.84.17 as permitted sender) receiver=protection.outlook.com;\n client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C", "From": "Sivaprasad Tummala <sivaprasad.tummala@amd.com>", "To": "<david.hunt@intel.com>, <anatoly.burakov@intel.com>, <jerinj@marvell.com>,\n <radu.nicolau@intel.com>, <gakhil@marvell.com>,\n <cristian.dumitrescu@intel.com>, <ferruh.yigit@amd.com>,\n <konstantin.ananyev@huawei.com>, <stephen@networkplumber.org>,\n <david.marchand@redhat.com>", "CC": "<dev@dpdk.org>, <sergio.gonzalez.monroy@intel.com>, <stable@dpdk.org>", "Subject": "[PATCH v5 4/6] examples/ipsec-secgw: fix lcore ID restriction", "Date": "Mon, 18 Mar 2024 18:31:43 +0100", "Message-ID": "<20240318173146.24303-5-sivaprasad.tummala@amd.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20240318173146.24303-1-sivaprasad.tummala@amd.com>", "References": "<20240116182332.95537-1-sivaprasad.tummala@amd.com>\n <20240318173146.24303-1-sivaprasad.tummala@amd.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[10.180.168.240]", "X-ClientProxiedBy": "SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com\n (10.181.40.145)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "CH1PEPF0000AD79:EE_|IA1PR12MB7638:EE_", "X-MS-Office365-Filtering-Correlation-Id": "cc06d770-9627-4163-2a93-08dc47715ec2", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n DnFCwz34ggclcdYzHDk2IaK9p8bJVjOyjJ+yXezfFdPG5gYfXJ+I/5g3viYAz5HKwDHAnoV27x2n+rfuiI/+33ey5HEPfBzaQyiaHHOrHfI5xpNaepsj6KVBgeqzBJJvZ3Rx+U68akgTmbHom6c4NCIgkIWRuzK+YxD/KwMkApHNe6jc4V7ZH7lZbPIxzQ5txFjDtog6t9lNDwE01YPD8v+07MStaehJdFrNZls3s4s7Potpe5WM3dz/KK5bWPXa4WZuUenfaKSQX6UH9lCSeY5u/DNlKy07v3/e6ATevjOn4Z/2P1OqdmQ3WVDuSkdfHbi8/IYb8pyjy4JYa4f1rhhlzFMV2HlVwakvzxSZCZlXj0QgY6CWwmRoH4EtosgNScyIGhPy2GR6MwEYceWMvcgRmSe5Fk8u4BzCj06XT1KzAL1Hq5WGb2zoDzRBLM1f23rzv3uzGYcmkq3qNGGchiO80jfHsoX/i9DsLKkFb9I8lzyYaKCL+StxUjyFBpnp2NB92leeuZZ5ewkjCWANXpohDuDIqTaJ6iIUZ8cFr740Hzfhu26xy+I6xpGssT4ychKS9R3IGGgDRnVqJ+7U20LwH/cLuyMKQXd6iKyvHkaA/Bha+Z0wR8mzX8bSOYPXIppURWnm6ccLSmS8kozpsBdZRNpVqXteUXbkTR7/Ss8wXBRBilUgdrlTwxdCeeRzs8W5hYha2LF/UHvuMZdDCRBqdrDgkJUFakV+Jy8WJa+BxKQXZMCCF5l8EiQ0zYFIxEkPcwM/F4BvfSQOOUoEDw==", "X-Forefront-Antispam-Report": "CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:;\n IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE;\n SFS:(13230031)(7416005)(376005)(82310400014)(1800799015)(36860700004)(921011);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "amd.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "18 Mar 2024 17:32:22.5802 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n cc06d770-9627-4163-2a93-08dc47715ec2", "X-MS-Exchange-CrossTenant-Id": "3dd8961f-e488-4e60-8e11-a82d994e183d", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "\n TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17];\n Helo=[SATLEXMB04.amd.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n CH1PEPF0000AD79.namprd04.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "IA1PR12MB7638", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Currently the config option allows lcore IDs up to 255,\nirrespective of RTE_MAX_LCORES and needs to be fixed.\n\nThe patch allows config options based on DPDK config.\n\nFixes: d299106e8e31 (\"examples/ipsec-secgw: add IPsec sample application\")\nCc: sergio.gonzalez.monroy@intel.com\nCc: stable@dpdk.org\n\nSigned-off-by: Sivaprasad Tummala <sivaprasad.tummala@amd.com>\nAcked-by: Konstantin Ananyev <konstantin.ananyev@huawei.com>\n---\n examples/ipsec-secgw/event_helper.h | 2 +-\n examples/ipsec-secgw/ipsec-secgw.c | 37 +++++++++++++++--------------\n examples/ipsec-secgw/ipsec.c | 2 +-\n examples/ipsec-secgw/ipsec.h | 6 ++---\n examples/ipsec-secgw/ipsec_worker.c | 10 ++++----\n 5 files changed, 28 insertions(+), 29 deletions(-)", "diff": "diff --git a/examples/ipsec-secgw/event_helper.h b/examples/ipsec-secgw/event_helper.h\nindex dfb81bfcf1..be635685b4 100644\n--- a/examples/ipsec-secgw/event_helper.h\n+++ b/examples/ipsec-secgw/event_helper.h\n@@ -102,7 +102,7 @@ struct eh_event_link_info {\n \t\t/**< Event port ID */\n \tuint8_t eventq_id;\n \t\t/**< Event queue to be linked to the port */\n-\tuint8_t lcore_id;\n+\tuint32_t lcore_id;\n \t\t/**< Lcore to be polling on this port */\n };\n \ndiff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c\nindex 45a303850d..dc7491a2b9 100644\n--- a/examples/ipsec-secgw/ipsec-secgw.c\n+++ b/examples/ipsec-secgw/ipsec-secgw.c\n@@ -220,8 +220,8 @@ static const char *cfgfile;\n \n struct lcore_params {\n \tuint16_t port_id;\n-\tuint8_t queue_id;\n-\tuint8_t lcore_id;\n+\tuint16_t queue_id;\n+\tuint32_t lcore_id;\n } __rte_cache_aligned;\n \n static struct lcore_params lcore_params_array[MAX_LCORE_PARAMS];\n@@ -695,8 +695,7 @@ ipsec_poll_mode_worker(void)\n \tstruct rte_mbuf *pkts[MAX_PKT_BURST];\n \tuint32_t lcore_id;\n \tuint64_t prev_tsc, diff_tsc, cur_tsc;\n-\tuint16_t i, nb_rx, portid;\n-\tuint8_t queueid;\n+\tuint16_t i, nb_rx, portid, queueid;\n \tstruct lcore_conf *qconf;\n \tint32_t rc, socket_id;\n \tconst uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1)\n@@ -743,7 +742,7 @@ ipsec_poll_mode_worker(void)\n \t\tportid = rxql[i].port_id;\n \t\tqueueid = rxql[i].queue_id;\n \t\tRTE_LOG(INFO, IPSEC,\n-\t\t\t\" -- lcoreid=%u portid=%u rxqueueid=%hhu\\n\",\n+\t\t\t\" -- lcoreid=%u portid=%u rxqueueid=%hu\\n\",\n \t\t\tlcore_id, portid, queueid);\n \t}\n \n@@ -788,8 +787,7 @@ int\n check_flow_params(uint16_t fdir_portid, uint8_t fdir_qid)\n {\n \tuint16_t i;\n-\tuint16_t portid;\n-\tuint8_t queueid;\n+\tuint16_t portid, queueid;\n \n \tfor (i = 0; i < nb_lcore_params; ++i) {\n \t\tportid = lcore_params_array[i].port_id;\n@@ -809,7 +807,7 @@ check_flow_params(uint16_t fdir_portid, uint8_t fdir_qid)\n static int32_t\n check_poll_mode_params(struct eh_conf *eh_conf)\n {\n-\tuint8_t lcore;\n+\tuint32_t lcore;\n \tuint16_t portid;\n \tuint16_t i;\n \tint32_t socket_id;\n@@ -828,13 +826,13 @@ check_poll_mode_params(struct eh_conf *eh_conf)\n \tfor (i = 0; i < nb_lcore_params; ++i) {\n \t\tlcore = lcore_params[i].lcore_id;\n \t\tif (!rte_lcore_is_enabled(lcore)) {\n-\t\t\tprintf(\"error: lcore %hhu is not enabled in \"\n+\t\t\tprintf(\"error: lcore %u is not enabled in \"\n \t\t\t\t\"lcore mask\\n\", lcore);\n \t\t\treturn -1;\n \t\t}\n \t\tsocket_id = rte_lcore_to_socket_id(lcore);\n \t\tif (socket_id != 0 && numa_on == 0) {\n-\t\t\tprintf(\"warning: lcore %hhu is on socket %d \"\n+\t\t\tprintf(\"warning: lcore %u is on socket %d \"\n \t\t\t\t\"with numa off\\n\",\n \t\t\t\tlcore, socket_id);\n \t\t}\n@@ -851,7 +849,7 @@ check_poll_mode_params(struct eh_conf *eh_conf)\n \treturn 0;\n }\n \n-static uint8_t\n+static uint16_t\n get_port_nb_rx_queues(const uint16_t port)\n {\n \tint32_t queue = -1;\n@@ -862,14 +860,14 @@ get_port_nb_rx_queues(const uint16_t port)\n \t\t\t\tlcore_params[i].queue_id > queue)\n \t\t\tqueue = lcore_params[i].queue_id;\n \t}\n-\treturn (uint8_t)(++queue);\n+\treturn (uint16_t)(++queue);\n }\n \n static int32_t\n init_lcore_rx_queues(void)\n {\n \tuint16_t i, nb_rx_queue;\n-\tuint8_t lcore;\n+\tuint32_t lcore;\n \n \tfor (i = 0; i < nb_lcore_params; ++i) {\n \t\tlcore = lcore_params[i].lcore_id;\n@@ -1050,6 +1048,8 @@ parse_config(const char *q_arg)\n \tchar *str_fld[_NUM_FLD];\n \tint32_t i;\n \tuint32_t size;\n+\tuint32_t max_fld[_NUM_FLD] = {RTE_MAX_ETHPORTS,\n+\t\t\t\tUSHRT_MAX, RTE_MAX_LCORE};\n \n \tnb_lcore_params = 0;\n \n@@ -1070,7 +1070,7 @@ parse_config(const char *q_arg)\n \t\tfor (i = 0; i < _NUM_FLD; i++) {\n \t\t\terrno = 0;\n \t\t\tint_fld[i] = strtoul(str_fld[i], &end, 0);\n-\t\t\tif (errno != 0 || end == str_fld[i] || int_fld[i] > 255)\n+\t\t\tif (errno != 0 || end == str_fld[i] || int_fld[i] > max_fld[i])\n \t\t\t\treturn -1;\n \t\t}\n \t\tif (nb_lcore_params >= MAX_LCORE_PARAMS) {\n@@ -1079,11 +1079,11 @@ parse_config(const char *q_arg)\n \t\t\treturn -1;\n \t\t}\n \t\tlcore_params_array[nb_lcore_params].port_id =\n-\t\t\t(uint8_t)int_fld[FLD_PORT];\n+\t\t\t(uint16_t)int_fld[FLD_PORT];\n \t\tlcore_params_array[nb_lcore_params].queue_id =\n-\t\t\t(uint8_t)int_fld[FLD_QUEUE];\n+\t\t\t(uint16_t)int_fld[FLD_QUEUE];\n \t\tlcore_params_array[nb_lcore_params].lcore_id =\n-\t\t\t(uint8_t)int_fld[FLD_LCORE];\n+\t\t\t(uint32_t)int_fld[FLD_LCORE];\n \t\t++nb_lcore_params;\n \t}\n \tlcore_params = lcore_params_array;\n@@ -1919,7 +1919,8 @@ port_init(uint16_t portid, uint64_t req_rx_offloads, uint64_t req_tx_offloads,\n \tstruct rte_eth_dev_info dev_info;\n \tstruct rte_eth_txconf *txconf;\n \tuint16_t nb_tx_queue, nb_rx_queue;\n-\tuint16_t tx_queueid, rx_queueid, queue, lcore_id;\n+\tuint16_t tx_queueid, rx_queueid, queue;\n+\tuint32_t lcore_id;\n \tint32_t ret, socket_id;\n \tstruct lcore_conf *qconf;\n \tstruct rte_ether_addr ethaddr;\ndiff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c\nindex c321108119..b52b0ffc3d 100644\n--- a/examples/ipsec-secgw/ipsec.c\n+++ b/examples/ipsec-secgw/ipsec.c\n@@ -259,7 +259,7 @@ create_lookaside_session(struct ipsec_ctx *ipsec_ctx_lcore[],\n \t\t\tcontinue;\n \n \t\t/* Looking for cryptodev, which can handle this SA */\n-\t\tkey.lcore_id = (uint8_t)lcore_id;\n+\t\tkey.lcore_id = lcore_id;\n \t\tkey.cipher_algo = (uint8_t)sa->cipher_algo;\n \t\tkey.auth_algo = (uint8_t)sa->auth_algo;\n \t\tkey.aead_algo = (uint8_t)sa->aead_algo;\ndiff --git a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h\nindex bdcada1c40..6526a80d81 100644\n--- a/examples/ipsec-secgw/ipsec.h\n+++ b/examples/ipsec-secgw/ipsec.h\n@@ -256,11 +256,11 @@ extern struct offloads tx_offloads;\n * (hash key calculation reads 8 bytes if this struct is size 5 bytes).\n */\n struct cdev_key {\n-\tuint16_t lcore_id;\n+\tuint32_t lcore_id;\n \tuint8_t cipher_algo;\n \tuint8_t auth_algo;\n \tuint8_t aead_algo;\n-\tuint8_t padding[3]; /* padding to 8-byte size should be zeroed */\n+\tuint8_t padding; /* padding to 8-byte size should be zeroed */\n };\n \n struct socket_ctx {\n@@ -285,7 +285,7 @@ struct cnt_blk {\n \n struct lcore_rx_queue {\n \tuint16_t port_id;\n-\tuint8_t queue_id;\n+\tuint16_t queue_id;\n \tvoid *sec_ctx;\n } __rte_cache_aligned;\n \ndiff --git a/examples/ipsec-secgw/ipsec_worker.c b/examples/ipsec-secgw/ipsec_worker.c\nindex 8d122e8519..90a4c38ba4 100644\n--- a/examples/ipsec-secgw/ipsec_worker.c\n+++ b/examples/ipsec-secgw/ipsec_worker.c\n@@ -1598,8 +1598,7 @@ ipsec_poll_mode_wrkr_inl_pr(void)\n \tint32_t socket_id;\n \tuint32_t lcore_id;\n \tint32_t i, nb_rx;\n-\tuint16_t portid;\n-\tuint8_t queueid;\n+\tuint16_t portid, queueid;\n \n \tprev_tsc = 0;\n \tlcore_id = rte_lcore_id();\n@@ -1633,7 +1632,7 @@ ipsec_poll_mode_wrkr_inl_pr(void)\n \t\tportid = rxql[i].port_id;\n \t\tqueueid = rxql[i].queue_id;\n \t\tRTE_LOG(INFO, IPSEC,\n-\t\t\t\" -- lcoreid=%u portid=%u rxqueueid=%hhu\\n\",\n+\t\t\t\" -- lcoreid=%u portid=%u rxqueueid=%hu\\n\",\n \t\t\tlcore_id, portid, queueid);\n \t}\n \n@@ -1729,8 +1728,7 @@ ipsec_poll_mode_wrkr_inl_pr_ss(void)\n \tuint32_t i, nb_rx, j;\n \tint32_t socket_id;\n \tuint32_t lcore_id;\n-\tuint16_t portid;\n-\tuint8_t queueid;\n+\tuint16_t portid, queueid;\n \n \tprev_tsc = 0;\n \tlcore_id = rte_lcore_id();\n@@ -1764,7 +1762,7 @@ ipsec_poll_mode_wrkr_inl_pr_ss(void)\n \t\tportid = rxql[i].port_id;\n \t\tqueueid = rxql[i].queue_id;\n \t\tRTE_LOG(INFO, IPSEC,\n-\t\t\t\" -- lcoreid=%u portid=%u rxqueueid=%hhu\\n\",\n+\t\t\t\" -- lcoreid=%u portid=%u rxqueueid=%hu\\n\",\n \t\t\tlcore_id, portid, queueid);\n \t}\n \n", "prefixes": [ "v5", "4/6" ] }