From patchwork Sun Jun 5 15:25:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 12869779 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEF85C433EF for ; Sun, 5 Jun 2022 15:25:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C3468D0005; Sun, 5 Jun 2022 11:25:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 53FBA8D0001; Sun, 5 Jun 2022 11:25:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 364CF8D0005; Sun, 5 Jun 2022 11:25:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 25D8D8D0001 for ; Sun, 5 Jun 2022 11:25:49 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id EF6F080397 for ; Sun, 5 Jun 2022 15:25:48 +0000 (UTC) X-FDA: 79544557176.30.CD06719 Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by imf25.hostedemail.com (Postfix) with ESMTP id 1F976A006A for ; Sun, 5 Jun 2022 15:25:10 +0000 (UTC) Received: by mail-ed1-f50.google.com with SMTP id 25so15517698edw.8 for ; Sun, 05 Jun 2022 08:25:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AijNSNENsndq1lruXgHmAupjtkvf2lBpkHUQA6jew9s=; b=H0zgmtQMVi6D7id759wg8VhqByApWuQ2eAmgXrVLdr0Q1LBDhY7Kz4vpBWUEF4NhOf XiNPQ4GjBN04uYIBj9rn/FJOfwHB5hceglNc0WlSZbm1ugfm6i9LqALZfCEzOoYvi6yF 92djWVCArm7K7WenfzY12vjC0Kkr0MxID7g4E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AijNSNENsndq1lruXgHmAupjtkvf2lBpkHUQA6jew9s=; b=1ChIlp7O3V6Nf9tRVZrRrY5ADAHxyVXxE2Bv4HW2mveQRu7c45OUqaq5LOe02Le5NN 4ILkcMH8G925Vhd9jSwQhmFTFJ0aLb8yzCkpc10KGKzouJGQkvHVTeDb0wjxv76o4PHX PbkU8BVRQxGQt/2N2namED2khAFqEFKR5DSEaFuYcu3sJgjKFR/TPqNepPyDOkrRjx3G eJHAmNl8thyi2mQIyLz31+UuixsQizE87Qnlp6ROqc/lqbR+PFDYneqFBmkrKvxJqaPf 8h1/d6BCCDTchXDly7217/iOq8ESwwRuk9y9RPUzYnVMTlVo5I8WjeGoKwEL85tiZU00 LfEw== X-Gm-Message-State: AOAM5318h/FEDTjXu6KvPQTLHhFDeWcLU2T2Yh8XlEzV390ozoRoO1tT Muio2Xx0mxY0KZY9P/7znShljA== X-Google-Smtp-Source: ABdhPJz8dAE/Co15RJ/4mJpqVwCjyClqDvdCuxcacvEE1TV8+moyX503AYyBnHuJfqgA1ohjLbwB0w== X-Received: by 2002:a05:6402:3484:b0:42e:1f3b:4a4c with SMTP id v4-20020a056402348400b0042e1f3b4a4cmr17457804edc.326.1654442747113; Sun, 05 Jun 2022 08:25:47 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id l21-20020a056402125500b0042dddaa8af3sm7051499edw.37.2022.06.05.08.25.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jun 2022 08:25:46 -0700 (PDT) From: Daniel Vetter To: LKML Cc: DRI Development , Daniel Vetter , Daniel Vetter , Andrew Morton , linux-mm@kvack.org Subject: [PATCH 3/3] mm/mempool: use might_alloc() Date: Sun, 5 Jun 2022 17:25:39 +0200 Message-Id: <20220605152539.3196045-3-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220605152539.3196045-1-daniel.vetter@ffwll.ch> References: <20220605152539.3196045-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Stat-Signature: 9j1exdrpy38eg5tc3cpmcbz7cft6ziji X-Rspam-User: Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=ffwll.ch header.s=google header.b=H0zgmtQM; spf=none (imf25.hostedemail.com: domain of daniel.vetter@ffwll.ch has no SPF policy when checking 209.85.208.50) smtp.mailfrom=daniel.vetter@ffwll.ch; dmarc=none X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 1F976A006A X-HE-Tag: 1654442710-11420 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: mempool are generally used for GFP_NOIO, so this wont benefit all that much because might_alloc currently only checks GFP_NOFS. But it does validate against mmu notifier pte zapping, some might catch some drivers doing really silly things, plus it's a bit more meaningful in what we're checking for here. Signed-off-by: Daniel Vetter Cc: Andrew Morton Cc: linux-mm@kvack.org Reviewed-by: Vlastimil Babka --- mm/mempool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/mempool.c b/mm/mempool.c index b933d0fc21b8..96488b13a1ef 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -379,7 +379,7 @@ void *mempool_alloc(mempool_t *pool, gfp_t gfp_mask) gfp_t gfp_temp; VM_WARN_ON_ONCE(gfp_mask & __GFP_ZERO); - might_sleep_if(gfp_mask & __GFP_DIRECT_RECLAIM); + might_alloc(gfp_mask); gfp_mask |= __GFP_NOMEMALLOC; /* don't allocate emergency reserves */ gfp_mask |= __GFP_NORETRY; /* don't loop in __alloc_pages */