From patchwork Fri Dec 8 07:01:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 175633 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5285592vqy; Thu, 7 Dec 2023 23:01:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IGS2NA8qTZiJ3tOvQX5hOlYBNZgZRF60CuXpS7jFe0Y8kN6u1K3cfVRJJ7YdyPNZ7V26MMK X-Received: by 2002:a05:622a:1050:b0:425:4043:1d7e with SMTP id f16-20020a05622a105000b0042540431d7emr4263450qte.81.1702018902203; Thu, 07 Dec 2023 23:01:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702018902; cv=pass; d=google.com; s=arc-20160816; b=x6r2g/0Zft+M4kyuTQW9nztzvOiGfcIF43ge6hLcVNokOwYt2Zr5vzWB9cEkGCO1Ib 7OKHjJp4DWzht37aMTH5CRkgLMMEZhEDz0qYhtqU1rOecYIR6xMXo92TCPQZQAXdeL+1 50teRngT4N/vX9pLnUEiKeDAlnKF5IfJgjwKa4oteQNQPZdj/PvvkjSzGxL/ovsVG+9r NJEGNv5zW2RTpQOGUO6CSGR+w63f8ZneFEj/bN+u6JmskWVRgZptfbp1zl/AOhAxf4yZ 2T4G8l6JvkReDaeZ+sc74Hr5lXIrwtnrQD3oAJWUKieAgapNTvk1BPFCvE5oySkLhGWN imCQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :in-reply-to:autocrypt:references:cc:to:from:content-language :subject:user-agent:mime-version:date:message-id:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=9mEMcMc4MzHxZZFPrA4O742B7xGCp+7sU94WvgFFgOg=; fh=8WW8/k0o0G2vlJiZAQKLzwZ5FShsw2CjyMds4OH6804=; b=izAoXGzS2o+OISWqq9lmBh6Ci8SfkOjuPeluR6Dr6a4Qkf7qL+FcdamQ33sVZy6ISh LOdU6bA8rIeUycw5oV8hXxG7ZTjSp+nLPuiPGgOuZ6XqGlVN9WLKd6F9uS73wzm8J5F2 x4MKJ2Z8kKuPFCAviOtBBD4je9rFzakA7gvDhmTRcIA6BcaBrLlU4N+fFrru8UMCRAHI NPKk8OroS+4+bTdUD6pXKbih3Im4ttNKGLKr491Ta6TsRHJaAFvtP6Xpe5E27isLS6Cd PF60E+rILM5WcAPOybZtoBaPE1BE8TQjbexHCx3psaK28uW4Lz51GJvYc2yxUAV5tltb 1lfA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=google header.b=E1YLsfYa; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id ay13-20020a05622a228d00b00423aca6388bsi1692944qtb.786.2023.12.07.23.01.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 23:01:42 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=google header.b=E1YLsfYa; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0FE3F3857B94 for ; Fri, 8 Dec 2023 07:01:41 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by sourceware.org (Postfix) with ESMTPS id 859023857C7C for ; Fri, 8 Dec 2023 07:01:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 859023857C7C 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-Filter: OpenARC Filter v1.0.0 sourceware.org 859023857C7C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::431 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702018896; cv=none; b=ViFc8HrRZngDwK9fde/4nWUhrh5ftUnbNp2BQLXQN/M75UeI5NCH3mfCD+IBa5Rq5xC9hesbUBchEt48UYmaODxFgA0HU238n4MFTtqfgyx2UyLa1L19a/6fJvxinYjIxvh9u0xM04e6J83zLheJl/4dkJot2v8P4jd9wAf8NpM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702018896; c=relaxed/simple; bh=5BxyDWz3RgODbE2iUeOi+0i9GZIOAZlss5oMN6+C+3A=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=bFGHGrFHBWRxdIzP80Ykcrur+taa8q51B1ucpYwefZ54lLozjBq6Y5SJDBrpjf+Ik0NBTm4SxpYunRZ5oc98nhHO3BdKAFGl6rdQ1F3VubEVb5mbnxH3UTjH2jTmXeGnryzj07Ct2YT6CbakaUMIo28hjXLq3D8OtEZGmtSZXKA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3333a3a599fso1504674f8f.0 for ; Thu, 07 Dec 2023 23:01:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1702018893; x=1702623693; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=9mEMcMc4MzHxZZFPrA4O742B7xGCp+7sU94WvgFFgOg=; b=E1YLsfYaicUDDYJhxCwiATHc4c2s2u7SzNNlnekx7wO1XwV3QVUiM11k0tc7bvyDz+ XIAO9Yr6LrrGOuWcn/AtHqa2fDwZxNY9J12JYXgi1jTAamtFAHAfIBGNcoOzEy7BWF7+ DVmPYpdhPPnrLbxHbhTgIdQlS9gJ6DafsgSpg0I6aD2OgqY1h3UCu5H2OWxARifKyjbc 7jrzKXJgad3elOz+sEoyTOkb3lvczaMTMkVgFUuJXCLLe7B9uhoxDmOzAwKauNHvn4RE BPVGky+w3CT7pjeI2oui/XKT2rWujNaMtXP+kET5dqEAjRh+Wrkz53RFI8493IUq/C0U P18Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702018893; x=1702623693; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9mEMcMc4MzHxZZFPrA4O742B7xGCp+7sU94WvgFFgOg=; b=Lmh2T6uKdf7zmA337PbxErLWY5P0rSd3WeZce77r6ILMRaadWhH6JinfwCALj2OJSc 7vYDn5U5LLugzoAeoH2QiC9i6Tzeb5Lfon65D1TlfDcBVx1+dT2MfoG4GMlA3wjtNJQ9 9810DUu9T9KqGgmCv5J2V8F40XDeO3RY+Sjaqr4LGgZnMLZOhwIZuoShGULTRwfE9FdP 1ixvrlMq1s4ec7H+1MDCc6tVLSfOiVck2By+OZMvW1LkTsu/lDLLfjcAWUwnC55wzT+U 7hIjDpg/fjG7iHGNpCvRP5PiIkpJzA392cVECXh2GZmZrw6bmFgdC9C/jwLDFs9lr6bx c+/g== X-Gm-Message-State: AOJu0YzM9Yq0bdrch0cVP9HJlA/W49GovCo1T2aJcumVY6+IcleGMcjc hcisAzu9PJ4/w8WmPjBg6vsJmkZTNxfRI0oYxvtr X-Received: by 2002:a5d:42cc:0:b0:333:3c90:fe16 with SMTP id t12-20020a5d42cc000000b003333c90fe16mr218521wrr.32.1702018893265; Thu, 07 Dec 2023 23:01:33 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id w13-20020a5d404d000000b003333f9200d8sm1320385wrp.84.2023.12.07.23.01.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 07 Dec 2023 23:01:33 -0800 (PST) Message-ID: <8bee4d1a-9d7d-4fb0-980c-f40c404fa542@suse.com> Date: Fri, 8 Dec 2023 08:01:32 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 3/3] x86: last-insn recording should be per-subsection Content-Language: en-US From: Jan Beulich To: Binutils Cc: "H.J. Lu" References: <9853a641-73fc-4d47-83aa-1402464d2920@suse.com> Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <9853a641-73fc-4d47-83aa-1402464d2920@suse.com> X-Spam-Status: No, score=-3026.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, 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 server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784696172424281365 X-GMAIL-MSGID: 1784696172424281365 Otherwise intermediate subsection switches result in inconsistent behavior. Leverage ELF's section change hook to switch state as necessary, limiting overhead to the bare minimum when subsections aren't used. --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -15920,6 +15920,39 @@ i386_elf_section_type (const char *str, return -1; } +void +i386_elf_section_change_hook (void) +{ + struct i386_segment_info *info = &seg_info(now_seg)->tc_segment_info_data; + struct i386_segment_info *curr, *prev; + + if (info->subseg == now_subseg) + return; + + /* Find the (or make a) list entry to save state into. */ + for (prev = info; (curr = prev->next) != NULL; prev = curr) + if (curr->subseg == info->subseg) + break; + if (!curr) + { + curr = XNEW (struct i386_segment_info); + curr->subseg = info->subseg; + curr->next = NULL; + prev->next = curr; + } + curr->last_insn = info->last_insn; + + /* Find the list entry to load state from. */ + for (curr = info->next; curr; curr = curr->next) + if (curr->subseg == now_subseg) + break; + if (curr) + info->last_insn = curr->last_insn; + else + memset (&info->last_insn, 0, sizeof (info->last_insn)); + info->subseg = now_subseg; +} + #ifdef TE_SOLARIS void i386_solaris_fix_up_eh_frame (segT sec) --- a/gas/config/tc-i386.h +++ b/gas/config/tc-i386.h @@ -294,6 +294,8 @@ struct i386_segment_info { last_insn_prefix } kind; } last_insn; + subsegT subseg; + struct i386_segment_info *next; }; #define TC_SEGMENT_INFO_TYPE struct i386_segment_info @@ -395,6 +397,9 @@ extern void tc_x86_frame_initial_instruc #define md_elf_section_type(str,len) i386_elf_section_type (str, len) extern int i386_elf_section_type (const char *, size_t); +#define md_elf_section_change_hook i386_elf_section_change_hook +extern void i386_elf_section_change_hook (void); + #ifdef TE_SOLARIS #define md_fix_up_eh_frame(sec) i386_solaris_fix_up_eh_frame (sec) extern void i386_solaris_fix_up_eh_frame (segT); --- a/gas/testsuite/gas/i386/i386.exp +++ b/gas/testsuite/gas/i386/i386.exp @@ -745,6 +745,8 @@ if [gas_32_check] then { run_dump_test "nop-6" run_dump_test "unique" + run_dump_test "lfence-subsect" + run_dump_test "property-1" if {[istarget "*-*-linux*"]} then { --- /dev/null +++ b/gas/testsuite/gas/i386/lfence-subsect.d @@ -0,0 +1,18 @@ +#as: -mlfence-before-indirect-branch=all +#warning_output: lfence-section.e +#objdump: -dw +#name: -mlfence-before-indirect-branch=all w/ subsection switches + +.*: +file format .* + +Disassembly of section .text: + +0+ <_start>: + +[a-f0-9]+: f3 ff d0 repz call \*%eax + +[a-f0-9]+: f3 c3 repz ret + +[a-f0-9]+: cc int3 + +[a-f0-9]+: cc int3 + +[a-f0-9]+: cc int3 + +0+8 : +#pass --- /dev/null +++ b/gas/testsuite/gas/i386/lfence-subsect.s @@ -0,0 +1,19 @@ + .text +_start: + rep + + .subsection 2 +aux1: + nop + + .previous + call *%eax + rep + + .pushsection .text, 2 +aux2: + nop + + .popsection + ret + .p2align 2, 0xcc