From patchwork Wed Dec 6 19:43:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 10096967 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 A5C7C60327 for ; Wed, 6 Dec 2017 19:49:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97E4F297C2 for ; Wed, 6 Dec 2017 19:49:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CE7929930; Wed, 6 Dec 2017 19:49:19 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8467C297C2 for ; Wed, 6 Dec 2017 19:49:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=GsBRmiJ+XLdKgVJ7zoXuL9YbcII7s3E8wun/dNhi6pU=; b=DvIW/L0VLoQNqBQUrOijmdEZay Pt72revTtrwiGm8q5aYPnfomAe9SXz5qYcqYHTP6iuhUVwefdRGD3qpj8cXLAq6Zi49jU7A+0PuAZ lL/bV0F5g3yYYsbL8jxpE/tXxT941tZsWnou8rH2GmL4TGij7S8IQERa6idfLfrbanmAEecS9bl5s /Tw4Ztkip+jM+gvIOZf6fdlAGkyq2G35GWeSRlaoimHyLYKZ1NqeByR54oRvCxLGGtEpje3ZoXa7X vSJej+LmWFnD+uce0Vz+v6sMaN6JIpfkmibhxyGwHzkgdkP/ao1mjoUXVd5NLHW5cs/zkVis31HUo PzGpU4Gw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eMfgy-0003dZ-Ue; Wed, 06 Dec 2017 19:49:16 +0000 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eMfcx-00071x-75 for linux-arm-kernel@lists.infradead.org; Wed, 06 Dec 2017 19:45:12 +0000 Received: by mail-wr0-x242.google.com with SMTP id a41so5117743wra.6 for ; Wed, 06 Dec 2017 11:44:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BL7MNGsFJHzh9iuhaPLwnIKlO2L0viHJHw1NaMe/+d0=; b=DoP3Ra9JcaGQyn2jVGzl+u90f/z3fxxRBRqkoe1OQIliGygn6N47xYs4qLmqEiDqui lp4ITXWEI3skiSyHBVRvKZaIfDokk83Bw/rB4mBsQPxU1gJ62DiBVscsZN+MjhslndE1 7IDzIKzp/lMN+ZuSy3Q3FQ1bGNoIO+f6mYwkc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BL7MNGsFJHzh9iuhaPLwnIKlO2L0viHJHw1NaMe/+d0=; b=iTBYluyFO6ZCAK69CLPHifp1ylqsqsTEp+Xu+sS9Y+FCJDOjkXAyKcVzJIo8BqrlNx mvVT0DlqhH79QM4LaIFTAwOPXqzaJZrDb5SccpWLfMOa4QqJZEOCSgWBJdTUyDhYC0WU zJZiWWg9+/T++KrFMJzRwyuhHJsKqMipkRShDes/kAfSw/ejJMzAeqmiV4fJbItHeCyM tyLYvAq9reUBUwGft1MeWXSoOox2An2X/gqo0CAyl9uP10/JLytLk+NcRbo9o6e8D9p8 RCUB8dE+n70v5kdNSpTwFZ4McKji+aTT8IAnuD06E92ILLnYt76Bm+k7xKplK7OenBtq 0ZdQ== X-Gm-Message-State: AJaThX7Y6FiyREzDkWav6SWpOXN3bFUGRkEGOHVPIrHoMoeZotGncNKf u7X7RCj34qL4v80yA5dtos5/KQ== X-Google-Smtp-Source: AGs4zMYFG0C4Urn15RgC5hzuS7YspmqJYB8N//pxydcRc94mM71lNpYnf+ZlUmYDiyiqlN8aRZjHNw== X-Received: by 10.223.176.27 with SMTP id f27mr21352453wra.105.1512589490251; Wed, 06 Dec 2017 11:44:50 -0800 (PST) Received: from localhost.localdomain ([105.150.171.234]) by smtp.gmail.com with ESMTPSA id b66sm3596594wmh.32.2017.12.06.11.44.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Dec 2017 11:44:49 -0800 (PST) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Subject: [PATCH v3 18/20] crypto: arm64/crc32-ce - yield NEON after every block of input Date: Wed, 6 Dec 2017 19:43:44 +0000 Message-Id: <20171206194346.24393-19-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171206194346.24393-1-ard.biesheuvel@linaro.org> References: <20171206194346.24393-1-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171206_114507_763604_A2AFB791 X-CRM114-Status: GOOD ( 11.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , herbert@gondor.apana.org.au, Ard Biesheuvel , Peter Zijlstra , Catalin Marinas , Sebastian Andrzej Siewior , Will Deacon , Russell King - ARM Linux , Steven Rostedt , Thomas Gleixner , Dave Martin , linux-arm-kernel@lists.infradead.org, linux-rt-users@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Avoid excessive scheduling delays under a preemptible kernel by yielding the NEON after every block of input. Signed-off-by: Ard Biesheuvel --- arch/arm64/crypto/crc32-ce-core.S | 44 ++++++++++++++------ 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/arch/arm64/crypto/crc32-ce-core.S b/arch/arm64/crypto/crc32-ce-core.S index 18f5a8442276..b4ddbb2027e5 100644 --- a/arch/arm64/crypto/crc32-ce-core.S +++ b/arch/arm64/crypto/crc32-ce-core.S @@ -100,9 +100,9 @@ dCONSTANT .req d0 qCONSTANT .req q0 - BUF .req x0 - LEN .req x1 - CRC .req x2 + BUF .req x19 + LEN .req x20 + CRC .req x21 vzr .req v9 @@ -116,13 +116,21 @@ * size_t len, uint crc32) */ ENTRY(crc32_pmull_le) - adr x3, .Lcrc32_constants + frame_push 4, 64 + + adr x22, .Lcrc32_constants b 0f ENTRY(crc32c_pmull_le) - adr x3, .Lcrc32c_constants + frame_push 4, 64 + + adr x22, .Lcrc32c_constants + +0: mov BUF, x0 + mov LEN, x1 + mov CRC, x2 -0: bic LEN, LEN, #15 + bic LEN, LEN, #15 ld1 {v1.16b-v4.16b}, [BUF], #0x40 movi vzr.16b, #0 fmov dCONSTANT, CRC @@ -131,7 +139,7 @@ ENTRY(crc32c_pmull_le) cmp LEN, #0x40 b.lt less_64 - ldr qCONSTANT, [x3] + ldr qCONSTANT, [x22] loop_64: /* 64 bytes Full cache line folding */ sub LEN, LEN, #0x40 @@ -161,10 +169,21 @@ loop_64: /* 64 bytes Full cache line folding */ eor v4.16b, v4.16b, v8.16b cmp LEN, #0x40 - b.ge loop_64 + b.lt less_64 + + if_will_cond_yield_neon + stp q1, q2, [sp, #48] + stp q3, q4, [sp, #80] + do_cond_yield_neon + ldp q1, q2, [sp, #48] + ldp q3, q4, [sp, #80] + ldr qCONSTANT, [x22] + movi vzr.16b, #0 + endif_yield_neon + b loop_64 less_64: /* Folding cache line into 128bit */ - ldr qCONSTANT, [x3, #16] + ldr qCONSTANT, [x22, #16] pmull2 v5.1q, v1.2d, vCONSTANT.2d pmull v1.1q, v1.1d, vCONSTANT.1d @@ -203,8 +222,8 @@ fold_64: eor v1.16b, v1.16b, v2.16b /* final 32-bit fold */ - ldr dCONSTANT, [x3, #32] - ldr d3, [x3, #40] + ldr dCONSTANT, [x22, #32] + ldr d3, [x22, #40] ext v2.16b, v1.16b, vzr.16b, #4 and v1.16b, v1.16b, v3.16b @@ -212,7 +231,7 @@ fold_64: eor v1.16b, v1.16b, v2.16b /* Finish up with the bit-reversed barrett reduction 64 ==> 32 bits */ - ldr qCONSTANT, [x3, #48] + ldr qCONSTANT, [x22, #48] and v2.16b, v1.16b, v3.16b ext v2.16b, vzr.16b, v2.16b, #8 @@ -222,6 +241,7 @@ fold_64: eor v1.16b, v1.16b, v2.16b mov w0, v1.s[1] + frame_pop 4, 64 ret ENDPROC(crc32_pmull_le) ENDPROC(crc32c_pmull_le)