From patchwork Fri Sep 11 09:23:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mateusz Nosek X-Patchwork-Id: 11770055 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6833B112E for ; Fri, 11 Sep 2020 09:24:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id F05DA21D6C for ; Fri, 11 Sep 2020 09:24:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="C0GoCwMn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F05DA21D6C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id F01706B005A; Fri, 11 Sep 2020 05:24:15 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id EB3976B0070; Fri, 11 Sep 2020 05:24:15 -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 DA0996B0071; Fri, 11 Sep 2020 05:24:15 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0140.hostedemail.com [216.40.44.140]) by kanga.kvack.org (Postfix) with ESMTP id C22216B005A for ; Fri, 11 Sep 2020 05:24:15 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 826C0181AEF10 for ; Fri, 11 Sep 2020 09:24:15 +0000 (UTC) X-FDA: 77250244470.29.art39_080d82e270ed Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id 59A0D180868E4 for ; Fri, 11 Sep 2020 09:24:15 +0000 (UTC) X-Spam-Summary: 1,0,0,5eb0cdd922d8650e,d41d8cd98f00b204,mateusznosek0@gmail.com,,RULES_HIT:41:355:379:541:800:960:966:973:988:989:1260:1311:1314:1345:1437:1515:1534:1541:1711:1730:1747:1777:1792:2196:2198:2199:2200:2393:2553:2559:2562:2693:2731:3138:3139:3140:3141:3142:3353:3865:3866:3867:3868:3870:3871:3872:3874:4250:4321:4385:5007:6261:6653:7514:7576:9413:9592:10004:11026:11473:11658:11914:12297:12438:12517:12519:12555:12679:12895:13069:13161:13229:13311:13357:13894:14096:14181:14384:14394:14721:21080:21444:21451:21611:21627:21666:30054:30070:30090,0,RBL:209.85.221.45:@gmail.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04yfx38z1rh53fkbku4hsn644wza5oczacji97akzjmbxki64rt69g1m4tqxikq.b8hfrwrjoj6ipjtwh1tu3bmen1rbsgeu79zkkcyohsks97oc71nn1b61neua1yk.s-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: art39_080d82e270ed X-Filterd-Recvd-Size: 4361 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Fri, 11 Sep 2020 09:24:14 +0000 (UTC) Received: by mail-wr1-f45.google.com with SMTP id z4so10782186wrr.4 for ; Fri, 11 Sep 2020 02:24:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mZsvG/SauzKMRV4u8/MtOFoZci+o6dCxmbXBGIM7a50=; b=C0GoCwMnOvnBY+2+L0nL96kQrzbpQJHwZv0N+qm4QZXcFWLYhlJmTu7u2nxGIN8kEb 6Ms1rGU5GUXaoyHz0OMjOedBu7OsXpacE0mpczLdX4+RgfI7Bp+8EVM7966JEHQnBWke c6zn991D+Fxa+a+sMUdIt8XKen3Ptea+XQppBRgCdMOMcyF4jpewAbXDB3yV2b/dfky1 GvFgGFYFLflrETgvFlUjOEu5eYM7DZFh+mGL10PE82HafYOquOXR/nxXAwvrf0itUFhh vfBqli232EvLgTCdpWpa044WpvCk++tB1lKeLh+79+LngIQGiNmznQRON8YVgiW73HXa K0DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mZsvG/SauzKMRV4u8/MtOFoZci+o6dCxmbXBGIM7a50=; b=mCzql0NhmJf18pHO8b9MakD1U3oj/Hhq+w24cmX2RIz1wjc4KgybF4uPgquncztSay B8zXSaW68VhAmf9rn+e5nk+8ZJjT2OZbN13QCLO9QBvPlDpfiTpB8ZILITe7lH4FTuou aCdlogSKLAp6iJ39YYYUqXVyh5wJ4abJnWhvRiLmiX2THZYrxEmIhsopXHkav0hYgm9N lJXqnk46rfxN7awVxj3AtrgjnDUJdkvZ5wUiih8anz2criIgDHkR57hnlNN/W2HCMVD3 PBCQR+VZmVf4G+ceCigrxbXfR2XgfMZ1WI4J5sTWmJMmE4RsDcMgqhQ+rhBC1UCUAREl xOOw== X-Gm-Message-State: AOAM531RCdeg7X85H2DSR8mbQ1ZU0Zz/Ds5JFb6f9VR7rqwYOCHicsuY ziyKOr3JxKq+QVhWASWHsrmJKhpAF7gvBw== X-Google-Smtp-Source: ABdhPJwT2zTIACtbEHcwRj6X6yZSyjEQMDhg/RhN5KU4tsLxeF/tXk7LZ1CUstYAK1USVCqaaPNG7A== X-Received: by 2002:a5d:66c1:: with SMTP id k1mr1124780wrw.34.1599816253482; Fri, 11 Sep 2020 02:24:13 -0700 (PDT) Received: from localhost.localdomain (188.147.111.252.nat.umts.dynamic.t-mobile.pl. [188.147.111.252]) by smtp.gmail.com with ESMTPSA id o4sm3270841wrv.86.2020.09.11.02.24.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2020 02:24:12 -0700 (PDT) From: mateusznosek0@gmail.com To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Mateusz Nosek , akpm@linux-foundation.org Subject: [PATCH] mm/page_alloc.c: micro-optimization remove unnecessary branch Date: Fri, 11 Sep 2020 11:23:10 +0200 Message-Id: <20200911092310.31136-1-mateusznosek0@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Rspamd-Queue-Id: 59A0D180868E4 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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: From: Mateusz Nosek Previously flags check was separated into two separated checks with two separated branches. In case of presence of any of two mentioned flags, the same effect on flow occurs. Therefore checks can be merged and one branch can be avoided. Signed-off-by: Mateusz Nosek --- mm/page_alloc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index cefbef32bf4a..b9bd75cacf02 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3972,8 +3972,10 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order, * success so it is time to admit defeat. We will skip the OOM killer * because it is very likely that the caller has a more reasonable * fallback than shooting a random task. + * + * The OOM killer may not free memory on a specific node. */ - if (gfp_mask & __GFP_RETRY_MAYFAIL) + if (gfp_mask & (__GFP_RETRY_MAYFAIL | __GFP_THISNODE)) goto out; /* The OOM killer does not needlessly kill tasks for lowmem */ if (ac->highest_zoneidx < ZONE_NORMAL) @@ -3990,10 +3992,6 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order, * failures more gracefully we should just bail out here. */ - /* The OOM killer may not free memory on a specific node */ - if (gfp_mask & __GFP_THISNODE) - goto out; - /* Exhausted what can be done so it's blame time */ if (out_of_memory(&oc) || WARN_ON_ONCE(gfp_mask & __GFP_NOFAIL)) { *did_some_progress = 1;