From patchwork Sat Mar 10 15:21:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 131302 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2244825lja; Sat, 10 Mar 2018 07:23:10 -0800 (PST) X-Google-Smtp-Source: AG47ELvK4YzxfOaeTx+cJTOYxGssbXoHfMAKgvGvijtAdo/6716DuO6mr/S6/4WojNHBx5OIY93w X-Received: by 10.98.247.9 with SMTP id h9mr2268483pfi.212.1520695389938; Sat, 10 Mar 2018 07:23:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520695389; cv=none; d=google.com; s=arc-20160816; b=EJe4WXLs7y6Wqjo/dvBLyGdAw3/m6zJJDguQ9TVhpRR2JykNQlFCAa9iZZGA/s5o4z aju5UeUOOt6lQ50x5CL6GyRTSDNMSH/LDFJT3Fl8Nzvy9EOHvlKb3wwGXN9tFDkMlMmn 2VgggZvkuCMHFKVm8BPvYNA5+Zj3BfDL3lRjUgntxrJqriEfHg6cJCh+sABwwwYhXRGw cWKvCjKNr5NpjKzb+lhSvNbGLd1lEEV7u0GxoyPj4UDVbWCrMaioMrNBfGNB/zlT1Leu GYc0QdZnp6p/QWWykhe4Oj6Y73WYVreYXqRLV8gDkzwSccyTH/wIvDjLWCerLo8gDIRR cVMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=HIaJ2+vYgpjVaRswbk9moKmdBZkLjUoatcf1FGuw1Kk=; b=AsNHIUoYYKcscnYY2Dn6QI72heJNHAJrqsvHB0qvgNWqn0P+wLOivPOolYIboNMlxR Ml6RJdSk2cQWIw+8eCex9eIitTwpfJ+y/Jh0u0/TthmA73rQG6huVPfppiL6vK+kMpG2 XK9j69tJngdNm+LsUB3Gx2ZyTUwdhMmKmETyqRVNRGbe/v6v/hLDIiCoHbZXoD+d/sc3 eKJbGblNrsRpgnuwmpbaahzL1vYn8EaH5y4zwkD3zT29Ts0csOQCwXEE/+k/WoLdtUR3 si0kNVWftHqLnQSdrQXsckxkIoQOR5sqF6uqxG1FwEHSFdnrn89qnqX7F+Xks6qisEbr 6lgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=BlX59uZr; spf=pass (google.com: best guess record for domain of linux-rt-users-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-rt-users-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q16si2824191pfg.221.2018.03.10.07.23.09; Sat, 10 Mar 2018 07:23:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-rt-users-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=BlX59uZr; spf=pass (google.com: best guess record for domain of linux-rt-users-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-rt-users-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932325AbeCJPXI (ORCPT + 4 others); Sat, 10 Mar 2018 10:23:08 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35149 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932333AbeCJPXG (ORCPT ); Sat, 10 Mar 2018 10:23:06 -0500 Received: by mail-wm0-f65.google.com with SMTP id x7so8758697wmc.0 for ; Sat, 10 Mar 2018 07:23:05 -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=b5L/U4UbL5kjXRpLckrVX3q+qInCo8IzJ15unk/D7c0=; b=BlX59uZrJIhgn55fe1G3KrfItzjy3qR0gn6UBxOds1HAum6BqyJzBJv39VjU/48MC4 Z0YdzpM66a1FOheE4l8rum8zy3o5b9+C6+dN1HOip1E0zWU1w3767SHP3iYmKjg7zXx5 tG2sGTeZmWcRWDJk8Co8aW6z0ROZfDMBfIaZE= 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=b5L/U4UbL5kjXRpLckrVX3q+qInCo8IzJ15unk/D7c0=; b=qJzfGd4lKqkj4rUsTbMYd1Z/lg4So9co5kLUdJZrPVPKPJslGWtgtLTYoZhQYtYaZ7 4zY+LHZl4uwFQCUnLZ2nfSuXIKs4CwRvQKAdSY+xsXHMjOR/CL3XM8OlJqpQ2XSLZWTQ E3ueLLblpjPDCC6BQBenQCtLaeJNT80JH+jpb8ppn0QWnHbOsoaWdAYrYlQvD3aIAJbM WFGjvG5iZcxyNdLgKfYvttBdJkEaF/XX6DLjXFNZswgesfTiXpoYcPgcA+bSVfoR3IGc 6u3gLijvXoyEUzmjxWgjpphA36/PMJDVBEbKmHCDo66IVcCIoWFG98LeyzFRYLhNP5bJ G/RA== X-Gm-Message-State: AElRT7H9miWgrep48x8aG33sn97gxxyDUzeRuiWfKAdqBW+jpRHgJ5XZ 5U+C13TGjpQoMEsjdLmNPfD6+A== X-Received: by 10.28.109.90 with SMTP id i87mr1336898wmc.71.1520695385165; Sat, 10 Mar 2018 07:23:05 -0800 (PST) Received: from localhost.localdomain ([105.148.128.186]) by smtp.gmail.com with ESMTPSA id m9sm7027531wrf.13.2018.03.10.07.23.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Mar 2018 07:23:04 -0800 (PST) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Dave Martin , Russell King - ARM Linux , Sebastian Andrzej Siewior , Mark Rutland , linux-rt-users@vger.kernel.org, Peter Zijlstra , Catalin Marinas , Will Deacon , Steven Rostedt , Thomas Gleixner Subject: [PATCH v5 12/23] crypto: arm64/sha1-ce - yield NEON after every block of input Date: Sat, 10 Mar 2018 15:21:57 +0000 Message-Id: <20180310152208.10369-13-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180310152208.10369-1-ard.biesheuvel@linaro.org> References: <20180310152208.10369-1-ard.biesheuvel@linaro.org> Sender: linux-rt-users-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org Avoid excessive scheduling delays under a preemptible kernel by conditionally yielding the NEON after every block of input. Signed-off-by: Ard Biesheuvel --- arch/arm64/crypto/sha1-ce-core.S | 42 ++++++++++++++------ 1 file changed, 29 insertions(+), 13 deletions(-) -- 2.15.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm64/crypto/sha1-ce-core.S b/arch/arm64/crypto/sha1-ce-core.S index 46049850727d..78eb35fb5056 100644 --- a/arch/arm64/crypto/sha1-ce-core.S +++ b/arch/arm64/crypto/sha1-ce-core.S @@ -69,30 +69,36 @@ * int blocks) */ ENTRY(sha1_ce_transform) + frame_push 3 + + mov x19, x0 + mov x20, x1 + mov x21, x2 + /* load round constants */ - loadrc k0.4s, 0x5a827999, w6 +0: loadrc k0.4s, 0x5a827999, w6 loadrc k1.4s, 0x6ed9eba1, w6 loadrc k2.4s, 0x8f1bbcdc, w6 loadrc k3.4s, 0xca62c1d6, w6 /* load state */ - ld1 {dgav.4s}, [x0] - ldr dgb, [x0, #16] + ld1 {dgav.4s}, [x19] + ldr dgb, [x19, #16] /* load sha1_ce_state::finalize */ ldr_l w4, sha1_ce_offsetof_finalize, x4 - ldr w4, [x0, x4] + ldr w4, [x19, x4] /* load input */ -0: ld1 {v8.4s-v11.4s}, [x1], #64 - sub w2, w2, #1 +1: ld1 {v8.4s-v11.4s}, [x20], #64 + sub w21, w21, #1 CPU_LE( rev32 v8.16b, v8.16b ) CPU_LE( rev32 v9.16b, v9.16b ) CPU_LE( rev32 v10.16b, v10.16b ) CPU_LE( rev32 v11.16b, v11.16b ) -1: add t0.4s, v8.4s, k0.4s +2: add t0.4s, v8.4s, k0.4s mov dg0v.16b, dgav.16b add_update c, ev, k0, 8, 9, 10, 11, dgb @@ -123,16 +129,25 @@ CPU_LE( rev32 v11.16b, v11.16b ) add dgbv.2s, dgbv.2s, dg1v.2s add dgav.4s, dgav.4s, dg0v.4s - cbnz w2, 0b + cbz w21, 3f + + if_will_cond_yield_neon + st1 {dgav.4s}, [x19] + str dgb, [x19, #16] + do_cond_yield_neon + b 0b + endif_yield_neon + + b 1b /* * Final block: add padding and total bit count. * Skip if the input size was not a round multiple of the block size, * the padding is handled by the C code in that case. */ - cbz x4, 3f +3: cbz x4, 4f ldr_l w4, sha1_ce_offsetof_count, x4 - ldr x4, [x0, x4] + ldr x4, [x19, x4] movi v9.2d, #0 mov x8, #0x80000000 movi v10.2d, #0 @@ -141,10 +156,11 @@ CPU_LE( rev32 v11.16b, v11.16b ) mov x4, #0 mov v11.d[0], xzr mov v11.d[1], x7 - b 1b + b 2b /* store new state */ -3: st1 {dgav.4s}, [x0] - str dgb, [x0, #16] +4: st1 {dgav.4s}, [x19] + str dgb, [x19, #16] + frame_pop ret ENDPROC(sha1_ce_transform)