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 X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F24B4C55182 for ; Mon, 20 Apr 2020 21:37:30 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AFDC720722 for ; Mon, 20 Apr 2020 21:37:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tS5kOR3q" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AFDC720722 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 3CEC48E0005; Mon, 20 Apr 2020 17:37:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 37F978E0003; Mon, 20 Apr 2020 17:37:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2959D8E0005; Mon, 20 Apr 2020 17:37:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0044.hostedemail.com [216.40.44.44]) by kanga.kvack.org (Postfix) with ESMTP id 108B68E0003 for ; Mon, 20 Apr 2020 17:37:30 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id BB050180AD822 for ; Mon, 20 Apr 2020 21:37:29 +0000 (UTC) X-FDA: 76729545018.16.rings95_5e8300cdb3d10 X-HE-Tag: rings95_5e8300cdb3d10 X-Filterd-Recvd-Size: 4629 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by imf10.hostedemail.com (Postfix) with ESMTP for ; Mon, 20 Apr 2020 21:37:29 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id x18so14086563wrq.2 for ; Mon, 20 Apr 2020 14:37:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:reply-to:references:mime-version :content-disposition:in-reply-to:user-agent; bh=W4Bn1MKtUzPQNpJZJxjnYoMLdILkHx07ckmoRRYi+ms=; b=tS5kOR3qoRdmcADQh2JwfruP6cP7oYTN2pWbVQvnFxntw/YVLrXxpPVGiN63ZezMIS plBnDsbuZJNqmm3OT8EQyL45pKUg2NTa1H4hINr0pKz53vePltPUwxaiRPhY4qHIA1bU 9JtGc/mJcSVNRN87ewx9FNh3VOS+iam+Hd/35UsRfe6xknjSwTcwqHwRP/5Lgq8YptIO LHZSCeSKM+tkyVP+vzJjyyLKFxOILE5BKTAFS5RySgqNs0tBBPcACIkLEJv63g2J7mVI UDCSDwGEdzCgOl4DJw6nvEArO1f35IxL4Y5qPPdf46F+gcoXUXjlVNdquYHEDoegc0qw wEvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:reply-to :references:mime-version:content-disposition:in-reply-to:user-agent; bh=W4Bn1MKtUzPQNpJZJxjnYoMLdILkHx07ckmoRRYi+ms=; b=SQv27LPUxF1DLr1q4aKX1SpA1inWQjMaWIQ8MsaYJkEsrwZKFws+/Rhl4BW74oE1Cx bOpdR3XYT/VoBW5VkCri7DmKkl2dqwrrY7aPDDPp6leRi5iHfCV/q54H5SYmkLxNKmsW l5tetPlBA4sShihMkfGo1OLuhsw3qvrAkbn0PS8xB/F0EHxQw5HaDvfCPTMNqzBEuokW T3eQOGQiryRH7ChlpGwkSPfT8bl98tIzyJX5JS2Vu+hh+RjKSuzXtSXNnz5XM1bCqldy +wQ0Si0dq/VEF/kmUtSoYNhFwXAgcrIOXA98HEdoEabhjYWQNpiCe0qGcsX+1FRPoIxG 7Abg== X-Gm-Message-State: AGi0PuYrF9lrTNC4iY6D6nJE5ll3J6n5HRjw31ivBovuAGuBoyGZKIbW VWY1d+VwZmWyhGOZpj4Ikkg= X-Google-Smtp-Source: APiQypLKQe0tdxzMNB/vMLEy2jql+PPVAPjM0a7sQ7uIMk/qr+dKAYtIAx/FYpr5da1PzWMg1Gmx2A== X-Received: by 2002:a5d:4dcd:: with SMTP id f13mr5595480wru.417.1587418648160; Mon, 20 Apr 2020 14:37:28 -0700 (PDT) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id a7sm857114wmj.12.2020.04.20.14.37.27 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Apr 2020 14:37:27 -0700 (PDT) Date: Mon, 20 Apr 2020 21:37:26 +0000 From: Wei Yang To: "Huang, Ying" Cc: Wei Yang , akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, tim.c.chen@linux.intel.com Subject: Re: [PATCH 3/4] mm/swapfile.c: compare tmp and max after trying to iterate on swap_map Message-ID: <20200420213726.juehv5yr5kyhlbxv@master> Reply-To: Wei Yang References: <20200419013921.14390-1-richard.weiyang@gmail.com> <20200419013921.14390-3-richard.weiyang@gmail.com> <87ftczt1cg.fsf@yhuang-dev.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87ftczt1cg.fsf@yhuang-dev.intel.com> User-Agent: NeoMutt/20170113 (1.7.2) 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 Mon, Apr 20, 2020 at 09:03:43AM +0800, Huang, Ying wrote: >Wei Yang writes: > >> There are two duplicate code to handle the case when there is no >> available swap entry. Just let the code go through and do the check at >> second place. >> >> No functional change is expected. >> >> Signed-off-by: Wei Yang >> --- >> mm/swapfile.c | 4 ---- >> 1 file changed, 4 deletions(-) >> >> diff --git a/mm/swapfile.c b/mm/swapfile.c >> index 3aae700f9931..07b0bc095411 100644 >> --- a/mm/swapfile.c >> +++ b/mm/swapfile.c >> @@ -629,10 +629,6 @@ static bool scan_swap_map_try_ssd_cluster(struct swap_info_struct *si, >> tmp = cluster->next; >> max = min_t(unsigned long, si->max, >> (cluster_next(&cluster->index) + 1) * SWAPFILE_CLUSTER); >> - if (tmp >= max) { >> - cluster_set_null(&cluster->index); >> - goto new_cluster; >> - } > >The code is to avoid to acquire the cluster lock unnecessarily. So I think >we should keep this. > If you really want to avoid the lock, my suggestion is to add: if (tmp < max) { ci = lock_cluster(si, tmp); while (tmp < max) { ... } unlock_cluster(ci); } Instead of do the similar thing twice. >Best Regards, >Huang, Ying > >> ci = lock_cluster(si, tmp); >> while (tmp < max) { >> if (!si->swap_map[tmp]) -- Wei Yang Help you, Help me