From owner-svn-src-user@freebsd.org Tue Mar 13 17:57:54 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 651A2F37AE4 for ; Tue, 13 Mar 2018 17:57:54 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1AD3D6C03E; Tue, 13 Mar 2018 17:57:54 +0000 (UTC) (envelope-from markj@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1126C1D116; Tue, 13 Mar 2018 17:57:54 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2DHvrvN051452; Tue, 13 Mar 2018 17:57:53 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DHvrJV051451; Tue, 13 Mar 2018 17:57:53 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201803131757.w2DHvrJV051451@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 13 Mar 2018 17:57:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r330869 - user/markj/vm-playground/sys/vm X-SVN-Group: user X-SVN-Commit-Author: markj X-SVN-Commit-Paths: user/markj/vm-playground/sys/vm X-SVN-Commit-Revision: 330869 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 17:57:54 -0000 Author: markj Date: Tue Mar 13 17:57:53 2018 New Revision: 330869 URL: https://svnweb.freebsd.org/changeset/base/330869 Log: Make VM_BATCHQ_FOREACH safe. Modified: user/markj/vm-playground/sys/vm/vm_pagequeue.h Modified: user/markj/vm-playground/sys/vm/vm_pagequeue.h ============================================================================== --- user/markj/vm-playground/sys/vm/vm_pagequeue.h Tue Mar 13 17:10:52 2018 (r330868) +++ user/markj/vm-playground/sys/vm/vm_pagequeue.h Tue Mar 13 17:57:53 2018 (r330869) @@ -82,10 +82,10 @@ struct vm_batchqueue { int bq_cnt; } __aligned(CACHE_LINE_SIZE); -#define VM_BATCHQ_FOREACH(batchqp, page) \ - page = (batchqp)->bq_pa[0]; \ - for (int __index = 0; __index < (batchqp)->bq_cnt; \ - __index++, (page) = (batchqp)->bq_pa[__index]) +#define VM_BATCHQ_FOREACH(batchqp, page) \ + for (vm_page_t *__mp = &(batchqp)->bq_pa[0]; \ + (page) = *__mp, __mp != &(batchqp)->bq_pa[(batchqp)->bq_cnt]; \ + __mp++) #include #include