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;
Content-Type: multipart/mixed; boundary="------------R30R0KSuTXrEe2P2evgWzt2J"
Message-ID: <d11eea99-6e93-6af4-87aa-2e7f1c6ae83e@oracle.com>
Date:   Tue, 18 Jul 2023 13:01:33 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.4.2
Subject: Re: [GIT PULL] objtool/urgent for v6.5-rc2
Content-Language: en-US
To:     Linus Torvalds <torvalds@linux-foundation.org>,
        Borislav Petkov <bp@alien8.de>
Cc:     x86-ml <x86@kernel.org>, lkml <linux-kernel@vger.kernel.org>,
        Josh Poimboeuf <jpoimboe@kernel.org>,
        Jens Axboe <axboe@kernel.dk>,
        Peter Zijlstra <peterz@infradead.org>
References: <20230716184204.GFZLQ5/DJ1+q8vpuuN@fat_crate.local>
 <CAHk-=wiXp9YLB6wHOmc4rBJbd7j0gHgHZPHhUSPe-SAjJgmABQ@mail.gmail.com>
From:   Vegard Nossum <vegard.nossum@oracle.com>
In-Reply-To: <CAHk-=wiXp9YLB6wHOmc4rBJbd7j0gHgHZPHhUSPe-SAjJgmABQ@mail.gmail.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dzhuU01ibmFKa0NranFVenVDQnJMTlcyYnQ0TXYrNkNzdSs2ejc5Y0ZNMyt3?=
 =?utf-8?B?cWVhbzU2aVBrYWRKR3U3Zy92cFBBSXBkSzl6Y1NFQ3JOaWlOMVVVaWZtek5L?=
 =?utf-8?B?RXMyRkVldndraUtFWEJLbmRVRUtuSG9ib1pnT3BLdWIzcHlkR2lkY0dRUVZJ?=
 =?utf-8?B?MXZhQUVKeDBsSjdNeXJjMXJud1FEdHMzckVQTVRyVUdNTzEwNXQySUNCV0dG?=
 =?utf-8?B?VTYzaTBBUnN0OXR4cEtXa2twMG1IQktJNU9RQ3RpcnhTM2FXSmhYSjBvTXAz?=
 =?utf-8?B?Mk0yTk9CbmwrL3ZZOWxSWDRrdStMUjR3eDNLYWdtNm5rWkVnWEV0eUdhd24z?=
 =?utf-8?B?SkJhZTQ4UEh6TTFXa1IySHpqMGVnQ2hKVjhSVytJekhQSGZRM3dDd1RIV3Bm?=
 =?utf-8?B?OWcwL1RZWHVqallCZ3l4OCtINnllUTlzYzZjb2lJVHc3K1laWmpIZldMY0k0?=
 =?utf-8?B?cmJJem0yRUlPYzRnTjdBbThOWkpHTWVhem4xOEJ2MWJIdGMrT25RQnZRUjI4?=
 =?utf-8?B?Z1RybzE2Wkd4a1ZpN3U2UlYzM0lhMUtwT240ZGtHL0VKNEpYaTJpa3k1cU94?=
 =?utf-8?B?bkxZREZXay9kdWI1bUdNSExaVG4wY3hEMzVIa1hUUGVHUXRJMnVidVUyNUxF?=
 =?utf-8?B?NU1XUXVXcmNvS0NWUHR3b3hFMjZtNHd4ZG9pUVZ4TUFRZDBOV0NhakVGcWxD?=
 =?utf-8?B?bnFjT2Jmb0kyYVplZWNkREdnemYwUkEzRnphWXlhaE1FN1VORWhWZGRhSmcv?=
 =?utf-8?B?Zkw2Q2NBUkxmVlpWNXpzUWE3OWtmam5PV2RBbnBUM3hYMWpCakF3ZWNRVm5S?=
 =?utf-8?B?SFBJaGE4bUN3NG5TTG8xRDRubE1HNzZ4azY3QzZQOEJETmt3WVdKY0lGZUFn?=
 =?utf-8?B?TGE5SU1paVlPeVpwMHFBZEZhNHhvYTFaR1JtcU1EU21IeVlybzNZK3MzRFlG?=
 =?utf-8?B?NUMvQXJmdnpqRmpKblFEYXY0NXRpZkxaLzJuOTZBbjZmN1diNi9CY3ExaUp4?=
 =?utf-8?B?dHNyVlFRdnA1Tm9xeUZSNHJPd2JWU1BwWnlOYVErN25EMHZtYXFjRjVJWkhW?=
 =?utf-8?B?TFR3ZnF6VExjaDY1eDVZS3hMbGxsUVQ4UGtNcGM1VW9ZWGFuYlhCam5pUjA5?=
 =?utf-8?B?Vm1WTjNIVkxyN0dKN2hQWkNJbUNFZDVFVHoyK2hLYjE0SHJwMmFxZkJDTGFE?=
 =?utf-8?B?VllPdS9nVDU4MytMUzJ6dy9VSnVpcGpmQVFMckpNSndxczNNazBnVmFPb0pq?=
 =?utf-8?B?Y2hCMnZwQ3pVMjJOd2Q5bjIvUFJtRjBKSWI4aFZRbDRsWi9uQnFURUlTeWNq?=
 =?utf-8?B?VGlzSDVBbEFKMWVMNzZkRWVjQ2dNSC93WXZKSzhxSmpuN0o3MWdESDFYS1Vs?=
 =?utf-8?B?RmVuWmtjaTAwaVdlYkw1N3J1QmlmNGhIZDdUQStBWHFaZmpTYTFIMlVyWW9j?=
 =?utf-8?B?ZW1DT0RCUkNjZWlZWjI1Mjc0L3Q2VU9reloxcHE3ckZCdWxCWXh3N3dFVXNm?=
 =?utf-8?B?TnBjZGxvVXFwTFg0OHNJMzRyQkQ4WmZ6anVEOUxuaEdSYWlWaFhpRXQ3TDI0?=
 =?utf-8?B?KzY1OFVpNmU0MW9qa1ZsaUxYQ2RKcllCNDF2Mm4rbzhPMXZNcTRMVVh6VUkr?=
 =?utf-8?B?Mnp1UnczaDg0dWFiN1pibUVrSHpIR1NicVg4QTJjS2wxMGJmKzJlVXEycXNo?=
 =?utf-8?B?Nm9HSktxWGgyajhJWHo2TVlDOWtiVHBTTDJybkdPZHFwdjh4TktvR3NmUGNp?=
 =?utf-8?B?TCtxRmwzamx3YXNlN3FQdWhjK2JicXY3elZvNTRoTllaaDFNTERsYlE5YzVv?=
 =?utf-8?B?bUdkcmVaY0pwaHU2eWs3bHp2MmgrOEFzaE1VYVlFSlk1L0NXei9HK0t5OHBp?=
 =?utf-8?B?MXd5THQwMVI4VmRLT0RpNnFCM1MyT2hwemVmaE4vZWFtNnpMbkd0TGc0WjJm?=
 =?utf-8?B?enpNVUNYOVhlSGZRU0J5QWgxS01iS3dUZ2JGK2FWTkRwb3BtbWVzelhwaFpl?=
 =?utf-8?B?dlE5czRqdEg1eURBdDNsUUoxcE95TXc2T09BeVpPZ1lIbDBOTHViT1Y2UFZY?=
 =?utf-8?B?eThKVlpKbHhKZUhXK2xjaWYyY0RMd1hLY0hlQWJuelJRNHk1ZkNta3VyNlg2?=
 =?utf-8?Q?LQlRgnj3q+HTq4lhAGZoBZSi5?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?utf-8?B?ekFEYTdwczFFNStrbzlYWFpxV0ozSUo2V1MyNjYrU2dSSk5GZGV4ck5YZWsy?=
 =?utf-8?B?eGMxQnd0aWk4UmRBUlJNYmRhUEVnbXNwMDJGQjcvZzFWeVQ2RDNCMEZBY0M3?=
 =?utf-8?B?N0ZLOVVKTVVZNkFNR2poL0UrTlZYT3RXNmJsOVI1MU4wb1FaemlhaXRROUNL?=
 =?utf-8?B?WG9UOGU3d3JyNnJmOWhqdkJhUVM4OGFnSEJyT0xoM05Mc0NpeEViZnpSYnVp?=
 =?utf-8?B?OHdLcUFPdEdjYXNLWkM3UGR5d0ZXL25zTXpxVVNtdXgxdjdDR3BhZ3NPb01D?=
 =?utf-8?B?NjlqSWRNc2l1Ty9TN29yRDM3MWRaS0h6WVFraVBDRTRtcis2T1NOb1VpVWwr?=
 =?utf-8?B?ZkZHWCtzL0prT1o5dk9kUnByUmpUUkZqNHZ0QSt4R0xWditFTXhZMlE1eE5F?=
 =?utf-8?B?QlNiaDlHMlBTYkttVEdGeUJGWVowZE9FQWwyVzAvV2c2NXpNM3h6UUMvelpz?=
 =?utf-8?B?ZStUd2IwTTluVjkyaENZRmRQQmVUZ1ZFd3BmcStUa1ZORWdFUVNKVUNoRGRn?=
 =?utf-8?B?Mzh5QmFxZ043V0V1UDM3OG9sdlJ3UzVMS29STHVVZzlqY05OcVgxeE41azF4?=
 =?utf-8?B?ZEg4VU5FM0xIQU9KNEM3c2ZPQVVWejNHVFVXdWlraU83eE55eEZlSEtlbG9Y?=
 =?utf-8?B?T1RoR016ZkZoWjJyNVB0SVU4cEV4ZnVLeUt6cFE3SzhvZWI4RFB1bjlTbU1l?=
 =?utf-8?B?cUNvQmJ5eHpZZDM1bTB1OXBzTnowNXNVT2EydVQ4ZUc5WFhlY0ZEVmRlTWkv?=
 =?utf-8?B?NENDSVVIT21LTFNsRWxQamxBeE50b2V6UGdSMSszUXdWdUFvSHpKb2lVb2Ri?=
 =?utf-8?B?SlNUSjRWc3ltbmpSQmpaZDNFSHpZWW4xRnkwcXZLd2VUeFlKQlBMQkpQTzhB?=
 =?utf-8?B?bkVnZ1FMTHdoQk9BT0FEd0NZckNVSXBxVUo1K3RVOW1NN0dtVDJKcjNpTDQ3?=
 =?utf-8?B?V2phSEZyc3RtOFRHSVNCeTljMmw4VVJFanhScnRra1o3OWNsZzNSc2c0UXJS?=
 =?utf-8?B?UGZjTEpQL3JpdmEyVHdUYkp2S01abm8yRlFheGtWZm1jaUlNdUU0V0FlcHFv?=
 =?utf-8?B?aXNjclQzTE5HV2tsOHUrMGI2eU5TdnRLbFJrRW5xNWp5MXdLZWY3SXFNa0RU?=
 =?utf-8?B?UDlQUjBoSnNsRkhoTjE2UmYrRXQ5V05BbDA1UFV2TmFYZ3BEbFV5NzMreVNU?=
 =?utf-8?B?Rm1xaXpYMSszcGMwNzdSYXVGSk1MQ0ZFTHh6bno2bkJpVUNHV09Qb3NhbXU4?=
 =?utf-8?Q?ARQGEfWJd23lfwN?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 40aaebd1-96aa-4d64-d594-08db877e5d8c
