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 F0415C54FB9 for ; Sun, 19 Nov 2023 19:48:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 815AC6B0378; Sun, 19 Nov 2023 14:48:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 778906B0380; Sun, 19 Nov 2023 14:48:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5F6F66B0385; Sun, 19 Nov 2023 14:48:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 4A6196B0378 for ; Sun, 19 Nov 2023 14:48:28 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 24894402B1 for ; Sun, 19 Nov 2023 19:48:28 +0000 (UTC) X-FDA: 81475740696.19.8219A45 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by imf19.hostedemail.com (Postfix) with ESMTP id 504941A0003 for ; Sun, 19 Nov 2023 19:48:26 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dRRUBVcq; spf=pass (imf19.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.178 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700423306; h=from:from:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=65vQj2xJm5p5mk5SbjAKMeJnwT21tT7eyXmu2H+Etu0=; b=0Dc4rbMaoAt43ZZnsyx2ubzH9sMeiUfqBDD06WsZNYC2kxWb5xXgmnYo/r610HAL2skZR1 BrRN8dpmRwcwL1898IJW/EzLpKWS6wgy/r0gEM59jK5KXixQAPfnb0294eREiLa6WPOCLv Ze1OCMaP5s7ta+Yx7W1ajsFs3/UB6rs= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dRRUBVcq; spf=pass (imf19.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.178 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700423306; a=rsa-sha256; cv=none; b=TooULEyneTvVrvs+lhRDVhui9wdmSYU/cEOojq4JjqTfVAnnV43UTzWh6Gg7N4IUWJlm40 ZE/NXNWlSUENMKKnI3oz3GyO6ETadASlz3sC5DLp6aZL7BxxriLn7UmDX+Rq1NJ0+Is/0i fwij3AtWxBNRffZQDP8M9xTq0v1WXFM= Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-6cb7951d713so352248b3a.1 for ; Sun, 19 Nov 2023 11:48:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700423304; x=1701028104; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=65vQj2xJm5p5mk5SbjAKMeJnwT21tT7eyXmu2H+Etu0=; b=dRRUBVcqfb5qH64M9KHloBTGpU3kiITKYEwo8qq5NkFrqgWJYDdysk5YJ+W6rNp5me H7hL1B3VUT5X+mnNeLXEsncyYXgSuJmvoLbSZfuAX+RZufvcJWN5FPsPRWzhNRPDUwW3 k3ZRg8h4SV27qPmkXu4uwP9BgmuZSE6P07HkjH2nKjcybQD5ZQRHTJlX/QuL1x0b+geC m6zynGPzpOTYK8rJQOI38WWY1rdTgkFqalQnc0rQ9ZVAkfNy1GeXdQ7vaHCUpS8d84GB Fe7Jo1s+8LXHKufn6SDVUO4HwTVLO+utYh0NYDgH47zE04saXATloJisNhADiHSNQxdb v8+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700423304; x=1701028104; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=65vQj2xJm5p5mk5SbjAKMeJnwT21tT7eyXmu2H+Etu0=; b=TdM7XbXmnUzYIuFCeVXvhX+Le/yCUVE0Mv6NDHRXmkyQ950ZKby/bie/JS/MVGo7yk 45ndAAswPesaH6+TBOO8mxzCXLhmi2YC44b2JbFv+i1SlzdH25g/SKJy+5cGMAXu8mMx kbfCr3zqgoRx1wEMcWeMGJZIs0I5uFQm7t5GsmPPJmTKNnVmM8Aj08g1yuWDxPZcyOcK m182KtbPGaNlYNrF/RWg3W3o36Un3MyznjMPt8nfCrH4++dx+H9hvWyUDTmfOsy9xaPE B1ixhKAXQ22SMp5t9X/EDsa891+SEFVUvZpCrQYLAL7s0fT9zdfKpHZIxVReDmaNfLpD zjDA== X-Gm-Message-State: AOJu0YwwkwqL4zYvcBnDsd51lEjfbMA1PDtwLXielJsmF8fklgtgOy/j V2yX6mb8fVzf4dF3vebhY+DCNKjAUo9WZZJo X-Google-Smtp-Source: AGHT+IHHw1felGXoqcj71N9Zw1zsM8vWNO/fCDW6ep+Q60u+G2qJ+qT6hdQV7yWi9c9XQgH0pPdoJg== X-Received: by 2002:a05:6a00:1390:b0:6cb:8abd:39b5 with SMTP id t16-20020a056a00139000b006cb8abd39b5mr2493633pfg.1.1700423304666; Sun, 19 Nov 2023 11:48:24 -0800 (PST) Received: from KASONG-MB2.tencent.com ([115.171.40.79]) by smtp.gmail.com with ESMTPSA id a6-20020aa78646000000b006cb7feae74fsm1237140pfo.164.2023.11.19.11.48.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 19 Nov 2023 11:48:24 -0800 (PST) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , "Huang, Ying" , David Hildenbrand , Hugh Dickins , Johannes Weiner , Matthew Wilcox , Michal Hocko , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH 07/24] mm/swap: move swap_count to header to be shared Date: Mon, 20 Nov 2023 03:47:23 +0800 Message-ID: <20231119194740.94101-8-ryncsn@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231119194740.94101-1-ryncsn@gmail.com> References: <20231119194740.94101-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 504941A0003 X-Rspam-User: X-Stat-Signature: qijpajutmt1exud9gq1q1wy36qai1cw7 X-Rspamd-Server: rspam01 X-HE-Tag: 1700423306-98742 X-HE-Meta: U2FsdGVkX19CPR1hEejti1ZDp4mDL2lZnCmOLsHcUMWiPxhfc5ajUHP6OrUq8xIDuntbz3lIMO/uDU9higdYscHF2el8fPJ91uvy3brG4QBXSUAGb2Xhi/aSTZZwUsoHwNTHi5MtxanvHcLzVwDjnycOKf8jKklcocLJk6WJpLbOlzPREnK6n6NUpcDaA5hm//rBUWtMZmHOjQFHObjamTSp/wfnk3a4lUsRJ/kH/qfLC6wtYtXUTTpm3vjwUADQibULaTWakSin7SM2LHoiadbYvxl4ecubHySH+lZ5nHgaXdyWAjFeyICBnG9bxovtvKEa+e5lwKjaA6EXt7Gz4ftOwi0puLA7XRXJHtNWRP2p+jJbQGp1kT+ZHKkYwo6p9Hw7OnokuMh2wNH+pJenLK/aiHSCIRHa5kJA7ykKoTzA/U5YWngNjKSJkCPYWySJL/P4PWf/YMM897dukQ1uNqFtotF7PytohkPoo+t9MpQiLTMIDWq2jYKFsO5lKmm3FS33L9OJM7tV6EM6hAd/iGRcJnWFDq7wbkuVKpIxQRbUcnsbYsys4lqmqEIneWcprEqVb0w4bYyB+XUEeH+Kmxxs0J6n+5iWM6zW6d6iwh/tuaRKMmRKO3wQ6rpkRrTR1SYjCaLCXvbsXDlMbsc/N16xSCrUlx3dm698Wte02IoJIyrfoNL7CwbuUXEZw7VkJ4VcUiFjSVmKWJax4aXvWGoeB5xrBwUS0yvP7BKs51Dy91HVXWZt9xhSLPXbhVgUnC0stmB7Q3uSvE0vSD7qjt6w5+syZVt94RRsnTbQOUpCQHdCveMDeKj9UL26HMT+12PCtymf3HDjaukIIV7jpYu/lDX3X6peQGY85ZCuWFPJGszZhnuDjB9jKNI7UmI8r6uSDmosjUMLS2yL5LJ8+ox/ZSuGJzjTrWuFfSoaDrTDCxW/UGYRcjWadbqZsZMTjC6hgeAkxjBBTUfsiJ8 09ylixqr Y932xoJDvwrj1WifYjYAAhv/nsJWUH+q0mqvSQRACMfCJd3/+kQYc70mVBvN4V67aLrzdKxb5UpYwDeZkeIpC8OrnYNYW0yhWyk2RTEap/8KUbI0Ks9aIpGRpfZA+JJtpO6YNsCNgu7inu9IM3yIoS3we1FgpDvljby+yJErU7h6B3oKTJdftdZsQGeKaZ3r96xaRd7bvFk2coe7Vc58dBVVb+wGXvyvRX+6Oi0kXGje3yv0/ELB1c6LHOzz1fl1Zp3QtJEMixQlKvR/MNRQU7mB4sXWmYZEV9BogcPWZb7t0akTiB1JGc2kEMTifasc9wXDw3PBzuFUW1P8wApCPEMQw24HR5Hazf36hVRAGYbjQHj18aS0wwb0PX0Kmfd0mCJdsPZPvB3T5KBZv2+4j4+CClbXUQIMqfr2HuIXw84zbUuW5yP+xCzOeccLTYLKXqMcWWEUQXCRnmbbK7lRIZEvlsNdpdMvc6597ucP03EvAxn20d7zreQ4SaSJLP6+fbuND/klkIt1Hn6jcHCQlmHh98sCAKptTUt+rcUvlKzy+eZWAHqH5GvnGhYdws9P4ZzKn7uJp5KJU+ctMv0B0YnRTG13sBrFajo3PIZ88BZLbbWBUWcj3quB6p6AGmZnlU268QOBXlaupvFqFH2xRl7YFM57FLT+8wQnvzjOSgJhtdzY= 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: From: Kairui Song No feature change, prepare for later commits. Signed-off-by: Kairui Song --- mm/swap.h | 5 +++++ mm/swapfile.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/swap.h b/mm/swap.h index f82d43d7b52a..a9a654af791e 100644 --- a/mm/swap.h +++ b/mm/swap.h @@ -61,6 +61,11 @@ static inline unsigned int folio_swap_flags(struct folio *folio) { return page_swap_info(&folio->page)->flags; } + +static inline unsigned char swap_count(unsigned char ent) +{ + return ent & ~SWAP_HAS_CACHE; /* may include COUNT_CONTINUED flag */ +} #else /* CONFIG_SWAP */ struct swap_iocb; static inline void swap_readpage(struct page *page, bool do_poll, diff --git a/mm/swapfile.c b/mm/swapfile.c index 0142bfc71b81..a8ae472ed2b6 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -114,11 +114,6 @@ static struct swap_info_struct *swap_type_to_swap_info(int type) return READ_ONCE(swap_info[type]); /* rcu_dereference() */ } -static inline unsigned char swap_count(unsigned char ent) -{ - return ent & ~SWAP_HAS_CACHE; /* may include COUNT_CONTINUED flag */ -} - /* Reclaim the swap entry anyway if possible */ #define TTRS_ANYWAY 0x1 /* -- 2.42.0