From patchwork Tue Apr 19 01:48:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Weiwei Li X-Patchwork-Id: 12817241 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 47B08C433F5 for ; Tue, 19 Apr 2022 01:59:03 +0000 (UTC) Received: from localhost ([::1]:48508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ngd8w-0008FO-Fj for qemu-devel@archiver.kernel.org; Mon, 18 Apr 2022 21:59:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ngczd-0008DM-WE; Mon, 18 Apr 2022 21:49:28 -0400 Received: from smtp23.cstnet.cn ([159.226.251.23]:51848 helo=cstnet.cn) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ngczZ-0003Ja-Ng; Mon, 18 Apr 2022 21:49:25 -0400 Received: from localhost.localdomain (unknown [180.156.147.178]) by APP-03 (Coremail) with SMTP id rQCowACnr0sPFV5iXeUSAw--.34873S2; Tue, 19 Apr 2022 09:49:05 +0800 (CST) From: Weiwei Li To: richard.henderson@linaro.org, palmer@dabbelt.com, alistair.francis@wdc.com, bin.meng@windriver.com, qemu-riscv@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v11 00/14] support subsets of scalar crypto extension Date: Tue, 19 Apr 2022 09:48:33 +0800 Message-Id: <20220419014847.9722-1-liweiwei@iscas.ac.cn> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-CM-TRANSID: rQCowACnr0sPFV5iXeUSAw--.34873S2 X-Coremail-Antispam: 1UD129KBjvJXoWxAFy7KrWUJrWxAFW8Xw43Jrb_yoWrCF4fpr 4rC3y5CrZ8J397Gryfta18Ar15Ja1rWrW5JwnrJ34kJ39xJrWrJFZak3WYkF1UJF18Wr12 93Wjkr13ua1UAFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUv214x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26r4j6ryUM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gr 1j6F4UJwAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv 7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r 1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02 628vn2kIc2xKxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c 02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_ GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7 CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6rW3Jr0E3s1lIxAIcVC2z280aVAF wI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa 7VUbXdbUUUUUU== X-Originating-IP: [180.156.147.178] X-CM-SenderInfo: 5olzvxxzhlqxpvfd2hldfou0/ Received-SPF: pass client-ip=159.226.251.23; envelope-from=liweiwei@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wangjunqiang@iscas.ac.cn, Weiwei Li , lazyparser@gmail.com, luruibo2000@163.com, lustrew@foxmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This patchset implements RISC-V scalar crypto extension v1.0.0 version instructions. Partial instructions are reused from B-extension. Specification: https://github.com/riscv/riscv-crypto The port is available here: https://github.com/plctlab/plct-qemu/tree/plct-k-upstream-v11 To test rvk implementation, specify cpu argument with 'zks=true,zkn=true' or "zbkb=true,zbkc=true,zbkx=true,zknd=true,zkne=true,zknh=true,zksed=true,zksh=true,zkr=true" to enable K-extension support. This implementation can pass the ACT tests for K with our extended act support for qemu (available at https://github.com/plctlab/plct-qemu/tree/plct-k-upstream-v11-with-act) Review status: patch 5 is reviewed by Philippe Mathieu-Daudé patch 1~11 and 13-14 are acked or reviewed by Alistair Francis patch 2~11 are reviewed by Richard Henderson (fix new comments on patch 6 and 7) v11: * patch 6: add REQUIRE_32BIT to trans_* function for aes RV32 instruction * patch 7: add REQUIRE_64BIT to trans_* function for aes RV64 instruction v10: (only patch 12 is modified) * simplify the conditions for the check in seed function * add NULL check for ret_val in rmw_seed function * remain the change of MSECCFG_* to align with the added MSECCFG_*SEED v9: * check whether seed is accessed by a read-write instruction in helper_csrr. * fix disas for partial scalar crypto instructions * rebase on https://lists.nongnu.org/archive/html/qemu-riscv/2022-03/msg00156.html v8: * replace large macro for trans function of sha256/512 instructions with parameters to gen_sha* function in patch 8,9,10 * fix tcg_const_tl to tcg_constant_tl * fix rmw_seed function v7: * reuse gen_unary/gen_arith to simplify trans_* functions * replace DEF_HELPER_* with DEF_HEPER_FLAG_* * move aes64 related macros from patch 6 to patch 7 * create common helper gen_aes32_sm4 for aes32 and sm4 related instructions * replace bs with shamt (bs << 3) * optimize trans function for sha256, sha512 and sm4 instructions to be generated inline v6: * add reviewed-by tags * rebase on upstream v5: * split the big patches v4: * drop "x-" in exposed properties * delete unrelated changes v3: * add extension check for SEED csr access v2: * optimize implementation for brev8, xperm, zip, unzip * use aes related sbox array from crypto/aes.h * move sm4_sbox to crypto/sm4.c, and share it with target/arm Weiwei Li (14): target/riscv: rvk: add cfg properties for zbk* and zk* target/riscv: rvk: add support for zbkb extension target/riscv: rvk: add support for zbkc extension target/riscv: rvk: add support for zbkx extension crypto: move sm4_sbox from target/arm target/riscv: rvk: add support for zknd/zkne extension in RV32 target/riscv: rvk: add support for zkne/zknd extension in RV64 target/riscv: rvk: add support for sha256 related instructions in zknh extension target/riscv: rvk: add support for sha512 related instructions for RV32 in zknh extension target/riscv: rvk: add support for sha512 related instructions for RV64 in zknh extension target/riscv: rvk: add support for zksed/zksh extension target/riscv: rvk: add CSR support for Zkr disas/riscv.c: rvk: add disas support for Zbk* and Zk* instructions target/riscv: rvk: expose zbk* and zk* properties crypto/meson.build | 1 + crypto/sm4.c | 49 +++ disas/riscv.c | 173 ++++++++++- include/crypto/sm4.h | 6 + target/arm/crypto_helper.c | 36 +-- target/riscv/bitmanip_helper.c | 80 +++++ target/riscv/cpu.c | 36 +++ target/riscv/cpu.h | 13 + target/riscv/cpu_bits.h | 9 + target/riscv/crypto_helper.c | 302 ++++++++++++++++++ target/riscv/csr.c | 80 +++++ target/riscv/helper.h | 22 ++ target/riscv/insn32.decode | 97 ++++-- target/riscv/insn_trans/trans_rvb.c.inc | 116 ++++++- target/riscv/insn_trans/trans_rvk.c.inc | 391 ++++++++++++++++++++++++ target/riscv/meson.build | 3 +- target/riscv/op_helper.c | 9 + target/riscv/pmp.h | 8 +- target/riscv/translate.c | 8 + 19 files changed, 1368 insertions(+), 71 deletions(-) create mode 100644 crypto/sm4.c create mode 100644 include/crypto/sm4.h create mode 100644 target/riscv/crypto_helper.c create mode 100644 target/riscv/insn_trans/trans_rvk.c.inc