From patchwork Thu Jan 11 15:24:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13517541 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 B01B2C47077 for ; Thu, 11 Jan 2024 15:24:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 022CC6B0098; Thu, 11 Jan 2024 10:24:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F164D6B0099; Thu, 11 Jan 2024 10:24:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D66926B009A; Thu, 11 Jan 2024 10:24:53 -0500 (EST) 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 C5FC06B0098 for ; Thu, 11 Jan 2024 10:24:53 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A064CA0CAA for ; Thu, 11 Jan 2024 15:24:53 +0000 (UTC) X-FDA: 81667402866.13.A4C1886 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf05.hostedemail.com (Postfix) with ESMTP id E7AA7100012 for ; Thu, 11 Jan 2024 15:24:51 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Xdb6YNnx; spf=none (imf05.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704986692; 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:in-reply-to:references:references:dkim-signature; bh=grYj7oDXTJx8wAhL05lTDgU26iqsxg0SBN9GKoUT5AE=; b=Hp/vrEWXSjwB5LSj6/HPg/rpPBlSRRzRcqdTcy74hNg9XEKbibZxEwReNKO4gTjDf5QvCk 9AGnny/MYTqJqoNEG8LX8t0YS/eV5PR59U9r4NQuOJZXyx29sJS+Nxnp4GWc9FqYS7fNxJ IvqGN7CvsZx9pvJKZuc9NC3yUJxi2AU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704986692; a=rsa-sha256; cv=none; b=WttTwl6DRx+R6/8MSNyAzcDAUDAFNGvCB2FGcoU050qYhviSNkLlDU9wTyBXi3GwzXE9xa OrjdbQkFDzOijeXOZO9a/dUE+9NLxnzlB1siDAZ1EUxWxlmpT6FqStbMokd+CMvnQ/W1k/ jAUUqGnTBGMzSq9R1UDCcoSVeVEIeks= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Xdb6YNnx; spf=none (imf05.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=grYj7oDXTJx8wAhL05lTDgU26iqsxg0SBN9GKoUT5AE=; b=Xdb6YNnxxBXSES0V1LNS1egGU2 clY+LLffhJGIXNu16qGhurri+B7H6+ljnMyT/GZA2dsuGUKFK6a7u+6lHWLOMnYPZyk2UyIy91Cel Rcl+JxphhKwHqOf2kVErU/0Zh/gLVJ+7V86Lqp3ep8aLvMY0kC2A9E3sKmLO0TBfnDctNSK+rD0kD YeApnLsNyt9pGyY9MmiIgxzFd8oTF1NC+XH9y9hHqCnB3cw3RwI2JKM1Wwl6LYY7RQO/zUbSpGRhX z2pWVhO4ETI/wG0PUTjbxmCJKKf3vUJggjWbCjrd+XDxHJ0y3uZagXZJavOntEfrQPSzhGroPYlNY ukjSqK9Q==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1rNwv1-00E9sm-Ir; Thu, 11 Jan 2024 15:24:31 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: Kefeng Wang , linux-mm@kvack.org, david@redhat.com, linux-s390@vger.kernel.org, Matthew Wilcox Subject: [PATCH v3 04/10] s390: use pfn_swap_entry_folio() in ptep_zap_swap_entry() Date: Thu, 11 Jan 2024 15:24:23 +0000 Message-Id: <20240111152429.3374566-5-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20240111152429.3374566-1-willy@infradead.org> References: <20240111152429.3374566-1-willy@infradead.org> MIME-Version: 1.0 X-Stat-Signature: 4jeqprmifeye7adh5cg89ft3oocdso46 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: E7AA7100012 X-Rspam-User: X-HE-Tag: 1704986691-163569 X-HE-Meta: U2FsdGVkX189f702bD5Pa0C/TSWGeswsxRBa6yEuTBw5d1pLRTyPTjl7Cu9aPTb78zMoON/Vy0ZWWTak7a3r5vc2N/XhGwlAw9T7hPDdNRcLOhWH5T3WcjTb9vbymdcHymVc3bDAUlKe745LmOAeCueHRiAM7/dfUqHMummHsUrUregObhPJVxTtKjfnhhZhBWCR/+z5XRyQexCcHM+lGY3ra52RgAX1yoKiZa30KtUws4ILvbnQ8DfZyCTzNbl4SAMQT4Oo6r6cVybenzt4vmViIExGHHOwM+MnMVowBdqd1kpR0mOCpkhOf3qXdksexcnGSfc76YuP7P/yI/xx/VyaFrfR6XEJpSy6DCL3yGKqo6+Nq9El49FM+AHQ7kwAWhOUkqSUmkEUF8CDIyZDiWdcnfaFVR9o8Oiu93u28lIeVHwZ/XE1a1d1tVJeUpQgsSUkRs96jQ8EANkdfMW2hM0GnIqqN8SPcAJ4QSdELKRSOJh9DFkNpGvP4yiihKWsaVLfjuDh2tic/Q58JfRp6PK3Tq0ZT0Ugsd3q/PhpmfRcK5s/ykNubdHnZSUE3/gmEmYJyGxCKLPVkHWaX99/YSPemJAgD9/UnWBi3lbx7VhoXCey3l7qBX8hCOW+8HW45oU9ZYydKbTMy9+VKMN4xqi4dMY6/zzZhRCV01FffNPU4iF8ZjvquoHHI+Zyu+b/486ngcO4UO8hJkHiqahPfjrDKFthKqZ6GZ0416C0fyajCEGTw5E3YXbTYZ5q71KMkmpBGSWlGhAGxc17KNmjzSM6A+lnNQP8Kj8/iMB4kxXpUz96h8q7sGwZj3B7D565JtNCYU73bJiU7872aogxn9F4Klr4wBqK9kr7lGNZrRg8aoqdiR9LdZqQCS/AYBj1sa7U9W7yPbgehJKQhxG9vyHOWnIrkK1/zcmRUx7fONrw8y7tfnmLZeOEpOzzQOmvzov+z18AJxCE/KaduYb Xqin4jA2 zTv+agJzYZnc5e09Zyz3ClTFuqEKA9k95hdP1PQeY5DA+8uCSeMPQlkOvLIx1lxU6XCfUmXsLSeJuQIN2Ps5hsC9psXvNMFrsnUH7m9WEIdNpHHiwHu3LR4I3jfXh0NHuUmbjGY01J9aNzaUSSLyyHtVHzxCZy/1AxLU4wDGpFfYhE9/p0PctIOATQ2YzdsYsx0IwteQfkumLrvUjK9e/YtWlxIhzDLFezZx9ZXYRB1CLkTOIKa0pCMuNCg== 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: Kefeng Wang Call pfn_swap_entry_folio() in ptep_zap_swap_entry() as preparation for converting mm counter functions to take a folio. Signed-off-by: Kefeng Wang Signed-off-by: Matthew Wilcox (Oracle) --- arch/s390/mm/pgtable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c index 99422926efe1..7e5dd4b17664 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c @@ -721,9 +721,9 @@ static void ptep_zap_swap_entry(struct mm_struct *mm, swp_entry_t entry) if (!non_swap_entry(entry)) dec_mm_counter(mm, MM_SWAPENTS); else if (is_migration_entry(entry)) { - struct page *page = pfn_swap_entry_to_page(entry); + struct folio *folio = pfn_swap_entry_folio(entry); - dec_mm_counter(mm, mm_counter(page)); + dec_mm_counter(mm, mm_counter(&folio->page)); } free_swap_and_cache(entry); }