From owner-svn-src-stable@freebsd.org Sat Mar 18 06:05:55 2017 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ACB9DD11F5C; Sat, 18 Mar 2017 06:05:55 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 849E21B5A; Sat, 18 Mar 2017 06:05:55 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2I65sPJ063813; Sat, 18 Mar 2017 06:05:54 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2I65svs063812; Sat, 18 Mar 2017 06:05:54 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201703180605.v2I65svs063812@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Sat, 18 Mar 2017 06:05:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r315476 - stable/11/sys/kern X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Mar 2017 06:05:55 -0000 Author: alc Date: Sat Mar 18 06:05:54 2017 New Revision: 315476 URL: https://svnweb.freebsd.org/changeset/base/315476 Log: MFC r314717,315085 Style and punctuation fixes. Simplify the control flow and tidy up a comment in map_insert. Modified: stable/11/sys/kern/imgact_elf.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/kern/imgact_elf.c ============================================================================== --- stable/11/sys/kern/imgact_elf.c Sat Mar 18 05:53:09 2017 (r315475) +++ stable/11/sys/kern/imgact_elf.c Sat Mar 18 06:05:54 2017 (r315476) @@ -416,7 +416,7 @@ __elfN(map_partial)(vm_map_t map, vm_obj /* * Find the page from the underlying object. */ - if (object) { + if (object != NULL) { sf = vm_imgact_map_page(object, offset); if (sf == NULL) return (KERN_FAILURE); @@ -444,7 +444,7 @@ __elfN(map_insert)(struct image_params * if (start != trunc_page(start)) { rv = __elfN(map_partial)(map, object, offset, start, round_page(start), prot); - if (rv) + if (rv != KERN_SUCCESS) return (rv); offset += round_page(start) - start; start = round_page(start); @@ -452,54 +452,51 @@ __elfN(map_insert)(struct image_params * if (end != round_page(end)) { rv = __elfN(map_partial)(map, object, offset + trunc_page(end) - start, trunc_page(end), end, prot); - if (rv) + if (rv != KERN_SUCCESS) return (rv); end = trunc_page(end); } - if (end > start) { - if (offset & PAGE_MASK) { - /* - * The mapping is not page aligned. This means we have - * to copy the data. Sigh. - */ - rv = vm_map_fixed(map, NULL, 0, start, end - start, - prot | VM_PROT_WRITE, VM_PROT_ALL, MAP_CHECK_EXCL); - if (rv != KERN_SUCCESS) - return (rv); - if (object == NULL) - return (KERN_SUCCESS); - for (; start < end; start += sz) { - sf = vm_imgact_map_page(object, offset); - if (sf == NULL) - return (KERN_FAILURE); - off = offset - trunc_page(offset); - sz = end - start; - if (sz > PAGE_SIZE - off) - sz = PAGE_SIZE - off; - error = copyout((caddr_t)sf_buf_kva(sf) + off, - (caddr_t)start, sz); - vm_imgact_unmap_page(sf); - if (error != 0) - return (KERN_FAILURE); - offset += sz; - } - rv = KERN_SUCCESS; - } else { - vm_object_reference(object); - rv = vm_map_fixed(map, object, offset, start, - end - start, prot, VM_PROT_ALL, - cow | MAP_CHECK_EXCL); - if (rv != KERN_SUCCESS) { - locked = VOP_ISLOCKED(imgp->vp); - VOP_UNLOCK(imgp->vp, 0); - vm_object_deallocate(object); - vn_lock(imgp->vp, locked | LK_RETRY); - } + if (start >= end) + return (KERN_SUCCESS); + if ((offset & PAGE_MASK) != 0) { + /* + * The mapping is not page aligned. This means that we have + * to copy the data. + */ + rv = vm_map_fixed(map, NULL, 0, start, end - start, + prot | VM_PROT_WRITE, VM_PROT_ALL, MAP_CHECK_EXCL); + if (rv != KERN_SUCCESS) + return (rv); + if (object == NULL) + return (KERN_SUCCESS); + for (; start < end; start += sz) { + sf = vm_imgact_map_page(object, offset); + if (sf == NULL) + return (KERN_FAILURE); + off = offset - trunc_page(offset); + sz = end - start; + if (sz > PAGE_SIZE - off) + sz = PAGE_SIZE - off; + error = copyout((caddr_t)sf_buf_kva(sf) + off, + (caddr_t)start, sz); + vm_imgact_unmap_page(sf); + if (error != 0) + return (KERN_FAILURE); + offset += sz; } - return (rv); } else { - return (KERN_SUCCESS); + vm_object_reference(object); + rv = vm_map_fixed(map, object, offset, start, end - start, + prot, VM_PROT_ALL, cow | MAP_CHECK_EXCL); + if (rv != KERN_SUCCESS) { + locked = VOP_ISLOCKED(imgp->vp); + VOP_UNLOCK(imgp->vp, 0); + vm_object_deallocate(object); + vn_lock(imgp->vp, locked | LK_RETRY); + return (rv); + } } + return (KERN_SUCCESS); } static int @@ -539,7 +536,7 @@ __elfN(load_section)(struct image_params * We have two choices. We can either clear the data in the last page * of an oversized mapping, or we can start the anon mapping a page * early and copy the initialized data into that first page. We - * choose the second.. + * choose the second. */ if (memsz > filsz) map_len = trunc_page_ps(offset + filsz, pagesize) - file_addr;