From owner-svn-src-stable-10@freebsd.org Sun Feb 21 22:34:10 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C8465AAF933; Sun, 21 Feb 2016 22:34:10 +0000 (UTC) (envelope-from marius@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 mx1.freebsd.org (Postfix) with ESMTPS id A50FFCC7; Sun, 21 Feb 2016 22:34:10 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1LMY9T3005500; Sun, 21 Feb 2016 22:34:09 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1LMY9tn005499; Sun, 21 Feb 2016 22:34:09 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201602212234.u1LMY9tn005499@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Sun, 21 Feb 2016 22:34:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r295870 - stable/10/sys/kern X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Feb 2016 22:34:11 -0000 Author: marius Date: Sun Feb 21 22:34:09 2016 New Revision: 295870 URL: https://svnweb.freebsd.org/changeset/base/295870 Log: MFC: r264565 Do not set M_BESTFIT if a strategy has already been provided. This fixes problems when using M_FIRSTFIT. MFC: r280805 Add four new DDB commands to display vmem(9) statistics. In particular, such DDB commands were added: show vmem show all vmem show vmemdump show all vmemdump As possible usage, that allows to see KVA usage and fragmentation. Approved by: re (gjb) Modified: stable/10/sys/kern/subr_vmem.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/subr_vmem.c ============================================================================== --- stable/10/sys/kern/subr_vmem.c Sun Feb 21 21:20:23 2016 (r295869) +++ stable/10/sys/kern/subr_vmem.c Sun Feb 21 22:34:09 2016 (r295870) @@ -502,7 +502,8 @@ qc_import(void *arg, void **store, int c int i; qc = arg; - flags |= M_BESTFIT; + if ((flags & VMEM_FITMASK) == 0) + flags |= M_BESTFIT; for (i = 0; i < cnt; i++) { if (vmem_xalloc(qc->qc_vmem, qc->qc_size, 0, 0, 0, VMEM_ADDR_MIN, VMEM_ADDR_MAX, flags, &addr) != 0) @@ -1407,6 +1408,8 @@ vmem_dump(const vmem_t *vm , int (*pr)(c #endif /* defined(DDB) || defined(DIAGNOSTIC) */ #if defined(DDB) +#include + static bt_t * vmem_whatis_lookup(vmem_t *vm, vmem_addr_t addr) { @@ -1460,6 +1463,78 @@ vmem_print(vmem_addr_t addr, const char vmem_dump(vm, pr); } + +DB_SHOW_COMMAND(vmemdump, vmemdump) +{ + + if (!have_addr) { + db_printf("usage: show vmemdump \n"); + return; + } + + vmem_dump((const vmem_t *)addr, db_printf); +} + +DB_SHOW_ALL_COMMAND(vmemdump, vmemdumpall) +{ + const vmem_t *vm; + + LIST_FOREACH(vm, &vmem_list, vm_alllist) + vmem_dump(vm, db_printf); +} + +DB_SHOW_COMMAND(vmem, vmem_summ) +{ + const vmem_t *vm = (const void *)addr; + const bt_t *bt; + size_t ft[VMEM_MAXORDER], ut[VMEM_MAXORDER]; + size_t fs[VMEM_MAXORDER], us[VMEM_MAXORDER]; + int ord; + + if (!have_addr) { + db_printf("usage: show vmem \n"); + return; + } + + db_printf("vmem %p '%s'\n", vm, vm->vm_name); + db_printf("\tquantum:\t%zu\n", vm->vm_quantum_mask + 1); + db_printf("\tsize:\t%zu\n", vm->vm_size); + db_printf("\tinuse:\t%zu\n", vm->vm_inuse); + db_printf("\tfree:\t%zu\n", vm->vm_size - vm->vm_inuse); + db_printf("\tbusy tags:\t%d\n", vm->vm_nbusytag); + db_printf("\tfree tags:\t%d\n", vm->vm_nfreetags); + + memset(&ft, 0, sizeof(ft)); + memset(&ut, 0, sizeof(ut)); + memset(&fs, 0, sizeof(fs)); + memset(&us, 0, sizeof(us)); + TAILQ_FOREACH(bt, &vm->vm_seglist, bt_seglist) { + ord = SIZE2ORDER(bt->bt_size >> vm->vm_quantum_shift); + if (bt->bt_type == BT_TYPE_BUSY) { + ut[ord]++; + us[ord] += bt->bt_size; + } else if (bt->bt_type == BT_TYPE_FREE) { + ft[ord]++; + fs[ord] += bt->bt_size; + } + } + db_printf("\t\t\tinuse\tsize\t\tfree\tsize\n"); + for (ord = 0; ord < VMEM_MAXORDER; ord++) { + if (ut[ord] == 0 && ft[ord] == 0) + continue; + db_printf("\t%-15zu %zu\t%-15zu %zu\t%-16zu\n", + ORDER2SIZE(ord) << vm->vm_quantum_shift, + ut[ord], us[ord], ft[ord], fs[ord]); + } +} + +DB_SHOW_ALL_COMMAND(vmem, vmem_summall) +{ + const vmem_t *vm; + + LIST_FOREACH(vm, &vmem_list, vm_alllist) + vmem_summ((db_expr_t)vm, TRUE, count, modif); +} #endif /* defined(DDB) */ #define vmem_printf printf