Mon Feb 19 13:02:47 2018 UTC ()
Double size of MSGBUFSIZE as existing value is not big enough to hold boot dmesg
on modern server-class hardware with lots of CPUs, etc.


(sborrill)
diff -r1.23 -r1.24 src/sys/arch/amd64/include/param.h
diff -r1.82 -r1.83 src/sys/arch/i386/include/param.h
cvs diff -r1.23 -r1.24 src/sys/arch/amd64/include/param.h (expand / switch to unified diff)

--- src/sys/arch/amd64/include/param.h 2018/01/11 10:30:26 1.23
+++ src/sys/arch/amd64/include/param.h 2018/02/19 13:02:47 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.23 2018/01/11 10:30:26 maxv Exp $ */ 1/* $NetBSD: param.h,v 1.24 2018/02/19 13:02:47 sborrill Exp $ */
2 2
3#ifdef __x86_64__ 3#ifdef __x86_64__
4 4
5#ifndef XEN 5#ifndef XEN
6/* Must be defined before cpu.h */ 6/* Must be defined before cpu.h */
7#define MAXCPUS 256 7#define MAXCPUS 256
8#endif 8#endif
9 9
10#ifdef _KERNEL 10#ifdef _KERNEL
11#include <machine/cpu.h> 11#include <machine/cpu.h>
12#endif 12#endif
13 13
14#define _MACHINE amd64 14#define _MACHINE amd64
@@ -55,27 +55,27 @@ @@ -55,27 +55,27 @@
55#define MAXPHYS (64 * 1024) /* max raw I/O transfer size */ 55#define MAXPHYS (64 * 1024) /* max raw I/O transfer size */
56#endif 56#endif
57 57
58#define SSIZE 1 /* initial stack size/NBPG */ 58#define SSIZE 1 /* initial stack size/NBPG */
59#define SINCR 1 /* increment of stack/NBPG */ 59#define SINCR 1 /* increment of stack/NBPG */
60#ifdef DIAGNOSTIC 60#ifdef DIAGNOSTIC
61#define UPAGES 4 /* pages of u-area (1 for redzone) */ 61#define UPAGES 4 /* pages of u-area (1 for redzone) */
62#else 62#else
63#define UPAGES 3 /* pages of u-area */ 63#define UPAGES 3 /* pages of u-area */
64#endif 64#endif
65#define USPACE (UPAGES * NBPG) /* total size of u-area */ 65#define USPACE (UPAGES * NBPG) /* total size of u-area */
66 66
67#ifndef MSGBUFSIZE 67#ifndef MSGBUFSIZE
68#define MSGBUFSIZE (8*NBPG) /* default message buffer size */ 68#define MSGBUFSIZE (16*NBPG) /* default message buffer size */
69#endif 69#endif
70 70
71/* 71/*
72 * Constants related to network buffer management. 72 * Constants related to network buffer management.
73 * MCLBYTES must be no larger than NBPG (the software page size), and, 73 * MCLBYTES must be no larger than NBPG (the software page size), and,
74 * on machines that exchange pages of input or output buffers with mbuf 74 * on machines that exchange pages of input or output buffers with mbuf
75 * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple 75 * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple
76 * of the hardware page size. 76 * of the hardware page size.
77 */ 77 */
78#define MSIZE 512 /* size of an mbuf */ 78#define MSIZE 512 /* size of an mbuf */
79 79
80#ifndef MCLSHIFT 80#ifndef MCLSHIFT
81#define MCLSHIFT 11 /* convert bytes to m_buf clusters */ 81#define MCLSHIFT 11 /* convert bytes to m_buf clusters */
cvs diff -r1.82 -r1.83 src/sys/arch/i386/include/param.h (expand / switch to unified diff)

--- src/sys/arch/i386/include/param.h 2017/07/29 13:05:15 1.82
+++ src/sys/arch/i386/include/param.h 2018/02/19 13:02:47 1.83
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.82 2017/07/29 13:05:15 maxv Exp $ */ 1/* $NetBSD: param.h,v 1.83 2018/02/19 13:02:47 sborrill Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1990 The Regents of the University of California. 4 * Copyright (c) 1990 The Regents of the University of California.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to Berkeley by 7 * This code is derived from software contributed to Berkeley by
8 * William Jolitz. 8 * William Jolitz.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -98,27 +98,27 @@ @@ -98,27 +98,27 @@
98#define SINCR 1 /* increment of stack/NBPG */ 98#define SINCR 1 /* increment of stack/NBPG */
99 99
100#ifndef UPAGES 100#ifndef UPAGES
101# ifdef DIAGNOSTIC 101# ifdef DIAGNOSTIC
102# define UPAGES 3 /* 2 + 1 page for redzone */ 102# define UPAGES 3 /* 2 + 1 page for redzone */
103# else 103# else
104# define UPAGES 2 /* normal pages of u-area */ 104# define UPAGES 2 /* normal pages of u-area */
105# endif /* DIAGNOSTIC */ 105# endif /* DIAGNOSTIC */
106#endif /* !defined(UPAGES) */ 106#endif /* !defined(UPAGES) */
107#define USPACE (UPAGES * NBPG) /* total size of u-area */ 107#define USPACE (UPAGES * NBPG) /* total size of u-area */
108#define INTRSTACKSIZE 8192 108#define INTRSTACKSIZE 8192
109 109
110#ifndef MSGBUFSIZE 110#ifndef MSGBUFSIZE
111#define MSGBUFSIZE (8*NBPG) /* default message buffer size */ 111#define MSGBUFSIZE (16*NBPG) /* default message buffer size */
112#endif 112#endif
113 113
114/* 114/*
115 * Constants related to network buffer management. 115 * Constants related to network buffer management.
116 * MCLBYTES must be no larger than NBPG (the software page size), and, 116 * MCLBYTES must be no larger than NBPG (the software page size), and,
117 * on machines that exchange pages of input or output buffers with mbuf 117 * on machines that exchange pages of input or output buffers with mbuf
118 * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple 118 * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple
119 * of the hardware page size. 119 * of the hardware page size.
120 */ 120 */
121#define MSIZE 256 /* size of an mbuf */ 121#define MSIZE 256 /* size of an mbuf */
122 122
123#ifndef MCLSHIFT 123#ifndef MCLSHIFT
124#define MCLSHIFT 11 /* convert bytes to m_buf clusters */ 124#define MCLSHIFT 11 /* convert bytes to m_buf clusters */