msg/async, v2: drop onwire_segment_t as epilogue had derogated it.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc
index 361aa06f9a18e07474b4a8cbcf58f25dceae9f6f..ebf0aa308cc8e554f4bd202f98f6af76e7eb2a7d 100644 (file)
--- a/src/msg/async/ProtocolV2.cc
+++ b/src/msg/async/ProtocolV2.cc
@@ -260,9 +260,9 @@ void ProtocolV2::reset_recv_state() {
   if (state > THROTTLE_BYTES && state <= THROTTLE_DONE) {
     if (connection->policy.throttler_bytes) {
       const uint32_t cur_msg_size = \
-       rx_segments_desc[SegmentIndex::Msg::FRONT].logical.length + \
-       rx_segments_desc[SegmentIndex::Msg::MIDDLE].logical.length + \
-       rx_segments_desc[SegmentIndex::Msg::DATA].logical.length;
+       rx_segments_desc[SegmentIndex::Msg::FRONT].length + \
+       rx_segments_desc[SegmentIndex::Msg::MIDDLE].length + \
+       rx_segments_desc[SegmentIndex::Msg::DATA].length;
 
       ldout(cct, 10) << __func__ << " releasing " << cur_msg_size
                      << " bytes to policy throttler "
@@ -273,9 +273,9 @@ void ProtocolV2::reset_recv_state() {
   }
   if (state > THROTTLE_DISPATCH_QUEUE && state <= THROTTLE_DONE) {
     const uint32_t cur_msg_size = \
-      rx_segments_desc[SegmentIndex::Msg::FRONT].logical.length + \
-      rx_segments_desc[SegmentIndex::Msg::MIDDLE].logical.length + \
-      rx_segments_desc[SegmentIndex::Msg::DATA].logical.length;
+      rx_segments_desc[SegmentIndex::Msg::FRONT].length + \
+      rx_segments_desc[SegmentIndex::Msg::MIDDLE].length + \
+      rx_segments_desc[SegmentIndex::Msg::DATA].length;
 
     ldout(cct, 10)
         << __func__ << " releasing " << cur_msg_size
@@ -1065,10 +1065,7 @@ CtPtr ProtocolV2::handle_read_frame_preamble_main(char *buffer, int r) {
                     << " len=" << main_preamble.segments[idx].length
                     << " align=" << main_preamble.segments[idx].alignment
                     << dendl;
-      rx_segments_desc.emplace_back(onwire_segment_t{
-       get_onwire_size(main_preamble.segments[idx].length),
-       main_preamble.segments[idx]
-      });
+      rx_segments_desc.emplace_back(main_preamble.segments[idx]);
     }
   }
 
@@ -1126,7 +1123,7 @@ CtPtr ProtocolV2::read_frame_segment() {
   // description of current segment to read
   const auto& cur_rx_desc = rx_segments_desc.at(rx_segments_data.size());
 
-  if (cur_rx_desc.logical.alignment == segment_t::DEFERRED_ALLOCATION) {
+  if (cur_rx_desc.alignment == segment_t::DEFERRED_ALLOCATION) {
     // This is a special case for the rx_buffers zero-copy optimization
     // used for Message's data field. It might be dangerous and will be
     // ultimately replaced by `allocation policies`.
@@ -1157,12 +1154,12 @@ CtPtr ProtocolV2::read_frame_segment() {
   std::unique_ptr<buffer::ptr_node, buffer::ptr_node::disposer> rx_buffer;
   try {
     rx_buffer = ceph::buffer::ptr_node::create(buffer::create_aligned(
-      cur_rx_desc.onwire_length, cur_rx_desc.logical.alignment));
+      get_onwire_size(cur_rx_desc.length), cur_rx_desc.alignment));
   } catch (std::bad_alloc&) {
     // Catching because of potential issues with satisfying alignment.
     ldout(cct, 20) << __func__ << " can't allocate aligned rx_buffer "
-                  << " len=" << cur_rx_desc.onwire_length
-                  << " align=" << cur_rx_desc.logical.alignment
+                  << " len=" << get_onwire_size(cur_rx_desc.length)
+                  << " align=" << cur_rx_desc.alignment
                   << dendl;
     return _fault();
   }
@@ -1322,7 +1319,7 @@ CtPtr ProtocolV2::read_message_data_prepare() {
   ldout(cct, 20) << __func__ << dendl;
 
   const auto data_len = \
-    rx_segments_desc[SegmentIndex::Msg::DATA].logical.length;
+    rx_segments_desc[SegmentIndex::Msg::DATA].length;
   const unsigned data_off = le32_to_cpu(current_header.data_off);
 
   if (data_len) {
@@ -1453,11 +1450,11 @@ CtPtr ProtocolV2::handle_message_complete() {
   ldout(cct, 20) << __func__ << dendl;
 
   const auto front_len = \
-    rx_segments_desc[SegmentIndex::Msg::FRONT].logical.length;
+    rx_segments_desc[SegmentIndex::Msg::FRONT].length;
   const auto middle_len = \
-    rx_segments_desc[SegmentIndex::Msg::MIDDLE].logical.length;
+    rx_segments_desc[SegmentIndex::Msg::MIDDLE].length;
   const auto data_len = \
-    rx_segments_desc[SegmentIndex::Msg::DATA].logical.length;
+    rx_segments_desc[SegmentIndex::Msg::DATA].length;
 
   ldout(cct, 5) << __func__
                << " got " << front_len
@@ -1496,9 +1493,9 @@ CtPtr ProtocolV2::handle_message_complete() {
   message->set_message_throttler(connection->policy.throttler_messages);
 
   const uint32_t cur_msg_size = \
-    rx_segments_desc[SegmentIndex::Msg::FRONT].logical.length + \
-    rx_segments_desc[SegmentIndex::Msg::MIDDLE].logical.length + \
-    rx_segments_desc[SegmentIndex::Msg::DATA].logical.length;
+    rx_segments_desc[SegmentIndex::Msg::FRONT].length + \
+    rx_segments_desc[SegmentIndex::Msg::MIDDLE].length + \
+    rx_segments_desc[SegmentIndex::Msg::DATA].length;
 
   // store reservation size in message, so we don't get confused
   // by messages entering the dispatch queue through other paths.
@@ -1651,9 +1648,9 @@ CtPtr ProtocolV2::throttle_bytes() {
 
   ceph_assert(rx_segments_desc.size() == 4);
   uint32_t cur_msg_size = \
-    rx_segments_desc[SegmentIndex::Msg::FRONT].logical.length + \
-    rx_segments_desc[SegmentIndex::Msg::MIDDLE].logical.length + \
-    rx_segments_desc[SegmentIndex::Msg::DATA].logical.length;
+    rx_segments_desc[SegmentIndex::Msg::FRONT].length + \
+    rx_segments_desc[SegmentIndex::Msg::MIDDLE].length + \
+    rx_segments_desc[SegmentIndex::Msg::DATA].length;
   if (cur_msg_size) {
     if (connection->policy.throttler_bytes) {
       ldout(cct, 10) << __func__ << " wants " << cur_msg_size
@@ -1687,9 +1684,9 @@ CtPtr ProtocolV2::throttle_dispatch_queue() {
 
   ceph_assert(rx_segments_desc.size() == 4);
   uint32_t cur_msg_size =
-    rx_segments_desc[SegmentIndex::Msg::FRONT].logical.length + \
-    rx_segments_desc[SegmentIndex::Msg::MIDDLE].logical.length + \
-    rx_segments_desc[SegmentIndex::Msg::DATA].logical.length;
+    rx_segments_desc[SegmentIndex::Msg::FRONT].length + \
+    rx_segments_desc[SegmentIndex::Msg::MIDDLE].length + \
+    rx_segments_desc[SegmentIndex::Msg::DATA].length;
 
   if (cur_msg_size) {
     if (!connection->dispatch_queue->dispatch_throttler.get_or_fail(

diff --git a/src/msg/async/ProtocolV2.h b/src/msg/async/ProtocolV2.h
index 1385885c9fdb00c278eae5e9c81d514ff938be28..3ba55fb595aa95ef645315fea4ac0916dcd0b18c 100644 (file)
--- a/src/msg/async/ProtocolV2.h
+++ b/src/msg/async/ProtocolV2.h
@@ -86,7 +86,7 @@ private:
 
 public:
 
-  boost::container::static_vector<ceph::msgr::v2::onwire_segment_t,
+  boost::container::static_vector<ceph::msgr::v2::segment_t,
                                  ceph::msgr::v2::MAX_NUM_SEGMENTS> rx_segments_desc;
   boost::container::static_vector<ceph::bufferlist,
                                  ceph::msgr::v2::MAX_NUM_SEGMENTS> rx_segments_data;

diff --git a/src/msg/async/frames_v2.h b/src/msg/async/frames_v2.h
index dbbb29e6c9230d487d73047e7987a35a75f39235..85f333f5d55d3f73e2490eb79c34174fa0d668d6 100644 (file)
--- a/src/msg/async/frames_v2.h
+++ b/src/msg/async/frames_v2.h
@@ -63,16 +63,6 @@ struct segment_t {
   __le16 alignment;
 } __attribute__((packed));
 
-struct onwire_segment_t {
-  // crypto-processed segment can be expanded on-wire because of:
-  //  * padding to achieve CRYPTO_BLOCK_SIZE alignment,
-  //  * authentication tag. It's appended at the end of message.
-  //    See RxHandler::get_extra_size_at_final().
-  __le32 onwire_length;
-
-  struct ceph::msgr::v2::segment_t logical;
-} __attribute__((packed));
-
 struct SegmentIndex {
   struct Msg {
     static constexpr std::size_t HEADER = 0;