Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[linux-2.6-microblaze.git] / mm / debug.c

diff --git a/mm/debug.c b/mm/debug.c
index 27837c1..ca8d1ca 100644 (file)
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -95,19 +95,19 @@ void __dump_page(struct page *page, const char *reason)
         */
        mapcount = PageSlab(head) ? 0 : page_mapcount(page);
 
-       pr_warn("page:%px refcount:%d mapcount:%d mapping:%p index:%#lx\n",
+       pr_warn("page:%p refcount:%d mapcount:%d mapping:%p index:%#lx pfn:%#lx\n",
                        page, page_ref_count(head), mapcount, mapping,
-                       page_to_pgoff(page));
+                       page_to_pgoff(page), page_to_pfn(page));
        if (compound) {
                if (hpage_pincount_available(page)) {
-                       pr_warn("head:%px order:%u compound_mapcount:%d compound_pincount:%d\n",
+                       pr_warn("head:%p order:%u compound_mapcount:%d compound_pincount:%d\n",
                                        head, compound_order(head),
-                                       compound_mapcount(head),
-                                       compound_pincount(head));
+                                       head_mapcount(head),
+                                       head_pincount(head));
                } else {
-                       pr_warn("head:%px order:%u compound_mapcount:%d\n",
+                       pr_warn("head:%p order:%u compound_mapcount:%d\n",
                                        head, compound_order(head),
-                                       compound_mapcount(head));
+                                       head_mapcount(head));
                }
        }
        if (PageKsm(page))
@@ -115,54 +115,50 @@ void __dump_page(struct page *page, const char *reason)
        else if (PageAnon(page))
                type = "anon ";
        else if (mapping) {
-               const struct inode *host;
+               struct inode *host;
                const struct address_space_operations *a_ops;
-               const struct hlist_node *dentry_first;
-               const struct dentry *dentry_ptr;
+               struct hlist_node *dentry_first;
+               struct dentry *dentry_ptr;
                struct dentry dentry;
 
                /*
                 * mapping can be invalid pointer and we don't want to crash
                 * accessing it, so probe everything depending on it carefully
                 */
-               if (copy_from_kernel_nofault(&host, &mapping->host,
-                                       sizeof(struct inode *)) ||
-                   copy_from_kernel_nofault(&a_ops, &mapping->a_ops,
-                               sizeof(struct address_space_operations *))) {
-                       pr_warn("failed to read mapping->host or a_ops, mapping not a valid kernel address?\n");
+               if (get_kernel_nofault(host, &mapping->host) ||
+                   get_kernel_nofault(a_ops, &mapping->a_ops)) {
+                       pr_warn("failed to read mapping contents, not a valid kernel address?\n");
                        goto out_mapping;
                }
 
                if (!host) {
-                       pr_warn("mapping->a_ops:%ps\n", a_ops);
+                       pr_warn("aops:%ps\n", a_ops);
                        goto out_mapping;
                }
 
-               if (copy_from_kernel_nofault(&dentry_first,
-                       &host->i_dentry.first, sizeof(struct hlist_node *))) {
-                       pr_warn("mapping->a_ops:%ps with invalid mapping->host inode address %px\n",
-                               a_ops, host);
+               if (get_kernel_nofault(dentry_first, &host->i_dentry.first)) {
+                       pr_warn("aops:%ps with invalid host inode %px\n",
+                                       a_ops, host);
                        goto out_mapping;
                }
 
                if (!dentry_first) {
-                       pr_warn("mapping->a_ops:%ps\n", a_ops);
+                       pr_warn("aops:%ps ino:%lx\n", a_ops, host->i_ino);
                        goto out_mapping;
                }
 
                dentry_ptr = container_of(dentry_first, struct dentry, d_u.d_alias);
-               if (copy_from_kernel_nofault(&dentry, dentry_ptr,
-                                                       sizeof(struct dentry))) {
-                       pr_warn("mapping->aops:%ps with invalid mapping->host->i_dentry.first %px\n",
-                               a_ops, dentry_ptr);
+               if (get_kernel_nofault(dentry, dentry_ptr)) {
+                       pr_warn("aops:%ps with invalid dentry %px\n", a_ops,
+                                       dentry_ptr);
                } else {
                        /*
                         * if dentry is corrupted, the %pd handler may still
                         * crash, but it's unlikely that we reach here with a
                         * corrupted struct page
                         */
-                       pr_warn("mapping->aops:%ps dentry name:\"%pd\"\n",
-                                                               a_ops, &dentry);
+                       pr_warn("aops:%ps ino:%lx dentry name:\"%pd\"\n",
+                                       a_ops, host->i_ino, &dentry);
                }
        }
 out_mapping: