From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 01E56C3DA4B for ; Wed, 17 Jul 2024 13:14:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=m/kGOaEFPxu35CB+S6L3gVGWD5oMUYAOtiZNjanKDmQ=; b=X79H2JSrhf/YLk /m3DvEOnqJvXy9bDCx8M5RpD7SFTT3l2Kv/6A9Y7m8hGc1EmA2i+cV0Irt1kooFowl38AXe0YXRbE qhgdV2DIDXG/u3teSt+pd4NWSoJQQGHiuLkHp79oHM17RIa8cdndpgMGtmo5akq5mDnrh8HxFKEhn l4FZ/3OXnNdluzEBIELIDQH3YMbfWYql2tt1s7WhHnAvbUI3j1YPmpqjvfqiW903dcLTWT7sCyRxU I0cLR0pPYidiwTvE5c0dExt5v2bYqOsXaWiBkPmCfBK5ivV1gvpolNbdD8SMivK5kaqeVWowuyQSA y8X50S1r6k8sHtZulLkw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sU4Tx-0000000DrAf-0h6B; Wed, 17 Jul 2024 13:14:09 +0000 Received: from mail-il1-x12b.google.com ([2607:f8b0:4864:20::12b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sU4Tu-0000000Dr9T-0i0b for kexec@lists.infradead.org; Wed, 17 Jul 2024 13:14:07 +0000 Received: by mail-il1-x12b.google.com with SMTP id e9e14a558f8ab-38373958e94so2469745ab.0 for ; Wed, 17 Jul 2024 06:14:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1721222044; x=1721826844; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=5uVCb0H5+qw23qlc6XhoPIVvBE69YNuKQHQJOvzKA2E=; b=F18JXOmrNmI0lFB4LJUI2ltYyyQcHlrlUtw+h7x6rxzMdkG0zKlV6IfHZxMuFWHg28 E3HJBrpaYVcL5OvmsdsTIo26yoqiVbiJB3KpcpVO8W6Ksx4bA0FM0j/zG3IfQhnwldPf e/JstgnrQTHo4HS7jl2F704pUZqdf9rH2d26zEZV7hOPXLJLU9tlq/dj6/9oG6ERFE4Z 0qEqPBe/zvK3mX3ZcJkRazQsibYAzQuoHPD4ewBxaAh7naNVnHuUvMDoXY4TiwW+1gzi 2XUPbx/TzghhlCqd1pZxfJY5zgYKvUGuXPlGcsuX0AY8NG/70HIT1qktV5vry7I58KGY FJnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721222044; x=1721826844; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=5uVCb0H5+qw23qlc6XhoPIVvBE69YNuKQHQJOvzKA2E=; b=gESJBXYRnx07C2MDUDbkUBxFt9gcqdMRYsu76knaFw0sT4A8guHQUGhCqr62oBDHl6 tKXqgtg0myWWH9H5YvGzhna36FfcU71/QIwCaRwabRmap1U2zhTn7MxKIUPJzmvYajR+ 91WPAt9Fq7I6rotBG/tR5mlsqBpCVTDYoQwzaKnf0+Z95phpZB022oCWVJj/0ug5vaS3 LofeAwp7/Xs11CyPmuClzVFDg7TM5aBe6hCS6ijLTdDPIZ/UGllufph0M/qF4AwWbxCJ XSwl4P7npQYb4nmRG4N+kBhwVQsRfzsKPqq6f72MVT45Mgo+5In0354gr3v8fuuXBzN+ MXJA== X-Forwarded-Encrypted: i=1; AJvYcCX6vMAA3xrdVj/ntB9ViuuAYi0Fz3IAxCMBragn3nN27ECMSRRQ+jrYzjZfVPt2H+jUaiVetzNAzTxvc/lrmmLwpc4RxIrKD3Be X-Gm-Message-State: AOJu0YxLh7+zSJR+cW8zd8a+292agR51A8KeDruuMX2LHw+zFdHc84XD 5/GEmWml7+GZWr8Yvlf0k54Yf6LnZm6K1RSQNAwZccMha5GFPoCbOcWU2BMW3omAHblV/0xIj+m wYUE= X-Google-Smtp-Source: AGHT+IFhw3MWoZSEt2rfShEC06vRpqsGgviNG/vejjaH60Y+5HYzE8TtnavkRKo4N4oXKY9d7Dnl1A== X-Received: by 2002:a05:6e02:1c0d:b0:376:3c3b:e235 with SMTP id e9e14a558f8ab-3950f2855e2mr16902955ab.13.1721222043808; Wed, 17 Jul 2024 06:14:03 -0700 (PDT) Received: from localhost ([140.82.166.162]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4c210f7c4c8sm651830173.130.2024.07.17.06.14.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jul 2024 06:14:03 -0700 (PDT) Date: Wed, 17 Jul 2024 08:14:02 -0500 From: Andrew Jones To: sunying@isrc.iscas.ac.cn Cc: ebiederm@xmission.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, kexec@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, zhuhengbo@iscas.ac.cn, Petr Tesarik Subject: Re: [PATCH v1] riscv/kexec_file: Fix relocation type R_RISCV_ADD16 and R_RISCV_SUB16 unknown Message-ID: <20240717-c761f5af7369cdeba5b9c759@orel> References: <20240711083236.2859632-1-sunying@isrc.iscas.ac.cn> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240711083236.2859632-1-sunying@isrc.iscas.ac.cn> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240717_061406_233595_0C952FD8 X-CRM114-Status: GOOD ( 14.77 ) X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org On Thu, Jul 11, 2024 at 08:32:36AM GMT, sunying@isrc.iscas.ac.cn wrote: > From: Ying Sun > > Runs on the kernel with CONFIG_RISCV_ALTERNATIVE enabled: > kexec -sl vmlinux > > Error: > kexec_image: Unknown rela relocation: 34 > kexec_image: Error loading purgatory ret=-8 > and > kexec_image: Unknown rela relocation: 38 > kexec_image: Error loading purgatory ret=-8 > > The purgatory code uses the 16-bit addition and subtraction relocation > type, but not handled, resulting in kexec_file_load failure. > So add handle to arch_kexec_apply_relocations_add(). > > Tested on RISC-V64 Qemu-virt, issue fixed. > > Co-developed-by: Petr Tesarik > Signed-off-by: Petr Tesarik > Signed-off-by: Ying Sun > --- > arch/riscv/kernel/elf_kexec.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/riscv/kernel/elf_kexec.c b/arch/riscv/kernel/elf_kexec.c > index 11c0d2e0becf..3c37661801f9 100644 > --- a/arch/riscv/kernel/elf_kexec.c > +++ b/arch/riscv/kernel/elf_kexec.c > @@ -451,6 +451,12 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi, > *(u32 *)loc = CLEAN_IMM(CJTYPE, *(u32 *)loc) | > ENCODE_CJTYPE_IMM(val - addr); > break; > + case R_RISCV_ADD16: > + *(u16 *)loc += val; > + break; > + case R_RISCV_SUB16: > + *(u16 *)loc -= val; > + break; > case R_RISCV_ADD32: > *(u32 *)loc += val; > break; > -- > 2.34.1 > Reviewed-by: Andrew Jones _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec