From owner-svn-src-projects@FreeBSD.ORG Wed Sep 10 11:33:43 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7BC18F0B; Wed, 10 Sep 2014 11:33:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4EA742A9; Wed, 10 Sep 2014 11:33:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8ABXhwM000647; Wed, 10 Sep 2014 11:33:43 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8ABXgPI000645; Wed, 10 Sep 2014 11:33:42 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201409101133.s8ABXgPI000645@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 10 Sep 2014 11:33:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r271384 - in projects/sendfile/sys: kern ufs/ufs X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Sep 2014 11:33:43 -0000 Author: glebius Date: Wed Sep 10 11:33:42 2014 New Revision: 271384 URL: http://svnweb.freebsd.org/changeset/base/271384 Log: - Make default implementation of VOP_GETPAGES_ASYNC() a wrapper around VOP_GETPAGES(). This emulates asynchronous operation on all filesystems, that use their own vop_getpages(), namely: nfs, smbfs, fuse, zfs. - Opt-in UFS to use true asynchronous vop_stdgetpages_async(). Note: other filesystems, that use default pager, need also to opt-in after some testing. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/vfs_default.c projects/sendfile/sys/ufs/ufs/ufs_vnops.c Modified: projects/sendfile/sys/kern/vfs_default.c ============================================================================== --- projects/sendfile/sys/kern/vfs_default.c Wed Sep 10 11:27:52 2014 (r271383) +++ projects/sendfile/sys/kern/vfs_default.c Wed Sep 10 11:33:42 2014 (r271384) @@ -83,6 +83,7 @@ static int vop_stdset_text(struct vop_se static int vop_stdunset_text(struct vop_unset_text_args *ap); static int vop_stdget_writecount(struct vop_get_writecount_args *ap); static int vop_stdadd_writecount(struct vop_add_writecount_args *ap); +static int vop_stdgetpages_async_emulate(struct vop_getpages_async_args *ap); /* * This vnode table stores what we want to do if the filesystem doesn't @@ -111,7 +112,7 @@ struct vop_vector default_vnodeops = { .vop_close = VOP_NULL, .vop_fsync = VOP_NULL, .vop_getpages = vop_stdgetpages, - .vop_getpages_async = vop_stdgetpages_async, + .vop_getpages_async = vop_stdgetpages_async_emulate, .vop_getwritemount = vop_stdgetwritemount, .vop_inactive = VOP_NULL, .vop_ioctl = VOP_ENOTTY, @@ -739,6 +740,18 @@ vop_stdgetpages_async(struct vop_getpage ap->a_count, ap->a_reqpage, ap->a_vop_getpages_iodone, ap->a_arg); } +static int +vop_stdgetpages_async_emulate(struct vop_getpages_async_args *ap) +{ + int error; + + error = VOP_GETPAGES(ap->a_vp, ap->a_m, ap->a_count, ap->a_reqpage, + ap->a_offset); + vm_page_xunbusy(ap->a_m[ap->a_reqpage]); + ap->a_vop_getpages_iodone(ap->a_arg); + return (error); +} + int vop_stdkqfilter(struct vop_kqfilter_args *ap) { Modified: projects/sendfile/sys/ufs/ufs/ufs_vnops.c ============================================================================== --- projects/sendfile/sys/ufs/ufs/ufs_vnops.c Wed Sep 10 11:27:52 2014 (r271383) +++ projects/sendfile/sys/ufs/ufs/ufs_vnops.c Wed Sep 10 11:33:42 2014 (r271384) @@ -2745,6 +2745,7 @@ struct vop_vector ufs_vnodeops = { .vop_close = ufs_close, .vop_create = ufs_create, .vop_getattr = ufs_getattr, + .vop_getpages_async = vop_stdgetpages_async, .vop_inactive = ufs_inactive, .vop_ioctl = ufs_ioctl, .vop_link = ufs_link,