svn commit: r269964 - head/sys/kern

[Adrian Chadd]

Hi guys,

Both r269963 and r269964 have broken the MIPS platforms with smaller
amounts of RAM (< 64MB.)

Sean noticed it and filed a bug:

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=193465

Can we please figure out what changed? Otherwise I'm going to revert
these two changes until we figure out what happened.

Thanks,


-a


On 13 August 2014 22:31, Xin LI <delphij at freebsd.org> wrote:
> Author: delphij
> Date: Thu Aug 14 05:31:39 2014
> New Revision: 269964
> URL: http://svnweb.freebsd.org/changeset/base/269964
>
> Log:
>   Add a new loader tunable, vm.kmem_zmax which allows a system administrator
>   to limit the maximum allocation size that malloc(9) would consider using
>   the UMA cache allocator as backend.
>
>   Suggested by: alfred
>   MFC after:    2 weeks
>
> Modified:
>   head/sys/kern/kern_malloc.c
>
> Modified: head/sys/kern/kern_malloc.c
> ==============================================================================
> --- head/sys/kern/kern_malloc.c Thu Aug 14 05:13:24 2014        (r269963)
> +++ head/sys/kern/kern_malloc.c Thu Aug 14 05:31:39 2014        (r269964)
> @@ -172,6 +172,10 @@ u_long vm_kmem_size;
>  SYSCTL_ULONG(_vm, OID_AUTO, kmem_size, CTLFLAG_RDTUN, &vm_kmem_size, 0,
>      "Size of kernel memory");
>
> +static u_long kmem_zmax = KMEM_ZMAX;
> +SYSCTL_ULONG(_vm, OID_AUTO, kmem_zmax, CTLFLAG_RDTUN, &kmem_zmax, 0,
> +    "Maximum allocation size that malloc(9) would use UMA as backend");
> +
>  static u_long vm_kmem_size_min;
>  SYSCTL_ULONG(_vm, OID_AUTO, kmem_size_min, CTLFLAG_RDTUN, &vm_kmem_size_min, 0,
>      "Minimum size of kernel memory");
> @@ -485,7 +489,7 @@ malloc(unsigned long size, struct malloc
>         size = redzone_size_ntor(size);
>  #endif
>
> -       if (size <= KMEM_ZMAX) {
> +       if (size <= kmem_zmax) {
>                 mtip = mtp->ks_handle;
>                 if (size & KMEM_ZMASK)
>                         size = (size & ~KMEM_ZMASK) + KMEM_ZBASE;
> @@ -776,6 +780,9 @@ mallocinit(void *dummy)
>
>         uma_startup2();
>
> +       if (kmem_zmax < PAGE_SIZE || kmem_zmax > KMEM_ZMAX)
> +               kmem_zmax = KMEM_ZMAX;
> +
>         mt_zone = uma_zcreate("mt_zone", sizeof(struct malloc_type_internal),
>  #ifdef INVARIANTS
>             mtrash_ctor, mtrash_dtor, mtrash_init, mtrash_fini,
> @@ -800,7 +807,7 @@ mallocinit(void *dummy)
>                 }
>                 for (;i <= size; i+= KMEM_ZBASE)
>                         kmemsize[i >> KMEM_ZSHIFT] = indx;
> -
> +
>         }
>  }
>  SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_SECOND, mallocinit, NULL);
>