From patchwork Thu Dec 8 09:12:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 31246 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp89078wrr; Thu, 8 Dec 2022 01:15:29 -0800 (PST) X-Google-Smtp-Source: AA0mqf6tfizTWfFeSo81OXMSuCYpTcBSNVLtCpZkukLibTEA0D9sUPCzxnrLshD/LUPWDxJo7b/m X-Received: by 2002:a17:902:dacd:b0:189:6889:c30a with SMTP id q13-20020a170902dacd00b001896889c30amr61221144plx.6.1670490929447; Thu, 08 Dec 2022 01:15:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670490929; cv=none; d=google.com; s=arc-20160816; b=oNW1pVuy+WT2/C6TnPGs6CS2XAHUpbXDCTnyleBuXFVkhwQSbpIKUX2SjBewrgpYSC /zzEx7KOCmkXKouJkSfk1vbZjt5Iv4GPOQ2R5i7NOSc8eAr/OlNj0Tk6UMwpl9y/BQlf 5CNAO1q6j6mHt8mtzgLEo6WyGVPBEVjO27ipP+/9O1DUJJNgyI6Ao2fNdo6YNmJ7HbEB eYhbadgC4qQ3mlhM2lWOFgcQojPKL3yE9oQAt23lH6C2YewSg/DgjIQ0Qb+WBso6snD+ aqhxic/z55Ba6pWM8C7Ny/D1pLa9O323Yz7VV4x8WioOzSPtFZi2d7kcmrQGCqMVCjWf JGOA== 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=bTn6iPIDcY2LEhtM/zl8ZGzeHiW8JICeROFg+tKNG28=; b=NCWJBXewVKviaKV9s5XA4/4aefoelvoimdbmncM9FhmKNPnrSPkMVlTRX1QGcLvQaM dq6LL3ZZmZka7UZ5KHSciC0P1EqtTtrC5yxXh2d66pMzU/OFGHx7ilADvycnrynWlhoe efbSAbv+NuwOp2Jos/jDvLN5HL/N/sMc79UT8UeCo8mHD7ngLkVgsm/2W76x/6DYr2Pl Wbb3vHGZC+q+GBRShyaRXqG/cEMSQWByCy5PVSfBNKUtXirEVho6VznpmdPVNXnQbsYy hJwTK+Al83UiillVmzdDGUz4eX/vFQWQCUNnGF3CtarHYvRrQKy1jwryImXMRbelvqzu w+Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="d/UXaRQr"; 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 hi7-20020a17090b30c700b002196afcdfc8si3667316pjb.96.2022.12.08.01.15.16; Thu, 08 Dec 2022 01:15:29 -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="d/UXaRQr"; 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 S230108AbiLHJPF (ORCPT + 99 others); Thu, 8 Dec 2022 04:15:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230036AbiLHJOJ (ORCPT ); Thu, 8 Dec 2022 04:14:09 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21F9E73F58 for ; Thu, 8 Dec 2022 01:13:08 -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 84EC1B822E0 for ; Thu, 8 Dec 2022 09:13:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 010F6C433D6; Thu, 8 Dec 2022 09:13:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670490786; bh=K44IU5zSr+xRSYeCBFFHSvlbL/P6QS9pgaMT4XAkl6o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d/UXaRQrA35brDQUIPN4/w00QBDpafph2xKZwq8z0HqGZ4PW7e5T0MHGFPIHZ1Q9S cLnV7GzPgB6gQYPh2gA8Z7f44uiJD4ZLbfIzl1bG1CSmgAJ0Sen2gMb6QyVzuM45Qh 0cuOomAjJQRsMXS1hJ/ljDrItRZmaU4nv7E3w63Jfuu1DmdYNIxFYEx4WSj8bEGgYv ih6DLGzKbzcn/+2AH6hTGyXe2hHNhEzCBzC1DvqBeMZlRdFkf0JTfurz/8AwiOKya8 cts3o+LuJDIxIbL9LPfSYXXA4uX9+6hrJMBT/qr0JJiHkZXRBdDLM7MSDmfc0XIuOY RT4Q3QbPLdfDA== 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 Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Guo Ren , Guo Ren Subject: [PATCH -next V5 2/7] riscv: ftrace: Remove wasted nops for !RISCV_ISA_C Date: Thu, 8 Dec 2022 04:12:39 -0500 Message-Id: <20221208091244.203407-3-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221208091244.203407-1-guoren@kernel.org> References: <20221208091244.203407-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?1751636697013599615?= X-GMAIL-MSGID: =?utf-8?q?1751636697013599615?= 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 1c8ec656e916..36cc609c5d03 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)