From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2059.outbound.protection.outlook.com [40.107.7.59]) by sourceware.org (Postfix) with ESMTPS id AC238385703F for ; Fri, 2 Dec 2022 10:20:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AC238385703F Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LqYPqy341/pYHCG4bceScbhNp512druzrguZ/eMJEI3wln+WPesgjAk4pyOEKakblFXU80g34qq8EiZ8nNAhdOkyRpj+jujsTM4+lm3hws/TOkop15NN9+JwulerKCeMraxUgE6WF4CLxS0rht2tpvFja4Q6SfcIGkbXWJoy2rt/TljemNVCRBp7IrkXUhz4AOmmh9yB3PUyX93CAu6zI0HJoruBjHHPg7OGJv/BgkM2jAVeCTBeswjk8zFYyvzLZ8kqImRjouW/jZcNpHbiyRn9wlLbjfC5QQgvjjFwgXB8qidRYUf4Kt4s3a25hxpSA3T+F2duLZFVYaxn4fu47g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pXi4uz4U72kLOQ6gNTPYXEjFgpu3JKl+h7WiFLZrgJU=; b=kxHEvTeHkMmaNP41GfAk28LMOgwC2bz+zbpCJ0nx3XH1OnUw+KavdmCmf1LJ8+zBaEvjTEITcP51pWYi6+42zEKWYSc8vsuQ5llw1nBu2YSBwCyHUEroVkc2/viDudetq7oP/CXGfWdCyZ+RvDf/Jw0ueuuKzMnGjYCDmpwVoV3ce9qAPrFif0JqcWPtiAtzteNyij9TXyZYBL9AP5ZPCjXTlkdpXnZwa1rRvzL6Ycz7HRHw49P5uG031ptfJLf8yu3mUXWPI8d1CTg/hVJMpaOJHXUk/aTiVXDab63Tqbs5VsFiYknnLo+gcmNIXJ5ZLxO1/dSFdk3rJljayJVEGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pXi4uz4U72kLOQ6gNTPYXEjFgpu3JKl+h7WiFLZrgJU=; b=ciSB+x3Z0lSGR1C+n/ye64gkn0Vt6OLarI3icIJCLh0nWYzdxraZU4lQl3i9rj+Vro/eaoseZGOIzXuJvVXrSUaLUKQU2GlVrdGWQpx1vjd/3aOxpRhEAN41KnZRlAgqfuEGpTtfFu9+8eclWlcvmk/6BOehsFKGyHfgjaO4tfVYyIk0j6YbdGLb5XANs3y5DIOv7OiK1ybDiMF3Bp9eeVxifJ2aFbJS14AcAQpCoqw+Ai+JhiNjebm8n8CjL0F/hXnW6Io8Fnz1CqVL1WDRcByGKpSUxwKA/K/8d4ZVd62XdWxTw0hBaO1SOeYHcYvC56+hqANX/Yrqy1pMCmVzuQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM8PR04MB7409.eurprd04.prod.outlook.com (2603:10a6:20b:1c5::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.19; Fri, 2 Dec 2022 10:20:36 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8%4]) with mapi id 15.20.5857.023; Fri, 2 Dec 2022 10:20:35 +0000 Message-ID: Date: Fri, 2 Dec 2022 11:20:34 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: [PATCH v7 5/7] x86: move bad-use-of-TLS-reloc check Content-Language: en-US To: Binutils Cc: "H.J. Lu" References: From: Jan Beulich In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR3P281CA0083.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1f::21) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AM8PR04MB7409:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f46886d-0dae-41c6-527f-08dad44eda1a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XTq9gSGNa/t5+YZhjKLEZgCs+Dxeb/i5H4aQcSZ+avkUpyjqae90DcmQ/IebJOdTj5XfVYrkNYG/4gn9g8tVmxDOiZNWNBa6JBl5cChVtwhWM0X3m6ipbRNZiZDd7bMTFIJsf9CAkphV7/GSw8zel7T1BJI2ISctGNzgOLNifM4RIBWuivPOIFUZZGxPJo4SWlF8OEwH3rihTmQSrrNEkecSpa22RhSlw/YGLNsOUOMiBuymmOSt8eIzESynUQ3s2lIv6S/RBITpautYTioxk4SVpkGE5JD/uStHJcnePF8mi7IZvT2bB49w/JWfNVGvJ1xp/vycj0/RxCPmxRfFdhacYY3x2hfJjzV4kNsFmPfVYX5UkfWzhSiu3QOP+w3eeCjB1EljvI5zfZd0YxY02ojT8cHPP70QiU5F1TqFF6cV8tShvQgIoXQKovO6803ZN5Csw1A3PE0KPOq910IctGODJqE/QTYuIoqME8mO6jox+Wx8F7jcmkVXnJYLRagVkWsxGkUEsKABzGs6tJNpBsXsajinS5/vP2n8O1G9w/0FBIEO5T/AXL00pNOtWvPMZYFQwhd/gGbwvxuiNG5Xg95+hXAAZGP+8nQNLxJ50RQt87AnO8yD+YPuv2kSVdPWGMeQ/dKGyfgUn5vUcz6IkzzksSpE9AWE7QBen46k/blhJDdWfE3DjoEkEKYE7XV6anVr2XUKM3dihuvj2ia/J6z7vHnL+MwS7r1w4V+VOzs= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(346002)(136003)(366004)(396003)(376002)(451199015)(31686004)(2616005)(2906002)(26005)(36756003)(8936002)(6486002)(6512007)(5660300002)(31696002)(86362001)(41300700001)(6506007)(66476007)(478600001)(186003)(66556008)(66946007)(38100700002)(6916009)(316002)(8676002)(4326008)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MWZXS2Exc3VLb2M5OU00MmJKN1FqYXJDd0hoMm40eW16aHdMMjd4d3ZYZXNs?= =?utf-8?B?TE1TVC9RNklPWDdjcTNwVFJiRjdhekhXdUVvTXNTM2cwM21EWllrU2RLK1hn?= =?utf-8?B?UExtRkdpd3lhRlNJL3hKbHVuRWpOZWFtODEySmVQOG9YZTlEN25rRTduZnFh?= =?utf-8?B?R3pDWitXamczMHZMWDRtcHk3eGVLa2tEUXZTQ0k5NDB0eUVHM1R4N1RxY3l4?= =?utf-8?B?b3dZS3RZTnUvMXdERWw0d1JFZmwwVzdJTit4UkRHZFEwY3EwWTZpQXpqeVlI?= =?utf-8?B?MG9IL3ZkcytVVDIyanhmdVNGbk9pV0wzOFJERWsrckFxTkdLWVNnNzE2VWF0?= =?utf-8?B?dzFqK1NRU2owWkloVHo1dklZdm04N2l6Q3hKSnRWcVRKMUZkUHMrTldvbjho?= =?utf-8?B?bThua3h5aFRiRmM0QVJWdnVtUndWRElZU2xQZkQzVEpHdzdwM20rWmw2SjdQ?= =?utf-8?B?eUhOc29QUTNxdmRYN01tSGhTOVlxa3RHdkpFQWk3dWRpOC9ZRERaRnZyakZZ?= =?utf-8?B?U1N6L0w4bUJLWnpzZHFMQkdnQVRTR3Q0QVRuclREU2RNNyt1cmFDeTd2aDdF?= =?utf-8?B?dzJFK084aGU3Nmo4YUt1d3M2YmhwMjdxdGxxcGUvbWZ4WnBKUkFWZjhSaVpo?= =?utf-8?B?bnJYRkw4RlFVVVoyNlNpYUVKU2huODZralFpT0dLY2JrVHE1Q1BZYlljaDJn?= =?utf-8?B?UTFsK0hUZVU5MUh3WHJhSDFmU0piTjVnSkVvZ0owZVJXMHZ2RHRsNGl3U1oy?= =?utf-8?B?SldlQ1hOVHNyQnNVaGVQdEpUUnR6djZ3Qk8xNWZ3dExEWUdjYXI5Q0liN0h4?= =?utf-8?B?alQ0VzVhZm9zUVJIaDVNSVRDM2RRTDRzYUtDNjgveTVRNkQvNnRPeThva2ZY?= =?utf-8?B?YU5aaTBOK2FtdkF4UVN1cy9LNm1VdGU3dEUyOTFYamNYYXBLTEdlT29tMzh6?= =?utf-8?B?QnBIZDVWMHQ2ZEUySkNZakpLUm81QktOd1FxZUhlcVhhUHBVSkFHeGRjMkJz?= =?utf-8?B?b3JqaEFkVmlEOS9ycW8wV1J4MnJndm5XaGlYKzUrNVRwL1NLV09rMmE3OVFS?= =?utf-8?B?cWNJblJNejk1dlMvdyt3c1F3K2Y5K0YwcEJYQytxSXZydU9lYk40Nk95NnFv?= =?utf-8?B?UWdkbU1FTU5qcFNub2ZoT25mQlZsTkJYVzlWVUhVQjY0L0lmNlB0VWNKK0My?= =?utf-8?B?c0lJOXhQbDk0TGlvQnVTc1FNYjZlclhFOGpwa0N0SHVhclB4clZXL084MjNS?= =?utf-8?B?MGp2SzN5K1JpZnAybTdCa1pLOHpHVjlpSlVXRkZqNmVLdHNsZ1d6Y1RpT0Vu?= =?utf-8?B?U1hVMkw2Ulp1M0NTSE5VL1RGVmRhbHg3QUJuODNWMDJES0s3U0Nzc2dZWTIx?= =?utf-8?B?MWhIcTEzaEtYQzVJL3NjOUZZVGoydXVMRnNTZVBndGVnNkxXek5hSWxHUEFl?= =?utf-8?B?QXBLTEkxZkJTMG9keHpxOXBVTlUrUGxGTFVKTnlBTEJlcFdNUXlFWE92bGlR?= =?utf-8?B?TVpZaWpCOHk1TmZlK2ZHUTJPSnZ1MFZsVlp3dE5iQTlRSHhBT0xrYVl2bUU0?= =?utf-8?B?dUNRRUpIQ203SUU3QzJiQlZjRHZCcGx5aVY0bnJoa1N5cXJxZVhMTXdsSEhT?= =?utf-8?B?YXN4Y2ZsM1pkYW1neGJDM0YwUUNwbmcyRjk4RkF3ZG13ZTZjb3FNNERPd3F2?= =?utf-8?B?bGRFOFRSZllEbEhxWE9LSVZIWFE1RVo0d0dlQ08yc0dESHR4S3lDQTNXcVdG?= =?utf-8?B?c2Fobk9JV2wvbWZ1RXUxZUhXUTJ1NjVldllyaVZpbloxcnNSVnhUUExvbjIw?= =?utf-8?B?OEZ6THgzbmhkenplWlpRTlZYUFZPVVJ3SENJMzVJZzBsb3hiUkh0ZFNsTmM1?= =?utf-8?B?SWZmZytPeHZybytMbmRoNEtyZXdIVjVLMTZWNzV4Umk3dmpmTG03M01qUVZL?= =?utf-8?B?QWVjMEtrQzFUeC8wYkNaR0xEM1hudHpHUWRqT0dvQVpQTVNiYmtWNUt6QmI2?= =?utf-8?B?ZnZ3b3lZVmM3S2ZtQnhseDdPa1NEeUtZTVkzUk1ML0dYUkVtaVRzVUZFaW1u?= =?utf-8?B?VG5ITzZ0WXBJbjZQcVNVU0ZMalpOQ0FyRVFsTmxBZjFRTFNISTQzM2VsMEVE?= =?utf-8?Q?J4Pn27npXPP+nUMjf+zwY+p/s?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f46886d-0dae-41c6-527f-08dad44eda1a X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2022 10:20:35.8823 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9D8dDv8BhVJSJ5V3NFAD5M3wxeMtUQ80W2kUowd3PHoYdXRqknuXnqql5LyJYXVStQV+YeYBrv43bs5DBPpFpw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7409 X-Spam-Status: No, score=-3029.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Having it in match_template() is unhelpful. Neither does looking for the next template to possibly match make any sense in that case, nor is the resulting diagnostic making clear what the problem is. While moving the check, also generalize it to include all SIMD and VEX- encoded insns. This way an existing conditional can be re-used in md_assemble(). Note though that this still leaves a lof of insns which are also wrong to use with these relocations. Further fold the remaining check (BFD_RELOC_386_GOT32) with the XRELEASE related one a few lines down. This again allows re-using an existing conditional. --- Is the set of relocations enumerated here actually complete? --- v2: New. --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -5158,14 +5158,30 @@ md_assemble (char *line) return; } - /* Check for data size prefix on VEX/XOP/EVEX encoded and SIMD insns. */ - if (i.prefix[DATA_PREFIX] - && (is_any_vex_encoding (&i.tm) - || i.tm.operand_types[i.imm_operands].bitfield.class >= RegMMX - || i.tm.operand_types[i.imm_operands + 1].bitfield.class >= RegMMX)) + if (is_any_vex_encoding (&i.tm) + || i.tm.operand_types[i.imm_operands].bitfield.class >= RegMMX + || i.tm.operand_types[i.imm_operands + 1].bitfield.class >= RegMMX) { - as_bad (_("data size prefix invalid with `%s'"), i.tm.name); - return; + /* Check for data size prefix on VEX/XOP/EVEX encoded and SIMD insns. */ + if (i.prefix[DATA_PREFIX]) + { + as_bad (_("data size prefix invalid with `%s'"), i.tm.name); + return; + } + + /* Don't allow e.g. KMOV in TLS code sequences. */ + for (j = i.imm_operands; j < i.operands; ++j) + switch (i.reloc[j]) + { + case BFD_RELOC_386_TLS_GOTIE: + case BFD_RELOC_386_TLS_LE_32: + case BFD_RELOC_X86_64_GOTTPOFF: + case BFD_RELOC_X86_64_TLSLD: + as_bad (_("TLS relocation cannot be used with `%s'"), i.tm.name); + return; + default: + break; + } } /* Check if HLE prefix is OK. */ @@ -6819,26 +6835,6 @@ match_template (char mnem_suffix) } } - switch (i.reloc[0]) - { - case BFD_RELOC_386_GOT32: - /* Force 0x8b encoding for "mov foo@GOT, %eax". */ - if (t->base_opcode == 0xa0 - && t->opcode_modifier.opcodespace == SPACE_BASE) - continue; - break; - case BFD_RELOC_386_TLS_GOTIE: - case BFD_RELOC_386_TLS_LE_32: - case BFD_RELOC_X86_64_GOTTPOFF: - case BFD_RELOC_X86_64_TLSLD: - /* Don't allow KMOV in TLS code sequences. */ - if (t->opcode_modifier.vex) - continue; - break; - default: - break; - } - /* We check register size if needed. */ if (t->opcode_modifier.checkregsize) { @@ -6868,12 +6864,19 @@ match_template (char mnem_suffix) && i.types[0].bitfield.dword && i.types[1].bitfield.instance == Accum) continue; - /* xrelease mov %eax, is another special case. It must not - match the accumulator-only encoding of mov. */ - if (i.hle_prefix - && t->base_opcode == 0xa0 + + if (t->base_opcode == MOV_AX_DISP32 && t->opcode_modifier.opcodespace == SPACE_BASE) - continue; + { + /* Force 0x8b encoding for "mov foo@GOT, %eax". */ + if (i.reloc[0] == BFD_RELOC_386_GOT32) + continue; + + /* xrelease mov %eax, is another special case. It must not + match the accumulator-only encoding of mov. */ + if (i.hle_prefix) + continue; + } /* Fall through. */ case 3: