From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932294AbdKBFmb (ORCPT ); Thu, 2 Nov 2017 01:42:31 -0400 Received: from mga14.intel.com ([192.55.52.115]:47078 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751105AbdKBFm3 (ORCPT ); Thu, 2 Nov 2017 01:42:29 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,332,1505804400"; d="scan'208";a="170299839" From: "Huang, Ying" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Tim Chen , Michal Hocko , stable@vger.kernel.org, "Huang, Ying" , Christian Kujau , Minchan Kim Subject: [PATCH -mm -V3] mm, swap: Fix false error message in __swp_swapcount() Date: Thu, 2 Nov 2017 13:42:25 +0800 Message-Id: <20171102054225.22897-1-ying.huang@intel.com> X-Mailer: git-send-email 2.14.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Huang Ying When a page fault occurs for a swap entry, the physical swap readahead (not the VMA base swap readahead) may readahead several swap entries after the fault swap entry. The readahead algorithm calculates some of the swap entries to readahead via increasing the offset of the fault swap entry without checking whether they are beyond the end of the swap device and it relys on the __swp_swapcount() and swapcache_prepare() to check it. Although __swp_swapcount() checks for the swap entry passed in, it will complain with the error message as follow for the expected invalid swap entry. This may make the end users confused. swap_info_get: Bad swap offset entry 0200f8a7 To fix the false error message, the swap entry checking is added in swapin_readahead() to avoid to pass the out-of-bound swap entries and the swap entry reserved for the swap header to __swp_swapcount() and swapcache_prepare(). Cc: Tim Chen Cc: Michal Hocko Cc: # 4.11-4.13 Fixes: e8c26ab60598 ("mm/swap: skip readahead for unreferenced swap slots") Reported-by: Christian Kujau Suggested-by: Minchan Kim Signed-off-by: "Huang, Ying" --- mm/swap_state.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mm/swap_state.c b/mm/swap_state.c index 6c017ced11e6..6c33ebd193a9 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -558,6 +558,7 @@ struct page *swapin_readahead(swp_entry_t entry, gfp_t gfp_mask, unsigned long offset = entry_offset; unsigned long start_offset, end_offset; unsigned long mask; + struct swap_info_struct *si = swp_swap_info(entry); struct blk_plug plug; bool do_poll = true, page_allocated; @@ -571,6 +572,8 @@ struct page *swapin_readahead(swp_entry_t entry, gfp_t gfp_mask, end_offset = offset | mask; if (!start_offset) /* First page is swap header. */ start_offset++; + if (end_offset >= si->max) + end_offset = si->max - 1; blk_start_plug(&plug); for (offset = start_offset; offset <= end_offset ; offset++) { -- 2.14.2