X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5433.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 11:01:41.7424
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: xu2KpwHmgifmp1eOQ2aBE+nQ+OhRsk8iS406TJGArPv8cdw0rLzOioLraRnPfiNV9/g7UeKK8HezzKdEE0GM9uirEQOIwhNDmmOX6KEhd+0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB6176
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26
 definitions=2023-07-18_07,2023-07-18_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 mlxlogscore=826
 suspectscore=0 phishscore=0 mlxscore=0 adultscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000
 definitions=main-2307180100
X-Proofpoint-ORIG-GUID: tM8Z0aXtKFsfZICwUoEYCOv2HQUCa6e9
X-Proofpoint-GUID: tM8Z0aXtKFsfZICwUoEYCOv2HQUCa6e9
X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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

--------------R30R0KSuTXrEe2P2evgWzt2J
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit


On 7/16/23 22:39, Linus Torvalds wrote:
> On Sun, 16 Jul 2023 at 11:42, Borislav Petkov <bp@alien8.de> wrote:
>>
>> - Mark copy_iovec_from_user() __noclone in order to  prevent gcc from
>>    doing an inter-procedural optimization and confuse objtool
> 
> This is painful.
> 
> Isn't there some way to mark the user_access_begin() itself so that
> the compiler doesn't move it?
> 
> I've pulled this thing, but it does seem like we're chasing the
> symptoms, not the deeper cause..

