From patchwork Fri Jul 12 22:21:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henry Burns X-Patchwork-Id: 11042715 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5EF1C14C0 for ; Fri, 12 Jul 2019 22:22:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 485F22851B for ; Fri, 12 Jul 2019 22:22:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3BB112852C; Fri, 12 Jul 2019 22:22:29 +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 CD9AA2851B for ; Fri, 12 Jul 2019 22:22:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 608638E016A; Fri, 12 Jul 2019 18:22:27 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5BA0C8E0003; Fri, 12 Jul 2019 18:22:27 -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 4A7ED8E016A; Fri, 12 Jul 2019 18:22:27 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-vk1-f198.google.com (mail-vk1-f198.google.com [209.85.221.198]) by kanga.kvack.org (Postfix) with ESMTP id 296D48E0003 for ; Fri, 12 Jul 2019 18:22:27 -0400 (EDT) Received: by mail-vk1-f198.google.com with SMTP id p193so4566683vkd.7 for ; Fri, 12 Jul 2019 15:22:27 -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:date:message-id:mime-version :subject:from:to:cc; bh=kEx1JTVWGnPw7PBaID0vQzLE5AVxmop4HrGd6+u6kxc=; b=IresLuSWYAY6PDmnZYLOXPxc5Sj7nz8/q4nlcGuhrjMBszJCb9royeoc38CkktMtFE ODnTURKY8Q7sDloiq1ytux6CfH7pVnULgDrJtFZS//vfBmXuZ52riDJwyhoXKa3Q5Hw4 RGt5aStZ/WZn2OYOTqfTcYu+15Cq+BPKYRdo/wlpNrndMui9oYxZ+dwfQIdalgP95tqK /CN3fEoAgZ1HTIrjPGl5CS1BBldIipbbaVBhAFAo1k7Pg42hSsV3tuh5A01i0dCsIPkM kluJK+Q3kth544ekoxpLu0YnQIaef6aO7wFtmAO0Dpk8qCZpF57m/BIn7Kx0FDiWgm2f uesw== X-Gm-Message-State: APjAAAUSEq8J1jyCoGotHPQlDyhWelN8fzjABg4zpYn93YUawfYLr77x J1h21QcjegTc/LcG/vyqHyDOwLGpyMQ+F4Z5xphGAJE+yS9pfJm40QHRkTyS0RJXT6XfKDH2b4R CWlauFNoAkJbXUQdYpd9xv1T+9IkSuzvteyb1cwHD5OQ9VTingJ7ieM/xjmpTUszAQg== X-Received: by 2002:ab0:7782:: with SMTP id x2mr8491098uar.140.1562970146752; Fri, 12 Jul 2019 15:22:26 -0700 (PDT) X-Received: by 2002:ab0:7782:: with SMTP id x2mr8491073uar.140.1562970146012; Fri, 12 Jul 2019 15:22:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562970146; cv=none; d=google.com; s=arc-20160816; b=SX/PTQBWiIM21SgvtI1b/WdV9dAZiSTN++lWdvk1+l6PaLNcwqyt7Zl8H3seRFHIZ4 03W2WhCL4cO+1U30N3BhEUttm0YVwhZTi9x6/82utg5ZpbSPr4XTCjvfvxskn4VtGMTD 8qPvAnGErNHlsFx0xDcB1Q9DLu9xEvur4zvDyXK24R4zStuoTqNT9TsPSJhX8jS0ee5K MYrAb72DYHdCvnwVTui2cCEvo245HW9DuqeCQpNXHkWw0k6sQ+E2fPG3Jy6RsBXhUxQd sGV3jFG9wT2RcU2Q3dDmjJAaKy289pTt5miG6AZrPRTzpgsmIvrEYBD1hK0otpE3Efgl hpoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:mime-version:message-id:date:dkim-signature; bh=kEx1JTVWGnPw7PBaID0vQzLE5AVxmop4HrGd6+u6kxc=; b=l90JeNFn3xLmCPBQZsTIZgJTPd3AZUEpxau+mbr4ZgRiLtOqPPnc8XxfxDkWsxPMbi 3osX+gYVICrLlecLHNJMNp+/KCTu02wYaTMbJ8CPTQTlmYKqhnwLUA5DiaGqhwswgBGS sFvAYnTNckms1PoH+SFnoHBfKePnm/9t3ctsCnkr6gaiMG90cS5AJatr6I47C5vjbqxm uj/8CeEn9TnUTDoHhcKDb2TsEgTgj4v73oPbF7hsqGQMtJEplE4LCiXeXAc/i7hHpRFQ owBroNFHfjCMab1ma8R1VF6DVnKHqDavqD4fN6icY6cvYjEF1K20x+qPuiou7VgbxN7B sKmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=qSqUpYgx; spf=pass (google.com: domain of 3iqgpxqokcmqrox18l41x2qyyqvo.mywvsx47-wwu5kmu.y1q@flex--henryburns.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3IQgpXQoKCMQrox18l41x2qyyqvo.mywvsx47-wwu5kmu.y1q@flex--henryburns.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73]) by mx.google.com with SMTPS id d188sor3141628vkf.72.2019.07.12.15.22.25 for (Google Transport Security); Fri, 12 Jul 2019 15:22:26 -0700 (PDT) Received-SPF: pass (google.com: domain of 3iqgpxqokcmqrox18l41x2qyyqvo.mywvsx47-wwu5kmu.y1q@flex--henryburns.bounces.google.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=qSqUpYgx; spf=pass (google.com: domain of 3iqgpxqokcmqrox18l41x2qyyqvo.mywvsx47-wwu5kmu.y1q@flex--henryburns.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3IQgpXQoKCMQrox18l41x2qyyqvo.mywvsx47-wwu5kmu.y1q@flex--henryburns.bounces.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=date:message-id:mime-version:subject:from:to:cc; bh=kEx1JTVWGnPw7PBaID0vQzLE5AVxmop4HrGd6+u6kxc=; b=qSqUpYgxDFOWLl7WX5ZMCvv2dnzMaJCqPuNXx+1t+LERJgI7++uG0ZO8RDFLJAvyCI 6vtlGj/aPA2PgSjWEt8UtsZ2xZdxNwmtf+811n5cci63SBJXhTeNlao84VjBtwx3aiTl s38YNeMwPr3A3vty/petaHAj8L8Cp0/4FFpjrNOxoaoFY0wMbu+pYKT24o7mxuljGGk1 3n0I9/ZcxrVJxkW7sWptnhLEWk3ERnQ1o+AXflBrA9HjWDQk8m55PwirzEGfHMLb1vh8 q7+siU7xerds1v9PduFCN+C6GGgZPfPvY7YYRFUuFFfJmz0Rx+3B38Y4gM9Pr7Gm2W8t rdAA== X-Google-Smtp-Source: APXvYqw6UZScP0QuYWM6ggxZU6RObcNzc+ZCIWguGEz2HJky3VLBkJe0y3M2lj9SX52WcJWNIbqPrvDmuPtF+BPV X-Received: by 2002:a1f:1d58:: with SMTP id d85mr6949921vkd.13.1562970145444; Fri, 12 Jul 2019 15:22:25 -0700 (PDT) Date: Fri, 12 Jul 2019 15:21:18 -0700 Message-Id: <20190712222118.108192-1-henryburns@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.22.0.510.g264f2c817a-goog Subject: [PATCH] mm/z3fold.c: Allow __GFP_HIGHMEM in z3fold_alloc From: Henry Burns To: Vitaly Wool , Andrew Morton Cc: Vitaly Vul , Shakeel Butt , Jonathan Adams , Greg Kroah-Hartman , Snild Dolkow , Thomas Gleixner , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Henry Burns 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 One of the gfp flags used to show that a page is movable is __GFP_HIGHMEM. Currently z3fold_alloc() fails when __GFP_HIGHMEM is passed. Now that z3fold pages are movable, we allow __GFP_HIGHMEM. We strip the movability related flags from the call to kmem_cache_alloc() for our slots since it is a kernel allocation. Signed-off-by: Henry Burns Acked-by: Vitaly Wool Reviewed-by: Shakeel Butt --- mm/z3fold.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/z3fold.c b/mm/z3fold.c index e78f95284d7c..cb567ddf051c 100644 --- a/mm/z3fold.c +++ b/mm/z3fold.c @@ -193,7 +193,8 @@ static inline struct z3fold_buddy_slots *alloc_slots(struct z3fold_pool *pool, gfp_t gfp) { struct z3fold_buddy_slots *slots = kmem_cache_alloc(pool->c_handle, - gfp); + (gfp & ~(__GFP_HIGHMEM + | __GFP_MOVABLE))); if (slots) { memset(slots->slot, 0, sizeof(slots->slot)); @@ -844,7 +845,7 @@ static int z3fold_alloc(struct z3fold_pool *pool, size_t size, gfp_t gfp, enum buddy bud; bool can_sleep = gfpflags_allow_blocking(gfp); - if (!size || (gfp & __GFP_HIGHMEM)) + if (!size) return -EINVAL; if (size > PAGE_SIZE)