From patchwork Wed Feb 8 12:19:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 93631 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp2703846obz; Wed, 8 Feb 2017 04:28:08 -0800 (PST) X-Received: by 10.55.72.210 with SMTP id v201mr19124803qka.145.1486556888312; Wed, 08 Feb 2017 04:28:08 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id d5si5462930qtd.297.2017.02.08.04.28.08; Wed, 08 Feb 2017 04:28:08 -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 ED8C2634CC; Wed, 8 Feb 2017 12:28:07 +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 80D99634C9; Wed, 8 Feb 2017 12:23:11 +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 2A272634C9; Wed, 8 Feb 2017 12:23:06 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0120.outbound.protection.outlook.com [104.47.2.120]) by lists.linaro.org (Postfix) with ESMTPS id 54372634C1 for ; Wed, 8 Feb 2017 12:19:50 +0000 (UTC) Received: from VI1PR07CA0109.eurprd07.prod.outlook.com (10.165.229.163) by AMSPR07MB280.eurprd07.prod.outlook.com (10.242.227.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.5; Wed, 8 Feb 2017 12:19:48 +0000 Received: from AM1FFO11FD018.protection.gbl (2a01:111:f400:7e00::111) by VI1PR07CA0109.outlook.office365.com (2a01:111:e400:7a52::35) 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; Wed, 8 Feb 2017 12:19:48 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning linaro.org discourages use of 131.228.2.37 as permitted sender) Received: from hybrid2.ext.net.nokia.com (131.228.2.37) by AM1FFO11FD018.mail.protection.outlook.com (10.174.64.207) 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; Wed, 8 Feb 2017 12:19:48 +0000 Received: from fihe3nok1348.nsn-intra.net (10.158.36.136) by fihe3nok1348.nsn-intra.net (10.158.36.136) with Microsoft SMTP Server (TLS) id 15.1.466.34; Wed, 8 Feb 2017 14:19:47 +0200 Received: from mailrelay.int.nokia.com (10.130.128.21) by fihe3nok1348.nsn-intra.net (10.158.36.136) with Microsoft SMTP Server (TLS) id 15.1.466.34 via Frontend Transport; Wed, 8 Feb 2017 14:19:47 +0200 Received: from fihe3nok0734.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v18CJgtV027390 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 Feb 2017 14:19:42 +0200 Received: from 10.144.19.15 ([10.144.104.219]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v18CJf6L027358 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Wed, 8 Feb 2017 14:19:42 +0200 X-HPESVCS-Source-Ip: 10.144.104.219 From: Petri Savolainen To: Date: Wed, 8 Feb 2017 14:19:41 +0200 Message-ID: <1486556381-22233-6-git-send-email-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1486556381-22233-1-git-send-email-petri.savolainen@linaro.org> References: <1486556381-22233-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.37; IPV:NLI; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(7916002)(39450400003)(39840400002)(39410400002)(39860400002)(39850400002)(2980300002)(199003)(189002)(2906002)(92566002)(97736004)(626004)(8936002)(5660300001)(86362001)(50226002)(50986999)(2351001)(36756003)(81166006)(47776003)(450100001)(53936002)(106466001)(8676002)(356003)(81156014)(5003940100001)(105596002)(2950100002)(33646002)(68736007)(48376002)(189998001)(305945005)(6916009)(110136004)(50466002)(22756006)(76176999)(77096006)(38730400002); DIR:OUT; SFP:1102; SCL:1; SRVR:AMSPR07MB280; H:hybrid2.ext.net.nokia.com; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM1FFO11FD018; 1:YSQ1Vb2kDp3AcrzcA6QqIkxM/ipTf+tyBES42xwrlu8obJzyq5JNWyYIz3lN8m8VXDVaKrX6gJ6MNZJUw+tbYDz+LNeydPAJUMprwxm2V9JQ2fPKMYTIA5NPoyEYcQEpuGg7xzBm8B4scAnCmHibaLuanQYAKtQKXktvsAJYMdpPPf/z8DqT1DIOIVC1FGefAbNxEFw1Kmc5W7F+cr5Y503fGF8bTPYh70MU8AadxnmUT7XuCpoItbBtrYRZ3XAOJPNOqYJZ9QwZJOqDNE72lsP61QNyKoBCZgoph7o9NEMtgge0V+XiDZNm3mOF5j95d7LA5zPrXE/A/nLAP8gVwxoe98L0EGPoEIS31Djdp9TlFjQXqS2nvbMwg80JaKgLi2/0KRh1kexdryrQ9XviMYwLLyGDtug8WOEI4F9zlznbEWKSkBe3hVtwzkpqDEcFJVPDaxwYsFAMG6s0pKg0hxorig6PSX4tWwaFw5tCsGSSOjTB2e1Rr692oSAaNKomooR2hIORoR16uNZAg7q7Bw== X-MS-Office365-Filtering-Correlation-Id: 8b2d7b7f-abdf-4c82-6528-08d4501cc636 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:AMSPR07MB280; X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB280; 3:G5kLXy/rDQiWWNat7xBFMf+M+hWhWihxGGRMxsBuazPhlqN4T0bM/yz0G1EoKYHHE23/4FVmNs0e6HhKMmpkBrF/C/6CgmQCvbrmYO3hzmNZZwuiGXXI54KL6iRuXdimqST/gYCzBZALW6FKjQI9iRZmScB30jOCY2EuArvsdN/yXSGLs9r+CAaCLoCuSFqHxq8/jZJc8HEBATnwCovZCstirElosV/X50ebEeWDy25W0LdPBOZNBEYck2x/ZC1YGc4uT/I6VD5f/DN3w0Eg/ovhBbxL/ORs+ehXfsGoHSKD+bab6g3cVyDZ55AqTGieCImMsJA0xuze+nzZPA8lJsn20Ojg0hnA/QP7xtIqFU7PNNfSdsoyIwxsgDQrOBUd; 25:IOeOFBtSaS7P/JgrGEXDEim02LzY9Rr1xBvJLuJDoaogKuQ3F8c0lXVh6+aa3HMVsyJZ0dArF4erTWl+459LmJtknpQmqzhF3YphnOl1W+srQRjr+84fNMBqLrT/4q8+TsIcN09VmVhMLhawnmKS6SqK3hdje+3Qfe4gzt2oSltnwkvAfAb0GB9yO6c/YII/tE6xiDQA4cb42+4Qg3czyZliljI5SysyyozwgDqCzHXPnvbBcacR8b5PlGNSuxM0n74Kvo6z1avsOeQ6hijWREDBnDXOyPFXjMhQ1b9FRV/Pryeavcl4WomkRVO5DC1mtBvGKbbtTlUWi0p+D1ABNhmT70QU6Y103Px5NAdaagwDu4M0X1E+gWbvQG2fGCJlxKOrEjayZZRJ0V/O78en1ik2IyGMyNrqM62xr7+RFbn9TOJRhSbFIYE2NNYc6ExIwddh1uRgNXgxd0i7AkkzoA== X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB280; 31:jcJfzoV1v/12beHkXfR9+QXZ89NaXSLf1O92TYXcZolzjLStA8SheJk8NRPYDOAHpoRXJ7fLNz4ICBBX0C4dFQccFqoR+HzBGYyMvtJfLK3Xi1C2TewQPAVQmV53cFkn4qbVJ0awQKU00lTKfcHZsL6ENQzWvOpmz//XDCX6urau+bRGTHGSnBKhj9edm9LXk34/UEP4WxVyIbqmuTGa1IeqfJGN/TCKSQsEPXcS7ZHC87Dls/ZWqzJFDE5wnNNO7SSUPXZLl5nT8eq3CEAC9Q==; 20:dH4JQPZQrZAIMU4o7MTraTFDwjBJxszPn0XWVukuPNdZt1W/aEA7RKyYt1D1QX2GoOCVcJI1ZaqSyhUfSxYtjzw3KYfn4zvb1/4cvyRgrCHcIpzsXe1rCUhnzyEIVmKyuOSdhbgqGm3O2hglRbewdJaxTMm5vQatbCZ7IHhw+nwXuXRFIE9u5p2Jq8Pdw54+K4LteZVKSWlS3NnDE/YO4fZv5OKLw8DYIar0kWGZI3nLB5vvL2o7t/P8GmVkj8If378zo11HdRP12/flqBxHt5z9HYUy1zJmR8kAcrpjf5QeKyUqDs2PXIPAFs6YQSWm2rO4A8pyqQcfkJwKx6Csab1ACErH7C2eXBvgH1Hb0O45kOj2AigjJUvZFQNBGPLZZPiX8PM3w2vTiEUFDanRaNd/OnIYXkypv1YrV8OUH4G4qSpzkd1FbeMfd5Y/+7AQLmhPpUBenwt3Vc3K2aLNMhJq6BC3DGG1U0Pqr5lalE7b+xH2VNQ5mFU1YjpTiLPbpUa3JsmfIDVS+VCx0dXADZcutRxycQE+6ZYYhLc4v5IBT54o4spXDsdfVd9MU6sQm91YRfFnOx+myzgOz0N2fSqkiqqFl3WXJ/HOKznWArQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(13016025)(13018025)(5005006)(20170203043)(2017020702029)(3002001)(10201501046)(6055026)(6041248)(20161123564025)(20161123555025)(20161123562025)(20161123560025)(20161123558025)(6072148); SRVR:AMSPR07MB280; BCL:0; PCL:0; RULEID:; SRVR:AMSPR07MB280; X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB280; 4:4Hn/fDQCudBP0uOUmwAlhXdCUyvx3OfVOGnePV2dUsb2iuI6SgG9dCOch4TqlN2G0ck+5ZCZfZESIRC9W5gRoIZKeffwN3yoWX5Ox4InPA4v8lPCU8le6TZKvtHAPGAEyS3QVwl6MnE87uUSFt2LQqejivHqV98zIqrLGhQNWMYQHQ64lA/4j77OvPtrD90keJOOiIhGY81o0Fl87+fTFpQ+l36BSLzuDlJJJf5OPAieL0O8js7LNkESXvZ+lCZ2R9XZoVtwMtlxBDlQvyYJiquPv8N2xHms7KlrAMUSIcmOQwOv9z7p5BWhmU5bGLDrQ3thCDy3bPRJtPSvD0UuSYvF0L/Ls/nc5+TTeHyIdZYXIvsj340VIqL1UZ6CYDbLZPOl88n/M5oIfxEcHnq5dgmHWAeNZbWJb1n3Kju8F7EIP7vLAdkFJkv5a7rDSLW9j1L1vYz0iD30U1BgdRpIV93wB/qjmoa53XSw0rDa85qReJ5EBnF703jH9CL50yhQUlgeK6XogJLa+PDTZC55/AM4es5XOenusfNHzkvVadDDGk+AYSsYLORRJXCih7xGxr+D+DSXaoxEt2+biy8HPZf2Ly9bY5EsxhYO9VvQQgqjiFH4DLpxqdID7PJyOtnNESx8JBX+vkA+S72j2tWUJjBk0cCPezCB5HwAyW2r1kWTYCTwne0CtetFu6jHdyQ7kgQG1uuYu51OKDvHESGhhsog7fLDop1HqPVvDSL7Dco= X-Forefront-PRVS: 0212BDE3BE X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AMSPR07MB280; 23:grKixOSAGBDYq2pbnGBgxxwT7VmMgA6hhfRxHY4qkF?= xPoUk6NOmentfn662mjdZ4/CI5FAcEqta3NdqAcb8BrxT6R2a2n0C108HhZnqcI64dKtnYLtcY99Dhkbd+fgwMSEYv62I7xQE3IsQfrN8L6E3rqWBJZVBh3XIK2oDR7li4t6MVDBOUN7/NRixaL62OUtoK0Vv7A+bdLlgFgcBby1J7zAuRFW079OpKae4EAMZYaKhSkAM0etdj7IF5z6XnTegDdA/sGePAbTcAKlLAc2lbM4x+4N5MgSs7kby1qi5bBapg44MBMP52cXctXlO82bKy58pcqn/jS4tRGCFzUnvo7PIV/hagCZ4Rgm+yZxGO+Nj7aq7NbVdizFhoHKCUO078M8isGA0uH3TAioNtK4J+C3/kndyA89pUEnjCEIrAg35TPGKjgT5z6HB9TZcdPP/D0cQoZCbKnjvf7KR19dbmE+wWBb/5d/IfdPL4bb8NcH7a2BZ5ne2uUsQcApHHuPJZk0HE+T1XFtX+ljcO22I8XiWRs/dpWNIKacbnMECSWNFBSvJfNLcIHQV9ZYX43zMsXBu0oEQLuDtu8z9no5jAM38ixN50fKT7CDex6zGAsJNEo7J8pAnbWjXGT/E6QqrleqpxLKQc4JBkAQjKniU9foQyH4LSgFJuXUhCuUkVhSv4n1cLkncdInM2qfiQGUsOnz7TW1/YVxTBmfjWshV+J4jEsTZCTNJXDb+X0AkB+nxCtXqoV3grko9zyKIGsKAHAvAlVTDKZM/mGhq6jUujEXJmZ++lYt3eClqRyaBA9rCtlzLR4PY/qcD82xnfae4r5e6+cha67L4/D65lHyH2OPrnA68lmsqNEfGU25PRtW3VnMA5VM4pglDsroj0gJCuG+7oNuIyy1O8zIP8D0wyYORhIxeauHKI93vUP258Uko+D6gsJ4y+5l4ww+Aay1Gz6FKhq+sELl54Mg/en251jwJZfkbHQJxHvQ16ZkvIe2oow2TvHzelwjYc1f0MbEd27poQa8sKuU3JLRnQXETVLEpbrTEAE0HiRAafx4kFhpqgVQnrpdumYKaQNUMRHvQFQiqeMbRsXz8YimQYyA== X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB280; 6:kuOa1c5mALZ2arnHc8maDWQIJtrThXMJTmvEtsirM+iyu3hsPh/JyfAGuKkbzuxWN6Ztse+YwjyAG28Mri4FJVvCBiEXKzI2kUzVaJfI64bbs1kNz5xY4TB4KxNU0ZijQz4d5zo+c4soTY4oP+KRfbxebcr8EzH4dy0WCMN91Osh8QUBsoJLQj9ZnOoKEOStj/OyZa5XoScUuVnYr1syR0qxJ6a8HZr+zCZsXtH0JN1+ER2XsIyVzElc/aSItUxIl5l1laycC9LAmgYZrK3bpxZhMVjivNfQxcwolzib2ILqX6X5UudJKImtP66vSuhs3todGpmO9Y1i4Isg4lr/cNLkAq3MhYwi1FLUvurykoi5bO275UVg18/k15Dd25dDI3j7jhOpr5FZEPT1I//V06qSfHf//KSAONyWSfdbmbs=; 5:qK511KfQQ3sr4j6RVEtXlbO0LMXomPPZH9usWRCZxiOd+Ir+/q2SkViWs1NDASw+hvOXXGAAuJResexfD6uDdcwTDNS0GUP1cc+935XYbZlkSGoWDMALrJjSVX2hQvyB48C6i8GvN+Gdew1LL9t+9g==; 24:2vhbF4NqWERgU2Ccy/DgOVrP9CNahYQhIWX0mEustGqBheNY/aqMuIcRENtzf8Y8VxMJlMaFJqoWwK/pRIxeXie6pliKJHI2xJ+Dv4oKMR0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB280; 7:ngKBsg+odrsPGXnx8YT855i/19Tv7h1LkWLyDIPRtfV7dKRYpZ36A8i+5gPpt60Vrb/wRUTTDDpJecN6vdckog/Bm9pJm/U3sa0IC2KNu0kWqN94G6ela6edfb9MFIf7A6zEUs1XzMNLprLJtYLmgO0t+6D2+ugPnBPDjQPGjz+QxrJ45CbL+jEWPR2loxeXBO/HYsSCUQQ+FWAgxz0U+HXhwgUI+9B0PcYauZR+NewCXKjT6FpLDN1WXWBM6zGd932ZogQ+DVRtjp48/Al+BGg9cV99XKku7QBAsjA0jaMJlhkJeg7z8YbwpPM7VCQb9JyjxiM26V5LkkyRDdjYoX+Zrg11lBkzRXcFmxto873A5bGJ2APzYbN0ZNZKwpyKhgJLHjZ261M9wgM8GSvhMorwwpO7DW6IHVg6bANYCypkF3IjKgAt1IvRItnM2JWWskLimr91PRth8salvD4qGuElI3G4LhTwBUGiMvWUZSIGnzDgIgfeNHqOhoKfiMoBwkMjKXYozPEO3OKMKWgqHg== X-OriginatorOrg: nokia.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2017 12:19:48.0062 (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.37]; Helo=[hybrid2.ext.net.nokia.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR07MB280 Subject: [lng-odp] [PATCH 5/5] test: l2fwd: use packet_data 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" Since l2fwd can assume that all packets are Ethernet. Also odp_packet_data() points to the first byte of the frame directly after packet input. Signed-off-by: Petri Savolainen --- test/common_plat/performance/odp_l2fwd.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) -- 2.8.1 diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c index 9864c64..8f5c5e1 100644 --- a/test/common_plat/performance/odp_l2fwd.c +++ b/test/common_plat/performance/odp_l2fwd.c @@ -241,15 +241,13 @@ static inline void fill_eth_addrs(odp_packet_t pkt_tbl[], odp_packet_prefetch(pkt, 0, ODPH_ETHHDR_LEN); - if (odp_packet_has_eth(pkt)) { - eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL); + eth = odp_packet_data(pkt); - if (gbl_args->appl.src_change) - eth->src = gbl_args->port_eth_addr[dst_port]; + if (gbl_args->appl.src_change) + eth->src = gbl_args->port_eth_addr[dst_port]; - if (gbl_args->appl.dst_change) - eth->dst = gbl_args->dst_eth_addr[dst_port]; - } + if (gbl_args->appl.dst_change) + eth->dst = gbl_args->dst_eth_addr[dst_port]; } }