Message ID | 20200601174031.285173461@linuxfoundation.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <SRS0=Ycwd=7O=vger.kernel.org=stable-owner@kernel.org> 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 4B7D0C433E2 for <stable@archiver.kernel.org>; Mon, 1 Jun 2020 18:51:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 29A8920679 for <stable@archiver.kernel.org>; Mon, 1 Jun 2020 18:51:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591037497; bh=HfDsW7E7FnbB8ARdUvhq0rfqvewORS1KytEwONRTS0c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XmHpBkEQttEzn7H9zxDS8vVV+AMnMf93bEUdo/BmUqQAdPv9WZ6OLyz3ojE5RwckD pF+TpzC35W0kJEtqhJLtxeCdOF2v33slpEocVrUW9Ef2nOXyuOTU9DrdPEPyCYn74t mSRflFhc0ZBBqSFLD6sSO3J1Of7pj1DcCVHDKf1M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730265AbgFASEy (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 1 Jun 2020 14:04:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:49790 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730261AbgFASEx (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 1 Jun 2020 14:04:53 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 5B07F206E2; Mon, 1 Jun 2020 18:04:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034691; bh=HfDsW7E7FnbB8ARdUvhq0rfqvewORS1KytEwONRTS0c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=067COvTN8iDmDJ0VssX8yX1O1cmihJ0swps9A5Oec+lcDqMlyf8DFt4x82JHB8MAf MrkATZqyjqQ1v1jFqAEHxYs/wVTuG3hI7jK4l62jGeDxLyGtsW6IHtQbwT8ndQA95H azyd07XUMyPa3qrF3Zw2JMDnUALZE4eC/d6aBJvM= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Konstantin Khlebnikov <khlebnikov@yandex-team.ru>, Andrew Morton <akpm@linux-foundation.org>, Hugh Dickins <hughd@google.com>, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>, Vlastimil Babka <vbabka@suse.cz>, David Rientjes <rientjes@google.com>, Linus Torvalds <torvalds@linux-foundation.org>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.19 65/95] mm: remove VM_BUG_ON(PageSlab()) from page_mapcount() Date: Mon, 1 Jun 2020 19:54:05 +0200 Message-Id: <20200601174031.285173461@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174020.759151073@linuxfoundation.org> References: <20200601174020.759151073@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
diff --git a/include/linux/mm.h b/include/linux/mm.h index 45f10f5896b7..b1092046ebef 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -602,6 +602,11 @@ static inline void *kvcalloc(size_t n, size_t size, gfp_t flags) extern void kvfree(const void *addr); +/* + * Mapcount of compound page as a whole, does not include mapped sub-pages. + * + * Must be called only for compound pages or any their tail sub-pages. + */ static inline int compound_mapcount(struct page *page) { VM_BUG_ON_PAGE(!PageCompound(page), page); @@ -621,10 +626,16 @@ static inline void page_mapcount_reset(struct page *page) int __page_mapcount(struct page *page); +/* + * Mapcount of 0-order page; when compound sub-page, includes + * compound_mapcount(). + * + * Result is undefined for pages which cannot be mapped into userspace. + * For example SLAB or special types of pages. See function page_has_type(). + * They use this place in struct page differently. + */ static inline int page_mapcount(struct page *page) { - VM_BUG_ON_PAGE(PageSlab(page), page); - if (unlikely(PageCompound(page))) return __page_mapcount(page); return atomic_read(&page->_mapcount) + 1;