From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5C56379C56 for ; Wed, 8 Jul 2026 03:36:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783481791; cv=none; b=jzmIV16ZAPUZCFicnANqPG2kyBL9TA8hYWmQKuquhByHmugXVrfYJlk41tqGmfMP3Kxg7v3LgXkMVWXjzzyTDvqcNSiw1ZsyWWgnPzKH2objjl6ph8yhCw3pR3OPNACpwOL+NY1VJO6BFVPEjLzAxzwnmj1LGPNYZTkkMHpIOv4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783481791; c=relaxed/simple; bh=1tICEVIvaC4ZLr/Ax7sSaci3FTAyWazsJABtM7N8+oQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dTfIVFZXhFC7m5IP0otyVTgf7atSUS382sN+1aNqstn6+VpB1EA/MDJzPbnGQrYOgwhqrgnpHFXpIqoA/laXhF0c1buBA9qMEVxGhfKVSDSjTlWVS60yx3uFOBywCejNy1P68WfougTUNGMCIygytYAlx9qc25KbRg+WNQl4DnY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FQdEABsf; arc=none smtp.client-ip=209.85.216.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FQdEABsf" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-382ef647e20so244652a91.1 for ; Tue, 07 Jul 2026 20:36:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783481789; x=1784086589; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=+Vl1jMHF6Mz50lVaHNGk62U0kiVIW8sN4jisG45xdAs=; b=FQdEABsfK1wFFcf+1jwBPa6x7DkVDzKux6mLoL5krPkBPomwVVTk55i0hLMIe9KyPq pHCfs5QffhTKBYYmrpXt/vpV6iz3kImqoWwXZZeatvt5Yr5EQVD0OLKtR7w9WHyEjbO1 OMlXWb0c/U6+aZWRdjtqyPEbmrQGZZyQjroC8qjy/Ty8ZnlDPq0INQgng4UMW1OW1B5M zikHc6THyeWCTNS6eaZcerI9r9vsQMvzISirVkdu0VNA1vkJ6n0f1fL0qZwPju2djtsA cDr3cudmATK3yGkGevOrhdmWW/xv5brlSE6N3yccWgNGLz9Ee3tvV75KT3Rr3bKYzB/8 Si/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783481789; x=1784086589; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=+Vl1jMHF6Mz50lVaHNGk62U0kiVIW8sN4jisG45xdAs=; b=gGaWOPWpp8I2PMks4K8oYwmJRz/Mv8mOeA9IYD7qb72fx7hhODMcyFuEyJ+5azCTT8 X6+HMjhRkF1yUE70i5vObHVlTIEFHpo/lfI22XZACtKsDT/ihD3DUF6IsywKMa98h0E5 UAZyzDigXEKV3IY7TFSPkKMW9O6+9qOWsb7evOyDYprxwAu18015y8RS3K7uc0GtW/Gq 5CNdODZe8Ts+jveapzIaEE63gNQXH8MHMlwoY0d0Fq0tw6IufFGu7ZPcE6ZqZmKNXKmm SFZZJz5f+HT93quClcyBsI6gNgXZypW79V2eoAsL+ngWG8NIac/5cXb8m0YIl/aW5516 8Rug== X-Forwarded-Encrypted: i=1; AHgh+RqUzEOVds51kFCcQdLn4pGjhyoV9ToK743HpTrmkjbgRtH6gNruWVoxX4kjbGbryBlOCIY3JH/UXGxjeCI=@vger.kernel.org X-Gm-Message-State: AOJu0YwsnNOlh3C8w1yE2uMjw+Ji7DXz2M6zWYe2TxinHmpGa/MW3Cku W+FO1LLOtk7cm1qHkHey4/qI5ZQzVfHtgZR+Y22Owv9mL/5v/3oVTShs X-Gm-Gg: AfdE7cnEm8aUysBJfimA/YEzWrKHgEvqjNtkHUQybSUHzkYf1e5HIbQxNu6urpwcfML JB/lhALO1U/HBAOx3wDxeaqZVcWmG8dg4WAdgjPqTH2OBeUOBuWJ/ne27fNZC2+ePgMhmESQdF1 pGgbhJejnlV/4oVsxvRjxQ1Hb4EOAYwgtbin/ewHA037Vnl/CybWuVJzdPk2PuO/X0Dszor6XQs rghUsD1oRezJmDqm/EHEhQG9YFJdBHj+1XZcnvz5IE+o+uLUUVmWw0Lmk57gjurOnsvr4UiF9Tf PEJtL+f2EiFgMgjuJQlu2PLDJXUOWUK4kzm4U8dhUdI361xJwyFVyIBZueZ9PA51opwwiBULHCG TTk7NYncv79BNfshSF2/HLCGQ+KsUt3JZCmRcFPxx/5+8LRuBSOixvjDB63XFZe8E4ZAR9XMjJ4 LZpsv02/gS0AHvclXRWZ6MjxWxoXb9QUN9bay3B3mLx/MqmtvsWg== X-Received: by 2002:a17:90b:4b81:b0:387:e0db:3d8c with SMTP id 98e67ed59e1d1-38943954dc4mr623537a91.39.1783481789129; Tue, 07 Jul 2026 20:36:29 -0700 (PDT) Received: from [10.0.0.65] ([2601:647:6700:64d0::94ac]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-31174accae5sm21092850eec.29.2026.07.07.20.36.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2026 20:36:28 -0700 (PDT) From: Charlie Jenkins Date: Tue, 07 Jul 2026 20:34:29 -0700 Subject: [PATCH v3 06/17] riscv: cfi: Use generated instruction headers Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260707-riscv_insn_table-v3-6-3f8e5f75ba97@gmail.com> References: <20260707-riscv_insn_table-v3-0-3f8e5f75ba97@gmail.com> In-Reply-To: <20260707-riscv_insn_table-v3-0-3f8e5f75ba97@gmail.com> To: Paul Walmsley , Palmer Dabbelt , Nam Cao , Alexandre Ghiti , Anup Patel , Atish Patra , Conor Dooley , Paolo Bonzini , Andrew Morton , Shuah Khan , =?utf-8?q?Radim_Kr=C4=8Dm=C3=A1=C5=99?= , Jesse Taube Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-kselftest@vger.kernel.org, Charlie Jenkins X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1783481777; l=1198; i=thecharlesjenkins@gmail.com; s=20260605; h=from:subject:message-id; bh=1tICEVIvaC4ZLr/Ax7sSaci3FTAyWazsJABtM7N8+oQ=; b=Po1xRMgYDA5PIVVjKPxjGPmEu+M69/hx3ymY++n6Om1HumSakJPKNAgz3tx1U5lGTyl+yk573 kGum7EZxUnEABIJkspZZYr9uErQy5kunYsr5p3GGMpMq3eU7v6ZVH+f X-Developer-Key: i=thecharlesjenkins@gmail.com; a=ed25519; pk=ajnnRQ98PIdwKp4HeMkq9U32okYbnh6Zb4G3o5XXvkg= Migrate the code that is decoding cfi instructions to use the generated instruction headers. Signed-off-by: Charlie Jenkins --- This function generates the same assembly as before. --- arch/riscv/kernel/cfi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/riscv/kernel/cfi.c b/arch/riscv/kernel/cfi.c index 6ec9dbd7292e..e38d5f863747 100644 --- a/arch/riscv/kernel/cfi.c +++ b/arch/riscv/kernel/cfi.c @@ -40,16 +40,16 @@ static bool decode_cfi_insn(struct pt_regs *regs, unsigned long *target, if (!riscv_insn_is_beq(insn)) return false; - *type = (u32)regs_ptr[RV_EXTRACT_RS1_REG(insn)]; + *type = (u32)regs_ptr[riscv_insn_beq_extract_xs1(insn)]; if (get_kernel_nofault(insn, (void *)regs->epc) || get_kernel_nofault(insn, (void *)regs->epc + GET_INSN_LENGTH(insn))) return false; if (riscv_insn_is_jalr(insn)) - rs1_num = RV_EXTRACT_RS1_REG(insn); + rs1_num = riscv_insn_jalr_extract_xs1(insn); else if (riscv_insn_is_c_jalr(insn)) - rs1_num = RVC_EXTRACT_C2_RS1_REG(insn); + rs1_num = riscv_insn_c_jalr_extract_xs1(insn); else return false; -- 2.54.0