From patchwork Tue Oct 10 10:21:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Baronescu X-Patchwork-Id: 9995727 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A38CE60230 for ; Tue, 10 Oct 2017 10:22:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B4FC28450 for ; Tue, 10 Oct 2017 10:22:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8FEAA28488; Tue, 10 Oct 2017 10:22:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0580628450 for ; Tue, 10 Oct 2017 10:22:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752146AbdJJKWJ (ORCPT ); Tue, 10 Oct 2017 06:22:09 -0400 Received: from mail-sn1nam01on0055.outbound.protection.outlook.com ([104.47.32.55]:39461 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751420AbdJJKWH (ORCPT ); Tue, 10 Oct 2017 06:22:07 -0400 Received: from BLUPR0301CA0025.namprd03.prod.outlook.com (10.162.113.163) by CY1PR03MB2364.namprd03.prod.outlook.com (10.166.207.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Tue, 10 Oct 2017 10:22:06 +0000 Received: from BN1AFFO11FD031.protection.gbl (2a01:111:f400:7c10::109) by BLUPR0301CA0025.outlook.office365.com (2a01:111:e400:5259::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7 via Frontend Transport; Tue, 10 Oct 2017 10:22:05 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD031.mail.protection.outlook.com (10.58.52.185) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Tue, 10 Oct 2017 10:22:05 +0000 Received: from zro04tgen01.ea.freescale.net (zro04tgen01.ea.freescale.net [10.171.77.119]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v9AAM2mF005528; Tue, 10 Oct 2017 03:22:03 -0700 From: Robert Baronescu To: CC: , , Robert Baronescu Subject: [PATCH 1/2] crypto: tcrypt - fix S/G table for test_aead_speed() Date: Tue, 10 Oct 2017 13:21:59 +0300 Message-ID: <1507630920-9014-1-git-send-email-robert.baronescu@nxp.com> X-Mailer: git-send-email 1.9.3 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131521045255577942; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7966004)(336005)(376002)(39380400002)(39860400002)(346002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(47776003)(77096006)(8676002)(50226002)(4326008)(6666003)(50986999)(2906002)(53936002)(33646002)(86362001)(68736007)(50466002)(356003)(48376002)(305945005)(36756003)(5003940100001)(85426001)(498600001)(5660300001)(8936002)(189998001)(54906003)(316002)(81156014)(16586007)(97736004)(104016004)(6916009)(81166006)(8656003)(106466001)(2351001)(105606002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB2364; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD031; 1:gedMwRkgS/Zg0XPOnwOeS6hQGfyryReluYQViFTn0LF9letVKlBx+juVLsrzWWBVKVYg2ut2jDI/xg8pOOxZac/zPNVrrveo2r1ne7sspdw/wgQprlSa8rmlo8m+wITN MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: da2a4510-4fe8-4bb9-6156-08d50fc8c169 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017052603199)(201703131430075)(201703131517081); SRVR:CY1PR03MB2364; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2364; 3:h4Bs+6HkgH3WYHKK//ox64eJm7Gdql7v4ES9lC2ghXGxTYFZL3ht5qE6wJTDl/1xtfBTlsH1bOR//W/JxYLbc2KAfJMUF0OgrNi9Uqnm+ntXt3D8hWqz95cGi2ewnH8aVp8XjqFMGrguxctVCCzAv0LYMT8t1bKAntg4Gb1EenV+h5CRJqEpyuPIobr0eJ+qO71un5cOD7P0l4mTncs4JyUIGHqp1XAisB/W93tok40AMnS7EjWuAi/WHZtNzU/uO4EVK7OX2xDJVH+NAOa5xML+uOzEm9CSfN2Ff+kTdPGk715rwpCe7dMedHQD9weEOzajlUBOrX2j2ggrBvozk9yS9ToK8HL9fbXMQPhMMl8=; 25:R6Maqjbp1YxTNAQrYAx8db/MYrmdnl29Rqwl8/0sGBCVDxC1p4PlZVfzD5iTEpyQW13Du+r2bYiR2XFpyhABw42ehmWVan7h6MRDXCU4539CgwcatLHNurQyNM+YA9Lpzg+9fSCMrU1biS09ALiAs8xiSETgIS1VWh1H22ydTpTD1aLeOhXJ637Ap0BCMxWoM6wVYAH+DdjKIua/+FxaWg97uNHXh5e0DTEwof9EWef2WC5NZx+KjNuAqA5+iFA6ydYkaTzYiSpLymAd8Mxj3v9FfezZkyVZZmJy1vX0RAkYtFTxgn/NDBZtibMh1VI0m0AdagFTebACoPVqOLKQso2m8UsK9JzZrZeX0sYivZA= X-MS-TrafficTypeDiagnostic: CY1PR03MB2364: X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2364; 31:MLnmluZJ+F1GlaOJiBh3Yym8rkgbqcP8aYQNAd/p3rTCQqxP8j4pVUM70CN4X/W3h5VzYctoLK5LAGKs12367/I+ytYVLxNQwUuZ7lWEx8klNRoNrczBQJFmBWwSVOrKxIu//owxDc+aPIcs0pb7VQnqgm/1S5o3aR2gekpTIIfWernXZ0sN/R+gV/KU9ZDYtXFOeGMe60uyirrOyD7vQhCH+rRCeTUPgnrrdgnB9Mk=; 4:J5npFUagR/SFMDEfk22LZFn3qHDXmeL74s8507T4EcPPuczC4Ype6ynwj4erSUYhvtaGmKVXjD4954oirFKa8mzsF92GemhPMXN60fVCpDF6kJTDkN413pjJ+YYLRUj0hoAsIrjvmnqMQvRZhB4+rmMmWgJRh6K+qly/hJzI/EJUSomRD47p61n/9fklyLLArG5Yf/Jf0ycNUBr9AEfEPQpIGMH8zix70ytisgkyp9hiIHeH/ThW+qM4aA4mZ0+QY0ENgYdp4nig81KOyCb2iJgcutCNKUyMdGtcMH7N6Dg= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(100000703101)(100105400095)(6055026)(6096035)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123563025)(20161123559100)(20161123565025)(20161123561025)(20161123556025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR03MB2364; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR03MB2364; X-Forefront-PRVS: 04569283F9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB2364; 23:+iiQxylStGnIMJ5HzTmla6yY7jdptfZTUuXiMXDP2?= =?us-ascii?Q?nVdr0U2Ya5jQOJq2QAYyGE7gnayd4cXVhCfZNNUXzTAC278JKUopUP9Bwitc?= =?us-ascii?Q?ulSV9I11Nxv75w9DFvmrRTY7UGbsl0HTYYnIFEcpn8tTVeQfAt5ux2W3j2bL?= =?us-ascii?Q?sYrZAuyXYh81YHSBJaD7THSF7NCYdHPmxZkQRXhiLFfnbXOQfqe6QAJHTvre?= =?us-ascii?Q?EH5CqDYZPojguQYOOHaHo803tPvohtR001RsMHmqnHTzXZ8Y+64uPFq5QRnt?= =?us-ascii?Q?AV/Gy1XnpYAOCcOwKYz+Is8mAXKMScF4cOQuQ5zynkzAYhKc4wzMQy7k/Bqn?= =?us-ascii?Q?8FyQUz/OBmh1EOzFBDnnKrGz4dqI+1F5iUlhSvCXy9DAwuPinpd5AoiRAi9f?= =?us-ascii?Q?/Y4dAbFRBJ99VQC6yWpeeXyI1K18qHw/6yB8ib2L/SEd52GPMZsUTVpzj6km?= =?us-ascii?Q?3v6npv74UrG5OPqAJMw5w5T5tCzOB9hQwcCYH7Lw878GDWJ3zc524xcCuKoY?= =?us-ascii?Q?jCkZhocJ/IwS/tug/EE8UwMjmacq4/Pj0qNuJX98cZcf+4ZOKB+odiSxENMr?= =?us-ascii?Q?7dKhMmZ1GJ4paUQPs/encH6hDPle5F9+Qbj1MvxKYsg9laDxeMw2AAAesDYH?= =?us-ascii?Q?GrsclcC+rz9wLjepRstCUsCYYuCJKl8Q06ECIngnv5kz0rp8grwueEztFprd?= =?us-ascii?Q?b4MsZXY2iI7NDbVNZxJ2IGLlVWcFh2ZFaEmcyNMCRDIZ0AI/Su2xBWAX0b5B?= =?us-ascii?Q?AdoYAsijUWFk7DJPlurI+q4eeRH8q6iwAFDRolXGpOMruzJ3R9u+8cSZQnKI?= =?us-ascii?Q?Dw4kYNQ5ihYn4t9rGmcf2RpWjvpyE6kJQbfVs9OhXexATZxKUb7OaIcP8enT?= =?us-ascii?Q?noyfTG63ssGw1GcEFEHYMBgc8qk5X2U9H/qjot40usBdPWZ2jrl/n+boVn1A?= =?us-ascii?Q?9gwocaDeL0St8q9xSjKD0g4t4qsCv/xx5HzaJ0Co4ccasbXdvP3SVQZePF0B?= =?us-ascii?Q?8hVbNXtnViae9wEW9v6RbDyOHPrwhsaXTODHO4Pdz/qcHdL9jlZ3H7ppHIs9?= =?us-ascii?Q?DTmo9//rofwgwv0Xu52g8XM5b9dnJQrmSvDwtOjfe6qkKZDkBWs4/kIgBzBX?= =?us-ascii?Q?F/yI64VlUbMx4DWLLMV27SdLjkQFBsV?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2364; 6:BuHZ4dP0s+RPENiNUw951uX42c0lE4RiLDZEeWfUSexATTHWx34PewukrIC9rsi/nlcCDrQXve3EC7UvzP2fnM94EMynD81bAhmfpYq3Q3ollTIIUqmUNX4+QwlGOWL0Jzb26PvfhOl7VehlFMsr6SlMUWXFenV9yoQ/GsnEbWTCBXhEYVWSDyNvysfpyprVk8G7VJywa9Ob2MiL12MfMxyT80jvmT/uVC5RPpuSokVPINdeuWa+RSSIUQS60kb3XEtiQY3ItEQqbnt9fTxoeuiB2+ZDoXL0mbli6D+GhEtYe5Hgs6/r5x+Ysba/GVBm6tHOXg+0EHvXb5iZnWiIqg==; 5:ByeIixUnbR2cbqppAIvvSsPfgys9ExawXWtvGxcWjG83sYap/6NXZIOF+wXUKbu6jnYhThLaoEykZzjBe0+TbK+v/059QxRqOMuXamW54MBdUumBgBd9s4llgDpRsd+nngOm+kYgQvzPqQVbUuAS+bDDzBPHgCwtk4uh0TLhjWM=; 24:BJyDEI5WpnqQjKlMm8yZxgsexAk/hjN5WgFfh/wAnl9W9sbgJWPxLlWOnh+YaHmnG99SPB3W6csIy+TuDb/bCFzylv5KGt0lihy11sOFhq0=; 7:208n0fRMxaZ9mu6SOSj0SjKF/D6Aldlnr3WN+niwGySYZnd9O0SHZYwC870J3G9uwHRDrerq7IzQT7HlgM6ZTYrNq87jA0l4QGT0uPVzLX/Wnnle1kJQigPGbvpJ2TebeVli39hdQx9S/0TOlUe8mHYhsHEk4Z4d2l8S8PoDt3AArctQEfPY75FtHQrRg7KFk23ulr+8lyOfCJjskjyvZbGT72Zva+3mRHMhAJMMlBk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2017 10:22:05.3861 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB2364 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In case buffer length is a multiple of PAGE_SIZE, the S/G table is incorrectly generated. Fix this by handling buflen = k * PAGE_SIZE separately. Signed-off-by: Robert Baronescu --- crypto/tcrypt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 0022a18..bd9b66c 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -221,11 +221,13 @@ static void sg_init_aead(struct scatterlist *sg, char *xbuf[XBUFSIZE], } sg_init_table(sg, np + 1); - np--; + if (rem) + np--; for (k = 0; k < np; k++) sg_set_buf(&sg[k + 1], xbuf[k], PAGE_SIZE); - sg_set_buf(&sg[k + 1], xbuf[k], rem); + if (rem) + sg_set_buf(&sg[k + 1], xbuf[k], rem); } static void test_aead_speed(const char *algo, int enc, unsigned int secs,