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 A9B81E77199 for ; Thu, 9 Jan 2025 04:05:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 148976B009B; Wed, 8 Jan 2025 23:05:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F83E6B00A5; Wed, 8 Jan 2025 23:05:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EDB0E6B00A7; Wed, 8 Jan 2025 23:05:08 -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 D00AA6B00A0 for ; Wed, 8 Jan 2025 23:05:08 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 54494C1679 for ; Thu, 9 Jan 2025 04:05:08 +0000 (UTC) X-FDA: 82986573096.20.D79D8AB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 83C8F80007 for ; Thu, 9 Jan 2025 04:05:05 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XdP754Tr; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736395505; a=rsa-sha256; cv=none; b=FAzP8fe7Z1lHtNcAzAUmvjPGoOTkCdkRuc3Q/yBupeTUuOXystwbn88DwqtXL54Vlc5Vaa lNEq7Zi0+kLLwUItfu+jegu3dfFNBVc1oCwtzqquttH+p+Yafx0CXwd2CrLqzzqIQ0w0L4 2XZup+hCYcbUV0khO+YEUC1gYciGH60= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XdP754Tr; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1736395505; 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=Heh7PR+7tVAH8KEF5f0RmJaGucOc6ZlxH2lKixXCaN4=; b=GxkfpiIY/bpcbjaXm2ZsqgFnOBpVot8RRxlQcvKo2gUfQwFu2PohWz6aLIFeNgMjvjQRgB 62ankUsahJr4XAgZ8/sIh489TYEHe9kocNdgbf9Z53ccWAdAMPetCKOHaWMEeMq0yw1MEE BvZp1s2dUQCCbrXhQCha1Cz0eYI78+g= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736395504; 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=Heh7PR+7tVAH8KEF5f0RmJaGucOc6ZlxH2lKixXCaN4=; b=XdP754TryLp7FVcRpJhB2foDzukurDmc/IT+LgJyDnlwhTT+G8TIWtUbknjzQkMXHUBBvA FNZf6cA12Ld6zRBAw0cQPzgoYhUaymdJDoA0w98u8khXSGRXt11hbQ0GmLi4EluIMbcdaY pJBgQ5UQ933FAg5hH65/++DBrrndjR8= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-662-HzTtlziPPCaRaQDbxqcXCQ-1; Wed, 08 Jan 2025 23:05:01 -0500 X-MC-Unique: HzTtlziPPCaRaQDbxqcXCQ-1 X-Mimecast-MFC-AGG-ID: HzTtlziPPCaRaQDbxqcXCQ Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B68941979053; Thu, 9 Jan 2025 04:04:57 +0000 (UTC) Received: from localhost (unknown [10.72.112.99]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4CCCB19560B9; Thu, 9 Jan 2025 04:04:54 +0000 (UTC) Date: Thu, 9 Jan 2025 12:04:49 +0800 From: Baoquan He To: Kairui Song Cc: linux-mm@kvack.org, Andrew Morton , Chris Li , Barry Song , Ryan Roberts , Hugh Dickins , Yosry Ahmed , "Huang, Ying" , Nhat Pham , Johannes Weiner , Kalesh Singh , linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 01/13] mm, swap: minor clean up for swap entry allocation Message-ID: References: <20241230174621.61185-1-ryncsn@gmail.com> <20241230174621.61185-2-ryncsn@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241230174621.61185-2-ryncsn@gmail.com> X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 83C8F80007 X-Stat-Signature: 1cgmdcyq4rmbfkg86um3awmmxyz3ay7j X-HE-Tag: 1736395505-989030 X-HE-Meta: U2FsdGVkX1+5UPmjxj04mgF4PNCTM9nuro2MB8a/5PoYB65n0r9Jdsd1DKp6RmXvzaZJUlUvNq4kYH3gPWk2SxL7GVpu/NMdW8pQFXDtto9xgNRbPEOmRl1Pkq5QmgD80Zz7KZz3dJOCVtvIFbW+7dnj0slKoTM51OUybXuVal63JyjXA+N1qFwdIZfYIm1+jk/0AeojtREkclHVg2jiQ+16gg9e33AGTWdnw2Vodr33DaS/PTLih4HZyTxFWAGQa44rFHgX43Z7+4mEx6rYSmq1Wki/1mN80n9e6yLqOMH1rcYnpM14zbStU2dL8oxvG1NoB+F7yNrxNO16cWvVxznWa/w74zwmQd2T+hcGDGiK+FVOSO2TMOC1/z3c05TzjTNfZ7SJpYsBZjvqVe0l/PZ4QxJCuIT/Z+agdhrXR3rCwSyxQd8F11a9vhzItN7bD9aJz5SgtSZQ4fCFMpUaAq8Q+3nnLIXjZnF0kivSG9UN9HEddg6D9mZQRsnOdQba64ETPFNFDBzFVGk0adtL6u2gjavQtoUIi3VeLQnYYdq6KNW+fgMrKsoK/3V/lbiWVrdY6d+/0hi6JZsWj270U9tR+eazolfEkNpMXYuVQ/1TEx6sjh+6UZc+8L2t+D+IOzkNKbY8pzZkXg1j552jF/aIiFWz8a6iUVNFpxFpUv3YL7MwR+pP8hfjZFHan3kygeteTVUcLQeWsimkVvEUPou78LVKpyj4rqQr5Yahhk2/1S9g3699VLzPT1Q8ZOhiTwh5V4BUqEJE+URiIvkDCqlulZ1qQ5tu4jj+MPx2VRHil8cK12cN86kMeFW5UwGjwm+yaE5v51CllVNQ8+n437BiYDj4G9rr6O3bi7jRzYP1CPiCpv2glOXeodIhFEI1KXcY8CgNKLHfzcaXwz88y1WLx/yaobdORzllLj82msnTCJdESbCk+4Io75/dRVZG16+72v7kOTj3/GqnSwx D4ZdwMLg Y2aNpKzLpEN/Rezd88CugNveWSuHxh2mT4RkbK3jEIdesxiB1BuPmIoDKiVxvvmBudcV9dauiHJvzIC8ClloPhIOcs6cOM4N+Os13GSzICf9qxb1D7Wy5URTrIaVfYg+F+ZDVZIaNhDl1qsDTqdQVXvDRLs7A6qMK76SnI9Aa4IBoXl4vCDo5XstPvez2PORNcET4QNp0CBSiNg0Wii0MoEysQuWrD8tHSt6RY51k1IRtWzgSpkqWdi0t/zK8+S/36/uBtdpJ2zIZeucNx5jQkXTSagtZSlIkYMj7zGDjSQi6O1sMRVPEdoIMqNCuFy5dNsIYa6Mio2q5tq4uRkk4TbSZcV6M2oRkpEkbzcYanqPGwUtPLLj/IdGKDRELQpL/nibTHkbWBDTvIbM= 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 12/31/24 at 01:46am, Kairui Song wrote: > From: Kairui Song > > Direct reclaim can skip the whole folio after reclaimed a set of > folio based slots. Also simplify the code for allocation, reduce > indention. > > Signed-off-by: Kairui Song > --- > mm/swapfile.c | 59 +++++++++++++++++++++++++-------------------------- > 1 file changed, 29 insertions(+), 30 deletions(-) This actually can be split as two patches. Anyway, Reviewed-by: Baoquan He > > diff --git a/mm/swapfile.c b/mm/swapfile.c > index b0a9071cfe1d..f8002f110104 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -604,23 +604,28 @@ static bool cluster_reclaim_range(struct swap_info_struct *si, > unsigned long start, unsigned long end) > { > unsigned char *map = si->swap_map; > - unsigned long offset; > + unsigned long offset = start; > + int nr_reclaim; > > spin_unlock(&ci->lock); > spin_unlock(&si->lock); > > - for (offset = start; offset < end; offset++) { > + do { > switch (READ_ONCE(map[offset])) { > case 0: > - continue; > + offset++; > + break; > case SWAP_HAS_CACHE: > - if (__try_to_reclaim_swap(si, offset, TTRS_ANYWAY | TTRS_DIRECT) > 0) > - continue; > - goto out; > + nr_reclaim = __try_to_reclaim_swap(si, offset, TTRS_ANYWAY | TTRS_DIRECT); > + if (nr_reclaim > 0) > + offset += nr_reclaim; > + else > + goto out; > + break; > default: > goto out; > } > - } > + } while (offset < end); > out: > spin_lock(&si->lock); > spin_lock(&ci->lock); > @@ -838,35 +843,30 @@ static unsigned long cluster_alloc_swap_entry(struct swap_info_struct *si, int o > &found, order, usage); > frags++; > if (found) > - break; > + goto done; > } > > - if (!found) { > + /* > + * Nonfull clusters are moved to frag tail if we reached > + * here, count them too, don't over scan the frag list. > + */ > + while (frags < si->frag_cluster_nr[order]) { > + ci = list_first_entry(&si->frag_clusters[order], > + struct swap_cluster_info, list); > /* > - * Nonfull clusters are moved to frag tail if we reached > - * here, count them too, don't over scan the frag list. > + * Rotate the frag list to iterate, they were all failing > + * high order allocation or moved here due to per-CPU usage, > + * this help keeping usable cluster ahead. > */ > - while (frags < si->frag_cluster_nr[order]) { > - ci = list_first_entry(&si->frag_clusters[order], > - struct swap_cluster_info, list); > - /* > - * Rotate the frag list to iterate, they were all failing > - * high order allocation or moved here due to per-CPU usage, > - * this help keeping usable cluster ahead. > - */ > - list_move_tail(&ci->list, &si->frag_clusters[order]); > - offset = alloc_swap_scan_cluster(si, cluster_offset(si, ci), > - &found, order, usage); > - frags++; > - if (found) > - break; > - } > + list_move_tail(&ci->list, &si->frag_clusters[order]); > + offset = alloc_swap_scan_cluster(si, cluster_offset(si, ci), > + &found, order, usage); > + frags++; > + if (found) > + goto done; > } > } > > - if (found) > - goto done; > - > if (!list_empty(&si->discard_clusters)) { > /* > * we don't have free cluster but have some clusters in > @@ -904,7 +904,6 @@ static unsigned long cluster_alloc_swap_entry(struct swap_info_struct *si, int o > goto done; > } > } > - > done: > cluster->next[order] = offset; > return found; > -- > 2.47.1 > >