From patchwork Thu Oct 14 15:16:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 12558755 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6AEC6C433EF for ; Thu, 14 Oct 2021 15:16:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EAA15603E5 for ; Thu, 14 Oct 2021 15:16:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EAA15603E5 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 40309900003; Thu, 14 Oct 2021 11:16:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B36E900002; Thu, 14 Oct 2021 11:16:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C926900003; Thu, 14 Oct 2021 11:16:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0021.hostedemail.com [216.40.44.21]) by kanga.kvack.org (Postfix) with ESMTP id 1BEE7900002 for ; Thu, 14 Oct 2021 11:16:16 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id B5E6F18162A77 for ; Thu, 14 Oct 2021 15:16:15 +0000 (UTC) X-FDA: 78695393910.07.C5A9301 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf11.hostedemail.com (Postfix) with ESMTP id 5FDAFF0000B5 for ; Thu, 14 Oct 2021 15:16:15 +0000 (UTC) Received: by mail-pl1-f202.google.com with SMTP id q7-20020a170902edc700b0013f15c17dd0so2564882plk.23 for ; Thu, 14 Oct 2021 08:16:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=8lwRp3uP8+IKYysxWAf8gbvxjj8gBa/nFz3RxTvcuPo=; b=oJGw/QMmi9y17ZRzapZ6AW2NqjA67q2aRYewaRrOpIgd5leninbEz/X70fFAv2Tkyr tK4schSZy5xEATUYHCSx4ertgr+8G6lysBxuYmHYCKm01igmwtPNBZL10n9vtUHVoceC O7oUkdYT3NMshazQZbMIaGQsREoQuo5eao+1Z3zZ0z6M7E7FFD2JSQobCOQqG6y+Un5y XTzKDHVN9DkIcxjf9l3ztuNBu5zq+mMErnq7BEW+9GDjPOdw2fBMz1p4RTBFrTeVi6u8 Q0sR/ABZD6FSDzNrx4/Hw2+/7E/qpUZ+2z90EwCVBL3U9JP9G7tL22uJ7LCj3EiyYaFS VNPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=8lwRp3uP8+IKYysxWAf8gbvxjj8gBa/nFz3RxTvcuPo=; b=Hs4l+Fvnc0oUcJ8y/5FKCg6zR/p6SjAyS6WjEXpKmE5eRd+p5GWUxLzbbkf4Umgdua PhmZT9WuQ58iZGxeFwKr7bE5ROrOxZniiv8PKh+4ZlJ6IdFIR7UpFHaQZTe0b7Q8EQJF M/dJrwr2R2OZQ3ymxvKpiJtlQ1snWhJEgBmIQXlUfGIl6XIPQl2RoHH2FQbaivMybEp9 +UzmCwzrDGFY4VLVZvrNrS0amXMtyUWAeIDXzO/1qKE9MxY0sPwbiHHeRy9ayYvo+U4I 7SB6JmvRK0s6SQhKCZPGQR3IdcTXwQ9YT2WW30p+biTz9IAm1yowI9xl0Da0CcXJMBhW ogVA== X-Gm-Message-State: AOAM5312RLRYJwhZd4ZUMZt7wb9i8cNKnGPQ1kZIbV1SRK30pkIvp1Qu pillaCUjgf/vupEeKFfLu9FngDoHlsWbWA== X-Google-Smtp-Source: ABdhPJw+Wctx4vD1oG672/mLpw+81PzUDFwQ6/X9iV9MtZR4g0zPLuHZt2SN2+IVZ+mEQ6AmxssCTwZmjPSGYg== X-Received: from shakeelb.svl.corp.google.com ([2620:15c:2cd:202:1581:9ea1:b658:109a]) (user=shakeelb job=sendgmr) by 2002:a17:90b:1d0d:: with SMTP id on13mr6901295pjb.118.1634224574128; Thu, 14 Oct 2021 08:16:14 -0700 (PDT) Date: Thu, 14 Oct 2021 08:16:07 -0700 Message-Id: <20211014151607.2171970-1-shakeelb@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog Subject: [PATCH v2] memcg: page_alloc: skip bulk allocator for __GFP_ACCOUNT From: Shakeel Butt To: Johannes Weiner , Michal Hocko , Mel Gorman Cc: Uladzislau Rezki , Vasily Averin , Roman Gushchin , Matthew Wilcox , Andrew Morton , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Shakeel Butt X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 5FDAFF0000B5 X-Stat-Signature: ymjhzfd5r1f3qerbefycz7cxsjg9e3sm Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b="oJGw/QMm"; spf=pass (imf11.hostedemail.com: domain of 3vkloYQgKCAUxmfpjjqglttlqj.htrqnsz2-rrp0fhp.twl@flex--shakeelb.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3vkloYQgKCAUxmfpjjqglttlqj.htrqnsz2-rrp0fhp.twl@flex--shakeelb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-HE-Tag: 1634224575-214264 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 commit 5c1f4e690eec ("mm/vmalloc: switch to bulk allocator in __vmalloc_area_node()") switched to bulk page allocator for order 0 allocation backing vmalloc. However bulk page allocator does not support __GFP_ACCOUNT allocations and there are several users of kvmalloc(__GFP_ACCOUNT). For now make __GFP_ACCOUNT allocations bypass bulk page allocator. In future if there is workload that can be significantly improved with the bulk page allocator with __GFP_ACCCOUNT support, we can revisit the decision. Fixes: 5c1f4e690eec ("mm/vmalloc: switch to bulk allocator in __vmalloc_area_node()") Signed-off-by: Shakeel Butt Acked-by: David Hildenbrand Acked-by: Michal Hocko Acked-by: Roman Gushchin Acked-by: Johannes Weiner --- Changes since v1: - do fallback allocation instead of failure, suggested by Michal Hocko. - Added memcg_kmem_enabled() check, corrected by Vasily Averin mm/page_alloc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 668edb16446a..9ca871dc8602 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5230,6 +5230,10 @@ unsigned long __alloc_pages_bulk(gfp_t gfp, int preferred_nid, if (unlikely(page_array && nr_pages - nr_populated == 0)) goto out; + /* Bulk allocator does not support memcg accounting. */ + if (memcg_kmem_enabled() && (gfp & __GFP_ACCOUNT)) + goto failed; + /* Use the single page allocator for one page. */ if (nr_pages - nr_populated == 1) goto failed;