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 DE0DBC7619A for ; Tue, 11 Apr 2023 06:18:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 15144280058; Tue, 11 Apr 2023 02:18:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 10037280057; Tue, 11 Apr 2023 02:18:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F3146280058; Tue, 11 Apr 2023 02:18:12 -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 E5006280057 for ; Tue, 11 Apr 2023 02:18:12 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B05BE1608B2 for ; Tue, 11 Apr 2023 06:18:12 +0000 (UTC) X-FDA: 80668105224.30.23275AB Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by imf22.hostedemail.com (Postfix) with ESMTP id EC623C000A for ; Tue, 11 Apr 2023 06:18:10 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=dTr9g9fY; spf=pass (imf22.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.216.53 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=1681193891; 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=cqsMqbvDS5QxxMg57RO5e5hW3sg0toXxEzCmNLhErn4=; b=H36wN8AakOISOZ3E3i4IGXdoM+dd5AVpzeRpa/+xdVSBPa0ZecyTJdNJEv2u7/MEz9nxLz zylFUnODRsWjmmtKhHRcFLpJoARxSw4CqRU6qURoijyRLJRK7YU3C7zcUqfiUdqxsBSc1x 0EGIv1fsqwyCglBQton6l67kZATHd0g= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=dTr9g9fY; spf=pass (imf22.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.216.53 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com; dmarc=pass (policy=reject) header.from=shopee.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681193891; a=rsa-sha256; cv=none; b=aFu3SRvCMBcbeQbOULBMGkgvdhhbrIjXgUn07mT7//bdiW/KNPxOeQJhyiWpUwXXtbPoEB 1Huj4fxc1T7u4zjzeQ0tYmWno/ttF1+c34DoKIR1B4AOhr+jzgSLN5+mgxF3wkJCOGHVXe vrrl7Zt4xviI2Fa9P6iYf3GgJsjnmrM= Received: by mail-pj1-f53.google.com with SMTP id 60-20020a17090a09c200b0023fcc8ce113so9816312pjo.4 for ; Mon, 10 Apr 2023 23:18:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1681193890; x=1683785890; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=cqsMqbvDS5QxxMg57RO5e5hW3sg0toXxEzCmNLhErn4=; b=dTr9g9fYGDe5Q1TMQqYfmPf/nqf/tcQ0TQt81AKB/681zSZSwsraTVaMcxYbKxz58k MQEaV0uxJ3MGq4/WIjZeS/SlX1yyiYL2CLW1xgxcvaLHvsu/HlTuSlS1UW6q9e09G3Kz Jh4F95W06FaFdix8IyC4W4ILMFsU6P2uJG2mwaSCPVak76VPFjR6HNGBUx1X0dTLyCuz 2UMvZzJryD3MfAaDHUitSUPAQvD2b9i4rcv8ykBQ54wjuCs263HwN0QZW/NJpvxBmxFJ WQ4n6ufAXu93fzIbaKZAXFpnFrnXOHLSoSXET+7D4i4HD1LQnyW6dUWUiquRaW2/NiXg SdCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681193890; x=1683785890; 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=cqsMqbvDS5QxxMg57RO5e5hW3sg0toXxEzCmNLhErn4=; b=r2c8vSjEnFDuP0SZMP6lGZJ7rP0iHV70wnIZ2RwzUAmJUQI4izKb3njryTa6BfNN1t L40SM2voRXaGxQZbwzQzVEaeX8qc3RQVVgxSDNwBUdZyqajYAa+MdJ0urnn3rCXxO/N5 A2YMOpdPtuj5XJ1B4TLbUazPYAuLkUwvcYmdCJiKXFxzvq6+upKgPQN5D5v0xyDm2Cdz N00M/+b/3ZK3Skr53P2ImsnkERC6vM2CUWVXqq9Q9m220b2xDcb+FDIqmawLvp00IcDM LL0fzB7SAzQZJsGs0LmQH+yfUeIOuQNdTCviX65QXR2nZ+vKhVq2vNZDwlDd62cywtMv IPMA== X-Gm-Message-State: AAQBX9dkvpfZqvA+A69f0+t89R2rrYKz1J4hhADr8RiOQGlZHEcKu43/ 1Fn3tnzK+Az2yp0g/vyOMHL7oA== X-Google-Smtp-Source: AKy350bg11o+dXIS5dKvMfOAeCQT/Iep+crKcwYO7Uvf0zwtpYVEFqEAozETHZiksP8Hnvm2SxWKjA== X-Received: by 2002:a17:90b:3845:b0:240:883:8ff8 with SMTP id nl5-20020a17090b384500b0024008838ff8mr17957570pjb.3.1681193889742; Mon, 10 Apr 2023 23:18:09 -0700 (PDT) Received: from ubuntu-haifeng.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id nl6-20020a17090b384600b0023faa95f75csm10191290pjb.36.2023.04.10.23.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 23:18:09 -0700 (PDT) From: Haifeng Xu To: akpm@linux-foundation.org Cc: david@redhat.com, willy@infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH RESEND] mm/vmscan: simplify shrink_node() Date: Tue, 11 Apr 2023 06:17:57 +0000 Message-Id: <20230411061757.12041-1-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: EC623C000A X-Stat-Signature: 1jhef3arg1fibtujnt6pzdc6ma9ph3fd X-HE-Tag: 1681193890-536945 X-HE-Meta: U2FsdGVkX19yZ+0lLS/sCocR7dLBynLnMTlCgscfhJHsOmGfNw6GV/xWY6ok1jz4fdlhJ16xHWX1nZ3L3zDoFAIfzklpYBOJEWVK8vJTmPts5KY6msaGexAx8t/pleFeFXqZeozTYEva1wYcjyV1HmTnpNaxReQcMKmA/PGzixuWF3r2iJkbFq6bULSGfUpegzMC2+5rEMZqszEPl4TQFenVQESODy6k79ks/qwIhE5ERD/7RUUYNDRfBpScg2iLjm9KAbjQ1E7OSQEcomghFuzdby0lolNyRkPjouwz2YlyL547Ke9ssxN57ekERGYTRdtFu9CZf4ABbBqQKjKi7+ti4pI2I3VweGFStOTpBqSfQk8RW2inHcx176Adf/rwJ0t1BXfh8N5PquL2k/6lD6DvzyIySNvn5sK5cYdx0TNihbPfYg/u+xXdkiOXfY7jxAtrLZM4Cz/qXADTakO1iNsXS55FuzEllnNo1rwK+ToqfmJ8Bqgmi+2Yet3e+TiZLhjQMU8mCLF+piVadvOoC4ZSAOrEU0zw6c5usj+lOyReMIOjfV3DEE2rElZ9aKISEEKE6d6ovxHHvrD3Xt3th4qbUynOjCpllcvSarddS/vr4vxtMyRD8nAzYA7QvHP+4ye3IJvRZFbjmlmdwiIDToQVr8LOiOIaGC0g9VH5F2ppBAh9nxrr25COP1dvtI9N0BkgWqNOMWnSJ/5mkrczz58NSWe+UDRs3e870rQjABgtgYQ+ji5ltjJEqv74O39akd3R9uO1lWwM9KJM166UZta825Ox3Kb9DP351Yf65qNRws+2MnxHQkJB0jA6amA2aIzepncrtOl9xd8rRkYV+TlzxQjLemjCmDbblIAFknI6Tqetw4mRAn7VNNUzqru7KT1ETpXkPZFybrNFEdYRlxcaUJzcfg8qTHm2B6sjCcCvoZ7qhveTrLDaQGqOWRlrCg/t5VZp6Ei7PggaYUf 49JanOjT b1ERWKGdIxf1BAOXYKX2vkxChwNl0lbSJB6LfA4108Ursyjd8qEZAT6fJGYFwfw66uw7hKiWNRaRCyktbSxC1u9qOGoZNHV/wgmbiz5mUE4NsdEsN3e4PF7Fn8XOLC2kDfd1GiL4BWDJ1pXEZ3WMm96Cb7fTvECGz2ASnHeED7GmzfB9dYTttlLnfMCWgTAzt4kgHMlZ/UDcWAtDumTTEbVnH9NIbzOeX6jA83VdqmCZUL7HGoCX+SKA74MQVAb12n9wlXAQEkInBHCE9Y2P6mq4DyQTBPoDMsnTL/d4UhWGG1qQRcOFOz3ZCvm55fma8dX0otXPJN/sPLW7n0ZIvD3w6FGPWkt7xvaDsqALkH797wBho0j+SM+5gMqxGeZlT2hawTHnRJtYNtsaHVNaGV5Nr0dmr9+XHKzHyj9U2Ndz+5rz4J7e/c6HkmOSSJW4I4oBSUaqzk+tt4N1FYNjsWAq/DA== 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: The difference between sc->nr_reclaimed and nr_reclaimed is computed three times. Introduce a new variable to record the value, so it only needs to be computed once. Signed-off-by: Haifeng Xu --- mm/vmscan.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 9c1c5e8b24b8..b86573104974 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -6451,7 +6451,7 @@ static void shrink_node_memcgs(pg_data_t *pgdat, struct scan_control *sc) static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) { struct reclaim_state *reclaim_state = current->reclaim_state; - unsigned long nr_reclaimed, nr_scanned; + unsigned long nr_reclaimed, nr_scanned, nr_node_reclaimed; struct lruvec *target_lruvec; bool reclaimable = false; @@ -6477,13 +6477,14 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) reclaim_state->reclaimed_slab = 0; } + nr_node_reclaimed = sc->nr_reclaimed - nr_reclaimed; + /* Record the subtree's reclaim efficiency */ if (!sc->proactive) vmpressure(sc->gfp_mask, sc->target_mem_cgroup, true, - sc->nr_scanned - nr_scanned, - sc->nr_reclaimed - nr_reclaimed); + sc->nr_scanned - nr_scanned, nr_node_reclaimed); - if (sc->nr_reclaimed - nr_reclaimed) + if (nr_node_reclaimed) reclaimable = true; if (current_is_kswapd()) { @@ -6545,8 +6546,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) test_bit(LRUVEC_CONGESTED, &target_lruvec->flags)) reclaim_throttle(pgdat, VMSCAN_THROTTLE_CONGESTED); - if (should_continue_reclaim(pgdat, sc->nr_reclaimed - nr_reclaimed, - sc)) + if (should_continue_reclaim(pgdat, nr_node_reclaimed, sc)) goto again; /* -- 2.25.1