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=-16.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,T_DKIMWL_WL_MED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 3F91DC43219 for ; Thu, 2 May 2019 20:09:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EBA96206DF for ; Thu, 2 May 2019 20:09:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="tQPSQA19" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725995AbfEBUJJ (ORCPT ); Thu, 2 May 2019 16:09:09 -0400 Received: from mail-pg1-f202.google.com ([209.85.215.202]:36050 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725962AbfEBUJJ (ORCPT ); Thu, 2 May 2019 16:09:09 -0400 Received: by mail-pg1-f202.google.com with SMTP id l13so1808408pgp.3 for ; Thu, 02 May 2019 13:09:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=ybRTyJtBXApIl4yXjoSrJV3yhQpiIq0fhWYqnNEgzIQ=; b=tQPSQA19CW9fimawq50GdgkxoHSAU1X8/5KprS0qxaalkY+Oqt4IiwaSj476gWvnzH CdzSr0rzQmjIJoxtVNzO+KyiDpBk6y16H1KfV0UAIxj3y3F1fYoBbYiqFAm7yDgoNMxe ME59YcdyH8pGSL7Avbi9BR+67ZDfauQ4srgClkTh9/Y5JUb8rYEu/r8twcI8HKck24D7 kMgqgxBWM8juVKTdcnC4aGYsXJQ/2U6orFXV+WY8wXX3xq58CCAubuuy0X2gWFf6ZNQj KENL34+LaJQnBHMs+FUDFkaOn3fy5+nUSDlXdBlaPER2tnQGYFHyfhmR0xYmDmgWURUH okHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=ybRTyJtBXApIl4yXjoSrJV3yhQpiIq0fhWYqnNEgzIQ=; b=ctcx7s9BcdOM8A4HXq1vt2hyIPnjvBBgoUOgHD7MDI8O834iZf5p9Z18ODSFzrX/WR Fs3bkwvNg+Hn4EjQBwXSQ+VFI7OGoFTtXXim3+pwNYJ8R7O00XEPWd1dTOmzO/jJ3X8L WSD2H1sKqiCVgcQ4F92tJby8D5tf7ssaL3aqhEBzHeLqzZhDromEqbVAkJNxeIwkJprK Z4xvZgWk27nZh/4+AlF/f+wN9JOt24yQ+otmEoXuXbtvKfynLauxCQbK9HYh429PnbQZ dfeTSQWp9lbGABioigUVK0P5WBQKKK3LZYKOghpVz/9/LGkL4ipTrOaWKGNk2KM5nRuz P9sg== X-Gm-Message-State: APjAAAUXh7P7SxiZh7kL5ZJHYHvr1UlWrfi8zrwIUJOegN+E93jcR/vp 8a09xgvYXJR1ZNCu9VfYVM94sFFrcCwdxrBbsicDEK2YUDu4l1ldROiaTqpcR/nNdlQgs3STfGI Av4aN+dksY/6prNfULl/OLDHZ2qxK89dxba/jhnUHHu2YNASjBdjbV1tM+wOO+v/CuR83E4EhXQ == X-Google-Smtp-Source: APXvYqzy98BDo1ZjElAaJ7XsMXlxmeun8/ZLIFvSs9QWn92BJ/S4D4Nu+M2yCAtukoQsZunQjUKT0XW+BCHmhsZSrg== X-Received: by 2002:a65:5c82:: with SMTP id a2mr5996693pgt.378.1556827748039; Thu, 02 May 2019 13:09:08 -0700 (PDT) Date: Thu, 2 May 2019 13:09:05 -0700 Message-Id: <20190502200905.147551-1-rkolchmeyer@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog Subject: [PATCH] mm: do not stall register_shrinker() From: Robert Kolchmeyer To: stable@vger.kernel.org Cc: Minchan Kim , Shakeel Butt , Johannes Weiner , Michal Hocko , Tetsuo Handa , Anshuman Khandual , Robert Kolchmeyer Content-Type: text/plain; charset="UTF-8" Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Minchan Kim commit e496612c5130567fc9d5f1969ca4b86665aa3cbb upstream. Shakeel Butt reported he has observed in production systems that the job loader gets stuck for 10s of seconds while doing a mount operation. It turns out that it was stuck in register_shrinker() because some unrelated job was under memory pressure and was spending time in shrink_slab(). Machines have a lot of shrinkers registered and jobs under memory pressure have to traverse all of those memcg-aware shrinkers and affect unrelated jobs which want to register their own shrinkers. To solve the issue, this patch simply bails out slab shrinking if it is found that someone wants to register a shrinker in parallel. A downside is it could cause unfair shrinking between shrinkers. However, it should be rare and we can add compilcated logic if we find it's not enough. [akpm@linux-foundation.org: tweak code comment] Link: http://lkml.kernel.org/r/20171115005602.GB23810@bbox Link: http://lkml.kernel.org/r/1511481899-20335-1-git-send-email-minchan@kernel.org Signed-off-by: Minchan Kim Signed-off-by: Shakeel Butt Reported-by: Shakeel Butt Tested-by: Shakeel Butt Acked-by: Johannes Weiner Acked-by: Michal Hocko Cc: Tetsuo Handa Cc: Anshuman Khandual Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds [rkolchmeyer: Backported to 4.14: adjusted context] Signed-off-by: Robert Kolchmeyer --- Backport of commit e496612c5130567fc9d5f1969ca4b86665aa3cbb upstream. We would like to apply this to linux-4.14.y. I needed to change the patch context for the patch to apply to linux-4.14.y. The actual fix remains unchanged. mm/vmscan.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mm/vmscan.c b/mm/vmscan.c index 9734e62654fa..99837e931f53 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -502,6 +502,15 @@ static unsigned long shrink_slab(gfp_t gfp_mask, int nid, sc.nid = 0; freed += do_shrink_slab(&sc, shrinker, nr_scanned, nr_eligible); + /* + * Bail out if someone want to register a new shrinker to + * prevent the regsitration from being stalled for long periods + * by parallel ongoing shrinking. + */ + if (rwsem_is_contended(&shrinker_rwsem)) { + freed = freed ? : 1; + break; + } } up_read(&shrinker_rwsem); -- 2.21.0.593.g511ec345e18-goog