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 98D62C021AA for ; Wed, 19 Feb 2025 02:42:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 321A6280113; Tue, 18 Feb 2025 21:42:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2D1512800FF; Tue, 18 Feb 2025 21:42:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1992D280113; Tue, 18 Feb 2025 21:42:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id F0A332800FF for ; Tue, 18 Feb 2025 21:42:42 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 9E2731C8155 for ; Wed, 19 Feb 2025 02:42:42 +0000 (UTC) X-FDA: 83135146164.19.26864A7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf01.hostedemail.com (Postfix) with ESMTP id ACD684000D for ; Wed, 19 Feb 2025 02:42:40 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=N1vfgbHE; spf=pass (imf01.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739932960; 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=VxGow9T5Rm1Zah6lyvVvsZOcPv8HupyfwhnCQmanDiw=; b=D5kcR89BWsRBwrR+IU26GCPxkaqweydcGuxTSezyXgzr64WEXzGitOvfkVZitDQZ8oET28 k4mVq6ZIQupHRTAg6k8QQ89htOSXiWhYzUYCfrnKD567oxQ0gEUvJ73//rKQBquOf/9Ro8 SFXZMCv3dsG3zLho0UNbQ1QPZEsQIs8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739932960; a=rsa-sha256; cv=none; b=AZCyAizyQhdMxRJ2liAZeNnye79BpMDRDjCAnsxCRWWUw5CTltsfvg+/cdz7M5vT3leIWA sYc8ofq/lBJUDQDq5jn2Mc13LnqYTgFSdpGp2d662VKcsiQzLLee5mVPzTeKYOZq9R3DzZ srg4cboAmZDaAaqiE3zlPFpgFJh935M= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=N1vfgbHE; spf=pass (imf01.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739932960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=VxGow9T5Rm1Zah6lyvVvsZOcPv8HupyfwhnCQmanDiw=; b=N1vfgbHEU7JOxdEyGogCajNHDxOEjBVlH39Dc+LfaXpIa994887AcCkhOo0ySMqitEWfJt o5P1xQQOkd6VfYhJ9HQX0JEyPMQcTcXhKt3eofh4qbUZ4eOr5XCMEP3mU3DG3hfqx0o6G7 hb+atiz1kivaLM/7pFTz5r4PQYQFUGY= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-345-TYU6cTYCOL6RDQidgVqd2A-1; Tue, 18 Feb 2025 21:42:33 -0500 X-MC-Unique: TYU6cTYCOL6RDQidgVqd2A-1 X-Mimecast-MFC-AGG-ID: TYU6cTYCOL6RDQidgVqd2A_1739932951 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 486C9180098B; Wed, 19 Feb 2025 02:42:31 +0000 (UTC) Received: from localhost (unknown [10.72.112.127]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 847B21800940; Wed, 19 Feb 2025 02:42:28 +0000 (UTC) Date: Wed, 19 Feb 2025 10:42:24 +0800 From: Baoquan He To: Kairui Song Cc: linux-mm@kvack.org, Andrew Morton , Chris Li , Barry Song , Hugh Dickins , Yosry Ahmed , "Huang, Ying" , Nhat Pham , Johannes Weiner , Kalesh Singh , linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/7] mm, swap: drop the flag TTRS_DIRECT Message-ID: References: <20250214175709.76029-1-ryncsn@gmail.com> <20250214175709.76029-3-ryncsn@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250214175709.76029-3-ryncsn@gmail.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspam-User: X-Rspamd-Queue-Id: ACD684000D X-Rspamd-Server: rspam07 X-Stat-Signature: m1m1y48n6jqyth6c5n3e4oto7tkzciqo X-HE-Tag: 1739932960-386950 X-HE-Meta: U2FsdGVkX1/zoaus7qHA7D0+4SQE2TX1itvh4lgpiSE3LrM0nOZdaHy33J0H4cUtRzUPfJKXMILXw3PDROW12KifjKmJmtv6XJOmZMIZDk1fXsVQG3vnZT0PjhtvPjVVeNQT48UVkbXDv9RuZu8ao5l+IgOmzNmYU8l7YEVXzWsslhWWQjzy8sL+WjZBzkXAevMCqWjyLl0eHoMq8RXEbhfDDOprJdqAH5ZIaurhJYJRUC4xgtKU6AHao6hoThAjMt4jyr8ybddb7sVx+VmHVfuOxPfjlSLoI4qFcqiouVZVQmUmd37ySP0EUMSRtrQWE8xtjQ0TehxWMpIc/tLhBveCM2NkNYQJc7p59OP3S2XwdQz51CLMsD1u7h1XshjOmdNyVwQZevDeD6AHMXvwsuhIcIJiHfDT+DQTQD/bkqNZQZctTgb2IdguN0nBUna350vv+guZDEm37SLWzE0UpcBWxWIn2f/sWf87MkSDBt82ul88PQY/552Mju2Lfn0cbky1131Lpfn/BAaK0TAoghS8AlXWG7q/etfSAouGlsyy6E8qCkVufDuZvl5GKbxoURKhMpc7wz8eO01+kPX9CaQcxy+AhIXMqNKGYo7B0g9FE8mRJee8uG4ZqcmYpEufH9plwFm8Nx8vPPD0NjC1sZm/2P5L6qnWImM/n7WYXeTH98edAZiP+JkalwxCp59sIsvmXJh6b5LB/LDlXXmANB+gjj1R3J3JtnA9KusJMuYbpvGACeIc3zErgm/8QjlBKaBzg98DmUsVoOrzLE2d56VEK9A8skCrncRTeVagYTRdMO12Nm6FLQOldiJe3K/FApto8XG3oATJL/gvMshXBUFegesLfCrJTXRhkhe5isKO7EjYc1VHjgJawym9M/InBHM+ZY6fB3/RxU6MhvA0YycAkxrGDrttUeZX6u5k/CLAN0nDh/k4HS72r2fbvL+aw4lDv20+Cw3uetlEpjz qc8N3p0F rrkSDg47kGzPWHpdanTAjHaOxjMAYdTboDxUWubzm7vmp7bfoOGFRDFn8psTTfSY3lyvmHXHgtHOX0apVwU4hHGiQqUYhhV3CojqUbIZ5RyTRgeY6sac1E2WUc3tYcQjUZ3tsXrEvNwZEh1PWiY+5awVBZwthus0TmGyF+JOcsPfbTueB2oOs3VXIbxWWZpjd0f03qA6g6FtGbAtWxRCey3o9xXf66KiDvrt7xgtNoCwSV3oeic/YEnwo8EHpmtdLhQd/dXzVQ8Xs2yFCXWcERmOLabdzfgTieV59kLf6jwMZJx7/6hiMjR076lbx99XwC0K/yrzfo1OJB7dJqXqCoRCybPPubM7AN1S/SF1nhwCqGhaS7GjVgrDFLsFOKkhYWtm3c1JoFm277HrsLqisGMzd6lGk/kkuN97YmZGhFmRwdAM9w/3b4hHbsU/AOuw73/V8ykIaDK4mlaeCGh0Jpv5ZyEAEuHFVb/I3cEhf497vYFiQEYHDWN33a6SBnmGmuDpe9oHKNh2catH4ZHh3UqDILg== 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: On 02/15/25 at 01:57am, Kairui Song wrote: > From: Kairui Song > > This flag exists temporarily to allow the allocator to bypass the slot > cache during freeing, so reclaiming one slot will free the slot > immediately. > > But now we have already removed slot cache usage on freeing, so this > flag has no effect now. > > Signed-off-by: Kairui Song > --- > mm/swapfile.c | 23 +++-------------------- > 1 file changed, 3 insertions(+), 20 deletions(-) > > diff --git a/mm/swapfile.c b/mm/swapfile.c > index c77ffee4af86..449e388a6fec 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c Reviewed-by: Baoquan He > @@ -158,8 +158,6 @@ static long swap_usage_in_pages(struct swap_info_struct *si) > #define TTRS_UNMAPPED 0x2 > /* Reclaim the swap entry if swap is getting full */ > #define TTRS_FULL 0x4 > -/* Reclaim directly, bypass the slot cache and don't touch device lock */ > -#define TTRS_DIRECT 0x8 > > static bool swap_only_has_cache(struct swap_info_struct *si, > unsigned long offset, int nr_pages) > @@ -257,23 +255,8 @@ static int __try_to_reclaim_swap(struct swap_info_struct *si, > if (!need_reclaim) > goto out_unlock; > > - if (!(flags & TTRS_DIRECT)) { > - /* Free through slot cache */ > - delete_from_swap_cache(folio); > - folio_set_dirty(folio); > - ret = nr_pages; > - goto out_unlock; > - } > - > - xa_lock_irq(&address_space->i_pages); > - __delete_from_swap_cache(folio, entry, NULL); > - xa_unlock_irq(&address_space->i_pages); > - folio_ref_sub(folio, nr_pages); > + delete_from_swap_cache(folio); > folio_set_dirty(folio); > - > - ci = lock_cluster(si, offset); > - swap_entry_range_free(si, ci, entry, nr_pages); > - unlock_cluster(ci); > ret = nr_pages; > out_unlock: > folio_unlock(folio); > @@ -707,7 +690,7 @@ static bool cluster_reclaim_range(struct swap_info_struct *si, > offset++; > break; > case SWAP_HAS_CACHE: > - nr_reclaim = __try_to_reclaim_swap(si, offset, TTRS_ANYWAY | TTRS_DIRECT); > + nr_reclaim = __try_to_reclaim_swap(si, offset, TTRS_ANYWAY); > if (nr_reclaim > 0) > offset += nr_reclaim; > else > @@ -860,7 +843,7 @@ static void swap_reclaim_full_clusters(struct swap_info_struct *si, bool force) > if (READ_ONCE(map[offset]) == SWAP_HAS_CACHE) { > spin_unlock(&ci->lock); > nr_reclaim = __try_to_reclaim_swap(si, offset, > - TTRS_ANYWAY | TTRS_DIRECT); > + TTRS_ANYWAY); > spin_lock(&ci->lock); > if (nr_reclaim) { > offset += abs(nr_reclaim); > -- > 2.48.1 >