From patchwork Sat Feb 4 06:35:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 52739 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1229783wrn; Fri, 3 Feb 2023 22:44:46 -0800 (PST) X-Google-Smtp-Source: AK7set81Dogh7opyt2IW1c7Hu8CL+5TNNrfXsavK/TxRsa0QX6MH0WgqiQmfO8aVUePHeuFWPuDt X-Received: by 2002:a50:9ec7:0:b0:4aa:9f02:98f7 with SMTP id a65-20020a509ec7000000b004aa9f0298f7mr830755edf.0.1675493086611; Fri, 03 Feb 2023 22:44:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675493086; cv=none; d=google.com; s=arc-20160816; b=B45o4oaeXRBaLBeNtjjhlGuttBjmyzrfpa/DgrEMYtAlwmMmQL6uc6AOF5yfwDuqiz quLSfVtirr7LdwX/35feGZEydSDqk3rT+4GrvHM0G3IDRtTPP6cUpJM2s+PMjKcYO2Dy 53xEVg9pkaJtC9xRDg/N8LXL9U9IrFxZ9uYKfjuHaPIL5wXqPOts3NnEBgGmrkb1RcCY r3+5MBaosoDke4D2XvSCibg99ym2wAGNXb2q7OIhaIcNZxRIPvQEh+6VI1sR8izc2i2P lHPHT7orJry2KFB928HBpQJIm2lSxxWjB5PyP8S+JmmzFU61lqLuG/R9EU82KhOtoqhL EgZQ== 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=knj7AeAc9VB6GSfmn8M+L0BqZR+n79ByoarnrEdxvkQ=; b=Z2DnZFC0tZ889Qqtds6RvT7GP9mW6em8mGfdPSkabqTtJyr2j3WjZ52otHhoREBpkW 90Mh1oZ8bJpyjNvICJr1WcThV7QszJY6iNwhDnpX++g8dUQ/KatuTORHX2YI+usP+WSM wRZWLQ7VjvnFO5qxzZhoRO+UI5QtpDAaYFbOafX7Dr1+xRpF/VguwENwpYN9widl3Urj BlOsCiqq6ETs2GMXVrbeLWCqM9zd95iOLwUQ68A/rPa5CakwFKPuza1NKHaBY6D5ZMKb a00PHw5pGsM5T6OXdWh8CXTUkcjG9ABNDWUmK6O0BD1Ucluu3DhhPBxFKItT0obHmlkS ZdCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sd8EfC78; 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 q17-20020a056402519100b004a2443c95c2si6455011edd.148.2023.02.03.22.44.22; Fri, 03 Feb 2023 22:44:46 -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=sd8EfC78; 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 S232813AbjBDGfs (ORCPT + 99 others); Sat, 4 Feb 2023 01:35:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229436AbjBDGfr (ORCPT ); Sat, 4 Feb 2023 01:35:47 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BD0789344; Fri, 3 Feb 2023 22:35:46 -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 ams.source.kernel.org (Postfix) with ESMTPS id 03B7EB82B47; Sat, 4 Feb 2023 06:35:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 907ADC433D2; Sat, 4 Feb 2023 06:35:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675492543; bh=u/0MMX/IZLs1pjerWY5ETcVWivvex5xaBMMULMjK8+E=; h=From:To:Cc:Subject:Date:From; b=sd8EfC78IdaDn6c5domvcB8NDIJXxVniylK8Y11+3En5RRyoiSP4wKnCaJy8bZ/Ld OAgcbJUEiKq5a1Kz+zVXgyJf//qS/DSD4JJt6USNiteahyA5u63+UpvHkYdqo39oYH Xn0HYWK5+OBQ74TbrPTT/Q0TwWR+kJGR0IwjrRN8ObGChSW7v1oeytKhYc0wFYhEIg 18jisQbXphAFWSSQDQRxKx7NJM6HTwB9nuWx92j80hYcQcnP+tsz6PaxXG3BMeQvQ8 h5ActU4U/14qHc++M9NKCz8YRRCXfvGajvXdirvn0utSbiQfCHnbhwvf5RUMt9Y7ob OLekOkFY4YGkg== From: guoren@kernel.org To: guoren@kernel.org, palmer@rivosinc.com, conor.dooley@microchip.com, liaochang1@huawei.com, bjorn@kernel.org, jrtc27@jrtc27.com Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Guo Ren , Bjorn Topel Subject: [PATCH V2] riscv: kprobe: Fixup misaligned load text Date: Sat, 4 Feb 2023 01:35:31 -0500 Message-Id: <20230204063531.740220-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?1756881838679306920?= X-GMAIL-MSGID: =?utf-8?q?1756881838679306920?= 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 Cc: Jessica Clarke Reviewed-by: Björn Töpel --- Changelog V2: - Optimize coding convention (Thx Bjorn & Jessica) --- arch/riscv/kernel/probes/kprobes.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/riscv/kernel/probes/kprobes.c b/arch/riscv/kernel/probes/kprobes.c index c41bd8509032..d3b18e868f30 100644 --- a/arch/riscv/kernel/probes/kprobes.c +++ b/arch/riscv/kernel/probes/kprobes.c @@ -71,16 +71,18 @@ static bool __kprobes arch_check_kprobe(struct kprobe *p) int __kprobes arch_prepare_kprobe(struct kprobe *p) { - unsigned long probe_addr = (unsigned long)p->addr; + u16 *insn = (u16 *)p->addr; - if (probe_addr & 0x1) + if ((unsigned long)insn & 0x1) return -EILSEQ; if (!arch_check_kprobe(p)) return -EILSEQ; /* copy instruction */ - p->opcode = *p->addr; + p->opcode = (kprobe_opcode_t)(*insn++); + if (GET_INSN_LENGTH(p->opcode) == 4) + p->opcode |= (kprobe_opcode_t)(*insn) << 16; /* decode instruction */ switch (riscv_probe_decode_insn(p->addr, &p->ainsn.api)) {