Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp2392179iob; Sat, 30 Apr 2022 07:22:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRi9cWqA7AEqHtJFX+hcv5sPnwLu67DfsGXFPioxFGlOV2fac4MUhSD9/PkkqJZGy8EsKR X-Received: by 2002:ac2:5f4d:0:b0:448:7d37:5838 with SMTP id 13-20020ac25f4d000000b004487d375838mr3199319lfz.419.1651328571652; Sat, 30 Apr 2022 07:22:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651328571; cv=none; d=google.com; s=arc-20160816; b=NVfs3kROlSItMZSAUiHQurhyRyvdWJMn1B1ZTw/1XKwlcwcLD9MxBQNRqPLep9sgOi vpxq5d/HITRPlYy/kLjhR5Hzs+Mm/Z8UEn31JMcd8M6+4t+9oe00lnD6NZJDGVsLtAsx JID/ahGEgHZ2M4QlNsInmx4OSqqtJqiUMsrMUmADiABI48fbwpnoiSY9umB94UhcYR5r 41h6YuvGsuiRoLM7AJCxD2oUC6BlPtIEp5WhyhIGPz15RnWmPnOZV1oPXr3+0rz5Hq1N OlThhmzDSRr8eDhhaSZTubw18Z+EaA+GDQuFXeHvSaiHIdSZ/h0cRPwRlr8cbDpgnvic Fg5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=w26nTZDKmn0VjlBGU5u2opukQnCxdYTVQXqmJ2gAt0Q=; b=xvEEmYBRMLvgzcv1ch/4StY8T99Ss3sAfAvgFKOy8bBkRcEtCSuVd4Flk1v9ZYG3g/ JomtFnBhyCs7v9pwJCW3FJbI5QfIxWbN5D87kmisW8J6bXIQyd5Izm3MhqofK7JdldnA bHhASj3I4NCMgPmEqKEm73eN0BOz5kkkduS9X+zEyhtgvTK9PCKlwXKbY4dkWmEBCiMG PDRIMH2ii8R1EmHYxHxdvWAsua6qm8DwTUouE4RsF21Xl0gGZbXA+5lq+HNcUP+6eE1n v50gGTQmEFnYlC/OOyhvmamxz7j7u+yRz68ocN5hLPr6f9+8XsiTX9ABXFqdf/NZogLD UwbA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x28-20020ac2489c000000b0044a691e1d98si8811941lfc.377.2022.04.30.07.22.23; Sat, 30 Apr 2022 07:22:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354736AbiD2Go0 (ORCPT + 99 others); Fri, 29 Apr 2022 02:44:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354668AbiD2Gnx (ORCPT ); Fri, 29 Apr 2022 02:43:53 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F743B9F29 for ; Thu, 28 Apr 2022 23:40:36 -0700 (PDT) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4KqNCJ4bp4zhYWh; Fri, 29 Apr 2022 14:40:12 +0800 (CST) Received: from huawei.com (10.175.124.27) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 29 Apr 2022 14:40:33 +0800 From: Miaohe Lin To: , CC: , , Subject: [PATCH 5/9] revert "mm/z3fold.c: allow __GFP_HIGHMEM in z3fold_alloc" Date: Fri, 29 Apr 2022 14:40:47 +0800 Message-ID: <20220429064051.61552-6-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20220429064051.61552-1-linmiaohe@huawei.com> References: <20220429064051.61552-1-linmiaohe@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Revert commit f1549cb5ab2b ("mm/z3fold.c: allow __GFP_HIGHMEM in z3fold_alloc"). z3fold can't support GFP_HIGHMEM page now. page_address is used directly at all places. Moreover, z3fold_header is on per cpu unbuddied list which could be access anytime. So we should rid the support of GFP_HIGHMEM allocation for z3fold. Signed-off-by: Miaohe Lin --- mm/z3fold.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mm/z3fold.c b/mm/z3fold.c index b3b4e65c107f..5f5d5f1556be 100644 --- a/mm/z3fold.c +++ b/mm/z3fold.c @@ -212,10 +212,8 @@ static int size_to_chunks(size_t size) static inline struct z3fold_buddy_slots *alloc_slots(struct z3fold_pool *pool, gfp_t gfp) { - struct z3fold_buddy_slots *slots; - - slots = kmem_cache_zalloc(pool->c_handle, - (gfp & ~(__GFP_HIGHMEM | __GFP_MOVABLE))); + struct z3fold_buddy_slots *slots = kmem_cache_zalloc(pool->c_handle, + gfp); if (slots) { /* It will be freed separately in free_handle(). */ @@ -1075,7 +1073,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) + if (!size || (gfp & __GFP_HIGHMEM)) return -EINVAL; if (size > PAGE_SIZE) -- 2.23.0