From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F22D762FF for ; Fri, 26 Apr 2024 03:45:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714103111; cv=none; b=CAq26ld+dIakW6gOTC40lZVl+LbVjYh/Mm360fcr4MJEKJQ0NN1iwlZPtpj7qU1r0lj3poAofnpGBIRDRCkbyPNoBiRMTbIQzrV1bswS6lXeKMTOXWu0MGOwPhD9ysgtrrw8h9S7PdFgknCtE4AwXBNkkQ1yfMWlt4aq+PI1XtE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714103111; c=relaxed/simple; bh=5WHF5ZopQXECM0WAZemryP2R0CtqNaAuhr68zg/JDc4=; h=Date:To:From:Subject:Message-Id; b=I8qiWlCKZkeX8rDhgm2lhy+Yl/rgm/26ibibJRsAdL6tUAIzSPewI1Tuhl3r9cOgyCMoNpTNrQENQ2Foo7Ja0dBlzu0DIlxVgoWIcGcY32mz2VHtiRYEepGlWkCav8xHIlMbxUkUOunKC9Mo60bXpC33HY+/oY5Ef2xD1Kp0EHo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=eQ40U7+e; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="eQ40U7+e" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC340C113CD; Fri, 26 Apr 2024 03:45:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1714103110; bh=5WHF5ZopQXECM0WAZemryP2R0CtqNaAuhr68zg/JDc4=; h=Date:To:From:Subject:From; b=eQ40U7+ee4ASheRwkGVjyZTHs3NT0Sj1sSyyqkeZZZQbWYvs/TggaIb4IoqWY+uvJ WixdVDRmSezKIjk8dgDrPpZ82goGLkzCpRmLtrSnrlomtgpQmVD72w2YOl0jHqEY5e izuG/aP6IKYyUmm8lSwe9mao/QZb/sLOXOstp1hM= Date: Thu, 25 Apr 2024 20:45:10 -0700 To: mm-commits@vger.kernel.org,yuzhao@google.com,ying.huang@intel.com,xiang@kernel.org,willy@infradead.org,wangkefeng.wang@huawei.com,v-songbaohua@oppo.com,shy828301@gmail.com,mhocko@suse.com,ioworker0@gmail.com,david@redhat.com,chrisl@kernel.org,21cnbao@gmail.com,ryan.roberts@arm.com,akpm@linux-foundation.org From: Andrew Morton Subject: [folded-merged] mm-swap-free_swap_and_cache_nr-as-batched-free_swap_and_cache-fix.patch removed from -mm tree Message-Id: <20240426034510.CC340C113CD@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: FIXUP: mm: swap: free_swap_and_cache_nr() as batched free_swap_and_cache() has been removed from the -mm tree. Its filename was mm-swap-free_swap_and_cache_nr-as-batched-free_swap_and_cache-fix.patch This patch was dropped because it was folded into mm-swap-free_swap_and_cache_nr-as-batched-free_swap_and_cache.patch ------------------------------------------------------ From: Ryan Roberts Subject: FIXUP: mm: swap: free_swap_and_cache_nr() as batched free_swap_and_cache() Date: Tue, 9 Apr 2024 12:18:40 +0100 Fix a build warning on parisc [1] due to their implementation of __swp_entry_to_pte() not correctly putting the macro args in parenthisis. But it turns out that a bunch of other arches are also faulty in this regard. I'm also adding an extra statement to the documentation for pte_next_swp_offset() as suggested by David. [1] https://lore.kernel.org/all/202404091749.ScNPJ8j4-lkp@intel.com/ Link: https://lkml.kernel.org/r/20240409111840.3173122-1-ryan.roberts@arm.com Signed-off-by: Ryan Roberts Cc: Barry Song <21cnbao@gmail.com> Cc: Barry Song Cc: Chris Li Cc: David Hildenbrand Cc: Gao Xiang Cc: "Huang, Ying" Cc: Kefeng Wang Cc: Lance Yang Cc: Matthew Wilcox (Oracle) Cc: Michal Hocko Cc: Yang Shi Cc: Yu Zhao Signed-off-by: Andrew Morton --- mm/internal.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/mm/internal.h~mm-swap-free_swap_and_cache_nr-as-batched-free_swap_and_cache-fix +++ a/mm/internal.h @@ -194,7 +194,8 @@ static inline int folio_pte_batch(struct /** * pte_next_swp_offset - Increment the swap entry offset field of a swap pte. - * @pte: The initial pte state; is_swap_pte(pte) must be true. + * @pte: The initial pte state; is_swap_pte(pte) must be true and + * non_swap_entry() must be false. * * Increments the swap offset, while maintaining all other fields, including * swap type, and any swp pte bits. The resulting pte is returned. @@ -203,7 +204,7 @@ static inline pte_t pte_next_swp_offset( { swp_entry_t entry = pte_to_swp_entry(pte); pte_t new = __swp_entry_to_pte(__swp_entry(swp_type(entry), - swp_offset(entry) + 1)); + (swp_offset(entry) + 1))); if (pte_swp_soft_dirty(pte)) new = pte_swp_mksoft_dirty(new); _ Patches currently in -mm which might be from ryan.roberts@arm.com are mm-swap-remove-cluster_flag_huge-from-swap_cluster_info-flags.patch mm-swap-free_swap_and_cache_nr-as-batched-free_swap_and_cache.patch mm-swap-simplify-struct-percpu_cluster.patch mm-swap-update-get_swap_pages-to-take-folio-order.patch mm-swap-allow-storage-of-all-mthp-orders.patch mm-vmscan-avoid-split-during-shrink_folio_list.patch mm-madvise-avoid-split-during-madv_pageout-and-madv_cold.patch selftests-mm-soft-dirty-should-fail-if-a-testcase-fails.patch mm-fix-race-between-__split_huge_pmd_locked-and-gup-fast.patch