From patchwork Mon Jan 29 21:28:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jose E. Marchesi" X-Patchwork-Id: 84882 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C25673857703 for ; Mon, 29 Jan 2024 21:29:17 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id D03863858D20 for ; Mon, 29 Jan 2024 21:28:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D03863858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none 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 D03863858D20 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=1706563733; cv=pass; b=w5avzFgwKl8k8n4tSm2PU5mMq37wqFP5JKPSfiq1HzAgR5I985qw9juPDGW2k6GQ/dzaq0yBhIeFDoRmneiNLlBlWhAWN5Y9z+EKXCW7AuoKyV9j+Y9l/mJkRqA5lA+XXgyD9E5K6lLtVbLkcZvUMVjolYzvisID/v512EnUlC4= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1706563733; c=relaxed/simple; bh=w4SYTgPPfXSkdfB4ykeKLKVNl2xjIGucnVub1xrvQKE=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-Id: MIME-Version; b=IR1vAYf6hScND137dNFKq9T3NchY5kn/g9pkl671UgI0nmuZ/5sISRC+f/UpicSWUqK9XZXXgTAUGUi2JuwvR6Rqhvt6h27UhjFOz6aj0DNFo7mxxbOwSkVoE/yy1cPVEkkFUi3dIzBYz70bSIRqZTMuKJjO9DDdmLl5PdcKX50= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40TJi32g003544 for ; Mon, 29 Jan 2024 21:28:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=sE8Lqw2DsLmva+u4hxvKZwA0ZEMFThhxUzoVhmBLRNc=; b=Pbt5FW7RKvZbjLzFro25VydG4rirDxVY85OeJshIBInJnHz5FYSE1XueYGJT0RoKFPoV qGdw8MErz7hqz5UZfNvtRmweQGO/ai/otBEEl48PIjFDI1p1VN2nFHZ/k+FD3vPCMVpt XdMmGrqHFlR0LxMfkn6B2klmYXmxifQMYXjFFclciOHCP2epOJzen0shaTFSJpYpi48Q h1mNzDU3wHh0pE3kdrwF1hBjXWVHfRhVk9qt6JRnAMwf8uHWtFCI1wHiEtRez98DsR0a I6TjUukrdIT5qXEhvJFMVx503h3UHivwEd6AEJESNHC0eU2tkfAlQEVPD+QC96KrxOnd 0w== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3vvrm3w2n4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 29 Jan 2024 21:28:51 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 40TJwcBM035358 for ; Mon, 29 Jan 2024 21:28:46 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam04lp2041.outbound.protection.outlook.com [104.47.73.41]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3vvr9c8e25-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 29 Jan 2024 21:28:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=odJa8XL+qBm+9jAtfMTbThgqNK+JPeaNFptxSt3y3+QiB8YkRV8BRBJ9fFnA2sJFbbJr9PcW9lcUUBUmxhfe/kx7EXDvcymdUpWMbDPJ51MCuXqLAgdkyS7MamRMLAW6zA0dpcDt2j4YaInfnIg09FOetGJY75CbQfQt+fyM95GWaNcA0R5P+dKSzPOQ6S6UJf5KKzU6ASSWEp01JVLaxTp6WQUjeoATtKHvW2r3o7ZsOTXP2WxrAD7wQCLrS3I3Ucx0VR275IAZK0L19yoyLnRY2GeFBuLmK0pwb/b8kTCGhmPQtszBEiFnpRsritq5Vw23JtMYeySVjZjFq9MFxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=sE8Lqw2DsLmva+u4hxvKZwA0ZEMFThhxUzoVhmBLRNc=; b=KUsWBr5CN98iYISiQzQQrSL8lkFyuh8zYtD0LRltBruyvu4tvx+GXqbltkgGXr+Lgw/GJGhu3Vyr8CI38bhna6i5UGSNNh07AWNsfmvzuUfMr3pDQAalwPa8j8Q41VdXVVBAq25Hh23ufZPsI5/dOpDvpoDh5bT8GGxHqhbGGW2Ynw7QfEvCuBnSTv35OyaEnozig2zvVM1BleJmMzug18uktlZuwH63GvSlhG7DxZXVa/7bCYmmI7wFid7lGIlfGeZTpMQzXEd685gPvU/jkW8h4QTFM8adkjfRH80uzP9JFWM61s0gfnMLTfWwxLJptHcRD5Gyap8AEZrjXT847w== 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=sE8Lqw2DsLmva+u4hxvKZwA0ZEMFThhxUzoVhmBLRNc=; b=Yen1CuS6tD/c8oj0sX4rP0/r/gXiM0u6Tq9GoXvVOaA4qDR8Iw4G8ChSFgb2KCW7JkWyFI4CpjwwPmlmWAxpvL12v9Oji3/jKIjwzCgHKBhfvJ0rUBgkQQUnasGu+5z9dWIydJYew7twsHQKgnRtNVSz0X2Mb2X+NUpovLg6GMA= Received: from DM6PR10MB3113.namprd10.prod.outlook.com (2603:10b6:5:1a7::12) by IA1PR10MB7261.namprd10.prod.outlook.com (2603:10b6:208:3f6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.32; Mon, 29 Jan 2024 21:28:43 +0000 Received: from DM6PR10MB3113.namprd10.prod.outlook.com ([fe80::cafd:c8d6:e2c3:3a1]) by DM6PR10MB3113.namprd10.prod.outlook.com ([fe80::cafd:c8d6:e2c3:3a1%4]) with mapi id 15.20.7228.029; Mon, 29 Jan 2024 21:28:43 +0000 From: "Jose E. Marchesi" To: gdb-patches@sourceware.org Cc: "Jose E . Marchesi" Subject: [COMMITTED] sim: bpf: remove support for ldinddw and ldabsdw instructions Date: Mon, 29 Jan 2024 22:28:35 +0100 Message-Id: <20240129212835.12294-1-jose.marchesi@oracle.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: AM8P191CA0009.EURP191.PROD.OUTLOOK.COM (2603:10a6:20b:21a::14) To DM6PR10MB3113.namprd10.prod.outlook.com (2603:10b6:5:1a7::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB3113:EE_|IA1PR10MB7261:EE_ X-MS-Office365-Filtering-Correlation-Id: ce87cb0b-f9d1-4e27-ca31-08dc211144dd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RHaGK8r0Jw2u7A/Z92G1T1T8rVW62s8wsNIktVBCB5NAxmRyDS2FZjO2dECk1JCFBvYeP0NqKQDocOfX15clTco+mekgO4OGGrWECUBV777S2PcMoX184XgbtzSdhK2mCaUoCfI+NpJ49PE+fhChajQHjp7sxxQ34VQMECdtPQBcJxtGdHU7hRF6ywHw78Y7quWAZ6g0+ktvNJWLMSri72QuIOLYLoY6nXNN46tOoPwidu05koSP9WcD5aerURGJgc1RsdFZ6tUlML8UArdHjcMClgosrqlPltrZ4K8eqgYxPQFsslUyROqgfKRC3bShgQUjFjh83m3L6UVw6v2CmcfX/Zu1bOPBCBqXe12uXz4ol5N9+tZ9FEs1OdZVUXaZ91crjhOR9+P6VXx9NDwxbdnWnis+ZTXedWDs+LeTDBb373mVWKt8IVXr44rXh4DQHB1n7urvmfabDnssky/xas7gupXKGSQ9o0+1k5zjYhIGgjqyceh9GMXgosOJdS8UZrpz5dtHlqJ5JMJxhjm3jlXkQC7054PMdkZhS9fh5cRqAsGSD001Y3UjieC6Ud5T X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR10MB3113.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376002)(366004)(136003)(396003)(39860400002)(346002)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(41300700001)(107886003)(1076003)(26005)(2616005)(36756003)(6486002)(6916009)(316002)(478600001)(6506007)(38100700002)(6512007)(6666004)(83380400001)(66556008)(5660300002)(66946007)(66476007)(86362001)(2906002)(8676002)(4326008)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9LYXeHt/NXiCqrCNmGxSe2PFQBTyTnyx3M0TdjU9N2xn51WHEqht0ZvCKj8RY3mInTum3ITMeDiCqGsnC77uhYs5mc7FwMdXze7i65oxYrG9vqgqMASQd8bM+rkiT29wgZOnPDqvPDsLF1T6hYYkjqlBbHI0Jk4ROQ+KiWjLdaSY2f+xcl1rZt1Lo9+iLK0xyJQ8jbIKYX1YMbWWdKepnwjkfoksLj8y9uUnlvzQEvdi3N70d2/d/IRAQ/hko5ymyOsDuOqZSKeRCxdiqbi2J2+MR+QoujXQnsWXsCcmAiITInZcR10AItPpRRj9D93m3hFVpl6mEHBXjz5MDwqUHdGNVJYF3AYMACWUrEz6FIyZtJT0DRg8/EYnHYJ87eqkDJNQPgdJ2qq4n/axPkFE1U82zAulujJGQ/fAJAsdHXqp1suF5ds0Fx0kbGIRd3jrCSE0uWjSjmG4Wy+k5FNsXIedMRdFRbvry/N5Ago35XtwgJzffn526cOeT7QHM3Mj+5hmC9SW5hmIZuEQOfzfzLqi88pvXPMfoeXqjo9nYmF3eq4udSzbi/TsJYgoTk2+wLVwgJaQH8bE2ujFxnW1W/RMWzGnIgm1R/StUYx7f0oZ8kJ3rhK/bnwRv4bm3LBSHd/8kCfA3i169VNOrrXZKFIu2IxRsQp7jMzxGnDbc+rANL7l8iqGQ6LWXiFnC/eZC5bl5T0U21JoSGK6QaRbwtayV3OEVcAZXPtf/b0WTdM/Y84IcV+9hwf2oVjs8rxIgdNZzfZxNwXpOygY/6FYhE9FWjrpIHXMj1nxE3n3QkhZ0ZDc0Ft97vivoAsRk9An1+s4iKvqBMtzpN/15LrnEL2zF/UkIemX56djyImjtBP1O5TE1Q0XlZxhZ2biERoGDcRqhuFmOkgK0Rxr3B32Y7Y+Dh4nAcQWQ69TWlAR80a1c/iRxgfZoWGwgEh4u3SycyZhjqgH81btEfO+iOTzMN1V9wbk5LIjNJPbxxEarmEk9wNbQVIOWbahxF2+I0XcJOvEK6cXdYxPXDL4Nj4yZZRaNK1/EwcnykrKU1Xc8sNZEZF61GoM4zWFN9Y9XwtWADKl3XK9mWbZ2gCfGuK4kyc39CKLvsCIvRe78HpC7XqJM9QHqkOqKSqlTSe7xyfiYRd7JM8+7X84sDFYrqg00l+TRrxZ8zZ/u80ldgFVWLmJMHoJR48RbebxdKNojIG16eVkAu1noHDHVYGpEjy9skjyYuiinr13jMYMSYdO8y2eNTvLIP33/FfrTSjz8gk7G8wOgMfD0IaOy28DbyL3wjMoRFQM5RHCmPiyLNpTe2thQRKeCGOlx14EA00stnd6q+f73Xd3hwIcMT2BkX5nmCEGmysy+8PeKe+qNbYdvGquCLkcNiorV55NYztgm9pLxpygcYhFlP7mPFUmHzD0Z3l9o0j4iPxy+GOmjbsNjTAZ3uSpRvfgVvmHB6DDoo8Hnwg7VICz6/svOwB+3tIF0Bxs450alMZSp5Gzvebw37c0Z33GJ6jHVThTAZ+9g8Y/8ll8a7PqeGVleDopRYQJM3LNczfcaeVIqyqofRpl/5bIgqiMMWK2cv43qevKOpZAyMV74/XK8pThqGWuywBrNA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 5dseuOVypCj7lLmM/7K1NVUzNtw0dGLcdihbNlSv7Tcchs+FcVapJ+MkipTW1Sii/UFhZLof3tXIG34ZrHh5lAnEBmY4lJ8wysYUbLypq0pTnOV9l+SCEsgcvIf30PfbVdgzNiM4XOLFjeoiqB8B342/CwbW3JcjnqPb7x9ySbeJBw+FyjvIUaVEIKOOo+QB71jljnFXC7d0eI4UHyzx/41Vq0pRThX6PjrEIa6Cz/EfcNYUKhqC8OJUqnMJSxzC5BF7RQNvJ7SctUToUwRcDx7vcLwe9xTc5OZXW04oAHSsdI86taBIp7m1u1qRHrRpTL0JXO6KI0hbkAx0KJPoaoB+nP0fNAiZGPcNgFOq7IFqzSWZ2Gu5JQ12Jkz+tkUVm4rN/6s4R3poaVTxEVmQWvRB93oChL6UyqH5sgJ9pIk1EXSS4mCBFejo3sXWEeGfqYwMqFYqkVK6wLefVF7nkddCPMwsocyeaEGDJiT0ZTCFDu3XXu6GAnejZ1RcVp8gS7dFkmuRIE/leiKNQoPZqup2K5q+sBiQ9oPnflAcY9tro6MMXwiuRCNXl0tN+FqWQ3ww/aclg00XDPcL+nOGtggiM9nFcGM7QN1hz84VoZs= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce87cb0b-f9d1-4e27-ca31-08dc211144dd X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB3113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2024 21:28:43.5410 (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: fc9dfWxHy7BBVqRcFMoOxeBAxb9piK6CCJ+2cwQ0dJrifMez7307Ky/60CCgep/CoJ/R8PyP9T9wFFenNP7rZ4kf8EJkKNH0UFjucb/08qM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB7261 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-29_14,2024-01-29_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 spamscore=0 phishscore=0 adultscore=0 mlxlogscore=844 suspectscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401290159 X-Proofpoint-GUID: NyqJjcnUZ9wLHhi1DHAI8G5EnwYcOMGv X-Proofpoint-ORIG-GUID: NyqJjcnUZ9wLHhi1DHAI8G5EnwYcOMGv X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org This patch removes support for the two instructions above from the GNU simulator, including the corresponding tests. These instructions do not really exist in BPF and are not recognized as such by the kernel verifier. This has now been pointed out during the standardization of the BPF ISA. Signed-off-by: Jose E. Marchesi --- sim/bpf/bpf-sim.c | 13 ------------- sim/testsuite/bpf/ldabs.s | 15 --------------- 2 files changed, 28 deletions(-) diff --git a/sim/bpf/bpf-sim.c b/sim/bpf/bpf-sim.c index dbffa89bf88..c1f103823fb 100644 --- a/sim/bpf/bpf-sim.c +++ b/sim/bpf/bpf-sim.c @@ -943,13 +943,6 @@ execute (SIM_CPU *cpu, struct bpf_insn *insn) bpf_read_u64 (cpu, bpf_regs[BPF_R6] + skb_data_offset) + bpf_regs[insn->src] + insn->imm32); break; - case BPF_INSN_LDINDDW: - BPF_TRACE ("BPF_INSN_LDINDDW\n"); - bpf_regs[BPF_R0] = bpf_read_u64 (cpu, - bpf_read_u64 (cpu, bpf_regs[BPF_R6] + skb_data_offset) - + bpf_regs[insn->src] + insn->imm32); - break; - /* Absolute load instructions. */ case BPF_INSN_LDABSB: BPF_TRACE ("BPF_INSN_LDABSB\n"); bpf_regs[BPF_R0] = bpf_read_u8 (cpu, @@ -968,12 +961,6 @@ execute (SIM_CPU *cpu, struct bpf_insn *insn) bpf_read_u64 (cpu, bpf_regs[BPF_R6] + skb_data_offset) + insn->imm32); break; - case BPF_INSN_LDABSDW: - BPF_TRACE ("BPF_INSN_LDABSDW\n"); - bpf_regs[BPF_R0] = bpf_read_u64 (cpu, - bpf_read_u64 (cpu, bpf_regs[BPF_R6] + skb_data_offset) - + insn->imm32); - break; /* Generic load instructions (to register.) */ case BPF_INSN_LDXB: BPF_TRACE ("BPF_INSN_LDXB\n"); diff --git a/sim/testsuite/bpf/ldabs.s b/sim/testsuite/bpf/ldabs.s index 16f89ced97c..fb0e36b2d31 100644 --- a/sim/testsuite/bpf/ldabs.s +++ b/sim/testsuite/bpf/ldabs.s @@ -52,14 +52,6 @@ main: ldabsb 0x10 fail_ne32 %r0, 0x5a - /* Repeat for a double-word (8-byte) - (note: fail_ne macro uses r0, so copy to another r1 to compare) */ - lddw %r2, 0x1234deadbeef5678 - stxdw [%r6+0x1018], %r2 - ldabsdw 0x18 - mov %r1, %r0 - fail_ne %r1, 0x1234deadbeef5678 - /* Now, we do the same for the indirect loads */ mov %r7, 0x100 stw [%r6+0x1100], 0x0eedbeef @@ -77,11 +69,4 @@ main: ldindb %r7, 0x8 fail_ne32 %r0, 0x5f - /* double-word */ - lddw %r2, 0xcafe12345678d00d - stxdw [%r6+0x1110], %r2 - ldinddw %r7, 0x10 - mov %r1, %r0 - fail_ne %r1, 0xcafe12345678d00d - pass