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 76336C43334 for ; Wed, 15 Jun 2022 15:54:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E7F26B0072; Wed, 15 Jun 2022 11:54:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 098276B0074; Wed, 15 Jun 2022 11:54:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA2A26B0075; Wed, 15 Jun 2022 11:54:57 -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 DB1B66B0072 for ; Wed, 15 Jun 2022 11:54:57 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B33D8339 for ; Wed, 15 Jun 2022 15:54:57 +0000 (UTC) X-FDA: 79580918634.07.1A602A3 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf06.hostedemail.com (Postfix) with ESMTP id 47A30180097 for ; Wed, 15 Jun 2022 15:54:57 +0000 (UTC) Received: by mail-pl1-f177.google.com with SMTP id d13so10746704plh.13 for ; Wed, 15 Jun 2022 08:54:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=mreepqnLlPZFVd8ASkU0Ah/jZvsfiVvVvF1zUpWRDWE=; b=JIbS8nIuSpRIHU9HEZsMsxG7Z9HpGeMR+yEAX7PcKh1qcZUZJgrABhPr7cNjSPWBAo zkZEFqL87RspX0bf4C2GtOJqzslKAtf9wMVKrq1OahdWXuOnbJlOO0dyUiaWQ12UFlE2 vfgJUmrj/frlTbhNf275MjeH0dqVYGt4rRph69QzliWw1BB43Dp4C3ZmhjcxW6mmr3J8 jF4QQRfUxa4WtQRikKKYjDfh3dBeAr8gDfQv9LUlfo5tRIYym9bHTJbA4AVtFr6wbeP/ 7PHOs1bbn9TlZYYEp91Y6aqC/s9wEsr/aRebszXSM1Sj9Mjb7XezngLrKsszMjNNo+Rs z4bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=mreepqnLlPZFVd8ASkU0Ah/jZvsfiVvVvF1zUpWRDWE=; b=pJRyF/okJe7zmLxOZVcvYyVpD+saxyU9nYoB+wAC99GzEvxPidiwKmoxM2ebpf7dT0 kDoWaHoQ/0otEYjOSjaBB/YVQ+xNEWMD3f12iApVsl5pt5yWcoT3bcAPYn1mPM1zQaaI nqkR86M6KuQAg+hqtXv6Rcsy42amLC/bw2f+OTw8KxhiD/JmyB8FL8YE4DFocaaN+dVr NqGtE+i43NUbS2PxDbCje1D0U2TjAduBy5CMBcB8sZPFEq4c/nNzhth5zmtCEBQoSbYD cj2mD8YhfXv13C26OpLzXYLHvtNarQX5PswS8k5nM4Y5s+AsMKaayxEYrT9XnpcAI0t5 oa5Q== X-Gm-Message-State: AJIora9KpVN+fRb4p7a8675U/T+htVLuyKCTbUF+eD+hEzFD3iH+za/a 34ukBSsCTU8OD272Wk6zyKvKhA== X-Google-Smtp-Source: AGRyM1vQqRMnufvqMyDdXnDthwID1ZqRrTeVfioKLhTf97yBKB0/HBAXmIsWBSBAL2cB5rQ8vyymvg== X-Received: by 2002:a17:902:d64a:b0:168:fc10:7f5f with SMTP id y10-20020a170902d64a00b00168fc107f5fmr297189plh.123.1655308495831; Wed, 15 Jun 2022 08:54:55 -0700 (PDT) Received: from google.com (55.212.185.35.bc.googleusercontent.com. [35.185.212.55]) by smtp.gmail.com with ESMTPSA id f187-20020a636ac4000000b00405306de2c2sm8522756pgc.65.2022.06.15.08.54.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 08:54:55 -0700 (PDT) Date: Wed, 15 Jun 2022 08:54:49 -0700 From: Zach O'Keefe To: Miaohe Lin Cc: akpm@linux-foundation.org, aarcange@redhat.com, willy@infradead.org, vbabka@suse.cz, dhowells@redhat.com, neilb@suse.de, apopple@nvidia.com, david@redhat.com, surenb@google.com, peterx@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 4/7] mm/khugepaged: minor cleanup for collapse_file Message-ID: References: <20220611084731.55155-1-linmiaohe@huawei.com> <20220611084731.55155-5-linmiaohe@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220611084731.55155-5-linmiaohe@huawei.com> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655308497; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=mreepqnLlPZFVd8ASkU0Ah/jZvsfiVvVvF1zUpWRDWE=; b=P4w34DNGWwbThLk+YkiornkzxKbkxLWAKEdX3neBiSxSv6RZUpX1bjTicEcjelCKXhWMNa ehZQQpTwiNsI9BPSLBmyCi3fr79BZf8DTuA4Hpl+JS/yn+dMH8LwDUAfXG4L8GaAXCPd2D XS4kyUFlMc+6/3TEqWlJnaNzDnxwRks= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=JIbS8nIu; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf06.hostedemail.com: domain of zokeefe@google.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=zokeefe@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655308497; a=rsa-sha256; cv=none; b=ZEE4hzBpZjoe3nNSVK/tJhJ4r6AwzIy+X0ZW/a+UX4JuQjq22BkFwYkoDsTXj0ihgxcQzJ 7h6TcGCzxc8PGSiyLAgC+1zfmcNmNwkktWYm4/hSN+MKQyr2+GUiNrqBzffsRxHgc5O1fp DdCSqvElDbva0Jzcl7rHjvnuUtSsJNw= X-Stat-Signature: n9ps8yidow7dxqpy1fmbp5y16msq5p3j X-Rspamd-Queue-Id: 47A30180097 X-Rspam-User: X-Rspamd-Server: rspam05 Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=JIbS8nIu; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf06.hostedemail.com: domain of zokeefe@google.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=zokeefe@google.com X-HE-Tag: 1655308497-136864 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: On 11 Jun 16:47, Miaohe Lin wrote: > 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 > --- > 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); > } Might be worth a small comment here - even though folks can see in above code that this is only incremented in shmem path, might be nice to say why it's always 0 for non-shmem (or conversely, why it's only possible to be non 0 on shmem). > > /* 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) { > -- > 2.23.0 > > Otherwise, Reviewed-by: Zach O'Keefe