Received: by 2002:ac0:950c:0:0:0:0:0 with SMTP id f12csp2270292imc; Tue, 12 Mar 2019 10:17:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqxbjlCISXnhMvMdIejoyNsUibsEaUssKjQ1a9/6OAjg//E7o8dn1q3TEcFKjhkRnlTFXBKd X-Received: by 2002:aa7:8150:: with SMTP id d16mr39964466pfn.172.1552411038749; Tue, 12 Mar 2019 10:17:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411038; cv=none; d=google.com; s=arc-20160816; b=PGNxr0g9tu3tB4f46/4OhlcTOyK+BusKAQ+wub/iDPGVGBy4t/NW9jAr5JZOayQkXe 06mVTypAHisAdKjCk7REWLZIasbDYDh/eBvySCvTp0Tza17rb1q2a9L4uHownah5ERQk CSc9LVhEN1yzdoNY2ljNnEkDMTFvsNX256bdChJ7dAM0fkrjRpFbqTrj+hRwB79wz/0k k4ZETuMo6+PKMUAA3G9d0I+agzSwHH7hc9hD5TEPNm0pxgwmCDWpdU/Y62xzIDU9vDDk ewhIEod3g5wpGgN6gGLAlkzeKRAKACG+K6FhDauOs8ywUhZiThun0p8VRQXMOCqpA7eU YtGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UeaqVrzKc1MNMdHRRL9Co4i9cP5uNTDULDow2S1RH/U=; b=DtX4yBG4tgQb2lUPnTjnkbKNp5iyaPYb/JnRbOn2io07vqT582FdYxyuO2/9f2k6VN 2AVSBPX/Bcg7eydyfjvo3DAmjKB3FpTuKlShm8NhYv07ycVTLDN6smZxfCzM85YSJ3nB 0byzsVB7KnOMb2YTtBZ0VRfj8fks2oLGWiIiJm3tTcQMP2wI+SFgOxp2KJAvZavwtNLD mUjxKA4s4An6GdnJiKjdtoZGD7/U7bRWbgH2aUxx32NgDu8Ow2Zf7wrtXZ5PuIcUQHtI KRitJk1XvkMesrR9F2lBBlObHgtbD3j/24ULl5iUQJB6mfvW9QAOxzqOuQSlmCQkuut0 kpQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jK0VzZ9Q; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n14si7661074pgv.520.2019.03.12.10.17.03; Tue, 12 Mar 2019 10:17:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jK0VzZ9Q; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728906AbfCLRPw (ORCPT + 99 others); Tue, 12 Mar 2019 13:15:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:54610 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727746AbfCLRO7 (ORCPT ); Tue, 12 Mar 2019 13:14:59 -0400 Received: from localhost (unknown [104.133.8.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E765D2184C; Tue, 12 Mar 2019 17:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552410899; bh=LFHcKK6faK7/O4hcN+eXDnfvxF23d4nWBYOISKViewo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jK0VzZ9QGmh66uXuAemYxAy5EjpogAZV2tBuqD+TW8GgtG75TDbixDuE6NYotQ1n7 BYqgxQenzxcTsx5/Y709+T9WEJwwd28MHmNKBf+ySLFnDFvv1LsiLeMSID28ljZgeI bAaCpD90Fmq3kMabBs5/Ax21qCu5oJIakJnQTBg8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jun-Ru Chang , Tony Wu , Paul Burton , ralf@linux-mips.org, jhogan@kernel.org, macro@mips.com, yamada.masahiro@socionext.com, peterz@infradead.org, mingo@kernel.org, linux-mips@vger.kernel.org, Sasha Levin Subject: [PATCH 4.19 111/149] MIPS: Remove function size check in get_frame_info() Date: Tue, 12 Mar 2019 10:08:49 -0700 Message-Id: <20190312170358.799063461@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190312170349.421581206@linuxfoundation.org> References: <20190312170349.421581206@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 2b424cfc69728224fcb5fad138ea7260728e0901 ] Patch (b6c7a324df37b "MIPS: Fix get_frame_info() handling of microMIPS function size.") introduces additional function size check for microMIPS by only checking insn between ip and ip + func_size. However, func_size in get_frame_info() is always 0 if KALLSYMS is not enabled. This causes get_frame_info() to return immediately without calculating correct frame_size, which in turn causes "Can't analyze schedule() prologue" warning messages at boot time. This patch removes func_size check, and let the frame_size check run up to 128 insns for both MIPS and microMIPS. Signed-off-by: Jun-Ru Chang Signed-off-by: Tony Wu Signed-off-by: Paul Burton Fixes: b6c7a324df37b ("MIPS: Fix get_frame_info() handling of microMIPS function size.") Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Signed-off-by: Sasha Levin --- arch/mips/kernel/process.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index d4f7fd4550e1..85522c137f19 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -371,7 +371,7 @@ static inline int is_sp_move_ins(union mips_instruction *ip, int *frame_size) static int get_frame_info(struct mips_frame_info *info) { bool is_mmips = IS_ENABLED(CONFIG_CPU_MICROMIPS); - union mips_instruction insn, *ip, *ip_end; + union mips_instruction insn, *ip; const unsigned int max_insns = 128; unsigned int last_insn_size = 0; unsigned int i; @@ -384,10 +384,9 @@ static int get_frame_info(struct mips_frame_info *info) if (!ip) goto err; - ip_end = (void *)ip + info->func_size; - - for (i = 0; i < max_insns && ip < ip_end; i++) { + for (i = 0; i < max_insns; i++) { ip = (void *)ip + last_insn_size; + if (is_mmips && mm_insn_16bit(ip->halfword[0])) { insn.word = ip->halfword[0] << 16; last_insn_size = 2; -- 2.19.1