From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0072.outbound.protection.outlook.com [157.56.110.72]) by dpdk.org (Postfix) with ESMTP id 015333977 for ; Wed, 16 Mar 2016 00:24:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=f9gqn7KYeiynltQJFGV2YLoJXqK18JbuljuCyj4SxFY=; b=VxHmSBmYp5b+wu6ILhgUAW/Ij/Me5X3Nvt8b5giNouzIEHInIE66wNVWNSdsAAgJ5VPfbu15ntzvURlK01bJ5r/ejI4LlwX0STa6xUIKM4/PVyHAJnLXrHdOqZMNHZfcgI4RPBxnQPE7diDE/KavrfsetzOgHhoEhdNfpe2ekqE= Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost.localdomain (87.239.222.107) by BLUPR0701MB1026.namprd07.prod.outlook.com (10.160.35.18) with Microsoft SMTP Server (TLS) id 15.1.427.16; Tue, 15 Mar 2016 23:24:03 +0000 From: Maciej Czekaj To: CC: , Date: Wed, 16 Mar 2016 00:23:36 +0100 Message-ID: <1458084216-20942-1-git-send-email-Maciej.Czekaj@caviumnetworks.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [87.239.222.107] X-ClientProxiedBy: HE1PR06CA0078.eurprd06.prod.outlook.com (25.164.28.174) To BLUPR0701MB1026.namprd07.prod.outlook.com (25.160.35.18) X-MS-Office365-Filtering-Correlation-Id: 6c0dc3de-64ae-4b91-12dd-08d34d28e5e8 X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1026; 2:8szYX46UENyYH/DzxfxrTulXL9gHr2t3uFYVsKMudiXIzm4M/uphKZOx96TKIkNp0gtlz955ZSQl9i74WbtqWOL+PEW0WPSdlmgDdYGYDwNtyfpsHl6AVZh3H04oL7J7tQqFud3uDgLeAsWkgUncbiYtoYvxp/n0DppZxL/dhbKRaldX0GiNHeQw9fkA21fA; 3:2NXNZl9pCMkmM4TXWHutTMsVSY2Q5cboHjv9l2x98VPmJp25iAObEHFXXTVIQ5j4IzVsJmOUipyVmZCzv+ta1qhKb0EGKplp9NWhk+BupP7DehYa8fT1dA0wEXPq59PH; 25:QCCeyOt4kOVx3cen5lhpCI2fBeBOHZZtSse2FHxHAW+oqSXUZ86f4B2yC7ww+V3RXOxOXjXn2ke59nyYpfTa8vyNj4iOcB/c6njNO+cF6iA2H3M3ZS7ahWANxpYDEGHwDZkdot5i404YOZAcNq44AdiJ/1YeXO1CbhofKL/jPIzvM5EYgOUDk/DGypd7qpR8lsTXvxFbbqOplRRWyiCWSj0ffBB8zZMUfl0zgwZY5YJMNLWZqa6Cj6fLJtJOkCbJhLQ3VDwnW8UpROA5r8eU6lmTk5mdnfowVCtPeZHBoIVzoC0UQl1cnCZTswA6XUA/mQWQe+v9Y2+C71uBjgIXdQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0701MB1026; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1026; 20:oysvMoJbyxGORhk7SOkQEh1A+LVdfgKZe9HxchI5ZDGZ4PhsaWT+Cz2Of39jV3PZ1y2MF8M0Pmxri7IVl7G0dqPN27qYUmkk0WtzUW2PGn11nYJLj/kxuXUrz+2FuIb8N1+GvWBE8DIO1UpJBhxABjytaVhQbnOBuzwu49DYmpo89TOcHjf3tCIgSkkVC85ExjNZK3gMn0gKzFxB0dUADAO9Ivzcrs3JkXmzlPp1rbxG6wYhf23x08iZzAoTdo0KtQwY6pVrb3jgwdUkQ5dESSsqtiTx//vIX+qkTno+jUO9KlxsW5yQSD2oGS/oSsDdIM+oJK+BKF0nZUm2hyLpqZxVoxs8uDXTOz2UE5/oHhO5MG9Izw76Li+84Bwz4dadVeQhQb9y4yspny5z6x1ZaL5tr8sP16t1lKwgiuTDFeBXiPNMGzJhg8W95kZOMg/1exyq1QG9i3AGO3PmNV1itDZeTz5ARJrCrPnUDdmbI4qplHlEysBTkMJU3wxg5WODDl9XPn49f0vcts613BslxdM6I7QrZW6/0blt/+PC0zoD4YSmPn+wGsudno10jG9TrYR05D2qc4ODTjvyxUPArCbBE0ouoHBDIASg7w8oM5E= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001); SRVR:BLUPR0701MB1026; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0701MB1026; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1026; 4:z074ctu5Gh/Gg1GvqHYn+wfSgwRXqpmeSrZluBmdHt4Z7825SV+grMoMn3MIra16Y1qdIJtTys+Xw5seAKN3NNz+NxIMH/zbyQeoO6/ix/FxwFcDnAdVr0ZvaXma7elwuTrtSyu/e9CLa3NUDGG7wGZLME4ESQ3fYY5TjmpRmBgcdcPAjsRXP0D9oXxZrmo9vXFKogYlh8tNk4iduQQZT3Z93VkIVyMX63b3flIUlePHgmgSzEoQg74qj7c1SEbiBezfIDvtVgMcFukwhJLaotOBWsOQmUonrB1aUfZHdRwhCqOcPolsZvilpldf8xoINhA7KUZfBM0RUw04xaW0gQjpNj3Q/tepFTvGQFHubuXGs4iJgv96nm8jNX7GPRJZ X-Forefront-PRVS: 08828D20BC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(4326007)(36756003)(86362001)(2351001)(50226001)(189998001)(50466002)(66066001)(48376002)(2906002)(5003940100001)(47776003)(42186005)(92566002)(586003)(81166005)(5008740100001)(110136002)(229853001)(50986999)(1096002)(5004730100002)(3846002)(6116002)(77096005)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0701MB1026; H:localhost.localdomain; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1026; 23:UpnLpjORvKFc3vPdxybi+uxjM9VOe9bIQR6jGc3lkVOWw/3P8w+tTE/b8nftwvj2dRuqYTOAZ04ptr3EVGM2eJAeIlexG1oI02ceYfbngbPhqd5HnwAq0PmcPjPIQLr4GY13sEZiREoH7QaEERGsNQtkZsvTD3ANq7KtEI4KQkwWxz7b7ar/Rse/wM5kLw/gV+GsILOD6dhREnegSt+Zja65aM7obKpJI4c35sp3R6rFbFafRNXwAkH7A4QXowOdwAZ8+bqyknkJN8liEWQLsiaVhQJXhl33ha1eXTjCHdxzv98Nlb0I0Y1hDKmB0LjxHpoQszMndrfDc8XwteHE8xvE8VolAVGAXbXlzEL+6S4ONmoJv3ZRLHhiz3yMIyvvJ3Sah0nlQG9X6S5T5KHTHyETY8z5mulAXkG6Pb7cxPdZDwgw8dzreFZIknIGX8tM6ByUpKTcS3ZdK71c7Q8a8YnEaVQ8PaDfq1+sVHowEVDl/JAw7yeHYhlAx5JjOe89tNW7obID4quibwXGrm9SfI1WmnskmUf49tUvoXVaSpIF3lhrUq5wrKRa1Keve3oTcp4l1ucNYljRUisMwEwN16MQkNZ2e03ZsCNQcA7fvmrezGIj/B0YIIiTh0nwlmetlcEKj4hDwuIjnSWkFMFNlM2CsCm3pojLa6GTxxTq9Aycj5YFwvDxZLR1H9h9iw437cElo793gOPDjaj3BH3PCK5DwxjL8VBRVgXyVBkG+4z6g3A6p4c57Te0hQdagbwTQaX8gZ+CEMEZzOqQB8On7VuSIjItSVTgSTrCyyzW/7x7ch/xgSOGEaP8ye2Jz+34 X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1026; 5:xwVhLDMRtbT9u8eTAHyH+emI8ZZ46Cg7yBkVhgzXOfm3zfW0sbClJ774/8C79W6gN9R0GDmyjjxBXEcWblfNf5RRS4ysdUmIbee9gA6c8AYKiNAPjZ88KS6IGZev+ujVdI2rHTD30zVzCYFr1fHFjA==; 24:WD5u4Ps7Opc5ZodTLoglE+FXmxLthqMUm9HeE0Gidxm2DEaiMlgtImqhcn+lhEuk3+c8yDRlU//mEg1gwYNXi1Qm33oO+c76hlZi8PS/35U= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2016 23:24:03.1687 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0701MB1026 Subject: [dpdk-dev] [PATCH] l3fwd: Fix compilation with HASH_MULTI_LOOKUP X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Mar 2016 23:24:06 -0000 --- examples/l3fwd/l3fwd_em_hlm_sse.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/examples/l3fwd/l3fwd_em_hlm_sse.h b/examples/l3fwd/l3fwd_em_hlm_sse.h index d3388da..891ae2e 100644 --- a/examples/l3fwd/l3fwd_em_hlm_sse.h +++ b/examples/l3fwd/l3fwd_em_hlm_sse.h @@ -46,7 +46,7 @@ static inline void em_get_dst_port_ipv4x8(struct lcore_conf *qconf, struct rte_mbuf *m[8], - uint8_t portid, uint16_t dst_port[8]) + uint8_t portid, uint32_t dst_port[8]) { int32_t ret[8]; union ipv4_5tuple_host key[8]; @@ -77,14 +77,14 @@ em_get_dst_port_ipv4x8(struct lcore_conf *qconf, struct rte_mbuf *m[8], sizeof(struct ether_hdr) + offsetof(struct ipv4_hdr, time_to_live))); - key[0].xmm = _mm_and_si128(data[0], mask0); - key[1].xmm = _mm_and_si128(data[1], mask0); - key[2].xmm = _mm_and_si128(data[2], mask0); - key[3].xmm = _mm_and_si128(data[3], mask0); - key[4].xmm = _mm_and_si128(data[4], mask0); - key[5].xmm = _mm_and_si128(data[5], mask0); - key[6].xmm = _mm_and_si128(data[6], mask0); - key[7].xmm = _mm_and_si128(data[7], mask0); + key[0].xmm = _mm_and_si128(data[0], mask0.x); + key[1].xmm = _mm_and_si128(data[1], mask0.x); + key[2].xmm = _mm_and_si128(data[2], mask0.x); + key[3].xmm = _mm_and_si128(data[3], mask0.x); + key[4].xmm = _mm_and_si128(data[4], mask0.x); + key[5].xmm = _mm_and_si128(data[5], mask0.x); + key[6].xmm = _mm_and_si128(data[6], mask0.x); + key[7].xmm = _mm_and_si128(data[7], mask0.x); const void *key_array[8] = {&key[0], &key[1], &key[2], &key[3], &key[4], &key[5], &key[6], &key[7]}; @@ -170,19 +170,19 @@ get_ipv6_5tuple(struct rte_mbuf *m0, __m128i mask0, static inline void em_get_dst_port_ipv6x8(struct lcore_conf *qconf, struct rte_mbuf *m[8], - uint8_t portid, uint16_t dst_port[8]) + uint8_t portid, uint32_t dst_port[8]) { int32_t ret[8]; union ipv6_5tuple_host key[8]; - get_ipv6_5tuple(m[0], mask1, mask2, &key[0]); - get_ipv6_5tuple(m[1], mask1, mask2, &key[1]); - get_ipv6_5tuple(m[2], mask1, mask2, &key[2]); - get_ipv6_5tuple(m[3], mask1, mask2, &key[3]); - get_ipv6_5tuple(m[4], mask1, mask2, &key[4]); - get_ipv6_5tuple(m[5], mask1, mask2, &key[5]); - get_ipv6_5tuple(m[6], mask1, mask2, &key[6]); - get_ipv6_5tuple(m[7], mask1, mask2, &key[7]); + get_ipv6_5tuple(m[0], mask1.x, mask2.x, &key[0]); + get_ipv6_5tuple(m[1], mask1.x, mask2.x, &key[1]); + get_ipv6_5tuple(m[2], mask1.x, mask2.x, &key[2]); + get_ipv6_5tuple(m[3], mask1.x, mask2.x, &key[3]); + get_ipv6_5tuple(m[4], mask1.x, mask2.x, &key[4]); + get_ipv6_5tuple(m[5], mask1.x, mask2.x, &key[5]); + get_ipv6_5tuple(m[6], mask1.x, mask2.x, &key[6]); + get_ipv6_5tuple(m[7], mask1.x, mask2.x, &key[7]); const void *key_array[8] = {&key[0], &key[1], &key[2], &key[3], &key[4], &key[5], &key[6], &key[7]}; @@ -292,7 +292,7 @@ l3fwd_em_send_packets(int nb_rx, struct rte_mbuf **pkts_burst, uint8_t portid, struct lcore_conf *qconf) { int32_t j; - uint16_t dst_port[MAX_PKT_BURST]; + uint32_t dst_port[MAX_PKT_BURST]; /* * Send nb_rx - nb_rx%8 packets -- 1.9.1