From patchwork Sat Jan 7 13:35:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 40399 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1302830wrt; Sat, 7 Jan 2023 05:37:17 -0800 (PST) X-Google-Smtp-Source: AMrXdXv3XbFbrIoHOe51Uc0Ii0mbEBqFeSj/M246A6vICv+oxkRuCVC+Q458Mt70S+LZqkmToWS3 X-Received: by 2002:a17:906:33d0:b0:7e0:e1a2:dd98 with SMTP id w16-20020a17090633d000b007e0e1a2dd98mr51787112eja.67.1673098637095; Sat, 07 Jan 2023 05:37:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673098637; cv=none; d=google.com; s=arc-20160816; b=ZPmBb91pHj4at54RcpR8R/4WAFG/dJdh6RdOp5khP/LDOFUxhUN1dvTvXo5slghXHv 6/rSVwST+W9miU4q8Rg9HaTrD2i/zI7cPROhTZGBudXU8vNh4nZ1ObCrtJ9xWLsN13NA eezz9g9xGV2DbhXXEbAyWCyqnI2BrXJAE2fiXh8WhcXUeCBCto7n5/PHYHP9zkatpFua YBmh1/8415rOKqtg1auiDvg9Of8zkb9BIyZ4aPYTcwELwqkKuUYi2JjTcGYP3lygHdWc 3XXVhUpMo+JPL6NraTD901mBx+619rW6Ml+Hz2jAPnkjGNs+XYlMtLOzDUYam6Bglpax FhOw== 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=E4nqRKGnyZtlAHDZIcADYms4ruzD7FFHdhQlC8Yc62NZO9yplkIEP/IEn5WUB8P8lz dyW4f/a9Ius+aCPN+enx9BHmWMKivcAN4nd8MhPmymVAWTIk3v0jBEIdcd32J/JiWg9t nnii2AtaYMXTr1W6Mxha+NoBc/45V/9VBj82pR53eP0ojI/f8iNC32P+BMYVcfln2vTR GolfpOTCTe/yqVnRziXsv5ja/b39D0psJC2ERHtsO73n14b3z0ld3WbH847JLJceLI+/ 5cV8VtY8BGxlJWqFQ5lpr0h1fsRboSL1htH88lnKdxmN/OMuA8gVSrWZ5dKrJRWH7M2h dqsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=vCeDk01U; 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 ww2-20020a170907084200b0084cbde35b49si4479933ejb.990.2023.01.07.05.36.53; Sat, 07 Jan 2023 05:37:17 -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=vCeDk01U; 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 S232566AbjAGNgW (ORCPT + 99 others); Sat, 7 Jan 2023 08:36:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232161AbjAGNgQ (ORCPT ); Sat, 7 Jan 2023 08:36:16 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3654210553 for ; Sat, 7 Jan 2023 05:36:15 -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 C48A8606DC for ; Sat, 7 Jan 2023 13:36:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 042FFC433D2; Sat, 7 Jan 2023 13:36:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673098574; bh=903dKK56VBWA9nReoduRM1k/JbBxJj/M+VNo1IXCs18=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vCeDk01U0FqRBqslPDJ1SQ6NQa4uGYOkTag44ubpYQCa1M5/91Y/7NwZGvgyKVmj+ fvTB/My9tcVvxKSEu/dlGOvlCSOMNYUpBBS8DVYjAcivpNsD3yXojAk807lM6GoRHE jiWNrcnHhnJFNqL/M8OzR3+VBISLdCFm8/jRtyrtz1IUWsNR+o4x8ieNrxDrvunG8V eYD1HfDROaDLXAA1gzaSmhucnFakUlee8EZaddD+yOJGmlxSmEjXgw5uIrKnXwmx75 FQiUweN27gB52CgLLCOV3ntR339GXBkM37DVlSI/bElfSdCdo2g3D4C+hpbbx00Z1S cKK8y6W5Id/Vw== 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 V6 2/7] riscv: ftrace: Remove wasted nops for !RISCV_ISA_C Date: Sat, 7 Jan 2023 08:35:44 -0500 Message-Id: <20230107133549.4192639-3-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230107133549.4192639-1-guoren@kernel.org> References: <20230107133549.4192639-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?1754371076193216899?= X-GMAIL-MSGID: =?utf-8?q?1754371076193216899?= 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)