From nobody Tue Dec 2 02:30:05 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 949BA36C0B0 for ; Wed, 19 Nov 2025 14:34:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.165.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763562849; cv=none; b=E7T/q11Z3sUpJmYFz4+3MaDDvPuz4ExOEdcZDE96PvR4INnC5UAZ/8VW5+o90ufi+cuN4M/Z9RLPe8yniKvaOI9qyKlpTojAI6E0wQTW9IwlVAhgB3DNs6NXexAoxKVzE6Bg2v5VtZ6wYdajCpLWbhW/5+KjJr87OqmujmuEoEw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763562849; c=relaxed/simple; bh=fELxm/ydQEP+xfZCsge7EdLa+6CCoXkp/bh6YCbZuVU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i0fmxnIiaPHkDiHoMFtcXM9DH4U/4jkwa//sDSAFDeAnFSdZQxCNyqa/Nc4LzO+EuIxWuI0hP08mT5ZS7Ec3UFPQ9jfl2AyTn21JfWTfCnP1SyavHG+fEB1kaUOuK1FTikM9sFwDW98d1ca3qphtk2KZzyjRERzId+ocQ0YU+RE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=FH6EdN0B; arc=none smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="FH6EdN0B" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5AJEQs08011466; Wed, 19 Nov 2025 14:33:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=corp-2025-04-25; bh=uTugD ANuL75F+T+/Eb7gYSlOswvK1xvYjkCled4GLUw=; b=FH6EdN0Bx7JRVwIpMxOIb TIZtFwbCJD3PJWW9DaKImHqtJx4jIIlNdrArWTdA0jCPWdEcZPWVtVHQ85HJQh17 auqqbfQNgwYGrkOHXh4s+q9sn5FcVGoxoxQuFmioR54nfrb3n8MkC3JNY+i6Lh+X fq5c/oDZ+h8mN3h/rQZUi69+rWkzdPSdkqpjkYxLFydtWb44GoxHDocmJYp0Lg4y xAzIqi/9a1zeGhuanlOZLvRTVsh7C9KQiRtWClURf2kTW2mVxwrStgKdCvKF+2mq DgFElWRzK0pViyF3rhR6G4FviBvgOj2ZEDOJrs1f9BHsBe/t8oxEzAYlg0MLIL1J w== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 4aejbpy3uu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 19 Nov 2025 14:33:34 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 5AJDAvFf002393; Wed, 19 Nov 2025 14:33:33 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 4aefyanry2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 19 Nov 2025 14:33:33 +0000 Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 5AJEWnno022495; Wed, 19 Nov 2025 14:33:33 GMT Received: from laptop-dell-latitude7430.nl.oracle.com (dhcp-10-154-160-110.vpn.oracle.com [10.154.160.110]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 4aefyanr5p-24; Wed, 19 Nov 2025 14:33:33 +0000 From: Alexandre Chartre To: linux-kernel@vger.kernel.org, mingo@kernel.org, jpoimboe@kernel.org, peterz@infradead.org, david.laight.linux@gmail.com Cc: alexandre.chartre@oracle.com Subject: [PATCH v5 23/30] objtool: Disassemble jump table alternatives Date: Wed, 19 Nov 2025 15:32:40 +0100 Message-ID: <20251119143247.3944213-24-alexandre.chartre@oracle.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20251119143247.3944213-1-alexandre.chartre@oracle.com> References: <20251119143247.3944213-1-alexandre.chartre@oracle.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-19_04,2025-11-18_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0 malwarescore=0 suspectscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2510240000 definitions=main-2511190116 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTE1MDAzMSBTYWx0ZWRfX3WyElt42tA4n yWyqAvr93Z96JnjyK79v/2cWjzhHQ1ucyBVlVsKpQrzr3OaHYlzVKqlGt0InKhngVY0+Cht3LNj /xWW7Smq8ZMOh7YUL2RtaPRv9mOzXs85QBLf7QwFq792jcWdGaS9xEmWUYjzl6MSHz8uCGadLia YvpedaxM7GcAdWL1wzfRL5sItpAUhiBqXsx8eEnLaPHwcOJdQzXERFgSIQO9QIMO73AUj6TjBYb HJZ/dwd0cPiFgltH0fINGwvnEIUE09ZoX4/759kFHeAjJGbCWm/du6rHQ/C3b5mlu1S5t8xbuQU oEl6CGmUjMUpcpcmWx/6nZTZCM+RcitJhEGHcPSorMkOoDFvoYsiN5clP5s9tpi8igroU2lK4c7 /SZnYSNwuSnO/QfU3zt/wrzSzUEBXg== X-Proofpoint-ORIG-GUID: aSBmpuXQk_fHKS56gNt6Xipmjff-VLTy X-Proofpoint-GUID: aSBmpuXQk_fHKS56gNt6Xipmjff-VLTy X-Authority-Analysis: v=2.4 cv=a+o9NESF c=1 sm=1 tr=0 ts=691dd53e b=1 cx=c_pps a=WeWmnZmh0fydH62SvGsd2A==:117 a=WeWmnZmh0fydH62SvGsd2A==:17 a=6UeiqGixMTsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=yPCof4ZbAAAA:8 a=AdQ-_Nrh4r4Z-zFpdEsA:9 Content-Type: text/plain; charset="utf-8" When using the --disas option, also disable jump tables. Signed-off-by: Alexandre Chartre --- tools/objtool/disas.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/tools/objtool/disas.c b/tools/objtool/disas.c index 018aba37b996b..326e16c9f30a8 100644 --- a/tools/objtool/disas.c +++ b/tools/objtool/disas.c @@ -639,6 +639,34 @@ static int disas_alt_add_insn(struct disas_alt *dalt, = int index, char *insn_str, return 0; } =20 +static int disas_alt_jump(struct disas_alt *dalt) +{ + struct instruction *orig_insn; + struct instruction *dest_insn; + char suffix[2] =3D { 0 }; + char *str; + + orig_insn =3D dalt->orig_insn; + dest_insn =3D dalt->alt->insn; + + if (orig_insn->type =3D=3D INSN_NOP) { + if (orig_insn->len =3D=3D 5) + suffix[0] =3D 'q'; + str =3D strfmt("jmp%-3s %lx <%s+0x%lx>", suffix, + dest_insn->offset, dest_insn->sym->name, + dest_insn->offset - dest_insn->sym->offset); + } else { + str =3D strfmt("nop%d", orig_insn->len); + } + + if (!str) + return -1; + + disas_alt_add_insn(dalt, 0, str, 0); + + return 1; +} + /* * Disassemble an exception table alternative. */ @@ -809,10 +837,7 @@ static void *disas_alt(struct disas_context *dctx, goto done; } =20 - /* - * Only group alternatives and exception tables are - * supported at the moment. - */ + count =3D -1; switch (dalt->alt->type) { case ALT_TYPE_INSTRUCTIONS: count =3D disas_alt_group(dctx, dalt); @@ -820,8 +845,9 @@ static void *disas_alt(struct disas_context *dctx, case ALT_TYPE_EX_TABLE: count =3D disas_alt_extable(dalt); break; - default: - count =3D 0; + case ALT_TYPE_JUMP_TABLE: + count =3D disas_alt_jump(dalt); + break; } if (count < 0) { WARN("%s: failed to disassemble alternative %s", --=20 2.43.5