Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp10403597rwb; Fri, 25 Nov 2022 04:25:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf4ZLi/rh0oFRmuzuK82eXMCu3GRyRACLyCVZxD8zTlN5l9bjrr1YGj2fOoawoFOJD/VhcYP X-Received: by 2002:a17:906:3ad6:b0:7ae:40b7:7fbe with SMTP id z22-20020a1709063ad600b007ae40b77fbemr30509268ejd.371.1669379148878; Fri, 25 Nov 2022 04:25:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669379148; cv=none; d=google.com; s=arc-20160816; b=0+Z+t5EX4ug+E1lx8BErrN9lbhw7jsySP/EaC7Dvk1wGxd/gLaPvdE78s+LMxz8LNj daCbN9r39mmBok1Pb3I2OrdZlmKcJdI3ORP0EOzA2xBXBdyvW1wbi7CrvZjrNIEbn4fO NUligFWoc7RkgH868ewlE+R+lheoaaNYuAzgL9PisBDZHhe1EcL6occRRtkTfFf5PkFm A+ml5IQanKLR+L+/KT40j9mK3BYbKT9S2F7ovYmEIpZqHJm2ZS6HIbenNpLwbEVT9Pa4 G40Fq8cdGLkkGl4nrtCeWEJUhX7wzAEAdeNX3v6u7bh97jYqB+INciLgsYUtu0iRGewy VPWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=l0h3ch2bhhEAXGZP9bwX2VjD30wMZImlfDTFskfVrYM=; b=kyuueMYQER/ivWcC7wu1xWS/1kVACpFdnEEunP8p/4p3ob2vGfkmWU85Kd6YLc6X3V vh474fslm5Yx5R2Vi4pfWDC1nLVGytp160NM7VmWEMWOFnK2aFDXoi1eAQ95oG/1tO2s F2bQjQb5G384sJ2TRbfHB9Ndts/UWdd+hJFVxE2QUgF7kf/G1FytFkUzHSiH0rKyyska M1IsVBJ4vellOkuMVIsnL1B/BE6Xrq0MlaUXij7hZ5oXK0FlZt+I7iPKtnW1nW6lZr2t Qk0q5R4AhGVoRtfGkpyTcaRqS6EsICl0785090G8ZAbtCBA/G27r56Shi80am2Yx3FBF Rceg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m13-20020a056402510d00b00461f0d84ee1si2765826edd.228.2022.11.25.04.25.27; Fri, 25 Nov 2022 04:25:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229844AbiKYMRI (ORCPT + 87 others); Fri, 25 Nov 2022 07:17:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229575AbiKYMRD (ORCPT ); Fri, 25 Nov 2022 07:17:03 -0500 Received: from out30-56.freemail.mail.aliyun.com (out30-56.freemail.mail.aliyun.com [115.124.30.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BA184A585; Fri, 25 Nov 2022 04:16:57 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R161e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=tianjia.zhang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0VVfHzfl_1669378597; Received: from localhost(mailfrom:tianjia.zhang@linux.alibaba.com fp:SMTPD_---0VVfHzfl_1669378597) by smtp.aliyun-inc.com; Fri, 25 Nov 2022 20:16:38 +0800 From: Tianjia Zhang To: Eric Biggers , "Theodore Y. Ts o" , Jaegeuk Kim , Jonathan Corbet , Jens Axboe , Ard Biesheuvel , linux-fscrypt@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Cc: Tianjia Zhang Subject: [PATCH v3 1/2] blk-crypto: Add support for SM4-XTS blk crypto mode Date: Fri, 25 Nov 2022 20:16:29 +0800 Message-Id: <20221125121630.87793-2-tianjia.zhang@linux.alibaba.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20221125121630.87793-1-tianjia.zhang@linux.alibaba.com> References: <20221125121630.87793-1-tianjia.zhang@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org SM4 is a symmetric algorithm widely used in China, and SM4-XTS is also used to encrypt length-preserving data, these algoritms are mandatory in many scenarios. This patch enables the use of SM4-XTS algorithm in block inline encryption, and provides support for fscrypt. Signed-off-by: Tianjia Zhang --- block/blk-crypto.c | 6 ++++++ include/linux/blk-crypto.h | 1 + 2 files changed, 7 insertions(+) diff --git a/block/blk-crypto.c b/block/blk-crypto.c index a496aaef85ba..e44709fc6a08 100644 --- a/block/blk-crypto.c +++ b/block/blk-crypto.c @@ -36,6 +36,12 @@ const struct blk_crypto_mode blk_crypto_modes[] = { .keysize = 32, .ivsize = 32, }, + [BLK_ENCRYPTION_MODE_SM4_XTS] = { + .name = "SM4-XTS", + .cipher_str = "xts(sm4)", + .keysize = 32, + .ivsize = 16, + }, }; /* diff --git a/include/linux/blk-crypto.h b/include/linux/blk-crypto.h index 69b24fe92cbf..26b1b71c3091 100644 --- a/include/linux/blk-crypto.h +++ b/include/linux/blk-crypto.h @@ -13,6 +13,7 @@ enum blk_crypto_mode_num { BLK_ENCRYPTION_MODE_AES_256_XTS, BLK_ENCRYPTION_MODE_AES_128_CBC_ESSIV, BLK_ENCRYPTION_MODE_ADIANTUM, + BLK_ENCRYPTION_MODE_SM4_XTS, BLK_ENCRYPTION_MODE_MAX, }; -- 2.24.3 (Apple Git-128)