From owner-svn-src-stable@FreeBSD.ORG Fri Aug 27 18:50:33 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 219CA10656A8;
Fri, 27 Aug 2010 18:50:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 056128FC12;
Fri, 27 Aug 2010 18:50:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7RIoWi2003750;
Fri, 27 Aug 2010 18:50:32 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7RIoWov003745;
Fri, 27 Aug 2010 18:50:32 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201008271850.o7RIoWov003745@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 27 Aug 2010 18:50:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r211890 - stable/7/sys/netinet
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Aug 2010 18:50:33 -0000
Author: jhb
Date: Fri Aug 27 18:50:32 2010
New Revision: 211890
URL: http://svn.freebsd.org/changeset/base/211890
Log:
MFC 211433:
Ensure a minimum "slop" of 10 extra pcb structures when providing a
memory size estimate to userland for pcb list sysctls. The previous
behavior of a "slop" of n/8 does not work well for small values of n
(e.g. no slop at all if you have less than 8 open UDP connections).
Modified:
stable/7/sys/netinet/ip_divert.c
stable/7/sys/netinet/raw_ip.c
stable/7/sys/netinet/tcp_subr.c
stable/7/sys/netinet/udp_usrreq.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/netinet/ip_divert.c
==============================================================================
--- stable/7/sys/netinet/ip_divert.c Fri Aug 27 18:50:12 2010 (r211889)
+++ stable/7/sys/netinet/ip_divert.c Fri Aug 27 18:50:32 2010 (r211890)
@@ -579,8 +579,8 @@ div_pcblist(SYSCTL_HANDLER_ARGS)
*/
if (req->oldptr == 0) {
n = divcbinfo.ipi_count;
- req->oldidx = 2 * (sizeof xig)
- + (n + n/8) * sizeof(struct xinpcb);
+ n += imax(n / 8, 10);
+ req->oldidx = 2 * (sizeof xig) + n * sizeof(struct xinpcb);
return 0;
}
Modified: stable/7/sys/netinet/raw_ip.c
==============================================================================
--- stable/7/sys/netinet/raw_ip.c Fri Aug 27 18:50:12 2010 (r211889)
+++ stable/7/sys/netinet/raw_ip.c Fri Aug 27 18:50:32 2010 (r211890)
@@ -894,8 +894,8 @@ rip_pcblist(SYSCTL_HANDLER_ARGS)
*/
if (req->oldptr == 0) {
n = ripcbinfo.ipi_count;
- req->oldidx = 2 * (sizeof xig)
- + (n + n/8) * sizeof(struct xinpcb);
+ n += imax(n / 8, 10);
+ req->oldidx = 2 * (sizeof xig) + n * sizeof(struct xinpcb);
return (0);
}
Modified: stable/7/sys/netinet/tcp_subr.c
==============================================================================
--- stable/7/sys/netinet/tcp_subr.c Fri Aug 27 18:50:12 2010 (r211889)
+++ stable/7/sys/netinet/tcp_subr.c Fri Aug 27 18:50:32 2010 (r211890)
@@ -939,8 +939,9 @@ tcp_pcblist(SYSCTL_HANDLER_ARGS)
if (req->oldptr == NULL) {
m = syncache_pcbcount();
n = tcbinfo.ipi_count;
- req->oldidx = 2 * (sizeof xig)
- + ((m + n) + n/8) * sizeof(struct xtcpcb);
+ n += imax(n / 8, 10);
+ req->oldidx = 2 * (sizeof xig) +
+ (m + n) * sizeof(struct xtcpcb);
return (0);
}
Modified: stable/7/sys/netinet/udp_usrreq.c
==============================================================================
--- stable/7/sys/netinet/udp_usrreq.c Fri Aug 27 18:50:12 2010 (r211889)
+++ stable/7/sys/netinet/udp_usrreq.c Fri Aug 27 18:50:32 2010 (r211890)
@@ -684,8 +684,8 @@ udp_pcblist(SYSCTL_HANDLER_ARGS)
*/
if (req->oldptr == 0) {
n = udbinfo.ipi_count;
- req->oldidx = 2 * (sizeof xig)
- + (n + n/8) * sizeof(struct xinpcb);
+ n += imax(n / 8, 10);
+ req->oldidx = 2 * (sizeof xig) + n * sizeof(struct xinpcb);
return (0);
}