From patchwork Fri Dec 1 10:42:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinbum Park X-Patchwork-Id: 10086831 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 75B866035E for ; Fri, 1 Dec 2017 10:43:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EFBA2A37F for ; Fri, 1 Dec 2017 10:43:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73C5F2A39C; Fri, 1 Dec 2017 10:43:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 079EB2A37F for ; Fri, 1 Dec 2017 10:43:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:To:Date :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=mxpPdrWGmrYKpAP7lI7XOYFv8t+rHjcgUt9DPs81fws=; b=WFkRUo/0QXfUg4 RTG2j+FYZMJhjFxDRR+VMdu2fFZaMs8enn0UklPutInXJQo/kx4R25Ee6VSJDS1PiZGqzOK+pUfvI scz0lSufcrO6k+uRM7tGUdgXi6pLHp0RYXzbtGTTw9vpEf1iSZ/u1yNud3RNB5NTeOLhu/PVt0csp qR+Gwu1IkIjTkf8tj6JDoY21ZnOaqmiJYJrlj5O9t+wZCrqY/uFRn2bly+vgGkmT7++7MZx8UujLi s/MMe9ScwH0sC18dWxdOUVoq2D2eqLunlqZj74fY35rttGb4oiKZ9z/8AjWkcP7Jr9+BlqGruoUe0 XirQwg20bN50B2tW7ikQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eKimz-0007xV-Uv; Fri, 01 Dec 2017 10:43:25 +0000 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eKimw-0007vp-WA for linux-arm-kernel@lists.infradead.org; Fri, 01 Dec 2017 10:43:24 +0000 Received: by mail-pg0-x241.google.com with SMTP id j9so4320139pgc.11 for ; Fri, 01 Dec 2017 02:43:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=nRFnN3jjHIgvOdNhAauKhyBpu4QrywoKMqKg8YVcUHw=; b=J8l+e+dWDPBEn/lu9qVCMZm6cD1jSkbYYx5/m1bKMnZNRAovWzi7HWFFOifmbOREv3 t0BNnNKjgEfZap9wRU+mxapjNP7gY+For38ilWF0/GZeqWYa7Ffv+eWKHNrUOPBGczqp Xig/FKsGrV9gNLY8wGPooQFMSQU/1f4ZbT48OaOvndpyDqDUoy4Zf5RABDEbIC1BQmuj naKKD56VCsRAnPtl+0oxcL5VMERKFFL/Nms2eBRu5YEZS+lYMaD5OTBx0CDdDMFfH3Eg 6OXSGeWwiAhCRVZc5zVVsPnngC2Z+ETuFPKCecMJiLiKYu0S2C0oaar20U6UCHJR7w4o 7Nfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=nRFnN3jjHIgvOdNhAauKhyBpu4QrywoKMqKg8YVcUHw=; b=WCdo9x0PnICUM3zzIB3IkQv4y00loHRcV8YQyCNLT6eRoKXhgPK+IqYLs3AYWsJXwc 5oPLAQPOFRAkftpEpTOMlXqHyXFmImhbokyvWpvGxRUvL3dTmJDnZy1B9DjTeqp+sVoa W5ZTzkgAvfVm3cv4RI/hNrMCGJwtpYLa10bhH1WZwrrR6UIcfUZgRSx9PatEpMf/0MeR Q5P1wr10rZh6lY6UEqgi7AIG2vWaSL/0IxeRfAcX/eLYKSdbyQnSnPolvHeRuAoVFV7v 3+2IHTdoMLDhKWBgN2D4nPw1nmguenVeQjxsioYAYHDu1jIH4xrpuurLlXyzMP7JsIHP M7MQ== X-Gm-Message-State: AJaThX5U4vaqo3FJCjb9g8p14ExXcM6wpTNRqaOJqcITy1Tr8SwOQByj jqt0fwwOZKLcVftYPCb9nGbB0g== X-Google-Smtp-Source: AGs4zMYpATqlBbE1j7rk43lYsYF4ocRh1nXjP5DkCVfxKM4Vt5G47IdfKHIuagC3OHZSM6zxkBlJWQ== X-Received: by 10.101.75.82 with SMTP id k18mr2279445pgt.234.1512124981348; Fri, 01 Dec 2017 02:43:01 -0800 (PST) Received: from pjb1027-Latitude-E5410 ([58.227.15.43]) by smtp.gmail.com with ESMTPSA id m8sm10554350pgc.64.2017.12.01.02.42.58 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 01 Dec 2017 02:43:00 -0800 (PST) From: "jinb.park" X-Google-Original-From: "jinb.park" Date: Fri, 1 Dec 2017 19:42:54 +0900 To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-hardening@lists.openwall.com Subject: [kernel-hardening][PATCH 2/3] arm: mm: dump: make the page table dumping seq_file optional Message-ID: <20171201104254.GA3999@pjb1027-Latitude-E5410> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171201_024323_067543_1AF69BDF X-CRM114-Status: GOOD ( 11.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, vladimir.murzin@arm.com, keescook@chromium.org, arnd@arndb.de, gregkh@linuxfoundation.org, linux@armlinux.org.uk, labbott@redhat.com, afzal.mohd.ma@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch makes the page table dumping seq_file optional. It makes the page table dumping code usable for other cases. This patch refers below commit of arm64. (ae5d1cf358a5 ("arm64: dump: Make the page table dumping seq_file optional")) Signed-off-by: Jinbum Park --- arch/arm/mm/dump.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/arch/arm/mm/dump.c b/arch/arm/mm/dump.c index 8dfe7c3..43a2bee 100644 --- a/arch/arm/mm/dump.c +++ b/arch/arm/mm/dump.c @@ -34,6 +34,18 @@ { -1, NULL }, }; +#define pt_dump_seq_printf(m, fmt, args...) \ +({ \ + if (m) \ + seq_printf(m, fmt, ##args); \ +}) + +#define pt_dump_seq_puts(m, fmt) \ +({ \ + if (m) \ + seq_printf(m, fmt); \ +}) + struct pg_state { struct seq_file *seq; const struct addr_marker *marker; @@ -210,7 +222,7 @@ static void dump_prot(struct pg_state *st, const struct prot_bits *bits, size_t s = bits->clear; if (s) - seq_printf(st->seq, " %s", s); + pt_dump_seq_printf(st->seq, " %s", s); } } @@ -224,7 +236,7 @@ static void note_page(struct pg_state *st, unsigned long addr, st->level = level; st->current_prot = prot; st->current_domain = domain; - seq_printf(st->seq, "---[ %s ]---\n", st->marker->name); + pt_dump_seq_printf(st->seq, "---[ %s ]---\n", st->marker->name); } else if (prot != st->current_prot || level != st->level || domain != st->current_domain || addr >= st->marker[1].start_address) { @@ -232,7 +244,7 @@ static void note_page(struct pg_state *st, unsigned long addr, unsigned long delta; if (st->current_prot) { - seq_printf(st->seq, "0x%08lx-0x%08lx ", + pt_dump_seq_printf(st->seq, "0x%08lx-0x%08lx ", st->start_address, addr); delta = (addr - st->start_address) >> 10; @@ -240,17 +252,19 @@ static void note_page(struct pg_state *st, unsigned long addr, delta >>= 10; unit++; } - seq_printf(st->seq, "%9lu%c", delta, *unit); + pt_dump_seq_printf(st->seq, "%9lu%c", delta, *unit); if (st->current_domain) - seq_printf(st->seq, " %s", st->current_domain); + pt_dump_seq_printf(st->seq, " %s", + st->current_domain); if (pg_level[st->level].bits) dump_prot(st, pg_level[st->level].bits, pg_level[st->level].num); - seq_printf(st->seq, "\n"); + pt_dump_seq_printf(st->seq, "\n"); } if (addr >= st->marker[1].start_address) { st->marker++; - seq_printf(st->seq, "---[ %s ]---\n", st->marker->name); + pt_dump_seq_printf(st->seq, "---[ %s ]---\n", + st->marker->name); } st->start_address = addr; st->current_prot = prot;