From patchwork Mon Feb 6 12:37:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 93429 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1689816qgi; Mon, 6 Feb 2017 04:48:53 -0800 (PST) X-Received: by 10.200.57.109 with SMTP id t42mr8515708qtb.242.1486385333542; Mon, 06 Feb 2017 04:48:53 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id a188si408388qkc.182.2017.02.06.04.48.53; Mon, 06 Feb 2017 04:48:53 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 25AF262EBA; Mon, 6 Feb 2017 12:48:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 30C3660B51; Mon, 6 Feb 2017 12:39:41 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 749DC62DB7; Mon, 6 Feb 2017 12:38:50 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0114.outbound.protection.outlook.com [104.47.0.114]) by lists.linaro.org (Postfix) with ESMTPS id AA82C62DBB for ; Mon, 6 Feb 2017 12:38:31 +0000 (UTC) Received: from VI1PR07CA0052.eurprd07.prod.outlook.com (2a01:111:e400:5967::20) by AM3PR07MB276.eurprd07.prod.outlook.com (2a01:111:e400:8819::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.5; Mon, 6 Feb 2017 12:38:28 +0000 Received: from AM1FFO11FD035.protection.gbl (2a01:111:f400:7e00::121) by VI1PR07CA0052.outlook.office365.com (2a01:111:e400:5967::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.5 via Frontend Transport; Mon, 6 Feb 2017 12:38:28 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning linaro.org discourages use of 131.228.2.36 as permitted sender) Received: from hybrid2.ext.net.nokia.com (131.228.2.36) by AM1FFO11FD035.mail.protection.outlook.com (10.174.64.224) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.7 via Frontend Transport; Mon, 6 Feb 2017 12:38:28 +0000 Received: from fihe3nok1346.nsn-intra.net (10.158.36.134) by fihe3nok1347.nsn-intra.net (10.158.36.135) with Microsoft SMTP Server (TLS) id 15.1.466.34; Mon, 6 Feb 2017 14:38:24 +0200 Received: from mailrelay.int.nokia.com (10.130.128.30) by fihe3nok1346.nsn-intra.net (10.158.36.134) with Microsoft SMTP Server (TLS) id 15.1.466.34 via Frontend Transport; Mon, 6 Feb 2017 14:38:24 +0200 Received: from fihe3nok0735.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0735.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v16Cc4L7019883 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 6 Feb 2017 14:38:04 +0200 Received: from 10.144.19.15 ([10.144.104.219]) by fihe3nok0735.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v16Cc4VB019846 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Mon, 6 Feb 2017 14:38:04 +0200 X-HPESVCS-Source-Ip: 10.144.104.219 From: Petri Savolainen To: Date: Mon, 6 Feb 2017 14:37:57 +0200 Message-ID: <1486384684-14761-4-git-send-email-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1486384684-14761-1-git-send-email-petri.savolainen@linaro.org> References: <1486384684-14761-1-git-send-email-petri.savolainen@linaro.org> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:131.228.2.36; IPV:NLI; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(7916002)(39850400002)(39410400002)(39840400002)(39860400002)(39450400003)(2980300002)(189002)(199003)(53936002)(450100001)(22756006)(8676002)(81166006)(626004)(5003940100001)(47776003)(50466002)(92566002)(33646002)(81156014)(2906002)(2950100002)(68736007)(48376002)(356003)(5660300001)(6916009)(305945005)(575784001)(6666003)(105596002)(107886002)(77096006)(106466001)(189998001)(76176999)(50986999)(2351001)(36756003)(50226002)(110136003)(38730400001)(8936002)(86362001)(97736004); DIR:OUT; SFP:1102; SCL:1; SRVR:AM3PR07MB276; H:hybrid2.ext.net.nokia.com; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM1FFO11FD035; 1:J5whUKTDl3Jyke2EUR+S2qj27cb9xTBUxf1r7+CX5cUfUttocLr6xLEoV5zmYGBUiHdSZ/h1NxMAf6iSp1tbCY7rAUuPyy7hO1N2yiDoe2mvE0SN/DGMLNG8YT+9Uo+5KkY4Csi3wBA89PSfwt4EMdhOEYbidCsz5a8slDiCZW6cNyn6wwOeF5Z+yaV2aLvIZcRrQ4aRx5aUU8ZzyPZE0XxmKfXIfpdZVn1M9qtEHx3cyQlN/ZjSKhni/KCJzomaNt/1mDOxMHblL4WH+s2VojemLAyucpMwF6azzLPHBGWPcIZQik/rI6w7UiRJVxPYHGXiTnYAoSIAoQqg+cTJht7UOybFC+x6SF/uQeT0ZO0vMbzQ5DCED+Ppl7qMlGOf/44dmCwC9ky3QogV228S05uyzZOYvEuWo2DOQlLb8tVP0xVrNlsDe2oKbP7Ik62sgxobg5Ila5E0yx9ldbbL7jajORqeLqaj2RBW5gjlUfI= X-MS-Office365-Filtering-Correlation-Id: e7428f55-2e10-409e-ed42-08d44e8d0d02 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:AM3PR07MB276; X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB276; 3:nExDhu6IPpIOzlmqeTKRjFIXxWd9ejxHWk4XWJiiqkTPxHwn8ix1oEATEFdqsr/OtZkdSB7iMeCFHfwmSVfDyKDAhKuAk/0mQSDHRWWENZgWgWdouM0VJDdNNqcKa9jQMmU++xA4CNEkPRFFeI5sNsy5CfHY5czHi06SeHa/P6xm+yRFhSVT94QsrD40+s1bhPEoxakHc1fSoksdH1/qAeEvdBxosLSEhr/xTe6osCEASgn9gNt27LAbV7Fb7msh7hAL8FE3aIyuVPXES5dgosbpSjYxCOrlsHZUvqL0wQ2m5VXvr2ni9ioFMCzaCcnFlMsWqy5KrQrPbGjQut+c9Mg/hQa2iy2nO2PuYGuczS1iz95yQMxC4fEVcBqeZORc; 25:ezR141XoQLMJaJ7p9ZsFjDTCkgiJVT849rmr/Eok6WmB3x1AzY+8Gcdrh97ImVz/wc/CYsC5pQR1qSrb+5rktzkweMjicWfmyBENe5ixAXPvVFsgQBaMdF5K58HTfIKg3FVSX2UGT1QWrzY8Fn0ggi+YOQjDa8845O0cDYl7IuiLjMBDNvg/Q+zemidXEt3kYqDoECLJsWS//xCg4lvmhC2DiHIVmK33k37ML1nTbsuMxSeHY4VaWj1LZudYXtTUAznRKey7yz68QNgLYn3GDzMavBtkiNTl6NReh5WgahwMr2t1PnKlIu51acJzySBaLIUfJ11CtlYeHE0u5+nfo/83hYS7mD1f2x0YbAanlxJV0s/m3x0XN5U5EFGCpoLCe6R0Rn0q8/XWhZR7Acn5T3ob9la2NNo2CcKNSfYmvqtCsH5FPDlMQUBhuRP81zHXV0TwiZIbnUqDqUvoytDsEg== X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB276; 31:O5Ln2nYfv5iazyHspVFYRxkMeHyunWwgAHjV3r79bKY47OIcklbXzIhehWemqESTzZO1ZvtfOZFBKSU1EEwGZQCqUAps4PXpTcNgVaNLBYo1HjW79FknPDWNTZarpIeB686rdFZJxyPeNpHs04nn5RISU7GngFzeLoB+7zG3E9c5fvem5YVdnrETPB0c1IAlEDNpyznQoHFt7kvEgFpHrPambcsDnS8d+tN0U4Vi1/q6Ade//9lsX/Qj5cHorX2EHiRCpHdx9uSPliEnIPdpDjjR+nCox3wXuMSXTSwERkU=; 20:S25qS2+idr/TjRo/0blWty7+iFXAjT/E52kfdDFw4k9z1XA3HOo7IeoNNzA78u5HQntIarGQPUBhco27fYw+7iw0ZPLs2clyTkyG0qUrwN0PNrBaqrnJIg46IXrmjCG7wLD35VMjHLvK6axeatu5mYYLBZNR9ya5wbOqf8bHS8zEH/Nfqtf7oHCCaomF48DDmolVqyl0Np9RMT+1eW6sAEyBNRqdj87uRNgvpcec0OQeN6NonBZAZv313XUsTzCA1ojbyZRTbwKskwU9t18dpfnndN9ednHnvO9YMsqLYuqugeloQcS+Iv45Liflv6bQ6noTT/RHEKawRp6fi1403wToFYN1Y/ms2RvUb+hkDeyulBkMXhD3SbEvdvq7xLrqr7qEvvowwW3zKCsGtP+k21+ai9YUNII4qgDGjItiS7TgmYLxBoAJEa0g6gjbOvi5h/P6X78FiKF4AiHEZsbRp2s6dd61h8CsjuoKb8k2PEP0oU6kvHNvZMA9aOLgo+j0Wmshf+d+xyrtpUgXIwVNAcT9Iq8QcweXemEsxePNRmSlMOwRTK6qT0nld5nIbk36ZY3KTHbbgATDI6OBiLo22KvPG/c/jdn3N3syfHGXSJs= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(20170203043)(13018025)(13016025)(5005006)(8121501046)(10201501046)(3002001)(6055026)(6041248)(20161123555025)(20161123562025)(20161123564025)(20161123560025)(20161123558025)(6072148); SRVR:AM3PR07MB276; BCL:0; PCL:0; RULEID:; SRVR:AM3PR07MB276; X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB276; 4:CUXzIy1zhjdM5sOWEf1EMjBns2gKOewycgktuK6eZNNBNZ9Pvp4cKopNFtLxpeAz5waSOqznheTf2gAY3rY9tVnCnT29L6sORKZB5Wj/aie+55q0yL+jB9Z7EA8Bav/JkFwknLH4WsNjlUB+tDXMt+oMkuYd8tsPhS9/RY8gpu6x1rd3RXWhvPwpB+GjXozxTThwzXN6EJSaPgukMmEA4xPeld0P/wDB6qe7PWpDmPyKT1SMDvRiXCRH79W5kp9QOKtCgmLhqwokXvAkh9Z8qHq/RMvNc+tHCrYaUWHB+l62De/kIUYNyquW4CUe0DY190eDbgZ9rO8EkbxElj68Hh8+/ywEtw08R2sVNjFTyYc2NMOJQedQ4JfYpWXQpgEXq8XSCV9hyx+wq7QPcMJBU3qn7Ei9z2F0SGwx0qGcPo28tB/M9UAcqmxurm5Lrh6QROycwnRQsmnZBEkJ0QCFSpMLMOhyWda+TmGy2hFHLnuRY23+P1N62NWTQaQjTUba14YpjNGnoolKfpkHJb/WvCv+UtVbFM2UTmftlDFWoCvHRgQwp/JyWuCCExNHNDCanSM3+0pCgT8U7i00bGWuH9Iyd7kBOI2kKy+ZMuWyOXXG3OvsvX0xcJvYShhrwHxfwRxRXqkb6fSYuh8x4ZjcN35WpbDItLc+Fn35xP9F7DTwozNEckIbOCkMQcstxBO/ X-Forefront-PRVS: 0210479ED8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM3PR07MB276; 23:mMsc5+s1Bv//efQ12flm05yP/44dTb3tLc+/P6GKm5?= 8I9wcYj+aI8JhvNfcKSXvsgdHRttntSr1RPHF2KYmOyncvhm1FGIntYz2QlaPC6c593LcySxq8KpTahuglmUyZ2zFH1LmWLU350GTReU2xk3PO0srmLF8vTm+ROz+aTdfcndcwMAHsTIzPhM4vZ5KVjMR8pYVzZcrMdd9UiMw4Hz/+qL25wtzAzuTxs+Z98DUXYfHJS69PEWS1dz8f2Xvo5D5j1e2s9QZ4miER2d0vJFlcBTH8ECII2lw3ccQW0biYaFTsHrnoOn2yH3Ot5XKpqbqMDDgf0mYMY1J/cl7Bo5hGrWpuY5mCB8UQz9dlMqNQrnJVuv/te3nB8Ngj8ukO6wUNgWJNgXeyuB+1nZ1RNKSpAbyGCEu5ZXonI2wbZ2bGbKUdodz9L8BUxiBNKvJE9e29BKqAwfzSDfz/mmUMVv9xWaK5kpeqBpZn5K0e6Q36n0Y1+Ms/biziB96f5GWUbchHJ1vbZcIwIBV/EMaVpT4hgIt4DaQaVskMtS4iepsBXv3QwyXg0jdwL9YNxN0nOeBnrx+VhNzeSQwPF6Ey/na+K6yozn6icuZMYCjP9EKD08oWeeYRrfmfFRvt03dgd0B9nETYk24yy5WDkvTiG9KgXVPd1rbrYasrB95Uj6AjvhbneCCzGCDY7AbzLRm+JZkc9DutbX/o73Ah4ik/tpOfMsBt7Eszm9snUEsgxps9mbmkWOkhTiFI6tcmh8FlrvbqlWPy0+LWLzU30etAsPQ+6NOI/utbNYBtm5yulkD4ywZSETOWUFQeq9Y4oKcdWO1+Fn/3hHd8midD0YHGoMMLwl8npp8RQq4HtivBNBENwrPchUxrhs7gfqGD9xyTeHLTFdfanzIuTOu2dccFVvkH5OPhxDvP/grZK4DPoGbzdBXFOIadlogm0OP9kLfwNBXmCOeBEkFLKByJxaQix6vtjgZ/Y44ZPhw1KhYsJqpkx7BN/tuCXMTOq46TKMZBgqJlLLwLRS4WtWu14Aoe60t+Ec8CcO6zeGWzEKk3PYFSct8tXkGzQH3CiHhMzq8ZbrJZRqSnKEUFZ5GCqqKPgk42xBlgOyf7SmMHfsPjLsmrq+JyCsrjiKp9KvRm12ylUXcUqxE1oSyb2NPS/d2/cA== X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB276; 6:LEGGBwdhdcR9xuV0t7Lx49svwvx0tkQ5cIaOOkKGmP1aLTNwThCrJIthlJGza07sv3s7k/DeV5IWho9KQors7xtsgkdvPADaNma/j7ui7FPQ/HlqtxCq4p1Qlmlsvo4QekjQbSADzgkI73hqsqcvMIpjWQ7uURGHPmxKPWZgw1dDUqUID3yHRQ2RIKP6oInau581QxY4y0X3q4ZiNpuBjPzjshdtQicXuG1kd52RJRUpLWGKimrrxxp3SYelSK1bZ22XzZY8P9FewarKge0RO90BWCBqumsCLkkXM62dCnZTxQtuI4CY0d+ZF6hxLDVxEkhR91GbhMA4ASm87a76WGSinClvfZ1umwZNvZ2r49+C274/j6K8aSMDq8/DfvqOL2KcIsj2hE3GP1vSdzfQ5pr9b4qOVoVNMgt/djhLEsk=; 5:DrjB6SjTCzbknNTUccH3OVU3DEL9IM0rVyO/uBLs9aY/zHhXV8NIgDUgE90E7TCHJ3OVebL+yGpeEtnAiwsqW80s9ZdXcdRmzHfQ7rIU2CT7o+tOta7ESt6TZigIejrDMfyDD90sQYiNNCqkn4Z8sw==; 24:VtGveaJ2b+ciaTZPtW1g/kiTahugsJnpBlW4wFOyMP6CH79cDeYm4Mt7trtE3EzknZESN0JPw+sb7hIxUD3LQ1Yc6r/6xmbr2Zydf8VYMLU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB276; 7:NOK1vaKqppElkMa2Vp19+yiD+eAEoVPBSOSjtEVQRZZXd0QaSLfVKQclKIl9B/dIwZKZm8/Iu+pCV+dSg/ym0z0CRu7rBydaMVexSSVDYg3BlrpIkZiBmNPT8L4varSwRpNWPO7XZSasrLLUzzhTZsdKEyrOYPPG37j9fKWRkrz6Skfv4KPbYHyjIxx/wP4yd1vBxKGB0cBp00UDaily2cLPdXoQbmTlqxZpjUz5qxYEdPC/R1LY2itEzay/7jsVm6ph3zXH/IaBfRefqQqGHD5u1g2rI6WWzUKyHsTLtn/eMk/hWLY6xtdlRizsQUGBIF9e3kKG3awpm1vBqkzsHEHlCjXvzZv9hReQI+Ex6xtOwzbQwJERqSBrXZYBigRMj1kCl8e/7+CLvEY2LprhqqNYArmfE3oV8qkyC7d29+RHJb/9Qk4gUWTcWqwu/1+67gWIMKw7wczYWXr2/yXF6E0kGyrBJNQMPUU4NSWqU696xUq7kIRXmC1nmfJzwETun5VmKToZ8j4mTRI4I+a8/g== X-OriginatorOrg: nokia.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2017 12:38:28.0953 (UTC) X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.36]; Helo=[hybrid2.ext.net.nokia.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR07MB276 Subject: [lng-odp] [PATCH 03/10] linux-gen: packet: packet handle is hdr pointer X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Changed packet handle (odp_packet_t) to store pointer to the packet header, instead a bit field structure of pool and index. Buffer and event handles are not changed. Pointer as handle improves packet accessor function performance and enable accessor function inlining as mapping to pool/index is not needed. Signed-off-by: Petri Savolainen --- .../include/odp/api/plat/packet_types.h | 2 +- .../linux-generic/include/odp_packet_internal.h | 2 +- platform/linux-generic/odp_packet.c | 163 ++++++++++++--------- 3 files changed, 96 insertions(+), 71 deletions(-) -- 2.8.1 diff --git a/platform/linux-generic/include/odp/api/plat/packet_types.h b/platform/linux-generic/include/odp/api/plat/packet_types.h index 34e5dd8..999130e 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_types.h @@ -32,7 +32,7 @@ extern "C" { typedef ODP_HANDLE_T(odp_packet_t); -#define ODP_PACKET_INVALID _odp_cast_scalar(odp_packet_t, 0xffffffff) +#define ODP_PACKET_INVALID _odp_cast_scalar(odp_packet_t, 0) #define ODP_PACKET_OFFSET_INVALID (0x0fffffff) diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index e6e9d74..9e3b9fe 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -209,7 +209,7 @@ typedef struct { */ static inline odp_packet_hdr_t *odp_packet_hdr(odp_packet_t pkt) { - return (odp_packet_hdr_t *)buf_hdl_to_hdr((odp_buffer_t)pkt); + return (odp_packet_hdr_t *)(uintptr_t)pkt; } static inline void copy_packet_parser_metadata(odp_packet_hdr_t *src_hdr, diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 8833822..e56d954 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -23,9 +23,14 @@ /* Initial packet segment data length */ #define BASE_LEN CONFIG_PACKET_MAX_SEG_LEN +static inline odp_packet_hdr_t *packet_hdr(odp_packet_t pkt) +{ + return (odp_packet_hdr_t *)(uintptr_t)pkt; +} + static inline odp_packet_t packet_handle(odp_packet_hdr_t *pkt_hdr) { - return (odp_packet_t)pkt_hdr->buf_hdr.handle.handle; + return (odp_packet_t)pkt_hdr; } static inline odp_buffer_t buffer_handle(odp_packet_hdr_t *pkt_hdr) @@ -33,6 +38,11 @@ static inline odp_buffer_t buffer_handle(odp_packet_hdr_t *pkt_hdr) return pkt_hdr->buf_hdr.handle.handle; } +static inline odp_packet_hdr_t *buf_to_packet_hdr(odp_buffer_t buf) +{ + return (odp_packet_hdr_t *)buf_hdl_to_hdr(buf); +} + static inline uint32_t packet_seg_len(odp_packet_hdr_t *pkt_hdr, uint32_t seg_idx) { @@ -485,8 +495,8 @@ static inline int packet_alloc(pool_t *pool, uint32_t len, int max_pkt, odp_packet_hdr_t *hdr; /* First buffer is the packet descriptor */ - pkt[i] = (odp_packet_t)buf[i * num_seg]; hdr = pkt_hdr[i * num_seg]; + pkt[i] = packet_handle(hdr); init_segments(&pkt_hdr[i * num_seg], num_seg); packet_init(hdr, len, parse); @@ -552,11 +562,13 @@ int odp_packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, void odp_packet_free(odp_packet_t pkt) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + odp_buffer_t hdl = buffer_handle(pkt_hdr); + int num_seg = pkt_hdr->buf_hdr.segcount; if (odp_likely(CONFIG_PACKET_MAX_SEGS == 1 || num_seg == 1)) - buffer_free_multi((odp_buffer_t *)&pkt, 1); + buffer_free_multi(&hdl, 1); else free_bufs(pkt_hdr, 0, num_seg); } @@ -571,11 +583,11 @@ void odp_packet_free_multi(const odp_packet_t pkt[], int num) int bufs = 0; for (i = 0; i < num; i++) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt[i]); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt[i]); int num_seg = pkt_hdr->buf_hdr.segcount; odp_buffer_hdr_t *buf_hdr = &pkt_hdr->buf_hdr; - buf[bufs] = (odp_buffer_t)pkt[i]; + buf[bufs] = buffer_handle(pkt_hdr); bufs++; if (odp_likely(num_seg == 1)) @@ -593,7 +605,7 @@ void odp_packet_free_multi(const odp_packet_t pkt[], int num) int odp_packet_reset(odp_packet_t pkt, uint32_t len) { - odp_packet_hdr_t *const pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *const pkt_hdr = packet_hdr(pkt); pool_t *pool = pool_entry_from_hdl(pkt_hdr->buf_hdr.pool_hdl); if (len > pool->headroom + pool->data_size + pool->tailroom) @@ -606,22 +618,34 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len) odp_packet_t _odp_packet_from_buffer(odp_buffer_t buf) { - return (odp_packet_t)buf; + if (odp_unlikely(buf == ODP_BUFFER_INVALID)) + return ODP_PACKET_INVALID; + + return (odp_packet_t)buf_to_packet_hdr(buf); } odp_buffer_t _odp_packet_to_buffer(odp_packet_t pkt) { - return (odp_buffer_t)pkt; + if (odp_unlikely(pkt == ODP_PACKET_INVALID)) + return ODP_BUFFER_INVALID; + + return buffer_handle(packet_hdr(pkt)); } odp_packet_t odp_packet_from_event(odp_event_t ev) { - return (odp_packet_t)ev; + if (odp_unlikely(ev == ODP_EVENT_INVALID)) + return ODP_PACKET_INVALID; + + return (odp_packet_t)buf_to_packet_hdr((odp_buffer_t)ev); } odp_event_t odp_packet_to_event(odp_packet_t pkt) { - return (odp_event_t)pkt; + if (odp_unlikely(pkt == ODP_PACKET_INVALID)) + return ODP_EVENT_INVALID; + + return (odp_event_t)buffer_handle(packet_hdr(pkt)); } /* @@ -633,57 +657,57 @@ odp_event_t odp_packet_to_event(odp_packet_t pkt) void *odp_packet_head(odp_packet_t pkt) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); return pkt_hdr->buf_hdr.seg[0].data - pkt_hdr->headroom; } uint32_t odp_packet_buf_len(odp_packet_t pkt) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); return pkt_hdr->buf_hdr.size * pkt_hdr->buf_hdr.segcount; } void *odp_packet_data(odp_packet_t pkt) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); return packet_data(pkt_hdr); } uint32_t odp_packet_seg_len(odp_packet_t pkt) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); return packet_first_seg_len(pkt_hdr); } uint32_t odp_packet_len(odp_packet_t pkt) { - return odp_packet_hdr(pkt)->frame_len; + return packet_hdr(pkt)->frame_len; } uint32_t odp_packet_headroom(odp_packet_t pkt) { - return odp_packet_hdr(pkt)->headroom; + return packet_hdr(pkt)->headroom; } uint32_t odp_packet_tailroom(odp_packet_t pkt) { - return odp_packet_hdr(pkt)->tailroom; + return packet_hdr(pkt)->tailroom; } void *odp_packet_tail(odp_packet_t pkt) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); return packet_tail(pkt_hdr); } void *odp_packet_push_head(odp_packet_t pkt, uint32_t len) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (len > pkt_hdr->headroom) return NULL; @@ -868,7 +892,7 @@ static inline void reset_seg(odp_packet_hdr_t *pkt_hdr, int first, int num) int odp_packet_extend_head(odp_packet_t *pkt, uint32_t len, void **data_ptr, uint32_t *seg_len) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(*pkt); uint32_t frame_len = pkt_hdr->frame_len; uint32_t headroom = pkt_hdr->headroom; int ret = 0; @@ -972,7 +996,7 @@ int odp_packet_extend_head(odp_packet_t *pkt, uint32_t len, void *odp_packet_pull_head(odp_packet_t pkt, uint32_t len) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (len > pkt_hdr->frame_len) return NULL; @@ -984,7 +1008,7 @@ void *odp_packet_pull_head(odp_packet_t pkt, uint32_t len) int odp_packet_trunc_head(odp_packet_t *pkt, uint32_t len, void **data_ptr, uint32_t *seg_len_out) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(*pkt); uint32_t seg_len = packet_first_seg_len(pkt_hdr); if (len > pkt_hdr->frame_len) @@ -1018,7 +1042,7 @@ int odp_packet_trunc_head(odp_packet_t *pkt, uint32_t len, void *odp_packet_push_tail(odp_packet_t pkt, uint32_t len) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); void *old_tail; if (len > pkt_hdr->tailroom) @@ -1033,7 +1057,7 @@ void *odp_packet_push_tail(odp_packet_t pkt, uint32_t len) int odp_packet_extend_tail(odp_packet_t *pkt, uint32_t len, void **data_ptr, uint32_t *seg_len_out) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(*pkt); uint32_t frame_len = pkt_hdr->frame_len; uint32_t tailroom = pkt_hdr->tailroom; uint32_t tail_off = frame_len; @@ -1124,7 +1148,7 @@ int odp_packet_extend_tail(odp_packet_t *pkt, uint32_t len, void *odp_packet_pull_tail(odp_packet_t pkt, uint32_t len) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (len > packet_last_seg_len(pkt_hdr)) return NULL; @@ -1139,7 +1163,7 @@ int odp_packet_trunc_tail(odp_packet_t *pkt, uint32_t len, { int last; uint32_t seg_len; - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(*pkt); if (len > pkt_hdr->frame_len) return -1; @@ -1174,7 +1198,7 @@ void *odp_packet_offset(odp_packet_t pkt, uint32_t offset, uint32_t *len, odp_packet_seg_t *seg) { int seg_idx; - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); void *addr = packet_map(pkt_hdr, offset, len, &seg_idx); if (addr != NULL && seg != NULL) @@ -1199,42 +1223,42 @@ void odp_packet_prefetch(odp_packet_t pkt ODP_UNUSED, odp_pool_t odp_packet_pool(odp_packet_t pkt) { - return odp_packet_hdr(pkt)->buf_hdr.pool_hdl; + return packet_hdr(pkt)->buf_hdr.pool_hdl; } odp_pktio_t odp_packet_input(odp_packet_t pkt) { - return odp_packet_hdr(pkt)->input; + return packet_hdr(pkt)->input; } int odp_packet_input_index(odp_packet_t pkt) { - return odp_pktio_index(odp_packet_hdr(pkt)->input); + return odp_pktio_index(packet_hdr(pkt)->input); } void *odp_packet_user_ptr(odp_packet_t pkt) { - return odp_packet_hdr(pkt)->buf_hdr.buf_ctx; + return packet_hdr(pkt)->buf_hdr.buf_ctx; } void odp_packet_user_ptr_set(odp_packet_t pkt, const void *ctx) { - odp_packet_hdr(pkt)->buf_hdr.buf_cctx = ctx; + packet_hdr(pkt)->buf_hdr.buf_cctx = ctx; } void *odp_packet_user_area(odp_packet_t pkt) { - return odp_packet_hdr(pkt)->buf_hdr.uarea_addr; + return packet_hdr(pkt)->buf_hdr.uarea_addr; } uint32_t odp_packet_user_area_size(odp_packet_t pkt) { - return odp_packet_hdr(pkt)->buf_hdr.uarea_size; + return packet_hdr(pkt)->buf_hdr.uarea_size; } void *odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (!packet_hdr_has_l2(pkt_hdr)) return NULL; @@ -1243,7 +1267,7 @@ void *odp_packet_l2_ptr(odp_packet_t pkt, uint32_t *len) uint32_t odp_packet_l2_offset(odp_packet_t pkt) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (!packet_hdr_has_l2(pkt_hdr)) return ODP_PACKET_OFFSET_INVALID; @@ -1252,7 +1276,7 @@ uint32_t odp_packet_l2_offset(odp_packet_t pkt) int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (offset >= pkt_hdr->frame_len) return -1; @@ -1264,7 +1288,7 @@ int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset) void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (pkt_hdr->p.parsed_layers < LAYER_L3) packet_parse_layer(pkt_hdr, LAYER_L3); @@ -1273,7 +1297,7 @@ void *odp_packet_l3_ptr(odp_packet_t pkt, uint32_t *len) uint32_t odp_packet_l3_offset(odp_packet_t pkt) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (pkt_hdr->p.parsed_layers < LAYER_L3) packet_parse_layer(pkt_hdr, LAYER_L3); @@ -1282,7 +1306,7 @@ uint32_t odp_packet_l3_offset(odp_packet_t pkt) int odp_packet_l3_offset_set(odp_packet_t pkt, uint32_t offset) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (offset >= pkt_hdr->frame_len) return -1; @@ -1295,7 +1319,7 @@ int odp_packet_l3_offset_set(odp_packet_t pkt, uint32_t offset) void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (pkt_hdr->p.parsed_layers < LAYER_L4) packet_parse_layer(pkt_hdr, LAYER_L4); @@ -1304,7 +1328,7 @@ void *odp_packet_l4_ptr(odp_packet_t pkt, uint32_t *len) uint32_t odp_packet_l4_offset(odp_packet_t pkt) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (pkt_hdr->p.parsed_layers < LAYER_L4) packet_parse_layer(pkt_hdr, LAYER_L4); @@ -1313,7 +1337,7 @@ uint32_t odp_packet_l4_offset(odp_packet_t pkt) int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (offset >= pkt_hdr->frame_len) return -1; @@ -1326,14 +1350,14 @@ int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset) uint32_t odp_packet_flow_hash(odp_packet_t pkt) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); return pkt_hdr->flow_hash; } void odp_packet_flow_hash_set(odp_packet_t pkt, uint32_t flow_hash) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); pkt_hdr->flow_hash = flow_hash; pkt_hdr->p.input_flags.flow_hash = 1; @@ -1341,14 +1365,14 @@ void odp_packet_flow_hash_set(odp_packet_t pkt, uint32_t flow_hash) odp_time_t odp_packet_ts(odp_packet_t pkt) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); return pkt_hdr->timestamp; } void odp_packet_ts_set(odp_packet_t pkt, odp_time_t timestamp) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); pkt_hdr->timestamp = timestamp; pkt_hdr->p.input_flags.timestamp = 1; @@ -1356,12 +1380,12 @@ void odp_packet_ts_set(odp_packet_t pkt, odp_time_t timestamp) int odp_packet_is_segmented(odp_packet_t pkt) { - return odp_packet_hdr(pkt)->buf_hdr.segcount > 1; + return packet_hdr(pkt)->buf_hdr.segcount > 1; } int odp_packet_num_segs(odp_packet_t pkt) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); return pkt_hdr->buf_hdr.segcount; } @@ -1375,14 +1399,14 @@ odp_packet_seg_t odp_packet_first_seg(odp_packet_t pkt) odp_packet_seg_t odp_packet_last_seg(odp_packet_t pkt) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); return packet_last_seg(pkt_hdr); } odp_packet_seg_t odp_packet_next_seg(odp_packet_t pkt, odp_packet_seg_t seg) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (odp_unlikely(seg >= (odp_packet_seg_t)packet_last_seg(pkt_hdr))) return ODP_PACKET_SEG_INVALID; @@ -1399,7 +1423,7 @@ odp_packet_seg_t odp_packet_next_seg(odp_packet_t pkt, odp_packet_seg_t seg) void *odp_packet_seg_data(odp_packet_t pkt, odp_packet_seg_t seg) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (odp_unlikely(seg >= pkt_hdr->buf_hdr.segcount)) return NULL; @@ -1409,7 +1433,7 @@ void *odp_packet_seg_data(odp_packet_t pkt, odp_packet_seg_t seg) uint32_t odp_packet_seg_data_len(odp_packet_t pkt, odp_packet_seg_t seg) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (odp_unlikely(seg >= pkt_hdr->buf_hdr.segcount)) return 0; @@ -1427,7 +1451,7 @@ uint32_t odp_packet_seg_data_len(odp_packet_t pkt, odp_packet_seg_t seg) int odp_packet_add_data(odp_packet_t *pkt_ptr, uint32_t offset, uint32_t len) { odp_packet_t pkt = *pkt_ptr; - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); uint32_t pktlen = pkt_hdr->frame_len; odp_packet_t newpkt; @@ -1456,7 +1480,7 @@ int odp_packet_add_data(odp_packet_t *pkt_ptr, uint32_t offset, uint32_t len) int odp_packet_rem_data(odp_packet_t *pkt_ptr, uint32_t offset, uint32_t len) { odp_packet_t pkt = *pkt_ptr; - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); uint32_t pktlen = pkt_hdr->frame_len; odp_packet_t newpkt; @@ -1488,7 +1512,7 @@ int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len, int rc; uint32_t shift; uint32_t seglen = 0; /* GCC */ - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(*pkt); void *addr = packet_map(pkt_hdr, offset, &seglen, NULL); uint64_t uaddr = (uint64_t)(uintptr_t)addr; uint64_t misalign; @@ -1526,8 +1550,8 @@ int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len, int odp_packet_concat(odp_packet_t *dst, odp_packet_t src) { - odp_packet_hdr_t *dst_hdr = odp_packet_hdr(*dst); - odp_packet_hdr_t *src_hdr = odp_packet_hdr(src); + odp_packet_hdr_t *dst_hdr = packet_hdr(*dst); + odp_packet_hdr_t *src_hdr = packet_hdr(src); int dst_segs = dst_hdr->buf_hdr.segcount; int src_segs = src_hdr->buf_hdr.segcount; odp_pool_t dst_pool = dst_hdr->buf_hdr.pool_hdl; @@ -1585,7 +1609,7 @@ int odp_packet_split(odp_packet_t *pkt, uint32_t len, odp_packet_t *tail) odp_packet_t odp_packet_copy(odp_packet_t pkt, odp_pool_t pool) { - odp_packet_hdr_t *srchdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *srchdr = packet_hdr(pkt); uint32_t pktlen = srchdr->frame_len; odp_packet_t newpkt = odp_packet_alloc(pool, pktlen); @@ -1623,7 +1647,7 @@ int odp_packet_copy_to_mem(odp_packet_t pkt, uint32_t offset, uint32_t seglen = 0; /* GCC */ uint32_t cpylen; uint8_t *dstaddr = (uint8_t *)dst; - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (offset + len > pkt_hdr->frame_len) return -1; @@ -1647,7 +1671,7 @@ int odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset, uint32_t seglen = 0; /* GCC */ uint32_t cpylen; const uint8_t *srcaddr = (const uint8_t *)src; - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); if (offset + len > pkt_hdr->frame_len) return -1; @@ -1668,8 +1692,8 @@ int odp_packet_copy_from_pkt(odp_packet_t dst, uint32_t dst_offset, odp_packet_t src, uint32_t src_offset, uint32_t len) { - odp_packet_hdr_t *dst_hdr = odp_packet_hdr(dst); - odp_packet_hdr_t *src_hdr = odp_packet_hdr(src); + odp_packet_hdr_t *dst_hdr = packet_hdr(dst); + odp_packet_hdr_t *src_hdr = packet_hdr(src); void *dst_map; void *src_map; uint32_t cpylen, minseg; @@ -1746,10 +1770,11 @@ void odp_packet_print(odp_packet_t pkt) char str[max_len]; int len = 0; int n = max_len - 1; - odp_packet_hdr_t *hdr = odp_packet_hdr(pkt); + odp_packet_hdr_t *hdr = packet_hdr(pkt); + odp_buffer_t buf = _odp_packet_to_buffer(pkt); len += snprintf(&str[len], n - len, "Packet "); - len += odp_buffer_snprint(&str[len], n - len, (odp_buffer_t)pkt); + len += odp_buffer_snprint(&str[len], n - len, buf); len += snprintf(&str[len], n - len, " input_flags 0x%" PRIx64 "\n", hdr->p.input_flags.all); len += snprintf(&str[len], n - len, " error_flags 0x%" PRIx32 "\n", @@ -1794,7 +1819,7 @@ void odp_packet_print(odp_packet_t pkt) int odp_packet_is_valid(odp_packet_t pkt) { - if (odp_buffer_is_valid((odp_buffer_t)pkt) == 0) + if (odp_buffer_is_valid(_odp_packet_to_buffer(pkt)) == 0) return 0; if (odp_event_type(odp_packet_to_event(pkt)) != ODP_EVENT_PACKET) @@ -1812,8 +1837,8 @@ int odp_packet_is_valid(odp_packet_t pkt) int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt) { - odp_packet_hdr_t *srchdr = odp_packet_hdr(srcpkt); - odp_packet_hdr_t *dsthdr = odp_packet_hdr(dstpkt); + odp_packet_hdr_t *srchdr = packet_hdr(srcpkt); + odp_packet_hdr_t *dsthdr = packet_hdr(dstpkt); dsthdr->input = srchdr->input; dsthdr->dst_queue = srchdr->dst_queue;