From patchwork Wed Feb 1 06:46:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 51184 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp119834wrn; Tue, 31 Jan 2023 22:52:50 -0800 (PST) X-Google-Smtp-Source: AK7set94Hg8PAiqwKwUhEBrNuCLuqjHy07idOD32Zh/6l9XV5bmZXVTW7o4+cISeI3b8YR8IFAkI X-Received: by 2002:a17:90b:3b4d:b0:22b:e71d:f258 with SMTP id ot13-20020a17090b3b4d00b0022be71df258mr964309pjb.37.1675234370271; Tue, 31 Jan 2023 22:52:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675234370; cv=none; d=google.com; s=arc-20160816; b=RKnKJpE7iGswYBHdj/PY+x2X8Qyj8lZ/m/VYMC9eoccoLD26hee1qigv2u4Rw0XUSB uNJ2sZxFkHpcEHLqiBKenws2JW4jgmu6MvxisryInGbqV+YVUsOImD6B8igjIJtP43lO 5K284MmQ7liwB3GATvhkdZQ2ZaUxWwJ0p9+MYSt8GBUF89HGPGmVboZ5tPFIh6PGrb45 1KAocJtCv5p/6k2lfxZKX9PdeTihv8YZjoZuVehEGSAxBPAGxBayrFKqaFcxfMhkIS75 BZ477KjLFa2kyg6ioxoabfshmIJL0vvukxqqvFZZXshwVbtSYYQoEVd++38YeBZg/niF EXqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ZG+zJ+hgn2a+/MkPdBXYmJq91oYaBHjzS6SvQ0NOYYo=; b=gpo2hym9qWwZjJTViiQM0dAtvBFEorhTUndZRzDf3z38rl37SInXHoJHLLEbgzxwPH 4QrFFn2ANWKtBP9DMWd6kpjdFHnnWbaJWPexI8r/L1wX9ttojwcTVzB6YUKfSJbnZhgY rPzYrlgF6UM41cWIiH6UY/IpUpxL8LKR595pzxVTPjietNCKGwkO68VZs1JVPNkcjFAf cmKKejdkCw8Oz5aoOJk8YceJXcjQ3gAK0A3Oh/l1Vw7ek3Dy88YzX7LIU3q45LEy6KLQ s6vlY7kWGB7lxuqvUU6zHGe6ddESwjmL7HCCttn6jeVy7+sky6VJqcJoLOwFA/vlyEgY C2lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="eCghh/6S"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j20-20020a637a54000000b004de876f94f8si3593985pgn.395.2023.01.31.22.52.37; Tue, 31 Jan 2023 22:52:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="eCghh/6S"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230508AbjBAGrE (ORCPT + 99 others); Wed, 1 Feb 2023 01:47:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229911AbjBAGrB (ORCPT ); Wed, 1 Feb 2023 01:47:01 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDBB534C2E; Tue, 31 Jan 2023 22:46:50 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6166461343; Wed, 1 Feb 2023 06:46:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1C69C433D2; Wed, 1 Feb 2023 06:46:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675234009; bh=gTXbxviqwiipAfrlkTcVTx4LMrjxFY0gn9AiSEXRjEE=; h=From:To:Cc:Subject:Date:From; b=eCghh/6SgHVgxYCyz3WcktFEU3qWMlkrXdIptT5sbgaK9kcLJ9bVRRnO9rAsD4FLD bDbjATRN4x1gxo4p++R2Rcb5DyE438+8mqZCkUeOMO7ZsBbvVrMNSIwOJoWmygTYLd +gHMiP6xmfG2lj8eY3JtTYSz/8kQJJda4euN/X1ws3mbRyM2hJmR+6CHMDOzxyAjtC iGx3yLa6bd84w6HMwkafXHz0rwszeSqMaNQ6Bqct+wgV8EYhLWKIrJSK9KGWp2V8ey gFjCsf6QAVbFMk+KPrNqVPgXSF25fE8xBi9tk4OaDDqlNC4APrSbZGHvAT9kLXTCfF xDuEwPzKN5mdQ== From: guoren@kernel.org To: guoren@kernel.org, palmer@rivosinc.com, conor.dooley@microchip.com, liaochang1@huawei.com, bjorn@kernel.org Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Guo Ren , Bjorn Topel Subject: [PATCH] riscv: kprobe: Fixup misaligned load text Date: Wed, 1 Feb 2023 01:46:08 -0500 Message-Id: <20230201064608.3486136-1-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756610555056511470?= X-GMAIL-MSGID: =?utf-8?q?1756610555056511470?= From: Guo Ren The current kprobe would cause a misaligned load for the probe point. This patch fixup it with two half-word loads instead. Fixes: c22b0bcb1dd0 ("riscv: Add kprobes supported") Signed-off-by: Guo Ren Signed-off-by: Guo Ren Link: https://lore.kernel.org/linux-riscv/878rhig9zj.fsf@all.your.base.are.belong.to.us/ Reported-by: Bjorn Topel --- arch/riscv/kernel/probes/kprobes.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/riscv/kernel/probes/kprobes.c b/arch/riscv/kernel/probes/kprobes.c index 41c7481afde3..c1160629cef4 100644 --- a/arch/riscv/kernel/probes/kprobes.c +++ b/arch/riscv/kernel/probes/kprobes.c @@ -74,7 +74,9 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) return -EILSEQ; /* copy instruction */ - p->opcode = *p->addr; + p->opcode = (kprobe_opcode_t)(*(u16 *)probe_addr); + if (GET_INSN_LENGTH(p->opcode) == 4) + p->opcode |= (kprobe_opcode_t)(*(u16 *)(probe_addr + 2)) << 16; /* decode instruction */ switch (riscv_probe_decode_insn(p->addr, &p->ainsn.api)) {