From patchwork Sat Jul 15 01:26:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Levin, Alexander \(Sasha Levin\)" X-Patchwork-Id: 107840 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1650932qge; Fri, 14 Jul 2017 18:37:18 -0700 (PDT) X-Received: by 10.99.171.67 with SMTP id k3mr17707676pgp.128.1500082637994; Fri, 14 Jul 2017 18:37:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500082637; cv=none; d=google.com; s=arc-20160816; b=c0c1/bMwOqu2Dvv+UzWeHHanrfJc5HD65XqvvhUf9c/xfXwIdhwhlYf6b8gfzlvOr3 DaPhLeHbcdiZjG6khoHHUn/5G8CX+FYw6ea8wP7IeHmis7UiMjeDkow9Z4wgppTBFp/s vYHpWjVfrGFAA6m2YJjoWzx3Khq8iz+g5dO9XDe++3ESR/sU7djkTF4YTQNYWnTyXe2K BLirJBD4x5i/zVn+2lwGE+emXc2LlFBFEkNiXVvjhRK4i66yyVTZJ2UfIdmIRKusXT5g j3T6oGQa1DwcJDM5R6SN9pg8ID8qWgYxmnch8qnj6OMX0PkylujC+lj6je4wdfBbKLTP /ctw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:to:dkim-signature :dkim-signature:cc:from:dkim-signature:arc-authentication-results; bh=kXzuk1rceAN/g+7b8DkTQo5mKDWvbUjBWHnIW1aGN8M=; b=nCWn58TupO1YqQh76xFzmEk/lnCrWkczcQP/eLpT2F3fXKSPtl+vaTC87rMmqiSW1b FrkJxGdjlJoJv4IaWeBzgVS4+ok9SsGxJCqFGe0B2lgLKBOR//1XgOcNhgXTwpSKoExB gR76snn3hTjq9cF042xMxOcRr2Ugl3vd8Ndnczzv/BrAEz48NYBG3eUbZiUQjBAdEjqL kDEiz1ZE9iWFVw7OG8AkRjH/+0uBA4y6deoQRfsjz4QzZSIgcXcVhrmwKZVHIV8QMijd QSuG3iqETmrpEIfuB4BNkBO50nhV8P1WVbQ19dplIxgRwydFV8jsJ0Sn1POAf1AbZQ74 GuXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@verizon.com header.b=TLIqwHH3; dkim=fail header.i=@verizon.com header.b=Rj39jMnE; dkim=fail header.i=@verizon.com header.b=Rj39jMnE; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n189si7571824pgn.110.2017.07.14.18.37.17; Fri, 14 Jul 2017 18:37:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=@verizon.com header.b=TLIqwHH3; dkim=fail header.i=@verizon.com header.b=Rj39jMnE; dkim=fail header.i=@verizon.com header.b=Rj39jMnE; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751455AbdGOBhP (ORCPT + 6 others); Fri, 14 Jul 2017 21:37:15 -0400 Received: from omzsmtpe01.verizonbusiness.com ([199.249.25.210]:25549 "EHLO omzsmtpe01.verizonbusiness.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751450AbdGOB1W (ORCPT ); Fri, 14 Jul 2017 21:27:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1500082042; x=1531618042; h=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=vlO8qYgPyGlyoNJ3vBo2yDnUGzT22hFTXBkZefqQYgw=; b=TLIqwHH35w1RMKF6uSbJyvijtEos8Wmerx7/4j5+XHQ5H+eAcpiLz1XS 2bomRVAJ4L2MBVbc0d4M8aash451WOZMPBJ9YYBL+RS/NXpBZahOigjv+ DAv4tJtaT4ejccMcsFcdHRoUwYzrQRBlOkf4t9UbyDqa/J0ddW0Mt58E0 4=; X-IronPort-Anti-Spam-Filtered: false Received: from unknown (HELO fldsmtpi01.verizon.com) ([166.68.71.143]) by omzsmtpe01.verizonbusiness.com with ESMTP; 15 Jul 2017 01:27:14 +0000 From: "Levin, Alexander (Sasha Levin)" Cc: Mark Rutland , Catalin Marinas , "Levin, Alexander (Sasha Levin)" Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO atlantis.verizonwireless.com) ([10.255.192.101]) by fldsmtpi01.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 15 Jul 2017 01:26:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1500082017; x=1531618017; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=vlO8qYgPyGlyoNJ3vBo2yDnUGzT22hFTXBkZefqQYgw=; b=Rj39jMnE5nkZJx+i0+1iHcr8YzOl21PSk8Ssq2W2cFYFzCZZXsGku5g9 PgIXYRYMhkAnkw/OMp9/i0acDkprZ0umFbbzzAG5mEj82saXR2C+TKLFn m6UNzfdaz0ui5WGbrE/HKaVTl0Ued0UiG6WRDinmTpydUdR4lbc+gsybn Q=; Received: from ranger.odc.vzwcorp.com (HELO mercury.verizonwireless.com) ([10.255.240.27]) by atlantis.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 14 Jul 2017 21:26:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1500082017; x=1531618017; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=vlO8qYgPyGlyoNJ3vBo2yDnUGzT22hFTXBkZefqQYgw=; b=Rj39jMnE5nkZJx+i0+1iHcr8YzOl21PSk8Ssq2W2cFYFzCZZXsGku5g9 PgIXYRYMhkAnkw/OMp9/i0acDkprZ0umFbbzzAG5mEj82saXR2C+TKLFn m6UNzfdaz0ui5WGbrE/HKaVTl0Ued0UiG6WRDinmTpydUdR4lbc+gsybn Q=; X-Host: ranger.odc.vzwcorp.com Received: from casac1exh001.uswin.ad.vzwcorp.com ([10.11.218.43]) by mercury.verizonwireless.com with ESMTP/TLS/AES128-SHA256; 15 Jul 2017 01:26:56 +0000 Received: from scwexch15apd.uswin.ad.vzwcorp.com (153.114.130.34) by CASAC1EXH001.uswin.ad.vzwcorp.com (10.11.218.43) with Microsoft SMTP Server (TLS) id 14.3.248.2; Fri, 14 Jul 2017 18:26:56 -0700 Received: from OMZP1LUMXCA18.uswin.ad.vzwcorp.com (144.8.22.196) by scwexch15apd.uswin.ad.vzwcorp.com (153.114.130.34) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Fri, 14 Jul 2017 18:26:55 -0700 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA18.uswin.ad.vzwcorp.com (144.8.22.196) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Fri, 14 Jul 2017 20:26:54 -0500 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) by OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) with mapi id 15.00.1263.000; Fri, 14 Jul 2017 20:26:54 -0500 To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: [PATCH for v4.9 LTS 45/87] arm64: mm: fix show_pte KERN_CONT fallout Thread-Topic: [PATCH for v4.9 LTS 45/87] arm64: mm: fix show_pte KERN_CONT fallout Thread-Index: AQHS/QlYPOym6W1hmkCIo1OYqPqHIQ== Date: Sat, 15 Jul 2017 01:26:13 +0000 Message-ID: <20170715012538.10101-45-alexander.levin@verizon.com> References: <20170715012538.10101-1-alexander.levin@verizon.com> In-Reply-To: <20170715012538.10101-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Rutland [ Upstream commit 6ef4fb387d50fa8f3bffdffc868b57e981cdd709 ] Recent changes made KERN_CONT mandatory for continued lines. In the absence of KERN_CONT, a newline may be implicit inserted by the core printk code. In show_pte, we (erroneously) use printk without KERN_CONT for continued prints, resulting in output being split across a number of lines, and not matching the intended output, e.g. [ff000000000000] *pgd=00000009f511b003 , *pud=00000009f4a80003 , *pmd=0000000000000000 Fix this by using pr_cont() for all the continuations. Acked-by: Will Deacon Signed-off-by: Mark Rutland Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- arch/arm64/mm/fault.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.11.0 diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 8b8ac3db4092..0e90c7e0279c 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -101,21 +101,21 @@ void show_pte(struct mm_struct *mm, unsigned long addr) break; pud = pud_offset(pgd, addr); - printk(", *pud=%016llx", pud_val(*pud)); + pr_cont(", *pud=%016llx", pud_val(*pud)); if (pud_none(*pud) || pud_bad(*pud)) break; pmd = pmd_offset(pud, addr); - printk(", *pmd=%016llx", pmd_val(*pmd)); + pr_cont(", *pmd=%016llx", pmd_val(*pmd)); if (pmd_none(*pmd) || pmd_bad(*pmd)) break; pte = pte_offset_map(pmd, addr); - printk(", *pte=%016llx", pte_val(*pte)); + pr_cont(", *pte=%016llx", pte_val(*pte)); pte_unmap(pte); } while(0); - printk("\n"); + pr_cont("\n"); } #ifdef CONFIG_ARM64_HW_AFDBM