From patchwork Mon Jul 2 22:02:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 10502517 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4C96D6028F for ; Mon, 2 Jul 2018 22:02:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C36C289E0 for ; Mon, 2 Jul 2018 22:02:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E4C328C50; Mon, 2 Jul 2018 22:02:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 969F5289E0 for ; Mon, 2 Jul 2018 22:02:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 815C16B028F; Mon, 2 Jul 2018 18:02:16 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 79F7C6B0290; Mon, 2 Jul 2018 18:02:16 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6412F6B0291; Mon, 2 Jul 2018 18:02:16 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f197.google.com (mail-pf0-f197.google.com [209.85.192.197]) by kanga.kvack.org (Postfix) with ESMTP id 1EA006B028F for ; Mon, 2 Jul 2018 18:02:16 -0400 (EDT) Received: by mail-pf0-f197.google.com with SMTP id g20-v6so9263471pfi.2 for ; Mon, 02 Jul 2018 15:02:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=SKh13LkMK7j4XBTqGSWo1FUAYyaM8xDSpOf54EkY4xc=; b=oMSwcV1OklCx4IC27ZVu5WVo6E7Nk2kWjdhnT3DR49NnBtfifSXQrxYDz342XnZzm0 SeD2feOY9cpj4yqFa4C+OoZxgJdgnl3C310XGlqUVMR/qneoYUGiE1eYUDCdgapJ0ulw MtyYr92OkrWWqNVXVa8PlQttVJWyGiDsywNEpVFYTskhPyN0vNGbmpiXc/KWsV8O6Fo9 tUFEmZOl16HlQXGJMV+Fc2F9jIO4M8TOMgp+4uSYXiaMc1sR1A1tnEecY656JSvqrEuv kLiejRokMij+FkIhyxBKyjmHHgQ2yp+qSKc3gwfBbX1UYIQZiJ8l9/ZFmxHGfoCPYdqn 51Pg== X-Gm-Message-State: APt69E1JHqjEOj4YR3AaHfUeAYmFKIi+s5kISXOjXL8Z+Rs2Z+LgRI3L 7Vr9WrG2pFx41tNuIccRTYRgYu8esI7n1IZFC4uECCqQJqxXvn574FAZ5CJAI/JTPFgccaKJVqD +0sL3Ul71QN3ESbMrteFBlX1LBlSazekxBEJvjginm7XgxgKpJyPDBrByOyg6QWb8Z+hGnCkFvI Y4jBXtsz82ruT1ofmuj+JAjGDyWkDGH2cYsSjEMrBmOWVAf2bToRHnvyp4CJTEBj9wjTXlEYdAr XbxH7qJLvDZgEx/LPgRbG5kD7Nn+5pFW84DnbyIe4QmvjzC+4mDI5KW/FM19PK9Ow23V0vJChq5 9ZBVOeGYDS3V1rtJzHJoMRTI/JbFZmWoC8FRuhDOqBCM4s8Nxbfstn6Q5ZKERuMi/WY8s6xb2mx 5 X-Received: by 2002:a17:902:44a4:: with SMTP id l33-v6mr27395734pld.134.1530568935810; Mon, 02 Jul 2018 15:02:15 -0700 (PDT) X-Received: by 2002:a17:902:44a4:: with SMTP id l33-v6mr27395689pld.134.1530568935164; Mon, 02 Jul 2018 15:02:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530568935; cv=none; d=google.com; s=arc-20160816; b=yiHtDG1g9XnxTEZwQias8lChHiURFnZ67YQfFxa3rqi6Ihoc9C3Ue3hW6jnJoDmJo+ Q473WWECbtz4XAVWc92OsXEoyV2FUOJ1xFiPzbpF06GXV/cBM+Nh1KW4u/cIubV30uGp vBw8dSRAmxniTu1128yWubGfBWJDx1MQeTGS7naXahvoHl3VUxqI3sAGEBeATxKfV8v5 b7NFGyHqJiJMl5QGPqE8oWfxPthz2ZpZcCnCm1qwHFYzvGoYuYKoA99JXMeg9PuRmMVW nFEQiXImBamnzxPFbCn/ipQ8HgVIjNlcsydeYAItls0SucjFnia5ocSnFeLtgsf5SfKE 0Xqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=SKh13LkMK7j4XBTqGSWo1FUAYyaM8xDSpOf54EkY4xc=; b=kKgY1abMnlmnkChrGeDNb91oZMVPwMJ6pLm/GCHKX3yPaPv/HkQE9C25EYr6LHCEJj O3S3phDCGHUGE0oXiAKVofvNkjzcE4l2RAIO793KUdREdefnfuuFyrek2e80xQhzwY/f SOxXF/aNY//X9xU9lg2+OHiLhJ/j87iBdTP3KR1PSDGg2TPHJMleynJozNOFG1yCj0PL NLwBteZ8lqM0jjotYNLNsCOSNr4QrJnByXU5pPGONOO2Sb1QnMgcBv+F1ItEvq3p/dkU AYcDL9bCMZhpLyEXoykvXTF7Wp1mk/jpvkHLLjySrrgKHIeqbdLXIrW81N9IYQvEVYvZ fKuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=BIX13R4u; spf=pass (google.com: domain of shakeelb@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=shakeelb@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id c198-v6sor3352805pga.143.2018.07.02.15.02.14 for (Google Transport Security); Mon, 02 Jul 2018 15:02:15 -0700 (PDT) Received-SPF: pass (google.com: domain of shakeelb@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=BIX13R4u; spf=pass (google.com: domain of shakeelb@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=shakeelb@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SKh13LkMK7j4XBTqGSWo1FUAYyaM8xDSpOf54EkY4xc=; b=BIX13R4uPRJtUM2PLlfjFO375WJjIr/xwG5flMI5/HPb0pYm0GAJkCCPP7VHJU81gk mIXY4jMFemSOyMDxscgDBoW7trqcZRH98FDUXyKyrs+99rzrsjB2BCotiDSdQBwbYA4J CFzNkd9a8Nop7151PRu3U9QYT41r6cWSBb/shBNYr7RGA8sq2p0+M29lHar1VfDA+fdO 2tEJjJWMVRq0v5TRF+gSdyFwCd3J1HtgW5s4SQdM85jpJFq2zesaeqlX9QYolhL9ufDw sm7t3L0a3SYwHu9KoYuNM30yRaQmRkEa/WAKgYAhl58kwUsEsc65gUI8VBFx6O3hT9VT Wy1g== X-Google-Smtp-Source: AAOMgpcliNZPckQaC46iuvQtF9How/enwOSB/pM5GeWlhaTt9BWoTFO+Fi+zqcouktLe6xBVmTl99Q== X-Received: by 2002:a63:1546:: with SMTP id 6-v6mr8808447pgv.271.1530568934429; Mon, 02 Jul 2018 15:02:14 -0700 (PDT) Received: from shakeelb.mtv.corp.google.com ([2620:15c:2cb:201:3a5f:3a4f:fa44:6b63]) by smtp.gmail.com with ESMTPSA id i89-v6sm30086229pfi.170.2018.07.02.15.02.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jul 2018 15:02:13 -0700 (PDT) From: Shakeel Butt To: Andrew Morton Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Shakeel Butt Subject: [PATCH] fs-mm-account-buffer_head-to-kmemcg.patch.fix Date: Mon, 2 Jul 2018 15:02:08 -0700 Message-Id: <20180702220208.213380-1-shakeelb@google.com> X-Mailer: git-send-email 2.18.0.399.gad0ab374a1-goog In-Reply-To: <20180627191250.209150-3-shakeelb@google.com> References: <20180627191250.209150-3-shakeelb@google.com> 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: X-Virus-Scanned: ClamAV using ClamSMTP The patch "fs, mm: account buffer_head to kmemcg" missed to add __GFP_ACCOUNT flag into the gfp mask for directed memcg charging. So, adding it. Andrew, please squash this into the original patch. Signed-off-by: Shakeel Butt --- fs/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/buffer.c b/fs/buffer.c index e08863af56f6..405d4723ed3d 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -814,7 +814,7 @@ struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size, bool retry) { struct buffer_head *bh, *head; - gfp_t gfp = GFP_NOFS; + gfp_t gfp = GFP_NOFS | __GFP_ACCOUNT; long offset; struct mem_cgroup *memcg;