From patchwork Thu Nov 30 08:51:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 171780 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp243238vqy; Thu, 30 Nov 2023 00:52:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IGjSzO1Jub33ZLPJ40qN/+GlhEyKOwSohtRIK5kLmaTB3Y+u1j+/RsjUwWOcJSMZfrRinu3 X-Received: by 2002:a05:6a20:7493:b0:189:bde9:71aa with SMTP id p19-20020a056a20749300b00189bde971aamr25186837pzd.48.1701334338925; Thu, 30 Nov 2023 00:52:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701334338; cv=none; d=google.com; s=arc-20160816; b=NSC/gLi258UEiUmp1TOZAwY0mICgjaeekgEcSuCEfMAidiNPbjgzE8hfLW9L97R5UG 3RWxUp9mGC7osO9KADvEPl0g2IBi0k7M9vkACa7t3ar1Ip16WAURrFiLAqqaePveQJ9F bi9RS/LlYHvl4Uu2kEO++zLhD2pB4VnP+PNcW+lftCCnfAOMnDdOvmYmxTTE8xJtBqJ6 83Jw3WayWtRcgLlEB6g4uQln8QYgUdPztwqO21GiXiraD5o7VcBG9Y7WBR2n2AN0RMGF MpocM+5o0BzxtPcQvOjyUoxWBkASNV5kJw5W3idMzfO5+eekTrZLRUD3ZOk4BrhE4TyT DlXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=Ei2mNn8OwqK1Sc4aKtY1O7cZCrtlOZi7TfAXs+UClv8=; fh=Ls3SIKZSOYS/D0c8JX9EDCWn36Q3d9AslWtPrd2gQac=; b=1HxARaa5MG6XEN2Li/YGG7pcTh+s/ehAHzGei2DrrME74uaSuQUqriHuBOLHdxRw4z sXEqwX7UpNyVmyRLVKjDuVaLFieb7hnh3Ioc9js+08Sw4aT1jjXG/olQTnYcpK+0osHz 5bRjqudQVIniSwUSQnU7fBNRZQl31DNKzm7B4zTf49KkKeIyGxV/ma2syVVWybp3Gu2D 42XUr0Tl4UwvGSK4WFTjzc5j1MlHpsCl+mRTZaQH0tvFRmkUV+fvJ5EXGFIAXj0jiDzi oxDQwYfkrN/6WGgCQzQHKLJsRh44BHCIZxaAr141IM2EYEk1kjybHFbo+UrRdfqpI6KF oXqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=yYhg46Jp; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id a16-20020a17090a8c1000b002858d558cd7si954838pjo.82.2023.11.30.00.52.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 00:52:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=yYhg46Jp; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 54CE58097E74; Thu, 30 Nov 2023 00:52:02 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229758AbjK3Ive (ORCPT + 99 others); Thu, 30 Nov 2023 03:51:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231753AbjK3Iva (ORCPT ); Thu, 30 Nov 2023 03:51:30 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B99BB10DF; Thu, 30 Nov 2023 00:51:35 -0800 (PST) Date: Thu, 30 Nov 2023 08:51:33 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1701334294; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ei2mNn8OwqK1Sc4aKtY1O7cZCrtlOZi7TfAXs+UClv8=; b=yYhg46JpQKn421IDN2b2djun1MZvgVpZeLfYXSRBkCdW0YziafKjODizigoRng1MaJA6M4 iK0Ti5Bq3kTs/FAzwcGZ18IfeRyO8DzrpXC1rn06/+NnIagMd42GVhLjuIZigBkES9FRI0 Cye2e0A24SM0N/6fzr8vzz58F4mVtqMBg06xpPaLgPuObGxrs7u/AcbrK2VrvrT6c+deGo hPXmW3wxRSGqF/p2BEzUjH8vbwH0szXsVswnfA9sKY7Oh3ihoPQoM9Iqx7VaI+v0zE7NPn ZPAvEQahQKu7y9NkMX65ozb061tE9OeD+2YD9wgktPhsNWCKKC9625P4Kks5CQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1701334294; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ei2mNn8OwqK1Sc4aKtY1O7cZCrtlOZi7TfAXs+UClv8=; b=jCD5VsuRzWO7FoL/pcZqNbqea+1qgzT9MQOtaAyUEm7zhzIg+vcqLbx1iWBGB5TVCpQOHG oChEKIOxeEeAC4Ag== From: "tip-bot2 for Samuel Zeter" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/build] x86/tools: objdump_reformat.awk: Allow for spaces Cc: Samuel Zeter , Nathan Chancellor , Ingo Molnar , Kees Cook , Masami Hiramatsu , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231129-objdump-reformat-llvm-v3-2-0d855e79314d@kernel.org> References: <20231129-objdump-reformat-llvm-v3-2-0d855e79314d@kernel.org> MIME-Version: 1.0 Message-ID: <170133429362.398.4707883263902716130.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 30 Nov 2023 00:52:02 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783938463333458958 X-GMAIL-MSGID: 1783978355745145502 The following commit has been merged into the x86/build branch of tip: Commit-ID: f4570ebd836363dc7722b8eb8d099b311021af13 Gitweb: https://git.kernel.org/tip/f4570ebd836363dc7722b8eb8d099b311021af13 Author: Samuel Zeter AuthorDate: Wed, 29 Nov 2023 15:17:42 -07:00 Committer: Ingo Molnar CommitterDate: Thu, 30 Nov 2023 09:38:10 +01:00 x86/tools: objdump_reformat.awk: Allow for spaces GNU objdump and LLVM objdump have differing output formats. Specifically, GNU objump will format its output as: address:hex, whereas LLVM objdump displays its output as address:hex. objdump_reformat.awk incorrectly handles this discrepancy due to the unexpected space and as a result insn_decoder_test fails, as its input is garbled. The instruction line being tokenized now handles a space and colon, or tab delimiter. Signed-off-by: Samuel Zeter Signed-off-by: Nathan Chancellor Signed-off-by: Ingo Molnar Tested-by: Nathan Chancellor Tested-by: Kees Cook Reviewed-by: Kees Cook Acked-by: Masami Hiramatsu Link: https://lore.kernel.org/r/20231129-objdump-reformat-llvm-v3-2-0d855e79314d@kernel.org Closes: https://github.com/ClangBuiltLinux/linux/issues/1364 --- arch/x86/tools/objdump_reformat.awk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/tools/objdump_reformat.awk b/arch/x86/tools/objdump_reformat.awk index 276e572..a4120d9 100644 --- a/arch/x86/tools/objdump_reformat.awk +++ b/arch/x86/tools/objdump_reformat.awk @@ -22,7 +22,7 @@ BEGIN { } /^ *[0-9a-f]+:/ { - if (split($0, field, "\t") < 3) { + if (split($0, field, /: |\t/) < 3) { # This is a continuation of the same insn. prev_hex = prev_hex field[2] } else {