Skip to content

Commit 253632d

Browse files
[lldb] Implement ProcessGDBRemote support for ReadMemoryRanges (llvm#164311)
This commit makes use of the newly created MultiMemRead packet to provide an efficient implementation of MultiMemRead inside ProcessGDBRemote. Testing is tricky, but it is accomplished two ways: 1. Some Objective-C tests would fail if this were implemented incorrectly, as there is already an in-tree use of the base class implementation of MultiMemRead, which is now getting replaced by the derived class. 2. One Objective-C test is modified so that we ensure the packet is being sent by looking at the packet logs. While not the most elegant solution, it is a strategy adopted in other tests as well. This gets around the fact that we cannot instantiate / unittest a mock ProcessGDBRemote. Depends on llvm#163651 (cherry picked from commit 276bccd) (cherry picked from commit 8e1255f)
1 parent f7b3ff2 commit 253632d

File tree

3 files changed

+146
-0
lines changed

3 files changed

+146
-0
lines changed

lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
#include "lldb/Host/Host.h"
8686
#include "lldb/Utility/StringExtractorGDBRemote.h"
8787

88+
#include "llvm/ADT/STLExtras.h"
8889
#include "llvm/ADT/ScopeExit.h"
8990
#include "llvm/ADT/StringMap.h"
9091
#include "llvm/ADT/StringSwitch.h"
@@ -2629,6 +2630,108 @@ size_t ProcessGDBRemote::DoReadMemory(addr_t addr, void *buf, size_t size,
26292630
return 0;
26302631
}
26312632

2633+
llvm::SmallVector<llvm::MutableArrayRef<uint8_t>>
2634+
ProcessGDBRemote::ReadMemoryRanges(
2635+
llvm::ArrayRef<Range<lldb::addr_t, size_t>> ranges,
2636+
llvm::MutableArrayRef<uint8_t> buffer) {
2637+
if (!m_gdb_comm.GetMultiMemReadSupported())
2638+
return Process::ReadMemoryRanges(ranges, buffer);
2639+
2640+
llvm::Expected<StringExtractorGDBRemote> response =
2641+
SendMultiMemReadPacket(ranges);
2642+
if (!response) {
2643+
LLDB_LOG_ERROR(GetLog(GDBRLog::Process), response.takeError(),
2644+
"MultiMemRead error response: {0}");
2645+
return Process::ReadMemoryRanges(ranges, buffer);
2646+
}
2647+
2648+
llvm::StringRef response_str = response->GetStringRef();
2649+
const unsigned expected_num_ranges = ranges.size();
2650+
llvm::Expected<llvm::SmallVector<llvm::MutableArrayRef<uint8_t>>>
2651+
parsed_response =
2652+
ParseMultiMemReadPacket(response_str, buffer, expected_num_ranges);
2653+
if (!parsed_response) {
2654+
LLDB_LOG_ERROR(GetLog(GDBRLog::Process), parsed_response.takeError(),
2655+
"MultiMemRead error parsing response: {0}");
2656+
return Process::ReadMemoryRanges(ranges, buffer);
2657+
}
2658+
return std::move(*parsed_response);
2659+
}
2660+
2661+
llvm::Expected<StringExtractorGDBRemote>
2662+
ProcessGDBRemote::SendMultiMemReadPacket(
2663+
llvm::ArrayRef<Range<lldb::addr_t, size_t>> ranges) {
2664+
std::string packet_str;
2665+
llvm::raw_string_ostream stream(packet_str);
2666+
stream << "MultiMemRead:ranges:";
2667+
2668+
auto range_to_stream = [&](auto range) {
2669+
// the "-" marker omits the '0x' prefix.
2670+
stream << llvm::formatv("{0:x-},{1:x-}", range.base, range.size);
2671+
};
2672+
llvm::interleave(ranges, stream, range_to_stream, ",");
2673+
stream << ";";
2674+
2675+
StringExtractorGDBRemote response;
2676+
GDBRemoteCommunication::PacketResult packet_result =
2677+
m_gdb_comm.SendPacketAndWaitForResponse(packet_str.data(), response,
2678+
GetInterruptTimeout());
2679+
if (packet_result != GDBRemoteCommunication::PacketResult::Success)
2680+
return llvm::createStringError(
2681+
llvm::formatv("MultiMemRead failed to send packet: '{0}'", packet_str));
2682+
2683+
if (response.IsErrorResponse())
2684+
return llvm::createStringError(
2685+
llvm::formatv("MultiMemRead failed: '{0}'", response.GetStringRef()));
2686+
2687+
if (!response.IsNormalResponse())
2688+
return llvm::createStringError(llvm::formatv(
2689+
"MultiMemRead unexpected response: '{0}'", response.GetStringRef()));
2690+
2691+
return response;
2692+
}
2693+
2694+
llvm::Expected<llvm::SmallVector<llvm::MutableArrayRef<uint8_t>>>
2695+
ProcessGDBRemote::ParseMultiMemReadPacket(llvm::StringRef response_str,
2696+
llvm::MutableArrayRef<uint8_t> buffer,
2697+
unsigned expected_num_ranges) {
2698+
// The sizes and the data are separated by a `;`.
2699+
auto [sizes_str, memory_data] = response_str.split(';');
2700+
if (sizes_str.size() == response_str.size())
2701+
return llvm::createStringError(llvm::formatv(
2702+
"MultiMemRead response missing field separator ';' in: '{0}'",
2703+
response_str));
2704+
2705+
llvm::SmallVector<llvm::MutableArrayRef<uint8_t>> read_results;
2706+
2707+
// Sizes are separated by a `,`.
2708+
for (llvm::StringRef size_str : llvm::split(sizes_str, ',')) {
2709+
uint64_t read_size;
2710+
if (size_str.getAsInteger(16, read_size))
2711+
return llvm::createStringError(llvm::formatv(
2712+
"MultiMemRead response has invalid size string: {0}", size_str));
2713+
2714+
if (memory_data.size() < read_size)
2715+
return llvm::createStringError(
2716+
llvm::formatv("MultiMemRead response did not have enough data, "
2717+
"requested sizes: {0}",
2718+
sizes_str));
2719+
2720+
llvm::StringRef region_to_read = memory_data.take_front(read_size);
2721+
memory_data = memory_data.drop_front(read_size);
2722+
2723+
assert(buffer.size() >= read_size);
2724+
llvm::MutableArrayRef<uint8_t> region_to_write =
2725+
buffer.take_front(read_size);
2726+
buffer = buffer.drop_front(read_size);
2727+
2728+
memcpy(region_to_write.data(), region_to_read.data(), read_size);
2729+
read_results.push_back(region_to_write);
2730+
}
2731+
2732+
return read_results;
2733+
}
2734+
26322735
bool ProcessGDBRemote::SupportsMemoryTagging() {
26332736
return m_gdb_comm.GetMemoryTaggingSupported();
26342737
}

lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,22 @@ class ProcessGDBRemote : public Process,
138138
size_t DoReadMemory(lldb::addr_t addr, void *buf, size_t size,
139139
Status &error) override;
140140

141+
/// Override of ReadMemoryRanges that uses MultiMemRead to optimize this
142+
/// operation.
143+
llvm::SmallVector<llvm::MutableArrayRef<uint8_t>>
144+
ReadMemoryRanges(llvm::ArrayRef<Range<lldb::addr_t, size_t>> ranges,
145+
llvm::MutableArrayRef<uint8_t> buf) override;
146+
147+
private:
148+
llvm::Expected<StringExtractorGDBRemote>
149+
SendMultiMemReadPacket(llvm::ArrayRef<Range<lldb::addr_t, size_t>> ranges);
150+
151+
llvm::Expected<llvm::SmallVector<llvm::MutableArrayRef<uint8_t>>>
152+
ParseMultiMemReadPacket(llvm::StringRef response_str,
153+
llvm::MutableArrayRef<uint8_t> buffer,
154+
unsigned expected_num_ranges);
155+
156+
public:
141157
Status
142158
WriteObjectFile(std::vector<ObjectFile::LoadableData> entries) override;
143159

lldb/test/API/lang/objc/foundation/TestObjCMethodsNSError.py

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,30 @@ def test_NSError_p(self):
4545
],
4646
)
4747
self.runCmd("process continue")
48+
49+
@skipIfOutOfTreeDebugserver
50+
def test_runtime_types_efficient_memreads(self):
51+
# Test that we use an efficient reading of memory when reading
52+
# Objective-C method descriptions.
53+
logfile = os.path.join(self.getBuildDir(), "log.txt")
54+
self.runCmd(f"log enable -f {logfile} gdb-remote packets process")
55+
self.addTearDownHook(lambda: self.runCmd("log disable gdb-remote packets"))
56+
57+
self.build()
58+
self.target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(
59+
self, "// Break here for NSString tests", lldb.SBFileSpec("main.m", False)
60+
)
61+
62+
self.runCmd(f"proc plugin packet send StartTesting", check=False)
63+
self.expect('expression str = [NSString stringWithCString: "new"]')
64+
self.runCmd(f"proc plugin packet send EndTesting", check=False)
65+
66+
self.assertTrue(os.path.exists(logfile))
67+
log_text = open(logfile).read()
68+
log_text = log_text.split("StartTesting", 1)[-1].split("EndTesting", 1)[0]
69+
70+
# This test is only checking that the packet it used at all (and that
71+
# no errors are produced). It doesn't check that the packet is being
72+
# used to solve a problem in an optimal way.
73+
self.assertIn("MultiMemRead:", log_text)
74+
self.assertNotIn("MultiMemRead error", log_text)

0 commit comments

Comments
 (0)