From patchwork Fri Jun 9 20:57:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 105818 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1192869vqr; Fri, 9 Jun 2023 14:27:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5wyfESgk4QHiH9Vs87K2YswJlqYowXpq2ThUm+roXyxI7Yc4RJYP/IpxWM56YcqcaszHQo X-Received: by 2002:a05:6a00:2d0e:b0:65b:bb3b:3c02 with SMTP id fa14-20020a056a002d0e00b0065bbb3b3c02mr2410265pfb.29.1686346024138; Fri, 09 Jun 2023 14:27:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686346024; cv=none; d=google.com; s=arc-20160816; b=WmQWC4LJajsX3bDbD7cfn1MUsfXHb9akfOhijPFLSrM4SE2c997Y6rhDipiQP3rYfi IW0taoopQ4NLSOWLKa2qjc3E+RqdCc44+1Ar8aS0ILRF9BC+26w/E/iRMyxA3z0Zmjro YDmfzJ3IyZwvnrRR1T7nONFQCxyDiNnt/qqH39cxbiG05vTtKtPdVD4t6qkeRd679wzN mjdG7xcPHEED2pERfLglphTcxV7M8wveBFs3MuFwLmLoETBNBTvqQaypQA/h/kPUfdRI 9Q0PjnpkpumC6ZAn4DDsFAklGZDUVH2jTbg2qbuqZKfExiQvUTlvUeUPbp3pnFYR1W3M 1yUQ== 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=0nInAwiPSY59EHfwf1REBhxEW/sYaJRe5sRuFLMxcAo=; b=fXVQ8pB6MSucEGzqXHOgA2cYqBtQ6xwQjo+q2zboKQtcmRaIIKHFwJzE3cE+N4Xy+G R8d09s3+V2bQifIRju9OIhCR/QRW3ac8R9LeGSNH7B7qTvaUQPoA5sViaHjtl51KQuS4 1dbDg2jXhq80UfEACzABeTj9ysTW7ddmVZFfnsO3RVPVsFQ92vn0qJD9Gp93Ha3cIsbw TA+9Lrzj1l+oowW0C40HzsOszehsIxNKVLX8JNueFFMoNTeQKkTlhfAiIV/X4e5HrYEa z7tuqzAtDz978oZukWOIC5sTWMXXv+F7oGhW64i1rVVT909C1QdMGjDYLCdfkNs9jAEj QfOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=ULS+iR+t; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d7-20020aa797a7000000b0064d3fb487cbsi3042237pfq.72.2023.06.09.14.26.51; Fri, 09 Jun 2023 14:27:04 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=ULS+iR+t; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229599AbjFIU5T (ORCPT + 99 others); Fri, 9 Jun 2023 16:57:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229471AbjFIU5R (ORCPT ); Fri, 9 Jun 2023 16:57:17 -0400 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D20E30FC for ; Fri, 9 Jun 2023 13:57:16 -0700 (PDT) Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-53404873a19so877351a12.3 for ; Fri, 09 Jun 2023 13:57:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686344236; x=1688936236; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0nInAwiPSY59EHfwf1REBhxEW/sYaJRe5sRuFLMxcAo=; b=ULS+iR+tAH8ihvJrorv5atpE1iOo8M10PeWzgUVQ3NmATAWYZuuTU0H0JISMkElRiy JcfUYVyHC0veT8E/nVnIglqM8Fwou0ypjKc9s/RGKb0WhzS88jv3A3vzfZM5cEimhsdo nYJYAwCZsXobTkbZouIJHa5xu5xEgVfIg0HWva2ZQUYhKZBfIR2bZ0ZQj8E2pyWmRwJf HX2UuqYpWKMaH0sokAMKhdQGTDd7HxJvqGFRjZnDZfoH6jniHMnqNeWwtjCnwj0UgQsl Cbl1TodOE9I8jVHYVHzfGqbmM38Uu+zchGgsyQFa6DXXy70YATzi0zLe3QGWaBKHkHve OsBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686344236; x=1688936236; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0nInAwiPSY59EHfwf1REBhxEW/sYaJRe5sRuFLMxcAo=; b=jfwwOUinTlotTYC88oQkgOiFOV2vOzUlYAV+Wi/EPi8mINarNTWeRlmQE3TExQnsrF WlJKe0rfm36VmnX6k6zOCdZXVusAMSEVl0QU+jxiLnDeNArpOObhAwLYC+deAT96JiL6 BnbsMcpiXsi4qhKf0aZQq4kfgyJr/AnJHQ46XlHNjilL9/4Oj7sbdCalQICY1/+ttyu9 CMZeXUqEUPFg/bFyvnK0wlNySgEz4ySU3y9nIwUVk2tb2tdfvMAUkROE0mtZCSJaKZTo VPu4bbCYyFUM1R0LKocc0Mm1LpA29X11+UNeRvSBK4W25sKGQKVTDOKNSpRHPqp6MJEw PxbA== X-Gm-Message-State: AC+VfDzNJn0ER4o3ZBHdNYkZw6TgTwQ2K7a0f8yQfk882pGly+ruf9nH hO3c6uzvXQO7ZLyp8X73FZ4n0nb2fkM= X-Received: by 2002:a17:90a:1d1:b0:256:2ef:92ec with SMTP id 17-20020a17090a01d100b0025602ef92ecmr1872152pjd.1.1686344235616; Fri, 09 Jun 2023 13:57:15 -0700 (PDT) Received: from octofox.hsd1.ca.comcast.net ([2601:641:401:1d20:1bc3:5645:d3d:e4be]) by smtp.gmail.com with ESMTPSA id g193-20020a636bca000000b0053b8a4f9465sm3323304pgc.45.2023.06.09.13.57.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 13:57:14 -0700 (PDT) From: Max Filippov To: linux-kernel@vger.kernel.org Cc: Chris Zankel , Max Filippov Subject: [PATCH] xtensa: drop ARCH_WANT_FRAME_POINTERS Date: Fri, 9 Jun 2023 13:57:09 -0700 Message-Id: <20230609205709.1984611-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, FROM_LOCAL_NOVOWEL,HK_RANDOM_ENVFROM,HK_RANDOM_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1768261968676058140?= X-GMAIL-MSGID: =?utf-8?q?1768261968676058140?= ARCH_WANT_FRAME_POINTERS was enabled in the xtensa Kconfig in the commit 8f371c752154 ("xtensa: enable lockdep support"), but neither windowed nor call0 xtensa ABI need frame pointers for stack tracing. Drop ARCH_WANT_FRAME_POINTERS from the xtensa Kconfig. Drop ftrace_return_address0 definition as the generic implementation is correct. Signed-off-by: Max Filippov --- arch/xtensa/Kconfig | 1 - arch/xtensa/include/asm/ftrace.h | 9 --------- arch/xtensa/kernel/stacktrace.c | 4 ---- 3 files changed, 14 deletions(-) diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 46051edc5ed3..45f72c8fa911 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -16,7 +16,6 @@ config XTENSA select ARCH_USE_MEMTEST select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_SPINLOCKS - select ARCH_WANT_FRAME_POINTERS select ARCH_WANT_IPC_PARSE_VERSION select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS diff --git a/arch/xtensa/include/asm/ftrace.h b/arch/xtensa/include/asm/ftrace.h index 6c6d9a9f185f..0ea4f84cd558 100644 --- a/arch/xtensa/include/asm/ftrace.h +++ b/arch/xtensa/include/asm/ftrace.h @@ -13,17 +13,8 @@ #include #ifndef __ASSEMBLY__ -#define ftrace_return_address0 ({ unsigned long a0, a1; \ - __asm__ __volatile__ ( \ - "mov %0, a0\n" \ - "mov %1, a1\n" \ - : "=r"(a0), "=r"(a1)); \ - MAKE_PC_FROM_RA(a0, a1); }) - -#ifdef CONFIG_FRAME_POINTER extern unsigned long return_address(unsigned level); #define ftrace_return_address(n) return_address(n) -#endif #endif /* __ASSEMBLY__ */ #ifdef CONFIG_FUNCTION_TRACER diff --git a/arch/xtensa/kernel/stacktrace.c b/arch/xtensa/kernel/stacktrace.c index 7f7755cd28f0..f643ea5e36da 100644 --- a/arch/xtensa/kernel/stacktrace.c +++ b/arch/xtensa/kernel/stacktrace.c @@ -237,8 +237,6 @@ EXPORT_SYMBOL_GPL(save_stack_trace); #endif -#ifdef CONFIG_FRAME_POINTER - struct return_addr_data { unsigned long addr; unsigned skip; @@ -271,5 +269,3 @@ unsigned long return_address(unsigned level) return r.addr; } EXPORT_SYMBOL(return_address); - -#endif