From nobody@FreeBSD.org  Sat Dec  5 17:45:45 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 431E81065670
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  5 Dec 2009 17:45:44 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 189298FC17
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  5 Dec 2009 17:45:44 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id nB5Hjhs6077612
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 5 Dec 2009 17:45:43 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id nB5Hjhuj077611;
	Sat, 5 Dec 2009 17:45:43 GMT
	(envelope-from nobody)
Message-Id: <200912051745.nB5Hjhuj077611@www.freebsd.org>
Date: Sat, 5 Dec 2009 17:45:43 GMT
From: Robert Woolley <freebsd2009@morbius.sent.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: tmpfs treats the size option as mod 2^32
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         141194
>Category:       kern
>Synopsis:       [tmpfs] tmpfs treats the size option as mod 2^32
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 05 17:50:00 UTC 2009
>Closed-Date:    Tue Feb 07 18:08:09 UTC 2012
>Last-Modified:  Tue Feb 07 18:08:09 UTC 2012
>Originator:     Robert Woolley
>Release:        RELENG_8_0
>Organization:
>Environment:
FreeBSD gumby.homeunix.com 8.0-RELEASE-p1 FreeBSD 8.0-RELEASE-p1 #1: Sat Dec  5 01:37:17 UTC 2009     root@gumby.homeunix.com:/usr/obj/usr/src/sys/MUSTARD  i386

