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 DFC48C3DA6E for ; Fri, 5 Jan 2024 07:16:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 379606B00C4; Fri, 5 Jan 2024 02:16:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 301746B00C5; Fri, 5 Jan 2024 02:16:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C8FA6B00C6; Fri, 5 Jan 2024 02:16:56 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 036986B00C4 for ; Fri, 5 Jan 2024 02:16:56 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C24951204BF for ; Fri, 5 Jan 2024 07:16:55 +0000 (UTC) X-FDA: 81644400390.10.2A5E843 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by imf18.hostedemail.com (Postfix) with ESMTP id 6DE921C000A for ; Fri, 5 Jan 2024 07:16:52 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="NMYLu/Gd"; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf18.hostedemail.com: domain of ying.huang@intel.com designates 198.175.65.10 as permitted sender) smtp.mailfrom=ying.huang@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704439013; 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=THehO0T4KKiFb8qzVSpO1i7HPom3sji8K59cmCfBA0w=; b=oIEC+TC7fu4hNUm/keH85NlLZ36gKj+ZE2LYqZvmkBSiGHEw+hJWJcev7a377pOEDNYdl6 qn4WaapqyL3sXvFYcDMo6eeklW3w8FulvgVrxfsySx5W4a97gxvf+/g4CTBwmDJHQuYasz EGjQD0l2V9i4cssr8335v7RRj2qkl2c= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="NMYLu/Gd"; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf18.hostedemail.com: domain of ying.huang@intel.com designates 198.175.65.10 as permitted sender) smtp.mailfrom=ying.huang@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704439013; a=rsa-sha256; cv=none; b=Dy0I9oL+/8DB+W4KEDt7fxuHym3M0n+mMj7xkkQMH81oK3W8Gs22Nw20ZfReIz9CqJDZ9r Z6u/ApdZoJUCPevh8nVeSrWmYnvmZassYKTcjwIt5Qx2cBYtWBdOPqjpGml1o9mu5XCpyp jTxu2UI6KoKnunitN6oRS1Grhld49cc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1704439013; x=1735975013; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=rmI+/pbw5vwRtTdn9jKRFOQEK4BpH6g7BJ8uZMZV//0=; b=NMYLu/GdgS4sK0OU3AKfAF11gR8XRjqKVwkSkegP+11+hK++GxyiCBRn fGMN5zucNYSOtSr9gIyQA+whBixdSqHbSIis37XFI/SPw/UphAXErsVLe ZhR6Uj4lrDBW+t4VrUWkmjvxnGEbuwCc8EmymwEYw0WToUiSsIzwugr2q tItg5bUJujQyZ21dFxTd2QiJ493BQKc8fE3QWBqNOIMoK3Q22SsaSp3HO CfMSXAhtVIYzPTqDhT7bF5DHZVcoksYtfB5AAIGdDhMOYVa4Q2lqfZdIk 2jRuGCRXqHshtgR9+E1ZEXQjJW7ZAPockmLrteU1fR2GGemkc9OASNNsN g==; X-IronPort-AV: E=McAfee;i="6600,9927,10943"; a="10822148" X-IronPort-AV: E=Sophos;i="6.04,333,1695711600"; d="scan'208";a="10822148" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2024 23:16:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10943"; a="809473787" X-IronPort-AV: E=Sophos;i="6.04,333,1695711600"; d="scan'208";a="809473787" Received: from yhuang6-desk2.sh.intel.com (HELO yhuang6-desk2.ccr.corp.intel.com) ([10.238.208.55]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2024 23:16:47 -0800 From: "Huang, Ying" To: Kairui Song Cc: linux-mm@kvack.org, Kairui Song , Andrew Morton , Chris Li , Hugh Dickins , Johannes Weiner , Matthew Wilcox , Michal Hocko , Yosry Ahmed , David Hildenbrand , linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 4/9] mm/swap: always account swapped in page into current memcg In-Reply-To: <20240102175338.62012-5-ryncsn@gmail.com> (Kairui Song's message of "Wed, 3 Jan 2024 01:53:33 +0800") References: <20240102175338.62012-1-ryncsn@gmail.com> <20240102175338.62012-5-ryncsn@gmail.com> Date: Fri, 05 Jan 2024 15:14:49 +0800 Message-ID: <878r54b6ae.fsf@yhuang6-desk2.ccr.corp.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=ascii X-Rspamd-Queue-Id: 6DE921C000A X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: mninjdcdijo8wxm15etxcfnbtm61bj77 X-HE-Tag: 1704439012-789422 X-HE-Meta: U2FsdGVkX19phQUoSzDPMzFIUf7ENMu9BTi7+JzWZ1fq4BBzHdG8g7Vwrg1tiYqWKWh/W9pGIM+CawvgoJ0gPTBHElrOTBLb2zA4CeeMq3UYHTt5otFafGuGRGxuY9xr8o1m26tAz4DDBlO6HnQY61ARIpj6t5XtEU76SbaNmrrU2mm1eqCaH4Zj8xUByN6v51LofPevUEAGBeooGhxHTSpm29BpGpviFddI3/x9rg+kOyHfe4oM0fjrpvjgHlKTNRcRLe4ATPo6n+MovQ/CUuTPIZZC1gP2+ePGTlAGl1YEZNiOcmHEkSi1Ka3jwOZIIgIGbZAOCOKX7NrxFHYhf/0ab89PfVrQSwgDN3bHGcsMFbeQNXkZXaPrVYU+UlWyTsJR/pEqgSusOoIO2H6B+Gn74u4G3SWj1QR1wzGsn+J4QrsacVS8Oe24KU+om/aT75sysegji5f0QzEl0qKZ0LvxfzmoYS/rNcfG78wQX17W4EUzXnYLEURdpOep1D7heK0mj0pIeVG+JxrMMcvg9TtRvO57Dn+UahdLB0OH+GVhfBs8tvn7zYPaaPu/G5hjpHpNPsFE+aSztoNF/zk8oo8Q9OKgKFEexx7AWSwwpyy6eBNEQzd6H7tQOYrm5umRvFrav7Q+M5abiH32086fiQheps6/rCoB+mdHAXSEofSAEr0caB+fHZV8niHbZOCrSFh73l1g1GG9NmugTXzoZ3ozCoN5uNmrml7Xk4Gz2KtZHQk/fmz50iogKfd4h1kuoTITC5lf0mhYn66xdpB1dEyhdui8Cv/GrBpTLuOEA3qb+NLhENaSK37sTMk5rURaYG2SuFcIeZc4hu+DpPR6TK9gsK5ym0RgyfWTDfExhY1QPCJKxxroD/ynvpHWcdm8tRmkuA/rMZh8znJnAk8Y4WnRCzMfv3jfDUv2tGENlkD7cEMhox811h5c8AqU5iE2jFaOYTLkmnAfdi+1SKZ PSOtVyl2 h0v1F4HFsBLfxlLqzacAfkoT2a58d8wfe+9kE+agc44j/Ya3LJ46jHPKOYwVfOFxZnrEoE/CaGH/yoFmW27gCMxN8E2t27pjOOXdGU1tD3JyfldbQHG2X3BuuP7FfxclG0mTyKeMixmWkrjPL4nE/pNia5K+mfpa/BT7w6nOOw02/Id18h8hcq6X/09hgMRDJ0Ej/j1qBmgjrTr6tarGtW70+3/ahapMo8CJwpFDLG5EHs3kV5Ki8ehkwy4J5Y4KB8n8+ 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: List-Subscribe: List-Unsubscribe: Kairui Song writes: > From: Kairui Song > > Currently, mem_cgroup_swapin_charge_folio is always called with > mm argument as NULL, except in swapin_direct. > > swapin_direct is used when swapin should skip readahead and > swapcache (SWP_SYNCHRONOUS_IO). Other caller paths of > mem_cgroup_swapin_charge_folio are for swapin that should > not skip readahead and cache. > > This could cause swapin charging to behave differently depending > on swap device. This currently didn't happen because the only call > path of swapin_direct is the direct anon page fault path, where mm > equals to current->mm, but will no longer be true if swapin_direct > is shared and have other callers (eg, swapoff). > > So make swapin_direct also passes NULL for mm, no feature change. > > Signed-off-by: Kairui Song > --- > mm/swap_state.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/swap_state.c b/mm/swap_state.c > index 6130de8d5226..d39c5369da21 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -881,7 +881,7 @@ struct folio *swapin_direct(swp_entry_t entry, gfp_t gfp_mask, > folio = vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, > vma, vmf->address, false); > if (folio) { > - if (mem_cgroup_swapin_charge_folio(folio, vma->vm_mm, > + if (mem_cgroup_swapin_charge_folio(folio, NULL, > GFP_KERNEL, entry)) { > folio_put(folio); > return NULL; I think that why not provide "mm" when it's available? For swapin_direct() called by do_swap_page(), mm can be provided. While, for swapin_direct() called by shmem swapin, mm will be NULL. We can even provide "mm" for __read_swap_cache_async() for VMA based swapin and for the fault address for cluster swapin. -- Best Regards, Huang, Ying