From owner-svn-src-projects@FreeBSD.ORG Sun Aug 31 16:37:42 2014 Return-Path: Delivered-To: svn-src-projects@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 2C9D24CA; Sun, 31 Aug 2014 16:37:42 +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 185311ACD; Sun, 31 Aug 2014 16:37:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7VGbfWb035824; Sun, 31 Aug 2014 16:37:41 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7VGbfHF035823; Sun, 31 Aug 2014 16:37:41 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201408311637.s7VGbfHF035823@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sun, 31 Aug 2014 16:37:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r270881 - projects/sendfile/sys/kern 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: Sun, 31 Aug 2014 16:37:42 -0000 Author: glebius Date: Sun Aug 31 16:37:41 2014 New Revision: 270881 URL: http://svnweb.freebsd.org/changeset/base/270881 Log: Even if userland requested SF_NOCACHE, ignore it in cases when we are sure that page will be reused. Explain this in comment. Suggested by: David Pfitzner Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/uipc_syscalls.c Modified: projects/sendfile/sys/kern/uipc_syscalls.c ============================================================================== --- projects/sendfile/sys/kern/uipc_syscalls.c Sun Aug 31 16:14:20 2014 (r270880) +++ projects/sendfile/sys/kern/uipc_syscalls.c Sun Aug 31 16:37:41 2014 (r270881) @@ -3138,16 +3138,26 @@ retry_space: } /* - * Get an mbuf and set it up as having - * EXT_SFBUF/EXT_SFBUF_NOCACHE external storage. + * Get an mbuf and set it up. + * + * SF_NOCACHE sets the page as being freed upon send. + * However, we ignore it for the last page in 'space', + * if the page is truncated, and we got more data to + * send (rem > space), or if we have readahead + * configured (rhpages > 0). */ m0 = m_get(M_WAITOK, MT_DATA); m0->m_ext.ext_buf = (char *)sf_buf_kva(sf); m0->m_ext.ext_size = PAGE_SIZE; m0->m_ext.ext_arg1 = sf; m0->m_ext.ext_arg2 = sfs; - m0->m_ext.ext_type = (flags & SF_NOCACHE) ? - EXT_SFBUF_NOCACHE : EXT_SFBUF; + if ((flags & SF_NOCACHE) == 0 || + (i == npages - 1 && + ((off + space) & PAGE_MASK) && + (rem > space || rhpages > 0))) + m0->m_ext.ext_type = EXT_SFBUF; + else + m0->m_ext.ext_type = EXT_SFBUF_NOCACHE; m0->m_ext.ext_flags = 0; m0->m_flags |= (M_EXT | M_RDONLY); if (nios)