From nobody Wed Mar 29 07:52:32 2023 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 4Pmf0d2X0yz42BCY; Wed, 29 Mar 2023 07:52:33 +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 4Pmf0d20Pdz3Q16; Wed, 29 Mar 2023 07:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076353; 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=IRFw3F86JNd6SrYOuN6UGdayGeOyyGpWP7sjxqbR1qE=; b=QXbrnpWeAF8/VNlLfbw712dSGCE+U1Pf4FFTFxESZpJZPu0ew+FovvJIY2rhBvcbpS/ETe Sk6joq9HrJ+VIYs2pVewDNibdMLDLY5Zrc3QGBL2/KoTvcWTqCp0PE1u5+4SMDeWb10dM+ o9otqCDcepXjsvUe53d7vs38GkG3LqyhpPXL+IOC5FLOprVKb8Whu9gnaYZpta+htF1JYH Wd3RD6VbxCExjAZZvb3Y85EC4Kc6pKo3gjS3sQ/4eAOmFXKd8Gsn2J4/Ncx0rkg+WOfBiT wyEr/2iI+QLq90rJCUWUQJvkzcAjzE+QBgZ6VFHCERy0/bAvhtuzs4rZnv1RKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680076353; 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=IRFw3F86JNd6SrYOuN6UGdayGeOyyGpWP7sjxqbR1qE=; b=vvUxevvOEu3diToGhTt2+UUigBMo4HbhCPYX9BEPuMNywJhrnTDvtEMn2FFDv/e2q6TERR oxII5J+ttz5v1pVh1RwnypsqNHh+qHdLRGxVGi+S05OKWvUUtqPL8qD3T3M+c0HYREDzzL XuMBwhq1A0Jb3jqDBa2zsYfOUhQOxahJ952ot4Q0kR/j1rXy17bim0TTuMq2apS6w7Zldc A3FzdBVIv/Ktcf90W7rqhh+ZzxfGnbPHBjvjtihxy5L6PWJuqe18wLkgRIjl3TQuM2b77q iXW1yzPgNYmPFyJ2YW9Ph2oWUFhfmivK8EIPMneGT/qTmz2L701A0hquYvlsVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680076353; a=rsa-sha256; cv=none; b=KciQ2q29XH70HxV5DcQ9IIni9fB4En59ZgfPgVXsRXDgqTI8uTAm3XC6PqZD5PP2C16Dgq lsFk48tKJY6R8LC1hzgH4028VN3KEx7gDvy1FKm48eGZkr2mwh+mB/MnmyLZuichrNraKo 90thezWuHYbLJW52lhApTlFPqGlWa7h3fnIItbYAkskwApt+WI5K+7/OoxYCYpYANG5slk 5HTrGhesiYZf4VQi9NxBoSCkaR39mDLqi1vGjJXbBmNx2AWvkUft9AMMSTvcVqUpF0TpEd kq/w96G/S/f8T+zsAZdvs2EvUyOcCdmRJxJWyPsqJ5MCQikV7KMUo9y23h7ASg== 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 4Pmf0d0YHKzLsj; Wed, 29 Mar 2023 07:52:33 +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 32T7qWg8052093; Wed, 29 Mar 2023 07:52:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32T7qWr4052092; Wed, 29 Mar 2023 07:52:32 GMT (envelope-from git) Date: Wed, 29 Mar 2023 07:52:32 GMT Message-Id: <202303290752.32T7qWr4052092@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: 40ad9aaa880c - main - xen/intr: stop passing shared_info_t to xen_intr_active_ports() 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 40ad9aaa880c7eefa3c16786beb19320afdc8903 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=40ad9aaa880c7eefa3c16786beb19320afdc8903 commit 40ad9aaa880c7eefa3c16786beb19320afdc8903 Author: Elliott Mitchell AuthorDate: 2022-02-23 16:47:18 +0000 Commit: Roger Pau Monné CommitDate: 2023-03-29 07:51:43 +0000 xen/intr: stop passing shared_info_t to xen_intr_active_ports() There is only a single global HYPERVISOR_shared_info pointer, so directly use the global pointer. Reviewed by: royger MFC after: 1 week --- sys/x86/xen/xen_intr.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 8d5562e21018..129252044da9 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -485,9 +485,10 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, * events. */ static inline u_long -xen_intr_active_ports(struct xen_intr_pcpu_data *pcpu, shared_info_t *sh, - u_int idx) +xen_intr_active_ports(const struct xen_intr_pcpu_data *const pcpu, + const u_int idx) { + volatile const shared_info_t *const sh = HYPERVISOR_shared_info; CTASSERT(sizeof(sh->evtchn_mask[0]) == sizeof(sh->evtchn_pending[0])); CTASSERT(sizeof(sh->evtchn_mask[0]) == sizeof(pcpu->evtchn_enabled[0])); @@ -509,7 +510,6 @@ xen_intr_handle_upcall(struct trapframe *trap_frame) u_int l1i, l2i, port, cpu __diagused; u_long masked_l1, masked_l2; struct xenisrc *isrc; - shared_info_t *s; vcpu_info_t *v; struct xen_intr_pcpu_data *pc; u_long l1, l2; @@ -522,7 +522,6 @@ xen_intr_handle_upcall(struct trapframe *trap_frame) cpu = PCPU_GET(cpuid); pc = DPCPU_PTR(xen_intr_pcpu); - s = HYPERVISOR_shared_info; v = DPCPU_GET(vcpu_info); if (!xen_has_percpu_evtchn()) { @@ -560,7 +559,7 @@ xen_intr_handle_upcall(struct trapframe *trap_frame) l1i = ffsl(masked_l1) - 1; do { - l2 = xen_intr_active_ports(pc, s, l1i); + l2 = xen_intr_active_ports(pc, l1i); l2i = (l2i + 1) % LONG_BIT; masked_l2 = l2 & ((~0UL) << l2i); @@ -596,7 +595,7 @@ xen_intr_handle_upcall(struct trapframe *trap_frame) } while (l2i != LONG_BIT - 1); - l2 = xen_intr_active_ports(pc, s, l1i); + l2 = xen_intr_active_ports(pc, l1i); if (l2 == 0) { /* * We handled all ports, so we can clear the