From patchwork Sat Jun 11 08:47:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaohe Lin X-Patchwork-Id: 12878376 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 2CB2CCCA47A for ; Sat, 11 Jun 2022 08:47:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 409D08D0114; Sat, 11 Jun 2022 04:47:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B7EE8D010E; Sat, 11 Jun 2022 04:47:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E4178D0114; Sat, 11 Jun 2022 04:47:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 05B278D010E for ; Sat, 11 Jun 2022 04:47:36 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D69D7219A9 for ; Sat, 11 Jun 2022 08:47:35 +0000 (UTC) X-FDA: 79565326470.15.A0501A1 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf27.hostedemail.com (Postfix) with ESMTP id B90524007F for ; Sat, 11 Jun 2022 08:47:33 +0000 (UTC) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LKryj3C3lzjXBj; Sat, 11 Jun 2022 16:46:05 +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; Sat, 11 Jun 2022 16:47:29 +0800 From: Miaohe Lin To: CC: , , , , , , , , , , , Subject: [PATCH 4/7] mm/khugepaged: minor cleanup for collapse_file Date: Sat, 11 Jun 2022 16:47:28 +0800 Message-ID: <20220611084731.55155-5-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20220611084731.55155-1-linmiaohe@huawei.com> References: <20220611084731.55155-1-linmiaohe@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1654937254; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=78qf201W12OHttsLlmajLmNjqCk5g7H5qLiqHgXayHk=; b=NIl1/uQx63lDq4v8lZnx+TgvC70SIbVMqlEUnDzACqgwwHcr0qtieJyjvpdGxUjiUuAArc BsGvbhdadHj33Fq5ZyoSiNdCw93oePGkXYzQLpa7SrPYsf9bYOsQiUdP+aTG/ukcf2tohi 0jNO7XdI9RoqPubl3MKKeEGNX/E4jeo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1654937254; a=rsa-sha256; cv=none; b=hhJm6NgCmHDkihRTemFwArtTIF3Lv9KG1uepsO6UXTnNc9HAuKXLLEvd2ao/44DQHW424E XKD1+pRA+dkLr8O7TSa2RJrquOrd1aHXmp9+LOcQBeMGM+RYGGiPZQMpGYSzkbdma5hvti oc7dC6nEf105/pL15tSPKZJLDEwTBIA= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf27.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf27.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com X-Rspamd-Server: rspam08 X-Rspam-User: X-Stat-Signature: 6ub4em99ycr7o1njnzszm4onbgtsc6y6 X-Rspamd-Queue-Id: B90524007F X-HE-Tag: 1654937253-608885 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: nr_none is always 0 for non-shmem case because the page can be read from the backend store. So when nr_none ! = 0, it must be in is_shmem case. Also only adjust the nrpages and uncharge shmem when nr_none != 0 to save cpu cycles. Signed-off-by: Miaohe Lin Reviewed-by: Zach O'Keefe --- mm/khugepaged.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 1b5dd3820eac..8e6fad7c7bd9 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1885,8 +1885,7 @@ static void collapse_file(struct mm_struct *mm, if (nr_none) { __mod_lruvec_page_state(new_page, NR_FILE_PAGES, nr_none); - if (is_shmem) - __mod_lruvec_page_state(new_page, NR_SHMEM, nr_none); + __mod_lruvec_page_state(new_page, NR_SHMEM, nr_none); } /* Join all the small entries into a single multi-index entry */ @@ -1950,10 +1949,10 @@ static void collapse_file(struct mm_struct *mm, /* Something went wrong: roll back page cache changes */ xas_lock_irq(&xas); - mapping->nrpages -= nr_none; - - if (is_shmem) + if (nr_none) { + mapping->nrpages -= nr_none; shmem_uncharge(mapping->host, nr_none); + } xas_set(&xas, start); xas_for_each(&xas, page, end - 1) {