From patchwork Thu Oct 3 18:33:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 1992454 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=sC2Bu/44; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XKL4k1r7Bz1xsn for ; Fri, 4 Oct 2024 04:37:10 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1swQeh-0007M6-CI; Thu, 03 Oct 2024 14:34:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1swQe9-0007AW-L9 for qemu-devel@nongnu.org; Thu, 03 Oct 2024 14:33:54 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1swQe7-0004rR-2k for qemu-devel@nongnu.org; Thu, 03 Oct 2024 14:33:53 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-20b7eb9e81eso14986995ad.2 for ; Thu, 03 Oct 2024 11:33:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1727980430; x=1728585230; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AAmFNgO6MN8uMyYd2N3W1c951PV1oQBhf1Qm4FKEhUY=; b=sC2Bu/44Z++ULGZHJe01ygZ7vxxVYncjNL8Ti5VtVI2bs95F0RMGQz4A1+bIwdio/n EcI/hSxiA+2rVtq+HLcNqd7CVq2VOBJUwKzG27IUW/iNpNa9QiF9aJfX1jdZTRDJmlrM SyMtQ6rGKmqNnm4US7xkEYMFvyDjDlHmpByqoemttjgz/KaLsg+5y/3jbQ1GeygCBFtQ 8ozZY/c2DfxC8C0h5FgPxLL5ZIJr6ctE5PQ2ReUECp1MqGr23YluXu1tPWs0JmygjpZg U2JuqnRXRxPlZNyki/M5MK2sZpSydhnDFBcjJzOCa1kMpsA25qb+3YZwmmD16VXVZtSk cqzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727980430; x=1728585230; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AAmFNgO6MN8uMyYd2N3W1c951PV1oQBhf1Qm4FKEhUY=; b=Z0O3ITHdhhKlye5Xkr1vKvtV66X/2o/9/rf6QMlxS1ClzWGYGBgOsCIHxtc02TnFMv drrNWwo37oPgeRtkliUIeieJCYErAGtt+ngnbAK5B1ZzuNqJGVdEowE1haaPn3xZ1fVf 0p43qUGXzX/SGrDMdY3ZqWe6wChTEPGqOBBrm9aHfl6ch7z4miWhgvDj7wgsiFLOil2x fPwBenhMEXumKq1pucw10oA/kpSLCjcqC7Ysp4QNh9CLIcy1t41jhKFTBUapbscJ0nrz p6Js1X2EfzhpDn7g98Qxv00y+AkKlVgRkciGVARaiUiJssFRF6gLzgPjt685eHWeuRe2 Jf8w== X-Forwarded-Encrypted: i=1; AJvYcCW/ap+OjZwVk8z7yjnCtECBjUm+WowBroDy0QI2AeOURiPfbhxDGE7SFQ3JW59Be6vrqhux188NBTOa@nongnu.org X-Gm-Message-State: AOJu0YycSdDRjBhHyWe7qeJUV02GSnLk99PsE+Qby/kWxe2DEloyf1k1 ruWBycrsktNvuYyKjMNbekQX4a4p6REQ5aRHOeYHfy6vIr+vCHT9IDveknaZFGU92P3aPYSbytM X X-Google-Smtp-Source: AGHT+IF0PdIVNBjxhfYqVDty8AvcJRheY3qIUlv+V73/WxVPDtVci13Y1h9sDnpsUmejPS5B4Ji2ww== X-Received: by 2002:a17:902:ce12:b0:207:4c7c:743b with SMTP id d9443c01a7336-20bfd99c820mr2026905ad.0.1727980429758; Thu, 03 Oct 2024 11:33:49 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20beefad16asm11796245ad.193.2024.10.03.11.33.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Oct 2024 11:33:49 -0700 (PDT) From: Deepak Gupta To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Cc: palmer@dabbelt.com, Alistair.Francis@wdc.com, bmeng.cn@gmail.com, liwei1518@gmail.com, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com, jim.shu@sifive.com, kito.cheng@sifive.com, Deepak Gupta , Andy Chiu , Alistair Francis Subject: [PATCH v15 02/21] target/riscv: Add zicfilp extension Date: Thu, 3 Oct 2024 11:33:23 -0700 Message-ID: <20241003183342.679249-3-debug@rivosinc.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20241003183342.679249-1-debug@rivosinc.com> References: <20241003183342.679249-1-debug@rivosinc.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=debug@rivosinc.com; helo=mail-pl1-x630.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org zicfilp [1] riscv cpu extension enables forward control flow integrity. If enabled, all indirect calls must land on a landing pad instruction. This patch sets up space for zicfilp extension in cpuconfig. zicfilp is dependend on zicsr. [1] - https://github.com/riscv/riscv-cfi Signed-off-by: Deepak Gupta Co-developed-by: Jim Shu Co-developed-by: Andy Chiu Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 1 + target/riscv/cpu_cfg.h | 1 + target/riscv/tcg/tcg-cpu.c | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 24ca0bfcaa..b7201a69df 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -106,6 +106,7 @@ const RISCVIsaExtData isa_edata_arr[] = { ISA_EXT_DATA_ENTRY(ziccif, PRIV_VERSION_1_11_0, has_priv_1_11), ISA_EXT_DATA_ENTRY(zicclsm, PRIV_VERSION_1_11_0, has_priv_1_11), ISA_EXT_DATA_ENTRY(ziccrse, PRIV_VERSION_1_11_0, has_priv_1_11), + ISA_EXT_DATA_ENTRY(zicfilp, PRIV_VERSION_1_12_0, ext_zicfilp), ISA_EXT_DATA_ENTRY(zicond, PRIV_VERSION_1_12_0, ext_zicond), ISA_EXT_DATA_ENTRY(zicntr, PRIV_VERSION_1_12_0, ext_zicntr), ISA_EXT_DATA_ENTRY(zicsr, PRIV_VERSION_1_10_0, ext_zicsr), diff --git a/target/riscv/cpu_cfg.h b/target/riscv/cpu_cfg.h index 355afedfd3..fe7ad85b66 100644 --- a/target/riscv/cpu_cfg.h +++ b/target/riscv/cpu_cfg.h @@ -67,6 +67,7 @@ struct RISCVCPUConfig { bool ext_zicbom; bool ext_zicbop; bool ext_zicboz; + bool ext_zicfilp; bool ext_zicond; bool ext_zihintntl; bool ext_zihintpause; diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index dea8ab7a43..963c1c604a 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -623,6 +623,11 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) cpu->pmu_avail_ctrs = 0; } + if (cpu->cfg.ext_zicfilp && !cpu->cfg.ext_zicsr) { + error_setg(errp, "zicfilp extension requires zicsr extension"); + return; + } + /* * Disable isa extensions based on priv spec after we * validated and set everything we need.