From nobody Tue Dec 2 02:30:45 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.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 EEDA536C0BE for ; Wed, 19 Nov 2025 14:33:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.177.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763562840; cv=none; b=Wpv/H16acyYXFstsRnT6djUyti2MTMBFtFSfUe8M0cKsqljjxMH4khCKG1wigUgi59V3WnSmIRQ41ONY4G1+GTndDiX/70GPOvqxDlamuL8a1E1blXpY1z1Msaae9xW5zBL9SCSY4/LDd3uHVhxlCxQ898eLuu/2Q7slHDdA4d8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763562840; c=relaxed/simple; bh=qxlVETB9k6E9YlB10GmWvaFDDM+MCgrwkRBWIdB62LU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dS+VQF3MzFOdPl4CwjU34ODOqQwKkXSJwYe9RedW3WTip24rgiDIFrFLTgqiT3zs8EgIWspiiRtUYjhYQFLM3v4hdR+/8CSBpF1Nk+w066DmLawPEz9XxyEO+KeGtxFaQAY7b4fuwcOPUKIjKkplCSJ3xZIwUrgqOxjgpLCi+AE= 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=ER6dQsfx; arc=none smtp.client-ip=205.220.177.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="ER6dQsfx" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5AJERPEe014547; Wed, 19 Nov 2025 14:33:25 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=DDhzv SgDSur0SqFwPxZuqmAIipYf6Nj8GnAsYkfXqV0=; b=ER6dQsfxPsHVCzNzZTofp b7CrnJjDVFClnxoQKdsDlZd0BQGXJUa3idGmAjgvBetvBL+aOWRfGEgQmC7Iz4jV 4LRqqgQ0uwoqGi5NeMhK4p9WqxgBraGIBee78onxJSLzHHa6iK8lKcgQ9vYvqnUe dt8zYcFMDMXVSWxBHkUlHyFsKKumCR3V5st2OzwvlmJFQRbAYSddZSOwmSie8d0c EXCKsp5rCieMlVNFblWtsXwAsTrG1gTJZkIH50ypE8dA7uu+eceWeae72hbLiOia 4RWf3eM6Ob4b3DacNBBrVgDplwpzFumNj/4cP/GtJh9LTCChgnAHcnBsfp3Y8Ywz Q== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 4aej9077c8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 19 Nov 2025 14:33:25 +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 5AJCn34I002499; Wed, 19 Nov 2025 14:33:24 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 4aefyanrsm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 19 Nov 2025 14:33:24 +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 5AJEWnne022495; Wed, 19 Nov 2025 14:33:23 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-19; Wed, 19 Nov 2025 14:33:23 +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 18/30] objtool: Preserve alternatives order Date: Wed, 19 Nov 2025 15:32:35 +0100 Message-ID: <20251119143247.3944213-19-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-Authority-Analysis: v=2.4 cv=OMAqHCaB c=1 sm=1 tr=0 ts=691dd535 b=1 cx=c_pps a=WeWmnZmh0fydH62SvGsd2A==:117 a=WeWmnZmh0fydH62SvGsd2A==:17 a=6UeiqGixMTsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=yPCof4ZbAAAA:8 a=bp1g5Iz1D7c7guLF1_8A:9 X-Proofpoint-ORIG-GUID: bZMSEjHgqxtHFire9lgwLPxyL-dorn-3 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTE1MDAzMSBTYWx0ZWRfX5zsgI3RBiplD qV3ZaEsCzzkx1a+pEUUnZAEBA9hmDlteFNCFZHV12MUx5Y3kJGH94F8Vw34OoebjQXt2ArbRAES nU+2BSuBZAlwFL8MlIDpr7bHK0VozkdhNyCtT1AgKcrSjSp0vEGMtelGTq/51fzHRK51zTgyQeX c3h+P+Sozvclh+iX/JB8jSfodGfy0EcV4xSnTsxtjIsRm6Q1fqdIszRgwU8Z5Jc7rrZsZD4ZpNS xn5kFCjNjiHMzn0f0BAUQVW/x5+ETEba1vgTPSXaz0GsFwi+Fwotw5QRKm5Om7yPBALcod8SsZ8 o28P+e4/Jd4SZ6khU4vzTEKaZ9y41Kfyi1dTxqUIA8wyz5y/q4rhtAn5ozYSnZD2Er7qYJoXqM8 vJ/NTKulqHVjfeZaQBgzKDQ0h3xvOQ== X-Proofpoint-GUID: bZMSEjHgqxtHFire9lgwLPxyL-dorn-3 Content-Type: text/plain; charset="utf-8" Preserve the order in which alternatives are defined. Currently objtool stores alternatives in a list in reverse order. Signed-off-by: Alexandre Chartre --- tools/objtool/check.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 5bb932f211f6b..25839c3950a3c 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -1942,6 +1942,7 @@ static int add_special_section_alts(struct objtool_fi= le *file) struct special_alt *special_alt, *tmp; enum alternative_type alt_type; struct alternative *alt; + struct alternative *a; =20 if (special_get_alts(file->elf, &special_alts)) return -1; @@ -1994,9 +1995,20 @@ static int add_special_section_alts(struct objtool_f= ile *file) } =20 alt->insn =3D new_insn; - alt->next =3D orig_insn->alts; alt->type =3D alt_type; - orig_insn->alts =3D alt; + alt->next =3D NULL; + + /* + * Store alternatives in the same order they have been + * defined. + */ + if (!orig_insn->alts) { + orig_insn->alts =3D alt; + } else { + for (a =3D orig_insn->alts; a->next; a =3D a->next) + ; + a->next =3D alt; + } =20 list_del(&special_alt->list); free(special_alt); --=20 2.43.5