From mboxrd@z Thu Jan 1 00:00:00 1970 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 E474AC77B7F for ; Mon, 8 May 2023 07:36:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7B90A6B0078; Mon, 8 May 2023 03:36:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 769436B007D; Mon, 8 May 2023 03:36:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 630F56B007E; Mon, 8 May 2023 03:36:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 52FC36B0078 for ; Mon, 8 May 2023 03:36:06 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 1A7151A0214 for ; Mon, 8 May 2023 07:36:06 +0000 (UTC) X-FDA: 80766279132.14.4D734ED Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by imf08.hostedemail.com (Postfix) with ESMTP id 47B88160002 for ; Mon, 8 May 2023 07:36:03 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=FyIHeGMO; spf=pass (imf08.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.210.175 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com; dmarc=pass (policy=reject) header.from=shopee.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1683531363; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=ygLFz5lp7rVG8bpNJQZRYXuv/EyC+2NG5vRieXJ/Ap8=; b=he10sSXfUZataqsUFu+3ROkH/hms7I2/PiszB+3j8AZCe+gWzGpHafZNWebhu8hBLBD8WC N2rR8pJyYKXr63Ia6i9Yys7vehHziy84vf0woxul8Jhzzp0lx6bEms9eTXAjdl/eYtIVlX 9JjOAnP9lJJDLaCmduLXVepeswQoKWY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1683531363; a=rsa-sha256; cv=none; b=c7KaeTN8hFLYZSmcnqcAtYdEy0k1tY4I3pGd5EHI7TXLGqLBC+SEcwmSTBY1i6o5MMMYxB HucsI0TnJoJ9gNrKZqpTE+kcG0KwGfgR3aX+8Tonug0JhygcBG1fo/wTtcdz4P8SbjTIH7 4g6Ly4AWRpZDjuIIpRAbM/ckVa+2vH4= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=FyIHeGMO; spf=pass (imf08.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.210.175 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com; dmarc=pass (policy=reject) header.from=shopee.com Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-643ac91c51fso1919108b3a.1 for ; Mon, 08 May 2023 00:36:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1683531362; x=1686123362; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ygLFz5lp7rVG8bpNJQZRYXuv/EyC+2NG5vRieXJ/Ap8=; b=FyIHeGMOiWrw78c7PCs2FMcBOLTKivUYGJ2768dgYJR+8an+EDAR4x7uItpduIWTzU r3URbPVfohXVMN/WJm07/WX5k8IFehcJCsS7pXvIZKpfs/xQ39gsm01Jhv9tw1/V0rGX ktD8RFRlllYGE9GQgnJmJgZJpFt6ma9c+Rw/y69oL2NzbVvrjhVn3X29ZU3jRRyJFXD8 GEQ2N1WATV+Fc4Zf0wQjLqUxv9/gdWBaqOS/7+btth/HpO9viXn4jEV2HkDh9HfvJq1V WksHGDX5O1eCgJ4+ApOTiwmmwdNtVecRSVtJdHBNOuInKRn1MEYMO6lUABHYknzvpdgy nxDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683531362; x=1686123362; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ygLFz5lp7rVG8bpNJQZRYXuv/EyC+2NG5vRieXJ/Ap8=; b=J0APQbjTrEnwLSeNTcxJcnMQuV58QASEHKVxKvAheo+PpgRPllFWrHnkms1ciXfqm1 HFGLSdgTvEurR0OP7oaPrAV3lGyb4syfpyeebIqQqZUhJtgbdYAU0YS7gPzMXXDloBc+ ix5fOIHc5vDZP1MwRV9DXg9LC0HveksIVumbUmQQSuK2UwRo+kVnQXRYwBjDQlTgor5t BbYwxgbp4K/LLic4ztfCUyQ+8svN0eIu5PR5gbsb8vz9LITyPaBrzGbQJS/5Ky0v9Nb7 dn8UTpC0F6WkvivcXHvTpQZfNv+XlpRkN7PH7FM8lBe+oB1g+7pr68sowoMmGZ/gH46V ep8Q== X-Gm-Message-State: AC+VfDwXb1MiPujlYc2rwSBKeXOXaIAviaeP66+GXWWSLu0vw2Rl9RNQ euRSDzg1EGEFFsfARBW8tTa8BA== X-Google-Smtp-Source: ACHHUZ7KhMkV6amOYcooRe8a2MSv80Mbw85ivjMJdfvDakq9Lpf5YmoCv6gQiClktKk2+7BRtmd6EA== X-Received: by 2002:a05:6a20:7489:b0:f2:9378:814a with SMTP id p9-20020a056a20748900b000f29378814amr12094355pzd.49.1683531361867; Mon, 08 May 2023 00:36:01 -0700 (PDT) Received: from ubuntu-hf2.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id y13-20020a655b0d000000b00502ecc282e2sm5377276pgq.5.2023.05.08.00.36.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 00:36:01 -0700 (PDT) From: Haifeng Xu To: mhocko@suse.com Cc: shakeelb@google.com, hannes@cmpxchg.org, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH] mm, oom: do not check 0 mask in out_of_memory() Date: Mon, 8 May 2023 07:35:38 +0000 Message-Id: <20230508073538.1168-1-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 47B88160002 X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: 8ax7zmccskk9dfb1fogo977grt6hoq4j X-HE-Tag: 1683531363-901767 X-HE-Meta: U2FsdGVkX1+RrW54XazsFg5TKNDt8SkG4Mz59xBR+1XvHR6LRJjv7gtTWSQRZGRYISPEr4D5n9KedDQYvFoWXAsDweNXqeWoMjwK+X99e7/H8COzPuNyzrvQAoNESLidVQzVMP/3HjJaN62HCuoWjTb+H/VZyPZ0/o29LCbGadF91koWUpk7xQurYmE6+WIN+w1q4Al4c9zo5V0bRiKsyHES8b/JZHa2M2f2CuSZS39rDRQ9wKq5Rbq7NI66mZyRsoYJ9kEoAaM34aLJuEupW9Ij8YeE3O+vRTxdCYn2VV3Slf64Z7/NWdunvpTnOAvq+HTueSjpRok0rCi7UHqi+SKNnsHoeTMM3mGgYk+idtGFWYO4mjs21EJR5UwrYThwU7ptTei9S9dgeeznh8wveNYn6jPSwAMLDCLkY/0ij6yb9uvznlA7Ab6Wc81FlWji/QDxLheJ3eQD81sLzF7z7NmmTmGssNwfIZ4+PSvQoZUity+O0MUAqnpxKoFnWB86EZCUJVCQd0dRmxFqAjwxkNfMOuAeYRm43e/vIIfdewOKI6tmcXtZNbDALONfPEFNRxuEszNRamz0XbEv2Y6BuHTbmZF0auiD3/XJmN42KnevEd1ivVqZ616+ghdkPrhxkiYULu2Pn+QJxg+Z2dro2FjKDsyeRxDfpNiuT62/dECpDgU4Uwzu8TWP77QtXh6UmeTTc5gHlOsLM5/qjFvX/s44YcVvkCGEfsa4GpGHNVX+fhzTXBL7UdC9+tE48BLED57/E37+YyxP+ruDBZwzxist+6Oi2zHHaw77sfa4/GXUfxtJ+8exxLqLDBhdapBssXAQeZI/L7E//5qRU3yba9wW9ORudW+Il2QXf+YhzGDhdeqCtvGKsw2l7sj6qW2E4b/Dmf9+/wKxCtyLZYG54uClL0NPBx9SHbDovFSB+LTk0LtZqpIl4wIUlVMD1M9LxdBKzqVA+JxfhkRG3c9 UUqjYL+E TFBZ0Q9bESWfQ/mM171zBjEBHXimq2nl8SaSiYanFF3kieHLVMytfibwONk6hD8ms9Wi6NKgIx0ZBFAVz6t2n9tL+ECVFDE4cAE9DCdDhQ+A3Ch+vFqMpJxV3WAUtHSputZPpPuMti1McE6pUhm4EaJXZm8WJzFgMaaGfNnKR67iMgBeY7hFHynmyWhu9fjONziXbxPqUjDCp0rKgyZWok2Ka6ieGTP/M7OWnOkhprrdpSa7jBpoO9Q2TZxXjzsG2oqwbhnTeAsLwkSqdbZvI78juO182j+eBJ9F+o8cGSMJO4tr7s3dhmxCdw7fdlytRiw1xz9RDf3/42qXO5nWd4tdOUCH7hWEoQwFf0nlmPTlXsZjYg0xQYY9V88vkIRoAhN1aMwcppWbkCYMwxGHT0Jpii8VyO0cv2dm85OjwxmZc2tpYP025Z3+4KfR09ekXnfUh X-Bogosity: Ham, tests=bogofilter, spamicity=0.000006, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Since commit 60e2793d440a ("mm, oom: do not trigger out_of_memory from the #PF"), no user sets gfp_mask to 0. Remove the 0 mask check and update the comments. Signed-off-by: Haifeng Xu --- mm/oom_kill.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 044e1eed720e..612b5597d3af 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -1130,12 +1130,10 @@ bool out_of_memory(struct oom_control *oc) /* * The OOM killer does not compensate for IO-less reclaim. - * pagefault_out_of_memory lost its gfp context so we have to - * make sure exclude 0 mask - all other users should have at least - * ___GFP_DIRECT_RECLAIM to get here. But mem_cgroup_oom() has to - * invoke the OOM killer even if it is a GFP_NOFS allocation. + * But mem_cgroup_oom() has to invoke the OOM killer even + * if it is a GFP_NOFS allocation. */ - if (oc->gfp_mask && !(oc->gfp_mask & __GFP_FS) && !is_memcg_oom(oc)) + if (!(oc->gfp_mask & __GFP_FS) && !is_memcg_oom(oc)) return true; /* -- 2.25.1