From nobody Wed Mar 29 07:52:35 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 4Pmf0g48N9z42B0F; Wed, 29 Mar 2023 07:52:35 +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 4Pmf0g3HvFz3Q4D; Wed, 29 Mar 2023 07:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076355; 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=azJ94TRQx1gJ4JaV63eT/ZA/5D8mHemjodGtiEW+agE=; b=q4xzDQZkeKMoUuCCkNgBwGNaFe6Jx4J+f9UiMFlWUhi7e7x2z5xPdfZ/uqlBulPtGwCYYd 8yDa/eFkFWpjBIvEaPT0qTP2+BeNMNpnk2GE5zZgoPIlDEztC/9otebvxPGh2n5j1dAO1H I0TawSIi1QerUswJUYW9bahHRtH1tAMUt7K29BzcTOtlndAJrgMT8u4ztknCGax/nUrHgr suob7PME8xnqQohHHJbKoZ7m1WZ7KvY8R3k7o6AMbcXZPIbMjQMQcRGBLCacxSdtxvQXan hfuc1TuErQ6vA5uVCHfXEyzuBdi1klbWAO8D4mHgSJ9vPeAZzqWoEeh8KMBE7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076355; 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=azJ94TRQx1gJ4JaV63eT/ZA/5D8mHemjodGtiEW+agE=; b=gJLMHeEPVBhKKbYzzpzC6uHucW8fSDvyPClNTDcgmspZJ0KvrTPXXqcIKI+9+0/jq+rAwL P7ELbKyDMJ14iBAbL9Nj/q6eTo+oKPiTLlzLdfH5xmH+NU8tLAd6FX+MCgvm86/Ir8vZVz +u5JW2TFr+noEXfxm1Xa4JVZ8E7rKLvnIwOiYgUr2dBvt0krsdONG3Lnp7/P32Vj178MMn 80OK7Lzup/B30/1HPZ56ew1HUQozrYgAdhwXT3KT6XyHHh588cqbMf9cX+BBovtZO3k9aa oJXhgE+9ckfW1DeKVYj3YFxkuhOljqb0XulH+kyVD0LmEw8ljhGPxV0DNOWQMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680076355; a=rsa-sha256; cv=none; b=Je9Cmgzs9a9Ugs6CqUrM9y4GPjey5gUFp1Q0SwO3avbFDeB+RJMFblGbbJ/6TZeDMdmWZb 6OZjYgeCiZhKyWpBg75e4Oqy8WlqBbYUfmvPRlPMx99ZZjeJAhSor7geHNKw00TE2ML/ou a6jb/TshTYHJ+2pd0Drvyu34WgoaKTy3dZl2tt2888TVsXyIjDGZe8GOlcOiuLKhH85GYH bVZPe2XiCZmLgwhB0tLUkh9xpvFupG/dnpvUochL8dQgu8PT0OgI9Zg4EatioYicswACo/ cn2tbuI+/Bi5V5slvUVCQV06nqw1qfWy9FGrxNNb7Oo6G5mAHJjCEQVTT8dftA== 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 4Pmf0g2Nv4zN71; Wed, 29 Mar 2023 07:52:35 +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 32T7qZWQ052141; Wed, 29 Mar 2023 07:52:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T7qZr4052140; Wed, 29 Mar 2023 07:52:35 GMT (envelope-from git) Date: Wed, 29 Mar 2023 07:52:35 GMT Message-Id: <202303290752.32T7qZr4052140@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: e45c8ea31cd8 - main - xen/intr: merge parts of resume functionality into new function 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: e45c8ea31cd89feda2b5b31bd623f4879602aec5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=e45c8ea31cd89feda2b5b31bd623f4879602aec5 commit e45c8ea31cd89feda2b5b31bd623f4879602aec5 Author: Elliott Mitchell AuthorDate: 2021-06-01 00:55:12 +0000 Commit: Roger Pau Monné CommitDate: 2023-03-29 07:51:44 +0000 xen/intr: merge parts of resume functionality into new function The portions of xen_rebind_ipi() and xen_rebind_virq() were already near-identical. While xen_rebind_ipi() should panic() on single-processor, still having the functionality to invoke seems harmless. Meanwhile much of the loop from xen_intr_resume() seemed to want to be closer to this same code. This pushes related bits closer together. Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D30598 --- sys/x86/xen/xen_intr.c | 52 ++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 39486f28c9c5..e2f23b4a5c6e 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -707,16 +707,6 @@ xen_rebind_ipi(struct xenisrc *isrc) panic("unable to rebind xen IPI: %d", error); isrc->xi_port = bind_ipi.port; - isrc->xi_cpu = 0; - xen_intr_port_to_isrc[bind_ipi.port] = isrc; - - error = xen_intr_assign_cpu(&isrc->xi_intsrc, - cpu_apic_ids[cpu]); - if (error) - panic("unable to bind xen IPI to CPU#%d: %d", - cpu, error); - - evtchn_unmask_port(bind_ipi.port); #else panic("Resume IPI event channel on UP"); #endif @@ -737,18 +727,39 @@ xen_rebind_virq(struct xenisrc *isrc) panic("unable to rebind xen VIRQ#%d: %d", isrc->xi_virq, error); isrc->xi_port = bind_virq.port; - isrc->xi_cpu = 0; - xen_intr_port_to_isrc[bind_virq.port] = isrc; +} + +static void +xen_intr_rebind_isrc(struct xenisrc *isrc) +{ +#ifdef SMP + u_int cpu = isrc->xi_cpu; + int error; +#endif + + switch (isrc->xi_type) { + case EVTCHN_TYPE_IPI: + xen_rebind_ipi(isrc); + break; + case EVTCHN_TYPE_VIRQ: + xen_rebind_virq(isrc); + break; + default: + return; + } + + xen_intr_port_to_isrc[isrc->xi_port] = isrc; #ifdef SMP + isrc->xi_cpu = 0; error = xen_intr_assign_cpu(&isrc->xi_intsrc, cpu_apic_ids[cpu]); if (error) - panic("unable to bind xen VIRQ#%d to CPU#%d: %d", - isrc->xi_virq, cpu, error); + panic("%s(): unable to rebind Xen channel %u to vCPU%u: %d", + __func__, isrc->xi_port, cpu, error); #endif - evtchn_unmask_port(bind_virq.port); + evtchn_unmask_port(isrc->xi_port); } /** @@ -789,16 +800,7 @@ xen_intr_resume(struct pic *unused, bool suspend_cancelled) isrc = (struct xenisrc *)intr_lookup_source(vector); if (isrc != NULL) { isrc->xi_port = INVALID_EVTCHN; - switch (isrc->xi_type) { - case EVTCHN_TYPE_IPI: - xen_rebind_ipi(isrc); - break; - case EVTCHN_TYPE_VIRQ: - xen_rebind_virq(isrc); - break; - default: - break; - } + xen_intr_rebind_isrc(isrc); } } }