Date: Sat, 23 Feb 2019 13:49:56 -0800 (PST) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> To: Matt Macy <mmacy@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r344487 - in head/sys: conf gnu/gcov Message-ID: <201902232149.x1NLnute032111@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201902232114.x1NLE0cH085345@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> Author: mmacy > Date: Sat Feb 23 21:14:00 2019 > New Revision: 344487 > URL: https://svnweb.freebsd.org/changeset/base/344487 > > Log: > gcov support > > add gcov support and export results as files in debugfs > > Reviewed by: hps@ > MFC after: 1 week > Sponsored by: iX Systems > Differential Revision: https://reviews.freebsd.org/D19260 > > Added: > head/sys/gnu/gcov/ > head/sys/gnu/gcov/gcc_4_7.c (contents, props changed) > head/sys/gnu/gcov/gcov.h (contents, props changed) > head/sys/gnu/gcov/gcov_fs.c (contents, props changed) > head/sys/gnu/gcov/gcov_subr.c (contents, props changed) > Modified: > head/sys/conf/files > head/sys/conf/kern.mk > head/sys/conf/kern.post.mk > head/sys/conf/kern.pre.mk > head/sys/conf/kmod.mk > head/sys/conf/options > > Modified: head/sys/conf/files > ============================================================================== > --- head/sys/conf/files Sat Feb 23 21:04:48 2019 (r344486) > +++ head/sys/conf/files Sat Feb 23 21:14:00 2019 (r344487) > @@ -3726,6 +3726,11 @@ fs/cd9660/cd9660_util.c optional cd9660 > fs/cd9660/cd9660_vfsops.c optional cd9660 > fs/cd9660/cd9660_vnops.c optional cd9660 > fs/cd9660/cd9660_iconv.c optional cd9660_iconv > +gnu/gcov/gcc_4_7.c optional gcov > +gnu/gcov/gcov_fs.c optional gcov lindebugfs \ > + compile-with "${LINUXKPI_C}" > +gnu/gcov/gcov_subr.c optional gcov > + > kern/bus_if.m standard > kern/clock_if.m standard > kern/cpufreq_if.m standard > @@ -4473,6 +4478,12 @@ compat/linuxkpi/common/src/linux_slab.c optional comp > compat/linuxkpi/common/src/linux_usb.c optional compat_linuxkpi usb \ > compile-with "${LINUXKPI_C}" > compat/linuxkpi/common/src/linux_work.c optional compat_linuxkpi \ > + compile-with "${LINUXKPI_C}" > + > +compat/linuxkpi/common/src/linux_seq_file.c optional compat_linuxkpi | lindebugfs \ > + compile-with "${LINUXKPI_C}" > + > +compat/lindebugfs/lindebugfs.c optional lindebugfs \ > compile-with "${LINUXKPI_C}" > > # OpenFabrics Enterprise Distribution (Infiniband) > > Modified: head/sys/conf/kern.mk > ============================================================================== > --- head/sys/conf/kern.mk Sat Feb 23 21:04:48 2019 (r344486) > +++ head/sys/conf/kern.mk Sat Feb 23 21:14:00 2019 (r344487) > @@ -56,7 +56,7 @@ CWARNEXTRA?= -Wno-error=address \ > -Wno-error=maybe-uninitialized \ > -Wno-error=overflow \ > -Wno-error=sequence-point \ > - -Wno-error=unused-but-set-variable > + -Wno-unused-but-set-variable > .if ${COMPILER_VERSION} >= 60100 > CWARNEXTRA+= -Wno-error=misleading-indentation \ > -Wno-error=nonnull-compare \ > > Modified: head/sys/conf/kern.post.mk > ============================================================================== > --- head/sys/conf/kern.post.mk Sat Feb 23 21:04:48 2019 (r344486) > +++ head/sys/conf/kern.post.mk Sat Feb 23 21:14:00 2019 (r344487) > @@ -32,6 +32,10 @@ MKMODULESENV+= WITH_EXTRA_TCP_STACKS="${WITH_EXTRA_TCP > MKMODULESENV+= SAN_CFLAGS="${SAN_CFLAGS}" > .endif > > +.if defined(GCOV_CFLAGS) > +MKMODULESENV+= GCOV_CFLAGS="${GCOV_CFLAGS}" > +.endif > + > # Allow overriding the kernel debug directory, so kernel and user debug may be > # installed in different directories. Setting it to "" restores the historical > # behavior of installing debug files in the kernel directory. > > Modified: head/sys/conf/kern.pre.mk > ============================================================================== > --- head/sys/conf/kern.pre.mk Sat Feb 23 21:04:48 2019 (r344486) > +++ head/sys/conf/kern.pre.mk Sat Feb 23 21:14:00 2019 (r344487) > @@ -130,6 +130,15 @@ SAN_CFLAGS+= -fsanitize-coverage=trace-pc > > CFLAGS+= ${SAN_CFLAGS} > > +GCOV_ENABLED!= grep GCOV opt_global.h || true ; echo > +.if !empty(GCOV_ENABLED) > +.if ${COMPILER_TYPE} == "gcc" > +GCOV_CFLAGS+= -fprofile-arcs -ftest-coverage > +.endif > +.endif > + > +CFLAGS+= ${GCOV_CFLAGS} > + > # Put configuration-specific C flags last (except for ${PROF}) so that they > # can override the others. > CFLAGS+= ${CONF_CFLAGS} > > Modified: head/sys/conf/kmod.mk > ============================================================================== > --- head/sys/conf/kmod.mk Sat Feb 23 21:04:48 2019 (r344486) > +++ head/sys/conf/kmod.mk Sat Feb 23 21:14:00 2019 (r344487) > @@ -380,6 +380,9 @@ ${_src}: > # Add the sanitizer C flags > CFLAGS+= ${SAN_CFLAGS} > > +# Add the gcov flags > +CFLAGS+= ${GCOV_CFLAGS} > + > # Respect configuration-specific C flags. > CFLAGS+= ${ARCH_FLAGS} ${CONF_CFLAGS} > > > Modified: head/sys/conf/options > ============================================================================== > --- head/sys/conf/options Sat Feb 23 21:04:48 2019 (r344486) > +++ head/sys/conf/options Sat Feb 23 21:14:00 2019 (r344487) > @@ -1013,3 +1013,7 @@ NVME_USE_NVD opt_nvme.h > > # amdsbwd options > AMDSBWD_DEBUG opt_amdsbwd.h > + > +# gcov support > +GCOV opt_global.h > +LINDEBUGFS > > Added: head/sys/gnu/gcov/gcc_4_7.c > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/sys/gnu/gcov/gcc_4_7.c Sat Feb 23 21:14:00 2019 (r344487) > @@ -0,0 +1,597 @@ > +// SPDX-License-Identifier: GPL-2.0 The open item on the SPDX only use needs to be dealt with on a repository of local tag to file location, etc. I still feel very uncorftable with most of that, especially given the GPL 2 itsel clearly says to place "this body of text" in your file. I do not know that you can modify that aspect of it and have it still be called gpl 2.0. > +/* > + * This code provides functions to handle gcc's profiling data format > + * introduced with gcc 4.7. > + * > + * This file is based heavily on gcc_3_4.c file. > + * > + * For a better understanding, refer to gcc source: > + * gcc/gcov-io.h > + * libgcc/libgcov.c > + * > + * Uses gcc-internal data definitions. > + */ > + > + > +#include <sys/cdefs.h> > +__FBSDID("$FreeBSD$"); > + > +#include <sys/param.h> > +#include <sys/systm.h> > +#include <sys/types.h> > +#include <sys/systm.h> > +#include <sys/sbuf.h> > +#include <sys/malloc.h> > +#include <sys/module.h> > +#include <gnu/gcov/gcov.h> > + > + > +#if (__GNUC__ >= 7) > +#define GCOV_COUNTERS 9 > +#elif (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) > +#define GCOV_COUNTERS 10 > +#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 9 > +#define GCOV_COUNTERS 9 > +#else > +#define GCOV_COUNTERS 8 > +#endif > + > +#define GCOV_TAG_FUNCTION_LENGTH 3 > + > +static struct gcov_info *gcov_info_head; > + > +/** > + * struct gcov_ctr_info - information about counters for a single function > + * @num: number of counter values for this type > + * @values: array of counter values for this type > + * > + * This data is generated by gcc during compilation and doesn't change > + * at run-time with the exception of the values array. > + */ > +struct gcov_ctr_info { > + unsigned int num; > + gcov_type *values; > +}; > + > +/** > + * struct gcov_fn_info - profiling meta data per function > + * @key: comdat key > + * @ident: unique ident of function > + * @lineno_checksum: function lineo_checksum > + * @cfg_checksum: function cfg checksum > + * @ctrs: instrumented counters > + * > + * This data is generated by gcc during compilation and doesn't change > + * at run-time. > + * > + * Information about a single function. This uses the trailing array > + * idiom. The number of counters is determined from the merge pointer > + * array in gcov_info. The key is used to detect which of a set of > + * comdat functions was selected -- it points to the gcov_info object > + * of the object file containing the selected comdat function. > + */ > +struct gcov_fn_info { > + const struct gcov_info *key; > + unsigned int ident; > + unsigned int lineno_checksum; > + unsigned int cfg_checksum; > + struct gcov_ctr_info ctrs[0]; > +}; > + > +/** > + * struct gcov_info - profiling data per object file > + * @version: gcov version magic indicating the gcc version used for compilation > + * @next: list head for a singly-linked list > + * @stamp: uniquifying time stamp > + * @filename: name of the associated gcov data file > + * @merge: merge functions (null for unused counter type) > + * @n_functions: number of instrumented functions > + * @functions: pointer to pointers to function information > + * > + * This data is generated by gcc during compilation and doesn't change > + * at run-time with the exception of the next pointer. > + */ > +struct gcov_info { > + unsigned int version; > + struct gcov_info *next; > + unsigned int stamp; > + const char *filename; > + void (*merge[GCOV_COUNTERS])(gcov_type *, unsigned int); > + unsigned int n_functions; > + struct gcov_fn_info **functions; > +}; > + > +/** > + * gcov_info_filename - return info filename > + * @info: profiling data set > + */ > +const char * > +gcov_info_filename(struct gcov_info *info) > +{ > + return (info->filename); > +} > + > +/** > + * gcov_info_version - return info version > + * @info: profiling data set > + */ > +unsigned int > +gcov_info_version(struct gcov_info *info) > +{ > + return (info->version); > +} > + > +/** > + * gcov_info_next - return next profiling data set > + * @info: profiling data set > + * > + * Returns next gcov_info following @info or first gcov_info in the chain if > + * @info is %NULL. > + */ > +struct gcov_info * > +gcov_info_next(struct gcov_info *info) > +{ > + if (!info) > + return gcov_info_head; > + > + return (info->next); > +} > + > +/** > + * gcov_info_link - link/add profiling data set to the list > + * @info: profiling data set > + */ > +void > +gcov_info_link(struct gcov_info *info) > +{ > + info->next = gcov_info_head; > + gcov_info_head = info; > +} > + > +/** > + * gcov_info_unlink - unlink/remove profiling data set from the list > + * @prev: previous profiling data set > + * @info: profiling data set > + */ > +void > +gcov_info_unlink(struct gcov_info *prev, struct gcov_info *info) > +{ > + if (prev) > + prev->next = info->next; > + else > + gcov_info_head = info->next; > +} > + > +/* Symbolic links to be created for each profiling data file. */ > +const struct gcov_link gcov_link[] = { > + { OBJ_TREE, "gcno" }, /* Link to .gcno file in $(objtree). */ > + { 0, NULL}, > +}; > + > +/* > + * Determine whether a counter is active. Doesn't change at run-time. > + */ > +static int > +counter_active(struct gcov_info *info, unsigned int type) > +{ > + return (info->merge[type] ? 1 : 0); > +} > + > +/* Determine number of active counters. Based on gcc magic. */ > +static unsigned int > +num_counter_active(struct gcov_info *info) > +{ > + unsigned int i; > + unsigned int result = 0; > + > + for (i = 0; i < GCOV_COUNTERS; i++) { > + if (counter_active(info, i)) > + result++; > + } > + return (result); > +} > + > +/** > + * gcov_info_reset - reset profiling data to zero > + * @info: profiling data set > + */ > +void > +gcov_info_reset(struct gcov_info *info) > +{ > + struct gcov_ctr_info *ci_ptr; > + unsigned int fi_idx; > + unsigned int ct_idx; > + > + for (fi_idx = 0; fi_idx < info->n_functions; fi_idx++) { > + ci_ptr = info->functions[fi_idx]->ctrs; > + > + for (ct_idx = 0; ct_idx < GCOV_COUNTERS; ct_idx++) { > + if (!counter_active(info, ct_idx)) > + continue; > + > + memset(ci_ptr->values, 0, > + sizeof(gcov_type) * ci_ptr->num); > + ci_ptr++; > + } > + } > +} > + > +/** > + * gcov_info_is_compatible - check if profiling data can be added > + * @info1: first profiling data set > + * @info2: second profiling data set > + * > + * Returns non-zero if profiling data can be added, zero otherwise. > + */ > +int > +gcov_info_is_compatible(struct gcov_info *info1, struct gcov_info *info2) > +{ > + return (info1->stamp == info2->stamp); > +} > + > +/** > + * gcov_info_add - add up profiling data > + * @dest: profiling data set to which data is added > + * @source: profiling data set which is added > + * > + * Adds profiling counts of @source to @dest. > + */ > +void > +gcov_info_add(struct gcov_info *dst, struct gcov_info *src) > +{ > + struct gcov_ctr_info *dci_ptr; > + struct gcov_ctr_info *sci_ptr; > + unsigned int fi_idx; > + unsigned int ct_idx; > + unsigned int val_idx; > + > + for (fi_idx = 0; fi_idx < src->n_functions; fi_idx++) { > + dci_ptr = dst->functions[fi_idx]->ctrs; > + sci_ptr = src->functions[fi_idx]->ctrs; > + > + for (ct_idx = 0; ct_idx < GCOV_COUNTERS; ct_idx++) { > + if (!counter_active(src, ct_idx)) > + continue; > + > + for (val_idx = 0; val_idx < sci_ptr->num; val_idx++) > + dci_ptr->values[val_idx] += > + sci_ptr->values[val_idx]; > + > + dci_ptr++; > + sci_ptr++; > + } > + } > +} > + > +/** > + * gcov_info_dup - duplicate profiling data set > + * @info: profiling data set to duplicate > + * > + * Return newly allocated duplicate on success, %NULL on error. > + */ > +struct gcov_info * > +gcov_info_dup(struct gcov_info *info) > +{ > + struct gcov_info *dup; > + struct gcov_ctr_info *dci_ptr; /* dst counter info */ > + struct gcov_ctr_info *sci_ptr; /* src counter info */ > + unsigned int active; > + unsigned int fi_idx; /* function info idx */ > + unsigned int ct_idx; /* counter type idx */ > + size_t fi_size; /* function info size */ > + size_t cv_size; /* counter values size */ > + > + if ((dup = malloc(sizeof(*dup), M_GCOV, M_NOWAIT|M_ZERO)) == NULL) > + return (NULL); > + memcpy(dup, info, sizeof(*dup)); > + > + dup->next = NULL; > + dup->filename = NULL; > + dup->functions = NULL; > + > + dup->filename = strdup_flags(info->filename, M_GCOV, M_NOWAIT); > + if (dup->filename == NULL) > + goto err_free; > + > + dup->functions = malloc(info->n_functions * sizeof(struct gcov_fn_info *), M_GCOV, M_NOWAIT|M_ZERO); > + if (dup->functions == NULL) > + goto err_free; > + active = num_counter_active(info); > + fi_size = sizeof(struct gcov_fn_info); > + fi_size += sizeof(struct gcov_ctr_info) * active; > + > + for (fi_idx = 0; fi_idx < info->n_functions; fi_idx++) { > + dup->functions[fi_idx] = malloc(fi_size, M_GCOV, M_NOWAIT|M_ZERO); > + if (!dup->functions[fi_idx]) > + goto err_free; > + > + *(dup->functions[fi_idx]) = *(info->functions[fi_idx]); > + > + sci_ptr = info->functions[fi_idx]->ctrs; > + dci_ptr = dup->functions[fi_idx]->ctrs; > + > + for (ct_idx = 0; ct_idx < active; ct_idx++) { > + > + cv_size = sizeof(gcov_type) * sci_ptr->num; > + > + dci_ptr->values = malloc(cv_size, M_GCOV, M_NOWAIT); > + > + if (!dci_ptr->values) > + goto err_free; > + > + dci_ptr->num = sci_ptr->num; > + memcpy(dci_ptr->values, sci_ptr->values, cv_size); > + > + sci_ptr++; > + dci_ptr++; > + } > + } > + > + return (dup); > +err_free: > + gcov_info_free(dup); > + return (NULL); > +} > + > +/** > + * gcov_info_free - release memory for profiling data set duplicate > + * @info: profiling data set duplicate to free > + */ > +void > +gcov_info_free(struct gcov_info *info) > +{ > + unsigned int active; > + unsigned int fi_idx; > + unsigned int ct_idx; > + struct gcov_ctr_info *ci_ptr; > + > + if (!info->functions) > + goto free_info; > + > + active = num_counter_active(info); > + > + for (fi_idx = 0; fi_idx < info->n_functions; fi_idx++) { > + if (!info->functions[fi_idx]) > + continue; > + > + ci_ptr = info->functions[fi_idx]->ctrs; > + > + for (ct_idx = 0; ct_idx < active; ct_idx++, ci_ptr++) > + free(ci_ptr->values, M_GCOV); > + > + free(info->functions[fi_idx], M_GCOV); > + } > + > +free_info: > + free(info->functions, M_GCOV); > + free(__DECONST(char *, info->filename), M_GCOV); > + free(info, M_GCOV); > + } > + > +#define ITER_STRIDE PAGE_SIZE > + > +/** > + * struct gcov_iterator - specifies current file position in logical records > + * @info: associated profiling data > + * @buffer: buffer containing file data > + * @size: size of buffer > + * @pos: current position in file > + */ > +struct gcov_iterator { > + struct gcov_info *info; > + caddr_t buffer; > + size_t size; > + off_t pos; > +}; > + > +/** > + * store_gcov_uint32 - store 32 bit number in gcov format to buffer > + * @buffer: target buffer or NULL > + * @off: offset into the buffer > + * @v: value to be stored > + * > + * Number format defined by gcc: numbers are recorded in the 32 bit > + * unsigned binary form of the endianness of the machine generating the > + * file. Returns the number of bytes stored. If @buffer is %NULL, doesn't > + * store anything. > + */ > +static size_t > +store_gcov_uint32(void *buffer, size_t off, uint32_t v) > +{ > + uint32_t *data; > + > + if (buffer) { > + data = (void*)((caddr_t)buffer + off); > + *data = v; > + } > + > + return sizeof(*data); > +} > + > +/** > + * store_gcov_uint64 - store 64 bit number in gcov format to buffer > + * @buffer: target buffer or NULL > + * @off: offset into the buffer > + * @v: value to be stored > + * > + * Number format defined by gcc: numbers are recorded in the 32 bit > + * unsigned binary form of the endianness of the machine generating the > + * file. 64 bit numbers are stored as two 32 bit numbers, the low part > + * first. Returns the number of bytes stored. If @buffer is %NULL, doesn't store > + * anything. > + */ > + > +static size_t > +store_gcov_uint64(void *buffer, size_t off, uint64_t v) > +{ > + uint32_t *data; > + > + if (buffer) { > + data = (void*)((caddr_t)buffer + off); > + > + data[0] = (v & 0xffffffffUL); > + data[1] = (v >> 32); > + } > + > + return sizeof(*data) * 2; > +} > + > +/** > + * convert_to_gcda - convert profiling data set to gcda file format > + * @buffer: the buffer to store file data or %NULL if no data should be stored > + * @info: profiling data set to be converted > + * > + * Returns the number of bytes that were/would have been stored into the buffer. > + */ > +static size_t > +convert_to_gcda(char *buffer, struct gcov_info *info) > +{ > + struct gcov_fn_info *fi_ptr; > + struct gcov_ctr_info *ci_ptr; > + unsigned int fi_idx; > + unsigned int ct_idx; > + unsigned int cv_idx; > + size_t pos = 0; > + > + /* File header. */ > + pos += store_gcov_uint32(buffer, pos, GCOV_DATA_MAGIC); > + pos += store_gcov_uint32(buffer, pos, info->version); > + pos += store_gcov_uint32(buffer, pos, info->stamp); > + > + for (fi_idx = 0; fi_idx < info->n_functions; fi_idx++) { > + fi_ptr = info->functions[fi_idx]; > + > + /* Function record. */ > + pos += store_gcov_uint32(buffer, pos, GCOV_TAG_FUNCTION); > + pos += store_gcov_uint32(buffer, pos, GCOV_TAG_FUNCTION_LENGTH); > + pos += store_gcov_uint32(buffer, pos, fi_ptr->ident); > + pos += store_gcov_uint32(buffer, pos, fi_ptr->lineno_checksum); > + pos += store_gcov_uint32(buffer, pos, fi_ptr->cfg_checksum); > + > + ci_ptr = fi_ptr->ctrs; > + > + for (ct_idx = 0; ct_idx < GCOV_COUNTERS; ct_idx++) { > + if (!counter_active(info, ct_idx)) > + continue; > + > + /* Counter record. */ > + pos += store_gcov_uint32(buffer, pos, > + GCOV_TAG_FOR_COUNTER(ct_idx)); > + pos += store_gcov_uint32(buffer, pos, ci_ptr->num * 2); > + > + for (cv_idx = 0; cv_idx < ci_ptr->num; cv_idx++) { > + pos += store_gcov_uint64(buffer, pos, > + ci_ptr->values[cv_idx]); > + } > + > + ci_ptr++; > + } > + } > + > + return (pos); > +} > + > +/** > + * gcov_iter_new - allocate and initialize profiling data iterator > + * @info: profiling data set to be iterated > + * > + * Return file iterator on success, %NULL otherwise. > + */ > +struct gcov_iterator * > +gcov_iter_new(struct gcov_info *info) > +{ > + struct gcov_iterator *iter; > + > + iter = malloc(sizeof(struct gcov_iterator), M_GCOV, M_NOWAIT|M_ZERO); > + if (iter == NULL) > + goto err_free; > + > + iter->info = info; > + /* Dry-run to get the actual buffer size. */ > + iter->size = convert_to_gcda(NULL, info); > + iter->buffer = malloc(iter->size, M_GCOV, M_NOWAIT); > + if (!iter->buffer) > + goto err_free; > + > + convert_to_gcda(iter->buffer, info); > + > + return iter; > + > +err_free: > + free(iter, M_GCOV); > + return (NULL); > +} > + > + > +/** > + * gcov_iter_get_info - return profiling data set for given file iterator > + * @iter: file iterator > + */ > +void > +gcov_iter_free(struct gcov_iterator *iter) > +{ > + free(iter->buffer, M_GCOV); > + free(iter, M_GCOV); > +} > + > +/** > + * gcov_iter_get_info - return profiling data set for given file iterator > + * @iter: file iterator > + */ > +struct gcov_info * > +gcov_iter_get_info(struct gcov_iterator *iter) > +{ > + return (iter->info); > +} > + > +/** > + * gcov_iter_start - reset file iterator to starting position > + * @iter: file iterator > + */ > +void > +gcov_iter_start(struct gcov_iterator *iter) > +{ > + iter->pos = 0; > +} > + > +/** > + * gcov_iter_next - advance file iterator to next logical record > + * @iter: file iterator > + * > + * Return zero if new position is valid, non-zero if iterator has reached end. > + */ > +int > +gcov_iter_next(struct gcov_iterator *iter) > +{ > + if (iter->pos < iter->size) > + iter->pos += ITER_STRIDE; > + > + if (iter->pos >= iter->size) > + return (EINVAL); > + > + return 0; > +} > + > +/** > + * gcov_iter_write - write data for current pos to seq_file > + * @iter: file iterator > + * @seq: seq_file handle > + * > + * Return zero on success, non-zero otherwise. > + */ > +int > +gcov_iter_write(struct gcov_iterator *iter, struct sbuf *sbuf) > +{ > + size_t len; > + > + if (iter->pos >= iter->size) > + return (EINVAL); > + > + len = ITER_STRIDE; > + if (iter->pos + len > iter->size) > + len = iter->size - iter->pos; > + > + sbuf_bcat(sbuf, iter->buffer + iter->pos, len); > + > + return (0); > +} > > Added: head/sys/gnu/gcov/gcov.h > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/sys/gnu/gcov/gcov.h Sat Feb 23 21:14:00 2019 (r344487) > @@ -0,0 +1,99 @@ > +/*- > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > + * > + * Copyright (c) 2019, Matthew Macy <mmacy@freebsd.org> > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + * SUCH DAMAGE. > + * > + * $FreeBSD$ > + * > + */ > + > +#ifndef _SYS_GCOV_H_ > +#define _SYS_GCOV_H_ > + > +MALLOC_DECLARE(M_GCOV); > + > +/* > + * Profiling data types used for gcc 3.4 and above - these are defined by > + * gcc and need to be kept as close to the original definition as possible to > + * remain compatible. > + */ > +#define GCOV_DATA_MAGIC ((unsigned int) 0x67636461) > +#define GCOV_TAG_FUNCTION ((unsigned int) 0x01000000) > +#define GCOV_TAG_COUNTER_BASE ((unsigned int) 0x01a10000) > +#define GCOV_TAG_FOR_COUNTER(count) \ > + (GCOV_TAG_COUNTER_BASE + ((unsigned int) (count) << 17)) > + > +typedef uint64_t gcov_type; > + > +/* Opaque gcov_info. The gcov structures can change as for example in gcc 4.7 so > + * we cannot use full definition here and they need to be placed in gcc specific > + * implementation of gcov. This also means no direct access to the members in > + * generic code and usage of the interface below.*/ > +struct gcov_info; > + > +/* Interface to access gcov_info data */ > +const char *gcov_info_filename(struct gcov_info *info); > +unsigned int gcov_info_version(struct gcov_info *info); > +struct gcov_info *gcov_info_next(struct gcov_info *info); > +void gcov_info_link(struct gcov_info *info); > +void gcov_info_unlink(struct gcov_info *prev, struct gcov_info *info); > + > +/* Base interface. */ > +enum gcov_action { > + GCOV_ADD, > + GCOV_REMOVE, > +}; > + > +/* Iterator control. */ > +struct gcov_iterator; > + > +struct gcov_iterator *gcov_iter_new(struct gcov_info *info); > +void gcov_iter_free(struct gcov_iterator *iter); > +void gcov_iter_start(struct gcov_iterator *iter); > +int gcov_iter_next(struct gcov_iterator *iter); > +int gcov_iter_write(struct gcov_iterator *iter, struct sbuf *sbuf); > +struct gcov_info *gcov_iter_get_info(struct gcov_iterator *iter); > + > +/* gcov_info control. */ > +void gcov_info_reset(struct gcov_info *info); > +int gcov_info_is_compatible(struct gcov_info *info1, struct gcov_info *info2); > +void gcov_info_add(struct gcov_info *dest, struct gcov_info *source); > +struct gcov_info *gcov_info_dup(struct gcov_info *info); > +void gcov_info_free(struct gcov_info *info); > +void gcov_stats_reset(void); > +void gcov_enable_events(void); > +void gcov_module_unload(void *, module_t); > +void gcov_fs_init(void); > + > +int within_module(vm_offset_t addr, module_t mod); > + > +struct gcov_link { > + enum { > + OBJ_TREE, > + SRC_TREE, > + } dir; > + const char *ext; > +}; > +extern const struct gcov_link gcov_link[]; > +#endif > > Added: head/sys/gnu/gcov/gcov_fs.c > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/sys/gnu/gcov/gcov_fs.c Sat Feb 23 21:14:00 2019 (r344487) > @@ -0,0 +1,945 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * This code exports profiling data as debugfs files to userspace. > + * > + * Copyright IBM Corp. 2009 > + * Author(s): Peter Oberparleiter <oberpar@linux.vnet.ibm.com> > + * > + * Uses gcc-internal data definitions. > + * Based on the gcov-kernel patch by: > + * Hubertus Franke <frankeh@us.ibm.com> > + * Nigel Hinds <nhinds@us.ibm.com> > + * Rajan Ravindran <rajancr@us.ibm.com> > + * Peter Oberparleiter <oberpar@linux.vnet.ibm.com> > + * Paul Larson > + * Yi CDL Yang > + */ > + > + > +#include <sys/cdefs.h> > +__FBSDID("$FreeBSD$"); > + > +#include <sys/types.h> > +#include <sys/systm.h> > +#include <sys/param.h> > +#include <sys/sbuf.h> > + > +#include <sys/queue.h> > +#include <sys/linker.h> > +#include <sys/module.h> > +#include <sys/eventhandler.h> > +#include <sys/kernel.h> > +#include <sys/malloc.h> > +#include <sys/syslog.h> > +#include <sys/proc.h> > +#include <sys/sched.h> > +#include <sys/syslog.h> > +#include <sys/sysctl.h> > +#include <linux/debugfs.h> > + > +#include <gnu/gcov/gcov.h> > +#include <sys/queue.h> > + > +extern int gcov_events_enabled; > +static int gcov_persist; > +static struct mtx gcov_mtx; > +MTX_SYSINIT(gcov_init, &gcov_mtx, "gcov_mtx", MTX_DEF); > +MALLOC_DEFINE(M_GCOV, "gcov", "gcov"); > + > +void __gcov_init(struct gcov_info *info); > +void __gcov_flush(void); > +void __gcov_merge_add(gcov_type *counters, unsigned int n_counters); > +void __gcov_merge_single(gcov_type *counters, unsigned int n_counters); > +void __gcov_merge_delta(gcov_type *counters, unsigned int n_counters); > +void __gcov_merge_ior(gcov_type *counters, unsigned int n_counters); > +void __gcov_merge_time_profile(gcov_type *counters, unsigned int n_counters); > +void __gcov_merge_icall_topn(gcov_type *counters, unsigned int n_counters); > +void __gcov_exit(void); > + > +static void gcov_event(enum gcov_action action, struct gcov_info *info); > + > + > +/* > + * Private copy taken from libc > + */ > +static char * > +(basename)(char *path) > +{ > + char *ptr; > + > + /* > + * If path is a null pointer or points to an empty string, > + * basename() shall return a pointer to the string ".". > + */ > + if (path == NULL || *path == '\0') > + return (__DECONST(char *, ".")); > + > + /* Find end of last pathname component and null terminate it. */ > + ptr = path + strlen(path); > + while (ptr > path + 1 && *(ptr - 1) == '/') > + --ptr; > + *ptr-- = '\0'; > + > + /* Find beginning of last pathname component. */ > + while (ptr > path && *(ptr - 1) != '/') > + --ptr; > + return (ptr); > +} > + > +/* > + * __gcov_init is called by gcc-generated constructor code for each object > + * file compiled with -fprofile-arcs. > + */ > +void > +__gcov_init(struct gcov_info *info) > +{ > + static unsigned int gcov_version; > + > + mtx_lock(&gcov_mtx); > + if (gcov_version == 0) { > + gcov_version = gcov_info_version(info); > + /* > + * Printing gcc's version magic may prove useful for debugging > + * incompatibility reports. > + */ > + log(LOG_INFO, "version magic: 0x%x\n", gcov_version); > + } > + /* > + * Add new profiling data structure to list and inform event > + * listener. > + */ > + gcov_info_link(info); > + if (gcov_events_enabled) > + gcov_event(GCOV_ADD, info); > + mtx_unlock(&gcov_mtx); > +} > + > +/* > + * These functions may be referenced by gcc-generated profiling code but serve > + * no function for kernel profiling. > + */ > +void > +__gcov_flush(void) > +{ > + /* Unused. */ > +} > + > +void > +__gcov_merge_add(gcov_type *counters, unsigned int n_counters) > +{ > + /* Unused. */ > +} > + > +void > +__gcov_merge_single(gcov_type *counters, unsigned int n_counters) > +{ > + /* Unused. */ > +} > + > +void > +__gcov_merge_delta(gcov_type *counters, unsigned int n_counters) > +{ > + /* Unused. */ > +} > + > +void > +__gcov_merge_ior(gcov_type *counters, unsigned int n_counters) > +{ > + /* Unused. */ > +} > + > +void > +__gcov_merge_time_profile(gcov_type *counters, unsigned int n_counters) > +{ > + /* Unused. */ > +} > + > +void > +__gcov_merge_icall_topn(gcov_type *counters, unsigned int n_counters) > +{ > + /* Unused. */ > +} > + > +void > +__gcov_exit(void) > +{ > + /* Unused. */ > +} > + > + > +/** > + * struct gcov_node - represents a debugfs entry > + * @entry: list entry for parent's child node list > + * @children: child nodes > + * @all_entry: list entry for list of all nodes > + * @parent: parent node > + * @loaded_info: array of pointers to profiling data sets for loaded object > + * files. > + * @num_loaded: number of profiling data sets for loaded object files. > + * @unloaded_info: accumulated copy of profiling data sets for unloaded > + * object files. Used only when gcov_persist=1. > + * @dentry: main debugfs entry, either a directory or data file > + * @links: associated symbolic links > + * @name: data file basename > + * > + * struct gcov_node represents an entity within the gcov/ subdirectory > + * of debugfs. There are directory and data file nodes. The latter represent > + * the actual synthesized data file plus any associated symbolic links which > + * are needed by the gcov tool to work correctly. > + */ > +struct gcov_node { > + LIST_ENTRY(gcov_node) children_entry; > + LIST_ENTRY(gcov_node) all_entry; > + struct { > + struct gcov_node *lh_first; > + } children; > + struct gcov_node *parent; > + struct gcov_info **loaded_info; > + struct gcov_info *unloaded_info; > + struct dentry *dentry; > + struct dentry **links; > + int num_loaded; > + char name[0]; > +}; > + > > *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** > > -- Rod Grimes rgrimes@freebsd.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902232149.x1NLnute032111>