From nobody Tue Jan 02 00:42:43 2024 X-Original-To: dev-commits-src-all@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 4T3vFv6XTjz560DK; Tue, 2 Jan 2024 00:42:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T3vFv2tWVz3S3M; Tue, 2 Jan 2024 00:42:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704156163; 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=zdznI8XdpIUjsDJTf1RQPhtAwhkqtRXvi075TL6KnG4=; b=QbW/RsPXgCt3BSaiMard8ddKS8d1wj3m6eSF2q4zhHJSeVIIgPA54DRX2lij4Jmi1F6cYh Yu75opmAdGu0PpAs2NGe8YA2Zy7pSy8d6fGke6d66UAzxgBn09cpvkvvs5Ax3dKtFhFU5D R8Alp+OCMmBmUxyemN4DQy0lVuC9uk/XnyffjtRUHgDBAowlvffJSzUJmOtZFH184BUZtR x/9JzNOOpouH8LHHE71f3smSreXSkUT1aaARENlKCvk+6+J6diStwBnzLSHtkZm9x1E5xQ 38Xy3yl3Faa4QHLoRedz2RlO2JKgSvqiG12pdlpG+J8+Az1qHrN72fyUnppr/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704156163; a=rsa-sha256; cv=none; b=a2Nh4jmJhezOgOlNqgMfQ0SVwVSQYGkmbu4GELXn0d2m2RTrH+BhFdk+Q7AWNBkLniqsAE NshL0v37QY2/EWu+5MyzB0Qeocn+Fo7XU77l189GIIGCyTvfyjcRTgYX3RvggZe8u59hfH 0UQSUO3djH1Mbk0Td0QS9VHRp5FZhIHDub+CJmJNM8+yXaUlw6Wk3Sl39qi1h331nC3hBk 1/rNfrMwGmIahV1KcGWWv+945pVAxhTBSVftTILmMQOHS79TFa1OH7NYZLDPzdvIVvfP6h BIpXQZy1gEEvPZimMYKBXCS/q4Gxs6HLi7pC/pESYUDefNZFO3DV09g60a/XoA== 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=1704156163; 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=zdznI8XdpIUjsDJTf1RQPhtAwhkqtRXvi075TL6KnG4=; b=j1wXf9Nh2oU57wwiy6I0xtkdiDGW+9QVJBrIFwvKHsHegW6anvic57/nMTqqMs0FpoUkil pK3IxAXtW0CyBRXhH8QJAbk1nj4fVluPrlo2p1XUEs+z8BUXjwGNfnCDrQn7J6MWcqSqM7 k5H+AweKecGbHEvxOCE/z/CdzBkliqHAGQffTTeRRQf4bGm0D537tK2VcfZGzti3u3Bvo5 EyLbyo9UXXhdP78ghIY2L5MFTOa93EuYYBbluNiNK+/5na6T4JIwf4TiWI7TamCQZxIHxl l0SR/hg3mqJfPGfEB2WEzX97N+Qn2sugpUF0Tcyt+Dz06Tz6MyD8LIt4zl4o8g== 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 4T3vFv1hVQzfcB; Tue, 2 Jan 2024 00:42:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4020ghlh004125; Tue, 2 Jan 2024 00:42:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4020ghsv004122; Tue, 2 Jan 2024 00:42:43 GMT (envelope-from git) Date: Tue, 2 Jan 2024 00:42:43 GMT Message-Id: <202401020042.4020ghsv004122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9ffa317779e3 - stable/13 - IOMMU: add GAS map entry flag IOMMU_MAP_ENTRY_FAKE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9ffa317779e3a05b8609302f84bae1d59947b779 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9ffa317779e3a05b8609302f84bae1d59947b779 commit 9ffa317779e3a05b8609302f84bae1d59947b779 Author: Konstantin Belousov AuthorDate: 2023-12-22 22:39:27 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-02 00:42:13 +0000 IOMMU: add GAS map entry flag IOMMU_MAP_ENTRY_FAKE (cherry picked from commit a59c252903e81f46c74903ce5b1cf0960927dbcc) --- sys/dev/iommu/iommu_gas.c | 6 +++++- sys/dev/iommu/iommu_gas.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index e178acf60478..dc850747512a 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -123,7 +123,8 @@ iommu_gas_cmp_entries(struct iommu_map_entry *a, struct iommu_map_entry *b) a, (uintmax_t)a->start, (uintmax_t)a->end)); KASSERT(b->start <= b->end, ("inverted entry %p (%jx, %jx)", b, (uintmax_t)b->start, (uintmax_t)b->end)); - KASSERT(a->end <= b->start || b->end <= a->start || + KASSERT(((a->flags | b->flags) & IOMMU_MAP_ENTRY_FAKE) != 0 || + a->end <= b->start || b->end <= a->start || a->end == a->start || b->end == b->start, ("overlapping entries %p (%jx, %jx) f %#x %p (%jx, %jx) f %#x" " domain %p %p", @@ -536,11 +537,13 @@ iommu_gas_alloc_region(struct iommu_domain *domain, struct iommu_map_entry *entr if (entry->end >= domain->end) return (EINVAL); + entry->flags |= IOMMU_MAP_ENTRY_FAKE; next = RB_NFIND(iommu_gas_entries_tree, &domain->rb_root, entry); KASSERT(next != NULL, ("next must be non-null %p %jx", domain, (uintmax_t)entry->start)); prev = RB_PREV(iommu_gas_entries_tree, &domain->rb_root, next); /* prev could be NULL */ + entry->flags &= ~IOMMU_MAP_ENTRY_FAKE; /* * Adapt to broken BIOSes which specify overlapping RMRR @@ -658,6 +661,7 @@ iommu_gas_remove_clip_left(struct iommu_domain *domain, iommu_gaddr_t start, bzero(&fentry, sizeof(fentry)); fentry.start = start + 1; fentry.end = start + 1; + fentry.flags = IOMMU_MAP_ENTRY_FAKE; entry = RB_NFIND(iommu_gas_entries_tree, &domain->rb_root, &fentry); if (entry->start >= start || diff --git a/sys/dev/iommu/iommu_gas.h b/sys/dev/iommu/iommu_gas.h index 8069c5a15a34..cdc4bd22d60c 100644 --- a/sys/dev/iommu/iommu_gas.h +++ b/sys/dev/iommu/iommu_gas.h @@ -50,6 +50,7 @@ #define IOMMU_MAP_ENTRY_UNMAPPED 0x0010 /* No backing pages */ #define IOMMU_MAP_ENTRY_REMOVING 0x0020 /* In process of removal by iommu_gas_remove() */ +#define IOMMU_MAP_ENTRY_FAKE 0x0040 /* disable assert in cmp() */ #define IOMMU_MAP_ENTRY_READ 0x1000 /* Read permitted */ #define IOMMU_MAP_ENTRY_WRITE 0x2000 /* Write permitted */ #define IOMMU_MAP_ENTRY_SNOOP 0x4000 /* Snoop */