From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932104AbdBGTSt (ORCPT ); Tue, 7 Feb 2017 14:18:49 -0500 Received: from mail-pg0-f54.google.com ([74.125.83.54]:34355 "EHLO mail-pg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755096AbdBGTSp (ORCPT ); Tue, 7 Feb 2017 14:18:45 -0500 Date: Tue, 7 Feb 2017 11:11:16 -0800 (PST) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Linus Torvalds cc: Andrew Morton , Nicholas Piggin , Wu Fengguang , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH] mm: fix KPF_SWAPCACHE Message-ID: User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.10-rc1 commit 6326fec1122c ("mm: Use owner_priv bit for PageSwapCache, valid when PageSwapBacked") aliased PG_swapcache to PG_owner_priv_1: so /proc/kpageflags' KPF_SWAPCACHE should now be synthesized, instead of being shown on unrelated pages which have PG_owner_priv_1 set. Signed-off-by: Hugh Dickins --- fs/proc/page.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- 4.10-rc7/fs/proc/page.c 2016-12-25 18:40:50.618454962 -0800 +++ linux/fs/proc/page.c 2017-02-07 10:28:51.019640392 -0800 @@ -173,7 +173,8 @@ u64 stable_page_flags(struct page *page) u |= kpf_copy_bit(k, KPF_ACTIVE, PG_active); u |= kpf_copy_bit(k, KPF_RECLAIM, PG_reclaim); - u |= kpf_copy_bit(k, KPF_SWAPCACHE, PG_swapcache); + if (PageSwapCache(page)) + u |= 1 << KPF_SWAPCACHE; u |= kpf_copy_bit(k, KPF_SWAPBACKED, PG_swapbacked); u |= kpf_copy_bit(k, KPF_UNEVICTABLE, PG_unevictable);