From nobody Wed May 1 23:05:39 2024 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1641436656260381.7958355664724; Wed, 5 Jan 2022 18:37:36 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344883AbiAFChf (ORCPT ); Wed, 5 Jan 2022 21:37:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344864AbiAFChd (ORCPT ); Wed, 5 Jan 2022 21:37:33 -0500 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E436C061245 for ; Wed, 5 Jan 2022 18:37:33 -0800 (PST) Received: by mail-pj1-x102d.google.com with SMTP id c9-20020a17090a1d0900b001b2b54bd6c5so6909259pjd.1 for ; Wed, 05 Jan 2022 18:37:33 -0800 (PST) Received: from szeter.. ([2001:8004:44e0:acae:b2b7:5ce1:129d:48de]) by smtp.gmail.com with ESMTPSA id ot7sm4575514pjb.12.2022.01.05.18.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jan 2022 18:37:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6F+wgRNGA6fmbi/NQHkyKHDOaLPRpTVQjDWUyB2GPWs=; b=GvA3rXcKfSWrlZAUME9wINoWn7f8pSfd/2Ds8BW2zGgDk1lp8ibquF/buACF79wpwf sLkViwkR5MJpIdl40Vo2HcbhCdr6OjT+caVm91LhfA4phGuTC+e4WZxMJmAxmK/Nteuj kuj9PVQEtOT4wkME91KVVUK0ar10CNb46Djdt3hH6hoGcjTXvXGWRnE5B8Go2zPfXz2M 1GAiZ6PQL0F6xf+BsE7Rwa5eeIj/MD7+sG5bcNqWKBxuIy5oKkck5w263IGLxfzO0S2W RIBuow/+T58Ik9rybBUvwYRutvEgfxhMg1h5vs8IJ/HrTCagirO7tERNYX2uvBW/yMHX 35Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6F+wgRNGA6fmbi/NQHkyKHDOaLPRpTVQjDWUyB2GPWs=; b=qANgYqDGiUaUG28evXin/vm9JSE9Cu8oTG08A54Qsdbxv73uUz1E39D9nogcnYubpB 3RaPviTo7iV+NOfeJaJYODrwnKQEHtFZVv6LWb75hR6jUBmghrN0ctsj09DZmjqC8qqE pgZm74gOwjBPWN8W7gBGbtla04TwJEORqWyaJMvxX9AxitB+L01h+ynAVUoa2cODGnMj uIZcCchIEbo3R00GKy1/GeR5fNTTO0U/94CjTyzXb8rhu7RCMhNUXRwGuTOfXyPvII36 SO+B5lV5TwkblMSWzYixX3TtWLGt8AW9TM8Nh1GaQHb0+AFyEpzGmX4LnFJ1OGWzK/hq AsnA== X-Gm-Message-State: AOAM533uaNmOrJ6tBajGX39QOu7CcSnIDOHgdsCkk9BQFPfWVzTBLy9W 63hb+DJ2oP67J9ryaAm88Tw= X-Google-Smtp-Source: ABdhPJzxZu1N5RV7hhwDk6hn3lgcW3Vx1ADnJ/qD/dkyPtxwow6lgw84fht+Zu496a7mZFLa+PaeZQ== X-Received: by 2002:a17:90b:4b0c:: with SMTP id lx12mr7654723pjb.146.1641436652809; Wed, 05 Jan 2022 18:37:32 -0800 (PST) From: Samuel Zeter Cc: samuelzeter@gmail.com, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Nathan Chancellor , Nick Desaulniers , linux-kernel@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH 1/2] arch/x86/tools/objdump_reformat.awk: Ensure regex matches fwait Date: Thu, 6 Jan 2022 13:36:04 +1100 Message-Id: <20220106023606.283953-2-samuelzeter@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220106023606.283953-1-samuelzeter@gmail.com> References: <20220106023606.283953-1-samuelzeter@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1641436657955100002 Content-Type: text/plain; charset="utf-8" If there is "wait" mnemonic in the line being parsed, it is incorrectly handled by the script, and an extra line of "fwait" in objdump_reformat's output is inserted. As insn_decoder_test relies upon the formatted output, the test fails. This is reproducible when disassembling with llvm-objdump: Pre-processed lines: ffffffff81033e72: 9b wait ffffffff81033e73: 48 c7 c7 89 50 42 82 movq After objdump_reformat.awk: ffffffff81033e72: 9b fwait ffffffff81033e72: wait ffffffff81033e73: 48 c7 c7 89 50 42 82 movq This patch fixes the issue by requiring spaces, or tabs, along with the "fwait" instruction in the regex match. Signed-off-by: Samuel Zeter --- 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_r= eformat.awk index f418c91b71f0..276e572a6f60 100644 --- a/arch/x86/tools/objdump_reformat.awk +++ b/arch/x86/tools/objdump_reformat.awk @@ -12,7 +12,7 @@ BEGIN { prev_hex =3D "" prev_mnemonic =3D "" bad_expr =3D "(\\(bad\\)|^rex|^.byte|^rep(z|nz)$|^lock$|^es$|^cs$|^ss$|^d= s$|^fs$|^gs$|^data(16|32)$|^addr(16|32|64))" - fwait_expr =3D "^9b " + fwait_expr =3D "^9b[ \t]*fwait" fwait_str=3D"9b\tfwait" } =20 --=20 2.32.0 From nobody Wed May 1 23:05:39 2024 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1641436672132160.79276703339906; Wed, 5 Jan 2022 18:37:52 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344886AbiAFChv (ORCPT ); Wed, 5 Jan 2022 21:37:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344884AbiAFChj (ORCPT ); Wed, 5 Jan 2022 21:37:39 -0500 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D46CC061201 for ; Wed, 5 Jan 2022 18:37:39 -0800 (PST) Received: by mail-pf1-x430.google.com with SMTP id 205so1373166pfu.0 for ; Wed, 05 Jan 2022 18:37:39 -0800 (PST) Received: from szeter.. ([2001:8004:44e0:acae:b2b7:5ce1:129d:48de]) by smtp.gmail.com with ESMTPSA id ot7sm4575514pjb.12.2022.01.05.18.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jan 2022 18:37:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=egvZCbNF81D4jXVxm61f4vyRV9IHo60P+3/hLtcUbE4=; b=jOc/KL0zSz2kdl12cGK0gMcDlrrOQ3pW4BEWkFXJJ8h5dbq9xq7S/yRaJAns2ZvNtS V6UKU48JGzRv783SUVXZVXVWqA8biMoY3GZ6UiQbooSJLdvfnRFHctKHdi3J2vGSh5FA yKAcQkB68czEXjG9XcY1IjuaBaDMXXRgwPsyv4vAUAVlv4vhnFzonMM9Tt4uW4C2PBXe tnq2jogG/v3QawLXtCPcpVWYtFXjDOUfIJq+q50zPQknQbOjDuuWwLaqSxMEcS+sHokU b5+WUwMsz7rtmZpJ5z8VndBoSOn+y7v7aoz72p+nGPIcvrvJGgoheNJaBYPJIgLP8Xae GK6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=egvZCbNF81D4jXVxm61f4vyRV9IHo60P+3/hLtcUbE4=; b=ASXAOBCf5LgflN3E5uuAZO+BBIGnOvCBAVjAi1DZMFEDt2MhHxttbX9+m62WllHfPT St1YLrGQKbWmNiRyBzFAUDJz9imEigakEF1uWfryT8iqXFoSu0Va+A1RATyI52fAaeZg +lOG4vNjZhDhO8Tomiz2suyBQD+we9HikUgqMkU9+dZAA7l+tai37qSArMYXekMaeXY1 n61N2/6W7te2riThsJvw778kK4KRSDcO6qUU99G70LJ9HuWGdwwuzBDubeld7djLWLiH 3hwwrc/dvgVbGJVVesxrbJTi28D4hfAT8fSJJRCSI26FU1d5ZOshA2C9OxC+8htUnhRv GN4Q== X-Gm-Message-State: AOAM530vbb9qwEBSbEogBdiWC0CTk7UC7O9wjGPsWVJ1tpFGMLcjx0Zj rQM4Y2tmjSbkEgpJusMjQb8= X-Google-Smtp-Source: ABdhPJybA7gaMPPtTcoI6DXlaCSAnzfyMyQyG31rcVoEbqT+9kFMO0T9OlJNspNUZiQin0ZZ17Ux2w== X-Received: by 2002:a63:4f22:: with SMTP id d34mr50255121pgb.12.1641436658856; Wed, 05 Jan 2022 18:37:38 -0800 (PST) From: Samuel Zeter Cc: samuelzeter@gmail.com, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Nathan Chancellor , Nick Desaulniers , linux-kernel@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH 2/2] arch/x86/tools/objdump_reformat.awk: Allow for spaces Date: Thu, 6 Jan 2022 13:36:05 +1100 Message-Id: <20220106023606.283953-3-samuelzeter@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220106023606.283953-1-samuelzeter@gmail.com> References: <20220106023606.283953-1-samuelzeter@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1641436672815100001 Content-Type: text/plain; charset="utf-8" objdump and llvm-objdump have differing output formats. Specifically, 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. This patch ensures that the instruction line being tokenized can support either a space and colon, or tab delimiter. Signed-off-by: Samuel Zeter --- 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_r= eformat.awk index 276e572a6f60..a4120d907277 100644 --- a/arch/x86/tools/objdump_reformat.awk +++ b/arch/x86/tools/objdump_reformat.awk @@ -22,7 +22,7 @@ BEGIN { } =20 /^ *[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 =3D prev_hex field[2] } else { --=20 2.32.0