From nobody Wed Mar 29 07:52:29 2023 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 4Pmf0Y6q38z42B40; Wed, 29 Mar 2023 07:52:29 +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 4Pmf0Y5vYjz3Q02; Wed, 29 Mar 2023 07:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076349; 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=EFoLzbBaFCWzi03yuu0JTHBRglWka2ZtRfFsUPSeodA=; b=hjfjAQROXOARrgY9uVL65DOo6ZkeM+A4epjhBgQLu0kUlHfabzFxSaHPksIM2clCF48T8J Qvl8kG26+7i2mGCCQaj60zGhJXxAsGjGXVylyaZSFySDmR+t2gXcjdx+bsToR1irNkLQ3M QP1cDcmt2ddr8oyj9I59cB92OOKQ3tA/aWdV91vnzbVlA+QNf/+09++m8B2wU4zL6IaD2b pqLXf60VarIOCQSoAM7BK8VtQFijapkdHa3EYpFY6BSD52s39MZj/mRRu+LPKOQ1x2PTuw oplQLDojxAGNZbDeGcMEvtAWzMd9eBdmKNuuGNJFGPBS9E1jxUd4lZ7ziSfGog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076349; 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=EFoLzbBaFCWzi03yuu0JTHBRglWka2ZtRfFsUPSeodA=; b=yP4laRNvraa54wz6CvWz+kAW2el0eS4IMUaA+cZ2P7koTRfkemaCO2HuPSAjtjOgA0VKWE sG1mUVnDr/EtvChjt/Xe4XNcKKNpWdjU7S46kKzhlM94rhBNreuHdkgfRdiu4IqzlXom/q 9O8PEsjkRYXU+iKoc9ua2GTBk98c07tMwZYCZ+v29knKggIYNqXyyn7Cyev0Hkgkug44hx 3Ob06efGpR2hy5rtEWNj4PHk9PUrG2KidsYGIPJXmb+DYm94kPmh7doBIvRaq1/tMfntJJ /iS739XumcPSHhlqcynmKw3wtoh6yuYa8KzNiUhDB8XZuCalcbEusa8wPE/Q/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680076349; a=rsa-sha256; cv=none; b=m8SEWvZUjkT0K4e5OibdFOrar4nnQ3BzYgv+WC6IuYE4+G3KjzVN4FPWkTJ1M89qLm0kKS UGZwNclmkTVmHo5HTkUKiAxl38JBJaWAYhatwyJJE0znC5LEbfKjgFIcC9y0QVo/rS26hM iTsC5fc1TN5BXgy1jZVXHRMEZqfGTRLk1rjrfr011TvTflhm9tIpTz0PpfrqP6sPiDmcwc MJwsVwHGnwR+/NDzeAyq3n7/NlZbUc00ukMVD6FuoweD4v1+Ra1994apsUdTG1vL1YkDYF j5bW3xY/DHHhHiMcDuARuQ5fRjjdGDCnYtxnIkON3rU0MBTqxbjrvDaKsCpuRQ== 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 4Pmf0Y4zV6zN6y; Wed, 29 Mar 2023 07:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32T7qTYF052014; Wed, 29 Mar 2023 07:52:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T7qTfB052013; Wed, 29 Mar 2023 07:52:29 GMT (envelope-from git) Date: Wed, 29 Mar 2023 07:52:29 GMT Message-Id: <202303290752.32T7qTfB052013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 1797ff962769 - main - xen/intr: cleanup event channel number use 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1797ff962769aac6822cde45719ed02c18d6cdb8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=1797ff962769aac6822cde45719ed02c18d6cdb8 commit 1797ff962769aac6822cde45719ed02c18d6cdb8 Author: Elliott Mitchell AuthorDate: 2021-06-06 00:43:13 +0000 Commit: Roger Pau Monné CommitDate: 2023-03-29 07:51:41 +0000 xen/intr: cleanup event channel number use Consistently use ~0 instead of 0 when clearing xenisrc structures. 0 is a valid event channel number, even though it is reserved by Xen. Whereas ~0 is guaranteed invalid. Reviewed by: royger MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D30743 --- sys/x86/xen/xen_intr.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 4e16778874b5..3a053b10f915 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -117,9 +117,8 @@ DPCPU_DEFINE_STATIC(struct xen_intr_pcpu_data, xen_intr_pcpu) = { DPCPU_DECLARE(struct vcpu_info *, vcpu_info); -#define XEN_INVALID_EVTCHN 0 /* Invalid event channel */ - -#define is_valid_evtchn(x) ((x) != XEN_INVALID_EVTCHN) +#define INVALID_EVTCHN (~(evtchn_port_t)0) /* Invalid event channel */ +#define is_valid_evtchn(x) ((uintmax_t)(x) < NR_EVENT_CHANNELS) struct xenisrc { struct intsrc xi_intsrc; @@ -372,7 +371,7 @@ xen_intr_release_isrc(struct xenisrc *isrc) } isrc->xi_cpu = 0; isrc->xi_type = EVTCHN_TYPE_UNBOUND; - isrc->xi_port = 0; + isrc->xi_port = INVALID_EVTCHN; isrc->xi_cookie = NULL; mtx_unlock(&xen_intr_isrc_lock); return (0); @@ -613,6 +612,19 @@ xen_intr_init(void *dummy __unused) if (!xen_domain()) return (0); + _Static_assert(is_valid_evtchn(0), + "is_valid_evtchn(0) fails (unused by Xen, but valid by interface"); + _Static_assert(is_valid_evtchn(NR_EVENT_CHANNELS - 1), + "is_valid_evtchn(max) fails (is a valid channel)"); + _Static_assert(!is_valid_evtchn(NR_EVENT_CHANNELS), + "is_valid_evtchn(>max) fails (NOT a valid channel)"); + _Static_assert(!is_valid_evtchn(~(evtchn_port_t)0), + "is_valid_evtchn(maxint) fails (overflow?)"); + _Static_assert(!is_valid_evtchn(INVALID_EVTCHN), + "is_valid_evtchn(INVALID_EVTCHN) fails (must be invalid!)"); + _Static_assert(!is_valid_evtchn(-1), + "is_valid_evtchn(-1) fails (negative are invalid)"); + mtx_init(&xen_intr_isrc_lock, "xen-irq-lock", NULL, MTX_DEF); /* @@ -769,7 +781,7 @@ xen_intr_resume(struct pic *unused, bool suspend_cancelled) vector = first_evtchn_irq + isrc_idx; isrc = (struct xenisrc *)intr_lookup_source(vector); if (isrc != NULL) { - isrc->xi_port = 0; + isrc->xi_port = INVALID_EVTCHN; switch (isrc->xi_type) { case EVTCHN_TYPE_IPI: xen_rebind_ipi(isrc); @@ -1292,7 +1304,7 @@ int xen_intr_get_evtchn_from_port(evtchn_port_t port, xen_intr_handle_t *handlep) { - if (!is_valid_evtchn(port) || port >= NR_EVENT_CHANNELS) + if (!is_valid_evtchn(port)) return (EINVAL); if (handlep == NULL) {