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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 9A969C47089 for ; Wed, 26 May 2021 22:48:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7BE88613D3 for ; Wed, 26 May 2021 22:48:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232553AbhEZWuS (ORCPT ); Wed, 26 May 2021 18:50:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:56910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232088AbhEZWuS (ORCPT ); Wed, 26 May 2021 18:50:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C5C01613D8; Wed, 26 May 2021 22:48:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1622069326; bh=YnVL+2tYXD+/silOdFcuim+vH3zH1K7DdeVrdJOMIRo=; h=Date:From:To:Subject:From; b=Ep1WALat8ZbphRekh+A78nQ38K/6w7lAL/XkEnDHdiofu/ltnczKzENvP2lQm8MdC npA/XcSEo0mTqKlJUnZA2lXmq0njVO0+mvjUrIp/mg4dYl6Q5aU7B6mmbw+NG3lfCB tOBKZACUl5uboa3iiG75CRu/quylAiVzbAjns2x0= Date: Wed, 26 May 2021 15:48:45 -0700 From: akpm@linux-foundation.org To: adobriyan@gmail.com, alex.shi@linux.alibaba.com, david@redhat.com, guro@fb.com, haiyangz@microsoft.com, jasowang@redhat.com, jbohac@suse.cz, kys@microsoft.com, mhocko@suse.com, mike.kravetz@oracle.com, mm-commits@vger.kernel.org, mst@redhat.com, naoya.horiguchi@nec.com, osalvador@suse.de, rppt@linux.ibm.com, steven.price@arm.com, sthemmin@microsoft.com, wei.liu@kernel.org, willy@infradead.org, yaoaili@kingsoft.com Subject: [to-be-updated] fs-proc-kcore-pfn_is_ram-check-only-applies-to-kcore_ram.patch removed from -mm tree Message-ID: <20210526224845.UtQhhoohv%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: fs/proc/kcore: pfn_is_ram check only applies to KCORE_RAM has been removed from the -mm tree. Its filename was fs-proc-kcore-pfn_is_ram-check-only-applies-to-kcore_ram.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: David Hildenbrand Subject: fs/proc/kcore: pfn_is_ram check only applies to KCORE_RAM Let's resturcture the code, using switch-case, and checking pfn_is_ram() only when we are dealing with KCORE_RAM. Link: https://lkml.kernel.org/r/20210514172247.176750-3-david@redhat.com Signed-off-by: David Hildenbrand Reviewed-by: Mike Rapoport Cc: Aili Yao Cc: Alexey Dobriyan Cc: Alex Shi Cc: Haiyang Zhang Cc: Jason Wang Cc: Jiri Bohac Cc: "K. Y. Srinivasan" Cc: "Matthew Wilcox (Oracle)" Cc: "Michael S. Tsirkin" Cc: Michal Hocko Cc: Mike Kravetz Cc: Naoya Horiguchi Cc: Oscar Salvador Cc: Roman Gushchin Cc: Stephen Hemminger Cc: Steven Price Cc: Wei Liu Signed-off-by: Andrew Morton --- fs/proc/kcore.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) --- a/fs/proc/kcore.c~fs-proc-kcore-pfn_is_ram-check-only-applies-to-kcore_ram +++ a/fs/proc/kcore.c @@ -483,25 +483,36 @@ read_kcore(struct file *file, char __use goto out; } m = NULL; /* skip the list anchor */ - } else if (!pfn_is_ram(__pa(start) >> PAGE_SHIFT)) { - if (clear_user(buffer, tsz)) { - ret = -EFAULT; - goto out; - } - } else if (m->type == KCORE_VMALLOC) { + goto skip; + } + + switch (m->type) { + case KCORE_VMALLOC: vread(buf, (char *)start, tsz); /* we have to zero-fill user buffer even if no read */ if (copy_to_user(buffer, buf, tsz)) { ret = -EFAULT; goto out; } - } else if (m->type == KCORE_USER) { + break; + case KCORE_USER: /* User page is handled prior to normal kernel page: */ if (copy_to_user(buffer, (char *)start, tsz)) { ret = -EFAULT; goto out; } - } else { + break; + case KCORE_RAM: + if (!pfn_is_ram(__pa(start) >> PAGE_SHIFT)) { + if (clear_user(buffer, tsz)) { + ret = -EFAULT; + goto out; + } + break; + } + fallthrough; + case KCORE_VMEMMAP: + case KCORE_TEXT: if (kern_addr_valid(start)) { /* * Using bounce buffer to bypass the @@ -525,7 +536,15 @@ read_kcore(struct file *file, char __use goto out; } } + break; + default: + pr_warn_once("Unhandled KCORE type: %d\n", m->type); + if (clear_user(buffer, tsz)) { + ret = -EFAULT; + goto out; + } } +skip: buflen -= tsz; *fpos += tsz; buffer += tsz; _ Patches currently in -mm which might be from david@redhat.com are perf-map_executable-does-not-indicate-vm_mayexec.patch binfmt-remove-in-tree-usage-of-map_executable.patch mm-ignore-map_executable-in-ksys_mmap_pgoff.patch mm-make-variable-names-for-populate_vma_page_range-consistent.patch mm-madvise-introduce-madv_populate_readwrite-to-prefault-page-tables.patch maintainers-add-tools-testing-selftests-vm-to-memory-management.patch selftests-vm-add-protection_keys_32-protection_keys_64-to-gitignore.patch selftests-vm-add-test-for-madv_populate_readwrite.patch memory-hotplugrst-complete-admin-guide-overhaul.patch fs-proc-kcore-dont-read-offline-sections-logically-offline-pages-and-hwpoisoned-pages.patch mm-introduce-page_offline_beginendfreezethaw-to-synchronize-setting-pageoffline.patch virtio-mem-use-page_offline_startend-when-setting-pageoffline.patch fs-proc-kcore-use-page_offline_freezethaw.patch