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 945F1E77188 for ; Mon, 30 Dec 2024 17:47:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 26DB96B00A2; Mon, 30 Dec 2024 12:47:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 21E556B00A3; Mon, 30 Dec 2024 12:47:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0225C6B00A4; Mon, 30 Dec 2024 12:47:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D21B16B00A2 for ; Mon, 30 Dec 2024 12:47:19 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 86211C085D for ; Mon, 30 Dec 2024 17:47:19 +0000 (UTC) X-FDA: 82952356578.29.5AACF2B Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf07.hostedemail.com (Postfix) with ESMTP id 05C6040005 for ; Mon, 30 Dec 2024 17:45:53 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=nTaXpKoW; spf=pass (imf07.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.214.171 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=1735580782; 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=OsT4sLdVe9hCMPuRvzlfY9IxFp2eLdf3+7xkxYCm7K8=; b=6VsTfg4pjsohRKU16W9LcYYKuw7wH/Mi0hYcHDkHcF46Sfgh7onQfLG9TYiPhdb0jPx6ND R9w19vfaJO1WF4/r8atHirdpZ1pbVM9ekyXv9rWVOEE237vBV6XGzEY194RUFfjy/FwVfX tJ1XtqIXxNWcjJ7x1VOZmlFoYeDZewI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1735580782; a=rsa-sha256; cv=none; b=afrWirfdkZIridRexf/NKo91YZMYOq+DEFPO/RbO5mnCJzzvcoEaNiuNh37rMU0sVUol3O 7HehERWY/YA3JROsX5fJoxFdIanMXjjtKp0V9QR5R4+m37YV12ZYVX3EnWbQNmvYYJ/rxv wTeyrNVwdOA0EHTiak4P3fcIOWxAeLM= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=nTaXpKoW; spf=pass (imf07.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-21680814d42so106494685ad.2 for ; Mon, 30 Dec 2024 09:47:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735580836; x=1736185636; 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=OsT4sLdVe9hCMPuRvzlfY9IxFp2eLdf3+7xkxYCm7K8=; b=nTaXpKoWxS08Xl6+Pw+D2hUQ80XJkTvJdFky1/+UeAEwPJas63INeSHlqhFvlB2VJB s87h0v0hEWkN3Oh/XKlEV2ksdDI7CYp7UcMtpQJvuSsCng1XDgrSM6gRjX/3EQ8Ip3dK ZXarnP7ZpJN/JQTtHmDWmIxOI/MLt0VXFKKaUln+2TXdc4E5Zq3g+NQ5O6as7ymnJ8ts 67lEsdqj/ElkIwQ43/ypXv1aHaFFSa7Gu8YFsxwLvhw9YbF6AHNFvuAqi7Q1bGCZXehD FXrTMh1XArpnT3+YK8HJBQ+Mq4DLMwYtxBuVhYh8XWF3+TBUbma2gU8buDgh62gcumzX HpMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735580836; x=1736185636; 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=OsT4sLdVe9hCMPuRvzlfY9IxFp2eLdf3+7xkxYCm7K8=; b=lm5COAQyr4/CbwWiMRQ+E+k6w6zH5mBSU7GiORISZEWVcGfnqs6xA7Ts/Kv1HuA65e OOwie31KwX743omLUjZoGWfv8xJKU3b2GZWcZRuIgH6Q+Laaq0fGvX+MqBrLYMj5Dlwy 13nu6l4HPHm7PS7ROZNHehU/XZT6JejqsWkXwsFPAVrJimWpRvac03oV+YyUqqmV4Ank swrHNCcvIGWMLQpclfjwBwr77eGJWJuHVkGQFy4ppt2efsb3AEjPbVSEum+0OBiHN6iH 5aqgs44rGUjaY+E8JMrfOzY0wyC9muQ4DS9xq9SovaEgo4lYllmfFNA/zza8O2FHC/VI DsxQ== X-Gm-Message-State: AOJu0YybGo1oKIK0LT7KhOvRAwttiOkzBqU0VTDwa/DpqQ2TDxB/M4Gi Y3cmphuoPW8xQw+eqxoViJmRZsLG0I1r72hnXiZQgkx79lz2qAuLDwU20p/h7cLZ4A== X-Gm-Gg: ASbGncu08FxKHT5WMcTO/u0HZ75OBuyD6GpZGMExpTPtJVOqWm72lcCdansKL2TWYd3 O/9NFdbbj6P1kZ8hp7iypmXbcUj5PyQPXvPJXW28NLZEyOfClV97EvMl54AwHAf5UuGimJlck26 0/yx0PGX5iljr8yN4TY00IvwHFNNuSiDQWmZhDjR9j+dKFVuOJLniKPQrdyMi2wOeLfONgtv102 TwMAir/tpQIGl/cz3xpIdVGzw8G57szcgzp2jnF41cAExOFBxAry/lzqTKns//19g+N+Szn+kr8 X-Google-Smtp-Source: AGHT+IGPvpYXhXtnW4rHEEOtWEli3yi6N/9jP3Hzf2YcEEXLkgTW0xIcXQNV1qxoFOuaB/N2UyZHvQ== X-Received: by 2002:a17:902:e80b:b0:215:7cd0:758d with SMTP id d9443c01a7336-219e70bf2femr561117935ad.36.1735580835940; Mon, 30 Dec 2024 09:47:15 -0800 (PST) Received: from KASONG-MC4.tencent.com ([1.203.117.231]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9cdf25sm180687695ad.118.2024.12.30.09.47.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 30 Dec 2024 09:47:15 -0800 (PST) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Chris Li , Barry Song , Ryan Roberts , Hugh Dickins , Yosry Ahmed , "Huang, Ying" , Nhat Pham , Johannes Weiner , Kalesh Singh , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH v3 11/13] mm, swap: introduce a helper for retrieving cluster from offset Date: Tue, 31 Dec 2024 01:46:19 +0800 Message-ID: <20241230174621.61185-12-ryncsn@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241230174621.61185-1-ryncsn@gmail.com> References: <20241230174621.61185-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 05C6040005 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: czpy83m9x1ie116duf1bubyr8pji7j8p X-HE-Tag: 1735580753-717814 X-HE-Meta: U2FsdGVkX18/y4+7vHo4Krdo/yh0BaZ8lXazR+Lt9FEOJZN+LgdY2aaIeG93Pjm9mm35t6GPET7q4mTqPoeJB5Mlw8gx5EgquSw1EpiWWKpfL6iwB8WNpJs7bDW/ZxNoWWKuE64eWGBsRbwZKL9BQZsR8mm7KFotrG4MvaowSypb6M2pGTtv7+GGf4Y4vVmHdAWT1shETMDLi/61v9Oogql/gpUZnqb9cawMy2SHmHcqwj4chfdA3jVOZ2UqEP9Ppq8Sf7OA6ij7t+IrA+NFnvfV7vCSlA+ABEvrppCQuQjS4s4IcvAD8I9wmXltu3A44Cmi6mOiJCvFTdyTsyGucJZG5NZ/HKzOkptp0peMO4+P/AhZvFyzLfz0VFAYZ2zSTauNoxTOkQdyDbKCmxzhMWSwQ2YPTNqFJj1QSQAWzOkTBEKI57CNa2Wjt/p8KTZpCxW4SkK/9JAP6y1wioaEL/0uzyZ5ygHRMBsliYxU7ixVU7KXqRwPuCOPxuT3oW84N0BNQsZsNLtUg2Qy7xNJSdKHPBTFvEkKx09DWHBaF3L0AK6yn/EbQfcd0KPKpp5VRR9JWlK1boz5UCmFjqRRVplZC9EhLLhcQfBxZUKp7kTBL012HpDjZpSMiBmqlKoCB4L/68gcusvOImEzBu2WrIK6KrP6nithNvkin/7fHoFv/o7EMhMrm2tDWxWOdvIKEg3hIe14UbtdUrvLNY3yvtua1S/gfV5SHmWEPgxjCjJL+0JOuV+kIVuLJHDDtLWXH6KbM72r8QKti+S/v/7XbOs+wr6v52hZCGT7iyBCmMZsnB2jp2LoZGq6cwf53+7wM1yR0td5WJiKnee9NXVYRXHzA2DQAV2P1Es2vw4d97Pe6Ch/YdZY0ei2pO36+rNrBsA6Z+jv7cCujZZRuMSPMu+B3OQuvdFnOA9Hl9w+toPsrkoGz3/rtx0b4jzepbT8h6O3quccjjn2td/e14g DTeVZmGx tFoGwcdX9IT7QU+uGXTlz9aYvpjuQgOxYRzTzNf1fduLkjumOrFbwLB4pBda3CnmD7Cm9X7CHSOZJZUVJQXOmZCD2JWwACxlfYP0IEO6BJ9R/HdTBDInvaLttR0yhywOgGthZpVZSzGKCLSemmVlBQEZd0xXSffuTAhG5OmLWySoaIWZjnX7VNcLvBOjfSN52sZXhHr1NE2trLE/sxM4AMPT3uqPXmJmJa30bIPlTnhMjESN+OotKHIrfX2o12uzy/cemzgbr+LErVjhqPQSSPzQiosJk+WIA2b7VGlPKVIdWK2AIAbTf9w5seE/Qqb0UZTRW7zXby7tLl4rm9hTj7DA9jrYvt2BxultfV+osCZUGyb2roCpJ0GbCIPCjiTBdeVt1LuVb00i8LIPwSgUEzq4xV8CW0+GNuGqfWOH3KA+35Eh6P3aqyrcP/cY1VtOOhUr3pNwOuoicpZvKOSxHsPmoeqf16QjChvvUNqLKWjUY81Sq8yZedlJwiXiqtv6wGyHKt6cAzLVSoDfJwQ54MNM2JAKcVTWmda6bI1L6EeXAVAY= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000004, 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 It's a common operation to retrieve the cluster info from offset, introduce a helper for this. Suggested-by: Chris Li Signed-off-by: Kairui Song --- mm/swapfile.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 60a650ba88fd..a3d1239d944b 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -424,6 +424,12 @@ static inline unsigned int cluster_index(struct swap_info_struct *si, return ci - si->cluster_info; } +static inline struct swap_cluster_info *offset_to_cluster(struct swap_info_struct *si, + unsigned long offset) +{ + return &si->cluster_info[offset / SWAPFILE_CLUSTER]; +} + static inline unsigned int cluster_offset(struct swap_info_struct *si, struct swap_cluster_info *ci) { @@ -435,7 +441,7 @@ static inline struct swap_cluster_info *lock_cluster(struct swap_info_struct *si { struct swap_cluster_info *ci; - ci = &si->cluster_info[offset / SWAPFILE_CLUSTER]; + ci = offset_to_cluster(si, offset); spin_lock(&ci->lock); return ci; @@ -1477,10 +1483,10 @@ static void swap_entry_range_free(struct swap_info_struct *si, swp_entry_t entry unsigned char *map_end = map + nr_pages; struct swap_cluster_info *ci; - /* It should never free entries across different clusters */ - VM_BUG_ON((offset / SWAPFILE_CLUSTER) != ((offset + nr_pages - 1) / SWAPFILE_CLUSTER)); - ci = lock_cluster(si, offset); + + /* It should never free entries across different clusters */ + VM_BUG_ON(ci != offset_to_cluster(si, offset + nr_pages - 1)); VM_BUG_ON(cluster_is_free(ci)); VM_BUG_ON(ci->count < nr_pages); -- 2.47.1