From patchwork Tue Apr 14 12:23:10 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Zissulescu X-Patchwork-Id: 133026 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 5288B4BA23DA for ; Tue, 14 Apr 2026 12:24:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5288B4BA23DA Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=oracle.com header.i=@oracle.com header.a=rsa-sha256 header.s=corp-2025-04-25 header.b=nldq3/nD; dkim=pass (1024-bit key, unprotected) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-oracle-onmicrosoft-com header.b=qxNpF4eO X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 4226D4BA2E1C for ; Tue, 14 Apr 2026 12:23:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4226D4BA2E1C Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4226D4BA2E1C Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1776169404; cv=pass; b=r6Q8q2m55zMu9Q7y4zBmKsNJtO43YcsLAdmZKSR9CV3Un1z8r3kysBCREI7QmGBQyJTwxnObD1eESvzOMb7EwELSoP7vM2v2JmojsCc2vbL5MndOIf6a0t5HQyltFL0B0m2wBdWCSrDmeKzcEkewixRu16NxeP0pSsprfWFGn4U= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1776169404; c=relaxed/simple; bh=urGsg958fE8uQGoSFSdNC7TfDePVLmpWF4gQzsoVIiE=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=iXQRn2Pz5CSI4cYzljnnhICNGrkIyKnh8bAcrSdYw/u+utA/rkAWkx2Fr2k/PsIL5eI/mVnxcZ/FNaZgOXJt3NnRe31HQvqvmvQkNJ/mFIeUMeJTRU6zrqPn9equlAeJww2exb9G55KtbpTRNPUiER6kklxi9hHP3g9chVZWJYI= ARC-Authentication-Results: i=2; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4226D4BA2E1C Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63E9fMaE1404684 for ; Tue, 14 Apr 2026 12:23:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2025-04-25; bh=SNxr9O4I12bCJ3du/a20ngvgFeQJRRQgY1s63syTE2M=; b= nldq3/nDC2+4s3iVzMLdFK/iLHsu8iLS5mW1S/ynOov3A4cC+FZHCufO6bhQouDP MjH/XlKERv0hgMTzyL5gJP/nbbLmW7v6TNepzXRvvRLMC6Rjy86J4IXyvO8SbXNk JwhQ3oy2x/03vCSzq3WgHvBqUpoTK0xjT0/FxOH1PJB2RUPI7/E7GUK5fQvjEa+D 01hbMZUPxuupzltXEgcrk3D+lUZoui3xwRVWS5PHewMfSuaivM2kFQPwRJm+GxHI 1hbBDb93Z4GkJh/uwcZvyomV/xwIMB9xYBv1mhKh/RvaR6PXmJpDNU/vf7/L2JRf 8QbZNISU31zEqJ0GnuKFTA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 4dh8682bj0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 14 Apr 2026 12:23:23 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.7/8.18.1.7) with ESMTP id 63ECJPS0031839 for ; Tue, 14 Apr 2026 12:23:23 GMT Received: from sn4pr2101cu001.outbound.protection.outlook.com (mail-southcentralusazon11012046.outbound.protection.outlook.com [40.93.195.46]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 4dh7nmma3u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 14 Apr 2026 12:23:22 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VF2aFTfiW81et8Ru09X3jbL6fkTKbCoQ3jU3/OvjEfXSNvOhhg4O8DBuAz04QK16lhEbLpVNr0bPrJx8C6WOCXSAZXj8QahDFSHQ3x/SJTGuKX9LQF1HHJoQIyAR/0DAWv6FQWs90e/2Rr3ryDfGXwyT96s0Kgjdf2QNsCfS72gzSnvhmk2/BwSroLDW80SS4WgQBWv+wQVFNfcGtQTCjy2P0yHDJJmlMdJ7RNFklSNj5N9leVUbU2bpz9C4aa2bhUqGRoBfry3WEFMGQZ8l/ijvapQNhyQ29GbEjZeyInjc7EUXhWSULLWOP5ythsKfS+8vl0Nn3EUNnIWAT8o+lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SNxr9O4I12bCJ3du/a20ngvgFeQJRRQgY1s63syTE2M=; b=JJerKVTUYxERw5GyarKgAyNKjV7IB6pfTdUZWa3FGwiFb+etzffHUGpeCI5E5vA5wuES596BjpL+ewqMTLyXQrGC0Uw7BT+CAGodfsFTZ2gDhXmn6FGejvbJBPXr0C0pJ9Lh7VW+x345zVjQKbgAA2q6boR62UiZF85JOAcZamEOySAiSyuWLn3R46raBcNhHdOfn69D5mkWIuXfxUWGZd8EnqtSb3oKgqshgDvFihX6lm7z88/9YncBARSl+xHan6kqFM8C46dQk+Jw3sUUTuf1P405GCWxcOLh68IEIO7Dlgxaba3EIvzaCMD59pSpJUHC+uZZIckpJI48vZxukg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SNxr9O4I12bCJ3du/a20ngvgFeQJRRQgY1s63syTE2M=; b=qxNpF4eOP/izvh4n1fSLN6spr+YRVa5mgb6t+m15m5yLrIRBCowq6yg99XbLsBokFcG+JcXVfqqDodGYpm7ZILpazrmk1pG467LExH44s/kWohPYesaNBEFTeyBQ97dqFHOs2m0CF5Q7neDbRDaOEUzMfQuswg5vPnRal/SO1CE= Received: from CY5PR10MB6011.namprd10.prod.outlook.com (2603:10b6:930:28::16) by MN2PR10MB4285.namprd10.prod.outlook.com (2603:10b6:208:198::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.48; Tue, 14 Apr 2026 12:23:19 +0000 Received: from CY5PR10MB6011.namprd10.prod.outlook.com ([fe80::c792:6d38:1377:61cc]) by CY5PR10MB6011.namprd10.prod.outlook.com ([fe80::c792:6d38:1377:61cc%4]) with mapi id 15.20.9769.046; Tue, 14 Apr 2026 12:23:19 +0000 From: claudiu.zissulescu-ianculescu@oracle.com To: libc-alpha@sourceware.org Cc: elena.zannoni@oracle.com, jose.marchesi@oracle.com Subject: [PATCH 1/2] sframe: Add SFrame v3 decode support for regular FDEs Date: Tue, 14 Apr 2026 15:23:10 +0300 Message-ID: <20260414122311.173644-2-claudiu.zissulescu-ianculescu@oracle.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414122311.173644-1-claudiu.zissulescu-ianculescu@oracle.com> References: <20260414122311.173644-1-claudiu.zissulescu-ianculescu@oracle.com> X-ClientProxiedBy: VI1PR04CA0051.eurprd04.prod.outlook.com (2603:10a6:802:2::22) To CY5PR10MB6011.namprd10.prod.outlook.com (2603:10b6:930:28::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY5PR10MB6011:EE_|MN2PR10MB4285:EE_ X-MS-Office365-Filtering-Correlation-Id: ba8a053c-6e5c-4f04-2c27-08de9a209cdd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|366016|56012099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: 0nsNCY6lwDVx6zaCwNiqGS4qAnVspXX69eR+WziXq+IUkpik0mhAPSd4qss8OfMk+MtCVk+Z8QX1vusRtTrKoSud10u7UfqCWHQxh97QwDGaB4hvGuoRS13ajmyhP6XQS/efYrho6SZUXQlOh8jqpXCRFjjuoLHCQXfJZqz4fwLOQRu8dntvNB7A0rGz21VhrEVmAJXIbQKnUDhek4kwbPyYo/G+Oq9RNqhsMcjmgfXdZLd0AxC2ZtB0QVsVg6rDGjiS5TP2+Uim70R66O4axbVrbVjQ4lXe1XdCFJ0fv2vd+c4tYXBAOMTlUp9q59Z5yYwcyXeBesxMHXOwhrklkk571hqSzQX2GvdjP9a+Iw6hBWEFeO+tBf6odZv6+Kv6do8YtH5WNUh9jFdEpqmK9ucyXwmlrOlvr5Eh3C7yGO9AXZydUYU0WTdjm/zxA4rkbPeDBQmjr1Z9AljYmeRKCLfKmpbiwrg++R/fcyLCpL1yQcmhvRAk7xX5Urv7NbSQltmeIYA5/nYEcnds46xQqgBw5jqqF9e7lFkiPgr68r3NhoF9lx3M1H7/bfcZvUBt3HoRab8hJ8qJNMsEwtghMlMVwroZL+x4SFCVC5iG7X2zKQZS5vwSXiC0DEApRLgN9W2NCRSTwft25kU1Pkoglpa21UHCjquJcvMXTPE+Ata0cHMeMu3LJ5jLKc0XRS5q2AFvgF0S4zKEop0alTvX6LPHFnPQVULlN4MyN0cSCb8= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CY5PR10MB6011.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(376014)(366016)(56012099003)(22082099003)(18002099003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ibo8qaEkebGLuXc3+WWuYJC57PHN+rNDooRNdABg6Nf+CAWctsCoGD54KdraOVh8Bf+BJw30a0jKkpPxy07PobYYtxDqy404zgSbNxuJzkbt8PedNXBQv6drJ2RBlMEmhn02AVvl90PfZ3J5Jca5zwWu/6KRVxFlsFdhEdRR8eW3TsJ8hfzJtfjX4X7ZPNmoYSRk1pteLfRiGo+9gkauqC5KfQkoEY6u/he8BJ/3SYaprtSm68m7X/sKsUP65WVwVQkp2CZ1KwNQQRrWqexhhVi16vu52SdsZ2pxH+92b6Pc7+NdfsjiIACm7c5XbtbKKOHXErYadejqNWUQgJzY4A2DDjvZsfAgAh4LAveuExqMq5sx7jYm7SESkxT4/8/Y1yFaOrwqFjyg4q331t74ZcsxDIbapl4E7RgCsPbojih1iVu4JyBKXXsaHQ5qzRz6qHT1MgTmDuBot32GEinFFbZ54NOQpThBlamh0sDy1McCjQZ89lUNopQ9wIjY7u8zhZZTyGt2UqEAYfSFv4Wh/JN0d10wRDNj7gwMTVx6SncyXv8+6a/n0PrEU/Mf1IoDcJcCbsRQo0eYQ09I1CXnPIm0EzJ7ERIpBKcwCse2YmK1bi5/+D8L9dCb3tfa24yN2i/7dsyQcMxtq96rtuIv9rPHvjiJ/1BGu5qjWMLOzSP7KNvxuYlJDJg7RxnsR9cCOcfZclt++ua75wyZhekx9dIXH+pAN441QSw55tT1PBm+QzU6+ceMQ+cVnQmjtl/iFMqlXbbC1wPiguEImIiqreFkjEc+znz1M3GYWP8DmiZWVC9325quc8NWeS/9dPN+xSNxeYNa+mntRCH2bI9j3TckqY2KoxUtXzV8yVs4mMEbFKOCUXmeGqaQsfKtcr1zfbCxsahv9whaj91l3UPWFAEx1HA0vDxWr6yYT/67pEVDkXUa3cQPrwJWTyeYUIVneSQV1F47hBMHltEKSJKZVck5nCqjprccd7a+10WlGKl0dnoVE192lpsotPDu4L4ZAb6CsktF1TwCOA9S0lCdReo70Zb3oZC7IB3A9vN6gOWY8+JCh8iVl3jKpPVKlBwKT66Is18izz2AAprCGONMmE0HB0pAtlc6T8YDvtWcrm3mYWZalUdz/8BoLOvBsaGt2i3XLcEtuGay6Hqakf12aM9KRV+1FocyupVoDnK5M/nu6xaI/rNkcAH68DN5Zl/AMvWHAw3fq20LBHTm08V0tLXQEtmeUzetvvsY/Faf/zQ0GbaDXdE85pO6f3y5WXeAPK8oXEVbblvpGKRmNUxiiBB/GS2jTDRUuCHSI9Zao54SgqCmSsUjl6+Y6Qd3VS3AvnnRGj9+mpK2pmRGJZVSO29SIjOOfvztR5U0slqzDNaxhynp/Fv/NVN4TLGv0dhhd+UvTpawn9FdPuCtp21+v3bnW28HumtshqSOoaW40nMUkOPjMucYUjIC6q3uKlNax7g33EYRkzKO3bNVdgMSfzN7+Zd6DaAvPLI57PtOWgLytO+yEIYZPju12OuaW3yRQVrLvuvMu1JBeD1aIqHdbaxM8saUTOzkuRSKhKA8oMRiXTkzKm6dDNBiTtdq4W+Vku9xjE2gXnJkTR5r+iOojkLajtErrUMMhuaIsW/ynQTn32QS27P0iCfrV+CfsSQ8eKtpgVEdq0Q6AmiKeVfG2Q77igTKZq0cnoAhmmrQFgWJ+4L5Hmpk8QHt79yLcHb0dUxVld1MY/lzquQO5vOxd/v9Qi2Ug4tQRgqbx/efwBjdjyvHrWqFlH850rVA6kRn X-Exchange-RoutingPolicyChecked: HCSXIlRYqHxMnvfxjHepPbjQNqHCxn17R72TG1Tsw//kJ9wOwVxvXar2U+kAzOl85eMWvmpE+WZCudNSrlXyOpm041lhx1w5HENV0pZlhtbmiVZXgXv6uG506r8b9a5u6/N4xCpXf6Nw0mDiIW47ZWkR5ldf/uLXbkH0XMT28CBalIAmb1ubeEyzJuOJc5sFFGf2FzjU/QpNBZrUuIlMLQI1da07yrzVY22sa0ulAyF1ljbR62tdFYupyLLNvmcEjMvRF3jI9IxNhj8mI7NYJ/FTccJboWeNIyclx6/b+9QyPbnL22VXno5vUW3PiPkdGy/rUps4S7QeKPsqoADDFQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: lWI6ScEaCBARiAxl29tHW7f+Cf8wFkS4daODBqFUxvN477xhoEKuffxtQxsY8Y4DNa9V0zJnrGqCfu3r+oqoRWXWI2O3pMcrlWXCbHKhEnHJTMSlz/w7Cjusr5uVeiZowQptbCJBtFNUbEZAx5kepOKhqW/S0dBeKqlC1P4Y825Kw/jmBE/5tyGfNBhiggpMiQN3TdIYAuM5FzLAzUtCR/xFrD/50mn2gugaVqM7Tl0MaQwJJU3w98OZyX434D/hqL4IbZkyfQ+o4ZqNneNgEcvQpomhfG6TxT5CsM3fqtTI9m3S87R6KuGhACrmV3GAat4ptp3cMwlShcW0F+kYjn4+2ZoVjxztC7jcVJyy4ud7dvM9QKYlJsu9O+lxlHCs73xAav2T50sEY84/6rOSWtrkYL2xTZHaJf5OCdWBvfdH+54H8c+WaDsW3UAHZcXEhqA0AY1VPJlZ44bmGeBXUq7ixtGvjqF62Qn1cLGB8FG60l+9gqG8JkddmpvCBzBl2X28ykOlYByWF+nscYPZOGxWtFk/xL501euXzmga7DF1W5G3+lX80BpBBNYo6IDzA6FkWlSwExFhRbEG+CqMuGxwgnhSf9uvepGi+hcyakw= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba8a053c-6e5c-4f04-2c27-08de9a209cdd X-MS-Exchange-CrossTenant-AuthSource: CY5PR10MB6011.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2026 12:23:19.7606 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pYatvk7M+YmYLkVZ+Wgg+b32BpzuBdx0y5uQplEQf8izircIQKUIugD0e6+fvzfzYkzMEuqSGiQlk9UtvQ+8mAIE69pKFSn7Oo6WwWQwtUjgQAMr/PmJH+F+Lzgtxoip38eY8yOnjVIO7TmB0WOLtQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4285 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-14_03,2026-04-13_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 phishscore=0 mlxlogscore=999 bulkscore=0 spamscore=0 malwarescore=0 suspectscore=0 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2604070000 definitions=main-2604140115 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDE0MDExNSBTYWx0ZWRfX/lYaF+xaSC8P PBlEElp/f/N/8Q95ieVa7xApaz7oRYRehM0D3CiyItE660DQMO0FftQI2ojLs/TF7gZxNIz6qbN Jzgy4WJmDllNICwN977qXzcSy3fS9JcrNO5ypGXw9ByfQv0Gk7DgLoD/jSxMBD8FPzd6T8r/JEJ vf3zS2bxxak+YaSfDk6lzgHwVnddkR0XrovHAY2fdwrvJ1ZYTtWuDQiMOm0I4DAXiQrGZmFAYyP 0NBpz21y9aiE0dUeWAjYoRr05GUcMckM6/DRwGSLj3bdC4hH/Nsd7/eHt8eKeF89S6gWqIcnUY3 c7UPa/L0wE0G6mw7+oLEhcE4iFaTjOVWTgwSefK+nUcpEimQ//NmsotL2gUtkA/jprRcd7LL+aY 2e8qizEVWuMywNzoieGYnhj+wqusDz/P4qp42oRTtiJrARbbCodJr0DWczcl0Up38BwdCrtrh0R lRmydEjbehg9ICltPOFf5xWEYiGc0BeSsqe0i0E8= X-Proofpoint-GUID: HxapdR7lNKMkL_omiaGjRqVEhm0b5Sjg X-Proofpoint-ORIG-GUID: HxapdR7lNKMkL_omiaGjRqVEhm0b5Sjg X-Authority-Analysis: v=2.4 cv=JY6Ma0KV c=1 sm=1 tr=0 ts=69de31bb b=1 cx=c_pps a=e1sVV491RgrpLwSTMOnk8w==:117 a=e1sVV491RgrpLwSTMOnk8w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=A5OVakUREuEA:10 a=GoEa3M9JfhUA:10 a=VkNPw1HP01LnGYTKEx00:22 a=jiCTI4zE5U7BLdzWsZGv:22 a=3I1J8UUJPc9JN9BFgKH3:22 a=yPCof4ZbAAAA:8 a=XaIcZU7q1KEy9Zk2DxEA:9 a=esB8q-t_bEDkH78P:21 cc=ntf awl=host:13825 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org From: Claudiu Zissulescu Add SFrame v3 format definitions and modify the backtrace routines to handle both v2 and v3 function descriptor layouts. The sframe stack trace backtracer now detects the outer most frame returning without error. Also, the decoder reads v3 index/attribute records, performs explicit bounds checks for FRE access, and uses int64_t PC/start-address handling for version-agnostic lookup. --- sysdeps/generic/sframe-read.c | 328 +++++++++++++++++++++++++--------- sysdeps/generic/sframe-read.h | 4 +- sysdeps/generic/sframe.c | 4 + sysdeps/generic/sframe.h | 156 ++++++++++++++-- 4 files changed, 397 insertions(+), 95 deletions(-) diff --git a/sysdeps/generic/sframe-read.c b/sysdeps/generic/sframe-read.c index 0b339cc981..9464cd71e6 100644 --- a/sysdeps/generic/sframe-read.c +++ b/sysdeps/generic/sframe-read.c @@ -21,6 +21,18 @@ #include #include +/* Representation of SFrame FDE internal to libsframe. */ +typedef struct sframe_func_desc_entry_int +{ + int64_t func_start_address; + uint32_t func_size; + uint32_t func_start_fre_off; + uint32_t func_num_fres; + uint8_t func_info; + uint8_t func_info2; + uint8_t func_rep_size; +} sframe_func_desc_entry_int; + /* Get the SFrame header size. */ static inline uint32_t @@ -52,33 +64,51 @@ sframe_get_fre_ra_mangled_p (uint8_t fre_info) /* Access functions for info from function descriptor entry. */ static uint32_t -sframe_get_fre_type (sframe_func_desc_entry *fdep) +sframe_get_fre_type (sframe_func_desc_entry_int *fdep, uint8_t version) { - uint32_t fre_type = 0; - if (fdep != NULL) - fre_type = SFRAME_V1_FUNC_FRE_TYPE (fdep->sfde_func_info); - return fre_type; + if (fdep == NULL) + return 0; + if (version == SFRAME_VERSION_3) + return SFRAME_V3_FDE_FRE_TYPE (fdep->func_info); + return SFRAME_V1_FUNC_FRE_TYPE (fdep->func_info); +} + +static uint32_t +sframe_get_fde_pc_type (sframe_func_desc_entry_int *fdep, uint8_t version) +{ + if (fdep == NULL) + return 0; + if (version == SFRAME_VERSION_3) + return SFRAME_V3_FDE_PC_TYPE (fdep->func_info); + return SFRAME_V1_FUNC_FDE_TYPE (fdep->func_info); } static uint32_t -sframe_get_fde_type (sframe_func_desc_entry *fdep) +sframe_get_fde_type (sframe_func_desc_entry_int *fdep, uint8_t version) { - uint32_t fde_type = 0; - if (fdep != NULL) - fde_type = SFRAME_V1_FUNC_FDE_TYPE (fdep->sfde_func_info); - return fde_type; + if (fdep == NULL) + return 0; + if (version == SFRAME_VERSION_3) + return SFRAME_V3_FDE_TYPE (fdep->func_info2); + return SFRAME_FDE_TYPE_DEFAULT; } -/* Check if SFrame header has valid data. Only consider SFrame type - 2. */ +/* Check if SFrame header has valid data (v2 or v3). */ static bool sframe_header_sanity_check_p (sframe_header *hp) { + uint8_t valid_flags; + /* Check preamble is valid. */ if ((hp->sfh_preamble.sfp_magic != SFRAME_MAGIC) - || (hp->sfh_preamble.sfp_version != SFRAME_VERSION_2) - || (hp->sfh_preamble.sfp_flags & ~SFRAME_V2_F_ALL_FLAGS)) + || (hp->sfh_preamble.sfp_version != SFRAME_VERSION_2 + && hp->sfh_preamble.sfp_version != SFRAME_VERSION_3)) + return false; + + valid_flags = (hp->sfh_preamble.sfp_version == SFRAME_VERSION_3 + ? SFRAME_V3_F_ALL_FLAGS : SFRAME_V2_F_ALL_FLAGS); + if (hp->sfh_preamble.sfp_flags & ~valid_flags) return false; /* Check offsets are valid. */ @@ -181,6 +211,78 @@ sframe_decoder_get_header (sframe_decoder_ctx *dctx) return hp; } +static inline uint8_t +sframe_decoder_get_version (sframe_decoder_ctx *dctx) +{ + sframe_header *hp = sframe_decoder_get_header (dctx); + return hp != NULL ? hp->sfh_preamble.sfp_version : 0; +} + +/* Read function descriptor data at FUNC_IDX in DCTX and fill FDEP. */ + +static bool +sframe_decoder_get_funcdesc_at_index (sframe_decoder_ctx *dctx, + uint32_t func_idx, + sframe_func_desc_entry_int *fdep) +{ + sframe_header *dhp; + uint8_t version; + + if (fdep == NULL) + return false; + + dhp = sframe_decoder_get_header (dctx); + if (dhp == NULL + || func_idx >= dhp->sfh_num_fdes + || dctx->sfd_funcdesc == NULL) + return false; + + version = sframe_decoder_get_version (dctx); + if (version == SFRAME_VERSION_3) + { + const sframe_func_desc_idx_v3 *fdip; + const sframe_func_desc_attr_v3 *fdap; + uint32_t fre_off, fre_bytes; + + if (dctx->sfd_fres == NULL || dctx->sfd_fre_nbytes < 0) + return false; + + fdip = ((const sframe_func_desc_idx_v3 *) dctx->sfd_funcdesc) + func_idx; + fre_off = fdip->sfdi_func_start_fre_off; + fre_bytes = (uint32_t) dctx->sfd_fre_nbytes; + if (fre_off > fre_bytes + || fre_bytes - fre_off < sizeof (sframe_func_desc_attr_v3)) + return false; + + fdap = (const sframe_func_desc_attr_v3 *) (dctx->sfd_fres + fre_off); + fdep->func_start_address = fdip->sfdi_func_start_offset; + fdep->func_size = fdip->sfdi_func_size; + fdep->func_start_fre_off = fre_off; + fdep->func_num_fres = fdap->sfda_func_num_fres; + fdep->func_info = fdap->sfda_func_info; + fdep->func_info2 = fdap->sfda_func_info2; + fdep->func_rep_size = fdap->sfda_func_rep_size; + return true; + } + + if (version == SFRAME_VERSION_2) + { + const sframe_func_desc_entry_v2 *fdp; + + fdp = ((const sframe_func_desc_entry_v2 *) dctx->sfd_funcdesc) + func_idx; + fdep->func_start_address = fdp->sfde_func_start_address; + fdep->func_size = fdp->sfde_func_size; + fdep->func_start_fre_off = fdp->sfde_func_start_fre_off; + fdep->func_num_fres = fdp->sfde_func_num_fres; + fdep->func_info = fdp->sfde_func_info; + fdep->func_info2 = 0; + fdep->func_rep_size = fdp->sfde_func_rep_size; + return true; + } + + return false; +} + /* Get the offset of the sfde_func_start_address field (from the start of the on-disk layout of the SFrame section) of the FDE at FUNC_IDX in the decoder context DCTX. */ @@ -209,9 +311,16 @@ sframe_decoder_get_offsetof_fde_start_addr (sframe_decoder_ctx *dctx, else if (errp != NULL) *errp = _URC_NO_REASON; + if (sframe_decoder_get_version (dctx) == SFRAME_VERSION_3) + return (sframe_get_hdr_size (dhp) + + dhp->sfh_fdeoff + + func_idx * sizeof (sframe_func_desc_idx_v3) + + offsetof (sframe_func_desc_idx_v3, sfdi_func_start_offset)); + return (sframe_get_hdr_size (dhp) - + func_idx * sizeof (sframe_func_desc_entry) - + offsetof (sframe_func_desc_entry, sfde_func_start_address)); + + dhp->sfh_fdeoff + + func_idx * sizeof (sframe_func_desc_entry_v2) + + offsetof (sframe_func_desc_entry_v2, sfde_func_start_address)); } @@ -222,13 +331,22 @@ sframe_decoder_get_offsetof_fde_start_addr (sframe_decoder_ctx *dctx, If FUNC_IDX is not a valid index in the given decoder object, returns 0. */ -static int32_t +static int64_t sframe_decoder_get_secrel_func_start_addr (sframe_decoder_ctx *dctx, - uint32_t func_idx) + uint32_t func_idx, + sframe_func_desc_entry_int *fdep) { - int32_t func_start_addr; + int64_t func_start_addr; _Unwind_Reason_Code err = 0; - int32_t offsetof_fde_in_sec = 0; + uint32_t offsetof_fde_in_sec = 0; + sframe_func_desc_entry_int fdesc; + + if (fdep == NULL) + { + if (!sframe_decoder_get_funcdesc_at_index (dctx, func_idx, &fdesc)) + return 0; + fdep = &fdesc; + } /* Check if we have SFRAME_F_FDE_FUNC_START_PCREL. */ sframe_header *sh = &dctx->sfd_header; @@ -241,7 +359,7 @@ sframe_decoder_get_secrel_func_start_addr (sframe_decoder_ctx *dctx, return 0; } - func_start_addr = dctx->sfd_funcdesc[func_idx].sfde_func_start_address; + func_start_addr = fdep->func_start_address; return func_start_addr + offsetof_fde_in_sec; } @@ -251,25 +369,28 @@ sframe_decoder_get_secrel_func_start_addr (sframe_decoder_ctx *dctx, FUNC_IDX). */ static bool -sframe_fre_check_range_p (sframe_decoder_ctx *dctx, uint32_t func_idx, +sframe_fre_check_range_p (sframe_decoder_ctx *dctx, + sframe_func_desc_entry_int *fdep, + uint32_t func_idx, uint32_t start_ip_offset, uint32_t end_ip_offset, - int32_t pc) + int64_t pc) { - sframe_func_desc_entry *fdep; - int32_t func_start_addr; + int64_t func_start_addr; uint8_t rep_block_size; - uint32_t fde_type; - uint32_t pc_offset; + uint32_t fde_pc_type; + uint64_t pc_offset; bool mask_p; + uint8_t version; - fdep = &dctx->sfd_funcdesc[func_idx]; if (fdep == NULL) return false; - func_start_addr = sframe_decoder_get_secrel_func_start_addr (dctx, func_idx); - fde_type = sframe_get_fde_type (fdep); - mask_p = (fde_type == SFRAME_FDE_TYPE_PCMASK); - rep_block_size = fdep->sfde_func_rep_size; + version = sframe_decoder_get_version (dctx); + func_start_addr = sframe_decoder_get_secrel_func_start_addr (dctx, func_idx, + fdep); + fde_pc_type = sframe_get_fde_pc_type (fdep, version); + mask_p = (fde_pc_type == SFRAME_FDE_TYPE_PCMASK); + rep_block_size = fdep->func_rep_size; if (func_start_addr > pc) return false; @@ -279,7 +400,11 @@ sframe_fre_check_range_p (sframe_decoder_ctx *dctx, uint32_t func_idx, /* For SFrame FDEs encoding information for repetitive pattern of insns, masking with the rep_block_size is necessary to find the matching FRE. */ if (mask_p) + { + if (rep_block_size == 0) + return false; pc_offset = pc_offset % rep_block_size; + } return (start_ip_offset <= pc_offset) && (end_ip_offset >= pc_offset); } @@ -360,68 +485,72 @@ sframe_decode_fre_start_address (const char *fre_buf, /* Find the function descriptor entry starting which contains the specified address ADDR. */ -static sframe_func_desc_entry * -sframe_get_funcdesc_with_addr_internal (sframe_decoder_ctx *ctx, int32_t addr, - int *errp, uint32_t *func_idx) +static bool +sframe_get_funcdesc_with_addr_internal (sframe_decoder_ctx *ctx, int64_t addr, + sframe_func_desc_entry_int *fdep, + uint32_t *func_idx) { sframe_header *dhp; - sframe_func_desc_entry *fdp; int low, high; - if (ctx == NULL) - return NULL; + if (ctx == NULL || fdep == NULL || func_idx == NULL) + return false; dhp = sframe_decoder_get_header (ctx); if (dhp == NULL || dhp->sfh_num_fdes == 0 || ctx->sfd_funcdesc == NULL) - return NULL; + return false; /* If the FDE sub-section is not sorted on PCs, skip the lookup because binary search cannot be used. */ if ((dhp->sfh_preamble.sfp_flags & SFRAME_F_FDE_SORTED) == 0) - return NULL; + return false; - /* Do the binary search. */ - fdp = (sframe_func_desc_entry *) ctx->sfd_funcdesc; low = 0; high = dhp->sfh_num_fdes - 1; while (low <= high) { int mid = low + (high - low) / 2; + sframe_func_desc_entry_int mid_fde; + int64_t start_addr; + + if (!sframe_decoder_get_funcdesc_at_index (ctx, mid, &mid_fde)) + return false; - /* Given sfde_func_start_address <= addr, - addr - sfde_func_start_address must be positive. */ - if (sframe_decoder_get_secrel_func_start_addr (ctx, mid) <= addr - && ((uint32_t)(addr - sframe_decoder_get_secrel_func_start_addr (ctx, - mid)) - < fdp[mid].sfde_func_size)) + start_addr = sframe_decoder_get_secrel_func_start_addr (ctx, mid, + &mid_fde); + /* Given start_addr <= addr, addr - start_addr must be positive. */ + if (start_addr <= addr + && ((uint64_t) (addr - start_addr) < mid_fde.func_size)) { *func_idx = mid; - return fdp + mid; + *fdep = mid_fde; + return true; } - if (sframe_decoder_get_secrel_func_start_addr (ctx, mid) < addr) + if (start_addr < addr) low = mid + 1; else high = mid - 1; } - return NULL; + return false; } /* Get the end IP offset for the FRE at index i in the FDEP. The buffer FRES is the starting location for the FRE. */ static uint32_t -sframe_fre_get_end_ip_offset (sframe_func_desc_entry *fdep, unsigned int i, - const char *fres) +sframe_fre_get_end_ip_offset (sframe_func_desc_entry_int *fdep, + uint8_t version, + unsigned int i, const char *fres) { uint32_t end_ip_offset = 0; uint32_t fre_type; - fre_type = sframe_get_fre_type (fdep); + fre_type = sframe_get_fre_type (fdep, version); /* Get the start address of the next FRE in sequence. */ - if (i < fdep->sfde_func_num_fres - 1) + if (i < fdep->func_num_fres - 1) { sframe_decode_fre_start_address (fres, &end_ip_offset, fre_type); end_ip_offset -= 1; @@ -429,7 +558,7 @@ sframe_fre_get_end_ip_offset (sframe_func_desc_entry *fdep, unsigned int i, else /* The end IP offset for the FRE needs to be deduced from the function size. */ - end_ip_offset = fdep->sfde_func_size - 1; + end_ip_offset = fdep->func_size - 1; return end_ip_offset; } @@ -528,11 +657,13 @@ _Unwind_Reason_Code __sframe_decode (sframe_decoder_ctx *dctx, const char *sf_buf) { const sframe_preamble *sfp; + char *frame_buf; + const char *payload; size_t hdrsz; + size_t fde_desc_size; + size_t fde_table_size; sframe_header *sfheaderp; - char *frame_buf; - - int fidx_size; + uint8_t version; uint32_t fre_bytes; if (sf_buf == NULL) @@ -555,15 +686,23 @@ __sframe_decode (sframe_decoder_ctx *dctx, const char *sf_buf) return _URC_END_OF_STACK; hdrsz = sframe_get_hdr_size (sfheaderp); - frame_buf += hdrsz; + payload = frame_buf + hdrsz; + version = sfheaderp->sfh_preamble.sfp_version; + + fde_desc_size = (version == SFRAME_VERSION_3 + ? sizeof (sframe_func_desc_idx_v3) + : sizeof (sframe_func_desc_entry_v2)); + fde_table_size = sfheaderp->sfh_num_fdes * fde_desc_size; + if (sfheaderp->sfh_freoff < sfheaderp->sfh_fdeoff + || (size_t) (sfheaderp->sfh_freoff - sfheaderp->sfh_fdeoff) + < fde_table_size) + return _URC_END_OF_STACK; /* Handle the SFrame Function Descriptor Entry section. */ - fidx_size - = sfheaderp->sfh_num_fdes * sizeof (sframe_func_desc_entry); - dctx->sfd_funcdesc = (sframe_func_desc_entry *)frame_buf; - frame_buf += (fidx_size); + dctx->sfd_funcdesc + = (sframe_func_desc_entry_v2 *) (payload + sfheaderp->sfh_fdeoff); - dctx->sfd_fres = frame_buf; + dctx->sfd_fres = (char *) (payload + sfheaderp->sfh_freoff); fre_bytes = sfheaderp->sfh_fre_len; dctx->sfd_fre_nbytes = fre_bytes; @@ -574,55 +713,84 @@ __sframe_decode (sframe_decoder_ctx *dctx, const char *sf_buf) _URC_END_OF_STACK if failure. */ _Unwind_Reason_Code -__sframe_find_fre (sframe_decoder_ctx *ctx, int32_t pc, +__sframe_find_fre (sframe_decoder_ctx *ctx, int64_t pc, sframe_frame_row_entry *frep) { - sframe_func_desc_entry *fdep; + sframe_func_desc_entry_int fdep; uint32_t func_idx; + uint8_t version; uint32_t fre_type, i; uint32_t start_ip_offset; - int32_t func_start_addr; + int64_t func_start_addr; uint32_t end_ip_offset; + const char *fres_end; const char *fres; size_t size = 0; - int err = 0; if ((ctx == NULL) || (frep == NULL)) return _URC_END_OF_STACK; + version = sframe_decoder_get_version (ctx); + /* Find the FDE which contains the PC, then scan its fre entries. */ - fdep = sframe_get_funcdesc_with_addr_internal (ctx, pc, &err, &func_idx); - if (fdep == NULL || ctx->sfd_fres == NULL) + if (!sframe_get_funcdesc_with_addr_internal (ctx, pc, &fdep, &func_idx) + || ctx->sfd_fres == NULL) return _URC_END_OF_STACK; - fre_type = sframe_get_fre_type (fdep); + /* Glibc's SFrame unwinder currently supports only DEFAULT FDEs. */ + if (sframe_get_fde_type (&fdep, version) != SFRAME_FDE_TYPE_DEFAULT) + return _URC_END_OF_STACK; - fres = ctx->sfd_fres + fdep->sfde_func_start_fre_off; - func_start_addr = sframe_decoder_get_secrel_func_start_addr (ctx, func_idx); + fre_type = sframe_get_fre_type (&fdep, version); + fres = ctx->sfd_fres + fdep.func_start_fre_off; + if (version == SFRAME_VERSION_3) + fres += sizeof (sframe_func_desc_attr_v3); - for (i = 0; i < fdep->sfde_func_num_fres; i++) + if (ctx->sfd_fre_nbytes < 0) + return _URC_END_OF_STACK; + fres_end = ctx->sfd_fres + (size_t) ctx->sfd_fre_nbytes; + if (fres > fres_end) + return _URC_END_OF_STACK; + + func_start_addr = sframe_decoder_get_secrel_func_start_addr (ctx, func_idx, + &fdep); + + for (i = 0; i < fdep.func_num_fres; i++) { size_t addr_size; + addr_size = sframe_fre_start_addr_size (fre_type); + if (addr_size == 0) + return _URC_END_OF_STACK; + + if ((size_t) (fres_end - fres) < addr_size) + return _URC_END_OF_STACK; + /* Partially decode the FRE. */ sframe_decode_fre_start_address (fres, &frep->fre_start_addr, fre_type); - addr_size = sframe_fre_start_addr_size (fre_type); - if (addr_size == 0) + if ((size_t) (fres_end - fres) < addr_size + sizeof (frep->fre_info)) return _URC_END_OF_STACK; frep->fre_info = *(uint8_t *)(fres + addr_size); size = sframe_fre_entry_size (frep, addr_size); + if ((size_t) (fres_end - fres) < size) + return _URC_END_OF_STACK; + if (i < fdep.func_num_fres - 1 + && (size_t) (fres_end - (fres + size)) < addr_size) + return _URC_END_OF_STACK; start_ip_offset = frep->fre_start_addr; - end_ip_offset = sframe_fre_get_end_ip_offset (fdep, i, fres + size); + end_ip_offset = sframe_fre_get_end_ip_offset (&fdep, version, i, + fres + size); /* Stop search if FRE's start_ip is greater than pc. Given func_start_addr <= pc, pc - func_start_addr must be positive. */ - if (start_ip_offset > (uint32_t) (pc - func_start_addr)) + if (func_start_addr > pc + || start_ip_offset > (uint64_t) (pc - func_start_addr)) return _URC_END_OF_STACK; - if (sframe_fre_check_range_p (ctx, func_idx, start_ip_offset, + if (sframe_fre_check_range_p (ctx, &fdep, func_idx, start_ip_offset, end_ip_offset, pc)) { /* Decode last FRE bits: offsets size. */ diff --git a/sysdeps/generic/sframe-read.h b/sysdeps/generic/sframe-read.h index db9547b5b5..9bda6b1b19 100644 --- a/sysdeps/generic/sframe-read.h +++ b/sysdeps/generic/sframe-read.h @@ -31,7 +31,7 @@ typedef struct sframe_decoder_ctx sframe_header sfd_header; - sframe_func_desc_entry *sfd_funcdesc; + sframe_func_desc_entry_v2 *sfd_funcdesc; /* SFrame FRE table. */ char *sfd_fres; /* Number of bytes needed for SFrame FREs. */ @@ -67,7 +67,7 @@ __sframe_decode (sframe_decoder_ctx *dctx, const char *cf_buf); _URC_END_OF_STACK if failure. */ extern _Unwind_Reason_Code -__sframe_find_fre (sframe_decoder_ctx *ctx, int32_t pc, +__sframe_find_fre (sframe_decoder_ctx *ctx, int64_t pc, sframe_frame_row_entry *frep); /* Get the base reg id from the FRE info. */ diff --git a/sysdeps/generic/sframe.c b/sysdeps/generic/sframe.c index bcee70cf60..3c5721f513 100644 --- a/sysdeps/generic/sframe.c +++ b/sysdeps/generic/sframe.c @@ -117,6 +117,10 @@ __stacktrace_sframe (void **ra_lst, int count, frame *frame) return 0; } + /* A FRE with undefined RA indicates the outermost frame. */ + if (SFRAME_V2_FRE_RA_UNDEFINED_P (frep->fre_info)) + return i; + /* Get the CFA offset from the FRE. If offset is unavailable, sets err. */ cfa_offset = __sframe_fre_get_cfa_offset (dctx, frep, &err); diff --git a/sysdeps/generic/sframe.h b/sysdeps/generic/sframe.h index c7717af473..2bb720bb43 100644 --- a/sysdeps/generic/sframe.h +++ b/sysdeps/generic/sframe.h @@ -72,10 +72,11 @@ extern "C" /* SFrame format versions. */ #define SFRAME_VERSION_1 1 #define SFRAME_VERSION_2 2 +#define SFRAME_VERSION_3 3 /* SFrame magic number. */ #define SFRAME_MAGIC 0xdee2 /* Current version of SFrame format. */ -#define SFRAME_VERSION SFRAME_VERSION_2 +#define SFRAME_VERSION SFRAME_VERSION_3 /* Various flags for SFrame. */ @@ -95,6 +96,10 @@ extern "C" (SFRAME_F_FDE_SORTED | SFRAME_F_FRAME_POINTER \ | SFRAME_F_FDE_FUNC_START_PCREL) +/* Set of all defined flags in SFrame V3. */ +#define SFRAME_V3_F_ALL_FLAGS \ + (SFRAME_F_FDE_SORTED | SFRAME_F_FDE_FUNC_START_PCREL) + #define SFRAME_CFA_FIXED_FP_INVALID 0 #define SFRAME_CFA_FIXED_RA_INVALID 0 @@ -102,6 +107,7 @@ extern "C" #define SFRAME_ABI_AARCH64_ENDIAN_BIG 1 /* AARCH64 big endian. */ #define SFRAME_ABI_AARCH64_ENDIAN_LITTLE 2 /* AARCH64 little endian. */ #define SFRAME_ABI_AMD64_ENDIAN_LITTLE 3 /* AMD64 little endian. */ +#define SFRAME_ABI_S390X_ENDIAN_BIG 4 /* s390x big endian. */ /* SFrame FRE types. */ #define SFRAME_FRE_TYPE_ADDR1 0 @@ -131,6 +137,19 @@ extern "C" matching FRE. */ #define SFRAME_FDE_TYPE_PCMASK 1 +/* SFrame FDE types. */ + +/* Default FDE type. */ +#define SFRAME_FDE_TYPE_DEFAULT 0 +/* Flexible Frame FDE type. + The recovery rule for CFA, RA and FP allow more flexibility. Examples of + patterns supported include: + - CFA may be non-SP/FP based. + - CFA, FP may encode dereferencing of register after offset adjustment + - RA may be in a non-default register. + Currently used for SFRAME_ABI_AMD64_ENDIAN_LITTLE. */ +#define SFRAME_FDE_TYPE_FLEX 1 + typedef struct sframe_preamble { uint16_t sfp_magic; /* Magic number (SFRAME_MAGIC). */ @@ -180,7 +199,7 @@ typedef struct sframe_header #define SFRAME_AARCH64_PAUTH_KEY_A 0 /* Key A. */ #define SFRAME_AARCH64_PAUTH_KEY_B 1 /* Key B. */ -typedef struct sframe_func_desc_entry +typedef struct sframe_func_desc_entry_v2 { /* Function start address. Encoded as a signed offset, relative to the beginning of the current FDE. */ @@ -199,7 +218,7 @@ typedef struct sframe_func_desc_entry - 2-bits: Unused. ------------------------------------------------------------------------ | Unused | PAC auth A/B key (aarch64) | FDE type | FRE type | - | | Unused (amd64) | | | + | | Unused (amd64, s390x) | | | ------------------------------------------------------------------------ 8 6 5 4 0 */ uint8_t sfde_func_info; @@ -207,7 +226,7 @@ typedef struct sframe_func_desc_entry SFRAME_FDE_TYPE_PCMASK. */ uint8_t sfde_func_rep_size; uint16_t sfde_func_padding2; -} __attribute__ ((packed)) sframe_func_desc_entry; +} __attribute__ ((packed)) sframe_func_desc_entry_v2; /* Macros to compose and decompose function info in FDE. */ @@ -224,6 +243,87 @@ typedef struct sframe_func_desc_entry #define SFRAME_V1_FUNC_INFO_UPDATE_PAUTH_KEY(pauth_key, fde_info) \ ((((pauth_key) & 0x1) << 5) | ((fde_info) & 0xdf)) +/* SFrame V2 has similar SFrame FDE representation as SFrame V1. */ +#define SFRAME_V2_FUNC_PC_TYPE(data) (SFRAME_V1_FUNC_FDE_TYPE (data)) +#define SFRAME_V2_FUNC_FRE_TYPE(data) (SFRAME_V1_FUNC_FRE_TYPE (data)) + +/* SFrame Function Descriptor Entry PC types. + + The SFrame format has two possible representations for functions' PC Type. + The choice of which PC type to use is made according to the instruction + patterns in the relevant program stub. + + The PC type SFRAME_V3_FDE_PCTYPE_INC is an indication that the PCs in the + FREs should be treated as increments in bytes. This is used for a bulk of + the executable code of a program, which contains instructions with no + specific pattern. + + The PC type SFRAME_V3_FDE_PCTYPE_MASK is an indication that the PCs in the + FREs should be treated as masks. This type is useful for the cases when a + small pattern of instructions in a program stub is repeatedly to cover a + specific functionality. Typical usescases are pltN entries, trampolines + etc. + + NB: In SFrame version 2 or lower, the names SFRAME_FDE_TYPE_PCINC and + SFRAME_FDE_TYPE_PCMASK were used. */ + +/* Unwinders perform a (PC >= FRE_START_ADDR) to look up a matching FRE. */ +#define SFRAME_V3_FDE_PCTYPE_INC SFRAME_FDE_TYPE_PCINC +/* Unwinders perform a (PC % REP_BLOCK_SIZE >= FRE_START_ADDR) to look up a + matching FRE. */ +#define SFRAME_V3_FDE_PCTYPE_MASK SFRAME_FDE_TYPE_PCMASK + +typedef struct sframe_func_desc_idx_v3 +{ + /* Offset to the function start address. Encoded as a signed offset, + relative to the beginning of the current FDE. */ + int64_t sfdi_func_start_offset; + /* Size of the function in bytes. */ + uint32_t sfdi_func_size; + /* Offset of the first SFrame Frame Row Entry of the function, relative to the + beginning of the SFrame Frame Row Entry sub-section. */ + uint32_t sfdi_func_start_fre_off; +} __attribute__ ((packed)) sframe_func_desc_idx_v3; + +typedef struct sframe_func_desc_attr_v3 +{ + /* Number of frame row entries for the function. */ + uint16_t sfda_func_num_fres; + /* Additional information for stack tracing from the function: + - 4-bits: Identify the FRE type used for the function. + - 1-bit: Identify the PC type of the function - mask or inc. + - 1-bit: PAC authorization A/B key (aarch64). + - 1-bits: Unused. + - 1-bit: Signal frame. + ------------------------------------------------------------------------------- + | Signal | Unused | PAC auth A/B key (aarch64) | FDE | FRE Type | + | frame | | Unused (amd64) | PC Type | | + ------------------------------------------------------------------------------- + 8 7 6 5 4 0 */ + uint8_t sfda_func_info; + /* Additional information for stack tracing from the function: + - 5-bits: FDE type. + - 3-bits: Unused. + ------------------------------------------------------------ + | Unused | FDE Type | + | | | + ------------------------------------------------------------ + 8 7 6 5 0 */ + uint8_t sfda_func_info2; + /* Size of the block of repeating insns. Used for SFrame FDEs of type + SFRAME_V3_FDE_PCTYPE_MASK. */ + uint8_t sfda_func_rep_size; +} __attribute__ ((packed)) sframe_func_desc_attr_v3; + +/* Mask for the ABI/arch specific FDE type (lower 5 bits). */ +#define SFRAME_V3_FDE_TYPE_MASK 0x1f + +/* Get the FDE type from the info2 byte. */ +#define SFRAME_V3_FDE_TYPE(info2) \ + ((info2) & SFRAME_V3_FDE_TYPE_MASK) +#define SFRAME_V3_FDE_FRE_TYPE(info) (SFRAME_V2_FUNC_FRE_TYPE (info)) +#define SFRAME_V3_FDE_PC_TYPE(info) (SFRAME_V2_FUNC_PC_TYPE (info)) + /* Size of stack frame offsets in an SFrame Frame Row Entry. A single SFrame FRE has all offsets of the same size. Offset size may vary across frame row entries. */ @@ -231,6 +331,14 @@ typedef struct sframe_func_desc_entry #define SFRAME_FRE_OFFSET_2B 1 #define SFRAME_FRE_OFFSET_4B 2 +/* In SFrame V3, with the addition of flexible FDE, usage of term "offsets" + (for the varlen data trailing the SFrame FRE) is inappropriate. Use the + terminology of "data word" instead. A single SFrame FRE has all data words + of the same size. Size of data words may vary across frame row entries. */ +#define SFRAME_FRE_DATAWORD_1B SFRAME_FRE_OFFSET_1B +#define SFRAME_FRE_DATAWORD_2B SFRAME_FRE_OFFSET_2B +#define SFRAME_FRE_DATAWORD_4B SFRAME_FRE_OFFSET_4B + /* An SFrame Frame Row Entry can be SP or FP based. */ #define SFRAME_BASE_REG_FP 0 #define SFRAME_BASE_REG_SP 1 @@ -249,15 +357,16 @@ typedef struct sframe_fre_info { /* Information about - 1 bit: base reg for CFA - - 4 bits: Number of offsets (N). A value of upto 3 is allowed to track - all three of CFA, FP and RA (fixed implicit order). - - 2 bits: information about size of the offsets (S) in bytes. - Valid values are SFRAME_FRE_OFFSET_1B, SFRAME_FRE_OFFSET_2B, - SFRAME_FRE_OFFSET_4B + - 4 bits: Number of data words (N). Typically for default FDE type, a + value of upto 3 suffices to track all three of CFA, FP and RA (fixed + implicit order). + - 2 bits: information about size of the data words (S) in bytes. + Valid values are SFRAME_FRE_DATAWORD_1B, SFRAME_FRE_DATAWORD_2B, + SFRAME_FRE_DATAWORD_4B. - 1 bit: Mangled RA state bit (aarch64 only). ---------------------------------------------------------------------------------- - | Mangled-RA (aarch64) | Size of offsets | Number of offsets | base_reg | - | Unused (amd64) | | | | + | Mangled-RA (aarch64) | Size of Data Words | Number of Data Words | base_reg | + | Unused (amd64, s390x)| | | | ---------------------------------------------------------------------------------- 8 7 5 1 0 @@ -280,10 +389,12 @@ typedef struct sframe_fre_info #define SFRAME_V1_FRE_OFFSET_COUNT(data) (((data) >> 1) & 0xf) #define SFRAME_V1_FRE_OFFSET_SIZE(data) (((data) >> 5) & 0x3) #define SFRAME_V1_FRE_MANGLED_RA_P(data) (((data) >> 7) & 0x1) +/* A zero offset count indicates that RA is undefined for this FRE. */ +#define SFRAME_V2_FRE_RA_UNDEFINED_P(data) (SFRAME_V1_FRE_OFFSET_COUNT (data) == 0) /* SFrame Frame Row Entry definitions. - Used for both AMD64 and AARCH64. + Used for Default FDEs in AMD64, AARCH64, and s390x. An SFrame Frame Row Entry is a self-sufficient record which contains information on how to generate the stack trace for the specified range of @@ -291,7 +402,7 @@ typedef struct sframe_fre_info S is the size of the stack frame offset for the FRE, and N is the number of stack frame offsets in the FRE - The interpretation of FRE stack offsets is ABI-specific: + The interpretation of FRE stack offsets for default FDEs is ABI-specific: AMD64: offset1 (interpreted as CFA = BASE_REG + offset1) @@ -307,6 +418,25 @@ typedef struct sframe_fre_info fi Note that in AAPCS64, a frame record, if created, will save both FP and LR on stack. + + s390x: + offset1 (interpreted as CFA = BASE_REG + offset1) + if RA is being tracked + offset2 (interpreted as RA = CFA + offset2; an offset value of + SFRAME_FRE_RA_OFFSET_INVALID indicates a dummy padding RA offset + to represent FP without RA saved on stack) + if FP is being tracked + offset3 (intrepreted as FP = CFA + offset3) + fi + else + if FP is being tracked + offset2 (intrepreted as FP = CFA + offset2) + fi + fi + Note that in s390x, if a FP/RA is to be restored from a register, flex FDEs + are used in SFrame V3. In SFrame V2, default FDEs were used: the + least-significant bit of the offset was set to indicate that the encoded + value is a DWARF register number shifted to the left by 1. */ /* Used when SFRAME_FRE_TYPE_ADDR1 is specified as FRE type. */ From patchwork Tue Apr 14 12:23:11 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Zissulescu X-Patchwork-Id: 133027 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 671E04BA23CC for ; Tue, 14 Apr 2026 12:24:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 671E04BA23CC Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=oracle.com header.i=@oracle.com header.a=rsa-sha256 header.s=corp-2025-04-25 header.b=ZzV4wE5J; dkim=pass (1024-bit key, unprotected) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-oracle-onmicrosoft-com header.b=wIAYE3Qe X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id DF0CE4BA23CF for ; Tue, 14 Apr 2026 12:23:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DF0CE4BA23CF Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DF0CE4BA23CF Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1776169413; cv=pass; b=OBnNv88b91M2j6Li1hMKEoMa1hg8Sq4YQ+o9HVw4gXDGSDlE71J0jFiG0a952pDiyngxQEnuNAkSs9hkWokOdrcgJQpMSKsfP2b01scECf0k8jC43lS6b30IvI3FjwClP4gkvF8Eh7Ay8Kx8gJyNcX/lwDhLZDUDPscWRzP8t5E= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1776169413; c=relaxed/simple; bh=z7TvUJcq+6dly9CZyN3piz5c6q7f0zY4ggDQVDvcIko=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=ZX01uoLD6UXY/t2HgaDVrensClVXpYxQqDPJQXlRZIXtbHc99N1lIpwW32JVZ13VzlNEmyJIsgMAOkLkKESTNFy/Ssx4oT2YrMSrTCnB1QNrbOq+X4NjkBPwtsY0lhSHJbfjjade88D7YsJyDGV3zlXPe1P/F3fVuNQKXuHltOM= ARC-Authentication-Results: i=2; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DF0CE4BA23CF Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63EACmmx1751255 for ; Tue, 14 Apr 2026 12:23:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2025-04-25; bh=HdIrGmPS+DPYh+3kayGyHh8lluVFTRKoP0Jnp4pI1Ts=; b= ZzV4wE5Jkn1p9Y5+M1YxIq+qAqrO+bLXkIWX0inMv0mwBIrYqAyYeuxBd9I5Jwbw PWRsfPFeRdndyCg1uy5I35oSHVKKtTvR6s1XajqZNcuFM2SFwU8VdImLzwUnoYrv AUFF1hMglWJmGFFwF6Wl8LeO3YEsgmqf1GO/KdKu2TF4KVtPUVCXJeCyRN179Xs4 PW2LA8Lkj+7ZA6d0yfy7KWVzgggNklkiqbpV5MJb5mCUyiuFdPRbh9jC9Vomj74N 6KUpOeVf0KB0yr/gCGvGZmYBYMsSLZgbzhtYJSuQ67Kpz6DpbPbjBgi/EbixeP8W 4PpxQ9turH1YQtMZhcF/6Q== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 4dh8682bk8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 14 Apr 2026 12:23:31 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.7/8.18.1.7) with ESMTP id 63ECJa9J036372 for ; Tue, 14 Apr 2026 12:23:30 GMT Received: from sn4pr2101cu001.outbound.protection.outlook.com (mail-southcentralusazon11012000.outbound.protection.outlook.com [40.93.195.0]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 4dh9jp4u8p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 14 Apr 2026 12:23:30 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UAHdQePFrYRaN4lbP/YN9QJWdtnF3+oT3RThiNiRtS537z5WQMsL0cgQHSol/4ysbNDMa9rO1KDDAq2eB0n1F36rbI+vUw0zEwRJryLSxw7YSG/wkZD+sJE9QO2ag1M0ArAULnMGHu6Bnw6XEOZBT6wcGadcvlZv784Nn/+fwW9oxhPcxJJPhPL+OUDEzNWIAd5ceBs5VKPC91738my6wPvu1k1oJ4CwpUvUpnLxKBG9PhTLZyoan2kutITtqqMGvzf5mvSn2d4TXc8Mr4PpY4FRiX5sIyx+8cUxjf6fDD0gPgxXgprTmZyqjUhBwQXWRWNOk0J6MHO1TOwgzu8olw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HdIrGmPS+DPYh+3kayGyHh8lluVFTRKoP0Jnp4pI1Ts=; b=kJUgas8lJ+UA766p+X7ycko1up9Gx416gbh6pEWGmhwxoIPgXaGsyAX+v9tP+7fvp0wmELRWek6bLtJBqsWNyLu5+qbCHDAM96/3XrFt1wyQ4ug5KwciWgUcktVTfCTwg3VbYEtQwFkCjak8wv+ja/s+Lj/FImuLplRGiql/FOxlJs/TgtKbnc2WcAOKir9e3MGjJrXnN03tDFDx0JLOcUawIoLsm0UTOqyBm6GENbT4B2ZFzVPKGsmIOD0E23Ce5rPDFekkQSp2RfBid0V1ku6e5zDHy0u+kNphIwEdtkenT1GJQLRn21IefS7p/3d57SOCKDdC+j150PlmHKLbGQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HdIrGmPS+DPYh+3kayGyHh8lluVFTRKoP0Jnp4pI1Ts=; b=wIAYE3QeDKUXvQ+xyega1jM3RaLLTELkk1K8q/QcMLMBhIC2X6dS/ksAmYq1CmbUhO6C8q2Rk6wJXetUbol1RkqBk3Uslc+U9teRZ0p64ZnqzHc7aUVB4iI4Gg/bDZQj6jV5vZeK3ePuQ1VMN3V8uEvrpzQLBP6KBPwD6kMLTCA= Received: from CY5PR10MB6011.namprd10.prod.outlook.com (2603:10b6:930:28::16) by MN2PR10MB4285.namprd10.prod.outlook.com (2603:10b6:208:198::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.48; Tue, 14 Apr 2026 12:23:24 +0000 Received: from CY5PR10MB6011.namprd10.prod.outlook.com ([fe80::c792:6d38:1377:61cc]) by CY5PR10MB6011.namprd10.prod.outlook.com ([fe80::c792:6d38:1377:61cc%4]) with mapi id 15.20.9769.046; Tue, 14 Apr 2026 12:23:24 +0000 From: claudiu.zissulescu-ianculescu@oracle.com To: libc-alpha@sourceware.org Cc: elena.zannoni@oracle.com, jose.marchesi@oracle.com Subject: [PATCH 2/2] sframe: add v3 FLEX FDE unwind support and tests Date: Tue, 14 Apr 2026 15:23:11 +0300 Message-ID: <20260414122311.173644-3-claudiu.zissulescu-ianculescu@oracle.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260414122311.173644-1-claudiu.zissulescu-ianculescu@oracle.com> References: <20260414122311.173644-1-claudiu.zissulescu-ianculescu@oracle.com> X-ClientProxiedBy: VI1PR04CA0054.eurprd04.prod.outlook.com (2603:10a6:802:2::25) To CY5PR10MB6011.namprd10.prod.outlook.com (2603:10b6:930:28::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY5PR10MB6011:EE_|MN2PR10MB4285:EE_ X-MS-Office365-Filtering-Correlation-Id: 04c7ec65-6ec3-44c1-2865-08de9a209fe3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|366016|56012099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: g8b01pC/hH0zDNTAEfwnVkjWe+/l++bPNNQtr63sLdZIVBLm2NTv7oF+9Og1CRf9GMUL79MIu/8sKbWmIaXJP+FogrWzW0qsuGc+uvcrHjN02wai+mwu+a69PQaokL4g4UTmSM05gh+Yp8uVg/Q/8cdGv8xlH6PjvcEI9ITjqa7ZwzfYiaTQjcS5ga5nih81aWRKezdrmRFkgrnExA1i+hOFigYNjeGLFhTY8WjKpVIUZ9ybTgoZKzhdhmOyJOZpAhcIamhgRJ14KoG/TuBjzO0RlmpaMCu0qO3/3v8Aaa8iy83WvaAhcZ1vmxuwLNCJzqO/1ZycFw0qJctaDvs/whwl3WY9xtQx9KDpbRtxFiB4oYeW8wx7+XaWLvoB26VW/YpFkrK7fadXvRxRQwb48eFz6Uq77ghrwhF3HVMeJIjd6FKUdL101c21zHroh6GQ3R7A6aPxIkNEqu5YLbKedLgcvLn3JQVerCu8jh08zbaTahPDb54GE0f78efVYDAGKuTZ12AIh7OaZisCdF6co9LC78hMe8wjcWs4jRUmxhz7FWOFejLRf5lPKR796Esr1GRwPBsK/2lyOhaXNAPeaqQ/4ILbE2EEvRzTzpiNwvjBC5pSzogqjAUpY0idasIdNDufZ14LfY1xsi920e5DgEJuehLtIPZmwihqZ6QJHcaAMwMM7nMk9YaStMlRrxZh1QSRfgdKro/jXvPTF88ZMd4W8fwjxXBhHvSnuNf0hY862ecuIfAG4wJRvlCVnkPB X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CY5PR10MB6011.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(376014)(366016)(56012099003)(22082099003)(18002099003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tMdmpLn9vaYXc7L4Ln4sCpLoTq6X3Jj1AKtcRvPU+X86639io1pJLhmIJn5+SOLziuPrwOaFikOg88bxXFnhXNhuiTAlB1kAO5GEq0zz52w+8fqqM/EJPAO7eYcDOjGtF1JnysMB5nyEHj1PclvjajiS/oCBuPQxbbXhjFI/ILeTCCfWEZc3jn81AU2gyl9bvH7fSfywGzvg1bJp38eFlZ2H5W16Kk5cSH8DZjLsvD04GhOJFtdfieBUG60q/CNgct4LVl7x8x60HJQOzkcPoljnZO0gX3xhe88sURho/sXKu2pVX2NVJV1WLqgImsTbxVPmssz5rFH5Ve6ksiSuKdqCzI/mt/oZZ/n9KG/e7aLPvlv8fEOW4yjsvBr087CNHtpCxVbpnEgDQJ0EFxiC70G91e5PWKeDZIdWN8xTDPqLlN/XJSe9Seoxsenfyz8Z1NqrmedqQ4QpQYsHF2goYJkKZHqUONd9weQz4/Ys5CXUWBE4Bg6J7RN/Lk8MgEVXAyTFgKBK6MepAoTHGTABEc9xZuO+m8T08kYivLqENH/cYxeElS8z8qz0j/FRP5JTXe6lEAag9VTN5q1CsPKBDvvfrx2KDw3LHRmiccN3yagih0kUEgPXY+4+XLLTmhQqU2OzZMIltp4/++DMFOT/olXux0hmeBf9U+xlHqg/D5fBFowU28AwTrNgfZCtGmaY4bWBStzzgIXOUwaPyIOy73iiMZp7nn6VNoFmYGh2IkKX8rAS0bAi7Cvl1acWYGUh3c4IW+D6VDO54z/p5d4QY1z7xCmpbxv/2mnN5lk204EDBkYHuwAKq+DCcy9oDumiMZI1CqsDfLkYpNDx5nngeEE+MO3xPrEudkJXSrWsEJk6EeOPknCbIlKrD9A3kQGogs/qgi34gpd5zlXYe/pKzeXdsqBRDiz1dlNSIMxjXj5oZC4E8knmmzNVWnlbeUBoMZK8TxAcOBquXwXFDDVVPQ8eYSITP2rXqRVHn2eNysxgv90mXxkToBqNQIbVYxW0oCLQVKIfWImX1jwE8gcFN66vVi6dZGPodRQcImmgYvLTraVJf+R2d9UPutin1pTGd0j3bKrXB3yfKR+jM6QnsQIkenHKMU4URu34umMweR00tcUZ1xjiryOTOFATZ9hLdHP8F8y1loLvhF+3d+KS6V6hxdOva7ouB47qB10LMxrxRsD0hjZveDnePauu3H704h2vzFOoNfa36mTUlnFxFBZpVadS9/DGS/3bQ3aN6rOIh1tbr8Xj26Asp56/fo58ODYGQbr8ie7JgLoM+Z8Velf35876CwK445knA8YFMlpl7Zn8ak0nx+tYj2riyC0ixVD3BitbsibjR21kABFFrxqT8SnAnQuJlFA4UsmN8uhEqdpYWogzFY2NSzJd7YDhFlRkadcJsBrEWjPu3DnZump+H1u7Duxsj80OtZHz6zOCtw0AN/iMTsdvi2v6w10M36oQsHXHrqCiKLJFoUeKJqrM4Jb12/DHC0gcY51t2E+hQiaNpraeFnVBpQAH+LItbZh0BJ0DH4rw5LWqcP2CZ2JW329R91CgQtuDaep1dnm7bkza5qYDrbA+RbevZLp/CDuzT9EbHnXENGNItuQyGTc1I+u3od3biqOci9K5L/cNaAEFpNK/qAx8ssBxzxs1ZgDO9kc2BLKGlGION6uHZ6+dIVgC7CtC+ymmKryaJTJlOjW5n+Qt2tnPoDGda48es70xYZoFDYw1eWHy2khvxCZOh/OpAbEAPiNzwKRKbIhUakBQjTEMgX/QIijMvpTY X-Exchange-RoutingPolicyChecked: QIq2i/BgrX1QwX8nO71RlB7KPCq/On+Q4IpAqczb7wNPbrVTgE2rgbH0Et5tquk7ETPD5Q7q3EZ4iZ+WAUOqmZDvVTcBEn5Nwphdaf54WOaBGvjzX8PtCgGc2+/XAepvqzHHHuIhrMcjc+j6lC/aSmpD59mO1yfCCfuUM83dICmGUHONXmy28CeT8p2sLEYwXZn4w0gnn19NjOmhM82XFamUg1kz3cSz982CKc3U0dWhxT1PpKtfrH7gIRcq+3nC+lMr7vsnweEjSD5mKwgyeTPeV1+bimzVRgw+QmESmETMo1GYqZQXHhclyVr+R7ETefLGW+pq6dOnxzOPC/fobg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: M+Nu6hH9CWgJ5zfJB1oRoXvnVCLnna3Pzy0eSZdYAKtCEOXorcXMo58aMUV67aKDRDO8lj3LNE0D4mYAGmzmcN/yQmaFqP2gjK/HgR2aJoj8ZvwuSJcbwVDVtVnNaBJANFX92AZo8YWPj8GeSHf9VQQ+0Ud4/9qNKlKZFKVCDrjoeviQZE1Di3ZCTRCQdzqNCW9dL3LmQNBjeTKjeX04xn3zuI4Kp1oZZ6wh7IG2XlWecz++LKzngmIJiYKAWiXp7/SRVmcFgvcjitvkDeizdDehQoHNKaMnbX6NE6BEWkeao68HPagrS1yQtx7GaRJ3azoIi9Mgh6oBqQy9VtSBgk3Tgd8fXyqdCmCY3DLb3ehEFBmJ0/C+H//SdwIVRcY+qWLRBddxp1MSPA5S7HT7Z5+tbtZLpRQI7aUXv+Gt7jKwIEJQwtwZ9doyim8fjMc+WpAFdmQemkieQ0I8XtazDOGaEsjVkvnUJXa66eCB1uLxzB6HjFaz0CFH4j5ra+yj0DOzu0cGGJ4pVj/FxnL6JYIFP1KklSgLI1gOrraQuM/rHwslLSsbscEPogu1xQGGAspWe+8JIbcXJDjSRlyMV0Ncd9KScFl2rvrzNGcVL3A= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04c7ec65-6ec3-44c1-2865-08de9a209fe3 X-MS-Exchange-CrossTenant-AuthSource: CY5PR10MB6011.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2026 12:23:24.8395 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2lX9ik46X8XVBnkmSKUZQSLO8n2KnIjrocBTMmOVGNYntqcyTuqnPYI4mAbZ+Ubfc2Dx/VkazG2IEgt/Ykuzy02jKlB/h72I1z6zVkqueFvRdHER2EM3eDg/4au5xjx1lSIE6QOtkmbB/1RoRgREGw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4285 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-14_03,2026-04-13_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 spamscore=0 adultscore=0 bulkscore=0 suspectscore=0 lowpriorityscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2604070000 definitions=main-2604140115 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDE0MDExNSBTYWx0ZWRfX2LzdQh0TPY3Q /EmpJdksObUUOFek2gVwxX3sQxyWJnvxMghsWZp+0H3pq4GOJfUVapFWZ3Pi6hGDkzjhlcWbIPc 2R5d0MEgSjKWhsGWLEMI3sg/JH4MYCgilUEEkSApxXDgif+VyHAfnmDhofW1F9fnLXdT4m+nW/9 p6APG2Auye5GU3X+NLAl+Buc95dPG24rrT4z/dBYu9r1pirWrV4iGVZ/Z2osznuOvVpDKy9e6od bzuHJHS/IIYwBKxCJyzgkF+yhvkVaOmc5ekfHCk33CWoZnzbQS/qTuQKCbPQndPB8bEAc5HMOd6 j5r0iqE3tvma26Sgw1HtQim/QCIFXFEjjq9AfQqmg+9EjsDlLbGoFD3gIiiSWzhjRfMULXyCbbN m5R7iKi8csb7DauIsLu3TNjAgdo3IJVztqkacttIuxBE7QWDembcPNz71Wb7hE4lvohwfAWBgK3 fR4F8cn9aYgSmNVTnQw== X-Proofpoint-GUID: QLtSKEGthDBwiTW-7zqXyRbG8BSI_wFA X-Proofpoint-ORIG-GUID: QLtSKEGthDBwiTW-7zqXyRbG8BSI_wFA X-Authority-Analysis: v=2.4 cv=JY6Ma0KV c=1 sm=1 tr=0 ts=69de31c3 b=1 cx=c_pps a=WeWmnZmh0fydH62SvGsd2A==:117 a=WeWmnZmh0fydH62SvGsd2A==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=A5OVakUREuEA:10 a=GoEa3M9JfhUA:10 a=VkNPw1HP01LnGYTKEx00:22 a=jiCTI4zE5U7BLdzWsZGv:22 a=3I1J8UUJPc9JN9BFgKH3:22 a=mDV3o1hIAAAA:8 a=yPCof4ZbAAAA:8 a=EtVehNF6vVAjHvIjOK4A:9 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org From: Claudiu Zissulescu This commit adds FLEX FDE support for SFrame v3. In FLEX FDEs, payload may include control words and offset words. FLEX us ebavked wgen CFI patterns require it and target hook allows it. FLEX is supported in binutils by x86_64 and s390x backends. --- debug/Makefile | 3 + debug/tst-backtrace-flex.c | 164 ++++++++++++++++++ sysdeps/generic/sframe-read.c | 158 ++++++++++++++--- sysdeps/generic/sframe-read.h | 13 +- sysdeps/generic/sframe.c | 137 +++++++++++++-- sysdeps/generic/sframe.h | 19 ++ sysdeps/unix/sysv/linux/aarch64/uw-sigframe.h | 6 + sysdeps/unix/sysv/linux/x86_64/uw-sigframe.h | 6 + 8 files changed, 473 insertions(+), 33 deletions(-) create mode 100644 debug/tst-backtrace-flex.c diff --git a/debug/Makefile b/debug/Makefile index c6c1069b40..d36f024d8b 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -291,6 +291,9 @@ $(objpfx)tst-backtrace1: $(shared-thread-library) # When SFrame is enabled, make sure the dwarf unwinder is also exercised. ifeq ($(enable-gsframe),yes) +tests-internal += tst-backtrace-flex +LDLIBS-tst-backtrace-flex += $(common-objpfx)elf/sframe-read.o + dw_unwind_pair := \ tst-backtrace1-nosframe:tst-backtrace1 \ tst-backtrace2-nosframe:tst-backtrace2 \ diff --git a/debug/tst-backtrace-flex.c b/debug/tst-backtrace-flex.c new file mode 100644 index 0000000000..572c427fd4 --- /dev/null +++ b/debug/tst-backtrace-flex.c @@ -0,0 +1,164 @@ +/* Test SFrame v3 FLEX FRE decoding in the backtrace test suite. + Copyright (C) 2026 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include + +#define TEST_FRE0_DATAWORDS 5 +#define TEST_FRE1_DATAWORDS 4 +#define TEST_FDE_COUNT 1 +#define TEST_FRE_COUNT 2 +#define TEST_FUNC_SIZE 0x10 + +#define FLEX_CFA_SP_CTRL \ + SFRAME_V3_FLEX_FDE_CTRLWORD_ENCODE (7, 0, 1) +#define FLEX_FP_RBP_CTRL \ + SFRAME_V3_FLEX_FDE_CTRLWORD_ENCODE (6, 1, 1) +#define FLEX_RA_REG_CTRL \ + SFRAME_V3_FLEX_FDE_CTRLWORD_ENCODE (2, 0, 1) + +#define TEST_FRE_SECTION_LEN \ + (sizeof (sframe_func_desc_attr_v3) \ + + sizeof (sframe_frame_row_entry_addr1) + TEST_FRE0_DATAWORDS \ + + sizeof (sframe_frame_row_entry_addr1) + TEST_FRE1_DATAWORDS) + +struct sframe_test_section +{ + sframe_header header; + sframe_func_desc_idx_v3 fde; + sframe_func_desc_attr_v3 attr; + sframe_frame_row_entry_addr1 fre0; + int8_t fre0_data[TEST_FRE0_DATAWORDS]; + sframe_frame_row_entry_addr1 fre1; + int8_t fre1_data[TEST_FRE1_DATAWORDS]; +} __attribute__ ((packed)); + +static const struct sframe_test_section test_sframe_section = +{ + .header = + { + .sfh_preamble = { SFRAME_MAGIC, SFRAME_VERSION_3, SFRAME_F_FDE_SORTED }, + .sfh_abi_arch = SFRAME_ABI_AMD64_ENDIAN_LITTLE, + .sfh_cfa_fixed_fp_offset = SFRAME_CFA_FIXED_FP_INVALID, + .sfh_cfa_fixed_ra_offset = -8, + .sfh_auxhdr_len = 0, + .sfh_num_fdes = TEST_FDE_COUNT, + .sfh_num_fres = TEST_FRE_COUNT, + .sfh_fre_len = TEST_FRE_SECTION_LEN, + .sfh_fdeoff = 0, + .sfh_freoff = sizeof (sframe_func_desc_idx_v3), + }, + .fde = + { + .sfdi_func_start_offset = 0, + .sfdi_func_size = TEST_FUNC_SIZE, + .sfdi_func_start_fre_off = 0, + }, + .attr = + { + .sfda_func_num_fres = TEST_FRE_COUNT, + .sfda_func_info = SFRAME_V1_FUNC_INFO (SFRAME_V3_FDE_PCTYPE_INC, + SFRAME_FRE_TYPE_ADDR1), + .sfda_func_info2 = SFRAME_V3_SET_FDE_TYPE (0, SFRAME_FDE_TYPE_FLEX), + .sfda_func_rep_size = 0, + }, + /* FRE0 (start 0): CFA via SP+8, RA padding, FP via deref(FP+0). */ + .fre0 = + { + .sfre_start_address = 0, + .sfre_info = + { + .fre_info = SFRAME_V1_FRE_INFO (SFRAME_BASE_REG_SP, + TEST_FRE0_DATAWORDS, + SFRAME_FRE_DATAWORD_1B), + }, + }, + .fre0_data = { FLEX_CFA_SP_CTRL, 8, SFRAME_FRE_RA_OFFSET_INVALID, + FLEX_FP_RBP_CTRL, 0 }, + /* FRE1 (start 8): CFA via SP+16, RA via register rule r2+0. */ + .fre1 = + { + .sfre_start_address = 8, + .sfre_info = + { + .fre_info = SFRAME_V1_FRE_INFO (SFRAME_BASE_REG_SP, + TEST_FRE1_DATAWORDS, + SFRAME_FRE_DATAWORD_1B), + }, + }, + .fre1_data = { FLEX_CFA_SP_CTRL, 16, FLEX_RA_REG_CTRL, 0 }, +}; + +static int +do_test (void) +{ + sframe_decoder_ctx dctx = { 0 }; + sframe_frame_row_entry fre; + _Unwind_Reason_Code err; + int32_t off; + + err = __sframe_decode (&dctx, (const char *) &test_sframe_section); + TEST_COMPARE (err, _URC_NO_REASON); + + err = __sframe_find_fre (&dctx, 0, &fre); + TEST_COMPARE (err, _URC_NO_REASON); + TEST_COMPARE (__sframe_fre_get_fde_type (&fre), SFRAME_FDE_TYPE_FLEX); + + TEST_COMPARE (__sframe_fre_get_udata (&fre, 0, &err), FLEX_CFA_SP_CTRL); + TEST_COMPARE (err, _URC_NO_REASON); + TEST_COMPARE (__sframe_fre_get_udata (&fre, 2, &err), + SFRAME_FRE_RA_OFFSET_INVALID); + TEST_COMPARE (err, _URC_NO_REASON); + + off = __sframe_fre_get_cfa_offset (&dctx, &fre, &err); + TEST_COMPARE (err, _URC_NO_REASON); + TEST_COMPARE (off, 8); + + off = __sframe_fre_get_fp_offset (&dctx, &fre, &err); + TEST_COMPARE (err, _URC_NO_REASON); + TEST_COMPARE (off, 0); + + off = __sframe_fre_get_ra_offset (&dctx, &fre, &err); + TEST_COMPARE (err, _URC_NO_REASON); + TEST_COMPARE (off, -8); + + err = __sframe_find_fre (&dctx, 8, &fre); + TEST_COMPARE (err, _URC_NO_REASON); + + TEST_COMPARE (__sframe_fre_get_udata (&fre, 2, &err), FLEX_RA_REG_CTRL); + TEST_COMPARE (err, _URC_NO_REASON); + + off = __sframe_fre_get_cfa_offset (&dctx, &fre, &err); + TEST_COMPARE (err, _URC_NO_REASON); + TEST_COMPARE (off, 16); + + off = __sframe_fre_get_ra_offset (&dctx, &fre, &err); + TEST_COMPARE (err, _URC_NO_REASON); + TEST_COMPARE (off, 0); + + off = __sframe_fre_get_fp_offset (&dctx, &fre, &err); + TEST_COMPARE (err, _URC_END_OF_STACK); + TEST_COMPARE (off, 0); + + err = __sframe_find_fre (&dctx, TEST_FUNC_SIZE, &fre); + TEST_COMPARE (err, _URC_END_OF_STACK); + + return 0; +} + +#include diff --git a/sysdeps/generic/sframe-read.c b/sysdeps/generic/sframe-read.c index 9464cd71e6..ec139a49a7 100644 --- a/sysdeps/generic/sframe-read.c +++ b/sysdeps/generic/sframe-read.c @@ -451,6 +451,49 @@ sframe_get_fre_offset (sframe_frame_row_entry *fre, } } +/* Get IDX'th data word from FRE as unsigned value. + Set ERRP as applicable. */ + +static uint32_t +sframe_get_fre_udata (sframe_frame_row_entry *fre, + int idx, + _Unwind_Reason_Code *errp) +{ + uint8_t offset_cnt, offset_size; + + if (!sframe_fre_sanity_check_p (fre)) + { + *errp = _URC_END_OF_STACK; + return 0; + } + + offset_cnt = sframe_fre_get_offset_count (fre->fre_info); + offset_size = sframe_fre_get_offset_size (fre->fre_info); + + if (offset_cnt < (idx + 1)) + { + *errp = _URC_END_OF_STACK; + return 0; + } + *errp = _URC_NO_REASON; + + if (offset_size == SFRAME_FRE_OFFSET_1B) + { + uint8_t *sp = (uint8_t *)fre->fre_offsets; + return sp[idx]; + } + else if (offset_size == SFRAME_FRE_OFFSET_2B) + { + uint16_t *sp = (uint16_t *)fre->fre_offsets; + return sp[idx]; + } + else + { + uint32_t *ip = (uint32_t *)fre->fre_offsets; + return ip[idx]; + } +} + /* Decode the SFrame FRE start address offset value from FRE_BUF in on-disk binary format, given the FRE_TYPE. Updates the FRE_START_ADDR. */ @@ -592,6 +635,26 @@ __sframe_fre_get_base_reg_id (sframe_frame_row_entry *fre) return SFRAME_V1_FRE_CFA_BASE_REG_ID (fre_info); } +/* Get the FDE type associated with the FRE. */ + +uint8_t +__sframe_fre_get_fde_type (sframe_frame_row_entry *fre) +{ + if (fre == NULL) + return SFRAME_FDE_TYPE_DEFAULT; + + return fre->fre_fde_type; +} + +/* Get IDX'th data word from FRE as unsigned value. */ + +uint32_t +__sframe_fre_get_udata (sframe_frame_row_entry *fre, int idx, + _Unwind_Reason_Code *errp) +{ + return sframe_get_fre_udata (fre, idx, errp); +} + /* Get the CFA offset from the FRE. If the offset is unavailable, sets errp. */ @@ -600,7 +663,10 @@ __sframe_fre_get_cfa_offset (sframe_decoder_ctx *dctx __attribute__ ((__unused__ sframe_frame_row_entry *fre, _Unwind_Reason_Code *errp) { - return sframe_get_fre_offset (fre, SFRAME_FRE_CFA_OFFSET_IDX, errp); + bool flex_p = (__sframe_fre_get_fde_type (fre) == SFRAME_FDE_TYPE_FLEX); + uint32_t idx = flex_p ? SFRAME_FRE_CFA_OFFSET_IDX + 1 + : SFRAME_FRE_CFA_OFFSET_IDX; + return sframe_get_fre_offset (fre, idx, errp); } /* Get the FP offset from the FRE. If the offset is unavailable, sets @@ -611,14 +677,10 @@ __sframe_fre_get_fp_offset (sframe_decoder_ctx *dctx, sframe_frame_row_entry *fre, _Unwind_Reason_Code *errp) { + _Unwind_Reason_Code fp_err = _URC_NO_REASON; + bool flex_p = (__sframe_fre_get_fde_type (fre) == SFRAME_FDE_TYPE_FLEX); uint32_t fp_offset_idx = 0; - int8_t fp_offset = sframe_decoder_get_fixed_fp_offset (dctx); - - *errp = _URC_NO_REASON; - /* If the FP offset is not being tracked, return the fixed FP offset - from the SFrame header. */ - if (fp_offset != SFRAME_CFA_FIXED_FP_INVALID) - return fp_offset; + int8_t fixed_fp_offset = sframe_decoder_get_fixed_fp_offset (dctx); /* In some ABIs, the stack offset to recover RA (using the CFA) from is fixed (like AMD64). In such cases, the stack offset to recover FP will @@ -627,7 +689,32 @@ __sframe_fre_get_fp_offset (sframe_decoder_ctx *dctx, != SFRAME_CFA_FIXED_RA_INVALID) ? SFRAME_FRE_RA_OFFSET_IDX : SFRAME_FRE_FP_OFFSET_IDX); - return sframe_get_fre_offset (fre, fp_offset_idx, errp); + if (flex_p) + { + _Unwind_Reason_Code ra_reg_err; + uint32_t flex_ra_reg_data + = sframe_get_fre_udata (fre, SFRAME_FRE_RA_OFFSET_IDX * 2, + &ra_reg_err); + if (ra_reg_err == _URC_NO_REASON + && flex_ra_reg_data == SFRAME_FRE_RA_OFFSET_INVALID) + fp_offset_idx = SFRAME_FRE_FP_OFFSET_IDX * 2; + else + fp_offset_idx = SFRAME_FRE_FP_OFFSET_IDX * 2 + 1; + } + + int32_t fp_offset = sframe_get_fre_offset (fre, fp_offset_idx, &fp_err); + + /* If the FP offset is fixed and the FRE does not provide one, use the + fixed offset in the SFrame header. */ + if ((!flex_p || (flex_p && fp_err != _URC_NO_REASON)) + && fixed_fp_offset != SFRAME_CFA_FIXED_FP_INVALID) + { + *errp = _URC_NO_REASON; + return fixed_fp_offset; + } + + *errp = fp_err; + return fp_offset; } /* Get the RA offset from the FRE. If the offset is unavailable, sets @@ -638,16 +725,48 @@ __sframe_fre_get_ra_offset (sframe_decoder_ctx *dctx, sframe_frame_row_entry *fre, _Unwind_Reason_Code *errp) { - int8_t ra_offset = sframe_decoder_get_fixed_ra_offset (dctx); - *errp = _URC_NO_REASON; + _Unwind_Reason_Code ra_err = _URC_NO_REASON; + bool flex_p = (__sframe_fre_get_fde_type (fre) == SFRAME_FDE_TYPE_FLEX); + int8_t fixed_ra_offset = sframe_decoder_get_fixed_ra_offset (dctx); + + uint32_t ra_offset_idx = SFRAME_FRE_RA_OFFSET_IDX; + if (flex_p) + { + _Unwind_Reason_Code ra_reg_err; + uint32_t flex_ra_reg_data + = sframe_get_fre_udata (fre, SFRAME_FRE_RA_OFFSET_IDX * 2, + &ra_reg_err); + + /* In FLEX rows, a missing RA rule means use the fixed RA offset from + the SFrame header (if available). */ + if (ra_reg_err == _URC_NO_REASON + && flex_ra_reg_data == SFRAME_FRE_RA_OFFSET_INVALID) + { + if (fixed_ra_offset != SFRAME_CFA_FIXED_RA_INVALID) + { + *errp = _URC_NO_REASON; + return fixed_ra_offset; + } + + *errp = _URC_END_OF_STACK; + return 0; + } + + ra_offset_idx = SFRAME_FRE_RA_OFFSET_IDX * 2 + 1; + } + int32_t ra_offset = sframe_get_fre_offset (fre, ra_offset_idx, &ra_err); - /* If the RA offset was not being tracked, return the fixed RA offset - from the SFrame header. */ - if (ra_offset != SFRAME_CFA_FIXED_RA_INVALID) - return ra_offset; + /* If the RA offset is fixed and the FRE does not provide one, use the + fixed offset in the SFrame header. */ + if ((!flex_p || (flex_p && ra_err != _URC_NO_REASON)) + && fixed_ra_offset != SFRAME_CFA_FIXED_RA_INVALID) + { + *errp = _URC_NO_REASON; + return fixed_ra_offset; + } - /* Otherwise, get the RA offset from the FRE. */ - return sframe_get_fre_offset (fre, SFRAME_FRE_RA_OFFSET_IDX, errp); + *errp = ra_err; + return ra_offset; } /* Decode the specified SFrame buffer SF_BUF and return the new SFrame @@ -737,10 +856,6 @@ __sframe_find_fre (sframe_decoder_ctx *ctx, int64_t pc, || ctx->sfd_fres == NULL) return _URC_END_OF_STACK; - /* Glibc's SFrame unwinder currently supports only DEFAULT FDEs. */ - if (sframe_get_fde_type (&fdep, version) != SFRAME_FDE_TYPE_DEFAULT) - return _URC_END_OF_STACK; - fre_type = sframe_get_fre_type (&fdep, version); fres = ctx->sfd_fres + fdep.func_start_fre_off; if (version == SFRAME_VERSION_3) @@ -795,6 +910,7 @@ __sframe_find_fre (sframe_decoder_ctx *ctx, int64_t pc, { /* Decode last FRE bits: offsets size. */ frep->fre_offsets = fres + addr_size + sizeof (frep->fre_info); + frep->fre_fde_type = sframe_get_fde_type (&fdep, version); return _URC_NO_REASON; } diff --git a/sysdeps/generic/sframe-read.h b/sysdeps/generic/sframe-read.h index 9bda6b1b19..ffb6e46c3a 100644 --- a/sysdeps/generic/sframe-read.h +++ b/sysdeps/generic/sframe-read.h @@ -38,7 +38,8 @@ typedef struct sframe_decoder_ctx int sfd_fre_nbytes; } sframe_decoder_ctx; -#define MAX_NUM_STACK_OFFSETS 3 +/* Default FDEs use up to 3 data words, FLEX FDEs may use up to 6. */ +#define MAX_NUM_STACK_OFFSETS 6 /* User interfacing SFrame Row Entry. An abstraction provided by libsframe so the consumer is decoupled from @@ -52,6 +53,7 @@ typedef struct sframe_frame_row_entry { uint32_t fre_start_addr; const char *fre_offsets; + uint8_t fre_fde_type; unsigned char fre_info; } sframe_frame_row_entry; @@ -75,6 +77,15 @@ __sframe_find_fre (sframe_decoder_ctx *ctx, int64_t pc, extern uint8_t __sframe_fre_get_base_reg_id (sframe_frame_row_entry *fre); +/* Get the FDE type associated with the FRE. */ +extern uint8_t +__sframe_fre_get_fde_type (sframe_frame_row_entry *fre); + +/* Get IDX'th data word from the FRE as unsigned value. */ +extern uint32_t +__sframe_fre_get_udata (sframe_frame_row_entry *fre, int idx, + _Unwind_Reason_Code *errp); + /* Get the CFA offset from the FRE. Sets ERRP if an error is detected. */ diff --git a/sysdeps/generic/sframe.c b/sysdeps/generic/sframe.c index 3c5721f513..30644494bb 100644 --- a/sysdeps/generic/sframe.c +++ b/sysdeps/generic/sframe.c @@ -34,6 +34,52 @@ read_stack_value (_Unwind_Ptr loc) return value; } +/* Resolve a FLEX rule register number to a known register value. */ + +static _Unwind_Reason_Code +sframe_flex_get_reg_value (frame *frame, uint32_t reg_num, _Unwind_Ptr *value) +{ +#if defined SFRAME_FLEX_REG_FP && defined SFRAME_FLEX_REG_SP + if (reg_num == SFRAME_FLEX_REG_SP) + *value = frame->sp; + else if (reg_num == SFRAME_FLEX_REG_FP) + *value = frame->fp; + else + return _URC_END_OF_STACK; + + return _URC_NO_REASON; +#else + return _URC_END_OF_STACK; +#endif +} + +/* Apply one FLEX control-word + offset recovery rule. */ + +static _Unwind_Reason_Code +sframe_apply_flex_rule (frame *frame, _Unwind_Ptr cfa, uint32_t reg_data, + int32_t offset, bool cfa_p, _Unwind_Ptr *value) +{ + _Unwind_Ptr base; + bool reg_p = SFRAME_V3_FLEX_FDE_CTRLWORD_REG_P (reg_data); + bool deref_p = SFRAME_V3_FLEX_FDE_CTRLWORD_DEREF_P (reg_data); + + if (cfa_p && !reg_p) + return _URC_END_OF_STACK; + + if (reg_p) + { + uint32_t reg_num = SFRAME_V3_FLEX_FDE_CTRLWORD_REGNUM (reg_data); + if (sframe_flex_get_reg_value (frame, reg_num, &base) != _URC_NO_REASON) + return _URC_END_OF_STACK; + } + else + base = cfa; + + _Unwind_Ptr loc = base + (_Unwind_Ptr) ((intptr_t) offset); + *value = deref_p ? read_stack_value (loc) : loc; + return _URC_NO_REASON; +} + /* Helper to avoid PLT call in libc. Fixes elf/check-localplt errors. */ @@ -52,6 +98,7 @@ _dl_find_object_helper (void *address, struct dl_find_object *result) int __stacktrace_sframe (void **ra_lst, int count, frame *frame) { + uint32_t fde_type; _Unwind_Ptr sframe_vma, cfa, return_addr, ra_stack_loc, fp_stack_loc, pc, frame_ptr; int cfa_offset, fp_offset, ra_offset, i; @@ -121,6 +168,8 @@ __stacktrace_sframe (void **ra_lst, int count, frame *frame) if (SFRAME_V2_FRE_RA_UNDEFINED_P (frep->fre_info)) return i; + fde_type = __sframe_fre_get_fde_type (frep); + /* Get the CFA offset from the FRE. If offset is unavailable, sets err. */ cfa_offset = __sframe_fre_get_cfa_offset (dctx, frep, &err); @@ -128,9 +177,21 @@ __stacktrace_sframe (void **ra_lst, int count, frame *frame) /* Force fallback to DWARF stacktracer. */ return 0; - /* Get CFA using base reg id from the FRE info. */ - cfa = ((__sframe_fre_get_base_reg_id (frep) - == SFRAME_BASE_REG_SP) ? frame->sp : frame->fp) + cfa_offset; + if (fde_type == SFRAME_FDE_TYPE_FLEX) + { + uint32_t cfa_reg_data + = __sframe_fre_get_udata (frep, SFRAME_FRE_CFA_OFFSET_IDX, &err); + if (err != _URC_NO_REASON + || sframe_apply_flex_rule (frame, 0, cfa_reg_data, + cfa_offset, true, &cfa) + != _URC_NO_REASON) + /* Force fallback to DWARF stacktracer. */ + return 0; + } + else + /* Get CFA using base reg id from the FRE info. */ + cfa = ((__sframe_fre_get_base_reg_id (frep) == SFRAME_BASE_REG_SP) + ? frame->sp : frame->fp) + cfa_offset; /* Get the RA offset from the FRE. If the offset is unavailable, sets err. */ @@ -139,10 +200,35 @@ __stacktrace_sframe (void **ra_lst, int count, frame *frame) /* Force fallback to DWARF stacktracer. */ return 0; - /* RA offset is available, get the value stored in the stack - location. */ - ra_stack_loc = cfa + ra_offset; - return_addr = read_stack_value (ra_stack_loc); + if (fde_type == SFRAME_FDE_TYPE_FLEX) + { + _Unwind_Reason_Code ra_reg_err; + uint32_t ra_reg_data + = __sframe_fre_get_udata (frep, SFRAME_FRE_RA_OFFSET_IDX * 2, + &ra_reg_err); + if (ra_reg_err == _URC_NO_REASON + && ra_reg_data != SFRAME_FRE_RA_OFFSET_INVALID) + { + if (sframe_apply_flex_rule (frame, cfa, ra_reg_data, ra_offset, + false, &return_addr) + != _URC_NO_REASON) + /* Force fallback to DWARF stacktracer. */ + return 0; + } + else + { + /* Fixed RA offset case in FLEX uses default stack rule. */ + ra_stack_loc = cfa + ra_offset; + return_addr = read_stack_value (ra_stack_loc); + } + } + else + { + /* RA offset is available, get the value stored in the stack + location. */ + ra_stack_loc = cfa + ra_offset; + return_addr = read_stack_value (ra_stack_loc); + } ra_lst[i] = (void *) return_addr; @@ -152,10 +238,39 @@ __stacktrace_sframe (void **ra_lst, int count, frame *frame) frame_ptr = frame->fp; if (err == _URC_NO_REASON) { - /* FP offset is available, get the value stored in the stack - location. */ - fp_stack_loc = cfa + fp_offset; - frame_ptr = read_stack_value (fp_stack_loc); + if (fde_type == SFRAME_FDE_TYPE_FLEX) + { + _Unwind_Reason_Code ra_reg_err, fp_reg_err; + int fp_idx = SFRAME_FRE_FP_OFFSET_IDX * 2; + uint32_t ra_reg_data + = __sframe_fre_get_udata (frep, SFRAME_FRE_RA_OFFSET_IDX * 2, + &ra_reg_err); + if (ra_reg_err == _URC_NO_REASON + && ra_reg_data == SFRAME_FRE_RA_OFFSET_INVALID) + fp_idx -= 1; + uint32_t fp_reg_data = __sframe_fre_get_udata (frep, fp_idx, + &fp_reg_err); + if (fp_reg_err == _URC_NO_REASON) + { + if (sframe_apply_flex_rule (frame, cfa, fp_reg_data, fp_offset, + false, &frame_ptr) + != _URC_NO_REASON) + /* Force fallback to DWARF stacktracer. */ + return 0; + } + else + { + fp_stack_loc = cfa + fp_offset; + frame_ptr = read_stack_value (fp_stack_loc); + } + } + else + { + /* FP offset is available, get the value stored in the stack + location. */ + fp_stack_loc = cfa + fp_offset; + frame_ptr = read_stack_value (fp_stack_loc); + } } /* Set up for the next frame. */ diff --git a/sysdeps/generic/sframe.h b/sysdeps/generic/sframe.h index 2bb720bb43..240a452a20 100644 --- a/sysdeps/generic/sframe.h +++ b/sysdeps/generic/sframe.h @@ -323,6 +323,22 @@ typedef struct sframe_func_desc_attr_v3 ((info2) & SFRAME_V3_FDE_TYPE_MASK) #define SFRAME_V3_FDE_FRE_TYPE(info) (SFRAME_V2_FUNC_FRE_TYPE (info)) #define SFRAME_V3_FDE_PC_TYPE(info) (SFRAME_V2_FUNC_PC_TYPE (info)) +#define SFRAME_V3_FDE_SIGNAL_P(info) (((info) >> 7) & 0x1) + +/* Set the FDE type in the info2 byte, preserving upper bits. */ +#define SFRAME_V3_SET_FDE_TYPE(info2, fde_type) \ + (((info2) & ~SFRAME_V3_FDE_TYPE_MASK) \ + | ((fde_type) & SFRAME_V3_FDE_TYPE_MASK)) + +#define SFRAME_V3_FDE_UPDATE_SIGNAL_P(signal_p, info) \ + ((((signal_p) & 0x1) << 7) | ((info) & 0x7f)) + +#define SFRAME_V3_FLEX_FDE_CTRLWORD_ENCODE(reg, deref_p, reg_p) \ + ((((reg) << 0x3) | (0 << 0x2) | (((deref_p) & 0x1) << 0x1) | ((reg_p) & 0x1))) + +#define SFRAME_V3_FLEX_FDE_CTRLWORD_REGNUM(data) ((data) >> 3) +#define SFRAME_V3_FLEX_FDE_CTRLWORD_DEREF_P(data) (((data) >> 1) & 0x1) +#define SFRAME_V3_FLEX_FDE_CTRLWORD_REG_P(data) ((data) & 0x1) /* Size of stack frame offsets in an SFrame Frame Row Entry. A single SFrame FRE has all offsets of the same size. Offset size may vary @@ -353,6 +369,9 @@ typedef struct sframe_func_desc_attr_v3 may or may not be tracked. */ #define SFRAME_FRE_FP_OFFSET_IDX 2 +/* Invalid RA offset. Used as padding in FLEX FREs when RA is not tracked. */ +#define SFRAME_FRE_RA_OFFSET_INVALID 0 + typedef struct sframe_fre_info { /* Information about diff --git a/sysdeps/unix/sysv/linux/aarch64/uw-sigframe.h b/sysdeps/unix/sysv/linux/aarch64/uw-sigframe.h index 7aa9e4bd60..51dfa7456f 100644 --- a/sysdeps/unix/sysv/linux/aarch64/uw-sigframe.h +++ b/sysdeps/unix/sysv/linux/aarch64/uw-sigframe.h @@ -32,6 +32,12 @@ #define SVC_0 0x010000d4 #endif +/* DWARF register number of the frame-pointer for SFrame CFA tracking. */ +#define SFRAME_FLEX_REG_FP 29 +/* DWARF register number of the stack-pointer for SFrame CFA and FP + tracking. */ +#define SFRAME_FLEX_REG_SP 31 + #define MD_DECODE_SIGNAL_FRAME aarch64_decode_signal_frame static _Unwind_Reason_Code diff --git a/sysdeps/unix/sysv/linux/x86_64/uw-sigframe.h b/sysdeps/unix/sysv/linux/x86_64/uw-sigframe.h index 7813667789..1eea78a224 100644 --- a/sysdeps/unix/sysv/linux/x86_64/uw-sigframe.h +++ b/sysdeps/unix/sysv/linux/x86_64/uw-sigframe.h @@ -27,6 +27,12 @@ /* SFrame is only supported by x86_64 targets. */ +/* DWARF register number of the frame-pointer for SFrame CFA tracking. */ +#define SFRAME_FLEX_REG_FP 6 +/* DWARF register number of the stack-pointer for SFrame CFA and FP + tracking. */ +#define SFRAME_FLEX_REG_SP 7 + #define MD_DECODE_SIGNAL_FRAME x86_64_decode_signal_frame #ifdef __LP64__