From patchwork Fri Oct 5 08:13:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 10627581 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BAF6515A6 for ; Fri, 5 Oct 2018 08:14:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B018F2926F for ; Fri, 5 Oct 2018 08:14:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3E2629277; Fri, 5 Oct 2018 08:14:08 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 79A7E2926F for ; Fri, 5 Oct 2018 08:14:07 +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=/Ig0mE+ygExAOqVoy0tRwi/7P0gQhCcrjsQSRB1X224=; b=Z0myOFjVcBmbLm0osLqEjify9I UXLsr2gzY9xdJmJzApIoEtOarxfJ8QMXcXdj8pSC19r+GboejJM/IG+iqzee0PD4Q0lqVi0T/g5XW 3QYqegtboS3qfMsoWMc8tdOHr4uR0xHzMcp9bAEixAGKn83WomkeN3q1X9Of8EdvMCD9XiWAKGEgn +tFhBvdlGI4NZfZ6bS7i1+eNAA3qlgBTgP2M8N2rIoF/v7fLX+sfJE7xC0Q8PA0JwjAzCcbqTKgAP vsOMSVs+mKS1VZBQBJdh7YLIAdZBZLoJgRyuv8685sBpSya5WrG7veryhauThwCFmDSqaJUmyqVBc lK13VoBg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LFG-00051V-0d; Fri, 05 Oct 2018 08:13:58 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LFA-0004xR-1w for linux-arm-kernel@lists.infradead.org; Fri, 05 Oct 2018 08:13:54 +0000 Received: by mail-wm1-x343.google.com with SMTP id 206-v6so976423wmb.5 for ; Fri, 05 Oct 2018 01:13:41 -0700 (PDT) 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=M974k2iyDJIOjsCt9yr954r2LChEqIlYPLi3JqN8ezM=; b=MWd+hOYP/XT8JhDN37zPYJpwEJYaMjz+DGw/Gv25gw+eg0s/a5gjnsTq2fxMFRjXfa XOMVBcpP7CyWqNHbBWmey7hjHyMNnG+gxrzc/jDFOObGBsroeG0GPzJLFwCtev3yPYQp vVyxleV0C7JUqQAW22vpLbZCcIWLOpw1cxhDg= 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=M974k2iyDJIOjsCt9yr954r2LChEqIlYPLi3JqN8ezM=; b=iEqnV63GXsvM+qqNvAnV7NtVvf4V7mWjl/JLaUpe1sdCNICNJT9ao4Co1SYwCXT202 z5BJZypzH96jaYyGpfgZSSK4rXZeVFClG9EJxXyWq4lm672Xe1Y/jEqfErF0fxeCUYEC JentEYBzxdJHPUPNvfqQfn/rVizQj09SQmICqfsonorgKqBRzIp2hii4ORkBGI81pkay UOpy8LbtVYmxC7YEfPIfOwcgBhjvVIdfdm3ObhEMaIXe0WjoGErUjLPQySPtgwYyZ/z7 E/F+3HUigIF2ACoKlejTxN5TOwPwLt3s5evIqBlbts+cw3ZswoL3UBMpHQakwFo8BBSj A5aA== X-Gm-Message-State: ABuFfohfvCZxqFAEzmcZygJmW/+1STum79iiyghThdSP1u7nr8AqTngJ 0zVYg9piaeVdQkXGHxoa2yg0aQ== X-Google-Smtp-Source: ACcGV614x+adL4bvBW2ETzXeZ17LWqoKCU2QTWwE8UtRdZ8cX4K5Bkp1v89Z9ZQ2IkgyOmpJzyMJig== X-Received: by 2002:a1c:9901:: with SMTP id b1-v6mr4381093wme.15.1538727220155; Fri, 05 Oct 2018 01:13:40 -0700 (PDT) Received: from localhost.localdomain ([2a01:cb1d:112:6f00:697e:67d9:a05d:22c7]) by smtp.gmail.com with ESMTPSA id t4-v6sm6565620wrb.45.2018.10.05.01.13.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 01:13:39 -0700 (PDT) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Subject: [RFC PATCH 1/9] kernel: add support for patchable function pointers Date: Fri, 5 Oct 2018 10:13:25 +0200 Message-Id: <20181005081333.15018-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181005081333.15018-1-ard.biesheuvel@linaro.org> References: <20181005081333.15018-1-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181005_011352_139853_AE53B438 X-CRM114-Status: GOOD ( 17.25 ) 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: "Jason A . Donenfeld" , Peter Zijlstra , Catalin Marinas , Will Deacon , Samuel Neves , Paul Mackerras , Herbert Xu , Richard Weinberger , Eric Biggers , Ingo Molnar , Benjamin Herrenschmidt , Kees Cook , Arnd Bergmann , Andy Lutomirski , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, "Martin K. Petersen" , Ard Biesheuvel , Greg Kroah-Hartman , linux-crypto@vger.kernel.org, Michael Ellerman , Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" 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 Add a function pointer abstraction that can be implemented by the arch in a manner that avoids the downsides of function pointers, i.e., the fact that they are typically located in a writable data section, and their vulnerability to Spectre like defects. The FFP (or fast function pointer) is callable as a function, since the generic incarnation is simply that. However, due to the fact that C does not distinguish between functions and function pointers at the call site, the architecture can instead emit it as a patchable sequence of instructions consisting of ordinary branches. Signed-off-by: Ard Biesheuvel --- arch/Kconfig | 3 ++ include/linux/ffp.h | 43 ++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/arch/Kconfig b/arch/Kconfig index 6801123932a5..2af3442a61d3 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -862,6 +862,9 @@ config HAVE_ARCH_PREL32_RELOCATIONS architectures, and don't require runtime relocation on relocatable kernels. +config HAVE_ARCH_FFP + bool + source "kernel/gcov/Kconfig" source "scripts/gcc-plugins/Kconfig" diff --git a/include/linux/ffp.h b/include/linux/ffp.h new file mode 100644 index 000000000000..8fc3b4c9b38f --- /dev/null +++ b/include/linux/ffp.h @@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __LINUX_FFP_H +#define __LINUX_FFP_H + +#include +#include + +#ifdef CONFIG_HAVE_ARCH_FFP +#include +#else + +struct ffp { + void (**fn)(void); + void (*default_fn)(void); +}; + +#define DECLARE_FFP(_fn, _def) \ + extern typeof(_def) *_fn; \ + extern struct ffp const __ffp_ ## _fn + +#define DEFINE_FFP(_fn, _def) \ + typeof(_def) *_fn = &_def; \ + struct ffp const __ffp_ ## _fn \ + = { (void(**)(void))&_fn, (void(*)(void))&_def }; \ + EXPORT_SYMBOL(__ffp_ ## _fn) + +static inline void ffp_set_target(const struct ffp *m, void *new_fn) +{ + WRITE_ONCE(*m->fn, new_fn); +} + +static inline void ffp_reset_target(const struct ffp *m) +{ + WRITE_ONCE(*m->fn, m->default_fn); +} + +#endif + +#define SET_FFP(_fn, _new) ffp_set_target(&__ffp_ ## _fn, _new) +#define RESET_FFP(_fn) ffp_reset_target(&__ffp_ ## _fn) + +#endif From patchwork Fri Oct 5 08:13:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 10627601 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B77521515 for ; Fri, 5 Oct 2018 08:17:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF4AE29295 for ; Fri, 5 Oct 2018 08:17:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A063F29280; Fri, 5 Oct 2018 08:17:09 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 493B02929B for ; Fri, 5 Oct 2018 08:17:09 +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=+4nlXDVC2yVMfxC60fNWLcviZlET2xtX/Z2zobA0g60=; b=FkTUMmCxPN/GcZj9t5ozEeVrZV qzwnNYQ1uqeTq7mRTm//lLq9Dx7OQE56gyc4ctXJbZpdVGTv6HOpQev+pqezXmqfqqrxnePOHuQ5P 4qVOHWxz6SbiUvbQqT6UbYOBrP7vQ4JHRCrKIFiz+VqaZPjAaiooB8Nbs7Y281JVKE4H9C6Zvgfk7 OcXN4cnzs+fdp/rYKv6tla0+tbTV2s2BFRlKalUG9ocXNFFyMBZy7kqLEVOJL9AupXEk//LJl0V+L 9ZAbP3lKTxTszKSL3Lwr9IgLAHpI1+U5bYlqt22NAEhYjGjIwNV/SZbjARJObjitivH72MslI4BMT QinFiXXA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LI6-0007dd-OE; Fri, 05 Oct 2018 08:16:54 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LFB-0004xV-HH for linux-arm-kernel@lists.infradead.org; Fri, 05 Oct 2018 08:14:04 +0000 Received: by mail-wm1-x344.google.com with SMTP id 143-v6so983091wmf.1 for ; Fri, 05 Oct 2018 01:13:43 -0700 (PDT) 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=Bsz7BDS1SKX9gHYXcW+7Yci+Ue2vSEITfG0cme0MbDA=; b=kI1I9XaciHUjWQntHHKbdAEv8Lm6aYT5IbNk7lfmiPNfZV7PrVjSNpmFq2Jb0VlwbE ZuX3XeBgMPpPy+wOgvVxMR/QHwgKKUOYnCADUKvUpr9aZKOY7+D76TJkI/VCLKkKNez8 +gmvc8uxFGNprC67bkbat2uDXwlxiRbel6D0c= 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=Bsz7BDS1SKX9gHYXcW+7Yci+Ue2vSEITfG0cme0MbDA=; b=jD3gTEp6+0QopSVomXe92N6zMUW3dWYTvfaQECuL6msio3AX5yu3DZCd7qL0dSMr3Y tZUhYCalccKKdZrUoHdyaAUNp2nkx77TnWfKHnWxbvwxPK8pPBd1qYMwPsWuOBbZ48Ka pOoOXWs1zsEjxMR0dji5AVIGzJntBuiG3zIJSoJGPqz58c0ex3SNCx98ypcAJMBjuuef 72LR+NSObGeHOhdBGE1i5FiPQp9jBLNh65sZBxWst6wmvq9/TW6tZjL2QmsQThxfAzcj eO3GvoMz5ySdzeG9FiiPskRaCHXVVkmqVu+eEncSSeqDjiMXu8bxhBvgyoqGN4BwRc03 /mrA== X-Gm-Message-State: ABuFfojXe92lKuutRwjyqNOG2jSfbF5Annb+4PEl5u9S7gVgJxxaQxWe 5Y8a46YY5IopYw5Fvao/LF2y9Q== X-Google-Smtp-Source: ACcGV62etp+lM1HN/t1sYejJBWMbHx2UjdBHB+cI2jGegnJnCQHI4XozZ0fBzC1R8f1Ib4p8VBAR+g== X-Received: by 2002:a1c:14d1:: with SMTP id 200-v6mr7367930wmu.106.1538727221719; Fri, 05 Oct 2018 01:13:41 -0700 (PDT) Received: from localhost.localdomain ([2a01:cb1d:112:6f00:697e:67d9:a05d:22c7]) by smtp.gmail.com with ESMTPSA id t4-v6sm6565620wrb.45.2018.10.05.01.13.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 01:13:40 -0700 (PDT) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Subject: [RFC PATCH 2/9] arm64: kernel: add arch support for patchable function pointers Date: Fri, 5 Oct 2018 10:13:26 +0200 Message-Id: <20181005081333.15018-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181005081333.15018-1-ard.biesheuvel@linaro.org> References: <20181005081333.15018-1-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181005_011353_612678_8ECD2813 X-CRM114-Status: GOOD ( 19.10 ) 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: "Jason A . Donenfeld" , Peter Zijlstra , Catalin Marinas , Will Deacon , Samuel Neves , Paul Mackerras , Herbert Xu , Richard Weinberger , Eric Biggers , Ingo Molnar , Benjamin Herrenschmidt , Kees Cook , Arnd Bergmann , Andy Lutomirski , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, "Martin K. Petersen" , Ard Biesheuvel , Greg Kroah-Hartman , linux-crypto@vger.kernel.org, Michael Ellerman , Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" 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 Implement arm64 support for patchable function pointers by emitting them as branch instructions (and a couple of NOPs in case the new target is out of range of a normal branch instruction.) Signed-off-by: Ard Biesheuvel --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/ffp.h | 35 ++++++++++++++++++++ arch/arm64/kernel/insn.c | 22 ++++++++++++ 3 files changed, 58 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 1b1a0e95c751..db8c9e51c56d 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -102,6 +102,7 @@ config ARM64 select HAVE_ALIGNED_STRUCT_PAGE if SLUB select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_BITREVERSE + select HAVE_ARCH_FFP select HAVE_ARCH_HUGE_VMAP select HAVE_ARCH_JUMP_LABEL select HAVE_ARCH_KASAN if !(ARM64_16K_PAGES && ARM64_VA_BITS_48) diff --git a/arch/arm64/include/asm/ffp.h b/arch/arm64/include/asm/ffp.h new file mode 100644 index 000000000000..678dc1262218 --- /dev/null +++ b/arch/arm64/include/asm/ffp.h @@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASM_FFP_H +#define __ASM_FFP_H + +struct ffp { + u32 insn[5]; + u32 def_branch; +}; + +#define DECLARE_FFP(_fn, _def) \ + extern typeof(_def) _fn; \ + extern struct ffp const __ffp_ ## _fn + +#define DEFINE_FFP(_fn, _def) \ + DECLARE_FFP(_fn, _def); \ + asm(" .pushsection \".text\", \"ax\", %progbits \n" \ + " .align 3 \n" \ + " .globl " #_fn " \n" \ + " .globl __ffp_" #_fn " \n" \ + #_fn " : \n" \ + "__ffp_" #_fn " : \n" \ + " b " #_def " \n" \ + " nop \n" \ + " nop \n" \ + " nop \n" \ + " nop \n" \ + " b " #_def " \n" \ + " .popsection \n"); \ + EXPORT_SYMBOL(__ffp_ ## _fn) + +extern void ffp_set_target(const struct ffp *m, void *new_fn); +extern void ffp_reset_target(const struct ffp *m); + +#endif diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c index 2b3413549734..a2ed547fd171 100644 --- a/arch/arm64/kernel/insn.c +++ b/arch/arm64/kernel/insn.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -1603,3 +1604,24 @@ u32 aarch64_insn_gen_extr(enum aarch64_insn_variant variant, insn = aarch64_insn_encode_register(AARCH64_INSN_REGTYPE_RN, insn, Rn); return aarch64_insn_encode_register(AARCH64_INSN_REGTYPE_RM, insn, Rm); } + +void ffp_set_target(const struct ffp *m, void *new_fn) +{ + u32 branch = aarch64_insn_gen_branch_imm((u64)m, (u64)new_fn, + AARCH64_INSN_BRANCH_NOLINK); + + if (branch == AARCH64_BREAK_FAULT) { + /* TODO out of range - use a PLT sequence instead */ + } else { + aarch64_insn_patch_text((void *[]){ (void *)m }, &branch, 1); + } +} +EXPORT_SYMBOL(ffp_set_target); + +void ffp_reset_target(const struct ffp *m) +{ + u32 branch = le32_to_cpu(m->def_branch); + + aarch64_insn_patch_text((void *[]){ (void *)m }, &branch, 1); +} +EXPORT_SYMBOL(ffp_reset_target); From patchwork Fri Oct 5 08:13:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 10627599 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 28F5315A6 for ; Fri, 5 Oct 2018 08:16:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FC6A28D97 for ; Fri, 5 Oct 2018 08:16:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D9B52929B; Fri, 5 Oct 2018 08:16:28 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 A7DBF28D97 for ; Fri, 5 Oct 2018 08:16:27 +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=tN3NXek3szoGOddya4K4Iv2vpjUj/9HzYuyRtPYHTXs=; b=bhHrdAhGoS2dpgLEOinw5a0aKv L2IZ9AJd5ZLORyxsMnE3Bd/Jvhm3ITUQBGGmag/MeCyqXJ4UBKEG77XA35F6WryF7HoEoyzy9GpVf Pnez5CdENmvJGKxvNWdYSqorClgJ+/NKdSugDevAuNE8jUUBc3+V80a1LAHDG1rDE2AplR0A/5MT/ HlL3iCJZlzF2xlKh9Yw2H+QPGcI5ZvET5nN+pUc1ZxKOEK/2MTUGK4w52RB4AhVoJysoLc/j/mVEo YuGtqqhOCcBbIPqw7KUUnT2J056h2niQU1gjJlH5r5w5/z1eeTmBMBTVT8qXW5FPO/SDRGPYT/bZk Yx44FTGQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LHT-0007NL-SB; Fri, 05 Oct 2018 08:16:15 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LFC-0004xb-ND for linux-arm-kernel@lists.infradead.org; Fri, 05 Oct 2018 08:14:05 +0000 Received: by mail-wr1-x441.google.com with SMTP id 63-v6so12552841wra.11 for ; Fri, 05 Oct 2018 01:13:44 -0700 (PDT) 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=9pEAraO+w5FxZNKwOwU68gCXSvwsp2RrSj23yV0hAkg=; b=e+cypP9O6uanr3tyDWz0c6akRdpCzHEznDk/UGqdh0XmBEz5LaG5BHA8TQpA89x4OX 1yb2GPuTj7EKXgJXcoo8GSSuT10ecGI2deQSCUBfSElkNv+n92lTnZFWQxHmqCgl4FEe ouWG6NoD/o9bqb2rorXsdLVQB0OmZTM4XGPlM= 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=9pEAraO+w5FxZNKwOwU68gCXSvwsp2RrSj23yV0hAkg=; b=VM4TcES7EVb727NqI4M8y1WyW4Q6iTZQH+hYd1YZeBLcCv3sqJTmkSBSTTyszQVy+w 7ln4XlWMpLgTHratGcoXJMK5aHmqir5BAb0v3gN0iM2GjsjRfgdHa3UgX7vo86mGF0CE 3kN9G0J549Snf6A2FS70O2SLOyQhV5GZ50oDh2n1VfTvtwIYTsnsA2h3c6qtYdkXow/E K1QB0f8+AzmvgH7AUzKz4Y29NherAfMaNYNblI7s1jQTqyU9tDO9PSWluGaatCBi1Fzt ziitW6pqjtc+bP9rLToDyZSHYxymQfCjU3wOGGbuYc6x984jMtRNzPcCigJW/5QLu9Od 2J3g== X-Gm-Message-State: ABuFfoiuCKE71lMy+uBP2b8Cyqh9bUDDtw3yT66bFBso7qPWk2LNtLqS ridnWT0ThkPYY18if/N2MbRz1A== X-Google-Smtp-Source: ACcGV62ntJ9ibv6XTTbuRRc5lV5zur1H0clIqrdCTZXin3xHDioy7KJrXqpRM0YbS2pFQWeCAQb7kA== X-Received: by 2002:a5d:610a:: with SMTP id v10-v6mr1391403wrt.308.1538727223269; Fri, 05 Oct 2018 01:13:43 -0700 (PDT) Received: from localhost.localdomain ([2a01:cb1d:112:6f00:697e:67d9:a05d:22c7]) by smtp.gmail.com with ESMTPSA id t4-v6sm6565620wrb.45.2018.10.05.01.13.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 01:13:42 -0700 (PDT) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Subject: [RFC PATCH 3/9] crypto: crc-t10dif - make crc_t10dif a static inline Date: Fri, 5 Oct 2018 10:13:27 +0200 Message-Id: <20181005081333.15018-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181005081333.15018-1-ard.biesheuvel@linaro.org> References: <20181005081333.15018-1-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181005_011354_782748_1C8F6B47 X-CRM114-Status: GOOD ( 15.05 ) 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: "Jason A . Donenfeld" , Peter Zijlstra , Catalin Marinas , Will Deacon , Samuel Neves , Paul Mackerras , Herbert Xu , Richard Weinberger , Eric Biggers , Ingo Molnar , Benjamin Herrenschmidt , Kees Cook , Arnd Bergmann , Andy Lutomirski , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, "Martin K. Petersen" , Ard Biesheuvel , Greg Kroah-Hartman , linux-crypto@vger.kernel.org, Michael Ellerman , Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" 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 crc_t10dif() is a trivial wrapper around crc_t10dif_update() so move it into the header file as a static inline function. Signed-off-by: Ard Biesheuvel --- include/linux/crc-t10dif.h | 6 +++++- lib/crc-t10dif.c | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/linux/crc-t10dif.h b/include/linux/crc-t10dif.h index 6bb0c0bf357b..4dfe09ff4cf2 100644 --- a/include/linux/crc-t10dif.h +++ b/include/linux/crc-t10dif.h @@ -10,7 +10,11 @@ extern __u16 crc_t10dif_generic(__u16 crc, const unsigned char *buffer, size_t len); -extern __u16 crc_t10dif(unsigned char const *, size_t); extern __u16 crc_t10dif_update(__u16 crc, unsigned char const *, size_t); +static inline __u16 crc_t10dif(const unsigned char *buffer, size_t len) +{ + return crc_t10dif_update(0, buffer, len); +} + #endif diff --git a/lib/crc-t10dif.c b/lib/crc-t10dif.c index 4d0d47c1ffbd..036ee664c9e1 100644 --- a/lib/crc-t10dif.c +++ b/lib/crc-t10dif.c @@ -81,12 +81,6 @@ __u16 crc_t10dif_update(__u16 crc, const unsigned char *buffer, size_t len) } EXPORT_SYMBOL(crc_t10dif_update); -__u16 crc_t10dif(const unsigned char *buffer, size_t len) -{ - return crc_t10dif_update(0, buffer, len); -} -EXPORT_SYMBOL(crc_t10dif); - static int __init crc_t10dif_mod_init(void) { crypto_register_notifier(&crc_t10dif_nb); From patchwork Fri Oct 5 08:13:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 10627607 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3425315A6 for ; Fri, 5 Oct 2018 08:23:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1ED29291DF for ; Fri, 5 Oct 2018 08:23:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12AA22920D; Fri, 5 Oct 2018 08:23:59 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 1BCC0291DF for ; Fri, 5 Oct 2018 08:23:58 +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=0sfgzqpjQ1qAUvUwjRxCScSEigAfe2nFNmhrsACDDRk=; b=r4j3aseAA9THUPT8XoR29cIHyX 4EYhfcAySKS0bAcP75TOtE/Ji++j8VFUA5wUEHghTt42KV7K4O3wR5SSlwoio96ywF5Pp9hfu7a/4 6BeWJg5zSOiQ3z29nQRqYuhB2wp1XI9Jqz56E64YmOxC9LiMsQMx1pq6nyYgPCjEFmuXdqmFjTCdq NNB3jb4ckqezwxRHbMgf9krRBQ90zND6wSMln7/UALNvj3MaYLv+nB0bYWX+N2IUFVcVVhgZwLtx+ cpWQ4RfG1e7daATjAll6Gcuq01RomW3IC9SCcqAJ7Zg5AzkyPMRUpr+78YvGLwDWyCtppQ3S5ldLJ FgT/0BGw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LOr-0003lZ-Qb; Fri, 05 Oct 2018 08:23:53 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LFA-0004y4-1e for linux-arm-kernel@lists.infradead.org; Fri, 05 Oct 2018 08:14:05 +0000 Received: by mail-wm1-x343.google.com with SMTP id z204-v6so1014592wmc.5 for ; Fri, 05 Oct 2018 01:13:46 -0700 (PDT) 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=Fxj46aGIQEnRq0OD4ORznr2qDih7cDH3aLP6N+qOvl0=; b=gXy7rzachiFVzs6Se2M3CTfXMoAUkiS5SVsKRnuQfABMagY0ldsXKqAh54BGYqTdSn U6Fo/VGTd+VBruFgC3dHOn5Nt52gnnCryGILncEpkn76GRGnZaB8td4NAV5yQ7L/CVhW q7AcKDZkW5ObEUsX53SNtUTY1m0FgFzci75+E= 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=Fxj46aGIQEnRq0OD4ORznr2qDih7cDH3aLP6N+qOvl0=; b=i/5yuoy7XfpkhCDz5jcj0doTYAEur0Sjj0Dtgktp8aJNAD4MlG3WvXBmF3r3eWuuIF 77euCbgTr/r7DHXdz3kJaRg5SBVLkkZHTuEkMmlheRIj3wc19s+mHV4jSlppjQdcpt8V M9wSyXNXNRr3GYQI8inNUNHNoUNwbfAiDfHvEcVoIjMU7rSimgdIk2Sy5IXDU63M1Nwd j29qnPbWK9eMvstYqFFxIK/1E6w8pHTNUwtWCIBP/dVTccZWQFLh5SnQEi4O1jEzsadS K2MKzLEGnC73qNgSkLnbfT0Y9eq0SX8MrrMHYpowRRU8BJxnMCwUqZ9nHPvceUp1P3VE m4uA== X-Gm-Message-State: ABuFfohyw+ODIIj24mhs4VnygFK0EvKsAfOaVrvPEb1wxd2dsVDNz7rn gRPmPJfrcZsHzM6/XX6Mr0U7fg== X-Google-Smtp-Source: ACcGV63PIP7JmGonCixKxR3dTvqmt4DLL9v59DU4Y2U4I+ObgRJXmtOfaHGka6WgicyXQUQey8jbTg== X-Received: by 2002:a1c:c50f:: with SMTP id v15-v6mr6743333wmf.123.1538727224868; Fri, 05 Oct 2018 01:13:44 -0700 (PDT) Received: from localhost.localdomain ([2a01:cb1d:112:6f00:697e:67d9:a05d:22c7]) by smtp.gmail.com with ESMTPSA id t4-v6sm6565620wrb.45.2018.10.05.01.13.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 01:13:44 -0700 (PDT) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Subject: [RFC PATCH 4/9] crypto: crc-t10dif - use patchable function pointer for core update routine Date: Fri, 5 Oct 2018 10:13:28 +0200 Message-Id: <20181005081333.15018-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181005081333.15018-1-ard.biesheuvel@linaro.org> References: <20181005081333.15018-1-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181005_011352_152126_C1576060 X-CRM114-Status: GOOD ( 26.92 ) 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: "Jason A . Donenfeld" , Peter Zijlstra , Catalin Marinas , Will Deacon , Samuel Neves , Paul Mackerras , Herbert Xu , Richard Weinberger , Eric Biggers , Ingo Molnar , Benjamin Herrenschmidt , Kees Cook , Arnd Bergmann , Andy Lutomirski , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, "Martin K. Petersen" , Ard Biesheuvel , Greg Kroah-Hartman , linux-crypto@vger.kernel.org, Michael Ellerman , Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" 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 Use a patchable function pointer for the core CRC-T10DIF transform so that we can allow modules to supersede this transform based on platform capabilities. Signed-off-by: Ard Biesheuvel --- crypto/Kconfig | 1 + crypto/Makefile | 2 +- crypto/crct10dif_common.c | 82 ----------- include/linux/crc-t10dif.h | 18 ++- lib/Kconfig | 2 - lib/crc-t10dif.c | 143 +++++++------------- 6 files changed, 69 insertions(+), 179 deletions(-) diff --git a/crypto/Kconfig b/crypto/Kconfig index 63ef279322d2..009c736a082e 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -611,6 +611,7 @@ config CRYPTO_CRC32_MIPS config CRYPTO_CRCT10DIF tristate "CRCT10DIF algorithm" select CRYPTO_HASH + select CRCT10DIF help CRC T10 Data Integrity Field computation is being cast as a crypto transform. This allows for faster crc t10 diff diff --git a/crypto/Makefile b/crypto/Makefile index 5c207c76abf7..0c2491a5a657 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -122,7 +122,7 @@ obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o obj-$(CONFIG_CRYPTO_CRC32C) += crc32c_generic.o obj-$(CONFIG_CRYPTO_CRC32) += crc32_generic.o -obj-$(CONFIG_CRYPTO_CRCT10DIF) += crct10dif_common.o crct10dif_generic.o +obj-$(CONFIG_CRYPTO_CRCT10DIF) += crct10dif_generic.o obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o obj-$(CONFIG_CRYPTO_LZO) += lzo.o obj-$(CONFIG_CRYPTO_LZ4) += lz4.o diff --git a/crypto/crct10dif_common.c b/crypto/crct10dif_common.c deleted file mode 100644 index b2fab366f518..000000000000 --- a/crypto/crct10dif_common.c +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Cryptographic API. - * - * T10 Data Integrity Field CRC16 Crypto Transform - * - * Copyright (c) 2007 Oracle Corporation. All rights reserved. - * Written by Martin K. Petersen - * Copyright (C) 2013 Intel Corporation - * Author: Tim Chen - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#include -#include -#include - -/* Table generated using the following polynomium: - * x^16 + x^15 + x^11 + x^9 + x^8 + x^7 + x^5 + x^4 + x^2 + x + 1 - * gt: 0x8bb7 - */ -static const __u16 t10_dif_crc_table[256] = { - 0x0000, 0x8BB7, 0x9CD9, 0x176E, 0xB205, 0x39B2, 0x2EDC, 0xA56B, - 0xEFBD, 0x640A, 0x7364, 0xF8D3, 0x5DB8, 0xD60F, 0xC161, 0x4AD6, - 0x54CD, 0xDF7A, 0xC814, 0x43A3, 0xE6C8, 0x6D7F, 0x7A11, 0xF1A6, - 0xBB70, 0x30C7, 0x27A9, 0xAC1E, 0x0975, 0x82C2, 0x95AC, 0x1E1B, - 0xA99A, 0x222D, 0x3543, 0xBEF4, 0x1B9F, 0x9028, 0x8746, 0x0CF1, - 0x4627, 0xCD90, 0xDAFE, 0x5149, 0xF422, 0x7F95, 0x68FB, 0xE34C, - 0xFD57, 0x76E0, 0x618E, 0xEA39, 0x4F52, 0xC4E5, 0xD38B, 0x583C, - 0x12EA, 0x995D, 0x8E33, 0x0584, 0xA0EF, 0x2B58, 0x3C36, 0xB781, - 0xD883, 0x5334, 0x445A, 0xCFED, 0x6A86, 0xE131, 0xF65F, 0x7DE8, - 0x373E, 0xBC89, 0xABE7, 0x2050, 0x853B, 0x0E8C, 0x19E2, 0x9255, - 0x8C4E, 0x07F9, 0x1097, 0x9B20, 0x3E4B, 0xB5FC, 0xA292, 0x2925, - 0x63F3, 0xE844, 0xFF2A, 0x749D, 0xD1F6, 0x5A41, 0x4D2F, 0xC698, - 0x7119, 0xFAAE, 0xEDC0, 0x6677, 0xC31C, 0x48AB, 0x5FC5, 0xD472, - 0x9EA4, 0x1513, 0x027D, 0x89CA, 0x2CA1, 0xA716, 0xB078, 0x3BCF, - 0x25D4, 0xAE63, 0xB90D, 0x32BA, 0x97D1, 0x1C66, 0x0B08, 0x80BF, - 0xCA69, 0x41DE, 0x56B0, 0xDD07, 0x786C, 0xF3DB, 0xE4B5, 0x6F02, - 0x3AB1, 0xB106, 0xA668, 0x2DDF, 0x88B4, 0x0303, 0x146D, 0x9FDA, - 0xD50C, 0x5EBB, 0x49D5, 0xC262, 0x6709, 0xECBE, 0xFBD0, 0x7067, - 0x6E7C, 0xE5CB, 0xF2A5, 0x7912, 0xDC79, 0x57CE, 0x40A0, 0xCB17, - 0x81C1, 0x0A76, 0x1D18, 0x96AF, 0x33C4, 0xB873, 0xAF1D, 0x24AA, - 0x932B, 0x189C, 0x0FF2, 0x8445, 0x212E, 0xAA99, 0xBDF7, 0x3640, - 0x7C96, 0xF721, 0xE04F, 0x6BF8, 0xCE93, 0x4524, 0x524A, 0xD9FD, - 0xC7E6, 0x4C51, 0x5B3F, 0xD088, 0x75E3, 0xFE54, 0xE93A, 0x628D, - 0x285B, 0xA3EC, 0xB482, 0x3F35, 0x9A5E, 0x11E9, 0x0687, 0x8D30, - 0xE232, 0x6985, 0x7EEB, 0xF55C, 0x5037, 0xDB80, 0xCCEE, 0x4759, - 0x0D8F, 0x8638, 0x9156, 0x1AE1, 0xBF8A, 0x343D, 0x2353, 0xA8E4, - 0xB6FF, 0x3D48, 0x2A26, 0xA191, 0x04FA, 0x8F4D, 0x9823, 0x1394, - 0x5942, 0xD2F5, 0xC59B, 0x4E2C, 0xEB47, 0x60F0, 0x779E, 0xFC29, - 0x4BA8, 0xC01F, 0xD771, 0x5CC6, 0xF9AD, 0x721A, 0x6574, 0xEEC3, - 0xA415, 0x2FA2, 0x38CC, 0xB37B, 0x1610, 0x9DA7, 0x8AC9, 0x017E, - 0x1F65, 0x94D2, 0x83BC, 0x080B, 0xAD60, 0x26D7, 0x31B9, 0xBA0E, - 0xF0D8, 0x7B6F, 0x6C01, 0xE7B6, 0x42DD, 0xC96A, 0xDE04, 0x55B3 -}; - -__u16 crc_t10dif_generic(__u16 crc, const unsigned char *buffer, size_t len) -{ - unsigned int i; - - for (i = 0 ; i < len ; i++) - crc = (crc << 8) ^ t10_dif_crc_table[((crc >> 8) ^ buffer[i]) & 0xff]; - - return crc; -} -EXPORT_SYMBOL(crc_t10dif_generic); - -MODULE_DESCRIPTION("T10 DIF CRC calculation common code"); -MODULE_LICENSE("GPL"); diff --git a/include/linux/crc-t10dif.h b/include/linux/crc-t10dif.h index 4dfe09ff4cf2..ae4f46723f5d 100644 --- a/include/linux/crc-t10dif.h +++ b/include/linux/crc-t10dif.h @@ -3,14 +3,28 @@ #define _LINUX_CRC_T10DIF_H #include +#include +#include #define CRC_T10DIF_DIGEST_SIZE 2 #define CRC_T10DIF_BLOCK_SIZE 1 -#define CRC_T10DIF_STRING "crct10dif" extern __u16 crc_t10dif_generic(__u16 crc, const unsigned char *buffer, size_t len); -extern __u16 crc_t10dif_update(__u16 crc, unsigned char const *, size_t); + +DECLARE_FFP(crc_t10dif_update_arch, crc_t10dif_generic); + +static inline __u16 crc_t10dif_update(__u16 crc, unsigned char const *buffer, + size_t len) +{ + __u16 ret; + + rcu_read_lock(); + ret = crc_t10dif_update_arch(crc, buffer, len); + rcu_read_unlock(); + + return ret; +} static inline __u16 crc_t10dif(const unsigned char *buffer, size_t len) { diff --git a/lib/Kconfig b/lib/Kconfig index a3928d4438b5..01a8a8daf08f 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -89,8 +89,6 @@ config CRC16 config CRC_T10DIF tristate "CRC calculation for the T10 Data Integrity Field" - select CRYPTO - select CRYPTO_CRCT10DIF help This option is only needed if a module that's not in the kernel tree needs to calculate CRC checks for use with the diff --git a/lib/crc-t10dif.c b/lib/crc-t10dif.c index 036ee664c9e1..54dd4b7a763c 100644 --- a/lib/crc-t10dif.c +++ b/lib/crc-t10dif.c @@ -3,9 +3,13 @@ * * Copyright (c) 2007 Oracle Corporation. All rights reserved. * Written by Martin K. Petersen + * Copyright (C) 2013 Intel Corporation + * Author: Tim Chen * - * This source code is licensed under the GNU General Public License, - * Version 2. See the file COPYING for more details. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. */ #include @@ -13,104 +17,59 @@ #include #include #include -#include -#include -#include -#include -static struct crypto_shash __rcu *crct10dif_tfm; -static struct static_key crct10dif_fallback __read_mostly; -static DEFINE_MUTEX(crc_t10dif_mutex); - -static int crc_t10dif_rehash(struct notifier_block *self, unsigned long val, void *data) -{ - struct crypto_alg *alg = data; - struct crypto_shash *new, *old; - - if (val != CRYPTO_MSG_ALG_LOADED || - static_key_false(&crct10dif_fallback) || - strncmp(alg->cra_name, CRC_T10DIF_STRING, strlen(CRC_T10DIF_STRING))) - return 0; - - mutex_lock(&crc_t10dif_mutex); - old = rcu_dereference_protected(crct10dif_tfm, - lockdep_is_held(&crc_t10dif_mutex)); - if (!old) { - mutex_unlock(&crc_t10dif_mutex); - return 0; - } - new = crypto_alloc_shash("crct10dif", 0, 0); - if (IS_ERR(new)) { - mutex_unlock(&crc_t10dif_mutex); - return 0; - } - rcu_assign_pointer(crct10dif_tfm, new); - mutex_unlock(&crc_t10dif_mutex); - - synchronize_rcu(); - crypto_free_shash(old); - return 0; -} - -static struct notifier_block crc_t10dif_nb = { - .notifier_call = crc_t10dif_rehash, +/* Table generated using the following polynomium: + * x^16 + x^15 + x^11 + x^9 + x^8 + x^7 + x^5 + x^4 + x^2 + x + 1 + * gt: 0x8bb7 + */ +static const __u16 t10_dif_crc_table[256] __cacheline_aligned = { + 0x0000, 0x8BB7, 0x9CD9, 0x176E, 0xB205, 0x39B2, 0x2EDC, 0xA56B, + 0xEFBD, 0x640A, 0x7364, 0xF8D3, 0x5DB8, 0xD60F, 0xC161, 0x4AD6, + 0x54CD, 0xDF7A, 0xC814, 0x43A3, 0xE6C8, 0x6D7F, 0x7A11, 0xF1A6, + 0xBB70, 0x30C7, 0x27A9, 0xAC1E, 0x0975, 0x82C2, 0x95AC, 0x1E1B, + 0xA99A, 0x222D, 0x3543, 0xBEF4, 0x1B9F, 0x9028, 0x8746, 0x0CF1, + 0x4627, 0xCD90, 0xDAFE, 0x5149, 0xF422, 0x7F95, 0x68FB, 0xE34C, + 0xFD57, 0x76E0, 0x618E, 0xEA39, 0x4F52, 0xC4E5, 0xD38B, 0x583C, + 0x12EA, 0x995D, 0x8E33, 0x0584, 0xA0EF, 0x2B58, 0x3C36, 0xB781, + 0xD883, 0x5334, 0x445A, 0xCFED, 0x6A86, 0xE131, 0xF65F, 0x7DE8, + 0x373E, 0xBC89, 0xABE7, 0x2050, 0x853B, 0x0E8C, 0x19E2, 0x9255, + 0x8C4E, 0x07F9, 0x1097, 0x9B20, 0x3E4B, 0xB5FC, 0xA292, 0x2925, + 0x63F3, 0xE844, 0xFF2A, 0x749D, 0xD1F6, 0x5A41, 0x4D2F, 0xC698, + 0x7119, 0xFAAE, 0xEDC0, 0x6677, 0xC31C, 0x48AB, 0x5FC5, 0xD472, + 0x9EA4, 0x1513, 0x027D, 0x89CA, 0x2CA1, 0xA716, 0xB078, 0x3BCF, + 0x25D4, 0xAE63, 0xB90D, 0x32BA, 0x97D1, 0x1C66, 0x0B08, 0x80BF, + 0xCA69, 0x41DE, 0x56B0, 0xDD07, 0x786C, 0xF3DB, 0xE4B5, 0x6F02, + 0x3AB1, 0xB106, 0xA668, 0x2DDF, 0x88B4, 0x0303, 0x146D, 0x9FDA, + 0xD50C, 0x5EBB, 0x49D5, 0xC262, 0x6709, 0xECBE, 0xFBD0, 0x7067, + 0x6E7C, 0xE5CB, 0xF2A5, 0x7912, 0xDC79, 0x57CE, 0x40A0, 0xCB17, + 0x81C1, 0x0A76, 0x1D18, 0x96AF, 0x33C4, 0xB873, 0xAF1D, 0x24AA, + 0x932B, 0x189C, 0x0FF2, 0x8445, 0x212E, 0xAA99, 0xBDF7, 0x3640, + 0x7C96, 0xF721, 0xE04F, 0x6BF8, 0xCE93, 0x4524, 0x524A, 0xD9FD, + 0xC7E6, 0x4C51, 0x5B3F, 0xD088, 0x75E3, 0xFE54, 0xE93A, 0x628D, + 0x285B, 0xA3EC, 0xB482, 0x3F35, 0x9A5E, 0x11E9, 0x0687, 0x8D30, + 0xE232, 0x6985, 0x7EEB, 0xF55C, 0x5037, 0xDB80, 0xCCEE, 0x4759, + 0x0D8F, 0x8638, 0x9156, 0x1AE1, 0xBF8A, 0x343D, 0x2353, 0xA8E4, + 0xB6FF, 0x3D48, 0x2A26, 0xA191, 0x04FA, 0x8F4D, 0x9823, 0x1394, + 0x5942, 0xD2F5, 0xC59B, 0x4E2C, 0xEB47, 0x60F0, 0x779E, 0xFC29, + 0x4BA8, 0xC01F, 0xD771, 0x5CC6, 0xF9AD, 0x721A, 0x6574, 0xEEC3, + 0xA415, 0x2FA2, 0x38CC, 0xB37B, 0x1610, 0x9DA7, 0x8AC9, 0x017E, + 0x1F65, 0x94D2, 0x83BC, 0x080B, 0xAD60, 0x26D7, 0x31B9, 0xBA0E, + 0xF0D8, 0x7B6F, 0x6C01, 0xE7B6, 0x42DD, 0xC96A, 0xDE04, 0x55B3 }; -__u16 crc_t10dif_update(__u16 crc, const unsigned char *buffer, size_t len) -{ - struct { - struct shash_desc shash; - char ctx[2]; - } desc; - int err; - - if (static_key_false(&crct10dif_fallback)) - return crc_t10dif_generic(crc, buffer, len); - - rcu_read_lock(); - desc.shash.tfm = rcu_dereference(crct10dif_tfm); - desc.shash.flags = 0; - *(__u16 *)desc.ctx = crc; - - err = crypto_shash_update(&desc.shash, buffer, len); - rcu_read_unlock(); - - BUG_ON(err); - - return *(__u16 *)desc.ctx; -} -EXPORT_SYMBOL(crc_t10dif_update); - -static int __init crc_t10dif_mod_init(void) +__u16 crc_t10dif_generic(__u16 crc, const unsigned char *buffer, size_t len) { - crypto_register_notifier(&crc_t10dif_nb); - crct10dif_tfm = crypto_alloc_shash("crct10dif", 0, 0); - if (IS_ERR(crct10dif_tfm)) { - static_key_slow_inc(&crct10dif_fallback); - crct10dif_tfm = NULL; - } - return 0; -} + unsigned int i; -static void __exit crc_t10dif_mod_fini(void) -{ - crypto_unregister_notifier(&crc_t10dif_nb); - crypto_free_shash(crct10dif_tfm); -} - -module_init(crc_t10dif_mod_init); -module_exit(crc_t10dif_mod_fini); - -static int crc_t10dif_transform_show(char *buffer, const struct kernel_param *kp) -{ - if (static_key_false(&crct10dif_fallback)) - return sprintf(buffer, "fallback\n"); + for (i = 0 ; i < len ; i++) + crc = (crc << 8) ^ t10_dif_crc_table[((crc >> 8) ^ buffer[i]) & 0xff]; - return sprintf(buffer, "%s\n", - crypto_tfm_alg_driver_name(crypto_shash_tfm(crct10dif_tfm))); + return crc; } +EXPORT_SYMBOL(crc_t10dif_generic); -module_param_call(transform, NULL, crc_t10dif_transform_show, NULL, 0644); +DEFINE_FFP(crc_t10dif_update_arch, crc_t10dif_generic); +EXPORT_SYMBOL(crc_t10dif_update_arch); MODULE_DESCRIPTION("T10 DIF CRC calculation"); MODULE_LICENSE("GPL"); From patchwork Fri Oct 5 08:13:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 10627603 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8673315A6 for ; Fri, 5 Oct 2018 08:18:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C87A291AF for ; Fri, 5 Oct 2018 08:18:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F3FE291C3; Fri, 5 Oct 2018 08:18:31 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 139CA291AF for ; Fri, 5 Oct 2018 08:18:30 +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=GK1WPCzG2LVDHiPbA5XiTGXyjrHHr3i/+uYiYuTY07s=; b=Clr97Y/ol8rKwGHseLgKVa/ebG F0GOVeptNDhqZkXC4Ad9YpYUqyDUTg7ppCRiH9Y5TR6JofSXAEcjW9tRlN9RJl7m58VhnEWY7ME+A nGrMExUYtnMDW/JkhDLd57gz5ypaznUc26ZRccwOFORs6kotG+urn06ponRXKNLxOKFo5/lFR1BA/ 5254GBHdC4zhsN3X+WQFOWn2iN1aK186wozEP7vTivhd2fikteZ30aiqoNYEPAyObcXiG6+TbKYGP MZtX5jWuLeXUa41epHjVd/1J3o7tTEhC2mL9wWeatzC6mF/URbMuPJ88E9KF7dxObq6wcCFixI+On 01838S+g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LJR-0008Cl-2p; Fri, 05 Oct 2018 08:18:17 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LFG-0004yQ-6E for linux-arm-kernel@lists.infradead.org; Fri, 05 Oct 2018 08:14:15 +0000 Received: by mail-wm1-x341.google.com with SMTP id z204-v6so1014641wmc.5 for ; Fri, 05 Oct 2018 01:13:47 -0700 (PDT) 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=BPVA95HGlQkQ8R4OJEDdFwk26jpvhoTlnJX6hJlBlqw=; b=de+kc9fsZ4BjBKbbhzZrYUMq4lHYmA2vJFroD9TaHnog+QwlRkYWgz+hr1/fdeK2OC IyauWZM3k2PDGmd0msOw0d3zhlUGxbRNkeYk0lR3xcdIIZuvqGI85mWFDFE6IkdE4zfj NpLaGFTYQMdPLGYkiqxBV67e30UPsXDrw4d4s= 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=BPVA95HGlQkQ8R4OJEDdFwk26jpvhoTlnJX6hJlBlqw=; b=I60MFIdsL1pCNePsdQSoxS52exEpBAW0W8Zz4CzK5pXwNHsWdt+CM315G4mWr3zKbm LsonY5E0TAytgzD8/RXJ0pOAJTNjH3KqD9BXYQkODGjddk5xLIsis5Uep/IYDHl4rDGi WskDrqjg2Hp75B3VPg1E25RLlk8/IvmNmboK+2yP89csAsj11zH13/WXw7qhYXj00rFb qT8Fz6ilbP7MqLJNmsH7WAkUqlNF8tsqGzcFLaLaXI7AVnm4FdecHWuLCnWz3Nz0mgaM GauJrDv+yCpGs8rvnrtcKyEW6+wJDw8RVIxetvVyyf5Mwnh/e+lZ5lflPERFgf1k/Zf+ 1ygg== X-Gm-Message-State: ABuFfogh/8kBYquD1YqdPTVm1XB/5/CXsc8QLrKMAjXbufEOb6i9dcfw DoWJBIVtku7zyztMaxOIqcmTPA== X-Google-Smtp-Source: ACcGV60xeceEtoHxfm1bbZfKafUhAMdCLJMw2SQJGQ5J07UpIu3go71Nyk67nKveVB8EbZmX6TsamQ== X-Received: by 2002:a1c:af07:: with SMTP id y7-v6mr7208461wme.12.1538727226568; Fri, 05 Oct 2018 01:13:46 -0700 (PDT) Received: from localhost.localdomain ([2a01:cb1d:112:6f00:697e:67d9:a05d:22c7]) by smtp.gmail.com with ESMTPSA id t4-v6sm6565620wrb.45.2018.10.05.01.13.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 01:13:45 -0700 (PDT) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Subject: [RFC PATCH 5/9] crypto: crc-t10dif/arm64 - move PMULL based code into core library Date: Fri, 5 Oct 2018 10:13:29 +0200 Message-Id: <20181005081333.15018-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181005081333.15018-1-ard.biesheuvel@linaro.org> References: <20181005081333.15018-1-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181005_011358_259060_8B1F7159 X-CRM114-Status: GOOD ( 18.98 ) 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: "Jason A . Donenfeld" , Peter Zijlstra , Catalin Marinas , Will Deacon , Samuel Neves , Paul Mackerras , Herbert Xu , Richard Weinberger , Eric Biggers , Ingo Molnar , Benjamin Herrenschmidt , Kees Cook , Arnd Bergmann , Andy Lutomirski , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, "Martin K. Petersen" , Ard Biesheuvel , Greg Kroah-Hartman , linux-crypto@vger.kernel.org, Michael Ellerman , Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" 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 Move the PMULL based routines out of the crypto API into the core CRC-T10DIF library. Signed-off-by: Ard Biesheuvel --- arch/arm64/crypto/crct10dif-ce-glue.c | 61 +++++--------------- 1 file changed, 14 insertions(+), 47 deletions(-) diff --git a/arch/arm64/crypto/crct10dif-ce-glue.c b/arch/arm64/crypto/crct10dif-ce-glue.c index b461d62023f2..c67db86aba2c 100644 --- a/arch/arm64/crypto/crct10dif-ce-glue.c +++ b/arch/arm64/crypto/crct10dif-ce-glue.c @@ -10,13 +10,12 @@ #include #include +#include #include #include #include #include -#include - #include #include @@ -25,27 +24,17 @@ asmlinkage u16 crc_t10dif_pmull_p64(u16 init_crc, const u8 buf[], u64 len); asmlinkage u16 crc_t10dif_pmull_p8(u16 init_crc, const u8 buf[], u64 len); -static u16 (*crc_t10dif_pmull)(u16 init_crc, const u8 buf[], u64 len); - -static int crct10dif_init(struct shash_desc *desc) -{ - u16 *crc = shash_desc_ctx(desc); - - *crc = 0; - return 0; -} +DEFINE_FFP(crc_t10dif_pmull, crc_t10dif_pmull_p8); -static int crct10dif_update(struct shash_desc *desc, const u8 *data, - unsigned int length) +static __u16 crct10dif_update_arm64(u16 crc, const u8 *data, unsigned int length) { - u16 *crc = shash_desc_ctx(desc); unsigned int l; if (unlikely((u64)data % CRC_T10DIF_PMULL_CHUNK_SIZE)) { l = min_t(u32, length, CRC_T10DIF_PMULL_CHUNK_SIZE - ((u64)data % CRC_T10DIF_PMULL_CHUNK_SIZE)); - *crc = crc_t10dif_generic(*crc, data, l); + crc = crc_t10dif_generic(crc, data, l); length -= l; data += l; @@ -54,51 +43,31 @@ static int crct10dif_update(struct shash_desc *desc, const u8 *data, if (length > 0) { if (may_use_simd()) { kernel_neon_begin(); - *crc = crc_t10dif_pmull(*crc, data, length); + crc = crc_t10dif_pmull(crc, data, length); kernel_neon_end(); } else { - *crc = crc_t10dif_generic(*crc, data, length); + crc = crc_t10dif_generic(crc, data, length); } } - return 0; -} - -static int crct10dif_final(struct shash_desc *desc, u8 *out) -{ - u16 *crc = shash_desc_ctx(desc); - - *(u16 *)out = *crc; - return 0; + return crc; } -static struct shash_alg crc_t10dif_alg = { - .digestsize = CRC_T10DIF_DIGEST_SIZE, - .init = crct10dif_init, - .update = crct10dif_update, - .final = crct10dif_final, - .descsize = CRC_T10DIF_DIGEST_SIZE, - - .base.cra_name = "crct10dif", - .base.cra_driver_name = "crct10dif-arm64-ce", - .base.cra_priority = 200, - .base.cra_blocksize = CRC_T10DIF_BLOCK_SIZE, - .base.cra_module = THIS_MODULE, -}; - static int __init crc_t10dif_mod_init(void) { if (elf_hwcap & HWCAP_PMULL) - crc_t10dif_pmull = crc_t10dif_pmull_p64; - else - crc_t10dif_pmull = crc_t10dif_pmull_p8; + SET_FFP(crc_t10dif_pmull, crc_t10dif_pmull_p64); - return crypto_register_shash(&crc_t10dif_alg); + SET_FFP(crc_t10dif_update_arch, crct10dif_update_arm64); + + return 0; } static void __exit crc_t10dif_mod_exit(void) { - crypto_unregister_shash(&crc_t10dif_alg); + RESET_FFP(crc_t10dif_update_arch); + /* wait for all users to switch back to the old version */ + synchronize_rcu(); } module_cpu_feature_match(ASIMD, crc_t10dif_mod_init); @@ -106,5 +75,3 @@ module_exit(crc_t10dif_mod_exit); MODULE_AUTHOR("Ard Biesheuvel "); MODULE_LICENSE("GPL v2"); -MODULE_ALIAS_CRYPTO("crct10dif"); -MODULE_ALIAS_CRYPTO("crct10dif-arm64-ce"); From patchwork Fri Oct 5 08:13:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 10627609 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F3DCD1515 for ; Fri, 5 Oct 2018 08:24:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6FA5291DF for ; Fri, 5 Oct 2018 08:24:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D9CE32920D; Fri, 5 Oct 2018 08:24:06 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 7A57F291DF for ; Fri, 5 Oct 2018 08:24:06 +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=3oO1hZPX7uctFyhLuLM6yJOnq5YXDC1U21a3txTdIoE=; b=p7JS1JywQOBXSq6SeksIThsznj yektR2HYFJ4nS2iP0m0mp/cR0CIVssjTNyx4x1B/lrHl1tjyz8o6UHu+rF68rJKF7ZJ/kSa2nNvnz BgsIhseqHV2NRlHzsXu2wKXP9KtDQUtB10K9UBhqLirMgmZsk2e+DUfGiMc3JflwWTa7Ylb5CpX2y xk4FByM8Nx/9Fnn/cSck5kof++UQPa0+hnIHFCVF55YK8ABikQKaNSy9XCLf+EQsBf31/5pAoZi6e M+Ne9Iuah5TwmouzZSMxwSHz8UZInxOHW2bPJq5algVxKn+zjT9klnaX6f6RC8c83XmXKycEmL9Ba 7qUpa34Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LP0-0003of-Pv; Fri, 05 Oct 2018 08:24:02 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LFH-0004yn-Vc for linux-arm-kernel@lists.infradead.org; Fri, 05 Oct 2018 08:14:23 +0000 Received: by mail-wr1-x442.google.com with SMTP id n1-v6so12567207wrt.10 for ; Fri, 05 Oct 2018 01:13:49 -0700 (PDT) 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=W4XNrL/HVz1JFq0EC5F2/AltrGoh1ZboRDNEWdxrwVU=; b=jnwyIatHaYA2n3cTx6guJoyPbr+L3fOA9AOBqx0Y2oMaeF96hobAONVdvSUned1y3s StByQ8z+FybmB6IbckDsErTVElZPazLc7iw2ihFw0/S6pZiXC3Q6LPbxewFO5smDCYZf uOH6PjRG3nJAjWfuYmqeU3mfvrJ5BOnGliwTE= 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=W4XNrL/HVz1JFq0EC5F2/AltrGoh1ZboRDNEWdxrwVU=; b=Au+k/5Bm4sepk0VnyNmo+uwRD869qkTOTgWbjfC/R/3rOfbZ6zeXrF12CA9pfp8pwA s8/IUMl+miawEgHgHP1eX96zq9gzUZCc0ve2jj4k6pcVgAlKmqE6arYzImgLbR9jdeEV YmeFVfOw5sK/ATdYXFQJdaQEpMJUxXB2TxUMPn5XDsYSe7SaJCGp2wVf6mbkMV3ZtHjW 1RvImqF3nV2xJAqejHc91CwQKan/u3qqHNJhYpEm8zE3b9+muP9QW0+UdPSAHo+4ChK6 uReKDS3TYYr5Xg5dWcCVTsM+DZcCiR1xoXodD+AvmIowXjdXlScf9b6mUqMUijNcsJq9 gguQ== X-Gm-Message-State: ABuFfoh85QC/+VsG5rueomfBj9EUfnAtzICNFOf0TQSXMtj9DG74o8Ek 3r70Xd+TIoM2CJxcln0jzpT0XQ== X-Google-Smtp-Source: ACcGV61HoftJXzqiL1l8hk7uMWp9ORWuLz+n27+qFSZw8Ez8l1VEdbwmXm9/Fc00segej20s6XNxjA== X-Received: by 2002:a5d:40cd:: with SMTP id b13-v6mr7838866wrq.133.1538727228189; Fri, 05 Oct 2018 01:13:48 -0700 (PDT) Received: from localhost.localdomain ([2a01:cb1d:112:6f00:697e:67d9:a05d:22c7]) by smtp.gmail.com with ESMTPSA id t4-v6sm6565620wrb.45.2018.10.05.01.13.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 01:13:47 -0700 (PDT) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Subject: [RFC PATCH 6/9] crypto: crc-t10dif/arm - move PMULL based code into core library Date: Fri, 5 Oct 2018 10:13:30 +0200 Message-Id: <20181005081333.15018-7-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181005081333.15018-1-ard.biesheuvel@linaro.org> References: <20181005081333.15018-1-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181005_011400_064561_5DF498EF X-CRM114-Status: GOOD ( 19.56 ) 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: "Jason A . Donenfeld" , Peter Zijlstra , Catalin Marinas , Will Deacon , Samuel Neves , Paul Mackerras , Herbert Xu , Richard Weinberger , Eric Biggers , Ingo Molnar , Benjamin Herrenschmidt , Kees Cook , Arnd Bergmann , Andy Lutomirski , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, "Martin K. Petersen" , Ard Biesheuvel , Greg Kroah-Hartman , linux-crypto@vger.kernel.org, Michael Ellerman , Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" 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 Move the PMULL based routines out of the crypto API into the core CRC-T10DIF library. Signed-off-by: Ard Biesheuvel --- arch/arm/crypto/crct10dif-ce-glue.c | 78 ++++++-------------- 1 file changed, 22 insertions(+), 56 deletions(-) diff --git a/arch/arm/crypto/crct10dif-ce-glue.c b/arch/arm/crypto/crct10dif-ce-glue.c index d428355cf38d..2020d9c29ff1 100644 --- a/arch/arm/crypto/crct10dif-ce-glue.c +++ b/arch/arm/crypto/crct10dif-ce-glue.c @@ -10,12 +10,11 @@ #include #include +#include #include #include #include -#include - #include #include @@ -23,74 +22,42 @@ asmlinkage u16 crc_t10dif_pmull(u16 init_crc, const u8 buf[], u32 len); -static int crct10dif_init(struct shash_desc *desc) +static __u16 crct10dif_update_arm(__u16 crc, const u8 *data, unsigned int length) { - u16 *crc = shash_desc_ctx(desc); - - *crc = 0; - return 0; -} - -static int crct10dif_update(struct shash_desc *desc, const u8 *data, - unsigned int length) -{ - u16 *crc = shash_desc_ctx(desc); unsigned int l; - if (!may_use_simd()) { - *crc = crc_t10dif_generic(*crc, data, length); - } else { - if (unlikely((u32)data % CRC_T10DIF_PMULL_CHUNK_SIZE)) { - l = min_t(u32, length, CRC_T10DIF_PMULL_CHUNK_SIZE - - ((u32)data % CRC_T10DIF_PMULL_CHUNK_SIZE)); + if (!may_use_simd()) + return crc_t10dif_generic(crc, data, length); - *crc = crc_t10dif_generic(*crc, data, l); + if (unlikely((u32)data % CRC_T10DIF_PMULL_CHUNK_SIZE)) { + l = min_t(u32, length, CRC_T10DIF_PMULL_CHUNK_SIZE - + ((u32)data % CRC_T10DIF_PMULL_CHUNK_SIZE)); - length -= l; - data += l; - } - if (length > 0) { - kernel_neon_begin(); - *crc = crc_t10dif_pmull(*crc, data, length); - kernel_neon_end(); - } - } - return 0; -} + crc = crc_t10dif_generic(crc, data, l); -static int crct10dif_final(struct shash_desc *desc, u8 *out) -{ - u16 *crc = shash_desc_ctx(desc); - - *(u16 *)out = *crc; - return 0; + length -= l; + data += l; + } + if (length > 0) { + kernel_neon_begin(); + crc = crc_t10dif_pmull(crc, data, length); + kernel_neon_end(); + } + return crc; } -static struct shash_alg crc_t10dif_alg = { - .digestsize = CRC_T10DIF_DIGEST_SIZE, - .init = crct10dif_init, - .update = crct10dif_update, - .final = crct10dif_final, - .descsize = CRC_T10DIF_DIGEST_SIZE, - - .base.cra_name = "crct10dif", - .base.cra_driver_name = "crct10dif-arm-ce", - .base.cra_priority = 200, - .base.cra_blocksize = CRC_T10DIF_BLOCK_SIZE, - .base.cra_module = THIS_MODULE, -}; - static int __init crc_t10dif_mod_init(void) { - if (!(elf_hwcap2 & HWCAP2_PMULL)) - return -ENODEV; + SET_FFP(crc_t10dif_update_arch, crct10dif_update_arm); - return crypto_register_shash(&crc_t10dif_alg); + return 0; } static void __exit crc_t10dif_mod_exit(void) { - crypto_unregister_shash(&crc_t10dif_alg); + RESET_FFP(crc_t10dif_update_arch); + /* wait for all users to switch back to the old version */ + synchronize_rcu(); } module_init(crc_t10dif_mod_init); @@ -98,4 +65,3 @@ module_exit(crc_t10dif_mod_exit); MODULE_AUTHOR("Ard Biesheuvel "); MODULE_LICENSE("GPL v2"); -MODULE_ALIAS_CRYPTO("crct10dif"); From patchwork Fri Oct 5 08:13:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 10627597 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8F71215A6 for ; Fri, 5 Oct 2018 08:15:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D0EB28D97 for ; Fri, 5 Oct 2018 08:15:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 712D929298; Fri, 5 Oct 2018 08:15:49 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 EB38B28D97 for ; Fri, 5 Oct 2018 08:15:48 +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=syMgyGSoWhZT+mo1c3u27SmXR9TQG42VBlK6vcrG+Ak=; b=LI1fB+ZfGx6X3P7J9DdTkzaVMe 92+nWpwvKStFWQqubXqjdUKEzUf1+k//51hIkzA0eHE4lU6cEWNZsOMHPM49WPiU4cHfyl36hMj86 3G6YDjnieApY//fCtrI0qHXVOdEb9Bo9QGSZvUPkkLV7sj2O7IQKnaReXHnMXri0qkhVcM+qWzch4 4DLGRDrICKFQnwfXpmbERsjySc3yZXEEdrQ3KQWG7SqY74EJR+w9e6McRtyuuP58eKoa9sXXf/3hL HvvDqFfULGqeADSv3LolGdF26OxUgcFimudap8xGTMB5t4UA2QWnaONw0pbRQiJncUjq6u/4VXxto vdJs1HMw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LGq-0006z8-Hl; Fri, 05 Oct 2018 08:15:36 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LFB-0004zB-HD for linux-arm-kernel@lists.infradead.org; Fri, 05 Oct 2018 08:13:58 +0000 Received: by mail-wm1-x344.google.com with SMTP id e187-v6so1036318wmf.0 for ; Fri, 05 Oct 2018 01:13:50 -0700 (PDT) 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=7ykn0kdpAuelX0ufR1lLCrLMFlIy/5JjP//jovQ6hBA=; b=WeDWUysrCM1wTzn7PG9YlepPl9dIJg8fzOw1684WVaduAN0K8vgjCHF+9AEbojUJgw a6lay2dDQi7EbALoyTHW5TVZR0JGZnd8dl/TJiMHR5gduxF+udxOeiLpDmYl4u8nrdr4 Yex3cYKNCM1K4/unt4EPkx1wx8ANl/+NncRN8= 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=7ykn0kdpAuelX0ufR1lLCrLMFlIy/5JjP//jovQ6hBA=; b=KwO3kBHH4obDrnZQDkauShtyn0U/FDvnpLdba9huGJk4w6NjrvqHhyr7nXcAXLMSPx fUvZppUDhAOIBh1ut8vE4/Ro94U2g8hplLEYCtQBQTZIkZnCMmyz9rAr8jV+rtBO67Wz lOMQJu4NN9YTDKVW1TLcaNjLpvk8Ekiws46aR1A51FKtd9f9R6GanIMr7PRnyLHq8V2G ZVMwvfuzih+YIymaHGdl0nGoHWbzd4Rx8g9pz8Q4WyuPLm2idSb2dN6OPQ6N0WWA8j5r l0S6IrzOwis1tfQ8I+kQT3euHbcJR/dkiB1gWYFYEPTDllT5WIFfHM13TJ4h2YYqmT5d SVsQ== X-Gm-Message-State: ABuFfoj0s1orMAmxKS4r4j78trU6Msl91PR/GOU3loDwka2/MqH8hHP5 Tih0d0iynyTn1BNmssaHUOtoQw== X-Google-Smtp-Source: ACcGV63LMyLTdsFROQVq2F8T9xrNbOmEFXJ//dKfIs8ROq4/BvnQT8Qlj0D9nA/4mALqefT70j74+Q== X-Received: by 2002:a1c:9901:: with SMTP id b1-v6mr4381461wme.15.1538727229699; Fri, 05 Oct 2018 01:13:49 -0700 (PDT) Received: from localhost.localdomain ([2a01:cb1d:112:6f00:697e:67d9:a05d:22c7]) by smtp.gmail.com with ESMTPSA id t4-v6sm6565620wrb.45.2018.10.05.01.13.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 01:13:49 -0700 (PDT) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Subject: [RFC PATCH 7/9] crypto: crct10dif/generic - switch crypto API driver to core library Date: Fri, 5 Oct 2018 10:13:31 +0200 Message-Id: <20181005081333.15018-8-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181005081333.15018-1-ard.biesheuvel@linaro.org> References: <20181005081333.15018-1-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181005_011353_569492_0B0FE42B X-CRM114-Status: GOOD ( 16.18 ) 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: "Jason A . Donenfeld" , Peter Zijlstra , Catalin Marinas , Will Deacon , Samuel Neves , Paul Mackerras , Herbert Xu , Richard Weinberger , Eric Biggers , Ingo Molnar , Benjamin Herrenschmidt , Kees Cook , Arnd Bergmann , Andy Lutomirski , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, "Martin K. Petersen" , Ard Biesheuvel , Greg Kroah-Hartman , linux-crypto@vger.kernel.org, Michael Ellerman , Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" 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 Signed-off-by: Ard Biesheuvel --- crypto/crct10dif_generic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/crct10dif_generic.c b/crypto/crct10dif_generic.c index 8e94e29dc6fc..9ea4242c4921 100644 --- a/crypto/crct10dif_generic.c +++ b/crypto/crct10dif_generic.c @@ -53,7 +53,7 @@ static int chksum_update(struct shash_desc *desc, const u8 *data, { struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); - ctx->crc = crc_t10dif_generic(ctx->crc, data, length); + ctx->crc = crc_t10dif_update(ctx->crc, data, length); return 0; } @@ -68,7 +68,7 @@ static int chksum_final(struct shash_desc *desc, u8 *out) static int __chksum_finup(__u16 *crcp, const u8 *data, unsigned int len, u8 *out) { - *(__u16 *)out = crc_t10dif_generic(*crcp, data, len); + *(__u16 *)out = crc_t10dif_update(*crcp, data, len); return 0; } From patchwork Fri Oct 5 08:13:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 10627605 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 53A3A15A6 for ; Fri, 5 Oct 2018 08:19:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A6CE28BDE for ; Fri, 5 Oct 2018 08:19:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3EA5D291DD; Fri, 5 Oct 2018 08:19:09 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 5280C28BDE for ; Fri, 5 Oct 2018 08:19:07 +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=sX6iqjYQmVjrZHVCbWPmeE+PCwg0yViDi3VUzuEQVJg=; b=bkEr13DZhhOK30udQxh7JsfWnW THj9gdZgjZkzRBpp8kkdi9tiefbxnF6Tq6sqpYSHemuk2uu8BVUryNLCOYcfFUiOxcpYvqgJeLc3Z mIn56NnRuJGsUsSTwnDVfPtIlrODMQZjTIXvef8em88cubh9vTNN1wTLVbQ0dLWhS57LRdrzDAhLa GKnIsQttq3arXH9gHYjoTjvBWwOcVo7fRUYEk99TuJKI96lAU0h7ydY3mgJSuvKHss2FKUTYKZ57C dV8xkZHkB3ardE2ooPmGP6UuqmHmFpaW0nNZpfl4I73OotOGsIc2L26t5kTqs4VNCEt6QugdhJF/U ITP3VN4g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LK4-0008T0-PK; Fri, 05 Oct 2018 08:18:56 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LFG-0004zc-6q for linux-arm-kernel@lists.infradead.org; Fri, 05 Oct 2018 08:14:24 +0000 Received: by mail-wm1-x341.google.com with SMTP id 189-v6so986245wmw.2 for ; Fri, 05 Oct 2018 01:13:52 -0700 (PDT) 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=J4kMEdjdjyVuuZO5lYFdItsW+zGD6WfP39sVuKslDsg=; b=e8esmuRCIp6ko/JwvDO3kBBIs0dTMMN1wtG2whhv2f4XMHEle3rjYH89bQUST5qiFq y01wiSYV80GPMjl+jFCfCvbACNJysosMxzXmakYDLal79M0Jvjtc315CNojt1VlrX3wv 1kEIFKnSbXS0TIqiC1s6eOzAaXSjfGUTetKb4= 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=J4kMEdjdjyVuuZO5lYFdItsW+zGD6WfP39sVuKslDsg=; b=ETChxs+IOAHWi2uS1K7PgPWHnjtkTQSveZcrg8+eGCrJD4fByRvRea2AsP6quplCCS qBW4mMAhoaJj6jM68sNQAeiENGO5XPOmDVSDzT3R2gyCCZFoWpiZ1NXkYGqmBZ8MCaZ4 vwfJqY5G6FPTKBn7ssfyv1WTOgkLfHFCITuRA6OiueKJqGKdee348z1HMGIIt0rje4wJ rkquKi+xVaMugZhzwZC1Dw+5e7qNbjD6MP5px7fbKkb+ljTgISBQdob+YLnMp/0blKTn dXOB7VOPlcYBQ9i2S3bMdRIJERz5aRbPE5vDyhaDXv+XA/l/WT1/D6aIa/0wsaIqhtHX ZFWA== X-Gm-Message-State: ABuFfohKOFsXLntLXUCpZNvzmQEM5wXEVTTPW7pj7nKHUqWjmqCqVf9+ K1rdQVw56enxvuke+aOrNYvE3pJrGtM= X-Google-Smtp-Source: ACcGV61Ibe9AAfd/NquSGQgeZdTsN3JKQyq9DGyJgyEhxqZ5dP7RSW7Wle9DnyJkVviljI3UE2oc5w== X-Received: by 2002:a1c:14d1:: with SMTP id 200-v6mr7368323wmu.106.1538727231291; Fri, 05 Oct 2018 01:13:51 -0700 (PDT) Received: from localhost.localdomain ([2a01:cb1d:112:6f00:697e:67d9:a05d:22c7]) by smtp.gmail.com with ESMTPSA id t4-v6sm6565620wrb.45.2018.10.05.01.13.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 01:13:50 -0700 (PDT) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Subject: [RFC PATCH 8/9] crypto: crc-t10dif/powerpc - move PMULL based code into core library Date: Fri, 5 Oct 2018 10:13:32 +0200 Message-Id: <20181005081333.15018-9-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181005081333.15018-1-ard.biesheuvel@linaro.org> References: <20181005081333.15018-1-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181005_011358_263153_C1E594B9 X-CRM114-Status: GOOD ( 18.24 ) 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: "Jason A . Donenfeld" , Peter Zijlstra , Catalin Marinas , Will Deacon , Samuel Neves , Paul Mackerras , Herbert Xu , Richard Weinberger , Eric Biggers , Ingo Molnar , Benjamin Herrenschmidt , Kees Cook , Arnd Bergmann , Andy Lutomirski , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, "Martin K. Petersen" , Ard Biesheuvel , Greg Kroah-Hartman , linux-crypto@vger.kernel.org, Michael Ellerman , Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" 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 Move the PMULL based routines out of the crypto API into the core CRC-T10DIF library. Signed-off-by: Ard Biesheuvel --- arch/powerpc/crypto/crct10dif-vpmsum_glue.c | 55 +++----------------- 1 file changed, 6 insertions(+), 49 deletions(-) diff --git a/arch/powerpc/crypto/crct10dif-vpmsum_glue.c b/arch/powerpc/crypto/crct10dif-vpmsum_glue.c index 02ea277863d1..a4db7ecc0ccc 100644 --- a/arch/powerpc/crypto/crct10dif-vpmsum_glue.c +++ b/arch/powerpc/crypto/crct10dif-vpmsum_glue.c @@ -11,8 +11,8 @@ */ #include -#include #include +#include #include #include #include @@ -63,59 +63,18 @@ static u16 crct10dif_vpmsum(u16 crci, unsigned char const *p, size_t len) return crc & 0xffff; } -static int crct10dif_vpmsum_init(struct shash_desc *desc) -{ - u16 *crc = shash_desc_ctx(desc); - - *crc = 0; - return 0; -} - -static int crct10dif_vpmsum_update(struct shash_desc *desc, const u8 *data, - unsigned int length) -{ - u16 *crc = shash_desc_ctx(desc); - - *crc = crct10dif_vpmsum(*crc, data, length); - - return 0; -} - - -static int crct10dif_vpmsum_final(struct shash_desc *desc, u8 *out) -{ - u16 *crcp = shash_desc_ctx(desc); - - *(u16 *)out = *crcp; - return 0; -} - -static struct shash_alg alg = { - .init = crct10dif_vpmsum_init, - .update = crct10dif_vpmsum_update, - .final = crct10dif_vpmsum_final, - .descsize = CRC_T10DIF_DIGEST_SIZE, - .digestsize = CRC_T10DIF_DIGEST_SIZE, - .base = { - .cra_name = "crct10dif", - .cra_driver_name = "crct10dif-vpmsum", - .cra_priority = 200, - .cra_blocksize = CRC_T10DIF_BLOCK_SIZE, - .cra_module = THIS_MODULE, - } -}; - static int __init crct10dif_vpmsum_mod_init(void) { - if (!cpu_has_feature(CPU_FTR_ARCH_207S)) - return -ENODEV; + SET_FFP(crc_t10dif_update_arch, crct10dif_vpmsum); - return crypto_register_shash(&alg); + return 0; } static void __exit crct10dif_vpmsum_mod_fini(void) { - crypto_unregister_shash(&alg); + RESET_FFP(crc_t10dif_update_arch); + /* wait for all users to switch back to the old version */ + synchronize_rcu(); } module_cpu_feature_match(PPC_MODULE_FEATURE_VEC_CRYPTO, crct10dif_vpmsum_mod_init); @@ -124,5 +83,3 @@ module_exit(crct10dif_vpmsum_mod_fini); MODULE_AUTHOR("Daniel Axtens "); MODULE_DESCRIPTION("CRCT10DIF using vector polynomial multiply-sum instructions"); MODULE_LICENSE("GPL"); -MODULE_ALIAS_CRYPTO("crct10dif"); -MODULE_ALIAS_CRYPTO("crct10dif-vpmsum"); From patchwork Fri Oct 5 08:13:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 10627611 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A07E91515 for ; Fri, 5 Oct 2018 08:24:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93D30291E0 for ; Fri, 5 Oct 2018 08:24:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 863E329214; Fri, 5 Oct 2018 08:24:16 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 082EE291E0 for ; Fri, 5 Oct 2018 08:24:16 +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=K1rlcDVvVUAhzWogPXnt5wtjl+YShh8BSnvmdzuH7w8=; b=EVc4ZSh1tk6te/sgea00uAJtrz SRK+BMrYgM5GhP4kZTclKRtpW9Irx/5xBq0nNrsNpuI2yLCcOdfz1DYsEcQFtgP6CmcbK3hpj6B4a mjrNebDluAGFIYRRYjEG7KrxGAGPxyv2L1VnI0sp2gwt35t6d/kPhCrJWfGNbpPxVStsQa9vEbJ4o kGXOMPXL50dhJOG+tN92rIeTHc/FramlMArp0j7DY+wdUf4RoovadUzq/TbFfCMgX5eAhpLrnfuya LlCFl98X0E4Q2ofQ4wFzgrL3viwDvWNfuNTFVxsZvd0nA4vTY301ts+brIcRkvkl+I1qFQQqOXcEF s5HDisng==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LP9-0003wA-P7; Fri, 05 Oct 2018 08:24:11 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8LFM-00050F-Bq for linux-arm-kernel@lists.infradead.org; Fri, 05 Oct 2018 08:14:26 +0000 Received: by mail-wm1-x343.google.com with SMTP id e187-v6so1036445wmf.0 for ; Fri, 05 Oct 2018 01:13:54 -0700 (PDT) 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=A+1FdRMKX5kWT68MST48ZYdoIobJ5B3kYMhv71JKOAg=; b=PJcLwtVXRuyJPKWbbwJBGaYD/0+A6pH/bRN1v8Ky+MsOeDl1X8nZVqwwcKBgUCWjct PMh/eQPIxbpQRmrMSUG0NVWRyNWL60QRHPjdWY8s3j9dnprSTAVQeym8nwAdgE0Kfn39 qt/i7giQasS5aiIXOxSLGpmt7KZ1soLYUoyuA= 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=A+1FdRMKX5kWT68MST48ZYdoIobJ5B3kYMhv71JKOAg=; b=dFckpSzhviXk2gcIHcEmJ6YkhIQ9IZ3qc9PIHqbpGYUkHmgmOv7x8B14fGyW/DtTbE WJFgjuXdJIIK+Y5U9tePtvXG/qY+SFmS+lWAC8ANro29hisp2JWoMZCBDnHge27HAmBU 842hcEW52eVlt1r4FthitqGlFJk9NyAzbIgKYqhgCAXpmrQJn0xtGJDr0oIr2nkZcMXo bU2CAM9gkXQUnyo2WtDmtbaPT+ZwhFpGCMtsG/dAARureUOJMLFCufeJfPxl4W+eyu7C caA2+HGTwOfZMjwPeCoMwZIJwMm8pSSpimChX7j7xkHsHS2V69AcEZfmZiuISnTBqOZ/ lDpw== X-Gm-Message-State: ABuFfoitl7o90OB4xOtcLz4xEM+h80H2qbNnAdA0/OfbpldgmGEpEUWJ awA/w4hF0F9jFpz9g26BpXr4AQ== X-Google-Smtp-Source: ACcGV61whWAPedlj0YXt2r0zQodYfSJJwK7RNqx61OHr39dNjfuLTcFQbE9SyFx0akoRNcAg/V4cJg== X-Received: by 2002:a1c:9e8f:: with SMTP id h137-v6mr380822wme.142.1538727232789; Fri, 05 Oct 2018 01:13:52 -0700 (PDT) Received: from localhost.localdomain ([2a01:cb1d:112:6f00:697e:67d9:a05d:22c7]) by smtp.gmail.com with ESMTPSA id t4-v6sm6565620wrb.45.2018.10.05.01.13.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 01:13:52 -0700 (PDT) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Subject: [RFC PATCH 9/9] crypto: crc-t10dif/x86 - move PMULL based code into core library Date: Fri, 5 Oct 2018 10:13:33 +0200 Message-Id: <20181005081333.15018-10-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181005081333.15018-1-ard.biesheuvel@linaro.org> References: <20181005081333.15018-1-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181005_011404_497580_0CEDA816 X-CRM114-Status: GOOD ( 18.95 ) 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: "Jason A . Donenfeld" , Peter Zijlstra , Catalin Marinas , Will Deacon , Samuel Neves , Paul Mackerras , Herbert Xu , Richard Weinberger , Eric Biggers , Ingo Molnar , Benjamin Herrenschmidt , Kees Cook , Arnd Bergmann , Andy Lutomirski , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, "Martin K. Petersen" , Ard Biesheuvel , Greg Kroah-Hartman , linux-crypto@vger.kernel.org, Michael Ellerman , Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" 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 Move the PMULL based routines out of the crypto API into the core CRC-T10DIF library. Signed-off-by: Ard Biesheuvel --- arch/x86/crypto/crct10dif-pclmul_glue.c | 98 +++----------------- 1 file changed, 13 insertions(+), 85 deletions(-) diff --git a/arch/x86/crypto/crct10dif-pclmul_glue.c b/arch/x86/crypto/crct10dif-pclmul_glue.c index cd4df9322501..47f0017ad7f3 100644 --- a/arch/x86/crypto/crct10dif-pclmul_glue.c +++ b/arch/x86/crypto/crct10dif-pclmul_glue.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -36,90 +36,17 @@ asmlinkage __u16 crc_t10dif_pcl(__u16 crc, const unsigned char *buf, size_t len); -struct chksum_desc_ctx { - __u16 crc; -}; - -/* - * Steps through buffer one byte at at time, calculates reflected - * crc using table. - */ - -static int chksum_init(struct shash_desc *desc) -{ - struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); - - ctx->crc = 0; - - return 0; -} - -static int chksum_update(struct shash_desc *desc, const u8 *data, - unsigned int length) -{ - struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); - - if (irq_fpu_usable()) { - kernel_fpu_begin(); - ctx->crc = crc_t10dif_pcl(ctx->crc, data, length); - kernel_fpu_end(); - } else - ctx->crc = crc_t10dif_generic(ctx->crc, data, length); - return 0; -} - -static int chksum_final(struct shash_desc *desc, u8 *out) -{ - struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); - - *(__u16 *)out = ctx->crc; - return 0; -} - -static int __chksum_finup(__u16 *crcp, const u8 *data, unsigned int len, - u8 *out) +static __u16 crct10dif_update_x86(__u16 crc, const u8 *data, unsigned int length) { if (irq_fpu_usable()) { kernel_fpu_begin(); - *(__u16 *)out = crc_t10dif_pcl(*crcp, data, len); + crc = crc_t10dif_pcl(crc, data, length); kernel_fpu_end(); - } else - *(__u16 *)out = crc_t10dif_generic(*crcp, data, len); - return 0; -} - -static int chksum_finup(struct shash_desc *desc, const u8 *data, - unsigned int len, u8 *out) -{ - struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); - - return __chksum_finup(&ctx->crc, data, len, out); -} - -static int chksum_digest(struct shash_desc *desc, const u8 *data, - unsigned int length, u8 *out) -{ - struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); - - return __chksum_finup(&ctx->crc, data, length, out); -} - -static struct shash_alg alg = { - .digestsize = CRC_T10DIF_DIGEST_SIZE, - .init = chksum_init, - .update = chksum_update, - .final = chksum_final, - .finup = chksum_finup, - .digest = chksum_digest, - .descsize = sizeof(struct chksum_desc_ctx), - .base = { - .cra_name = "crct10dif", - .cra_driver_name = "crct10dif-pclmul", - .cra_priority = 200, - .cra_blocksize = CRC_T10DIF_BLOCK_SIZE, - .cra_module = THIS_MODULE, + } else { + crc = crc_t10dif_generic(crc, data, length); } -}; + return crc; +} static const struct x86_cpu_id crct10dif_cpu_id[] = { X86_FEATURE_MATCH(X86_FEATURE_PCLMULQDQ), @@ -132,12 +59,16 @@ static int __init crct10dif_intel_mod_init(void) if (!x86_match_cpu(crct10dif_cpu_id)) return -ENODEV; - return crypto_register_shash(&alg); + SET_FFP(crc_t10dif_update_arch, crct10dif_update_x86); + + return 0; } static void __exit crct10dif_intel_mod_fini(void) { - crypto_unregister_shash(&alg); + RESET_FFP(crc_t10dif_update_arch); + /* wait for all users to switch back to the old version */ + synchronize_rcu(); } module_init(crct10dif_intel_mod_init); @@ -146,6 +77,3 @@ module_exit(crct10dif_intel_mod_fini); MODULE_AUTHOR("Tim Chen "); MODULE_DESCRIPTION("T10 DIF CRC calculation accelerated with PCLMULQDQ."); MODULE_LICENSE("GPL"); - -MODULE_ALIAS_CRYPTO("crct10dif"); -MODULE_ALIAS_CRYPTO("crct10dif-pclmul");