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 1CFE1C25B76 for ; Mon, 3 Jun 2024 06:07:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 825DE6B009B; Mon, 3 Jun 2024 02:07:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D6B96B009C; Mon, 3 Jun 2024 02:07:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C48F6B009E; Mon, 3 Jun 2024 02:07:56 -0400 (EDT) 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 510726B009B for ; Mon, 3 Jun 2024 02:07:56 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id B9B0BA07B5 for ; Mon, 3 Jun 2024 06:07:55 +0000 (UTC) X-FDA: 82188546510.02.5811CE2 Received: from out-181.mta1.migadu.com (out-181.mta1.migadu.com [95.215.58.181]) by imf29.hostedemail.com (Postfix) with ESMTP id A69B7120002 for ; Mon, 3 Jun 2024 06:07:53 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=poEldqWu; spf=pass (imf29.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.181 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717394873; a=rsa-sha256; cv=none; b=AX63mHeLiq+hEaR3t0L3NpPst6ihLf4qpBbJWcMqdyudhfaCyh1WkKOEvPriX7eROf8ObC 1WtClNiqXkuVxUm5eb3CqB3FD4fdPqxHcJFcsaPt/O3lpb4uoQu0YPx/O715/S8/T162YM kNuoc5PuhORbj4TkUEMyE32dsxaWsd8= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=poEldqWu; spf=pass (imf29.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.181 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717394873; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=lGrrOJrJBkBQe6EQRvR+Wm4pVmmlK5pjswzRASjAaAk=; b=dpMWYrc+bOQaSmIS3+ZxzKv0Fu4Wyu+U4zPc7551tLEw6jBtjKxini1rI9zPRLYdULAZfc pjXqSU4l1XI9crSx7E79i/7egBfn1uA4wnU91fzrcH3WagG5qdCJPuh61JCLbsPw5IrXbD 5kaE/pHlUgfnixgM1wPobbbBa2OmQ+g= X-Envelope-To: yosryahmed@google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1717394872; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lGrrOJrJBkBQe6EQRvR+Wm4pVmmlK5pjswzRASjAaAk=; b=poEldqWuC5AdILdualjDCyO0jcsQPwB2dNl4E+G+e95RhHOJsHOwh8KbCW1tVMXbpVfTVO XyXWqYAL3HqnVKEY5EeIjkPVSCbEQV9ihMf3yQsCEjxGv6m4hmdqCGmZ90/owkuqmiLCAh cb002kdDSZefBmj0wDmvSfA8odQllqo= X-Envelope-To: akpm@linux-foundation.org X-Envelope-To: hannes@cmpxchg.org X-Envelope-To: nphamcs@gmail.com X-Envelope-To: willy@infradead.org X-Envelope-To: linux-mm@kvack.org X-Envelope-To: linux-kernel@vger.kernel.org Message-ID: <85994845-1aad-4142-adb3-91aa231b5a7d@linux.dev> Date: Mon, 3 Jun 2024 14:07:40 +0800 MIME-Version: 1.0 Subject: Re: [PATCH 3/3] mm: zswap: make same_filled functions folio-friendly Content-Language: en-US To: Yosry Ahmed , Andrew Morton Cc: Johannes Weiner , Nhat Pham , Matthew Wilcox , linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20240524033819.1953587-1-yosryahmed@google.com> <20240524033819.1953587-4-yosryahmed@google.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chengming Zhou In-Reply-To: <20240524033819.1953587-4-yosryahmed@google.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: A69B7120002 X-Rspam-User: X-Rspamd-Server: rspam12 X-Stat-Signature: 9wryfg5g5g4rt1axha48o4xjfxqsutk7 X-HE-Tag: 1717394873-914238 X-HE-Meta: U2FsdGVkX1/wO3WYqUubOHndbiPwzyGlskwpbrkIJWAoKRFbrUnWYUIFdBohS7SdOlA+A8v32470TgQ1q3rgiyrKVwYHQQ4QKcEwY6BkwP1ysRUo4twgbs2rIVRnH3eQFuOQEXe/pq+UXPddLeWk5+Wo0EZ/LXCyxzZ6vR1uvOncIkX990Zxi70OZFN2Phv458nFL8xKpsF0L3MJCxzgjXvYsyOGDbY8x9KO08UX79ZRGwqQrZKKYUoUzBTYCDjcVBfDgObUoFteawK+rfLdCsQ2Wz9pqYDz8w7I+GF4O5/nP4Vim1mp0qN/Pqg10+py8Df7Zu31I583ent+tsGCYYhT5Vqe6SVlddAe9W2MzchitRnpDM594kdiYIhvGMX6mrQJqbdV8LNm/GIe33SCBySBYRP5xPED35BPM07YAgoq8o5/U2DObw7jh81CxYpQbJ8RYO4OuepQZS9Z7XkY+9YqfaGvk9Qq3FRLvTudJ0pQ7CibVqx7DVePgkfbtJCn6qa8WLAkNszLCnGD36HCzpbitswLE4o4PJdtuTX2ii0tzP65/SNsqhsXyEnLjZCh73LSTbVzhtq5RA1VVqAHdVucJJ0FLIpkWEra5gHyWVo2V3/pzwck3pI9hUiwrPYW+HSy+I+Tmkr4RwkkIjfLj9BMo3fmDscbRmcMZjIEfOn0Aun243ZFYMD0/GqLAzYrkCNMA6E+fkB3Y2+iQSHO28mi1g5tYSLztWdgUMNRf21pw0jOpWH1NI+ot794n4CVq5Ag/o3Y3ntbSl5kSGg72li3SFqBpzJPXfHAWFv3K0uMdorv5Syp4xrjmb48QPGuDsE0uIU+hin/2X8TvAgqo417gOIEMeCa1FAZMtA/lWvjYaBuVIIsiZZHCu9WPfhGnpyyFdLOPqBDsNGhMGI0b7+0gsUBWuJBRKYG82oAxSgFIXnlyRI8zxOtOi3N0nuf47QxyautkwYJkJTjJgY kyj4XgLW skUfPLwmztHW5C5IpOa/fuDDnR+olFERdPVZbGyhjicQlL5WrtG97QGpwGCjDObrnMxtVX0fTGH41L4/aQlD7V3OCshn9gMegH3FM2XSQIlUPHUOv1R3Pipn3sMWCBxDgwkLEJnx+8LN+QCPachUAl/RbNaGm2oTQDV8f 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 2024/5/24 11:38, Yosry Ahmed wrote: > A variable name 'page' is used in zswap_is_folio_same_filled() and > zswap_fill_page() to point at the kmapped data in a folio. Use 'data' > instead to avoid confusion and stop it from showing up when searching > for 'page' references in mm/zswap.c. > > While we are at it, move the kmap/kunmap calls into zswap_fill_page(), > make it take in a folio, and rename it to zswap_fill_folio(). > > Signed-off-by: Yosry Ahmed LGTM, thanks! Reviewed-by: Chengming Zhou > --- > mm/zswap.c | 30 +++++++++++++----------------- > 1 file changed, 13 insertions(+), 17 deletions(-) > > diff --git a/mm/zswap.c b/mm/zswap.c > index bac66991fb14e..b9b35ef86d9be 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -1375,35 +1375,35 @@ static void shrink_worker(struct work_struct *w) > **********************************/ > static bool zswap_is_folio_same_filled(struct folio *folio, unsigned long *value) > { > - unsigned long *page; > + unsigned long *data; > unsigned long val; > - unsigned int pos, last_pos = PAGE_SIZE / sizeof(*page) - 1; > + unsigned int pos, last_pos = PAGE_SIZE / sizeof(*data) - 1; > bool ret = false; > > - page = kmap_local_folio(folio, 0); > - val = page[0]; > + data = kmap_local_folio(folio, 0); > + val = data[0]; > > - if (val != page[last_pos]) > + if (val != data[last_pos]) > goto out; > > for (pos = 1; pos < last_pos; pos++) { > - if (val != page[pos]) > + if (val != data[pos]) > goto out; > } > > *value = val; > ret = true; > out: > - kunmap_local(page); > + kunmap_local(data); > return ret; > } > > -static void zswap_fill_page(void *ptr, unsigned long value) > +static void zswap_fill_folio(struct folio *folio, unsigned long value) > { > - unsigned long *page; > + unsigned long *data = kmap_local_folio(folio, 0); > > - page = (unsigned long *)ptr; > - memset_l(page, value, PAGE_SIZE / sizeof(unsigned long)); > + memset_l(data, value, PAGE_SIZE / sizeof(unsigned long)); > + kunmap_local(data); > } > > /********************************* > @@ -1554,7 +1554,6 @@ bool zswap_load(struct folio *folio) > bool swapcache = folio_test_swapcache(folio); > struct xarray *tree = swap_zswap_tree(swp); > struct zswap_entry *entry; > - u8 *dst; > > VM_WARN_ON_ONCE(!folio_test_locked(folio)); > > @@ -1580,11 +1579,8 @@ bool zswap_load(struct folio *folio) > > if (entry->length) > zswap_decompress(entry, folio); > - else { > - dst = kmap_local_folio(folio, 0); > - zswap_fill_page(dst, entry->value); > - kunmap_local(dst); > - } > + else > + zswap_fill_folio(folio, entry->value); > > count_vm_event(ZSWPIN); > if (entry->objcg)