From patchwork Tue Dec 26 10:29:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 122724 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp778826qgn; Tue, 26 Dec 2017 02:30:48 -0800 (PST) X-Google-Smtp-Source: ACJfBovVmj1ogwTj3M6GjmLHBtzkc6qiegcdK+qTEHSjoFUJgD01CDr2DfbKVG7EPJfjPlhtYnLV X-Received: by 10.99.97.66 with SMTP id v63mr22005686pgb.184.1514284248854; Tue, 26 Dec 2017 02:30:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514284248; cv=none; d=google.com; s=arc-20160816; b=IJjewrHEYVDZdMwRbau3CQEF1tFLt4GCwxNx0idttK+RUWAv5gz6SeeMkw4eEeQ1AW QHIo2wHsgEIzLgPuzRkqcPgWqISF1aV4dFoyVqRqptPkwPsGQdJkDnh7hPqy2jIBd+Jd pgghUoCJjAL3AjPw6KsSHtJQAXsB1IJPSyPwIZqUJMvqaavnB/A3ZldsBTrY1/+/tVN3 uRkS8pnhF9bWZ6GFZ4GFA+dKniznOmm3X4UrN1zf9hFaizEB0s+YabXPBDHdN6dbNKlL 7zmLi+63q3MXefcjeLLLQoIXE7Ye9Z0VgN+/NI+/hw7FxhZhYY+tY3eboWewizfxSaqi LGxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=GSksGG/keoBv84vTvvmjhAaMwhFuRQ2s8/necaOLTpk=; b=tX0BoW59cix0+dJecy7RPSFWll8S0ajAV21z6qCGHoC3+1coqpu5j7vGHUIpz3jbTU ReblTBeSn1+ERryDSKXb1U8C78OtDk4lbVkobdKwkHUkD1kfd8lLlVKx+4sdcK6kolqh FkI4TpzjBxAXfCroM1n9D2ShyezH3oeRiePWYdnIpHZOvj5eTqRT9UiYnf+moz0TuB7p S/RJd/nthBCdzkzwfLwfG7OTtDmU7KA3oGRjXazzQo5W3BX4JhRvDPMQoDPTMidn2tdq 1a7SmUSe9FbprLqVC9dP5x81usUktVup122KUs4M10ewVTwiPyCqQI9VasNdJZkNN5Z+ MSxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=RPR5RVth; 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 f12si22504241plo.19.2017.12.26.02.30.48; Tue, 26 Dec 2017 02:30:48 -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=RPR5RVth; 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 S1750805AbdLZKak (ORCPT + 4 others); Tue, 26 Dec 2017 05:30:40 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:45588 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750705AbdLZKaj (ORCPT ); Tue, 26 Dec 2017 05:30:39 -0500 Received: by mail-wm0-f47.google.com with SMTP id 9so34459398wme.4 for ; Tue, 26 Dec 2017 02:30:38 -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; bh=knqu2JwrMdlA7mbnc+KNwNvJaF6B6rrslvu9lspXG+s=; b=RPR5RVthy7LAhGfqLYX1PTCbNYVBCGeXx0KIY0MkypQZoNLApfzt5K+oCAq5dfshmz VJr6Fev6fmMxKrg2wItrl79IFwHzLLs4FhXwSZA8SdWhVTbh2/p0+aBwf0J+QkKKcMv2 pw9z9Rr5WMJmGjUBNnnanLLaWAlvHD5RxqMMg= 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; bh=knqu2JwrMdlA7mbnc+KNwNvJaF6B6rrslvu9lspXG+s=; b=VhxOam+4+eUmOxFoMsDonXpalvyCaUIexAXUsjpKr3RG1LrIFRbOqtzBDmbA3wU4nl uXY79dlqIcg+fjMaGXuLnoqILdNatZ7nPEhA+jeIKyBtHVatwIIeW+EfnlOONXOOsgYr WEp6H4JYSGIxLD70EuAjgJKQeECWG+DoOWZZj7lJzW7aU6kKna5SWhTUjnMyHgfg1C+l lbFunRpv0k6BqWMDgsOWt3bfpaRHvppv/hPlqpdjDq0Bt2LLhqSgWlayF9ArfiUnX6jb u0+qxviMy/KNHBcoXnO7YwJ9KE/u7SkSqvHl81fWsLlL5xn8YoSzc03ps4pjtUm/9ZJq R9aQ== X-Gm-Message-State: AKGB3mKvQME3peuV5GMtruPxlCGt97kodhSvh+rcDxpss77j6CTO46tV INi4wvJwAx0PLUPuDapDIB5b3A== X-Received: by 10.28.107.211 with SMTP id a80mr19973709wmi.71.1514284238011; Tue, 26 Dec 2017 02:30:38 -0800 (PST) Received: from localhost.localdomain ([160.171.216.245]) by smtp.gmail.com with ESMTPSA id l142sm13974036wmb.43.2017.12.26.02.30.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Dec 2017 02:30:37 -0800 (PST) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Cc: 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 v4 00/20] crypto: arm64 - play nice with CONFIG_PREEMPT Date: Tue, 26 Dec 2017 10:29:20 +0000 Message-Id: <20171226102940.26908-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 Sender: linux-rt-users-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org As reported by Sebastian, the way the arm64 NEON crypto code currently keeps kernel mode NEON enabled across calls into skcipher_walk_xxx() is causing problems with RT builds, given that the skcipher walk API may allocate and free temporary buffers it uses to present the input and output arrays to the crypto algorithm in blocksize sized chunks (where blocksize is the natural blocksize of the crypto algorithm), and doing so with NEON enabled means we're alloc/free'ing memory with preemption disabled. This was deliberate: when this code was introduced, each kernel_neon_begin() and kernel_neon_end() call incurred a fixed penalty of storing resp. loading the contents of all NEON registers to/from memory, and so doing it less often had an obvious performance benefit. However, in the mean time, we have refactored the core kernel mode NEON code, and now kernel_neon_begin() only incurs this penalty the first time it is called after entering the kernel, and the NEON register restore is deferred until returning to userland. This means pulling those calls into the loops that iterate over the input/output of the crypto algorithm is not a big deal anymore (although there are some places in the code where we relied on the NEON registers retaining their values between calls) So let's clean this up for arm64: update the NEON based skcipher drivers to no longer keep the NEON enabled when calling into the skcipher walk API. As pointed out by Peter, this only solves part of the problem. So let's tackle it more thoroughly, and update the algorithms to test the NEED_RESCHED flag each time after processing a fixed chunk of input. Changes since v3: - incorporate Dave's feedback on the asm macros to push/pop frames and to yield the NEON conditionally - make frame_push/pop more easy to use, by recording the arguments to frame_push, removing the need to specify them again when calling frame_pop - emit local symbol .Lframe_local_offset to allow code using the frame push/pop macros to index the stack more easily - use the magic \@ macro invocation counter provided by GAS to generate unique labels om the NEON yield macros, rather than relying on chance Changes since v2: - Drop logic to yield only after so many blocks - as it turns out, the throughput of the algorithms that are most likely to be affected by the overhead (GHASH and AES-CE) only drops by ~1% (on Cortex-A57), and if that is inacceptable, you are probably not using CONFIG_PREEMPT in the first place. - Add yield support to the AES-CCM driver - Clean up macros based on feedback from Dave - Given that I had to add stack frame logic to many of these functions, factor it out and wrap it in a couple of macros - Merge the changes to the core asm driver and glue code of the GHASH/GCM driver. The latter was not correct without the former. Changes since v1: - add CRC-T10DIF test vector (#1) - stop using GFP_ATOMIC in scatterwalk API calls, now that they are executed with preemption enabled (#2 - #6) - do some preparatory refactoring on the AES block mode code (#7 - #9) - add yield patches (#10 - #18) - add test patch (#19) - DO NOT MERGE Cc: Dave Martin Cc: Russell King - ARM Linux Cc: Sebastian Andrzej Siewior Cc: Mark Rutland Cc: linux-rt-users@vger.kernel.org Cc: Peter Zijlstra Cc: Catalin Marinas Cc: Will Deacon Cc: Steven Rostedt Cc: Thomas Gleixner Ard Biesheuvel (20): crypto: testmgr - add a new test case for CRC-T10DIF crypto: arm64/aes-ce-ccm - move kernel mode neon en/disable into loop crypto: arm64/aes-blk - move kernel mode neon en/disable into loop crypto: arm64/aes-bs - move kernel mode neon en/disable into loop crypto: arm64/chacha20 - move kernel mode neon en/disable into loop crypto: arm64/aes-blk - remove configurable interleave crypto: arm64/aes-blk - add 4 way interleave to CBC encrypt path crypto: arm64/aes-blk - add 4 way interleave to CBC-MAC encrypt path crypto: arm64/sha256-neon - play nice with CONFIG_PREEMPT kernels arm64: assembler: add utility macros to push/pop stack frames arm64: assembler: add macros to conditionally yield the NEON under PREEMPT crypto: arm64/sha1-ce - yield NEON after every block of input crypto: arm64/sha2-ce - yield NEON after every block of input crypto: arm64/aes-ccm - yield NEON after every block of input crypto: arm64/aes-blk - yield NEON after every block of input crypto: arm64/aes-bs - yield NEON after every block of input crypto: arm64/aes-ghash - yield NEON after every block of input crypto: arm64/crc32-ce - yield NEON after every block of input crypto: arm64/crct10dif-ce - yield NEON after every block of input DO NOT MERGE arch/arm64/crypto/Makefile | 3 - arch/arm64/crypto/aes-ce-ccm-core.S | 150 ++++-- arch/arm64/crypto/aes-ce-ccm-glue.c | 47 +- arch/arm64/crypto/aes-ce.S | 15 +- arch/arm64/crypto/aes-glue.c | 95 ++-- arch/arm64/crypto/aes-modes.S | 562 +++++++++----------- arch/arm64/crypto/aes-neonbs-core.S | 305 ++++++----- arch/arm64/crypto/aes-neonbs-glue.c | 48 +- arch/arm64/crypto/chacha20-neon-glue.c | 12 +- arch/arm64/crypto/crc32-ce-core.S | 40 +- arch/arm64/crypto/crct10dif-ce-core.S | 32 +- arch/arm64/crypto/ghash-ce-core.S | 113 ++-- arch/arm64/crypto/ghash-ce-glue.c | 28 +- arch/arm64/crypto/sha1-ce-core.S | 42 +- arch/arm64/crypto/sha2-ce-core.S | 37 +- arch/arm64/crypto/sha256-glue.c | 36 +- arch/arm64/include/asm/assembler.h | 154 ++++++ arch/arm64/kernel/asm-offsets.c | 2 + crypto/testmgr.h | 259 +++++++++ 19 files changed, 1285 insertions(+), 695 deletions(-) -- 2.11.0 -- 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