From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13052C43381 for ; Thu, 28 Mar 2019 15:22:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C9402206BA for ; Thu, 28 Mar 2019 15:22:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C9402206BA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7412F6B026D; Thu, 28 Mar 2019 11:22:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 69F846B026E; Thu, 28 Mar 2019 11:22:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 541726B026F; Thu, 28 Mar 2019 11:22:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by kanga.kvack.org (Postfix) with ESMTP id ED5206B026D for ; Thu, 28 Mar 2019 11:22:49 -0400 (EDT) Received: by mail-ed1-f69.google.com with SMTP id z98so8310106ede.3 for ; Thu, 28 Mar 2019 08:22:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Z5ii9WWPo9WVfhue9NtkIQuQCcbK0pxcqGqIbiUCEeU=; b=FsibXPTrZroK/VqhpCjtgXbeQYpBaTtsvlx9+4NgucnMjsyGFy/O9F5vzqBmh0cHys NFtDh9Guo30ZugpBGOkcZNNePzqUJQQ9tiyFAscags2EKeq5im4p1iqSot3c7N9ltZFy REB3kYZM9jOeCnVBapWmgH6Btd5nsBSxvPRupFhJYl/aESf8ZBuXPS73LvBysCajxquZ DcTqw1ItJYbHnupEhv3txOYbLPpOFxSlNtEaC+gk4ynsanuSUAaA8YKWMME2n+ksBg9B LeozbaT2aqqL6m697dUqnHKYf2CaMHner/4mmuTZ0caKBR6kHEsQCnWXWiDck78pPdOG lvsw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of steven.price@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=steven.price@arm.com X-Gm-Message-State: APjAAAUEiFRn0NGOScUDDC4AJ/GYnMRnEIGGau9UPUpVJz5C5GPMJgF/ Kuzicoocd+im4Rb3HRvQX+XzLfX1BNYoCEExxIhMl2yulHioiEUAQXECKZ86ebYS9YeuPyB2SDL aahOZfXZWtWrT78PUQurVYZda2Z6LWfFJVRlmJ+xmJ9hsxK9rX+QPdLSJ3DplYLqF+Q== X-Received: by 2002:a50:91ac:: with SMTP id g41mr26857188eda.188.1553786569475; Thu, 28 Mar 2019 08:22:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqxwrfIDf9swkALC4yvXjh+99w4j42ofVZFcD9A/AecH0UlicnWkTzy5UYFwGdjvgkVuB1jE X-Received: by 2002:a50:91ac:: with SMTP id g41mr26857096eda.188.1553786567839; Thu, 28 Mar 2019 08:22:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553786567; cv=none; d=google.com; s=arc-20160816; b=SJnTuDmkvtFGcF7Cqw0QFf8DuEQ89GcAoa9TLhtGIi7kO/s+g79/QNff4L6yfZCpoL 0mi5N4akaZn84FwGdLschG+7o1SWCEyLnG0RW3XSuLCHYXNHDHwpb4McpH4DJzDBefE9 jmarn6+cjm14hNpAt15RxByN5umZn1Y4QXqdHJxUbKnlIyvl2EThRQ1lo4A/N2Ru67vh zHL43vXzVnOofjjcNjhdHN46C8RxvrC9JVbLw9QoeTPYWVu5xOuNm9sHsIZIRVXCNJOR XEuabY2oaZIScOuvOOReTdTgC/hEFSpjW/RUnbJ1qu3wfBwINRul6KsYUutZK/jYMN1L Ps/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=Z5ii9WWPo9WVfhue9NtkIQuQCcbK0pxcqGqIbiUCEeU=; b=MhvBU+7eg4zr/yBJr52sKlJpLMgjnc6XfJrzfHQGEGqmw++Mv60f6PZ2o5vyrTD1JY ROZelpa0YflLJfyk4tzp2VRoTC9K1uiCtPTSFhXzNwEYjU6rRRNQ3Pk8v3Sebcos2s3Z RaXKeQaRBJroNb3CgpqhnqrswNvhnab/9UGn8TXnIBCfv6Ns5eG58e7e4iXEy0f8RS7K VPliD0urZvVvHlIJDO0kJGAlNxFcp9dTM3C338EJVYhSPe3w6HauQi+bS6l35PPfAt0m fDNCtCSDd6dd17+d6LnWvnGR898NqZqji/W7yOHeTGzmAd+OFoIKPbZ65v+4Z4Vz34bC na8A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of steven.price@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=steven.price@arm.com Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com. [217.140.101.70]) by mx.google.com with ESMTP id g23si2045430edg.412.2019.03.28.08.22.47 for ; Thu, 28 Mar 2019 08:22:47 -0700 (PDT) Received-SPF: pass (google.com: domain of steven.price@arm.com designates 217.140.101.70 as permitted sender) client-ip=217.140.101.70; Authentication-Results: mx.google.com; spf=pass (google.com: domain of steven.price@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=steven.price@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C9FA6165C; Thu, 28 Mar 2019 08:22:46 -0700 (PDT) Received: from e112269-lin.arm.com (e112269-lin.cambridge.arm.com [10.1.196.69]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 836DA3F557; Thu, 28 Mar 2019 08:22:43 -0700 (PDT) From: Steven Price To: linux-mm@kvack.org Cc: Steven Price , Andy Lutomirski , Ard Biesheuvel , Arnd Bergmann , Borislav Petkov , Catalin Marinas , Dave Hansen , Ingo Molnar , James Morse , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Peter Zijlstra , Thomas Gleixner , Will Deacon , x86@kernel.org, "H. Peter Anvin" , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Rutland , "Liang, Kan" Subject: [PATCH v7 14/20] arm64: mm: Convert mm/dump.c to use walk_page_range() Date: Thu, 28 Mar 2019 15:20:58 +0000 Message-Id: <20190328152104.23106-15-steven.price@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190328152104.23106-1-steven.price@arm.com> References: <20190328152104.23106-1-steven.price@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Now walk_page_range() can walk kernel page tables, we can switch the arm64 ptdump code over to using it, simplifying the code. Signed-off-by: Steven Price --- arch/arm64/mm/dump.c | 117 ++++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 58 deletions(-) diff --git a/arch/arm64/mm/dump.c b/arch/arm64/mm/dump.c index 14fe23cd5932..ea20c1213498 100644 --- a/arch/arm64/mm/dump.c +++ b/arch/arm64/mm/dump.c @@ -72,7 +72,7 @@ struct pg_state { struct seq_file *seq; const struct addr_marker *marker; unsigned long start_address; - unsigned level; + int level; u64 current_prot; bool check_wx; unsigned long wx_pages; @@ -234,11 +234,14 @@ static void note_prot_wx(struct pg_state *st, unsigned long addr) st->wx_pages += (addr - st->start_address) / PAGE_SIZE; } -static void note_page(struct pg_state *st, unsigned long addr, unsigned level, +static void note_page(struct pg_state *st, unsigned long addr, int level, u64 val) { static const char units[] = "KMGTPE"; - u64 prot = val & pg_level[level].mask; + u64 prot = 0; + + if (level >= 0) + prot = val & pg_level[level].mask; if (!st->level) { st->level = level; @@ -286,73 +289,71 @@ static void note_page(struct pg_state *st, unsigned long addr, unsigned level, } -static void walk_pte(struct pg_state *st, pmd_t *pmdp, unsigned long start, - unsigned long end) +static int pud_entry(pud_t *pud, unsigned long addr, + unsigned long next, struct mm_walk *walk) { - unsigned long addr = start; - pte_t *ptep = pte_offset_kernel(pmdp, start); + struct pg_state *st = walk->private; + pud_t val = READ_ONCE(*pud); + + if (pud_table(val)) + return 0; + + note_page(st, addr, 2, pud_val(val)); - do { - note_page(st, addr, 4, READ_ONCE(pte_val(*ptep))); - } while (ptep++, addr += PAGE_SIZE, addr != end); + return 0; } -static void walk_pmd(struct pg_state *st, pud_t *pudp, unsigned long start, - unsigned long end) +static int pmd_entry(pmd_t *pmd, unsigned long addr, + unsigned long next, struct mm_walk *walk) { - unsigned long next, addr = start; - pmd_t *pmdp = pmd_offset(pudp, start); - - do { - pmd_t pmd = READ_ONCE(*pmdp); - next = pmd_addr_end(addr, end); - - if (pmd_none(pmd) || pmd_sect(pmd)) { - note_page(st, addr, 3, pmd_val(pmd)); - } else { - BUG_ON(pmd_bad(pmd)); - walk_pte(st, pmdp, addr, next); - } - } while (pmdp++, addr = next, addr != end); + struct pg_state *st = walk->private; + pmd_t val = READ_ONCE(*pmd); + + if (pmd_table(val)) + return 0; + + note_page(st, addr, 3, pmd_val(val)); + + return 0; } -static void walk_pud(struct pg_state *st, pgd_t *pgdp, unsigned long start, - unsigned long end) +static int pte_entry(pte_t *pte, unsigned long addr, + unsigned long next, struct mm_walk *walk) { - unsigned long next, addr = start; - pud_t *pudp = pud_offset(pgdp, start); - - do { - pud_t pud = READ_ONCE(*pudp); - next = pud_addr_end(addr, end); - - if (pud_none(pud) || pud_sect(pud)) { - note_page(st, addr, 2, pud_val(pud)); - } else { - BUG_ON(pud_bad(pud)); - walk_pmd(st, pudp, addr, next); - } - } while (pudp++, addr = next, addr != end); + struct pg_state *st = walk->private; + pte_t val = READ_ONCE(*pte); + + note_page(st, addr, 4, pte_val(val)); + + return 0; +} + +static int pte_hole(unsigned long addr, unsigned long next, + struct mm_walk *walk) +{ + struct pg_state *st = walk->private; + + note_page(st, addr, -1, 0); + + return 0; } static void walk_pgd(struct pg_state *st, struct mm_struct *mm, - unsigned long start) + unsigned long start) { - unsigned long end = (start < TASK_SIZE_64) ? TASK_SIZE_64 : 0; - unsigned long next, addr = start; - pgd_t *pgdp = pgd_offset(mm, start); - - do { - pgd_t pgd = READ_ONCE(*pgdp); - next = pgd_addr_end(addr, end); - - if (pgd_none(pgd)) { - note_page(st, addr, 1, pgd_val(pgd)); - } else { - BUG_ON(pgd_bad(pgd)); - walk_pud(st, pgdp, addr, next); - } - } while (pgdp++, addr = next, addr != end); + struct mm_walk walk = { + .mm = mm, + .private = st, + .pud_entry = pud_entry, + .pmd_entry = pmd_entry, + .pte_entry = pte_entry, + .pte_hole = pte_hole + }; + down_read(&mm->mmap_sem); + walk_page_range(start, start | (((unsigned long)PTRS_PER_PGD << + PGDIR_SHIFT) - 1), + &walk); + up_read(&mm->mmap_sem); } void ptdump_walk_pgd(struct seq_file *m, struct ptdump_info *info) -- 2.20.1