highmem: add memcpy_to_folio() and memcpy_from_folio()
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Thu, 13 Jul 2023 03:55:06 +0000 (04:55 +0100)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 18 Aug 2023 17:12:29 +0000 (10:12 -0700)
Patch series "More filesystem folio conversions for 6.6".

Remove the only spots in affs which actually use a struct page; there
are a few places where one is mentioned, but it's part of the interface.

The rest of this is removing the remaining calls to set_bh_page(),
and then removing the function before any new users show up.

This patch (of 7):

These are the folio equivalent of memcpy_to_page() and memcpy_from_page().

[agruenba@redhat.com: use correct chunk size in memcpy()]
Link: https://lkml.kernel.org/r/20230802144354.1023099-1-agruenba@redhat.com
Link: https://lkml.kernel.org/r/20230713035512.4139457-1-willy@infradead.org
Link: https://lkml.kernel.org/r/20230713035512.4139457-2-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: David Sterba <dsterba@suse.com>
Cc: Jan Kara <jack@suse.com>
Cc: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Cc: Pankaj Raghav <p.raghav@samsung.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Tom Rix <trix@redhat.com>
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
include/linux/highmem.h

index 68da30625a6c1c9b487da4f6df1261733ef7754d..99c474de800ddc3b034a7b929684b9fb9f791479 100644 (file)
@@ -439,6 +439,50 @@ static inline void memzero_page(struct page *page, size_t offset, size_t len)
        kunmap_local(addr);
 }
 
+static inline void memcpy_from_folio(char *to, struct folio *folio,
+               size_t offset, size_t len)
+{
+       VM_BUG_ON(offset + len > folio_size(folio));
+
+       do {
+               const char *from = kmap_local_folio(folio, offset);
+               size_t chunk = len;
+
+               if (folio_test_highmem(folio) &&
+                   chunk > PAGE_SIZE - offset_in_page(offset))
+                       chunk = PAGE_SIZE - offset_in_page(offset);
+               memcpy(to, from, chunk);
+               kunmap_local(from);
+
+               from += chunk;
+               offset += chunk;
+               len -= chunk;
+       } while (len > 0);
+}
+
+static inline void memcpy_to_folio(struct folio *folio, size_t offset,
+               const char *from, size_t len)
+{
+       VM_BUG_ON(offset + len > folio_size(folio));
+
+       do {
+               char *to = kmap_local_folio(folio, offset);
+               size_t chunk = len;
+
+               if (folio_test_highmem(folio) &&
+                   chunk > PAGE_SIZE - offset_in_page(offset))
+                       chunk = PAGE_SIZE - offset_in_page(offset);
+               memcpy(to, from, chunk);
+               kunmap_local(to);
+
+               from += chunk;
+               offset += chunk;
+               len -= chunk;
+       } while (len > 0);
+
+       flush_dcache_folio(folio);
+}
+
 /**
  * memcpy_from_file_folio - Copy some bytes from a file folio.
  * @to: The destination buffer.