From nobody Sat Apr 19 22:16:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zg5Zx5FYKz5tYfh; Sat, 19 Apr 2025 22:16:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zg5Zx3r0jz3dSZ; Sat, 19 Apr 2025 22:16:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745101017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+7xttWex17BnwN/l21CPTrGgiVPiGRR5pRRw/qW3y0M=; b=pPuK806NQbU8Uc6ByXKR6gy9B0RRyHVBRw/aX/G3GivNAW8mw4qiCYpwd1PghxM5Z3eCFq m+I2IjPQ/Ufre7Z34TqS7ptMbnTeM2JI17mxfOgj2dZcTpMK4d4tgEgjJtxXI4Bpyi0XVT 5kLkWjkRquyVIE57nO9q3HHme7oz1JUWwfaE6Tl2HT8JtTT/X+4F3CnPEQwi9tk+TErzw/ cvsYfgIqDMVcnR+jf63Vs+RiBY2ADgyXm4FVk0Likrntm8GU+CLIBre8TptNQkAtH9/BHx kcoUD92ApQONRpgs/9xMSIKQxv6+SSeTnvYtlovvX305nSPJ57fN7XzDz8Ppyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745101017; a=rsa-sha256; cv=none; b=YUV6QF3HRdbMhWNfQrWyq/g0mTVf+QSRYlOzId1O2jAlIMX5801GxJmslgcnv85rBK40iB uMH2ZT3U2UAmBI44SWVEJpdGAy3KVIq563+bAbEeY1HyA/ln0Ds6PonpMg4dXpAryNxVIh THJDLiysSpRpjzSRFNGaNvAM/ZppMtd75lA85XsR9GjMGYbEEEwC0bNZEcQSrHVPVOVgvW kJTbdqBrb0ADCwD4A4jBHPx4Tcgr8MP4zGeCGU08FgXo8KTUsWgW2jPGQr2siFiXtekR/u 9wmOf93vjUayql7kms+duhFjFwBPxzSJCNuxHvggD5pRqpzpIb21G1Ed7ZejaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745101017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+7xttWex17BnwN/l21CPTrGgiVPiGRR5pRRw/qW3y0M=; b=q/6MDLKnynCTCWF/Shspu8ZiOzlsSZJuWFwUpc4bgpwdAYlWn2ON963vXOrPKPr+J5U1Tc cvh5WQUlLKo7yo48FfLQawn1kJH3slgP69TbI/SS8S3tb9gSJBI+3Zt3pvjO6JHCYfwd/q elw97VuYpH7bBpWCtPKUhIzP11iIVlbHofBMXUCyj2DUHQWmacLOmp6JuGcR47+sVZN41M rDQNp1B+XdRdJG3O0O5hcLGBy6ddPLiGz4ey2/xbJcU2LJ86hapE084nU/6xIMfkvTbWaJ KqhCbZdrvcyHqRPrAdCF2XHKyD6W4mjyJsgYJYAgRGBqd2yVsVFdtCdxIEs7qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zg5Zx2FXSzdBm; Sat, 19 Apr 2025 22:16:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53JMGvse048323; Sat, 19 Apr 2025 22:16:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53JMGvBs048320; Sat, 19 Apr 2025 22:16:57 GMT (envelope-from git) Date: Sat, 19 Apr 2025 22:16:57 GMT Message-Id: <202504192216.53JMGvBs048320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 60c4869ed58d - main - sgx: replace tailq pointers with iterators List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60c4869ed58d98c27b0f4a35713963cda46e6a46 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=60c4869ed58d98c27b0f4a35713963cda46e6a46 commit 60c4869ed58d98c27b0f4a35713963cda46e6a46 Author: Doug Moore AuthorDate: 2025-04-19 22:15:20 +0000 Commit: Doug Moore CommitDate: 2025-04-19 22:16:46 +0000 sgx: replace tailq pointers with iterators In sgx code, use iterators to replace tailq pointers for page manipulation. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D49919 --- sys/amd64/sgx/sgx.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/sys/amd64/sgx/sgx.c b/sys/amd64/sgx/sgx.c index 1cc268102b1f..af8adb763214 100644 --- a/sys/amd64/sgx/sgx.c +++ b/sys/amd64/sgx/sgx.c @@ -346,13 +346,17 @@ sgx_epc_page_remove(struct sgx_softc *sc, } static void -sgx_page_remove(struct sgx_softc *sc, vm_page_t p) +sgx_page_remove(struct sgx_softc *sc, vm_page_t p, + struct pctrie_iter *pages) { struct epc_page *epc; vm_paddr_t pa; uint64_t offs; - (void)vm_page_remove(p); + if (pages != NULL) + (void)vm_page_iter_remove(pages, p); + else + (void) vm_page_remove(p); dprintf("%s: p->pidx %ld\n", __func__, p->pindex); @@ -369,8 +373,9 @@ static void sgx_enclave_remove(struct sgx_softc *sc, struct sgx_enclave *enclave) { + struct pctrie_iter pages; vm_object_t object; - vm_page_t p, p_secs, p_next; + vm_page_t p, p_secs; mtx_lock(&sc->mtx); TAILQ_REMOVE(&sc->enclaves, enclave, next); @@ -378,6 +383,7 @@ sgx_enclave_remove(struct sgx_softc *sc, object = enclave->object; + vm_page_iter_init(&pages, object); VM_OBJECT_WLOCK(object); /* @@ -385,20 +391,21 @@ sgx_enclave_remove(struct sgx_softc *sc, * then remove SECS page. */ restart: - TAILQ_FOREACH_SAFE(p, &object->memq, listq, p_next) { + VM_RADIX_FOREACH(p, &pages) { if (p->pindex == SGX_SECS_VM_OBJECT_INDEX) continue; - if (vm_page_busy_acquire(p, VM_ALLOC_WAITFAIL) == 0) + if (vm_page_busy_acquire(p, VM_ALLOC_WAITFAIL) == 0) { + pctrie_iter_reset(&pages); goto restart; - sgx_page_remove(sc, p); + } + sgx_page_remove(sc, p, &pages); } p_secs = vm_page_grab(object, SGX_SECS_VM_OBJECT_INDEX, VM_ALLOC_NOCREAT); /* Now remove SECS page */ if (p_secs != NULL) - sgx_page_remove(sc, p_secs); + sgx_page_remove(sc, p_secs, NULL); - KASSERT(TAILQ_EMPTY(&object->memq) == 1, ("not empty")); KASSERT(object->resident_page_count == 0, ("count")); VM_OBJECT_WUNLOCK(object); @@ -729,7 +736,7 @@ sgx_ioctl_create(struct sgx_softc *sc, struct sgx_enclave_create *param) p = vm_page_grab(enclave->object, - SGX_VA_PAGES_OFFS - SGX_SECS_VM_OBJECT_INDEX, VM_ALLOC_NOCREAT); - sgx_page_remove(sc, p); + sgx_page_remove(sc, p, NULL); VM_OBJECT_WUNLOCK(object); goto error; } @@ -743,7 +750,7 @@ sgx_ioctl_create(struct sgx_softc *sc, struct sgx_enclave_create *param) p = vm_page_grab(enclave->object, - SGX_VA_PAGES_OFFS - SGX_SECS_VM_OBJECT_INDEX, VM_ALLOC_NOCREAT); - sgx_page_remove(sc, p); + sgx_page_remove(sc, p, NULL); VM_OBJECT_WUNLOCK(object); goto error; }