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: 148148 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp150974lji; Fri, 5 Oct 2018 01:13:46 -0700 (PDT) X-Google-Smtp-Source: ACcGV62SpdwrJCF1r54MPH8ZThpLy748LE2hw70/487Pxv2D3ToFskZAcEwpUz6csOcFWXzd6K20 X-Received: by 2002:a63:441f:: with SMTP id r31-v6mr9172219pga.60.1538727226521; Fri, 05 Oct 2018 01:13:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538727226; cv=none; d=google.com; s=arc-20160816; b=VV8QL1h3L/bvWuY2uPnIBKj7UJLVXU00VxNxOe2x8Mf3saO98qmLyIqNv+hI+6T+7h eAVORJ/Vno5pV9PYIKZfPhfRop6d0szXYcPvjkzSwZHeXPJ5BvW5ywqqdpyxgjHZ2ItS 7IHPYEsjm1cYU0Ji0scQvzJNyZ2Y5ynCr4TbPimbPGQx3woSQr1MLs22koRU2cDlvHRT jMFnKDwXubXzjLt4da09vFC7zKtIs2HtM1ucY9hHol5zOzhoM4LvtW1IZ8sqlQuxaSi6 wGuUNUnLgBrGMhuatTmA3uXyZaWEnAW6DeBarWNF7KoOPwq73r7V3G4ZJAomIFUlYnU9 icKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=Bsz7BDS1SKX9gHYXcW+7Yci+Ue2vSEITfG0cme0MbDA=; b=YTSOHzfZBvRrMVh8aXvBGSb5w2GV2idw6NVyuQBd78Q4imBKzYJpFbCbhBtVvitTaW eBqz4rFXvaTnpmAiTTRtzOpOupgKqMvSCVKFc/wjrLMWPgLExbCZ7S2lfPeUIfpnwfq/ oof2XzjJEwuyiNRrHEslcjOPCCmNtxK7uTZbn92bvjnBaRE4t4XiZy2keuR9at8JIb34 Y+TAzzSmfyrDcyMSkdOU6xb4zpuDkRhenWHiMOCT9QfqjKS632Qx4B2cLn+kUAiFm9Rz ji5yacM3hVGP7I/n3DbTiC7msXHBrhDJpODDnkeBZcbxHGiDucOqQuLCWmmZ7R9tCTJr q2WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kI1I9Xac; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (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 y30-v6si7612388pgk.13.2018.10.05.01.13.46; Fri, 05 Oct 2018 01:13:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kI1I9Xac; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728259AbeJEPLT (ORCPT + 2 others); Fri, 5 Oct 2018 11:11:19 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:51290 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728200AbeJEPLS (ORCPT ); Fri, 5 Oct 2018 11:11:18 -0400 Received: by mail-wm1-f66.google.com with SMTP id 143-v6so983090wmf.1 for ; Fri, 05 Oct 2018 01:13:42 -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=Az9rJt5gA6GT55rQBpDZ0v+fRPiqQdwwj8O7d9F5KrypBeOJ4RtqkDDnm9a13stRVA 77QmpSTPo6aXuAyITGCDB/5/QIHUZiypbPrtldKZNi6SfcGHPZJmSDgjf+wFS4jVyuDp tpoJw/KuXzDBcGXvF9Lg6ay930Q1F+BUqeT6XfeWxoy37VG6fM03Wh+5GfJXnygfF8Vy l6cLB/nW6gN8OpUWgz80iH0KFV9CBT8NFAau1OJp4eUfV7KNItKxsd7D4Gq10dl43t3e hiJaw0sFWuTuqOPFoiEz++p26DRVv8Pm0k65aLZyo2PFWs+lMC4WLr6Gpawady0Cm4Um cDgw== X-Gm-Message-State: ABuFfohRgNPAxbwqEepJcc3XsqqzJCCB2408C9TlGc5VdaV5T4hkO+BL u497pTkzIUKCR/AlvTxzq117+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 Cc: Ard Biesheuvel , "Jason A . Donenfeld" , Eric Biggers , Samuel Neves , Andy Lutomirski , Arnd Bergmann , Herbert Xu , "David S. Miller" , Catalin Marinas , Will Deacon , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Thomas Gleixner , Ingo Molnar , Kees Cook , "Martin K. Petersen" , Greg Kroah-Hartman , Andrew Morton , Richard Weinberger , Peter Zijlstra , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.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> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org 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(+) -- 2.11.0 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: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: 148155 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp151473lji; Fri, 5 Oct 2018 01:14:19 -0700 (PDT) X-Google-Smtp-Source: ACcGV605yNN5nkaQy+379QSUzmwl5+aZxCN7WrMWlY4YEMrKJRYo7A2/MEVrHq4Jv9B4bkKf/DZ4 X-Received: by 2002:a63:9e02:: with SMTP id s2-v6mr4658276pgd.302.1538727259109; Fri, 05 Oct 2018 01:14:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538727259; cv=none; d=google.com; s=arc-20160816; b=jtje+PoIGCGAuJ3z5+f6rF4u30wOf7rJsjQ4Qp+x5HvayLGPgOiVCz0J788EOOZjkQ 8ca+d1afYGQaiuMAYBZ3xGhnYGehmp2JzJa88zba099Yw0DInA6GbuMfTbrXcMGkPuHJ 7D79wjeY/G6fw7gOB8SR198gmT0Rh5dyS7MwJeT6ffUlDUepFvXj3cq+8tLb7Dpx9LK4 wdPZfZvafcZak6C+66aPVlK+BElyuxmEtt5t09LHP1tKsrCPBWfif3Uk8+LIsEg4wa4i aIdAwWtDr7Y2U5hNO2v16VQBK8I65qw/xKXl6iTijEh4gJxWiijaAoS23hFrWDqEKXw2 3QAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=Fxj46aGIQEnRq0OD4ORznr2qDih7cDH3aLP6N+qOvl0=; b=Fkz39GmDSyy4b27+vR/NGId45vZshEt/e7zmQS2C+beHR6nOwqfGaOpWkEzTlKnZPc qXnz5KVK+O2WBvi8RAi7Y7q98bJyJjdnVvgGH5GVfDT7xBs8tNGGsInTLo9g5d2nfUeU YmTb3u7Q9KT+IK7QZLxNC15pqXJJ2GGGa7AlSasEn3Az6GTASYhskXnmKzRBPh7cSnIE 6OM3WagIZpftrBLI/lGCczsgr1n9B3Un6jlElxKr/UKhH0Y+dFAgx5cbbHpFVWI1OdD3 prjPhfVWVP1xTVXfUryNqpDNd33Ilys77v0FtrSavtvT/Pzmubf5XFZnQEeP/poxqEG1 Fozg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gXy7rzac; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (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 g12-v6si284059pfi.184.2018.10.05.01.14.18; Fri, 05 Oct 2018 01:14:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gXy7rzac; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728524AbeJEPLZ (ORCPT + 2 others); Fri, 5 Oct 2018 11:11:25 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:38360 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728205AbeJEPLW (ORCPT ); Fri, 5 Oct 2018 11:11:22 -0400 Received: by mail-wm1-f65.google.com with SMTP id 193-v6so1016591wme.3 for ; Fri, 05 Oct 2018 01:13:45 -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=HHRmBd115XmZH++Yo9xd5oqHaHPTypJ9MwaqjqfwlOQ+piwAavtLpusbkaQaMMriy8 //UQ3jAoKyuN3YuqMaNktUTMCtU2rQ7QRWCX1YlpLl+WNcrPb7YDy6K2b/YqAKbHDfei auy8N+ki8OlZkn3vY6X+yMWfh5InC8yg7yK1e9ABh0Vxi3v5dnWrTgGrvulzVouBhEZm naYCaDRXsbl5i39JOHLgPognP6L0BBW6VPJw+DlFlOecHriubg5ZfbYxlWMhVBxxM1ee LmiG5imeKCGJ8eVUh3CiTKvUs17mWqgKQC5GYJpXPRgd9R1hhOmeWt+vysYA02PNc5Eo d8Fw== X-Gm-Message-State: ABuFfojVw8DXdUh/N9pXu/3R7enJY+v+/xaLESeefcd0VAlOYzGuIfGc q+nWJk05pIOx0greCiq2XG976A== 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 Cc: Ard Biesheuvel , "Jason A . Donenfeld" , Eric Biggers , Samuel Neves , Andy Lutomirski , Arnd Bergmann , Herbert Xu , "David S. Miller" , Catalin Marinas , Will Deacon , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Thomas Gleixner , Ingo Molnar , Kees Cook , "Martin K. Petersen" , Greg Kroah-Hartman , Andrew Morton , Richard Weinberger , Peter Zijlstra , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.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> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org 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(-) -- 2.11.0 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: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: 148151 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp151121lji; Fri, 5 Oct 2018 01:13:54 -0700 (PDT) X-Google-Smtp-Source: ACcGV60zjuG8QwEiKIv+KAoFdmRLPuR4iurO8rpmmAKIVFkmM36PglxKzafS/pQ1I3hdqYlqBaVc X-Received: by 2002:a17:902:b28:: with SMTP id 37-v6mr10544071plq.337.1538727234115; Fri, 05 Oct 2018 01:13:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538727234; cv=none; d=google.com; s=arc-20160816; b=S7yCKzgYa+fl/GPvIMs4Kb4QRzM+MB3H7ro29+chUz6XsbzAW2z5qIcVF1FhNXkfTR c4lvXah97ug9tP8G4kAWBVQfwG8ZH4ExGYqRHp8vV9j66PuBgck3Pwsd+mw6REpFlM21 Bt+4E4d9zSfHFBjhBOdW5hoZgoIuuGbU6hMuRhjNDan4/rTnGGwIbO8j9I8WuT99S2Is x0FlKw4uzzjMZIvaE8zAJGBabGTpdkXRrGKBpUrgbjrUmftkJEJ2Xt2uUXss91xhQRKL agFNXLWv275REDS48PU9pe3Z3VffNVoy/QDZzQnKT788a835shZjx+c8LcSaXhO6UREz eo1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=7ykn0kdpAuelX0ufR1lLCrLMFlIy/5JjP//jovQ6hBA=; b=nhUC3M9XUEbPCz1yEojmZGi6w/CES8AjJcw3hIOEru4ZaW1OzA2M05cayh0g0Snea1 2pBKEwxAP7rZJVoBFyt6PxM0QiG4qi12q2Gcsdj43iUN17AYiHQ2gsdwM4bv0ChosJfI GXUYQZk58AAEU16Efl5vdIcUafvlFN/ESVBK6f2uTLY+vW28FijXOzlKA15oiBRp8Zmf C6LlCpqVeyIY5zBzKPVsfoCtCQwP1vCMjE/QZMtqxbwDdWR81vScALrsFPw3ZDTvFB79 kBe/bt2VBXXFBPmMQAgI6lZS7d9KfBAtFGnQgP5mO4wja5DmCwR5Gu6I/ywmIPr65hX+ IsdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WeDWUysr; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (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 g15-v6si7691811plo.284.2018.10.05.01.13.53; Fri, 05 Oct 2018 01:13:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WeDWUysr; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728578AbeJEPL1 (ORCPT + 2 others); Fri, 5 Oct 2018 11:11:27 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:52841 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728495AbeJEPL1 (ORCPT ); Fri, 5 Oct 2018 11:11:27 -0400 Received: by mail-wm1-f66.google.com with SMTP id 189-v6so986160wmw.2 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=DqFH+qI+vRh366rU9Mf279NfOOWYePssQR+srs5gggHiZJL2QiutJZIWKexLm23wB3 aZgnl2glt7MZgWWsiM/Gfqu8XZyVzoNts5+ilH4SDGBj5hMAw3O4wEFNOYGD4uYJ8oR7 U5w8vBATaJ0OQcURbVOxST0XSttazgDYS4Lm9W4uv83LQtsDdVh1bQnpdcEql7gsAZZk kLSOdq4N+OjEHoeBtY8lFuE15VSSJT/6e8haMWq2K3SKY8HDVcGwLEZ3Ptq+4heDBEAL QwluytYi0n5dWuUVtlZD6sl0q1rQiId2DeTw9EnrvWbdCQEXoTUfEOpLG/fFwXs0WXzv Yu0w== X-Gm-Message-State: ABuFfohU9BHTi70EaNc+5DheUvhAZeFVG+3TkSawZYd1JhNbOx1KzZn5 CMEgqjXzNa16pcGNYaNxVdSsDw== 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 Cc: Ard Biesheuvel , "Jason A . Donenfeld" , Eric Biggers , Samuel Neves , Andy Lutomirski , Arnd Bergmann , Herbert Xu , "David S. Miller" , Catalin Marinas , Will Deacon , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Thomas Gleixner , Ingo Molnar , Kees Cook , "Martin K. Petersen" , Greg Kroah-Hartman , Andrew Morton , Richard Weinberger , Peter Zijlstra , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.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> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Signed-off-by: Ard Biesheuvel --- crypto/crct10dif_generic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.11.0 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: 148153 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp151147lji; Fri, 5 Oct 2018 01:13:56 -0700 (PDT) X-Google-Smtp-Source: ACcGV60DNv/AN/mSbcHt6x2ORe3s054r1Kd1FKkTHEnEHoJYrRJlk42p3VbFWh6kWXmkFNb9+7A2 X-Received: by 2002:a17:902:7109:: with SMTP id a9-v6mr10379495pll.310.1538727236094; Fri, 05 Oct 2018 01:13:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538727236; cv=none; d=google.com; s=arc-20160816; b=QnS09kHvUjy5eoMvj7c5dRuwLlZgxVeR09+MmGMmT+9A2QWpLJ4IenpZvraskW13tJ 7d36+GBniWAMCxjb8z7ITTFVAjcdRHicKbx5LqIRHMXG+3Q1KeY1WTZ8QuEBT7XDYDFR x+Q3x2JI/BY6orqLeqBIJj/FDa2eq1/1sNeuitzKQN1SWft78/xDjmLZAhNJPE5n5cFN AICQZg76lZQCT9IY3v5A/BXnTtpLw4gDMWz27bY+FkSasHfCfzl3PRXusuqek3ihhTPO gA3E17KRSPg+ldb0ZtP/RCQ5zwq7hfnV7uziTFUvfnATgErA8+wT6WA22Wc1+0VleWy6 a5Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=J4kMEdjdjyVuuZO5lYFdItsW+zGD6WfP39sVuKslDsg=; b=Zcm5HRRpUho2o/GZGYjT+EotZxDVOhM2Ta7cCGY1fvVn1ac7GKTb8pWzpEVut9SB4e pCjdaWGuZxe0avmGpymbk10nkI1zTcaDyJtoyVOkJNnlBALLYicn0J+JCUeR4mW5Qtd1 KK5amvzYgHt+RmoE9wTF1oMFWpfRmlhR6j3779ZnmotP1kWHQLQ4/uXG8aAxYleeFO5U werfnrJ52g3dhFfZAe+b6WOR8UoTpVTh+YlJ/7ZelLycu4h73slpa4tEnb4Xnw4Z2B+J Ixos3f0nj9oEDodruOI7zrF/IrOweH+aXZZSUxuZGGixcVkbSuqekt8D7D3P4C0t+4eI eY6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e8esmuRC; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (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 1-v6si7894961plw.121.2018.10.05.01.13.55; Fri, 05 Oct 2018 01:13:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e8esmuRC; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728582AbeJEPL3 (ORCPT + 2 others); Fri, 5 Oct 2018 11:11:29 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:53522 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727236AbeJEPL2 (ORCPT ); Fri, 5 Oct 2018 11:11:28 -0400 Received: by mail-wm1-f66.google.com with SMTP id b19-v6so981346wme.3 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=iWmo7Rkvs2BqIaeTQz8pCrcaglrn/nr7dmzrzvP2S/OgmFPYeAx/pwKI4ZVPKmbhJ0 2eRNj2QfHBWsoc0aID72rBN6Biw4cCOqbn/lrRtx0MhjKGp/b6G2MMR2QYszYQMg3KlA es1maCOQeET+n9sP7Z+Z9sDdyCk86plJBDTQP4GnIXt/kH7LJQAObDAaOIlMTyhEUgd3 JkONlAF538bLh3fSd2Juxzc49eie9/qk6n4qkppMyJwqPkm6pThDQoXK18ejdhO2j35S h+qorRMnTpWGgxzuy4Hj7WCgbafwlb0Hsnj9mhKOHCDE8UQ1zBkLvqjKWrt0BVVpYXSm H1pQ== X-Gm-Message-State: ABuFfohAv49+wngaDsEPgxiOS6QS7JHtHJPOdHsNlWQCoWfnUBsNqh9x aym6+hsorAv1G3dE9tlrElbLQw== 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 Cc: Ard Biesheuvel , "Jason A . Donenfeld" , Eric Biggers , Samuel Neves , Andy Lutomirski , Arnd Bergmann , Herbert Xu , "David S. Miller" , Catalin Marinas , Will Deacon , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Thomas Gleixner , Ingo Molnar , Kees Cook , "Martin K. Petersen" , Greg Kroah-Hartman , Andrew Morton , Richard Weinberger , Peter Zijlstra , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.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> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org 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(-) -- 2.11.0 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");