perf tools: Add gzip decompression support for kernel module

+7

tools/perf/Makefile.perf

··· 66 66 # 67 67 # Define NO_PERF_READ_VDSOX32 if you do not want to build perf-read-vdsox32 68 68 # for reading the x32 mode 32-bit compatibility VDSO in 64-bit mode 69 + # 70 + # Define NO_ZLIB if you do not want to support compressed kernel modules 71 + 69 72 70 73 ifeq ($(srctree),) 71 74 srctree := $(patsubst %/,%,$(dir $(shell pwd))) ··· 585 582 586 583 ifndef NO_LIBNUMA 587 584 BUILTIN_OBJS += $(OUTPUT)bench/numa.o 585 + endif 586 + 587 + ifndef NO_ZLIB 588 + LIB_OBJS += $(OUTPUT)util/zlib.o 588 589 endif 589 590 590 591 ifdef ASCIIDOC8

+13 -2

tools/perf/config/Makefile

··· 200 200 libunwind \ 201 201 stackprotector-all \ 202 202 timerfd \ 203 - libdw-dwarf-unwind 203 + libdw-dwarf-unwind \ 204 + zlib 204 205 205 206 LIB_FEATURE_TESTS = \ 206 207 dwarf \ ··· 215 214 libpython \ 216 215 libslang \ 217 216 libunwind \ 218 - libdw-dwarf-unwind 217 + libdw-dwarf-unwind \ 218 + zlib 219 219 220 220 VF_FEATURE_TESTS = \ 221 221 backtrace \ ··· 604 602 605 603 ifneq ($(filter -lbfd,$(EXTLIBS)),) 606 604 CFLAGS += -DHAVE_LIBBFD_SUPPORT 605 + endif 606 + 607 + ifndef NO_ZLIB 608 + ifeq ($(feature-zlib), 1) 609 + CFLAGS += -DHAVE_ZLIB_SUPPORT 610 + EXTLIBS += -lz 611 + else 612 + NO_ZLIB := 1 613 + endif 607 614 endif 608 615 609 616 ifndef NO_BACKTRACE

+6 -2

tools/perf/config/feature-checks/Makefile

··· 29 29 test-timerfd.bin \ 30 30 test-libdw-dwarf-unwind.bin \ 31 31 test-compile-32.bin \ 32 - test-compile-x32.bin 32 + test-compile-x32.bin \ 33 + test-zlib.bin 33 34 34 35 CC := $(CROSS_COMPILE)gcc -MD 35 36 PKG_CONFIG := $(CROSS_COMPILE)pkg-config ··· 42 41 ############################### 43 42 44 43 test-all.bin: 45 - $(BUILD) -Werror -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl 44 + $(BUILD) -Werror -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz 46 45 47 46 test-hello.bin: 48 47 $(BUILD) ··· 139 138 140 139 test-compile-x32.bin: 141 140 $(CC) -mx32 -o $(OUTPUT)$@ test-compile.c 141 + 142 + test-zlib.bin: 143 + $(BUILD) -lz 142 144 143 145 -include *.d 144 146

+5

tools/perf/config/feature-checks/test-all.c

··· 93 93 # include "test-sync-compare-and-swap.c" 94 94 #undef main 95 95 96 + #define main main_test_zlib 97 + # include "test-zlib.c" 98 + #undef main 99 + 96 100 int main(int argc, char *argv[]) 97 101 { 98 102 main_test_libpython(); ··· 120 116 main_test_stackprotector_all(); 121 117 main_test_libdw_dwarf_unwind(); 122 118 main_test_sync_compare_and_swap(argc, argv); 119 + main_test_zlib(); 123 120 124 121 return 0; 125 122 }

+9

tools/perf/config/feature-checks/test-zlib.c

··· 1 + #include <zlib.h> 2 + 3 + int main(void) 4 + { 5 + z_stream zs; 6 + 7 + inflateInit(&zs); 8 + return 0; 9 + }

+4 -8

tools/perf/util/dso.c

··· 141 141 return ret; 142 142 } 143 143 144 - static int decompress_dummy(const char *input __maybe_unused, 145 - int output __maybe_unused) 146 - { 147 - return -1; 148 - } 149 - 150 144 static const struct { 151 145 const char *fmt; 152 146 int (*decompress)(const char *input, int output); 153 147 } compressions[] = { 154 - { "gz", decompress_dummy }, 155 - { NULL, }, 148 + #ifdef HAVE_ZLIB_SUPPORT 149 + { "gz", gzip_decompress_to_file }, 150 + #endif 151 + { NULL, NULL }, 156 152 }; 157 153 158 154 bool is_supported_compression(const char *ext)

+5

tools/perf/util/util.h

··· 351 351 352 352 const char *get_filename_for_perf_kvm(void); 353 353 bool find_process(const char *name); 354 + 355 + #ifdef HAVE_ZLIB_SUPPORT 356 + int gzip_decompress_to_file(const char *input, int output_fd); 357 + #endif 358 + 354 359 #endif /* GIT_COMPAT_UTIL_H */

+78

tools/perf/util/zlib.c

··· 1 + #include <stdio.h> 2 + #include <unistd.h> 3 + #include <sys/stat.h> 4 + #include <sys/mman.h> 5 + #include <zlib.h> 6 + 7 + #include "util/util.h" 8 + #include "util/debug.h" 9 + 10 + 11 + #define CHUNK_SIZE 16384 12 + 13 + int gzip_decompress_to_file(const char *input, int output_fd) 14 + { 15 + int ret = Z_STREAM_ERROR; 16 + int input_fd; 17 + void *ptr; 18 + int len; 19 + struct stat stbuf; 20 + unsigned char buf[CHUNK_SIZE]; 21 + z_stream zs = { 22 + .zalloc = Z_NULL, 23 + .zfree = Z_NULL, 24 + .opaque = Z_NULL, 25 + .avail_in = 0, 26 + .next_in = Z_NULL, 27 + }; 28 + 29 + input_fd = open(input, O_RDONLY); 30 + if (input_fd < 0) 31 + return -1; 32 + 33 + if (fstat(input_fd, &stbuf) < 0) 34 + goto out_close; 35 + 36 + ptr = mmap(NULL, stbuf.st_size, PROT_READ, MAP_PRIVATE, input_fd, 0); 37 + if (ptr == MAP_FAILED) 38 + goto out_close; 39 + 40 + if (inflateInit2(&zs, 16 + MAX_WBITS) != Z_OK) 41 + goto out_unmap; 42 + 43 + zs.next_in = ptr; 44 + zs.avail_in = stbuf.st_size; 45 + 46 + do { 47 + zs.next_out = buf; 48 + zs.avail_out = CHUNK_SIZE; 49 + 50 + ret = inflate(&zs, Z_NO_FLUSH); 51 + switch (ret) { 52 + case Z_NEED_DICT: 53 + ret = Z_DATA_ERROR; 54 + /* fall through */ 55 + case Z_DATA_ERROR: 56 + case Z_MEM_ERROR: 57 + goto out; 58 + default: 59 + break; 60 + } 61 + 62 + len = CHUNK_SIZE - zs.avail_out; 63 + if (writen(output_fd, buf, len) != len) { 64 + ret = Z_DATA_ERROR; 65 + goto out; 66 + } 67 + 68 + } while (ret != Z_STREAM_END); 69 + 70 + out: 71 + inflateEnd(&zs); 72 + out_unmap: 73 + munmap(ptr, stbuf.st_size); 74 + out_close: 75 + close(input_fd); 76 + 77 + return ret == Z_STREAM_END ? 0 : -1; 78 + }