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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 BEB60C55181 for ; Mon, 20 Apr 2020 22:11:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6FB1C2078C for ; Mon, 20 Apr 2020 22:11:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=cmpxchg-org.20150623.gappssmtp.com header.i=@cmpxchg-org.20150623.gappssmtp.com header.b="jSJCSfFn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6FB1C2078C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cmpxchg.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 27DAC8E0009; Mon, 20 Apr 2020 18:11:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 259428E0003; Mon, 20 Apr 2020 18:11:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 121F28E0009; Mon, 20 Apr 2020 18:11:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0034.hostedemail.com [216.40.44.34]) by kanga.kvack.org (Postfix) with ESMTP id E246E8E0003 for ; Mon, 20 Apr 2020 18:11:48 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id A2052181AEF30 for ; Mon, 20 Apr 2020 22:11:48 +0000 (UTC) X-FDA: 76729631496.17.twist65_671431d8c3443 X-HE-Tag: twist65_671431d8c3443 X-Filterd-Recvd-Size: 6560 Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Mon, 20 Apr 2020 22:11:48 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id l60so10007093qtd.8 for ; Mon, 20 Apr 2020 15:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qdvfGvgiqTSSOoBTgsdkzUj0PUR50dAV0CLgbDwpjiQ=; b=jSJCSfFnTO4OPR2PXMMzBOLsjd60fYz1Vz33KEeQxmcKLLFNqwHx+eXNUVCnUa2jgm MQ4870epg/fzfEnY9kY5ISvA7kYnVP/9AuHpnpKNUl/oO0szqT26wFUh2CLiVtMBuEeT ZQ5OHAfKrv2ncOOfaqOue/BLHXBNj0mcCmcukxAk66reBSpYugVJdzKsveaTJa52j0jM 8hWWqm8AlHfx56RV3dkaOZgwf/VK1N06+y7NVVNpwC6B7rOoga8lfZ2wESPCMrP38XY9 mNp05N9AcF1W0XAbs5y1ZVxleAKBZyozJujlPFrpgen1kBAtNDHA683yLdfD8tP2K5ne g74w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qdvfGvgiqTSSOoBTgsdkzUj0PUR50dAV0CLgbDwpjiQ=; b=TcKUk6QEZUuoGsHkBSdOCsVD8Gqv879myfRPOcpXxZo1bXFITND1fvr0/GshbzZk86 zamA6L14vxA+hiN/EljW4Nrpsv31ip2BS9ks0OkEAk/r2ad9OSlq4WYuUBGl+dtqxY08 l+U6V5icEp8bkFHr9CniWuur+tZ2L5f9pojMSQCJHDidGq2EYsWDWg8J1trEB1OHdz7m MYzlePxE2TVelqKmGPGqjUu2OHrlEuQUIMahva+DgN8r8pfJdt5Shxela5DoRYK6lToj UAd1jPCjX/T4Iy+TkcM14hsfQQF4UHtFKPGHXLxMl3SU//JQAiX5Fy8j5XVWvuRRxQ9A LdXw== X-Gm-Message-State: AGi0PuZDsHH+kcFzrLklmn3SP0IePCw/y7jT1DLVBTweRyQcrLx6oBMA 0pssNTX0E5wMnpXOOdrZY7v5Jg== X-Google-Smtp-Source: APiQypLfSIi+vdlDFawvJqDgWwzmcuPG3NT3Wp2BJPzm3VNpRR8NI6wXFm3m0cUbCRlugdLi8j0DTQ== X-Received: by 2002:ac8:16d2:: with SMTP id y18mr18682751qtk.64.1587420707285; Mon, 20 Apr 2020 15:11:47 -0700 (PDT) Received: from localhost ([2620:10d:c091:480::1:e6b6]) by smtp.gmail.com with ESMTPSA id j2sm426943qth.57.2020.04.20.15.11.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 15:11:46 -0700 (PDT) From: Johannes Weiner To: Joonsoo Kim , Alex Shi Cc: Shakeel Butt , Hugh Dickins , Michal Hocko , "Kirill A. Shutemov" , Roman Gushchin , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 04/18] mm: memcontrol: move out cgroup swaprate throttling Date: Mon, 20 Apr 2020 18:11:12 -0400 Message-Id: <20200420221126.341272-5-hannes@cmpxchg.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200420221126.341272-1-hannes@cmpxchg.org> References: <20200420221126.341272-1-hannes@cmpxchg.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: The cgroup swaprate throttling is about matching new anon allocations to the rate of available IO when that is being throttled. It's the io controller hooking into the VM, rather than a memory controller thing. Rename mem_cgroup_throttle_swaprate() to cgroup_throttle_swaprate(), and drop the @memcg argument which is only used to check whether the preceding page charge has succeeded and the fault is proceeding. We could decouple the call from mem_cgroup_try_charge() here as well, but that would cause unnecessary churn: the following patches convert all callsites to a new charge API and we'll decouple as we go along. Signed-off-by: Johannes Weiner --- include/linux/swap.h | 6 ++---- mm/memcontrol.c | 5 ++--- mm/swapfile.c | 14 +++++++------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index b835d8dbea0e..e0380554f4c4 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -645,11 +645,9 @@ static inline int mem_cgroup_swappiness(struct mem_c= group *mem) #endif =20 #if defined(CONFIG_SWAP) && defined(CONFIG_MEMCG) && defined(CONFIG_BLK_= CGROUP) -extern void mem_cgroup_throttle_swaprate(struct mem_cgroup *memcg, int n= ode, - gfp_t gfp_mask); +extern void cgroup_throttle_swaprate(struct page *page, gfp_t gfp_mask); #else -static inline void mem_cgroup_throttle_swaprate(struct mem_cgroup *memcg= , - int node, gfp_t gfp_mask) +static inline void cgroup_throttle_swaprate(struct page *page, gfp_t gfp= _mask) { } #endif diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 5ed8f6651383..711d6dd5cbb1 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6493,12 +6493,11 @@ int mem_cgroup_try_charge(struct page *page, stru= ct mm_struct *mm, int mem_cgroup_try_charge_delay(struct page *page, struct mm_struct *mm, gfp_t gfp_mask, struct mem_cgroup **memcgp) { - struct mem_cgroup *memcg; int ret; =20 ret =3D mem_cgroup_try_charge(page, mm, gfp_mask, memcgp); - memcg =3D *memcgp; - mem_cgroup_throttle_swaprate(memcg, page_to_nid(page), gfp_mask); + if (*memcgp) + cgroup_throttle_swaprate(page, gfp_mask); return ret; } =20 diff --git a/mm/swapfile.c b/mm/swapfile.c index 9c9ab44780ba..74543137371b 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3744,11 +3744,12 @@ static void free_swap_count_continuations(struct = swap_info_struct *si) } =20 #if defined(CONFIG_MEMCG) && defined(CONFIG_BLK_CGROUP) -void mem_cgroup_throttle_swaprate(struct mem_cgroup *memcg, int node, - gfp_t gfp_mask) +void cgroup_throttle_swaprate(struct page *page, gfp_t gfp_mask) { struct swap_info_struct *si, *next; - if (!(gfp_mask & __GFP_IO) || !memcg) + int nid =3D page_to_nid(page); + + if (!(gfp_mask & __GFP_IO)) return; =20 if (!blk_cgroup_congested()) @@ -3762,11 +3763,10 @@ void mem_cgroup_throttle_swaprate(struct mem_cgro= up *memcg, int node, return; =20 spin_lock(&swap_avail_lock); - plist_for_each_entry_safe(si, next, &swap_avail_heads[node], - avail_lists[node]) { + plist_for_each_entry_safe(si, next, &swap_avail_heads[nid], + avail_lists[nid]) { if (si->bdev) { - blkcg_schedule_throttle(bdev_get_queue(si->bdev), - true); + blkcg_schedule_throttle(bdev_get_queue(si->bdev), true); break; } } --=20 2.26.0