The deeper cause is that the [code generated by the] user_access_begin()
and user_write_access_end()/unsafe_get_user() calls end up in different
functions and objtool doesn't like that.

If you are willing to add another helper function that also takes the
label argument, you could do something like this:

#define user_access_begin_label(a,b, err_label) \
         ({ \
                 asm_volatile_goto("" :::: err_label); \
                 user_access_begin(a,b); \
         })

The asm_volatile_goto() isn't a real goto (it emits no instructions),
but it makes GCC believe there's a potential jump there and prevents the
compiler from splitting up the function across the label and its usage.

unsafe_get_user() already takes this same label as an argument and the
user_access_end() call is where the label is defined.

I tried first to avoid changing the uaccess API by defining a fixed
label inside user_write_access_end() and always doing "fake jumps" to
this fixed label from both user_write_access_begin() and
unsafe_get_user(). However, you run into trouble with functions like
sys_waitid() in kernel/exit.c that have multiple user_write_access_end()
calls.

You might think that you could switch them around -- define the label in
_begin() and fake-jump to it from _end(), but that doesn't work either
since _begin() needs to be an expression and labels defined inside a
statement expression are not accessible outside that expression...

Anyway, attached a proof of concept patch that fixes the objtool
warning, but I didn't even do a full build test.


Vegard
--------------R30R0KSuTXrEe2P2evgWzt2J
Content-Type: text/x-patch; charset=UTF-8; name="uaccess.patch"
Content-Disposition: attachment; filename="uaccess.patch"
Content-Transfer-Encoding: base64

