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 7E200C4321E for ; Wed, 18 May 2022 09:37:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1D9626B0072; Wed, 18 May 2022 05:37:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1893A6B0073; Wed, 18 May 2022 05:37:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 051AB6B0074; Wed, 18 May 2022 05:37:51 -0400 (EDT) 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 E82566B0072 for ; Wed, 18 May 2022 05:37:50 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C83692056D for ; Wed, 18 May 2022 09:37:50 +0000 (UTC) X-FDA: 79478361900.07.E1E55E4 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf25.hostedemail.com (Postfix) with ESMTP id A79C4A009E for ; Wed, 18 May 2022 09:37:26 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id C97E121BBE; Wed, 18 May 2022 09:37:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1652866668; h=from:from:reply-to: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=HzOkeYYjSkPEtsKb0hML8fTPGO3mMqRS/q6R7KG3LyM=; b=Jx7fnVbOJ3gO9DN6ryDRbldgEIhfeUCubpkL9E8Ke9vXwuHlKKFWZ0zCa6LQGDlf2vwkjB LSLIOXTpE9vbYpAJiwWiEH0B8obcqAVK+htKlK6oei/RQ3iTJs74+K1Slro6fhbbLV1fjT IkuPvB/3ssIsOAG10J6OpbjNzOCohps= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1652866668; h=from:from:reply-to: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=HzOkeYYjSkPEtsKb0hML8fTPGO3mMqRS/q6R7KG3LyM=; b=lzNEiCgKHyOOYmDZHGS7KQd6PbSt0MhgwODN+OrLOko2B5jPkiviP8iEUuG3DMXU8EnQ6W SYgAMdOe/qtQeiBQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 93BB9133F5; Wed, 18 May 2022 09:37:47 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id ndHkHGu+hGL1EQAAMHmgww (envelope-from ); Wed, 18 May 2022 09:37:47 +0000 Date: Wed, 18 May 2022 11:37:45 +0200 From: Oscar Salvador To: Miaohe Lin Cc: akpm@linux-foundation.org, willy@infradead.org, vbabka@suse.cz, dhowells@redhat.com, neilb@suse.de, apopple@nvidia.com, david@redhat.com, surenb@google.com, peterx@redhat.com, naoya.horiguchi@nec.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 06/15] mm/swap: remove buggy cache->nr check in refill_swap_slots_cache Message-ID: References: <20220509131416.17553-1-linmiaohe@huawei.com> <20220509131416.17553-7-linmiaohe@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220509131416.17553-7-linmiaohe@huawei.com> X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: A79C4A009E X-Stat-Signature: rf486ncb7o7h6zx8zg816jbc4sy5bn8e X-Rspam-User: Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Jx7fnVbO; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=lzNEiCgK; spf=pass (imf25.hostedemail.com: domain of osalvador@suse.de designates 195.135.220.28 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de X-HE-Tag: 1652866646-327506 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, May 09, 2022 at 09:14:07PM +0800, Miaohe Lin wrote: > refill_swap_slots_cache is always called when cache->nr is 0. And if > cache->nr != 0, we should return cache->nr instead of 0. So remove > such buggy and confusing check. > > Signed-off-by: Miaohe Lin With Andrew's ammendment: Reviewed-by: Oscar Salvador > --- > mm/swap_slots.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/swap_slots.c b/mm/swap_slots.c > index 2f877e6f87d7..2a65a89b5b4d 100644 > --- a/mm/swap_slots.c > +++ b/mm/swap_slots.c > @@ -258,7 +258,7 @@ void enable_swap_slots_cache(void) > /* called with swap slot cache's alloc lock held */ > static int refill_swap_slots_cache(struct swap_slots_cache *cache) > { > - if (!use_swap_slot_cache || cache->nr) > + if (!use_swap_slot_cache) > return 0; > > cache->cur = 0; > -- > 2.23.0 > > -- Oscar Salvador SUSE Labs