>Description:
If you specify a size > 4GB to tmpfs you get a size limit of "size mod 2^32" instead. 
>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-i386->freebsd-fs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Dec 7 07:35:10 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer(s). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=141194 
Responsible-Changed-From-To: freebsd-fs->jh 
Responsible-Changed-By: jh 
Responsible-Changed-When: Thu Jan 7 16:52:37 UTC 2010 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=141194 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/141194: commit references a PR
Date: Fri,  8 Jan 2010 07:57:57 +0000 (UTC)

 Author: jh
 Date: Fri Jan  8 07:57:43 2010
 New Revision: 201773
 URL: http://svn.freebsd.org/changeset/base/201773
 
 Log:
   - Change the type of size_max to u_quad_t because its value is converted
     with vfs_scanopt(9) using the "%qu" format string.
   - Limit the maximum value of size_max to (SIZE_MAX - PAGE_SIZE) to
     prevent overflow in howmany() macro.
   
   PR:		kern/141194
   Approved by:	trasz (mentor)
   MFC after:	2 weeks
 
 Modified:
   head/sys/fs/tmpfs/tmpfs_vfsops.c
 
 Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c
 ==============================================================================
 --- head/sys/fs/tmpfs/tmpfs_vfsops.c	Fri Jan  8 07:42:01 2010	(r201772)
 +++ head/sys/fs/tmpfs/tmpfs_vfsops.c	Fri Jan  8 07:57:43 2010	(r201773)
 @@ -185,8 +185,8 @@ tmpfs_mount(struct mount *mp)
  	ino_t nodes;
  	int error;
  	/* Size counters. */
 -	ino_t	nodes_max;
 -	size_t	size_max;
 +	ino_t		nodes_max;
 +	u_quad_t	size_max;
  
  	/* Root node attributes. */
  	uid_t	root_uid;
 @@ -239,7 +239,7 @@ tmpfs_mount(struct mount *mp)
  	 * allowed to use, based on the maximum size the user passed in
  	 * the mount structure.  A value of zero is treated as if the
  	 * maximum available space was requested. */
 -	if (size_max < PAGE_SIZE || size_max >= SIZE_MAX)
 +	if (size_max < PAGE_SIZE || size_max > (SIZE_MAX - PAGE_SIZE))
  		pages = SIZE_MAX;
  	else
  		pages = howmany(size_max, PAGE_SIZE);
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->patched 
State-Changed-By: jh 
State-Changed-When: Fri Jan 8 08:09:16 UTC 2010 
State-Changed-Why:  
Patched in head (r201773). However please note that on i386 the maximum 
fixed file system size you can specify is 4294963199. If you specify a 
larger value dynamic file system size is used. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=141194 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/141194: commit references a PR
Date: Tue,  8 Mar 2011 17:27:46 +0000 (UTC)

 Author: jh
 Date: Tue Mar  8 17:27:36 2011
 New Revision: 219401
 URL: http://svn.freebsd.org/changeset/base/219401
 
 Log:
   MFC r201773:
   
   - Change the type of size_max to u_quad_t because its value is converted
     with vfs_scanopt(9) using the "%qu" format string.
   - Limit the maximum value of size_max to (SIZE_MAX - PAGE_SIZE) to
     prevent overflow in howmany() macro.
   
   PR:		kern/141194
   
   MFC r202187:
   
   - Fix some style bugs in tmpfs_mount().
   - Remove a stale comment about tmpfs_mem_info() 'total' argument.
   
   MFC r202708:
   
   - Change the type of nodes_max to u_int and use "%u" format string to
     convert its value.
   - Set default tm_nodes_max to min(pages + 3, UINT32_MAX). It's more
     reasonable than the old four nodes per page (with page size 4096) because
     non-empty regular files always use at least one page. This fixes possible
     overflow in the calculation.
   - Don't allow more than tm_nodes_max nodes allocated in tmpfs_alloc_node().
   
   PR:		kern/138367
 
 Modified:
   stable/8/sys/fs/tmpfs/tmpfs.h
   stable/8/sys/fs/tmpfs/tmpfs_subr.c
   stable/8/sys/fs/tmpfs/tmpfs_vfsops.c
 Directory Properties:
   stable/8/sys/   (props changed)
   stable/8/sys/amd64/include/xen/   (props changed)
   stable/8/sys/cddl/contrib/opensolaris/   (props changed)
   stable/8/sys/contrib/dev/acpica/   (props changed)
   stable/8/sys/contrib/pf/   (props changed)
 
 Modified: stable/8/sys/fs/tmpfs/tmpfs.h
 ==============================================================================
 --- stable/8/sys/fs/tmpfs/tmpfs.h	Tue Mar  8 17:00:31 2011	(r219400)
 +++ stable/8/sys/fs/tmpfs/tmpfs.h	Tue Mar  8 17:27:36 2011	(r219401)
 @@ -476,10 +476,6 @@ int	tmpfs_truncate(struct vnode *, off_t
   * Returns information about the number of available memory pages,
   * including physical and virtual ones.
   *
 - * If 'total' is TRUE, the value returned is the total amount of memory
 - * pages configured for the system (either in use or free).
 - * If it is FALSE, the value returned is the amount of free memory pages.
 - *
   * Remember to remove TMPFS_PAGES_RESERVED from the returned value to avoid
   * excessive memory usage.
   *
 
 Modified: stable/8/sys/fs/tmpfs/tmpfs_subr.c
 ==============================================================================
 --- stable/8/sys/fs/tmpfs/tmpfs_subr.c	Tue Mar  8 17:00:31 2011	(r219400)
 +++ stable/8/sys/fs/tmpfs/tmpfs_subr.c	Tue Mar  8 17:27:36 2011	(r219401)
 @@ -93,7 +93,7 @@ tmpfs_alloc_node(struct tmpfs_mount *tmp
  	MPASS(IFF(type == VLNK, target != NULL));
  	MPASS(IFF(type == VBLK || type == VCHR, rdev != VNOVAL));
  
 -	if (tmp->tm_nodes_inuse > tmp->tm_nodes_max)
 +	if (tmp->tm_nodes_inuse >= tmp->tm_nodes_max)
  		return (ENOSPC);
  
  	nnode = (struct tmpfs_node *)uma_zalloc_arg(
 
 Modified: stable/8/sys/fs/tmpfs/tmpfs_vfsops.c
 ==============================================================================
 --- stable/8/sys/fs/tmpfs/tmpfs_vfsops.c	Tue Mar  8 17:00:31 2011	(r219400)
 +++ stable/8/sys/fs/tmpfs/tmpfs_vfsops.c	Tue Mar  8 17:27:36 2011	(r219401)
 @@ -182,18 +182,18 @@ tmpfs_mount(struct mount *mp)
  	struct tmpfs_mount *tmp;
  	struct tmpfs_node *root;
  	size_t pages, mem_size;
 -	ino_t nodes;
 +	uint32_t nodes;
  	int error;
  	/* Size counters. */
 -	ino_t	nodes_max;
 -	size_t	size_max;
 +	u_int nodes_max;
 +	u_quad_t size_max;
  
  	/* Root node attributes. */
 -	uid_t	root_uid;
 -	gid_t	root_gid;
 -	mode_t	root_mode;
 +	uid_t root_uid;
 +	gid_t root_gid;
 +	mode_t root_mode;
  
 -	struct vattr	va;
 +	struct vattr va;
  
  	if (vfs_filteropt(mp->mnt_optnew, tmpfs_opts))
  		return (EINVAL);
 @@ -223,7 +223,7 @@ tmpfs_mount(struct mount *mp)
  	if (mp->mnt_cred->cr_ruid != 0 ||
  	    vfs_scanopt(mp->mnt_optnew, "mode", "%ho", &root_mode) != 1)
  		root_mode = va.va_mode;
 -	if (vfs_scanopt(mp->mnt_optnew, "inodes", "%d", &nodes_max) != 1)
 +	if (vfs_scanopt(mp->mnt_optnew, "inodes", "%u", &nodes_max) != 1)
  		nodes_max = 0;
  	if (vfs_scanopt(mp->mnt_optnew, "size", "%qu", &size_max) != 1)
  		size_max = 0;
 @@ -239,15 +239,18 @@ tmpfs_mount(struct mount *mp)
  	 * allowed to use, based on the maximum size the user passed in
  	 * the mount structure.  A value of zero is treated as if the
  	 * maximum available space was requested. */
 -	if (size_max < PAGE_SIZE || size_max >= SIZE_MAX)
 +	if (size_max < PAGE_SIZE || size_max > SIZE_MAX - PAGE_SIZE)
  		pages = SIZE_MAX;
  	else
  		pages = howmany(size_max, PAGE_SIZE);
  	MPASS(pages > 0);
  
 -	if (nodes_max <= 3)
 -		nodes = 3 + pages * PAGE_SIZE / 1024;
 -	else
 +	if (nodes_max <= 3) {
 +		if (pages > UINT32_MAX - 3)
 +			nodes = UINT32_MAX;
 +		else
 +			nodes = pages + 3;
 +	} else
  		nodes = nodes_max;
  	MPASS(nodes >= 3);
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: jh 
State-Changed-When: Tue Feb 7 18:08:08 UTC 2012 
State-Changed-Why:  
Fixed in head, stable/9 and stable/8. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=141194 
>Unformatted:
