From owner-svn-src-all@freebsd.org Thu Oct 11 23:25:15 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C04810CB581; Thu, 11 Oct 2018 23:25:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C8A8F86E67; Thu, 11 Oct 2018 23:25:14 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BDE41173DB; Thu, 11 Oct 2018 23:25:14 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9BNPETZ098857; Thu, 11 Oct 2018 23:25:14 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9BNPErQ098856; Thu, 11 Oct 2018 23:25:14 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201810112325.w9BNPErQ098856@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Thu, 11 Oct 2018 23:25:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339320 - head/lib/libmemstat X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/lib/libmemstat X-SVN-Commit-Revision: 339320 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Oct 2018 23:25:15 -0000 Author: mjg Date: Thu Oct 11 23:25:14 2018 New Revision: 339320 URL: https://svnweb.freebsd.org/changeset/base/339320 Log: libmemstat: adjust for per-cpu stats after r338899 Reported by: yuripv Reviewed by: kib, markj Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17490 Modified: head/lib/libmemstat/memstat_malloc.c Modified: head/lib/libmemstat/memstat_malloc.c ============================================================================== --- head/lib/libmemstat/memstat_malloc.c Thu Oct 11 22:27:12 2018 (r339319) +++ head/lib/libmemstat/memstat_malloc.c Thu Oct 11 23:25:14 2018 (r339320) @@ -279,15 +279,28 @@ kread_symbol(kvm_t *kvm, int index, void *address, siz return (0); } +static int +kread_zpcpu(kvm_t *kvm, u_long base, void *buf, size_t size, int cpu) +{ + ssize_t ret; + + ret = kvm_read_zpcpu(kvm, base, buf, size, cpu); + if (ret < 0) + return (MEMSTAT_ERROR_KVM); + if ((size_t)ret != size) + return (MEMSTAT_ERROR_KVM_SHORTREAD); + return (0); +} + int memstat_kvm_malloc(struct memory_type_list *list, void *kvm_handle) { struct memory_type *mtp; void *kmemstatistics; - int hint_dontsearch, j, mp_maxcpus, ret; + int hint_dontsearch, j, mp_maxcpus, mp_ncpus, ret; char name[MEMTYPE_MAXNAME]; - struct malloc_type_stats *mts, *mtsp; - struct malloc_type_internal *mtip; + struct malloc_type_stats mts; + struct malloc_type_internal mti, *mtip; struct malloc_type type, *typep; kvm_t *kvm; @@ -320,17 +333,12 @@ memstat_kvm_malloc(struct memory_type_list *list, void return (-1); } - mts = malloc(sizeof(struct malloc_type_stats) * mp_maxcpus); - if (mts == NULL) { - list->mtl_error = MEMSTAT_ERROR_NOMEMORY; - return (-1); - } + mp_ncpus = kvm_getncpus(kvm); for (typep = kmemstatistics; typep != NULL; typep = type.ks_next) { ret = kread(kvm, typep, &type, sizeof(type), 0); if (ret != 0) { _memstat_mtl_empty(list); - free(mts); list->mtl_error = ret; return (-1); } @@ -338,7 +346,6 @@ memstat_kvm_malloc(struct memory_type_list *list, void MEMTYPE_MAXNAME); if (ret != 0) { _memstat_mtl_empty(list); - free(mts); list->mtl_error = ret; return (-1); } @@ -348,11 +355,9 @@ memstat_kvm_malloc(struct memory_type_list *list, void * kernel's, we populate our own array. */ mtip = type.ks_handle; - ret = kread(kvm, mtip->mti_stats, mts, mp_maxcpus * - sizeof(struct malloc_type_stats), 0); + ret = kread(kvm, mtip, &mti, sizeof(mti), 0); if (ret != 0) { _memstat_mtl_empty(list); - free(mts); list->mtl_error = ret; return (-1); } @@ -366,7 +371,6 @@ memstat_kvm_malloc(struct memory_type_list *list, void name, mp_maxcpus); if (mtp == NULL) { _memstat_mtl_empty(list); - free(mts); list->mtl_error = MEMSTAT_ERROR_NOMEMORY; return (-1); } @@ -376,24 +380,34 @@ memstat_kvm_malloc(struct memory_type_list *list, void * be kept in sync. */ _memstat_mt_reset_stats(mtp, mp_maxcpus); - for (j = 0; j < mp_maxcpus; j++) { - mtsp = &mts[j]; - mtp->mt_memalloced += mtsp->mts_memalloced; - mtp->mt_memfreed += mtsp->mts_memfreed; - mtp->mt_numallocs += mtsp->mts_numallocs; - mtp->mt_numfrees += mtsp->mts_numfrees; - mtp->mt_sizemask |= mtsp->mts_size; + for (j = 0; j < mp_ncpus; j++) { + ret = kread_zpcpu(kvm, (u_long)mti.mti_stats, &mts, + sizeof(mts), j); + if (ret != 0) { + _memstat_mtl_empty(list); + list->mtl_error = ret; + return (-1); + } + mtp->mt_memalloced += mts.mts_memalloced; + mtp->mt_memfreed += mts.mts_memfreed; + mtp->mt_numallocs += mts.mts_numallocs; + mtp->mt_numfrees += mts.mts_numfrees; + mtp->mt_sizemask |= mts.mts_size; mtp->mt_percpu_alloc[j].mtp_memalloced = - mtsp->mts_memalloced; + mts.mts_memalloced; mtp->mt_percpu_alloc[j].mtp_memfreed = - mtsp->mts_memfreed; + mts.mts_memfreed; mtp->mt_percpu_alloc[j].mtp_numallocs = - mtsp->mts_numallocs; + mts.mts_numallocs; mtp->mt_percpu_alloc[j].mtp_numfrees = - mtsp->mts_numfrees; + mts.mts_numfrees; mtp->mt_percpu_alloc[j].mtp_sizemask = - mtsp->mts_size; + mts.mts_size; + } + for (; j < mp_maxcpus; j++) { + bzero(&mtp->mt_percpu_alloc[j], + sizeof(mtp->mt_percpu_alloc[0])); } mtp->mt_bytes = mtp->mt_memalloced - mtp->mt_memfreed;