From owner-freebsd-current@FreeBSD.ORG  Wed Nov 12 14:25:25 2003
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0B40E16A4CF
	for <current@freebsd.org>; Wed, 12 Nov 2003 14:25:25 -0800 (PST)
Received: from mail.evip.pl (mail.evip.com.pl [212.244.157.179])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A6D6F43FAF
	for <current@freebsd.org>; Wed, 12 Nov 2003 14:25:23 -0800 (PST)
	(envelope-from w@evip.pl)
Received: from drwebc by mail.evip.pl with drweb-scanned (Exim 4.22)
	id 1AK3QL-000GvB-Cj; Wed, 12 Nov 2003 23:25:17 +0100
Received: from w by mail.evip.pl with local (Exim 4.22)
	id 1AK3QL-000Gv2-9l; Wed, 12 Nov 2003 23:25:17 +0100
Date: Wed, 12 Nov 2003 23:25:17 +0100
From: Wiktor Niesiobedzki <bsd@w.evip.pl>
To: Dimitry Andric <dimitry@andric.com>
Message-ID: <20031112222517.GJ231@mail.evip.pl>
References: <20031111143115.GB231@mail.evip.pl>
	<5342692438.20031112201805@andric.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="ylS2wUBXLOxYXZFQ"
Content-Disposition: inline
In-Reply-To: <5342692438.20031112201805@andric.com>
User-Agent: Mutt/1.4i
Sender: Wiktor Niesiobedzki <w@evip.pl>
cc: current@freebsd.org
Subject: Re: munmap & cp [patch enclosed]
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Nov 2003 22:25:25 -0000


--ylS2wUBXLOxYXZFQ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Wed, Nov 12, 2003 at 08:18:05PM +0100, Dimitry Andric wrote:
> On 2003-11-11 at 15:31:15 Wiktor Niesiobedzki wrote:
> 
> > $ mkdir foo
> > $ cd foo
> > $ touch foo
> > $ cp foo foo2
> > cp: foo: Invalid argument
> Anyway, cp (and possibly other tools which use munmap) will need to be
> fixed. For now, I simply disabled the VM_AND_BUFFER_CACHE_SYNCHRONIZED
> flag in the Makefile for cp, which simply disables the whole mmap'ing
> stuff. I don't notice any difference without it...
I would still propose my one-line solution, to use mmap only when the file
size is greater than 0. As far as I looked into source tree, most usages of
munmap are in unsafe way - i.e. without checking the return value. 
 
Is there someone willing to commit this trival change? For now, some number of
ports will refuse tu build/install.

Cheers,

Wiktor Niesiobedzki

PS. The acctual patch attached.


--ylS2wUBXLOxYXZFQ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch

--- utils.c	2003/06/22 07:02:17	1.41
+++ utils.c	2003/11/11 14:32:17	
@@ -133,7 +133,7 @@
 	 * wins some CPU back.
 	 */
 #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
+	if (S_ISREG(fs->st_mode) && fs->st_size <= 8 * 1048576 && fs->st_size > 0) {
-	if (S_ISREG(fs->st_mode) && fs->st_size <= 8 * 1048576) {
 		if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
 		    MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) {
 			warn("%s", entp->fts_path);

--ylS2wUBXLOxYXZFQ--