From patchwork Wed Nov 16 08:24:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianjia Zhang X-Patchwork-Id: 20808 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp24730wru; Wed, 16 Nov 2022 00:33:41 -0800 (PST) X-Google-Smtp-Source: AA0mqf6tzlcztVsa6csvnMoPp5cREmvUQfZVhpb7JQG7Vek6PssVD8kqH8RATSwGBEirsp2ZpGQT X-Received: by 2002:a17:902:b111:b0:17c:73a5:d7a1 with SMTP id q17-20020a170902b11100b0017c73a5d7a1mr7848513plr.37.1668587621364; Wed, 16 Nov 2022 00:33:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668587621; cv=none; d=google.com; s=arc-20160816; b=OEKz3ZtirFXhJw3s1PV5hujevbMXtVnbiN+q3gx6IT/Sj8UhUpKkMoTG6YyDsoxW8c skyL5jC5KN6rs4+1quUsyq37Fd53mmkyF647WdoAtB8Rn4YdD+7WplGLB/S2RprsPqxn c7RP/VWsj5AW78MMFwXi3RWL0Ut3U6uTKQnZ3N9hx5BSocfL8mcie2c25kCFcHpKaMsw ihDmdO4NqcVlmWeO5LGw9dnVDJTvxjMthEos0SkzG8o2/RQTr+kLUBYAsnoOvb//18rV GMYwqe166+Gq3LpJ9eQCkOSmiUXKB5O+pJQd6kX9RTm82qqxhrlrVc8QIVMiLB84ATRS VaDQ== 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=eRZ6VrWswDca06OKFJ6ifi6lJf6Dl6eHVbbEdyKSnx8=; b=beQWql2IpdVj+W/ZCYts5rRvNT/SP5XWYI+2tq9MQlBNuqbJ9BTWsW/7v0W6N0JuTQ 4c4bNDK9RaJvXXoKsXQBWCBFV/aNG3rKnnWAyxGhcJGpG1fcAPmidmU60MRR6/2aa/l4 t31f8ciYlQ8DT2wbQ01IPKWPrMIBXcj9k+0JEvF30tkYxof85pb2l2Xj0s/8Z6VRMEuU Yt8AvAD5NhrKa+xDFxTedPq8/LHp0luYyIR67uffhY68SgHWJjF9jx7y2s3A/30LSNmP pCBlQLofVgMEx7unD4Mr4BZV6d7Fvp4ebovbGiAwQ7BVM//Nmn7qcW1z4Rl9R2U4MEOU 6eTw== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u7-20020a170902e5c700b001748ede4e05si17064720plf.119.2022.11.16.00.33.27; Wed, 16 Nov 2022 00:33:41 -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 S232075AbiKPI1b (ORCPT + 99 others); Wed, 16 Nov 2022 03:27:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238875AbiKPIZt (ORCPT ); Wed, 16 Nov 2022 03:25:49 -0500 Received: from out30-57.freemail.mail.aliyun.com (out30-57.freemail.mail.aliyun.com [115.124.30.57]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 203921AF3A; Wed, 16 Nov 2022 00:24:23 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R231e4;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=10;SR=0;TI=SMTPD_---0VUx967A_1668587060; Received: from localhost(mailfrom:tianjia.zhang@linux.alibaba.com fp:SMTPD_---0VUx967A_1668587060) by smtp.aliyun-inc.com; Wed, 16 Nov 2022 16:24:20 +0800 From: Tianjia Zhang To: "Theodore Y. Ts o" , Jaegeuk Kim , Eric Biggers , Jonathan Corbet , Jens Axboe , 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 1/2] blk-crypto: Add support for SM4-XTS blk crypto mode Date: Wed, 16 Nov 2022 16:24:15 +0800 Message-Id: <20221116082416.98977-2-tianjia.zhang@linux.alibaba.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20221116082416.98977-1-tianjia.zhang@linux.alibaba.com> References: <20221116082416.98977-1-tianjia.zhang@linux.alibaba.com> MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749640933194244784?= X-GMAIL-MSGID: =?utf-8?q?1749640933194244784?= SM4 is a symmetric algorithm widely used in China, and SM4-XTS is also used to encrypt length-preserving data, 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, };