From patchwork Sun Nov 8 19:19:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 322818 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=-6.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS autolearn=no 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 DD3F9C388F9 for ; Sun, 8 Nov 2020 19:19:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 95FB321D40 for ; Sun, 8 Nov 2020 19:19:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604863179; bh=Fn9z0pBVI1oqcyvjwjOdpDLU3JUiMWA1/Q3sHclTBX0=; h=Date:From:To:Subject:List-ID:From; b=stSS4YBRePRnfFIgMsF6T5srzSMfKwteNdOrY6vgEqiJXO7u0uYCrBDTJI5fiGyeR PVrnCV7c+UxhtN1QoWf5X/OAwJzmMB/oonSZ9fQd+TSBHD4WjYzWZjuwsMo9NuPbzX vtFNy1yoocOjrPocbjxZlfUTt5qN5m31qwX+6VPs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728709AbgKHTTj (ORCPT ); Sun, 8 Nov 2020 14:19:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:46782 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727910AbgKHTTi (ORCPT ); Sun, 8 Nov 2020 14:19:38 -0500 Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (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 B5E6C206ED; Sun, 8 Nov 2020 19:19:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604863177; bh=Fn9z0pBVI1oqcyvjwjOdpDLU3JUiMWA1/Q3sHclTBX0=; h=Date:From:To:Subject:From; b=Xqs6VLbHrXSxzq8bDJ+rLl7Zi/+lFfKsgm1VYxwIKIdXf/XG3bGLAJJJPzU9A59WY x3BbevsdpixIM5vvSjYeccbUd49X+giTJqzT2xabuaD+TwQd/lSa9bTEmgUpcPQGvJ aPWEPiEJ1V+vmkJh3U+w8FOaqoJL7kL6SywplLpE= Date: Sun, 08 Nov 2020 11:19:36 -0800 From: akpm@linux-foundation.org To: minchan@kernel.org, mm-commits@vger.kernel.org, rppt@kernel.org, sergey.senozhatsky.work@gmail.com, stable@vger.kernel.org, stefan@agner.ch Subject: [to-be-updated] mm-zsmalloc-include-sparsememh-for-max_physmem_bits.patch removed from -mm tree Message-ID: <20201108191936.5Jyru9n0n%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch titled Subject: mm/zsmalloc: include sparsemem.h for MAX_PHYSMEM_BITS has been removed from the -mm tree. Its filename was mm-zsmalloc-include-sparsememh-for-max_physmem_bits.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Stefan Agner Subject: mm/zsmalloc: include sparsemem.h for MAX_PHYSMEM_BITS Most architectures define MAX_PHYSMEM_BITS in asm/sparsemem.h and don't include it in asm/pgtable.h. If MAX_PHYSMEM_BITS is not set in mm/zsmalloc.c it will set MAX_PHYSMEM_BITS to BITS_PER_LONG. And this is 32-bit, too short when LPAE is in use. So include asm/sparsemem.h directly to get the MAX_PHYSMEM_BITS define on all architectures. This fixes a crash when accessing zram on 32-bit ARM platform with LPAE and more than 4GB of memory: Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = a27bd01c [00000000] *pgd=236a0003, *pmd=1ffa64003 Internal error: Oops: 207 [#1] SMP ARM Modules linked in: mdio_bcm_unimac(+) brcmfmac cfg80211 brcmutil raspberrypi_hwmon hci_uart crc32_arm_ce bcm2711_thermal phy_generic genet CPU: 0 PID: 123 Comm: mkfs.ext4 Not tainted 5.9.6 #1 Hardware name: BCM2711 PC is at zs_map_object+0x94/0x338 LR is at zram_bvec_rw.constprop.0+0x330/0xa64 pc : [] lr : [] psr: 60000013 sp : e376bbe0 ip : 00000000 fp : c1e2921c r10: 00000002 r9 : c1dda730 r8 : 00000000 r7 : e8ff7a00 r6 : 00000000 r5 : 02f9ffa0 r4 : e3710000 r3 : 000fdffe r2 : c1e0ce80 r1 : ebf979a0 r0 : 00000000 Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user Control: 30c5383d Table: 235c2a80 DAC: fffffffd Process mkfs.ext4 (pid: 123, stack limit = 0x495a22e6) Stack: (0xe376bbe0 to 0xe376c000) ... [] (zs_map_object) from [] (zram_bvec_rw.constprop.0+0x330/0xa64) [] (zram_bvec_rw.constprop.0) from [] (zram_submit_bio+0x1a4/0x40c) [] (zram_submit_bio) from [] (submit_bio_noacct+0xd0/0x3c8) [] (submit_bio_noacct) from [] (submit_bio+0x4c/0x190) [] (submit_bio) from [] (submit_bh_wbc+0x188/0x1b8) [] (submit_bh_wbc) from [] (__block_write_full_page+0x340/0x5e4) [] (__block_write_full_page) from [] (block_write_full_page+0x128/0x170) [] (block_write_full_page) from [] (__writepage+0x14/0x68) [] (__writepage) from [] (write_cache_pages+0x1bc/0x494) [] (write_cache_pages) from [] (generic_writepages+0x58/0x8c) [] (generic_writepages) from [] (do_writepages+0x48/0xec) [] (do_writepages) from [] (__filemap_fdatawrite_range+0xf0/0x128) [] (__filemap_fdatawrite_range) from [] (file_write_and_wait_range+0x48/0x98) [] (file_write_and_wait_range) from [] (blkdev_fsync+0x1c/0x44) [] (blkdev_fsync) from [] (do_fsync+0x3c/0x70) [] (do_fsync) from [] (__sys_trace_return+0x0/0x2c) Exception stack(0xe376bfa8 to 0xe376bff0) bfa0: 0003d2e0 b6f7b6f0 00000003 00046e40 00001000 00000000 bfc0: 0003d2e0 b6f7b6f0 00000000 00000076 00000000 00000000 befcbb20 befcbb28 bfe0: b6f4e060 befcbad8 b6f23e0c b6dc4a80 Code: e5927000 e0050391 e0871005 e5918018 (e5983000) Link: https://lkml.kernel.org/r/bdfa44bf1c570b05d6c70898e2bbb0acf234ecdf.1604762181.git.stefan@agner.ch Fixes: 61989a80fb3a ("staging: zsmalloc: zsmalloc memory allocation library") Signed-off-by: Stefan Agner Cc: Minchan Kim Cc: Sergey Senozhatsky Cc: Mike Rapoport Cc: Signed-off-by: Andrew Morton --- mm/zsmalloc.c | 1 + 1 file changed, 1 insertion(+) --- a/mm/zsmalloc.c~mm-zsmalloc-include-sparsememh-for-max_physmem_bits +++ a/mm/zsmalloc.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include