From owner-svn-src-head@FreeBSD.ORG  Fri Feb 14 07:28:29 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C3BB3F92;
 Fri, 14 Feb 2014 07:28:29 +0000 (UTC)
Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140])
 by mx1.freebsd.org (Postfix) with ESMTP id 8572B17E0;
 Fri, 14 Feb 2014 07:28:28 +0000 (UTC)
Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua
 [212.40.38.100])
 by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id JAA08960;
 Fri, 14 Feb 2014 09:28:20 +0200 (EET) (envelope-from avg@FreeBSD.org)
Received: from localhost ([127.0.0.1])
 by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD))
 id 1WEDC7-000NM8-SB; Fri, 14 Feb 2014 09:28:19 +0200
Message-ID: <52FDC542.1080703@FreeBSD.org>
Date: Fri, 14 Feb 2014 09:26:58 +0200
From: Andriy Gapon <avg@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:24.0) Gecko/20100101 Thunderbird/24.2.0
MIME-Version: 1.0
To: Attilio Rao <attilio@FreeBSD.org>, src-committers@FreeBSD.org,
 svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org
Subject: Re: svn commit: r261867 - head/sys/vm
References: <201402140334.s1E3YDsp013604@svn.freebsd.org>
In-Reply-To: <201402140334.s1E3YDsp013604@svn.freebsd.org>
X-Enigmail-Version: 1.6
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Feb 2014 07:28:29 -0000

on 14/02/2014 05:34 Attilio Rao said the following:
> Author: attilio
> Date: Fri Feb 14 03:34:12 2014
> New Revision: 261867
> URL: http://svnweb.freebsd.org/changeset/base/261867
> 
> Log:
>   Fix-up r254141: in the process of making a failing vm_page_rename()
>   a call of pager_swap_freespace() was moved around, now leading to freeing
>   the incorrect page because of the pindex changes after vm_page_rename().
>   
>   Get back to use the correct pindex when destroying the swap space.
>   
>   Sponsored by:	EMC / Isilon storage division
>   Reported by:	avg
>   Tested by:	pho
>   MFC after:	7 days

Thank you!
I also have not seen any of my previous problems since I started using the patch.

> Modified:
>   head/sys/vm/vm_object.c
> 
> Modified: head/sys/vm/vm_object.c
> ==============================================================================
> --- head/sys/vm/vm_object.c	Fri Feb 14 03:30:55 2014	(r261866)
> +++ head/sys/vm/vm_object.c	Fri Feb 14 03:34:12 2014	(r261867)
> @@ -1627,9 +1627,11 @@ vm_object_backing_scan(vm_object_t objec
>  				p = TAILQ_FIRST(&backing_object->memq);
>  				continue;
>  			}
> +
> +			/* Use the old pindex to free the right page. */
>  			if (backing_object->type == OBJT_SWAP)
> -				swap_pager_freespace(backing_object, p->pindex,
> -				    1);
> +				swap_pager_freespace(backing_object,
> +				    new_pindex + backing_offset_index, 1);
>  
>  #if VM_NRESERVLEVEL > 0
>  			/*
> 


-- 
Andriy Gapon