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.7 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,URIBL_BLOCKED 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 D811DC4361B for ; Tue, 15 Dec 2020 03:05:58 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8C893223C8 for ; Tue, 15 Dec 2020 03:05:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C893223C8 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 23E446B0080; Mon, 14 Dec 2020 22:05:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 176B56B0081; Mon, 14 Dec 2020 22:05:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0B4166B0083; Mon, 14 Dec 2020 22:05:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0036.hostedemail.com [216.40.44.36]) by kanga.kvack.org (Postfix) with ESMTP id E9E876B0080 for ; Mon, 14 Dec 2020 22:05:57 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id AF09B8249980 for ; Tue, 15 Dec 2020 03:05:57 +0000 (UTC) X-FDA: 77594027154.27.cub44_1d0d9b827420 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id 94DF73D663 for ; Tue, 15 Dec 2020 03:05:57 +0000 (UTC) X-HE-Tag: cub44_1d0d9b827420 X-Filterd-Recvd-Size: 2747 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf31.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Dec 2020 03:05:57 +0000 (UTC) Date: Mon, 14 Dec 2020 19:05:55 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1608001556; bh=Vpvc8JTQpQJHqfNcnhpmoMK3594F1lsIOGkHmHPsT7s=; h=From:To:Subject:In-Reply-To:From; b=FuUllS0/DvrJSbfrCV7otP1fxmxu1V0EmP3HWnw+XwfTcd9muThAGb1RhYxgyN9Fb fnP7ZgcUbGaPMzN4vjNFvwF7en/shlo7cG30RRt3L/6A9wIfUhGY1jbJODQbSMp6/p SpoAKLuEii3gx5zckILGk6AjN5H6mpQQN3jluFck= From: Andrew Morton To: akpm@linux-foundation.org, apopple@nvidia.com, dan.j.williams@intel.com, hch@lst.de, jgg@nvidia.com, jglisse@redhat.com, jhubbard@nvidia.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, rcampbell@nvidia.com, torvalds@linux-foundation.org, willy@infradead.org Subject: [patch 047/200] mm: handle zone device pages in release_pages() Message-ID: <20201215030555.QvhJGD0Lz%akpm@linux-foundation.org> In-Reply-To: <20201214190237.a17b70ae14f129e2dca3d204@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: From: Ralph Campbell Subject: mm: handle zone device pages in release_pages() release_pages() is an optimized, inlined version of __put_pages() except that zone device struct pages that are not page_is_devmap_managed() (i.e., memory_type MEMORY_DEVICE_GENERIC and MEMORY_DEVICE_PCI_P2PDMA), fall through to the code that could return the zone device page to the page allocator instead of adjusting the pgmap reference count. Clearly these type of pages are not having the reference count decremented to zero via release_pages() or page allocation problems would be seen. Just to be safe, handle the 1 to zero case in release_pages() like __put_page() does. Link: https://lkml.kernel.org/r/20201021194733.11530-1-rcampbell@nvidia.com Signed-off-by: Ralph Campbell Reviewed-by: Christoph Hellwig Cc: Jerome Glisse Cc: John Hubbard Cc: Alistair Popple Cc: Jason Gunthorpe Cc: Dan Williams Cc: Matthew Wilcox Signed-off-by: Andrew Morton --- mm/swap.c | 3 +++ 1 file changed, 3 insertions(+) --- a/mm/swap.c~mm-handle-zone-device-pages-in-release_pages +++ a/mm/swap.c @@ -909,6 +909,9 @@ void release_pages(struct page **pages, put_devmap_managed_page(page); continue; } + if (put_page_testzero(page)) + put_dev_pagemap(page->pgmap); + continue; } if (!put_page_testzero(page)) _