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;
Date:   Fri, 19 Aug 2022 13:54:06 +0800
From:   Pengfei Xu <pengfei.xu@intel.com>
To:     Josh Poimboeuf <jpoimboe@kernel.org>
CC:     <x86@kernel.org>, <linux-kernel@vger.kernel.org>,
        "Yang, Weijiang" <weijiang.yang@intel.com>,
        "Su, Heng" <heng.su@intel.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH v1.1] x86/ibt, objtool: Add IBT_NOSEAL()
Message-ID: <Yv8lfpTQk8cqZNVU@xpf.sh.intel.com>
References: <cover.1660837839.git.jpoimboe@kernel.org>
 <5b86c2e3fff1f1e1f3fda126c315819205eb9d20.1660837839.git.jpoimboe@kernel.org>
 <20220818213927.e44fmxkoq4yj6ybn@treble>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20220818213927.e44fmxkoq4yj6ybn@treble>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TP2+jPY6G+srFDamiKJpq2UslGKj/e0jSyyZMgxp7y1aUrnm02fdj54x48yc?=
 =?us-ascii?Q?EmMuZpOHbRh8uWjWEfmRo+mLDv+G/GD1d8yoipC2XslzcIMJtDWNbRuyc1cI?=
 =?us-ascii?Q?Y1kqRIu+ktJMXboMxyedzQrctjGLywkk7D942CdA1zFTdfMSMayLlWAukngo?=
 =?us-ascii?Q?hNBrcOpzcL1l6/HvBMNcSXyrADpFGKVyrqh/RjCRt/P3/58b4JQze/Rou0sI?=
 =?us-ascii?Q?a5EBXRRaSRjKaeQfilrJIYhztxMLryYWt740A1Kk0CQCOKPkn+L5L6s2wIvD?=
 =?us-ascii?Q?vw/MJfF3rRHZAlXYTMIdXGkjYpIz2FvUHc9ml4exzVZ+7xW9ajceAhE5KFya?=
 =?us-ascii?Q?o9jPLDq5t4VbJoEBjDiW5tgQeLfPWUAZ5OCZ10TwFrw2SDTeKCFMPtA+TM13?=
 =?us-ascii?Q?m6pJXMr2kf2Ga6wps0aWo2ZyQMDe2vEOlBl78KobowZKwWGqtpznGzNKuRxa?=
 =?us-ascii?Q?kBLX49XbQYK7H3tTiUWg1l13xWzfoZCBmmiQRtD3zZxUQDfQcs1+FjPxAnqC?=
 =?us-ascii?Q?nNWPcX3ihC+zVJDmN0VN1ZxKqqHb1c4AwSIfOf4xjNCDnNwc51VlPflAsm7p?=
 =?us-ascii?Q?RS88iOuzcC9c87yyVPure8nMqx+xV//SAUe3fsflCyfdoNq2E0aBfrfbwZgE?=
 =?us-ascii?Q?GyIS+ljPTyfyjZFvASc9KYOHdevChF+mtabTZErOZR/CciN3/5QD9io7Ut0v?=
 =?us-ascii?Q?2WOdQjOmq2cGCJhSDHaicl/eNeuuUmD1b3Ht1CjZe949wzEHTf/S7uSaDLFU?=
 =?us-ascii?Q?7KqcVmfovVnhDa0Zu4Qq6sPXnuWrmyV5qtQZY6PlLaMh47y1leXWPt13Cm7m?=
 =?us-ascii?Q?dwcJUqd/oZclsYX3AwDPazy5+8yzOZ84c1VZwpYFERhBcbZNoNR69P5wMpYB?=
 =?us-ascii?Q?9k/ppVKwu0jvLf26PsFZZLqGG+SPlH1aoFd8/tZQI+4r/ARq4TSU7sbxs0F7?=
 =?us-ascii?Q?4SYQnhEnnKUIozAgneSUzse5gSVXLrHDD3E94+Lr19dDmYdB+RFMdiImzDT3?=
 =?us-ascii?Q?8s3uypt53dJXWQ3eXU1j5ix2qf88jTCfNfjsEINKIoXH9uA7AeFmpP32bOvS?=
 =?us-ascii?Q?EvMkutwkeAvze0tCeFJffIphSeBGZQ9Wnd8TVZryDZ3FHbGhwSDpruIuABUH?=
 =?us-ascii?Q?0Z8gzHMu9nUgq429bMQtbg1L5HtR8cb8G43JCuxz+LGZf95frzHFQZfbH/sF?=
 =?us-ascii?Q?9QxXcVb94/wop4+FTb6l1Uxtv5LnITnBGBSPVARXhKxaNxjncmvxqQr5FwZk?=
 =?us-ascii?Q?Mlcbwb5RoLBWbvklNdxqgM+HLfm7i9wIl4l2e2Pv7y4dPFCeefKxp3qXdM0W?=
 =?us-ascii?Q?LDrAKeKfYF5b8+t/+J8ZQhsymGEfGQqAgdV8Ve0KKyu0Lj2iKvaLVYRmJ1yd?=
 =?us-ascii?Q?A+wh1fuhY1wlfTu12pav9J15AG7hOhLFaDIirmxHEzYNGRxcL3pdy9jI9JcN?=
 =?us-ascii?Q?rylidym4YivBVufzEB7sN4JjDQaNAUEGw3v8nC0m/qr/UU+pqDj8lQzWEA5b?=
 =?us-ascii?Q?qNdqrvpdR2tQrkLIDgv0xj52ulmLy36AV6AH+c4fKTZb6wHr88r9Ml1pgssQ?=
 =?us-ascii?Q?vX/zt7n3CHqIm4rZ8Ug23V/D9gfWQMzXOeEmrLUy?=
