Skip to content

Commit

Permalink
crimson/os/seastore: misc related cleanups
Browse files Browse the repository at this point in the history 
Signed-off-by: Yingxin Cheng <[email protected]>
  • Loading branch information
@cyx1231st
cyx1231st committed Dec 18, 2024
1 parent 8091f31 commit 98d693c
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 65 deletions.
105 changes: 62 additions & 43 deletions src/crimson/os/seastore/cache.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1398,25 +1398,34 @@ record_t Cache::prepare_record(
if (modify_time == NULL_TIME) {
modify_time = commit_time;
}
laddr_t fresh_laddr;
if (i->is_logical()) {
fresh_laddr = i->cast<LogicalCachedExtent>()->get_laddr();
} else if (is_lba_node(i->get_type())) {
fresh_laddr = i->cast<lba_manager::btree::LBANode>()->get_node_meta().begin;
} else {
fresh_laddr = L_ADDR_NULL;
}
record.push_back(extent_t{
i->get_type(),
i->is_logical()
? i->cast<LogicalCachedExtent>()->get_laddr()
: (is_lba_node(i->get_type())
? i->cast<lba_manager::btree::LBANode>()->get_node_meta().begin
: L_ADDR_NULL),
fresh_laddr,
std::move(bl)
},
modify_time);
if (i->is_valid()
&& is_backref_mapped_extent_node(i)) {
if (i->is_valid() &&
is_backref_mapped_extent_node(i)) {
laddr_t alloc_laddr;
if (i->is_logical()) {
alloc_laddr = i->cast<LogicalCachedExtent>()->get_laddr();
} else if (is_lba_node(i->get_type())) {
alloc_laddr = i->cast<lba_manager::btree::LBANode>()->get_node_meta().begin;
} else {
assert(i->get_type() == extent_types_t::TEST_BLOCK_PHYSICAL);
alloc_laddr = L_ADDR_NULL;
}
alloc_delta.alloc_blk_ranges.emplace_back(
i->get_paddr(),
i->is_logical()
? i->cast<LogicalCachedExtent>()->get_laddr()
: (is_lba_node(i->get_type())
? i->cast<lba_manager::btree::LBANode>()->get_node_meta().begin
: L_ADDR_NULL),
alloc_laddr,
i->get_length(),
i->get_type());
}
Expand All @@ -1430,11 +1439,16 @@ record_t Cache::prepare_record(
i->get_type()).increment(i->get_length());
i->prepare_commit();
if (is_backref_mapped_extent_node(i)) {
laddr_t alloc_laddr;
if (i->is_logical()) {
alloc_laddr = i->cast<LogicalCachedExtent>()->get_laddr();
} else {
assert(is_lba_node(i->get_type()));
alloc_laddr = i->cast<lba_manager::btree::LBANode>()->get_node_meta().begin;
}
alloc_delta.alloc_blk_ranges.emplace_back(
i->get_paddr(),
i->is_logical()
? i->cast<LogicalCachedExtent>()->get_laddr()
: i->cast<lba_manager::btree::LBANode>()->get_node_meta().begin,
alloc_laddr,
i->get_length(),
i->get_type());
}
Expand Down Expand Up @@ -1620,25 +1634,25 @@ record_t Cache::prepare_record(
}

void Cache::backref_batch_update(
std::vector<backref_entry_ref> &&list,
const journal_seq_t &seq)
backref_entry_refs_t&& backref_entries,
const journal_seq_t& seq)
{
LOG_PREFIX(Cache::backref_batch_update);
DEBUG("inserting {} entries at {}", list.size(), seq);
DEBUG("inserting {} entries at {}", backref_entries.size(), seq);
ceph_assert(seq != JOURNAL_SEQ_NULL);

for (auto &ent : list) {
backref_entry_mset.insert(*ent);
for (auto &entry : backref_entries) {
backref_entry_mset.insert(*entry);
}

auto iter = backref_entryrefs_by_seq.find(seq);
if (iter == backref_entryrefs_by_seq.end()) {
backref_entryrefs_by_seq.emplace(seq, std::move(list));
backref_entryrefs_by_seq.emplace(seq, std::move(backref_entries));
} else {
iter->second.insert(
iter->second.end(),
std::make_move_iterator(list.begin()),
std::make_move_iterator(list.end()));
std::make_move_iterator(backref_entries.begin()),
std::make_move_iterator(backref_entries.end()));
}
}

Expand All @@ -1651,7 +1665,7 @@ void Cache::complete_commit(
SUBTRACET(seastore_t, "final_block_start={}, start_seq={}",
t, final_block_start, start_seq);

std::vector<backref_entry_ref> backref_list;
backref_entry_refs_t backref_entries;
t.for_each_finalized_fresh_block([&](const CachedExtentRef &i) {
if (!i->is_valid()) {
return;
Expand Down Expand Up @@ -1683,18 +1697,23 @@ void Cache::complete_commit(
touch_extent(*i, &t_src);
epm.commit_space_used(i->get_paddr(), i->get_length());
if (is_backref_mapped_extent_node(i)) {
DEBUGT("backref_list new {} len 0x{:x}",
DEBUGT("backref_entry alloc {} len 0x{:x}",
t,
i->get_paddr(),
i->get_length());
backref_list.emplace_back(
laddr_t alloc_laddr;
if (i->is_logical()) {
alloc_laddr = i->cast<LogicalCachedExtent>()->get_laddr();
} else if (is_lba_node(i->get_type())) {
alloc_laddr = i->cast<lba_manager::btree::LBANode>()->get_node_meta().begin;
} else {
assert(i->get_type() == extent_types_t::TEST_BLOCK_PHYSICAL);
alloc_laddr = L_ADDR_NULL;
}
backref_entries.emplace_back(
std::make_unique<backref_entry_t>(
i->get_paddr(),
i->is_logical()
? i->cast<LogicalCachedExtent>()->get_laddr()
: (is_lba_node(i->get_type())
? i->cast<lba_manager::btree::LBANode>()->get_node_meta().begin
: L_ADDR_NULL),
alloc_laddr,
i->get_length(),
i->get_type()));
} else if (is_backref_node(i->get_type())) {
Expand Down Expand Up @@ -1751,11 +1770,11 @@ void Cache::complete_commit(
extent->dirty_from_or_retired_at = start_seq;
if (is_backref_mapped_extent_node(extent) ||
is_retired_placeholder_type(extent->get_type())) {
DEBUGT("backref_list free {} len 0x{:x}",
DEBUGT("backref_entry free {} len 0x{:x}",
t,
extent->get_paddr(),
extent->get_length());
backref_list.emplace_back(
backref_entries.emplace_back(
std::make_unique<backref_entry_t>(
extent->get_paddr(),
L_ADDR_NULL,
Expand All @@ -1764,8 +1783,8 @@ void Cache::complete_commit(
} else if (is_backref_node(extent->get_type())) {
remove_backref_extent(extent->get_paddr());
} else {
ERRORT("{}", t, *extent);
ceph_abort("not possible");
ERRORT("Got unexpected extent type: {}", t, *extent);
ceph_abort("impossible");
}
}

Expand All @@ -1783,11 +1802,11 @@ void Cache::complete_commit(
} else {
assert(i->state == CachedExtent::extent_state_t::DIRTY);
}
DEBUGT("backref_list new existing {} len 0x{:x}",
DEBUGT("backref_entry alloc existing {} len 0x{:x}",
t,
i->get_paddr(),
i->get_length());
backref_list.emplace_back(
backref_entries.emplace_back(
std::make_unique<backref_entry_t>(
i->get_paddr(),
i->cast<LogicalCachedExtent>()->get_laddr(),
Expand All @@ -1802,8 +1821,8 @@ void Cache::complete_commit(
}
}
}
if (!backref_list.empty()) {
backref_batch_update(std::move(backref_list), start_seq);
if (!backref_entries.empty()) {
backref_batch_update(std::move(backref_entries), start_seq);
}

for (auto &i: t.pre_alloc_list) {
Expand Down Expand Up @@ -1927,23 +1946,23 @@ Cache::replay_delta(

alloc_delta_t alloc_delta;
decode(alloc_delta, delta.bl);
std::vector<backref_entry_ref> backref_list;
backref_entry_refs_t backref_entries;
for (auto &alloc_blk : alloc_delta.alloc_blk_ranges) {
if (alloc_blk.paddr.is_relative()) {
assert(alloc_blk.paddr.is_record_relative());
alloc_blk.paddr = record_base.add_relative(alloc_blk.paddr);
}
DEBUG("replay alloc_blk {}~0x{:x} {}, journal_seq: {}",
alloc_blk.paddr, alloc_blk.len, alloc_blk.laddr, journal_seq);
backref_list.emplace_back(
backref_entries.emplace_back(
std::make_unique<backref_entry_t>(
alloc_blk.paddr,
alloc_blk.laddr,
alloc_blk.len,
alloc_blk.type));
}
if (!backref_list.empty()) {
backref_batch_update(std::move(backref_list), journal_seq);
if (!backref_entries.empty()) {
backref_batch_update(std::move(backref_entries), journal_seq);
}
return replay_delta_ertr::make_ready_future<std::pair<bool, CachedExtentRef>>(
std::make_pair(true, nullptr));
Expand Down
25 changes: 8 additions & 17 deletions src/crimson/os/seastore/cache.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,26 +40,18 @@ class SegmentProvider;

struct backref_entry_t {
backref_entry_t(
const paddr_t paddr,
const laddr_t laddr,
const extent_len_t len,
const extent_types_t type)
const paddr_t& paddr,
const laddr_t& laddr,
extent_len_t len,
extent_types_t type)
: paddr(paddr),
laddr(laddr),
len(len),
type(type)
{}
backref_entry_t(alloc_blk_t alloc_blk)
: paddr(alloc_blk.paddr),
laddr(alloc_blk.laddr),
len(alloc_blk.len),
type(alloc_blk.type)
{}
type(type) {}
paddr_t paddr = P_ADDR_NULL;
laddr_t laddr = L_ADDR_NULL;
extent_len_t len = 0;
extent_types_t type =
extent_types_t::ROOT;
extent_types_t type = extent_types_t::NONE;
friend bool operator< (
const backref_entry_t &l,
const backref_entry_t &r) {
Expand Down Expand Up @@ -112,8 +104,7 @@ using backref_entry_ref = std::unique_ptr<backref_entry_t>;
using backref_entry_mset_t = backref_entry_t::multiset_t;
using backref_entry_refs_t = std::vector<backref_entry_ref>;
using backref_entryrefs_by_seq_t = std::map<journal_seq_t, backref_entry_refs_t>;
using backref_entry_query_set_t = std::set<
backref_entry_t, backref_entry_t::cmp_t>;
using backref_entry_query_set_t = std::set<backref_entry_t, backref_entry_t::cmp_t>;

/**
* Cache
Expand Down Expand Up @@ -1905,7 +1896,7 @@ class Cache {
void register_metrics();

void backref_batch_update(
std::vector<backref_entry_ref> &&,
backref_entry_refs_t &&,
const journal_seq_t &);

/// Add extent to extents handling dirty and refcounting
Expand Down
8 changes: 3 additions & 5 deletions src/crimson/os/seastore/seastore_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1228,7 +1228,6 @@ constexpr laddr_t L_ADDR_MAX = laddr_t::from_raw_uint(laddr_t::RAW_VALUE_MAX);
constexpr laddr_t L_ADDR_MIN = laddr_t::from_raw_uint(0);
constexpr laddr_t L_ADDR_NULL = L_ADDR_MAX;
constexpr laddr_t L_ADDR_ROOT = laddr_t::from_raw_uint(laddr_t::RAW_VALUE_MAX - 1);
constexpr laddr_t L_ADDR_LBAT = laddr_t::from_raw_uint(laddr_t::RAW_VALUE_MAX - 2);

struct __attribute__((packed)) laddr_le_t {
ceph_le64 laddr;
Expand Down Expand Up @@ -1945,12 +1944,11 @@ struct __attribute__((packed)) root_t {

struct alloc_blk_t {
alloc_blk_t(
paddr_t paddr,
laddr_t laddr,
const paddr_t& paddr,
const laddr_t& laddr,
extent_len_t len,
extent_types_t type)
: paddr(paddr), laddr(laddr), len(len), type(type)
{}
: paddr(paddr), laddr(laddr), len(len), type(type) {}

explicit alloc_blk_t() = default;

Expand Down

0 comments on commit 98d693c

Please sign in to comment.