Merge pull request ceph#59182 from zhscn/wip-4k-laddr

crimson/os/seastore: make laddr_t block aligned

Reviewed-by: Yingxin Cheng <[email protected]>

Author: cyx1231st

src/crimson/os/seastore/backref/backref_tree_node.h

@@ -17,7 +17,7 @@ using BackrefNode = FixedKVNode<paddr_t>;
 
 struct backref_map_val_t {
   extent_len_t len = 0;	///< length of extents
-  laddr_t laddr = 0;	///< logical address of extents
+  laddr_t laddr = L_ADDR_MIN; ///< logical address of extents
   extent_types_t type = extent_types_t::ROOT;
 
   backref_map_val_t() = default;
@@ -36,7 +36,7 @@ std::ostream& operator<<(std::ostream &out, const backref_map_val_t& val);
 
 struct backref_map_val_le_t {
   extent_len_le_t len = init_extent_len_le(0);
-  laddr_le_t laddr = laddr_le_t(0);
+  laddr_le_t laddr = laddr_le_t(L_ADDR_MIN);
   extent_types_le_t type = 0;
 
   backref_map_val_le_t() = default;

src/crimson/os/seastore/btree/fixed_kv_btree.h

@@ -226,12 +226,18 @@ class FixedKVBtree {
       assert(!is_end());
       auto val = get_val();
       auto key = get_key();
+      node_key_t end{};
+      if constexpr (std::is_same_v<node_key_t, laddr_t>) {
+        end = (key + val.len).checked_to_laddr();
+      } else {
+        end = key + val.len;
+      }
       return std::make_unique<pin_t>(
         ctx,
 	leaf.node,
         leaf.pos,
 	val,
-	fixed_kv_node_meta_t<node_key_t>{ key, key + val.len, 0 });
+	fixed_kv_node_meta_t<node_key_t>{ key, end, 0 });
     }
 
     typename leaf_node_t::Ref get_leaf_node() {

src/crimson/os/seastore/cache.h

@@ -977,10 +977,9 @@ class Cache {
     TCachedExtentRef<T> ext;
     if (original_bptr.has_value()) {
       // shallow copy the buffer from original extent
-      auto nbp = ceph::bufferptr(
-        *original_bptr,
-        remap_laddr - original_laddr,
-        remap_length);
+      auto remap_offset = remap_laddr.get_byte_distance<
+	extent_len_t>(original_laddr);
+      auto nbp = ceph::bufferptr(*original_bptr, remap_offset, remap_length);
       // ExtentPlacementManager::alloc_new_extent will make a new
       // (relative/temp) paddr, so make extent directly
       ext = CachedExtent::make_cached_extent_ref<T>(std::move(nbp));

src/crimson/os/seastore/cached_extent.h

@@ -1325,7 +1325,7 @@ class LogicalCachedExtent : public ChildableCachedExtent {
   void on_rewrite(Transaction&, CachedExtent &extent, extent_len_t off) final {
     assert(get_type() == extent.get_type());
     auto &lextent = (LogicalCachedExtent&)extent;
-    set_laddr(lextent.get_laddr() + off);
+    set_laddr((lextent.get_laddr() + off).checked_to_laddr());
   }
 
   bool has_laddr() const {