ZGlmZiAtLWdpdCBhL2FyY2gveDg2L2luY2x1ZGUvYXNtL3VhY2Nlc3MuaCBiL2FyY2gveDg2L2lu
Y2x1ZGUvYXNtL3VhY2Nlc3MuaAppbmRleCAxY2M3NTZlYWZhNDQuLjEyOWJmODIzZTQwNSAxMDA2
NDQKLS0tIGEvYXJjaC94ODYvaW5jbHVkZS9hc20vdWFjY2Vzcy5oCisrKyBiL2FyY2gveDg2L2lu
Y2x1ZGUvYXNtL3VhY2Nlc3MuaApAQCAtNTU0LDYgKzU1NCwxMSBAQCBzdGF0aWMgX19tdXN0X2No
ZWNrIF9fYWx3YXlzX2lubGluZSBib29sIHVzZXJfYWNjZXNzX2JlZ2luKGNvbnN0IHZvaWQgX191
c2VyICpwdAogCXJldHVybiAxOwogfQogI2RlZmluZSB1c2VyX2FjY2Vzc19iZWdpbihhLGIpCXVz
ZXJfYWNjZXNzX2JlZ2luKGEsYikKKyNkZWZpbmUgdXNlcl9hY2Nlc3NfYmVnaW5fbGFiZWwoYSxi
LCBlcnJfbGFiZWwpCVwKKwkoeyBcCisJCWFzbV92b2xhdGlsZV9nb3RvKCIiIDo6OjogZXJyX2xh
YmVsKTsgXAorCQl1c2VyX2FjY2Vzc19iZWdpbihhLGIpOyBcCisJfSkKICNkZWZpbmUgdXNlcl9h
Y2Nlc3NfZW5kKCkJX191YWNjZXNzX2VuZCgpCiAKICNkZWZpbmUgdXNlcl9hY2Nlc3Nfc2F2ZSgp
CXNtYXBfc2F2ZSgpCmRpZmYgLS1naXQgYS9saWIvaW92X2l0ZXIuYyBiL2xpYi9pb3ZfaXRlci5j
CmluZGV4IDNlNmM5YmNmYTYxMi4uMzMwOWJhZDY5ZWNhIDEwMDY0NAotLS0gYS9saWIvaW92X2l0
ZXIuYworKysgYi9saWIvaW92X2l0ZXIuYwpAQCAtMTcwOSw3ICsxNzA5LDcgQEAgc3RhdGljIGlu
dCBjb3B5X2NvbXBhdF9pb3ZlY19mcm9tX3VzZXIoc3RydWN0IGlvdmVjICppb3YsCiAJCShjb25z
dCBzdHJ1Y3QgY29tcGF0X2lvdmVjIF9fdXNlciAqKXV2ZWM7CiAJaW50IHJldCA9IC1FRkFVTFQs
IGk7CiAKLQlpZiAoIXVzZXJfYWNjZXNzX2JlZ2luKHVpb3YsIG5yX3NlZ3MgKiBzaXplb2YoKnVp
b3YpKSkKKwlpZiAoIXVzZXJfYWNjZXNzX2JlZ2luX2xhYmVsKHVpb3YsIG5yX3NlZ3MgKiBzaXpl
b2YoKnVpb3YpLCB1YWNjZXNzX2VuZCkpCiAJCXJldHVybiAtRUZBVUxUOwogCiAJZm9yIChpID0g
MDsgaSA8IG5yX3NlZ3M7IGkrKykgewo=

--------------R30R0KSuTXrEe2P2evgWzt2J--