Received: by 2002:ac0:950c:0:0:0:0:0 with SMTP id f12csp2275296imc; Tue, 12 Mar 2019 10:23:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqzJC+54BwT9gWjXFhROQsuXRrQjhokpXJj1vm/qVvmTIcpByx/IQ4ft6T9d5bPU/FGFhAVt X-Received: by 2002:a65:6554:: with SMTP id a20mr35947765pgw.170.1552411385069; Tue, 12 Mar 2019 10:23:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411385; cv=none; d=google.com; s=arc-20160816; b=xQNlMpqA4LZWL23Pfg4uFW+nWsltUxJIHQeFSTrRUXAnul7JcU0zYGrG9GWAc1hWNq 4R5aDOHsJk7uscrvE5yh2Zl/4TTisnWLvvk9VX5tVe401BvHlbxqaUW8nLk5Ym8e8kiR asxOxTLC5l302ZvqkFrz4oZT5Cg9DhKXH0qoZGwTSZYQ3anCyO8zQ0VXZgIJBGca/pAY GLKzmUYWLJzslM6x+dS4IcazH5qLrCSgEmtxK5DP4fLPL+NeJHjhyAQA1vGZtJRi+ndl y0gDKwk2ACrJ5BUSX1+LEXgvN4rjnzT9R+k4uzQeoE/ATJXRF4131rhhiA6EsnzrqWK+ uhbg== 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=+x5ZvRpW+eh91VpXyKhC4bkSfUia1UeQ/YCShFP6vN0=; b=tTrhzJdFUpsjvcjcs9warbbuDvAKojMsF0BDdXmS4ZtyBdnU82wIBF+sYS2N1ue9oS hk7+hz7D/1vYjd7prJpDmjYg5hrjGzOqhhumgECaaNRW5NNhvci2JL5UsQ1XIuarDdaD +UITQgh5CeY0ItPy2BMbbIgCPn7g0vj0ldl1AlfilzGBHYAyZAqmnjcyXhg2sNHIu8m0 a+z6UdJmYTyBxFKjdRT5nfXKfwz9YfxiUeVhu1N8Z9WB7CvAPhFcEVW/qXczX6ipiKX4 Hpfl8o/0IVDk0IVLrL7KAwyVvpBidFQXXvjBmtwhsoxtMJi32SV7MZ2aL0Ax7ZgJz75H RPYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=a7K+fD13; 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 w8si7629355pgs.302.2019.03.12.10.22.49; Tue, 12 Mar 2019 10:23:05 -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=a7K+fD13; 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 S1727229AbfCLRUX (ORCPT + 99 others); Tue, 12 Mar 2019 13:20:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:35990 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730053AbfCLRSV (ORCPT ); Tue, 12 Mar 2019 13:18:21 -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 BCB98218A6; Tue, 12 Mar 2019 17:18:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552411100; bh=MVYqKjChGDIouZylQG6P77I0kakZDqiF79TlhZb0okY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a7K+fD13dg3fO3fW4C6Bbq7Le4cHyG9P0ABUnqIbkqaYbaXcmlYOjXtHhKIXAGY4X U1NT5usiX9Z8YaQj5Pf8mXECnOVV6macoSH9ZEqx57cQArj62hXl1WQ3libk7unJNW F6+gtCJFRV70dwlqT/Iyi6JVDr+uDPSoYHXSsNyg= 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.9 82/96] MIPS: Remove function size check in get_frame_info() Date: Tue, 12 Mar 2019 10:10:40 -0700 Message-Id: <20190312171040.763830937@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190312171034.530434962@linuxfoundation.org> References: <20190312171034.530434962@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.9-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 1cc133e7026f..fffd031dc6b6 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -344,7 +344,7 @@ static inline int is_sp_move_ins(union mips_instruction *ip) 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; @@ -356,10 +356,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.halfword[0] = 0; insn.halfword[1] = ip->halfword[0]; -- 2.19.1