From patchwork Thu Apr 10 15:39:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 14045922 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 A5B03C3601E for ; Thu, 10 Apr 2025 06:44:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 06EE36B016C; Thu, 10 Apr 2025 02:44:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 01E786B016E; Thu, 10 Apr 2025 02:44:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E273C6B016F; Thu, 10 Apr 2025 02:44:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id CA8A76B016C for ; Thu, 10 Apr 2025 02:44:09 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 57B0DABE2D for ; Thu, 10 Apr 2025 06:44:11 +0000 (UTC) X-FDA: 83317194702.07.4F2BD4E Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf21.hostedemail.com (Postfix) with ESMTP id 919541C0006 for ; Thu, 10 Apr 2025 06:44:07 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf21.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744267449; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=fTt4H0gTie/e7SnoyqlIlm8G9ornBZoCw2g3mjs6F6A=; b=rdavaTklZHME7AW5SpcLeEur+q7JwbrbAsYNGXCkPw0NyGRac+pwH0jFaXzvwDQcW7QlB1 6ePuHcVwFWo48T4u7rP83FH3JNrbq13RI63J07A5vPviiIcQJDbZd5QLOSgl73V8bda+vt 1yJo43fJiEJGMXbyrsbiRB2S0oBle4I= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf21.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744267449; a=rsa-sha256; cv=none; b=K6ElCeBgaXlY0x0jeyvjfD+gWkZTIWOF0jp/n8z2yGbXT8Z2pNvTSm2R1bEIa7TXwXRbcU kkv9/R/SinmzX7lHyfON+rlmTWNdB8w5YzSXGAy/UQWrM6NzLadFgJjlGd+FlgcdHLq51z TCsY6WlsbyoAIAvFrf1BKziTEMUxiU4= Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4ZY9J90khfz4f3jXc for ; Thu, 10 Apr 2025 14:43:37 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 901461A19E8 for ; Thu, 10 Apr 2025 14:44:00 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP4 (Coremail) with SMTP id gCh0CgCnCV6vaPdnHe0uJA--.32790S2; Thu, 10 Apr 2025 14:44:00 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org Cc: bhe@redhat.com, sj@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [patch] mm: swap: add __maybe_unused attribute for swap_is_last_ref() and update it's comment Date: Thu, 10 Apr 2025 23:39:08 +0800 Message-Id: <20250410153908.612984-1-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 X-CM-TRANSID: gCh0CgCnCV6vaPdnHe0uJA--.32790S2 X-Coremail-Antispam: 1UD129KBjvJXoW7WF1Utw4DZFy3AF4fGrW7Jwb_yoW8CrWfpF Z5Was8KFWxJry7ta9rZ3ZIyryFg3yfK34UZFyDK34fZ3ZxX3yS9Fyv93y5KFyUAr92vFyj vFsFgw17GF4jvaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUv2b4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E 3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26r xl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv 0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z2 80aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkF7I0E n4kS14v26r126r1DMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I 0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWU AVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcV CY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAF wI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa 7IU0A9N3UUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 919541C0006 X-Stat-Signature: o8ybcc54ftxmd4ukoy4nzifm56o83tzp X-HE-Tag: 1744267447-85889 X-HE-Meta: U2FsdGVkX1+MhrcPXWkEGlJ50ic/lZg6IdxRaBnA975zml+oqfZ+hJD9E68JkMo5HcviDap1FEIBMn+9OtK8UQhWIQeFB+JeUA49TD5yCKQc9P0l88iCNhwHdmqC3u8ngSIQFCdOoLa1vQcXi1vOBNnOCiIlrKRhFkfAoAu+lUXSX9bk54D9iPAlBs+ZkbAtyWNDnK+Ktiic/Q1TjVxjy+6cQqKN1Ca4gQZrWjJSvlyJXaDAYvR3FBijm0QrJqtwJqliiOQSQIN4y50ILLaSwBnX42SbQBNxZojrzl9k/10VAVCVVCXC840cCl1VTuTWDPw7tK8jqjlT60cxL2lu3ttXATaTQuc9C9Y8BRbbu5K043jNRumdroD9BKzVwsCS++oPfhS1o1yANLA1i+M4Cvb7ipGLysXtA1KV1xNe/kquc+PlRij0DstFjIaKyB/QlMf5thDvgOZJ1YtZmNdgLCXidC8EHeZfHyRb7ZiOlrJ96RXir3vpTjuEJDn6Fniit0EAfYuAiF0OBQkAO0mZgpbJV5OxoPfDTaWhVwiLtdhHCQav2n+ATngnFZj475iZBWmNJqSxvbH7o/e+YzA6Z24wENWr29sVfeDvkywT4+BpxNofYhX1b89Ury2E6WJGp2aLraFNmRPqH4C16Z/IQ2VDSN61EUDMhB7w3f8Qyd6HiHOGURFCnmGt36bdCXIOsNmxbdrFFwJlXJS1WzEgy9uctPB0ktWdis1oy6X1OSOdznSMsJQ4/CPi1sJw2O7CFjnq4RDzNh2132BS+EvlxSB0X7v42g2D55ywNN4ELM00UKwAV0a7whnEPrumEMhR8+CRT+fNUgV4dDXMEwoDd/l3TFF6sJhtYIq5G9cC+g8udnbZiKEQAKRQhkZYGzFcO57nVOl6svn83CLWdAklOgwdQcQfkPHUR1TzVN5UkmF4zC1Vk6uFJ4Wl+rz+5tc2KQjPqgNfEtvjVvMvWQg QMFqko4q FD9mKqgQHQ1e49dQQwoCQpEOtjLJRsQDOZmBAxZxSx1FudukoHy1GmkYX2hMv8LbRzesxAfixpEY6EYDKuAd8RcBRM20qYsO5WIPcDykkqGkTPLt/9SZGi2bwtPfM2W4LRZhMMhCI5VyNk1JYhiYeWX2ayeKwpynsSyeIAVBHX0WGZ0US9ISQDPXOWxdl8S04Y8fvNyBscVToYOnn+J6ufhiXT7mQywDCvn2Kf/aRbljNqC4BF4G9fbk2TxALe407Pj7w 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: Add __maybe_unused attribute for swap_is_last_ref ()to fix following building warning: mm/swapfile.c:1517:20: warning: function 'swap_is_last_ref' is not needed and will not be emitted [-Wunneeded-internal-declaration] 1517 | static inline bool swap_is_last_ref(unsigned char count) | ^~~~~~~~~~~~~~~~ 1 warning generated. Besides, original comment for swap_entries_free() is placed before swap_is_last_ref() which may introduce confusion. Update comment to address this. Fixes: 6bb001b6b64ec ("mm: swap: enable swap_entry_range_free() to drop any kind of last ref") Suggested-by: Baoquan He Tested-by: SeongJae Park Signed-off-by: Kemeng Shi Reviewed-by: Baoquan He --- mm/swapfile.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index c46b56d636af..4b5fc0c33a85 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1537,15 +1537,19 @@ static bool swap_entries_put_map_nr(struct swap_info_struct *si, } /* - * Drop the last ref(1, SWAP_HAS_CACHE or SWAP_MAP_SHMEM) of swap entries, - * caller have to ensure all entries belong to the same cgroup and cluster. + * Check if it's the last ref of swap entry in the freeing path. + * Qualified vlaue includes 1, SWAP_HAS_CACHE or SWAP_MAP_SHMEM. */ -static inline bool swap_is_last_ref(unsigned char count) +static inline bool __maybe_unused swap_is_last_ref(unsigned char count) { return (count == SWAP_HAS_CACHE) || (count == 1) || (count == SWAP_MAP_SHMEM); } +/* + * Drop the last ref of swap entries, caller have to ensure all entries + * belong to the same cgroup and cluster. + */ static void swap_entries_free(struct swap_info_struct *si, struct swap_cluster_info *ci, swp_entry_t entry, unsigned int nr_pages)