From xen-changelog-bounces@lists.xenproject.org Sat Feb 04 22:44:10 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 04 Feb 2023 22:44:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489621.757955 (Exim 4.92) (envelope-from ) id 1pORGN-0006c5-FV; Sat, 04 Feb 2023 22:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489621.757955; Sat, 04 Feb 2023 22:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pORGN-0006bx-C7; Sat, 04 Feb 2023 22:44:03 +0000 Received: by outflank-mailman (input) for mailman id 489621; Sat, 04 Feb 2023 22:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pORGL-0006br-Ml for xen-changelog@lists.xenproject.org; Sat, 04 Feb 2023 22:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pORGL-0002F5-L1 for xen-changelog@lists.xenproject.org; Sat, 04 Feb 2023 22:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pORGL-0003Uc-K3 for xen-changelog@lists.xenproject.org; Sat, 04 Feb 2023 22:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Ks7BnP3D9atIE7l7EFcxhc7+9Hbwq8+yrCvui3SVaiE=; b=r3cgA/RfXcxUUe8SzEU0htYlv9 mq+mfWcYe1RPuchb0oUgj6BC5qHoOMqacdljMn47XBSBpD00QkaOZJwwBOT2euQJ9Mf0NP9L59T0c nWqRbCJH6iZLK5+tJg3Y2DDD3O9e8bp3xYEk+2CRHl1ogOdZJr7IA8fV+QykK1zrEc70=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] Revert "tools/xenstore: simplify loop handling connection I/O" Message-Id: Date: Sat, 04 Feb 2023 22:44:01 +0000 commit 2f8851c37f88e4eb4858e16626fcb2379db71a4f Author: Jason Andryuk AuthorDate: Thu Jan 26 11:00:24 2023 +0100 Commit: Jan Beulich CommitDate: Thu Jan 26 11:00:24 2023 +0100 Revert "tools/xenstore: simplify loop handling connection I/O" I'm observing guest kexec trigger xenstored to abort on a double free. gdb output: Program received signal SIGABRT, Aborted. __pthread_kill_implementation (no_tid=0, signo=6, threadid=140645614258112) at ./nptl/pthread_kill.c:44 44 ./nptl/pthread_kill.c: No such file or directory. (gdb) bt at ./nptl/pthread_kill.c:44 at ./nptl/pthread_kill.c:78 at ./nptl/pthread_kill.c:89 at ../sysdeps/posix/raise.c:26 at talloc.c:119 ptr=ptr@entry=0x559fae724290) at talloc.c:232 at xenstored_core.c:2945 (gdb) frame 5 at talloc.c:119 119 TALLOC_ABORT("Bad talloc magic value - double free"); (gdb) frame 7 at xenstored_core.c:2945 2945 talloc_increase_ref_count(conn); (gdb) p conn $1 = (struct connection *) 0x559fae724290 Looking at a xenstore trace, we have: IN 0x559fae71f250 20230120 17:40:53 READ (/local/domain/3/image/device-model-dom id ) wrl: dom 0 1 msec 10000 credit 1000000 reserve 100 disc ard wrl: dom 3 1 msec 10000 credit 1000000 reserve 100 disc ard wrl: dom 0 0 msec 10000 credit 1000000 reserve 0 disc ard wrl: dom 3 0 msec 10000 credit 1000000 reserve 0 disc ard OUT 0x559fae71f250 20230120 17:40:53 ERROR (ENOENT ) wrl: dom 0 1 msec 10000 credit 1000000 reserve 100 disc ard wrl: dom 3 1 msec 10000 credit 1000000 reserve 100 disc ard IN 0x559fae71f250 20230120 17:40:53 RELEASE (3 ) DESTROY watch 0x559fae73f630 DESTROY watch 0x559fae75ddf0 DESTROY watch 0x559fae75ec30 DESTROY watch 0x559fae75ea60 DESTROY watch 0x559fae732c00 DESTROY watch 0x559fae72cea0 DESTROY watch 0x559fae728fc0 DESTROY watch 0x559fae729570 DESTROY connection 0x559fae724290 orphaned node /local/domain/3/device/suspend/event-channel deleted orphaned node /local/domain/3/device/vbd/51712 deleted orphaned node /local/domain/3/device/vkbd/0 deleted orphaned node /local/domain/3/device/vif/0 deleted orphaned node /local/domain/3/control/shutdown deleted orphaned node /local/domain/3/control/feature-poweroff deleted orphaned node /local/domain/3/control/feature-reboot deleted orphaned node /local/domain/3/control/feature-suspend deleted orphaned node /local/domain/3/control/feature-s3 deleted orphaned node /local/domain/3/control/feature-s4 deleted orphaned node /local/domain/3/control/sysrq deleted orphaned node /local/domain/3/data deleted orphaned node /local/domain/3/drivers deleted orphaned node /local/domain/3/feature deleted orphaned node /local/domain/3/attr deleted orphaned node /local/domain/3/error deleted orphaned node /local/domain/3/console/backend-id deleted and no further output. The trace shows that DESTROY was called for connection 0x559fae724290, but that is the same pointer (conn) main() was looping through from connections. So it wasn't actually removed from the connections list? Reverting commit e8e6e42279a5 "tools/xenstore: simplify loop handling connection I/O" fixes the abort/double free. I think the use of list_for_each_entry_safe is incorrect. list_for_each_entry_safe makes traversal safe for deleting the current iterator, but RELEASE/do_release will delete some other entry in the connections list. I think the observed abort is because list_for_each_entry has next pointing to the deleted connection, and it is used in the subsequent iteration. Add a comment explaining the unsuitability of list_for_each_entry_safe. Also notice that the old code takes a reference on next which would prevents a use-after-free. This reverts commit e8e6e42279a5723239c5c40ba4c7f579a979465d. This is XSA-425/CVE-2022-42330. Fixes: e8e6e42279a5 ("tools/xenstore: simplify loop handling connection I/O") Signed-off-by: Jason Andryuk Reviewed-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 476d5c6d51..56dbdc2530 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2935,8 +2935,23 @@ int main(int argc, char *argv[]) } } - list_for_each_entry_safe(conn, next, &connections, list) { - talloc_increase_ref_count(conn); + /* + * list_for_each_entry_safe is not suitable here because + * handle_input may delete entries besides the current one, but + * those may be in the temporary next which would trigger a + * use-after-free. list_for_each_entry_safe is only safe for + * deleting the current entry. + */ + next = list_entry(connections.next, typeof(*conn), list); + if (&next->list != &connections) + talloc_increase_ref_count(next); + while (&next->list != &connections) { + conn = next; + + next = list_entry(conn->list.next, + typeof(*conn), list); + if (&next->list != &connections) + talloc_increase_ref_count(next); if (conn_can_read(conn)) handle_input(conn); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:11:10 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:11:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489677.758014 (Exim 4.92) (envelope-from ) id 1pOWMq-0007mP-LL; Sun, 05 Feb 2023 04:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489677.758014; Sun, 05 Feb 2023 04:11:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWMq-0007mH-ID; Sun, 05 Feb 2023 04:11:04 +0000 Received: by outflank-mailman (input) for mailman id 489677; Sun, 05 Feb 2023 04:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWMo-0007m9-Ms for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWMo-0000qZ-L0 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWMo-0008Cn-Jr for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fWuJBRahXjv3BEzjh3yhb4GJGUxmqaZVZEyucRW7+DA=; b=bt4DpLV1QGrGuw2OSJAhMiup+s uG7JqK6+t2F+cia6mKfRGNlzKdsohtvzrb8NT/IjQj1e8E1tzW+wPfcP3+AqSngRFZO6ztBXGNf61 FF1SCPvKgCWUkwrJk90TMCSKDpwXm7wSI8R9dmmttzxseaNmVUzZZL41KUCYbpCdwA78=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: split populating of struct vcpu_time_info into a separate function Message-Id: Date: Sun, 05 Feb 2023 04:11:02 +0000 commit 20279afd732371dd2534380d27aa6d1863d82d1f Author: Jan Beulich AuthorDate: Fri Jan 20 09:12:48 2023 +0100 Commit: Jan Beulich CommitDate: Fri Jan 20 09:12:48 2023 +0100 x86: split populating of struct vcpu_time_info into a separate function This is to facilitate subsequent re-use of this code. While doing so add const in a number of places, extending to gtime_to_gtsc() and then for symmetry also its inverse function. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/include/asm/time.h | 4 ++-- xen/arch/x86/time.c | 51 +++++++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/xen/arch/x86/include/asm/time.h b/xen/arch/x86/include/asm/time.h index 2a57d930ef..dc2e636916 100644 --- a/xen/arch/x86/include/asm/time.h +++ b/xen/arch/x86/include/asm/time.h @@ -52,8 +52,8 @@ uint64_t cf_check acpi_pm_tick_to_ns(uint64_t ticks); uint64_t tsc_ticks2ns(uint64_t ticks); uint64_t pv_soft_rdtsc(const struct vcpu *v, const struct cpu_user_regs *regs); -u64 gtime_to_gtsc(struct domain *d, u64 time); -u64 gtsc_to_gtime(struct domain *d, u64 tsc); +uint64_t gtime_to_gtsc(const struct domain *d, uint64_t time); +uint64_t gtsc_to_gtime(const struct domain *d, uint64_t tsc); int tsc_set_info(struct domain *d, uint32_t tsc_mode, uint64_t elapsed_nsec, uint32_t gtsc_khz, uint32_t incarnation); diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index d882b43cf0..7bee4f784f 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1373,18 +1373,14 @@ uint64_t tsc_ticks2ns(uint64_t ticks) return scale_delta(ticks, &t->tsc_scale); } -static void __update_vcpu_system_time(struct vcpu *v, int force) +static void collect_time_info(const struct vcpu *v, + struct vcpu_time_info *u) { - const struct cpu_time *t; - struct vcpu_time_info *u, _u = {}; - struct domain *d = v->domain; + const struct cpu_time *t = &this_cpu(cpu_time); + const struct domain *d = v->domain; s_time_t tsc_stamp; - if ( v->vcpu_info == NULL ) - return; - - t = &this_cpu(cpu_time); - u = &vcpu_info(v, time); + memset(u, 0, sizeof(*u)); if ( d->arch.vtsc ) { @@ -1392,7 +1388,7 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) if ( is_hvm_domain(d) ) { - struct pl_time *pl = v->domain->arch.hvm.pl_time; + const struct pl_time *pl = d->arch.hvm.pl_time; stime += pl->stime_offset + v->arch.hvm.stime_offset; if ( stime >= 0 ) @@ -1403,27 +1399,27 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) else tsc_stamp = gtime_to_gtsc(d, stime); - _u.tsc_to_system_mul = d->arch.vtsc_to_ns.mul_frac; - _u.tsc_shift = d->arch.vtsc_to_ns.shift; + u->tsc_to_system_mul = d->arch.vtsc_to_ns.mul_frac; + u->tsc_shift = d->arch.vtsc_to_ns.shift; } else { if ( is_hvm_domain(d) && hvm_tsc_scaling_supported ) { tsc_stamp = hvm_scale_tsc(d, t->stamp.local_tsc); - _u.tsc_to_system_mul = d->arch.vtsc_to_ns.mul_frac; - _u.tsc_shift = d->arch.vtsc_to_ns.shift; + u->tsc_to_system_mul = d->arch.vtsc_to_ns.mul_frac; + u->tsc_shift = d->arch.vtsc_to_ns.shift; } else { tsc_stamp = t->stamp.local_tsc; - _u.tsc_to_system_mul = t->tsc_scale.mul_frac; - _u.tsc_shift = t->tsc_scale.shift; + u->tsc_to_system_mul = t->tsc_scale.mul_frac; + u->tsc_shift = t->tsc_scale.shift; } } - _u.tsc_timestamp = tsc_stamp; - _u.system_time = t->stamp.local_stime; + u->tsc_timestamp = tsc_stamp; + u->system_time = t->stamp.local_stime; /* * It's expected that domains cope with this bit changing on every @@ -1431,10 +1427,21 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) * or if it further requires monotonicity checks with other vcpus. */ if ( clocksource_is_tsc() ) - _u.flags |= XEN_PVCLOCK_TSC_STABLE_BIT; + u->flags |= XEN_PVCLOCK_TSC_STABLE_BIT; if ( is_hvm_domain(d) ) - _u.tsc_timestamp += v->arch.hvm.cache_tsc_offset; + u->tsc_timestamp += v->arch.hvm.cache_tsc_offset; +} + +static void __update_vcpu_system_time(struct vcpu *v, int force) +{ + struct vcpu_time_info *u = &vcpu_info(v, time), _u; + const struct domain *d = v->domain; + + if ( v->vcpu_info == NULL ) + return; + + collect_time_info(v, &_u); /* Don't bother unless timestamp record has changed or we are forced. */ _u.version = u->version; /* make versions match for memcmp test */ @@ -2476,7 +2483,7 @@ static int __init cf_check tsc_parse(const char *s) } custom_param("tsc", tsc_parse); -u64 gtime_to_gtsc(struct domain *d, u64 time) +uint64_t gtime_to_gtsc(const struct domain *d, uint64_t time) { if ( !is_hvm_domain(d) ) { @@ -2488,7 +2495,7 @@ u64 gtime_to_gtsc(struct domain *d, u64 time) return scale_delta(time, &d->arch.ns_to_vtsc); } -u64 gtsc_to_gtime(struct domain *d, u64 tsc) +uint64_t gtsc_to_gtime(const struct domain *d, uint64_t tsc) { u64 time = scale_delta(tsc, &d->arch.vtsc_to_ns); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:11:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489678.758018 (Exim 4.92) (envelope-from ) id 1pOWN0-0007oo-NI; Sun, 05 Feb 2023 04:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489678.758018; Sun, 05 Feb 2023 04:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWN0-0007oh-K7; Sun, 05 Feb 2023 04:11:14 +0000 Received: by outflank-mailman (input) for mailman id 489678; Sun, 05 Feb 2023 04:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWMy-0007oL-QG for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWMy-0000qh-PV for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWMy-0008DL-No for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XigbXQuvCQNqcX0+089nDIfo54PAVw6eQdDLY+o9U28=; b=eL1XSL5mQt70jDLL7w7GHveyjV 8eM1FUyqLt8QzZEuOIh9eYHth9kUjZb1eKfIMGsTMAtuq94npYc2ELEbh1hJWoytr0e+wFTOwW9Ri 4DnWyifht7LuCfl2pOyCXkwiBwtC/CMF5mGrsnAZh2iGSqVViiEs1g1mhWsSJ8aUId1A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: L2H shadow type is PV32-only Message-Id: Date: Sun, 05 Feb 2023 04:11:12 +0000 commit 1894049fa283308d5f90446370be1ade7afe8975 Author: Jan Beulich AuthorDate: Fri Jan 20 09:17:33 2023 +0100 Commit: Jan Beulich CommitDate: Fri Jan 20 09:17:33 2023 +0100 x86/shadow: L2H shadow type is PV32-only Like for the various HVM-only types, save a little bit of code by suitably "masking" this type out when !PV32. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/mm/shadow/common.c | 12 +++++++++++ xen/arch/x86/mm/shadow/hvm.c | 2 +- xen/arch/x86/mm/shadow/multi.c | 43 ++++++++++++++++++++++++---------------- xen/arch/x86/mm/shadow/private.h | 8 ++++++++ 4 files changed, 47 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 8b4bea5f92..26901b8b3b 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1791,9 +1791,11 @@ void sh_destroy_shadow(struct domain *d, mfn_t smfn) case SH_type_fl1_64_shadow: SHADOW_INTERNAL_NAME(sh_destroy_l1_shadow, 4)(d, smfn); break; +#ifdef CONFIG_PV32 case SH_type_l2h_64_shadow: ASSERT(is_pv_32bit_domain(d)); /* Fall through... */ +#endif case SH_type_l2_64_shadow: SHADOW_INTERNAL_NAME(sh_destroy_l2_shadow, 4)(d, smfn); break; @@ -2146,7 +2148,9 @@ static int sh_remove_shadow_via_pointer(struct domain *d, mfn_t smfn) #endif case SH_type_l1_64_shadow: case SH_type_l2_64_shadow: +#ifdef CONFIG_PV32 case SH_type_l2h_64_shadow: +#endif case SH_type_l3_64_shadow: case SH_type_l4_64_shadow: SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, 4)(d, vaddr, pmfn); @@ -2184,7 +2188,9 @@ void sh_remove_shadows(struct domain *d, mfn_t gmfn, int fast, int all) [SH_type_l2_pae_shadow] = SHADOW_INTERNAL_NAME(sh_remove_l1_shadow, 3), #endif [SH_type_l2_64_shadow] = SHADOW_INTERNAL_NAME(sh_remove_l1_shadow, 4), +#ifdef CONFIG_PV32 [SH_type_l2h_64_shadow] = SHADOW_INTERNAL_NAME(sh_remove_l1_shadow, 4), +#endif [SH_type_l3_64_shadow] = SHADOW_INTERNAL_NAME(sh_remove_l2_shadow, 4), [SH_type_l4_64_shadow] = SHADOW_INTERNAL_NAME(sh_remove_l3_shadow, 4), }; @@ -2197,7 +2203,9 @@ void sh_remove_shadows(struct domain *d, mfn_t gmfn, int fast, int all) #endif [SH_type_l1_64_shadow] = SHF_L2H_64 | SHF_L2_64, [SH_type_l2_64_shadow] = SHF_L3_64, +#ifdef CONFIG_PV32 [SH_type_l2h_64_shadow] = SHF_L3_64, +#endif [SH_type_l3_64_shadow] = SHF_L4_64, }; @@ -2261,7 +2269,9 @@ void sh_remove_shadows(struct domain *d, mfn_t gmfn, int fast, int all) #endif DO_UNSHADOW(SH_type_l4_64_shadow); DO_UNSHADOW(SH_type_l3_64_shadow); +#ifdef CONFIG_PV32 DO_UNSHADOW(SH_type_l2h_64_shadow); +#endif DO_UNSHADOW(SH_type_l2_64_shadow); DO_UNSHADOW(SH_type_l1_64_shadow); @@ -3268,7 +3278,9 @@ void shadow_audit_tables(struct vcpu *v) [SH_type_l1_64_shadow] = SHADOW_INTERNAL_NAME(sh_audit_l1_table, 4), [SH_type_fl1_64_shadow] = SHADOW_INTERNAL_NAME(sh_audit_fl1_table, 4), [SH_type_l2_64_shadow] = SHADOW_INTERNAL_NAME(sh_audit_l2_table, 4), +# ifdef CONFIG_PV32 [SH_type_l2h_64_shadow] = SHADOW_INTERNAL_NAME(sh_audit_l2_table, 4), +# endif [SH_type_l3_64_shadow] = SHADOW_INTERNAL_NAME(sh_audit_l3_table, 4), [SH_type_l4_64_shadow] = SHADOW_INTERNAL_NAME(sh_audit_l4_table, 4), #endif diff --git a/xen/arch/x86/mm/shadow/hvm.c b/xen/arch/x86/mm/shadow/hvm.c index f14fc42eab..918865cf1b 100644 --- a/xen/arch/x86/mm/shadow/hvm.c +++ b/xen/arch/x86/mm/shadow/hvm.c @@ -56,7 +56,7 @@ const uint8_t sh_type_to_size[] = { [SH_type_l1_64_shadow] = 1, [SH_type_fl1_64_shadow] = 1, [SH_type_l2_64_shadow] = 1, - [SH_type_l2h_64_shadow] = 1, +/* [SH_type_l2h_64_shadow] = 1, PV32-only */ [SH_type_l3_64_shadow] = 1, [SH_type_l4_64_shadow] = 1, [SH_type_p2m_table] = 1, diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index cd5a778d52..eb90bf2b15 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -97,6 +97,13 @@ static void sh_flush_local(const struct domain *d) flush_local(guest_flush_tlb_flags(d)); } +#if GUEST_PAGING_LEVELS >= 4 && defined(CONFIG_PV32) +#define ASSERT_VALID_L2(t) \ + ASSERT((t) == SH_type_l2_shadow || (t) == SH_type_l2h_shadow) +#else +#define ASSERT_VALID_L2(t) ASSERT((t) == SH_type_l2_shadow) +#endif + /**************************************************************************/ /* Hash table mapping from guest pagetables to shadows * @@ -337,7 +344,7 @@ static void sh_audit_gw(struct vcpu *v, const walk_t *gw) if ( mfn_valid((smfn = get_shadow_status(d, gw->l2mfn, SH_type_l2_shadow))) ) (void) sh_audit_l2_table(v, smfn, INVALID_MFN); -#if GUEST_PAGING_LEVELS >= 4 /* 32-bit PV only */ +#if GUEST_PAGING_LEVELS >= 4 && defined(CONFIG_PV32) if ( mfn_valid((smfn = get_shadow_status(d, gw->l2mfn, SH_type_l2h_shadow))) ) (void) sh_audit_l2_table(v, smfn, INVALID_MFN); @@ -859,13 +866,12 @@ do { \ int _i; \ int _xen = !shadow_mode_external(_dom); \ shadow_l2e_t *_sp = map_domain_page((_sl2mfn)); \ - ASSERT(mfn_to_page(_sl2mfn)->u.sh.type == SH_type_l2_64_shadow ||\ - mfn_to_page(_sl2mfn)->u.sh.type == SH_type_l2h_64_shadow);\ + ASSERT_VALID_L2(mfn_to_page(_sl2mfn)->u.sh.type); \ for ( _i = 0; _i < SHADOW_L2_PAGETABLE_ENTRIES; _i++ ) \ { \ if ( (!(_xen)) \ || !is_pv_32bit_domain(_dom) \ - || mfn_to_page(_sl2mfn)->u.sh.type != SH_type_l2h_64_shadow \ + || mfn_to_page(_sl2mfn)->u.sh.type == SH_type_l2_64_shadow \ || (_i < COMPAT_L2_PAGETABLE_FIRST_XEN_SLOT(_dom)) ) \ { \ (_sl2e) = _sp + _i; \ @@ -989,6 +995,7 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) } break; +#ifdef CONFIG_PV32 case SH_type_l2h_shadow: BUILD_BUG_ON(sizeof(l2_pgentry_t) != sizeof(shadow_l2e_t)); if ( is_pv_32bit_domain(d) ) @@ -999,6 +1006,8 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) unmap_domain_page(l2t); } break; +#endif + default: /* Do nothing */ break; } } @@ -1120,11 +1129,13 @@ static shadow_l2e_t * shadow_get_and_create_l2e(struct vcpu *v, shadow_l3e_t new_sl3e; unsigned int t = SH_type_l2_shadow; +#ifdef CONFIG_PV32 /* Tag compat L2 containing hypervisor (m2p) mappings */ if ( is_pv_32bit_domain(d) && guest_l4_table_offset(gw->va) == 0 && guest_l3_table_offset(gw->va) == 3 ) t = SH_type_l2h_shadow; +#endif /* No l2 shadow installed: find and install it. */ *sl2mfn = get_shadow_status(d, gw->l2mfn, t); @@ -1334,11 +1345,7 @@ void sh_destroy_l2_shadow(struct domain *d, mfn_t smfn) SHADOW_DEBUG(DESTROY_SHADOW, "%"PRI_mfn"\n", mfn_x(smfn)); -#if GUEST_PAGING_LEVELS >= 4 - ASSERT(t == SH_type_l2_shadow || t == SH_type_l2h_shadow); -#else - ASSERT(t == SH_type_l2_shadow); -#endif + ASSERT_VALID_L2(t); ASSERT(sp->u.sh.head); /* Record that the guest page isn't shadowed any more (in this type) */ @@ -1862,7 +1869,7 @@ int sh_map_and_validate_gl2he(struct vcpu *v, mfn_t gl2mfn, void *new_gl2p, u32 size) { -#if GUEST_PAGING_LEVELS >= 4 +#if GUEST_PAGING_LEVELS >= 4 && defined(CONFIG_PV32) return sh_map_and_validate(v, gl2mfn, new_gl2p, size, SH_type_l2h_shadow, shadow_l2_index, @@ -3647,7 +3654,7 @@ void sh_clear_shadow_entry(struct domain *d, void *ep, mfn_t smfn) shadow_set_l1e(d, ep, shadow_l1e_empty(), p2m_invalid, smfn); break; case SH_type_l2_shadow: -#if GUEST_PAGING_LEVELS >= 4 +#if GUEST_PAGING_LEVELS >= 4 && defined(CONFIG_PV32) case SH_type_l2h_shadow: #endif shadow_set_l2e(d, ep, shadow_l2e_empty(), smfn); @@ -4100,14 +4107,16 @@ int cf_check sh_audit_l3_table(struct vcpu *v, mfn_t sl3mfn, mfn_t x) if ( SHADOW_AUDIT & SHADOW_AUDIT_ENTRIES_MFNS ) { + unsigned int t = SH_type_l2_shadow; + gfn = guest_l3e_get_gfn(*gl3e); mfn = shadow_l3e_get_mfn(*sl3e); - gmfn = get_shadow_status(d, get_gfn_query_unlocked( - d, gfn_x(gfn), &p2mt), - (is_pv_32bit_domain(d) && - guest_index(gl3e) == 3) - ? SH_type_l2h_shadow - : SH_type_l2_shadow); +#ifdef CONFIG_PV32 + if ( guest_index(gl3e) == 3 && is_pv_32bit_domain(d) ) + t = SH_type_l2h_shadow; +#endif + gmfn = get_shadow_status( + d, get_gfn_query_unlocked(d, gfn_x(gfn), &p2mt), t); if ( !mfn_eq(gmfn, mfn) ) AUDIT_FAIL(3, "bad translation: gfn %" SH_PRI_gfn " --> %" PRI_mfn " != mfn %" PRI_mfn, diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index f080baff79..7d6c846c80 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -209,6 +209,10 @@ extern void shadow_audit_tables(struct vcpu *v); #define SH_type_unused 10U #endif +#ifndef CONFIG_PV32 /* Unused (but uglier to #ifdef above): */ +#undef SH_type_l2h_64_shadow +#endif + /* * What counts as a pinnable shadow? */ @@ -286,7 +290,11 @@ static inline void sh_terminate_list(struct page_list_head *tmp_list) #define SHF_L1_64 (1u << SH_type_l1_64_shadow) #define SHF_FL1_64 (1u << SH_type_fl1_64_shadow) #define SHF_L2_64 (1u << SH_type_l2_64_shadow) +#ifdef CONFIG_PV32 #define SHF_L2H_64 (1u << SH_type_l2h_64_shadow) +#else +#define SHF_L2H_64 0 +#endif #define SHF_L3_64 (1u << SH_type_l3_64_shadow) #define SHF_L4_64 (1u << SH_type_l4_64_shadow) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:11:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:11:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489679.758021 (Exim 4.92) (envelope-from ) id 1pOWNA-0007ry-Oq; Sun, 05 Feb 2023 04:11:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489679.758021; Sun, 05 Feb 2023 04:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWNA-0007rq-M2; Sun, 05 Feb 2023 04:11:24 +0000 Received: by outflank-mailman (input) for mailman id 489679; Sun, 05 Feb 2023 04:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWN8-0007rR-TB for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWN8-0000r2-SP for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWN8-0008Do-Ro for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kIxVOX0sNubq5nox51HTa2YOJgwuT30J77EfhXLKEvU=; b=fz83MDAq+3n9/10rXpdBNRHv5l UHUGA0e4mGecfwzaeFnXg+7wr6BBB0C6Z3tucr0I8lP8JWy5V3EikezUVQVfNvWqtVHPSp7BQtHFa SIZKC4wQ9ZWOgoxgVrefw8cnmj0cWgm8wQPHRdkHqlMmL2N1+4xXjodjxiJltZ4R8Agk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] include/types: move stddef.h-kind types to common header Message-Id: Date: Sun, 05 Feb 2023 04:11:22 +0000 commit 321b1b5eb351a5836d26817d7db48052e623b411 Author: Jan Beulich AuthorDate: Fri Jan 20 09:18:39 2023 +0100 Commit: Jan Beulich CommitDate: Fri Jan 20 09:18:39 2023 +0100 include/types: move stddef.h-kind types to common header size_t, ssize_t, and ptrdiff_t are all expected to be uniformly defined on any ports Xen might gain. In particular I hope new ports can rely on __SIZE_TYPE__ and __PTRDIFF_TYPE__ being made available by the compiler. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Julien Grall --- xen/arch/arm/include/asm/types.h | 13 ------------- xen/arch/x86/include/asm/types.h | 13 ------------- xen/include/xen/types.h | 13 +++++++++++++ 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/xen/arch/arm/include/asm/types.h b/xen/arch/arm/include/asm/types.h index 083acbd151..576e971fe1 100644 --- a/xen/arch/arm/include/asm/types.h +++ b/xen/arch/arm/include/asm/types.h @@ -54,19 +54,6 @@ typedef u64 register_t; #define PRIregister "016lx" #endif -#if defined(__SIZE_TYPE__) -typedef __SIZE_TYPE__ size_t; -#else -typedef unsigned long size_t; -#endif -typedef signed long ssize_t; - -#if defined(__PTRDIFF_TYPE__) -typedef __PTRDIFF_TYPE__ ptrdiff_t; -#else -typedef signed long ptrdiff_t; -#endif - #endif /* __ASSEMBLY__ */ #endif /* __ARM_TYPES_H__ */ diff --git a/xen/arch/x86/include/asm/types.h b/xen/arch/x86/include/asm/types.h index 7817132048..0e9cfdece8 100644 --- a/xen/arch/x86/include/asm/types.h +++ b/xen/arch/x86/include/asm/types.h @@ -32,19 +32,6 @@ typedef unsigned long paddr_t; #define INVALID_PADDR (~0UL) #define PRIpaddr "016lx" -#if defined(__SIZE_TYPE__) -typedef __SIZE_TYPE__ size_t; -#else -typedef unsigned long size_t; -#endif -typedef signed long ssize_t; - -#if defined(__PTRDIFF_TYPE__) -typedef __PTRDIFF_TYPE__ ptrdiff_t; -#else -typedef signed long ptrdiff_t; -#endif - #endif /* __ASSEMBLY__ */ #endif /* __X86_TYPES_H__ */ diff --git a/xen/include/xen/types.h b/xen/include/xen/types.h index 03f0fe612e..6aba80500a 100644 --- a/xen/include/xen/types.h +++ b/xen/include/xen/types.h @@ -5,6 +5,19 @@ #include +#if defined(__SIZE_TYPE__) +typedef __SIZE_TYPE__ size_t; +#else +typedef unsigned long size_t; +#endif +typedef signed long ssize_t; + +#if defined(__PTRDIFF_TYPE__) +typedef __PTRDIFF_TYPE__ ptrdiff_t; +#else +typedef signed long ptrdiff_t; +#endif + #define BITS_TO_LONGS(bits) \ (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG) #define DECLARE_BITMAP(name,bits) \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:11:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489680.758026 (Exim 4.92) (envelope-from ) id 1pOWNK-0007v6-Ri; Sun, 05 Feb 2023 04:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489680.758026; Sun, 05 Feb 2023 04:11:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWNK-0007uy-Ow; Sun, 05 Feb 2023 04:11:34 +0000 Received: by outflank-mailman (input) for mailman id 489680; Sun, 05 Feb 2023 04:11:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWNJ-0007ud-0m for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWNI-0000rH-Vs for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWNI-0008EF-Uo for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gkCn2Rp+KR8woUtLzfKnBSrH+lJcc+I2MX5HpY7mUuM=; b=QdpSoNAVZEztRQLamieETtFDHS tK7kPaWq2hdRI3hIru5ZlBVGyCrv6QxttvknxGsVUjTw8MGE5QcTnDJ72Ykm9N73xsidUwUauAoth /Bzg7Tb5kSqVx41xWGw+Xt0ZQMDpzgySqJ/C3zSYlixjTu7z5p+TRVlhlny6tSIgi9EM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: further correct MMIO handling in _sh_propagate() Message-Id: Date: Sun, 05 Feb 2023 04:11:32 +0000 commit 1d99732f2b092173d8600fa818aee3fa51046bb0 Author: Jan Beulich AuthorDate: Fri Jan 20 09:20:26 2023 +0100 Commit: Jan Beulich CommitDate: Fri Jan 20 09:20:26 2023 +0100 x86/shadow: further correct MMIO handling in _sh_propagate() While c61a6f74f80e ("x86: enforce consistent cachability of MMIO mappings") correctly converted one !mfn_valid() check there, two others were wrongly left untouched: Both cachability control and log-dirty tracking ought to be uniformly handled/excluded for all (non-)MMIO ranges, not just ones qualifiable by mfn_valid(). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/mm/shadow/multi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index eb90bf2b15..98c0b7302a 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -550,8 +550,7 @@ _sh_propagate(struct vcpu *v, * caching attributes in the shadows to match what was asked for. */ if ( (level == 1) && is_hvm_domain(d) && - (!mfn_valid(target_mfn) || - !is_special_page(mfn_to_page(target_mfn))) ) + (mmio_mfn || !is_special_page(mfn_to_page(target_mfn))) ) { int type; @@ -662,8 +661,7 @@ _sh_propagate(struct vcpu *v, * (We handle log-dirty entirely inside the shadow code, without using the * p2m_ram_logdirty p2m type: only HAP uses that.) */ - if ( level == 1 && unlikely(shadow_mode_log_dirty(d)) && - mfn_valid(target_mfn) ) + if ( level == 1 && unlikely(shadow_mode_log_dirty(d)) && !mmio_mfn ) { if ( ft & FETCH_TYPE_WRITE ) paging_mark_dirty(d, target_mfn); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:11:45 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:11:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489681.758030 (Exim 4.92) (envelope-from ) id 1pOWNU-0007xh-Sz; Sun, 05 Feb 2023 04:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489681.758030; Sun, 05 Feb 2023 04:11:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWNU-0007xZ-QM; Sun, 05 Feb 2023 04:11:44 +0000 Received: by outflank-mailman (input) for mailman id 489681; Sun, 05 Feb 2023 04:11:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWNT-0007xP-3S for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWNT-0000rf-2d for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWNT-0008Eh-1w for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8DarLTcerqkJoYmx9LOWi8r/2RtnpXOGh4/+3098F8I=; b=JBG56DxzktAi5j6CU2l1NOEdGR ExmWEIlLrHdTvoI+YbeYKo+5YFHyznfDUQ1A5W8qpm22/6zvyTUim+Z0js7zNmqqZ8LCXWBm+Gq6e BVAIBngv7HmiXvtgjZFUHlfKE1BvD1KhMMMxUVJRo811GyPLuMFjp70Q87p7E2gTz3yQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/iommu: amd_iommu_perdev_intremap is AMD-Vi specific Message-Id: Date: Sun, 05 Feb 2023 04:11:43 +0000 commit 0b5475996ca9cd8e69e586dcc9e649ba84e62add Author: Xenia Ragiadakou AuthorDate: Fri Jan 20 09:21:37 2023 +0100 Commit: Jan Beulich CommitDate: Fri Jan 20 09:21:37 2023 +0100 x86/iommu: amd_iommu_perdev_intremap is AMD-Vi specific Move its definition to the AMD-Vi driver and use CONFIG_AMD_IOMMU to guard its usage in common code. Take the opportunity to replace bool_t with bool and 1 with true. No functional change intended. Signed-off-by: Xenia Ragiadakou Reviewed-by: Jan Beulich --- xen/drivers/passthrough/amd/iommu_init.c | 2 ++ xen/drivers/passthrough/iommu.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 1f14aaf49e..9773ccfcb4 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -36,6 +36,8 @@ static struct radix_tree_root ivrs_maps; LIST_HEAD_READ_MOSTLY(amd_iommu_head); bool_t iommuv2_enabled; +bool __ro_after_init amd_iommu_perdev_intremap = true; + static bool iommu_has_ht_flag(struct amd_iommu *iommu, u8 mask) { return iommu->ht_flags & mask; diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 5e2a720d29..9d95fb27d0 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -58,7 +58,6 @@ bool __read_mostly iommu_hap_pt_share = true; #endif bool_t __read_mostly iommu_debug; -bool_t __read_mostly amd_iommu_perdev_intremap = 1; DEFINE_PER_CPU(bool_t, iommu_dont_flush_iotlb); @@ -116,7 +115,11 @@ static int __init cf_check parse_iommu_param(const char *s) iommu_verbose = 1; } else if ( (val = parse_boolean("amd-iommu-perdev-intremap", s, ss)) >= 0 ) +#ifdef CONFIG_AMD_IOMMU amd_iommu_perdev_intremap = val; +#else + no_config_param("AMD_IOMMU", "iommu", s, ss); +#endif else if ( (val = parse_boolean("dom0-passthrough", s, ss)) >= 0 ) iommu_hwdom_passthrough = val; else if ( (val = parse_boolean("dom0-strict", s, ss)) >= 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:11:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:11:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489682.758033 (Exim 4.92) (envelope-from ) id 1pOWNe-00080O-UV; Sun, 05 Feb 2023 04:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489682.758033; Sun, 05 Feb 2023 04:11:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWNe-00080G-Rl; Sun, 05 Feb 2023 04:11:54 +0000 Received: by outflank-mailman (input) for mailman id 489682; Sun, 05 Feb 2023 04:11:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWNd-0007zs-6B for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWNd-0000s8-5U for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWNd-0008F6-4r for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:11:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sBut7nPJmQ7NyemHhKWWPEc1KVuQBiW8N36Zu+j/6IE=; b=TXvdsxbqJNeSCk5QWMg0zNv4MR xq42HHIIXdFSZeoD2zv5tiB1mapC91bvAheaRFNcMpRkqkzAtGoUwb/zscwclvsXInlci91n1agcd uz/IbyicWIa/+OJaFk1SqbuUYWSjkNFXysJw2QfFCVutY3YrC8uHADxaVxt5QLYoDFUE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/iommu: iommu_igfx and iommu_qinval are Intel VT-d specific Message-Id: Date: Sun, 05 Feb 2023 04:11:53 +0000 commit 686b80c1ae4cc338334eb5df4836df526109377a Author: Xenia Ragiadakou AuthorDate: Fri Jan 20 09:22:13 2023 +0100 Commit: Jan Beulich CommitDate: Fri Jan 20 09:22:13 2023 +0100 x86/iommu: iommu_igfx and iommu_qinval are Intel VT-d specific Use CONFIG_INTEL_IOMMU to guard the usage of iommu_igfx and iommu_qinval in common code. No functional change intended. Signed-off-by: Xenia Ragiadakou Reviewed-by: Jan Beulich --- xen/drivers/passthrough/iommu.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 9d95fb27d0..b4dfa95dfd 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -82,11 +82,19 @@ static int __init cf_check parse_iommu_param(const char *s) else if ( ss == s + 23 && !strncmp(s, "quarantine=scratch-page", 23) ) iommu_quarantine = IOMMU_quarantine_scratch_page; #endif -#ifdef CONFIG_X86 else if ( (val = parse_boolean("igfx", s, ss)) >= 0 ) +#ifdef CONFIG_INTEL_IOMMU iommu_igfx = val; +#else + no_config_param("INTEL_IOMMU", "iommu", s, ss); +#endif else if ( (val = parse_boolean("qinval", s, ss)) >= 0 ) +#ifdef CONFIG_INTEL_IOMMU iommu_qinval = val; +#else + no_config_param("INTEL_IOMMU", "iommu", s, ss); +#endif +#ifdef CONFIG_X86 else if ( (val = parse_boolean("superpages", s, ss)) >= 0 ) iommu_superpages = val; #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:12:05 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:12:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489683.758038 (Exim 4.92) (envelope-from ) id 1pOWNp-00082y-01; Sun, 05 Feb 2023 04:12:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489683.758038; Sun, 05 Feb 2023 04:12:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWNo-00082k-TN; Sun, 05 Feb 2023 04:12:04 +0000 Received: by outflank-mailman (input) for mailman id 489683; Sun, 05 Feb 2023 04:12:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWNn-00082Z-9I for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWNn-0000sX-8d for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWNn-0008Fe-7n for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GqHGsaBLGN1INGilq6iQlAxmnMfewhsfCAJklmoE/vo=; b=vibZn8qfB+NtEFdkrpcAMGzr67 4UCwtYBpBnkPdpIRUVdZXHF/gZIqAK1ALcGDBjZuOZ6S1ZIjbFKDKNIIzTxBTbiHRbhfG8ESfeKoH YUWEY9+L34HLKdihvpwR0xpPv0AEvtS2CInxyTZH5iWEaJNwEcL/N+043+ELbPr+nll4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/acpi: separate AMD-Vi and VT-d specific functions Message-Id: Date: Sun, 05 Feb 2023 04:12:03 +0000 commit 41dbbfb5966f2517916333d1885ee68018161f48 Author: Xenia Ragiadakou AuthorDate: Fri Jan 20 09:22:42 2023 +0100 Commit: Jan Beulich CommitDate: Fri Jan 20 09:22:42 2023 +0100 x86/acpi: separate AMD-Vi and VT-d specific functions The functions acpi_dmar_init() and acpi_dmar_zap/reinstate() are VT-d specific while the function acpi_ivrs_init() is AMD-Vi specific. To eliminate dead code, they need to be guarded under CONFIG_INTEL_IOMMU and CONFIG_AMD_IOMMU, respectively. Instead of adding #ifdef guards around the function calls, implement them as empty static inline functions. Take the opportunity to move the declaration of acpi_dmar_init from the x86 arch-specific header to the common header, since Intel VT-d has been also used on IA-64 platforms. No functional change intended. Signed-off-by: Xenia Ragiadakou Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/acpi.h | 6 +++++- xen/include/xen/acpi.h | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/acpi.h b/xen/arch/x86/include/asm/acpi.h index c453450a74..6ce79ce465 100644 --- a/xen/arch/x86/include/asm/acpi.h +++ b/xen/arch/x86/include/asm/acpi.h @@ -140,8 +140,12 @@ extern u32 pmtmr_ioport; extern unsigned int pmtmr_width; void acpi_iommu_init(void); -int acpi_dmar_init(void); + +#ifdef CONFIG_AMD_IOMMU int acpi_ivrs_init(void); +#else +static inline int acpi_ivrs_init(void) { return -ENODEV; } +#endif void acpi_mmcfg_init(void); diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index 1b9c75e68f..352f27f6a7 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -206,8 +206,15 @@ static inline int acpi_get_pxm(acpi_handle handle) void acpi_reboot(void); +#ifdef CONFIG_INTEL_IOMMU +int acpi_dmar_init(void); void acpi_dmar_zap(void); void acpi_dmar_reinstate(void); +#else +static inline int acpi_dmar_init(void) { return -ENODEV; } +static inline void acpi_dmar_zap(void) {} +static inline void acpi_dmar_reinstate(void) {} +#endif #endif /* __ASSEMBLY__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:12:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489684.758041 (Exim 4.92) (envelope-from ) id 1pOWNy-00085v-1I; Sun, 05 Feb 2023 04:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489684.758041; Sun, 05 Feb 2023 04:12:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWNx-00085o-Ux; Sun, 05 Feb 2023 04:12:13 +0000 Received: by outflank-mailman (input) for mailman id 489684; Sun, 05 Feb 2023 04:12:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWNx-00085X-Cg for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWNx-0000sk-Bp for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWNx-0008G3-B3 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BE6az6ZMqydIYg2+KXov/iUhHjZB6gVL8LXYYTEzfw4=; b=amv+m96oXeN/v6XqKADpwY5lXm 6zADdgf22qjuBTpMlX7Crva6TUKUFWNyMO7ttZTEx9YU4sLF4DjhNPESEXXOswGUxsR0DixeOomiZ NA+yoCIAiwYpS0F7gZRY0WmkTBb0HwlTEDv/d8zOgfnR1P+/RkvTrOJORMf3Zq9qKp98=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: fix PAE check for top-level table unshadowing Message-Id: Date: Sun, 05 Feb 2023 04:12:13 +0000 commit f8fdceefbb1193ec81667eb40b83bc525cb71204 Author: Jan Beulich AuthorDate: Fri Jan 20 09:23:42 2023 +0100 Commit: Jan Beulich CommitDate: Fri Jan 20 09:23:42 2023 +0100 x86/shadow: fix PAE check for top-level table unshadowing Clearly within the for_each_vcpu() the vCPU of this loop is meant, not the (loop invariant) one the fault occurred on. Fixes: 3d5e6a3ff383 ("x86 hvm: implement HVMOP_pagetable_dying") Fixes: ef3b0d8d2c39 ("x86/shadow: shadow_table[] needs only one entry for PV-only configs") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/mm/shadow/multi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 98c0b7302a..8b3e678fa0 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2677,10 +2677,10 @@ static int cf_check sh_page_fault( #if GUEST_PAGING_LEVELS == 3 unsigned int i; - for_each_shadow_table(v, i) + for_each_shadow_table(tmp, i) { mfn_t smfn = pagetable_get_mfn( - v->arch.paging.shadow.shadow_table[i]); + tmp->arch.paging.shadow.shadow_table[i]); if ( mfn_x(smfn) ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:12:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:12:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489685.758046 (Exim 4.92) (envelope-from ) id 1pOWO8-000895-32; Sun, 05 Feb 2023 04:12:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489685.758046; Sun, 05 Feb 2023 04:12:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWO8-00088x-0L; Sun, 05 Feb 2023 04:12:24 +0000 Received: by outflank-mailman (input) for mailman id 489685; Sun, 05 Feb 2023 04:12:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWO7-00088p-GJ for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWO7-0000sz-Ei for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWO7-0008GU-E6 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Iz91euESOb3hBZ89tkVqO9xQYBfgse/0Vep+HSZ1FJM=; b=0QFBG8wmRNx9Wo8lebmx+d47Bi NCxW817DS+xQOo3d7gPlYQHyepDnxVkxem7gwvpQGTOuQT+QluWmTlT0KiT2yVVMnvYSni+KpVhbJ SDpq1XRWbqLjkD1fDifgucbFvCh+qH1mdiwTA39vuWwdWAZ1E4u7D13fBnphRHAwRkcg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/include: change to in early_printk.h Message-Id: Date: Sun, 05 Feb 2023 04:12:23 +0000 commit ee8c636dd4e8782116b1644e1cd209dbe4125c7d Author: Oleksii Kurochko AuthorDate: Fri Jan 20 09:24:20 2023 +0100 Commit: Jan Beulich CommitDate: Fri Jan 20 09:24:20 2023 +0100 xen/include: change to in early_printk.h In the patch "include/types: move stddef.h-kind types to common header" [1] size_t was moved from to so early_printk should be updated correspondingly. [1] https://lore.kernel.org/xen-devel/5a0a9e2a-c116-21b5-8081-db75fe4178d7@suse.com/ Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/include/xen/early_printk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/xen/early_printk.h b/xen/include/xen/early_printk.h index abb34687da..5d72293793 100644 --- a/xen/include/xen/early_printk.h +++ b/xen/include/xen/early_printk.h @@ -4,7 +4,7 @@ #ifndef __XEN_EARLY_PRINTK_H__ #define __XEN_EARLY_PRINTK_H__ -#include +#include #ifdef CONFIG_EARLY_PRINTK void early_puts(const char *s, size_t nr); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:12:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:12:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489686.758049 (Exim 4.92) (envelope-from ) id 1pOWOI-0008Bu-4P; Sun, 05 Feb 2023 04:12:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489686.758049; Sun, 05 Feb 2023 04:12:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWOI-0008Bn-1u; Sun, 05 Feb 2023 04:12:34 +0000 Received: by outflank-mailman (input) for mailman id 489686; Sun, 05 Feb 2023 04:12:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWOH-0008Bc-Is for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWOH-0000tA-I8 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWOH-0008H5-Gt for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eWG8Qqcf9WEfMAWBZw6A4l2IvPasogNEJ88PBJiy570=; b=paGJKoa6DElc1NtBOKCvUmDFim sg3Ft4V1wJ0gR2plGKZtIydGqe+WKw6g2CXtEJrKyavrmI9fzVHGefT2QQtxfkZaVNMoLKNq5fp6b /YCH63W6LQqs/mgWRfvacCor1+iyDP1+4cznJP2km9BKDnXEYBbIeMGRDxoFXt/g9jfU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce asm/types.h header file Message-Id: Date: Sun, 05 Feb 2023 04:12:33 +0000 commit 0c9c951e6fba035c53a79832ed20c21824bef6af Author: Oleksii Kurochko AuthorDate: Fri Jan 20 09:25:44 2023 +0100 Commit: Jan Beulich CommitDate: Fri Jan 20 09:25:44 2023 +0100 xen/riscv: introduce asm/types.h header file Signed-off-by: Oleksii Kurochko Reviewed-by: Alistair Francis --- xen/arch/riscv/include/asm/types.h | 70 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/xen/arch/riscv/include/asm/types.h b/xen/arch/riscv/include/asm/types.h new file mode 100644 index 0000000000..64976f118d --- /dev/null +++ b/xen/arch/riscv/include/asm/types.h @@ -0,0 +1,70 @@ +#ifndef __RISCV_TYPES_H__ +#define __RISCV_TYPES_H__ + +#ifndef __ASSEMBLY__ + +typedef __signed__ char __s8; +typedef unsigned char __u8; + +typedef __signed__ short __s16; +typedef unsigned short __u16; + +typedef __signed__ int __s32; +typedef unsigned int __u32; + +#if defined(__GNUC__) && !defined(__STRICT_ANSI__) +#if defined(CONFIG_RISCV_32) +typedef __signed__ long long __s64; +typedef unsigned long long __u64; +#elif defined (CONFIG_RISCV_64) +typedef __signed__ long __s64; +typedef unsigned long __u64; +#endif +#endif + +typedef signed char s8; +typedef unsigned char u8; + +typedef signed short s16; +typedef unsigned short u16; + +typedef signed int s32; +typedef unsigned int u32; + +#if defined(CONFIG_RISCV_32) + +typedef signed long long s64; +typedef unsigned long long u64; +typedef u32 vaddr_t; +#define PRIvaddr PRIx32 +typedef u64 paddr_t; +#define INVALID_PADDR (~0ULL) +#define PRIpaddr "016llx" +typedef u32 register_t; +#define PRIregister "x" + +#elif defined (CONFIG_RISCV_64) + +typedef signed long s64; +typedef unsigned long u64; +typedef u64 vaddr_t; +#define PRIvaddr PRIx64 +typedef u64 paddr_t; +#define INVALID_PADDR (~0UL) +#define PRIpaddr "016lx" +typedef u64 register_t; +#define PRIregister "lx" + +#endif + +#endif /* __ASSEMBLY__ */ + +#endif /* __RISCV_TYPES_H__ */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:12:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:12:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489687.758054 (Exim 4.92) (envelope-from ) id 1pOWOS-0008EZ-6Q; Sun, 05 Feb 2023 04:12:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489687.758054; Sun, 05 Feb 2023 04:12:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWOS-0008EP-3R; Sun, 05 Feb 2023 04:12:44 +0000 Received: by outflank-mailman (input) for mailman id 489687; Sun, 05 Feb 2023 04:12:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWOR-0008EJ-MG for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWOR-0000tL-LU for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWOR-0008Hh-Ki for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=E25m57zDxPMBLBi1AstMPsC/i1Z8bkDwPhOCcJM2ltY=; b=zUkogNziQRXicNViOG87TsCoE9 6fehbNkVg1BwbUBNyvzo8iK57u8FpxBOe/lmqyLTYYHSVp70oEwi0tUZ9JQZ22IRcdKjSFaGmlbI4 sC5vmsWxi/ypDBOUkpkydGrPM4yv7VH6lMsjnsnFveefD0NhHyfI3JhaZKENQNXxKBb8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce sbi call to putchar to console Message-Id: Date: Sun, 05 Feb 2023 04:12:43 +0000 commit 90caa47aa33efb6408514ce09721624a2bdf6694 Author: Bobby Eshleman AuthorDate: Fri Jan 20 09:26:31 2023 +0100 Commit: Jan Beulich CommitDate: Fri Jan 20 09:26:31 2023 +0100 xen/riscv: introduce sbi call to putchar to console Originally SBI implementation for Xen was introduced by Bobby Eshleman but it was removed all the stuff for simplicity except SBI call for putting character to console. The patch introduces sbi_putchar() SBI call which is necessary to implement initial early_printk. Signed-off-by: Bobby Eshleman Signed-off-by: Oleksii Kurochko Reviewed-by: Bobby Eshleman Reviewed-by: Alistair Francis --- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/include/asm/sbi.h | 34 +++++++++++++++++++++++++++++++ xen/arch/riscv/sbi.c | 44 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+) diff --git a/xen/arch/riscv/Makefile b/xen/arch/riscv/Makefile index 5a67a3f493..fd916e1004 100644 --- a/xen/arch/riscv/Makefile +++ b/xen/arch/riscv/Makefile @@ -1,4 +1,5 @@ obj-$(CONFIG_RISCV_64) += riscv64/ +obj-y += sbi.o obj-y += setup.o $(TARGET): $(TARGET)-syms diff --git a/xen/arch/riscv/include/asm/sbi.h b/xen/arch/riscv/include/asm/sbi.h new file mode 100644 index 0000000000..0e6820a4ed --- /dev/null +++ b/xen/arch/riscv/include/asm/sbi.h @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: (GPL-2.0-or-later) */ +/* + * Copyright (c) 2021-2023 Vates SAS. + * + * Taken from xvisor, modified by Bobby Eshleman (bobby.eshleman@gmail.com). + * + * Taken/modified from Xvisor project with the following copyright: + * + * Copyright (c) 2019 Western Digital Corporation or its affiliates. + */ + +#ifndef __ASM_RISCV_SBI_H__ +#define __ASM_RISCV_SBI_H__ + +#define SBI_EXT_0_1_CONSOLE_PUTCHAR 0x1 + +struct sbiret { + long error; + long value; +}; + +struct sbiret sbi_ecall(unsigned long ext, unsigned long fid, + unsigned long arg0, unsigned long arg1, + unsigned long arg2, unsigned long arg3, + unsigned long arg4, unsigned long arg5); + +/** + * Writes given character to the console device. + * + * @param ch The data to be written to the console. + */ +void sbi_console_putchar(int ch); + +#endif /* __ASM_RISCV_SBI_H__ */ diff --git a/xen/arch/riscv/sbi.c b/xen/arch/riscv/sbi.c new file mode 100644 index 0000000000..0ae166c861 --- /dev/null +++ b/xen/arch/riscv/sbi.c @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Taken and modified from the xvisor project with the copyright Copyright (c) + * 2019 Western Digital Corporation or its affiliates and author Anup Patel + * (anup.patel@wdc.com). + * + * Modified by Bobby Eshleman (bobby.eshleman@gmail.com). + * + * Copyright (c) 2019 Western Digital Corporation or its affiliates. + * Copyright (c) 2021-2023 Vates SAS. + */ + +#include + +struct sbiret sbi_ecall(unsigned long ext, unsigned long fid, + unsigned long arg0, unsigned long arg1, + unsigned long arg2, unsigned long arg3, + unsigned long arg4, unsigned long arg5) +{ + struct sbiret ret; + + register unsigned long a0 asm ("a0") = arg0; + register unsigned long a1 asm ("a1") = arg1; + register unsigned long a2 asm ("a2") = arg2; + register unsigned long a3 asm ("a3") = arg3; + register unsigned long a4 asm ("a4") = arg4; + register unsigned long a5 asm ("a5") = arg5; + register unsigned long a6 asm ("a6") = fid; + register unsigned long a7 asm ("a7") = ext; + + asm volatile ( "ecall" + : "+r" (a0), "+r" (a1) + : "r" (a2), "r" (a3), "r" (a4), "r" (a5), "r" (a6), "r" (a7) + : "memory"); + ret.error = a0; + ret.value = a1; + + return ret; +} + +void sbi_console_putchar(int ch) +{ + sbi_ecall(SBI_EXT_0_1_CONSOLE_PUTCHAR, 0, ch, 0, 0, 0, 0, 0); +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:12:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:12:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489688.758058 (Exim 4.92) (envelope-from ) id 1pOWOc-0008Hk-9E; Sun, 05 Feb 2023 04:12:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489688.758058; Sun, 05 Feb 2023 04:12:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWOc-0008Hc-6R; Sun, 05 Feb 2023 04:12:54 +0000 Received: by outflank-mailman (input) for mailman id 489688; Sun, 05 Feb 2023 04:12:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWOb-0008HW-PN for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWOb-0000tk-Oi for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWOb-0008Jf-Ny for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:12:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5IC1Ha/RN3mQWQ1eUHwJdNsIkAWNULooLzi65V8w8/I=; b=Gl0C8e2cNP4X0Q0L9n26fkEWDB bUKgN3EoajDBdw5yskT21MoS3Zm4SQ6UNDHRwaeN5EaYgpqelK5fi2Werckf6tNDOD3bUZcgEpyjA Zrp2N5ghEEcTV8tpo2N4950m5SpwNp9ZO6sTYUju/r3fpGAyS8VRwoIDw2QC7DlpDIxg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: let talloc_free() preserve errno Message-Id: Date: Sun, 05 Feb 2023 04:12:53 +0000 commit 1d4994ac79ed96550f8e8c9a682d468e83db4dfe Author: Juergen Gross AuthorDate: Wed Jan 18 10:50:00 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 09:23:51 2023 +0000 tools/xenstore: let talloc_free() preserve errno Today talloc_free() is not guaranteed to preserve errno, especially in case a custom destructor is being used. So preserve errno in talloc_free(). This allows to remove some errno saving outside of talloc.c. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/talloc.c | 21 +++++++++++++-------- tools/xenstore/xenstored_core.c | 2 -- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/xenstore/talloc.c b/tools/xenstore/talloc.c index d7edcf3a93..23c3a23b19 100644 --- a/tools/xenstore/talloc.c +++ b/tools/xenstore/talloc.c @@ -541,38 +541,39 @@ static void talloc_free_children(void *ptr) */ int talloc_free(void *ptr) { + int saved_errno = errno; struct talloc_chunk *tc; if (ptr == NULL) { - return -1; + goto err; } tc = talloc_chunk_from_ptr(ptr); if (tc->null_refs) { tc->null_refs--; - return -1; + goto err; } if (tc->refs) { talloc_reference_destructor(tc->refs); - return -1; + goto err; } if (tc->flags & TALLOC_FLAG_LOOP) { /* we have a free loop - stop looping */ - return 0; + goto success; } if (tc->destructor) { talloc_destructor_t d = tc->destructor; if (d == (talloc_destructor_t)-1) { - return -1; + goto err; } tc->destructor = (talloc_destructor_t)-1; if (d(ptr) == -1) { tc->destructor = d; - return -1; + goto err; } tc->destructor = NULL; } @@ -594,10 +595,14 @@ int talloc_free(void *ptr) tc->flags |= TALLOC_FLAG_FREE; free(tc); + success: + errno = saved_errno; return 0; -} - + err: + errno = saved_errno; + return -1; +} /* A talloc version of realloc. The context argument is only used if diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 78a3edaa4e..1650821922 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -771,9 +771,7 @@ struct node *read_node(struct connection *conn, const void *ctx, return node; error: - err = errno; talloc_free(node); - errno = err; return NULL; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:13:05 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:13:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489689.758062 (Exim 4.92) (envelope-from ) id 1pOWOn-0008Kl-Ao; Sun, 05 Feb 2023 04:13:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489689.758062; Sun, 05 Feb 2023 04:13:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWOn-0008Kd-80; Sun, 05 Feb 2023 04:13:05 +0000 Received: by outflank-mailman (input) for mailman id 489689; Sun, 05 Feb 2023 04:13:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWOl-0008K9-SU for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWOl-0000u1-Rj for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWOl-0008KF-R1 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=b3/TIfvdcVqZ2eNMbk3eU9wQJYrS34e/Qa05W02Id5g=; b=ydP88tLbp+j1m+4Sl9+VG3lZL9 5VrD8Qq8/bxbx1DdoyK/eGRUCKlYd8PODbKf/K38ULcHeThISJU82szeZ5ztMWRpPz8TtK5M6hf4O DgVBbHjrce/948R2Qrc9zKg01EJ6KtkUuTECEa6lpnuxYkSbjM0i9eWY0dN9Y0s+ZKKU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: remove all watches when a domain has stopped Message-Id: Date: Sun, 05 Feb 2023 04:13:03 +0000 commit 9260e41e73ddd9872825cd4ed836fd0dcfd5cb98 Author: Juergen Gross AuthorDate: Wed Jan 18 10:50:01 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 09:23:51 2023 +0000 tools/xenstore: remove all watches when a domain has stopped When a domain has been released by Xen tools, remove all its registered watches. This avoids sending watch events to the dead domain when all the nodes related to it are being removed by the Xen tools. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_domain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index aa86892fed..e669c89e94 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -740,6 +740,9 @@ int do_release(const void *ctx, struct connection *conn, if (IS_ERR(domain)) return -PTR_ERR(domain); + /* Avoid triggering watch events when the domain's nodes are deleted. */ + conn_delete_all_watches(domain->conn); + talloc_free(domain->conn); send_ack(conn, XS_RELEASE); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:13:15 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:13:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489690.758066 (Exim 4.92) (envelope-from ) id 1pOWOx-0008Ni-CD; Sun, 05 Feb 2023 04:13:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489690.758066; Sun, 05 Feb 2023 04:13:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWOx-0008Na-9Y; Sun, 05 Feb 2023 04:13:15 +0000 Received: by outflank-mailman (input) for mailman id 489690; Sun, 05 Feb 2023 04:13:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWOv-0008NN-VX for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWOv-0000uC-Uv for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWOv-0008Ki-U6 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=OVWld+lrw9WCG5lpxrcmXm2AkwnPTVCxHtl6zDOzoU8=; b=E5cAUm+AAp3ydIpdLKSbN8EPtq BuNhv+aafJ7KE+B8p5pgGu8i7cYYGMS4KS2po20IbHifFScZ4YqwJY65QBZri68s1z09/XBSlNNC0 PsojgGjQxWYANMN2Cffr+ouToALiqgLpsHJqChZ9pkYvu1ebsRMQsxB0YwamGxzarHv4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: add hashlist for finding struct domain by domid Message-Id: Date: Sun, 05 Feb 2023 04:13:13 +0000 commit a1a618208bf53469f5e3eaa14202ba777d33f442 Author: Juergen Gross AuthorDate: Wed Jan 18 10:50:02 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 09:23:51 2023 +0000 tools/xenstore: add hashlist for finding struct domain by domid Today finding a struct domain by its domain id requires to scan the list of domains until finding the correct domid. Add a hashlist for being able to speed this up. This allows to remove the linking of struct domain in a list. Note that the list of changed domains per transaction is kept as a list, as there are no known use cases with more than 4 domains being touched in a single transaction (this would be a device handled by a driver domain and being assigned to a HVM domain with device model in a stubdom, plus the control domain). Some simple performance tests comparing the scanning and hashlist have shown that the hashlist will win as soon as more than 6 entries need to be scanned. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_domain.c | 102 ++++++++++++++++++++++---------------- 1 file changed, 60 insertions(+), 42 deletions(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index e669c89e94..3ad1028edb 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -48,8 +48,6 @@ static struct node_perms dom_introduce_perms; struct domain { - struct list_head list; - /* The id of this domain */ unsigned int domid; @@ -96,7 +94,7 @@ struct domain bool wrl_delay_logged; }; -static LIST_HEAD(domains); +static struct hashtable *domhash; static bool check_indexes(XENSTORE_RING_IDX cons, XENSTORE_RING_IDX prod) { @@ -309,7 +307,7 @@ static int destroy_domain(void *_domain) domain_tree_remove(domain); - list_del(&domain->list); + hashtable_remove(domhash, &domain->domid); if (!domain->introduced) return 0; @@ -341,43 +339,50 @@ static bool get_domain_info(unsigned int domid, xc_dominfo_t *dominfo) dominfo->domid == domid; } -void check_domains(void) +static int check_domain(const void *k, void *v, void *arg) { xc_dominfo_t dominfo; - struct domain *domain; struct connection *conn; - int notify = 0; bool dom_valid; + struct domain *domain = v; + bool *notify = arg; - again: - list_for_each_entry(domain, &domains, list) { - dom_valid = get_domain_info(domain->domid, &dominfo); - if (!domain->introduced) { - if (!dom_valid) { - talloc_free(domain); - goto again; - } - continue; - } - if (dom_valid) { - if ((dominfo.crashed || dominfo.shutdown) - && !domain->shutdown) { - domain->shutdown = true; - notify = 1; - } - if (!dominfo.dying) - continue; - } - if (domain->conn) { - /* domain is a talloc child of domain->conn. */ - conn = domain->conn; - domain->conn = NULL; - talloc_unlink(talloc_autofree_context(), conn); - notify = 0; /* destroy_domain() fires the watch */ - goto again; + dom_valid = get_domain_info(domain->domid, &dominfo); + if (!domain->introduced) { + if (!dom_valid) + talloc_free(domain); + return 0; + } + if (dom_valid) { + if ((dominfo.crashed || dominfo.shutdown) + && !domain->shutdown) { + domain->shutdown = true; + *notify = true; } + if (!dominfo.dying) + return 0; + } + if (domain->conn) { + /* domain is a talloc child of domain->conn. */ + conn = domain->conn; + domain->conn = NULL; + talloc_unlink(talloc_autofree_context(), conn); + *notify = false; /* destroy_domain() fires the watch */ + + /* Above unlink might result in 2 domains being freed! */ + return 1; } + return 0; +} + +void check_domains(void) +{ + bool notify = false; + + while (hashtable_iterate(domhash, check_domain, ¬ify)) + ; + if (notify) fire_watches(NULL, NULL, "@releaseDomain", NULL, true, NULL); } @@ -415,13 +420,7 @@ static char *talloc_domain_path(const void *context, unsigned int domid) static struct domain *find_domain_struct(unsigned int domid) { - struct domain *i; - - list_for_each_entry(i, &domains, list) { - if (i->domid == domid) - return i; - } - return NULL; + return hashtable_search(domhash, &domid); } int domain_get_quota(const void *ctx, struct connection *conn, @@ -470,9 +469,13 @@ static struct domain *alloc_domain(const void *context, unsigned int domid) domain->generation = generation; domain->introduced = false; - talloc_set_destructor(domain, destroy_domain); + if (!hashtable_insert(domhash, &domain->domid, domain)) { + talloc_free(domain); + errno = ENOMEM; + return NULL; + } - list_add(&domain->list, &domains); + talloc_set_destructor(domain, destroy_domain); return domain; } @@ -906,10 +909,25 @@ void dom0_init(void) xenevtchn_notify(xce_handle, dom0->port); } +static unsigned int domhash_fn(void *k) +{ + return *(unsigned int *)k; +} + +static int domeq_fn(void *key1, void *key2) +{ + return *(unsigned int *)key1 == *(unsigned int *)key2; +} + void domain_init(int evtfd) { int rc; + /* Start with a random rather low domain count for the hashtable. */ + domhash = create_hashtable(8, domhash_fn, domeq_fn, 0); + if (!domhash) + barf_perror("Failed to allocate domain hashtable"); + xc_handle = talloc(talloc_autofree_context(), xc_interface*); if (!xc_handle) barf_perror("Failed to allocate domain handle"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:13:25 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:13:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489691.758070 (Exim 4.92) (envelope-from ) id 1pOWP7-0008Rx-Dm; Sun, 05 Feb 2023 04:13:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489691.758070; Sun, 05 Feb 2023 04:13:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWP7-0008Ro-B1; Sun, 05 Feb 2023 04:13:25 +0000 Received: by outflank-mailman (input) for mailman id 489691; Sun, 05 Feb 2023 04:13:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWP6-0008RU-2h for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWP6-0000uV-1u for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWP6-0008LE-11 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iE7jCNe0Nzil6S6GL7DWdpOd2yPTdm610CDRCGVw6Dc=; b=K648l6m4FJgAYsmUWkfqooGGKD M1nRQS6AslyfJv5qTA/Erd2gIpkzmQ2oq7BxbAd8zcDHSxdS+Yz1mWvDugklxZPCjRlBu4IIArRkQ bXDHvD2kVeljk/u0bHxqNzbCk0Jllhtuo9yzmV4JCYHyoNvJCxI5BMvQtH3AfScpa1uc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: make log macro globally available Message-Id: Date: Sun, 05 Feb 2023 04:13:24 +0000 commit ab5fa21c8d91f7057f0373ac63abc659f05b0c69 Author: Juergen Gross AuthorDate: Wed Jan 18 10:50:03 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 09:23:51 2023 +0000 tools/xenstore: make log macro globally available Move the definition of the log() macro to xenstored_core.h in order to make it usable from other source files, too. While at it preserve errno from being modified. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 14 -------------- tools/xenstore/xenstored_core.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 1650821922..d30f35e642 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -88,20 +88,6 @@ TDB_CONTEXT *tdb_ctx = NULL; static const char *sockmsg_string(enum xsd_sockmsg_type type); -#define log(...) \ - do { \ - char *s = talloc_asprintf(NULL, __VA_ARGS__); \ - if (s) { \ - trace("%s\n", s); \ - syslog(LOG_ERR, "%s\n", s); \ - talloc_free(s); \ - } else { \ - trace("talloc failure during logging\n"); \ - syslog(LOG_ERR, "talloc failure during logging\n"); \ - } \ - } while (0) - - int quota_nb_entry_per_domain = 1000; int quota_nb_watch_per_domain = 128; int quota_max_entry_size = 2048; /* 2K */ diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 37006d508d..89055cbb21 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -267,6 +267,21 @@ void trace(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); void reopen_log(void); void close_log(void); +#define log(...) \ + do { \ + int _saved_errno = errno; \ + char *s = talloc_asprintf(NULL, __VA_ARGS__); \ + if (s) { \ + trace("%s\n", s); \ + syslog(LOG_ERR, "%s\n", s); \ + talloc_free(s); \ + } else { \ + trace("talloc failure during logging\n"); \ + syslog(LOG_ERR, "talloc failure during logging\n"); \ + } \ + errno = _saved_errno; \ + } while (0) + extern int orig_argc; extern char **orig_argv; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:13:35 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:13:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489692.758074 (Exim 4.92) (envelope-from ) id 1pOWPH-0008Uj-FT; Sun, 05 Feb 2023 04:13:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489692.758074; Sun, 05 Feb 2023 04:13:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWPH-0008Uc-Cc; Sun, 05 Feb 2023 04:13:35 +0000 Received: by outflank-mailman (input) for mailman id 489692; Sun, 05 Feb 2023 04:13:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWPG-0008UQ-5n for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWPG-0000ub-57 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWPG-0008Lj-4W for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eROQADuV+Jzv5LLmmrufAaXcIVEPbZQLKoF9VvcEMtE=; b=3zj0ODgLuqnr23BsxtG1Yp04eA 7IRm8EOnorvKpdWjK6ZcoH3kiV89Wrb7L+bPo9DmoJ6wKoDT5JKvmsZ1hCYL6gzE3w4KdvS45t2yD XSQPRncYPsZT9WevZCHdmlyYjPucX6LRbHTgY9oI3HEv575NtnHhTQjab00/uV3uCNno=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: introduce dummy nodes for special watch paths Message-Id: Date: Sun, 05 Feb 2023 04:13:34 +0000 commit d6bb63924fc28a5bba53f5151db5c77f937879a5 Author: Juergen Gross AuthorDate: Wed Jan 18 10:50:04 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 09:23:51 2023 +0000 tools/xenstore: introduce dummy nodes for special watch paths Instead of special casing the permission handling and watch event firing for the special watch paths "@introduceDomain" and "@releaseDomain", use static dummy nodes added to the data base when starting Xenstore. The node accounting needs to reflect that change by adding the special nodes in the domain_entry_fix() call in setup_structure(). Note that this requires to rework the calls of fire_watches() for the special events in order to avoid leaking memory. Move the check for a valid node name from get_node() to get_node_canonicalized(), as it allows to use get_node() for the special nodes, too. In order to avoid read and write accesses to the special nodes use a special variant for obtaining the current node data for the permission handling. This allows to simplify quite some code. In future sub-nodes of the special nodes will be possible due to this change, allowing more fine grained permission control of special events for specific domains. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_control.c | 3 - tools/xenstore/xenstored_core.c | 94 +++++++++++++-------- tools/xenstore/xenstored_domain.c | 164 ++++++------------------------------- tools/xenstore/xenstored_domain.h | 6 -- tools/xenstore/xenstored_watch.c | 17 +--- 5 files changed, 83 insertions(+), 201 deletions(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index d1aaa00bf4..41e6992591 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -676,9 +676,6 @@ static const char *lu_dump_state(const void *ctx, struct connection *conn) if (ret) goto out; ret = dump_state_connections(fp); - if (ret) - goto out; - ret = dump_state_special_nodes(fp); if (ret) goto out; ret = dump_state_nodes(fp, ctx); diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index d30f35e642..c82fb6e3d5 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -597,12 +597,13 @@ static void get_acc_data(TDB_DATA *key, struct node_account_data *acc) * Per-transaction nodes need to be accounted for the transaction owner. * Those nodes are stored in the data base with the transaction generation * count prepended (e.g. 123/local/domain/...). So testing for the node's - * key not to start with "/" is sufficient. + * key not to start with "/" or "@" is sufficient. */ static unsigned int get_acc_domid(struct connection *conn, TDB_DATA *key, unsigned int domid) { - return (!conn || key->dptr[0] == '/') ? domid : conn->id; + return (!conn || key->dptr[0] == '/' || key->dptr[0] == '@') + ? domid : conn->id; } int do_tdb_write(struct connection *conn, TDB_DATA *key, TDB_DATA *data, @@ -944,10 +945,6 @@ static struct node *get_node(struct connection *conn, { struct node *node; - if (!name || !is_valid_nodename(name)) { - errno = EINVAL; - return NULL; - } node = read_node(conn, ctx, name); /* If we don't have permission, we don't have node. */ if (node) { @@ -1236,9 +1233,23 @@ static struct node *get_node_canonicalized(struct connection *conn, *canonical_name = canonicalize(conn, ctx, name); if (!*canonical_name) return NULL; + if (!is_valid_nodename(*canonical_name)) { + errno = EINVAL; + return NULL; + } return get_node(conn, ctx, *canonical_name, perm); } +static struct node *get_spec_node(struct connection *conn, const void *ctx, + const char *name, char **canonical_name, + unsigned int perm) +{ + if (name[0] == '@') + return get_node(conn, ctx, name, perm); + + return get_node_canonicalized(conn, ctx, name, canonical_name, perm); +} + static int send_directory(const void *ctx, struct connection *conn, struct buffered_data *in) { @@ -1723,8 +1734,7 @@ static int do_get_perms(const void *ctx, struct connection *conn, char *strings; unsigned int len; - node = get_node_canonicalized(conn, ctx, onearg(in), NULL, - XS_PERM_READ); + node = get_spec_node(conn, ctx, onearg(in), NULL, XS_PERM_READ); if (!node) return errno; @@ -1766,17 +1776,9 @@ static int do_set_perms(const void *ctx, struct connection *conn, if (perms.p[0].perms & XS_PERM_IGNORE) return ENOENT; - /* First arg is node name. */ - if (strstarts(in->buffer, "@")) { - if (set_perms_special(conn, in->buffer, &perms)) - return errno; - send_ack(conn, XS_SET_PERMS); - return 0; - } - /* We must own node to do this (tools can do this too). */ - node = get_node_canonicalized(conn, ctx, in->buffer, &name, - XS_PERM_WRITE | XS_PERM_OWNER); + node = get_spec_node(conn, ctx, in->buffer, &name, + XS_PERM_WRITE | XS_PERM_OWNER); if (!node) return errno; @@ -2374,7 +2376,9 @@ void setup_structure(bool live_update) manual_node("/", "tool"); manual_node("/tool", "xenstored"); manual_node("/tool/xenstored", NULL); - domain_entry_fix(dom0_domid, 3, true); + manual_node("@releaseDomain", NULL); + manual_node("@introduceDomain", NULL); + domain_entry_fix(dom0_domid, 5, true); } check_store(); @@ -3156,6 +3160,23 @@ static int dump_state_node(const void *ctx, struct connection *conn, return WALK_TREE_OK; } +static int dump_state_special_node(FILE *fp, const void *ctx, + struct dump_node_data *data, + const char *name) +{ + struct node *node; + int ret; + + node = read_node(NULL, ctx, name); + if (!node) + return dump_state_node_err(data, "Dump node read node error"); + + ret = dump_state_node(ctx, NULL, node, data); + talloc_free(node); + + return ret; +} + const char *dump_state_nodes(FILE *fp, const void *ctx) { struct dump_node_data data = { @@ -3167,6 +3188,11 @@ const char *dump_state_nodes(FILE *fp, const void *ctx) if (walk_node_tree(ctx, NULL, "/", &walkfuncs, &data)) return data.err; + if (dump_state_special_node(fp, ctx, &data, "@releaseDomain")) + return data.err; + if (dump_state_special_node(fp, ctx, &data, "@introduceDomain")) + return data.err; + return NULL; } @@ -3340,25 +3366,21 @@ void read_state_node(const void *ctx, const void *state) node->perms.p[i].id = sn->perms[i].domid; } - if (strstarts(name, "@")) { - set_perms_special(&conn, name, &node->perms); - talloc_free(node); - return; - } - - parentname = get_parent(node, name); - if (!parentname) - barf("allocation error restoring node"); - parent = read_node(NULL, node, parentname); - if (!parent) - barf("read parent error restoring node"); + if (!strstarts(name, "@")) { + parentname = get_parent(node, name); + if (!parentname) + barf("allocation error restoring node"); + parent = read_node(NULL, node, parentname); + if (!parent) + barf("read parent error restoring node"); - if (add_child(node, parent, name)) - barf("allocation error restoring node"); + if (add_child(node, parent, name)) + barf("allocation error restoring node"); - set_tdb_key(parentname, &key); - if (write_node_raw(NULL, &key, parent, true)) - barf("write parent error restoring node"); + set_tdb_key(parentname, &key); + if (write_node_raw(NULL, &key, parent, true)) + barf("write parent error restoring node"); + } set_tdb_key(name, &key); if (write_node_raw(NULL, &key, node, true)) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 3ad1028edb..494694fd30 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -43,9 +43,6 @@ static evtchn_port_t virq_port; xenevtchn_handle *xce_handle = NULL; -static struct node_perms dom_release_perms; -static struct node_perms dom_introduce_perms; - struct domain { /* The id of this domain */ @@ -225,27 +222,6 @@ static void unmap_interface(void *interface) xengnttab_unmap(*xgt_handle, interface, 1); } -static void remove_domid_from_perm(struct node_perms *perms, - struct domain *domain) -{ - unsigned int cur, new; - - if (perms->p[0].id == domain->domid) - perms->p[0].id = priv_domid; - - for (cur = new = 1; cur < perms->num; cur++) { - if (perms->p[cur].id == domain->domid) - continue; - - if (new != cur) - perms->p[new] = perms->p[cur]; - - new++; - } - - perms->num = new; -} - static int domain_tree_remove_sub(const void *ctx, struct connection *conn, struct node *node, void *arg) { @@ -297,8 +273,26 @@ static void domain_tree_remove(struct domain *domain) "error when looking for orphaned nodes\n"); } - remove_domid_from_perm(&dom_release_perms, domain); - remove_domid_from_perm(&dom_introduce_perms, domain); + walk_node_tree(domain, NULL, "@releaseDomain", &walkfuncs, domain); + walk_node_tree(domain, NULL, "@introduceDomain", &walkfuncs, domain); +} + +static void fire_special_watches(const char *name) +{ + void *ctx = talloc_new(NULL); + struct node *node; + + if (!ctx) + return; + + node = read_node(NULL, ctx, name); + + if (node) + fire_watches(NULL, ctx, name, node, true, NULL); + else + log("special node %s not found\n", name); + + talloc_free(ctx); } static int destroy_domain(void *_domain) @@ -326,7 +320,7 @@ static int destroy_domain(void *_domain) unmap_interface(domain->interface); } - fire_watches(NULL, domain, "@releaseDomain", NULL, true, NULL); + fire_special_watches("@releaseDomain"); wrl_domain_destroy(domain); @@ -384,7 +378,7 @@ void check_domains(void) ; if (notify) - fire_watches(NULL, NULL, "@releaseDomain", NULL, true, NULL); + fire_special_watches("@releaseDomain"); } /* We scan all domains rather than use the information given here. */ @@ -633,8 +627,7 @@ static struct domain *introduce_domain(const void *ctx, } if (!is_master_domain && !restore) - fire_watches(NULL, ctx, "@introduceDomain", NULL, - true, NULL); + fire_special_watches("@introduceDomain"); } else { /* Use XS_INTRODUCE for recreating the xenbus event-channel. */ if (domain->port) @@ -840,59 +833,6 @@ const char *get_implicit_path(const struct connection *conn) return conn->domain->path; } -static int set_dom_perms_default(struct node_perms *perms) -{ - perms->num = 1; - perms->p = talloc_array(NULL, struct xs_permissions, perms->num); - if (!perms->p) - return -1; - perms->p->id = 0; - perms->p->perms = XS_PERM_NONE; - - return 0; -} - -static struct node_perms *get_perms_special(const char *name) -{ - if (!strcmp(name, "@releaseDomain")) - return &dom_release_perms; - if (!strcmp(name, "@introduceDomain")) - return &dom_introduce_perms; - return NULL; -} - -int set_perms_special(struct connection *conn, const char *name, - struct node_perms *perms) -{ - struct node_perms *p; - - p = get_perms_special(name); - if (!p) - return EINVAL; - - if ((perm_for_conn(conn, p) & (XS_PERM_WRITE | XS_PERM_OWNER)) != - (XS_PERM_WRITE | XS_PERM_OWNER)) - return EACCES; - - p->num = perms->num; - talloc_free(p->p); - p->p = perms->p; - talloc_steal(NULL, perms->p); - - return 0; -} - -bool check_perms_special(const char *name, struct connection *conn) -{ - struct node_perms *p; - - p = get_perms_special(name); - if (!p) - return false; - - return perm_for_conn(conn, p) & XS_PERM_READ; -} - void dom0_init(void) { evtchn_port_t port; @@ -962,10 +902,6 @@ void domain_init(int evtfd) if (xce_handle == NULL) barf_perror("Failed to open evtchn device"); - if (set_dom_perms_default(&dom_release_perms) || - set_dom_perms_default(&dom_introduce_perms)) - barf_perror("Failed to set special permissions"); - if ((rc = xenevtchn_bind_virq(xce_handle, VIRQ_DOM_EXC)) == -1) barf_perror("Failed to bind to domain exception virq port"); virq_port = rc; @@ -1535,60 +1471,6 @@ const char *dump_state_connections(FILE *fp) return ret; } -static const char *dump_state_special_node(FILE *fp, const char *name, - const struct node_perms *perms) -{ - struct xs_state_record_header head; - struct xs_state_node sn; - unsigned int pathlen; - const char *ret; - - pathlen = strlen(name) + 1; - - head.type = XS_STATE_TYPE_NODE; - head.length = sizeof(sn); - - sn.conn_id = 0; - sn.ta_id = 0; - sn.ta_access = 0; - sn.perm_n = perms->num; - sn.path_len = pathlen; - sn.data_len = 0; - head.length += perms->num * sizeof(*sn.perms); - head.length += pathlen; - head.length = ROUNDUP(head.length, 3); - if (fwrite(&head, sizeof(head), 1, fp) != 1) - return "Dump special node error"; - if (fwrite(&sn, sizeof(sn), 1, fp) != 1) - return "Dump special node error"; - - ret = dump_state_node_perms(fp, perms->p, perms->num); - if (ret) - return ret; - - if (fwrite(name, pathlen, 1, fp) != 1) - return "Dump special node path error"; - - ret = dump_state_align(fp); - - return ret; -} - -const char *dump_state_special_nodes(FILE *fp) -{ - const char *ret; - - ret = dump_state_special_node(fp, "@releaseDomain", - &dom_release_perms); - if (ret) - return ret; - - ret = dump_state_special_node(fp, "@introduceDomain", - &dom_introduce_perms); - - return ret; -} - void read_state_connection(const void *ctx, const void *state) { const struct xs_state_connection *sc = state; diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index b38c82991d..630641d620 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -99,11 +99,6 @@ void domain_outstanding_domid_dec(unsigned int domid); int domain_get_quota(const void *ctx, struct connection *conn, unsigned int domid); -/* Special node permission handling. */ -int set_perms_special(struct connection *conn, const char *name, - struct node_perms *perms); -bool check_perms_special(const char *name, struct connection *conn); - /* Write rate limiting */ #define WRL_FACTOR 1000 /* for fixed-point arithmetic */ @@ -132,7 +127,6 @@ void wrl_apply_debit_direct(struct connection *conn); void wrl_apply_debit_trans_commit(struct connection *conn); const char *dump_state_connections(FILE *fp); -const char *dump_state_special_nodes(FILE *fp); void read_state_connection(const void *ctx, const void *state); diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_watch.c index 316c08b7f7..75748ac109 100644 --- a/tools/xenstore/xenstored_watch.c +++ b/tools/xenstore/xenstored_watch.c @@ -46,13 +46,6 @@ struct watch char *node; }; -static bool check_special_event(const char *name) -{ - assert(name); - - return strstarts(name, "@"); -} - /* Is child a subnode of parent, or equal? */ static bool is_child(const char *child, const char *parent) { @@ -153,14 +146,8 @@ void fire_watches(struct connection *conn, const void *ctx, const char *name, /* Create an event for each watch. */ list_for_each_entry(i, &connections, list) { - /* introduce/release domain watches */ - if (check_special_event(name)) { - if (!check_perms_special(name, i)) - continue; - } else { - if (!watch_permitted(i, ctx, name, node, perms)) - continue; - } + if (!watch_permitted(i, ctx, name, node, perms)) + continue; list_for_each_entry(watch, &i->watches, list) { if (exact) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:13:45 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:13:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489693.758078 (Exim 4.92) (envelope-from ) id 1pOWPR-00006g-J1; Sun, 05 Feb 2023 04:13:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489693.758078; Sun, 05 Feb 2023 04:13:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWPR-00006X-GC; Sun, 05 Feb 2023 04:13:45 +0000 Received: by outflank-mailman (input) for mailman id 489693; Sun, 05 Feb 2023 04:13:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWPQ-00006N-8f for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWPQ-0000um-7u for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWPQ-0008MA-7N for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=x4/+UoDKXfa+v4JwxHBPMwtFl3bB4Wor5Svo7r7Ry3c=; b=tu5g71ORl7REEmiPCIwO/QLNdR ssEmG6fKUfa5gzxSicL2NIRfrX2ajtqs1ISv/Ve1TS79NH7htABqXRn0L5TC2GWRg7AUE1aRYv/q/ jj0VXsROsftA3LJxMm5mFetKtidw8lx+AA7UEX+1UpEpO4rtm4zthxUummbrxWPI6WQY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: replace watch->relative_path with a prefix length Message-Id: Date: Sun, 05 Feb 2023 04:13:44 +0000 commit 4db46b04956272f11a588e183653a13c2dd2e422 Author: Juergen Gross AuthorDate: Wed Jan 18 10:50:05 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 09:23:51 2023 +0000 tools/xenstore: replace watch->relative_path with a prefix length Instead of storing a pointer to the path which is prepended to relative paths in struct watch, just use the length of the prepended path. It should be noted that the now removed special case of the relative path being "" in get_watch_path() can't happen at all. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_watch.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_watch.c index 75748ac109..8ad0229df6 100644 --- a/tools/xenstore/xenstored_watch.c +++ b/tools/xenstore/xenstored_watch.c @@ -39,8 +39,8 @@ struct watch /* Current outstanding events applying to this watch. */ struct list_head events; - /* Is this relative to connnection's implicit path? */ - const char *relative_path; + /* Offset into path for skipping prefix (used for relative paths). */ + unsigned int prefix_len; char *token; char *node; @@ -66,15 +66,7 @@ static bool is_child(const char *child, const char *parent) static const char *get_watch_path(const struct watch *watch, const char *name) { - const char *path = name; - - if (watch->relative_path) { - path += strlen(watch->relative_path); - if (*path == '/') /* Could be "" */ - path++; - } - - return path; + return name + watch->prefix_len; } /* @@ -211,10 +203,7 @@ static struct watch *add_watch(struct connection *conn, char *path, char *token, no_quota_check)) goto nomem; - if (relative) - watch->relative_path = get_implicit_path(conn); - else - watch->relative_path = NULL; + watch->prefix_len = relative ? strlen(get_implicit_path(conn)) + 1 : 0; INIT_LIST_HEAD(&watch->events); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:13:55 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:13:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489694.758082 (Exim 4.92) (envelope-from ) id 1pOWPb-00009p-Ka; Sun, 05 Feb 2023 04:13:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489694.758082; Sun, 05 Feb 2023 04:13:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWPb-00009f-Hh; Sun, 05 Feb 2023 04:13:55 +0000 Received: by outflank-mailman (input) for mailman id 489694; Sun, 05 Feb 2023 04:13:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWPa-00009R-BW for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWPa-0000v8-Ao for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWPa-0008Mm-AC for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:13:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cvZSbjdi9/w0kXhjYXhGxxX554b9nxEZoYWnMhcZzWI=; b=0q8LKViCnkBiWCFJCbb4uDofyk vOLk34HybeR63y9j8ZaBAgLL9BLyPbQ+oQqqIVKNPpXcp/Zo8Apfnr36Ruw+UlZ5rf5S7xtNikNgZ u6Z8I1bxNaoP+zXyz111zF4XxHs6Z9SyrFsfUbVznVDDAZw1JAoaOlTSMzzdNmKIVwwU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: move changed domain handling Message-Id: Date: Sun, 05 Feb 2023 04:13:54 +0000 commit c5bbae7bc59cc43d5f880dac25177315549f8c79 Author: Juergen Gross AuthorDate: Wed Jan 18 10:50:06 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 09:23:51 2023 +0000 tools/xenstore: move changed domain handling Move all code related to struct changed_domain from xenstored_transaction.c to xenstored_domain.c. This will be needed later in order to simplify the accounting data updates in cases of errors during a request. Split the code to have a more generic base framework. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_domain.c | 78 ++++++++++++++++++++++++++++++++++ tools/xenstore/xenstored_domain.h | 3 ++ tools/xenstore/xenstored_transaction.c | 64 ++-------------------------- 3 files changed, 85 insertions(+), 60 deletions(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 494694fd30..1d765ceffa 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -91,6 +91,18 @@ struct domain bool wrl_delay_logged; }; +struct changed_domain +{ + /* List of all changed domains. */ + struct list_head list; + + /* Identifier of the changed domain. */ + unsigned int domid; + + /* Amount by which this domain's nbentry field has changed. */ + int nbentry; +}; + static struct hashtable *domhash; static bool check_indexes(XENSTORE_RING_IDX cons, XENSTORE_RING_IDX prod) @@ -543,6 +555,72 @@ static struct domain *find_domain_by_domid(unsigned int domid) return (d && d->introduced) ? d : NULL; } +int acc_fix_domains(struct list_head *head, bool update) +{ + struct changed_domain *cd; + int cnt; + + list_for_each_entry(cd, head, list) { + cnt = domain_entry_fix(cd->domid, cd->nbentry, update); + if (!update) { + if (cnt >= quota_nb_entry_per_domain) + return ENOSPC; + if (cnt < 0) + return ENOMEM; + } + } + + return 0; +} + +static struct changed_domain *acc_find_changed_domain(struct list_head *head, + unsigned int domid) +{ + struct changed_domain *cd; + + list_for_each_entry(cd, head, list) { + if (cd->domid == domid) + return cd; + } + + return NULL; +} + +static struct changed_domain *acc_get_changed_domain(const void *ctx, + struct list_head *head, + unsigned int domid) +{ + struct changed_domain *cd; + + cd = acc_find_changed_domain(head, domid); + if (cd) + return cd; + + cd = talloc_zero(ctx, struct changed_domain); + if (!cd) + return NULL; + + cd->domid = domid; + list_add_tail(&cd->list, head); + + return cd; +} + +int acc_add_dom_nbentry(const void *ctx, struct list_head *head, int val, + unsigned int domid) +{ + struct changed_domain *cd; + + cd = acc_get_changed_domain(ctx, head, domid); + if (!cd) + return 0; + + errno = 0; + cd->nbentry += val; + + return cd->nbentry; +} + static void domain_conn_reset(struct domain *domain) { struct connection *conn = domain->conn; diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 630641d620..9e20d2b17d 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -98,6 +98,9 @@ void domain_outstanding_dec(struct connection *conn); void domain_outstanding_domid_dec(unsigned int domid); int domain_get_quota(const void *ctx, struct connection *conn, unsigned int domid); +int acc_fix_domains(struct list_head *head, bool update); +int acc_add_dom_nbentry(const void *ctx, struct list_head *head, int val, + unsigned int domid); /* Write rate limiting */ diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c index ac854197ca..c009c67989 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -137,18 +137,6 @@ struct accessed_node bool watch_exact; }; -struct changed_domain -{ - /* List of all changed domains in the context of this transaction. */ - struct list_head list; - - /* Identifier of the changed domain. */ - unsigned int domid; - - /* Amount by which this domain's nbentry field has changed. */ - int nbentry; -}; - struct transaction { /* List of all transactions active on this connection. */ @@ -514,24 +502,6 @@ int do_transaction_start(const void *ctx, struct connection *conn, return 0; } -static int transaction_fix_domains(struct transaction *trans, bool update) -{ - struct changed_domain *d; - int cnt; - - list_for_each_entry(d, &trans->changed_domains, list) { - cnt = domain_entry_fix(d->domid, d->nbentry, update); - if (!update) { - if (cnt >= quota_nb_entry_per_domain) - return ENOSPC; - if (cnt < 0) - return ENOMEM; - } - } - - return 0; -} - int do_transaction_end(const void *ctx, struct connection *conn, struct buffered_data *in) { @@ -558,7 +528,7 @@ int do_transaction_end(const void *ctx, struct connection *conn, if (streq(arg, "T")) { if (trans->fail) return ENOMEM; - ret = transaction_fix_domains(trans, false); + ret = acc_fix_domains(&trans->changed_domains, false); if (ret) return ret; ret = finalize_transaction(conn, trans, &is_corrupt); @@ -568,7 +538,7 @@ int do_transaction_end(const void *ctx, struct connection *conn, wrl_apply_debit_trans_commit(conn); /* fix domain entry for each changed domain */ - transaction_fix_domains(trans, true); + acc_fix_domains(&trans->changed_domains, true); if (is_corrupt) corrupt(conn, "transaction inconsistency"); @@ -580,44 +550,18 @@ int do_transaction_end(const void *ctx, struct connection *conn, void transaction_entry_inc(struct transaction *trans, unsigned int domid) { - struct changed_domain *d; - - list_for_each_entry(d, &trans->changed_domains, list) - if (d->domid == domid) { - d->nbentry++; - return; - } - - d = talloc(trans, struct changed_domain); - if (!d) { + if (!acc_add_dom_nbentry(trans, &trans->changed_domains, 1, domid)) { /* Let the transaction fail. */ trans->fail = true; - return; } - d->domid = domid; - d->nbentry = 1; - list_add_tail(&d->list, &trans->changed_domains); } void transaction_entry_dec(struct transaction *trans, unsigned int domid) { - struct changed_domain *d; - - list_for_each_entry(d, &trans->changed_domains, list) - if (d->domid == domid) { - d->nbentry--; - return; - } - - d = talloc(trans, struct changed_domain); - if (!d) { + if (!acc_add_dom_nbentry(trans, &trans->changed_domains, -1, domid)) { /* Let the transaction fail. */ trans->fail = true; - return; } - d->domid = domid; - d->nbentry = -1; - list_add_tail(&d->list, &trans->changed_domains); } void fail_transaction(struct transaction *trans) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:14:06 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:14:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489697.758090 (Exim 4.92) (envelope-from ) id 1pOWPl-0000FV-Vs; Sun, 05 Feb 2023 04:14:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489697.758090; Sun, 05 Feb 2023 04:14:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWPl-0000Er-Ql; Sun, 05 Feb 2023 04:14:05 +0000 Received: by outflank-mailman (input) for mailman id 489697; Sun, 05 Feb 2023 04:14:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWPk-0000CX-Eo for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWPk-0000vU-EA for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWPk-0008Nj-DS for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3uf39IgJHzrVp0/46ORk7BYNbHegXaMZVDuVvTohsFs=; b=MiphgRPZ3IFGhHvnWuepB/lqfp 5W2PF1tFh42V2YOZ4WkhcUp1leFWij6fRrw9bd51/giT62+va9swYgfjMHI4D8Pf+9M9ad6rD9rqC YpOogm+/X26+pFFie/JB+MPTq6KRsM3vtzT9Tbz/H8M/+aySO7gjGlRIs5ohQLRYx6Xc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: change per-domain node accounting interface Message-Id: Date: Sun, 05 Feb 2023 04:14:04 +0000 commit 4c1f92d664c49442af8c743bd06360bda3412b3c Author: Juergen Gross AuthorDate: Wed Jan 18 10:50:07 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 09:23:51 2023 +0000 tools/xenstore: change per-domain node accounting interface Rework the interface and the internals of the per-domain node accounting: - rename the functions to domain_nbentry_*() in order to better match the related counter name - switch from node pointer to domid as interface, as all nodes have the owner filled in - use a common internal function for adding a value to the counter For the transaction case add a helper function to get the list head of the per-transaction changed domains, enabling to eliminate the transaction_entry_*() functions. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 28 ++++---- tools/xenstore/xenstored_core.h | 6 ++ tools/xenstore/xenstored_domain.c | 126 +++++++++++++++------------------ tools/xenstore/xenstored_domain.h | 10 ++- tools/xenstore/xenstored_transaction.c | 15 +--- tools/xenstore/xenstored_transaction.h | 7 +- 6 files changed, 87 insertions(+), 105 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index c82fb6e3d5..4582ee39e1 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -738,13 +738,13 @@ struct node *read_node(struct connection *conn, const void *ctx, /* Permissions are struct xs_permissions. */ node->perms.p = hdr->perms; - node->acc.domid = node->perms.p[0].id; + node->acc.domid = get_node_owner(node); node->acc.memory = data.dsize; if (domain_adjust_node_perms(node)) goto error; /* If owner is gone reset currently accounted memory size. */ - if (node->acc.domid != node->perms.p[0].id) + if (node->acc.domid != get_node_owner(node)) node->acc.memory = 0; /* Data is binary blob (usually ascii, no nul). */ @@ -1445,7 +1445,7 @@ static void destroy_node_rm(struct connection *conn, struct node *node) static int destroy_node(struct connection *conn, struct node *node) { destroy_node_rm(conn, node); - domain_entry_dec(conn, node); + domain_nbentry_dec(conn, get_node_owner(node)); /* * It is not possible to easily revert the changes in a transaction. @@ -1484,7 +1484,7 @@ static struct node *create_node(struct connection *conn, const void *ctx, for (i = node; i; i = i->parent) { /* i->parent is set for each new node, so check quota. */ if (i->parent && - domain_entry(conn) >= quota_nb_entry_per_domain) { + domain_nbentry(conn) >= quota_nb_entry_per_domain) { ret = ENOSPC; goto err; } @@ -1495,7 +1495,7 @@ static struct node *create_node(struct connection *conn, const void *ctx, /* Account for new node */ if (i->parent) { - if (domain_entry_inc(conn, i)) { + if (domain_nbentry_inc(conn, get_node_owner(i))) { destroy_node_rm(conn, i); return NULL; } @@ -1648,7 +1648,7 @@ static int delnode_sub(const void *ctx, struct connection *conn, watch_exact = strcmp(root, node->name); fire_watches(conn, ctx, node->name, node, watch_exact, NULL); - domain_entry_dec(conn, node); + domain_nbentry_dec(conn, get_node_owner(node)); return WALK_TREE_RM_CHILDENTRY; } @@ -1784,29 +1784,29 @@ static int do_set_perms(const void *ctx, struct connection *conn, /* Unprivileged domains may not change the owner. */ if (domain_is_unprivileged(conn) && - perms.p[0].id != node->perms.p[0].id) + perms.p[0].id != get_node_owner(node)) return EPERM; old_perms = node->perms; - domain_entry_dec(conn, node); + domain_nbentry_dec(conn, get_node_owner(node)); node->perms = perms; - if (domain_entry_inc(conn, node)) { + if (domain_nbentry_inc(conn, get_node_owner(node))) { node->perms = old_perms; /* * This should never fail because we had a reference on the * domain before and Xenstored is single-threaded. */ - domain_entry_inc(conn, node); + domain_nbentry_inc(conn, get_node_owner(node)); return ENOMEM; } if (write_node(conn, node, false)) { int saved_errno = errno; - domain_entry_dec(conn, node); + domain_nbentry_dec(conn, get_node_owner(node)); node->perms = old_perms; /* No failure possible as above. */ - domain_entry_inc(conn, node); + domain_nbentry_inc(conn, get_node_owner(node)); errno = saved_errno; return errno; @@ -2378,7 +2378,7 @@ void setup_structure(bool live_update) manual_node("/tool/xenstored", NULL); manual_node("@releaseDomain", NULL); manual_node("@introduceDomain", NULL); - domain_entry_fix(dom0_domid, 5, true); + domain_nbentry_fix(dom0_domid, 5, true); } check_store(); @@ -3386,7 +3386,7 @@ void read_state_node(const void *ctx, const void *state) if (write_node_raw(NULL, &key, node, true)) barf("write node error restoring node"); - if (domain_entry_inc(&conn, node)) + if (domain_nbentry_inc(&conn, get_node_owner(node))) barf("node accounting error restoring node"); talloc_free(node); diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 89055cbb21..62d8ee96bd 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -232,6 +232,12 @@ char *canonicalize(struct connection *conn, const void *ctx, const char *node); unsigned int perm_for_conn(struct connection *conn, const struct node_perms *perms); +/* Get owner of a node. */ +static inline unsigned int get_node_owner(const struct node *node) +{ + return node->perms.p[0].id; +} + /* Write a node to the tdb data base. */ int write_node_raw(struct connection *conn, TDB_DATA *key, struct node *node, bool no_quota_check); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 1d765ceffa..703ddeec4e 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -249,7 +249,7 @@ static int domain_tree_remove_sub(const void *ctx, struct connection *conn, domain->nbentry--; node->perms.p[0].id = priv_domid; node->acc.memory = 0; - domain_entry_inc(NULL, node); + domain_nbentry_inc(NULL, priv_domid); if (write_node_raw(NULL, &key, node, true)) { /* That's unfortunate. We only can try to continue. */ syslog(LOG_ERR, @@ -561,7 +561,7 @@ int acc_fix_domains(struct list_head *head, bool update) int cnt; list_for_each_entry(cd, head, list) { - cnt = domain_entry_fix(cd->domid, cd->nbentry, update); + cnt = domain_nbentry_fix(cd->domid, cd->nbentry, update); if (!update) { if (cnt >= quota_nb_entry_per_domain) return ENOSPC; @@ -606,8 +606,8 @@ static struct changed_domain *acc_get_changed_domain(const void *ctx, return cd; } -int acc_add_dom_nbentry(const void *ctx, struct list_head *head, int val, - unsigned int domid) +static int acc_add_dom_nbentry(const void *ctx, struct list_head *head, int val, + unsigned int domid) { struct changed_domain *cd; @@ -991,30 +991,6 @@ void domain_deinit(void) xenevtchn_unbind(xce_handle, virq_port); } -int domain_entry_inc(struct connection *conn, struct node *node) -{ - struct domain *d; - unsigned int domid; - - if (!node->perms.p) - return 0; - - domid = node->perms.p[0].id; - - if (conn && conn->transaction) { - transaction_entry_inc(conn->transaction, domid); - } else { - d = (conn && domid == conn->id && conn->domain) ? conn->domain - : find_or_alloc_existing_domain(domid); - if (d) - d->nbentry++; - else - return ENOMEM; - } - - return 0; -} - /* * Check whether a domain was created before or after a specific generation * count (used for testing whether a node permission is older than a domain). @@ -1082,62 +1058,76 @@ int domain_adjust_node_perms(struct node *node) return 0; } -void domain_entry_dec(struct connection *conn, struct node *node) +static int domain_nbentry_add(struct connection *conn, unsigned int domid, + int add, bool no_dom_alloc) { struct domain *d; - unsigned int domid; - - if (!node->perms.p) - return; + struct list_head *head; + int ret; - domid = node->perms.p ? node->perms.p[0].id : conn->id; + if (conn && domid == conn->id && conn->domain) + d = conn->domain; + else if (no_dom_alloc) { + d = find_domain_struct(domid); + if (!d) { + errno = ENOENT; + corrupt(conn, "Missing domain %u\n", domid); + return -1; + } + } else { + d = find_or_alloc_existing_domain(domid); + if (!d) { + errno = ENOMEM; + return -1; + } + } if (conn && conn->transaction) { - transaction_entry_dec(conn->transaction, domid); - } else { - d = (conn && domid == conn->id && conn->domain) ? conn->domain - : find_domain_struct(domid); - if (d) { - d->nbentry--; - } else { - errno = ENOENT; - corrupt(conn, - "Node \"%s\" owned by non-existing domain %u\n", - node->name, domid); + head = transaction_get_changed_domains(conn->transaction); + ret = acc_add_dom_nbentry(conn->transaction, head, add, domid); + if (errno) { + fail_transaction(conn->transaction); + return -1; } + /* + * In a transaction when a node is being added/removed AND the + * same node has been added/removed outside the transaction in + * parallel, the resulting number of nodes will be wrong. This + * is no problem, as the transaction will fail due to the + * resulting conflict. + * In the node remove case the resulting number can be even + * negative, which should be avoided. + */ + return max(d->nbentry + ret, 0); } + + d->nbentry += add; + + return d->nbentry; } -int domain_entry_fix(unsigned int domid, int num, bool update) +int domain_nbentry_inc(struct connection *conn, unsigned int domid) { - struct domain *d; - int cnt; + return (domain_nbentry_add(conn, domid, 1, false) < 0) ? errno : 0; +} - if (update) { - d = find_domain_struct(domid); - assert(d); - } else { - /* - * We are called first with update == false in order to catch - * any error. So do a possible allocation and check for error - * only in this case, as in the case of update == true nothing - * can go wrong anymore as the allocation already happened. - */ - d = find_or_alloc_existing_domain(domid); - if (!d) - return -1; - } +int domain_nbentry_dec(struct connection *conn, unsigned int domid) +{ + return (domain_nbentry_add(conn, domid, -1, true) < 0) ? errno : 0; +} - cnt = d->nbentry + num; - assert(cnt >= 0); +int domain_nbentry_fix(unsigned int domid, int num, bool update) +{ + int ret; - if (update) - d->nbentry = cnt; + ret = domain_nbentry_add(NULL, domid, update ? num : 0, update); + if (ret < 0 || update) + return ret; - return domid_is_unprivileged(domid) ? cnt : 0; + return domid_is_unprivileged(domid) ? ret + num : 0; } -int domain_entry(struct connection *conn) +int domain_nbentry(struct connection *conn) { return (domain_is_unprivileged(conn)) ? conn->domain->nbentry diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 9e20d2b17d..1e402f2609 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -66,10 +66,10 @@ int domain_adjust_node_perms(struct node *node); int domain_alloc_permrefs(struct node_perms *perms); /* Quota manipulation */ -int domain_entry_inc(struct connection *conn, struct node *); -void domain_entry_dec(struct connection *conn, struct node *); -int domain_entry_fix(unsigned int domid, int num, bool update); -int domain_entry(struct connection *conn); +int domain_nbentry_inc(struct connection *conn, unsigned int domid); +int domain_nbentry_dec(struct connection *conn, unsigned int domid); +int domain_nbentry_fix(unsigned int domid, int num, bool update); +int domain_nbentry(struct connection *conn); int domain_memory_add(unsigned int domid, int mem, bool no_quota_check); /* @@ -99,8 +99,6 @@ void domain_outstanding_domid_dec(unsigned int domid); int domain_get_quota(const void *ctx, struct connection *conn, unsigned int domid); int acc_fix_domains(struct list_head *head, bool update); -int acc_add_dom_nbentry(const void *ctx, struct list_head *head, int val, - unsigned int domid); /* Write rate limiting */ diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c index c009c67989..82e5e66c18 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -548,20 +548,9 @@ int do_transaction_end(const void *ctx, struct connection *conn, return 0; } -void transaction_entry_inc(struct transaction *trans, unsigned int domid) +struct list_head *transaction_get_changed_domains(struct transaction *trans) { - if (!acc_add_dom_nbentry(trans, &trans->changed_domains, 1, domid)) { - /* Let the transaction fail. */ - trans->fail = true; - } -} - -void transaction_entry_dec(struct transaction *trans, unsigned int domid) -{ - if (!acc_add_dom_nbentry(trans, &trans->changed_domains, -1, domid)) { - /* Let the transaction fail. */ - trans->fail = true; - } + return &trans->changed_domains; } void fail_transaction(struct transaction *trans) diff --git a/tools/xenstore/xenstored_transaction.h b/tools/xenstore/xenstored_transaction.h index 3417303f94..b6f8cb7d0a 100644 --- a/tools/xenstore/xenstored_transaction.h +++ b/tools/xenstore/xenstored_transaction.h @@ -36,10 +36,6 @@ int do_transaction_end(const void *ctx, struct connection *conn, struct transaction *transaction_lookup(struct connection *conn, uint32_t id); -/* inc/dec entry number local to trans while changing a node */ -void transaction_entry_inc(struct transaction *trans, unsigned int domid); -void transaction_entry_dec(struct transaction *trans, unsigned int domid); - /* This node was accessed. */ int __must_check access_node(struct connection *conn, struct node *node, enum node_access_type type, TDB_DATA *key); @@ -54,6 +50,9 @@ void transaction_prepend(struct connection *conn, const char *name, /* Mark the transaction as failed. This will prevent it to be committed. */ void fail_transaction(struct transaction *trans); +/* Get the list head of the changed domains. */ +struct list_head *transaction_get_changed_domains(struct transaction *trans); + void conn_delete_all_transactions(struct connection *conn); int check_transactions(struct hashtable *hash); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:14:16 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:14:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489699.758101 (Exim 4.92) (envelope-from ) id 1pOWPv-0000ZW-WB; Sun, 05 Feb 2023 04:14:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489699.758101; Sun, 05 Feb 2023 04:14:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWPv-0000ZO-TJ; Sun, 05 Feb 2023 04:14:15 +0000 Received: by outflank-mailman (input) for mailman id 489699; Sun, 05 Feb 2023 04:14:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWPu-0000Ya-IN for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWPu-0000ve-Hb for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWPu-0008Oh-Gk for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1xBgfPHwD4I9UiEIaMGX8ku8Pq7EPeWze3X7KcKtFXw=; b=Xrfrm/zWTRZYCNufPPc8DrcLC+ Ug8sG4JyA/ljiO6skkcJDoB9QF3wXE8TuNRh0Q1kORm66q8J30nWIUubi9/svmEtCX5yKXtSXn9SP PZoBoBQRvA0x70LsQ2onA2fVXbSH5ftLkDlZOjPpkRiUYLJH6NeTkZXv3hBh0OFDbUEI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: replace literal domid 0 with dom0_domid Message-Id: Date: Sun, 05 Feb 2023 04:14:14 +0000 commit a401b48f378f7b29c7b1f4ea0dc4262aef42bd00 Author: Juergen Gross AuthorDate: Wed Jan 18 10:50:08 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 09:23:51 2023 +0000 tools/xenstore: replace literal domid 0 with dom0_domid There are some places left where dom0 is associated with domid 0. Use dom0_domid instead. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 5 +++-- tools/xenstore/xenstored_domain.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 4582ee39e1..9cfde76898 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2297,9 +2297,10 @@ static void accept_connection(int sock) return; conn = new_connection(&socket_funcs); - if (conn) + if (conn) { conn->fd = fd; - else + conn->id = dom0_domid; + } else close(fd); } #endif diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 703ddeec4e..a703c0ef47 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -326,7 +326,7 @@ static int destroy_domain(void *_domain) if (domain->interface) { /* Domain 0 was mapped by dom0_init, so it must be unmapped using munmap() and not the grant unmap call. */ - if (domain->domid == 0) + if (domain->domid == dom0_domid) unmap_xenbus(domain->interface); else unmap_interface(domain->interface); @@ -410,7 +410,7 @@ void handle_event(void) static bool domid_is_unprivileged(unsigned int domid) { - return domid != 0 && domid != priv_domid; + return domid != dom0_domid && domid != priv_domid; } bool domain_is_unprivileged(struct connection *conn) @@ -798,7 +798,7 @@ static struct domain *onearg_domain(struct connection *conn, return ERR_PTR(-EINVAL); domid = atoi(domid_str); - if (!domid) + if (domid == dom0_domid) return ERR_PTR(-EINVAL); return find_connected_domain(domid); @@ -1004,7 +1004,7 @@ static int chk_domain_generation(unsigned int domid, uint64_t gen) { struct domain *d; - if (!xc_handle && domid == 0) + if (!xc_handle && domid == dom0_domid) return 1; d = find_domain_struct(domid); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:14:26 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:14:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489702.758105 (Exim 4.92) (envelope-from ) id 1pOWQ6-0000ke-30; Sun, 05 Feb 2023 04:14:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489702.758105; Sun, 05 Feb 2023 04:14:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQ6-0000kU-0E; Sun, 05 Feb 2023 04:14:26 +0000 Received: by outflank-mailman (input) for mailman id 489702; Sun, 05 Feb 2023 04:14:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQ4-0000k5-LG for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQ4-0000vk-KZ for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWQ4-0008PJ-K1 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=rndhZKk3qqjXBEgUoJEnznNp0wVGYMvTTKKkKJ0oFaA=; b=m/61N8VSyLBY1tj56HN+VulHjD 7GXhEAZwyzxlldDY50GhPt6lXB/j/jvYO8H9lRfH9jjvKmiXDT9VK6IRm3VO8brIvo7lbFv8dwZOR ylHRWw9RO3YkoQS15lJcQOXC/NIY1XGKZO9v1Nm/WvHr1Ia7xvp270Mxx9gAsEvofQ1c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: make domain_is_unprivileged() an inline function Message-Id: Date: Sun, 05 Feb 2023 04:14:24 +0000 commit e91406f56a7ea1b09e4f265d34f3404c7ceb7316 Author: Juergen Gross AuthorDate: Wed Jan 18 10:50:09 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 09:23:51 2023 +0000 tools/xenstore: make domain_is_unprivileged() an inline function clang 14 is complaining about a NULL dereference for constructs like: domain_is_unprivileged(conn) ? conn->in : NULL as it can't know that domain_is_unprivileged(conn) will return false if conn is NULL. Fix that by making domain_is_unprivileged() an inline function (and related to that domid_is_unprivileged(), too). In order not having to make struct domain public, use conn->id instead of conn->domain->domid for the test. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/xenstored_core.h | 10 ++++++++++ tools/xenstore/xenstored_domain.c | 11 ----------- tools/xenstore/xenstored_domain.h | 2 -- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 62d8ee96bd..6548200d8e 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -318,6 +318,16 @@ void unmap_xenbus(void *interface); static inline int xenbus_master_domid(void) { return dom0_domid; } +static inline bool domid_is_unprivileged(unsigned int domid) +{ + return domid != dom0_domid && domid != priv_domid; +} + +static inline bool domain_is_unprivileged(const struct connection *conn) +{ + return conn && domid_is_unprivileged(conn->id); +} + /* Return the event channel used by xenbus. */ evtchn_port_t xenbus_evtchn(void); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index a703c0ef47..10880a32d9 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -408,17 +408,6 @@ void handle_event(void) barf_perror("Failed to write to event fd"); } -static bool domid_is_unprivileged(unsigned int domid) -{ - return domid != dom0_domid && domid != priv_domid; -} - -bool domain_is_unprivileged(struct connection *conn) -{ - return conn && conn->domain && - domid_is_unprivileged(conn->domain->domid); -} - static char *talloc_domain_path(const void *context, unsigned int domid) { return talloc_asprintf(context, "/local/domain/%u", domid); diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 1e402f2609..22996e2576 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -59,8 +59,6 @@ void ignore_connection(struct connection *conn, unsigned int err); /* Returns the implicit path of a connection (only domains have this) */ const char *get_implicit_path(const struct connection *conn); -bool domain_is_unprivileged(struct connection *conn); - /* Remove node permissions for no longer existing domains. */ int domain_adjust_node_perms(struct node *node); int domain_alloc_permrefs(struct node_perms *perms); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:14:37 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:14:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489706.758112 (Exim 4.92) (envelope-from ) id 1pOWQG-0000rf-5D; Sun, 05 Feb 2023 04:14:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489706.758112; Sun, 05 Feb 2023 04:14:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQG-0000rX-2S; Sun, 05 Feb 2023 04:14:36 +0000 Received: by outflank-mailman (input) for mailman id 489706; Sun, 05 Feb 2023 04:14:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQE-0000rJ-OG for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQE-0000vs-NV for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWQE-0008Pr-Mx for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CeiU/Fz9fkEa4blES2tkTBotPvy2iDmEXoajSQqxLLE=; b=cxB0YjGRQAXt5dpGW8ZYvn2He8 zD3OYU0xnRNpMAXK+brMV9mKDvk022+XI988L7TP1B7flxlmeUcdM1LywI7cyQF6Yo4CVaYOT/wy0 h8Ug86zIusoSTXAkr2rmfvD2rPUB20+2i/Q+qs2PZxjVNyZswJJTbkhMvuKbGztZ2OYE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: let chk_domain_generation() return a bool Message-Id: Date: Sun, 05 Feb 2023 04:14:34 +0000 commit 22f3c41dd73d78350437c0fc0968f67977ab97dd Author: Juergen Gross AuthorDate: Wed Jan 18 10:50:10 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 09:23:51 2023 +0000 tools/xenstore: let chk_domain_generation() return a bool Instead of returning 0 or 1 let chk_domain_generation() return a boolean value. Simplify the only caller by removing the ret variable. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_domain.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 10880a32d9..391395060e 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -985,20 +985,20 @@ void domain_deinit(void) * count (used for testing whether a node permission is older than a domain). * * Return values: - * 0: domain has higher generation count (it is younger than a node with the - * given count), or domain isn't existing any longer - * 1: domain is older than the node + * false: domain has higher generation count (it is younger than a node with + * the given count), or domain isn't existing any longer + * true: domain is older than the node */ -static int chk_domain_generation(unsigned int domid, uint64_t gen) +static bool chk_domain_generation(unsigned int domid, uint64_t gen) { struct domain *d; if (!xc_handle && domid == dom0_domid) - return 1; + return true; d = find_domain_struct(domid); - return (d && d->generation <= gen) ? 1 : 0; + return d && d->generation <= gen; } /* @@ -1033,14 +1033,12 @@ int domain_alloc_permrefs(struct node_perms *perms) int domain_adjust_node_perms(struct node *node) { unsigned int i; - int ret; for (i = 1; i < node->perms.num; i++) { if (node->perms.p[i].perms & XS_PERM_IGNORE) continue; - ret = chk_domain_generation(node->perms.p[i].id, - node->generation); - if (!ret) + if (!chk_domain_generation(node->perms.p[i].id, + node->generation)) node->perms.p[i].perms |= XS_PERM_IGNORE; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:14:46 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:14:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489707.758116 (Exim 4.92) (envelope-from ) id 1pOWQQ-0000uw-6a; Sun, 05 Feb 2023 04:14:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489707.758116; Sun, 05 Feb 2023 04:14:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQQ-0000uo-3w; Sun, 05 Feb 2023 04:14:46 +0000 Received: by outflank-mailman (input) for mailman id 489707; Sun, 05 Feb 2023 04:14:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQO-0000uW-R7 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQO-0000vw-QT for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWQO-0008QM-Pr for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fO9q78spvCDo8bajFkB5phigeNG4HaBB/BfvnpWDl58=; b=GLmwr5zVTK/1QBwUDuSMXBBbzr 0StLmE8352Vj6tSflbVO0KkbftUIf2HSIn3/+w19g5jGRjhPS5U8na8CbvaYiMEvi5b5qBHZPNtcG 6UFmd1mgQ+i5syoUfst84dIkFxAjp9IDR04X0luyHMILUGoD0dYCR+ivsBmL093klrNE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: don't let hashtable_remove() return the removed value Message-Id: Date: Sun, 05 Feb 2023 04:14:44 +0000 commit 473ae5b7f3038c17b8205b65b741f9e2e9dcdc4a Author: Juergen Gross AuthorDate: Wed Jan 18 10:50:11 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 09:23:51 2023 +0000 tools/xenstore: don't let hashtable_remove() return the removed value Letting hashtable_remove() return the value of the removed element is not used anywhere in Xenstore, and it conflicts with a hashtable created specifying the HASHTABLE_FREE_VALUE flag. So just drop returning the value. This of course requires to free the value if the HASHTABLE_FREE_VALUE was specified, as otherwise it would be a memory leak. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/hashtable.c | 9 ++++----- tools/xenstore/hashtable.h | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/xenstore/hashtable.c b/tools/xenstore/hashtable.c index 299549c51e..ddca1591a2 100644 --- a/tools/xenstore/hashtable.c +++ b/tools/xenstore/hashtable.c @@ -214,7 +214,7 @@ hashtable_search(struct hashtable *h, void *k) } /*****************************************************************************/ -void * /* returns value associated with key */ +void hashtable_remove(struct hashtable *h, void *k) { /* TODO: consider compacting the table when the load factor drops enough, @@ -222,7 +222,6 @@ hashtable_remove(struct hashtable *h, void *k) struct entry *e; struct entry **pE; - void *v; unsigned int hashvalue, index; hashvalue = hash(h,k); @@ -236,16 +235,16 @@ hashtable_remove(struct hashtable *h, void *k) { *pE = e->next; h->entrycount--; - v = e->v; if (h->flags & HASHTABLE_FREE_KEY) free(e->k); + if (h->flags & HASHTABLE_FREE_VALUE) + free(e->v); free(e); - return v; + return; } pE = &(e->next); e = e->next; } - return NULL; } /*****************************************************************************/ diff --git a/tools/xenstore/hashtable.h b/tools/xenstore/hashtable.h index 6d65431f96..780ad3c8f7 100644 --- a/tools/xenstore/hashtable.h +++ b/tools/xenstore/hashtable.h @@ -68,10 +68,9 @@ hashtable_search(struct hashtable *h, void *k); * @name hashtable_remove * @param h the hashtable to remove the item from * @param k the key to search for - does not claim ownership - * @return the value associated with the key, or NULL if none found */ -void * /* returns value */ +void hashtable_remove(struct hashtable *h, void *k); /***************************************************************************** -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:14:56 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:14:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489708.758120 (Exim 4.92) (envelope-from ) id 1pOWQa-0000z1-8H; Sun, 05 Feb 2023 04:14:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489708.758120; Sun, 05 Feb 2023 04:14:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQa-0000yt-5Q; Sun, 05 Feb 2023 04:14:56 +0000 Received: by outflank-mailman (input) for mailman id 489708; Sun, 05 Feb 2023 04:14:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQY-0000yh-UI for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQY-0000wN-Tc for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWQY-0008Qu-Sy for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:14:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QU38SgD70ja8XXPVMEHW/znnt9xydXdeU1z4wmzduPI=; b=iDZjyQIDL/gMLLOStXtmtm789S 5sKJjFBhoABQUtCeLQmR4MHC59ac1OEenHkYPn0LuJborJdJKagZSTdwZOjhoq9cLDm4HHmUjy1v7 NDQk/ElY3uhm3ByIOCWSSGUtKujYStQ6TShE1WLDToQFJAP+VnGdMtxlbZPp80zOrQu8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: switch hashtable to use the talloc framework Message-Id: Date: Sun, 05 Feb 2023 04:14:54 +0000 commit 46d960890605f0ebc257ac89050105fe012ee2cd Author: Juergen Gross AuthorDate: Wed Jan 18 10:50:12 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 09:23:51 2023 +0000 tools/xenstore: switch hashtable to use the talloc framework Instead of using malloc() and friends, let the hashtable implementation use the talloc framework. This is more consistent with the rest of xenstored and it allows to track memory usage via "xenstore-control memreport". Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/hashtable.c | 98 +++++++++++++-------------------------- tools/xenstore/hashtable.h | 3 +- tools/xenstore/xenstored_core.c | 5 +- tools/xenstore/xenstored_domain.c | 2 +- 4 files changed, 38 insertions(+), 70 deletions(-) diff --git a/tools/xenstore/hashtable.c b/tools/xenstore/hashtable.c index ddca1591a2..30eb9f21d2 100644 --- a/tools/xenstore/hashtable.c +++ b/tools/xenstore/hashtable.c @@ -6,6 +6,8 @@ #include #include #include +#include +#include "talloc.h" struct entry { @@ -50,7 +52,7 @@ indexFor(unsigned int tablelength, unsigned int hashvalue) { /*****************************************************************************/ struct hashtable * -create_hashtable(unsigned int minsize, +create_hashtable(const void *ctx, unsigned int minsize, unsigned int (*hashf) (void*), int (*eqf) (void*,void*), unsigned int flags) @@ -66,10 +68,10 @@ create_hashtable(unsigned int minsize, if (primes[pindex] > minsize) { size = primes[pindex]; break; } } - h = (struct hashtable *)calloc(1, sizeof(struct hashtable)); + h = talloc_zero(ctx, struct hashtable); if (NULL == h) goto err0; - h->table = (struct entry **)calloc(size, sizeof(struct entry *)); + h->table = talloc_zero_array(h, struct entry *, size); if (NULL == h->table) goto err1; @@ -83,7 +85,7 @@ create_hashtable(unsigned int minsize, return h; err1: - free(h); + talloc_free(h); err0: return NULL; } @@ -115,47 +117,32 @@ hashtable_expand(struct hashtable *h) if (h->primeindex == (prime_table_length - 1)) return 0; newsize = primes[++(h->primeindex)]; - newtable = (struct entry **)calloc(newsize, sizeof(struct entry*)); - if (NULL != newtable) + newtable = talloc_realloc(h, h->table, struct entry *, newsize); + if (!newtable) { - /* This algorithm is not 'stable'. ie. it reverses the list - * when it transfers entries between the tables */ - for (i = 0; i < h->tablelength; i++) { - while (NULL != (e = h->table[i])) { - h->table[i] = e->next; - index = indexFor(newsize,e->h); + h->primeindex--; + return 0; + } + + h->table = newtable; + memset(newtable + h->tablelength, 0, + (newsize - h->tablelength) * sizeof(*newtable)); + for (i = 0; i < h->tablelength; i++) { + for (pE = &(newtable[i]), e = *pE; e != NULL; e = *pE) { + index = indexFor(newsize, e->h); + if (index == i) + { + pE = &(e->next); + } + else + { + *pE = e->next; e->next = newtable[index]; newtable[index] = e; } } - free(h->table); - h->table = newtable; - } - /* Plan B: realloc instead */ - else - { - newtable = (struct entry **) - realloc(h->table, newsize * sizeof(struct entry *)); - if (NULL == newtable) { (h->primeindex)--; return 0; } - h->table = newtable; - memset(newtable + h->tablelength, 0, - (newsize - h->tablelength) * sizeof(*newtable)); - for (i = 0; i < h->tablelength; i++) { - for (pE = &(newtable[i]), e = *pE; e != NULL; e = *pE) { - index = indexFor(newsize,e->h); - if (index == i) - { - pE = &(e->next); - } - else - { - *pE = e->next; - e->next = newtable[index]; - newtable[index] = e; - } - } - } } + h->tablelength = newsize; h->loadlimit = (unsigned int) (((uint64_t)newsize * max_load_factor) / 100); @@ -184,12 +171,16 @@ hashtable_insert(struct hashtable *h, void *k, void *v) * element may be ok. Next time we insert, we'll try expanding again.*/ hashtable_expand(h); } - e = (struct entry *)calloc(1, sizeof(struct entry)); + e = talloc_zero(h, struct entry); if (NULL == e) { --(h->entrycount); return 0; } /*oom*/ e->h = hash(h,k); index = indexFor(h->tablelength,e->h); e->k = k; + if (h->flags & HASHTABLE_FREE_KEY) + talloc_steal(e, k); e->v = v; + if (h->flags & HASHTABLE_FREE_VALUE) + talloc_steal(e, v); e->next = h->table[index]; h->table[index] = e; return -1; @@ -235,11 +226,7 @@ hashtable_remove(struct hashtable *h, void *k) { *pE = e->next; h->entrycount--; - if (h->flags & HASHTABLE_FREE_KEY) - free(e->k); - if (h->flags & HASHTABLE_FREE_VALUE) - free(e->v); - free(e); + talloc_free(e); return; } pE = &(e->next); @@ -278,26 +265,7 @@ hashtable_iterate(struct hashtable *h, void hashtable_destroy(struct hashtable *h) { - unsigned int i; - struct entry *e, *f; - struct entry **table = h->table; - - for (i = 0; i < h->tablelength; i++) - { - e = table[i]; - while (NULL != e) - { - f = e; - e = e->next; - if (h->flags & HASHTABLE_FREE_KEY) - free(f->k); - if (h->flags & HASHTABLE_FREE_VALUE) - free(f->v); - free(f); - } - } - free(h->table); - free(h); + talloc_free(h); } /* diff --git a/tools/xenstore/hashtable.h b/tools/xenstore/hashtable.h index 780ad3c8f7..4e2823134e 100644 --- a/tools/xenstore/hashtable.h +++ b/tools/xenstore/hashtable.h @@ -9,6 +9,7 @@ struct hashtable; * create_hashtable * @name create_hashtable + * @param ctx talloc context to use for allocations * @param minsize minimum initial size of hashtable * @param hashfunction function for hashing keys * @param key_eq_fn function for determining key equality @@ -22,7 +23,7 @@ struct hashtable; #define HASHTABLE_FREE_KEY (1U << 1) struct hashtable * -create_hashtable(unsigned int minsize, +create_hashtable(const void *ctx, unsigned int minsize, unsigned int (*hashfunction) (void*), int (*key_eq_fn) (void*,void*), unsigned int flags diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 9cfde76898..17e678256e 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2405,11 +2405,10 @@ static int keys_equal_fn(void *key1, void *key2) int remember_string(struct hashtable *hash, const char *str) { - char *k = malloc(strlen(str) + 1); + char *k = talloc_strdup(NULL, str); if (!k) return 0; - strcpy(k, str); return hashtable_insert(hash, k, (void *)1); } @@ -2504,7 +2503,7 @@ void check_store(void) }; /* Don't free values (they are all void *1) */ - reachable = create_hashtable(16, hash_from_key_fn, keys_equal_fn, + reachable = create_hashtable(NULL, 16, hash_from_key_fn, keys_equal_fn, HASHTABLE_FREE_KEY); if (!reachable) { log("check_store: ENOMEM"); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 391395060e..4f4c0a727c 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -931,7 +931,7 @@ void domain_init(int evtfd) int rc; /* Start with a random rather low domain count for the hashtable. */ - domhash = create_hashtable(8, domhash_fn, domeq_fn, 0); + domhash = create_hashtable(NULL, 8, domhash_fn, domeq_fn, 0); if (!domhash) barf_perror("Failed to allocate domain hashtable"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:15:06 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:15:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489709.758124 (Exim 4.92) (envelope-from ) id 1pOWQk-000127-AS; Sun, 05 Feb 2023 04:15:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489709.758124; Sun, 05 Feb 2023 04:15:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQk-000120-6x; Sun, 05 Feb 2023 04:15:06 +0000 Received: by outflank-mailman (input) for mailman id 489709; Sun, 05 Feb 2023 04:15:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQj-00011s-1l for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQj-0000wr-0y for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWQj-0008RZ-06 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QflcNqd/k0j6wgLzercUwps43JCHWkWH+MumyJVmuTk=; b=pWoCQY5XvvNcjqWGm5IPeaq0SN G/Kjels4x37yN3Hn9RUlkkIaRKUioKU7Vu1GAYl6IRLxjH4IUnMxNqZJKOIGyIgnzjUc1rCdMTVZ4 sw3f6J48WeL4IxoQQ1UgcQpM8nVRWwhazJfNokfjfgk7LkmXabeuxcifiRxb/mBpiJ9M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: introduce trace classes Message-Id: Date: Sun, 05 Feb 2023 04:15:05 +0000 commit 1d2355d1c64a73bbf456a3a0215e22e5ad54abeb Author: Juergen Gross AuthorDate: Wed Jan 18 10:50:13 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 09:23:51 2023 +0000 tools/xenstore: introduce trace classes Make the xenstored internal trace configurable by adding classes which can be switched on and off independently from each other. Define the following classes: - obj: Creation and deletion of interesting "objects" (watch, transaction, connection) - io: incoming requests and outgoing responses - wrl: write limiting Per default "obj" and "io" are switched on. Entries written via trace() will always be printed (if tracing is on at all). Add the capability to control the trace settings via the "log" command and via a new "--log-control" command line option. Add a missing trace_create() call for creating a transaction. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- docs/misc/xenstore.txt | 10 ++++--- tools/xenstore/xenstored_control.c | 31 +++++++++++++++++-- tools/xenstore/xenstored_core.c | 55 +++++++++++++++++++++++++++++++--- tools/xenstore/xenstored_core.h | 8 +++++ tools/xenstore/xenstored_domain.c | 27 +++++++++-------- tools/xenstore/xenstored_transaction.c | 1 + 6 files changed, 108 insertions(+), 24 deletions(-) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index 44428ae3a7..8887e7df88 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -409,10 +409,12 @@ CONTROL |[|] error string in case of failure. -s can return "BUSY" in case of an active transaction, a retry of -s can be done in that case. - log|on - turn xenstore logging on - log|off - turn xenstore logging off + log|[on|off|+|-] + without parameters: show possible log switches + on: turn xenstore logging on + off: turn xenstore logging off + +: activates log entries for , + -: deactivates log entries for logfile| log to specified file memreport|[] diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 41e6992591..000b2bb8c7 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -182,6 +182,28 @@ static int do_control_check(const void *ctx, struct connection *conn, static int do_control_log(const void *ctx, struct connection *conn, char **vec, int num) { + int ret; + + if (num == 0) { + char *resp = talloc_asprintf(ctx, "Log switch settings:\n"); + unsigned int idx; + bool on; + + if (!resp) + return ENOMEM; + for (idx = 0; trace_switches[idx]; idx++) { + on = trace_flags & (1u << idx); + resp = talloc_asprintf_append(resp, "%-8s: %s\n", + trace_switches[idx], + on ? "on" : "off"); + if (!resp) + return ENOMEM; + } + + send_reply(conn, XS_CONTROL, resp, strlen(resp) + 1); + return 0; + } + if (num != 1) return EINVAL; @@ -189,8 +211,11 @@ static int do_control_log(const void *ctx, struct connection *conn, reopen_log(); else if (!strcmp(vec[0], "off")) close_log(); - else - return EINVAL; + else { + ret = set_trace_switch(vec[0]); + if (ret) + return ret; + } send_ack(conn, XS_CONTROL); return 0; @@ -923,7 +948,7 @@ static int do_control_help(const void *, struct connection *, char **, int); static struct cmd_s cmds[] = { { "check", do_control_check, "" }, - { "log", do_control_log, "on|off" }, + { "log", do_control_log, "[on|off|+|-]" }, #ifndef NO_LIVE_UPDATE /* diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 17e678256e..c2c2c342de 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -85,6 +85,7 @@ static int reopen_log_pipe[2]; static int reopen_log_pipe0_pollfd_idx = -1; char *tracefile = NULL; TDB_CONTEXT *tdb_ctx = NULL; +unsigned int trace_flags = TRACE_OBJ | TRACE_IO; static const char *sockmsg_string(enum xsd_sockmsg_type type); @@ -139,13 +140,13 @@ static void trace_io(const struct connection *conn, time_t now; struct tm *tm; - if (tracefd < 0) + if (tracefd < 0 || !(trace_flags & TRACE_IO)) return; now = time(NULL); tm = localtime(&now); - trace("%s %p %04d%02d%02d %02d:%02d:%02d %s (", + trace("io: %s %p %04d%02d%02d %02d:%02d:%02d %s (", out ? "OUT" : "IN", conn, tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, @@ -158,12 +159,14 @@ static void trace_io(const struct connection *conn, void trace_create(const void *data, const char *type) { - trace("CREATE %s %p\n", type, data); + if (trace_flags & TRACE_OBJ) + trace("obj: CREATE %s %p\n", type, data); } void trace_destroy(const void *data, const char *type) { - trace("DESTROY %s %p\n", type, data); + if (trace_flags & TRACE_OBJ) + trace("obj: DESTROY %s %p\n", type, data); } /** @@ -2599,6 +2602,8 @@ static void usage(void) " -N, --no-fork to request that the daemon does not fork,\n" " -P, --output-pid to request that the pid of the daemon is output,\n" " -T, --trace-file giving the file for logging, and\n" +" --trace-control=+ activate a specific \n" +" --trace-control=- deactivate a specific \n" " -E, --entry-nb limit the number of entries per domain,\n" " -S, --entry-size limit the size of entry per domain, and\n" " -W, --watch-nb limit the number of watches per domain,\n" @@ -2642,6 +2647,7 @@ static struct option options[] = { { "output-pid", 0, NULL, 'P' }, { "entry-size", 1, NULL, 'S' }, { "trace-file", 1, NULL, 'T' }, + { "trace-control", 1, NULL, 1 }, { "transaction", 1, NULL, 't' }, { "perm-nb", 1, NULL, 'A' }, { "path-max", 1, NULL, 'M' }, @@ -2716,6 +2722,43 @@ static void set_quota(const char *arg, bool soft) barf("unknown quota \"%s\"\n", arg); } +/* Sorted by bit values of TRACE_* flags. Flag is (1u << index). */ +const char *const trace_switches[] = { + "obj", "io", "wrl", + NULL +}; + +int set_trace_switch(const char *arg) +{ + bool remove = (arg[0] == '-'); + unsigned int idx; + + switch (arg[0]) { + case '-': + remove = true; + break; + case '+': + remove = false; + break; + default: + return EINVAL; + } + + arg++; + + for (idx = 0; trace_switches[idx]; idx++) { + if (!strcmp(arg, trace_switches[idx])) { + if (remove) + trace_flags &= ~(1u << idx); + else + trace_flags |= 1u << idx; + return 0; + } + } + + return EINVAL; +} + int main(int argc, char *argv[]) { int opt; @@ -2764,6 +2807,10 @@ int main(int argc, char *argv[]) case 'T': tracefile = optarg; break; + case 1: + if (set_trace_switch(optarg)) + barf("Illegal trace switch \"%s\"\n", optarg); + break; case 'I': if (optarg && !strcmp(optarg, "off")) tdb_flags = 0; diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 6548200d8e..c59b06551f 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -294,6 +294,14 @@ extern char **orig_argv; extern char *tracefile; extern int tracefd; +/* Trace flag values must be kept in sync with trace_switches[] contents. */ +extern unsigned int trace_flags; +#define TRACE_OBJ 0x00000001 +#define TRACE_IO 0x00000002 +#define TRACE_WRL 0x00000004 +extern const char *const trace_switches[]; +int set_trace_switch(const char *arg); + extern TDB_CONTEXT *tdb_ctx; extern int dom0_domid; extern int dom0_event; diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 4f4c0a727c..e9d84d7c24 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -1261,6 +1261,12 @@ static long wrl_ndomains; static wrl_creditt wrl_reserve; /* [-wrl_config_newdoms_dburst, +_gburst ] */ static time_t wrl_log_last_warning; /* 0: no previous warning */ +#define trace_wrl(...) \ +do { \ + if (trace_flags & TRACE_WRL) \ + trace("wrl: " __VA_ARGS__); \ +} while (0) + void wrl_gettime_now(struct wrl_timestampt *now_wt) { struct timespec now_ts; @@ -1366,12 +1372,9 @@ void wrl_credit_update(struct domain *domain, struct wrl_timestampt now) domain->wrl_timestamp = now; - trace("wrl: dom %4d %6ld msec %9ld credit %9ld reserve" - " %9ld discard\n", - domain->domid, - msec, - (long)domain->wrl_credit, (long)wrl_reserve, - (long)surplus); + trace_wrl("dom %4d %6ld msec %9ld credit %9ld reserve %9ld discard\n", + domain->domid, msec, (long)domain->wrl_credit, + (long)wrl_reserve, (long)surplus); } void wrl_check_timeout(struct domain *domain, @@ -1403,10 +1406,9 @@ void wrl_check_timeout(struct domain *domain, if (*ptimeout==-1 || wakeup < *ptimeout) *ptimeout = wakeup; - trace("wrl: domain %u credit=%ld (reserve=%ld) SLEEPING for %d\n", - domain->domid, - (long)domain->wrl_credit, (long)wrl_reserve, - wakeup); + trace_wrl("domain %u credit=%ld (reserve=%ld) SLEEPING for %d\n", + domain->domid, (long)domain->wrl_credit, (long)wrl_reserve, + wakeup); } #define WRL_LOG(now, ...) \ @@ -1424,9 +1426,8 @@ void wrl_apply_debit_actual(struct domain *domain) wrl_credit_update(domain, now); domain->wrl_credit -= wrl_config_writecost; - trace("wrl: domain %u credit=%ld (reserve=%ld)\n", - domain->domid, - (long)domain->wrl_credit, (long)wrl_reserve); + trace_wrl("domain %u credit=%ld (reserve=%ld)\n", domain->domid, + (long)domain->wrl_credit, (long)wrl_reserve); if (domain->wrl_credit < 0) { if (!domain->wrl_delay_logged) { diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c index 82e5e66c18..1aa9d3cb3d 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -475,6 +475,7 @@ int do_transaction_start(const void *ctx, struct connection *conn, if (!trans) return ENOMEM; + trace_create(trans, "transaction"); INIT_LIST_HEAD(&trans->accessed); INIT_LIST_HEAD(&trans->changed_domains); trans->conn = conn; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:15:16 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:15:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489711.758129 (Exim 4.92) (envelope-from ) id 1pOWQu-00018A-Db; Sun, 05 Feb 2023 04:15:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489711.758129; Sun, 05 Feb 2023 04:15:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQu-000182-Al; Sun, 05 Feb 2023 04:15:16 +0000 Received: by outflank-mailman (input) for mailman id 489711; Sun, 05 Feb 2023 04:15:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQt-00017m-4q for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWQt-0000wv-46 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWQt-0008S0-3X for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mWxHL2KL1cle8lgpkcVgRgqvgrQfg5eN+4hA92AiSLc=; b=gAamU+K4VBJw2AQDgA/M86WICE /SemvVfsN754oUAacXBI4PCv9zeUSHXy6zbrvFggbvA+L00wt3Un/1ixm91Yytey8MZ04JgeYu9oY UEow6KNXprm3mRCCcMby3zzkGz8hTMNtWDZr6hp1LhX4DOaRqQoIeZ3GoHO7qfEEMziI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: let check_store() check the accounting data Message-Id: Date: Sun, 05 Feb 2023 04:15:15 +0000 commit 67617067f0b681dd17d24bc2197cc9a30f8a7c3b Author: Juergen Gross AuthorDate: Wed Jan 18 10:50:14 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 09:23:51 2023 +0000 tools/xenstore: let check_store() check the accounting data Today check_store() is only testing the correctness of the node tree. Add verification of the accounting data (number of nodes) and correct the data if it is wrong. Do the initial check_store() call only after Xenstore entries of a live update have been read. This is wanted to make sure the accounting data is correct after a live update. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 62 +++++++++++++++++++++------- tools/xenstore/xenstored_domain.c | 86 +++++++++++++++++++++++++++++++++++++++ tools/xenstore/xenstored_domain.h | 4 ++ 3 files changed, 137 insertions(+), 15 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index c2c2c342de..27dfbe9593 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2384,8 +2384,6 @@ void setup_structure(bool live_update) manual_node("@introduceDomain", NULL); domain_nbentry_fix(dom0_domid, 5, true); } - - check_store(); } static unsigned int hash_from_key_fn(void *k) @@ -2428,20 +2426,28 @@ int remember_string(struct hashtable *hash, const char *str) * As we go, we record each node in the given reachable hashtable. These * entries will be used later in clean_store. */ + +struct check_store_data { + struct hashtable *reachable; + struct hashtable *domains; +}; + static int check_store_step(const void *ctx, struct connection *conn, struct node *node, void *arg) { - struct hashtable *reachable = arg; + struct check_store_data *data = arg; - if (hashtable_search(reachable, (void *)node->name)) { + if (hashtable_search(data->reachable, (void *)node->name)) { log("check_store: '%s' is duplicated!", node->name); return recovery ? WALK_TREE_RM_CHILDENTRY : WALK_TREE_SKIP_CHILDREN; } - if (!remember_string(reachable, node->name)) + if (!remember_string(data->reachable, node->name)) return WALK_TREE_ERROR_STOP; + domain_check_acc_add(node, data->domains); + return WALK_TREE_OK; } @@ -2491,37 +2497,61 @@ static int clean_store_(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA val, * Given the list of reachable nodes, iterate over the whole store, and * remove any that were not reached. */ -static void clean_store(struct hashtable *reachable) +static void clean_store(struct check_store_data *data) { - tdb_traverse(tdb_ctx, &clean_store_, reachable); + tdb_traverse(tdb_ctx, &clean_store_, data->reachable); + domain_check_acc(data->domains); } +int check_store_path(const char *name, struct check_store_data *data) +{ + struct node *node; + + node = read_node(NULL, NULL, name); + if (!node) { + log("check_store: error %d reading special node '%s'", errno, + name); + return errno; + } + + return check_store_step(NULL, NULL, node, data); +} void check_store(void) { - struct hashtable *reachable; struct walk_funcs walkfuncs = { .enter = check_store_step, .enoent = check_store_enoent, }; + struct check_store_data data; /* Don't free values (they are all void *1) */ - reachable = create_hashtable(NULL, 16, hash_from_key_fn, keys_equal_fn, - HASHTABLE_FREE_KEY); - if (!reachable) { + data.reachable = create_hashtable(NULL, 16, hash_from_key_fn, + keys_equal_fn, HASHTABLE_FREE_KEY); + if (!data.reachable) { log("check_store: ENOMEM"); return; } + data.domains = domain_check_acc_init(); + if (!data.domains) { + log("check_store: ENOMEM"); + goto out_hash; + } + log("Checking store ..."); - if (walk_node_tree(NULL, NULL, "/", &walkfuncs, reachable)) { + if (walk_node_tree(NULL, NULL, "/", &walkfuncs, &data)) { if (errno == ENOMEM) log("check_store: ENOMEM"); - } else if (!check_transactions(reachable)) - clean_store(reachable); + } else if (!check_store_path("@introduceDomain", &data) && + !check_store_path("@releaseDomain", &data) && + !check_transactions(data.reachable)) + clean_store(&data); log("Checking store complete."); - hashtable_destroy(reachable); + hashtable_destroy(data.domains); + out_hash: + hashtable_destroy(data.reachable); } @@ -2920,6 +2950,8 @@ int main(int argc, char *argv[]) lu_read_state(); #endif + check_store(); + /* Get ready to listen to the tools. */ initialize_fds(&sock_pollfd_idx, &timeout); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index e9d84d7c24..9ef41ede03 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -1574,6 +1574,92 @@ void read_state_connection(const void *ctx, const void *state) read_state_buffered_data(ctx, conn, sc); } +struct domain_acc { + unsigned int domid; + int nodes; +}; + +static int domain_check_acc_init_sub(const void *k, void *v, void *arg) +{ + struct hashtable *domains = arg; + struct domain *d = v; + struct domain_acc *dom; + + dom = talloc_zero(NULL, struct domain_acc); + if (!dom) + return -1; + + dom->domid = d->domid; + /* + * Set the initial value to the negative one of the current domain. + * If everything is correct incrementing the value for each node will + * result in dom->nodes being 0 at the end. + */ + dom->nodes = -d->nbentry; + + if (!hashtable_insert(domains, &dom->domid, dom)) { + talloc_free(dom); + return -1; + } + + return 0; +} + +struct hashtable *domain_check_acc_init(void) +{ + struct hashtable *domains; + + domains = create_hashtable(NULL, 8, domhash_fn, domeq_fn, + HASHTABLE_FREE_VALUE); + if (!domains) + return NULL; + + if (hashtable_iterate(domhash, domain_check_acc_init_sub, domains)) { + hashtable_destroy(domains); + return NULL; + } + + return domains; +} + +void domain_check_acc_add(const struct node *node, struct hashtable *domains) +{ + struct domain_acc *dom; + unsigned int domid; + + domid = get_node_owner(node); + dom = hashtable_search(domains, &domid); + if (!dom) + log("Node %s owned by unknown domain %u", node->name, domid); + else + dom->nodes++; +} + +static int domain_check_acc_cb(const void *k, void *v, void *arg) +{ + struct domain_acc *dom = v; + struct domain *d; + + if (!dom->nodes) + return 0; + + log("Correct accounting data for domain %u: nodes are %d off", + dom->domid, dom->nodes); + + d = find_domain_struct(dom->domid); + if (!d) + return 0; + + d->nbentry += dom->nodes; + + return 0; +} + +void domain_check_acc(struct hashtable *domains) +{ + hashtable_iterate(domains, domain_check_acc_cb, NULL); +} + /* * Local variables: * mode: C diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 22996e2576..dc4660861e 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -129,4 +129,8 @@ const char *dump_state_connections(FILE *fp); void read_state_connection(const void *ctx, const void *state); +struct hashtable *domain_check_acc_init(void); +void domain_check_acc_add(const struct node *node, struct hashtable *domains); +void domain_check_acc(struct hashtable *domains); + #endif /* _XENSTORED_DOMAIN_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:15:26 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:15:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489713.758132 (Exim 4.92) (envelope-from ) id 1pOWR4-0001Bt-FD; Sun, 05 Feb 2023 04:15:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489713.758132; Sun, 05 Feb 2023 04:15:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWR4-0001Bm-CH; Sun, 05 Feb 2023 04:15:26 +0000 Received: by outflank-mailman (input) for mailman id 489713; Sun, 05 Feb 2023 04:15:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWR3-0001B5-7f for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWR3-0000yW-6z for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWR3-0008SP-6Q for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eXKxp/CECiRaPmCGhE6o6/mWIx+zxUlFb5vvHFknXGM=; b=p8nOpXqr6S5tI1e260njbFiWJH JdZV19TEUEjKi75BCtQXCERcbqgl1F0KDH80s6cE4FVa5fKIa1JfFZmi7RnMiW2+qAWA6FO7P83So tuc9GrJCq1ftuHUHGeTwTr2ds2lycG1Po4PKr50I+MUHjfP5wRdWEa5nK2xAds0DR5CU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: make output of "xenstore-control help" more pretty Message-Id: Date: Sun, 05 Feb 2023 04:15:25 +0000 commit 5f5d25c84c0d3e0c6bdce2e135262ea913a4dd76 Author: Juergen Gross AuthorDate: Wed Jan 18 10:50:15 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 09:23:51 2023 +0000 tools/xenstore: make output of "xenstore-control help" more pretty Using a tab for separating the command from the options in the output of "xenstore-control help" results in a rather ugly list. Use a fixed size for the command instead. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 000b2bb8c7..cbd62556c3 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -996,7 +996,7 @@ static int do_control_help(const void *ctx, struct connection *conn, if (!resp) return ENOMEM; for (cmd = 0; cmd < ARRAY_SIZE(cmds); cmd++) { - resp = talloc_asprintf_append(resp, "%s\t%s\n", + resp = talloc_asprintf_append(resp, "%-15s %s\n", cmds[cmd].cmd, cmds[cmd].pars); if (!resp) return ENOMEM; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:15:36 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:15:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489714.758135 (Exim 4.92) (envelope-from ) id 1pOWRE-0001IJ-Gb; Sun, 05 Feb 2023 04:15:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489714.758135; Sun, 05 Feb 2023 04:15:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWRE-0001IB-Dt; Sun, 05 Feb 2023 04:15:36 +0000 Received: by outflank-mailman (input) for mailman id 489714; Sun, 05 Feb 2023 04:15:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWRD-0001HG-B5 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWRD-0000ye-AQ for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWRD-0008TF-9d for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Hl0AXKd6H4g5OxY+T/CNX3MAt26X0F2+SVdKWkpnv2w=; b=Gw0neJlO6WqRtXjoPjPwHRbdVJ sgKHEVlkbT9rfiAkFeAl/yLsQnkAC/BTGfQb4yfTabbt4VviLjwq2Gc4UM9XECN828LNZWkCacxj7 +zUm+SN2FAmib2naxf46s/lUss8FmYGEty0Ex3ygSGiZ03npFVDiLO4G5eS9PXFGJL8U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Use the correct format specifier Message-Id: Date: Sun, 05 Feb 2023 04:15:35 +0000 commit 13bfdceda0991214854f3e563a36f621e9da3bec Author: Ayan Kumar Halder AuthorDate: Tue Jan 17 17:43:49 2023 +0000 Commit: Julien Grall CommitDate: Fri Jan 20 09:31:59 2023 +0000 xen/arm: Use the correct format specifier 1. One should use 'PRIpaddr' to display 'paddr_t' variables. 2. One should use 'PRIx64' to display 'u64' in hex format. The current use of 'PRIpaddr' for printing PTE is buggy as this is not a physical address. Signed-off-by: Ayan Kumar Halder Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 10 +++++----- xen/arch/arm/gic-v2.c | 6 +++--- xen/arch/arm/mm.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index f35f4d2456..5608b290b5 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1315,7 +1315,7 @@ static int __init make_memory_node(const struct domain *d, dt_dprintk("Create memory node\n"); /* ePAPR 3.4 */ - snprintf(buf, sizeof(buf), "memory@%"PRIx64, mem->bank[i].start); + snprintf(buf, sizeof(buf), "memory@%"PRIpaddr, mem->bank[i].start); res = fdt_begin_node(fdt, buf); if ( res ) return res; @@ -1383,7 +1383,7 @@ static int __init make_shm_memory_node(const struct domain *d, __be32 *cells; unsigned int len = (addrcells + sizecells) * sizeof(__be32); - snprintf(buf, sizeof(buf), "xen-shmem@%"PRIx64, mem->bank[i].start); + snprintf(buf, sizeof(buf), "xen-shmem@%"PRIpaddr, mem->bank[i].start); res = fdt_begin_node(fdt, buf); if ( res ) return res; @@ -2719,7 +2719,7 @@ static int __init make_gicv2_domU_node(struct kernel_info *kinfo) /* Placeholder for interrupt-controller@ + a 64-bit number + \0 */ char buf[38]; - snprintf(buf, sizeof(buf), "interrupt-controller@%"PRIx64, + snprintf(buf, sizeof(buf), "interrupt-controller@%"PRIpaddr, vgic_dist_base(&d->arch.vgic)); res = fdt_begin_node(fdt, buf); if ( res ) @@ -2775,7 +2775,7 @@ static int __init make_gicv3_domU_node(struct kernel_info *kinfo) char buf[38]; unsigned int i, len = 0; - snprintf(buf, sizeof(buf), "interrupt-controller@%"PRIx64, + snprintf(buf, sizeof(buf), "interrupt-controller@%"PRIpaddr, vgic_dist_base(&d->arch.vgic)); res = fdt_begin_node(fdt, buf); @@ -2861,7 +2861,7 @@ static int __init make_vpl011_uart_node(struct kernel_info *kinfo) /* Placeholder for sbsa-uart@ + a 64-bit number + \0 */ char buf[27]; - snprintf(buf, sizeof(buf), "sbsa-uart@%"PRIx64, d->arch.vpl011.base_addr); + snprintf(buf, sizeof(buf), "sbsa-uart@%"PRIpaddr, d->arch.vpl011.base_addr); res = fdt_begin_node(fdt, buf); if ( res ) return res; diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 61802839cb..5d4d298b86 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -1049,7 +1049,7 @@ static void __init gicv2_dt_init(void) if ( csize < SZ_8K ) { printk(XENLOG_WARNING "GICv2: WARNING: " - "The GICC size is too small: %#"PRIx64" expected %#x\n", + "The GICC size is too small: %#"PRIpaddr" expected %#x\n", csize, SZ_8K); if ( platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) { @@ -1280,11 +1280,11 @@ static int __init gicv2_init(void) gicv2.map_cbase += aliased_offset; printk(XENLOG_WARNING - "GICv2: Adjusting CPU interface base to %#"PRIx64"\n", + "GICv2: Adjusting CPU interface base to %#"PRIpaddr"\n", cbase + aliased_offset); } else if ( csize == SZ_128K ) printk(XENLOG_WARNING - "GICv2: GICC size=%#"PRIx64" but not aliased\n", + "GICv2: GICC size=%#"PRIpaddr" but not aliased\n", csize); gicv2.map_hbase = ioremap_nocache(hbase, PAGE_SIZE); diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 0fc6f2992d..fab54618ab 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -249,7 +249,7 @@ void dump_pt_walk(paddr_t ttbr, paddr_t addr, pte = mapping[offsets[level]]; - printk("%s[0x%03x] = 0x%"PRIpaddr"\n", + printk("%s[0x%03x] = 0x%"PRIx64"\n", level_strs[level], offsets[level], pte.bits); if ( level == 3 || !pte.walk.valid || !pte.walk.table ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:15:46 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:15:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489715.758140 (Exim 4.92) (envelope-from ) id 1pOWRO-0001LY-Hu; Sun, 05 Feb 2023 04:15:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489715.758140; Sun, 05 Feb 2023 04:15:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWRO-0001LR-FM; Sun, 05 Feb 2023 04:15:46 +0000 Received: by outflank-mailman (input) for mailman id 489715; Sun, 05 Feb 2023 04:15:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWRN-0001LH-EO for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWRN-0000ys-Dm for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWRN-0008Ts-Cu for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Kf55le0pVxKD8wGzshtiqb3LFdj8UrhjroNFKuSrdvc=; b=0FACXM8aAdXQKLQqwogzQJgoH2 5kNgkvUy2ZxOCmCNIadZ+4OpBBX4Wpd05Xi6vIILj7VkrmYwXhMmuYrqZyklhK+TInQbuPG51vgYE vhtVrQ7DjTTvWD2jsm9IL9Kxjyo1fvQCKEWEvswkn0yuViZlVyjlSD7yYRRKvg6uBHPw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: domain_build: Replace use of paddr_t in find_domU_holes() Message-Id: Date: Sun, 05 Feb 2023 04:15:45 +0000 commit 89cc5d96a9d1fce81cf58b6814dac62a9e07fbee Author: Ayan Kumar Halder AuthorDate: Tue Jan 17 17:43:50 2023 +0000 Commit: Julien Grall CommitDate: Fri Jan 20 09:51:15 2023 +0000 xen/arm: domain_build: Replace use of paddr_t in find_domU_holes() bankbase, banksize and bankend are used to hold values of type 'unsigned long long'. This can be represented as 'uint64_t' instead of 'paddr_t'. This will ensure consistency with allocate_static_memory() (where we use 'uint64_t' for rambase and ramsize). In future, paddr_t can be used for 'uin32_t' as well to represent 32bit physical addresses. Signed-off-by: Ayan Kumar Halder Acked-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 5608b290b5..9116452d0c 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1726,9 +1726,9 @@ static int __init find_domU_holes(const struct kernel_info *kinfo, struct meminfo *ext_regions) { unsigned int i; - paddr_t bankend; - const paddr_t bankbase[] = GUEST_RAM_BANK_BASES; - const paddr_t banksize[] = GUEST_RAM_BANK_SIZES; + uint64_t bankend; + const uint64_t bankbase[] = GUEST_RAM_BANK_BASES; + const uint64_t banksize[] = GUEST_RAM_BANK_SIZES; int res = -ENOENT; for ( i = 0; i < GUEST_RAM_BANKS; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:15:56 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:15:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489716.758143 (Exim 4.92) (envelope-from ) id 1pOWRY-0001On-JH; Sun, 05 Feb 2023 04:15:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489716.758143; Sun, 05 Feb 2023 04:15:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWRY-0001Og-Go; Sun, 05 Feb 2023 04:15:56 +0000 Received: by outflank-mailman (input) for mailman id 489716; Sun, 05 Feb 2023 04:15:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWRX-0001ON-HY for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWRX-0000zC-Gt for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWRX-0008UH-GC for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:15:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KKL6jhIGWTn1N/0Hk380za6+WmYgyoZ5/nps5P8e1/I=; b=HQ1o4CbRc/ougqCX6hK0wSMi4c No9Z2E2mm3pMdIeh19zOh87nEQP9j7M0Gy57L1T9ZZvyzqNZtvMFdsXgyOac0eWmfQik120LWiYEA RPZTGgER4ooLIVphPwOoC4cokGtcIFFJ9sqJg5bq089PNMy0DeTzDOsHQVadvw4EdTZ0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: Fix incorrect DIRECTMAP_SIZE calculation Message-Id: Date: Sun, 05 Feb 2023 04:15:55 +0000 commit 1b9d4ec26b01c5cde17153b27f1038a24e6d8b27 Author: Michal Orzel AuthorDate: Tue Jan 17 12:43:30 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 13:44:05 2023 +0000 xen/arm64: Fix incorrect DIRECTMAP_SIZE calculation The direct mapped area occupies L0 slots from 256 to 265 included (i.e. 10 slots), resulting in 5TB (512GB * 10) of virtual address space. However, due to incorrect slot subtraction (we take 9 slots into account) we set DIRECTMAP_SIZE to 4.5TB instead. Fix it. Note that we only support up to 2TB of physical memory so this is a latent issue. Fixes: 5263507b1b4a ("xen: arm: Use a direct mapping of RAM on arm64") Signed-off-by: Michal Orzel Reviewed-by: Julien Grall --- xen/arch/arm/include/asm/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/include/asm/config.h b/xen/arch/arm/include/asm/config.h index 0fefed1b8a..16213c8b67 100644 --- a/xen/arch/arm/include/asm/config.h +++ b/xen/arch/arm/include/asm/config.h @@ -157,7 +157,7 @@ #define FRAMETABLE_NR (FRAMETABLE_SIZE / sizeof(*frame_table)) #define DIRECTMAP_VIRT_START SLOT0(256) -#define DIRECTMAP_SIZE (SLOT0_ENTRY_SIZE * (265-256)) +#define DIRECTMAP_SIZE (SLOT0_ENTRY_SIZE * (266 - 256)) #define DIRECTMAP_VIRT_END (DIRECTMAP_VIRT_START + DIRECTMAP_SIZE - 1) #define XENHEAP_VIRT_START directmap_virt_start -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:16:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:16:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489717.758147 (Exim 4.92) (envelope-from ) id 1pOWRj-0001Rx-LO; Sun, 05 Feb 2023 04:16:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489717.758147; Sun, 05 Feb 2023 04:16:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWRj-0001Rp-II; Sun, 05 Feb 2023 04:16:07 +0000 Received: by outflank-mailman (input) for mailman id 489717; Sun, 05 Feb 2023 04:16:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWRh-0001Ra-La for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWRh-00011O-Jy for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWRh-0008Ux-JH for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1EfMeB0gCB9JYn7LklqtJMU18Uxp2ZW6TehahNB+k9g=; b=f7KN491/7tuF8O+HW2TLe8qjk4 X5uZVunV0VJZ77WVQ5Ue+KPDiuGvf9li4dLazkZNBKmq20loscCfeaFQQijANj3R3J9qNZEr0pun7 AcwvGZBehn2rA1gy0VYYDpwXDiJ4LrcP3O6f6acRQrtlyaZh1CgCdownoObBB7hCDbjM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm32: Remove unused macro FRAMETABLE_VIRT_END Message-Id: Date: Sun, 05 Feb 2023 04:16:05 +0000 commit b2220f85256a9209560586c25e37d7ad860fa1e2 Author: Michal Orzel AuthorDate: Tue Jan 17 12:43:31 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 13:44:05 2023 +0000 xen/arm32: Remove unused macro FRAMETABLE_VIRT_END This macro is unused and the corresponding one for arm64 has already been removed as part of the commit 6dc9a1fe982f ("xen/arm: Remove most of the *_VIRT_END defines"). Signed-off-by: Michal Orzel Reviewed-by: Julien Grall --- xen/arch/arm/include/asm/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/xen/arch/arm/include/asm/config.h b/xen/arch/arm/include/asm/config.h index 16213c8b67..6661a41583 100644 --- a/xen/arch/arm/include/asm/config.h +++ b/xen/arch/arm/include/asm/config.h @@ -127,7 +127,6 @@ #define FRAMETABLE_VIRT_START _AT(vaddr_t,0x02000000) #define FRAMETABLE_SIZE MB(128-32) #define FRAMETABLE_NR (FRAMETABLE_SIZE / sizeof(*frame_table)) -#define FRAMETABLE_VIRT_END (FRAMETABLE_VIRT_START + FRAMETABLE_SIZE - 1) #define VMAP_VIRT_START _AT(vaddr_t,0x10000000) #define VMAP_VIRT_SIZE _AT(vaddr_t, GB(1) - MB(256)) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:16:17 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:16:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489719.758152 (Exim 4.92) (envelope-from ) id 1pOWRt-0001Vb-Nv; Sun, 05 Feb 2023 04:16:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489719.758152; Sun, 05 Feb 2023 04:16:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWRt-0001VT-LK; Sun, 05 Feb 2023 04:16:17 +0000 Received: by outflank-mailman (input) for mailman id 489719; Sun, 05 Feb 2023 04:16:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWRr-0001VE-Ng for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWRr-0001BX-N1 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWRr-0008VU-ML for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=05gvYVaIKwe0h39nkU1UUlzHyal097z+y64i1STtEJU=; b=hHVoQ+Hr161IKIt6v+ukx3eMOK uovcnmth8jhxyM5DjNd7dSbTIgPdfdQIcbVVhUT8w5UJ2VyQgIBQ5timGr097gOuprkjf21q31Pjx lzweLccTfjYPn9249YgLez0Ep5XSkhtGh1WYH5W9HXm0Np/XbMGXAHFil17uHrtVoUQk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Harden setup_frametable_mappings Message-Id: Date: Sun, 05 Feb 2023 04:16:15 +0000 commit 93017efd7c441420318e46443a06e40fa6f1b6d4 Author: Michal Orzel AuthorDate: Tue Jan 17 12:43:32 2023 +0100 Commit: Julien Grall CommitDate: Fri Jan 20 13:44:05 2023 +0000 xen/arm: Harden setup_frametable_mappings The amount of supported physical memory depends on the frametable size and the number of struct page_info entries that can fit into it. Define a macro PAGE_INFO_SIZE to store the current size of the struct page_info (i.e. 56B for arm64 and 32B for arm32) and add a sanity check in setup_frametable_mappings to be notified whenever the size of the structure changes. Also call a panic if the calculated frametable_size exceeds the limit defined by FRAMETABLE_SIZE macro. Update the comments regarding the frametable in asm/config.h. Signed-off-by: Michal Orzel Reviewed-by: Julien Grall --- xen/arch/arm/include/asm/config.h | 4 ++-- xen/arch/arm/include/asm/mm.h | 11 +++++++++++ xen/arch/arm/mm.c | 6 ++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/include/asm/config.h b/xen/arch/arm/include/asm/config.h index 6661a41583..d8f9977698 100644 --- a/xen/arch/arm/include/asm/config.h +++ b/xen/arch/arm/include/asm/config.h @@ -82,7 +82,7 @@ * ARM32 layout: * 0 - 12M * - * 32M - 128M Frametable: 24 bytes per page for 16GB of RAM + * 32M - 128M Frametable: 32 bytes per page for 12GB of RAM * 256M - 1G VMAP: ioremap and early_ioremap use this virtual address * space * @@ -95,7 +95,7 @@ * * 1G - 2G VMAP: ioremap and early_ioremap * - * 32G - 64G Frametable: 24 bytes per page for 5.3TB of RAM + * 32G - 64G Frametable: 56 bytes per page for 2TB of RAM * * 0x0000008000000000 - 0x00007fffffffffff (127.5TB, L0 slots [1..255]) * Unused diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index 68adcac9fa..23dec574eb 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -26,6 +26,17 @@ */ #define PFN_ORDER(_pfn) ((_pfn)->v.free.order) +/* + * The size of struct page_info impacts the number of entries that can fit + * into the frametable area and thus it affects the amount of physical memory + * we claim to support. Define PAGE_INFO_SIZE to be used for sanity checking. +*/ +#ifdef CONFIG_ARM_64 +#define PAGE_INFO_SIZE 56 +#else +#define PAGE_INFO_SIZE 32 +#endif + struct page_info { /* Each frame can be threaded onto a doubly-linked list. */ diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index fab54618ab..1d2d58fa0a 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -676,6 +676,12 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) const unsigned long mapping_size = frametable_size < MB(32) ? MB(2) : MB(32); int rc; + BUILD_BUG_ON(sizeof(struct page_info) != PAGE_INFO_SIZE); + + if ( frametable_size > FRAMETABLE_SIZE ) + panic("The frametable cannot cover the physical region %#"PRIpaddr" - %#"PRIpaddr"\n", + ps, pe); + frametable_base_pdx = mfn_to_pdx(maddr_to_mfn(ps)); /* Round up to 2M or 32M boundary, as appropriate. */ frametable_size = ROUNDUP(frametable_size, mapping_size); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:16:27 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:16:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489720.758156 (Exim 4.92) (envelope-from ) id 1pOWS3-0001YN-PV; Sun, 05 Feb 2023 04:16:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489720.758156; Sun, 05 Feb 2023 04:16:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWS3-0001YF-Ml; Sun, 05 Feb 2023 04:16:27 +0000 Received: by outflank-mailman (input) for mailman id 489720; Sun, 05 Feb 2023 04:16:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWS1-0001Y3-RT for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWS1-0001Bb-QF for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWS1-0008W0-Pc for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fLKPqGmXrY/MvdiXbwCv4icXK/kc2FgLScFpPubSTVE=; b=1N86lz7caUuWhAlMq52pGjyVdo n0pMvHZ2FdKwy98508w2tMZM4gcs/aXe++gbKqzDU/mE9prmU/zE8jZXJmu6+c+rG5H8srw5ulhDb CunopiZBTIsrWiMHIhxpWa1GIMJy+VzLQekUU7PbAoUHVNvbi91GodaAyLOsQuoD1GBM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Revert "xen/arm: Use the correct format specifier" Message-Id: Date: Sun, 05 Feb 2023 04:16:25 +0000 commit 56f3782633c252dcec9c96eb345f95fb9557cea7 Author: Julien Grall AuthorDate: Fri Jan 20 17:32:00 2023 +0000 Commit: Julien Grall CommitDate: Fri Jan 20 17:33:45 2023 +0000 Revert "xen/arm: Use the correct format specifier" This is breaking the CI. See: https://lore.kernel.org/all/ba37ee02-c07c-2803-0867-149c779890b6@amd.com/ This reverts commit 13bfdceda0991214854f3e563a36f621e9da3bec. Signed-off-by: Julien Grall --- xen/arch/arm/domain_build.c | 10 +++++----- xen/arch/arm/gic-v2.c | 6 +++--- xen/arch/arm/mm.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 9116452d0c..c2b97fa21e 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1315,7 +1315,7 @@ static int __init make_memory_node(const struct domain *d, dt_dprintk("Create memory node\n"); /* ePAPR 3.4 */ - snprintf(buf, sizeof(buf), "memory@%"PRIpaddr, mem->bank[i].start); + snprintf(buf, sizeof(buf), "memory@%"PRIx64, mem->bank[i].start); res = fdt_begin_node(fdt, buf); if ( res ) return res; @@ -1383,7 +1383,7 @@ static int __init make_shm_memory_node(const struct domain *d, __be32 *cells; unsigned int len = (addrcells + sizecells) * sizeof(__be32); - snprintf(buf, sizeof(buf), "xen-shmem@%"PRIpaddr, mem->bank[i].start); + snprintf(buf, sizeof(buf), "xen-shmem@%"PRIx64, mem->bank[i].start); res = fdt_begin_node(fdt, buf); if ( res ) return res; @@ -2719,7 +2719,7 @@ static int __init make_gicv2_domU_node(struct kernel_info *kinfo) /* Placeholder for interrupt-controller@ + a 64-bit number + \0 */ char buf[38]; - snprintf(buf, sizeof(buf), "interrupt-controller@%"PRIpaddr, + snprintf(buf, sizeof(buf), "interrupt-controller@%"PRIx64, vgic_dist_base(&d->arch.vgic)); res = fdt_begin_node(fdt, buf); if ( res ) @@ -2775,7 +2775,7 @@ static int __init make_gicv3_domU_node(struct kernel_info *kinfo) char buf[38]; unsigned int i, len = 0; - snprintf(buf, sizeof(buf), "interrupt-controller@%"PRIpaddr, + snprintf(buf, sizeof(buf), "interrupt-controller@%"PRIx64, vgic_dist_base(&d->arch.vgic)); res = fdt_begin_node(fdt, buf); @@ -2861,7 +2861,7 @@ static int __init make_vpl011_uart_node(struct kernel_info *kinfo) /* Placeholder for sbsa-uart@ + a 64-bit number + \0 */ char buf[27]; - snprintf(buf, sizeof(buf), "sbsa-uart@%"PRIpaddr, d->arch.vpl011.base_addr); + snprintf(buf, sizeof(buf), "sbsa-uart@%"PRIx64, d->arch.vpl011.base_addr); res = fdt_begin_node(fdt, buf); if ( res ) return res; diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 5d4d298b86..61802839cb 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -1049,7 +1049,7 @@ static void __init gicv2_dt_init(void) if ( csize < SZ_8K ) { printk(XENLOG_WARNING "GICv2: WARNING: " - "The GICC size is too small: %#"PRIpaddr" expected %#x\n", + "The GICC size is too small: %#"PRIx64" expected %#x\n", csize, SZ_8K); if ( platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) { @@ -1280,11 +1280,11 @@ static int __init gicv2_init(void) gicv2.map_cbase += aliased_offset; printk(XENLOG_WARNING - "GICv2: Adjusting CPU interface base to %#"PRIpaddr"\n", + "GICv2: Adjusting CPU interface base to %#"PRIx64"\n", cbase + aliased_offset); } else if ( csize == SZ_128K ) printk(XENLOG_WARNING - "GICv2: GICC size=%#"PRIpaddr" but not aliased\n", + "GICv2: GICC size=%#"PRIx64" but not aliased\n", csize); gicv2.map_hbase = ioremap_nocache(hbase, PAGE_SIZE); diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 1d2d58fa0a..1a94b52cce 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -249,7 +249,7 @@ void dump_pt_walk(paddr_t ttbr, paddr_t addr, pte = mapping[offsets[level]]; - printk("%s[0x%03x] = 0x%"PRIx64"\n", + printk("%s[0x%03x] = 0x%"PRIpaddr"\n", level_strs[level], offsets[level], pte.bits); if ( level == 3 || !pte.walk.valid || !pte.walk.table ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:16:37 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:16:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489721.758160 (Exim 4.92) (envelope-from ) id 1pOWSD-0001bO-R0; Sun, 05 Feb 2023 04:16:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489721.758160; Sun, 05 Feb 2023 04:16:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWSD-0001bG-OD; Sun, 05 Feb 2023 04:16:37 +0000 Received: by outflank-mailman (input) for mailman id 489721; Sun, 05 Feb 2023 04:16:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWSB-0001az-Tn for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWSB-0001Bp-T9 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWSB-0008WP-SU for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MvbaoAWco2GTIhcqqf2jKKY/nfEYxK7pphAs9e/Tl0A=; b=mD2G1pCxgPtLhrbnyFFkh1Ka8j qA1smuc/LfhqAgXnd/pxh7JzrtgCWTYc9z7Z1BGrsGRv/pmP5NQ1ouM2eEPUK9QJ+yCBjoQp4qjuL IZkJH+C7W59ODhJrwKfUDOE/5Ch8KuF0gmDuF+i9udU3TIvpQxFTEWTMiSlrTKaKkZc8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/version: Drop bogus return values for XENVER_platform_parameters Message-Id: Date: Sun, 05 Feb 2023 04:16:35 +0000 commit 273bde319fe039083a90f1aae211815d90a0a36e Author: Andrew Cooper AuthorDate: Tue Jan 3 13:45:48 2023 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 20 19:39:32 2023 +0000 xen/version: Drop bogus return values for XENVER_platform_parameters A split in virtual address space is only applicable for x86 PV guests. Furthermore, the information returned for x86 64bit PV guests is wrong. Explain the problem in version.h, stating the other information that PV guests need to know. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/common/kernel.c | 20 +++++++++++++++++--- xen/include/public/version.h | 27 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 4f268d83e3..f7b1f65f37 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -518,11 +518,15 @@ long do_xen_version(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENVER_platform_parameters: { + const struct vcpu *curr = current; + #ifdef CONFIG_COMPAT - if ( current->hcall_compat ) + if ( curr->hcall_compat ) { compat_platform_parameters_t params = { - .virt_start = HYPERVISOR_COMPAT_VIRT_START(current->domain), + .virt_start = is_pv_vcpu(curr) + ? HYPERVISOR_COMPAT_VIRT_START(curr->domain) + : 0, }; if ( copy_to_guest(arg, ¶ms, 1) ) @@ -532,7 +536,17 @@ long do_xen_version(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) #endif { xen_platform_parameters_t params = { - .virt_start = HYPERVISOR_VIRT_START, + /* + * Out of an abundance of caution, retain the useless return + * value for 64bit PV guests, but in release builds only. + * + * This is not expected to cause any problems, but if it does, + * the developer impacted will be the one best suited to fix + * the caller not to issue this hypercall. + */ + .virt_start = !IS_ENABLED(CONFIG_DEBUG) && is_pv_vcpu(curr) + ? HYPERVISOR_VIRT_START + : 0, }; if ( copy_to_guest(arg, ¶ms, 1) ) diff --git a/xen/include/public/version.h b/xen/include/public/version.h index 0ff8bd9077..cbc4ef7a46 100644 --- a/xen/include/public/version.h +++ b/xen/include/public/version.h @@ -42,6 +42,33 @@ typedef char xen_capabilities_info_t[1024]; typedef char xen_changeset_info_t[64]; #define XEN_CHANGESET_INFO_LEN (sizeof(xen_changeset_info_t)) +/* + * This API is problematic. + * + * It is only applicable to guests which share pagetables with Xen (x86 PV + * guests), but unfortunately has leaked into other guest types and + * architectures with an expectation of never failing. + * + * It is intended to identify the virtual address split between guest kernel + * and Xen. + * + * For 32bit PV guests, there is a split, and it is variable (between two + * fixed bounds), and this boundary is reported to guests. The detail missing + * from the hypercall is that the second boundary is the 32bit architectural + * boundary at 4G. + * + * For 64bit PV guests, Xen lives at the bottom of the upper canonical range. + * This hypercall happens to report the architectural boundary, not the one + * which would be necessary to make a variable split work. As such, this + * hypercall entirely useless for 64bit PV guests, and all inspected + * implementations at the time of writing were found to have compile time + * expectations about the split. + * + * For architectures where this hypercall is implemented, for backwards + * compatibility with the expectation of the hypercall never failing Xen will + * return 0 instead of failing with -ENOSYS in cases where the guest should + * not be making the hypercall. + */ #define XENVER_platform_parameters 5 struct xen_platform_parameters { xen_ulong_t virt_start; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:16:48 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:16:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489722.758163 (Exim 4.92) (envelope-from ) id 1pOWSN-0001dl-SP; Sun, 05 Feb 2023 04:16:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489722.758163; Sun, 05 Feb 2023 04:16:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWSN-0001de-Pr; Sun, 05 Feb 2023 04:16:47 +0000 Received: by outflank-mailman (input) for mailman id 489722; Sun, 05 Feb 2023 04:16:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWSM-0001dU-0h for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWSL-0001C0-WE for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWSL-00005C-VW for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Zi43ywqtZkn9aApJWwdOXPZDzr6UDyRmpAVN9CGLNu8=; b=tr/vPnnGfr4KiirpauTSM40H+3 n3fdjMnUTUJuwqbW9sAfVXvWjS8UBJmOvFlCAdnrk3yFMRXczEm56HWX/xz/beql7GpsG3oGa72cm qMMFQf90QM+8L2SGUXluPRSQThuXuVBmOez8O03/gmbKmKvbgY07+8BWdQs0jjeX0vac=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: Drop pat_entry_2_pte_flags Message-Id: Date: Sun, 05 Feb 2023 04:16:45 +0000 commit 848ca4e75f972e1d6ddae110965b2cc24997544f Author: Andrew Cooper AuthorDate: Mon Jan 16 11:01:26 2023 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 20 19:39:32 2023 +0000 x86/hvm: Drop pat_entry_2_pte_flags Converting from PAT to PTE is trivial, and shorter to encode with bitwise logic than the space taken by a table counting from 0 to 7 in non-adjacent bits. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/hvm/mtrr.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 093103f6c7..344edc2d6a 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -29,13 +29,6 @@ /* Get page attribute fields (PAn) from PAT MSR. */ #define pat_cr_2_paf(pat_cr,n) ((((uint64_t)pat_cr) >> ((n)<<3)) & 0xff) -/* PAT entry to PTE flags (PAT, PCD, PWT bits). */ -static const uint8_t pat_entry_2_pte_flags[8] = { - 0, _PAGE_PWT, - _PAGE_PCD, _PAGE_PCD | _PAGE_PWT, - _PAGE_PAT, _PAGE_PAT | _PAGE_PWT, - _PAGE_PAT | _PAGE_PCD, _PAGE_PAT | _PAGE_PCD | _PAGE_PWT }; - /* Effective mm type lookup table, according to MTRR and PAT. */ static const uint8_t mm_type_tbl[MTRR_NUM_TYPES][X86_NUM_MT] = { #define RS MEMORY_NUM_TYPES @@ -117,7 +110,7 @@ uint8_t pat_type_2_pte_flags(uint8_t pat_type) if ( unlikely(pat_entry == INVALID_MEM_TYPE) ) pat_entry = pat_entry_tbl[X86_MT_UC]; - return pat_entry_2_pte_flags[pat_entry]; + return cacheattr_to_pte_flags(pat_entry); } int hvm_vcpu_cacheattr_init(struct vcpu *v) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:16:57 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:16:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489723.758168 (Exim 4.92) (envelope-from ) id 1pOWSX-0001gj-U6; Sun, 05 Feb 2023 04:16:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489723.758168; Sun, 05 Feb 2023 04:16:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWSX-0001gc-RR; Sun, 05 Feb 2023 04:16:57 +0000 Received: by outflank-mailman (input) for mailman id 489723; Sun, 05 Feb 2023 04:16:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWSW-0001gO-3g for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWSW-0001CN-2u for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWSW-00005b-2M for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:16:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cGiW4LRBDjxGqXVA74n8NuXmXkqi/RXDPqSUtvq8wSs=; b=DQbFJ+aUV+hhUktEmtrBIfZ5ys IfifWfTlXR7qY42gV8rtwRnZeBYjKy5klmeJqs2wu0M6RiIB0FYUCCQYEFB485VjiLC/o8l+2mQcC o0kP4ngp9hjVBt8XD8LKxTIQOqei20O3v7HuN/jJ9FafwSvLxUZvDOFwZvPEOGIegBRA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: Drop dubious lastpage diagnostic Message-Id: Date: Sun, 05 Feb 2023 04:16:56 +0000 commit b5d8b03db136dca2c7e755cd227265b5be451c88 Author: Andrew Cooper AuthorDate: Fri Jan 20 11:01:52 2023 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 20 19:39:32 2023 +0000 x86/shadow: Drop dubious lastpage diagnostic This is a global variable (actually 3, one per GUEST_PAGING_LEVEL), operated on using atomics only (with no regard to what else shares the same cacheline), which emits a diagnostic (in debug builds only) without changing any program behaviour. It is presumably left-over debugging, as it interlinks the behaviour of all vCPUs in chronological order. Based on the read-only p2m types, this diagnostic can be tripped by entirely legitimate guest behaviour. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/mm/shadow/multi.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 8b3e678fa0..3b06cfaf9a 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2597,14 +2597,7 @@ static int cf_check sh_page_fault( /* Ignore attempts to write to read-only memory. */ if ( p2m_is_readonly(p2mt) && (ft == ft_demand_write) ) - { - static unsigned long lastpage; - if ( xchg(&lastpage, va & PAGE_MASK) != (va & PAGE_MASK) ) - gdprintk(XENLOG_DEBUG, "guest attempted write to read-only memory" - " page. va page=%#lx, mfn=%#lx\n", - va & PAGE_MASK, mfn_x(gmfn)); goto emulate_readonly; /* skip over the instruction */ - } /* In HVM guests, we force CR0.WP always to be set, so that the * pagetables are always write-protected. If the guest thinks -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:17:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:17:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489724.758172 (Exim 4.92) (envelope-from ) id 1pOWSh-0001js-W1; Sun, 05 Feb 2023 04:17:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489724.758172; Sun, 05 Feb 2023 04:17:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWSh-0001jk-Sx; Sun, 05 Feb 2023 04:17:07 +0000 Received: by outflank-mailman (input) for mailman id 489724; Sun, 05 Feb 2023 04:17:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWSg-0001jM-6m for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWSg-0001Cf-69 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWSg-00006E-5X for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ur1NaKj1Q9Jw37blGlbQvBqFPRL2NchuEGX6DGVzM38=; b=sNkCpOzP5jiPMpXuMVIBglklZk xfykYcGXhMmgHtY2Hivvwv32LMhQ+K8oy/4bSrQ7xO0j1ZUwEFTPzKY8VSCXMXvvi+xT/L2zMmYph rxov3zb/4FMMyuB5njZw+HDwnC0hXkZb89mjt1D4nIp4SaeF01YBqk1lD2d/utafB/I8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vmx: Partially revert "x86/vmx: implement Notify VM Exit" Message-Id: Date: Sun, 05 Feb 2023 04:17:06 +0000 commit 5f08bc9404c7cfa8131e262c7dbcb4d96c752686 Author: Andrew Cooper AuthorDate: Wed Jan 18 19:20:05 2023 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 20 19:39:32 2023 +0000 x86/vmx: Partially revert "x86/vmx: implement Notify VM Exit" The original patch tried to do two things - implement VMNotify, and re-optimise VT-x to not intercept #DB/#AC by default. The second part is buggy in multiple ways. Both GDBSX and Introspection need to conditionally intercept #DB, which was not accounted for. Also, #DB interception has nothing at all to do with cpu_has_monitor_trap_flag. Revert the second half, leaving #DB/#AC intercepted unilaterally, but with VMNotify active by default when available. Fixes: 573279cde1c4 ("x86/vmx: implement Notify VM Exit") Signed-off-by: Andrew Cooper Reviewed-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmcs.c | 11 ++--------- xen/arch/x86/hvm/vmx/vmx.c | 16 ++-------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 8992f4e0ae..7d8bfeb539 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1296,17 +1296,10 @@ static int construct_vmcs(struct vcpu *v) v->arch.hvm.vmx.exception_bitmap = HVM_TRAP_MASK | (paging_mode_hap(d) ? 0 : (1U << TRAP_page_fault)) | (v->arch.fully_eager_fpu ? 0 : (1U << TRAP_no_device)); + if ( cpu_has_vmx_notify_vm_exiting ) - { __vmwrite(NOTIFY_WINDOW, vm_notify_window); - /* - * Disable #AC and #DB interception: by using VM Notify Xen is - * guaranteed to get a VM exit even if the guest manages to lock the - * CPU. - */ - v->arch.hvm.vmx.exception_bitmap &= ~((1U << TRAP_debug) | - (1U << TRAP_alignment_check)); - } + vmx_update_exception_bitmap(v); v->arch.hvm.guest_cr[0] = X86_CR0_PE | X86_CR0_ET; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 15a07933ee..2e2ab0ac0e 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1564,19 +1564,10 @@ static void cf_check vmx_update_host_cr3(struct vcpu *v) void vmx_update_debug_state(struct vcpu *v) { - unsigned int mask = 1u << TRAP_int3; - - if ( !cpu_has_monitor_trap_flag && cpu_has_vmx_notify_vm_exiting ) - /* - * Only allow toggling TRAP_debug if notify VM exit is enabled, as - * unconditionally setting TRAP_debug is part of the XSA-156 fix. - */ - mask |= 1u << TRAP_debug; - if ( v->arch.hvm.debug_state_latch ) - v->arch.hvm.vmx.exception_bitmap |= mask; + v->arch.hvm.vmx.exception_bitmap |= 1U << TRAP_int3; else - v->arch.hvm.vmx.exception_bitmap &= ~mask; + v->arch.hvm.vmx.exception_bitmap &= ~(1U << TRAP_int3); vmx_vmcs_enter(v); vmx_update_exception_bitmap(v); @@ -4192,9 +4183,6 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) switch ( vector ) { case TRAP_debug: - if ( cpu_has_monitor_trap_flag && cpu_has_vmx_notify_vm_exiting ) - goto exit_and_crash; - /* * Updates DR6 where debugger can peek (See 3B 23.2.1, * Table 23-1, "Exit Qualification for Debug Exceptions"). -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:17:17 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:17:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489725.758176 (Exim 4.92) (envelope-from ) id 1pOWSr-0001n3-2w; Sun, 05 Feb 2023 04:17:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489725.758176; Sun, 05 Feb 2023 04:17:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWSr-0001mt-0D; Sun, 05 Feb 2023 04:17:17 +0000 Received: by outflank-mailman (input) for mailman id 489725; Sun, 05 Feb 2023 04:17:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWSq-0001mb-A5 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWSq-0001Cx-9O for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWSq-00006f-8f for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Z1pRP0p3pruhQjLIkRCDT5Syi9bWsdRLdYDqxMUD/24=; b=QfoOU9k35e/U/3spIVBnp1Y2tb VIzfVvBeu/bMrHiRHDnODtOty7A/lf269IUAnyjsGwJqTNmznG72xOOVRCF689PHVOcrU4+HlLfF6 tb36rnaWWgcGb1bfFm7vjHTpNuft94w6pFUcdVYn4fD9XOOKCwete6UtUalyCNaUwl5Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Sanitise PKRU on boot Message-Id: Date: Sun, 05 Feb 2023 04:17:16 +0000 commit c4f9a3bad3f1c6e34c61ad8103a4145f2d6f9c68 Author: Andrew Cooper AuthorDate: Tue Jan 10 10:57:21 2023 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 20 19:39:32 2023 +0000 x86/boot: Sanitise PKRU on boot While the reset value of the register is 0, it might not be after kexec/etc. If PKEY0.{WD,AD} have leaked in from an earlier context, construction of a PV dom0 will explode. Sequencing wise, this must come after setting CR4.PKE, and before we touch any user mappings. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 3 +++ xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/setup.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 0412dbc915..fe92f29c2d 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -936,6 +936,9 @@ void cpu_init(void) write_debugreg(6, X86_DR6_DEFAULT); write_debugreg(7, X86_DR7_DEFAULT); + if (cpu_has_pku) + wrpkru(0); + /* * If the platform is performing a Secure Launch via SKINIT, GIF is * clear to prevent external interrupts interfering with Secure diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index a3ad9ebee4..044cfd9f88 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -109,6 +109,7 @@ /* CPUID level 0x00000007:0.ecx */ #define cpu_has_avx512_vbmi boot_cpu_has(X86_FEATURE_AVX512_VBMI) +#define cpu_has_pku boot_cpu_has(X86_FEATURE_PKU) #define cpu_has_avx512_vbmi2 boot_cpu_has(X86_FEATURE_AVX512_VBMI2) #define cpu_has_gfni boot_cpu_has(X86_FEATURE_GFNI) #define cpu_has_vaes boot_cpu_has(X86_FEATURE_VAES) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 566422600d..6deadcf747 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1798,7 +1798,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( boot_cpu_has(X86_FEATURE_FSGSBASE) ) set_in_cr4(X86_CR4_FSGSBASE); - if ( boot_cpu_has(X86_FEATURE_PKU) ) + if ( cpu_has_pku ) set_in_cr4(X86_CR4_PKE); if ( opt_invpcid && cpu_has_invpcid ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:17:27 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:17:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489726.758180 (Exim 4.92) (envelope-from ) id 1pOWT1-0001qA-4I; Sun, 05 Feb 2023 04:17:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489726.758180; Sun, 05 Feb 2023 04:17:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWT1-0001q2-1h; Sun, 05 Feb 2023 04:17:27 +0000 Received: by outflank-mailman (input) for mailman id 489726; Sun, 05 Feb 2023 04:17:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWT0-0001ps-D6 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWT0-0001D2-CV for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWT0-000074-Bo for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:26 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uxLdiSUniRc5gup1WjVKd4ZQB2erOe4c663vAeLeV2E=; b=taysGfq47EdvrADrl3Fl0J6aY/ fUF+kPfyQdg280EowWR6bSPmERRduhGy3fjQuBDTMfSexIy/rVJlVUGYEL7BYSDzaAchojogXG6PD tl39od2fNS+paGcIqSXtcONfz92RsxRIVKrBXh9pvRqGyX7qihguQmiWowe1BSzgFPg8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/prot-key: Enumeration for Protection Key Supervisor Message-Id: Date: Sun, 05 Feb 2023 04:17:26 +0000 commit cd8fc0e9f313bb59d496a777c4af206b21c33296 Author: Andrew Cooper AuthorDate: Tue Dec 14 16:51:28 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 20 19:39:33 2023 +0000 x86/prot-key: Enumeration for Protection Key Supervisor Protection Key Supervisor works in a very similar way to Protection Key User, except that instead of a PKRU register used by the {RD,WR}PKRU instructions, the supervisor protection settings live in MSR_PKRS and is accessed using normal {RD,WR}MSR instructions. PKS has the same problematic interactions with PV guests as PKU (more infact, given the guest kernel's CPL), so we'll only support this for HVM guests for now. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- tools/libs/light/libxl_cpuid.c | 1 + tools/misc/xen-cpuid.c | 2 +- xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/include/asm/msr-index.h | 2 ++ xen/arch/x86/include/asm/x86-defns.h | 1 + xen/include/public/arch-x86/cpufeatureset.h | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index 2aa23225f4..cbd4e511e8 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -211,6 +211,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) {"avx512-vpopcntdq",0x00000007,0,CPUID_REG_ECX, 14, 1}, {"rdpid", 0x00000007, 0, CPUID_REG_ECX, 22, 1}, {"cldemote", 0x00000007, 0, CPUID_REG_ECX, 25, 1}, + {"pks", 0x00000007, 0, CPUID_REG_ECX, 31, 1}, {"avx512-4vnniw",0x00000007, 0, CPUID_REG_EDX, 2, 1}, {"avx512-4fmaps",0x00000007, 0, CPUID_REG_EDX, 3, 1}, diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index d5833e9ce8..ea7ff320e0 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -134,7 +134,7 @@ static const char *const str_7c0[32] = /* 24 */ [25] = "cldemote", /* 26 */ [27] = "movdiri", [28] = "movdir64b", [29] = "enqcmd", - [30] = "sgx-lc", + [30] = "sgx-lc", [31] = "pks", }; static const char *const str_e7d[32] = diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index 044cfd9f88..0a301013c3 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -121,6 +121,7 @@ #define cpu_has_movdiri boot_cpu_has(X86_FEATURE_MOVDIRI) #define cpu_has_movdir64b boot_cpu_has(X86_FEATURE_MOVDIR64B) #define cpu_has_enqcmd boot_cpu_has(X86_FEATURE_ENQCMD) +#define cpu_has_pks boot_cpu_has(X86_FEATURE_PKS) /* CPUID level 0x80000007.edx */ #define cpu_has_hw_pstate boot_cpu_has(X86_FEATURE_HW_PSTATE) diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index 0a8852f3c2..7615d8087f 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -148,6 +148,8 @@ #define MSR_PL3_SSP 0x000006a7 #define MSR_INTERRUPT_SSP_TABLE 0x000006a8 +#define MSR_PKRS 0x000006e1 + #define MSR_X2APIC_FIRST 0x00000800 #define MSR_X2APIC_LAST 0x000008ff diff --git a/xen/arch/x86/include/asm/x86-defns.h b/xen/arch/x86/include/asm/x86-defns.h index 42b5f382d4..fe1caba6f8 100644 --- a/xen/arch/x86/include/asm/x86-defns.h +++ b/xen/arch/x86/include/asm/x86-defns.h @@ -74,6 +74,7 @@ #define X86_CR4_SMAP 0x00200000 /* enable SMAP */ #define X86_CR4_PKE 0x00400000 /* enable PKE */ #define X86_CR4_CET 0x00800000 /* Control-flow Enforcement Technology */ +#define X86_CR4_PKS 0x01000000 /* Protection Key Supervisor */ /* * XSTATE component flags in XCR0 diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 7915f5826f..ad7e89dd4c 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -227,6 +227,7 @@ XEN_CPUFEATURE(CLDEMOTE, 6*32+25) /*A CLDEMOTE instruction */ XEN_CPUFEATURE(MOVDIRI, 6*32+27) /*a MOVDIRI instruction */ XEN_CPUFEATURE(MOVDIR64B, 6*32+28) /*a MOVDIR64B instruction */ XEN_CPUFEATURE(ENQCMD, 6*32+29) /* ENQCMD{,S} instructions */ +XEN_CPUFEATURE(PKS, 6*32+31) /* Protection Key for Supervisor */ /* AMD-defined CPU features, CPUID level 0x80000007.edx, word 7 */ XEN_CPUFEATURE(HW_PSTATE, 7*32+ 7) /* Hardware Pstates */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:17:37 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:17:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489727.758184 (Exim 4.92) (envelope-from ) id 1pOWTB-0001sv-68; Sun, 05 Feb 2023 04:17:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489727.758184; Sun, 05 Feb 2023 04:17:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTB-0001sn-3F; Sun, 05 Feb 2023 04:17:37 +0000 Received: by outflank-mailman (input) for mailman id 489727; Sun, 05 Feb 2023 04:17:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTA-0001sg-GC for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTA-0001DJ-FU for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWTA-00007i-Eq for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:36 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=S/iFPMV+4BVV1nWns/JtnWVTMS8ALDQldRf78ESGDlw=; b=FozIymB6GubMTlAASauTB1zce5 O9FWv7wgBVKA61m9w4RhNEHpoC8K5TmI3Mwiu+L6S1voczotFrkuhMncCkpP/WUDcw2jaw2cYdoMX V8YQF1yZdklyOZRPqxlwEOcbe9XmkgfBKGTJrPiQp5kdpkxS/M52vaYr8Er5CZaeyMaI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/prot-key: Split PKRU infrastructure out of asm/processor.h Message-Id: Date: Sun, 05 Feb 2023 04:17:36 +0000 commit c04b84ec74a47b13f7e0869f35983dbb026a9b9d Author: Andrew Cooper AuthorDate: Tue Dec 14 16:51:28 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 20 19:39:33 2023 +0000 x86/prot-key: Split PKRU infrastructure out of asm/processor.h asm/processor.h is in desperate need of splitting up, and protection key functionality in only used in the emulator and pagewalk. Introduce a new asm/prot-key.h and move the relevant content over. Rename the PKRU_* constants to drop the user part and to use the architectural terminology. Drop the read_pkru_{ad,wd}() helpers entirely. The pkru infix is about to become wrong, and the sole user is shorter and easier to follow without the helpers. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 1 + xen/arch/x86/include/asm/processor.h | 38 ------------------------------------ xen/arch/x86/include/asm/prot-key.h | 31 +++++++++++++++++++++++++++++ xen/arch/x86/mm/guest_walk.c | 9 ++++++--- xen/arch/x86/x86_emulate.c | 2 ++ 5 files changed, 40 insertions(+), 41 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index fe92f29c2d..2bcdd08b2f 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index 60b9020609..b95d248321 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -374,44 +374,6 @@ static always_inline void set_in_cr4 (unsigned long mask) write_cr4(read_cr4() | mask); } -static inline unsigned int rdpkru(void) -{ - unsigned int pkru; - - asm volatile (".byte 0x0f,0x01,0xee" - : "=a" (pkru) : "c" (0) : "dx"); - - return pkru; -} - -static inline void wrpkru(unsigned int pkru) -{ - asm volatile ( ".byte 0x0f, 0x01, 0xef" - :: "a" (pkru), "d" (0), "c" (0) ); -} - -/* Macros for PKRU domain */ -#define PKRU_READ (0) -#define PKRU_WRITE (1) -#define PKRU_ATTRS (2) - -/* - * PKRU defines 32 bits, there are 16 domains and 2 attribute bits per - * domain in pkru, pkeys is index to a defined domain, so the value of - * pte_pkeys * PKRU_ATTRS + R/W is offset of a defined domain attribute. - */ -static inline bool_t read_pkru_ad(uint32_t pkru, unsigned int pkey) -{ - ASSERT(pkey < 16); - return (pkru >> (pkey * PKRU_ATTRS + PKRU_READ)) & 1; -} - -static inline bool_t read_pkru_wd(uint32_t pkru, unsigned int pkey) -{ - ASSERT(pkey < 16); - return (pkru >> (pkey * PKRU_ATTRS + PKRU_WRITE)) & 1; -} - static always_inline void __monitor(const void *eax, unsigned long ecx, unsigned long edx) { diff --git a/xen/arch/x86/include/asm/prot-key.h b/xen/arch/x86/include/asm/prot-key.h new file mode 100644 index 0000000000..63a2e22f3f --- /dev/null +++ b/xen/arch/x86/include/asm/prot-key.h @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (c) 2021-2022 Citrix Systems Ltd. + */ +#ifndef ASM_PROT_KEY_H +#define ASM_PROT_KEY_H + +#include + +#define PKEY_AD 1 /* Access Disable */ +#define PKEY_WD 2 /* Write Disable */ + +#define PKEY_WIDTH 2 /* Two bits per protection key */ + +static inline uint32_t rdpkru(void) +{ + uint32_t pkru; + + asm volatile ( ".byte 0x0f,0x01,0xee" + : "=a" (pkru) : "c" (0) : "dx" ); + + return pkru; +} + +static inline void wrpkru(uint32_t pkru) +{ + asm volatile ( ".byte 0x0f,0x01,0xef" + :: "a" (pkru), "d" (0), "c" (0) ); +} + +#endif /* ASM_PROT_KEY_H */ diff --git a/xen/arch/x86/mm/guest_walk.c b/xen/arch/x86/mm/guest_walk.c index 70dacc477f..161a61b8f5 100644 --- a/xen/arch/x86/mm/guest_walk.c +++ b/xen/arch/x86/mm/guest_walk.c @@ -26,7 +26,9 @@ #include #include #include + #include +#include #include #include @@ -413,10 +415,11 @@ guest_walk_tables(const struct vcpu *v, struct p2m_domain *p2m, guest_pku_enabled(v) ) { unsigned int pkey = guest_l1e_get_pkey(gw->l1e); - unsigned int pkru = rdpkru(); + unsigned int pkr = rdpkru(); + unsigned int pk_ar = (pkr >> (pkey * PKEY_WIDTH)) & (PKEY_AD | PKEY_WD); - if ( read_pkru_ad(pkru, pkey) || - ((walk & PFEC_write_access) && read_pkru_wd(pkru, pkey) && + if ( (pk_ar & PKEY_AD) || + ((walk & PFEC_write_access) && (pk_ar & PKEY_WD) && ((walk & PFEC_user_mode) || guest_wp_enabled(v))) ) { gw->pfec |= PFEC_prot_key; diff --git a/xen/arch/x86/x86_emulate.c b/xen/arch/x86/x86_emulate.c index 720740f29b..8c7d185218 100644 --- a/xen/arch/x86/x86_emulate.c +++ b/xen/arch/x86/x86_emulate.c @@ -12,8 +12,10 @@ #include #include #include + #include #include /* current_cpu_info */ +#include #include #include /* cpu_has_amd_erratum() */ #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:17:47 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:17:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489728.758188 (Exim 4.92) (envelope-from ) id 1pOWTL-0001vP-7f; Sun, 05 Feb 2023 04:17:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489728.758188; Sun, 05 Feb 2023 04:17:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTL-0001vH-4r; Sun, 05 Feb 2023 04:17:47 +0000 Received: by outflank-mailman (input) for mailman id 489728; Sun, 05 Feb 2023 04:17:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTK-0001vB-J6 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTK-0001DU-IO for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWTK-00008O-Hm for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fyw3RD4hdbfJv5coAYuNIlhGMajre5Np2zkrHAVFRC0=; b=ZeqBf5XZfJ9kOgjf37qINnW1HB GGe3PT/YXMvi6LI5PunXBZxvhVBhG77Nf5F1gYV/SBdPLPS7jAEJqh7Ec1Jz/dPWE9+m74M+BZyM8 FROjyxB+3bYvqW40/NOjUuoIUkBASJW7ixWwMSOfTGKxIc20Ih/oQ5M9Aui7C2Kzhjj8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: Initial support for WRMSRNS Message-Id: Date: Sun, 05 Feb 2023 04:17:46 +0000 commit 80ff09ffe2fcbac1f2c52ac2bdfd0252ec08a6f8 Author: Andrew Cooper AuthorDate: Mon Jan 9 15:25:11 2023 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 20 19:39:33 2023 +0000 x86: Initial support for WRMSRNS WRMSR Non-Serialising is an optimisation intended for cases where an MSR needs updating, but architectural serialising properties are not needed. In is anticipated that this will apply to most if not all MSRs modified on context switch paths. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- tools/libs/light/libxl_cpuid.c | 1 + tools/misc/xen-cpuid.c | 2 ++ xen/arch/x86/include/asm/msr.h | 12 ++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 1 + 4 files changed, 16 insertions(+) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index cbd4e511e8..8da78773a8 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -235,6 +235,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) {"fzrm", 0x00000007, 1, CPUID_REG_EAX, 10, 1}, {"fsrs", 0x00000007, 1, CPUID_REG_EAX, 11, 1}, {"fsrcs", 0x00000007, 1, CPUID_REG_EAX, 12, 1}, + {"wrmsrns", 0x00000007, 1, CPUID_REG_EAX, 19, 1}, {"intel-psfd", 0x00000007, 2, CPUID_REG_EDX, 0, 1}, {"mcdt-no", 0x00000007, 2, CPUID_REG_EDX, 5, 1}, diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index ea7ff320e0..08831af46c 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -189,6 +189,8 @@ static const char *const str_7a1[32] = [10] = "fzrm", [11] = "fsrs", [12] = "fsrcs", + + /* 18 */ [19] = "wrmsrns", }; static const char *const str_e21a[32] = diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index dd1eee04a6..191e540688 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -38,6 +38,18 @@ static inline void wrmsrl(unsigned int msr, __u64 val) wrmsr(msr, lo, hi); } +/* Non-serialising WRMSR, when available. Falls back to a serialising WRMSR. */ +static inline void wrmsr_ns(uint32_t msr, uint32_t lo, uint32_t hi) +{ + /* + * WRMSR is 2 bytes. WRMSRNS is 3 bytes. Pad WRMSR with a redundant CS + * prefix to avoid a trailing NOP. + */ + alternative_input(".byte 0x2e; wrmsr", + ".byte 0x0f,0x01,0xc6", X86_FEATURE_WRMSRNS, + "c" (msr), "a" (lo), "d" (hi)); +} + /* rdmsr with exception handling */ #define rdmsr_safe(msr,val) ({\ int rc_; \ diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index ad7e89dd4c..5444bc5d83 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -281,6 +281,7 @@ XEN_CPUFEATURE(AVX512_BF16, 10*32+ 5) /*A AVX512 BFloat16 Instructions */ XEN_CPUFEATURE(FZRM, 10*32+10) /*A Fast Zero-length REP MOVSB */ XEN_CPUFEATURE(FSRS, 10*32+11) /*A Fast Short REP STOSB */ XEN_CPUFEATURE(FSRCS, 10*32+12) /*A Fast Short REP CMPSB/SCASB */ +XEN_CPUFEATURE(WRMSRNS, 10*32+19) /* WRMSR Non-Serialising */ /* AMD-defined CPU features, CPUID level 0x80000021.eax, word 11 */ XEN_CPUFEATURE(LFENCE_DISPATCH, 11*32+ 2) /*A LFENCE always serializing */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:17:57 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:17:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489729.758192 (Exim 4.92) (envelope-from ) id 1pOWTV-0001yY-9e; Sun, 05 Feb 2023 04:17:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489729.758192; Sun, 05 Feb 2023 04:17:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTV-0001yP-6O; Sun, 05 Feb 2023 04:17:57 +0000 Received: by outflank-mailman (input) for mailman id 489729; Sun, 05 Feb 2023 04:17:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTU-0001yH-Mg for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTU-0001Dr-Ls for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWTU-0000AT-LB for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:17:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=c2QiDkWS+hy5CXA2wUzONdAc8NE563kRNzCSWr+qMTs=; b=OaQMbykqdm+vkXcCcFg1zVzqgH CLBqnFMJUe3zjAMRqce1KpwxL58I9sm6XpnKIJQI3Td2vWG0Sp0KeCgwMC+XrgDVR/15d5sJjye9s ffYMOQ8yCwMLde1D8/vZCZlfLxG9ZaOb7JK1+fmeQe1kbZ6CUWAp38+rNM7s1ItOxexs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: Context switch MSR_PKRS Message-Id: Date: Sun, 05 Feb 2023 04:17:56 +0000 commit b5afdd2e1b7381a0a5f7fde0b40755d8088b6433 Author: Andrew Cooper AuthorDate: Tue Dec 14 16:51:28 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 20 19:39:33 2023 +0000 x86/hvm: Context switch MSR_PKRS Under PKS, MSR_PKRS is available and based on the CPUID policy alone, and usable independently of CR4.PKS. See the large comment in prot-key.h for details of the context switching arrangement. Use WRMSRNS right away, as we don't care about serialsing properties for context switching this MSR. Sanitise MSR_PKRS on boot. In anticipation of wanting to use PKS for Xen in the future, arrange for the sanitisation to occur prior to potentially setting CR4.PKS; if PKEY0.{AD,WD} leak in from a previous context, we will triple fault immediately on setting CR4.PKS. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/acpi/power.c | 10 +++++++ xen/arch/x86/cpu/common.c | 2 ++ xen/arch/x86/hvm/vmx/vmx.c | 9 +++++++ xen/arch/x86/include/asm/msr.h | 9 +++++++ xen/arch/x86/include/asm/prot-key.h | 54 +++++++++++++++++++++++++++++++++++++ xen/arch/x86/setup.c | 4 +++ xen/arch/x86/smpboot.c | 4 +++ 7 files changed, 92 insertions(+) diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index d23335391c..81233738b1 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -299,6 +300,15 @@ static int enter_state(u32 state) update_mcu_opt_ctrl(); + /* + * This should be before restoring CR4, but that is earlier in asm and + * awkward. Instead, we rely on MSR_PKRS being something sane out of S3 + * (0, or Xen's previous value) until this point, where we need to become + * certain that Xen's cache matches reality. + */ + if ( cpu_has_pks ) + wrpkrs_and_cache(0); + /* (re)initialise SYSCALL/SYSENTER state, amongst other things. */ percpu_traps_init(); diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 2bcdd08b2f..f44c907e8a 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -58,6 +58,8 @@ static unsigned int forced_caps[NCAPINTS]; DEFINE_PER_CPU(bool, full_gdt_loaded); +DEFINE_PER_CPU(uint32_t, pkrs); + void __init setup_clear_cpu_cap(unsigned int cap) { const uint32_t *dfs; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2e2ab0ac0e..d8525d3d3d 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -58,6 +58,7 @@ #include #include #include +#include #include static bool_t __initdata opt_force_ept; @@ -672,6 +673,7 @@ static void vmx_restore_host_msrs(void) static void vmx_save_guest_msrs(struct vcpu *v) { + const struct cpuid_policy *cp = v->domain->arch.cpuid; struct vcpu_msrs *msrs = v->arch.msrs; /* @@ -685,10 +687,14 @@ static void vmx_save_guest_msrs(struct vcpu *v) rdmsrl(MSR_RTIT_OUTPUT_MASK, msrs->rtit.output_mask); rdmsrl(MSR_RTIT_STATUS, msrs->rtit.status); } + + if ( cp->feat.pks ) + msrs->pkrs = rdpkrs_and_cache(); } static void vmx_restore_guest_msrs(struct vcpu *v) { + const struct cpuid_policy *cp = v->domain->arch.cpuid; const struct vcpu_msrs *msrs = v->arch.msrs; write_gs_shadow(v->arch.hvm.vmx.shadow_gs); @@ -705,6 +711,9 @@ static void vmx_restore_guest_msrs(struct vcpu *v) wrmsrl(MSR_RTIT_OUTPUT_MASK, msrs->rtit.output_mask); wrmsrl(MSR_RTIT_STATUS, msrs->rtit.status); } + + if ( cp->feat.pks ) + wrpkrs(msrs->pkrs); } void vmx_update_cpu_exec_control(struct vcpu *v) diff --git a/xen/arch/x86/include/asm/msr.h b/xen/arch/x86/include/asm/msr.h index 191e540688..7946b6b24c 100644 --- a/xen/arch/x86/include/asm/msr.h +++ b/xen/arch/x86/include/asm/msr.h @@ -373,6 +373,15 @@ struct vcpu_msrs }; } rtit; + /* + * 0x000006e1 - MSR_PKRS - Protection Key Supervisor. + * + * Exposed R/W to guests. Xen doesn't use PKS yet, so only context + * switched per vcpu. When in current context, live value is in hardware, + * and this value is stale. + */ + uint32_t pkrs; + /* 0x00000da0 - MSR_IA32_XSS */ struct { uint64_t raw; diff --git a/xen/arch/x86/include/asm/prot-key.h b/xen/arch/x86/include/asm/prot-key.h index 63a2e22f3f..0dcd31b7ea 100644 --- a/xen/arch/x86/include/asm/prot-key.h +++ b/xen/arch/x86/include/asm/prot-key.h @@ -5,8 +5,11 @@ #ifndef ASM_PROT_KEY_H #define ASM_PROT_KEY_H +#include #include +#include + #define PKEY_AD 1 /* Access Disable */ #define PKEY_WD 2 /* Write Disable */ @@ -28,4 +31,55 @@ static inline void wrpkru(uint32_t pkru) :: "a" (pkru), "d" (0), "c" (0) ); } +/* + * Xen does not use PKS. + * + * Guest kernel use is expected to be one default key, except for tiny windows + * with a double write to switch to a non-default key in a permitted critical + * section. + * + * As such, we want MSR_PKRS un-intercepted. Furthermore, as we only need it + * in Xen for emulation or migration purposes (i.e. possibly never in a + * domain's lifetime), we don't want to re-sync the hardware value on every + * vmexit. + * + * Therefore, we read and cache the guest value in ctxt_switch_from(), in the + * expectation that we can short-circuit the write in ctxt_switch_to(). + * During regular operations in current context, the guest value is in + * hardware and the per-cpu cache is stale. + */ +DECLARE_PER_CPU(uint32_t, pkrs); + +static inline uint32_t rdpkrs(void) +{ + uint32_t pkrs, tmp; + + rdmsr(MSR_PKRS, pkrs, tmp); + + return pkrs; +} + +static inline uint32_t rdpkrs_and_cache(void) +{ + return this_cpu(pkrs) = rdpkrs(); +} + +static inline void wrpkrs(uint32_t pkrs) +{ + uint32_t *this_pkrs = &this_cpu(pkrs); + + if ( *this_pkrs != pkrs ) + { + *this_pkrs = pkrs; + + wrmsr_ns(MSR_PKRS, pkrs, 0); + } +} + +static inline void wrpkrs_and_cache(uint32_t pkrs) +{ + this_cpu(pkrs) = pkrs; + wrmsr_ns(MSR_PKRS, pkrs, 0); +} + #endif /* ASM_PROT_KEY_H */ diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 6deadcf747..567a0a42ac 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -54,6 +54,7 @@ #include #include #include +#include #include /* opt_nosmp: If true, secondary processors are ignored. */ @@ -1804,6 +1805,9 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( opt_invpcid && cpu_has_invpcid ) use_invpcid = true; + if ( cpu_has_pks ) + wrpkrs_and_cache(0); /* Must be before setting CR4.PKS */ + init_speculation_mitigations(); init_idle_domain(); diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 52beed9d8d..b26758c2c8 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -364,6 +365,9 @@ void start_secondary(void *unused) /* Full exception support from here on in. */ + if ( cpu_has_pks ) + wrpkrs_and_cache(0); /* Must be before setting CR4.PKS */ + /* Safe to enable feature such as CR4.MCE with the IDT set up now. */ write_cr4(mmu_cr4_features); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:18:07 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:18:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489730.758195 (Exim 4.92) (envelope-from ) id 1pOWTf-00022N-CC; Sun, 05 Feb 2023 04:18:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489730.758195; Sun, 05 Feb 2023 04:18:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTf-00022G-9W; Sun, 05 Feb 2023 04:18:07 +0000 Received: by outflank-mailman (input) for mailman id 489730; Sun, 05 Feb 2023 04:18:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTe-000226-QA for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTe-0001E8-PP for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWTe-0000B4-Og for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vIFuM9XQJ9LGmqiJHgZ1uf43eChqb9ogFLqq400O148=; b=Jgj9UJ8OIm4LBzR5mCxsdaNglJ CWFhu/yKZdyHq9N+zV3UzvYFoB9wDTi+K+ZbctlHPwWYa5TkeZH+/8AUpVqADuNElYTvQvIJWuqSF AQ5mep1efGprK3udKEo15eD0R/d+gPs3ci3Xszb9g9cAXZXEsUYlRXG0FHVucqHB2qpI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: Enable guest access to MSR_PKRS Message-Id: Date: Sun, 05 Feb 2023 04:18:06 +0000 commit 59bbbb823d3d8aeff5615f7c9e2c2bd8a18b4ad5 Author: Andrew Cooper AuthorDate: Tue Dec 14 16:51:28 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 20 19:39:33 2023 +0000 x86/hvm: Enable guest access to MSR_PKRS Have guest_{rd,wr}msr(), via hvm_{get,set}_reg(), access either the live register, or stashed state, depending on context. Include MSR_PKRS for migration, and let the guest have full access. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 2 ++ xen/arch/x86/hvm/vmx/vmx.c | 17 +++++++++++++++++ xen/arch/x86/msr.c | 10 ++++++++++ 3 files changed, 29 insertions(+) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 927a221660..86cab7aa26 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1333,6 +1333,7 @@ static int cf_check hvm_load_cpu_xsave_states( static const uint32_t msrs_to_send[] = { MSR_SPEC_CTRL, MSR_INTEL_MISC_FEATURES_ENABLES, + MSR_PKRS, MSR_IA32_BNDCFGS, MSR_IA32_XSS, MSR_VIRT_SPEC_CTRL, @@ -1486,6 +1487,7 @@ static int cf_check hvm_load_cpu_msrs(struct domain *d, hvm_domain_context_t *h) case MSR_SPEC_CTRL: case MSR_INTEL_MISC_FEATURES_ENABLES: + case MSR_PKRS: case MSR_IA32_BNDCFGS: case MSR_IA32_XSS: case MSR_VIRT_SPEC_CTRL: diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index d8525d3d3d..ade2a25ce7 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -793,6 +793,11 @@ static void cf_check vmx_cpuid_policy_changed(struct vcpu *v) else vmx_set_msr_intercept(v, MSR_FLUSH_CMD, VMX_MSR_RW); + if ( cp->feat.pks ) + vmx_clear_msr_intercept(v, MSR_PKRS, VMX_MSR_RW); + else + vmx_set_msr_intercept(v, MSR_PKRS, VMX_MSR_RW); + out: vmx_vmcs_exit(v); @@ -2582,6 +2587,7 @@ static uint64_t cf_check vmx_get_reg(struct vcpu *v, unsigned int reg) { const struct vcpu *curr = current; struct domain *d = v->domain; + const struct vcpu_msrs *msrs = v->arch.msrs; uint64_t val = 0; int rc; @@ -2598,6 +2604,9 @@ static uint64_t cf_check vmx_get_reg(struct vcpu *v, unsigned int reg) } return val; + case MSR_PKRS: + return (v == curr) ? rdpkrs() : msrs->pkrs; + case MSR_SHADOW_GS_BASE: if ( v != curr ) return v->arch.hvm.vmx.shadow_gs; @@ -2626,6 +2635,8 @@ static uint64_t cf_check vmx_get_reg(struct vcpu *v, unsigned int reg) static void cf_check vmx_set_reg(struct vcpu *v, unsigned int reg, uint64_t val) { + const struct vcpu *curr = current; + struct vcpu_msrs *msrs = v->arch.msrs; struct domain *d = v->domain; int rc; @@ -2641,6 +2652,12 @@ static void cf_check vmx_set_reg(struct vcpu *v, unsigned int reg, uint64_t val) domain_crash(d); } return; + + case MSR_PKRS: + msrs->pkrs = val; + if ( v == curr ) + wrpkrs(val); + return; } /* Logic which maybe requires remote VMCS acquisition. */ diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index 317b154d24..7ddf0078c3 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -325,6 +325,11 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) *val = 0; break; + case MSR_PKRS: + if ( !cp->feat.pks ) + goto gp_fault; + goto get_reg; + case MSR_X2APIC_FIRST ... MSR_X2APIC_LAST: if ( !is_hvm_domain(d) || v != curr ) goto gp_fault; @@ -616,6 +621,11 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) break; goto gp_fault; + case MSR_PKRS: + if ( !cp->feat.pks || val != (uint32_t)val ) + goto gp_fault; + goto set_reg; + case MSR_X2APIC_FIRST ... MSR_X2APIC_LAST: if ( !is_hvm_domain(d) || v != curr ) goto gp_fault; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:18:17 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:18:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489731.758200 (Exim 4.92) (envelope-from ) id 1pOWTp-00025A-Dx; Sun, 05 Feb 2023 04:18:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489731.758200; Sun, 05 Feb 2023 04:18:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTp-000252-B9; Sun, 05 Feb 2023 04:18:17 +0000 Received: by outflank-mailman (input) for mailman id 489731; Sun, 05 Feb 2023 04:18:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTo-00024v-T1 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTo-0001EM-SL for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWTo-0000Bb-Rk for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=85rhUpvLDvjpOOMnfDswZ3v0b94gB3NE70Mvz6MKFI0=; b=JGQbVllAbxmFkcP4BZFGXBou6/ 57vgL2iwU0Es1hZzGyy2Ed/2+cG9YULnWQIHeh4fu2RxTXWRqQbIJxFY0Jzl5ktfzy3ZweCTCd3p6 bRRENACBMr8KlCsbai4cnHBqJy1lSeNsYp8Mwu432dVirfjA9q9YEBLQYhaZvh+HAWN0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pagewalk: Support PKS Message-Id: Date: Sun, 05 Feb 2023 04:18:16 +0000 commit e96f634b3dbbf98eaa261bcb8b33743a03afc20e Author: Andrew Cooper AuthorDate: Tue Dec 14 16:51:28 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 20 19:39:34 2023 +0000 x86/pagewalk: Support PKS PKS is very similar to the existing PKU behaviour, operating on pagewalks for any supervisor mapping. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/guest_pt.h | 5 +++++ xen/arch/x86/include/asm/hvm/hvm.h | 3 +++ xen/arch/x86/mm/guest_walk.c | 9 +++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/include/asm/guest_pt.h b/xen/arch/x86/include/asm/guest_pt.h index 6647ccfb85..6802db2a41 100644 --- a/xen/arch/x86/include/asm/guest_pt.h +++ b/xen/arch/x86/include/asm/guest_pt.h @@ -282,6 +282,11 @@ static always_inline bool guest_pku_enabled(const struct vcpu *v) return !is_pv_vcpu(v) && hvm_pku_enabled(v); } +static always_inline bool guest_pks_enabled(const struct vcpu *v) +{ + return !is_pv_vcpu(v) && hvm_pks_enabled(v); +} + /* Helpers for identifying whether guest entries have reserved bits set. */ /* Bits reserved because of maxphysaddr, and (lack of) EFER.NX */ diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/hvm/hvm.h index 93254651f2..65768c797e 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -407,6 +407,8 @@ int hvm_get_param(struct domain *d, uint32_t index, uint64_t *value); ((v)->arch.hvm.guest_efer & EFER_NXE) #define hvm_pku_enabled(v) \ (hvm_paging_enabled(v) && ((v)->arch.hvm.guest_cr[4] & X86_CR4_PKE)) +#define hvm_pks_enabled(v) \ + (hvm_paging_enabled(v) && ((v)->arch.hvm.guest_cr[4] & X86_CR4_PKS)) /* Can we use superpages in the HAP p2m table? */ #define hap_has_1gb (!!(hvm_funcs.hap_capabilities & HVM_HAP_SUPERPAGE_1GB)) @@ -911,6 +913,7 @@ static inline void hvm_set_reg(struct vcpu *v, unsigned int reg, uint64_t val) #define hvm_smap_enabled(v) ((void)(v), false) #define hvm_nx_enabled(v) ((void)(v), false) #define hvm_pku_enabled(v) ((void)(v), false) +#define hvm_pks_enabled(v) ((void)(v), false) #define arch_vcpu_block(v) ((void)(v)) diff --git a/xen/arch/x86/mm/guest_walk.c b/xen/arch/x86/mm/guest_walk.c index 161a61b8f5..76b4e04258 100644 --- a/xen/arch/x86/mm/guest_walk.c +++ b/xen/arch/x86/mm/guest_walk.c @@ -406,16 +406,17 @@ guest_walk_tables(const struct vcpu *v, struct p2m_domain *p2m, #if GUEST_PAGING_LEVELS >= 4 /* 64-bit only... */ /* * If all access checks are thus far ok, check Protection Key for 64bit - * data accesses to user mappings. + * data accesses. * * N.B. In the case that the walk ended with a superpage, the fabricated * gw->l1e contains the appropriate leaf pkey. */ - if ( (ar & _PAGE_USER) && !(walk & PFEC_insn_fetch) && - guest_pku_enabled(v) ) + if ( !(walk & PFEC_insn_fetch) && + ((ar & _PAGE_USER) ? guest_pku_enabled(v) + : guest_pks_enabled(v)) ) { unsigned int pkey = guest_l1e_get_pkey(gw->l1e); - unsigned int pkr = rdpkru(); + unsigned int pkr = (ar & _PAGE_USER) ? rdpkru() : rdpkrs(); unsigned int pk_ar = (pkr >> (pkey * PKEY_WIDTH)) & (PKEY_AD | PKEY_WD); if ( (pk_ar & PKEY_AD) || -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:18:28 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:18:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489732.758203 (Exim 4.92) (envelope-from ) id 1pOWU0-00029a-FK; Sun, 05 Feb 2023 04:18:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489732.758203; Sun, 05 Feb 2023 04:18:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWU0-00029S-Cd; Sun, 05 Feb 2023 04:18:28 +0000 Received: by outflank-mailman (input) for mailman id 489732; Sun, 05 Feb 2023 04:18:27 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTz-00029H-01 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:27 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWTy-0001ES-Va for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWTy-0000C9-Ut for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:26 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dERMXDX2eBFpUjC+0ITsnEYmnkqJ5zbtLmbbR3Rg950=; b=mcXeKhaSEKOB3E9Vq9RJAIganr Q+D6ePpyzL7QdZD9klrdUjT4/3UiY7czQxusMKqMJM7w/qaANOELP8+i5cwCSsinqP7u610QxzTEK GSM7mMf2HZfkUN57JA9lpzaWFLINk9KQiYQ5QokqMpMyJJbfMJYxT15Pbi8UcLV2KjUU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: Support PKS for HAP guests Message-Id: Date: Sun, 05 Feb 2023 04:18:26 +0000 commit 1d60c20260c7e82fe5344d06c20d718e0cc03b8b Author: Andrew Cooper AuthorDate: Tue Dec 14 16:51:28 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Jan 20 19:39:34 2023 +0000 x86/hvm: Support PKS for HAP guests With all infrastructure in place, advertise the PKS CPUID bit to HAP guests, and let them set CR4.PKS. Experiment with a tweak to the layout of hvm_cr4_guest_valid_bits() so future additions will be just a single added line. The current context switching behaviour is tied to how VT-x works, so leave a safety check in the short term. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpuid.c | 9 +++++++++ xen/arch/x86/hvm/hvm.c | 4 +++- xen/include/public/arch-x86/cpufeatureset.h | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index acc2f606ce..b22725c492 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -579,6 +579,15 @@ static void __init calculate_hvm_max_policy(void) __clear_bit(X86_FEATURE_XSAVES, hvm_featureset); } + /* + * Xen doesn't use PKS, so the guest support for it has opted to not use + * the VMCS load/save controls for efficiency reasons. This depends on + * the exact vmentry/exit behaviour, so don't expose PKS in other + * situations until someone has cross-checked the behaviour for safety. + */ + if ( !cpu_has_vmx ) + __clear_bit(X86_FEATURE_PKS, hvm_featureset); + guest_common_feature_adjustments(hvm_featureset); sanitise_featureset(hvm_featureset); diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 86cab7aa26..5c1e641896 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -969,7 +969,9 @@ unsigned long hvm_cr4_guest_valid_bits(const struct domain *d) (p->feat.smep ? X86_CR4_SMEP : 0) | (p->feat.smap ? X86_CR4_SMAP : 0) | (p->feat.pku ? X86_CR4_PKE : 0) | - (cet ? X86_CR4_CET : 0)); + (cet ? X86_CR4_CET : 0) | + (p->feat.pks ? X86_CR4_PKS : 0) | + 0); } static int cf_check hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 5444bc5d83..3b85bcca15 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -227,7 +227,7 @@ XEN_CPUFEATURE(CLDEMOTE, 6*32+25) /*A CLDEMOTE instruction */ XEN_CPUFEATURE(MOVDIRI, 6*32+27) /*a MOVDIRI instruction */ XEN_CPUFEATURE(MOVDIR64B, 6*32+28) /*a MOVDIR64B instruction */ XEN_CPUFEATURE(ENQCMD, 6*32+29) /* ENQCMD{,S} instructions */ -XEN_CPUFEATURE(PKS, 6*32+31) /* Protection Key for Supervisor */ +XEN_CPUFEATURE(PKS, 6*32+31) /*H Protection Key for Supervisor */ /* AMD-defined CPU features, CPUID level 0x80000007.edx, word 7 */ XEN_CPUFEATURE(HW_PSTATE, 7*32+ 7) /* Hardware Pstates */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:18:38 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:18:38 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489733.758208 (Exim 4.92) (envelope-from ) id 1pOWUA-0002CS-Gs; Sun, 05 Feb 2023 04:18:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489733.758208; Sun, 05 Feb 2023 04:18:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWUA-0002CK-E9; Sun, 05 Feb 2023 04:18:38 +0000 Received: by outflank-mailman (input) for mailman id 489733; Sun, 05 Feb 2023 04:18:37 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWU9-0002By-2x for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:37 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWU9-0001EW-2H for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:37 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWU9-0000CY-1Y for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:37 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=z+4Fr+qUeZfsBhi7DF4AGURui1kPNDrIv4zS/XFnTZY=; b=kfnlgHK9DAukmfWKsNbQbfdJaA kXrb/pNtRVuXXYZ/9ZC4Gtmdtm8cVmUw/3Tx/PO9jCv9YvS007Iu+JeFn2kngC1ctGNNuYoLVQn3h 0p6YGWOQYrEFpf3j5zXBaN+KB3jszarMjwD1LoJshK6+r4mMQkS8GfV7tNkt4PXxwge4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: fix building flask headers before descending in flask/ss/ Message-Id: Date: Sun, 05 Feb 2023 04:18:37 +0000 commit d60324d8af9404014cfcc37bba09e9facfd02fcf Author: Anthony PERARD AuthorDate: Mon Jan 23 15:03:58 2023 +0100 Commit: Jan Beulich CommitDate: Mon Jan 23 15:03:58 2023 +0100 build: fix building flask headers before descending in flask/ss/ Unfortunatly, adding prerequisite to "$(obj)/ss/built_in.o" doesn't work because we have "$(obj)/%/built_in.o: $(obj)/% ;" in Rules.mk. So, make is allow to try to build objects in "xsm/flask/ss/" before generating the headers. Adding a prerequisite on "$(obj)/ss" instead will fix the issue as that's the target used to run make in this subdirectory. Unfortunatly, that target is also used when running `make clean`, so we want to ignore it in this case. $(MAKECMDGOALS) can't be used in this case as it is empty, but we can guess which operation is done by looking at the list of loaded makefiles. Fixes: 7a3bcd2babcc ("build: build everything from the root dir, use obj=$subdir") Reported-by: "Daniel P. Smith" Signed-off-by: Anthony PERARD Acked-by: Daniel P. Smith Reviewed-by: Jan Beulich --- xen/xsm/flask/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile index d25312f4fa..3fdcf7727e 100644 --- a/xen/xsm/flask/Makefile +++ b/xen/xsm/flask/Makefile @@ -16,7 +16,11 @@ FLASK_H_FILES := flask.h class_to_string.h initial_sid_to_string.h AV_H_FILES := av_perm_to_string.h av_permissions.h ALL_H_FILES := $(addprefix include/,$(FLASK_H_FILES) $(AV_H_FILES)) -$(addprefix $(obj)/,$(obj-y)) $(obj)/ss/built_in.o: $(addprefix $(obj)/,$(ALL_H_FILES)) +# Adding prerequisite to descending into ss/ folder only when not running +# `make *clean`. +ifeq ($(filter %/Makefile.clean,$(MAKEFILE_LIST)),) +$(addprefix $(obj)/,$(obj-y)) $(obj)/ss: $(addprefix $(obj)/,$(ALL_H_FILES)) +endif extra-y += $(ALL_H_FILES) mkflask := $(srcdir)/policy/mkflask.sh -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:18:48 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:18:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489734.758212 (Exim 4.92) (envelope-from ) id 1pOWUK-0002FF-IG; Sun, 05 Feb 2023 04:18:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489734.758212; Sun, 05 Feb 2023 04:18:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWUK-0002F8-Fg; Sun, 05 Feb 2023 04:18:48 +0000 Received: by outflank-mailman (input) for mailman id 489734; Sun, 05 Feb 2023 04:18:47 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWUJ-0002Ey-5p for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:47 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWUJ-0001Ec-53 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:47 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWUJ-0000Cz-4T for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:47 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IFy1y9AexRHg4x4krxXTg2lt9INZyZvGXlOgQ2LKY38=; b=0auo0ecxXWWZQV2Fh9MN1YrjEf PRHVZ0get6Hs8X/yteIC7KUwidqIUWnpXWpn72vaZwoG8/k3sXF4ccrTnMBMXn/EID1CVeTWNe7vi z6wfQMnm56nb5KofTVMT63X55xXp6H7GzJ2NmUF1XUa77J5MpJkE6eXLFyata0Dbci5A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] ns16550: fix the use of simple_strtoul() for parsing u64 Message-Id: Date: Sun, 05 Feb 2023 04:18:47 +0000 commit aa7d3432caf02b6c8b60476fb54197c28f3b5e03 Author: Ayan Kumar Halder AuthorDate: Tue Jan 24 16:53:13 2023 +0100 Commit: Jan Beulich CommitDate: Tue Jan 24 16:53:13 2023 +0100 ns16550: fix the use of simple_strtoul() for parsing u64 One should be using simple_strtoull() ( instead of simple_strtoul() ) to assign value to 'u64' variable. The reason being u64 can be represented by 'unsigned long long' on all the platforms (ie Arm32, Arm64 and x86). Suggested-by: Jan Beulich Signed-off-by: Ayan Kumar Halder Reviewed-by: Jan Beulich --- xen/drivers/char/ns16550.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 01a05c9aa8..7e22e687fb 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -1532,7 +1532,7 @@ static bool __init parse_positional(struct ns16550 *uart, char **str) else #endif { - uart->io_base = simple_strtoul(conf, &conf, 0); + uart->io_base = simple_strtoull(conf, &conf, 0); } } @@ -1603,7 +1603,7 @@ static bool __init parse_namevalue_pairs(char *str, struct ns16550 *uart) "Can't use io_base with dev=pci or dev=amt options\n"); break; } - uart->io_base = simple_strtoul(param_value, NULL, 0); + uart->io_base = simple_strtoull(param_value, NULL, 0); break; case irq: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:18:58 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:18:58 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489735.758216 (Exim 4.92) (envelope-from ) id 1pOWUU-0002Hs-Jg; Sun, 05 Feb 2023 04:18:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489735.758216; Sun, 05 Feb 2023 04:18:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWUU-0002Hk-H8; Sun, 05 Feb 2023 04:18:58 +0000 Received: by outflank-mailman (input) for mailman id 489735; Sun, 05 Feb 2023 04:18:57 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWUT-0002HV-8i for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:57 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWUT-0001F9-7s for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:57 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWUT-0000DT-7H for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:18:57 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YyINUQ0bX4FVDGVLm99bZctmOTg98guJofi9nk8ImBM=; b=2ro/2uXFPeVtCihs+PEel+BKdH Hu902UtwoUtKT5HMxHTrn2SeFeJq9VdiQX21q85tcdkh7OIUXn2zXIE0ToY2OQPZBxneTrtWIPPP1 4a7+gHFI/R45ultXbDSzDmAY0dZ8DxmmigeFuUFPkEDKzccTZf4Ha4WRjyVcxja7zFOc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] ns16550: fix an incorrect assignment to uart->io_size Message-Id: Date: Sun, 05 Feb 2023 04:18:57 +0000 commit 352c89f72ddb67b8d9d4e492203f8c77f85c8df1 Author: Ayan Kumar Halder AuthorDate: Tue Jan 24 16:54:38 2023 +0100 Commit: Jan Beulich CommitDate: Tue Jan 24 16:54:38 2023 +0100 ns16550: fix an incorrect assignment to uart->io_size uart->io_size represents the size in bytes. Thus, when serial_port.bit_width is assigned to it, it should be converted to size in bytes. Fixes: 17b516196c ("ns16550: add ACPI support for ARM only") Reported-by: Jan Beulich Signed-off-by: Ayan Kumar Halder Reviewed-by: Stefano Stabellini --- xen/drivers/char/ns16550.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 7e22e687fb..4ce74b3cd3 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -1875,7 +1875,7 @@ static int __init ns16550_acpi_uart_init(const void *data) uart->parity = spcr->parity; uart->stop_bits = spcr->stop_bits; uart->io_base = spcr->serial_port.address; - uart->io_size = spcr->serial_port.bit_width; + uart->io_size = DIV_ROUND_UP(spcr->serial_port.bit_width, BITS_PER_BYTE); uart->reg_shift = spcr->serial_port.bit_offset; uart->reg_width = spcr->serial_port.access_width; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:19:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:19:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489736.758221 (Exim 4.92) (envelope-from ) id 1pOWUe-0002Kr-Lq; Sun, 05 Feb 2023 04:19:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489736.758221; Sun, 05 Feb 2023 04:19:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWUe-0002Kj-Ia; Sun, 05 Feb 2023 04:19:08 +0000 Received: by outflank-mailman (input) for mailman id 489736; Sun, 05 Feb 2023 04:19:07 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWUd-0002KX-BV for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:07 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWUd-0001FX-Ak for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:07 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWUd-0000EN-A4 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:07 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=AocxNpjYqkyM/CJmRTmvaHVsWlHJScRWKQLO/HP/5es=; b=t+dnzvfFh753jA6d2FfyQKS3Yn F7Pq+eK9d+egu5hdka0gBQs1qSMCkg1quBXlO6AJH13sxyaL+NfWx+qlqaUvHxks6h7jox4DjBDZi U8GwBMoJ6QIG+uNWU8M7MtiE7Qk11cEd+VS+0M0v2OWWVRZcD901UbBjQwj8bkKRchPU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: flushtlb: Reduce scope of barrier for local TLB flush Message-Id: Date: Sun, 05 Feb 2023 04:19:07 +0000 commit 7c438851475482bf73fcf451551d1cb718d4904c Author: Julien Grall AuthorDate: Tue Jan 24 19:25:19 2023 +0000 Commit: Julien Grall CommitDate: Tue Jan 24 19:34:44 2023 +0000 xen/arm64: flushtlb: Reduce scope of barrier for local TLB flush Per D5-4929 in ARM DDI 0487H.a: "A DSB NSH is sufficient to ensure completion of TLB maintenance instructions that apply to a single PE. A DSB ISH is sufficient to ensure completion of TLB maintenance instructions that apply to PEs in the same Inner Shareable domain. " This means barrier after local TLB flushes could be reduced to non-shareable. Note that the scope of the barrier in the workaround has not been changed because Linux v6.1-rc8 is also using 'ish' and I couldn't find anything in the Neoverse N1 suggesting that a 'nsh' would be sufficient. Signed-off-by: Julien Grall Reviewed-by: Michal Orzel Tested-by: Henry Wang --- xen/arch/arm/include/asm/arm64/flushtlb.h | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/include/asm/arm64/flushtlb.h b/xen/arch/arm/include/asm/arm64/flushtlb.h index 7c54315187..001ae4d1c3 100644 --- a/xen/arch/arm/include/asm/arm64/flushtlb.h +++ b/xen/arch/arm/include/asm/arm64/flushtlb.h @@ -12,8 +12,9 @@ * ARM64_WORKAROUND_REPEAT_TLBI: * Modification of the translation table for a virtual address might lead to * read-after-read ordering violation. - * The workaround repeats TLBI+DSB operation for all the TLB flush operations. - * While this is stricly not necessary, we don't want to take any risk. + * The workaround repeats TLBI+DSB ISH operation for all the TLB flush + * operations. While this is strictly not necessary, we don't want to + * take any risk. * * For Xen page-tables the ISB will discard any instructions fetched * from the old mappings. @@ -21,12 +22,17 @@ * For the Stage-2 page-tables the ISB ensures the completion of the DSB * (and therefore the TLB invalidation) before continuing. So we know * the TLBs cannot contain an entry for a mapping we may have removed. + * + * Note that for local TLB flush, using non-shareable (nsh) is sufficient + * (see D5-4929 in ARM DDI 0487H.a). Although, the memory barrier in + * for the workaround is left as inner-shareable to match with Linux + * v6.1-rc8. */ -#define TLB_HELPER(name, tlbop) \ +#define TLB_HELPER(name, tlbop, sh) \ static inline void name(void) \ { \ asm volatile( \ - "dsb ishst;" \ + "dsb " # sh "st;" \ "tlbi " # tlbop ";" \ ALTERNATIVE( \ "nop; nop;", \ @@ -34,25 +40,25 @@ static inline void name(void) \ "tlbi " # tlbop ";", \ ARM64_WORKAROUND_REPEAT_TLBI, \ CONFIG_ARM64_WORKAROUND_REPEAT_TLBI) \ - "dsb ish;" \ + "dsb " # sh ";" \ "isb;" \ : : : "memory"); \ } /* Flush local TLBs, current VMID only. */ -TLB_HELPER(flush_guest_tlb_local, vmalls12e1); +TLB_HELPER(flush_guest_tlb_local, vmalls12e1, nsh); /* Flush innershareable TLBs, current VMID only */ -TLB_HELPER(flush_guest_tlb, vmalls12e1is); +TLB_HELPER(flush_guest_tlb, vmalls12e1is, ish); /* Flush local TLBs, all VMIDs, non-hypervisor mode */ -TLB_HELPER(flush_all_guests_tlb_local, alle1); +TLB_HELPER(flush_all_guests_tlb_local, alle1, nsh); /* Flush innershareable TLBs, all VMIDs, non-hypervisor mode */ -TLB_HELPER(flush_all_guests_tlb, alle1is); +TLB_HELPER(flush_all_guests_tlb, alle1is, ish); /* Flush all hypervisor mappings from the TLB of the local processor. */ -TLB_HELPER(flush_xen_tlb_local, alle2); +TLB_HELPER(flush_xen_tlb_local, alle2, nsh); /* Flush TLB of local processor for address va. */ static inline void __flush_xen_tlb_one_local(vaddr_t va) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:19:19 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:19:19 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489737.758224 (Exim 4.92) (envelope-from ) id 1pOWUo-0002O6-PW; Sun, 05 Feb 2023 04:19:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489737.758224; Sun, 05 Feb 2023 04:19:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWUo-0002Nx-Mu; Sun, 05 Feb 2023 04:19:18 +0000 Received: by outflank-mailman (input) for mailman id 489737; Sun, 05 Feb 2023 04:19:17 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWUn-0002Nn-FI for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:17 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWUn-0001Fq-DO for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:17 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWUn-0000Er-Cs for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:17 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wGZO/QQ6AqSg52vG3YtMBa+wWtJQr9NDTAWuAUW4JVU=; b=EJRzKgi4jy/Mg8EDjW6Ifxx+nv GuseNXVybA2FIHUE8OJ1ukTwG0ypyAMPkdbg0oJG3ZpXivUGPhzRN8oBz2zPcqLGK01nTPf/r/PKX vWJpZ+le0JYsU/iT2uJGvDyG2UI+3abhsE6lV/5A4n4RiNjrazaKoUQrb59Viq95vK2M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: flushtlb: Implement the TLBI repeat workaround for TLB flush by VA Message-Id: Date: Sun, 05 Feb 2023 04:19:17 +0000 commit cbfaf6ccd2cb5d1b2bc6efe5c6f4ba5cccce5689 Author: Julien Grall AuthorDate: Tue Jan 24 19:25:50 2023 +0000 Commit: Julien Grall CommitDate: Tue Jan 24 19:34:44 2023 +0000 xen/arm64: flushtlb: Implement the TLBI repeat workaround for TLB flush by VA Looking at the Neoverse N1 errata document, it is not clear to me why the TLBI repeat workaround is not applied for TLB flush by VA. The TLB flush by VA helpers are used in flush_xen_tlb_range_va_local() and flush_xen_tlb_range_va(). So if the range size is a fixed size smaller than a PAGE_SIZE, it would be possible that the compiler remove the loop and therefore replicate the sequence described in the erratum 1286807. So the TLBI repeat workaround should also be applied for the TLB flush by VA helpers. Fixes: 22e323d115d8 ("xen/arm: Add workaround for Cortex-A76/Neoverse-N1 erratum #1286807") Signed-off-by: Julien Grall Reviewed-by: Michal Orzel Tested-by: Henry Wang --- xen/arch/arm/include/asm/arm64/flushtlb.h | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/include/asm/arm64/flushtlb.h b/xen/arch/arm/include/asm/arm64/flushtlb.h index 001ae4d1c3..3a9092b814 100644 --- a/xen/arch/arm/include/asm/arm64/flushtlb.h +++ b/xen/arch/arm/include/asm/arm64/flushtlb.h @@ -45,6 +45,27 @@ static inline void name(void) \ : : : "memory"); \ } +/* + * FLush TLB by VA. This will likely be used in a loop, so the caller + * is responsible to use the appropriate memory barriers before/after + * the sequence. + * + * See above about the ARM64_WORKAROUND_REPEAT_TLBI sequence. + */ +#define TLB_HELPER_VA(name, tlbop) \ +static inline void name(vaddr_t va) \ +{ \ + asm volatile( \ + "tlbi " # tlbop ", %0;" \ + ALTERNATIVE( \ + "nop; nop;", \ + "dsb ish;" \ + "tlbi " # tlbop ", %0;", \ + ARM64_WORKAROUND_REPEAT_TLBI, \ + CONFIG_ARM64_WORKAROUND_REPEAT_TLBI) \ + : : "r" (va >> PAGE_SHIFT) : "memory"); \ +} + /* Flush local TLBs, current VMID only. */ TLB_HELPER(flush_guest_tlb_local, vmalls12e1, nsh); @@ -61,16 +82,10 @@ TLB_HELPER(flush_all_guests_tlb, alle1is, ish); TLB_HELPER(flush_xen_tlb_local, alle2, nsh); /* Flush TLB of local processor for address va. */ -static inline void __flush_xen_tlb_one_local(vaddr_t va) -{ - asm volatile("tlbi vae2, %0;" : : "r" (va>>PAGE_SHIFT) : "memory"); -} +TLB_HELPER_VA(__flush_xen_tlb_one_local, vae2); /* Flush TLB of all processors in the inner-shareable domain for address va. */ -static inline void __flush_xen_tlb_one(vaddr_t va) -{ - asm volatile("tlbi vae2is, %0;" : : "r" (va>>PAGE_SHIFT) : "memory"); -} +TLB_HELPER_VA(__flush_xen_tlb_one, vae2is); #endif /* __ASM_ARM_ARM64_FLUSHTLB_H__ */ /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:19:28 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:19:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489738.758227 (Exim 4.92) (envelope-from ) id 1pOWUy-0002Qp-R2; Sun, 05 Feb 2023 04:19:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489738.758227; Sun, 05 Feb 2023 04:19:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWUy-0002Qi-OT; Sun, 05 Feb 2023 04:19:28 +0000 Received: by outflank-mailman (input) for mailman id 489738; Sun, 05 Feb 2023 04:19:27 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWUx-0002QV-Gl for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:27 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWUx-0001G2-G4 for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:27 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWUx-0000FR-FX for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:27 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lLqFK8qfrqoStgwRcCAu9hnWffCY/hPJWtqhxe/WYbQ=; b=K13UFEK4ZWe6u0VsiNAE8LfWqV BT8grJHEX7x231DVF5wgsWTFMXH4MH2FvD5hZ+dYkizIqdsgn86lYIJpxbqx37rO8JgxNsZDNRa7f N5yKyTooT3NGjRsNqRWGHIP07c1kqkPFeUnkG4A6DdxYXIM1q55F3CKi1WQ2iOJMeiE8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm32: flushtlb: Reduce scope of barrier for local TLB flush Message-Id: Date: Sun, 05 Feb 2023 04:19:27 +0000 commit d56c70b6e1fe2b4ee836ca4449a3277cbbeb0ddc Author: Julien Grall AuthorDate: Tue Jan 24 19:26:09 2023 +0000 Commit: Julien Grall CommitDate: Tue Jan 24 19:34:44 2023 +0000 xen/arm32: flushtlb: Reduce scope of barrier for local TLB flush Per G5-9224 in ARM DDI 0487I.a: "A DSB NSH is sufficient to ensure completion of TLB maintenance instructions that apply to a single PE. A DSB ISH is sufficient to ensure completion of TLB maintenance instructions that apply to PEs in the same Inner Shareable domain. " This is quoting the Armv8 specification because I couldn't find an explicit statement in the Armv7 specification. Instead, I could find bits in various places that confirm the same implementation. Furthermore, Linux has been using 'nsh' since 2013 (62cbbc42e001 "ARM: tlb: reduce scope of barrier domains for TLB invalidation"). This means barrier after local TLB flushes could be reduced to non-shareable. Signed-off-by: Julien Grall Reviewed-by: Michal Orzel Tested-by: Henry Wang --- xen/arch/arm/include/asm/arm32/flushtlb.h | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/include/asm/arm32/flushtlb.h b/xen/arch/arm/include/asm/arm32/flushtlb.h index 9085e65011..7ae6a12f81 100644 --- a/xen/arch/arm/include/asm/arm32/flushtlb.h +++ b/xen/arch/arm/include/asm/arm32/flushtlb.h @@ -15,30 +15,33 @@ * For the Stage-2 page-tables the ISB ensures the completion of the DSB * (and therefore the TLB invalidation) before continuing. So we know * the TLBs cannot contain an entry for a mapping we may have removed. + * + * Note that for local TLB flush, using non-shareable (nsh) is sufficient + * (see G5-9224 in ARM DDI 0487I.a). */ -#define TLB_HELPER(name, tlbop) \ -static inline void name(void) \ -{ \ - dsb(ishst); \ - WRITE_CP32(0, tlbop); \ - dsb(ish); \ - isb(); \ +#define TLB_HELPER(name, tlbop, sh) \ +static inline void name(void) \ +{ \ + dsb(sh ## st); \ + WRITE_CP32(0, tlbop); \ + dsb(sh); \ + isb(); \ } /* Flush local TLBs, current VMID only */ -TLB_HELPER(flush_guest_tlb_local, TLBIALL); +TLB_HELPER(flush_guest_tlb_local, TLBIALL, nsh); /* Flush inner shareable TLBs, current VMID only */ -TLB_HELPER(flush_guest_tlb, TLBIALLIS); +TLB_HELPER(flush_guest_tlb, TLBIALLIS, ish); /* Flush local TLBs, all VMIDs, non-hypervisor mode */ -TLB_HELPER(flush_all_guests_tlb_local, TLBIALLNSNH); +TLB_HELPER(flush_all_guests_tlb_local, TLBIALLNSNH, nsh); /* Flush innershareable TLBs, all VMIDs, non-hypervisor mode */ -TLB_HELPER(flush_all_guests_tlb, TLBIALLNSNHIS); +TLB_HELPER(flush_all_guests_tlb, TLBIALLNSNHIS, ish); /* Flush all hypervisor mappings from the TLB of the local processor. */ -TLB_HELPER(flush_xen_tlb_local, TLBIALLH); +TLB_HELPER(flush_xen_tlb_local, TLBIALLH, nsh); /* Flush TLB of local processor for address va. */ static inline void __flush_xen_tlb_one_local(vaddr_t va) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:19:38 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:19:38 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489739.758232 (Exim 4.92) (envelope-from ) id 1pOWV8-0002TT-Sw; Sun, 05 Feb 2023 04:19:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489739.758232; Sun, 05 Feb 2023 04:19:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWV8-0002TL-Pz; Sun, 05 Feb 2023 04:19:38 +0000 Received: by outflank-mailman (input) for mailman id 489739; Sun, 05 Feb 2023 04:19:37 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWV7-0002T9-Jp for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:37 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWV7-0001GD-JA for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:37 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWV7-0000GF-IN for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:37 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=AkW4So5Th8eYHrRpTT51A5143mJOxdxjPGwlZ2Z6kHo=; b=l72/GmZQyrU8QmGUKK4JZGwx7D WRAWrIRSnU4J2xpnuMP4+P0/9wDOVLAbil17ZuRraKHECCzpj92fsdlR+dsgAKONiX2Xt8L7HDXYn EGOevcdYeqQefvMsMdN4/UYxY/Ck3o74B5Kz7TG8jzSl0cJI2z4ujYd+f+nRqNxCvNTk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: flushtlb: Reduce scope of barrier for the TLB range flush Message-Id: Date: Sun, 05 Feb 2023 04:19:37 +0000 commit 5e5d1a43e18468399448ff8dec687342d48f56da Author: Julien Grall AuthorDate: Tue Jan 24 19:26:29 2023 +0000 Commit: Julien Grall CommitDate: Tue Jan 24 19:34:44 2023 +0000 xen/arm: flushtlb: Reduce scope of barrier for the TLB range flush At the moment, flush_xen_tlb_range_va{,_local}() are using system wide memory barrier. This is quite expensive and unnecessary. For the local version, a non-shareable barrier is sufficient. For the SMP version, an inner-shareable barrier is sufficient. Furthermore, the initial barrier only needs to a store barrier. For the full explanation of the sequence see asm/arm{32,64}/flushtlb.h. Signed-off-by: Julien Grall Reviewed-by: Michal Orzel Reviewed-by: Henry Wang --- xen/arch/arm/include/asm/flushtlb.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/include/asm/flushtlb.h b/xen/arch/arm/include/asm/flushtlb.h index 125a141975..e45fb6d97b 100644 --- a/xen/arch/arm/include/asm/flushtlb.h +++ b/xen/arch/arm/include/asm/flushtlb.h @@ -37,13 +37,14 @@ static inline void flush_xen_tlb_range_va_local(vaddr_t va, { vaddr_t end = va + size; - dsb(sy); /* Ensure preceding are visible */ + /* See asm/arm{32,64}/flushtlb.h for the explanation of the sequence. */ + dsb(nshst); /* Ensure prior page-tables updates have completed */ while ( va < end ) { __flush_xen_tlb_one_local(va); va += PAGE_SIZE; } - dsb(sy); /* Ensure completion of the TLB flush */ + dsb(nsh); /* Ensure the TLB invalidation has completed */ isb(); } @@ -56,13 +57,14 @@ static inline void flush_xen_tlb_range_va(vaddr_t va, { vaddr_t end = va + size; - dsb(sy); /* Ensure preceding are visible */ + /* See asm/arm{32,64}/flushtlb.h for the explanation of the sequence. */ + dsb(ishst); /* Ensure prior page-tables updates have completed */ while ( va < end ) { __flush_xen_tlb_one(va); va += PAGE_SIZE; } - dsb(sy); /* Ensure completion of the TLB flush */ + dsb(ish); /* Ensure the TLB invalidation has completed */ isb(); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:19:48 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:19:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489740.758235 (Exim 4.92) (envelope-from ) id 1pOWVI-0002W5-U4; Sun, 05 Feb 2023 04:19:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489740.758235; Sun, 05 Feb 2023 04:19:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWVI-0002Vx-RX; Sun, 05 Feb 2023 04:19:48 +0000 Received: by outflank-mailman (input) for mailman id 489740; Sun, 05 Feb 2023 04:19:47 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWVH-0002Vp-Mc for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:47 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWVH-0001GO-Lz for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:47 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWVH-0000Ge-LN for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:47 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GIxi8IeRcWxOVMnA4lcYWLu9X1FKaOttUVHtCReHvXM=; b=s93SGQl9fh06mNFuD8EzPTVKst RJllhvLtne5FvAhygFv6Dhrs5F0YQzrahjenQzDr/Dodr6MNQYijIjeAZA6VR/IQyV/JGz/aV7AoZ NtlSBpSNgbhBuLxnHxFmNXjw5opqzS0MDqREc5RoU3xgcqyVe8fC73R72mQkSQ7EXaV8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Clean-up the memory layout Message-Id: Date: Sun, 05 Feb 2023 04:19:47 +0000 commit 975bc942427e8173a97634ec9d75237c388c3bf7 Author: Julien Grall AuthorDate: Tue Jan 24 19:27:49 2023 +0000 Commit: Julien Grall CommitDate: Tue Jan 24 19:34:44 2023 +0000 xen/arm: Clean-up the memory layout In a follow-up patch, the base address for the common mappings will vary between arm32 and arm64. To avoid any duplication, define every mapping in the common region from the previous one. Take the opportunity to: * add missing *_SIZE for FIXMAP_VIRT_* and XEN_VIRT_* * switch to MB()/GB() to avoid hexadecimal (easier to read) Signed-off-by: Julien Grall Reviewed-by: Michal Orzel Reviewed-by: Henry Wang --- xen/arch/arm/include/asm/config.h | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/include/asm/config.h b/xen/arch/arm/include/asm/config.h index d8f9977698..b541bad609 100644 --- a/xen/arch/arm/include/asm/config.h +++ b/xen/arch/arm/include/asm/config.h @@ -107,14 +107,19 @@ * Unused */ -#define XEN_VIRT_START _AT(vaddr_t,0x00200000) -#define FIXMAP_ADDR(n) (_AT(vaddr_t,0x00400000) + (n) * PAGE_SIZE) +#define XEN_VIRT_START _AT(vaddr_t, MB(2)) +#define XEN_VIRT_SIZE _AT(vaddr_t, MB(2)) -#define BOOT_FDT_VIRT_START _AT(vaddr_t,0x00600000) -#define BOOT_FDT_VIRT_SIZE _AT(vaddr_t, MB(4)) +#define FIXMAP_VIRT_START (XEN_VIRT_START + XEN_VIRT_SIZE) +#define FIXMAP_VIRT_SIZE _AT(vaddr_t, MB(2)) + +#define FIXMAP_ADDR(n) (FIXMAP_VIRT_START + (n) * PAGE_SIZE) + +#define BOOT_FDT_VIRT_START (FIXMAP_VIRT_START + FIXMAP_VIRT_SIZE) +#define BOOT_FDT_VIRT_SIZE _AT(vaddr_t, MB(4)) #ifdef CONFIG_LIVEPATCH -#define LIVEPATCH_VMAP_START _AT(vaddr_t,0x00a00000) +#define LIVEPATCH_VMAP_START (BOOT_FDT_VIRT_START + BOOT_FDT_VIRT_SIZE) #define LIVEPATCH_VMAP_SIZE _AT(vaddr_t, MB(2)) #endif @@ -124,17 +129,17 @@ #define CONFIG_SEPARATE_XENHEAP 1 -#define FRAMETABLE_VIRT_START _AT(vaddr_t,0x02000000) +#define FRAMETABLE_VIRT_START _AT(vaddr_t, MB(32)) #define FRAMETABLE_SIZE MB(128-32) #define FRAMETABLE_NR (FRAMETABLE_SIZE / sizeof(*frame_table)) -#define VMAP_VIRT_START _AT(vaddr_t,0x10000000) +#define VMAP_VIRT_START _AT(vaddr_t, MB(256)) #define VMAP_VIRT_SIZE _AT(vaddr_t, GB(1) - MB(256)) -#define XENHEAP_VIRT_START _AT(vaddr_t,0x40000000) +#define XENHEAP_VIRT_START _AT(vaddr_t, GB(1)) #define XENHEAP_VIRT_SIZE _AT(vaddr_t, GB(1)) -#define DOMHEAP_VIRT_START _AT(vaddr_t,0x80000000) +#define DOMHEAP_VIRT_START _AT(vaddr_t, GB(2)) #define DOMHEAP_VIRT_SIZE _AT(vaddr_t, GB(2)) #define DOMHEAP_ENTRIES 1024 /* 1024 2MB mapping slots */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Feb 05 04:19:59 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 05 Feb 2023 04:19:59 +0000 Received: from list by lists.xenproject.org with outflank-mailman.489741.758239 (Exim 4.92) (envelope-from ) id 1pOWVS-0002Ys-W1; Sun, 05 Feb 2023 04:19:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 489741.758239; Sun, 05 Feb 2023 04:19:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWVS-0002Yk-T4; Sun, 05 Feb 2023 04:19:58 +0000 Received: by outflank-mailman (input) for mailman id 489741; Sun, 05 Feb 2023 04:19:57 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWVR-0002Yd-PY for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:57 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pOWVR-0001Gp-Oo for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:57 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1pOWVR-0000HP-OF for xen-changelog@lists.xenproject.org; Sun, 05 Feb 2023 04:19:57 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=I7aE9bfT5s/CYTNTjZ2sIdCSQBFkYHNY3fg1B9VVVXY=; b=BT6joO4K97cO9V2PlKjuE5+9S7 CneUnt8k7rtcBRw+5ndvffCrIx1xxxMoH7F10nG0sczxEZOg1UbWn0C+/ZbfIhdU2nZSAhyTTLwVV 950KK205vVymowNRwXLV1utMYCR2z/cCzeyobEs/tGCMAjf0Aq/Bt4WH0iQRqUrxblxg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm32: head: Replace "ldr rX, =