X-MS-Exchange-CrossTenant-Network-Message-Id: e2ed93ed-02be-4174-2a4d-08da81a7408f
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB4839.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Aug 2022 05:54:17.0398
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ZhRVMcuhZGb27gsBvj6EPSdrI+ZnjSLpOjm6pD0IImCfHYCm62eGPB2rXWBNHEEsYMcilbDWGaQPOjG9ZwFpjg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR11MB7107
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Poimboeuf,
  I installed your patches based on v5.19 kernel.

  And ran syzkaller test on TGL-H and ADL-P for more than
  4 hours with above kernel, this issue could not be reproduced.
  This issue should be fixed.

  Thanks!
  BR.

On 2022-08-18 at 14:39:27 -0700, Josh Poimboeuf wrote:
> Add a macro which prevents a function from getting sealed if there are
> no compile-time references to it.
> 
> Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
> ---
> v1.1:
> - add empty IBT_NOSEAL for CONFIG_X86_KERNEL_IBT=n
> 
>  arch/x86/include/asm/ibt.h | 11 +++++++++++
>  tools/objtool/check.c      |  3 ++-
>  2 files changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/x86/include/asm/ibt.h b/arch/x86/include/asm/ibt.h
> index 689880eca9ba..9b08082a5d9f 100644
> --- a/arch/x86/include/asm/ibt.h
> +++ b/arch/x86/include/asm/ibt.h
> @@ -31,6 +31,16 @@
>  
>  #define __noendbr	__attribute__((nocf_check))
>  
> +/*
> + * Create a dummy function pointer reference to prevent objtool from marking
> + * the function as needing to be "sealed" (i.e. ENDBR converted to NOP by
> + * apply_ibt_endbr()).
> + */
> +#define IBT_NOSEAL(fname)				\
> +	".pushsection .discard.ibt_endbr_noseal\n\t"	\
> +	_ASM_PTR fname "\n\t"				\
> +	".popsection\n\t"
> +
>  static inline __attribute_const__ u32 gen_endbr(void)
>  {
>  	u32 endbr;
> @@ -84,6 +94,7 @@ extern __noendbr void ibt_restore(u64 save);
>  #ifndef __ASSEMBLY__
>  
>  #define ASM_ENDBR
> +#define IBT_NOSEAL(name)
>  
>  #define __noendbr
>  
> diff --git a/tools/objtool/check.c b/tools/objtool/check.c
> index 0cec74da7ffe..91678252a9b6 100644
> --- a/tools/objtool/check.c
> +++ b/tools/objtool/check.c
> @@ -4096,7 +4096,8 @@ static int validate_ibt(struct objtool_file *file)
>  		 * These sections can reference text addresses, but not with
>  		 * the intent to indirect branch to them.
>  		 */
> -		if (!strncmp(sec->name, ".discard", 8)			||
> +		if ((!strncmp(sec->name, ".discard", 8) &&
> +		     strcmp(sec->name, ".discard.ibt_endbr_noseal"))	||
>  		    !strncmp(sec->name, ".debug", 6)			||
>  		    !strcmp(sec->name, ".altinstructions")		||
>  		    !strcmp(sec->name, ".ibt_endbr_seal")		||
> -- 
> 2.37.2
>