Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2014 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | #include "patchoat.h" |
| 17 | |
| 18 | #include <stdio.h> |
| 19 | #include <stdlib.h> |
Alex Light | a59dd80 | 2014-07-02 16:28:08 -0700 | [diff] [blame] | 20 | #include <sys/file.h> |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 21 | #include <sys/stat.h> |
Alex Light | a59dd80 | 2014-07-02 16:28:08 -0700 | [diff] [blame] | 22 | #include <unistd.h> |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 23 | |
| 24 | #include <string> |
| 25 | #include <vector> |
| 26 | |
Andreas Gampe | 46ee31b | 2016-12-14 10:11:49 -0800 | [diff] [blame] | 27 | #include "android-base/stringprintf.h" |
Andreas Gampe | 9186ced | 2016-12-12 14:28:21 -0800 | [diff] [blame] | 28 | #include "android-base/strings.h" |
| 29 | |
Mathieu Chartier | c785344 | 2015-03-27 14:35:38 -0700 | [diff] [blame] | 30 | #include "art_field-inl.h" |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 31 | #include "art_method-inl.h" |
Ian Rogers | c7dd295 | 2014-10-21 23:31:19 -0700 | [diff] [blame] | 32 | #include "base/dumpable.h" |
Andreas Gampe | b8cc175 | 2017-04-26 21:28:50 -0700 | [diff] [blame] | 33 | #include "base/memory_tool.h" |
Alex Light | a59dd80 | 2014-07-02 16:28:08 -0700 | [diff] [blame] | 34 | #include "base/scoped_flock.h" |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 35 | #include "base/stringpiece.h" |
Ian Rogers | d4c4d95 | 2014-10-16 20:31:53 -0700 | [diff] [blame] | 36 | #include "base/unix_file/fd_file.h" |
David Brazdil | 7b49e6c | 2016-09-01 11:06:18 +0100 | [diff] [blame] | 37 | #include "base/unix_file/random_access_file_utils.h" |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 38 | #include "elf_file.h" |
Tong Shen | 62d1ca3 | 2014-09-03 17:24:56 -0700 | [diff] [blame] | 39 | #include "elf_file_impl.h" |
Andreas Gampe | 8cf9cb3 | 2017-07-19 09:28:38 -0700 | [diff] [blame] | 40 | #include "elf_utils.h" |
Ian Rogers | e63db27 | 2014-07-15 15:36:11 -0700 | [diff] [blame] | 41 | #include "gc/space/image_space.h" |
Mathieu Chartier | 4a26f17 | 2016-01-26 14:26:18 -0800 | [diff] [blame] | 42 | #include "image-inl.h" |
Andreas Gampe | b2d18fa | 2017-06-06 20:46:10 -0700 | [diff] [blame] | 43 | #include "intern_table.h" |
Christina Wadsworth | bf44e0e | 2016-08-18 10:37:42 -0700 | [diff] [blame] | 44 | #include "mirror/dex_cache.h" |
Neil Fuller | 0e84439 | 2016-09-08 13:43:31 +0100 | [diff] [blame] | 45 | #include "mirror/executable.h" |
Andreas Gampe | 8cf9cb3 | 2017-07-19 09:28:38 -0700 | [diff] [blame] | 46 | #include "mirror/method.h" |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 47 | #include "mirror/object-inl.h" |
Andreas Gampe | c6ea7d0 | 2017-02-01 16:46:28 -0800 | [diff] [blame] | 48 | #include "mirror/object-refvisitor-inl.h" |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 49 | #include "mirror/reference.h" |
| 50 | #include "noop_compiler_callbacks.h" |
| 51 | #include "offsets.h" |
| 52 | #include "os.h" |
| 53 | #include "runtime.h" |
Mathieu Chartier | 0795f23 | 2016-09-27 18:43:30 -0700 | [diff] [blame] | 54 | #include "scoped_thread_state_change-inl.h" |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 55 | #include "thread.h" |
| 56 | #include "utils.h" |
| 57 | |
| 58 | namespace art { |
| 59 | |
Alex Light | 0eb76d2 | 2015-08-11 18:03:47 -0700 | [diff] [blame] | 60 | static const OatHeader* GetOatHeader(const ElfFile* elf_file) { |
| 61 | uint64_t off = 0; |
| 62 | if (!elf_file->GetSectionOffsetAndSize(".rodata", &off, nullptr)) { |
| 63 | return nullptr; |
| 64 | } |
| 65 | |
| 66 | OatHeader* oat_header = reinterpret_cast<OatHeader*>(elf_file->Begin() + off); |
| 67 | return oat_header; |
| 68 | } |
| 69 | |
Richard Uhler | 4bc11d0 | 2017-02-01 09:53:54 +0000 | [diff] [blame] | 70 | static File* CreateOrOpen(const char* name) { |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 71 | if (OS::FileExists(name)) { |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 72 | return OS::OpenFileReadWrite(name); |
| 73 | } else { |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 74 | std::unique_ptr<File> f(OS::CreateEmptyFile(name)); |
| 75 | if (f.get() != nullptr) { |
| 76 | if (fchmod(f->Fd(), 0644) != 0) { |
| 77 | PLOG(ERROR) << "Unable to make " << name << " world readable"; |
Dimitry Ivanov | 7a1c014 | 2016-03-17 15:59:38 -0700 | [diff] [blame] | 78 | unlink(name); |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 79 | return nullptr; |
| 80 | } |
| 81 | } |
| 82 | return f.release(); |
| 83 | } |
| 84 | } |
| 85 | |
| 86 | // Either try to close the file (close=true), or erase it. |
| 87 | static bool FinishFile(File* file, bool close) { |
| 88 | if (close) { |
| 89 | if (file->FlushCloseOrErase() != 0) { |
| 90 | PLOG(ERROR) << "Failed to flush and close file."; |
| 91 | return false; |
| 92 | } |
| 93 | return true; |
| 94 | } else { |
| 95 | file->Erase(); |
| 96 | return false; |
| 97 | } |
| 98 | } |
| 99 | |
David Brazdil | 7b49e6c | 2016-09-01 11:06:18 +0100 | [diff] [blame] | 100 | static bool SymlinkFile(const std::string& input_filename, const std::string& output_filename) { |
| 101 | if (input_filename == output_filename) { |
| 102 | // Input and output are the same, nothing to do. |
| 103 | return true; |
| 104 | } |
| 105 | |
| 106 | // Unlink the original filename, since we are overwriting it. |
| 107 | unlink(output_filename.c_str()); |
| 108 | |
| 109 | // Create a symlink from the source file to the target path. |
| 110 | if (symlink(input_filename.c_str(), output_filename.c_str()) < 0) { |
| 111 | PLOG(ERROR) << "Failed to create symlink " << output_filename << " -> " << input_filename; |
| 112 | return false; |
| 113 | } |
| 114 | |
| 115 | if (kIsDebugBuild) { |
| 116 | LOG(INFO) << "Created symlink " << output_filename << " -> " << input_filename; |
| 117 | } |
| 118 | |
| 119 | return true; |
| 120 | } |
| 121 | |
Andreas Gampe | 6eb6a39 | 2016-02-10 20:18:37 -0800 | [diff] [blame] | 122 | bool PatchOat::Patch(const std::string& image_location, |
| 123 | off_t delta, |
| 124 | const std::string& output_directory, |
| 125 | InstructionSet isa, |
| 126 | TimingLogger* timings) { |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 127 | CHECK(Runtime::Current() == nullptr); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 128 | CHECK(!image_location.empty()) << "image file must have a filename."; |
| 129 | |
Alex Light | eefbe39 | 2014-07-08 09:53:18 -0700 | [diff] [blame] | 130 | TimingLogger::ScopedTiming t("Runtime Setup", timings); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 131 | |
Vladimir Marko | 33bff25 | 2017-11-01 14:35:42 +0000 | [diff] [blame] | 132 | CHECK_NE(isa, InstructionSet::kNone); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 133 | const char* isa_name = GetInstructionSetString(isa); |
Igor Murashkin | 4677476 | 2014-10-22 11:37:02 -0700 | [diff] [blame] | 134 | |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 135 | // Set up the runtime |
Ian Rogers | e63db27 | 2014-07-15 15:36:11 -0700 | [diff] [blame] | 136 | RuntimeOptions options; |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 137 | NoopCompilerCallbacks callbacks; |
| 138 | options.push_back(std::make_pair("compilercallbacks", &callbacks)); |
| 139 | std::string img = "-Ximage:" + image_location; |
| 140 | options.push_back(std::make_pair(img.c_str(), nullptr)); |
| 141 | options.push_back(std::make_pair("imageinstructionset", reinterpret_cast<const void*>(isa_name))); |
Calin Juravle | 01aaf6e | 2015-06-19 22:05:39 +0100 | [diff] [blame] | 142 | options.push_back(std::make_pair("-Xno-sig-chain", nullptr)); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 143 | if (!Runtime::Create(options, false)) { |
| 144 | LOG(ERROR) << "Unable to initialize runtime"; |
| 145 | return false; |
| 146 | } |
Andreas Gampe | b8cc175 | 2017-04-26 21:28:50 -0700 | [diff] [blame] | 147 | std::unique_ptr<Runtime> runtime(Runtime::Current()); |
| 148 | |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 149 | // Runtime::Create acquired the mutator_lock_ that is normally given away when we Runtime::Start, |
| 150 | // give it away now and then switch to a more manageable ScopedObjectAccess. |
| 151 | Thread::Current()->TransitionFromRunnableToSuspended(kNative); |
| 152 | ScopedObjectAccess soa(Thread::Current()); |
| 153 | |
Richard Uhler | 4bc11d0 | 2017-02-01 09:53:54 +0000 | [diff] [blame] | 154 | t.NewTiming("Image Patching setup"); |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 155 | std::vector<gc::space::ImageSpace*> spaces = Runtime::Current()->GetHeap()->GetBootImageSpaces(); |
| 156 | std::map<gc::space::ImageSpace*, std::unique_ptr<File>> space_to_file_map; |
| 157 | std::map<gc::space::ImageSpace*, std::unique_ptr<MemMap>> space_to_memmap_map; |
| 158 | std::map<gc::space::ImageSpace*, PatchOat> space_to_patchoat_map; |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 159 | |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 160 | for (size_t i = 0; i < spaces.size(); ++i) { |
| 161 | gc::space::ImageSpace* space = spaces[i]; |
| 162 | std::string input_image_filename = space->GetImageFilename(); |
| 163 | std::unique_ptr<File> input_image(OS::OpenFileForReading(input_image_filename.c_str())); |
| 164 | if (input_image.get() == nullptr) { |
| 165 | LOG(ERROR) << "Unable to open input image file at " << input_image_filename; |
Igor Murashkin | 4677476 | 2014-10-22 11:37:02 -0700 | [diff] [blame] | 166 | return false; |
| 167 | } |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 168 | |
| 169 | int64_t image_len = input_image->GetLength(); |
| 170 | if (image_len < 0) { |
| 171 | LOG(ERROR) << "Error while getting image length"; |
| 172 | return false; |
| 173 | } |
| 174 | ImageHeader image_header; |
| 175 | if (sizeof(image_header) != input_image->Read(reinterpret_cast<char*>(&image_header), |
| 176 | sizeof(image_header), 0)) { |
| 177 | LOG(ERROR) << "Unable to read image header from image file " << input_image->GetPath(); |
| 178 | } |
| 179 | |
| 180 | /*bool is_image_pic = */IsImagePic(image_header, input_image->GetPath()); |
| 181 | // Nothing special to do right now since the image always needs to get patched. |
| 182 | // Perhaps in some far-off future we may have images with relative addresses that are true-PIC. |
| 183 | |
| 184 | // Create the map where we will write the image patches to. |
| 185 | std::string error_msg; |
| 186 | std::unique_ptr<MemMap> image(MemMap::MapFile(image_len, |
| 187 | PROT_READ | PROT_WRITE, |
| 188 | MAP_PRIVATE, |
| 189 | input_image->Fd(), |
| 190 | 0, |
| 191 | /*low_4gb*/false, |
| 192 | input_image->GetPath().c_str(), |
| 193 | &error_msg)); |
| 194 | if (image.get() == nullptr) { |
| 195 | LOG(ERROR) << "Unable to map image file " << input_image->GetPath() << " : " << error_msg; |
| 196 | return false; |
| 197 | } |
| 198 | space_to_file_map.emplace(space, std::move(input_image)); |
| 199 | space_to_memmap_map.emplace(space, std::move(image)); |
Igor Murashkin | 4677476 | 2014-10-22 11:37:02 -0700 | [diff] [blame] | 200 | } |
| 201 | |
Richard Uhler | 4bc11d0 | 2017-02-01 09:53:54 +0000 | [diff] [blame] | 202 | // Symlink PIC oat and vdex files and patch the image spaces in memory. |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 203 | for (size_t i = 0; i < spaces.size(); ++i) { |
| 204 | gc::space::ImageSpace* space = spaces[i]; |
| 205 | std::string input_image_filename = space->GetImageFilename(); |
David Brazdil | 7b49e6c | 2016-09-01 11:06:18 +0100 | [diff] [blame] | 206 | std::string input_vdex_filename = |
| 207 | ImageHeader::GetVdexLocationFromImageLocation(input_image_filename); |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 208 | std::string input_oat_filename = |
| 209 | ImageHeader::GetOatLocationFromImageLocation(input_image_filename); |
| 210 | std::unique_ptr<File> input_oat_file(OS::OpenFileForReading(input_oat_filename.c_str())); |
| 211 | if (input_oat_file.get() == nullptr) { |
| 212 | LOG(ERROR) << "Unable to open input oat file at " << input_oat_filename; |
| 213 | return false; |
| 214 | } |
| 215 | std::string error_msg; |
| 216 | std::unique_ptr<ElfFile> elf(ElfFile::Open(input_oat_file.get(), |
| 217 | PROT_READ | PROT_WRITE, MAP_PRIVATE, &error_msg)); |
| 218 | if (elf.get() == nullptr) { |
| 219 | LOG(ERROR) << "Unable to open oat file " << input_oat_file->GetPath() << " : " << error_msg; |
| 220 | return false; |
| 221 | } |
| 222 | |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 223 | MaybePic is_oat_pic = IsOatPic(elf.get()); |
| 224 | if (is_oat_pic >= ERROR_FIRST) { |
| 225 | // Error logged by IsOatPic |
| 226 | return false; |
Richard Uhler | 4bc11d0 | 2017-02-01 09:53:54 +0000 | [diff] [blame] | 227 | } else if (is_oat_pic == NOT_PIC) { |
| 228 | LOG(ERROR) << "patchoat cannot be used on non-PIC oat file: " << input_oat_file->GetPath(); |
| 229 | return false; |
| 230 | } else { |
| 231 | CHECK(is_oat_pic == PIC); |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 232 | |
Richard Uhler | 4bc11d0 | 2017-02-01 09:53:54 +0000 | [diff] [blame] | 233 | // Create a symlink. |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 234 | std::string converted_image_filename = space->GetImageLocation(); |
| 235 | std::replace(converted_image_filename.begin() + 1, converted_image_filename.end(), '/', '@'); |
| 236 | std::string output_image_filename = output_directory + |
Andreas Gampe | 9186ced | 2016-12-12 14:28:21 -0800 | [diff] [blame] | 237 | (android::base::StartsWith(converted_image_filename, "/") ? "" : "/") + |
| 238 | converted_image_filename; |
David Brazdil | 7b49e6c | 2016-09-01 11:06:18 +0100 | [diff] [blame] | 239 | std::string output_vdex_filename = |
| 240 | ImageHeader::GetVdexLocationFromImageLocation(output_image_filename); |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 241 | std::string output_oat_filename = |
| 242 | ImageHeader::GetOatLocationFromImageLocation(output_image_filename); |
| 243 | |
| 244 | if (!ReplaceOatFileWithSymlink(input_oat_file->GetPath(), |
Richard Uhler | 4bc11d0 | 2017-02-01 09:53:54 +0000 | [diff] [blame] | 245 | output_oat_filename) || |
David Brazdil | 7b49e6c | 2016-09-01 11:06:18 +0100 | [diff] [blame] | 246 | !SymlinkFile(input_vdex_filename, output_vdex_filename)) { |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 247 | // Errors already logged by above call. |
| 248 | return false; |
| 249 | } |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 250 | } |
| 251 | |
| 252 | PatchOat& p = space_to_patchoat_map.emplace(space, |
| 253 | PatchOat( |
| 254 | isa, |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 255 | space_to_memmap_map.find(space)->second.get(), |
| 256 | space->GetLiveBitmap(), |
| 257 | space->GetMemMap(), |
| 258 | delta, |
| 259 | &space_to_memmap_map, |
| 260 | timings)).first->second; |
| 261 | |
Richard Uhler | 4bc11d0 | 2017-02-01 09:53:54 +0000 | [diff] [blame] | 262 | t.NewTiming("Patching image"); |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 263 | if (!p.PatchImage(i == 0)) { |
| 264 | LOG(ERROR) << "Failed to patch image file " << input_image_filename; |
| 265 | return false; |
| 266 | } |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 267 | } |
| 268 | |
Richard Uhler | 4bc11d0 | 2017-02-01 09:53:54 +0000 | [diff] [blame] | 269 | // Write the patched image spaces. |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 270 | for (size_t i = 0; i < spaces.size(); ++i) { |
| 271 | gc::space::ImageSpace* space = spaces[i]; |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 272 | |
Richard Uhler | 4bc11d0 | 2017-02-01 09:53:54 +0000 | [diff] [blame] | 273 | t.NewTiming("Writing image"); |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 274 | std::string converted_image_filename = space->GetImageLocation(); |
| 275 | std::replace(converted_image_filename.begin() + 1, converted_image_filename.end(), '/', '@'); |
| 276 | std::string output_image_filename = output_directory + |
Andreas Gampe | 9186ced | 2016-12-12 14:28:21 -0800 | [diff] [blame] | 277 | (android::base::StartsWith(converted_image_filename, "/") ? "" : "/") + |
| 278 | converted_image_filename; |
Richard Uhler | 4bc11d0 | 2017-02-01 09:53:54 +0000 | [diff] [blame] | 279 | std::unique_ptr<File> output_image_file(CreateOrOpen(output_image_filename.c_str())); |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 280 | if (output_image_file.get() == nullptr) { |
| 281 | LOG(ERROR) << "Failed to open output image file at " << output_image_filename; |
| 282 | return false; |
| 283 | } |
| 284 | |
| 285 | PatchOat& p = space_to_patchoat_map.find(space)->second; |
| 286 | |
Serdjuk, Nikolay Y | d12f9c1 | 2016-03-22 10:06:33 +0600 | [diff] [blame] | 287 | bool success = p.WriteImage(output_image_file.get()); |
| 288 | success = FinishFile(output_image_file.get(), success); |
| 289 | if (!success) { |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 290 | return false; |
| 291 | } |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 292 | } |
Andreas Gampe | b8cc175 | 2017-04-26 21:28:50 -0700 | [diff] [blame] | 293 | |
| 294 | if (!kIsDebugBuild && !(RUNNING_ON_MEMORY_TOOL && kMemoryToolDetectsLeaks)) { |
| 295 | // We want to just exit on non-debug builds, not bringing the runtime down |
| 296 | // in an orderly fashion. So release the following fields. |
| 297 | runtime.release(); |
| 298 | } |
| 299 | |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 300 | return true; |
| 301 | } |
| 302 | |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 303 | bool PatchOat::WriteImage(File* out) { |
Alex Light | eefbe39 | 2014-07-08 09:53:18 -0700 | [diff] [blame] | 304 | TimingLogger::ScopedTiming t("Writing image File", timings_); |
Alex Light | a59dd80 | 2014-07-02 16:28:08 -0700 | [diff] [blame] | 305 | std::string error_msg; |
| 306 | |
Narayan Kamath | a3d27eb | 2017-05-11 13:50:59 +0100 | [diff] [blame] | 307 | // No error checking here, this is best effort. The locking may or may not |
| 308 | // succeed and we don't really care either way. |
| 309 | ScopedFlock img_flock = LockedFile::DupOf(out->Fd(), out->GetPath(), |
| 310 | true /* read_only_mode */, &error_msg); |
Alex Light | a59dd80 | 2014-07-02 16:28:08 -0700 | [diff] [blame] | 311 | |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 312 | CHECK(image_ != nullptr); |
| 313 | CHECK(out != nullptr); |
| 314 | size_t expect = image_->Size(); |
| 315 | if (out->WriteFully(reinterpret_cast<char*>(image_->Begin()), expect) && |
| 316 | out->SetLength(expect) == 0) { |
| 317 | return true; |
| 318 | } else { |
| 319 | LOG(ERROR) << "Writing to image file " << out->GetPath() << " failed."; |
| 320 | return false; |
| 321 | } |
| 322 | } |
| 323 | |
Igor Murashkin | 4677476 | 2014-10-22 11:37:02 -0700 | [diff] [blame] | 324 | bool PatchOat::IsImagePic(const ImageHeader& image_header, const std::string& image_path) { |
| 325 | if (!image_header.CompilePic()) { |
| 326 | if (kIsDebugBuild) { |
| 327 | LOG(INFO) << "image at location " << image_path << " was *not* compiled pic"; |
| 328 | } |
| 329 | return false; |
| 330 | } |
| 331 | |
| 332 | if (kIsDebugBuild) { |
| 333 | LOG(INFO) << "image at location " << image_path << " was compiled PIC"; |
| 334 | } |
| 335 | |
| 336 | return true; |
| 337 | } |
| 338 | |
| 339 | PatchOat::MaybePic PatchOat::IsOatPic(const ElfFile* oat_in) { |
| 340 | if (oat_in == nullptr) { |
| 341 | LOG(ERROR) << "No ELF input oat fie available"; |
| 342 | return ERROR_OAT_FILE; |
| 343 | } |
| 344 | |
Brian Carlstrom | f5b0f2c | 2016-10-14 01:04:26 -0700 | [diff] [blame] | 345 | const std::string& file_path = oat_in->GetFilePath(); |
Igor Murashkin | 4677476 | 2014-10-22 11:37:02 -0700 | [diff] [blame] | 346 | |
| 347 | const OatHeader* oat_header = GetOatHeader(oat_in); |
| 348 | if (oat_header == nullptr) { |
| 349 | LOG(ERROR) << "Failed to find oat header in oat file " << file_path; |
| 350 | return ERROR_OAT_FILE; |
| 351 | } |
| 352 | |
| 353 | if (!oat_header->IsValid()) { |
| 354 | LOG(ERROR) << "Elf file " << file_path << " has an invalid oat header"; |
| 355 | return ERROR_OAT_FILE; |
| 356 | } |
| 357 | |
| 358 | bool is_pic = oat_header->IsPic(); |
| 359 | if (kIsDebugBuild) { |
| 360 | LOG(INFO) << "Oat file at " << file_path << " is " << (is_pic ? "PIC" : "not pic"); |
| 361 | } |
| 362 | |
| 363 | return is_pic ? PIC : NOT_PIC; |
| 364 | } |
| 365 | |
| 366 | bool PatchOat::ReplaceOatFileWithSymlink(const std::string& input_oat_filename, |
Richard Uhler | 4bc11d0 | 2017-02-01 09:53:54 +0000 | [diff] [blame] | 367 | const std::string& output_oat_filename) { |
Igor Murashkin | 4677476 | 2014-10-22 11:37:02 -0700 | [diff] [blame] | 368 | // Delete the original file, since we won't need it. |
Dimitry Ivanov | 7a1c014 | 2016-03-17 15:59:38 -0700 | [diff] [blame] | 369 | unlink(output_oat_filename.c_str()); |
Igor Murashkin | 4677476 | 2014-10-22 11:37:02 -0700 | [diff] [blame] | 370 | |
| 371 | // Create a symlink from the old oat to the new oat |
| 372 | if (symlink(input_oat_filename.c_str(), output_oat_filename.c_str()) < 0) { |
| 373 | int err = errno; |
| 374 | LOG(ERROR) << "Failed to create symlink at " << output_oat_filename |
| 375 | << " error(" << err << "): " << strerror(err); |
| 376 | return false; |
| 377 | } |
| 378 | |
| 379 | if (kIsDebugBuild) { |
| 380 | LOG(INFO) << "Created symlink " << output_oat_filename << " -> " << input_oat_filename; |
| 381 | } |
| 382 | |
| 383 | return true; |
| 384 | } |
| 385 | |
Vladimir Marko | ad06b98 | 2016-11-17 16:38:59 +0000 | [diff] [blame] | 386 | class PatchOat::PatchOatArtFieldVisitor : public ArtFieldVisitor { |
Mathieu Chartier | 54d220e | 2015-07-30 16:20:06 -0700 | [diff] [blame] | 387 | public: |
| 388 | explicit PatchOatArtFieldVisitor(PatchOat* patch_oat) : patch_oat_(patch_oat) {} |
| 389 | |
Andreas Gampe | bdf7f1c | 2016-08-30 16:38:47 -0700 | [diff] [blame] | 390 | void Visit(ArtField* field) OVERRIDE REQUIRES_SHARED(Locks::mutator_lock_) { |
Mathieu Chartier | 54d220e | 2015-07-30 16:20:06 -0700 | [diff] [blame] | 391 | ArtField* const dest = patch_oat_->RelocatedCopyOf(field); |
Mathieu Chartier | 3398c78 | 2016-09-30 10:27:43 -0700 | [diff] [blame] | 392 | dest->SetDeclaringClass( |
Mathieu Chartier | 1cc62e4 | 2016-10-03 18:01:28 -0700 | [diff] [blame] | 393 | patch_oat_->RelocatedAddressOfPointer(field->GetDeclaringClass().Ptr())); |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 394 | } |
Mathieu Chartier | 54d220e | 2015-07-30 16:20:06 -0700 | [diff] [blame] | 395 | |
| 396 | private: |
| 397 | PatchOat* const patch_oat_; |
| 398 | }; |
| 399 | |
| 400 | void PatchOat::PatchArtFields(const ImageHeader* image_header) { |
| 401 | PatchOatArtFieldVisitor visitor(this); |
Mathieu Chartier | e42888f | 2016-04-14 10:49:19 -0700 | [diff] [blame] | 402 | image_header->VisitPackedArtFields(&visitor, heap_->Begin()); |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 403 | } |
| 404 | |
Vladimir Marko | ad06b98 | 2016-11-17 16:38:59 +0000 | [diff] [blame] | 405 | class PatchOat::PatchOatArtMethodVisitor : public ArtMethodVisitor { |
Mathieu Chartier | 54d220e | 2015-07-30 16:20:06 -0700 | [diff] [blame] | 406 | public: |
| 407 | explicit PatchOatArtMethodVisitor(PatchOat* patch_oat) : patch_oat_(patch_oat) {} |
| 408 | |
Andreas Gampe | bdf7f1c | 2016-08-30 16:38:47 -0700 | [diff] [blame] | 409 | void Visit(ArtMethod* method) OVERRIDE REQUIRES_SHARED(Locks::mutator_lock_) { |
Mathieu Chartier | 54d220e | 2015-07-30 16:20:06 -0700 | [diff] [blame] | 410 | ArtMethod* const dest = patch_oat_->RelocatedCopyOf(method); |
| 411 | patch_oat_->FixupMethod(method, dest); |
| 412 | } |
| 413 | |
| 414 | private: |
| 415 | PatchOat* const patch_oat_; |
| 416 | }; |
| 417 | |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 418 | void PatchOat::PatchArtMethods(const ImageHeader* image_header) { |
Andreas Gampe | 542451c | 2016-07-26 09:02:02 -0700 | [diff] [blame] | 419 | const PointerSize pointer_size = InstructionSetPointerSize(isa_); |
Mathieu Chartier | 54d220e | 2015-07-30 16:20:06 -0700 | [diff] [blame] | 420 | PatchOatArtMethodVisitor visitor(this); |
Mathieu Chartier | e42888f | 2016-04-14 10:49:19 -0700 | [diff] [blame] | 421 | image_header->VisitPackedArtMethods(&visitor, heap_->Begin(), pointer_size); |
| 422 | } |
| 423 | |
Artem Udovichenko | a62cb9b | 2016-06-30 09:18:25 +0000 | [diff] [blame] | 424 | void PatchOat::PatchImTables(const ImageHeader* image_header) { |
Andreas Gampe | 542451c | 2016-07-26 09:02:02 -0700 | [diff] [blame] | 425 | const PointerSize pointer_size = InstructionSetPointerSize(isa_); |
Artem Udovichenko | a62cb9b | 2016-06-30 09:18:25 +0000 | [diff] [blame] | 426 | // We can safely walk target image since the conflict tables are independent. |
| 427 | image_header->VisitPackedImTables( |
| 428 | [this](ArtMethod* method) { |
| 429 | return RelocatedAddressOfPointer(method); |
| 430 | }, |
| 431 | image_->Begin(), |
| 432 | pointer_size); |
| 433 | } |
| 434 | |
Mathieu Chartier | e42888f | 2016-04-14 10:49:19 -0700 | [diff] [blame] | 435 | void PatchOat::PatchImtConflictTables(const ImageHeader* image_header) { |
Andreas Gampe | 542451c | 2016-07-26 09:02:02 -0700 | [diff] [blame] | 436 | const PointerSize pointer_size = InstructionSetPointerSize(isa_); |
Mathieu Chartier | e42888f | 2016-04-14 10:49:19 -0700 | [diff] [blame] | 437 | // We can safely walk target image since the conflict tables are independent. |
| 438 | image_header->VisitPackedImtConflictTables( |
| 439 | [this](ArtMethod* method) { |
| 440 | return RelocatedAddressOfPointer(method); |
| 441 | }, |
| 442 | image_->Begin(), |
| 443 | pointer_size); |
Mathieu Chartier | c785344 | 2015-03-27 14:35:38 -0700 | [diff] [blame] | 444 | } |
| 445 | |
Vladimir Marko | ad06b98 | 2016-11-17 16:38:59 +0000 | [diff] [blame] | 446 | class PatchOat::FixupRootVisitor : public RootVisitor { |
Mathieu Chartier | d39645e | 2015-06-09 17:50:29 -0700 | [diff] [blame] | 447 | public: |
| 448 | explicit FixupRootVisitor(const PatchOat* patch_oat) : patch_oat_(patch_oat) { |
| 449 | } |
| 450 | |
| 451 | void VisitRoots(mirror::Object*** roots, size_t count, const RootInfo& info ATTRIBUTE_UNUSED) |
Andreas Gampe | bdf7f1c | 2016-08-30 16:38:47 -0700 | [diff] [blame] | 452 | OVERRIDE REQUIRES_SHARED(Locks::mutator_lock_) { |
Mathieu Chartier | d39645e | 2015-06-09 17:50:29 -0700 | [diff] [blame] | 453 | for (size_t i = 0; i < count; ++i) { |
| 454 | *roots[i] = patch_oat_->RelocatedAddressOfPointer(*roots[i]); |
| 455 | } |
| 456 | } |
| 457 | |
| 458 | void VisitRoots(mirror::CompressedReference<mirror::Object>** roots, size_t count, |
| 459 | const RootInfo& info ATTRIBUTE_UNUSED) |
Andreas Gampe | bdf7f1c | 2016-08-30 16:38:47 -0700 | [diff] [blame] | 460 | OVERRIDE REQUIRES_SHARED(Locks::mutator_lock_) { |
Mathieu Chartier | d39645e | 2015-06-09 17:50:29 -0700 | [diff] [blame] | 461 | for (size_t i = 0; i < count; ++i) { |
| 462 | roots[i]->Assign(patch_oat_->RelocatedAddressOfPointer(roots[i]->AsMirrorPtr())); |
| 463 | } |
| 464 | } |
| 465 | |
| 466 | private: |
| 467 | const PatchOat* const patch_oat_; |
| 468 | }; |
| 469 | |
| 470 | void PatchOat::PatchInternedStrings(const ImageHeader* image_header) { |
Vladimir Marko | cd87c3e | 2017-09-05 13:11:57 +0100 | [diff] [blame] | 471 | const auto& section = image_header->GetInternedStringsSection(); |
Vladimir Marko | 6cfbdbc | 2017-07-25 13:26:39 +0100 | [diff] [blame] | 472 | if (section.Size() == 0) { |
| 473 | return; |
| 474 | } |
Mathieu Chartier | d39645e | 2015-06-09 17:50:29 -0700 | [diff] [blame] | 475 | InternTable temp_table; |
| 476 | // Note that we require that ReadFromMemory does not make an internal copy of the elements. |
| 477 | // This also relies on visit roots not doing any verification which could fail after we update |
| 478 | // the roots to be the image addresses. |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 479 | temp_table.AddTableFromMemory(image_->Begin() + section.Offset()); |
Mathieu Chartier | d39645e | 2015-06-09 17:50:29 -0700 | [diff] [blame] | 480 | FixupRootVisitor visitor(this); |
| 481 | temp_table.VisitRoots(&visitor, kVisitRootFlagAllRoots); |
| 482 | } |
| 483 | |
Mathieu Chartier | 208a5cb | 2015-12-02 15:44:07 -0800 | [diff] [blame] | 484 | void PatchOat::PatchClassTable(const ImageHeader* image_header) { |
Vladimir Marko | cd87c3e | 2017-09-05 13:11:57 +0100 | [diff] [blame] | 485 | const auto& section = image_header->GetClassTableSection(); |
Mathieu Chartier | fbc3108 | 2016-01-24 11:59:56 -0800 | [diff] [blame] | 486 | if (section.Size() == 0) { |
| 487 | return; |
| 488 | } |
Mathieu Chartier | 208a5cb | 2015-12-02 15:44:07 -0800 | [diff] [blame] | 489 | // Note that we require that ReadFromMemory does not make an internal copy of the elements. |
| 490 | // This also relies on visit roots not doing any verification which could fail after we update |
| 491 | // the roots to be the image addresses. |
| 492 | WriterMutexLock mu(Thread::Current(), *Locks::classlinker_classes_lock_); |
| 493 | ClassTable temp_table; |
| 494 | temp_table.ReadFromMemory(image_->Begin() + section.Offset()); |
| 495 | FixupRootVisitor visitor(this); |
Mathieu Chartier | 58c3f6a | 2016-12-01 14:21:11 -0800 | [diff] [blame] | 496 | temp_table.VisitRoots(UnbufferedRootVisitor(&visitor, RootInfo(kRootUnknown))); |
Mathieu Chartier | 208a5cb | 2015-12-02 15:44:07 -0800 | [diff] [blame] | 497 | } |
| 498 | |
| 499 | |
Vladimir Marko | ad06b98 | 2016-11-17 16:38:59 +0000 | [diff] [blame] | 500 | class PatchOat::RelocatedPointerVisitor { |
Mathieu Chartier | 4b00d34 | 2015-11-13 10:42:08 -0800 | [diff] [blame] | 501 | public: |
| 502 | explicit RelocatedPointerVisitor(PatchOat* patch_oat) : patch_oat_(patch_oat) {} |
| 503 | |
| 504 | template <typename T> |
Mathieu Chartier | 8c19d24 | 2017-03-06 12:35:10 -0800 | [diff] [blame] | 505 | T* operator()(T* ptr, void** dest_addr ATTRIBUTE_UNUSED = 0) const { |
Mathieu Chartier | 4b00d34 | 2015-11-13 10:42:08 -0800 | [diff] [blame] | 506 | return patch_oat_->RelocatedAddressOfPointer(ptr); |
| 507 | } |
| 508 | |
| 509 | private: |
| 510 | PatchOat* const patch_oat_; |
| 511 | }; |
| 512 | |
Mathieu Chartier | c785344 | 2015-03-27 14:35:38 -0700 | [diff] [blame] | 513 | void PatchOat::PatchDexFileArrays(mirror::ObjectArray<mirror::Object>* img_roots) { |
| 514 | auto* dex_caches = down_cast<mirror::ObjectArray<mirror::DexCache>*>( |
| 515 | img_roots->Get(ImageHeader::kDexCaches)); |
Andreas Gampe | 542451c | 2016-07-26 09:02:02 -0700 | [diff] [blame] | 516 | const PointerSize pointer_size = InstructionSetPointerSize(isa_); |
Mathieu Chartier | c785344 | 2015-03-27 14:35:38 -0700 | [diff] [blame] | 517 | for (size_t i = 0, count = dex_caches->GetLength(); i < count; ++i) { |
Vladimir Marko | 05792b9 | 2015-08-03 11:56:49 +0100 | [diff] [blame] | 518 | auto* orig_dex_cache = dex_caches->GetWithoutChecks(i); |
| 519 | auto* copy_dex_cache = RelocatedCopyOf(orig_dex_cache); |
Vladimir Marko | 05792b9 | 2015-08-03 11:56:49 +0100 | [diff] [blame] | 520 | // Though the DexCache array fields are usually treated as native pointers, we set the full |
| 521 | // 64-bit values here, clearing the top 32 bits for 32-bit targets. The zero-extension is |
| 522 | // done by casting to the unsigned type uintptr_t before casting to int64_t, i.e. |
| 523 | // static_cast<int64_t>(reinterpret_cast<uintptr_t>(image_begin_ + offset))). |
Christina Wadsworth | bf44e0e | 2016-08-18 10:37:42 -0700 | [diff] [blame] | 524 | mirror::StringDexCacheType* orig_strings = orig_dex_cache->GetStrings(); |
| 525 | mirror::StringDexCacheType* relocated_strings = RelocatedAddressOfPointer(orig_strings); |
Vladimir Marko | 05792b9 | 2015-08-03 11:56:49 +0100 | [diff] [blame] | 526 | copy_dex_cache->SetField64<false>( |
| 527 | mirror::DexCache::StringsOffset(), |
| 528 | static_cast<int64_t>(reinterpret_cast<uintptr_t>(relocated_strings))); |
| 529 | if (orig_strings != nullptr) { |
Mathieu Chartier | 4b00d34 | 2015-11-13 10:42:08 -0800 | [diff] [blame] | 530 | orig_dex_cache->FixupStrings(RelocatedCopyOf(orig_strings), RelocatedPointerVisitor(this)); |
Mathieu Chartier | c785344 | 2015-03-27 14:35:38 -0700 | [diff] [blame] | 531 | } |
Vladimir Marko | 8d6768d | 2017-03-14 10:13:21 +0000 | [diff] [blame] | 532 | mirror::TypeDexCacheType* orig_types = orig_dex_cache->GetResolvedTypes(); |
| 533 | mirror::TypeDexCacheType* relocated_types = RelocatedAddressOfPointer(orig_types); |
Vladimir Marko | 05792b9 | 2015-08-03 11:56:49 +0100 | [diff] [blame] | 534 | copy_dex_cache->SetField64<false>( |
| 535 | mirror::DexCache::ResolvedTypesOffset(), |
| 536 | static_cast<int64_t>(reinterpret_cast<uintptr_t>(relocated_types))); |
| 537 | if (orig_types != nullptr) { |
Mathieu Chartier | 4b00d34 | 2015-11-13 10:42:08 -0800 | [diff] [blame] | 538 | orig_dex_cache->FixupResolvedTypes(RelocatedCopyOf(orig_types), |
| 539 | RelocatedPointerVisitor(this)); |
Vladimir Marko | 05792b9 | 2015-08-03 11:56:49 +0100 | [diff] [blame] | 540 | } |
Vladimir Marko | 07bfbac | 2017-07-06 14:55:02 +0100 | [diff] [blame] | 541 | mirror::MethodDexCacheType* orig_methods = orig_dex_cache->GetResolvedMethods(); |
| 542 | mirror::MethodDexCacheType* relocated_methods = RelocatedAddressOfPointer(orig_methods); |
Vladimir Marko | 05792b9 | 2015-08-03 11:56:49 +0100 | [diff] [blame] | 543 | copy_dex_cache->SetField64<false>( |
| 544 | mirror::DexCache::ResolvedMethodsOffset(), |
| 545 | static_cast<int64_t>(reinterpret_cast<uintptr_t>(relocated_methods))); |
| 546 | if (orig_methods != nullptr) { |
Vladimir Marko | 07bfbac | 2017-07-06 14:55:02 +0100 | [diff] [blame] | 547 | mirror::MethodDexCacheType* copy_methods = RelocatedCopyOf(orig_methods); |
Vladimir Marko | 05792b9 | 2015-08-03 11:56:49 +0100 | [diff] [blame] | 548 | for (size_t j = 0, num = orig_dex_cache->NumResolvedMethods(); j != num; ++j) { |
Vladimir Marko | 07bfbac | 2017-07-06 14:55:02 +0100 | [diff] [blame] | 549 | mirror::MethodDexCachePair orig = |
| 550 | mirror::DexCache::GetNativePairPtrSize(orig_methods, j, pointer_size); |
| 551 | mirror::MethodDexCachePair copy(RelocatedAddressOfPointer(orig.object), orig.index); |
| 552 | mirror::DexCache::SetNativePairPtrSize(copy_methods, j, copy, pointer_size); |
Vladimir Marko | 05792b9 | 2015-08-03 11:56:49 +0100 | [diff] [blame] | 553 | } |
| 554 | } |
Vladimir Marko | f44d36c | 2017-03-14 14:18:46 +0000 | [diff] [blame] | 555 | mirror::FieldDexCacheType* orig_fields = orig_dex_cache->GetResolvedFields(); |
| 556 | mirror::FieldDexCacheType* relocated_fields = RelocatedAddressOfPointer(orig_fields); |
Vladimir Marko | 05792b9 | 2015-08-03 11:56:49 +0100 | [diff] [blame] | 557 | copy_dex_cache->SetField64<false>( |
| 558 | mirror::DexCache::ResolvedFieldsOffset(), |
| 559 | static_cast<int64_t>(reinterpret_cast<uintptr_t>(relocated_fields))); |
| 560 | if (orig_fields != nullptr) { |
Vladimir Marko | f44d36c | 2017-03-14 14:18:46 +0000 | [diff] [blame] | 561 | mirror::FieldDexCacheType* copy_fields = RelocatedCopyOf(orig_fields); |
Vladimir Marko | 05792b9 | 2015-08-03 11:56:49 +0100 | [diff] [blame] | 562 | for (size_t j = 0, num = orig_dex_cache->NumResolvedFields(); j != num; ++j) { |
Vladimir Marko | f44d36c | 2017-03-14 14:18:46 +0000 | [diff] [blame] | 563 | mirror::FieldDexCachePair orig = |
| 564 | mirror::DexCache::GetNativePairPtrSize(orig_fields, j, pointer_size); |
| 565 | mirror::FieldDexCachePair copy(RelocatedAddressOfPointer(orig.object), orig.index); |
| 566 | mirror::DexCache::SetNativePairPtrSize(copy_fields, j, copy, pointer_size); |
Vladimir Marko | 05792b9 | 2015-08-03 11:56:49 +0100 | [diff] [blame] | 567 | } |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 568 | } |
Narayan Kamath | 7fe5658 | 2016-10-14 18:49:12 +0100 | [diff] [blame] | 569 | mirror::MethodTypeDexCacheType* orig_method_types = orig_dex_cache->GetResolvedMethodTypes(); |
| 570 | mirror::MethodTypeDexCacheType* relocated_method_types = |
| 571 | RelocatedAddressOfPointer(orig_method_types); |
| 572 | copy_dex_cache->SetField64<false>( |
| 573 | mirror::DexCache::ResolvedMethodTypesOffset(), |
| 574 | static_cast<int64_t>(reinterpret_cast<uintptr_t>(relocated_method_types))); |
| 575 | if (orig_method_types != nullptr) { |
| 576 | orig_dex_cache->FixupResolvedMethodTypes(RelocatedCopyOf(orig_method_types), |
| 577 | RelocatedPointerVisitor(this)); |
| 578 | } |
Orion Hodson | c069a30 | 2017-01-18 09:23:12 +0000 | [diff] [blame] | 579 | |
| 580 | GcRoot<mirror::CallSite>* orig_call_sites = orig_dex_cache->GetResolvedCallSites(); |
| 581 | GcRoot<mirror::CallSite>* relocated_call_sites = RelocatedAddressOfPointer(orig_call_sites); |
| 582 | copy_dex_cache->SetField64<false>( |
| 583 | mirror::DexCache::ResolvedCallSitesOffset(), |
| 584 | static_cast<int64_t>(reinterpret_cast<uintptr_t>(relocated_call_sites))); |
| 585 | if (orig_call_sites != nullptr) { |
| 586 | orig_dex_cache->FixupResolvedCallSites(RelocatedCopyOf(orig_call_sites), |
| 587 | RelocatedPointerVisitor(this)); |
| 588 | } |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 589 | } |
| 590 | } |
| 591 | |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 592 | bool PatchOat::PatchImage(bool primary_image) { |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 593 | ImageHeader* image_header = reinterpret_cast<ImageHeader*>(image_->Begin()); |
| 594 | CHECK_GT(image_->Size(), sizeof(ImageHeader)); |
| 595 | // These are the roots from the original file. |
Mathieu Chartier | c785344 | 2015-03-27 14:35:38 -0700 | [diff] [blame] | 596 | auto* img_roots = image_header->GetImageRoots(); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 597 | image_header->RelocateImage(delta_); |
| 598 | |
Mathieu Chartier | c785344 | 2015-03-27 14:35:38 -0700 | [diff] [blame] | 599 | PatchArtFields(image_header); |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 600 | PatchArtMethods(image_header); |
Artem Udovichenko | a62cb9b | 2016-06-30 09:18:25 +0000 | [diff] [blame] | 601 | PatchImTables(image_header); |
Mathieu Chartier | e42888f | 2016-04-14 10:49:19 -0700 | [diff] [blame] | 602 | PatchImtConflictTables(image_header); |
Mathieu Chartier | d39645e | 2015-06-09 17:50:29 -0700 | [diff] [blame] | 603 | PatchInternedStrings(image_header); |
Mathieu Chartier | 208a5cb | 2015-12-02 15:44:07 -0800 | [diff] [blame] | 604 | PatchClassTable(image_header); |
Mathieu Chartier | c785344 | 2015-03-27 14:35:38 -0700 | [diff] [blame] | 605 | // Patch dex file int/long arrays which point to ArtFields. |
| 606 | PatchDexFileArrays(img_roots); |
| 607 | |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 608 | if (primary_image) { |
| 609 | VisitObject(img_roots); |
| 610 | } |
| 611 | |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 612 | if (!image_header->IsValid()) { |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 613 | LOG(ERROR) << "relocation renders image header invalid"; |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 614 | return false; |
| 615 | } |
| 616 | |
| 617 | { |
Alex Light | eefbe39 | 2014-07-08 09:53:18 -0700 | [diff] [blame] | 618 | TimingLogger::ScopedTiming t("Walk Bitmap", timings_); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 619 | // Walk the bitmap. |
| 620 | WriterMutexLock mu(Thread::Current(), *Locks::heap_bitmap_lock_); |
Andreas Gampe | 0c18338 | 2017-07-13 22:26:24 -0700 | [diff] [blame] | 621 | auto visitor = [&](mirror::Object* obj) REQUIRES_SHARED(Locks::mutator_lock_) { |
| 622 | VisitObject(obj); |
| 623 | }; |
| 624 | bitmap_->Walk(visitor); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 625 | } |
| 626 | return true; |
| 627 | } |
| 628 | |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 629 | |
Mathieu Chartier | 31e8822 | 2016-10-14 18:43:19 -0700 | [diff] [blame] | 630 | void PatchOat::PatchVisitor::operator() (ObjPtr<mirror::Object> obj, |
| 631 | MemberOffset off, |
Ian Rogers | 6a3c1fc | 2014-10-31 00:33:20 -0700 | [diff] [blame] | 632 | bool is_static_unused ATTRIBUTE_UNUSED) const { |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 633 | mirror::Object* referent = obj->GetFieldObject<mirror::Object, kVerifyNone>(off); |
Mathieu Chartier | c785344 | 2015-03-27 14:35:38 -0700 | [diff] [blame] | 634 | mirror::Object* moved_object = patcher_->RelocatedAddressOfPointer(referent); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 635 | copy_->SetFieldObjectWithoutWriteBarrier<false, true, kVerifyNone>(off, moved_object); |
| 636 | } |
| 637 | |
Mathieu Chartier | 31e8822 | 2016-10-14 18:43:19 -0700 | [diff] [blame] | 638 | void PatchOat::PatchVisitor::operator() (ObjPtr<mirror::Class> cls ATTRIBUTE_UNUSED, |
| 639 | ObjPtr<mirror::Reference> ref) const { |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 640 | MemberOffset off = mirror::Reference::ReferentOffset(); |
| 641 | mirror::Object* referent = ref->GetReferent(); |
Mathieu Chartier | a13abba | 2016-04-21 10:23:16 -0700 | [diff] [blame] | 642 | DCHECK(referent == nullptr || |
| 643 | Runtime::Current()->GetHeap()->ObjectIsInBootImageSpace(referent)) << referent; |
Mathieu Chartier | c785344 | 2015-03-27 14:35:38 -0700 | [diff] [blame] | 644 | mirror::Object* moved_object = patcher_->RelocatedAddressOfPointer(referent); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 645 | copy_->SetFieldObjectWithoutWriteBarrier<false, true, kVerifyNone>(off, moved_object); |
| 646 | } |
| 647 | |
Andreas Gampe | 0c18338 | 2017-07-13 22:26:24 -0700 | [diff] [blame] | 648 | // Called by PatchImage. |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 649 | void PatchOat::VisitObject(mirror::Object* object) { |
| 650 | mirror::Object* copy = RelocatedCopyOf(object); |
| 651 | CHECK(copy != nullptr); |
Hiroshi Yamauchi | 12b58b2 | 2016-11-01 11:55:29 -0700 | [diff] [blame] | 652 | if (kUseBakerReadBarrier) { |
| 653 | object->AssertReadBarrierState(); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 654 | } |
| 655 | PatchOat::PatchVisitor visitor(this, copy); |
Mathieu Chartier | 059ef3d | 2015-08-18 13:54:21 -0700 | [diff] [blame] | 656 | object->VisitReferences<kVerifyNone>(visitor, visitor); |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 657 | if (object->IsClass<kVerifyNone>()) { |
Andreas Gampe | 542451c | 2016-07-26 09:02:02 -0700 | [diff] [blame] | 658 | const PointerSize pointer_size = InstructionSetPointerSize(isa_); |
Mathieu Chartier | 4b00d34 | 2015-11-13 10:42:08 -0800 | [diff] [blame] | 659 | mirror::Class* klass = object->AsClass(); |
| 660 | mirror::Class* copy_klass = down_cast<mirror::Class*>(copy); |
| 661 | RelocatedPointerVisitor native_visitor(this); |
| 662 | klass->FixupNativePointers(copy_klass, pointer_size, native_visitor); |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 663 | auto* vtable = klass->GetVTable(); |
| 664 | if (vtable != nullptr) { |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 665 | vtable->Fixup(RelocatedCopyOfFollowImages(vtable), pointer_size, native_visitor); |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 666 | } |
Mathieu Chartier | 6beced4 | 2016-11-15 15:51:31 -0800 | [diff] [blame] | 667 | mirror::IfTable* iftable = klass->GetIfTable(); |
| 668 | for (int32_t i = 0; i < klass->GetIfTableCount(); ++i) { |
| 669 | if (iftable->GetMethodArrayCount(i) > 0) { |
| 670 | auto* method_array = iftable->GetMethodArray(i); |
| 671 | CHECK(method_array != nullptr); |
| 672 | method_array->Fixup(RelocatedCopyOfFollowImages(method_array), |
| 673 | pointer_size, |
| 674 | native_visitor); |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 675 | } |
| 676 | } |
Mathieu Chartier | 4b00d34 | 2015-11-13 10:42:08 -0800 | [diff] [blame] | 677 | } else if (object->GetClass() == mirror::Method::StaticClass() || |
| 678 | object->GetClass() == mirror::Constructor::StaticClass()) { |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 679 | // Need to go update the ArtMethod. |
Neil Fuller | 0e84439 | 2016-09-08 13:43:31 +0100 | [diff] [blame] | 680 | auto* dest = down_cast<mirror::Executable*>(copy); |
| 681 | auto* src = down_cast<mirror::Executable*>(object); |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 682 | dest->SetArtMethod(RelocatedAddressOfPointer(src->GetArtMethod())); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 683 | } |
| 684 | } |
| 685 | |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 686 | void PatchOat::FixupMethod(ArtMethod* object, ArtMethod* copy) { |
Andreas Gampe | 542451c | 2016-07-26 09:02:02 -0700 | [diff] [blame] | 687 | const PointerSize pointer_size = InstructionSetPointerSize(isa_); |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 688 | copy->CopyFrom(object, pointer_size); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 689 | // Just update the entry points if it looks like we should. |
Alex Light | eefbe39 | 2014-07-08 09:53:18 -0700 | [diff] [blame] | 690 | // TODO: sanity check all the pointers' values |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 691 | copy->SetDeclaringClass(RelocatedAddressOfPointer(object->GetDeclaringClass())); |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 692 | copy->SetEntryPointFromQuickCompiledCodePtrSize(RelocatedAddressOfPointer( |
| 693 | object->GetEntryPointFromQuickCompiledCodePtrSize(pointer_size)), pointer_size); |
Mathieu Chartier | e42888f | 2016-04-14 10:49:19 -0700 | [diff] [blame] | 694 | // No special handling for IMT conflict table since all pointers are moved by the same offset. |
Andreas Gampe | 75f0885 | 2016-07-19 08:06:07 -0700 | [diff] [blame] | 695 | copy->SetDataPtrSize(RelocatedAddressOfPointer( |
| 696 | object->GetDataPtrSize(pointer_size)), pointer_size); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 697 | } |
| 698 | |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 699 | static int orig_argc; |
| 700 | static char** orig_argv; |
| 701 | |
| 702 | static std::string CommandLine() { |
| 703 | std::vector<std::string> command; |
| 704 | for (int i = 0; i < orig_argc; ++i) { |
| 705 | command.push_back(orig_argv[i]); |
| 706 | } |
Andreas Gampe | 9186ced | 2016-12-12 14:28:21 -0800 | [diff] [blame] | 707 | return android::base::Join(command, ' '); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 708 | } |
| 709 | |
| 710 | static void UsageErrorV(const char* fmt, va_list ap) { |
| 711 | std::string error; |
Andreas Gampe | 46ee31b | 2016-12-14 10:11:49 -0800 | [diff] [blame] | 712 | android::base::StringAppendV(&error, fmt, ap); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 713 | LOG(ERROR) << error; |
| 714 | } |
| 715 | |
| 716 | static void UsageError(const char* fmt, ...) { |
| 717 | va_list ap; |
| 718 | va_start(ap, fmt); |
| 719 | UsageErrorV(fmt, ap); |
| 720 | va_end(ap); |
| 721 | } |
| 722 | |
Andreas Gampe | 794ad76 | 2015-02-23 08:12:24 -0800 | [diff] [blame] | 723 | NO_RETURN static void Usage(const char *fmt, ...) { |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 724 | va_list ap; |
| 725 | va_start(ap, fmt); |
| 726 | UsageErrorV(fmt, ap); |
| 727 | va_end(ap); |
| 728 | |
| 729 | UsageError("Command: %s", CommandLine().c_str()); |
| 730 | UsageError("Usage: patchoat [options]..."); |
| 731 | UsageError(""); |
| 732 | UsageError(" --instruction-set=<isa>: Specifies the instruction set the patched code is"); |
Richard Uhler | 4bc11d0 | 2017-02-01 09:53:54 +0000 | [diff] [blame] | 733 | UsageError(" compiled for (required)."); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 734 | UsageError(""); |
| 735 | UsageError(" --input-image-location=<file.art>: Specifies the 'location' of the image file to"); |
Richard Uhler | 4bc11d0 | 2017-02-01 09:53:54 +0000 | [diff] [blame] | 736 | UsageError(" be patched."); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 737 | UsageError(""); |
| 738 | UsageError(" --output-image-file=<file.art>: Specifies the exact file to write the patched"); |
| 739 | UsageError(" image file to."); |
| 740 | UsageError(""); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 741 | UsageError(" --base-offset-delta=<delta>: Specify the amount to change the old base-offset by."); |
| 742 | UsageError(" This value may be negative."); |
| 743 | UsageError(""); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 744 | UsageError(" --dump-timings: dump out patch timing information"); |
| 745 | UsageError(""); |
| 746 | UsageError(" --no-dump-timings: do not dump out patch timing information"); |
| 747 | UsageError(""); |
| 748 | |
| 749 | exit(EXIT_FAILURE); |
| 750 | } |
| 751 | |
Andreas Gampe | 6eb6a39 | 2016-02-10 20:18:37 -0800 | [diff] [blame] | 752 | static int patchoat_image(TimingLogger& timings, |
| 753 | InstructionSet isa, |
| 754 | const std::string& input_image_location, |
| 755 | const std::string& output_image_filename, |
| 756 | off_t base_delta, |
| 757 | bool base_delta_set, |
| 758 | bool debug) { |
| 759 | CHECK(!input_image_location.empty()); |
| 760 | if (output_image_filename.empty()) { |
| 761 | Usage("Image patching requires --output-image-file"); |
| 762 | } |
| 763 | |
| 764 | if (!base_delta_set) { |
| 765 | Usage("Must supply a desired new offset or delta."); |
| 766 | } |
| 767 | |
| 768 | if (!IsAligned<kPageSize>(base_delta)) { |
| 769 | Usage("Base offset/delta must be aligned to a pagesize (0x%08x) boundary.", kPageSize); |
| 770 | } |
| 771 | |
| 772 | if (debug) { |
| 773 | LOG(INFO) << "moving offset by " << base_delta |
| 774 | << " (0x" << std::hex << base_delta << ") bytes or " |
| 775 | << std::dec << (base_delta/kPageSize) << " pages."; |
| 776 | } |
| 777 | |
| 778 | TimingLogger::ScopedTiming pt("patch image and oat", &timings); |
| 779 | |
| 780 | std::string output_directory = |
Andreas Gampe | ca620d7 | 2016-11-08 08:09:33 -0800 | [diff] [blame] | 781 | output_image_filename.substr(0, output_image_filename.find_last_of('/')); |
Andreas Gampe | 6eb6a39 | 2016-02-10 20:18:37 -0800 | [diff] [blame] | 782 | bool ret = PatchOat::Patch(input_image_location, base_delta, output_directory, isa, &timings); |
| 783 | |
| 784 | if (kIsDebugBuild) { |
| 785 | LOG(INFO) << "Exiting with return ... " << ret; |
| 786 | } |
| 787 | return ret ? EXIT_SUCCESS : EXIT_FAILURE; |
| 788 | } |
| 789 | |
Alex Light | eefbe39 | 2014-07-08 09:53:18 -0700 | [diff] [blame] | 790 | static int patchoat(int argc, char **argv) { |
Andreas Gampe | 51d80cc | 2017-06-21 21:05:13 -0700 | [diff] [blame] | 791 | InitLogging(argv, Runtime::Abort); |
Mathieu Chartier | 6e88ef6 | 2014-10-14 15:01:24 -0700 | [diff] [blame] | 792 | MemMap::Init(); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 793 | const bool debug = kIsDebugBuild; |
| 794 | orig_argc = argc; |
| 795 | orig_argv = argv; |
| 796 | TimingLogger timings("patcher", false, false); |
| 797 | |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 798 | // Skip over the command name. |
| 799 | argv++; |
| 800 | argc--; |
| 801 | |
| 802 | if (argc == 0) { |
| 803 | Usage("No arguments specified"); |
| 804 | } |
| 805 | |
| 806 | timings.StartTiming("Patchoat"); |
| 807 | |
| 808 | // cmd line args |
| 809 | bool isa_set = false; |
Vladimir Marko | 33bff25 | 2017-11-01 14:35:42 +0000 | [diff] [blame] | 810 | InstructionSet isa = InstructionSet::kNone; |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 811 | std::string input_image_location; |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 812 | std::string output_image_filename; |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 813 | off_t base_delta = 0; |
| 814 | bool base_delta_set = false; |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 815 | bool dump_timings = kIsDebugBuild; |
| 816 | |
Ian Rogers | d4c4d95 | 2014-10-16 20:31:53 -0700 | [diff] [blame] | 817 | for (int i = 0; i < argc; ++i) { |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 818 | const StringPiece option(argv[i]); |
| 819 | const bool log_options = false; |
| 820 | if (log_options) { |
| 821 | LOG(INFO) << "patchoat: option[" << i << "]=" << argv[i]; |
| 822 | } |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 823 | if (option.starts_with("--instruction-set=")) { |
| 824 | isa_set = true; |
| 825 | const char* isa_str = option.substr(strlen("--instruction-set=")).data(); |
Andreas Gampe | 20c8930 | 2014-08-19 17:28:06 -0700 | [diff] [blame] | 826 | isa = GetInstructionSetFromString(isa_str); |
Vladimir Marko | 33bff25 | 2017-11-01 14:35:42 +0000 | [diff] [blame] | 827 | if (isa == InstructionSet::kNone) { |
Andreas Gampe | 20c8930 | 2014-08-19 17:28:06 -0700 | [diff] [blame] | 828 | Usage("Unknown or invalid instruction set %s", isa_str); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 829 | } |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 830 | } else if (option.starts_with("--input-image-location=")) { |
| 831 | input_image_location = option.substr(strlen("--input-image-location=")).data(); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 832 | } else if (option.starts_with("--output-image-file=")) { |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 833 | output_image_filename = option.substr(strlen("--output-image-file=")).data(); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 834 | } else if (option.starts_with("--base-offset-delta=")) { |
| 835 | const char* base_delta_str = option.substr(strlen("--base-offset-delta=")).data(); |
| 836 | base_delta_set = true; |
| 837 | if (!ParseInt(base_delta_str, &base_delta)) { |
| 838 | Usage("Failed to parse --base-offset-delta argument '%s' as an off_t", base_delta_str); |
| 839 | } |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 840 | } else if (option == "--dump-timings") { |
| 841 | dump_timings = true; |
| 842 | } else if (option == "--no-dump-timings") { |
| 843 | dump_timings = false; |
| 844 | } else { |
| 845 | Usage("Unknown argument %s", option.data()); |
| 846 | } |
| 847 | } |
| 848 | |
Andreas Gampe | 6eb6a39 | 2016-02-10 20:18:37 -0800 | [diff] [blame] | 849 | // The instruction set is mandatory. This simplifies things... |
| 850 | if (!isa_set) { |
| 851 | Usage("Instruction set must be set."); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 852 | } |
| 853 | |
Richard Uhler | 4bc11d0 | 2017-02-01 09:53:54 +0000 | [diff] [blame] | 854 | int ret = patchoat_image(timings, |
| 855 | isa, |
| 856 | input_image_location, |
| 857 | output_image_filename, |
| 858 | base_delta, |
| 859 | base_delta_set, |
| 860 | debug); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 861 | |
Andreas Gampe | 6eb6a39 | 2016-02-10 20:18:37 -0800 | [diff] [blame] | 862 | timings.EndTiming(); |
| 863 | if (dump_timings) { |
| 864 | LOG(INFO) << Dumpable<TimingLogger>(timings); |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 865 | } |
| 866 | |
Andreas Gampe | 6eb6a39 | 2016-02-10 20:18:37 -0800 | [diff] [blame] | 867 | return ret; |
Alex Light | 53cb16b | 2014-06-12 11:26:29 -0700 | [diff] [blame] | 868 | } |
| 869 | |
| 870 | } // namespace art |
| 871 | |
| 872 | int main(int argc, char **argv) { |
| 873 | return art::patchoat(argc, argv); |
| 874 | } |