From patchwork Mon Dec 19 15:46:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 34629 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2468080wrn; Mon, 19 Dec 2022 07:57:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf6by+mWMoEltom4Rd7qGsbZFLCMDyOs1f05iWwi0tvzfVoMJ/VNF7GDZ2CBjfxO6n1yLvmK X-Received: by 2002:a05:6a00:1d09:b0:578:128b:3a3f with SMTP id a9-20020a056a001d0900b00578128b3a3fmr43676939pfx.15.1671465470549; Mon, 19 Dec 2022 07:57:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671465470; cv=none; d=google.com; s=arc-20160816; b=Loj+Nr27JsKBk7YFdoSRfEmdNCSrvHCjNHa8K7eim0AnCCe2zgPtrFMrGs3nnZh/I3 UjGNIK5sg7LNW7voQukAV2REQjTmiSbJiYhCq17dD1UHTEWz89nW1YCeaLaKhZCergzA VQXED0/vFTv6D2G1ZpjUfZH86YqsrsVkVkKHJKkQseiiT2kyU+x3mOHDqhFGw1Lh+gF4 9jIFeQ6AjptKDpuAlELBdGFIXOzvn73KFnjPEJPsqTQXo1H0bj2McMAGWZWWYCoaqne6 wWqv0gyv3y7C57O3FW0g5VtQuA4EpGTW85FNSoEBNIjTjHy68d3w5sFoPzNFTty9CTll JAJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=hX0kP4APVd7DKDenATe81gfX1vG99JqUwKWyY7oc+hs=; b=DY0EdpqxDbeC0qv9WnasBCp15IGxlsIMyNqUGZr7uGpZt7+N48QAjOS9a4wI5uUpG/ x5LUd0jlb6T+iGDjm4JrUO7mIp+Cfh4mfOM7IQnHbqR6YVvBSBcDFm3NbRr0YrOv6cML YW2pU6q75tfeRaNkbQv0DlEE3u8IYxJVoEjqfsMoJpK08rk8l3jYWhKCdQFXOIJ0Nwp/ laubUdYh7nTIUE8+wxHCpelaEO7Z3zgtPGfD6ql5IWKRi718XvaQbtGyC3ksmbNYK9XA gnxFxHhoMdpfVogSs67Fhdl7oEh4xNoVC4PvRQBRd5wXxRflGa7k9B1rTCIfCmtS71Au VLFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cesYhb6e; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s3-20020a056a0008c300b0055fa098c388si11628126pfu.259.2022.12.19.07.57.38; Mon, 19 Dec 2022 07:57:50 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cesYhb6e; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232465AbiLSPtd (ORCPT + 99 others); Mon, 19 Dec 2022 10:49:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231952AbiLSPtK (ORCPT ); Mon, 19 Dec 2022 10:49:10 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0815013D1B for ; Mon, 19 Dec 2022 07:46:23 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 796F961032 for ; Mon, 19 Dec 2022 15:46:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77C3BC433EF; Mon, 19 Dec 2022 15:46:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671464781; bh=pWSfuZOhIjqdOCy61VXp5X8qHj+yFgIvKlxmkT/QoMg=; h=Date:From:To:Cc:Subject:From; b=cesYhb6e1Iy+HV45aoxQypb5ezCh5mt3n88eMXxGAQKRsza3+oMKa05ZoB4SfMYgZ OmgbG2dobhuFv13QF4Kx7b098dIQUcHRLJr5sfXJdn8UYc2S4sByJV81uggpOUvu71 pse5Ory0GhfciWzECoMJrR7cxaxDR5Q+vPs5AzM5nyIlRCupvRNrrpfnSgdH2ee4qu EGxpRgs8evaXvyHAom7VCkNpWGwfKMNiB4XjWzj6lCDm2UBNpJDgWUAR1t+95v4LTo IJsiGvYiuBlMDOzojGowzJoIFMx0wxM207+C/fBjAosB+PrzZ49PjfpHbPtiuSPNOO NT8YZ3c4LE13w== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id ABDD240367; Mon, 19 Dec 2022 12:46:17 -0300 (-03) Date: Mon, 19 Dec 2022 12:46:17 -0300 From: Arnaldo Carvalho de Melo To: linux-kernel@vger.kernel.org Cc: Adrian Hunter , Eric Biggers , Ian Rogers , Jiri Olsa , Namhyung Kim , Tianjia Zhang Subject: [PATCH 1/1 fyi] tools headers UAPI: Sync linux/fscrypt.h with the kernel sources Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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?1752658577552736540?= X-GMAIL-MSGID: =?utf-8?q?1752658577552736540?= tldr; Just FYI, I'm carrying this on the perf tools tree. - Arnaldo Full explanation: There used to be no copies, with tools/ code using kernel headers directly. From time to time tools/perf/ broke due to legitimate kernel hacking. At some point Linus complained about such direct usage. Then we adopted the current model. The way these headers are used in perf are not restricted to just including them to compile something. There are sometimes used in scripts that convert defines into string tables, etc, so some change may break one of these scripts, or new MSRs may use some different #define pattern, etc. E.g.: $ ls -1 tools/perf/trace/beauty/*.sh | head -5 tools/perf/trace/beauty/arch_errno_names.sh tools/perf/trace/beauty/drm_ioctl.sh tools/perf/trace/beauty/fadvise.sh tools/perf/trace/beauty/fsconfig.sh tools/perf/trace/beauty/fsmount.sh $ $ tools/perf/trace/beauty/fadvise.sh static const char *fadvise_advices[] = { [0] = "NORMAL", [1] = "RANDOM", [2] = "SEQUENTIAL", [3] = "WILLNEED", [4] = "DONTNEED", [5] = "NOREUSE", }; $ The tools/perf/check-headers.sh script, part of the tools/ build process, points out changes in the original files. So its important not to touch the copies in tools/ when doing changes in the original kernel headers, that will be done later, when check-headers.sh inform about the change to the perf tools hackers. --- To pick the changes from: f8b435f93b7630af ("fscrypt: remove unused Speck definitions") e0cefada1383c5ce ("fscrypt: Add SM4 XTS/CTS symmetric algorithm support") That don't result in any changes in tooling, just causes this to be rebuilt: CC /tmp/build/perf-urgent/trace/beauty/sync_file_range.o LD /tmp/build/perf-urgent/trace/beauty/perf-in.o addressing this perf build warning: Warning: Kernel ABI header at 'tools/include/uapi/linux/fscrypt.h' differs from latest version at 'include/uapi/linux/fscrypt.h' diff -u tools/include/uapi/linux/fscrypt.h include/uapi/linux/fscrypt.h Cc: Adrian Hunter Cc: Eric Biggers Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Cc: Tianjia Zhang Link: https://lore.kernel.org/lkml/ Signed-off-by: Arnaldo Carvalho de Melo --- tools/include/uapi/linux/fscrypt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/include/uapi/linux/fscrypt.h b/tools/include/uapi/linux/fscrypt.h index a756b29afcc23749..fd1fb0d5389d3abd 100644 --- a/tools/include/uapi/linux/fscrypt.h +++ b/tools/include/uapi/linux/fscrypt.h @@ -26,6 +26,8 @@ #define FSCRYPT_MODE_AES_256_CTS 4 #define FSCRYPT_MODE_AES_128_CBC 5 #define FSCRYPT_MODE_AES_128_CTS 6 +#define FSCRYPT_MODE_SM4_XTS 7 +#define FSCRYPT_MODE_SM4_CTS 8 #define FSCRYPT_MODE_ADIANTUM 9 #define FSCRYPT_MODE_AES_256_HCTR2 10 /* If adding a mode number > 10, update FSCRYPT_MODE_MAX in fscrypt_private.h */ @@ -185,8 +187,6 @@ struct fscrypt_get_key_status_arg { #define FS_ENCRYPTION_MODE_AES_256_CTS FSCRYPT_MODE_AES_256_CTS #define FS_ENCRYPTION_MODE_AES_128_CBC FSCRYPT_MODE_AES_128_CBC #define FS_ENCRYPTION_MODE_AES_128_CTS FSCRYPT_MODE_AES_128_CTS -#define FS_ENCRYPTION_MODE_SPECK128_256_XTS 7 /* removed */ -#define FS_ENCRYPTION_MODE_SPECK128_256_CTS 8 /* removed */ #define FS_ENCRYPTION_MODE_ADIANTUM FSCRYPT_MODE_ADIANTUM #define FS_KEY_DESC_PREFIX FSCRYPT_KEY_DESC_PREFIX #define FS_KEY_DESC_PREFIX_SIZE FSCRYPT_KEY_DESC_PREFIX_SIZE