Merge pull request ceph#65204 from ifed01/wip-ifed-fix-ec-contiguous

erasure-code: make bufferlist contiguous in ErasureCode::encode_prepare

Reviewed-by: Radoslaw Zarzynski <[email protected]>
Reviewed-by: Alex Ainscow <[email protected]>

Author: rzarzynski

src/erasure-code/ErasureCode.cc

@@ -247,7 +247,7 @@ int ErasureCode::encode_prepare(const bufferlist &raw,
   for (unsigned int i = 0; i < k - padded_chunks; i++) {
     bufferlist &chunk = encoded[chunk_index(i)];
     chunk.substr_of(prepared, i * blocksize, blocksize);
-    chunk.rebuild_aligned_size_and_memory(blocksize, SIMD_ALIGN);
+    chunk.rebuild_aligned_size_and_memory(blocksize, SIMD_ALIGN, 1);
     ceph_assert(chunk.is_contiguous());
   }
   if (padded_chunks) {
@@ -285,7 +285,7 @@ int ErasureCode::encode_prepare(const bufferlist &raw,
   for (raw_shard_id_t i; i < k - padded_chunks; ++i) {
     bufferlist &chunk = encoded[chunk_index(i)];
     chunk.substr_of(prepared, (int)i * blocksize, blocksize);
-    chunk.rebuild_aligned_size_and_memory(blocksize, SIMD_ALIGN);
+    chunk.rebuild_aligned_size_and_memory(blocksize, SIMD_ALIGN, 1);
     ceph_assert(chunk.is_contiguous());
   }
   if (padded_chunks) {

src/test/bufferlist.cc

@@ -1867,6 +1867,9 @@ TEST(BufferList, rebuild_aligned_size_and_memory) {
   EXPECT_TRUE(bl.is_n_align_sized(BUFFER_SIZE));
   EXPECT_EQ(3U, bl.get_num_buffers());
 
+  bl.rebuild_aligned_size_and_memory(BUFFER_SIZE, SIMD_ALIGN, 1);
+  EXPECT_EQ(1U, bl.get_num_buffers());
+
   {
     /* bug replicator, to test rebuild_aligned_size_and_memory() in the
      * scenario where the first bptr is both size and memory aligned and