From patchwork Thu Jan 12 09:05:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 42317 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3779705wrt; Thu, 12 Jan 2023 01:15:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXvXRMeb8RFyseVvd2QryihCrobfTOsnwnfrHQY86oeSvSD0ax6nU1ttI8NL82TGymbilSVb X-Received: by 2002:a05:6402:220b:b0:475:32d2:74a5 with SMTP id cq11-20020a056402220b00b0047532d274a5mr57726017edb.42.1673514933475; Thu, 12 Jan 2023 01:15:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673514933; cv=none; d=google.com; s=arc-20160816; b=iQykQNHK7MYBoeWcSUW/fqCOKh9uM76m3v2f6tmuI3BX+Ebxh3ZJOFOHmEcAFuTkb5 9cNJIldLoC6FLUDiz1dVWHLQfNdr+8xEy5Bd11aCdw62nllMIsIfSFxQ0WB3JuDZtdCA NNMTNWgfqVVJPRFI3eA3bx/f3j/HZiSOEuXx6m6yyHrat+e1CC69Ac6J+QBMWNo1QeZd ZbpAhXcQ9BAMPOG8QdCqYQ9xYQX1fccydrZbPzmO2lMl82VEF3drl9eJnrnGlqOsPXvU C4iJvmPQ6sW2ykH1+Vbuo8+KHKCeh+UYZfNvC/Ssgvmcdf6iUgSNjICF8+5HYQ2eh1ot UBKg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=b3a0niYsk5jp1Jlc7YQyUVc62DlKsmjhwftTzTlFIKY=; b=HW3uy0AYISLy5SOoAJd5jXDS5U8H4UewVo66vaS/n2s4y2P2Qs6CAbr7eXfuBB8x5v fFEH6ik+nnq9MAu1QpCboT4Jkm98jQ//uCwnkvjgpu02sG9XOKnkCeBsrp4SPe6NVyYa j/vdx/5tCHC9d76sQSxG3ihtcSjbmBB6XhxQv4VEBjG3UfgpariSKLYbh88LvYY5Jvk0 YKRz5IdvgR2R4wo7YKkrNEUWqEpxoQVdrO9Onr1WcZpvfWDN1aJdDlE6Qtw+Lr2Nybau 93HLV5whCSluemG1VU/VyN/d7/6gJN+CB7bNwam98wJf3eGafDSFHexiey6g9VNHWCx9 tnDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dkzjIZCY; 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 x14-20020a50ba8e000000b004697e00bf31si17601583ede.90.2023.01.12.01.14.40; Thu, 12 Jan 2023 01:15:33 -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=dkzjIZCY; 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 S239631AbjALJMe (ORCPT + 99 others); Thu, 12 Jan 2023 04:12:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239939AbjALJKc (ORCPT ); Thu, 12 Jan 2023 04:10:32 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37105517DE for ; Thu, 12 Jan 2023 01:06:26 -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 C855961F9D for ; Thu, 12 Jan 2023 09:06:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C022C43396; Thu, 12 Jan 2023 09:06:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673514385; bh=903dKK56VBWA9nReoduRM1k/JbBxJj/M+VNo1IXCs18=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dkzjIZCYRCK6N2+ZVzl8WiNt48g3Hu2fgwRlh3Hbc4oMwg/noSl6WUDGeObO6ziYk k5ovFfyhTPYCSwMcUXEZqqY80xL49Jd//7LFlnPMoTCU/jdjE8jrbj5FUv/UDBz2qR I0SJiveKzzY/R0+MQB2iUzOyGEiCm32/UVLrOVqznPpcCkWM2WIGnEsjDqPBfIrnP5 cDq/bJeuuIFiiKR9InwSLXJW+w5HCfVlxg4ViTKbCXHbgaSB1hzKeEVP0i1riQ8Bap 4XibqqcbcZueSFAKpIS4MUrxJu3EgBE9uz5mo/M45fbq27LqtQZxQXElJLP34mzNou Ae/gY6/X2C3Sg== From: guoren@kernel.org To: anup@brainfault.org, paul.walmsley@sifive.com, palmer@dabbelt.com, conor.dooley@microchip.com, heiko@sntech.de, rostedt@goodmis.org, mhiramat@kernel.org, jolsa@redhat.com, bp@suse.de, jpoimboe@kernel.org, suagrfillet@gmail.com, andy.chiu@sifive.com, e.shatokhin@yadro.com, guoren@kernel.org Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Guo Ren Subject: [PATCH -next V7 2/7] riscv: ftrace: Remove wasted nops for !RISCV_ISA_C Date: Thu, 12 Jan 2023 04:05:58 -0500 Message-Id: <20230112090603.1295340-3-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230112090603.1295340-1-guoren@kernel.org> References: <20230112090603.1295340-1-guoren@kernel.org> 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?1754807594884464186?= X-GMAIL-MSGID: =?utf-8?q?1754807594884464186?= From: Guo Ren When CONFIG_RISCV_ISA_C=n, -fpatchable-function-entry=8 would generate more nops than we expect. Because it treat nop opcode as 0x00000013 instead of 0x0001. Dump of assembler code for function dw_pcie_free_msi: 0xffffffff806fce94 <+0>: sd ra,-8(sp) 0xffffffff806fce98 <+4>: auipc ra,0xff90f 0xffffffff806fce9c <+8>: jalr -684(ra) # 0xffffffff8000bbec 0xffffffff806fcea0 <+12>: ld ra,-8(sp) 0xffffffff806fcea4 <+16>: nop /* wasted */ 0xffffffff806fcea8 <+20>: nop /* wasted */ 0xffffffff806fceac <+24>: nop /* wasted */ 0xffffffff806fceb0 <+28>: nop /* wasted */ 0xffffffff806fceb4 <+0>: addi sp,sp,-48 0xffffffff806fceb8 <+4>: sd s0,32(sp) 0xffffffff806fcebc <+8>: sd s1,24(sp) 0xffffffff806fcec0 <+12>: sd s2,16(sp) 0xffffffff806fcec4 <+16>: sd s3,8(sp) 0xffffffff806fcec8 <+20>: sd ra,40(sp) 0xffffffff806fcecc <+24>: addi s0,sp,48 Signed-off-by: Guo Ren Signed-off-by: Guo Ren --- arch/riscv/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 12d91b0a73d8..ea5a91da6897 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -11,7 +11,11 @@ LDFLAGS_vmlinux := ifeq ($(CONFIG_DYNAMIC_FTRACE),y) LDFLAGS_vmlinux := --no-relax KBUILD_CPPFLAGS += -DCC_USING_PATCHABLE_FUNCTION_ENTRY +ifeq ($(CONFIG_RISCV_ISA_C),y) CC_FLAGS_FTRACE := -fpatchable-function-entry=8 +else + CC_FLAGS_FTRACE := -fpatchable-function-entry=4 +endif endif ifeq ($(CONFIG_CMODEL_MEDLOW),y)