Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp33193rwb; Mon, 26 Sep 2022 08:58:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7j2QtRfFcUBxDam8fR5HKN4Jaif00sYuyvsQjrw8CeYQAtqssa897Az8nBDbFmJmmWCRnf X-Received: by 2002:a62:8403:0:b0:540:c1e4:fb31 with SMTP id k3-20020a628403000000b00540c1e4fb31mr24139971pfd.85.1664207920646; Mon, 26 Sep 2022 08:58:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664207920; cv=none; d=google.com; s=arc-20160816; b=MmoqL8hwS3YkHRX924fSR9cvnX225OeG+KoYh5u2J4HlBMi/kek9oc1PqR/AWQ1L83 QwUbBdJ90uyWxN9p9gY/+Ht3gdtN0GKYYuK+VdaAPZzoqRQ3amJLWxZW1cvxgWhgwmZG XbBXxfHkjcAT/d9oztB7QGtNndSkLXfP67uuCDPDVusn8qJzBnvOL/HK/suCNZfTKRWg +LT/skJr5UIYVPOBQ758maPLylEJAGdgYAV5VvRvpVTseIf8Zw7iGTqiJDDR5FJwIOuy SmJJg4e4Ml1QRB+x1OgHi9n9zhxr015NHmr93jwcqlG6x+iyHwOdqr3pzSpElm5lcxKg Qgtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id; bh=UKhtsbkifI5lzj1NQ8BfE9HCfj6ZJAQDSZBRdGSy1LM=; b=CiDc3mjTamruitEbD2D8BNk7WepP1bv4N10lN56JEGwSeicHOr0oduCRuyKlj0SNsK 44MJeI9ARNWRFQn8ihU2+Zfu/eeClsKn3YS7HCDiJ3QICyT++8hZAcV3o6uwLrpjEYUW K3AIx5QVbe7B97gFijidzkJ91TRWHZAUX7IPvOdUqevaBrFvCHMNf8Jr4HLuL/Mz1YQR lFZz3Z10KRRptNyU02dg04FDmgCdLIkODBBRi1x5moD9nikWcPuOsOzxijJNumtM5YKb B470D3yIyr4Z6fRbgyk4FzqFJT8lCTi6EYmQsC7x5CawzlpA1ehRCmp5oO72Lei6HmMc xT7Q== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u4-20020a170902bf4400b0017298291826si11318790pls.459.2022.09.26.08.58.27; Mon, 26 Sep 2022 08:58:40 -0700 (PDT) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234070AbiIZOwt (ORCPT + 99 others); Mon, 26 Sep 2022 10:52:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235076AbiIZOvv (ORCPT ); Mon, 26 Sep 2022 10:51:51 -0400 Received: from mail-m118204.qiye.163.com (mail-m118204.qiye.163.com [115.236.118.204]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AE7B81261B for ; Mon, 26 Sep 2022 06:18:21 -0700 (PDT) Received: from [192.168.31.11] (unknown [221.212.176.62]) by mail-m118204.qiye.163.com (HMail) with ESMTPA id CCAA1A20452; Mon, 26 Sep 2022 21:18:18 +0800 (CST) Message-ID: <0ed40d5b-a404-f424-c9c4-2adf1bf9750b@inclyc.cn> Date: Mon, 26 Sep 2022 21:18:18 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 Subject: Re: [PATCH] x86/fpu: use __alignof__ to avoid UB in TYPE_ALIGN Content-Language: en-US To: Peter Zijlstra Cc: tglx@linutronix.de, ndesaulniers@google.com, Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Paolo Bonzini , "Chang S. Bae" , linux-kernel@vger.kernel.org References: <20220925153151.2467884-1-me@inclyc.cn> From: YingChi Long In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFPN1dZLVlBSVdZDwkaFQgSH1lBWUNNSR1WGR4fGhpISxkYThoZVQIWExYaEhckFA4PWV dZGBILWUFZSUlKVUlKSVVKTE1VTUlZV1kWGg8SFR0UWUFZS1VLVUtVS1kG X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6NQw6SDo4MjlOQjc5NhMiLThI SSsKFDFVSlVKTU1PSkJDSEtLS0tIVTMWGhIXVRYeOxIVGBcCGFUYFUVZV1kSC1lBWUlJSlVJSklV SkxNVU1JWVdZCAFZQUhDQk03Bg++ X-HM-Tid: 0a8379f2cee22d26kusnccaa1a20452 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,NICE_REPLY_A, RCVD_IN_DNSWL_NONE,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 Seems GCC __alignof__ is not evaluated to the minimum alignment of some TYPE, and depends on fields of the struct. > Notably I think 'long long' has 4 byte alignment on i386 and some other > 32bit archs. C11 _Alignof matches in the case (see godbolt link below). How about switch to _Alignof? Link: https://godbolt.org/z/T749MfM9o Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=10360 Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023 Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69560 On 2022/9/26 17:01, Peter Zijlstra wrote: > On Sun, Sep 25, 2022 at 11:31:50PM +0800, YingChi Long wrote: >> WG14 N2350 made very clear that it is an UB having type definitions with >> in "offsetof". This patch change the implementation of macro >> "TYPE_ALIGN" to builtin "__alignof__" to avoid undefined behavior. >> >> I've grepped all source files to find any type definitions within >> "offsetof". >> >> offsetof\(struct .*\{ .*, >> >> This implementation of macro "TYPE_ALIGN" seemes to be the only case of >> type definitions within offsetof in the kernel codebase. >> >> Signed-off-by: YingChi Long >> Link: https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm >> --- >> arch/x86/kernel/fpu/init.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c >> index 621f4b6cac4a..41425ba0b6b1 100644 >> --- a/arch/x86/kernel/fpu/init.c >> +++ b/arch/x86/kernel/fpu/init.c >> @@ -134,7 +134,7 @@ static void __init fpu__init_system_generic(void) >> } >> >> /* Get alignment of the TYPE. */ >> -#define TYPE_ALIGN(TYPE) offsetof(struct { char x; TYPE test; }, test) >> +#define TYPE_ALIGN(TYPE) __alignof__(TYPE) > IIRC there's a problem with alignof() in that it will return the ABI > alignment instead of that preferred or natural alignment for some types. > > Notably I think 'long long' has 4 byte alignment on i386 and some other > 32bit archs. > > That said; please just replace the *one* instance of TYPE_ALIGN entirely > and get rid of the thing. >