Message ID | 20200204013423.aFPO78Un-%akpm@linux-foundation.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=xrrM=3Y=kvack.org=owner-linux-mm@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2A8C613B4 for <patchwork-linux-mm@patchwork.kernel.org>; Tue, 4 Feb 2020 01:34:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EBF5A2087E for <patchwork-linux-mm@patchwork.kernel.org>; Tue, 4 Feb 2020 01:34:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="AjkOfuqc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EBF5A2087E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id CE2806B026C; Mon, 3 Feb 2020 20:34:25 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C41416B026D; Mon, 3 Feb 2020 20:34:25 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B2F8D6B026E; Mon, 3 Feb 2020 20:34:25 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0165.hostedemail.com [216.40.44.165]) by kanga.kvack.org (Postfix) with ESMTP id 97A736B026C for <linux-mm@kvack.org>; Mon, 3 Feb 2020 20:34:25 -0500 (EST) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 40857180AD802 for <linux-mm@kvack.org>; Tue, 4 Feb 2020 01:34:25 +0000 (UTC) X-FDA: 76450724490.10.dress20_972c90f98154 X-Spam-Summary: 2,0,0,0405c648340b345b,d41d8cd98f00b204,akpm@linux-foundation.org,:akpm@linux-foundation.org:aneesh.kumar@linux.ibm.com:dan.j.williams@intel.com:david@redhat.com:gregkh@linuxfoundation.org::logang@deltatee.com:mhocko@suse.com:mm-commits@vger.kernel.org:osalvador@suse.de:pagupta@redhat.com:pasha.tatashin@soleen.com:torvalds@linux-foundation.org:willy@infradead.org,RULES_HIT:41:69:355:379:421:800:960:967:968:973:988:989:1260:1263:1345:1359:1381:1431:1437:1534:1542:1711:1730:1747:1777:1792:2393:2525:2559:2563:2682:2685:2859:2902:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3353:3865:3866:3867:3868:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:5007:6117:6119:6261:6653:6737:7576:7903:8599:9025:9545:9592:10004:10913:11026:11473:11658:11914:12043:12048:12296:12297:12517:12519:12555:12679:12783:12986:13161:13229:13846:14181:14721:14849:21080:21451:21627:21939:21990:30034:30054:30064,0,RBL:error,CacheIP:none,Bayesian:0.5,0.5,0.5,Netche ck:none, X-HE-Tag: dress20_972c90f98154 X-Filterd-Recvd-Size: 3659 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf41.hostedemail.com (Postfix) with ESMTP for <linux-mm@kvack.org>; Tue, 4 Feb 2020 01:34:24 +0000 (UTC) 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 C589D2084E; Tue, 4 Feb 2020 01:34:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580780064; bh=NViNBs+x4bf40601PW0NnopsWVFxNddh71XdhK1tAB4=; h=Date:From:To:Subject:In-Reply-To:From; b=AjkOfuqce0mcthNpDMKUsNe0kuMZt/ZSywPkW4hTAS/8PugUQ3Iw1mmYuDN0XJaOW ILccV2dw0mHtYLziGxEkGu2pAMT+/VYqOlEobkpwB18YTqaV1egM7/t5n/B2cajfe/ u75Hr/jmzrqZDI3EaEFIkTQcyvnjurUmcM/uLs6I= Date: Mon, 03 Feb 2020 17:34:23 -0800 From: Andrew Morton <akpm@linux-foundation.org> To: akpm@linux-foundation.org, aneesh.kumar@linux.ibm.com, dan.j.williams@intel.com, david@redhat.com, gregkh@linuxfoundation.org, linux-mm@kvack.org, logang@deltatee.com, mhocko@suse.com, mm-commits@vger.kernel.org, osalvador@suse.de, pagupta@redhat.com, pasha.tatashin@soleen.com, torvalds@linux-foundation.org, willy@infradead.org Subject: [patch 12/67] mm/memory_hotplug: cleanup __remove_pages() Message-ID: <20200204013423.aFPO78Un-%akpm@linux-foundation.org> In-Reply-To: <20200203173311.6269a8be06a05e5a4aa08a93@linux-foundation.org> User-Agent: s-nail v14.8.16 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: <linux-mm.kvack.org> |
Series |
[01/67] ocfs2: fix oops when writing cloned file
|
expand
|
--- a/mm/memory_hotplug.c~mm-memory_hotplug-cleanup-__remove_pages +++ a/mm/memory_hotplug.c @@ -516,25 +516,20 @@ static void __remove_section(unsigned lo void __remove_pages(unsigned long pfn, unsigned long nr_pages, struct vmem_altmap *altmap) { + const unsigned long end_pfn = pfn + nr_pages; + unsigned long cur_nr_pages; unsigned long map_offset = 0; - unsigned long nr, start_sec, end_sec; map_offset = vmem_altmap_offset(altmap); if (check_pfn_span(pfn, nr_pages, "remove")) return; - start_sec = pfn_to_section_nr(pfn); - end_sec = pfn_to_section_nr(pfn + nr_pages - 1); - for (nr = start_sec; nr <= end_sec; nr++) { - unsigned long pfns; - + for (; pfn < end_pfn; pfn += cur_nr_pages) { cond_resched(); - pfns = min(nr_pages, PAGES_PER_SECTION - - (pfn & ~PAGE_SECTION_MASK)); - __remove_section(pfn, pfns, map_offset, altmap); - pfn += pfns; - nr_pages -= pfns; + /* Select all remaining pages up to the next section boundary */ + cur_nr_pages = min(end_pfn - pfn, -(pfn | PAGE_SECTION_MASK)); + __remove_section(pfn, cur_nr_pages, map_offset, altmap); map_offset = 0; } }