From xen-changelog-bounces@lists.xenproject.org Sat Jul 01 14:33:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jul 2023 14:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557875.871583 (Exim 4.92) (envelope-from ) id 1qFbep-00013m-Ao; Sat, 01 Jul 2023 14:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557875.871583; Sat, 01 Jul 2023 14:33: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 1qFbep-00013f-87; Sat, 01 Jul 2023 14:33:03 +0000 Received: by outflank-mailman (input) for mailman id 557875; Sat, 01 Jul 2023 14:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFben-00013Z-Km for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFben-00057Z-Jr for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFben-0004MA-IU for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33: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=yTGWrAVqBZu+xSasCiaWxj70dxvq3ZJYHf4F1isZMWU=; b=MzzyW1F0tPYd/lJ8eROpXMx21n wXx90ax9y7yBXv6+10WNwry40MwPHQk2sqSgH2JysH6ftzra06PvyBdB43n8qebxsvd3q0fe/5Ij1 dybPGYGHDg78UPOZcql3OPDLcJCcw5GBLpBJSX8XWrEeXFsdqNaYdxTAsCepbh2ns8Tg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xenalyze: Handle start-of-day ->RUNNING transitions Message-Id: Date: Sat, 01 Jul 2023 14:33:01 +0000 commit aab4b38b5d77e3c65f44bacd56427a85b7392a11 Author: George Dunlap AuthorDate: Fri Jun 30 11:25:33 2023 +0100 Commit: George Dunlap CommitDate: Fri Jun 30 11:25:33 2023 +0100 xenalyze: Handle start-of-day ->RUNNING transitions A recent xentrace highlighted an unhandled corner case in the vcpu "start-of-day" logic, if the trace starts after the last running -> non-running transition, but before the first non-running -> running transition. Because start-of-day wasn't handled, vcpu_next_update() was expecting p->current to be NULL, and tripping out with the following error message when it wasn't: vcpu_next_update: FATAL: p->current not NULL! (d32768dv$p, runstate RUNSTATE_INIT) where 32768 is the DEFAULT_DOMAIN, and $p is the pcpu number. Instead of calling vcpu_start() piecemeal throughout sched_runstate_process(), call it at the top of the function if the vcpu in question is still in RUNSTATE_INIT, so that we can handle all the cases in one place. Sketch out at the top of the function all cases which we need to handle, and what to do in those cases. Some transitions tell us where v is running; some transitions tell us about what is (or is not) running on p; some transitions tell us neither. If a transition tells us where v is now running, update its state; otherwise leave it in INIT, in order to avoid having to deal with TSC skew on start-up. If a transition tells us what is or is not running on p, update p->current (either to v or NULL). Otherwise leave it alone. If neither, do nothing. Reifying those rules: - If we're continuing to run, set v to RUNNING, and use p->first_tsc as the runstate time. - If we're starting to run, set v to RUNNING, and use ri->tsc as the runstate time. - If v is being deschedled, leave v in the INIT state to avoid dealing with TSC skew; but set p->current to NULL so that whatever is scheduled next won't trigger the assert in vcpu_next_update(). - If a vcpu is waking up (switching from one non-runnable state to another non-runnable state), leave v in INIT, and p in whatever state it's in (which may be the default domain, or some other vcpu which has already run). While here, fix the comment above vcpu_start; it's called when the vcpu state is INIT, not when current is the default domain. Signed-off-by: George Dunlap Acked-by: Andrew Cooper Acked-by: Anthony PERARD --- tools/xentrace/xenalyze.c | 159 +++++++++++++++++++++++++++++----------------- 1 file changed, 101 insertions(+), 58 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index a50538e9a8..2d1eaa4237 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -6885,39 +6885,86 @@ void vcpu_next_update(struct pcpu_info *p, struct vcpu_data *next, tsc_t tsc) p->lost_record.seen_valid_schedule = 1; } -/* If current is the default domain, we're fixing up from something - * like start-of-day. Update what we can. */ -void vcpu_start(struct pcpu_info *p, struct vcpu_data *v) { - /* If vcpus are created, or first show up, in a "dead zone", this will - * fail. */ - if( !p->current || p->current->d->did != DEFAULT_DOMAIN) { - fprintf(stderr, "Strange, p->current not default domain!\n"); - error(ERR_FILE, NULL); - return; - } +/* + * If the vcpu in question is in state INIT, we're fixing up from something + * like start-of-day. Update what we can. + */ +void vcpu_start(struct pcpu_info *p, struct vcpu_data *v, + int old_runstate, int new_runstate, tsc_t ri_tsc) { + tsc_t tsc; + + /* + * + * Cases: + * running -> running: + * v -> running, using p->first_tsc + * {runnable, blocked} -> running: + * v -> running, using ri->tsc + * running -> {runnable, blocked}: + * Leave v INIT, but clear p->current in case another vcpu is scheduled + * blocked -> runnable: + * Leave INIT, and also leave p->current, since we still don't know who's scheduled here + */ + + /* + * NB that a vcpu won't come out of INIT until it starts running somewhere. + * If this event is pcpu that has already seen a scheduling event, p->current + * should be null; if this is the first scheduling event on this pcpu, + * p->current should be the default domain. + */ + if( old_runstate == RUNSTATE_RUNNING ) { + if ( !p->current || p->current->d->did != DEFAULT_DOMAIN) { + fprintf(stderr, "Strange, p->current not default domain!\n"); + error(ERR_FILE, NULL); + return; - if(!p->first_tsc) { - fprintf(stderr, "Strange, p%d first_tsc 0!\n", p->pid); - error(ERR_FILE, NULL); + } + + if(!p->first_tsc) { + fprintf(stderr, "Strange, p%d first_tsc 0!\n", p->pid); + error(ERR_FILE, NULL); + } + + if(p->first_tsc <= p->current->runstate.tsc) { + fprintf(stderr, "Strange, first_tsc %llx < default_domain runstate tsc %llx!\n", + p->first_tsc, + p->current->runstate.tsc); + error(ERR_FILE, NULL); + } + + /* Change default domain to 'queued' */ + runstate_update(p->current, RUNSTATE_QUEUED, p->first_tsc); + + /* + * Set current to NULL, so that if another vcpu (not in INIT) + * is scheduled here, we don't trip over the check in + * vcpu_next_update() + */ + p->current = NULL; } - if(p->first_tsc <= p->current->runstate.tsc) { - fprintf(stderr, "Strange, first_tsc %llx < default_domain runstate tsc %llx!\n", - p->first_tsc, - p->current->runstate.tsc); - error(ERR_FILE, NULL); + /* TSC skew at start-of-day is hard to deal with. Don't + * bring a vcpu out of INIT until it's seen to be actually + * running somewhere. */ + if ( new_runstate != RUNSTATE_RUNNING ) { + fprintf(warn, "First schedule for d%dv%d doesn't take us into a running state; leaving INIT\n", + v->d->did, v->vid); + + return; } - /* Change default domain to 'queued' */ - runstate_update(p->current, RUNSTATE_QUEUED, p->first_tsc); + tsc = ri_tsc; + if ( old_runstate == RUNSTATE_RUNNING ) { + /* FIXME: Copy over data from the default domain this interval */ + fprintf(warn, "Using first_tsc for d%dv%d (%lld cycles)\n", + v->d->did, v->vid, p->last_tsc - p->first_tsc); - /* FIXME: Copy over data from the default domain this interval */ - fprintf(warn, "Using first_tsc for d%dv%d (%lld cycles)\n", - v->d->did, v->vid, p->last_tsc - p->first_tsc); + tsc = p->first_tsc; + } /* Simulate the time since the first tsc */ - runstate_update(v, RUNSTATE_RUNNING, p->first_tsc); - p->time.tsc = p->first_tsc; + runstate_update(v, RUNSTATE_RUNNING, tsc); + p->time.tsc = tsc; p->current = v; pcpu_string_draw(p); v->p = p; @@ -7021,6 +7068,13 @@ void sched_runstate_process(struct pcpu_info *p) last_oldstate = v->runstate.last_oldstate; v->runstate.last_oldstate.wrong = RUNSTATE_INIT; + /* Handle all "start-of-day" issues in one place. This can be + * done before any of the other tracks or sanity checks. */ + if ( v->runstate.state == RUNSTATE_INIT ) { + vcpu_start(p, v, sevt.old_runstate, sevt.new_runstate, ri->tsc); + return; + } + /* Close vmexits when the putative reason for blocking / &c stops. * This way, we don't account cpu contention to some other overhead. */ if(sevt.new_runstate == RUNSTATE_RUNNABLE @@ -7190,32 +7244,27 @@ update: * or stopping actually running on a physical cpu. */ if ( type == CONTINUE ) { - if( v->runstate.state == RUNSTATE_INIT ) { - /* Start-of-day; account first tsc -> now to v */ - vcpu_start(p, v); - } else { - /* Continue running. First, do some sanity checks */ - if ( v->runstate.state == RUNSTATE_LOST ) { - fprintf(warn, "WARNING: continue with d%dv%d in RUNSTATE_LOST. Resetting current.\n", - v->d->did, v->vid); - if ( p->current ) - vcpu_prev_update(p, p->current, ri->tsc, RUNSTATE_LOST); - vcpu_next_update(p, v, ri->tsc); - } - else if( v->runstate.state != RUNSTATE_RUNNING ) { - /* This should never happen. */ - fprintf(warn, "FATAL: sevt.old_runstate running, but d%dv%d runstate %s!\n", - v->d->did, v->vid, runstate_name[v->runstate.state]); - error(ERR_FILE, NULL); - } else if ( v->p != p ) { - fprintf(warn, "FATAL: continue on p%d, but d%dv%d p%d!\n", - p->pid, v->d->did, v->vid, - v->p ? v->p->pid : -1); - error(ERR_FILE, NULL); - } - - runstate_update(v, RUNSTATE_RUNNING, ri->tsc); + /* Continue running. First, do some sanity checks */ + if ( v->runstate.state == RUNSTATE_LOST ) { + fprintf(warn, "WARNING: continue with d%dv%d in RUNSTATE_LOST. Resetting current.\n", + v->d->did, v->vid); + if ( p->current ) + vcpu_prev_update(p, p->current, ri->tsc, RUNSTATE_LOST); + vcpu_next_update(p, v, ri->tsc); + } + else if( v->runstate.state != RUNSTATE_RUNNING ) { + /* This should never happen. */ + fprintf(warn, "FATAL: sevt.old_runstate running, but d%dv%d runstate %s!\n", + v->d->did, v->vid, runstate_name[v->runstate.state]); + error(ERR_FILE, NULL); + } else if ( v->p != p ) { + fprintf(warn, "FATAL: continue on p%d, but d%dv%d p%d!\n", + p->pid, v->d->did, v->vid, + v->p ? v->p->pid : -1); + error(ERR_FILE, NULL); } + + runstate_update(v, RUNSTATE_RUNNING, ri->tsc); } else if ( sevt.old_runstate == RUNSTATE_RUNNING || v->runstate.state == RUNSTATE_RUNNING ) @@ -7232,10 +7281,7 @@ update: * # (should never happen) */ if( sevt.old_runstate == RUNSTATE_RUNNING ) { - if( v->runstate.state == RUNSTATE_INIT ) { - /* Start-of-day; account first tsc -> now to v */ - vcpu_start(p, v); - } else if( v->runstate.state != RUNSTATE_RUNNING + if( v->runstate.state != RUNSTATE_RUNNING && v->runstate.state != RUNSTATE_LOST ) { /* This should never happen. */ fprintf(warn, "FATAL: sevt.old_runstate running, but d%dv%d runstate %s!\n", @@ -7264,11 +7310,8 @@ update: vcpu_next_update(p, v, ri->tsc); } - else if ( v->runstate.state != RUNSTATE_INIT ) + else { - /* TSC skew at start-of-day is hard to deal with. Don't - * bring a vcpu out of INIT until it's seen to be actually - * running somewhere. */ runstate_update(v, sevt.new_runstate, ri->tsc); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jul 01 14:33:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jul 2023 14:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557876.871587 (Exim 4.92) (envelope-from ) id 1qFbez-00015n-CP; Sat, 01 Jul 2023 14:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557876.871587; Sat, 01 Jul 2023 14:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbez-00015g-9g; Sat, 01 Jul 2023 14:33:13 +0000 Received: by outflank-mailman (input) for mailman id 557876; Sat, 01 Jul 2023 14:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbex-00015U-OH for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbex-00057w-NT for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFbex-0004Mb-Ma for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:11 +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=kzeJ6W1Venk38iAGks9ec6Afh8iEfSSFrYgg5Um2OxY=; b=CENwOVIAG7dUHl7ePQe5JHLUDd p90mX7j42SVNJtubH9fNfgOtENcL/5G019+TBhDOlOBTddi0JNWNLjHzle01Ye1i3vSAphVE7+lLF 8XxP+RGbPZ/lUZ1S5BLw0Ol0gGiOMkQ1zKIlUXonYwd769Jy/2HJYO8wn6mjigTNZVVo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xenalyze: Basic TRC_HVM_EMUL handling Message-Id: Date: Sat, 01 Jul 2023 14:33:11 +0000 commit c81b287e00b1a21beb65637d9cfb812da3a0e5ce Author: George Dunlap AuthorDate: Fri Jun 30 11:25:34 2023 +0100 Commit: George Dunlap CommitDate: Fri Jun 30 11:29:06 2023 +0100 xenalyze: Basic TRC_HVM_EMUL handling For now, mainly just do volume analysis and get rid of the warnings. Signed-off-by: George Dunlap Acked-by: Andrew Cooper Acked-by: Anthony PERARD --- tools/xentrace/xenalyze.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 2d1eaa4237..dde10d3e2d 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -987,6 +987,7 @@ enum { HVM_VOL_VMENTRY, HVM_VOL_VMEXIT, HVM_VOL_HANDLER, + HVM_VOL_EMUL, HVM_VOL_MAX }; @@ -1013,6 +1014,7 @@ const char *hvm_vol_name[HVM_VOL_MAX] = { [HVM_VOL_VMENTRY]="vmentry", [HVM_VOL_VMEXIT] ="vmexit", [HVM_VOL_HANDLER]="handler", + [HVM_VOL_EMUL]="emul", }; enum { @@ -5275,15 +5277,18 @@ void hvm_process(struct pcpu_info *p) if(vcpu_set_data_type(p->current, VCPU_DATA_HVM)) return; - if(ri->evt.sub == 2) - { + switch ( ri->evt.sub ) { + case 2: /* HVM_HANDLER */ UPDATE_VOLUME(p, hvm[HVM_VOL_HANDLER], ri->size); hvm_handler_process(ri, h); - } - else - { + break; + case 4: /* HVM_EMUL */ + UPDATE_VOLUME(p, hvm[HVM_VOL_EMUL], ri->size); + warn_once("WARNING: We don't yet analyze HVM_EMUL events.\n"); + /* FIXME: Collect analysis on this */ + break; + default: switch(ri->event) { - /* HVM */ case TRC_HVM_VMEXIT: case TRC_HVM_VMEXIT64: UPDATE_VOLUME(p, hvm[HVM_VOL_VMEXIT], ri->size); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jul 01 14:33:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jul 2023 14:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557877.871591 (Exim 4.92) (envelope-from ) id 1qFbf9-00018O-Ds; Sat, 01 Jul 2023 14:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557877.871591; Sat, 01 Jul 2023 14:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbf9-00018H-BC; Sat, 01 Jul 2023 14:33:23 +0000 Received: by outflank-mailman (input) for mailman id 557877; Sat, 01 Jul 2023 14:33:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbf7-000187-SF for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbf7-00058N-RQ for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFbf7-0004NJ-Ps for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:21 +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=qFdnL/oaRqru+y1fIvhAhXCv05fLgbJ5GtmYg6dPoGc=; b=gdzBshyJU/AHBxItEHNx8CB9b5 Qp1jsOkzY/fiq3OAP5P5dN0OkIAwgoO1yT8jWF2EU0QmB5enT9lXOLyFd1d8vv/Ax37j4Ljv6a5Ec cJNRfoEXqtQeJtwgLGZtRJTY6VaOIs/AezDNPvtOP1AxoMtz7WGVvzFeTv1U7CKWtfzk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] {x86,arm}/mm.c: Make populate_pt_range __init Message-Id: Date: Sat, 01 Jul 2023 14:33:21 +0000 commit 9dd3caf12f52b859947c260b1cb3a48b491d53b6 Author: George Dunlap AuthorDate: Tue Oct 6 12:03:52 2020 +0100 Commit: George Dunlap CommitDate: Fri Jun 30 14:12:54 2023 +0100 {x86,arm}/mm.c: Make populate_pt_range __init It's only called from another __init function. Signed-off-by: George Dunlap Acked-by: Andrew Cooper Acked-by: Julien Grall --- xen/arch/arm/mm.c | 2 +- xen/arch/x86/mm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 0a3e1f3b64..9b14ae3a5d 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1218,7 +1218,7 @@ int map_pages_to_xen(unsigned long virt, return xen_pt_update(virt, mfn, nr_mfns, flags); } -int populate_pt_range(unsigned long virt, unsigned long nr_mfns) +int __init populate_pt_range(unsigned long virt, unsigned long nr_mfns) { return xen_pt_update(virt, INVALID_MFN, nr_mfns, _PAGE_POPULATE); } diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 9741d28cbc..be2b10a391 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5574,7 +5574,7 @@ int map_pages_to_xen( return rc; } -int populate_pt_range(unsigned long virt, unsigned long nr_mfns) +int __init populate_pt_range(unsigned long virt, unsigned long nr_mfns) { return map_pages_to_xen(virt, INVALID_MFN, nr_mfns, MAP_SMALL_PAGES); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jul 01 14:33:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jul 2023 14:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557878.871595 (Exim 4.92) (envelope-from ) id 1qFbfJ-0001Bg-FD; Sat, 01 Jul 2023 14:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557878.871595; Sat, 01 Jul 2023 14:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbfJ-0001BZ-Cd; Sat, 01 Jul 2023 14:33:33 +0000 Received: by outflank-mailman (input) for mailman id 557878; Sat, 01 Jul 2023 14:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbfH-0001BM-Vh for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbfH-00058t-Ur for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFbfH-0004O5-Tm for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:31 +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=i120xptZgMJG4aa/IgwKg/o04jl80ouOM6pKWATXe6E=; b=ZpmvjAAtW2Sk2+/GYUCnHsIeH3 TecplYuGxxpjJisNoQAA47EXW3YSrVXp+H3POzT3AXt3jZdr22msqMX5ypmwYdkXOoSM8+PKroSol Rxa/I4u/Iilxfmifh5RcA/uXvJHsqRsbkxnCrcDfjCzRDBqQuksululsawy2Qh9GtgnM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: Add __AC() macro to common-macros.h Message-Id: Date: Sat, 01 Jul 2023 14:33:31 +0000 commit 91d4159a34c4706aab803f5a2cf74dbb52eec5e3 Author: Alejandro Vallejo AuthorDate: Thu Jun 29 13:17:11 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 30 14:18:28 2023 +0100 tools: Add __AC() macro to common-macros.h Currently libxl and the x86-emulator tests carry their own versions. Factor those out into the common macros header so every library can make use of it. This is required so the following patch can add this macro to a header used both in Xen and tools/libs. No functional change. Signed-off-by: Alejandro Vallejo Reviewed-by: Andrew Cooper --- tools/include/xen-tools/common-macros.h | 3 +++ tools/libs/light/libxl_internal.h | 2 -- tools/tests/x86_emulator/x86-emulate.h | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/include/xen-tools/common-macros.h b/tools/include/xen-tools/common-macros.h index 168691be0e..e5ed603904 100644 --- a/tools/include/xen-tools/common-macros.h +++ b/tools/include/xen-tools/common-macros.h @@ -84,4 +84,7 @@ (type *)((char *)mptr__ - offsetof(type, member)); \ }) +#define __AC(X, Y) (X ## Y) +#define _AC(X, Y) __AC(X, Y) + #endif /* __XEN_TOOLS_COMMON_MACROS__ */ diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h index 61f4fe1dec..1cf3d400bf 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -125,8 +125,6 @@ #define PVSHIM_CMDLINE "pv-shim console=xen,pv" /* Size macros. */ -#define __AC(X,Y) (X##Y) -#define _AC(X,Y) __AC(X,Y) #define MB(_mb) (_AC(_mb, ULL) << 20) #define GB(_gb) (_AC(_gb, ULL) << 30) diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index aa1ed75ec8..350d1a0abf 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -59,9 +59,6 @@ #define cf_check /* No Control Flow Integriy checking */ -#define AC_(n,t) (n##t) -#define _AC(n,t) AC_(n,t) - #ifdef __GCC_ASM_FLAG_OUTPUTS__ # define ASM_FLAG_OUT(yes, no) yes #else -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jul 01 14:33:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jul 2023 14:33:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557879.871599 (Exim 4.92) (envelope-from ) id 1qFbfT-0001ER-H7; Sat, 01 Jul 2023 14:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557879.871599; Sat, 01 Jul 2023 14:33:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbfT-0001EK-EI; Sat, 01 Jul 2023 14:33:43 +0000 Received: by outflank-mailman (input) for mailman id 557879; Sat, 01 Jul 2023 14:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbfS-0001E8-2l for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbfS-000594-1w for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFbfS-0004Od-0t for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:42 +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=I3yhMY4Jt43ifFuI6esdJ+SM5Mk5w6oastgE//sCDE8=; b=E0RzGikFqiNiRV8DnVYRDdyKga MZG/4zwStbZ1KmXBx7GxTECvDu6y2w3vgQyz4JCHs7refspZ26wRGwyq4/2VNyUSzOuLyCvgFtOk3 HPLO/UM15cJkAgaTvKMIleiv+prjKkTpRxioAamrdKqLV5KvAup+AAjiQgQEQa+OLr+o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Clear XD_DISABLE from the early boot path Message-Id: Date: Sat, 01 Jul 2023 14:33:42 +0000 commit fc3090a47b21bfe746ef3bd2cbc5d0cdaa797686 Author: Alejandro Vallejo AuthorDate: Thu Jun 29 13:17:12 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 30 14:18:28 2023 +0100 x86/boot: Clear XD_DISABLE from the early boot path Intel CPUs have a bit in MSR_IA32_MISC_ENABLE that may prevent the NX bit from being advertised. Clear it unconditionally if we can't find the NX feature right away on boot. The conditions for the MSR being read on early boot are (in this order): * Long Mode is supported * NX isn't advertised * The vendor is Intel The order of checks has been chosen carefully so a virtualized Xen on a hypervisor that doesn't emulate that MSR (but supports NX) doesn't triple fault trying to access the non-existing MSR. With that done, we can remove the XD_DISABLE checks in the intel-specific init path (as they are already done in early assembly). Keep a printk to highlight the fact that NX was forcefully enabled. Signed-off-by: Alejandro Vallejo Reviewed-by: Andrew Cooper --- xen/arch/x86/boot/head.S | 49 +++++++++++++++++++++++++++++----- xen/arch/x86/cpu/intel.c | 15 ++++------- xen/arch/x86/include/asm/msr-index.h | 2 +- xen/arch/x86/include/asm/x86-vendors.h | 30 ++++++++++----------- 4 files changed, 64 insertions(+), 32 deletions(-) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index 9fbd602ea5..6685d3e504 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -652,16 +652,53 @@ trampoline_setup: cpuid 1: mov %edx, CPUINFO_FEATURE_OFFSET(X86_FEATURE_LM) + sym_esi(boot_cpu_data) - /* Check for NX. Adjust EFER setting if available. */ - bt $cpufeat_bit(X86_FEATURE_NX), %edx - jnc 1f - orb $EFER_NXE >> 8, 1 + sym_esi(trampoline_efer) -1: - /* Check for availability of long mode. */ bt $cpufeat_bit(X86_FEATURE_LM),%edx jnc .Lbad_cpu + /* Check for NX */ + bt $cpufeat_bit(X86_FEATURE_NX), %edx + jc .Lgot_nx + + /* + * NX appears to be unsupported, but it might be hidden. + * + * The feature is part of the AMD64 spec, but the very first Intel + * 64bit CPUs lacked the feature, and thereafter there was a + * firmware knob to disable the feature. Undo the disable if + * possible. + * + * All 64bit Intel CPUs support this MSR. If virtualised, expect + * the hypervisor to either emulate the MSR or give us NX. + */ + xor %eax, %eax + cpuid + cmp $X86_VENDOR_INTEL_EBX, %ebx + jnz .Lno_nx + cmp $X86_VENDOR_INTEL_EDX, %edx + jnz .Lno_nx + cmp $X86_VENDOR_INTEL_ECX, %ecx + jnz .Lno_nx + + /* Clear the XD_DISABLE bit */ + mov $MSR_IA32_MISC_ENABLE, %ecx + rdmsr + btr $2, %edx + jnc .Lno_nx + wrmsr + orb $MSR_IA32_MISC_ENABLE_XD_DISABLE >> 32, 4 + sym_esi(trampoline_misc_enable_off) + + /* Check again for NX */ + mov $0x80000001, %eax + cpuid + bt $cpufeat_bit(X86_FEATURE_NX), %edx + jnc .Lno_nx + +.Lgot_nx: + /* Adjust EFER given that NX is present */ + orb $EFER_NXE >> 8, 1 + sym_esi(trampoline_efer) +.Lno_nx: + /* Stash TSC to calculate a good approximation of time-since-boot */ rdtsc mov %eax, sym_esi(boot_tsc_stamp) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 168cd58f36..36018aa8fe 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -304,24 +304,19 @@ static void cf_check early_init_intel(struct cpuinfo_x86 *c) if (c->x86 == 15 && c->x86_cache_alignment == 64) c->x86_cache_alignment = 128; + if (c == &boot_cpu_data && + bootsym(trampoline_misc_enable_off) & MSR_IA32_MISC_ENABLE_XD_DISABLE) + printk(KERN_INFO "re-enabled NX (Execute Disable) protection\n"); + /* Unmask CPUID levels and NX if masked: */ rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); - disable = misc_enable & (MSR_IA32_MISC_ENABLE_LIMIT_CPUID | - MSR_IA32_MISC_ENABLE_XD_DISABLE); + disable = misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID; if (disable) { wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable & ~disable); bootsym(trampoline_misc_enable_off) |= disable; - bootsym(trampoline_efer) |= EFER_NXE; - } - - if (disable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) printk(KERN_INFO "revised cpuid level: %d\n", cpuid_eax(0)); - if (disable & MSR_IA32_MISC_ENABLE_XD_DISABLE) { - write_efer(read_efer() | EFER_NXE); - printk(KERN_INFO - "re-enabled NX (Execute Disable) protection\n"); } /* CPUID workaround for Intel 0F33/0F34 CPU */ diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index 2749e433d2..4f861c0bb4 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -502,7 +502,7 @@ #define MSR_IA32_MISC_ENABLE_MONITOR_ENABLE (1<<18) #define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1<<22) #define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1<<23) -#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << 34) +#define MSR_IA32_MISC_ENABLE_XD_DISABLE (_AC(1, ULL) << 34) #define MSR_IA32_TSC_DEADLINE 0x000006E0 #define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 diff --git a/xen/arch/x86/include/asm/x86-vendors.h b/xen/arch/x86/include/asm/x86-vendors.h index 0a37024cbd..d51c516909 100644 --- a/xen/arch/x86/include/asm/x86-vendors.h +++ b/xen/arch/x86/include/asm/x86-vendors.h @@ -12,28 +12,28 @@ #define X86_VENDOR_UNKNOWN 0 #define X86_VENDOR_INTEL (1 << 0) -#define X86_VENDOR_INTEL_EBX 0x756e6547U /* "GenuineIntel" */ -#define X86_VENDOR_INTEL_ECX 0x6c65746eU -#define X86_VENDOR_INTEL_EDX 0x49656e69U +#define X86_VENDOR_INTEL_EBX _AC(0x756e6547, U) /* "GenuineIntel" */ +#define X86_VENDOR_INTEL_ECX _AC(0x6c65746e, U) +#define X86_VENDOR_INTEL_EDX _AC(0x49656e69, U) #define X86_VENDOR_AMD (1 << 1) -#define X86_VENDOR_AMD_EBX 0x68747541U /* "AuthenticAMD" */ -#define X86_VENDOR_AMD_ECX 0x444d4163U -#define X86_VENDOR_AMD_EDX 0x69746e65U +#define X86_VENDOR_AMD_EBX _AC(0x68747541, U) /* "AuthenticAMD" */ +#define X86_VENDOR_AMD_ECX _AC(0x444d4163, U) +#define X86_VENDOR_AMD_EDX _AC(0x69746e65, U) #define X86_VENDOR_CENTAUR (1 << 2) -#define X86_VENDOR_CENTAUR_EBX 0x746e6543U /* "CentaurHauls" */ -#define X86_VENDOR_CENTAUR_ECX 0x736c7561U -#define X86_VENDOR_CENTAUR_EDX 0x48727561U +#define X86_VENDOR_CENTAUR_EBX _AC(0x746e6543, U) /* "CentaurHauls" */ +#define X86_VENDOR_CENTAUR_ECX _AC(0x736c7561, U) +#define X86_VENDOR_CENTAUR_EDX _AC(0x48727561, U) #define X86_VENDOR_SHANGHAI (1 << 3) -#define X86_VENDOR_SHANGHAI_EBX 0x68532020U /* " Shanghai " */ -#define X86_VENDOR_SHANGHAI_ECX 0x20206961U -#define X86_VENDOR_SHANGHAI_EDX 0x68676e61U +#define X86_VENDOR_SHANGHAI_EBX _AC(0x68532020, U) /* " Shanghai " */ +#define X86_VENDOR_SHANGHAI_ECX _AC(0x20206961, U) +#define X86_VENDOR_SHANGHAI_EDX _AC(0x68676e61, U) #define X86_VENDOR_HYGON (1 << 4) -#define X86_VENDOR_HYGON_EBX 0x6f677948U /* "HygonGenuine" */ -#define X86_VENDOR_HYGON_ECX 0x656e6975U -#define X86_VENDOR_HYGON_EDX 0x6e65476eU +#define X86_VENDOR_HYGON_EBX _AC(0x6f677948, U) /* "HygonGenuine" */ +#define X86_VENDOR_HYGON_ECX _AC(0x656e6975, U) +#define X86_VENDOR_HYGON_EDX _AC(0x6e65476e, U) #endif /* __XEN_X86_VENDORS_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jul 01 14:33:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jul 2023 14:33:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557880.871602 (Exim 4.92) (envelope-from ) id 1qFbfd-0001HV-KR; Sat, 01 Jul 2023 14:33:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557880.871602; Sat, 01 Jul 2023 14:33:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbfd-0001HM-Hn; Sat, 01 Jul 2023 14:33:53 +0000 Received: by outflank-mailman (input) for mailman id 557880; Sat, 01 Jul 2023 14:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbfc-0001H9-64 for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbfc-00059D-5B for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFbfc-0004PP-4F for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:33:52 +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=rjgiCDbaMDId9dsGheG62hdFW3oYO9Xi4o4xQrHdjK0=; b=U2TnSiDCRmpYLycZ3GLqP6l5+U 2FvZM/ULgumC8OnCpYxGN0InGbJzJa20aA6mLnsw6ZVbL6Jw6hEN2vJr7eqQQf+fmyC3pKb8qguBu XoOSjJDWV95C/IZBOBh44bwUA8oLPWOP7DZ7UCHJiqhmaVn8gztJgMlJpGT7hROvbdR8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: Add Kconfig option to require NX bit support Message-Id: Date: Sat, 01 Jul 2023 14:33:52 +0000 commit 098e27578b0b1743831877787fc7ded591dfd8d6 Author: Alejandro Vallejo AuthorDate: Thu Jun 29 13:17:13 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 30 14:18:28 2023 +0100 x86: Add Kconfig option to require NX bit support This option hardens Xen by forcing it to write secure (NX-enhanced) PTEs regardless of the runtime NX feature bit in boot_cpu_data. This prevents an attacker with partial write support from affecting Xen's PTE generation logic by overriding the NX feature flag. The patch asserts support for the NX bit in PTEs at boot time and if so short-circuits the cpu_has_nx macro to 1. It has the nice benefit of replacing many instances of runtime checks with folded constants. This has several knock-on effects that improve codegen, saving 2.5KiB off the text section. The config option defaults to OFF for compatibility with previous behaviour. Signed-off-by: Alejandro Vallejo Reviewed-by: Andrew Cooper --- xen/arch/x86/Kconfig | 16 ++++++++++++++++ xen/arch/x86/boot/head.S | 15 ++++++++++++++- xen/arch/x86/boot/trampoline.S | 3 ++- xen/arch/x86/efi/efi-boot.h | 9 +++++++++ xen/arch/x86/include/asm/cpufeature.h | 3 ++- 5 files changed, 43 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 406445a358..92f3a627da 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -307,6 +307,22 @@ config MEM_SHARING bool "Xen memory sharing support (UNSUPPORTED)" if UNSUPPORTED depends on HVM +config REQUIRE_NX + bool "Require NX (No eXecute) support" + help + No-eXecute (also called XD "eXecute Disable" and DEP "Data + Execution Prevention") is a security feature designed originally + to combat buffer overflow attacks by marking regions of memory + which the CPU must not interpret as instructions. + + The NX feature exists in every 64bit CPU except for some very + early Pentium 4 Prescott machines. + + Enabling this option will improve Xen's security by removing + cases where Xen could be tricked into thinking that the feature + was unavailable. However, if enabled, Xen will no longer boot on + any CPU which is lacking NX support. + endmenu source "common/Kconfig" diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index 6685d3e504..e03f52c755 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -123,6 +123,7 @@ multiboot2_header: .Lbad_ldr_nih: .asciz "ERR: EFI ImageHandle is not provided by bootloader!" .Lbad_efi_msg: .asciz "ERR: EFI IA-32 platforms are not supported!" .Lbag_alg_msg: .asciz "ERR: Xen must be loaded at a 2Mb boundary!" +.Lno_nx_msg: .asciz "ERR: Not an NX-capable CPU!" .section .init.data, "aw", @progbits .align 4 @@ -153,6 +154,11 @@ early_error: /* Here to improve the disassembly. */ .Lnot_aligned: add $sym_offs(.Lbag_alg_msg), %esi jmp .Lget_vtb +#ifdef CONFIG_REQUIRE_NX +.Lno_nx: + add $sym_offs(.Lno_nx_msg), %esi + jmp .Lget_vtb +#endif .Lmb2_no_st: /* * Here we are on EFI platform. vga_text_buffer was zapped earlier @@ -656,7 +662,12 @@ trampoline_setup: bt $cpufeat_bit(X86_FEATURE_LM),%edx jnc .Lbad_cpu - /* Check for NX */ + /* + * Check for NX + * - If Xen was compiled requiring it simply assert it's + * supported. The trampoline already has the right constant. + * - Otherwise, update the trampoline EFER mask accordingly. + */ bt $cpufeat_bit(X86_FEATURE_NX), %edx jc .Lgot_nx @@ -695,9 +706,11 @@ trampoline_setup: jnc .Lno_nx .Lgot_nx: +#ifndef CONFIG_REQUIRE_NX /* Adjust EFER given that NX is present */ orb $EFER_NXE >> 8, 1 + sym_esi(trampoline_efer) .Lno_nx: +#endif /* Stash TSC to calculate a good approximation of time-since-boot */ rdtsc diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S index c6005fa33d..b8ab0ffdcb 100644 --- a/xen/arch/x86/boot/trampoline.S +++ b/xen/arch/x86/boot/trampoline.S @@ -147,7 +147,8 @@ GLOBAL(trampoline_misc_enable_off) /* EFER OR-mask for boot paths. SCE conditional on PV support, NX added when available. */ GLOBAL(trampoline_efer) - .long EFER_LME | (EFER_SCE * IS_ENABLED(CONFIG_PV)) + .long EFER_LME | (EFER_SCE * IS_ENABLED(CONFIG_PV)) | \ + (EFER_NXE * IS_ENABLED(CONFIG_REQUIRE_NX)) GLOBAL(trampoline_xen_phys_start) .long 0 diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index c94e53d139..64c1a02cf1 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -751,6 +751,15 @@ static void __init efi_arch_cpu(void) { caps[FEATURESET_e1d] = cpuid_edx(0x80000001); + /* + * This check purposefully doesn't use cpu_has_nx because + * cpu_has_nx bypasses the boot_cpu_data read if Xen was compiled + * with CONFIG_REQUIRE_NX + */ + if ( IS_ENABLED(CONFIG_REQUIRE_NX) && + !boot_cpu_has(X86_FEATURE_NX) ) + blexit(L"This build of Xen requires NX support"); + if ( cpu_has_nx ) trampoline_efer |= EFER_NXE; } diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index e2cb8f3cc7..64e1dad225 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -91,7 +91,8 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_hypervisor boot_cpu_has(X86_FEATURE_HYPERVISOR) /* CPUID level 0x80000001.edx */ -#define cpu_has_nx boot_cpu_has(X86_FEATURE_NX) +#define cpu_has_nx (IS_ENABLED(CONFIG_REQUIRE_NX) || \ + boot_cpu_has(X86_FEATURE_NX)) #define cpu_has_page1gb boot_cpu_has(X86_FEATURE_PAGE1GB) #define cpu_has_rdtscp boot_cpu_has(X86_FEATURE_RDTSCP) #define cpu_has_3dnow_ext boot_cpu_has(X86_FEATURE_3DNOWEXT) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jul 01 14:34:03 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jul 2023 14:34:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557881.871606 (Exim 4.92) (envelope-from ) id 1qFbfn-0001Kc-Lq; Sat, 01 Jul 2023 14:34:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557881.871606; Sat, 01 Jul 2023 14:34: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 1qFbfn-0001KU-JD; Sat, 01 Jul 2023 14:34:03 +0000 Received: by outflank-mailman (input) for mailman id 557881; Sat, 01 Jul 2023 14:34:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbfm-0001KF-93 for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:34:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbfm-00059Z-83 for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:34:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFbfm-0004Pz-7I for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:34: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=WYptoRsiVaoCMSHbZz7PQj8y7u80mf+3xzVuOaRovBc=; b=vZKFsJMXwApiTMmquBM3v6J35q fd2oqfGNylbQLxdrO3JZETumnO79Xe0TmZYfI2peygtqsIBvX9pq8dk7iW6DJ6Knoq34eZn9FArbw zhV4DBZmnKYY9PnDVpTQ947PJhs/kmEYGd+cioZ099RwlqEfbbjZDBaCpWy0A/gWXE0o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: Swap parameter names of hvm_copy_context_and_params() declaration Message-Id: Date: Sat, 01 Jul 2023 14:34:02 +0000 commit f319f32347d3fc383fda53d0c4be462e03e94baf Author: Federico Serafini AuthorDate: Thu Jun 29 17:55:29 2023 +0200 Commit: Andrew Cooper CommitDate: Fri Jun 30 14:18:28 2023 +0100 x86/hvm: Swap parameter names of hvm_copy_context_and_params() declaration Swap parameter names 'src' and 'dst' of hvm_copy_context_and_params() declaration for consistency with the corresponding definition and the uses of such function. Also, this fixes a violation of MISRA C:2012 Rule 8.3. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini Acked-by: Andrew Cooper --- xen/arch/x86/include/asm/hvm/hvm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/hvm/hvm.h index 04cbd4ff24..9555b4c41f 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -366,7 +366,7 @@ const char *hvm_efer_valid(const struct vcpu *v, uint64_t value, signed int cr0_pg); unsigned long hvm_cr4_guest_valid_bits(const struct domain *d); -int hvm_copy_context_and_params(struct domain *src, struct domain *dst); +int hvm_copy_context_and_params(struct domain *dst, struct domain *src); int hvm_get_param(struct domain *d, uint32_t index, uint64_t *value); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jul 01 14:34:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jul 2023 14:34:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557882.871610 (Exim 4.92) (envelope-from ) id 1qFbfx-0001NZ-ND; Sat, 01 Jul 2023 14:34:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557882.871610; Sat, 01 Jul 2023 14:34:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbfx-0001NR-Kh; Sat, 01 Jul 2023 14:34:13 +0000 Received: by outflank-mailman (input) for mailman id 557882; Sat, 01 Jul 2023 14:34:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbfw-0001N9-CM for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:34:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbfw-00059n-BX for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:34:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFbfw-0004Qr-AC for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:34: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=t5LVegf53/Qw8IouV7AVwvVPqTh0/Jd39niuTEiuFLs=; b=2xXGaqNR7SwkaE3rWn3ffXm/iW 5eC2rCgfIcj2GsebTqmsWOv7AytnGC9I0EocDy5b2GWx5gaa1fXipoXaI4vGHN0afi9aaKKL/sfwE n8Y5na0s5fM0WBhmbraFVjqxh4Q13syUvcEaHmq1G92s7zFzydSPSGtZmrLj6m9XSS54=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: Change parameter names of nestedhvm_vcpu_iomap_get() definition Message-Id: Date: Sat, 01 Jul 2023 14:34:12 +0000 commit 02e294de60cb5ac731637000dffd633b9ffd7e31 Author: Federico Serafini AuthorDate: Thu Jun 29 17:55:30 2023 +0200 Commit: Andrew Cooper CommitDate: Fri Jun 30 14:18:28 2023 +0100 x86/hvm: Change parameter names of nestedhvm_vcpu_iomap_get() definition Change parameter names of nestedhvm_vcpu_iomap_get() definition to those used in the function declaration in order to: 1) improve readability; 2) fix violations of MISRA C:2012 Rule 8.3. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini Acked-by: Andrew Cooper --- xen/arch/x86/hvm/nestedhvm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/nestedhvm.c b/xen/arch/x86/hvm/nestedhvm.c index ec68551127..64d7eec9a1 100644 --- a/xen/arch/x86/hvm/nestedhvm.c +++ b/xen/arch/x86/hvm/nestedhvm.c @@ -155,19 +155,19 @@ static int __init cf_check nestedhvm_setup(void) __initcall(nestedhvm_setup); unsigned long * -nestedhvm_vcpu_iomap_get(bool_t port_80, bool_t port_ed) +nestedhvm_vcpu_iomap_get(bool_t ioport_80, bool_t ioport_ed) { int i; if (!hvm_port80_allowed) - port_80 = 1; + ioport_80 = 1; - if (port_80 == 0) { - if (port_ed == 0) + if (ioport_80 == 0) { + if (ioport_ed == 0) return hvm_io_bitmap; i = 0; } else { - if (port_ed == 0) + if (ioport_ed == 0) i = 1; else i = 2; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jul 01 14:34:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Jul 2023 14:34:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557883.871615 (Exim 4.92) (envelope-from ) id 1qFbg7-0001QQ-Ou; Sat, 01 Jul 2023 14:34:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557883.871615; Sat, 01 Jul 2023 14:34:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbg7-0001QI-MB; Sat, 01 Jul 2023 14:34:23 +0000 Received: by outflank-mailman (input) for mailman id 557883; Sat, 01 Jul 2023 14:34:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbg6-0001Q8-Gm for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:34:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFbg6-0005A0-Fu for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:34:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFbg6-0004Rg-Dd for xen-changelog@lists.xenproject.org; Sat, 01 Jul 2023 14:34: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=yKnQ5yCJlzPLQhYi1WZthMuAw86a08m1fATImUxxxUg=; b=P42ilHs6MQ1rdz1dcV7SDXcGyL 9QzhvZqklTk7aZzu3Db8JGEgMivfeXFhIuhvSYdStAusm6U4BFCFOwyU3GjPPVmbV/cgATdAFj0G4 ZK2O/1Sd/7gEbn7JKp6Dlwp/t8Y7rg6G2tFi1AYDu/Il4QzfmZRPt6itLi/ZIcqYvVDE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vlapic: Change parameter names in function definitions Message-Id: Date: Sat, 01 Jul 2023 14:34:22 +0000 commit f51e5d8eae8ece77a949571f39ee49904f3129aa Author: Federico Serafini AuthorDate: Thu Jun 29 17:55:31 2023 +0200 Commit: Andrew Cooper CommitDate: Fri Jun 30 14:18:28 2023 +0100 x86/vlapic: Change parameter names in function definitions Change parameter names in guest_wrmsr_x2apic() and guest_wrmsr_apic_base() definitions in order to: 1) keep consistency with parameter names used in guest_* function declarations; 2) fix violations of MISRA C:2012 Rule 8.3. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/vlapic.c | 60 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 785d5d88d9..c7ce82d064 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -959,7 +959,7 @@ int vlapic_apicv_write(struct vcpu *v, unsigned int offset) return X86EMUL_OKAY; } -int guest_wrmsr_x2apic(struct vcpu *v, uint32_t msr, uint64_t msr_content) +int guest_wrmsr_x2apic(struct vcpu *v, uint32_t msr, uint64_t val) { struct vlapic *vlapic = vcpu_vlapic(v); uint32_t offset = (msr - MSR_X2APIC_FIRST) << 4; @@ -973,38 +973,38 @@ int guest_wrmsr_x2apic(struct vcpu *v, uint32_t msr, uint64_t msr_content) switch ( offset ) { case APIC_TASKPRI: - if ( msr_content & ~APIC_TPRI_MASK ) + if ( val & ~APIC_TPRI_MASK ) return X86EMUL_EXCEPTION; break; case APIC_SPIV: - if ( msr_content & ~(APIC_VECTOR_MASK | APIC_SPIV_APIC_ENABLED | - APIC_SPIV_FOCUS_DISABLED | - (VLAPIC_VERSION & APIC_LVR_DIRECTED_EOI - ? APIC_SPIV_DIRECTED_EOI : 0)) ) + if ( val & ~(APIC_VECTOR_MASK | APIC_SPIV_APIC_ENABLED | + APIC_SPIV_FOCUS_DISABLED | + (VLAPIC_VERSION & APIC_LVR_DIRECTED_EOI + ? APIC_SPIV_DIRECTED_EOI : 0)) ) return X86EMUL_EXCEPTION; break; case APIC_LVTT: - if ( msr_content & ~(LVT_MASK | APIC_TIMER_MODE_MASK) ) + if ( val & ~(LVT_MASK | APIC_TIMER_MODE_MASK) ) return X86EMUL_EXCEPTION; break; case APIC_LVTTHMR: case APIC_LVTPC: case APIC_CMCI: - if ( msr_content & ~(LVT_MASK | APIC_MODE_MASK) ) + if ( val & ~(LVT_MASK | APIC_MODE_MASK) ) return X86EMUL_EXCEPTION; break; case APIC_LVT0: case APIC_LVT1: - if ( msr_content & ~LINT_MASK ) + if ( val & ~LINT_MASK ) return X86EMUL_EXCEPTION; break; case APIC_LVTERR: - if ( msr_content & ~LVT_MASK ) + if ( val & ~LVT_MASK ) return X86EMUL_EXCEPTION; break; @@ -1012,35 +1012,35 @@ int guest_wrmsr_x2apic(struct vcpu *v, uint32_t msr, uint64_t msr_content) break; case APIC_TDCR: - if ( msr_content & ~APIC_TDR_DIV_MASK ) + if ( val & ~APIC_TDR_DIV_MASK ) return X86EMUL_EXCEPTION; break; case APIC_ICR: - if ( (uint32_t)msr_content & ~(APIC_VECTOR_MASK | APIC_MODE_MASK | - APIC_DEST_MASK | APIC_INT_ASSERT | - APIC_INT_LEVELTRIG | APIC_SHORT_MASK) ) + if ( (uint32_t)val & ~(APIC_VECTOR_MASK | APIC_MODE_MASK | + APIC_DEST_MASK | APIC_INT_ASSERT | + APIC_INT_LEVELTRIG | APIC_SHORT_MASK) ) return X86EMUL_EXCEPTION; - vlapic_set_reg(vlapic, APIC_ICR2, msr_content >> 32); + vlapic_set_reg(vlapic, APIC_ICR2, val >> 32); break; case APIC_SELF_IPI: - if ( msr_content & ~APIC_VECTOR_MASK ) + if ( val & ~APIC_VECTOR_MASK ) return X86EMUL_EXCEPTION; offset = APIC_ICR; - msr_content = APIC_DEST_SELF | (msr_content & APIC_VECTOR_MASK); + val = APIC_DEST_SELF | (val & APIC_VECTOR_MASK); break; case APIC_EOI: case APIC_ESR: - if ( msr_content ) + if ( val ) { default: return X86EMUL_EXCEPTION; } } - vlapic_reg_write(v, array_index_nospec(offset, PAGE_SIZE), msr_content); + vlapic_reg_write(v, array_index_nospec(offset, PAGE_SIZE), val); return X86EMUL_OKAY; } @@ -1070,7 +1070,7 @@ static void set_x2apic_id(struct vlapic *vlapic) vlapic_set_reg(vlapic, APIC_LDR, ldr); } -int guest_wrmsr_apic_base(struct vcpu *v, uint64_t value) +int guest_wrmsr_apic_base(struct vcpu *v, uint64_t val) { const struct cpu_policy *cp = v->domain->arch.cpu_policy; struct vlapic *vlapic = vcpu_vlapic(v); @@ -1079,8 +1079,8 @@ int guest_wrmsr_apic_base(struct vcpu *v, uint64_t value) return X86EMUL_EXCEPTION; /* Attempting to set reserved bits? */ - if ( value & ~(APIC_BASE_ADDR_MASK | APIC_BASE_ENABLE | APIC_BASE_BSP | - (cp->basic.x2apic ? APIC_BASE_EXTD : 0)) ) + if ( val & ~(APIC_BASE_ADDR_MASK | APIC_BASE_ENABLE | APIC_BASE_BSP | + (cp->basic.x2apic ? APIC_BASE_EXTD : 0)) ) return X86EMUL_EXCEPTION; /* @@ -1118,21 +1118,21 @@ int guest_wrmsr_apic_base(struct vcpu *v, uint64_t value) * fault will be far more obvious to debug than a malfunctioning MMIO * window. */ - if ( ((value & (APIC_BASE_EXTD | APIC_BASE_ENABLE)) == APIC_BASE_ENABLE) && - ((value & APIC_BASE_ADDR_MASK) != APIC_DEFAULT_PHYS_BASE) ) + if ( ((val & (APIC_BASE_EXTD | APIC_BASE_ENABLE)) == APIC_BASE_ENABLE) && + ((val & APIC_BASE_ADDR_MASK) != APIC_DEFAULT_PHYS_BASE) ) { printk(XENLOG_G_INFO "%pv tried to move the APIC MMIO window: val 0x%08"PRIx64"\n", - v, value); + v, val); return X86EMUL_EXCEPTION; } - if ( (vlapic->hw.apic_base_msr ^ value) & APIC_BASE_ENABLE ) + if ( (vlapic->hw.apic_base_msr ^ val) & APIC_BASE_ENABLE ) { - if ( unlikely(value & APIC_BASE_EXTD) ) + if ( unlikely(val & APIC_BASE_EXTD) ) return X86EMUL_EXCEPTION; - if ( value & APIC_BASE_ENABLE ) + if ( val & APIC_BASE_ENABLE ) { vlapic_reset(vlapic); vlapic->hw.disabled &= ~VLAPIC_HW_DISABLED; @@ -1144,11 +1144,11 @@ int guest_wrmsr_apic_base(struct vcpu *v, uint64_t value) pt_may_unmask_irq(vlapic_domain(vlapic), NULL); } } - else if ( ((vlapic->hw.apic_base_msr ^ value) & APIC_BASE_EXTD) && + else if ( ((vlapic->hw.apic_base_msr ^ val) & APIC_BASE_EXTD) && unlikely(!vlapic_xapic_mode(vlapic)) ) return X86EMUL_EXCEPTION; - vlapic->hw.apic_base_msr = value; + vlapic->hw.apic_base_msr = val; memset(&vlapic->loaded, 0, sizeof(vlapic->loaded)); if ( vlapic_x2apic_mode(vlapic) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jul 04 22:33:07 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 04 Jul 2023 22:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.558745.873110 (Exim 4.92) (envelope-from ) id 1qGoZz-0002TZ-4q; Tue, 04 Jul 2023 22:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 558745.873110; Tue, 04 Jul 2023 22:33: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 1qGoZz-0002TS-2G; Tue, 04 Jul 2023 22:33:03 +0000 Received: by outflank-mailman (input) for mailman id 558745; Tue, 04 Jul 2023 22:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qGoZx-0002TM-PU for xen-changelog@lists.xenproject.org; Tue, 04 Jul 2023 22:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qGoZx-0004vI-Hh for xen-changelog@lists.xenproject.org; Tue, 04 Jul 2023 22:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qGoZx-0000uW-GY for xen-changelog@lists.xenproject.org; Tue, 04 Jul 2023 22:33: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=hUeS8y7xrXflM+gg2ai2PU451mmmzEhqtQHffElRsOA=; b=OPjjDUXPjZAjiyCs2uOB1gYUWg eTK/V/bAfa4xAnc8erKxTBwHVHZ4rP6OGploVrX4eVfJja2uZEv7LHi4iMPb7Js7TzY4PCNBygTog ZERRuVGy3Uw7H4cSrSvFj8joJ0w8zjPgY74OtvQ1quokNmglR1t6QP++mVYb1IDl3N0I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Correct comments after renaming xen_{dom,sys}ctl_cpu_policy fields Message-Id: Date: Tue, 04 Jul 2023 22:33:01 +0000 commit 6e06d229d538ea51b92dc189546c522f5e903511 Author: Andrew Cooper AuthorDate: Thu Jun 29 11:23:27 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Jul 4 10:57:57 2023 +0100 xen: Correct comments after renaming xen_{dom,sys}ctl_cpu_policy fields Fixes: 21e3ef57e040 ("x86: Rename {domctl,sysctl}.cpu_policy.{cpuid,msr}_policy fields") Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- xen/include/public/domctl.h | 6 ++---- xen/include/public/sysctl.h | 10 ++++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index e2e22cb534..a33f9ec32b 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -679,10 +679,8 @@ struct xen_domctl_set_target { * Query or set the CPUID and MSR policies for a specific domain. */ struct xen_domctl_cpu_policy { - uint32_t nr_leaves; /* IN/OUT: Number of leaves in/written to - * 'cpuid_policy'. */ - uint32_t nr_msrs; /* IN/OUT: Number of MSRs in/written to - * 'msr_policy' */ + uint32_t nr_leaves; /* IN/OUT: Number of leaves in/written to 'leaves' */ + uint32_t nr_msrs; /* IN/OUT: Number of MSRs in/written to 'msrs' */ XEN_GUEST_HANDLE_64(xen_cpuid_leaf_t) leaves; /* IN/OUT */ XEN_GUEST_HANDLE_64(xen_msr_entry_t) msrs; /* IN/OUT */ diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 9d06e92d0f..33e86ace51 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -1047,12 +1047,10 @@ struct xen_sysctl_cpu_policy { #define XEN_SYSCTL_cpu_policy_pv_default 4 #define XEN_SYSCTL_cpu_policy_hvm_default 5 uint32_t index; /* IN: Which policy to query? */ - uint32_t nr_leaves; /* IN/OUT: Number of leaves in/written to - * 'cpuid_policy', or the maximum number of leaves - * if the guest handle is NULL. */ - uint32_t nr_msrs; /* IN/OUT: Number of MSRs in/written to - * 'msr_policy', or the maximum number of MSRs if - * the guest handle is NULL. */ + uint32_t nr_leaves; /* IN/OUT: Number of leaves in/written to 'leaves', + * or the max number if 'leaves' is NULL. */ + uint32_t nr_msrs; /* IN/OUT: Number of MSRs in/written to 'msrs', or + * the max number of if 'msrs' is NULL. */ uint32_t _rsvd; /* Must be zero. */ XEN_GUEST_HANDLE_64(xen_cpuid_leaf_t) leaves; /* OUT */ XEN_GUEST_HANDLE_64(xen_msr_entry_t) msrs; /* OUT */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 05 09:55:10 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Jul 2023 09:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.558998.873615 (Exim 4.92) (envelope-from ) id 1qGzDz-0005Kt-Mx; Wed, 05 Jul 2023 09:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 558998.873615; Wed, 05 Jul 2023 09:55: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 1qGzDz-0005Kl-KI; Wed, 05 Jul 2023 09:55:03 +0000 Received: by outflank-mailman (input) for mailman id 558998; Wed, 05 Jul 2023 09:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qGzDy-0005KZ-B3 for xen-changelog@lists.xenproject.org; Wed, 05 Jul 2023 09:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qGzDy-0003mw-6Y for xen-changelog@lists.xenproject.org; Wed, 05 Jul 2023 09:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qGzDy-0006rv-5T for xen-changelog@lists.xenproject.org; Wed, 05 Jul 2023 09:55: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=MCHFZog2lKHSp4VfZgrIcH9ojqA2p3f9tVPMSVqNnBc=; b=q0PqhzS5dQetqrh1k7cGQiZ6aj Xd39i73YHlbXLvVhXAZXAyOg0LLsQzz7NZWdjEUY9wk+j35BR+1qNue0ZrXsRguHPcL6AR4+P7ofY VU/nk9J2YL2swGsoTsNn2hQmD5/+dimoI4ob5X44elWetDBzXpwMnqrcsg99slwhR+9Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: grant-table: Correct the prototype of the arch helpers Message-Id: Date: Wed, 05 Jul 2023 09:55:02 +0000 commit c53384ea2fbe37eaa966e25aa86017f42e3fdc7d Author: Julien Grall AuthorDate: Tue Jul 4 19:21:42 2023 +0100 Commit: Julien Grall CommitDate: Tue Jul 4 19:23:02 2023 +0100 xen/arm: grant-table: Correct the prototype of the arch helpers Both the stub and the x86 prototypes for replace_grant_host_mapping() and create_grant_host_mapping() will define the first parameter (and third for the former) as uint64_t. Yet Arm will define it as 'unsigned long'. While there are no differences for 64-bit, for 32-bit it means that the address should be truncated as 32-bit guest could support up to 40-bit addresses. So replace 'unsigned long' with 'uint64_t' for the first parameter (and third parameter for replace_grant_host_mapping()). Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Reviewed-by: Henry Wang Tested-by: Henry Wang Reviewed-by: Bertrand Marquis --- xen/arch/arm/include/asm/grant_table.h | 6 +++--- xen/arch/arm/mm.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/include/asm/grant_table.h b/xen/arch/arm/include/asm/grant_table.h index f2d115b97d..d3c518a926 100644 --- a/xen/arch/arm/include/asm/grant_table.h +++ b/xen/arch/arm/include/asm/grant_table.h @@ -36,10 +36,10 @@ static inline bool gnttab_release_host_mappings(const struct domain *d) return true; } -int create_grant_host_mapping(unsigned long gpaddr, mfn_t frame, +int create_grant_host_mapping(uint64_t gpaddr, mfn_t frame, unsigned int flags, unsigned int cache_flags); -int replace_grant_host_mapping(unsigned long gpaddr, mfn_t frame, - unsigned long new_gpaddr, unsigned int flags); +int replace_grant_host_mapping(uint64_t gpaddr, mfn_t frame, + uint64_t new_gpaddr, unsigned int flags); /* * The region used by Xen on the memory will never be mapped in DOM0 diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 9b14ae3a5d..cb21a01d7d 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1579,7 +1579,7 @@ void put_page_type(struct page_info *page) return; } -int create_grant_host_mapping(unsigned long gpaddr, mfn_t frame, +int create_grant_host_mapping(uint64_t gpaddr, mfn_t frame, unsigned int flags, unsigned int cache_flags) { int rc; @@ -1600,8 +1600,8 @@ int create_grant_host_mapping(unsigned long gpaddr, mfn_t frame, return GNTST_okay; } -int replace_grant_host_mapping(unsigned long gpaddr, mfn_t frame, - unsigned long new_gpaddr, unsigned int flags) +int replace_grant_host_mapping(uint64_t gpaddr, mfn_t frame, + uint64_t new_gpaddr, unsigned int flags) { gfn_t gfn = gaddr_to_gfn(gpaddr); struct domain *d = current->domain; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 05 09:55:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Jul 2023 09:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.558999.873619 (Exim 4.92) (envelope-from ) id 1qGzE9-0005Oe-OG; Wed, 05 Jul 2023 09:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 558999.873619; Wed, 05 Jul 2023 09:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qGzE9-0005OV-Li; Wed, 05 Jul 2023 09:55:13 +0000 Received: by outflank-mailman (input) for mailman id 558999; Wed, 05 Jul 2023 09:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qGzE8-0005OH-CQ for xen-changelog@lists.xenproject.org; Wed, 05 Jul 2023 09:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qGzE8-0003nB-Bc for xen-changelog@lists.xenproject.org; Wed, 05 Jul 2023 09:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qGzE8-0006sg-8l for xen-changelog@lists.xenproject.org; Wed, 05 Jul 2023 09:55: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=Q9BE2UhFuD7S+8TKb9itg2Qtu56iLz/rbDZ5Oh0CcwQ=; b=jXbPjx7wPOPxnBhJvJNxFM8OG+ 18JWFyYVTIfbjiWcaKpZjpO7owGGseCWbEwtxEja4KZOY+SPZXH49zT+KcXGwfJj+384dX+LF1gzE dkcY6c/xP2J2Jf9Qhp3arP7bDs6p8lbki/xbI8naxHYhcqiQxgZyN9z5iQxqXi29dFhk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: head: Don't map too much in boot_third Message-Id: Date: Wed, 05 Jul 2023 09:55:12 +0000 commit 804145a1614a57e2822e404373452c5032de87e2 Author: Julien Grall AuthorDate: Tue Jul 4 19:26:13 2023 +0100 Commit: Julien Grall CommitDate: Tue Jul 4 19:31:42 2023 +0100 xen/arm64: head: Don't map too much in boot_third At the moment, we are mapping the size of the reserved area for Xen (i.e. 2MB) even if the binary is smaller. We don't exactly know what's after Xen, so it is not a good idea to map more than necessary for a couple of reasons: * We would need to use break-before-make if the extra PTE needs to be updated to point to another region * The extra area mapped may be mapped again by Xen with different memory attribute. This would result to attribute mismatch. Therefore, rework the logic in create_page_tables() to map only what's necessary. To simplify the logic, we also want to make sure _end is page-aligned. So align the symbol in the linker and add an assert to catch any change. Lastly, take the opportunity to confirm that _start is equal to XEN_VIRT_START as the assembly is using both interchangeably. Signed-off-by: Julien Grall Reviewed-by: Henry Wang Reviewed-by: Michal Orzel Reviewed-by: Bertrand Marquis --- xen/arch/arm/arm64/head.S | 15 ++++++++++++++- xen/arch/arm/xen.lds.S | 9 +++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index c0e03755bb..5e9562a222 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -572,6 +572,19 @@ create_page_tables: create_table_entry boot_first, boot_second, x0, 1, x1, x2, x3 create_table_entry boot_second, boot_third, x0, 2, x1, x2, x3 + /* + * Find the size of Xen in pages and multiply by the size of a + * PTE. This will then be compared in the mapping loop below. + * + * Note the multiplication is just to avoid using an extra + * register/instruction per iteration. + */ + ldr x0, =_start /* x0 := vaddr(_start) */ + ldr x1, =_end /* x1 := vaddr(_end) */ + sub x0, x1, x0 /* x0 := effective size of Xen */ + lsr x0, x0, #PAGE_SHIFT /* x0 := Number of pages for Xen */ + lsl x0, x0, #3 /* x0 := Number of pages * PTE size */ + /* Map Xen */ adr_l x4, boot_third @@ -585,7 +598,7 @@ create_page_tables: 1: str x2, [x4, x1] /* Map vaddr(start) */ add x2, x2, #PAGE_SIZE /* Next page */ add x1, x1, #8 /* Next slot */ - cmp x1, #(XEN_PT_LPAE_ENTRIES<<3) /* 512 entries per page */ + cmp x1, x0 /* Loop until we map all of Xen */ b.lt 1b /* diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index d36b67708a..a3c90ca823 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -212,6 +212,7 @@ SECTIONS . = ALIGN(POINTER_ALIGN); __bss_end = .; } :text + . = ALIGN(PAGE_SIZE); _end = . ; /* Section for the device tree blob (if any). */ @@ -226,6 +227,12 @@ SECTIONS ELF_DETAILS_SECTIONS } +/* + * The assembly code use _start and XEN_VIRT_START interchangeably to + * match the context. + */ +ASSERT(_start == XEN_VIRT_START, "_start != XEN_VIRT_START") + /* * We require that Xen is loaded at a page boundary, so this ensures that any * code running on the identity map cannot cross a section boundary. @@ -241,4 +248,6 @@ ASSERT(IS_ALIGNED(__init_begin, 4), "__init_begin is misaligned") ASSERT(IS_ALIGNED(__init_end, 4), "__init_end is misaligned") ASSERT(IS_ALIGNED(__bss_start, POINTER_ALIGN), "__bss_start is misaligned") ASSERT(IS_ALIGNED(__bss_end, POINTER_ALIGN), "__bss_end is misaligned") +/* To simplify the logic in head.S, we want to _end to be page aligned */ +ASSERT(IS_ALIGNED(_end, PAGE_SIZE), "_end is not page aligned") ASSERT((_end - _start) <= XEN_VIRT_SIZE, "Xen is too big") -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 05 09:55:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Jul 2023 09:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559000.873624 (Exim 4.92) (envelope-from ) id 1qGzEJ-0005Rf-QM; Wed, 05 Jul 2023 09:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559000.873624; Wed, 05 Jul 2023 09:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qGzEJ-0005RX-NF; Wed, 05 Jul 2023 09:55:23 +0000 Received: by outflank-mailman (input) for mailman id 559000; Wed, 05 Jul 2023 09:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qGzEI-0005RP-Fb for xen-changelog@lists.xenproject.org; Wed, 05 Jul 2023 09:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qGzEI-0003nM-Ek for xen-changelog@lists.xenproject.org; Wed, 05 Jul 2023 09:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qGzEI-0006uX-Dj for xen-changelog@lists.xenproject.org; Wed, 05 Jul 2023 09:55: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=EOuMl64bZpT6PBrIWk4sHk5ozUkuWVsCrAMQWv/lLTM=; b=OpAEQLcKa3O8FS8siafsvuVo0e nFxJU9ZHEs65A4Ys9F2C0b846X2Ilq9ESg/JBnriNp9h4d7ijfhP/MiV9y/IYPyJ1RcpZ/DqQ6D5h Z6QYkOYGup3IN6NzKoPYxTAoQyjGd0YN+/i/EIhF3X+Lp62GoOP06MW5maVvNqUYeI1M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm32: head: Don't map too much in boot_third Message-Id: Date: Wed, 05 Jul 2023 09:55:22 +0000 commit 78d2de69e5e5a5154480e7d4696cf2dedb0e7791 Author: Julien Grall AuthorDate: Tue Jul 4 19:27:40 2023 +0100 Commit: Julien Grall CommitDate: Tue Jul 4 19:31:42 2023 +0100 xen/arm32: head: Don't map too much in boot_third At the moment, we are mapping the size of the reserved area for Xen (i.e. 2MB) even if the binary is smaller. We don't exactly know what's after Xen, so it is not a good idea to map more than necessary for a couple of reasons: * We would need to use break-before-make if the extra PTE needs to be updated to point to another region * The extra area mapped may be mapped again by Xen with different memory attribute. This would result to attribute mismatch. Therefore, rework the logic in create_page_tables() to map only what's necessary. Signed-off-by: Julien Grall Reviewed-by: Michal Orzel Reviewed-by: Henry Wang Reviewed-by: Bertrand Marquis --- xen/arch/arm/arm32/head.S | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 72f667b856..2d8b570d76 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -459,6 +459,19 @@ create_page_tables: create_table_entry boot_pgtable, boot_second, r0, 1 create_table_entry boot_second, boot_third, r0, 2 + /* + * Find the size of Xen in pages and multiply by the size of a + * PTE. This will then be compared in the mapping loop below. + * + * Note the multiplication is just to avoid using an extra + * register/instruction per iteration. + */ + mov_w r0, _start /* r0 := vaddr(_start) */ + mov_w r1, _end /* r1 := vaddr(_end) */ + sub r0, r1, r0 /* r0 := effective size of Xen */ + lsr r0, r0, #PAGE_SHIFT /* r0 := Number of pages for Xen */ + lsl r0, r0, #3 /* r0 := Number of pages * PTE size */ + /* Setup boot_third: */ adr_l r4, boot_third @@ -473,7 +486,7 @@ create_page_tables: 1: strd r2, r3, [r4, r1] /* Map vaddr(start) */ add r2, r2, #PAGE_SIZE /* Next page */ add r1, r1, #8 /* Next slot */ - cmp r1, #(XEN_PT_LPAE_ENTRIES<<3) /* 512*8-byte entries per page */ + cmp r1, r0 /* Loop until we map all of Xen */ blo 1b /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 05 09:55:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Jul 2023 09:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559001.873627 (Exim 4.92) (envelope-from ) id 1qGzET-0005Uy-RY; Wed, 05 Jul 2023 09:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559001.873627; Wed, 05 Jul 2023 09:55:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qGzET-0005Ur-Oo; Wed, 05 Jul 2023 09:55:33 +0000 Received: by outflank-mailman (input) for mailman id 559001; Wed, 05 Jul 2023 09:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qGzES-0005Uf-J1 for xen-changelog@lists.xenproject.org; Wed, 05 Jul 2023 09:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qGzES-0003pJ-I7 for xen-changelog@lists.xenproject.org; Wed, 05 Jul 2023 09:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qGzES-0006vk-H6 for xen-changelog@lists.xenproject.org; Wed, 05 Jul 2023 09:55: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=NmIY0IjyPIHZzLhojLA8U8+Jw1WQAKSlfgWUOyaNbCs=; b=QMgRHKQxITAXFSTMsWlRVaigUu eChMR+CQoepf9KrOaagKU3/hnKzGRTYJj5n5c94vOtZrn5fiLSNHDccuYlceXxchEwKUc6olSWXVX TiuYiV02qMLH2GrurTHOOx7jWap9Y1Xck0AE9abRc8DyKTlcUV2cgZx3SVgLx4cNDNsc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Rework the code mapping Xen to avoid relying on the size of Xen Message-Id: Date: Wed, 05 Jul 2023 09:55:32 +0000 commit 7356733f725693f0d2d0fa380beab2314c702799 Author: Julien Grall AuthorDate: Tue Jul 4 19:29:11 2023 +0100 Commit: Julien Grall CommitDate: Tue Jul 4 19:31:42 2023 +0100 xen/arm: Rework the code mapping Xen to avoid relying on the size of Xen At the moment, the maximum size of Xen binary we can support is 2MB. This is what we reserved in the virtual address but also what all the code in Xen relies on as we only allocate one L3 page-table. When feature like UBSAN (will be enabled in a follow-up patch) and GCOV are enabled, the binary will be way over 2MB. The code is now reworked so it doesn't rely on a specific size but will instead look at the reversed size and compute the number of page-table to allocate/map. While at it, replace any reference to 4KB mappings with a more generic word because the page-size may change in the future. Also fix the typo s/tlb/tbl/ in code move in arm32/head.S Signed-off-by: Julien Grall Reviewed-by: Michal Orzel Reviewed-by: Bertrand Marquis --- xen/arch/arm/arm32/head.S | 64 ++++++++++++++++++++++++++++----------- xen/arch/arm/arm64/head.S | 54 +++++++++++++++++++++++++-------- xen/arch/arm/include/asm/config.h | 1 + xen/arch/arm/include/asm/lpae.h | 10 +++--- xen/arch/arm/mm.c | 24 +++++++++------ 5 files changed, 110 insertions(+), 43 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 2d8b570d76..451579051c 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -141,8 +141,7 @@ /* * This must be the very first address in the loaded image. * It should be linked at XEN_VIRT_START, and loaded at any - * 4K-aligned address. All of text+data+bss must fit in 2MB, - * or the initial pagetable code below will need adjustment. + * 4K-aligned address. */ GLOBAL(start) /* @@ -373,7 +372,35 @@ ENDPROC(cpu_init) .endm /* - * Macro to create a page table entry in \ptbl to \tbl + * Macro to create a page table entry in \ptbl to \tbl (physical + * address) + * + * ptbl: table symbol where the entry will be created + * tbl: physical address of the table to point to + * virt: virtual address + * lvl: page-table level + * + * Preserves \virt + * Clobbers \tbl, r1 - r3 + * + * Note that \tbl and \virt should be in a register other than r1 - r3 + */ +.macro create_table_entry_from_paddr, ptbl, tbl, virt, lvl + get_table_slot r1, \virt, \lvl /* r1 := slot in \tbl */ + lsl r1, r1, #3 /* r1 := slot offset in \tbl */ + + movw r2, #PT_PT /* r2:r3 := right for linear PT */ + orr r2, r2, \tbl /* + \tbl paddr */ + mov r3, #0 + + adr_l \tbl, \ptbl /* \tbl := (v,p)addr of \ptbl */ + + strd r2, r3, [\tbl, r1] +.endm + + +/* + * Macro to create a page table entry in \ptbl to \tbl (symbol) * * ptbl: table symbol where the entry will be created * tbl: table symbol to point to @@ -388,19 +415,9 @@ ENDPROC(cpu_init) * Note that \virt should be in a register other than r1 - r4 */ .macro create_table_entry, ptbl, tbl, virt, lvl - get_table_slot r1, \virt, \lvl /* r1 := slot in \tlb */ - lsl r1, r1, #3 /* r1 := slot offset in \tlb */ - load_paddr r4, \tbl - - movw r2, #PT_PT /* r2:r3 := right for linear PT */ - orr r2, r2, r4 /* + \tlb paddr */ - mov r3, #0 - - adr_l r4, \ptbl - - strd r2, r3, [r4, r1] -.endm + create_table_entry_from_paddr \ptbl, r4, \virt, \lvl + .endm /* * Macro to create a mapping entry in \tbl to \paddr. Only mapping in 3rd @@ -451,13 +468,26 @@ ENDPROC(cpu_init) * Output: * r12: Was a temporary mapping created? * - * Clobbers r0 - r4 + * Clobbers r0 - r5 */ create_page_tables: /* Prepare the page-tables for mapping Xen */ mov_w r0, XEN_VIRT_START create_table_entry boot_pgtable, boot_second, r0, 1 - create_table_entry boot_second, boot_third, r0, 2 + + /* + * We need to use a stash register because + * create_table_entry_paddr() will clobber the register storing + * the physical address of the table to point to. + */ + load_paddr r5, boot_third + mov_w r4, XEN_VIRT_START +.rept XEN_NR_ENTRIES(2) + mov r0, r5 /* r0 := paddr(l3 table) */ + create_table_entry_from_paddr boot_second, r0, r4, 2 + add r4, r4, #XEN_PT_LEVEL_SIZE(2) /* r4 := Next vaddr */ + add r5, r5, #PAGE_SIZE /* r5 := Next table */ +.endr /* * Find the size of Xen in pages and multiply by the size of a diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 5e9562a222..ad9e0ba87a 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -146,8 +146,7 @@ * * This must be the very first address in the loaded image. * It should be linked at XEN_VIRT_START, and loaded at any - * 4K-aligned address. All of text+data+bss must fit in 2MB, - * or the initial pagetable code below will need adjustment. + * 4K-aligned address. */ GLOBAL(start) @@ -490,6 +489,31 @@ ENDPROC(cpu_init) ubfx \slot, \virt, #XEN_PT_LEVEL_SHIFT(\lvl), #XEN_PT_LPAE_SHIFT .endm +/* + * Macro to create a page table entry in \ptbl to \tbl + * ptbl: table symbol where the entry will be created + * tbl: physical address of the table to point to + * virt: virtual address + * lvl: page-table level + * tmp1: scratch register + * tmp2: scratch register + * + * Preserves \virt + * Clobbers \tbl, \tmp1, \tmp2 + * + * Note that all parameters using registers should be distinct. + */ +.macro create_table_entry_from_paddr, ptbl, tbl, virt, lvl, tmp1, tmp2 + get_table_slot \tmp1, \virt, \lvl /* \tmp1 := slot in \tbl */ + + mov \tmp2, #PT_PT /* \tmp2 := right for linear PT */ + orr \tmp2, \tmp2, \tbl /* + \tbl */ + + adr_l \tbl, \ptbl /* \tbl := address(\ptbl) */ + + str \tmp2, [\tbl, \tmp1, lsl #3] +.endm + /* * Macro to create a page table entry in \ptbl to \tbl * @@ -509,15 +533,8 @@ ENDPROC(cpu_init) * Note that all parameters using registers should be distinct. */ .macro create_table_entry, ptbl, tbl, virt, lvl, tmp1, tmp2, tmp3 - get_table_slot \tmp1, \virt, \lvl /* \tmp1 := slot in \tlb */ - - load_paddr \tmp2, \tbl - mov \tmp3, #PT_PT /* \tmp3 := right for linear PT */ - orr \tmp3, \tmp3, \tmp2 /* + \tlb paddr */ - - adr_l \tmp2, \ptbl - - str \tmp3, [\tmp2, \tmp1, lsl #3] + load_paddr \tmp1, \tbl + create_table_entry_from_paddr \ptbl, \tmp1, \virt, \lvl, \tmp2, \tmp3 .endm /* @@ -570,7 +587,20 @@ create_page_tables: ldr x0, =XEN_VIRT_START create_table_entry boot_pgtable, boot_first, x0, 0, x1, x2, x3 create_table_entry boot_first, boot_second, x0, 1, x1, x2, x3 - create_table_entry boot_second, boot_third, x0, 2, x1, x2, x3 + + /* + * We need to use a stash register because + * create_table_entry_paddr() will clobber the register storing + * the physical address of the table to point to. + */ + load_paddr x4, boot_third + ldr x1, =XEN_VIRT_START +.rept XEN_NR_ENTRIES(2) + mov x0, x4 /* x0 := paddr(l3 table) */ + create_table_entry_from_paddr boot_second, x0, x1, 2, x2, x3 + add x1, x1, #XEN_PT_LEVEL_SIZE(2) /* x1 := Next vaddr */ + add x4, x4, #PAGE_SIZE /* x4 := Next table */ +.endr /* * Find the size of Xen in pages and multiply by the size of a diff --git a/xen/arch/arm/include/asm/config.h b/xen/arch/arm/include/asm/config.h index c969e6da58..6d246ab23c 100644 --- a/xen/arch/arm/include/asm/config.h +++ b/xen/arch/arm/include/asm/config.h @@ -125,6 +125,7 @@ #endif #define XEN_VIRT_SIZE _AT(vaddr_t, MB(2)) +#define XEN_NR_ENTRIES(lvl) (XEN_VIRT_SIZE / XEN_PT_LEVEL_SIZE(lvl)) #define FIXMAP_VIRT_START (XEN_VIRT_START + XEN_VIRT_SIZE) #define FIXMAP_VIRT_SIZE _AT(vaddr_t, MB(2)) diff --git a/xen/arch/arm/include/asm/lpae.h b/xen/arch/arm/include/asm/lpae.h index 7d2f6fd1bd..4a1679cb33 100644 --- a/xen/arch/arm/include/asm/lpae.h +++ b/xen/arch/arm/include/asm/lpae.h @@ -267,15 +267,17 @@ lpae_t mfn_to_xen_entry(mfn_t mfn, unsigned int attr); /* * Macros to define page-tables: - * - DEFINE_BOOT_PAGE_TABLE is used to define page-table that are used - * in assembly code before BSS is zeroed. + * - DEFINE_BOOT_PAGE_TABLE{,S} are used to define one or multiple + * page-table that are used in assembly code before BSS is zeroed. * - DEFINE_PAGE_TABLE{,S} are used to define one or multiple * page-tables to be used after BSS is zeroed (typically they are only used * in C). */ -#define DEFINE_BOOT_PAGE_TABLE(name) \ +#define DEFINE_BOOT_PAGE_TABLES(name, nr) \ lpae_t __aligned(PAGE_SIZE) __section(".data.page_aligned") \ - name[XEN_PT_LPAE_ENTRIES] + name[XEN_PT_LPAE_ENTRIES * (nr)] + +#define DEFINE_BOOT_PAGE_TABLE(name) DEFINE_BOOT_PAGE_TABLES(name, 1) #define DEFINE_PAGE_TABLES(name, nr) \ lpae_t __aligned(PAGE_SIZE) name[XEN_PT_LPAE_ENTRIES * (nr)] diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index cb21a01d7d..b587a64189 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -53,8 +53,8 @@ mm_printk(const char *fmt, ...) {} * to the CPUs own pagetables. * * These pagetables have a very simple structure. They include: - * - 2MB worth of 4K mappings of xen at XEN_VIRT_START, boot_first and - * boot_second are used to populate the tables down to boot_third + * - XEN_VIRT_SIZE worth of L3 mappings of xen at XEN_VIRT_START, boot_first + * and boot_second are used to populate the tables down to boot_third * which contains the actual mapping. * - a 1:1 mapping of xen at its current physical address. This uses a * section mapping at whichever of boot_{pgtable,first,second} @@ -79,7 +79,7 @@ DEFINE_BOOT_PAGE_TABLE(boot_first_id); DEFINE_BOOT_PAGE_TABLE(boot_second_id); DEFINE_BOOT_PAGE_TABLE(boot_third_id); DEFINE_BOOT_PAGE_TABLE(boot_second); -DEFINE_BOOT_PAGE_TABLE(boot_third); +DEFINE_BOOT_PAGE_TABLES(boot_third, XEN_NR_ENTRIES(2)); /* Main runtime page tables */ @@ -115,7 +115,7 @@ DEFINE_BOOT_PAGE_TABLE(xen_fixmap); * Third level page table used to map Xen itself with the XN bit set * as appropriate. */ -static DEFINE_PAGE_TABLE(xen_xenmap); +static DEFINE_PAGE_TABLES(xen_xenmap, XEN_NR_ENTRIES(2)); /* Non-boot CPUs use this to find the correct pagetables. */ uint64_t init_ttbr; @@ -518,15 +518,15 @@ void __init setup_pagetables(unsigned long boot_phys_offset) p[0].pt.table = 1; p[0].pt.xn = 0; - /* Break up the Xen mapping into 4k pages and protect them separately. */ - for ( i = 0; i < XEN_PT_LPAE_ENTRIES; i++ ) + /* Break up the Xen mapping into pages and protect them separately. */ + for ( i = 0; i < XEN_NR_ENTRIES(3); i++ ) { vaddr_t va = XEN_VIRT_START + (i << PAGE_SHIFT); if ( !is_kernel(va) ) break; pte = pte_of_xenaddr(va); - pte.pt.table = 1; /* 4k mappings always have this bit set */ + pte.pt.table = 1; /* third level mappings always have this bit set */ if ( is_kernel_text(va) || is_kernel_inittext(va) ) { pte.pt.xn = 0; @@ -539,10 +539,14 @@ void __init setup_pagetables(unsigned long boot_phys_offset) /* Initialise xen second level entries ... */ /* ... Xen's text etc */ + for ( i = 0; i < XEN_NR_ENTRIES(2); i++ ) + { + vaddr_t va = XEN_VIRT_START + (i << XEN_PT_LEVEL_SHIFT(2)); - pte = pte_of_xenaddr((vaddr_t)xen_xenmap); - pte.pt.table = 1; - xen_second[second_table_offset(XEN_VIRT_START)] = pte; + pte = pte_of_xenaddr((vaddr_t)(xen_xenmap + i * XEN_PT_LPAE_ENTRIES)); + pte.pt.table = 1; + xen_second[second_table_offset(va)] = pte; + } /* ... Fixmap */ pte = pte_of_xenaddr((vaddr_t)xen_fixmap); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 05 09:55:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Jul 2023 09:55:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559002.873630 (Exim 4.92) (envelope-from ) id 1qGzEd-0005YL-Ud; Wed, 05 Jul 2023 09:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559002.873630; Wed, 05 Jul 2023 09:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qGzEd-0005YD-S1; Wed, 05 Jul 2023 09:55:43 +0000 Received: by outflank-mailman (input) for mailman id 559002; Wed, 05 Jul 2023 09:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qGzEc-0005Y3-Lt for xen-changelog@lists.xenproject.org; Wed, 05 Jul 2023 09:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qGzEc-0003pQ-L8 for xen-changelog@lists.xenproject.org; Wed, 05 Jul 2023 09:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qGzEc-0006wD-KA for xen-changelog@lists.xenproject.org; Wed, 05 Jul 2023 09:55:42 +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=heEBe6mHyNjAzygkHlXmEnJhP0gOdFrxYzpI4T8TssA=; b=YSXPIwdjNV4OTOKq7iCY7UP+LK w5yYi7w7uZKMxcOltkeVKnGeQnKbX5QhyRn+NjTL8ZOFXGP9fVE2SazdpU/TbSc3eFDmFvG0/Emn9 tn/ULCN3xSylQ9xDwBYR7LNMN7CYbBdUun8sBb2ryCz0cAVk2juiOJ7HBa5R1T3sixjE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Allow the user to build Xen with UBSAN Message-Id: Date: Wed, 05 Jul 2023 09:55:42 +0000 commit abb1522832bb2ef340a56681d486dce51d2f9971 Author: Julien Grall AuthorDate: Tue Jul 4 19:31:13 2023 +0100 Commit: Julien Grall CommitDate: Tue Jul 4 19:31:42 2023 +0100 xen/arm: Allow the user to build Xen with UBSAN UBSAN has been enabled a few years ago on x86 but was never enabled on Arm because the final binary is bigger than 2MB ( the maximum we can currently handled). With the recent rework, it is now possible to grow Xen over 2MB. So there is no more roadblock to enable Xen other than increasing the reserved area. On my setup, for arm32, the final binaray was very close to 4MB. Furthermore, one may want to enable UBSAN and GCOV which would put the binary well-over 4MB (both features require for some space). Therefore, increase the size to 8MB which should us some margin. Signed-off-by: Julien Grall Reviewed-by: Henry Wang Reviewed-by: Michal Orzel Reviewed-by: Bertrand Marquis o --- xen/arch/arm/Kconfig | 1 + xen/arch/arm/include/asm/config.h | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 61e581b8c2..06b5ff755c 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -17,6 +17,7 @@ config ARM select HAS_PASSTHROUGH select HAS_PDX select HAS_PMAP + select HAS_UBSAN select IOMMU_FORCE_PT_SHARE config ARCH_DEFCONFIG diff --git a/xen/arch/arm/include/asm/config.h b/xen/arch/arm/include/asm/config.h index 6d246ab23c..cc32802ad0 100644 --- a/xen/arch/arm/include/asm/config.h +++ b/xen/arch/arm/include/asm/config.h @@ -74,10 +74,10 @@ /* * ARM32 layout: * 0 - 2M Unmapped - * 2M - 4M Xen text, data, bss - * 4M - 6M Fixmap: special-purpose 4K mapping slots - * 6M - 10M Early boot mapping of FDT - * 10M - 12M Livepatch vmap (if compiled in) + * 2M - 10M Xen text, data, bss + * 10M - 12M Fixmap: special-purpose 4K mapping slots + * 12M - 16M Early boot mapping of FDT + * 16M - 18M Livepatch vmap (if compiled in) * * 32M - 128M Frametable: 32 bytes per page for 12GB of RAM * 256M - 1G VMAP: ioremap and early_ioremap use this virtual address @@ -94,10 +94,10 @@ * 0x0000020000000000 - 0x0000027fffffffff (512GB, L0 slot [4]) * (Relative offsets) * 0 - 2M Unmapped - * 2M - 4M Xen text, data, bss - * 4M - 6M Fixmap: special-purpose 4K mapping slots - * 6M - 10M Early boot mapping of FDT - * 10M - 12M Livepatch vmap (if compiled in) + * 2M - 10M Xen text, data, bss + * 10M - 12M Fixmap: special-purpose 4K mapping slots + * 12M - 16M Early boot mapping of FDT + * 16M - 18M Livepatch vmap (if compiled in) * * 1G - 2G VMAP: ioremap and early_ioremap * @@ -124,7 +124,11 @@ #define XEN_VIRT_START (SLOT0(4) + _AT(vaddr_t, MB(2))) #endif -#define XEN_VIRT_SIZE _AT(vaddr_t, MB(2)) +/* + * Reserve enough space so both UBSAN and GCOV can be enabled together + * plus some slack for future growth. + */ +#define XEN_VIRT_SIZE _AT(vaddr_t, MB(8)) #define XEN_NR_ENTRIES(lvl) (XEN_VIRT_SIZE / XEN_PT_LEVEL_SIZE(lvl)) #define FIXMAP_VIRT_START (XEN_VIRT_START + XEN_VIRT_SIZE) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:55:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559646.874794 (Exim 4.92) (envelope-from ) id 1qHItL-0008IR-Kj; Thu, 06 Jul 2023 06:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559646.874794; Thu, 06 Jul 2023 06:55: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 1qHItL-0008IJ-I7; Thu, 06 Jul 2023 06:55:03 +0000 Received: by outflank-mailman (input) for mailman id 559646; Thu, 06 Jul 2023 06:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHItJ-0008ID-SG for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHItJ-0000aO-RK for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHItJ-0001uu-PT for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55: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=jjjXBGbRu/IrsWQuU8o+2eIC40mxK9j5HsRj7OmM3Rc=; b=awaR3qYQwcB19uDsak8vytZqRJ ml51lVAF9wXnVJByQgnQeod7/jxEcPbHJIphopAK5yfL9zPaGjCYULg+ercXiGub+jb/q09g1KvDj gvOLpdWFqaOsiqkYBj8u3X4i+GuWafQ+AGa3fPknNYVzxmTO6obHxEEyKTkeJRDCXXL0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm32: head: Add missing isb in setup_fixmap() Message-Id: Date: Thu, 06 Jul 2023 06:55:01 +0000 commit f7c24c2907d4092a1cdc63d0a850e5d887545b61 Author: Julien Grall AuthorDate: Tue Jul 4 19:57:00 2023 +0100 Commit: Julien Grall CommitDate: Tue Jul 4 20:07:47 2023 +0100 xen/arm32: head: Add missing isb in setup_fixmap() Per the Arm Arm (ARM DDI 0406C.d A3.8.3): "The DMB and DSB memory barriers affect reads and writes to the memory system generated by load/store instructions and data or unified cache maintenance operations being executed by the processor. Instruction fetches or accesses caused by a hardware translation table access are not explicit accesses." In setup_fixmap(), we write the fixmap area and may be used soon after, for instance, to write to the UART. IOW, there could be hardware translation table access. So we need to ensure the 'dsb' has completed before continuing. Therefore add an 'isb'. Fixes: e79999e587d7 ("xen/arm32: head: Remove 1:1 mapping as soon as it is not used") Signed-off-by: Julien Grall Reviewed-by: Henry Wang Tested-by: Henry Wang Reviewed-by: Luca Fancellu Reviewed-by: Bertrand Marquis --- xen/arch/arm/arm32/head.S | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 451579051c..4cfda2cf70 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -791,6 +791,11 @@ setup_fixmap: create_table_entry boot_second, xen_fixmap, r0, 2 /* Ensure any page table updates made above have occurred. */ dsb nshst + /* + * The fixmap area will be used soon after. So ensure no hardware + * translation happens before the dsb completes. + */ + isb mov pc, lr ENDPROC(setup_fixmap) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:55:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559647.874799 (Exim 4.92) (envelope-from ) id 1qHItV-0008MA-ML; Thu, 06 Jul 2023 06:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559647.874799; Thu, 06 Jul 2023 06:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHItV-0008M0-Ja; Thu, 06 Jul 2023 06:55:13 +0000 Received: by outflank-mailman (input) for mailman id 559647; Thu, 06 Jul 2023 06:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHItT-0008Ll-VR for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHItT-0000aV-UY for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHItT-0001vL-Tf for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55:11 +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=StdUlsmBBIkSSQV1mc8KIpLLEQC1Jl3h0Sh0rT+d7nk=; b=B4t81mmpqe81yC+YGnqUoHuXV+ t81l6XK6TjkgLok8aa1Dlv07/FIROn+hMkscS0lrudz3/eNzp3jnVMy58CUnvJYdI5TgUrao24S+A rRW++FJdCFq+c3njL7uEQO3vrSZyfWikEYOBKVWaplYQ5btt84qsNnBtrXIV5uyJLs/4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm32: head: Add mising isb in switch_to_runtime_mapping() Message-Id: Date: Thu, 06 Jul 2023 06:55:11 +0000 commit f5a49eb7f8b31c930979f615ee66a994d9537aaa Author: Julien Grall AuthorDate: Tue Jul 4 19:58:14 2023 +0100 Commit: Julien Grall CommitDate: Tue Jul 4 20:07:47 2023 +0100 xen/arm32: head: Add mising isb in switch_to_runtime_mapping() Per the Arm Arm (ARM DDI 0406C.d A3.8.3): "The DMB and DSB memory barriers affect reads and writes to the memory system generated by load/store instructions and data or unified cache maintenance operations being executed by the processor. Instruction fetches or accesses caused by a hardware translation table access are not explicit accesses." The function switch_to_runtime_mapping() is responsible to map the Xen at its runtime address if we were using the temporary area before jumping returning using a runtime address. So we need to ensure the 'dsb' has completed before continuing. Therefore add an 'isb'. Fixes: fbd9b5fb4c26 ("xen/arm32: head: Remove restriction where to load Xen") Signed-off-by: Julien Grall Reviewed-by: Henry Wang Reviewed-by: Luca Fancellu Reviewed-by: Bertrand Marquis --- xen/arch/arm/arm32/head.S | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 4cfda2cf70..26fc420b2e 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -696,6 +696,11 @@ switch_to_runtime_mapping: /* Ensure any page table updates are visible before continuing */ dsb nsh + /* + * The function will return on the runtime mapping. So we want + * to prevent instruction fetch before the dsb completes. + */ + isb ready_to_switch: mov pc, lr -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:55:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559648.874803 (Exim 4.92) (envelope-from ) id 1qHItf-0008P1-NS; Thu, 06 Jul 2023 06:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559648.874803; Thu, 06 Jul 2023 06:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHItf-0008Ou-L1; Thu, 06 Jul 2023 06:55:23 +0000 Received: by outflank-mailman (input) for mailman id 559648; Thu, 06 Jul 2023 06:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIte-0008Oa-27 for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIte-0000ah-1O for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIte-0001vo-0R for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55: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=WJs4iojKst92fl1Q94xkM9D5CvGxUJ6oV3+oNChc4tc=; b=29kN8bZtck/sJ7bpQc8PlWNDck kcy2INqstBfnKdjlqVI/8H7tFSY4avgRx+AtI+6HTMIlmuZA9dtNHjoTQvxKheO693npCcpBQtAbO IZbe/71l4JZSCzgK0Sc4bXMf+D09wFdhneieAjrXpHBcYefkcdcMdYh3m42bQvCu2UT4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: head: Add missing isb in setup_fixmap() Message-Id: Date: Thu, 06 Jul 2023 06:55:22 +0000 commit d29a767d045b10b5971e93a1e8a7ee4a08d8601f Author: Julien Grall AuthorDate: Tue Jul 4 19:59:06 2023 +0100 Commit: Julien Grall CommitDate: Tue Jul 4 20:07:47 2023 +0100 xen/arm64: head: Add missing isb in setup_fixmap() On older version of the Arm Arm (ARM DDI 0487E.a, B2-125) there were the following paragraph: "DMB and DSB instructions affect reads and writes to the memory system generated by Load/Store instructions and data or unified cache maintenance instructions being executed by the PE. Instruction fetches or accesses caused by a hardware translation table access are not explicit accesses." Newer revision (e.g. ARM DDI 0487J.a) doesn't have the second sentence (it might be somewhere else in the Arm Arm). But the interpretation is not much different. In setup_fixmap(), we write the fixmap area and may be used soon after, for instance, to write to the UART. IOW, there could be hardware translation table access. So we need to ensure the 'dsb' has completed before continuing. Therefore add an 'isb'. Fixes: 2b11c3646105 ("xen/arm64: head: Remove 1:1 mapping as soon as it is not used") Signed-off-by: Julien Grall Reviewed-by: Henry Wang Reviewed-by: Luca Fancellu Reviewed-by: Michal Orzel Reviewed-by: Bertrand Marquis --- xen/arch/arm/arm64/head.S | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index ad9e0ba87a..c09d0b3a1a 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -812,6 +812,11 @@ setup_fixmap: create_table_entry boot_second, xen_fixmap, x0, 2, x1, x2, x3 /* Ensure any page table updates made above have occurred. */ dsb nshst + /* + * The fixmap area will be used soon after. So ensure no hardware + * translation happens before the dsb completes. + */ + isb ret ENDPROC(setup_fixmap) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:55:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559649.874806 (Exim 4.92) (envelope-from ) id 1qHItp-0008Rj-Ov; Thu, 06 Jul 2023 06:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559649.874806; Thu, 06 Jul 2023 06:55:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHItp-0008Rc-MT; Thu, 06 Jul 2023 06:55:33 +0000 Received: by outflank-mailman (input) for mailman id 559649; Thu, 06 Jul 2023 06:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIto-0008RQ-78 for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIto-0000cO-4U for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIto-0001xm-3W for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55: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=zbuQ/ba8MO7qsmbcMv7KjCXtSEpQy7+McC0u0g6TQu8=; b=1Nro11D+tVrptSMG64Qy+uMuPe yVPHIzsds0crFNpYxJ5x8TJxi88s0WNT2oHFwbMhSUEOVfjAMRkQ2GFMWpriIsIf8vqPtCfDfB9e1 CKp8gQPL8FMZY45KdQ5fID2WwqIinJazNN/FHWENKDNTL2h1hwwqfs4hcewnoAuOpyZ4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: page: Consolidate write_pte() and clarify the documentation Message-Id: Date: Thu, 06 Jul 2023 06:55:32 +0000 commit 863a42a0c9fcc374e406795903c89eb27e082471 Author: Julien Grall AuthorDate: Tue Jul 4 20:04:40 2023 +0100 Commit: Julien Grall CommitDate: Tue Jul 4 20:07:47 2023 +0100 xen/arm: page: Consolidate write_pte() and clarify the documentation The implementation of write_pte() is pretty much the same on arm32 and arm64. So it would be good to consolidate it as this would help to clarify the requirements when using the helper. Take the opportunity to switch from assembly to call macros. Note there is a difference on arm32 because the option was not specified. But this meant 'sy' (system wide). Futhermore, the requirements for the ISB is incomplete. Per the Arm Arm, (Armv7 DDI406C.d A3.8.3 and Armv8 DDI 0487J.a B2.3.12), DSB will only affect explicit accesses. So an ISB is necessary after DSB to ensure the completion. Having an ISB after each update to the page-tables is probably too much, so let the caller add the instruction when it is convenient. Lastly, the barrier in write_pte() may be too restrictive but I haven't yet find the proper section(s) in the Arm Arm. Signed-off-by: Julien Grall Reviewed-by: Henry Wang Reviewed-by: Bertrand Marquis ---- I am a bit split on whether we should add an ISB in write_pte(). It would make easier for the developper, but would likely force a pipeline flush too often. It might also be possible to drop the ISB (and even DSB) when updating stage-2 PTE (Linux already does it, see 120798d2e7d1). But I am not sure this is worth it in Xen. --- xen/arch/arm/include/asm/arm32/page.h | 16 ---------------- xen/arch/arm/include/asm/arm64/page.h | 11 ----------- xen/arch/arm/include/asm/page.h | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/xen/arch/arm/include/asm/arm32/page.h b/xen/arch/arm/include/asm/arm32/page.h index 715a9e4fef..6d1ff0636c 100644 --- a/xen/arch/arm/include/asm/arm32/page.h +++ b/xen/arch/arm/include/asm/arm32/page.h @@ -3,22 +3,6 @@ #ifndef __ASSEMBLY__ -/* Write a pagetable entry. - * - * If the table entry is changing a text mapping, it is responsibility - * of the caller to issue an ISB after write_pte. - */ -static inline void write_pte(lpae_t *p, lpae_t pte) -{ - asm volatile ( - /* Ensure any writes have completed with the old mappings. */ - "dsb;" - /* Safely write the entry (STRD is atomic on CPUs that support LPAE) */ - "strd %0, %H0, [%1];" - "dsb;" - : : "r" (pte.bits), "r" (p) : "memory"); -} - /* Inline ASM to invalidate dcache on register R (may be an inline asm operand) */ #define __invalidate_dcache_one(R) STORE_CP32(R, DCIMVAC) diff --git a/xen/arch/arm/include/asm/arm64/page.h b/xen/arch/arm/include/asm/arm64/page.h index 0cba266373..4f58c0382a 100644 --- a/xen/arch/arm/include/asm/arm64/page.h +++ b/xen/arch/arm/include/asm/arm64/page.h @@ -5,17 +5,6 @@ #include -/* Write a pagetable entry */ -static inline void write_pte(lpae_t *p, lpae_t pte) -{ - asm volatile ( - /* Ensure any writes have completed with the old mappings. */ - "dsb sy;" - "str %0, [%1];" /* Write the entry */ - "dsb sy;" - : : "r" (pte.bits), "r" (p) : "memory"); -} - /* Inline ASM to invalidate dcache on register R (may be an inline asm operand) */ #define __invalidate_dcache_one(R) "dc ivac, %" #R ";" diff --git a/xen/arch/arm/include/asm/page.h b/xen/arch/arm/include/asm/page.h index e7cd62190c..ea96983ab9 100644 --- a/xen/arch/arm/include/asm/page.h +++ b/xen/arch/arm/include/asm/page.h @@ -126,6 +126,7 @@ #include #include #include +#include #include #if defined(CONFIG_ARM_32) @@ -237,6 +238,22 @@ static inline int clean_and_invalidate_dcache_va_range : : "r" (_p), "m" (*_p)); \ } while (0) +/* + * Write a pagetable entry. + * + * It is the responsibility of the caller to issue an ISB (if a new entry) + * or a TLB flush (if modified or removed) after write_pte(). + */ +static inline void write_pte(lpae_t *p, lpae_t pte) +{ + /* Ensure any writes have completed with the old mappings. */ + dsb(sy); + /* Safely write the entry. This should always be an atomic write. */ + write_atomic(p, pte); + dsb(sy); +} + + /* Flush the dcache for an entire page. */ void flush_page_to_ram(unsigned long mfn, bool sync_icache); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:55:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:55:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559650.874810 (Exim 4.92) (envelope-from ) id 1qHItz-0008V1-QM; Thu, 06 Jul 2023 06:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559650.874810; Thu, 06 Jul 2023 06:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHItz-0008Uu-Nx; Thu, 06 Jul 2023 06:55:43 +0000 Received: by outflank-mailman (input) for mailman id 559650; Thu, 06 Jul 2023 06:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIty-0008Ui-86 for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIty-0000cV-7M for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIty-0001yF-6W for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55:42 +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=szX1sdlNXaJJHZx/nghsmkbMAk5PHp0yNEgkaHziO9s=; b=tCabwg9F67ecJlLfhEE3iV34aX +CEbo5HupmlKpj49kWhK651VgAR2q7K36sLByRoS0M3yJk5sG51Q3V1gdmVlkmHHr0bxToRxMS9Nj /celJNvWWyo0922pfwR+CZiRjNoyhrx+WTvEczwNouRfVXmW0qMbPqDztlALg+iboz60=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: pmap: Add missing ISB in arch_pmap_map() Message-Id: Date: Thu, 06 Jul 2023 06:55:42 +0000 commit feaa9aca87fd84226a023c02bf29a40081f24c4c Author: Julien Grall AuthorDate: Tue Jul 4 20:05:02 2023 +0100 Commit: Julien Grall CommitDate: Tue Jul 4 20:07:47 2023 +0100 xen/arm: pmap: Add missing ISB in arch_pmap_map() Per the Arm Arm, (Armv7 DDI406C.d A3.8.3 and Armv8 DDI 0487J.a B2.3.12): "The DMB and DSB memory barriers affect reads and writes to the memory system generated by load/store instructions and data or unified cache maintenance operations being executed by the processor. Instruction fetches or accesses caused by a hardware translation table access are not explicit accesses." Note that second sentence is not part of the newer Armv8 spec. But the interpretation is not much different. As the entry created by arch_pmap_map() will be used soon after pmap_map() returns, we want to ensure the DSB in write_pte() has completed. So add an ISB. Fixes: 4f17357b52f6 ("xen/arm: add Persistent Map (PMAP) infrastructure") Signed-off-by: Julien Grall Reviewed-by: Henry Wang Reviewed-by: Bertrand Marquis --- xen/arch/arm/include/asm/pmap.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xen/arch/arm/include/asm/pmap.h b/xen/arch/arm/include/asm/pmap.h index e094d13dd2..bca3381796 100644 --- a/xen/arch/arm/include/asm/pmap.h +++ b/xen/arch/arm/include/asm/pmap.h @@ -15,6 +15,11 @@ static inline void arch_pmap_map(unsigned int slot, mfn_t mfn) pte = mfn_to_xen_entry(mfn, PAGE_HYPERVISOR_RW); pte.pt.table = 1; write_pte(entry, pte); + /* + * The new entry will be used very soon after arch_pmap_map() returns. + * So ensure the DSB in write_pte() has completed before continuing. + */ + isb(); } static inline void arch_pmap_unmap(unsigned int slot) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:55:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:55:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559651.874815 (Exim 4.92) (envelope-from ) id 1qHIu9-00005s-SH; Thu, 06 Jul 2023 06:55:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559651.874815; Thu, 06 Jul 2023 06:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIu9-00005k-PR; Thu, 06 Jul 2023 06:55:53 +0000 Received: by outflank-mailman (input) for mailman id 559651; Thu, 06 Jul 2023 06:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIu8-00005Y-BJ for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIu8-0000ct-AS for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIu8-0001yz-9b for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:55:52 +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=2iW1LStt1B/CRt0pFUaGLNT+c6J4tJ26/j6hO8kfw78=; b=KL4+rYDDgkqAmOeCFxXAW2+S4e FKuWW9QHKku60S8tPOXKNr/gbtWOOSRYvBNe51pEhmGaS+Zs3rjaEaShrOIcecpnHYw590NPbPo9h GTXIcz1yZ4MEdVaF0/UtI3ZjChvAMkJZeceRYLtK0DLHCHt8vC9qqYJx/RXCx5K93C3Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: mm: Add missing ISB in xen_pt_update() Message-Id: Date: Thu, 06 Jul 2023 06:55:52 +0000 commit c16460ff073b47c99e18894d482d5710f95113c5 Author: Julien Grall AuthorDate: Tue Jul 4 20:05:46 2023 +0100 Commit: Julien Grall CommitDate: Tue Jul 4 20:07:47 2023 +0100 xen/arm: mm: Add missing ISB in xen_pt_update() Per the Arm Arm, (Armv7 DDI406C.d A3.8.3 and Armv8 DDI 0487J.a B2.3.12): "The DMB and DSB memory barriers affect reads and writes to the memory system generated by load/store instructions and data or unified cache maintenance operations being executed by the processor. Instruction fetches or accesses caused by a hardware translation table access are not explicit accesses." Note that second sentence is not part of the newer Armv8 spec. But the interpretation is not much different. The updated entry will not be used until xen_pt_update() completes. So rather than adding the ISB after write_pte() in create_xen_table() and xen_pt-update_entry(), add it in xen_pt_update(). Also document the reasoning of the deferral after each write_pte() calls. Fixes: 07d11f63d03e ("xen/arm: mm: Avoid flushing the TLBs when mapping are inserted") Signed-off-by: Julien Grall Reviewed-by: Henry Wang Reviewed-by: Bertrand Marquis --- xen/arch/arm/mm.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index b587a64189..c688227abd 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -783,6 +783,11 @@ static int create_xen_table(lpae_t *entry) pte = mfn_to_xen_entry(mfn, MT_NORMAL); pte.pt.table = 1; write_pte(entry, pte); + /* + * No ISB here. It is deferred to xen_pt_update() as the new table + * will not be used for hardware translation table access as part of + * the mapping update. + */ return 0; } @@ -1021,6 +1026,10 @@ static int xen_pt_update_entry(mfn_t root, unsigned long virt, } write_pte(entry, pte); + /* + * No ISB or TLB flush here. They are deferred to xen_pt_update() + * as the entry will not be used as part of the mapping update. + */ rc = 0; @@ -1200,6 +1209,9 @@ static int xen_pt_update(unsigned long virt, /* * The TLBs flush can be safely skipped when a mapping is inserted * as we don't allow mapping replacement (see xen_pt_check_entry()). + * Although we still need an ISB to ensure any DSB in + * write_pte() will complete because the mapping may be used soon + * after. * * For all the other cases, the TLBs will be flushed unconditionally * even if the mapping has failed. This is because we may have @@ -1208,6 +1220,8 @@ static int xen_pt_update(unsigned long virt, */ if ( !((flags & _PAGE_PRESENT) && !mfn_eq(mfn, INVALID_MFN)) ) flush_xen_tlb_range_va(virt, PAGE_SIZE * nr_mfns); + else + isb(); spin_unlock(&xen_pt_lock); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:56:03 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:56:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559652.874819 (Exim 4.92) (envelope-from ) id 1qHIuJ-00008x-Tj; Thu, 06 Jul 2023 06:56:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559652.874819; Thu, 06 Jul 2023 06:56: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 1qHIuJ-00008p-Qv; Thu, 06 Jul 2023 06:56:03 +0000 Received: by outflank-mailman (input) for mailman id 559652; Thu, 06 Jul 2023 06:56:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIuI-00008O-EQ for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIuI-0000dD-Da for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIuI-0001zg-Cr for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56: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=E/yN30AuuSuxlUjL07fo3S+PXH/EhiA4htMP7hJtWv8=; b=np/9ypsbSSd9vNXqgKkgDYep3o WegMq7In40DrzfZtTUup69JOIQNDBNy9IiKyCX8h77kyMKZZktVpvMEkJShLwbJoarMFzbvtlMbXu Kny1ph14iQJkHQs+G/tMEHbVAfaW2crUTO/M16+v/4sfg7BJGK2vRneUVSDMZ/KF7wY0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: Fix ifdef for aarch64 that should include also arm Message-Id: Date: Thu, 06 Jul 2023 06:56:02 +0000 commit 619fe8a261bf9dd2660df38bebccd43316e4167a Author: Luca Fancellu AuthorDate: Thu Jun 8 14:59:12 2023 +0100 Commit: Julien Grall CommitDate: Tue Jul 4 20:10:20 2023 +0100 tools: Fix ifdef for aarch64 that should include also arm Commit 56a7aaa16bfe introduced some SVE related code that is protected by '#if defined(__aarch64__)', the issue is that this doesn't take into consideration when the toolstack is compiled for an arm32 Dom0 running on an arm64 platform, it should be able to create SVE enabled guests but with the current code it's not. So fix the issue by compiling the code when the toolstack is compiled for both arm32 and arm64. Fixes: 56a7aaa16bfe ("tools: add physinfo arch_capabilities handling for Arm") Signed-off-by: Luca Fancellu Reported-by: Andrew Cooper Acked-by: Anthony PERARD Acked-by: Marek Marczykowski-Górecki --- tools/include/xen-tools/arm-arch-capabilities.h | 2 +- tools/python/xen/lowlevel/xc/xc.c | 2 +- tools/xl/xl_info.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/include/xen-tools/arm-arch-capabilities.h b/tools/include/xen-tools/arm-arch-capabilities.h index 3849e89792..4aa4c6c34a 100644 --- a/tools/include/xen-tools/arm-arch-capabilities.h +++ b/tools/include/xen-tools/arm-arch-capabilities.h @@ -14,7 +14,7 @@ static inline unsigned int arch_capabilities_arm_sve(unsigned int arch_capabilities) { -#if defined(__aarch64__) +#if defined(__arm__) || defined(__aarch64__) unsigned int sve_vl = MASK_EXTR(arch_capabilities, XEN_SYSCTL_PHYSCAP_ARM_SVE_MASK); diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 491e88977f..e14e223ec9 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -911,7 +911,7 @@ static PyObject *pyxc_physinfo(XcObject *self) "hw_caps", cpu_cap, "virt_caps", virt_caps); -#if defined(__aarch64__) +#if defined(__arm__) || defined(__aarch64__) if ( objret ) { unsigned int sve_vl_bits; PyObject *py_arm_sve_vl; diff --git a/tools/xl/xl_info.c b/tools/xl/xl_info.c index ddc42f96b9..72e87eac46 100644 --- a/tools/xl/xl_info.c +++ b/tools/xl/xl_info.c @@ -226,7 +226,7 @@ static void output_physinfo(void) ); /* Print arm SVE vector length only on ARM platforms */ -#if defined(__aarch64__) +#if defined(__arm__) || defined(__aarch64__) maybe_printf("arm_sve_vector_length : %u\n", arch_capabilities_arm_sve(info.arch_capabilities) ); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:56:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:56:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559653.874822 (Exim 4.92) (envelope-from ) id 1qHIuU-0000CV-05; Thu, 06 Jul 2023 06:56:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559653.874822; Thu, 06 Jul 2023 06:56:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIuT-0000CN-Tn; Thu, 06 Jul 2023 06:56:13 +0000 Received: by outflank-mailman (input) for mailman id 559653; Thu, 06 Jul 2023 06:56:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIuS-0000CD-HU for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIuS-0000dL-GZ for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIuS-00020B-Fn for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56: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=hW/fouRxOVk1m2OIufDT5NPS/ZMLVdycBHj2EiKMUNg=; b=rb1kaTrx8q4QO6eEr6uuyPoUpJ x6fu2iEHaZVokiJNLwNjIfYy7HkQZf0sngzAoW+d0E0GxeI/IjnJ2WheJLllybmvWLulrJGK/z3yZ LAST+lAG0Gi5mRpBD+5xHijiSWlD+XAOmfo/0pzzyedGTZY9WB8gQnBMVWgV/FNrS8j8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/python: Fix memory leak on error path Message-Id: Date: Thu, 06 Jul 2023 06:56:12 +0000 commit 248fbb9ee26a614d7baf79fd6e14fba5596f3f51 Author: Luca Fancellu AuthorDate: Thu Jun 8 14:59:13 2023 +0100 Commit: Julien Grall CommitDate: Tue Jul 4 20:10:20 2023 +0100 tools/python: Fix memory leak on error path Commit 56a7aaa16bfe introduced a memory leak on the error path for a Py_BuildValue built object that on some newly introduced error path has not the correct reference count handling, fix that by decrementing the refcount in these path. Fixes: 56a7aaa16bfe ("tools: add physinfo arch_capabilities handling for Arm") Signed-off-by: Luca Fancellu Reported-by: Andrew Cooper Acked-by: Marek Marczykowski-Górecki --- tools/python/xen/lowlevel/xc/xc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index e14e223ec9..d3ea350e07 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -919,11 +919,16 @@ static PyObject *pyxc_physinfo(XcObject *self) sve_vl_bits = arch_capabilities_arm_sve(pinfo.arch_capabilities); py_arm_sve_vl = PyLong_FromUnsignedLong(sve_vl_bits); - if ( !py_arm_sve_vl ) + if ( !py_arm_sve_vl ) { + Py_DECREF(objret); return NULL; + } - if( PyDict_SetItemString(objret, "arm_sve_vl", py_arm_sve_vl) ) + if( PyDict_SetItemString(objret, "arm_sve_vl", py_arm_sve_vl) ) { + Py_DECREF(py_arm_sve_vl); + Py_DECREF(objret); return NULL; + } } #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:56:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:56:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559654.874826 (Exim 4.92) (envelope-from ) id 1qHIue-0000FK-1c; Thu, 06 Jul 2023 06:56:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559654.874826; Thu, 06 Jul 2023 06:56: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 1qHIud-0000FD-VR; Thu, 06 Jul 2023 06:56:23 +0000 Received: by outflank-mailman (input) for mailman id 559654; Thu, 06 Jul 2023 06:56:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIuc-0000Ey-KK for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIuc-0000dS-Jc for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIuc-00020a-Ig for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56: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=ov5p+NrOkZu2u01RwgTzwVJLJWBw8dbrrufm7UEmzTo=; b=dxIIlVYVH3ONTHHx5RPSb0fw2b 7+J14hr2i1IBwJqAYWm2nnyJoCAA6p9xKvIB52etoufh+J1NZudQRnEKMU3gIbpkZzpVZotdlZBnb 45kYOVj3AN6OszjjMsWN/NhQVW3TCJINJrKxpyArFOVZkI1ODpgBF3nfeR61eKbO53xc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: vgic: Add missing 'U' in VGIC_ICFG_MASK for shifted constant Message-Id: Date: Thu, 06 Jul 2023 06:56:22 +0000 commit 91957bf3ff90cadb93e5c30e8ce95441f6db2771 Author: Henry Wang AuthorDate: Fri Jun 30 06:18:00 2023 +0800 Commit: Julien Grall CommitDate: Tue Jul 4 20:12:59 2023 +0100 xen/arm: vgic: Add missing 'U' in VGIC_ICFG_MASK for shifted constant With UBSAN on some arm64 platforms, e.g. FVP_Base_RevC-2xAEMvA, the following splat will be printed while Dom0 is booting: ``` (XEN) ================================================================== (XEN) UBSAN: Undefined behaviour in arch/arm/vgic.c:372:15 (XEN) left shift of 1 by 31 places cannot be represented in type 'int' (XEN) Xen WARN at common/ubsan/ubsan.c:172 (XEN) ----[ Xen-4.18-unstable arm64 debug=y ubsan=y Not tainted ]---- ``` This is because there is a device node in the device tree with 0xf as the interrupts property. Example of the device tree node is shown below: ``` ethernet@202000000 { compatible = "smsc,lan91c111"; reg = <0x2 0x2000000 0x10000>; interrupts = <0xf>; }; ``` and this value is passed to vgic_get_virq_type() as "index" then "intr" in VGIC_ICFG_MASK. Add the missing 'U' in VGIC_ICFG_MASK as a fix, and this should also addressing MISRA Rule 7.2: A "u" or "U" suffix shall be applied to all integer constants that are represented in an unsigned type Signed-off-by: Henry Wang Reviewed-by: Stefano Stabellini Reviewed-by: Hongda Deng --- xen/arch/arm/vgic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index c61c68870c..97d6f61066 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -358,7 +358,7 @@ void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) } } -#define VGIC_ICFG_MASK(intr) (1 << ((2 * ((intr) % 16)) + 1)) +#define VGIC_ICFG_MASK(intr) (1U << ((2 * ((intr) % 16)) + 1)) /* The function should be called with the rank lock taken */ static inline unsigned int vgic_get_virq_type(struct vcpu *v, int n, int index) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:56:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:56:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559655.874831 (Exim 4.92) (envelope-from ) id 1qHIuo-0000I4-39; Thu, 06 Jul 2023 06:56:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559655.874831; Thu, 06 Jul 2023 06:56: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 1qHIuo-0000Hx-0c; Thu, 06 Jul 2023 06:56:34 +0000 Received: by outflank-mailman (input) for mailman id 559655; Thu, 06 Jul 2023 06:56:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIum-0000Hk-ND for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIum-0000da-MS for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIum-000214-Lh for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56: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=IceAGRX8mW1aGP5oi3QC4XdzGnYuPP5t6Z/ErcCDmD4=; b=pqLn9BkD+hkHQpHPzUDAH4cCEM CjdlIIO55NOkqGPupdfhAPnfO7c4MEMdPB5nsF8UPWNAQi4uaqc8qGAgrXI1diibTGwnzVy6hc/Zk c1cJM8SIl5nwhHiq9bW96tmWuucrXhEPTv10KYk6RQ0omaFKv+ElgOyinqJMy4wVreag=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: remove xen_phys_start and xenheap_phys_end from config.h Message-Id: Date: Thu, 06 Jul 2023 06:56:32 +0000 commit 7604056fb7b051f532d6e17f146e9d58754f2dc3 Author: Wei Chen AuthorDate: Mon Jun 26 11:33:52 2023 +0800 Commit: Julien Grall CommitDate: Tue Jul 4 20:16:58 2023 +0100 xen/arm: remove xen_phys_start and xenheap_phys_end from config.h These two variables are stale variables, they only have declarations in config.h, they don't have any definition and no any code is using these two variables. So in this patch, we remove them from config.h. Signed-off-by: Wei Chen Signed-off-by: Penny Zheng Acked-by: Julien Grall --- xen/arch/arm/include/asm/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/xen/arch/arm/include/asm/config.h b/xen/arch/arm/include/asm/config.h index cc32802ad0..83cbf6b0cb 100644 --- a/xen/arch/arm/include/asm/config.h +++ b/xen/arch/arm/include/asm/config.h @@ -209,8 +209,6 @@ #define STACK_SIZE (PAGE_SIZE << STACK_ORDER) #ifndef __ASSEMBLY__ -extern unsigned long xen_phys_start; -extern unsigned long xenheap_phys_end; extern unsigned long frametable_virt_end; #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:56:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:56:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559656.874835 (Exim 4.92) (envelope-from ) id 1qHIuy-0000LN-4d; Thu, 06 Jul 2023 06:56:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559656.874835; Thu, 06 Jul 2023 06:56: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 1qHIuy-0000LF-21; Thu, 06 Jul 2023 06:56:44 +0000 Received: by outflank-mailman (input) for mailman id 559656; Thu, 06 Jul 2023 06:56:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIuw-0000L4-Q5 for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIuw-0000dh-PM for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIuw-00021V-Od for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56:42 +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=nPptzSeECYICbyIb4YtbYZ9ddt/N2LFktGm4x3gmp4U=; b=G3Wmr8V7fjiWrqWFKqJTb5PRzU WHayi4vMnPdk7llxqpY5ML6s9oALRg1BIXsMHyqG9q29m9lIvvU62s2XJvKw5Vrc9Ihy4uhuIG9b+ gyXxyxIMgeZAGPFfM62H/jLURCDQh/JSM8RclicfP78t7RjAk2mrXAY3Fqnf0MefllKg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: make ARM_EFI selectable for Arm64 Message-Id: Date: Thu, 06 Jul 2023 06:56:42 +0000 commit 12314be5749ecbb338d42ad10df059def6fc259a Author: Wei Chen AuthorDate: Mon Jun 26 11:33:53 2023 +0800 Commit: Julien Grall CommitDate: Tue Jul 4 20:16:58 2023 +0100 xen/arm: make ARM_EFI selectable for Arm64 Currently, ARM_EFI will mandatorily selected by Arm64. Even if the user knows for sure that their images will not start in the EFI environment, they can't disable the EFI support for Arm64. This means there will be about 3K lines unused code in their images. So in this patch, we make ARM_EFI selectable for Arm64, and based on that, we can use CONFIG_ARM_EFI to gate the EFI specific code in head.S for those images that will not be booted in EFI environment. Signed-off-by: Wei Chen Signed-off-by: Penny Zheng Reviewed-by: Julien Grall --- xen/arch/arm/Kconfig | 9 +++++++-- xen/arch/arm/arm64/head.S | 15 +++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 06b5ff755c..c30f324573 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -7,7 +7,6 @@ config ARM_64 def_bool y depends on !ARM_32 select 64BIT - select ARM_EFI select HAS_FAST_MULTIPLY config ARM @@ -71,7 +70,13 @@ config ACPI an alternative to device tree on ARM64. config ARM_EFI - bool + bool "UEFI boot service support" + depends on ARM_64 + default y + help + This option provides support for boot services through + UEFI firmware. A UEFI stub is provided to allow Xen to + be booted as an EFI application. config GICV3 bool "GICv3 driver" diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index c09d0b3a1a..31cdb54d74 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -22,8 +22,11 @@ #include #include + +#ifdef CONFIG_ARM_EFI #include #include +#endif #define PT_PT 0xf7f /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=1 P=1 */ #define PT_MEM 0xf7d /* nG=1 AF=1 SH=11 AP=01 NS=1 ATTR=111 T=0 P=1 */ @@ -171,8 +174,10 @@ efi_head: .byte 0x52 .byte 0x4d .byte 0x64 - .long pe_header - efi_head /* Offset to the PE header. */ - +#ifndef CONFIG_ARM_EFI + .long 0 /* 0 means no PE header. */ +#else + .long pe_header - efi_head /* Offset to the PE header. */ /* * Add the PE/COFF header to the file. The address of this header * is at offset 0x3c in the file, and is part of Linux "Image" @@ -278,6 +283,8 @@ section_table: .short 0 /* NumberOfLineNumbers (0 for executables) */ .long 0xe0500020 /* Characteristics (section flags) */ .align 5 +#endif /* CONFIG_ARM_EFI */ + real_start: /* BSS should be zeroed when booting without EFI */ mov x26, #0 /* x26 := skip_zero_bss */ @@ -965,6 +972,8 @@ putn: ret ENTRY(lookup_processor_type) mov x0, #0 ret + +#ifdef CONFIG_ARM_EFI /* * Function to transition from EFI loader in C, to Xen entry point. * void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); @@ -1023,6 +1032,8 @@ ENTRY(efi_xen_start) b real_start_efi ENDPROC(efi_xen_start) +#endif /* CONFIG_ARM_EFI */ + /* * Local variables: * mode: ASM -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:56:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:56:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559657.874839 (Exim 4.92) (envelope-from ) id 1qHIv8-0000O2-62; Thu, 06 Jul 2023 06:56:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559657.874839; Thu, 06 Jul 2023 06:56: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 1qHIv8-0000Nu-3O; Thu, 06 Jul 2023 06:56:54 +0000 Received: by outflank-mailman (input) for mailman id 559657; Thu, 06 Jul 2023 06:56:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIv6-0000Nk-T4 for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIv6-0000eA-SM for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIv6-000222-RQ for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:56:52 +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=ui8v7cmS/EpPhxMnpG8teBD+YSDeP3dW9+BYcMEDiw4=; b=fYCp5auYxTX22LGshO7qazIOtA cmMJ1/kkSS1Ga0sXpCyg5qjx2W/PrB8vc/JzI/GK3VAB8CkfE2WYRCwj3czhEn1jbpplw6Ay9YXG4 V4TxCQj7aUY41hN5rseiEq27E5uKGP3GTeX638507vi0aVnyx34YIWcPBB/pxZ1vCKQg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libelf: make L1_MFN_VALID note known Message-Id: Date: Thu, 06 Jul 2023 06:56:52 +0000 commit 01a5814d4e4892b896ebb301143588864816abb8 Author: Jan Beulich AuthorDate: Wed Jul 5 08:17:13 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 5 08:17:13 2023 +0200 libelf: make L1_MFN_VALID note known We still don't use it (in the tool stack), and its values (plural) also aren't fetched correctly, but it is odd to continue to see the hypervisor log "ELF: note: unknown (0xd)" when loading a Linux Dom0. Signed-off-by: Jan Beulich Acked-by: Julien Grall --- xen/common/libelf/libelf-dominfo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c index e5644f6c7f..fcaee2f7bc 100644 --- a/xen/common/libelf/libelf-dominfo.c +++ b/xen/common/libelf/libelf-dominfo.c @@ -117,6 +117,7 @@ elf_errorstatus elf_xen_parse_note(struct elf_binary *elf, [XEN_ELFNOTE_FEATURES] = { "FEATURES", 1}, [XEN_ELFNOTE_SUPPORTED_FEATURES] = { "SUPPORTED_FEATURES", 0}, [XEN_ELFNOTE_BSD_SYMTAB] = { "BSD_SYMTAB", 1}, + [XEN_ELFNOTE_L1_MFN_VALID] = { "L1_MFN_VALID", false }, [XEN_ELFNOTE_SUSPEND_CANCEL] = { "SUSPEND_CANCEL", 0 }, [XEN_ELFNOTE_MOD_START_PFN] = { "MOD_START_PFN", 0 }, [XEN_ELFNOTE_PHYS32_ENTRY] = { "PHYS32_ENTRY", 0 }, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:57:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:57:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559659.874843 (Exim 4.92) (envelope-from ) id 1qHIvI-0000Qo-7T; Thu, 06 Jul 2023 06:57:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559659.874843; Thu, 06 Jul 2023 06:57: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 1qHIvI-0000Qg-4q; Thu, 06 Jul 2023 06:57:04 +0000 Received: by outflank-mailman (input) for mailman id 559659; Thu, 06 Jul 2023 06:57:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIvG-0000QV-WA for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIvG-0000eU-VN for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIvG-00022a-UY for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57: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=COJ8PCXQb5/RCx2T/2vHF94OxiZEBxtYYRILP/nqGH8=; b=v0PsU/S0tuuWSA7vNgTiIOnr6/ ugqFU4sI/A8BDUp82gF27bCgfG8oseXnIj245KL4eYWvN8ho+n2jLMp8X71is69oYzLe+o/w4URi2 o/rdf2kNfLnX9OUQjEXKai5+38DsqRVww7wI2ixKjsoG1TQXtvc6T8wqlzAhkks2z4GE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: add SPDX tags Message-Id: Date: Thu, 06 Jul 2023 06:57:02 +0000 commit afb775d3e55607748c12a85b27cab510c4a32553 Author: Oleksii Kurochko AuthorDate: Wed Jul 5 08:18:46 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 5 08:18:46 2023 +0200 xen/riscv: add SPDX tags Suggested-by: Andrew Cooper Signed-off-by: Oleksii Kurochko Reviewed-by: Alistair Francis --- xen/arch/riscv/include/asm/current.h | 2 ++ xen/arch/riscv/include/asm/early_printk.h | 2 ++ xen/arch/riscv/include/asm/mm.h | 2 ++ xen/arch/riscv/include/asm/page-bits.h | 2 ++ xen/arch/riscv/include/asm/page.h | 2 ++ xen/arch/riscv/include/asm/traps.h | 2 ++ xen/arch/riscv/include/asm/types.h | 2 ++ xen/arch/riscv/mm.c | 2 ++ xen/arch/riscv/setup.c | 2 ++ 9 files changed, 18 insertions(+) diff --git a/xen/arch/riscv/include/asm/current.h b/xen/arch/riscv/include/asm/current.h index d87e6717e0..d84f15dc50 100644 --- a/xen/arch/riscv/include/asm/current.h +++ b/xen/arch/riscv/include/asm/current.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + #ifndef __ASM_CURRENT_H #define __ASM_CURRENT_H diff --git a/xen/arch/riscv/include/asm/early_printk.h b/xen/arch/riscv/include/asm/early_printk.h index 05106e160d..85e60df33a 100644 --- a/xen/arch/riscv/include/asm/early_printk.h +++ b/xen/arch/riscv/include/asm/early_printk.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + #ifndef __EARLY_PRINTK_H__ #define __EARLY_PRINTK_H__ diff --git a/xen/arch/riscv/include/asm/mm.h b/xen/arch/riscv/include/asm/mm.h index 64293eacee..2a8f9a1a44 100644 --- a/xen/arch/riscv/include/asm/mm.h +++ b/xen/arch/riscv/include/asm/mm.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + #ifndef _ASM_RISCV_MM_H #define _ASM_RISCV_MM_H diff --git a/xen/arch/riscv/include/asm/page-bits.h b/xen/arch/riscv/include/asm/page-bits.h index 4a3e33589a..8f1f474371 100644 --- a/xen/arch/riscv/include/asm/page-bits.h +++ b/xen/arch/riscv/include/asm/page-bits.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + #ifndef __RISCV_PAGE_BITS_H__ #define __RISCV_PAGE_BITS_H__ diff --git a/xen/arch/riscv/include/asm/page.h b/xen/arch/riscv/include/asm/page.h index 22b36e03a4..95074e29b3 100644 --- a/xen/arch/riscv/include/asm/page.h +++ b/xen/arch/riscv/include/asm/page.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + #ifndef _ASM_RISCV_PAGE_H #define _ASM_RISCV_PAGE_H diff --git a/xen/arch/riscv/include/asm/traps.h b/xen/arch/riscv/include/asm/traps.h index f3fb6b25d1..3fef318478 100644 --- a/xen/arch/riscv/include/asm/traps.h +++ b/xen/arch/riscv/include/asm/traps.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + #ifndef __ASM_TRAPS_H__ #define __ASM_TRAPS_H__ diff --git a/xen/arch/riscv/include/asm/types.h b/xen/arch/riscv/include/asm/types.h index 0c0ce78c8f..c2cdfd9caa 100644 --- a/xen/arch/riscv/include/asm/types.h +++ b/xen/arch/riscv/include/asm/types.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + #ifndef __RISCV_TYPES_H__ #define __RISCV_TYPES_H__ diff --git a/xen/arch/riscv/mm.c b/xen/arch/riscv/mm.c index 8ceed445cf..40b781a2fa 100644 --- a/xen/arch/riscv/mm.c +++ b/xen/arch/riscv/mm.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + #include #include #include diff --git a/xen/arch/riscv/setup.c b/xen/arch/riscv/setup.c index 845d18d86f..dde8fb898b 100644 --- a/xen/arch/riscv/setup.c +++ b/xen/arch/riscv/setup.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:57:15 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:57:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559660.874847 (Exim 4.92) (envelope-from ) id 1qHIvT-0000TV-8x; Thu, 06 Jul 2023 06:57:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559660.874847; Thu, 06 Jul 2023 06:57: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 1qHIvT-0000TM-6J; Thu, 06 Jul 2023 06:57:15 +0000 Received: by outflank-mailman (input) for mailman id 559660; Thu, 06 Jul 2023 06:57:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIvR-0000T6-Dz for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIvR-0000eb-26 for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIvR-00022z-1C for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57: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=EbjsiwheEDxDus8dxrcU6xOIXgPQ3kD5wkwSviqxRyw=; b=xk21v/qdaZgokyPpobE57HSc1d 0J3jzGKTSacNYcmRerALhiMFfG/UzhC5cRS5xhBLgr+El8jLlI/r7DLM3V99qNEPFS1rBd+VeRCAw JZtdDloZFa0GBrh4H04A9uEf2glsuOS9yXen36VsEq29ocH2gCNx3TMOTRTiG7KfYc24=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: move extern of cpu0_boot_stack to header Message-Id: Date: Thu, 06 Jul 2023 06:57:13 +0000 commit 9b0fc8eeb2a2b54afe14069fe51812aeb2a2ad14 Author: Oleksii Kurochko AuthorDate: Wed Jul 5 08:19:34 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 5 08:19:34 2023 +0200 xen/riscv: move extern of cpu0_boot_stack to header Suggested-by: Andrew Cooper Signed-off-by: Oleksii Kurochko Reviewed-by: Alistair Francis --- xen/arch/riscv/include/asm/mm.h | 2 ++ xen/arch/riscv/mm.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/riscv/include/asm/mm.h b/xen/arch/riscv/include/asm/mm.h index 2a8f9a1a44..5e3ac5cde3 100644 --- a/xen/arch/riscv/include/asm/mm.h +++ b/xen/arch/riscv/include/asm/mm.h @@ -8,6 +8,8 @@ #define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) #define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) +extern unsigned char cpu0_boot_stack[]; + void setup_initial_pagetables(void); void enable_mmu(void); diff --git a/xen/arch/riscv/mm.c b/xen/arch/riscv/mm.c index 40b781a2fa..fddb3cd0bd 100644 --- a/xen/arch/riscv/mm.c +++ b/xen/arch/riscv/mm.c @@ -19,8 +19,6 @@ struct mmu_desc { pte_t *pgtbl_base; }; -extern unsigned char cpu0_boot_stack[STACK_SIZE]; - #define PHYS_OFFSET ((unsigned long)_start - XEN_VIRT_START) #define LOAD_TO_LINK(addr) ((addr) - PHYS_OFFSET) #define LINK_TO_LOAD(addr) ((addr) + PHYS_OFFSET) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:57:25 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:57:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559661.874850 (Exim 4.92) (envelope-from ) id 1qHIvd-0000W8-B8; Thu, 06 Jul 2023 06:57:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559661.874850; Thu, 06 Jul 2023 06:57: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 1qHIvd-0000W0-7d; Thu, 06 Jul 2023 06:57:25 +0000 Received: by outflank-mailman (input) for mailman id 559661; Thu, 06 Jul 2023 06:57:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIvb-0000Vm-5l for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIvb-0000ei-50 for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIvb-00023Q-4A for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57: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=lxrP/BAXoV+ugEIUtzk05KcnlHvf/EzqSz/OjkUeW8Y=; b=d5gfEi8+vs5GsfSqESavmxPoBC cUuwzpoPT2mp5yJdztO04sL/tCgYzvm0Fpuz2r02836H/HzcmOesbmQme0HjWh8X/jHQ1IyIf5dS8 EgA0IBb8Le8CosP8JOUyUgm70KqdtD0xJj8uwvYeCyuVIJSKQYABNJudg668q8MEj1Wk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: define ARCH and SRCARCH later Message-Id: Date: Thu, 06 Jul 2023 06:57:23 +0000 commit 58e0a3f3b2c430f8640ef9df67ac857b0008ebc8 Author: Anthony PERARD AuthorDate: Wed Jul 5 08:25:03 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 5 08:25:03 2023 +0200 build: define ARCH and SRCARCH later Defining ARCH and SRCARCH later in xen/Makefile allows to switch to immediate evaluation variable type. ARCH and SRCARCH depend on value defined in Config.mk and aren't used for e.g. TARGET_SUBARCH or TARGET_ARCH, and not before they're needed in a sub-make or a rule. This will help reduce the number of times the shell rune is been run. With GNU make 4.4, the number of execution of the command present in these $(shell ) increased greatly. This is probably because as of make 4.4, exported variable are also added to the environment of $(shell ) construct. Also, `make -d` shows a lot of these: Makefile:39: not recursively expanding SRCARCH to export to shell function Makefile:38: not recursively expanding ARCH to export to shell function Reported-by: Jason Andryuk Signed-off-by: Anthony PERARD Tested-by: Jason Andryuk Reviewed-by: Jan Beulich --- xen/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index db5454fb58..96efe52ed8 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -35,12 +35,6 @@ MAKEFLAGS += -rR EFI_MOUNTPOINT ?= $(BOOT_DIR)/efi -ARCH=$(XEN_TARGET_ARCH) -SRCARCH=$(shell echo $(ARCH) | \ - sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g' \ - -e s'/riscv.*/riscv/g' -e s'/ppc.*/ppc/g') -export ARCH SRCARCH - # Allow someone to change their config file export KCONFIG_CONFIG ?= .config @@ -241,6 +235,13 @@ include scripts/Kbuild.include include $(XEN_ROOT)/Config.mk # Set ARCH/SUBARCH appropriately. + +ARCH := $(XEN_TARGET_ARCH) +SRCARCH := $(shell echo $(ARCH) | \ + sed -e 's/x86.*/x86/' -e 's/arm\(32\|64\)/arm/g' \ + -e 's/riscv.*/riscv/g' -e 's/ppc.*/ppc/g') +export ARCH SRCARCH + export TARGET_SUBARCH := $(XEN_TARGET_ARCH) export TARGET_ARCH := $(shell echo $(XEN_TARGET_ARCH) | \ sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g' \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:57:35 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:57:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559662.874854 (Exim 4.92) (envelope-from ) id 1qHIvn-0000Z2-DE; Thu, 06 Jul 2023 06:57:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559662.874854; Thu, 06 Jul 2023 06:57: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 1qHIvn-0000Yu-Aj; Thu, 06 Jul 2023 06:57:35 +0000 Received: by outflank-mailman (input) for mailman id 559662; Thu, 06 Jul 2023 06:57:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIvl-0000Ya-8d for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIvl-0000eu-7w for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIvl-000249-7C for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57: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=ElHMILKCINCxrV9pDX3fHbnYGRroP3v417U7ywRYNqU=; b=udh+vrq8oRB5orGftppEJaq8UT /28XZyHm/NyKXlm+d7k5l7hrRaNhqQVw2QPB+Mu9iuxLW3HE0carVdKHfWsS3J3lUjR91UP7lzUVI re9cB+zIirQjsO0sOKqC93a29IfFRmkkFAEwNj0zwr+9eoWZDASBYhJzfdrxyxvnGeaU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: remove TARGET_SUBARCH, a duplicate of ARCH Message-Id: Date: Thu, 06 Jul 2023 06:57:33 +0000 commit a6ab7dd061338c33faef629cbe52ed1608571d84 Author: Anthony PERARD AuthorDate: Wed Jul 5 08:27:51 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 5 08:27:51 2023 +0200 build: remove TARGET_SUBARCH, a duplicate of ARCH Signed-off-by: Anthony PERARD Reviewed-by: Jan Beulich --- xen/Makefile | 3 +-- xen/build.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 96efe52ed8..79b9704e24 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -234,7 +234,7 @@ include scripts/Kbuild.include # we need XEN_TARGET_ARCH to generate the proper config include $(XEN_ROOT)/Config.mk -# Set ARCH/SUBARCH appropriately. +# Set ARCH/SRCARCH appropriately. ARCH := $(XEN_TARGET_ARCH) SRCARCH := $(shell echo $(ARCH) | \ @@ -242,7 +242,6 @@ SRCARCH := $(shell echo $(ARCH) | \ -e 's/riscv.*/riscv/g' -e 's/ppc.*/ppc/g') export ARCH SRCARCH -export TARGET_SUBARCH := $(XEN_TARGET_ARCH) export TARGET_ARCH := $(shell echo $(XEN_TARGET_ARCH) | \ sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g' \ -e s'/riscv.*/riscv/g' -e s'/ppc.*/ppc/g') diff --git a/xen/build.mk b/xen/build.mk index 30d74d4772..7e33e710fd 100644 --- a/xen/build.mk +++ b/xen/build.mk @@ -41,7 +41,7 @@ include/xen/compile.h: include/xen/compile.h.in .banner FORCE targets += include/xen/compile.h -include $(wildcard .asm-offsets.s.d) -asm-offsets.s: arch/$(TARGET_ARCH)/$(TARGET_SUBARCH)/asm-offsets.c +asm-offsets.s: arch/$(TARGET_ARCH)/$(ARCH)/asm-offsets.c $(CC) $(call cpp_flags,$(c_flags)) -S -g0 -o $@.new -MQ $@ $< $(call move-if-changed,$@.new,$@) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:57:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:57:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559663.874860 (Exim 4.92) (envelope-from ) id 1qHIvw-0000bp-F3; Thu, 06 Jul 2023 06:57:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559663.874860; Thu, 06 Jul 2023 06:57: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 1qHIvw-0000bd-C7; Thu, 06 Jul 2023 06:57:44 +0000 Received: by outflank-mailman (input) for mailman id 559663; Thu, 06 Jul 2023 06:57:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIvv-0000bT-Ba for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIvv-0000f6-Ao for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIvv-00025C-A2 for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57: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=G/YmpcERPRJnSOP+eQOqtR44EFpZUEFZ9gKqjDKy0UY=; b=CbeErH8APO5Oul8EDtP07Cs9kJ tCtvJCohtbUfvWBJdHsPl+C8JSCa6zpEKtwq7mdeAW/zqyP6xgq8dXvubrtos3R4Mf0f6I+4CApx8 6AljczdkDp6o+SQ8eoiV+jjUhD0fDolpjGhwq6cFhqf4+gggnjE64fKjQ3aAaCbAsvys=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: remove TARGET_ARCH, a duplicate of SRCARCH Message-Id: Date: Thu, 06 Jul 2023 06:57:43 +0000 commit ac27b3beb9b7b423d5563768de890c7594c21b4e Author: Anthony PERARD AuthorDate: Wed Jul 5 08:29:49 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 5 08:31:23 2023 +0200 build: remove TARGET_ARCH, a duplicate of SRCARCH The same command is used to generate the value of both $(TARGET_ARCH) and $(SRCARCH), as $(ARCH) is an alias for $(XEN_TARGET_ARCH). Signed-off-by: Anthony PERARD Reviewed-by: Jan Beulich --- xen/Makefile | 18 +++++++----------- xen/Rules.mk | 2 +- xen/arch/ppc/arch.mk | 2 +- xen/arch/riscv/arch.mk | 2 +- xen/build.mk | 6 +++--- 5 files changed, 13 insertions(+), 17 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 79b9704e24..e8aa663781 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -242,10 +242,6 @@ SRCARCH := $(shell echo $(ARCH) | \ -e 's/riscv.*/riscv/g' -e 's/ppc.*/ppc/g') export ARCH SRCARCH -export TARGET_ARCH := $(shell echo $(XEN_TARGET_ARCH) | \ - sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g' \ - -e s'/riscv.*/riscv/g' -e s'/ppc.*/ppc/g') - export CONFIG_SHELL := $(SHELL) export CC CXX LD NM OBJCOPY OBJDUMP ADDR2LINE export YACC = $(if $(BISON),$(BISON),bison) @@ -262,7 +258,7 @@ export XEN_TREEWIDE_CFLAGS := $(CFLAGS) ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),) CLANG_FLAGS := -ifeq ($(TARGET_ARCH),x86) +ifeq ($(SRCARCH),x86) # The tests to select whether the integrated assembler is usable need to happen # before testing any assembler features, or else the result of the tests would # be stale if the integrated assembler is not used. @@ -430,22 +426,22 @@ endif ifdef building_out_of_srctree CFLAGS += -I$(objtree)/include - CFLAGS += -I$(objtree)/arch/$(TARGET_ARCH)/include + CFLAGS += -I$(objtree)/arch/$(SRCARCH)/include endif CFLAGS += -I$(srctree)/include -CFLAGS += -I$(srctree)/arch/$(TARGET_ARCH)/include +CFLAGS += -I$(srctree)/arch/$(SRCARCH)/include # Note that link order matters! ALL_OBJS-y := common/built_in.o ALL_OBJS-y += drivers/built_in.o ALL_OBJS-y += lib/built_in.o ALL_OBJS-y += xsm/built_in.o -ALL_OBJS-y += arch/$(TARGET_ARCH)/built_in.o +ALL_OBJS-y += arch/$(SRCARCH)/built_in.o ALL_OBJS-$(CONFIG_CRYPTO) += crypto/built_in.o ALL_LIBS-y := lib/lib.a -include $(srctree)/arch/$(TARGET_ARCH)/arch.mk +include $(srctree)/arch/$(SRCARCH)/arch.mk # define new variables to avoid the ones defined in Config.mk export XEN_CFLAGS := $(CFLAGS) @@ -589,8 +585,8 @@ $(TARGET): outputmakefile FORCE $(Q)$(MAKE) $(build)=tools $(Q)$(MAKE) $(build)=. include/xen/compile.h $(Q)$(MAKE) $(build)=include all - $(Q)$(MAKE) $(build)=arch/$(TARGET_ARCH) include - $(Q)$(MAKE) $(build)=. arch/$(TARGET_ARCH)/include/asm/asm-offsets.h + $(Q)$(MAKE) $(build)=arch/$(SRCARCH) include + $(Q)$(MAKE) $(build)=. arch/$(SRCARCH)/include/asm/asm-offsets.h $(Q)$(MAKE) $(build)=. MKRELOC=$(MKRELOC) 'ALL_OBJS=$(ALL_OBJS-y)' 'ALL_LIBS=$(ALL_LIBS-y)' $@ SUBDIRS = xsm arch common crypto drivers lib test diff --git a/xen/Rules.mk b/xen/Rules.mk index 59072ae8df..8af3dd7277 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -180,7 +180,7 @@ cpp_flags = $(filter-out -Wa$(comma)% -flto,$(1)) c_flags = -MMD -MP -MF $(depfile) $(XEN_CFLAGS) a_flags = -MMD -MP -MF $(depfile) $(XEN_AFLAGS) -include $(srctree)/arch/$(TARGET_ARCH)/Rules.mk +include $(srctree)/arch/$(SRCARCH)/Rules.mk c_flags += $(_c_flags) a_flags += $(_c_flags) diff --git a/xen/arch/ppc/arch.mk b/xen/arch/ppc/arch.mk index 36830457c6..ec2a6136f4 100644 --- a/xen/arch/ppc/arch.mk +++ b/xen/arch/ppc/arch.mk @@ -8,5 +8,5 @@ CFLAGS += -m64 -mlittle-endian -mcpu=$(ppc-march-y) CFLAGS += -mstrict-align -mcmodel=large -mabi=elfv2 -mno-altivec -mno-vsx # TODO: Drop override when more of the build is working -override ALL_OBJS-y = arch/$(TARGET_ARCH)/built_in.o +override ALL_OBJS-y = arch/$(SRCARCH)/built_in.o override ALL_LIBS-y = diff --git a/xen/arch/riscv/arch.mk b/xen/arch/riscv/arch.mk index 7448f759b4..8403f96b6f 100644 --- a/xen/arch/riscv/arch.mk +++ b/xen/arch/riscv/arch.mk @@ -15,5 +15,5 @@ riscv-march-$(CONFIG_RISCV_ISA_C) := $(riscv-march-y)c CFLAGS += -march=$(riscv-march-y) -mstrict-align -mcmodel=medany # TODO: Drop override when more of the build is working -override ALL_OBJS-y = arch/$(TARGET_ARCH)/built_in.o +override ALL_OBJS-y = arch/$(SRCARCH)/built_in.o override ALL_LIBS-y = diff --git a/xen/build.mk b/xen/build.mk index 7e33e710fd..26dd5a8e87 100644 --- a/xen/build.mk +++ b/xen/build.mk @@ -41,11 +41,11 @@ include/xen/compile.h: include/xen/compile.h.in .banner FORCE targets += include/xen/compile.h -include $(wildcard .asm-offsets.s.d) -asm-offsets.s: arch/$(TARGET_ARCH)/$(ARCH)/asm-offsets.c +asm-offsets.s: arch/$(SRCARCH)/$(ARCH)/asm-offsets.c $(CC) $(call cpp_flags,$(c_flags)) -S -g0 -o $@.new -MQ $@ $< $(call move-if-changed,$@.new,$@) -arch/$(TARGET_ARCH)/include/asm/asm-offsets.h: asm-offsets.s +arch/$(SRCARCH)/include/asm/asm-offsets.h: asm-offsets.s @(set -e; \ echo "/*"; \ echo " * DO NOT MODIFY."; \ @@ -87,4 +87,4 @@ endif targets += prelink.o $(TARGET): prelink.o FORCE - $(Q)$(MAKE) $(build)=arch/$(TARGET_ARCH) $@ + $(Q)$(MAKE) $(build)=arch/$(SRCARCH) $@ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:57:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:57:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559664.874862 (Exim 4.92) (envelope-from ) id 1qHIw6-0000el-G3; Thu, 06 Jul 2023 06:57:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559664.874862; Thu, 06 Jul 2023 06:57: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 1qHIw6-0000ed-DX; Thu, 06 Jul 2023 06:57:54 +0000 Received: by outflank-mailman (input) for mailman id 559664; Thu, 06 Jul 2023 06:57:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIw5-0000eT-EL for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIw5-0000fU-DW for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIw5-00025n-Cp for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:57: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=57ti17LjqvMvfXONnAI1sFmDngHYDoQdYiS5g/fjWeU=; b=WSEoO+sPCa/vGczkDug5WouR8w PPXuaKkNuZwcWZW5a7XID4foiwHBn3oPDmRKjdG2/hx5J5sRsZ41AcTw5aq2LYBwX9bFD7WXeqjQw P3Pbz7Lgto371O6bQjs3+0DU6nQdmIIsd0V2u2m36Z3x5/2XlyvnttzlMgsbxxsQ7XQU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/include: avoid using a compiler extension for BUILD_BUG_ON_ZERO Message-Id: Date: Thu, 06 Jul 2023 06:57:53 +0000 commit 5c02dbd0e0adbe6100128345328999876fc78d00 Author: Nicola Vetrini AuthorDate: Wed Jul 5 08:32:14 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 5 08:32:14 2023 +0200 xen/include: avoid using a compiler extension for BUILD_BUG_ON_ZERO Redefine BUILD_BUG_ON_ZERO to avoid using a compiler extension that gives an acceptable semantics to C99 undefined behavior 58 ("A structure or union is defined as containing no named members (6.7.2.1)"). The first definition includes an additional named field of type char. The chosen ill-formed construct for the second definition is a struct with a named bitfield of width 0 when the condition is true, which prevents the UB without using the compiler extension while keeping the semantic of the construct. The choice of the bitwise AND operation to bring the result to 0 when cond is false boils down to possibly better portability. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- xen/include/xen/lib.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 67fc7c1d7e..a8958ed57b 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -51,9 +51,10 @@ e.g. in a structure initializer (or where-ever else comma expressions aren't permitted). */ #define BUILD_BUG_ON_ZERO(cond) \ - sizeof(struct { _Static_assert(!(cond), "!(" #cond ")"); }) + (sizeof(struct { char c; _Static_assert(!(cond), "!(" #cond ")"); }) & 0) #else -#define BUILD_BUG_ON_ZERO(cond) sizeof(struct { int:-!!(cond); }) +#define BUILD_BUG_ON_ZERO(cond) \ + (sizeof(struct { unsigned u : !(cond); }) & 0) #define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond)) #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:58:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:58:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559665.874867 (Exim 4.92) (envelope-from ) id 1qHIwG-0000hO-Hf; Thu, 06 Jul 2023 06:58:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559665.874867; Thu, 06 Jul 2023 06:58: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 1qHIwG-0000hG-F0; Thu, 06 Jul 2023 06:58:04 +0000 Received: by outflank-mailman (input) for mailman id 559665; Thu, 06 Jul 2023 06:58:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIwF-0000h7-HC for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:58:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIwF-0000fo-GR for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:58:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIwF-00026L-Fg for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:58: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=xO0nNi7Fk5yvDZ1pVPM6vIMOi3UGUIeqdxy2xAAD7Ng=; b=PaeUak95MeueKJU1gfgNwnrsH/ zJjgAHeCHeQ3tAz4GJB1f6ZalhuHpRmDM4qgz+c7WZ0Ttd1HiOnge+frlAPlSoOVyqAJktAcPh/Zf 6jipryGB2BiyxcIn2h/EZlN8zgP7Owuhih+TQxz7hrKGJVvCoWfbb5rwiVYBuckwaPOo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: smmuv3: fix violations of MISRA C:2012 Rule 3.1 Message-Id: Date: Thu, 06 Jul 2023 06:58:03 +0000 commit c2ff2ca3a9dd60e1fb7d6c252be5cb1865952fda Author: Nicola Vetrini AuthorDate: Thu Jun 29 12:06:16 2023 +0200 Commit: Julien Grall CommitDate: Wed Jul 5 09:56:16 2023 +0100 xen/arm: smmuv3: fix violations of MISRA C:2012 Rule 3.1 In the file `xen/drivers/passthrough/arm/smmu-v3.c' there are a few occurrences of nested '//' character sequences inside C-style comment blocks, which violate Rule 3.1. The patch aims to resolve those by replacing the nested comments with equivalent constructs that do not violate the rule. Signed-off-by: Nicola Vetrini Acked-by: Rahul Singh Reviewed-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu-v3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index 720aa69ff2..cdbb505134 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -1047,10 +1047,10 @@ static int arm_smmu_atc_inv_domain(struct arm_smmu_domain *smmu_domain, * before we read 'nr_ats_masters' in case of a concurrent call to * arm_smmu_enable_ats(): * - * // unmap() // arm_smmu_enable_ats() - * TLBI+SYNC atomic_inc(&nr_ats_masters); - * smp_mb(); [...] - * atomic_read(&nr_ats_masters); pci_enable_ats() // writel() + * --- unmap() --- --- arm_smmu_enable_ats() --- + * TLBI+SYNC atomic_inc(&nr_ats_masters); + * smp_mb(); [...] + * atomic_read(&nr_ats_masters); pci_enable_ats() (see writel()) * * Ensures that we always see the incremented 'nr_ats_masters' count if * ATS was enabled at the PCI device before completion of the TLBI. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 06 06:58:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Jul 2023 06:58:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.559666.874871 (Exim 4.92) (envelope-from ) id 1qHIwQ-0000jw-JW; Thu, 06 Jul 2023 06:58:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 559666.874871; Thu, 06 Jul 2023 06:58: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 1qHIwQ-0000jn-GX; Thu, 06 Jul 2023 06:58:14 +0000 Received: by outflank-mailman (input) for mailman id 559666; Thu, 06 Jul 2023 06:58:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIwP-0000jS-Ju for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:58:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHIwP-0000fv-JG for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:58:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHIwP-00026k-IU for xen-changelog@lists.xenproject.org; Thu, 06 Jul 2023 06:58: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=1bXCKcDogmhkHXblLd3v70dLJ6FpUsVbbucN82ez2VI=; b=5nA2lQRYFq2usuyIFCtpRuHfj3 1Iv0k9hHri/0MjEyR/EGgJngs60fCedG24vKxaLBw7xWpAoVrCQbRi/WhPjEYmA/AjyxDVLpV+23V 6HxAH9W/RTRWYOjv4dnXTuRH2SWXtZlg1rzTl4HDCu17txzkHTKeMvuW+NYYH0WJ5nAM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Kconfig: ACPI should depend on UEFI Message-Id: Date: Thu, 06 Jul 2023 06:58:13 +0000 commit dc5e6082f5b36c4a4008c158b53320699025f895 Author: Julien Grall AuthorDate: Wed Jul 5 14:47:16 2023 +0100 Commit: Julien Grall CommitDate: Wed Jul 5 14:47:35 2023 +0100 xen/arm: Kconfig: ACPI should depend on UEFI On Arm, it is not possible to use ACPI without UEFI. In fact disabling UEFI but not ACPI will lead to a compilation error: ld: prelink.o: in function `acpi_os_get_root_pointer': /builds/xen-project/people/andyhhp/xen/xen/drivers/acpi/osl.c:73: undefined reference to `efi' /builds/xen-project/people/andyhhp/xen/xen/drivers/acpi/osl.c:73:(.init.text+0x8ac0): relocation truncated to fit: R_AARCH64_ADR_PREL_PG_HI21 against undefined symbol `efi' So make the dependency clear in the Kconfig. This was spotted by the randconfig build in gitlab CI. Fixes: 12314be5749e ("xen/arm: make ARM_EFI selectable for Arm64") Signed-off-by: Julien Grall Reviewed-by: Bertrand Marquis --- xen/arch/arm/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index c30f324573..439cc94f33 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -63,11 +63,11 @@ source "arch/Kconfig" config ACPI bool "ACPI (Advanced Configuration and Power Interface) Support (UNSUPPORTED)" if UNSUPPORTED - depends on ARM_64 + depends on ARM_64 && ARM_EFI ---help--- Advanced Configuration and Power Interface (ACPI) support for Xen is - an alternative to device tree on ARM64. + an alternative to device tree on ARM64. This requires UEFI. config ARM_EFI bool "UEFI boot service support" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 07 07:22:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Jul 2023 07:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.560220.875957 (Exim 4.92) (envelope-from ) id 1qHfn1-0002pX-1A; Fri, 07 Jul 2023 07:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 560220.875957; Fri, 07 Jul 2023 07:22: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 1qHfn0-0002pO-UO; Fri, 07 Jul 2023 07:22:02 +0000 Received: by outflank-mailman (input) for mailman id 560220; Fri, 07 Jul 2023 07:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfn0-0002pG-4Z for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfmz-000245-Uo for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHfmz-00008p-S8 for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22: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=t1dZmEQhK9MKKFWm2eE0OBD0SS9UTrvCmfHBmE3Zfyw=; b=b/sm/xNGiZcaoacC+lqGgtByod LFmKQlBPz+fMoxtc9PdZB7BsSbyqXHKsGnI0sP6DpYc3sv7XvenP5hGK1Ch2gQOuylW+TWQjaRGXu H2gzr24gPMkZxyY5z3FKk2Z9DQ+wUYBnDb+gkzGOiDbS1SXsoRJGnF4uVwQGce91pVPs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/asm: Introduce a tailcall pseduo-op Message-Id: Date: Fri, 07 Jul 2023 07:22:01 +0000 commit 8720e7f3a482580cabddfb3126351da56a4c9690 Author: Andrew Cooper AuthorDate: Fri Jun 30 16:11:40 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Jul 5 15:20:04 2023 +0100 x86/asm: Introduce a tailcall pseduo-op It was previously noted that CALL/BUG is a weird combination, but there is good reason to use this pattern. Introduce an explicit tailcall macro make it clearer in context. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/boot/x86_64.S | 6 ++---- xen/arch/x86/include/asm/asm-defns.h | 9 +++++++++ xen/arch/x86/x86_64/entry.S | 12 ++++-------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index 5d12937a0e..04bb62ae86 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -74,14 +74,12 @@ ENTRY(__high_start) .L_ap_cet_done: #endif /* CONFIG_XEN_SHSTK || CONFIG_XEN_IBT */ - call start_secondary - BUG /* start_secondary() shouldn't return. */ + tailcall start_secondary .L_bsp: /* Pass off the Multiboot info structure to C land (if applicable). */ mov multiboot_ptr(%rip),%edi - call __start_xen - BUG /* __start_xen() shouldn't return. */ + tailcall __start_xen .section .data.page_aligned, "aw", @progbits .align PAGE_SIZE, 0 diff --git a/xen/arch/x86/include/asm/asm-defns.h b/xen/arch/x86/include/asm/asm-defns.h index 8bd9007731..9a7073ced5 100644 --- a/xen/arch/x86/include/asm/asm-defns.h +++ b/xen/arch/x86/include/asm/asm-defns.h @@ -20,6 +20,15 @@ .byte 0x0f, 0x01, 0xdd .endm +/* + * Call a noreturn function. This could be JMP, but CALL results in a more + * helpful backtrace. BUG is to catch functions which do decide to return... + */ +.macro tailcall fn:req + call \fn + BUG /* Shouldn't return */ +.endm + .macro INDIRECT_BRANCH insn:req arg:req /* * Create an indirect branch. insn is one of call/jmp, arg is a single diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 8b77d7113b..bca1500e2b 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -824,8 +824,7 @@ handle_exception_saved: DISPATCH(X86_EXC_CP, do_entry_CP) #undef DISPATCH - call do_unhandled_trap - BUG /* do_unhandled_trap() shouldn't return. */ + tailcall do_unhandled_trap .L_exn_dispatch_done: mov %r15, STACK_CPUINFO_FIELD(xen_cr3)(%r14) @@ -880,8 +879,7 @@ exception_with_ints_disabled: FATAL_exception_with_ints_disabled: xorl %esi,%esi movq %rsp,%rdi - call fatal_trap - BUG /* fatal_trap() shouldn't return. */ + tailcall fatal_trap ENTRY(divide_error) ENDBR64 @@ -989,8 +987,7 @@ ENTRY(double_fault) .Ldblf_cr3_okay: movq %rsp,%rdi - call do_double_fault - BUG /* do_double_fault() shouldn't return. */ + tailcall do_double_fault ENTRY(nmi) ENDBR64 @@ -1085,8 +1082,7 @@ handle_ist_exception: DISPATCH(X86_EXC_MC, do_machine_check) #undef DISPATCH - call do_unhandled_trap - BUG /* do_unhandled_trap() shouldn't return. */ + tailcall do_unhandled_trap .L_ist_dispatch_done: mov %r15, STACK_CPUINFO_FIELD(xen_cr3)(%r14) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 07 07:22:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Jul 2023 07:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.560221.875960 (Exim 4.92) (envelope-from ) id 1qHfnB-0002r5-2C; Fri, 07 Jul 2023 07:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 560221.875960; Fri, 07 Jul 2023 07:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfnA-0002qx-Vw; Fri, 07 Jul 2023 07:22:12 +0000 Received: by outflank-mailman (input) for mailman id 560221; Fri, 07 Jul 2023 07:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfnA-0002qq-2O for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfnA-00024T-1c for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHfnA-00009L-0c for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22: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=tKGjTLH146To0RFwjDA64dDE8yRjVBixKZEh9WOb4TA=; b=y9msyDq9bsy1N3u/6wj1oMGDfg NNXUZItZ7mvIiXXtsgW1xDDWl6tVYzwKCEvt6WgF+cslAHwPNtjoAJlsMidn/ZnzoCA4g7uSEKIQr upWEKQ5TSUDTyNmioFCUXbREvJs0vpyoYg3tgTy88wUx7WUpA+emwhZ+u7kEWWui/Oeo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/types: Drop #ifdefary for __{SIZE,PTRDIFF}_TYPE__ Message-Id: Date: Fri, 07 Jul 2023 07:22:12 +0000 commit b2e688730a17e3d2af72d7f1f1729047054b0e83 Author: Andrew Cooper AuthorDate: Wed Jun 21 21:36:54 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Jul 5 15:20:04 2023 +0100 xen/types: Drop #ifdefary for __{SIZE,PTRDIFF}_TYPE__ All supported compilers have these types. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Alistair Francis Reviewed-by: Oleksii Kurochko --- xen/include/xen/types.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/xen/include/xen/types.h b/xen/include/xen/types.h index 6aba80500a..8b22a02eea 100644 --- a/xen/include/xen/types.h +++ b/xen/include/xen/types.h @@ -5,18 +5,11 @@ #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) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 07 07:22:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Jul 2023 07:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.560222.875965 (Exim 4.92) (envelope-from ) id 1qHfnL-0002tc-41; Fri, 07 Jul 2023 07:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 560222.875965; Fri, 07 Jul 2023 07:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfnL-0002tV-16; Fri, 07 Jul 2023 07:22:23 +0000 Received: by outflank-mailman (input) for mailman id 560222; Fri, 07 Jul 2023 07:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfnK-0002tL-79 for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfnK-00024a-6K for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHfnK-00009o-4a for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22: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=OhABO99LoStXG8GoCKf5NfOvrL5SR/CGMtM8ex8h6Mw=; b=iZ9CR5DcLUDAcYagF1Pex6x16s vlZYPniUQi7ceOkdXIgcwAQPMAGoUQxJVbqDNrgAqeZcOEWm/QLhsrejFwPJ3n4B/FG1ss1P8Q67Y I7yrxh6AiWYEhm1ljuj8SrHE85kipDjO6v6VTxUkSd3rA+q+E7AApibZTrNbmaXp0JpM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] treewide: Avoid including asm/types.h Message-Id: Date: Fri, 07 Jul 2023 07:22:22 +0000 commit fe9e78dbd369f52d92e6535b1cf8c84d8d9d28a6 Author: Andrew Cooper AuthorDate: Mon Jun 26 16:36:36 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Jul 5 15:20:04 2023 +0100 treewide: Avoid including asm/types.h We're about to rearrange the common and arch types.h split. While most users already include , a few do not and some files fail to compile as a result. Almost all logic is going to have types very early in the include chain. Drop the include entirely from C files, and swap to the common types.h in headers. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/arm64/lib/find_next_bit.c | 2 +- xen/arch/x86/cpu/mcheck/mce.h | 1 - xen/arch/x86/cpu/vpmu.c | 1 - xen/arch/x86/cpu/vpmu_intel.c | 1 - xen/arch/x86/hvm/hvm.c | 1 - xen/arch/x86/hvm/vmx/vvmx.c | 1 - xen/arch/x86/include/asm/byteorder.h | 2 +- xen/arch/x86/include/asm/hvm/svm/svmdebug.h | 2 +- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 3 ++- xen/arch/x86/include/asm/io_apic.h | 3 ++- xen/arch/x86/include/asm/page.h | 2 +- xen/arch/x86/include/asm/processor.h | 1 - xen/arch/x86/include/asm/x86_64/page.h | 2 +- xen/arch/x86/mm/p2m-ept.c | 1 - xen/common/trace.c | 1 - xen/drivers/char/arm-uart.c | 2 +- xen/include/xen/bitops.h | 2 +- xen/include/xen/spinlock.h | 3 ++- 18 files changed, 13 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/arm64/lib/find_next_bit.c b/xen/arch/arm/arm64/lib/find_next_bit.c index 8ebf8bfe97..ca6f82277e 100644 --- a/xen/arch/arm/arm64/lib/find_next_bit.c +++ b/xen/arch/arm/arm64/lib/find_next_bit.c @@ -9,7 +9,7 @@ * 2 of the License, or (at your option) any later version. */ #include -#include + #include #ifndef find_next_bit diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index bea08bdc74..dd5d258362 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -7,7 +7,6 @@ #include #include -#include #include #include diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index f31c32bcf3..a022126f18 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index bda5d511ac..fa5b40c65c 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index a67ef79dc0..57363c2ae1 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 1034534c97..16b0ef82b6 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -10,7 +10,6 @@ #include -#include #include #include #include diff --git a/xen/arch/x86/include/asm/byteorder.h b/xen/arch/x86/include/asm/byteorder.h index 1f77e502a5..e935f7b2b0 100644 --- a/xen/arch/x86/include/asm/byteorder.h +++ b/xen/arch/x86/include/asm/byteorder.h @@ -1,7 +1,7 @@ #ifndef __ASM_X86_BYTEORDER_H__ #define __ASM_X86_BYTEORDER_H__ -#include +#include #include static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) diff --git a/xen/arch/x86/include/asm/hvm/svm/svmdebug.h b/xen/arch/x86/include/asm/hvm/svm/svmdebug.h index f1cde676dc..2fb76ec24c 100644 --- a/xen/arch/x86/include/asm/hvm/svm/svmdebug.h +++ b/xen/arch/x86/include/asm/hvm/svm/svmdebug.h @@ -8,7 +8,7 @@ #ifndef __ASM_X86_HVM_SVM_SVMDEBUG_H__ #define __ASM_X86_HVM_SVM_SVMDEBUG_H__ -#include +#include #include void svm_sync_vmcb(struct vcpu *v, enum vmcb_sync_state new_state); diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmx.h b/xen/arch/x86/include/asm/hvm/vmx/vmx.h index 36c108d879..c84acc221d 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h @@ -8,7 +8,8 @@ #define __ASM_X86_HVM_VMX_VMX_H__ #include -#include +#include + #include #include #include diff --git a/xen/arch/x86/include/asm/io_apic.h b/xen/arch/x86/include/asm/io_apic.h index ef0878b09e..bd8cb95f46 100644 --- a/xen/arch/x86/include/asm/io_apic.h +++ b/xen/arch/x86/include/asm/io_apic.h @@ -1,7 +1,8 @@ #ifndef __ASM_IO_APIC_H #define __ASM_IO_APIC_H -#include +#include + #include #include #include diff --git a/xen/arch/x86/include/asm/page.h b/xen/arch/x86/include/asm/page.h index b585235d06..3647bb1260 100644 --- a/xen/arch/x86/include/asm/page.h +++ b/xen/arch/x86/include/asm/page.h @@ -9,7 +9,7 @@ #define PAGE_ORDER_1G 18 #ifndef __ASSEMBLY__ -# include +# include # include #endif diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index f983ff501d..3b3cf51814 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #endif diff --git a/xen/arch/x86/include/asm/x86_64/page.h b/xen/arch/x86/include/asm/x86_64/page.h index 26bdb4b19b..53faa7875b 100644 --- a/xen/arch/x86/include/asm/x86_64/page.h +++ b/xen/arch/x86/include/asm/x86_64/page.h @@ -19,7 +19,7 @@ static inline unsigned long canonicalise_addr(unsigned long addr) return addr & ~CANONICAL_MASK; } -#include +#include #include diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index ffd34a1cc6..85c4e8e54f 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/common/trace.c b/xen/common/trace.c index df4a719e4b..17d62f7056 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -16,7 +16,6 @@ * it's possible to reconstruct a chronological record of trace events. */ -#include #include #include #include diff --git a/xen/drivers/char/arm-uart.c b/xen/drivers/char/arm-uart.c index eeb9ceefc0..8098a968c2 100644 --- a/xen/drivers/char/arm-uart.c +++ b/xen/drivers/char/arm-uart.c @@ -18,7 +18,7 @@ */ #include -#include + #include #include #include diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index 33619a0873..4cd0310789 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -1,6 +1,6 @@ #ifndef _LINUX_BITOPS_H #define _LINUX_BITOPS_H -#include +#include /* * Create a contiguous bitmask starting at bit position @l and ending at diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index ca40c71c88..0a02a527dc 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -2,9 +2,10 @@ #define __SPINLOCK_H__ #include +#include + #include #include -#include #define SPINLOCK_CPU_BITS 12 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 07 07:22:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Jul 2023 07:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.560223.875969 (Exim 4.92) (envelope-from ) id 1qHfnV-0002x3-56; Fri, 07 Jul 2023 07:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 560223.875969; Fri, 07 Jul 2023 07:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfnV-0002ww-2a; Fri, 07 Jul 2023 07:22:33 +0000 Received: by outflank-mailman (input) for mailman id 560223; Fri, 07 Jul 2023 07:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfnU-0002wi-A9 for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfnU-00024m-9J for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHfnU-0000AD-8W for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22: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=2VXnlStfQcivsXTggLmeUMK7sXvjg1GZGw7e1J8yUr4=; b=TBHiml2l9kjM7aURyZyG+0grBp Hzz8wqMRU90xOvTTL0IyY3Pif5bVRM7xpHO7ABd3z6FR5yyQkOLsesKTBIfjQ4WzbOgw3z3glLRim 3d/Bo0hwhNgn7ATEtmdK6NIEzdaXSSp7AouLxUCsQFD4yH1OOGX6qsrl5Syi1WfZvYQc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/types: Rework stdint vs __{u,s}$N types Message-Id: Date: Fri, 07 Jul 2023 07:22:32 +0000 commit 1c139701ebaef5072ccfa5fdafc3bc60c650bb7e Author: Andrew Cooper AuthorDate: Wed Jun 21 21:44:37 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Jul 5 15:20:04 2023 +0100 xen/types: Rework stdint vs __{u,s}$N types Xen uses the stdint types. Rearrange the types headers to define the compatibility __{u,s}$N types in terms of the stdint types, not the other way around. All supported compilers on architectures other than x86 support the stdint __*_TYPE__ macros. Move these into a new xen/stdint.h to avoid them being duplicated in each architecture. For the very old x86 compilers, synthesize suitable types using GCC internals. This cleanup has the side effect of removing all use of the undocumented __signed__ GCC keyword. This is a vestigial remnant of `gcc -traditional` mode for dialetcs of C prior to the introduction of the signed keyword. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Oleksii Kurochko Reviewed-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/include/asm/types.h | 19 ------------------- xen/arch/riscv/include/asm/types.h | 19 ------------------- xen/arch/x86/include/asm/types.h | 14 -------------- xen/include/xen/stdint.h | 33 +++++++++++++++++++++++++++++++++ xen/include/xen/types.h | 20 +++++++++----------- 5 files changed, 42 insertions(+), 63 deletions(-) diff --git a/xen/arch/arm/include/asm/types.h b/xen/arch/arm/include/asm/types.h index fb6618ef24..545a5e9d11 100644 --- a/xen/arch/arm/include/asm/types.h +++ b/xen/arch/arm/include/asm/types.h @@ -1,25 +1,6 @@ #ifndef __ARM_TYPES_H__ #define __ARM_TYPES_H__ -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_ARM_32) -typedef __signed__ long long __s64; -typedef unsigned long long __u64; -#elif defined (CONFIG_ARM_64) -typedef __signed__ long __s64; -typedef unsigned long __u64; -#endif -#endif - typedef signed char s8; typedef unsigned char u8; diff --git a/xen/arch/riscv/include/asm/types.h b/xen/arch/riscv/include/asm/types.h index c2cdfd9caa..ab222de337 100644 --- a/xen/arch/riscv/include/asm/types.h +++ b/xen/arch/riscv/include/asm/types.h @@ -3,25 +3,6 @@ #ifndef __RISCV_TYPES_H__ #define __RISCV_TYPES_H__ -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; diff --git a/xen/arch/x86/include/asm/types.h b/xen/arch/x86/include/asm/types.h index 2d56aed667..c9d2577165 100644 --- a/xen/arch/x86/include/asm/types.h +++ b/xen/arch/x86/include/asm/types.h @@ -1,20 +1,6 @@ #ifndef __X86_TYPES_H__ #define __X86_TYPES_H__ -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__) -typedef __signed__ long __s64; -typedef unsigned long __u64; -#endif - typedef signed char s8; typedef unsigned char u8; diff --git a/xen/include/xen/stdint.h b/xen/include/xen/stdint.h new file mode 100644 index 0000000000..a40165c6ae --- /dev/null +++ b/xen/include/xen/stdint.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __XEN_STDINT_H__ +#define __XEN_STDINT_H__ + +#ifndef __INT8_TYPE__ /* GCC <= 4.4 */ + +/* + * Define the types using GCC internal notation. Clang understands this too. + * https://gcc.gnu.org/onlinedocs/gcc/Common-Variable-Attributes.html + */ +typedef signed __attribute__((__mode__(__QI__))) int8_t; +typedef unsigned __attribute__((__mode__(__QI__))) uint8_t; +typedef signed __attribute__((__mode__(__HI__))) int16_t; +typedef unsigned __attribute__((__mode__(__HI__))) uint16_t; +typedef signed __attribute__((__mode__(__SI__))) int32_t; +typedef unsigned __attribute__((__mode__(__SI__))) uint32_t; +typedef signed __attribute__((__mode__(__DI__))) int64_t; +typedef unsigned __attribute__((__mode__(__DI__))) uint64_t; + +#else + +typedef __INT8_TYPE__ int8_t; +typedef __UINT8_TYPE__ uint8_t; +typedef __INT16_TYPE__ int16_t; +typedef __UINT16_TYPE__ uint16_t; +typedef __INT32_TYPE__ int32_t; +typedef __UINT32_TYPE__ uint32_t; +typedef __INT64_TYPE__ int64_t; +typedef __UINT64_TYPE__ uint64_t; + +#endif + +#endif /* __XEN_STDINT_H__ */ diff --git a/xen/include/xen/types.h b/xen/include/xen/types.h index 8b22a02eea..c873c81ccf 100644 --- a/xen/include/xen/types.h +++ b/xen/include/xen/types.h @@ -2,6 +2,7 @@ #define __TYPES_H__ #include +#include #include @@ -39,17 +40,14 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; #define LONG_MIN (-LONG_MAX - 1) #define ULONG_MAX (~0UL) -typedef __u8 uint8_t; -typedef __s8 int8_t; - -typedef __u16 uint16_t; -typedef __s16 int16_t; - -typedef __u32 uint32_t; -typedef __s32 int32_t; - -typedef __u64 uint64_t; -typedef __s64 int64_t; +typedef uint8_t __u8; +typedef int8_t __s8; +typedef uint16_t __u16; +typedef int16_t __s16; +typedef uint32_t __u32; +typedef int32_t __s32; +typedef uint64_t __u64; +typedef int64_t __s64; typedef __u16 __le16; typedef __u16 __be16; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 07 07:22:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Jul 2023 07:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.560224.875974 (Exim 4.92) (envelope-from ) id 1qHfng-0002zi-7c; Fri, 07 Jul 2023 07:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 560224.875974; Fri, 07 Jul 2023 07:22: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 1qHfng-0002za-4G; Fri, 07 Jul 2023 07:22:44 +0000 Received: by outflank-mailman (input) for mailman id 560224; Fri, 07 Jul 2023 07:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfne-0002zP-Ej for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfne-00024t-Dy for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHfne-0000Ak-BU for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22:42 +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=hvYwao6PwEiX7+3rzVPOSsTNBFdB1pYaqlaQ7b0mk2o=; b=AUKvsEIGL4MXpAvxNTXnJ/sDL5 x9dMhRznl6te8+JtUG2q1iy8SUbJxu7P5OWHBDatLSJOHLvC4QakK47nnEAl65Dy9SfIEHwik14wJ rLPlcXGHPLzTg01rDXxPt0xv3arO8BfNNhSikJv+qI8KSTiJIf+/8qpPpdLtOkAfSmoY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/microcode: Allow reading microcode revision even if it can't be updated Message-Id: Date: Fri, 07 Jul 2023 07:22:42 +0000 commit a00f12055d266a034eb05962810cba4f6b9b0300 Author: Alejandro Vallejo AuthorDate: Thu Jul 6 09:05:37 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jul 6 09:05:37 2023 +0200 x86/microcode: Allow reading microcode revision even if it can't be updated microcode_update_one() currently assumes all microcode handlers are set or none are. That won't be the case in a future patch, as apply_microcode() may not be set while the others are. Hence, this patch allows reading the microcode revision even if updating it is unavailable. Signed-off-by: Alejandro Vallejo Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/microcode/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index c3fee62906..bec8b55db2 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -750,11 +750,12 @@ __initcall(microcode_init); /* Load a cached update to current cpu */ int microcode_update_one(void) { + if ( ucode_ops.collect_cpu_info ) + alternative_vcall(ucode_ops.collect_cpu_info); + if ( !ucode_ops.apply_microcode ) return -EOPNOTSUPP; - alternative_vcall(ucode_ops.collect_cpu_info); - return microcode_update_cpu(NULL); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 07 07:22:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Jul 2023 07:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.560225.875977 (Exim 4.92) (envelope-from ) id 1qHfnq-00033K-AI; Fri, 07 Jul 2023 07:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 560225.875977; Fri, 07 Jul 2023 07:22: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 1qHfnq-00033A-70; Fri, 07 Jul 2023 07:22:54 +0000 Received: by outflank-mailman (input) for mailman id 560225; Fri, 07 Jul 2023 07:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfno-00032d-IE for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfno-000254-HT for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHfno-0000BE-GU for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:22:52 +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=4ZXpOo/jJhrt1h8ZzXuCRmeAlNWoVRgE/VCJzujnMOs=; b=Tx3tpXaK1YaFDdazc8N5rcUWlS M+DxZOvHojf1i2fCaqtWO7cPa/OJIjZVjx0apLf4k6zzkxcxKpu6tFE4a8VtMpoNxVd3dIGwAsgNX 9G1WLh9niw+ZJ4w7vqct4GLPRUyxIU+OCBinMWvrc1QT7fd+11ASAZRRwaiVz10Z26Mk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xenstore: talloc.h needs to include stdarg.h Message-Id: Date: Fri, 07 Jul 2023 07:22:52 +0000 commit 68c85cf3a83a54fe20cc5feb8365848b7b12ee8e Author: Jan Beulich AuthorDate: Thu Jul 6 09:06:27 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jul 6 09:06:27 2023 +0200 xenstore: talloc.h needs to include stdarg.h talloc_vasprintf() has a va_list type parameter, so this type needs to be defined (independent of the particular libc implementation). Fixes: 63b6419d2a2d ("tools/xenstore: split out rest of live update control code") Signed-off-by: Jan Beulich Reviewed-by: Juergen Gross --- tools/xenstore/talloc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/xenstore/talloc.h b/tools/xenstore/talloc.h index a0f4bff257..518fcac151 100644 --- a/tools/xenstore/talloc.h +++ b/tools/xenstore/talloc.h @@ -24,6 +24,7 @@ License along with this library; If not, see . */ +#include #include #include "utils.h" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 07 07:23:03 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Jul 2023 07:23:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.560229.875991 (Exim 4.92) (envelope-from ) id 1qHfnz-0003L1-Ih; Fri, 07 Jul 2023 07:23:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 560229.875991; Fri, 07 Jul 2023 07:23: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 1qHfnz-0003Ko-FY; Fri, 07 Jul 2023 07:23:03 +0000 Received: by outflank-mailman (input) for mailman id 560229; Fri, 07 Jul 2023 07:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfny-0003Ka-L0 for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHfny-00025p-KI for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qHfny-0000Bo-JT for xen-changelog@lists.xenproject.org; Fri, 07 Jul 2023 07:23: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=3fz6TIUFtFv9ozUAjKnKXAFEPGcxvGEOQ/E+cpe5Wto=; b=CFUxTKbvQR3BOAAjIihzyvIwPY 6nyYvcJuqvhTlNLBdKRGXFTDqdYEn9CkrICRXrh5wLZSw2+C3LTD4Hff1a1U+LmGR3Ib4YA76NCk1 J1ezWwqZPjW+qTCxaa4OHl7rxAf/SXvoh8ovmP2t6pret5PnFrwBKnX9xGEQ5LnTyqRc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] ppc: make also linking work with big-endian tool chain Message-Id: Date: Fri, 07 Jul 2023 07:23:02 +0000 commit 886c22f00c575199f7bb3dc5b7662dd09bf05146 Author: Jan Beulich AuthorDate: Thu Jul 6 09:06:48 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jul 6 09:06:48 2023 +0200 ppc: make also linking work with big-endian tool chain Telling just the compiler to produce little-endian objects isn't enough. Signed-off-by: Jan Beulich Acked-by: Shawn Anastasio --- xen/arch/ppc/arch.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/ppc/arch.mk b/xen/arch/ppc/arch.mk index ec2a6136f4..7eec22c283 100644 --- a/xen/arch/ppc/arch.mk +++ b/xen/arch/ppc/arch.mk @@ -7,6 +7,8 @@ ppc-march-$(CONFIG_POWER_ISA_3_00) := power9 CFLAGS += -m64 -mlittle-endian -mcpu=$(ppc-march-y) CFLAGS += -mstrict-align -mcmodel=large -mabi=elfv2 -mno-altivec -mno-vsx +LDFLAGS += -m elf64lppc + # TODO: Drop override when more of the build is working override ALL_OBJS-y = arch/$(SRCARCH)/built_in.o override ALL_LIBS-y = -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jul 10 22:33:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Jul 2023 22:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.561424.877869 (Exim 4.92) (envelope-from ) id 1qIzRG-0002fG-Jk; Mon, 10 Jul 2023 22:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 561424.877869; Mon, 10 Jul 2023 22:33:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qIzRG-0002f8-H8; Mon, 10 Jul 2023 22:33:02 +0000 Received: by outflank-mailman (input) for mailman id 561424; Mon, 10 Jul 2023 22:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qIzRF-0002ez-M6 for xen-changelog@lists.xenproject.org; Mon, 10 Jul 2023 22:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qIzRF-0003wF-LA for xen-changelog@lists.xenproject.org; Mon, 10 Jul 2023 22:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qIzRF-00082m-Jg for xen-changelog@lists.xenproject.org; Mon, 10 Jul 2023 22:33: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=HSxImnkr+shU96yLGzL1hOycUcWggV43oy4/wsJ79Ic=; b=LKmNNFuZ1mfP5c9LDuVRctuvLg KwPiaujJ7t8bYKQp7KxP+yf6bPDvB82Sdq+07NzwNFTN+EfaFRVToFpVvQvBlU949fg2kxqizTzXL ACcwbjC3AnBn/YNvqzvYNRRPWAmGuHN60/lpSyRRY0r74rYcF11hO/2U9XjSiaCHzKBs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] multiboot2: parse vga= option when setting GOP mode Message-Id: Date: Mon, 10 Jul 2023 22:33:01 +0000 commit c93aa5c5d0a9f92c0a62c1992d5e52435fa24f15 Author: Roger Pau Monné AuthorDate: Mon Jul 10 12:17:45 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 10 12:17:45 2023 +0200 multiboot2: parse vga= option when setting GOP mode Introduce support for passing the command line to the efi_multiboot2() helper, and parse the vga= option if present. Add support for the 'gfx' and 'current' vga options, ignore the 'keep' option, and print a warning message about other options not being currently implemented. Note that the multboot2 command line string must always be zero-terminated according to the multiboot2 specification, and hence there's no need to pass the string size to efi_multiboot2(). Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/boot/head.S | 13 +++++-- xen/arch/x86/efi/efi-boot.h | 74 +++++++++++++++++++++++++++++++++++++-- xen/arch/x86/x86_64/asm-offsets.c | 1 + 3 files changed, 84 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index e03f52c755..1eb829ab41 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -237,9 +237,10 @@ __efi64_mb2_start: jmp x86_32_switch .Lefi_multiboot2_proto: - /* Zero EFI SystemTable and EFI ImageHandle addresses. */ + /* Zero EFI SystemTable, EFI ImageHandle addresses and cmdline. */ xor %esi,%esi xor %edi,%edi + xor %edx,%edx /* Skip Multiboot2 information fixed part. */ lea (MB2_fixed_sizeof+MULTIBOOT2_TAG_ALIGN-1)(%rbx),%ecx @@ -277,6 +278,13 @@ __efi64_mb2_start: cmove MB2_efi64_ih(%rcx),%rdi je .Lefi_mb2_next_tag + /* Get command line from Multiboot2 information. */ + cmpl $MULTIBOOT2_TAG_TYPE_CMDLINE, MB2_tag_type(%rcx) + jne .Lno_cmdline + lea MB2_tag_string(%rcx), %rdx + jmp .Lefi_mb2_next_tag +.Lno_cmdline: + /* Is it the end of Multiboot2 information? */ cmpl $MULTIBOOT2_TAG_TYPE_END,MB2_tag_type(%rcx) je .Lrun_bs @@ -340,7 +348,8 @@ __efi64_mb2_start: /* * efi_multiboot2() is called according to System V AMD64 ABI: - * - IN: %rdi - EFI ImageHandle, %rsi - EFI SystemTable. + * - IN: %rdi - EFI ImageHandle, %rsi - EFI SystemTable, + * %rdx - MB2 cmdline */ call efi_multiboot2 diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 64c1a02cf1..88e715f4dd 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -795,7 +795,30 @@ static bool __init efi_arch_use_config_file(EFI_SYSTEM_TABLE *SystemTable) static void __init efi_arch_flush_dcache_area(const void *vaddr, UINTN size) { } -void __init efi_multiboot2(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) +/* Return a pointer to the character after the first occurrence of opt in cmd */ +static const char *__init get_option(const char *cmd, const char *opt) +{ + const char *s = cmd, *o = NULL; + + if ( !cmd || !opt ) + return NULL; + + while ( (s = strstr(s, opt)) != NULL ) + { + if ( s == cmd || *(s - 1) == ' ' || *(s - 1) == '\t' ) + { + o = s + strlen(opt); + break; + } + + s += strlen(opt); + } + + return o; +} + +void __init efi_multiboot2(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable, + const char *cmdline) { EFI_GRAPHICS_OUTPUT_PROTOCOL *gop; EFI_HANDLE gop_handle; @@ -816,7 +839,54 @@ void __init efi_multiboot2(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable if ( gop ) { - gop_mode = efi_find_gop_mode(gop, 0, 0, 0); + const char *cur = cmdline; + unsigned int width = 0, height = 0, depth = 0; + bool keep_current = false; + + while ( (cur = get_option(cur, "vga=")) != NULL ) + { +#define VALID_TERMINATOR(c) \ + (*(c) == ' ' || *(c) == '\t' || *(c) == '\0' || *(c) == ',') + if ( !strncmp(cur, "gfx-", 4) ) + { + width = simple_strtoul(cur + 4, &cur, 10); + + if ( *cur == 'x' ) + height = simple_strtoul(cur + 1, &cur, 10); + else + goto error; + + if ( *cur == 'x' ) + depth = simple_strtoul(cur + 1, &cur, 10); + else + goto error; + + if ( !VALID_TERMINATOR(cur) ) + { + error: + PrintErr(L"Warning: Invalid gfx- option detected\r\n"); + width = height = depth = 0; + } + keep_current = false; + } + else if ( !strncmp(cur, "current", 7) && VALID_TERMINATOR(cur + 7) ) + keep_current = true; + else if ( !strncmp(cur, "keep", 4) && VALID_TERMINATOR(cur + 4) ) + { + /* Ignore, handled in later vga= parsing. */ + } + else + { + /* Fallback to defaults if unimplemented. */ + width = height = depth = 0; + keep_current = false; + PrintErr(L"Warning: Cannot use selected vga option\r\n"); + } +#undef VALID_TERMINATOR + } + + if ( !keep_current ) + gop_mode = efi_find_gop_mode(gop, width, height, depth); efi_arch_edid(gop_handle); } diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index 287dac101a..fbd6c54188 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -175,6 +175,7 @@ void __dummy__(void) OFFSET(MB2_mem_lower, multiboot2_tag_basic_meminfo_t, mem_lower); OFFSET(MB2_efi64_st, multiboot2_tag_efi64_t, pointer); OFFSET(MB2_efi64_ih, multiboot2_tag_efi64_ih_t, pointer); + OFFSET(MB2_tag_string, multiboot2_tag_string_t, string); BLANK(); OFFSET(DOMAIN_vm_assist, struct domain, vm_assist); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jul 10 22:33:12 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Jul 2023 22:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.561425.877872 (Exim 4.92) (envelope-from ) id 1qIzRQ-0002hR-LB; Mon, 10 Jul 2023 22:33:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 561425.877872; Mon, 10 Jul 2023 22:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qIzRQ-0002hJ-Id; Mon, 10 Jul 2023 22:33:12 +0000 Received: by outflank-mailman (input) for mailman id 561425; Mon, 10 Jul 2023 22:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qIzRP-0002h0-Ou for xen-changelog@lists.xenproject.org; Mon, 10 Jul 2023 22:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qIzRP-0003wg-OF for xen-changelog@lists.xenproject.org; Mon, 10 Jul 2023 22:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qIzRP-00083D-NM for xen-changelog@lists.xenproject.org; Mon, 10 Jul 2023 22:33:11 +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=ldUl7VjCYEB4xly0o1aJxGTabwXCqyNQ/mpgz9UE/TY=; b=ndYaUADVdjwDtiTD9sOhx2AUyk uvym3dt9g+X3tBKa/Nmpceb72YAjThvBKFVXpakt9Gic/qS6HEyq4x2T4o1qP9lIUGbIwk+E19AHL NbvAazjP+PxsjIdDRkGrXn6X3ec4QeFgpM0cG7xF8IJQs33GJLbcXX0yLSYFUfXO8fBA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] multiboot2: do not set StdOut mode unconditionally Message-Id: Date: Mon, 10 Jul 2023 22:33:11 +0000 commit 60474e8e281807f384f4768a464d71406d0cf659 Author: Roger Pau Monné AuthorDate: Mon Jul 10 12:18:39 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 10 12:18:39 2023 +0200 multiboot2: do not set StdOut mode unconditionally Only initialize StdOut if the current StdOut mode is unusable. This avoids forcefully switching StdOut to the maximum supported resolution, and thus very likely changing the GOP mode without having first parsed the command line options. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/efi/efi-boot.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 88e715f4dd..92f4cfe8bd 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -829,7 +829,13 @@ void __init efi_multiboot2(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable efi_init(ImageHandle, SystemTable); - efi_console_set_mode(); + if ( StdOut->QueryMode(StdOut, StdOut->Mode->Mode, + &cols, &rows) != EFI_SUCCESS ) + /* + * If active StdOut mode is invalid init ConOut (StdOut) to the max + * supported size. + */ + efi_console_set_mode(); if ( StdOut->QueryMode(StdOut, StdOut->Mode->Mode, &cols, &rows) == EFI_SUCCESS ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jul 10 22:33:22 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Jul 2023 22:33:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.561426.877877 (Exim 4.92) (envelope-from ) id 1qIzRa-0002kS-Mg; Mon, 10 Jul 2023 22:33:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 561426.877877; Mon, 10 Jul 2023 22:33:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qIzRa-0002kL-K4; Mon, 10 Jul 2023 22:33:22 +0000 Received: by outflank-mailman (input) for mailman id 561426; Mon, 10 Jul 2023 22:33:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qIzRZ-0002k8-TW for xen-changelog@lists.xenproject.org; Mon, 10 Jul 2023 22:33:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qIzRZ-0003wp-Ss for xen-changelog@lists.xenproject.org; Mon, 10 Jul 2023 22:33:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qIzRZ-00083j-QI for xen-changelog@lists.xenproject.org; Mon, 10 Jul 2023 22:33:21 +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=sjvo3aE0Y12Ik5qzF9lKGK1WFVDf31+FR32skMK5fpE=; b=k7TTYnE+vG1AQsIBqKS8ucOEJe A0OSvZcHYWRGtMK8iYTGj2B06oQAer37CUSm7qkh579sZrMH6ynrO0ZFnyI7kEwt8P8QxkFONIvBJ mmeoYPHH/VYWBF2XPIlI0UVsJrhUV8yNGVSyq84XDYcCKzuAYEd3z4zeR+CJKMroQ+1A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] cmdline: parse multiple instances of the vga option Message-Id: Date: Mon, 10 Jul 2023 22:33:21 +0000 commit 9473d9a241827b90b7f6db32b93e12bc77e2e44f Author: Roger Pau Monné AuthorDate: Mon Jul 10 12:19:03 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 10 12:19:03 2023 +0200 cmdline: parse multiple instances of the vga option Parse all instances of the vga= option on the command line, in order to always enforce the last selection on the command line. Note that it's not safe to parse just the last occurrence of the vga= option, as then a command line with `vga=current vga=keep` would result in current being ignored. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/boot/cmdline.c | 83 +++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/xen/arch/x86/boot/cmdline.c b/xen/arch/x86/boot/cmdline.c index fc11c6d3c5..10dcc6142c 100644 --- a/xen/arch/x86/boot/cmdline.c +++ b/xen/arch/x86/boot/cmdline.c @@ -277,59 +277,60 @@ static u16 rows2vmode(unsigned int rows) static void vga_parse(const char *cmdline, early_boot_opts_t *ebo) { - const char *c; - unsigned int tmp, vesa_depth, vesa_height, vesa_width; - - c = find_opt(cmdline, "vga=", true); - - if ( !c ) - return; + const char *c = cmdline; ebo->boot_vid_mode = ASK_VGA; - if ( !strmaxcmp(c, "current", delim_chars_comma) ) - ebo->boot_vid_mode = VIDEO_CURRENT_MODE; - else if ( !strsubcmp(c, "text-80x") ) - { - c += strlen("text-80x"); - ebo->boot_vid_mode = rows2vmode(strtoui(c, delim_chars_comma, NULL)); - } - else if ( !strsubcmp(c, "gfx-") ) + while ( (c = find_opt(c, "vga=", true)) != NULL ) { - vesa_width = strtoui(c + strlen("gfx-"), "x", &c); + unsigned int tmp, vesa_depth, vesa_height, vesa_width; + + if ( !strmaxcmp(c, "current", delim_chars_comma) ) + ebo->boot_vid_mode = VIDEO_CURRENT_MODE; + else if ( !strsubcmp(c, "text-80x") ) + { + c += strlen("text-80x"); + ebo->boot_vid_mode = rows2vmode(strtoui(c, delim_chars_comma, NULL)); + } + else if ( !strsubcmp(c, "gfx-") ) + { + vesa_width = strtoui(c + strlen("gfx-"), "x", &c); - if ( vesa_width > U16_MAX ) - return; + if ( vesa_width > U16_MAX ) + return; - /* - * Increment c outside of strtoui() because otherwise some - * compiler may complain with following message: - * warning: operation on 'c' may be undefined. - */ - ++c; - vesa_height = strtoui(c, "x", &c); + /* + * Increment c outside of strtoui() because otherwise some + * compiler may complain with following message: + * warning: operation on 'c' may be undefined. + */ + ++c; + vesa_height = strtoui(c, "x", &c); - if ( vesa_height > U16_MAX ) - return; + if ( vesa_height > U16_MAX ) + return; - vesa_depth = strtoui(++c, delim_chars_comma, NULL); + vesa_depth = strtoui(++c, delim_chars_comma, NULL); - if ( vesa_depth > U16_MAX ) - return; + if ( vesa_depth > U16_MAX ) + return; - ebo->vesa_width = vesa_width; - ebo->vesa_height = vesa_height; - ebo->vesa_depth = vesa_depth; - ebo->boot_vid_mode = VIDEO_VESA_BY_SIZE; - } - else if ( !strsubcmp(c, "mode-") ) - { - tmp = strtoui(c + strlen("mode-"), delim_chars_comma, NULL); + ebo->vesa_width = vesa_width; + ebo->vesa_height = vesa_height; + ebo->vesa_depth = vesa_depth; + ebo->boot_vid_mode = VIDEO_VESA_BY_SIZE; + } + else if ( !strsubcmp(c, "mode-") ) + { + tmp = strtoui(c + strlen("mode-"), delim_chars_comma, NULL); - if ( tmp > U16_MAX ) - return; + if ( tmp > U16_MAX ) + return; - ebo->boot_vid_mode = tmp; + ebo->boot_vid_mode = tmp; + } + else if ( !strmaxcmp(c, "ask", delim_chars_comma) ) + ebo->boot_vid_mode = ASK_VGA; } } #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jul 10 22:33:32 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Jul 2023 22:33:32 +0000 Received: from list by lists.xenproject.org with outflank-mailman.561427.877882 (Exim 4.92) (envelope-from ) id 1qIzRk-0002na-Os; Mon, 10 Jul 2023 22:33:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 561427.877882; Mon, 10 Jul 2023 22:33:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qIzRk-0002nS-LX; Mon, 10 Jul 2023 22:33:32 +0000 Received: by outflank-mailman (input) for mailman id 561427; Mon, 10 Jul 2023 22:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qIzRk-0002nI-0I for xen-changelog@lists.xenproject.org; Mon, 10 Jul 2023 22:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qIzRj-0003wx-Vv for xen-changelog@lists.xenproject.org; Mon, 10 Jul 2023 22:33:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qIzRj-00084O-V0 for xen-changelog@lists.xenproject.org; Mon, 10 Jul 2023 22:33:31 +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=dct6B4e8Sw2LqR7iWJXvANLa46c7MBl0kZHjJK9QyoQ=; b=rr1E64UQmMcCtgGeiF0dZz3Oml l9URIFm+nq5yQL8cmn8Mi4SvpHVVvSzBw2XR18fyq0wncWnQXWI4oHzo5HBg00A/2b6DsQUs9v/gF GRLCKem92CdPS9jlu3baf9+etE9YDGnMMvK0JJbG9hF4H/I7jXlDEc1r2fg/UJ1v7y5U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] iommu/amd-vi: avoid pointless flushes in invalidate_all_domain_pages() Message-Id: Date: Mon, 10 Jul 2023 22:33:31 +0000 commit fd62986f6b776876f3028a755c859d02e55dc262 Author: Roger Pau Monné AuthorDate: Mon Jul 10 12:19:25 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 10 12:19:25 2023 +0200 iommu/amd-vi: avoid pointless flushes in invalidate_all_domain_pages() Fix invalidate_all_domain_pages() to only attempt to flush the domains that have IOMMU enabled, otherwise the flush is pointless. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/drivers/passthrough/amd/iommu_init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 7dbd7e7d09..af6713d2fc 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -1532,8 +1532,10 @@ int __init amd_iommu_init_late(void) static void invalidate_all_domain_pages(void) { struct domain *d; + for_each_domain( d ) - amd_iommu_flush_all_pages(d); + if ( is_iommu_enabled(d) ) + amd_iommu_flush_all_pages(d); } static int cf_check _invalidate_all_devices( -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jul 11 09:44:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Jul 2023 09:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.561709.878219 (Exim 4.92) (envelope-from ) id 1qJ9uc-0002wt-VL; Tue, 11 Jul 2023 09:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 561709.878219; Tue, 11 Jul 2023 09:44:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJ9uc-0002wl-So; Tue, 11 Jul 2023 09:44:02 +0000 Received: by outflank-mailman (input) for mailman id 561709; Tue, 11 Jul 2023 09:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJ9ub-0002wf-Tc for xen-changelog@lists.xenproject.org; Tue, 11 Jul 2023 09:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJ9ub-00035V-Sm for xen-changelog@lists.xenproject.org; Tue, 11 Jul 2023 09:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qJ9ub-0003er-Rg for xen-changelog@lists.xenproject.org; Tue, 11 Jul 2023 09: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=FSF03/wns8XyQwx2C5XLxjjP4UEJcVtalDqsLnV9AKY=; b=hseXWjBginHXsGDgJCfqYw8cXx GxM68a9uFbqNzARxi0pkYuT9Cd5zCr0vF9GAIBa/UX8LhV+a3YcFThw4eXrlKsDKo//tQk/5FRck0 b7hNi8famJE2BYQprDIUyi2qqM5JUVGTBa5fD3gBV846vkWkoNskSKVRBodsx50BNmB0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] cmdline: only set ask mode if vga= is present Message-Id: Date: Tue, 11 Jul 2023 09:44:01 +0000 commit b831326ee2f9ed94523b3d8b0fb2da2a82113e9e Author: Roger Pau Monné AuthorDate: Mon Jul 10 18:35:09 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 10 18:35:09 2023 +0200 cmdline: only set ask mode if vga= is present Commit 9473d9a24182 set the ASK mode without checking if there was a `vga` option provided in the command line. This breaks existing behavior, so exit early without changes if `vga` is not present in the command line. Fixes: 9473d9a24182 ('cmdline: parse multiple instances of the vga option') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/boot/cmdline.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/boot/cmdline.c b/xen/arch/x86/boot/cmdline.c index 10dcc6142c..74997703b3 100644 --- a/xen/arch/x86/boot/cmdline.c +++ b/xen/arch/x86/boot/cmdline.c @@ -279,9 +279,13 @@ static void vga_parse(const char *cmdline, early_boot_opts_t *ebo) { const char *c = cmdline; + c = find_opt(c, "vga=", true); + if ( !c ) + return; + ebo->boot_vid_mode = ASK_VGA; - while ( (c = find_opt(c, "vga=", true)) != NULL ) + do { unsigned int tmp, vesa_depth, vesa_height, vesa_width; @@ -332,6 +336,7 @@ static void vga_parse(const char *cmdline, early_boot_opts_t *ebo) else if ( !strmaxcmp(c, "ask", delim_chars_comma) ) ebo->boot_vid_mode = ASK_VGA; } + while ( (c = find_opt(c, "vga=", true)) != NULL ); } #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 12 21:22:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Jul 2023 21:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.562852.879592 (Exim 4.92) (envelope-from ) id 1qJhHf-0006ho-DR; Wed, 12 Jul 2023 21:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 562852.879592; Wed, 12 Jul 2023 21:22: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 1qJhHf-0006hg-AK; Wed, 12 Jul 2023 21:22:03 +0000 Received: by outflank-mailman (input) for mailman id 562852; Wed, 12 Jul 2023 21:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJhHe-0006ha-5M for xen-changelog@lists.xenproject.org; Wed, 12 Jul 2023 21:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJhHe-0003iJ-4S for xen-changelog@lists.xenproject.org; Wed, 12 Jul 2023 21:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qJhHe-0003ge-3D for xen-changelog@lists.xenproject.org; Wed, 12 Jul 2023 21:22: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=hG0iKWLb0/ytmiSo73IorzhPpbgBDB3OIEnGuyQBMNI=; b=SmZxjdJs5A9MCJ3S/qgDWkR6zA 4/n5Lpd82nibQl4tOvuZWBVc2xRutGWnqnPYYJ2xoS/AIBf3tQcvRPZ00O6AfeiXP5lAWkCYFqoEM IoXeUenBvsAm4tHn5INNb8EAxtRjRakupHr8NYGiSb7c7+penFU1JnzGEi4wI12x6Un8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: add Rule 7.4 and 9.4 Message-Id: Date: Wed, 12 Jul 2023 21:22:02 +0000 commit 67f6063b1bf0a100b0ed9c98d80533fb712e6013 Author: Stefano Stabellini AuthorDate: Mon Jul 10 13:28:35 2023 -0700 Commit: Stefano Stabellini CommitDate: Tue Jul 11 13:14:12 2023 -0700 docs/misra: add Rule 7.4 and 9.4 Rule 9.4 is non-controversial and we have no violations. Rule 7.4 is considered a good idea with the caveat that assigning a string literal to const void is allowed. I added a note to specify it. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich Reviewed-by: Luca Fancellu --- docs/misra/rules.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index 622f35410c..72aa986bce 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -203,6 +203,15 @@ maintainers if you want to suggest a change. - The lowercase character l shall not be used in a literal suffix - + * - `Rule 7.4 `_ + - Required + - A string literal shall not be assigned to an object unless the + object type is pointer to const-qualified char + - All "character types" are permitted, as long as the string + element type and the character type match. (There should be no + casts.) Assigning a string literal to any object with type + "pointer to const-qualified void" is allowed. + * - `Rule 8.1 `_ - Required - Types shall be explicitly specified @@ -275,6 +284,11 @@ maintainers if you want to suggest a change. braces - + * - `Rule 9.4 `_ + - Required + - An element of an object shall not be initialized more than once + - + * - `Rule 12.5 `_ - Mandatory - The sizeof operator shall not have an operand which is a function -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 12 21:22:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Jul 2023 21:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.562853.879596 (Exim 4.92) (envelope-from ) id 1qJhHp-0006jl-Ep; Wed, 12 Jul 2023 21:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 562853.879596; Wed, 12 Jul 2023 21:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJhHp-0006jd-Be; Wed, 12 Jul 2023 21:22:13 +0000 Received: by outflank-mailman (input) for mailman id 562853; Wed, 12 Jul 2023 21:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJhHo-0006jT-9o for xen-changelog@lists.xenproject.org; Wed, 12 Jul 2023 21:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJhHo-0003iR-95 for xen-changelog@lists.xenproject.org; Wed, 12 Jul 2023 21:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qJhHo-0003hX-7m for xen-changelog@lists.xenproject.org; Wed, 12 Jul 2023 21:22: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=hG9lrrG9KDc22dcK17rTvTb1evrKdxWcfyhGqXm+O8Q=; b=q8MWBYtQHnEP2YloUr52VsDyLN z3UrliNDVW8R/mPq7vf8JYH8lsd4jEJGanUwt42uYWt7uwpnHgFUNFh//Wz1F6qmwEBNOu43CHYug rFOCq7AJFjb2q8hCAweCqT8UcQCmlUIPs7pmMk/m63oGxWOEKgMFneHCyYlAmuuUs5/U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/emul: fix violations of MISRA C:2012 Rule 8.3 on parameter names Message-Id: Date: Wed, 12 Jul 2023 21:22:12 +0000 commit 2402591437599489627a15dd75e85b970b98c150 Author: Federico Serafini AuthorDate: Mon Jul 10 16:15:59 2023 +0200 Commit: Stefano Stabellini CommitDate: Tue Jul 11 13:15:05 2023 -0700 x86/emul: fix violations of MISRA C:2012 Rule 8.3 on parameter names The headline of MISRA C:2012 Rule 8.3 states that: "All declarations of an object or function shall use the same names and type qualifiers". Change parameter names to meet the following requirements: 1) keep consistency between declarations and the corresponding definitions thus fixing violations of the Rule 8.3; 2) use the globally-adopted shorthands (e.g., 's' to denote a 'state'); 3) keep adjacent declarations consistent with respect to the parameter names that are used. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/x86_emulate/x86_emulate.c | 54 +++++++++++++++++----------------- xen/arch/x86/x86_emulate/x86_emulate.h | 26 ++++++++-------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index be2e3c6b11..2de1be7996 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -8446,12 +8446,12 @@ int x86_emul_rmw( void *ptr, unsigned int bytes, uint32_t *eflags, - struct x86_emulate_state *state, + struct x86_emulate_state *s, struct x86_emulate_ctxt *ctxt) { unsigned long *dst = ptr; - ASSERT(bytes == state->op_bytes); + ASSERT(bytes == s->op_bytes); /* * We cannot use Jcc below, as this code executes with the guest status flags @@ -8469,23 +8469,23 @@ int x86_emul_rmw( ".L" #op "%=:\n\t" \ #op - switch ( state->rmw ) + switch ( s->rmw ) { #define UNOP(op) \ case rmw_##op: \ _emulate_1op(COND_LOCK(op), dst, bytes, *eflags, \ - "c" ((long)state->lock_prefix) ); \ + "c" ((long)s->lock_prefix) ); \ break #define BINOP(op, sfx) \ case rmw_##op: \ _emulate_2op_SrcV##sfx(COND_LOCK(op), \ - state->ea.val, dst, bytes, *eflags, \ - "c" ((long)state->lock_prefix) ); \ + s->ea.val, dst, bytes, *eflags, \ + "c" ((long)s->lock_prefix) ); \ break #define SHIFT(op) \ case rmw_##op: \ - ASSERT(!state->lock_prefix); \ - _emulate_2op_SrcB(#op, state->ea.val, dst, bytes, *eflags); \ + ASSERT(!s->lock_prefix); \ + _emulate_2op_SrcB(#op, s->ea.val, dst, bytes, *eflags); \ break BINOP(adc, ); @@ -8514,46 +8514,46 @@ int x86_emul_rmw( #undef SHIFT case rmw_not: - switch ( state->op_bytes ) + switch ( s->op_bytes ) { case 1: asm ( COND_LOCK(notb) " %0" - : "+m" (*dst) : "c" ((long)state->lock_prefix) ); + : "+m" (*dst) : "c" ((long)s->lock_prefix) ); break; case 2: asm ( COND_LOCK(notw) " %0" - : "+m" (*dst) : "c" ((long)state->lock_prefix) ); + : "+m" (*dst) : "c" ((long)s->lock_prefix) ); break; case 4: asm ( COND_LOCK(notl) " %0" - : "+m" (*dst) : "c" ((long)state->lock_prefix) ); + : "+m" (*dst) : "c" ((long)s->lock_prefix) ); break; #ifdef __x86_64__ case 8: asm ( COND_LOCK(notq) " %0" - : "+m" (*dst) : "c" ((long)state->lock_prefix) ); + : "+m" (*dst) : "c" ((long)s->lock_prefix) ); break; #endif } break; case rmw_shld: - ASSERT(!state->lock_prefix); + ASSERT(!s->lock_prefix); _emulate_2op_SrcV_nobyte("shld", - state->ea.val, dst, bytes, *eflags, - "c" (state->ea.orig_val) ); + s->ea.val, dst, bytes, *eflags, + "c" (s->ea.orig_val) ); break; case rmw_shrd: - ASSERT(!state->lock_prefix); + ASSERT(!s->lock_prefix); _emulate_2op_SrcV_nobyte("shrd", - state->ea.val, dst, bytes, *eflags, - "c" (state->ea.orig_val) ); + s->ea.val, dst, bytes, *eflags, + "c" (s->ea.orig_val) ); break; case rmw_xadd: *eflags &= ~EFLAGS_MASK; - switch ( state->op_bytes ) + switch ( s->op_bytes ) { unsigned long dummy; @@ -8562,11 +8562,11 @@ int x86_emul_rmw( asm ( "" \ COND_LOCK(xadd) " %"#mod"[reg], %[mem]; " \ _POST_EFLAGS("[efl]", "[msk]", "[tmp]") \ - : [reg] "+" #cst (state->ea.val), \ + : [reg] "+" #cst (s->ea.val), \ [mem] "+m" (*dst), \ [efl] "+g" (*eflags), \ [tmp] "=&r" (dummy) \ - : "c" ((long)state->lock_prefix), \ + : "c" ((long)s->lock_prefix), \ [msk] "i" (EFLAGS_MASK) ); \ break XADD(1, q, b); @@ -8580,21 +8580,21 @@ int x86_emul_rmw( break; case rmw_xchg: - switch ( state->op_bytes ) + switch ( s->op_bytes ) { case 1: - asm ( "xchg %b0, %b1" : "+q" (state->ea.val), "+m" (*dst) ); + asm ( "xchg %b0, %b1" : "+q" (s->ea.val), "+m" (*dst) ); break; case 2: - asm ( "xchg %w0, %w1" : "+r" (state->ea.val), "+m" (*dst) ); + asm ( "xchg %w0, %w1" : "+r" (s->ea.val), "+m" (*dst) ); break; case 4: #ifdef __x86_64__ - asm ( "xchg %k0, %k1" : "+r" (state->ea.val), "+m" (*dst) ); + asm ( "xchg %k0, %k1" : "+r" (s->ea.val), "+m" (*dst) ); break; case 8: #endif - asm ( "xchg %0, %1" : "+r" (state->ea.val), "+m" (*dst) ); + asm ( "xchg %0, %1" : "+r" (s->ea.val), "+m" (*dst) ); break; } break; diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index 40d5054fb7..698750267a 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -746,36 +746,36 @@ x86_decode_insn( struct x86_emulate_ctxt *ctxt)); unsigned int -x86_insn_opsize(const struct x86_emulate_state *state); +x86_insn_opsize(const struct x86_emulate_state *s); int -x86_insn_modrm(const struct x86_emulate_state *state, +x86_insn_modrm(const struct x86_emulate_state *s, unsigned int *rm, unsigned int *reg); unsigned long -x86_insn_operand_ea(const struct x86_emulate_state *state, +x86_insn_operand_ea(const struct x86_emulate_state *s, enum x86_segment *seg); unsigned long -x86_insn_immediate(const struct x86_emulate_state *state, +x86_insn_immediate(const struct x86_emulate_state *s, unsigned int nr); unsigned int -x86_insn_length(const struct x86_emulate_state *state, +x86_insn_length(const struct x86_emulate_state *s, const struct x86_emulate_ctxt *ctxt); bool cf_check -x86_insn_is_mem_access(const struct x86_emulate_state *state, +x86_insn_is_mem_access(const struct x86_emulate_state *s, const struct x86_emulate_ctxt *ctxt); bool cf_check -x86_insn_is_mem_write(const struct x86_emulate_state *state, +x86_insn_is_mem_write(const struct x86_emulate_state *s, const struct x86_emulate_ctxt *ctxt); bool cf_check -x86_insn_is_portio(const struct x86_emulate_state *state, +x86_insn_is_portio(const struct x86_emulate_state *s, const struct x86_emulate_ctxt *ctxt); bool cf_check -x86_insn_is_cr_access(const struct x86_emulate_state *state, +x86_insn_is_cr_access(const struct x86_emulate_state *s, const struct x86_emulate_ctxt *ctxt); #if !defined(__XEN__) || defined(NDEBUG) -static inline void x86_emulate_free_state(struct x86_emulate_state *state) {} +static inline void x86_emulate_free_state(struct x86_emulate_state *s) {} #else -void x86_emulate_free_state(struct x86_emulate_state *state); +void x86_emulate_free_state(struct x86_emulate_state *s); #endif #ifdef __XEN__ @@ -800,7 +800,7 @@ x86_emul_rmw( void *ptr, unsigned int bytes, uint32_t *eflags, - struct x86_emulate_state *state, + struct x86_emulate_state *s, struct x86_emulate_ctxt *ctxt); int x86_emul_blk( @@ -808,7 +808,7 @@ x86_emul_blk( void *data, unsigned int bytes, uint32_t *eflags, - struct x86_emulate_state *state, + struct x86_emulate_state *s, struct x86_emulate_ctxt *ctxt); static inline void x86_emul_hw_exception( -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 12 21:22:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Jul 2023 21:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.562855.879599 (Exim 4.92) (envelope-from ) id 1qJhHz-0006mo-Fx; Wed, 12 Jul 2023 21:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 562855.879599; Wed, 12 Jul 2023 21:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJhHz-0006mh-DO; Wed, 12 Jul 2023 21:22:23 +0000 Received: by outflank-mailman (input) for mailman id 562855; Wed, 12 Jul 2023 21:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJhHy-0006mX-DO for xen-changelog@lists.xenproject.org; Wed, 12 Jul 2023 21:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJhHy-0003ib-CK for xen-changelog@lists.xenproject.org; Wed, 12 Jul 2023 21:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qJhHy-0003i2-BU for xen-changelog@lists.xenproject.org; Wed, 12 Jul 2023 21:22: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=asTuJWrmfDf25zLQ+mjZZ1VRjSYJKvAoXZzSoDSTdD8=; b=Ce4TncklpAw4BD7E2LIBTtLyrq DqMaQ7wS12DFx0pfpbdmHQQFSPz+DGZoie5s7+DmkCMpo+anvEqhQw64+S7HbhdBmHsuQxzww9iaa toBHHF6FHR2QLXgLwwLNrbQtGUgxomS0uLcnXtjTGyZOILlOEriDfmh9NWw1Jif+6ld4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: document the C dialect and translation toolchain assumptions. Message-Id: Date: Wed, 12 Jul 2023 21:22:22 +0000 commit 3c911be55f1c4e0063e690fb61223df21511b5bb Author: Roberto Bagnara AuthorDate: Wed Jun 21 17:47:56 2023 +0200 Commit: Stefano Stabellini CommitDate: Tue Jul 11 13:15:52 2023 -0700 docs/misra: document the C dialect and translation toolchain assumptions. This document specifies the C language dialect used by Xen and the assumptions Xen makes on the translation toolchain. Signed-off-by: Roberto Bagnara Reviewed-by: Stefano Stabellini --- docs/misra/C-language-toolchain.rst | 468 ++++++++++++++++++++++++++++++++++++ 1 file changed, 468 insertions(+) diff --git a/docs/misra/C-language-toolchain.rst b/docs/misra/C-language-toolchain.rst new file mode 100644 index 0000000000..8651f59118 --- /dev/null +++ b/docs/misra/C-language-toolchain.rst @@ -0,0 +1,468 @@ +============================================= +C Dialect and Translation Assumptions for Xen +============================================= + +This document specifies the C language dialect used by Xen and +the assumptions Xen makes on the translation toolchain. +It covers, in particular: + +1. the used language extensions; +2. the translation limits that the translation toolchains must be able + to accommodate; +3. the implementation-defined behaviors upon which Xen may depend. + +All points are of course relevant for portability. In addition, +programming in C is impossible without a detailed knowledge of the +implementation-defined behaviors. For this reason, it is recommended +that Xen developers have familiarity with this document and the +documentation referenced therein. + +This document needs maintenance and adaptation in the following +circumstances: + +- whenever the compiler is changed or updated; +- whenever the use of a certain language extension is added or removed; +- whenever code modifications cause exceeding the stated translation limits. + + +Applicable C Language Standard +______________________________ + +Xen is written in C99 with extensions. The relevant ISO standard is + + *ISO/IEC 9899:1999/Cor 3:2007*: Programming Languages - C, + Technical Corrigendum 3. + ISO/IEC, Geneva, Switzerland, 2007. + + +Reference Documentation +_______________________ + +The following documents are referred to in the sequel: + +GCC_MANUAL: + https://gcc.gnu.org/onlinedocs/gcc-12.1.0/gcc.pdf +CPP_MANUAL: + https://gcc.gnu.org/onlinedocs/gcc-12.1.0/cpp.pdf +ARM64_ABI_MANUAL: + https://github.com/ARM-software/abi-aa/blob/60a8eb8c55e999d74dac5e368fc9d7e36e38dda4/aapcs64/aapcs64.rst +X86_64_ABI_MANUAL: + https://gitlab.com/x86-psABIs/x86-64-ABI/-/jobs/artifacts/master/raw/x86-64-ABI/abi.pdf?job=build + + +C Language Extensions +_____________________ + + +The following table lists the extensions currently used in Xen. +The table columns are as follows: + + Extension + a terse description of the extension; + Architectures + a set of Xen architectures making use of the extension; + References + when available, references to the documentation explaining + the syntax and semantics of (each instance of) the extension. + + +.. list-table:: + :widths: 30 15 55 + :header-rows: 1 + + * - Extension + - Architectures + - References + + * - Non-standard tokens + - ARM64, X86_64 + - _Static_assert: + see Section "2.1 C Language" of GCC_MANUAL. + asm, __asm__: + see Sections "6.48 Alternate Keywords" and "6.47 How to Use Inline Assembly Language in C Code" of GCC_MANUAL. + __volatile__: + see Sections "6.48 Alternate Keywords" and "6.47.2.1 Volatile" of GCC_MANUAL. + __const__, __inline__, __inline: + see Section "6.48 Alternate Keywords" of GCC_MANUAL. + typeof, __typeof__: + see Section "6.7 Referring to a Type with typeof" of GCC_MANUAL. + __alignof__, __alignof: + see Sections "6.48 Alternate Keywords" and "6.44 Determining the Alignment of Functions, Types or Variables" of GCC_MANUAL. + __attribute__: + see Section "6.39 Attribute Syntax" of GCC_MANUAL. + __builtin_types_compatible_p: + see Section "6.59 Other Built-in Functions Provided by GCC" of GCC_MANUAL. + __builtin_va_arg: + non-documented GCC extension. + __builtin_offsetof: + see Section "6.53 Support for offsetof" of GCC_MANUAL. + + * - Empty initialization list + - ARM64, X86_64 + - Non-documented GCC extension. + + * - Arithmetic operator on pointer to void + - ARM64, X86_64 + - See Section "6.24 Arithmetic on void- and Function-Pointers" of GCC_MANUAL." + + * - Statements and declarations in expressions + - ARM64, X86_64 + - See Section "6.1 Statements and Declarations in Expressions" of GCC_MANUAL. + + * - Structure or union definition with no members + - ARM64, X86_64 + - See Section "6.19 Structures with No Members" of GCC_MANUAL. + + * - Zero size array type + - ARM64, X86_64 + - See Section "6.18 Arrays of Length Zero" of GCC_MANUAL. + + * - Binary conditional expression + - ARM64, X86_64 + - See Section "6.8 Conditionals with Omitted Operands" of GCC_MANUAL. + + * - 'Case' label with upper/lower values + - ARM64, X86_64 + - See Section "6.30 Case Ranges" of GCC_MANUAL. + + * - Unnamed field that is not a bit-field + - ARM64, X86_64 + - See Section "6.63 Unnamed Structure and Union Fields" of GCC_MANUAL. + + * - Empty declaration + - ARM64, X86_64 + - Non-documented GCC extension. + Note: an empty declaration is caused by a semicolon at file scope + with nothing before it (not to be confused with an empty statement). + + * - Incomplete enum declaration + - ARM64 + - See Section "6.49 Incomplete enum Types" of GCC_MANUAL. + + * - Implicit conversion from a pointer to an incompatible pointer + - ARM64, X86_64 + - Non-documented GCC extension. The documentation for option + -Wincompatible-pointer-types in Section + "3.8 Options to Request or Suppress Warnings" of GCC_MANUAL + is possibly relevant. + + * - Pointer to a function is converted to a pointer to an object or a pointer to an object is converted to a pointer to a function + - X86_64 + - Non-documented GCC extension. The information provided in + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83584 + is possibly relevant. + + * - Token pasting of ',' and __VA_ARGS__ + - ARM64, X86_64 + - See Section "6.21 Macros with a Variable Number of Arguments" of GCC_MANUAL. + + * - Named variadic macro arguments + - ARM64, X86_64 + - See Section "6.21 Macros with a Variable Number of Arguments" of GCC_MANUAL. + + * - No arguments for '...' parameter of variadic macro + - ARM64, X86_64 + - See Section "6.21 Macros with a Variable Number of Arguments" of GCC_MANUAL. + + * - void function returning void expression + - ARM64, X86_64 + - See the documentation for -Wreturn-type in Section "3.8 Options to Request or Suppress Warnings" of GCC_MANUAL. + + * - GNU statement expressions from macro expansion + - ARM64, X86_64 + - See Section "6.1 Statements and Declarations in Expressions" of GCC_MANUAL. + + * - Invalid application of sizeof to a void type + - ARM64, X86_64 + - See Section "6.24 Arithmetic on void- and Function-Pointers" of GCC_MANUAL. + + * - Redeclaration of already-defined enum + - ARM64, X86_64 + - See Section "6.49 Incomplete enum Types" of GCC_MANUAL. + + * - struct with flexible array member nested in a struct + - ARM64, X86_64 + - See Section "6.18 Arrays of Length Zero" of GCC_MANUAL. + + * - struct with flexible array member used as an array element + - ARM64, X86_64 + - See Section "6.18 Arrays of Length Zero" of GCC_MANUAL. + + * - enumerator value outside the range of int + - ARM64, X86_64 + - Non-documented GCC extension. + + * - Extended integer types + - X86_64 + - See Section "6.9 128-bit Integers" of GCC_MANUAL. + + +Translation Limits +__________________ + +The following table lists the translation limits that a toolchain has +to satisfy in order to translate Xen. The numbers given are a +compromise: on the one hand, many modern compilers have very generous +limits (in several cases, the only limitation is the amount of +available memory); on the other hand we prefer setting limits that are +not too high, because compilers do not have any obligation of +diagnosing when a limit has been exceeded, and not too low, so as to +avoid frequently updating this document. In the table, only the +limits that go beyond the minima specified by the relevant C Standard +are listed. + +The table columns are as follows: + + Limit + a terse description of the translation limit; + Architectures + a set relevant of Xen architectures; + Threshold + a value that the Xen project does not wish to exceed for that limit + (this is typically below, often much below what the translation + toolchain supports); + References + when available, references to the documentation providing evidence + that the translation toolchain honors the threshold (and more). + +.. list-table:: + :widths: 30 15 10 45 + :header-rows: 1 + + * - Limit + - Architectures + - Threshold + - References + + * - Size of an object + - ARM64, X86_64 + - 8388608 + - The maximum size of an object is defined in the MAX_SIZE macro, and for a 32 bit architecture is 8MB. + The maximum size for an array is defined in the PTRDIFF_MAX and in a 32 bit architecture is 2^30-1. + See occurrences of these macros in GCC_MANUAL. + + * - Characters in one logical source line + - ARM64 + - 5000 + - See Section "11.2 Implementation limits" of CPP_MANUAL. + + * - Characters in one logical source line + - X86_64 + - 12000 + - See Section "11.2 Implementation limits" of CPP_MANUAL. + + * - Nesting levels for #include files + - ARM64 + - 24 + - See Section "11.2 Implementation limits" of CPP_MANUAL. + + * - Nesting levels for #include files + - X86_64 + - 32 + - See Section "11.2 Implementation limits" of CPP_MANUAL. + + * - case labels for a switch statement (excluding those for any nested switch statements) + - X86_64 + - 1500 + - See Section "4.12 Statements" of GCC_MANUAL. + + * - Number of significant initial characters in an external identifier + - ARM64, X86_64 + - 63 + - See Section "4.3 Identifiers" of GCC_MANUAL. + + +Implementation-Defined Behaviors +________________________________ + +The following table lists the C language implementation-defined behaviors +relevant for MISRA C:2012 Dir 1.1 upon which Xen may possibly depend. + +The table columns are as follows: + + I.-D.B. + a terse description of the implementation-defined behavior; + Architectures + a set relevant of Xen architectures; + Value(s) + for i.-d.b.'s with values, the values allowed; + References + when available, references to the documentation providing details + about how the i.-d.b. is resolved by the translation toolchain. + +.. list-table:: + :widths: 30 15 10 45 + :header-rows: 1 + + * - I.-D.B. + - Architectures + - Value(s) + - References + + * - Allowable bit-field types other than _Bool, signed int, and unsigned int + - ARM64, X86_64 + - All explicitly signed integer types, all unsigned integer types, + and enumerations. + - See Section "4.9 Structures, Unions, Enumerations, and Bit-Fields". + + * - #pragma preprocessing directive that is documented as causing translation failure or some other form of undefined behavior is encountered + - ARM64, X86_64 + - pack, GCC visibility + - #pragma pack: + see Section "6.62.11 Structure-Layout Pragmas" of GCC_MANUAL. + #pragma GCC visibility: + see Section "6.62.14 Visibility Pragmas" of GCC_MANUAL. + + * - The number of bits in a byte + - ARM64 + - 8 + - See Section "4.4 Characters" of GCC_MANUAL and Section "8.1 Data types" of ARM64_ABI_MANUAL. + + * - The number of bits in a byte + - X86_64 + - 8 + - See Section "4.4 Characters" of GCC_MANUAL and Section "3.1.2 Data Representation" of X86_64_ABI_MANUAL. + + * - Whether signed integer types are represented using sign and magnitude, two's complement, or one's complement, and whether the extraordinary value is a trap representation or an ordinary value + - ARM64, X86_64 + - Two's complement + - See Section "4.5 Integers" of GCC_MANUAL. + + * - Any extended integer types that exist in the implementation + - X86_64 + - __uint128_t + - See Section "6.9 128-bit Integers" of GCC_MANUAL. + + * - The number, order, and encoding of bytes in any object + - ARM64 + - + - See Section "4.15 Architecture" of GCC_MANUAL and Chapter 5 "Data types and alignment" of ARM64_ABI_MANUAL. + + * - The number, order, and encoding of bytes in any object + - X86_64 + - + - See Section "4.15 Architecture" of GCC_MANUAL and Section "3.1.2 Data Representation" of X86_64_ABI_MANUAL. + + * - Whether a bit-field can straddle a storage-unit boundary + - ARM64 + - + - See Section "4.9 Structures, Unions, Enumerations, and Bit-Fields of GCC_MANUAL and Section "8.1.8 Bit-fields" of ARM64_ABI_MANUAL. + + * - Whether a bit-field can straddle a storage-unit boundary + - X86_64 + - + - See Section "4.9 Structures, Unions, Enumerations, and Bit-Fields" of GCC_MANUAL and Section "3.1.2 Data Representation" of X86_64_ABI_MANUAL. + + * - The order of allocation of bit-fields within a unit + - ARM64 + - + - See Section "4.9 Structures, Unions, Enumerations, and Bit-Fields of GCC_MANUAL and Section "8.1.8 Bit-fields" of ARM64_ABI_MANUAL. + + * - The order of allocation of bit-fields within a unit + - X86_64 + - + - See Section "4.9 Structures, Unions, Enumerations, and Bit-Fields" of GCC_MANUAL and Section "3.1.2 Data Representation" of X86_64_ABI_MANUAL. + + * - What constitutes an access to an object that has volatile-qualified type + - ARM64, X86_64 + - + - See Section "4.10 Qualifiers" of GCC_MANUAL. + + * - The values or expressions assigned to the macros specified in the headers , , and + - ARM64 + - + - See Section "4.15 Architecture" of GCC_MANUAL and Chapter 5 "Data types and alignment" of ARM64_ABI_MANUAL. + + * - The values or expressions assigned to the macros specified in the headers , , and + - X86_64 + - + - See Section "4.15 Architecture" of GCC_MANUAL and Section "3.1.2 Data Representation" of X86_64_ABI_MANUAL. + + * - Character not in the basic source character set is encountered in a source file, except in an identifier, a character constant, a string literal, a header name, a comment, or a preprocessing token that is never converted to a token + - ARM64 + - UTF-8 + - See Section "1.1 Character sets" of CPP_MANUAL. + We assume the locale is not restricting any UTF-8 characters being part of the source character set. + + * - The value of a char object into which has been stored any character other than a member of the basic execution character set + - ARM64 + - + - See Section "4.4 Characters" of GCC_MANUAL and Section "8.1 Data types" of ARM64_ABI_MANUAL. + + * - The value of a char object into which has been stored any character other than a member of the basic execution character set + - X86_64 + - + - See Section "4.4 Characters" of GCC_MANUAL and Section "3.1.2 Data Representation" of X86_64_ABI_MANUAL. + + * - The value of an integer character constant containing more than one character or containing a character or escape sequence that does not map to a single-byte execution character + - ARM64 + - + - See Section "4.4 Characters" of GCC_MANUAL and Section "8.1 Data types" of ARM64_ABI_MANUAL. + + * - The value of an integer character constant containing more than one character or containing a character or escape sequence that does not map to a single-byte execution character + - X86_64 + - + - See Section "4.4 Characters" of GCC_MANUAL and Section "3.1.2 Data Representation" of X86_64_ABI_MANUAL. + + * - The mapping of members of the source character set + - ARM64, X86_64 + - + - See Section "4.4 Characters" of GCC_MANUAL and the documentation for -finput-charset=charset in the same manual. + + * - The members of the source and execution character sets, except as explicitly specified in the Standard + - ARM64, X86_64 + - UTF-8 + - See Section "4.4 Characters" of GCC_MANUAL + + * - The values of the members of the execution character set + - ARM64, X86_64 + - + - See Section "4.4 Characters" of GCC_MANUAL and the documentation for -fexec-charset=charset in the same manual. + + * - How a diagnostic is identified + - ARM64, X86_64 + - + - See Section "4.1 Translation" of GCC_MANUAL. + + * - The places that are searched for an included < > delimited header, and how the places are specified or the header is identified + - ARM64, X86_64 + - + - See Chapter "2 Header Files" of CPP_MANUAL. + + * - How the named source file is searched for in an included " " delimited header + - ARM64, X86_64 + - + - See Chapter "2 Header Files" of CPP_MANUAL. + + * - How sequences in both forms of header names are mapped to headers or external source file names + - ARM64, X86_64 + - + - See Chapter "2 Header Files" of CPP_MANUAL. + + * - Whether the # operator inserts a \ character before the \ character that begins a universal character name in a character constant or string literal + - ARM64, X86_64 + - + - See Section "3.4 Stringizing" of CPP_MANUAL. + + * - The current locale used to convert a wide string literal into corresponding wide character codes + - ARM64, X86_64 + - + - See Section "4.4 Characters" of GCC_MANUAL and Section "11.1 Implementation-defined behavior" of CPP_MANUAL. + + * - The value of a string literal containing a multibyte character or escape sequence not represented in the execution character set + - X86_64 + - + - See Section "4.4 Characters" of GCC_MANUAL and Section "11.1 Implementation-defined behavior" of CPP_MANUAL. + + * - The behavior on each recognized #pragma directive + - ARM64, X86_64 + - pack, GCC visibility + - See Section "4.13 Preprocessing Directives" of GCC_MANUAL and Section "7 Pragmas" of CPP_MANUAL. + + * - The method by which preprocessing tokens (possibly resulting from macro expansion) in a #include directive are combined into a header name + - X86_64 + - + - See Section "4.13 Preprocessing Directives" of GCC_MANUAL and Section "11.1 Implementation-defined behavior" of CPP_MANUAL. + + +END OF DOCUMENT. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 13 09:22:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jul 2023 09:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563036.879924 (Exim 4.92) (envelope-from ) id 1qJsWR-0003Ss-8s; Thu, 13 Jul 2023 09:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563036.879924; Thu, 13 Jul 2023 09:22: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 1qJsWR-0003Se-6G; Thu, 13 Jul 2023 09:22:03 +0000 Received: by outflank-mailman (input) for mailman id 563036; Thu, 13 Jul 2023 09:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsWP-0003SU-Nq for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsWP-00045X-My for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qJsWP-00010J-Lx for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22: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=MNsZuYI+w065q+aQPcXhxJaTCZhM8LVmZsl+4/9ta3Q=; b=we2FsTtjdm7w6yUq5uxx007MqU HMgcFIMEThX4uMXFjXOxWhM3X/vofey9q0uDKhSYa0FgMvPEqKPirakfuFyxRTmX+3bQkDHu9Uv2A pJGCH44p/0BV7xp9GTxRBYh8TL+uLktJpwQtmuYg91crYkjJbLShanaroHnhhC9N/VOA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xenoprof: default to off Message-Id: Date: Thu, 13 Jul 2023 09:22:01 +0000 commit 08e2372c6570b3629bebfca14987f31c6cd81d30 Author: Jan Beulich AuthorDate: Wed Jul 12 13:25:11 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 12 13:25:11 2023 +0200 xenoprof: default to off This being x86-only right now, and its x86 bits being heavily outdated, let's no longer enable this by default. While there also adjust the "help" keyword spelling. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/configs/pvshim_defconfig | 1 - xen/common/Kconfig | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/configs/pvshim_defconfig b/xen/arch/x86/configs/pvshim_defconfig index d0e92c2ded..a8ab1d4337 100644 --- a/xen/arch/x86/configs/pvshim_defconfig +++ b/xen/arch/x86/configs/pvshim_defconfig @@ -13,7 +13,6 @@ CONFIG_EXPERT=y # CONFIG_HYPFS is not set # CONFIG_BIGMEM is not set # CONFIG_KEXEC is not set -# CONFIG_XENOPROF is not set # CONFIG_XSM is not set # CONFIG_UNSUPPORTED is not set # CONFIG_SCHED_CREDIT is not set diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 3d2123a783..dd8d7c3f1c 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -229,10 +229,9 @@ config EFI_SET_VIRTUAL_ADDRESS_MAP If unsure, say N. config XENOPROF - def_bool y - prompt "Xen Oprofile Support" if EXPERT + bool "Xen Oprofile Support" if EXPERT depends on X86 - ---help--- + help Xen OProfile (Xenoprof) is a system-wide profiler for Xen virtual machine environments, capable of profiling the Xen virtual machine monitor, multiple Linux guest operating systems, and applications -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 13 09:22:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jul 2023 09:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563037.879928 (Exim 4.92) (envelope-from ) id 1qJsWb-0003VI-AQ; Thu, 13 Jul 2023 09:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563037.879928; Thu, 13 Jul 2023 09:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsWb-0003VA-7j; Thu, 13 Jul 2023 09:22:13 +0000 Received: by outflank-mailman (input) for mailman id 563037; Thu, 13 Jul 2023 09:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsWZ-0003Uv-Qv for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsWZ-00045f-Q8 for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qJsWZ-00010m-P2 for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:11 +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=3Ad27bgpqiikEBiy1qr9sERAkz++aTSMNDoxPbor0/A=; b=Q0ku850qrwOtOs6faFzt5wb6aw kTQGWBohJwoMK2LTtkEoBQ/2Nl+KFemmgHjB3iXOKhQvN/s2Bf04UVYJmN9r0NJpv/GwfrzuCilqa e1g8UJPP/mYUO2Zw3qKrVkUerfxY7qpyb2H5y+9Jva5/0KBpseXIFNA8WoUyCKkjOzVw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpufreq: fix violations of MISRA C:2012 Rule 7.2 Message-Id: Date: Thu, 13 Jul 2023 09:22:11 +0000 commit 63077bd042cc6e0275ded9c8693f70261d3abd98 Author: Gianluca Luparini AuthorDate: Wed Jul 12 13:27:39 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 12 13:27:39 2023 +0200 x86/cpufreq: fix violations of MISRA C:2012 Rule 7.2 The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states: "A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type". Add the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity. Signed-off-by: Gianluca Luparini Signed-off-by: Simone Ballarin Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/acpi/cpufreq/powernow.c | 14 +++++++------- xen/include/acpi/cpufreq/processor_perf.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/powernow.c b/xen/arch/x86/acpi/cpufreq/powernow.c index d4c7dcd5d9..8e0784b69c 100644 --- a/xen/arch/x86/acpi/cpufreq/powernow.c +++ b/xen/arch/x86/acpi/cpufreq/powernow.c @@ -32,14 +32,14 @@ #include #include -#define HW_PSTATE_MASK 0x00000007 -#define HW_PSTATE_VALID_MASK 0x80000000 -#define HW_PSTATE_MAX_MASK 0x000000f0 +#define HW_PSTATE_MASK 0x00000007U +#define HW_PSTATE_VALID_MASK 0x80000000U +#define HW_PSTATE_MAX_MASK 0x000000f0U #define HW_PSTATE_MAX_SHIFT 4 -#define MSR_PSTATE_DEF_BASE 0xc0010064 /* base of Pstate MSRs */ -#define MSR_PSTATE_STATUS 0xc0010063 /* Pstate Status MSR */ -#define MSR_PSTATE_CTRL 0xc0010062 /* Pstate control MSR */ -#define MSR_PSTATE_CUR_LIMIT 0xc0010061 /* pstate current limit MSR */ +#define MSR_PSTATE_DEF_BASE 0xc0010064U /* base of Pstate MSRs */ +#define MSR_PSTATE_STATUS 0xc0010063U /* Pstate Status MSR */ +#define MSR_PSTATE_CTRL 0xc0010062U /* Pstate control MSR */ +#define MSR_PSTATE_CUR_LIMIT 0xc0010061U /* pstate current limit MSR */ #define MSR_HWCR_CPBDIS_MASK 0x02000000ULL #define ARCH_CPU_FLAG_RESUME 1 diff --git a/xen/include/acpi/cpufreq/processor_perf.h b/xen/include/acpi/cpufreq/processor_perf.h index d8a1ba68a6..8b5a1b9bde 100644 --- a/xen/include/acpi/cpufreq/processor_perf.h +++ b/xen/include/acpi/cpufreq/processor_perf.h @@ -5,7 +5,7 @@ #include #include -#define XEN_PX_INIT 0x80000000 +#define XEN_PX_INIT 0x80000000U int powernow_cpufreq_init(void); unsigned int powernow_register_driver(void); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 13 09:22:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jul 2023 09:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563038.879932 (Exim 4.92) (envelope-from ) id 1qJsWl-0003Y7-Bb; Thu, 13 Jul 2023 09:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563038.879932; Thu, 13 Jul 2023 09:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsWl-0003Y0-9B; Thu, 13 Jul 2023 09:22:23 +0000 Received: by outflank-mailman (input) for mailman id 563038; Thu, 13 Jul 2023 09:22:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsWj-0003Xn-Tx for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsWj-00045u-T5 for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qJsWj-00011H-SA for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:21 +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=X1wg0xRg0r9JyqmnODknkoxlqKm8k+ZXVV1eZgL4Ph8=; b=mIUuS25L65PgVwHWWKcbX0kYd4 fln6kcY3ur1VxFahuMUWmvRROEI4OkXtXOKyaB2cRn2mQx0VZ0jBcLtB5ipOVGDM/KHplM4ywRuQ1 qqR4B3sXkwNzmHWlNUrDPUvZIBOgfcAHalx+wCH72d0u/JyKqGXHmN/GTq6gfL+200fg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] AMD/IOMMU: fix violations of MISRA C:2012 Rule 7.2 Message-Id: Date: Thu, 13 Jul 2023 09:22:21 +0000 commit 46e92772235288cf69ed60d0acc445a7567eb153 Author: Gianluca Luparini AuthorDate: Wed Jul 12 13:28:09 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 12 13:28:09 2023 +0200 AMD/IOMMU: fix violations of MISRA C:2012 Rule 7.2 The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states: "A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type". Add the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity. Signed-off-by: Gianluca Luparini Signed-off-by: Simone Ballarin Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/drivers/passthrough/amd/iommu-defs.h | 122 +++++++++++++++---------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu-defs.h b/xen/drivers/passthrough/amd/iommu-defs.h index 35de548e3a..c145248f9a 100644 --- a/xen/drivers/passthrough/amd/iommu-defs.h +++ b/xen/drivers/passthrough/amd/iommu-defs.h @@ -38,49 +38,49 @@ ((uint64_t)(offset) << (12 + (PTE_PER_TABLE_SHIFT * ((level) - 1)))) /* IOMMU Capability */ -#define PCI_CAP_ID_MASK 0x000000FF +#define PCI_CAP_ID_MASK 0x000000FFU #define PCI_CAP_ID_SHIFT 0 -#define PCI_CAP_NEXT_PTR_MASK 0x0000FF00 +#define PCI_CAP_NEXT_PTR_MASK 0x0000FF00U #define PCI_CAP_NEXT_PTR_SHIFT 8 -#define PCI_CAP_TYPE_MASK 0x00070000 +#define PCI_CAP_TYPE_MASK 0x00070000U #define PCI_CAP_TYPE_SHIFT 16 -#define PCI_CAP_REV_MASK 0x00F80000 +#define PCI_CAP_REV_MASK 0x00F80000U #define PCI_CAP_REV_SHIFT 19 -#define PCI_CAP_IOTLB_MASK 0x01000000 +#define PCI_CAP_IOTLB_MASK 0x01000000U #define PCI_CAP_IOTLB_SHIFT 24 -#define PCI_CAP_HT_TUNNEL_MASK 0x02000000 +#define PCI_CAP_HT_TUNNEL_MASK 0x02000000U #define PCI_CAP_HT_TUNNEL_SHIFT 25 -#define PCI_CAP_NP_CACHE_MASK 0x04000000 +#define PCI_CAP_NP_CACHE_MASK 0x04000000U #define PCI_CAP_NP_CACHE_SHIFT 26 #define PCI_CAP_EFRSUP_SHIFT 27 -#define PCI_CAP_RESET_MASK 0x80000000 +#define PCI_CAP_RESET_MASK 0x80000000U #define PCI_CAP_RESET_SHIFT 31 #define PCI_CAP_TYPE_IOMMU 0x3 #define PCI_CAP_MMIO_BAR_LOW_OFFSET 0x04 #define PCI_CAP_MMIO_BAR_HIGH_OFFSET 0x08 -#define PCI_CAP_MMIO_BAR_LOW_MASK 0xFFFFC000 +#define PCI_CAP_MMIO_BAR_LOW_MASK 0xFFFFC000U #define IOMMU_MMIO_REGION_LENGTH 0x4000 #define PCI_CAP_RANGE_OFFSET 0x0C -#define PCI_CAP_BUS_NUMBER_MASK 0x0000FF00 +#define PCI_CAP_BUS_NUMBER_MASK 0x0000FF00U #define PCI_CAP_BUS_NUMBER_SHIFT 8 -#define PCI_CAP_FIRST_DEVICE_MASK 0x00FF0000 +#define PCI_CAP_FIRST_DEVICE_MASK 0x00FF0000U #define PCI_CAP_FIRST_DEVICE_SHIFT 16 -#define PCI_CAP_LAST_DEVICE_MASK 0xFF000000 +#define PCI_CAP_LAST_DEVICE_MASK 0xFF000000U #define PCI_CAP_LAST_DEVICE_SHIFT 24 -#define PCI_CAP_UNIT_ID_MASK 0x0000001F +#define PCI_CAP_UNIT_ID_MASK 0x0000001FU #define PCI_CAP_UNIT_ID_SHIFT 0 #define PCI_CAP_MISC_INFO_OFFSET 0x10 -#define PCI_CAP_MSI_NUMBER_MASK 0x0000001F +#define PCI_CAP_MSI_NUMBER_MASK 0x0000001FU #define PCI_CAP_MSI_NUMBER_SHIFT 0 /* Device Table */ #define IOMMU_DEV_TABLE_BASE_LOW_OFFSET 0x00 #define IOMMU_DEV_TABLE_BASE_HIGH_OFFSET 0x04 -#define IOMMU_DEV_TABLE_SIZE_MASK 0x000001FF +#define IOMMU_DEV_TABLE_SIZE_MASK 0x000001FFU #define IOMMU_DEV_TABLE_SIZE_SHIFT 0 #define IOMMU_DEV_TABLE_ENTRIES_PER_BUS 256 @@ -159,13 +159,13 @@ struct amd_iommu_dte { #define IOMMU_CMD_BUFFER_BASE_HIGH_OFFSET 0x0C #define IOMMU_CMD_BUFFER_HEAD_OFFSET 0x2000 #define IOMMU_CMD_BUFFER_TAIL_OFFSET 0x2008 -#define IOMMU_CMD_BUFFER_LENGTH_MASK 0x0F000000 +#define IOMMU_CMD_BUFFER_LENGTH_MASK 0x0F000000U #define IOMMU_CMD_BUFFER_LENGTH_SHIFT 24 #define IOMMU_CMD_BUFFER_ENTRY_ORDER 4 #define IOMMU_CMD_BUFFER_MAX_ENTRIES (1u << 15) -#define IOMMU_CMD_OPCODE_MASK 0xF0000000 +#define IOMMU_CMD_OPCODE_MASK 0xF0000000U #define IOMMU_CMD_OPCODE_SHIFT 28 #define IOMMU_CMD_COMPLETION_WAIT 0x1 #define IOMMU_CMD_INVALIDATE_DEVTAB_ENTRY 0x2 @@ -178,50 +178,50 @@ struct amd_iommu_dte { /* COMPLETION_WAIT command */ #define IOMMU_COMP_WAIT_DATA_BUFFER_SIZE 8 #define IOMMU_COMP_WAIT_DATA_BUFFER_ALIGNMENT 8 -#define IOMMU_COMP_WAIT_S_FLAG_MASK 0x00000001 -#define IOMMU_COMP_WAIT_I_FLAG_MASK 0x00000002 -#define IOMMU_COMP_WAIT_F_FLAG_MASK 0x00000004 -#define IOMMU_COMP_WAIT_ADDR_LOW_MASK 0xFFFFFFF8 +#define IOMMU_COMP_WAIT_S_FLAG_MASK 0x00000001U +#define IOMMU_COMP_WAIT_I_FLAG_MASK 0x00000002U +#define IOMMU_COMP_WAIT_F_FLAG_MASK 0x00000004U +#define IOMMU_COMP_WAIT_ADDR_LOW_MASK 0xFFFFFFF8U #define IOMMU_COMP_WAIT_ADDR_LOW_SHIFT 3 -#define IOMMU_COMP_WAIT_ADDR_HIGH_MASK 0x000FFFFF +#define IOMMU_COMP_WAIT_ADDR_HIGH_MASK 0x000FFFFFU #define IOMMU_COMP_WAIT_ADDR_HIGH_SHIFT 0 /* INVALIDATE_IOMMU_PAGES command */ -#define IOMMU_INV_IOMMU_PAGES_DOMAIN_ID_MASK 0x0000FFFF +#define IOMMU_INV_IOMMU_PAGES_DOMAIN_ID_MASK 0x0000FFFFU #define IOMMU_INV_IOMMU_PAGES_DOMAIN_ID_SHIFT 0 -#define IOMMU_INV_IOMMU_PAGES_S_FLAG_MASK 0x00000001 +#define IOMMU_INV_IOMMU_PAGES_S_FLAG_MASK 0x00000001U #define IOMMU_INV_IOMMU_PAGES_S_FLAG_SHIFT 0 -#define IOMMU_INV_IOMMU_PAGES_PDE_FLAG_MASK 0x00000002 +#define IOMMU_INV_IOMMU_PAGES_PDE_FLAG_MASK 0x00000002U #define IOMMU_INV_IOMMU_PAGES_PDE_FLAG_SHIFT 1 -#define IOMMU_INV_IOMMU_PAGES_ADDR_LOW_MASK 0xFFFFF000 +#define IOMMU_INV_IOMMU_PAGES_ADDR_LOW_MASK 0xFFFFF000U #define IOMMU_INV_IOMMU_PAGES_ADDR_LOW_SHIFT 12 -#define IOMMU_INV_IOMMU_PAGES_ADDR_HIGH_MASK 0xFFFFFFFF +#define IOMMU_INV_IOMMU_PAGES_ADDR_HIGH_MASK 0xFFFFFFFFU #define IOMMU_INV_IOMMU_PAGES_ADDR_HIGH_SHIFT 0 /* INVALIDATE_DEVTAB_ENTRY command */ -#define IOMMU_INV_DEVTAB_ENTRY_DEVICE_ID_MASK 0x0000FFFF +#define IOMMU_INV_DEVTAB_ENTRY_DEVICE_ID_MASK 0x0000FFFFU #define IOMMU_INV_DEVTAB_ENTRY_DEVICE_ID_SHIFT 0 /* INVALIDATE_INTERRUPT_TABLE command */ -#define IOMMU_INV_INT_TABLE_DEVICE_ID_MASK 0x0000FFFF +#define IOMMU_INV_INT_TABLE_DEVICE_ID_MASK 0x0000FFFFU #define IOMMU_INV_INT_TABLE_DEVICE_ID_SHIFT 0 /* INVALIDATE_IOTLB_PAGES command */ -#define IOMMU_INV_IOTLB_PAGES_MAXPEND_MASK 0xff000000 +#define IOMMU_INV_IOTLB_PAGES_MAXPEND_MASK 0xff000000U #define IOMMU_INV_IOTLB_PAGES_MAXPEND_SHIFT 24 -#define IOMMU_INV_IOTLB_PAGES_PASID1_MASK 0x00ff0000 +#define IOMMU_INV_IOTLB_PAGES_PASID1_MASK 0x00ff0000U #define IOMMU_INV_IOTLB_PAGES_PASID1_SHIFT 16 -#define IOMMU_INV_IOTLB_PAGES_PASID2_MASK 0x0fff0000 +#define IOMMU_INV_IOTLB_PAGES_PASID2_MASK 0x0fff0000U #define IOMMU_INV_IOTLB_PAGES_PASID2_SHIFT 16 -#define IOMMU_INV_IOTLB_PAGES_QUEUEID_MASK 0x0000ffff +#define IOMMU_INV_IOTLB_PAGES_QUEUEID_MASK 0x0000ffffU #define IOMMU_INV_IOTLB_PAGES_QUEUEID_SHIFT 0 -#define IOMMU_INV_IOTLB_PAGES_DEVICE_ID_MASK 0x0000FFFF +#define IOMMU_INV_IOTLB_PAGES_DEVICE_ID_MASK 0x0000FFFFU #define IOMMU_INV_IOTLB_PAGES_DEVICE_ID_SHIFT 0 -#define IOMMU_INV_IOTLB_PAGES_ADDR_LOW_MASK 0xFFFFF000 +#define IOMMU_INV_IOTLB_PAGES_ADDR_LOW_MASK 0xFFFFF000U #define IOMMU_INV_IOTLB_PAGES_ADDR_LOW_SHIFT 12 -#define IOMMU_INV_IOTLB_PAGES_ADDR_HIGH_MASK 0xFFFFFFFF +#define IOMMU_INV_IOTLB_PAGES_ADDR_HIGH_MASK 0xFFFFFFFFU #define IOMMU_INV_IOTLB_PAGES_ADDR_HIGH_SHIFT 0 -#define IOMMU_INV_IOTLB_PAGES_S_FLAG_MASK 0x00000001 +#define IOMMU_INV_IOTLB_PAGES_S_FLAG_MASK 0x00000001U #define IOMMU_INV_IOTLB_PAGES_S_FLAG_SHIFT 0 /* Event Log */ @@ -229,18 +229,18 @@ struct amd_iommu_dte { #define IOMMU_EVENT_LOG_BASE_HIGH_OFFSET 0x14 #define IOMMU_EVENT_LOG_HEAD_OFFSET 0x2010 #define IOMMU_EVENT_LOG_TAIL_OFFSET 0x2018 -#define IOMMU_EVENT_LOG_LENGTH_MASK 0x0F000000 +#define IOMMU_EVENT_LOG_LENGTH_MASK 0x0F000000U #define IOMMU_EVENT_LOG_LENGTH_SHIFT 24 -#define IOMMU_EVENT_LOG_HEAD_MASK 0x0007FFF0 +#define IOMMU_EVENT_LOG_HEAD_MASK 0x0007FFF0U #define IOMMU_EVENT_LOG_HEAD_SHIFT 4 -#define IOMMU_EVENT_LOG_TAIL_MASK 0x0007FFF0 +#define IOMMU_EVENT_LOG_TAIL_MASK 0x0007FFF0U #define IOMMU_EVENT_LOG_TAIL_SHIFT 4 #define IOMMU_EVENT_LOG_ENTRY_SIZE 16 #define IOMMU_EVENT_LOG_POWER_OF2_ENTRIES_PER_PAGE 8 #define IOMMU_EVENT_LOG_U32_PER_ENTRY (IOMMU_EVENT_LOG_ENTRY_SIZE / 4) -#define IOMMU_EVENT_CODE_MASK 0xF0000000 +#define IOMMU_EVENT_CODE_MASK 0xF0000000U #define IOMMU_EVENT_CODE_SHIFT 28 #define IOMMU_EVENT_ILLEGAL_DEV_TABLE_ENTRY 0x1 #define IOMMU_EVENT_IO_PAGE_FAULT 0x2 @@ -251,12 +251,12 @@ struct amd_iommu_dte { #define IOMMU_EVENT_IOTLB_INV_TIMEOUT 0x7 #define IOMMU_EVENT_INVALID_DEV_REQUEST 0x8 -#define IOMMU_EVENT_DOMAIN_ID_MASK 0x0000FFFF +#define IOMMU_EVENT_DOMAIN_ID_MASK 0x0000FFFFU #define IOMMU_EVENT_DOMAIN_ID_SHIFT 0 -#define IOMMU_EVENT_DEVICE_ID_MASK 0x0000FFFF +#define IOMMU_EVENT_DEVICE_ID_MASK 0x0000FFFFU #define IOMMU_EVENT_DEVICE_ID_SHIFT 0 #define IOMMU_EVENT_FLAGS_SHIFT 16 -#define IOMMU_EVENT_FLAGS_MASK 0x0FFF0000 +#define IOMMU_EVENT_FLAGS_MASK 0x0FFF0000U /* PPR Log */ #define IOMMU_PPR_LOG_ENTRY_SIZE 16 @@ -265,21 +265,21 @@ struct amd_iommu_dte { #define IOMMU_PPR_LOG_BASE_LOW_OFFSET 0x0038 #define IOMMU_PPR_LOG_BASE_HIGH_OFFSET 0x003C -#define IOMMU_PPR_LOG_BASE_LOW_MASK 0xFFFFF000 +#define IOMMU_PPR_LOG_BASE_LOW_MASK 0xFFFFF000U #define IOMMU_PPR_LOG_BASE_LOW_SHIFT 12 -#define IOMMU_PPR_LOG_BASE_HIGH_MASK 0x000FFFFF +#define IOMMU_PPR_LOG_BASE_HIGH_MASK 0x000FFFFFU #define IOMMU_PPR_LOG_BASE_HIGH_SHIFT 0 -#define IOMMU_PPR_LOG_LENGTH_MASK 0x0F000000 +#define IOMMU_PPR_LOG_LENGTH_MASK 0x0F000000U #define IOMMU_PPR_LOG_LENGTH_SHIFT 24 -#define IOMMU_PPR_LOG_HEAD_MASK 0x0007FFF0 +#define IOMMU_PPR_LOG_HEAD_MASK 0x0007FFF0U #define IOMMU_PPR_LOG_HEAD_SHIFT 4 -#define IOMMU_PPR_LOG_TAIL_MASK 0x0007FFF0 +#define IOMMU_PPR_LOG_TAIL_MASK 0x0007FFF0U #define IOMMU_PPR_LOG_TAIL_SHIFT 4 #define IOMMU_PPR_LOG_HEAD_OFFSET 0x2030 #define IOMMU_PPR_LOG_TAIL_OFFSET 0x2038 -#define IOMMU_PPR_LOG_DEVICE_ID_MASK 0x0000FFFF +#define IOMMU_PPR_LOG_DEVICE_ID_MASK 0x0000FFFFU #define IOMMU_PPR_LOG_DEVICE_ID_SHIFT 0 -#define IOMMU_PPR_LOG_CODE_MASK 0xF0000000 +#define IOMMU_PPR_LOG_CODE_MASK 0xF0000000U #define IOMMU_PPR_LOG_CODE_SHIFT 28 #define IOMMU_LOG_ENTRY_TIMEOUT 1000 @@ -342,17 +342,17 @@ union amd_iommu_control { #define IOMMU_EXCLUSION_BASE_HIGH_OFFSET 0x24 #define IOMMU_EXCLUSION_LIMIT_LOW_OFFSET 0x28 #define IOMMU_EXCLUSION_LIMIT_HIGH_OFFSET 0x2C -#define IOMMU_EXCLUSION_BASE_LOW_MASK 0xFFFFF000 +#define IOMMU_EXCLUSION_BASE_LOW_MASK 0xFFFFF000U #define IOMMU_EXCLUSION_BASE_LOW_SHIFT 12 -#define IOMMU_EXCLUSION_BASE_HIGH_MASK 0xFFFFFFFF +#define IOMMU_EXCLUSION_BASE_HIGH_MASK 0xFFFFFFFFU #define IOMMU_EXCLUSION_BASE_HIGH_SHIFT 0 -#define IOMMU_EXCLUSION_RANGE_ENABLE_MASK 0x00000001 +#define IOMMU_EXCLUSION_RANGE_ENABLE_MASK 0x00000001U #define IOMMU_EXCLUSION_RANGE_ENABLE_SHIFT 0 -#define IOMMU_EXCLUSION_ALLOW_ALL_MASK 0x00000002 +#define IOMMU_EXCLUSION_ALLOW_ALL_MASK 0x00000002U #define IOMMU_EXCLUSION_ALLOW_ALL_SHIFT 1 -#define IOMMU_EXCLUSION_LIMIT_LOW_MASK 0xFFFFF000 +#define IOMMU_EXCLUSION_LIMIT_LOW_MASK 0xFFFFF000U #define IOMMU_EXCLUSION_LIMIT_LOW_SHIFT 12 -#define IOMMU_EXCLUSION_LIMIT_HIGH_MASK 0xFFFFFFFF +#define IOMMU_EXCLUSION_LIMIT_HIGH_MASK 0xFFFFFFFFU #define IOMMU_EXCLUSION_LIMIT_HIGH_SHIFT 0 /* Extended Feature Register */ @@ -476,14 +476,14 @@ union amd_iommu_pte { #define INV_IOMMU_ALL_PAGES_ADDRESS ((1ULL << 63) - 1) -#define IOMMU_RING_BUFFER_PTR_MASK 0x0007FFF0 +#define IOMMU_RING_BUFFER_PTR_MASK 0x0007FFF0U -#define IOMMU_CMD_DEVICE_ID_MASK 0x0000FFFF +#define IOMMU_CMD_DEVICE_ID_MASK 0x0000FFFFU #define IOMMU_CMD_DEVICE_ID_SHIFT 0 -#define IOMMU_REG_BASE_ADDR_LOW_MASK 0xFFFFF000 +#define IOMMU_REG_BASE_ADDR_LOW_MASK 0xFFFFF000U #define IOMMU_REG_BASE_ADDR_LOW_SHIFT 12 -#define IOMMU_REG_BASE_ADDR_HIGH_MASK 0x000FFFFF +#define IOMMU_REG_BASE_ADDR_HIGH_MASK 0x000FFFFFU #define IOMMU_REG_BASE_ADDR_HIGH_SHIFT 0 #endif /* AMD_IOMMU_DEFS_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 13 09:22:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jul 2023 09:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563039.879936 (Exim 4.92) (envelope-from ) id 1qJsWv-0003ao-Dg; Thu, 13 Jul 2023 09:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563039.879936; Thu, 13 Jul 2023 09:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsWv-0003ag-Ap; Thu, 13 Jul 2023 09:22:33 +0000 Received: by outflank-mailman (input) for mailman id 563039; Thu, 13 Jul 2023 09:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsWu-0003aS-0M for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsWt-00046C-Vy for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qJsWt-00011k-VD for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:31 +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=gp1k2VDD50ysIwDWO4Q8wN+1fD8hcnNakKC7ih37gyc=; b=IxLCHhymvbbxx+RAtegm5Gi3ZH xPipuY5cRaGlAhqTTK2D9YQN8932UsOuIrPP5iSzmobqN68//tdrmK5jNnhM837+QsWRKE5EJjgDu /RlSe4FIsJj3QHx06FHInUa3I1QfgAlMpZSdeS/JJXugl3ps/61C+AvPxlhlTb9ESgmg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/svm: fix violations of MISRA C:2012 Rule 7.2 Message-Id: Date: Thu, 13 Jul 2023 09:22:31 +0000 commit 82d3665d65189aeeb44cc99436e977a2fe9bb33c Author: Gianluca Luparini AuthorDate: Wed Jul 12 13:28:37 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 12 13:28:37 2023 +0200 x86/svm: fix violations of MISRA C:2012 Rule 7.2 The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states: "A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type". Add the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity. Signed-off-by: Gianluca Luparini Signed-off-by: Simone Ballarin Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/hvm/svm/asid.c | 2 +- xen/arch/x86/hvm/svm/svm.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/svm/asid.c b/xen/arch/x86/hvm/svm/asid.c index 09f8c23fd9..28e0dbc176 100644 --- a/xen/arch/x86/hvm/svm/asid.c +++ b/xen/arch/x86/hvm/svm/asid.c @@ -16,7 +16,7 @@ void svm_asid_init(const struct cpuinfo_x86 *c) /* Check for erratum #170, and leave ASIDs disabled if it's present. */ if ( !cpu_has_amd_erratum(c, AMD_ERRATUM_170) ) - nasids = cpuid_ebx(0x8000000A); + nasids = cpuid_ebx(0x8000000aU); hvm_asid_init(nasids); } diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 59a6e88dff..56cb2f61bb 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -269,9 +269,9 @@ svm_msrbit(unsigned long *msr_bitmap, uint32_t msr) */ if ( msr <= 0x1fff ) msr_bit = msr_bitmap + 0x0000 / BYTES_PER_LONG; - else if ( (msr >= 0xc0000000) && (msr <= 0xc0001fff) ) + else if ( (msr >= 0xc0000000U) && (msr <= 0xc0001fffU) ) msr_bit = msr_bitmap + 0x0800 / BYTES_PER_LONG; - else if ( (msr >= 0xc0010000) && (msr <= 0xc0011fff) ) + else if ( (msr >= 0xc0010000U) && (msr <= 0xc0011fffU) ) msr_bit = msr_bitmap + 0x1000 / BYTES_PER_LONG; return msr_bit; @@ -2539,8 +2539,8 @@ const struct hvm_function_table * __init start_svm(void) setup_vmcb_dump(); - if ( boot_cpu_data.extended_cpuid_level >= 0x8000000a ) - svm_feature_flags = cpuid_edx(0x8000000a); + if ( boot_cpu_data.extended_cpuid_level >= 0x8000000aU ) + svm_feature_flags = cpuid_edx(0x8000000aU); printk("SVM: Supported advanced features:\n"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 13 09:22:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jul 2023 09:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563040.879940 (Exim 4.92) (envelope-from ) id 1qJsX5-0003de-FE; Thu, 13 Jul 2023 09:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563040.879940; Thu, 13 Jul 2023 09:22:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsX5-0003dW-CL; Thu, 13 Jul 2023 09:22:43 +0000 Received: by outflank-mailman (input) for mailman id 563040; Thu, 13 Jul 2023 09:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsX4-0003dI-3E for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsX4-00046O-2Z for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qJsX4-000129-1o for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:42 +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=gY3oiAUalDeqKC+KCrk7pZ15uoLpZlvD9D2WP0x2OUU=; b=I/uDdWjLhjLwu1/Lde0fgyN2eM U7T7gK4TvCW2tx6n+X+IatbEfosyb9Qur4pDDEsXDhWsYUXTozDbFHoO13FhzDVcVfpHsnlbpjRhv xw9hI3uw7d3E6t4uCY9nlCvgPNEH2fKVghD+Tft3JMY8spqvnk/edrS7gcU0lLYky03Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/device-tree: fix violations of MISRA C:2012 Rule 7.2 Message-Id: Date: Thu, 13 Jul 2023 09:22:42 +0000 commit 4efde79938310035e2eb53c043406b0cbc62e645 Author: Gianluca Luparini AuthorDate: Wed Jul 12 13:29:04 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 12 13:29:04 2023 +0200 xen/device-tree: fix violations of MISRA C:2012 Rule 7.2 The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states: "A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type". Add the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity. Signed-off-by: Gianluca Luparini Signed-off-by: Simone Ballarin Reviewed-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- xen/common/device_tree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 8da1052911..0677193ab3 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -2115,7 +2115,7 @@ static void __init __unflatten_device_tree(const void *fdt, /* Allocate memory for the expanded device tree */ mem = (unsigned long)_xmalloc (size + 4, __alignof__(struct dt_device_node)); - ((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeef); + ((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeefU); dt_dprintk(" unflattening %lx...\n", mem); @@ -2125,7 +2125,7 @@ static void __init __unflatten_device_tree(const void *fdt, if ( be32_to_cpup((__be32 *)start) != FDT_END ) printk(XENLOG_WARNING "Weird tag at end of tree: %08x\n", *((u32 *)start)); - if ( be32_to_cpu(((__be32 *)mem)[size / 4]) != 0xdeadbeef ) + if ( be32_to_cpu(((__be32 *)mem)[size / 4]) != 0xdeadbeefU ) printk(XENLOG_WARNING "End of tree marker overwritten: %08x\n", be32_to_cpu(((__be32 *)mem)[size / 4])); *allnextp = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 13 09:22:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jul 2023 09:22:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563041.879954 (Exim 4.92) (envelope-from ) id 1qJsXF-0003w4-UX; Thu, 13 Jul 2023 09:22:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563041.879954; Thu, 13 Jul 2023 09:22:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsXF-0003vs-Rd; Thu, 13 Jul 2023 09:22:53 +0000 Received: by outflank-mailman (input) for mailman id 563041; Thu, 13 Jul 2023 09:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsXE-0003gc-6O for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsXE-00046d-5n for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qJsXE-00012Z-4g for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:22:52 +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=P+GmM3W6cGj6w5L32sBpu0QOgy1kxmzk9Abxz/s4JlE=; b=lmVH5MMHMsmjCSNqjQzs00tioN BF0jZY6ZBiwKGsUGv8yZz82yXUsfmUzeBbN2G/TST8EpO6SEMCPXcAwoH6r8XRGGtQbpaxM4Uu3up c5uGDmZCldDQ4P9IAnBDTN5pxd+dFDaVwJxgP3HfkPAbAj/My5puE6Nciu+zbboESp5c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/efi: fix violations of MISRA C:2012 Rule 7.2 Message-Id: Date: Thu, 13 Jul 2023 09:22:52 +0000 commit 5e6ad30ee5a3acba9906787ad78f213b6509385d Author: Gianluca Luparini AuthorDate: Wed Jul 12 13:29:54 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 12 13:29:54 2023 +0200 xen/efi: fix violations of MISRA C:2012 Rule 7.2 The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states: "A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type". Add the 'U' suffix to integers literals with unsigned type. For the sake of uniformity, the following changes are made: - add the 'U' suffix to all first macro's arguments in 'boot.c' - add the 'U' suffix near '0x3fffffff' in 'runtime.c' Signed-off-by: Gianluca Luparini Signed-off-by: Simone Ballarin Reviewed-by: Luca Fancellu Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/common/efi/boot.c | 8 ++++---- xen/common/efi/runtime.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index c5850c26af..24169b7b50 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -34,13 +34,13 @@ #define EFI_REVISION(major, minor) (((major) << 16) | (minor)) #define SMBIOS3_TABLE_GUID \ - { 0xf2fd1544, 0x9794, 0x4a2c, {0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94} } + { 0xf2fd1544U, 0x9794, 0x4a2c, {0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94} } #define SHIM_LOCK_PROTOCOL_GUID \ - { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} } + { 0x605dab50U, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} } #define APPLE_PROPERTIES_PROTOCOL_GUID \ - { 0x91bd12fe, 0xf6c3, 0x44fb, { 0xa5, 0xb7, 0x51, 0x22, 0xab, 0x30, 0x3a, 0xe0} } + { 0x91bd12feU, 0xf6c3, 0x44fb, {0xa5, 0xb7, 0x51, 0x22, 0xab, 0x30, 0x3a, 0xe0} } #define EFI_SYSTEM_RESOURCE_TABLE_GUID \ - { 0xb122a263, 0x3661, 0x4f68, {0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80} } + { 0xb122a263U, 0x3661, 0x4f68, {0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80} } #define EFI_SYSTEM_RESOURCE_TABLE_FIRMWARE_RESOURCE_VERSION 1 typedef struct { diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index 13b0975866..5cb7504c96 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -698,7 +698,7 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) #ifndef COMPAT op->status = status; #else - op->status = (status & 0x3fffffff) | ((status >> 32) & 0xc0000000); + op->status = (status & 0x3fffffffU) | ((status >> 32) & 0xc0000000U); #endif return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 13 09:23:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jul 2023 09:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563043.879958 (Exim 4.92) (envelope-from ) id 1qJsXP-000431-W6; Thu, 13 Jul 2023 09:23:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563043.879958; Thu, 13 Jul 2023 09:23: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 1qJsXP-00042t-T7; Thu, 13 Jul 2023 09:23:03 +0000 Received: by outflank-mailman (input) for mailman id 563043; Thu, 13 Jul 2023 09:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsXO-00041q-B2 for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsXO-00047L-8n for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qJsXO-000139-7t for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:23: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=DQLR5lczNyjMiQ+WnWOFbJ+aefIobCPFWJTSij4spQg=; b=ILLqYCU72mnJRI+WjSyIidxCv4 VrzpfZB5LFeegiTl+ujsXtn5Riu4v5yCG2Lr3R3JLY+fxmkrz1bhptpVZLIGpSiaiRc2bf9Raaiw7 2/pZhxkiEmHXahZFa4yA1NrQLFYxE+iUIQFYoMAaK9ZHEfUuRxsrP/67F/GHe3muy33c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/pci: fix violations of MISRA C:2012 Rule 7.2 Message-Id: Date: Thu, 13 Jul 2023 09:23:02 +0000 commit 02ccfdcf4a397fc3ac0332c1a9c9dbb4d1385482 Author: Gianluca Luparini AuthorDate: Wed Jul 12 13:30:26 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 12 13:30:26 2023 +0200 xen/pci: fix violations of MISRA C:2012 Rule 7.2 The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states: "A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type". Add the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity. Signed-off-by: Gianluca Luparini Signed-off-by: Simone Ballarin Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/drivers/passthrough/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 07d1986d33..95846e84f2 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -990,8 +990,8 @@ bool_t __init pci_device_detect(u16 seg, u8 bus, u8 dev, u8 func) vendor = pci_conf_read32(PCI_SBDF(seg, bus, dev, func), PCI_VENDOR_ID); /* some broken boards return 0 or ~0 if a slot is empty: */ - if ( (vendor == 0xffffffff) || (vendor == 0x00000000) || - (vendor == 0x0000ffff) || (vendor == 0xffff0000) ) + if ( (vendor == 0xffffffffU) || (vendor == 0x00000000U) || + (vendor == 0x0000ffffU) || (vendor == 0xffff0000U) ) return 0; return 1; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 13 09:23:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jul 2023 09:23:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563045.879961 (Exim 4.92) (envelope-from ) id 1qJsXa-0004Fj-1H; Thu, 13 Jul 2023 09:23:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563045.879961; Thu, 13 Jul 2023 09:23: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 1qJsXZ-0004Fb-UX; Thu, 13 Jul 2023 09:23:13 +0000 Received: by outflank-mailman (input) for mailman id 563045; Thu, 13 Jul 2023 09:23:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsXY-0004Cl-CK for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:23:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsXY-00047U-Ba for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:23:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qJsXY-00013p-Ar for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:23: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=59gxJ4elhMGB9BIeQrtn3lXjXC5RoHSawLn5AysC1FI=; b=esD0831KevVSmmJd9yodB1DRRQ Iv119aZQ4s2HodgRondXudXljfeUQM4tV2LUB/Yv5vtNK6TWCbDARdCOQw5VoH4/VrVytuz3PMsNP FX35ZTRZdGLJwvEdHtFs4sVPD7Vbf+z1CMAVsU1QfYE6UZy5x7sA1UCQwDgZR3ACIKhE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/public: fix violations of MISRA C:2012 Rule 7.2 Message-Id: Date: Thu, 13 Jul 2023 09:23:12 +0000 commit 952ce1f38f40c975cb8a72b98b2a41c5331e969f Author: Gianluca Luparini AuthorDate: Wed Jul 12 13:30:49 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 12 13:30:49 2023 +0200 xen/public: fix violations of MISRA C:2012 Rule 7.2 The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states: "A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type". Add the 'U' suffix to integers literals with unsigned type. For the sake of uniformity, the following changes are made: - add the 'U' suffix to integer constants before the '?' operator Signed-off-by: Gianluca Luparini Signed-off-by: Simone Ballarin Reviewed-by: Juergen Gross Reviewed-by: Stefano Stabellini --- xen/include/public/io/ring.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h index 025939278b..0cae4367be 100644 --- a/xen/include/public/io/ring.h +++ b/xen/include/public/io/ring.h @@ -36,11 +36,11 @@ typedef unsigned int RING_IDX; /* Round a 32-bit unsigned constant down to the nearest power of two. */ -#define __RD2(_x) (((_x) & 0x00000002) ? 0x2 : ((_x) & 0x1)) -#define __RD4(_x) (((_x) & 0x0000000c) ? __RD2((_x)>>2)<<2 : __RD2(_x)) -#define __RD8(_x) (((_x) & 0x000000f0) ? __RD4((_x)>>4)<<4 : __RD4(_x)) -#define __RD16(_x) (((_x) & 0x0000ff00) ? __RD8((_x)>>8)<<8 : __RD8(_x)) -#define __RD32(_x) (((_x) & 0xffff0000) ? __RD16((_x)>>16)<<16 : __RD16(_x)) +#define __RD2(x) (((x) & 0x00000002U) ? 0x2 : ((x) & 0x1)) +#define __RD4(x) (((x) & 0x0000000cU) ? __RD2((x) >> 2) << 2 : __RD2(x)) +#define __RD8(x) (((x) & 0x000000f0U) ? __RD4((x) >> 4) << 4 : __RD4(x)) +#define __RD16(x) (((x) & 0x0000ff00U) ? __RD8((x) >> 8) << 8 : __RD8(x)) +#define __RD32(x) (((x) & 0xffff0000U) ? __RD16((x) >> 16) << 16 : __RD16(x)) /* * Calculate size of a shared ring, given the total available space for the -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 13 09:23:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jul 2023 09:23:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563047.879966 (Exim 4.92) (envelope-from ) id 1qJsXk-0004LG-2s; Thu, 13 Jul 2023 09:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563047.879966; Thu, 13 Jul 2023 09:23: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 1qJsXj-0004L7-WF; Thu, 13 Jul 2023 09:23:24 +0000 Received: by outflank-mailman (input) for mailman id 563047; Thu, 13 Jul 2023 09:23:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsXi-0004Kc-F9 for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:23:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsXi-00047j-EH for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:23:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qJsXi-00014L-Dd for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:23: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=qrCgJvovpm0CQFA6MdmWxeVrtv58LN0XTLTxdeLCeaM=; b=SyswV+eCR5rW5hoxwVgiqyy/RW 6BSIbhvIl1VnEh8r96cngEs1aVuCY/nPfbvRts3mJY7GXwwRIf37g/1ziOlo0Chrf5HuvqOnz0sv6 csJGkOjctH9+3e0yZwZ4VmxwOK05gLIwNUu6msREPiIVLpYgIbIRbEZb/GGVi+80HQ/w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/monitor: fix violations of MISRA C:2012 Rule 7.2 Message-Id: Date: Thu, 13 Jul 2023 09:23:22 +0000 commit d717825a2036896ff37d66ed1846a7a2198ac532 Author: Gianluca Luparini AuthorDate: Wed Jul 12 13:31:08 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 12 13:31:08 2023 +0200 x86/monitor: fix violations of MISRA C:2012 Rule 7.2 The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states: "A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type". Add the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity. Signed-off-by: Gianluca Luparini Signed-off-by: Simone Ballarin Reviewed-by: Stefano Stabellini Acked-by: Tamas K Lengyel --- xen/arch/x86/monitor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/monitor.c b/xen/arch/x86/monitor.c index d4857faf8a..dc336c239a 100644 --- a/xen/arch/x86/monitor.c +++ b/xen/arch/x86/monitor.c @@ -48,17 +48,17 @@ static unsigned long *monitor_bitmap_for_msr(const struct domain *d, u32 *msr) switch ( *msr ) { - case 0 ... 0x1fff: + case 0 ... 0x1fffU: BUILD_BUG_ON(sizeof(d->arch.monitor.msr_bitmap->low) * 8 <= 0x1fff); return d->arch.monitor.msr_bitmap->low; - case 0x40000000 ... 0x40001fff: + case 0x40000000U ... 0x40001fffU: BUILD_BUG_ON( sizeof(d->arch.monitor.msr_bitmap->hypervisor) * 8 <= 0x1fff); *msr &= 0x1fff; return d->arch.monitor.msr_bitmap->hypervisor; - case 0xc0000000 ... 0xc0001fff: + case 0xc0000000U ... 0xc0001fffU: BUILD_BUG_ON(sizeof(d->arch.monitor.msr_bitmap->high) * 8 <= 0x1fff); *msr &= 0x1fff; return d->arch.monitor.msr_bitmap->high; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 13 09:23:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jul 2023 09:23:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563048.879970 (Exim 4.92) (envelope-from ) id 1qJsXu-0004Q1-43; Thu, 13 Jul 2023 09:23:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563048.879970; Thu, 13 Jul 2023 09:23: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 1qJsXu-0004Pr-1P; Thu, 13 Jul 2023 09:23:34 +0000 Received: by outflank-mailman (input) for mailman id 563048; Thu, 13 Jul 2023 09:23:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsXs-0004Pd-Hl for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:23:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsXs-00047s-H1 for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:23:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qJsXs-000155-GL for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:23: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=91qF+97bVQIwv/0kyV8evpk586v1Ec+ggSI9gTYdKeA=; b=cSQtHtkMnbjkezSkIwAzOukot4 kLKMd2eWWKqTejvRHG4fufvTmFaD+157MVZcFXpBoh6unkc/h0GLnM1LkrIVedWydNJoZl8FI7BLA DF5AYbXiUZoVD8HXkYtJ9BgiByDox2LRpJOf9GpNf+RfN0F2Y2VeyzvShW9LMh3SKpYw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] ACPI/APEI: fix violations of MISRA C:2012 Rule 7.2 Message-Id: Date: Thu, 13 Jul 2023 09:23:32 +0000 commit a665d69e8800cc7c702ec12c57b9af479f56caad Author: Gianluca Luparini AuthorDate: Wed Jul 12 13:31:55 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 12 13:31:55 2023 +0200 ACPI/APEI: fix violations of MISRA C:2012 Rule 7.2 The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states: "A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type". Add the 'U' suffix to integers literals with unsigned type. For the sake of uniformity, the following changes are made: - add the 'U' suffix to all first macro's arguments in 'cper.h' Signed-off-by: Gianluca Luparini Signed-off-by: Simone Ballarin Acked-by: Jan Beulich --- xen/include/xen/cper.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/include/xen/cper.h b/xen/include/xen/cper.h index f8e5272bc1..7c6a4c45ce 100644 --- a/xen/include/xen/cper.h +++ b/xen/include/xen/cper.h @@ -56,7 +56,7 @@ static inline uint64_t cper_next_record_id(void) #define CPER_SIG_RECORD "CPER" #define CPER_SIG_SIZE 4 /* Used in signature_end field in struct cper_record_header */ -#define CPER_SIG_END 0xffffffff +#define CPER_SIG_END 0xffffffffU /* * CPER record header revision, used in revision field in struct @@ -80,35 +80,35 @@ static inline uint64_t cper_next_record_id(void) * Corrected Machine Check */ #define CPER_NOTIFY_CMC \ - UUID_LE(0x2DCE8BB1, 0xBDD7, 0x450e, 0xB9, 0xAD, 0x9C, 0xF4, \ + UUID_LE(0x2DCE8BB1U, 0xBDD7, 0x450e, 0xB9, 0xAD, 0x9C, 0xF4, \ 0xEB, 0xD4, 0xF8, 0x90) /* Corrected Platform Error */ #define CPER_NOTIFY_CPE \ - UUID_LE(0x4E292F96, 0xD843, 0x4a55, 0xA8, 0xC2, 0xD4, 0x81, \ + UUID_LE(0x4E292F96U, 0xD843, 0x4a55, 0xA8, 0xC2, 0xD4, 0x81, \ 0xF2, 0x7E, 0xBE, 0xEE) /* Machine Check Exception */ #define CPER_NOTIFY_MCE \ - UUID_LE(0xE8F56FFE, 0x919C, 0x4cc5, 0xBA, 0x88, 0x65, 0xAB, \ + UUID_LE(0xE8F56FFEU, 0x919C, 0x4cc5, 0xBA, 0x88, 0x65, 0xAB, \ 0xE1, 0x49, 0x13, 0xBB) /* PCI Express Error */ #define CPER_NOTIFY_PCIE \ - UUID_LE(0xCF93C01F, 0x1A16, 0x4dfc, 0xB8, 0xBC, 0x9C, 0x4D, \ + UUID_LE(0xCF93C01FU, 0x1A16, 0x4dfc, 0xB8, 0xBC, 0x9C, 0x4D, \ 0xAF, 0x67, 0xC1, 0x04) /* INIT Record (for IPF) */ #define CPER_NOTIFY_INIT \ - UUID_LE(0xCC5263E8, 0x9308, 0x454a, 0x89, 0xD0, 0x34, 0x0B, \ + UUID_LE(0xCC5263E8U, 0x9308, 0x454a, 0x89, 0xD0, 0x34, 0x0B, \ 0xD3, 0x9B, 0xC9, 0x8E) /* Non-Maskable Interrupt */ #define CPER_NOTIFY_NMI \ - UUID_LE(0x5BAD89FF, 0xB7E6, 0x42c9, 0x81, 0x4A, 0xCF, 0x24, \ + UUID_LE(0x5BAD89FFU, 0xB7E6, 0x42c9, 0x81, 0x4A, 0xCF, 0x24, \ 0x85, 0xD6, 0xE9, 0x8A) /* BOOT Error Record */ #define CPER_NOTIFY_BOOT \ - UUID_LE(0x3D61A466, 0xAB40, 0x409a, 0xA6, 0x98, 0xF3, 0x62, \ + UUID_LE(0x3D61A466U, 0xAB40, 0x409a, 0xA6, 0x98, 0xF3, 0x62, \ 0xD4, 0x64, 0xB3, 0x8F) /* DMA Remapping Error */ #define CPER_NOTIFY_DMAR \ - UUID_LE(0x667DD791, 0xC6B3, 0x4c27, 0x8A, 0x6B, 0x0F, 0x8E, \ + UUID_LE(0x667DD791U, 0xC6B3, 0x4c27, 0x8A, 0x6B, 0x0F, 0x8E, \ 0x72, 0x2D, 0xEB, 0x41) /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 13 09:23:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Jul 2023 09:23:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563050.879974 (Exim 4.92) (envelope-from ) id 1qJsY4-0004T7-5q; Thu, 13 Jul 2023 09:23:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563050.879974; Thu, 13 Jul 2023 09:23: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 1qJsY4-0004Sz-2o; Thu, 13 Jul 2023 09:23:44 +0000 Received: by outflank-mailman (input) for mailman id 563050; Thu, 13 Jul 2023 09:23:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsY2-0004Se-Ks for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:23:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qJsY2-000481-KA for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:23:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qJsY2-00015u-JM for xen-changelog@lists.xenproject.org; Thu, 13 Jul 2023 09:23:42 +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=0sLB7z9zNuHhHCGFemjx0DQaTci53Uy8ah6N7rnmPJE=; b=L++joeC+9hva0AWOjl2nIgmXpM k1EYp+gtpnfAJ17PmQCi1pnCkQB4FMLaugxQpXwPgjtiYztnlBe6r2yGRyYIC4w7HuBmGab9USZab H87Vkndtpb+djJhtphr31xSGJTvdtAqD2yUZWfH0i1Nu9eJ/THgK+MIaPAGUboZrEpeU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: fix violations of MISRA C:2012 Rule 7.2 Message-Id: Date: Thu, 13 Jul 2023 09:23:42 +0000 commit 0a834e953b01ec25c412369d7a5b8b57d340ac60 Author: Gianluca Luparini AuthorDate: Wed Jul 12 13:32:28 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 12 13:32:28 2023 +0200 xen: fix violations of MISRA C:2012 Rule 7.2 The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states: "A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type". Add the 'U' suffix to integers literals with unsigned type. Fot the sake of uniformity, the following changes are made: - add the 'U' suffix to all integer constants before the '?' operator in 'bitops.h' Signed-off-by: Gianluca Luparini Signed-off-by: Simone Ballarin Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/common/gunzip.c | 2 +- xen/common/xmalloc_tlsf.c | 2 +- xen/drivers/char/ehci-dbgp.c | 4 ++-- xen/drivers/video/vesa.c | 2 +- xen/include/public/memory.h | 2 +- xen/include/public/sysctl.h | 4 ++-- xen/include/xen/bitops.h | 10 +++++----- xen/lib/muldiv64.c | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/common/gunzip.c b/xen/common/gunzip.c index 71ec5f26be..b810499be2 100644 --- a/xen/common/gunzip.c +++ b/xen/common/gunzip.c @@ -11,7 +11,7 @@ static unsigned char *__initdata window; static memptr __initdata free_mem_ptr; static memptr __initdata free_mem_end_ptr; -#define WSIZE 0x80000000 +#define WSIZE 0x80000000U static unsigned char *__initdata inbuf; static unsigned int __initdata insize; diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c index 75bdf18c4e..c21bf71e88 100644 --- a/xen/common/xmalloc_tlsf.c +++ b/xen/common/xmalloc_tlsf.c @@ -46,7 +46,7 @@ #define BHDR_OVERHEAD (sizeof(struct bhdr) - MIN_BLOCK_SIZE) #define PTR_MASK (sizeof(void *) - 1) -#define BLOCK_SIZE_MASK (0xFFFFFFFF - PTR_MASK) +#define BLOCK_SIZE_MASK (0xFFFFFFFFU - PTR_MASK) #define GET_NEXT_BLOCK(addr, r) ((struct bhdr *) \ ((char *)(addr) + (r))) diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index bb9d3198d9..4d8d765122 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -375,12 +375,12 @@ static inline u32 dbgp_pid_write_update(u32 x, u32 tok) static u8 data0 = USB_PID_DATA1; data0 ^= USB_PID_DATA0 ^ USB_PID_DATA1; - return (x & 0xffff0000) | (data0 << 8) | (tok & 0xff); + return (x & 0xffff0000U) | (data0 << 8) | (tok & 0xffU); } static inline u32 dbgp_pid_read_update(u32 x, u32 tok) { - return (x & 0xffffff00) | (tok & 0xff); + return (x & 0xffffff00U) | (tok & 0xffU); } static inline void dbgp_set_data(struct ehci_dbg_port __iomem *ehci_debug, diff --git a/xen/drivers/video/vesa.c b/xen/drivers/video/vesa.c index c41f6b8d40..b007ff5678 100644 --- a/xen/drivers/video/vesa.c +++ b/xen/drivers/video/vesa.c @@ -123,7 +123,7 @@ void __init vesa_init(void) if ( vlfb_info.bits_per_pixel > 8 ) { /* Light grey in truecolor. */ - unsigned int grey = 0xaaaaaaaa; + unsigned int grey = 0xaaaaaaaaU; lfbp.pixel_on = ((grey >> (32 - vlfb_info. red_size)) << vlfb_info. red_pos) | ((grey >> (32 - vlfb_info.green_size)) << vlfb_info.green_pos) | diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index c5f0d31e23..5e545ae9a4 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -234,7 +234,7 @@ struct xen_add_to_physmap { unsigned int space; /* => enum phys_map_space */ -#define XENMAPIDX_grant_table_status 0x80000000 +#define XENMAPIDX_grant_table_status 0x80000000U /* Index into space being mapped. */ xen_ulong_t idx; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 33e86ace51..fa7147de47 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -384,7 +384,7 @@ struct xen_sysctl_pm_op { struct xen_set_cpufreq_para set_para; uint64_aligned_t get_avgfreq; uint32_t set_sched_opt_smt; -#define XEN_SYSCTL_CX_UNLIMITED 0xffffffff +#define XEN_SYSCTL_CX_UNLIMITED 0xffffffffU uint32_t get_max_cstate; uint32_t set_max_cstate; } u; @@ -547,7 +547,7 @@ struct xen_sysctl_numainfo { #define XEN_SYSCTL_CPUPOOL_OP_RMCPU 5 /* R */ #define XEN_SYSCTL_CPUPOOL_OP_MOVEDOMAIN 6 /* M */ #define XEN_SYSCTL_CPUPOOL_OP_FREEINFO 7 /* F */ -#define XEN_SYSCTL_CPUPOOL_PAR_ANY 0xFFFFFFFF +#define XEN_SYSCTL_CPUPOOL_PAR_ANY 0xFFFFFFFFU struct xen_sysctl_cpupool_op { uint32_t op; /* IN */ uint32_t cpupool_id; /* IN: CDIARM OUT: CI */ diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index 4cd0310789..e926047932 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -227,11 +227,11 @@ static inline __u32 ror32(__u32 word, unsigned int shift) } /* base-2 logarithm */ -#define __L2(_x) (((_x) & 0x00000002) ? 1 : 0) -#define __L4(_x) (((_x) & 0x0000000c) ? ( 2 + __L2( (_x)>> 2)) : __L2( _x)) -#define __L8(_x) (((_x) & 0x000000f0) ? ( 4 + __L4( (_x)>> 4)) : __L4( _x)) -#define __L16(_x) (((_x) & 0x0000ff00) ? ( 8 + __L8( (_x)>> 8)) : __L8( _x)) -#define ilog2(_x) (((_x) & 0xffff0000) ? (16 + __L16((_x)>>16)) : __L16(_x)) +#define __L2(x) (((x) & 0x00000002U) ? 1 : 0) +#define __L4(x) (((x) & 0x0000000cU) ? ( 2 + __L2( (x) >> 2)) : __L2( x)) +#define __L8(x) (((x) & 0x000000f0U) ? ( 4 + __L4( (x) >> 4)) : __L4( x)) +#define __L16(x) (((x) & 0x0000ff00U) ? ( 8 + __L8( (x) >> 8)) : __L8( x)) +#define ilog2(x) (((x) & 0xffff0000U) ? (16 + __L16((x) >> 16)) : __L16(x)) /** * for_each_set_bit - iterate over every set bit in a memory region diff --git a/xen/lib/muldiv64.c b/xen/lib/muldiv64.c index 78177ce616..79411f5d59 100644 --- a/xen/lib/muldiv64.c +++ b/xen/lib/muldiv64.c @@ -27,7 +27,7 @@ uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c) rh = (uint64_t)u.l.high * (uint64_t)b; rh += (rl >> 32); res.l.high = rh / c; - res.l.low = (((rh % c) << 32) + (rl & 0xffffffff)) / c; + res.l.low = (((rh % c) << 32) + (uint32_t)rl) / c; return res.ll; #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 14 20:55:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jul 2023 20:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563807.881230 (Exim 4.92) (envelope-from ) id 1qKPod-0006z6-J3; Fri, 14 Jul 2023 20:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563807.881230; Fri, 14 Jul 2023 20:55: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 1qKPod-0006yy-GP; Fri, 14 Jul 2023 20:55:03 +0000 Received: by outflank-mailman (input) for mailman id 563807; Fri, 14 Jul 2023 20:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPoc-0006yo-5z for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPob-0005RV-TS for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qKPob-0002yN-SQ for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55: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=J0jua2bCOYd411ggIbii6+aGPo1jGKv/OIyYYo5oikk=; b=5jkQzfws3ZyWS+0XyYyBW/GCLq C5hOgh8aSvpIvXzl+zkXHVKFRnIVrl5RWnmxoltE4cD1DCEdzNsC9DmDOGwGPa8lNKVSfogOKKus8 /ysmUg0GfF3KCwiki7ssUd1SGdbVUXGYvmXkTyH1KFCAJ3qLcv/fhF12D7bB6ZSivxPY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: add Rule 9.3 Message-Id: Date: Fri, 14 Jul 2023 20:55:01 +0000 commit 24909098fdb260da9ffd0ba733d3a540c8c61aec Author: Stefano Stabellini AuthorDate: Tue Jul 11 13:21:45 2023 -0700 Commit: Stefano Stabellini CommitDate: Wed Jul 12 13:02:07 2023 -0700 docs/misra: add Rule 9.3 Specify that {} is allowed for zero-initialization. Signed-off-by: Stefano Stabellini Reviewed-by: Luca Fancellu Acked-by: Jan Beulich --- docs/misra/rules.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index 72aa986bce..29a777938a 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -284,6 +284,11 @@ maintainers if you want to suggest a change. braces - + * - `Rule 9.3 `_ + - Required + - Arrays shall not be partially initialized + - {} is also allowed to specify explicit zero-initialization + * - `Rule 9.4 `_ - Required - An element of an object shall not be initialized more than once -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 14 20:55:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jul 2023 20:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563808.881234 (Exim 4.92) (envelope-from ) id 1qKPon-00070o-Kd; Fri, 14 Jul 2023 20:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563808.881234; Fri, 14 Jul 2023 20:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPon-00070g-Hk; Fri, 14 Jul 2023 20:55:13 +0000 Received: by outflank-mailman (input) for mailman id 563808; Fri, 14 Jul 2023 20:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPom-00070Z-1H for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPom-0005Rd-0R for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qKPol-0002yo-Vc for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55:11 +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=IRXsKh7cPJU12a3bQjeRpmeb6QyaZnC07Z1zdAoDjkc=; b=650C7EU/52sDXn9/wVyqRV22ne JWsWKxKcatSrID4wW2/qJ5SY0/ciMPXmUq0LGHp2eGbrAppbhOZ0KRR0iOvOm6DQnQFJeUdDcKAIj pCa1fJl8wOnsKXm3EBk7DWRn7YqFu4nBHdjaTiP1ou+D5xCTomV0BGJrGGHZ09jDt9xs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] ocaml/libs/xc: Fix NULL dereference with physinfo_arch_caps() Message-Id: Date: Fri, 14 Jul 2023 20:55:11 +0000 commit 99e45548934923f0d2c1d52ae1239ffe4ef17a06 Author: Edwin Török AuthorDate: Thu Jul 13 09:30:01 2023 +0100 Commit: Andrew Cooper CommitDate: Thu Jul 13 11:06:07 2023 +0100 ocaml/libs/xc: Fix NULL dereference with physinfo_arch_caps() `Tag_cons` is `0` and is meant to be used as the tag argument for `caml_alloc`/`caml_alloc_small` when constructing a non-empty list. The empty list is `Val_emptylist` instead, which is really just `Val_int(0)`. Assigning `0` to a list value like this is equivalent to assigning the naked pointer `NULL` to the field. Naked pointers are not valid in OCaml 5, however even in OCaml <5.x any attempt to iterate on the list will lead to a segfault. The list currently only has an opaque type, so no code would have reason to iterate on it currently, but we shouldn't construct invalid OCaml values that might lead to a crash when exploring the type. `Val_emptylist` is available since OCaml 3.01 as a constant. Fixes: e5ac68a0110c ("x86/hvm: Revert per-domain APIC acceleration support") Signed-off-by: Edwin Török Acked-by: Christian Lindig --- tools/ocaml/libs/xc/xenctrl_stubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index e4d9070f2d..3703f48c74 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -832,7 +832,7 @@ CAMLprim value physinfo_arch_caps(const xc_physinfo_t *info) tag = 1; /* tag x86 */ - arch_obj = Tag_cons; + arch_obj = Val_emptylist; #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 14 20:55:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jul 2023 20:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563809.881239 (Exim 4.92) (envelope-from ) id 1qKPox-00073o-MR; Fri, 14 Jul 2023 20:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563809.881239; Fri, 14 Jul 2023 20:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPox-00073a-J8; Fri, 14 Jul 2023 20:55:23 +0000 Received: by outflank-mailman (input) for mailman id 563809; Fri, 14 Jul 2023 20:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPow-000739-4I for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPow-0005S8-3X for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qKPow-0002zH-2W for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55: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=nC3WPD/OcvC36cZX1lLP/xlmW1Zt4dzLcLmke61xwMw=; b=aXMqnvU1p3TbWBh1ZeOEfUbD+l Wxba00GLyqWuHrGRDKaEHm3wn0/dX5p+bwspFFwKPia73q2mNcuKFkioVkbtCn9Is39tzRjB4iZji 7GAxMdKBZhGVWrzbpjGrvkRf/AeOMYQbEWnDH8KCfd3U1inb74GQywMwa7QNe4/a9+88=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: fix violations of MISRA C:2012 Rule 3.1 Message-Id: Date: Fri, 14 Jul 2023 20:55:22 +0000 commit ea96231023fb264b4499fda0cca4ae048ea6d456 Author: Nicola Vetrini AuthorDate: Thu Jul 13 16:57:16 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jul 13 16:57:16 2023 +0200 xen: fix violations of MISRA C:2012 Rule 3.1 In the file 'xen/common/xmalloc_tlsf.c' is not clear how the commented-out code should interact with the previous statement. To resolve the MISRA violation generated by the nested comment a #if .. #endif block with an explanatory comment substitutes the earlier construct. In the file 'xen/include/xen/atomic.h' the nested comment has been removed, since the code sample is already explained by the preceding comment. Signed-off-by: Nicola Vetrini Reviewed-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- xen/common/xmalloc_tlsf.c | 13 ++++++++++--- xen/include/xen/atomic.h | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c index c21bf71e88..c603c39bb9 100644 --- a/xen/common/xmalloc_tlsf.c +++ b/xen/common/xmalloc_tlsf.c @@ -139,10 +139,17 @@ static inline void MAPPING_SEARCH(unsigned long *r, int *fl, int *sl) *r = *r + t; *fl = flsl(*r) - 1; *sl = (*r >> (*fl - MAX_LOG2_SLI)) - MAX_SLI; - *fl -= FLI_OFFSET; - /*if ((*fl -= FLI_OFFSET) < 0) // FL will be always >0! - *fl = *sl = 0; + /* + * It's unclear what was the purpose of the commented-out code that now + * is in the #else branch. The current form is motivated by the correction + * of a violation MISRA:C 2012 Rule 3.1 */ +#if 1 + *fl -= FLI_OFFSET; +#else + if ((*fl -= FLI_OFFSET) < 0) /* FL will be always >0! */ + *fl = *sl = 0; +#endif *r &= ~t; } } diff --git a/xen/include/xen/atomic.h b/xen/include/xen/atomic.h index 529213ebbb..fa750a18ae 100644 --- a/xen/include/xen/atomic.h +++ b/xen/include/xen/atomic.h @@ -78,7 +78,7 @@ static inline void _atomic_set(atomic_t *v, int i); * int old = atomic_read(&v); * int new = old + 1; * if ( likely(old == atomic_cmpxchg(&v, old, new)) ) - * break; // success! + * break; * } */ static inline int atomic_cmpxchg(atomic_t *v, int old, int new); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 14 20:55:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jul 2023 20:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563810.881241 (Exim 4.92) (envelope-from ) id 1qKPp7-00076v-NR; Fri, 14 Jul 2023 20:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563810.881241; Fri, 14 Jul 2023 20:55:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPp7-00076n-Kc; Fri, 14 Jul 2023 20:55:33 +0000 Received: by outflank-mailman (input) for mailman id 563810; Fri, 14 Jul 2023 20:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPp6-00076V-7Z for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPp6-0005SJ-6f for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qKPp6-0002zm-5i for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55: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=4nwz7+lo6QRYGN+sETYt83rqPok+UJQ2m7IX4455tL8=; b=I+TLnwRs74zauuh1ZxBXGvx7yd T57akBQS8CGaWV3dlY9zpr5/IrpgkEtO5w8dM0uiT2qDSw8800CQJx7J+HFIDKlnWF9skyLbGNWin ZPnhy4NEifKZPZtJ/sURip3Ms7v0V9EazGn5vISrCdTJTDv/rXJyvVh/73fl95QVUQU4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/APIC: include full string with error_interrupt() error messages Message-Id: Date: Fri, 14 Jul 2023 20:55:32 +0000 commit 013670adf50f49469eaf0ef251726959e956f470 Author: Elliott Mitchell AuthorDate: Thu Jul 13 16:58:24 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jul 13 16:58:24 2023 +0200 x86/APIC: include full string with error_interrupt() error messages Rather than adding ", " with each printf(), simply include them in the string initially. This allows converting to strlcat() or other methods which strictly concatenate, rather than formatting. Signed-off-by: Elliott Mitchell Acked-by: Jan Beulich --- xen/arch/x86/apic.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index f71474d47d..8cfb8cd71c 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1401,14 +1401,14 @@ static void cf_check spurious_interrupt(struct cpu_user_regs *regs) static void cf_check error_interrupt(struct cpu_user_regs *regs) { static const char *const esr_fields[] = { - "Send CS error", - "Receive CS error", - "Send accept error", - "Receive accept error", - "Redirectable IPI", - "Send illegal vector", - "Received illegal vector", - "Illegal register address", + ", Send CS error", + ", Receive CS error", + ", Send accept error", + ", Receive accept error", + ", Redirectable IPI", + ", Send illegal vector", + ", Received illegal vector", + ", Illegal register address", }; unsigned int v, v1; int i; @@ -1423,7 +1423,7 @@ static void cf_check error_interrupt(struct cpu_user_regs *regs) smp_processor_id(), v , v1); for ( i = 7; i >= 0; --i ) if ( v1 & (1 << i) ) - printk(", %s", esr_fields[i]); + printk("%s", esr_fields[i]); printk("\n"); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 14 20:55:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jul 2023 20:55:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563812.881245 (Exim 4.92) (envelope-from ) id 1qKPpH-0007A8-Oq; Fri, 14 Jul 2023 20:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563812.881245; Fri, 14 Jul 2023 20:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPpH-0007A0-M9; Fri, 14 Jul 2023 20:55:43 +0000 Received: by outflank-mailman (input) for mailman id 563812; Fri, 14 Jul 2023 20:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPpG-00079h-CO for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPpG-0005SS-9p for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qKPpG-00030B-8k for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55:42 +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=5jaZ2U3o8/IEx9+gnL2MOqfZUhaXcoq3OQrDC65WdsU=; b=0PmUS+PdqqZX0eOLDjNdy97Hcx dByuMSXMAu4cAR/ebBMaY0dDIVELqX7hQa9WvN06FRf0C3PyoeRwYOZvghXeHsLFL2pzJJ/M31JHR MFRoMvsr2Ye94OWeZjMCueOuoCXoqPXTgkd5qvgTkSIDTpse1t1xsorHbfPp31yPAWDA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/APIC: modify error_interrupt() to output using single printk() Message-Id: Date: Fri, 14 Jul 2023 20:55:42 +0000 commit 6960e343d6b374196e6af585532d058d58585027 Author: Elliott Mitchell AuthorDate: Thu Jul 13 16:58:56 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jul 13 16:58:56 2023 +0200 x86/APIC: modify error_interrupt() to output using single printk() This takes care of the issue of APIC errors tending to occur on multiple cores at once. In turn this tends to causes the error messages to be merged together, making understanding them difficult. Signed-off-by: Elliott Mitchell Acked-by: Jan Beulich --- xen/arch/x86/apic.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 8cfb8cd71c..08459228e0 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1410,6 +1410,7 @@ static void cf_check error_interrupt(struct cpu_user_regs *regs) ", Received illegal vector", ", Illegal register address", }; + const char *entries[ARRAY_SIZE(esr_fields)]; unsigned int v, v1; int i; @@ -1419,12 +1420,13 @@ static void cf_check error_interrupt(struct cpu_user_regs *regs) v1 = apic_read(APIC_ESR); ack_APIC_irq(); - printk(XENLOG_DEBUG "APIC error on CPU%u: %02x(%02x)", - smp_processor_id(), v , v1); for ( i = 7; i >= 0; --i ) - if ( v1 & (1 << i) ) - printk("%s", esr_fields[i]); - printk("\n"); + entries[i] = v1 & (1 << i) ? esr_fields[i] : ""; + printk(XENLOG_DEBUG + "APIC error on CPU%u: %02x(%02x)%s%s%s%s%s%s%s%s\n", + smp_processor_id(), v, v1, + entries[7], entries[6], entries[5], entries[4], + entries[3], entries[2], entries[1], entries[0]); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 14 20:55:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jul 2023 20:55:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563813.881250 (Exim 4.92) (envelope-from ) id 1qKPpR-0007D4-QP; Fri, 14 Jul 2023 20:55:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563813.881250; Fri, 14 Jul 2023 20:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPpR-0007Cx-Ng; Fri, 14 Jul 2023 20:55:53 +0000 Received: by outflank-mailman (input) for mailman id 563813; Fri, 14 Jul 2023 20:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPpQ-0007Ch-Dk for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPpQ-0005Sd-Cy for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qKPpQ-00030a-Bv for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:55:52 +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=5KMc/9GCxM0+Qlfh11ki9+pxrIGvU/CWpZdcVbs89Rs=; b=bV0IYMHpLqnrpJaP5v93sB3cbr QZvxm3OaRRmm9vSP77XmyorNFrz5PM9obq84/4nLmt3URtUZjZWYTRsAOIYxHQJ95BKz/IG7TkrTb c1B411bhu1YINi5rI3qIyVSWg3YHbEV4mxLBg7pMWZTcczHcohAVQvITVPX9nVvdSEm4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/APIC: adjustments to error_interrupt() loop Message-Id: Date: Fri, 14 Jul 2023 20:55:52 +0000 commit 2acec876949e2488dfeffab3c531984b91d33cf5 Author: Elliott Mitchell AuthorDate: Thu Jul 13 16:59:18 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jul 13 16:59:18 2023 +0200 x86/APIC: adjustments to error_interrupt() loop ARRAY_SIZE() makes future maintainance easier and thus less likely for bugs to occur. Signed-off-by: Elliott Mitchell Acked-by: Jan Beulich --- xen/arch/x86/apic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 08459228e0..ce556b2684 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1412,7 +1412,7 @@ static void cf_check error_interrupt(struct cpu_user_regs *regs) }; const char *entries[ARRAY_SIZE(esr_fields)]; unsigned int v, v1; - int i; + unsigned int i; /* First tickle the hardware, only then report what went on. -- REW */ v = apic_read(APIC_ESR); @@ -1420,7 +1420,7 @@ static void cf_check error_interrupt(struct cpu_user_regs *regs) v1 = apic_read(APIC_ESR); ack_APIC_irq(); - for ( i = 7; i >= 0; --i ) + for ( i = 0; i < ARRAY_SIZE(entries); ++i ) entries[i] = v1 & (1 << i) ? esr_fields[i] : ""; printk(XENLOG_DEBUG "APIC error on CPU%u: %02x(%02x)%s%s%s%s%s%s%s%s\n", -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 14 20:56:03 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jul 2023 20:56:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563815.881254 (Exim 4.92) (envelope-from ) id 1qKPpb-0007Fw-S1; Fri, 14 Jul 2023 20:56:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563815.881254; Fri, 14 Jul 2023 20:56: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 1qKPpb-0007Fo-PJ; Fri, 14 Jul 2023 20:56:03 +0000 Received: by outflank-mailman (input) for mailman id 563815; Fri, 14 Jul 2023 20:56:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPpa-0007Fe-Gh for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:56:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPpa-0005Sx-G2 for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:56:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qKPpa-00031H-FD for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:56: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=/mYK+zzaK2mxolGt0QvijP60s7CW0wjNcjrBMRU6UCg=; b=3qMoIHSpuk4HZeCcwED11S9aUc mdbCo4mi3d8a1M5SqG5hq72DuszonuGFzHaQTIjdhCFr6J2Wyt4jA6N77QZOlbodS9DMp1Hii7lw7 YDw6sh66aghmOQ99HiXWtsEqz8AWGF5WaKAxeopywwz0XjuryAvkXVD5AwYd87+ML4HI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs: Fix style in misc/arm/silicon-errata.txt table Message-Id: Date: Fri, 14 Jul 2023 20:56:02 +0000 commit 728bdd3a338ca0c097ff2cca3a1d1f47901473dc Author: Luca Fancellu AuthorDate: Wed Jul 12 13:04:40 2023 +0100 Commit: Julien Grall CommitDate: Thu Jul 13 19:17:33 2023 +0100 docs: Fix style in misc/arm/silicon-errata.txt table Fix the right border of the silicon-errata.txt table Fixes: 1814a626fb58 ("xen/arm: Update silicon-errata.txt with the Neovers AT erratum") Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel Acked-by: Stefano Stabellini --- docs/misc/arm/silicon-errata.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/misc/arm/silicon-errata.txt b/docs/misc/arm/silicon-errata.txt index 1925d8fd4e..a7abcc1ba1 100644 --- a/docs/misc/arm/silicon-errata.txt +++ b/docs/misc/arm/silicon-errata.txt @@ -56,6 +56,6 @@ stable hypervisors. | ARM | Cortex-A73 | #858921 | ARM_ERRATUM_858921 | | ARM | Cortex-A76 | #1165522 | N/A | | ARM | Cortex-A76 | #1286807 | ARM64_ERRATUM_1286807 | -| ARM | Neoverse-N1 | #1165522 | N/A +| ARM | Neoverse-N1 | #1165522 | N/A | | ARM | Neoverse-N1 | #1286807 | ARM64_ERRATUM_1286807 | | ARM | MMU-500 | #842869 | N/A | -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 14 20:56:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Jul 2023 20:56:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563816.881257 (Exim 4.92) (envelope-from ) id 1qKPpl-0007IW-Tg; Fri, 14 Jul 2023 20:56:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563816.881257; Fri, 14 Jul 2023 20:56:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPpl-0007IO-Qt; Fri, 14 Jul 2023 20:56:13 +0000 Received: by outflank-mailman (input) for mailman id 563816; Fri, 14 Jul 2023 20:56:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPpk-0007IE-Jd for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:56:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKPpk-0005T7-Is for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:56:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qKPpk-00031j-I7 for xen-changelog@lists.xenproject.org; Fri, 14 Jul 2023 20:56: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=HCPhUpcGwrc3cOIz4zJtG4O2ilQS9YOjJlivdPwifyc=; b=b1df8mXdb0gy/L90WlYymsXIUm E5WCGmg4tpA4Q/+AZx9axITD4KPaC2mzivQQn8PDUedBG8SRIwMEwwP2T5g0/aWtUsIaD51Mbpe3o K9gNff1jzapunbLP/vlYLcEgP6kaW+ByF49x3Cn5xhXhdjJyMkhBunpYFiiuYrJ7Nf4E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: pci: fix check in pci_check_bar() Message-Id: Date: Fri, 14 Jul 2023 20:56:12 +0000 commit 11961f0a6700fb62edb17930fcf6c3f5453c133b Author: Stewart Hildebrand AuthorDate: Wed Jul 12 09:52:21 2023 -0400 Commit: Julien Grall CommitDate: Thu Jul 13 19:19:25 2023 +0100 xen/arm: pci: fix check in pci_check_bar() When mapping BARs for vPCI, it's valid for a BAR mfn_t start to equal the BAR mfn_t end (i.e. start == end) since end is inclusive. However, pci_check_bar() currently returns false in this case, which results in Xen not mapping the BAR in the guest 2nd stage page tables. In this example boot log, Linux has mapped the BARs in the 1st stage, but since Xen did not map them in the 2nd stage, Linux encounters a data abort and panics: [ 2.593300] pci 0000:00:00.0: BAR 0: assigned [mem 0x50008000-0x50008fff] [ 2.593682] pci 0000:00:00.0: BAR 2: assigned [mem 0x50009000-0x50009fff] [ 2.594066] pci 0000:00:00.0: BAR 4: assigned [mem 0x5000a000-0x5000afff] ... [ 2.810502] virtio-pci 0000:00:00.0: enabling device (0000 -> 0002) (XEN) 0000:00:00.0: not mapping BAR [50008, 50008] invalid position (XEN) 0000:00:00.0: not mapping BAR [50009, 50009] invalid position (XEN) 0000:00:00.0: not mapping BAR [5000a, 5000a] invalid position [ 2.817502] virtio-pci 0000:00:00.0: virtio_pci: leaving for legacy driver [ 2.817853] virtio-pci 0000:00:00.0: enabling bus mastering (XEN) arch/arm/traps.c:1992:d0v0 HSR=0x00000093010045 pc=0xffff8000089507d4 gva=0xffff80000c46d012 gpa=0x00000050008012 [ 2.818397] Unable to handle kernel ttbr address size fault at virtual address ffff80000c46d012 ... Adjust the end physical address e to account for the full page when converting from mfn, at which point s and e cannot be equal, so drop the equality check in the condition. Note that adjusting e to account for the full page also increases the accuracy of the subsequent is_bar_valid check. Fixes: cc80e2bab0d0 ("xen/pci: replace call to is_memory_hole to pci_check_bar") Signed-off-by: Stewart Hildebrand Reviewed-by: Roger Pau Monné Reviewed-by: Rahul Singh Tested-by: Rahul Singh Acked-by: Julien Grall --- xen/arch/arm/pci/pci-host-common.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index 7cdfc89e52..c0faf0f436 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -393,20 +393,24 @@ static int is_bar_valid(const struct dt_device_node *dev, return 0; } -/* TODO: Revisit this function when ACPI PCI passthrough support is added. */ +/* + * The MFN range [start, end] is inclusive. + * + * TODO: Revisit this function when ACPI PCI passthrough support is added. + */ bool pci_check_bar(const struct pci_dev *pdev, mfn_t start, mfn_t end) { int ret; const struct dt_device_node *dt_node; paddr_t s = mfn_to_maddr(start); - paddr_t e = mfn_to_maddr(end); + paddr_t e = mfn_to_maddr(mfn_add(end, 1)) - 1; /* inclusive */ struct pdev_bar_check bar_data = { .start = s, .end = e, .is_valid = false }; - if ( s >= e ) + if ( s > e ) return false; dt_node = pci_find_host_bridge_node(pdev); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jul 15 06:33:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Jul 2023 06:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563871.881322 (Exim 4.92) (envelope-from ) id 1qKYpy-0007QW-OZ; Sat, 15 Jul 2023 06:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563871.881322; Sat, 15 Jul 2023 06:33:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKYpy-0007QO-LT; Sat, 15 Jul 2023 06:33:02 +0000 Received: by outflank-mailman (input) for mailman id 563871; Sat, 15 Jul 2023 06:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKYpy-0007QD-C3 for xen-changelog@lists.xenproject.org; Sat, 15 Jul 2023 06:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKYpy-0001eN-Aw for xen-changelog@lists.xenproject.org; Sat, 15 Jul 2023 06:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qKYpy-0001Eu-9s for xen-changelog@lists.xenproject.org; Sat, 15 Jul 2023 06:33: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=AeFCk5FltrMjLFwTPHmVtU4y/NjSbSAzkOKJ75ftflQ=; b=3DpPXMRtO3ppOQEpKzGwp+Drt4 Pd8Hu9+XyCdW7HkY0MZvTlq7VxQ/bxMDsJqnsT4usT4MbdaVc9Gk0QlqMGkK91dtECoKg7L5fPuJ+ aXD+Y7J7v3Fn3pIeQuPVaLlhScXe1Ft5+qTAUYDUBTpaigW5CMAfnzVZQR7V16T5x9VY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] iommu/ipmmu-vmsa: Add missing 'U' in IMTTLBR0_TTBR_MASK for shifted constant Message-Id: Date: Sat, 15 Jul 2023 06:33:02 +0000 commit 80248d526caa933230f87008c8850e9c0592bff2 Author: Oleksandr Tyshchenko AuthorDate: Tue Jul 4 23:30:32 2023 +0300 Commit: Julien Grall CommitDate: Fri Jul 14 17:33:26 2023 +0100 iommu/ipmmu-vmsa: Add missing 'U' in IMTTLBR0_TTBR_MASK for shifted constant With enabling both CONFIG_UBSAN and CONFIG_IPMMU_VMSA I have got the following splat when an IOMMU driver tried to setup page tables: (XEN) ipmmu: /soc/iommu@e67b0000: d1: Set IPMMU context 1 (pgd 0x77fe90000) (XEN) ================================================================================ (XEN) UBSAN: Undefined behaviour in drivers/passthrough/arm/ipmmu-vmsa.c:558:51 (XEN) left shift of 1048575 by 12 places cannot be represented in type 'int' (XEN) Xen WARN at common/ubsan/ubsan.c:172 (XEN) ---[ Xen-4.18-unstable arm64 debug=y ubsan=y Tainted: S ]---- ... This points to shifted constant in IMTTLBR0_TTBR_MASK. Fix that by adding missing 'U' to it. This should also address MISRA Rule 7.2: A "u" or "U" suffix shall be applied to all integer constants that are represented in an unsigned type. Signed-off-by: Oleksandr Tyshchenko Acked-by: Stefano Stabellini --- xen/drivers/passthrough/arm/ipmmu-vmsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/arm/ipmmu-vmsa.c b/xen/drivers/passthrough/arm/ipmmu-vmsa.c index 611d9eeba5..b5c84c51a2 100644 --- a/xen/drivers/passthrough/arm/ipmmu-vmsa.c +++ b/xen/drivers/passthrough/arm/ipmmu-vmsa.c @@ -198,7 +198,7 @@ static DEFINE_SPINLOCK(ipmmu_devices_lock); #define IMTTBCR_TSZ0_SHIFT 0 #define IMTTLBR0 0x0010 -#define IMTTLBR0_TTBR_MASK (0xfffff << 12) +#define IMTTLBR0_TTBR_MASK (0xfffffU << 12) #define IMTTUBR0 0x0014 #define IMTTUBR0_TTBR_MASK (0xff << 0) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jul 15 06:33:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Jul 2023 06:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563872.881326 (Exim 4.92) (envelope-from ) id 1qKYq9-0007Sf-Q1; Sat, 15 Jul 2023 06:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563872.881326; Sat, 15 Jul 2023 06:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKYq9-0007SX-NN; Sat, 15 Jul 2023 06:33:13 +0000 Received: by outflank-mailman (input) for mailman id 563872; Sat, 15 Jul 2023 06:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKYq8-0007SO-Ez for xen-changelog@lists.xenproject.org; Sat, 15 Jul 2023 06:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKYq8-0001eV-E9 for xen-changelog@lists.xenproject.org; Sat, 15 Jul 2023 06:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qKYq8-0001FP-D8 for xen-changelog@lists.xenproject.org; Sat, 15 Jul 2023 06:33: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=7Ky7Dir0uAwsS+2suLHkI6IjH+Rqjpshoy3AGthXLbc=; b=Rir65+K4w5wJ9VjbaKz/nPhDrN FOw0VRwBPnkF4bGlQkbKwYAGoksZh2eluhq7+arNR1fOoPKcIesbPWq3CWPxnwi9JYKyF5ltXUnfm lUHQgY7Flvnm93EmBI0MiySfA/E2vNzOEwAsj70AOjmkXINtSWA1/VlGqbOXmARB7ToA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Fix domain_handle_dtb_bootmodule() error path Message-Id: Date: Sat, 15 Jul 2023 06:33:12 +0000 commit 028c43902b420e202c9f71a49334bf2f5e5393bc Author: Michal Orzel AuthorDate: Tue Jul 11 10:29:30 2023 +0200 Commit: Julien Grall CommitDate: Fri Jul 14 17:34:43 2023 +0100 xen/arm: Fix domain_handle_dtb_bootmodule() error path Fix the error path in domain_handle_dtb_bootmodule(), so that the memory previously mapped is unmapped before returning the error code. This is because the function shall not make assumptions on the way of handling its error code in the callers. Today we call panic in case of domU creation failure, so having memory not unmapped is not a bug, but it can change. Similarly, fix prepare_dtb_domU() so that the memory allocated is freed before returning the error code from domain_handle_dtb_bootmodule(). Signed-off-by: Michal Orzel Acked-by: Julien Grall Reviewed-by: Luca Fancellu --- xen/arch/arm/domain_build.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index d0d6be922d..f2134f24b9 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -3204,7 +3204,7 @@ static int __init domain_handle_dtb_bootmodule(struct domain *d, res = check_partial_fdt(pfdt, kinfo->dtb_bootmodule->size); if ( res < 0 ) - return res; + goto out; for ( node_next = fdt_first_subnode(pfdt, 0); node_next > 0; @@ -3235,7 +3235,7 @@ static int __init domain_handle_dtb_bootmodule(struct domain *d, DT_ROOT_NODE_SIZE_CELLS_DEFAULT, false); if ( res ) - return res; + goto out; continue; } if ( dt_node_cmp(name, "passthrough") == 0 ) @@ -3245,11 +3245,12 @@ static int __init domain_handle_dtb_bootmodule(struct domain *d, DT_ROOT_NODE_SIZE_CELLS_DEFAULT, true); if ( res ) - return res; + goto out; continue; } } + out: iounmap(pfdt); return res; @@ -3326,7 +3327,7 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) { ret = domain_handle_dtb_bootmodule(d, kinfo); if ( ret ) - return ret; + goto err; } ret = make_gic_domU_node(kinfo); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jul 15 06:33:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Jul 2023 06:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.563873.881331 (Exim 4.92) (envelope-from ) id 1qKYqJ-0007Vc-SA; Sat, 15 Jul 2023 06:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 563873.881331; Sat, 15 Jul 2023 06:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKYqJ-0007VR-Oy; Sat, 15 Jul 2023 06:33:23 +0000 Received: by outflank-mailman (input) for mailman id 563873; Sat, 15 Jul 2023 06:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKYqI-0007VD-IR for xen-changelog@lists.xenproject.org; Sat, 15 Jul 2023 06:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qKYqI-0001ef-Hf for xen-changelog@lists.xenproject.org; Sat, 15 Jul 2023 06:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qKYqI-0001GE-GL for xen-changelog@lists.xenproject.org; Sat, 15 Jul 2023 06:33: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=dDV3PYtVHtMaWMSK+Uhzxiq5wikTLbII7aMSLVa+bj8=; b=nwaLwNQ6pCPH8E85IMyIGVmMIB c3/8xYINQ9dTLe9o+j2r6yKN8ZU38+B3aQQglv78bAteWwEchIt/GM9skyCZHVvpbAprv5Xi3AUo4 yUpBJlD3J+/q3c2GLnxn7lDmhQzrYx2WSncgIJ/wvr5RJOdEP4N3cIJ1PN93vq55dRcw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Account for domU dtb bootmodule size separately Message-Id: Date: Sat, 15 Jul 2023 06:33:22 +0000 commit d27d274ffab06b42e5680073db11b592d282d53d Author: Michal Orzel AuthorDate: Tue Jul 11 10:29:31 2023 +0200 Commit: Julien Grall CommitDate: Fri Jul 14 17:34:43 2023 +0100 xen/arm: Account for domU dtb bootmodule size separately At the moment, we limit the allocation size when creating a domU dtb to 4KB, which is not enough when using a passthrough dtb with several nodes. Improve the handling by accounting for a dtb bootmodule (if present) size separately, while keeping 4KB for the Xen generated nodes (still plenty of space for new nodes). Also, cap the allocation size to 2MB, which is the max dtb size allowed. Signed-off-by: Michal Orzel Acked-by: Julien Grall Reviewed-by: Luca Fancellu --- xen/arch/arm/domain_build.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index f2134f24b9..1dc0eca37b 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -3257,14 +3257,15 @@ static int __init domain_handle_dtb_bootmodule(struct domain *d, } /* - * The max size for DT is 2MB. However, the generated DT is small, 4KB - * are enough for now, but we might have to increase it in the future. + * The max size for DT is 2MB. However, the generated DT is small (not including + * domU passthrough DT nodes whose size we account separately), 4KB are enough + * for now, but we might have to increase it in the future. */ #define DOMU_DTB_SIZE 4096 static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) { int addrcells, sizecells; - int ret; + int ret, fdt_size = DOMU_DTB_SIZE; kinfo->phandle_gic = GUEST_PHANDLE_GIC; kinfo->gnttab_start = GUEST_GNTTAB_BASE; @@ -3273,11 +3274,18 @@ static int __init prepare_dtb_domU(struct domain *d, struct kernel_info *kinfo) addrcells = GUEST_ROOT_ADDRESS_CELLS; sizecells = GUEST_ROOT_SIZE_CELLS; - kinfo->fdt = xmalloc_bytes(DOMU_DTB_SIZE); + /* Account for domU passthrough DT size */ + if ( kinfo->dtb_bootmodule ) + fdt_size += kinfo->dtb_bootmodule->size; + + /* Cap to max DT size if needed */ + fdt_size = min(fdt_size, SZ_2M); + + kinfo->fdt = xmalloc_bytes(fdt_size); if ( kinfo->fdt == NULL ) return -ENOMEM; - ret = fdt_create(kinfo->fdt, DOMU_DTB_SIZE); + ret = fdt_create(kinfo->fdt, fdt_size); if ( ret < 0 ) goto err; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Jul 17 21:55:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Jul 2023 21:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.564867.882617 (Exim 4.92) (envelope-from ) id 1qLWBK-0001Rs-Tv; Mon, 17 Jul 2023 21:55:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 564867.882617; Mon, 17 Jul 2023 21:55:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLWBK-0001Rk-RL; Mon, 17 Jul 2023 21:55:02 +0000 Received: by outflank-mailman (input) for mailman id 564867; Mon, 17 Jul 2023 21:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLWBJ-0001Re-Vh for xen-changelog@lists.xenproject.org; Mon, 17 Jul 2023 21:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLWBJ-0004QG-Hy for xen-changelog@lists.xenproject.org; Mon, 17 Jul 2023 21:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLWBJ-0000zn-Gv for xen-changelog@lists.xenproject.org; Mon, 17 Jul 2023 21:55: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=hk7y5nDKHOuF1Q63jonwY0V5652V5NDdM4F0DlmFDh0=; b=KdQMV7+WRL5+X8E4m2hSOW9y5G l5cpBzEYI4HmdHtMiM3THCrs4Kkith3QyHJlOX6trVRkpesjMvCsCx2ZAoyW1AC2TPfqcHcChbERl P/5cHiXBR8yGU4cDpMmL39jjOVlrOsLPVTBvuNnO5VCWXoHSi6uVq2GJcKUwpO2GluKU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] tools: convert bitfields to unsigned type Message-Id: Date: Mon, 17 Jul 2023 21:55:01 +0000 commit 0b4f9d1f31314af4977a132173e09e5604de730a Author: Olaf Hering AuthorDate: Mon Jul 17 08:27:04 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 17 08:27:04 2023 +0200 tools: convert bitfields to unsigned type clang complains about the signed type: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] Signed-off-by: Olaf Hering Reviewed-by: Juergen Gross Acked-by: Anthony PERARD Backport: Dropped the libxenvchan change, for the original commit saying "The potential ABI change in libxenvchan is covered by the Xen version based SONAME." which won't hold on stable trees. master commit: 99ab02f63ea813f2e467a39a7736bf460a3f3495 master date: 2023-05-16 20:03:02 +0100 --- tools/xentrace/xenalyze.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 5de167031e..e7ec284eea 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -1377,7 +1377,7 @@ struct hvm_data { tsc_t exit_tsc, arc_cycles, entry_tsc; unsigned long long rip; unsigned exit_reason, event_handler; - int short_summary_done:1, prealloc_unpin:1, wrmap_bf:1; + unsigned int short_summary_done:1, prealloc_unpin:1, wrmap_bf:1; /* Immediate processing */ void *d; @@ -8235,13 +8235,13 @@ void mem_set_p2m_entry_process(struct pcpu_info *p) struct { uint64_t gfn, mfn; - int p2mt; - int d:16,order:16; + uint32_t p2mt; + uint16_t d, order; } *r = (typeof(r))ri->d; if ( opt.dump_all ) { - printf(" %s set_p2m_entry d%d o%d t %d g %llx m %llx\n", + printf(" %s set_p2m_entry d%u o%u t %u g %llx m %llx\n", ri->dump_header, r->d, r->order, r->p2mt, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Mon Jul 17 21:55:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Jul 2023 21:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.564868.882622 (Exim 4.92) (envelope-from ) id 1qLWBU-0001Td-Vp; Mon, 17 Jul 2023 21:55:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 564868.882622; Mon, 17 Jul 2023 21:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLWBU-0001TW-Sp; Mon, 17 Jul 2023 21:55:12 +0000 Received: by outflank-mailman (input) for mailman id 564868; Mon, 17 Jul 2023 21:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLWBT-0001TO-Ma for xen-changelog@lists.xenproject.org; Mon, 17 Jul 2023 21:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLWBT-0004Qh-LM for xen-changelog@lists.xenproject.org; Mon, 17 Jul 2023 21:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLWBT-00010C-KC for xen-changelog@lists.xenproject.org; Mon, 17 Jul 2023 21:55:11 +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=WyxLcG/lofF2/c/CiIz8ZP3VBTk1PVrtUW/qW97BgVY=; b=kBkEhoI3Ocs5eWnSa11wruuHeR hvTZOf2PdJKJ9X0byLvTepIQ789fzRTHuzIPFjgsfPQvICrUkSVYH/cUwHJfvYwMAjf3rZUcB31d5 bvKRPUOfWNfgHTSglM20Dbke96PyiiYia25MC8algIzcVXg6fFgjxHwEuhNYCRLAG1GI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] vpci/header: cope with devices not having vpci allocated Message-Id: Date: Mon, 17 Jul 2023 21:55:11 +0000 commit 32f3486f3fe19364736ac7301e5a989daad5fff7 Author: Roger Pau Monné AuthorDate: Mon Jul 17 08:27:30 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 17 08:27:30 2023 +0200 vpci/header: cope with devices not having vpci allocated When traversing the list of pci devices assigned to a domain cope with some of them not having the vpci struct allocated. It should be possible for the hardware domain to have read-only devices assigned that are not handled by vPCI, such support will be added by further patches. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: ee045f3a4a6dddb09f5aa96a50cceaae97d3245f master date: 2023-05-26 09:18:37 +0200 --- xen/drivers/vpci/header.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index ec2e978a4e..766fd98b21 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -289,6 +289,14 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t cmd, bool rom_only) */ for_each_pdev ( pdev->domain, tmp ) { + if ( !tmp->vpci ) + /* + * For the hardware domain it's possible to have devices assigned + * to it that are not handled by vPCI, either because those are + * read-only devices, or because vPCI setup has failed. + */ + continue; + if ( tmp == pdev ) { /* -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Mon Jul 17 21:55:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Jul 2023 21:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.564869.882626 (Exim 4.92) (envelope-from ) id 1qLWBf-0001Wo-0r; Mon, 17 Jul 2023 21:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 564869.882626; Mon, 17 Jul 2023 21:55:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLWBe-0001Wh-UU; Mon, 17 Jul 2023 21:55:22 +0000 Received: by outflank-mailman (input) for mailman id 564869; Mon, 17 Jul 2023 21:55:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLWBd-0001WX-RD for xen-changelog@lists.xenproject.org; Mon, 17 Jul 2023 21:55:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLWBd-0004Qt-QN for xen-changelog@lists.xenproject.org; Mon, 17 Jul 2023 21:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLWBd-00010d-Nd for xen-changelog@lists.xenproject.org; Mon, 17 Jul 2023 21:55:21 +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=jQuFyiXpo/IyCR63yXdXaYA+Och/5db5NP7aT1fJOUI=; b=X9ihQy37bPY6sLKGl6QUXLMPZT yilWCopdulh8ky3CE3wvqptURy6fqNqwbEt1Hiknob1SUzcAPgZhQqa5sC+oG5xW4uNembxldsdcI aCKfb62hyTH/X0sgQESp9R2T7TC6q0lXrAMEAjD3/ifz08pP9z4fuD29fSm/4jcDLmZk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/microcode: Add missing unlock in microcode_update_helper() Message-Id: Date: Mon, 17 Jul 2023 21:55:21 +0000 commit 6ecb20151e7fdb99d68ddcc21ec84ca866a0b051 Author: Alejandro Vallejo AuthorDate: Mon Jul 17 08:28:19 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 17 08:28:19 2023 +0200 x86/microcode: Add missing unlock in microcode_update_helper() microcode_update_helper() may return early while holding cpu_add_remove_lock, hence preventing any writers from taking it again. Leave through the `put` label instead so it's properly released. Fixes: 5ed12565aa32 ("microcode: rendezvous CPUs in NMI handler and load ucode") Signed-off-by: Alejandro Vallejo Reviewed-by: Andrew Cooper master commit: b35b22acb887f682efe8385b3df165220bc84c86 master date: 2023-06-05 16:11:10 +0100 --- xen/arch/x86/cpu/microcode/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index c760723e4f..b204b95f8f 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -596,7 +596,8 @@ static long cf_check microcode_update_helper(void *data) printk(XENLOG_WARNING "CPU%u is expected to lead ucode loading (but got CPU%u)\n", nmi_cpu, cpumask_first(&cpu_online_map)); - return -EPERM; + ret = -EPERM; + goto put; } patch = parse_blob(buffer->buffer, buffer->len); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Mon Jul 17 21:55:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Jul 2023 21:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.564870.882630 (Exim 4.92) (envelope-from ) id 1qLWBp-0001a1-2f; Mon, 17 Jul 2023 21:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 564870.882630; Mon, 17 Jul 2023 21:55:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLWBp-0001Zt-07; Mon, 17 Jul 2023 21:55:33 +0000 Received: by outflank-mailman (input) for mailman id 564870; Mon, 17 Jul 2023 21:55:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLWBn-0001Zi-U8 for xen-changelog@lists.xenproject.org; Mon, 17 Jul 2023 21:55:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLWBn-0004R3-TR for xen-changelog@lists.xenproject.org; Mon, 17 Jul 2023 21:55:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLWBn-00011A-SX for xen-changelog@lists.xenproject.org; Mon, 17 Jul 2023 21:55:31 +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=UNosMfygI9bxOPl4TDluTjjMF16BtnsmmTsun6hjtMs=; b=kn2eL9sRlFRBurks62luloDodm 2qtDSweqSkb79fXOLfb+Kycfzq6GiGIpW3tvDctTxZYeg3BpqTGUdcpMSmwjN/OXv9yHPkLqN9njZ NxjKQEPD1ViTSjjcA+TOSim1J7LaGZ5SX/QXyupPidlDsQW9aHhWgOXzrQXSRkpdVZkk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] iommu/amd-vi: fix checking for Invalidate All support in amd_iommu_resume() Message-Id: Date: Mon, 17 Jul 2023 21:55:31 +0000 commit d5d76fe0ab00646a917c3007529fd4691795abf2 Author: Roger Pau Monné AuthorDate: Mon Jul 17 08:28:49 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 17 08:28:49 2023 +0200 iommu/amd-vi: fix checking for Invalidate All support in amd_iommu_resume() The iommu local variable does not point to to a valid amd_iommu element after the call to for_each_amd_iommu(). Instead check whether any IOMMU on the system doesn't support Invalidate All in order to perform the per-domain and per-device flushes. Fixes: 9c46139de889 ('amd iommu: Support INVALIDATE_IOMMU_ALL command.') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 5ecbb779748a56495f2c892f0610d57dd623c7cd master date: 2023-06-13 14:41:32 +0200 --- xen/drivers/passthrough/amd/iommu_init.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 1f14aaf49e..166570648d 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -1578,6 +1578,7 @@ void cf_check amd_iommu_crash_shutdown(void) void cf_check amd_iommu_resume(void) { struct amd_iommu *iommu; + bool invalidate_all = true; for_each_amd_iommu ( iommu ) { @@ -1587,10 +1588,12 @@ void cf_check amd_iommu_resume(void) */ disable_iommu(iommu); enable_iommu(iommu); + if ( !iommu->features.flds.ia_sup ) + invalidate_all = false; } /* flush all cache entries after iommu re-enabled */ - if ( !iommu->features.flds.ia_sup ) + if ( !invalidate_all ) { invalidate_all_devices(); invalidate_all_domain_pages(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Mon Jul 17 21:55:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Jul 2023 21:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.564871.882634 (Exim 4.92) (envelope-from ) id 1qLWBz-0001cB-4A; Mon, 17 Jul 2023 21:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 564871.882634; Mon, 17 Jul 2023 21:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLWBz-0001c2-1Z; Mon, 17 Jul 2023 21:55:43 +0000 Received: by outflank-mailman (input) for mailman id 564871; Mon, 17 Jul 2023 21:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLWBy-0001bu-1F for xen-changelog@lists.xenproject.org; Mon, 17 Jul 2023 21:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLWBy-0004RC-0O for xen-changelog@lists.xenproject.org; Mon, 17 Jul 2023 21:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLWBx-00011b-Vk for xen-changelog@lists.xenproject.org; Mon, 17 Jul 2023 21:55:41 +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=1V/vv9/j+S3dgpPRXfNS9v5LwHk/oOrzH4WqR53/LXQ=; b=nIM1WFNfEo2S3OMia5R40Z8liW UZqvJHbOEOfJf9RMwkIrNc+8jl3gz3IQbGHtuPNTfaQWc9J8EKaUpAWOn71cnQxFBaprGtVIwYH+R 2DCidUWHVAjt2i8kYiq1xZPYnFCipmeW2IxObm6R8c+AbWehohHlUOpQC3z3/6Ykvsxw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] iommu/vtd: fix address translation for leaf entries Message-Id: Date: Mon, 17 Jul 2023 21:55:41 +0000 commit 71792ec9af49f94dd3fcb581310106aa5156150f Author: Roger Pau Monné AuthorDate: Mon Jul 17 08:29:18 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 17 08:29:18 2023 +0200 iommu/vtd: fix address translation for leaf entries Fix two issues related to leaf address lookups in VT-d: * When translating an address that falls inside of a superpage in the IOMMU page tables the fetching of the PTE value wasn't masking of the contiguous related data, which caused the returned data to be corrupt as it would contain bits that the caller would interpret as part of the address. * When the requested leaf address wasn't mapped by a superpage the returned value wouldn't have any of the low 12 bits set, thus missing the permission bits expected by the caller. Take the opportunity to also adjust the function comment to note that when returning the full PTE the bits above PADDR_BITS are removed. Fixes: c71e55501a61 ('VT-d: have callers specify the target level for page table walks') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Reviewed-by: Kevin Tian master commit: 82b28deb25f37e8422b14493a2efa2852638206d master date: 2023-06-19 15:46:03 +0200 --- xen/drivers/passthrough/vtd/iommu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 62e143125d..cde67b9574 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -313,7 +313,7 @@ static u64 bus_to_context_maddr(struct vtd_iommu *iommu, u8 bus) * failure, * - for target > 0 the physical address of the page table holding the leaf * PTE for the requested address, - * - for target == 0 the full PTE. + * - for target == 0 the full PTE contents below PADDR_BITS limit. */ static uint64_t addr_to_dma_page_maddr(struct domain *domain, daddr_t addr, unsigned int target, @@ -371,7 +371,7 @@ static uint64_t addr_to_dma_page_maddr(struct domain *domain, daddr_t addr, * with the address adjusted to account for the residual of * the walk. */ - pte_maddr = pte->val + + pte_maddr = (pte->val & PADDR_MASK) + (addr & ((1UL << level_to_offset_bits(level)) - 1) & PAGE_MASK); if ( !target ) @@ -416,7 +416,11 @@ static uint64_t addr_to_dma_page_maddr(struct domain *domain, daddr_t addr, } if ( --level == target ) + { + if ( !target ) + pte_maddr = pte->val & PADDR_MASK; break; + } unmap_vtd_domain_page(parent); parent = map_vtd_domain_page(pte_maddr); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue Jul 18 05:11:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jul 2023 05:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.564934.882709 (Exim 4.92) (envelope-from ) id 1qLczH-0000Q9-GP; Tue, 18 Jul 2023 05:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 564934.882709; Tue, 18 Jul 2023 05:11: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 1qLczH-0000Q1-Do; Tue, 18 Jul 2023 05:11:03 +0000 Received: by outflank-mailman (input) for mailman id 564934; Tue, 18 Jul 2023 05:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLczG-0000Pv-CX for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 05:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLczG-0005Qv-4m for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 05:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLczG-00016T-3l for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 05: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=0hYDdNq9CdT7+v45JatvRa9rP3AlgHVJDg9Zz+lfSYI=; b=N0p3DldgijYb7Yq7m1gsuNC1L6 S9ZHwgicSkQ5LhvxRhqf1OitSuVW1hMI8N4HRWgsUSBvfF3Fy4QjQcCs2PkYZioN/INsXYmDkV+Lw paWnfiqxoiWX5pUA1yOOcKTEEZyHRddhggZ+LQ3gM7BYcMPyCppGvSWdKHYjTutBOxZM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [qemu-xen stable-4.16] rtl8139: Remove unused variable Message-Id: Date: Tue, 18 Jul 2023 05:11:02 +0000 commit 204c1af1fc6f99ca70a671a013a30f5409e30786 Author: Miroslav Rezanina AuthorDate: Wed Nov 9 10:57:11 2022 -0500 Commit: Anthony PERARD CommitDate: Mon Jul 17 12:05:00 2023 +0100 rtl8139: Remove unused variable Variable send_count used in rtl8139_cplus_transmit_one function is only incremented but never read. This causes 'Unused but set variable' warning on Clang 15.0.1 compiler. Removing the variable to prevent the warning. Signed-off-by: Miroslav Rezanina Reviewed-by: Thomas Huth Message-Id: <15a32dd06c492216cbf27cd3ddcbe1e9afb8d8f5.1668009030.git.mrezanin@redhat.com> Signed-off-by: Thomas Huth (cherry picked from commit 7d7238c72b983cff5064734349d2d45be9c6282c) --- hw/net/rtl8139.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 90b4fc63ce..e278ae1ed5 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2156,7 +2156,6 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) ip_data_len, saved_size - ETH_HLEN, large_send_mss); int tcp_send_offset = 0; - int send_count = 0; /* maximum IP header length is 60 bytes */ uint8_t saved_ip_header[60]; @@ -2261,7 +2260,6 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) /* add transferred count to TCP sequence number */ stl_be_p(&p_tcp_hdr->th_seq, chunk_size + ldl_be_p(&p_tcp_hdr->th_seq)); - ++send_count; } /* Stop sending this frame */ -- generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Tue Jul 18 05:11:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jul 2023 05:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.564935.882714 (Exim 4.92) (envelope-from ) id 1qLczR-0000S4-IV; Tue, 18 Jul 2023 05:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 564935.882714; Tue, 18 Jul 2023 05:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLczR-0000Rw-FJ; Tue, 18 Jul 2023 05:11:13 +0000 Received: by outflank-mailman (input) for mailman id 564935; Tue, 18 Jul 2023 05:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLczQ-0000Rm-AW for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 05:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLczQ-0005R2-9k for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 05:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLczQ-00016x-6u for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 05: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=sqdQXKPJDWpVLJAOc8hwEF6NdFte9VNlQe6t5l+klGg=; b=noOhgBJWRDJYmSXMDU49FRaAey 7PIqB2Qn7iXDjKTmMQka/01E5osqULzg/vI4A2Jsv1V4nwJy8bY+udDF+F2QSDtIC0XAS7yY+nkLU /D1Zi7jBJ6YivUqBaBmWBHPYI1G7NfZbFRHowh/+IkGKkKl++vcMxw8l9T/xDbNU5fyA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [qemu-xen stable-4.16] tulip: Remove unused variable Message-Id: Date: Tue, 18 Jul 2023 05:11:12 +0000 commit 290836b2894d2f6a855b1b153f6a1e9ca82a5820 Author: Miroslav Rezanina AuthorDate: Wed Nov 9 10:57:12 2022 -0500 Commit: Anthony PERARD CommitDate: Mon Jul 17 12:05:00 2023 +0100 tulip: Remove unused variable Variable n used in tulip_idblock_crc function is only incremented but never read. This causes 'Unused but set variable' warning on Clang 15.0.1 compiler. Removing the variable to prevent the warning. Signed-off-by: Miroslav Rezanina Reviewed-by: Thomas Huth Message-Id: <02e1560d115c208df32236df8916fed98429fda1.1668009030.git.mrezanin@redhat.com> Signed-off-by: Thomas Huth (cherry picked from commit 6083dcad80743718620a3f8a72fb76ea8b7c28ca) --- hw/net/tulip.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/net/tulip.c b/hw/net/tulip.c index ca69f7ea5e..42666378de 100644 --- a/hw/net/tulip.c +++ b/hw/net/tulip.c @@ -866,11 +866,10 @@ static const MemoryRegionOps tulip_ops = { static void tulip_idblock_crc(TULIPState *s, uint16_t *srom) { - int word, n; + int word; int bit; unsigned char bitval, crc; const int len = 9; - n = 0; crc = -1; for (word = 0; word < len; word++) { @@ -883,7 +882,6 @@ static void tulip_idblock_crc(TULIPState *s, uint16_t *srom) srom[len - 1] = (srom[len - 1] & 0xff00) | (unsigned short)crc; break; } - n++; bitval = ((srom[word] >> bit) & 1) ^ ((crc >> 7) & 1); crc = crc << 1; if (bitval == 1) { -- generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Tue Jul 18 05:11:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jul 2023 05:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.564936.882717 (Exim 4.92) (envelope-from ) id 1qLczb-0000VD-Ju; Tue, 18 Jul 2023 05:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 564936.882717; Tue, 18 Jul 2023 05:11:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLczb-0000V4-Gm; Tue, 18 Jul 2023 05:11:23 +0000 Received: by outflank-mailman (input) for mailman id 564936; Tue, 18 Jul 2023 05:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLcza-0000Us-Di for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 05:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLcza-0005RU-Cy for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 05:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLcza-00017M-Bz for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 05: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=PepD0IhVX617JCjZ0472z4C0NxYTiGtqJeJZUjKuFhQ=; b=j0aYXaorLsE1O1KqklICxGnycd ZLTsqpSNE6B8JsYWrril2iZ69pnap4lS/EUYK2lShQLZPQEhE+wsv9joig8kFw7GQvY7TPFYWCtzt RD/5WxMFNqT+stX1LxQ36MSCwjxnyhNTg8shlOIYZVKfCaREoNx96Iz4EOI0uJVK8Loc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [qemu-xen stable-4.16] qemu-img: remove unused variable Message-Id: Date: Tue, 18 Jul 2023 05:11:22 +0000 commit 1b31565af3932ffe4a6e12012a406ae23aa381a1 Author: Miroslav Rezanina AuthorDate: Wed Nov 9 10:57:13 2022 -0500 Commit: Anthony PERARD CommitDate: Mon Jul 17 12:05:26 2023 +0100 qemu-img: remove unused variable Variable block_count used in img_dd function is only incremented but never read. This causes 'Unused but set variable' warning on Clang 15.0.1 compiler. Removing the variable to prevent the warning. Signed-off-by: Miroslav Rezanina Reviewed-by: Thomas Huth Message-Id: Signed-off-by: Thomas Huth (cherry picked from commit 0f48c47c679bc29fceb3a67283ee3b78175524bf) --- qemu-img.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 908fd0cce5..314ca0534d 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -4886,7 +4886,7 @@ static int img_dd(int argc, char **argv) const char *out_fmt = "raw"; const char *fmt = NULL; int64_t size = 0; - int64_t block_count = 0, out_pos, in_pos; + int64_t out_pos, in_pos; bool force_share = false; struct DdInfo dd = { .flags = 0, @@ -5086,7 +5086,7 @@ static int img_dd(int argc, char **argv) in.buf = g_new(uint8_t, in.bsz); - for (out_pos = 0; in_pos < size; block_count++) { + for (out_pos = 0; in_pos < size; ) { int in_ret, out_ret; if (in_pos + in.bsz > size) { -- generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Tue Jul 18 05:11:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jul 2023 05:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.564937.882720 (Exim 4.92) (envelope-from ) id 1qLczm-0000YN-NM; Tue, 18 Jul 2023 05:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 564937.882720; Tue, 18 Jul 2023 05: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 1qLczm-0000YF-Kh; Tue, 18 Jul 2023 05:11:34 +0000 Received: by outflank-mailman (input) for mailman id 564937; Tue, 18 Jul 2023 05:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLczk-0000Y2-KC for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 05:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLczk-0005Rb-Hp for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 05:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLczk-00017t-F3 for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 05: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=K1+BJOfytfTvcLON/9dc7qbONyjsSecRzB6NMo6xTUU=; b=qLK82MdjiVYmlkDAWBwUueIuOt k4njCOm3+WakqbyAv4JJGb17ivGvaop3ShwQZtZd+MzgcuHpCaH/xXZLb0NwLIY73QnRE0CjCrB3i QjtZ+eIdyxCQ/d1wC8GRvAQGvI0ihj/j8BVMWjlyViLMolcXMvqdKx0QzEJv/4yCuax0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [qemu-xen stable-4.16] Update dtc to include build fix Message-Id: Date: Tue, 18 Jul 2023 05:11:32 +0000 commit 770026a27872174f66e420f643abce0756a128f1 Author: Anthony PERARD AuthorDate: Mon Jul 17 12:05:34 2023 +0100 Commit: Anthony PERARD CommitDate: Mon Jul 17 12:05:34 2023 +0100 Update dtc to include build fix Build fix: libfdt: Correct condition for reordering blocks This change also include one extra commit that seems to be a unit test only. Signed-off-by: Anthony PERARD --- dtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dtc b/dtc index 85e5d83984..b6910bec11 160000 --- a/dtc +++ b/dtc @@ -1 +1 @@ -Subproject commit 85e5d839847af54efab170f2b1331b2a6421e647 +Subproject commit b6910bec11614980a21e46fbccc35934b671bd81 -- generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Tue Jul 18 05:11:45 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jul 2023 05:11:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.564938.882725 (Exim 4.92) (envelope-from ) id 1qLczw-0000ao-Ot; Tue, 18 Jul 2023 05:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 564938.882725; Tue, 18 Jul 2023 05: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 1qLczw-0000ag-MB; Tue, 18 Jul 2023 05:11:44 +0000 Received: by outflank-mailman (input) for mailman id 564938; Tue, 18 Jul 2023 05:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLczu-0000aS-Lp for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 05:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLczu-0005Rn-L0 for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 05:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLczu-000193-KA for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 05:11:42 +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=48ceH5sPIxd+7OkZytkNts2UlY8I5waqL5hdDCn6WPE=; b=vb1jVOLq8mLum9ZaR9+ONKklRJ TyDOWBv9eQe9Ez2+AVVxYjMz1soMYlWYuSlXWK8+Ek58bbYlNCRX1LSr3Tj8MNsbGwNVFzI7wGW8f djF9SyU40UD5CYfjUtlnOfhY4NaQY0/U7W3Bwv+UMCMQve94HcQpmhcUv0RhhMv7OEBs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [qemu-xen stable-4.16] migration: Fix operator type Message-Id: Date: Tue, 18 Jul 2023 05:11:42 +0000 commit c02cb236b5e4a76cf74e641cc35a0e3ebd3e52f3 Author: Dr. David Alan Gilbert AuthorDate: Wed Apr 6 11:25:15 2022 +0100 Commit: Anthony PERARD CommitDate: Mon Jul 17 12:09:08 2023 +0100 migration: Fix operator type Clang spotted an & that should have been an &&; fix it. Reported by: David Binderman / https://gitlab.com/dcb Fixes: 65dacaa04fa ("migration: introduce save_normal_page()") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/963 Signed-off-by: Dr. David Alan Gilbert Message-Id: <20220406102515.96320-1-dgilbert@redhat.com> Reviewed-by: Peter Maydell Reviewed-by: Peter Xu Signed-off-by: Dr. David Alan Gilbert (cherry picked from commit f912ec5b2d65644116ff496b58d7c9145c19e4c0) (cherry picked from commit b746458e1ce1bec85e58b458386f8b7a0bedfaa6) --- migration/ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 7a43bfd7af..541f6b6b41 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1155,7 +1155,7 @@ static int save_normal_page(RAMState *rs, RAMBlock *block, ram_addr_t offset, offset | RAM_SAVE_FLAG_PAGE); if (async) { qemu_put_buffer_async(rs->f, buf, TARGET_PAGE_SIZE, - migrate_release_ram() & + migrate_release_ram() && migration_in_postcopy()); } else { qemu_put_buffer(rs->f, buf, TARGET_PAGE_SIZE); -- generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Tue Jul 18 11:33:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jul 2023 11:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.565142.883040 (Exim 4.92) (envelope-from ) id 1qLiwx-00017V-Ix; Tue, 18 Jul 2023 11:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 565142.883040; Tue, 18 Jul 2023 11:33: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 1qLiwx-00017L-Fr; Tue, 18 Jul 2023 11:33:03 +0000 Received: by outflank-mailman (input) for mailman id 565142; Tue, 18 Jul 2023 11:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLiwv-000178-T6 for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 11:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLiwv-0006dJ-SG for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 11:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLiwv-0002kY-Pc for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 11:33: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=P6p1p6/mdfBVHpuNXlvrX/U7uTJbHUWGcn1J6Z0aUtk=; b=1Xz/onmSknCHlKkml8d8TsuvZw p9derDiUWhwYy7spjqiTaizrCjyqKa1RbUzuMnHEyEcw7YWFT01Ze8e0Lfh9/kcz0lu6bgDmmmKG9 xLecSInjZxcVlBAwr7SHePP75/QEgpPYyAKZgo05GkXYpaIr31GdnURviL+Whsju+Q/o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: fix violations of MISRA C:2012 Rule 7.2 Message-Id: Date: Tue, 18 Jul 2023 11:33:01 +0000 commit 3148ef6c7b009d3f1cd7c11b88b241bcf9ba92be Author: Gianluca Luparini AuthorDate: Mon Jul 17 10:27:27 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 17 10:27:27 2023 +0200 xen/arm: fix violations of MISRA C:2012 Rule 7.2 The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states: "A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type". Add the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity. Signed-off-by: Gianluca Luparini Signed-off-by: Simone Ballarin Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 4 ++-- xen/arch/arm/efi/efi-boot.h | 2 +- xen/arch/arm/gic-v2.c | 6 +++--- xen/arch/arm/gic-v3.c | 10 +++++----- xen/arch/arm/include/asm/arm64/brk.h | 2 +- xen/arch/arm/include/asm/arm64/efibind.h | 10 +++++----- xen/arch/arm/include/asm/arm64/insn.h | 16 ++++++++-------- xen/arch/arm/include/asm/vreg.h | 2 +- xen/arch/arm/kernel.c | 2 +- xen/arch/arm/traps.c | 14 +++++++------- xen/arch/arm/vgic-v2.c | 2 +- xen/arch/arm/vgic-v3.c | 2 +- xen/include/public/arch-arm/smccc.h | 4 ++-- 13 files changed, 38 insertions(+), 38 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 1dc0eca37b..39b4ee03a5 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -3760,8 +3760,8 @@ static int __init construct_domain(struct domain *d, struct kernel_info *kinfo) * r1 = machine nr, r2 = atags or dtb pointer. *... */ - regs->r0 = 0; /* SBZ */ - regs->r1 = 0xffffffff; /* We use DTB therefore no machine id */ + regs->r0 = 0U; /* SBZ */ + regs->r1 = 0xffffffffU; /* We use DTB therefore no machine id */ regs->r2 = kinfo->dtb_paddr; } #ifdef CONFIG_ARM_64 diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index bb64925d70..3daa63a40d 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -46,7 +46,7 @@ static int get_module_file_index(const char *name, unsigned int name_len); static void PrintMessage(const CHAR16 *s); #define DEVICE_TREE_GUID \ -{0xb1b621d5, 0xf19c, 0x41a5, {0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0}} +{0xb1b621d5U, 0xf19c, 0x41a5, {0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0}} static struct file __initdata dtbfile; static void __initdata *fdt; diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 6476ff4230..cf392bfd1c 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -386,9 +386,9 @@ static void gicv2_cpu_init(void) /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so * even though they are controlled with GICD registers, they must * be set up here with the other per-cpu state. */ - writel_gicd(0xffffffff, GICD_ICACTIVER); /* Diactivate PPIs and SGIs */ - writel_gicd(0xffff0000, GICD_ICENABLER); /* Disable all PPI */ - writel_gicd(0x0000ffff, GICD_ISENABLER); /* Enable all SGI */ + writel_gicd(0xffffffffU, GICD_ICACTIVER); /* De-activate PPIs and SGIs */ + writel_gicd(0xffff0000U, GICD_ICENABLER); /* Disable all PPI */ + writel_gicd(0x0000ffffU, GICD_ISENABLER); /* Enable all SGI */ /* Set SGI priorities */ for ( i = 0; i < 16; i += 4 ) diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 4e6c98bada..95e4f020fe 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -619,8 +619,8 @@ static void __init gicv3_dist_init(void) /* Disable/deactivate all global interrupts */ for ( i = NR_GIC_LOCAL_IRQS; i < nr_lines; i += 32 ) { - writel_relaxed(0xffffffff, GICD + GICD_ICENABLER + (i / 32) * 4); - writel_relaxed(0xffffffff, GICD + GICD_ICACTIVER + (i / 32) * 4); + writel_relaxed(0xffffffffU, GICD + GICD_ICENABLER + (i / 32) * 4); + writel_relaxed(0xffffffffU, GICD + GICD_ICACTIVER + (i / 32) * 4); } /* @@ -832,13 +832,13 @@ static int gicv3_cpu_init(void) * The activate state is unknown at boot, so make sure all * SGIs and PPIs are de-activated. */ - writel_relaxed(0xffffffff, GICD_RDIST_SGI_BASE + GICR_ICACTIVER0); + writel_relaxed(0xffffffffU, GICD_RDIST_SGI_BASE + GICR_ICACTIVER0); /* * Disable all PPI interrupts, ensure all SGI interrupts are * enabled. */ - writel_relaxed(0xffff0000, GICD_RDIST_SGI_BASE + GICR_ICENABLER0); - writel_relaxed(0x0000ffff, GICD_RDIST_SGI_BASE + GICR_ISENABLER0); + writel_relaxed(0xffff0000U, GICD_RDIST_SGI_BASE + GICR_ICENABLER0); + writel_relaxed(0x0000ffffU, GICD_RDIST_SGI_BASE + GICR_ISENABLER0); /* Configure SGIs/PPIs as non-secure Group-1 */ writel_relaxed(GENMASK(31, 0), GICD_RDIST_SGI_BASE + GICR_IGROUPR0); diff --git a/xen/arch/arm/include/asm/arm64/brk.h b/xen/arch/arm/include/asm/arm64/brk.h index 04442c4b9f..3af153a053 100644 --- a/xen/arch/arm/include/asm/arm64/brk.h +++ b/xen/arch/arm/include/asm/arm64/brk.h @@ -21,7 +21,7 @@ * BRK instruction encoding * The #imm16 value should be placed at bits[20:5] within BRK ins */ -#define AARCH64_BREAK_MON 0xd4200000 +#define AARCH64_BREAK_MON 0xd4200000U /* * BRK instruction for provoking a fault on purpose diff --git a/xen/arch/arm/include/asm/arm64/efibind.h b/xen/arch/arm/include/asm/arm64/efibind.h index 8b43bb8495..f13eadd4f0 100644 --- a/xen/arch/arm/include/asm/arm64/efibind.h +++ b/xen/arch/arm/include/asm/arm64/efibind.h @@ -22,12 +22,12 @@ Revision History #pragma pack() #endif -#define EFIERR(a) (0x8000000000000000 | a) -#define EFI_ERROR_MASK 0x8000000000000000 -#define EFIERR_OEM(a) (0xc000000000000000 | a) +#define EFIERR(a) (0x8000000000000000ULL | a) +#define EFI_ERROR_MASK 0x8000000000000000ULL +#define EFIERR_OEM(a) (0xc000000000000000ULL | a) -#define BAD_POINTER 0xFBFBFBFBFBFBFBFB -#define MAX_ADDRESS 0xFFFFFFFFFFFFFFFF +#define BAD_POINTER 0xFBFBFBFBFBFBFBFBULL +#define MAX_ADDRESS 0xFFFFFFFFFFFFFFFFULL #define EFI_STUB_ERROR MAX_ADDRESS diff --git a/xen/arch/arm/include/asm/arm64/insn.h b/xen/arch/arm/include/asm/arm64/insn.h index 4e0d364d41..6308959449 100644 --- a/xen/arch/arm/include/asm/arm64/insn.h +++ b/xen/arch/arm/include/asm/arm64/insn.h @@ -60,14 +60,14 @@ static always_inline bool aarch64_insn_is_##abbr(u32 code) \ static always_inline u32 aarch64_insn_get_##abbr##_value(void) \ { return (val); } -__AARCH64_INSN_FUNCS(b, 0xFC000000, 0x14000000) -__AARCH64_INSN_FUNCS(bl, 0xFC000000, 0x94000000) -__AARCH64_INSN_FUNCS(cbz, 0x7F000000, 0x34000000) -__AARCH64_INSN_FUNCS(cbnz, 0x7F000000, 0x35000000) -__AARCH64_INSN_FUNCS(tbz, 0x7F000000, 0x36000000) -__AARCH64_INSN_FUNCS(tbnz, 0x7F000000, 0x37000000) -__AARCH64_INSN_FUNCS(bcond, 0xFF000010, 0x54000000) -__AARCH64_INSN_FUNCS(hint, 0xFFFFF01F, 0xD503201F) +__AARCH64_INSN_FUNCS(b, 0xFC000000U, 0x14000000U) +__AARCH64_INSN_FUNCS(bl, 0xFC000000U, 0x94000000U) +__AARCH64_INSN_FUNCS(cbz, 0x7F000000U, 0x34000000U) +__AARCH64_INSN_FUNCS(cbnz, 0x7F000000U, 0x35000000U) +__AARCH64_INSN_FUNCS(tbz, 0x7F000000U, 0x36000000U) +__AARCH64_INSN_FUNCS(tbnz, 0x7F000000U, 0x37000000U) +__AARCH64_INSN_FUNCS(bcond, 0xFF000010U, 0x54000000U) +__AARCH64_INSN_FUNCS(hint, 0xFFFFF01FU, 0xD503201FU) bool aarch64_insn_is_branch_imm(u32 insn); diff --git a/xen/arch/arm/include/asm/vreg.h b/xen/arch/arm/include/asm/vreg.h index bf945eebbd..387ce76e7e 100644 --- a/xen/arch/arm/include/asm/vreg.h +++ b/xen/arch/arm/include/asm/vreg.h @@ -56,7 +56,7 @@ static inline bool vreg_emulate_cp64(struct cpu_user_regs *regs, union hsr hsr, if ( ret && cp64.read ) { - set_user_reg(regs, cp64.reg1, x & 0xffffffff); + set_user_reg(regs, cp64.reg1, x & 0xffffffffU); set_user_reg(regs, cp64.reg2, x >> 32); } diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index ca5318515e..508c54824d 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -39,7 +39,7 @@ struct minimal_dtb_header { /* There are other fields but we don't use them yet. */ }; -#define DTB_MAGIC 0xd00dfeed +#define DTB_MAGIC 0xd00dfeedU /** * copy_from_paddr - copy data from a physical address diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index ef5c6a8195..d1ef787638 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -398,7 +398,7 @@ static vaddr_t exception_handler32(vaddr_t offset) register_t sctlr = READ_SYSREG(SCTLR_EL1); if ( sctlr & SCTLR_A32_EL1_V ) - return 0xffff0000 + offset; + return 0xffff0000U + offset; else /* always have security exceptions */ return READ_SYSREG(VBAR_EL1) + offset; } @@ -809,7 +809,7 @@ static void show_registers_32(const struct cpu_user_regs *regs, #ifdef CONFIG_ARM_64 (uint32_t)(ctxt->far >> 32), ctxt->ifsr32_el2, - (uint32_t)(ctxt->far & 0xffffffff), + (uint32_t)(ctxt->far & 0xffffffffU), ctxt->esr_el1 #else ctxt->ifar, ctxt->ifsr, ctxt->dfar, ctxt->dfsr @@ -1414,16 +1414,16 @@ static void do_trap_hypercall(struct cpu_user_regs *regs, register_t *nr, { /* Deliberately corrupt parameter regs used by this hypercall. */ switch ( hypercall_args[*nr] ) { - case 5: HYPERCALL_ARG5(regs) = 0xDEADBEEF; - case 4: HYPERCALL_ARG4(regs) = 0xDEADBEEF; - case 3: HYPERCALL_ARG3(regs) = 0xDEADBEEF; - case 2: HYPERCALL_ARG2(regs) = 0xDEADBEEF; + case 5: HYPERCALL_ARG5(regs) = 0xDEADBEEFU; + case 4: HYPERCALL_ARG4(regs) = 0xDEADBEEFU; + case 3: HYPERCALL_ARG3(regs) = 0xDEADBEEFU; + case 2: HYPERCALL_ARG2(regs) = 0xDEADBEEFU; case 1: /* Don't clobber x0/r0 -- it's the return value */ case 0: /* -ENOSYS case */ break; default: BUG(); } - *nr = 0xDEADBEEF; + *nr = 0xDEADBEEFU; } #endif diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 0b083c33e6..35363fee09 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -306,7 +306,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info, case VREG32(GICD_SGIR): if ( dabt.size != DABT_WORD ) goto bad_width; /* Write only -- read unknown */ - *r = 0xdeadbeef; + *r = 0xdeadbeefU; return 1; case VRANGE32(0xF04, 0xF0C): diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 9c1fdcc3f8..1b7173da1e 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -354,7 +354,7 @@ read_reserved: return 1; read_unknown: - *r = vreg_reg64_extract(0xdeadbeafdeadbeaf, info); + *r = vreg_reg64_extract(0xdeadbeafdeadbeafULL, info); return 1; } diff --git a/xen/include/public/arch-arm/smccc.h b/xen/include/public/arch-arm/smccc.h index 802d800aad..8a9321ebed 100644 --- a/xen/include/public/arch-arm/smccc.h +++ b/xen/include/public/arch-arm/smccc.h @@ -26,7 +26,7 @@ #define XEN_SMCCC_MINOR_REVISION 1 /* Hypervisor Service UID. Randomly generated with uuidgen. */ -#define XEN_SMCCC_UID XEN_DEFINE_UUID(0xa71812dc, 0xc698, 0x4369, 0x9acf, \ +#define XEN_SMCCC_UID XEN_DEFINE_UUID(0xa71812dcU, 0xc698, 0x4369, 0x9acf, \ 0x79, 0xd1, 0x8d, 0xde, 0xe6, 0x67) /* Standard Service Service Call version. */ @@ -34,7 +34,7 @@ #define SSSC_SMCCC_MINOR_REVISION 1 /* Standard Service Call UID. Randomly generated with uuidgen. */ -#define SSSC_SMCCC_UID XEN_DEFINE_UUID(0xf863386f, 0x4b39, 0x4cbd, 0x9220,\ +#define SSSC_SMCCC_UID XEN_DEFINE_UUID(0xf863386fU, 0x4b39, 0x4cbd, 0x9220,\ 0xce, 0x16, 0x41, 0xe5, 0x9f, 0x6f) #endif /* __XEN_PUBLIC_ARCH_ARM_SMCCC_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jul 18 11:33:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jul 2023 11:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.565143.883043 (Exim 4.92) (envelope-from ) id 1qLix7-00019x-Jw; Tue, 18 Jul 2023 11:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 565143.883043; Tue, 18 Jul 2023 11:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLix7-00019p-HO; Tue, 18 Jul 2023 11:33:13 +0000 Received: by outflank-mailman (input) for mailman id 565143; Tue, 18 Jul 2023 11:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLix6-00019Z-0A for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 11:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLix5-0006dQ-Vg for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 11:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLix5-0002l5-UU for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 11:33:11 +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=KNEsitBdf1J/dAPyKJ301cH1ibe79wKmcnOOTdrgaUU=; b=iDq6elYc/eg/UK7CTpUtKeAso8 VvOtvFpILmgBRW7qcDpPwdAOJqqujEuVC/HhWYcPrWrWXcCl6ZAB7g5uSiesNNgrPsUG6PFR3691/ t8HQyyr92JRLjb9+yUl3DVrQIbnyfI7gUUXvT9+3GRaENE6WPf+oMNHg8OLG/qmvgPR4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mce: change parameter names in function definitions to match the corresponding declarations Message-Id: Date: Tue, 18 Jul 2023 11:33:11 +0000 commit b5fc8061b78d4ecf58a6745e6a202a1f14f8249b Author: Federico Serafini AuthorDate: Mon Jul 17 10:27:58 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 17 10:30:20 2023 +0200 x86/mce: change parameter names in function definitions to match the corresponding declarations Change parameter names in function definitions to match the corresponding delcarations thus fixing violations of MISRA C:2012 Rule 8.3 ("All declarations of an object or function shall use the same names and type qualifiers"). Signed-off-by: Federico Serafini [jb: while there also add const to amd_mcheck_init()] Acked-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/mce.c | 11 +++++------ xen/arch/x86/cpu/mcheck/mce.h | 2 +- xen/arch/x86/cpu/mcheck/mce_amd.c | 16 ++++++++-------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 3e93bdd8da..140634198c 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -123,7 +123,7 @@ void mce_recoverable_register(mce_recoverable_t cbfunc) mc_recoverable_scan = cbfunc; } -struct mca_banks *mcabanks_alloc(unsigned int nr_mce_banks) +struct mca_banks *mcabanks_alloc(unsigned int nr) { struct mca_banks *mb; @@ -135,18 +135,17 @@ struct mca_banks *mcabanks_alloc(unsigned int nr_mce_banks) * For APs allocations get done by the BSP, i.e. when the bank count may * may not be known yet. A zero bank count is a clear indication of this. */ - if ( !nr_mce_banks ) - nr_mce_banks = MCG_CAP_COUNT; + if ( !nr ) + nr = MCG_CAP_COUNT; - mb->bank_map = xzalloc_array(unsigned long, - BITS_TO_LONGS(nr_mce_banks)); + mb->bank_map = xzalloc_array(unsigned long, BITS_TO_LONGS(nr)); if ( !mb->bank_map ) { xfree(mb); return NULL; } - mb->num = nr_mce_banks; + mb->num = nr; return mb; } diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index dd5d258362..5a751d1485 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -43,7 +43,7 @@ extern uint8_t cmci_apic_vector; extern bool lmce_support; /* Init functions */ -enum mcheck_type amd_mcheck_init(struct cpuinfo_x86 *c); +enum mcheck_type amd_mcheck_init(const struct cpuinfo_x86 *c); enum mcheck_type intel_mcheck_init(struct cpuinfo_x86 *c, bool bsp); void amd_nonfatal_mcheck_init(struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/mcheck/mce_amd.c b/xen/arch/x86/cpu/mcheck/mce_amd.c index 3c374fd4e4..adc36522cc 100644 --- a/xen/arch/x86/cpu/mcheck/mce_amd.c +++ b/xen/arch/x86/cpu/mcheck/mce_amd.c @@ -272,13 +272,13 @@ int vmce_amd_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) } enum mcheck_type -amd_mcheck_init(struct cpuinfo_x86 *ci) +amd_mcheck_init(const struct cpuinfo_x86 *c) { uint32_t i; enum mcequirk_amd_flags quirkflag = 0; - if ( ci->x86_vendor != X86_VENDOR_HYGON ) - quirkflag = mcequirk_lookup_amd_quirkdata(ci); + if ( c->x86_vendor != X86_VENDOR_HYGON ) + quirkflag = mcequirk_lookup_amd_quirkdata(c); /* Assume that machine check support is available. * The minimum provided support is at least the K8. */ @@ -298,14 +298,14 @@ amd_mcheck_init(struct cpuinfo_x86 *ci) } } - if ( ci->x86 == 0xf ) + if ( c->x86 == 0xf ) return mcheck_amd_k8; if ( quirkflag == MCEQUIRK_F10_GART ) mcequirk_amd_apply(quirkflag); - if ( cpu_has(ci, X86_FEATURE_AMD_PPIN) && - (ci == &boot_cpu_data || ppin_msr) ) + if ( cpu_has(c, X86_FEATURE_AMD_PPIN) && + (c == &boot_cpu_data || ppin_msr) ) { uint64_t val; @@ -320,7 +320,7 @@ amd_mcheck_init(struct cpuinfo_x86 *ci) if ( !(val & PPIN_ENABLE) ) ppin_msr = 0; - else if ( ci == &boot_cpu_data ) + else if ( c == &boot_cpu_data ) ppin_msr = MSR_AMD_PPIN; } @@ -328,6 +328,6 @@ amd_mcheck_init(struct cpuinfo_x86 *ci) mce_recoverable_register(mc_amd_recoverable_scan); mce_register_addrcheck(mc_amd_addrcheck); - return ci->x86_vendor == X86_VENDOR_HYGON ? + return c->x86_vendor == X86_VENDOR_HYGON ? mcheck_hygon : mcheck_amd_famXX; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jul 18 11:33:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jul 2023 11:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.565144.883046 (Exim 4.92) (envelope-from ) id 1qLixH-0001Cy-La; Tue, 18 Jul 2023 11:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 565144.883046; Tue, 18 Jul 2023 11:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLixH-0001Cr-J0; Tue, 18 Jul 2023 11:33:23 +0000 Received: by outflank-mailman (input) for mailman id 565144; Tue, 18 Jul 2023 11:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLixG-0001CI-3W for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 11:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLixG-0006du-2f for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 11:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLixG-0002lZ-1g for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 11:33: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=VVmaXhQcecu20VP8aUet7QZpD+LsVqz1/T26W5W/H8M=; b=jatVCtoxJTbiJufKbwsa/NCZee SwKBZdtcg3tNl1Fj/CfYdUnLpa3VTIKcvivyOfuMPlRPAKHvlO8npqO7BhYRyRFgY4r5WmT+V1UFh bpKFR7w2qVKZNGfKh0ipMW925r9ae3YTMkV341weA9twI1KZpouxoM+JIUVF98G8YkKM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/ioapic: sanitize IO-APIC pins before enabling lapic LVTERR/ESR Message-Id: Date: Tue, 18 Jul 2023 11:33:22 +0000 commit 813da5f0e73b8cbd2ac3c7922506e58c28cd736d Author: Roger Pau Monné AuthorDate: Mon Jul 17 10:31:10 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 17 10:31:10 2023 +0200 x86/ioapic: sanitize IO-APIC pins before enabling lapic LVTERR/ESR The current logic to init the local APIC and the IO-APIC does init the local APIC LVTERR/ESR before doing any sanitization on the IO-APIC pin configuration. It's already noted on enable_IO_APIC() that Xen shouldn't trust the IO-APIC being empty at bootup. At XenServer we have a system where the IO-APIC 0 is handed to Xen with pin 0 unmasked, set to Fixed delivery mode, edge triggered and with a vector of 0 (all fields of the RTE are zeroed). Once the local APIC LVTERR/ESR is enabled periodic injections from such pin cause the local APIC to in turn inject periodic error vectors: APIC error on CPU0: 00(40), Received illegal vector APIC error on CPU0: 40(40), Received illegal vector APIC error on CPU0: 40(40), Received illegal vector APIC error on CPU0: 40(40), Received illegal vector APIC error on CPU0: 40(40), Received illegal vector APIC error on CPU0: 40(40), Received illegal vector That prevents Xen from booting. Move the masking of the IO-APIC pins ahead of the setup of the local APIC. This has the side effect of also moving the detection of the pin where the i8259 is connected, as such detection must be done before masking any pins. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/apic.c | 4 ++++ xen/arch/x86/include/asm/irq.h | 1 + xen/arch/x86/io_apic.c | 4 +--- xen/arch/x86/smpboot.c | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index ce556b2684..41879230ec 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1493,6 +1493,10 @@ int __init APIC_init_uniprocessor (void) physids_clear(phys_cpu_present_map); physid_set(boot_cpu_physical_apicid, phys_cpu_present_map); + if ( !skip_ioapic_setup && nr_ioapics ) + /* Sanitize the IO-APIC pins before enabling the lapic LVTERR/ESR. */ + enable_IO_APIC(); + setup_local_APIC(true); if (nmi_watchdog == NMI_LOCAL_APIC) diff --git a/xen/arch/x86/include/asm/irq.h b/xen/arch/x86/include/asm/irq.h index 424b0e1af8..3f95dd39b7 100644 --- a/xen/arch/x86/include/asm/irq.h +++ b/xen/arch/x86/include/asm/irq.h @@ -118,6 +118,7 @@ bool bogus_8259A_irq(unsigned int irq); int i8259A_suspend(void); int i8259A_resume(void); +void enable_IO_APIC(void); void setup_IO_APIC(void); void disable_IO_APIC(void); void setup_ioapic_dest(void); diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 9b8a972cf5..25a08b1ea6 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -1273,7 +1273,7 @@ static void cf_check _print_IO_APIC_keyhandler(unsigned char key) __print_IO_APIC(0); } -static void __init enable_IO_APIC(void) +void __init enable_IO_APIC(void) { int i8259_apic, i8259_pin; int i, apic; @@ -2067,8 +2067,6 @@ static void __init ioapic_pm_state_alloc(void) void __init setup_IO_APIC(void) { - enable_IO_APIC(); - if (acpi_ioapic) io_apic_irqs = ~0; /* all IRQs go through IOAPIC */ else diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index cf9bb220f9..3a1a659082 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -1224,6 +1224,11 @@ void __init smp_prepare_cpus(void) verify_local_APIC(); connect_bsp_APIC(); + + if ( !skip_ioapic_setup && nr_ioapics ) + /* Sanitize the IO-APIC pins before enabling the lapic LVTERR/ESR. */ + enable_IO_APIC(); + setup_local_APIC(true); if ( !skip_ioapic_setup && nr_ioapics ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jul 18 13:00:06 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jul 2023 13:00:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.565205.883161 (Exim 4.92) (envelope-from ) id 1qLkJ9-0008Ty-5X; Tue, 18 Jul 2023 13:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 565205.883161; Tue, 18 Jul 2023 13:00: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 1qLkJ9-0008Tb-2W; Tue, 18 Jul 2023 13:00:03 +0000 Received: by outflank-mailman (input) for mailman id 565205; Tue, 18 Jul 2023 13:00:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLkJ7-0008B3-NR for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 13:00:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLkJ7-0000SO-AT for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 13:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLkJ7-0006kE-9R for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 13:00: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=jXlasSAAkmivPzW7ot9NLPa4aUggvrejgeSAHNwmb5M=; b=RbUgh4g0Vfz5rhSZsVfPb5SQP0 KdZZDSX4hLAvuWAwPylG9T9qOXygno7dLuU2etQ6dFe8iV+KVZWOYaWxtJyCKwNztgEQgtKC7eS3J i6kvlC0LEN2kSxCHeKV+/Kx9aMo2kjotb8tWFQydFnKrH/lAkZo8OAcIjJcnGj1Gaur8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] xen/x86: Remove the use of K&R functions Message-Id: Date: Tue, 18 Jul 2023 13:00:01 +0000 commit 8f11b6e942dbf02592de2ab3338226f0cd3ee3ac Author: Andrew Cooper AuthorDate: Mon Jul 17 09:32:07 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 17 09:32:07 2023 +0200 xen/x86: Remove the use of K&R functions Clang-15 (as seen in the FreeBSD 14 tests) complains: arch/x86/time.c:1364:20: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] s_time_t get_s_time() ^ void The error message is a bit confusing but appears to new as part of -Wdeprecated-non-prototype which is part of supporting C2x which formally removes K&R syntax. Either way, fix the identified functions. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 22b2fa4766728c3057757c00e79da5f7803fff33 master date: 2023-02-17 11:01:54 +0000 --- xen/arch/x86/hvm/vmx/vmcs.c | 2 +- xen/arch/x86/time.c | 2 +- xen/drivers/passthrough/iommu.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 7912053bda..bcbecc6945 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -782,7 +782,7 @@ static int _vmx_cpu_up(bool bsp) return 0; } -int cf_check vmx_cpu_up() +int cf_check vmx_cpu_up(void) { return _vmx_cpu_up(false); } diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index d882b43cf0..b664ae4c83 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1361,7 +1361,7 @@ s_time_t get_s_time_fixed(u64 at_tsc) return t->stamp.local_stime + scale_delta(delta, &t->tsc_scale); } -s_time_t get_s_time() +s_time_t get_s_time(void) { return get_s_time_fixed(0); } diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 5e2a720d29..df803afb79 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -598,7 +598,7 @@ int __init iommu_setup(void) return rc; } -int iommu_suspend() +int iommu_suspend(void) { if ( iommu_enabled ) return iommu_call(iommu_get_ops(), suspend); @@ -606,7 +606,7 @@ int iommu_suspend() return 0; } -void iommu_resume() +void iommu_resume(void) { if ( iommu_enabled ) iommu_vcall(iommu_get_ops(), resume); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Tue Jul 18 14:33:11 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jul 2023 14:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.565319.883375 (Exim 4.92) (envelope-from ) id 1qLll9-0005pC-Vo; Tue, 18 Jul 2023 14:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 565319.883375; Tue, 18 Jul 2023 14:33: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 1qLll9-0005p4-TB; Tue, 18 Jul 2023 14:33:03 +0000 Received: by outflank-mailman (input) for mailman id 565319; Tue, 18 Jul 2023 14:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLll8-0005ov-3G for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 14:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLll7-0002e0-SY for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 14:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLll7-0002xV-RJ for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 14:33: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=ym+yi9nUUJbhZBFV+1su9qBtpvPDMXHD7i82IHLMBaU=; b=XbFx8dxx+hXeoOtU86DOS0UBa/ NHYU//xBo8wfony8v0oj9g4GuBdiPkpkU1DemKw4SftTfDvrgEzTj80TN47/H5ENSWwz1UZy5b5Kp FtAyFTJecx0KUIWXQX8WtMnUbdzEZ2Onc02rpgKFgc/X93S6idfWNKiyL1BBc2S3Nbc4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] tools: convert bitfields to unsigned type Message-Id: Date: Tue, 18 Jul 2023 14:33:01 +0000 commit c9c8b20ebcb5a75b40da34f541ff226cac70dd22 Author: Olaf Hering AuthorDate: Mon Jul 17 08:32:19 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 17 08:32:19 2023 +0200 tools: convert bitfields to unsigned type clang complains about the signed type: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] Signed-off-by: Olaf Hering Reviewed-by: Juergen Gross Acked-by: Anthony PERARD Backport: Dropped the libxenvchan change, for the original commit saying "The potential ABI change in libxenvchan is covered by the Xen version based SONAME." which won't hold on stable trees. master commit: 99ab02f63ea813f2e467a39a7736bf460a3f3495 master date: 2023-05-16 20:03:02 +0100 --- tools/xentrace/xenalyze.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 5de167031e..e7ec284eea 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -1377,7 +1377,7 @@ struct hvm_data { tsc_t exit_tsc, arc_cycles, entry_tsc; unsigned long long rip; unsigned exit_reason, event_handler; - int short_summary_done:1, prealloc_unpin:1, wrmap_bf:1; + unsigned int short_summary_done:1, prealloc_unpin:1, wrmap_bf:1; /* Immediate processing */ void *d; @@ -8235,13 +8235,13 @@ void mem_set_p2m_entry_process(struct pcpu_info *p) struct { uint64_t gfn, mfn; - int p2mt; - int d:16,order:16; + uint32_t p2mt; + uint16_t d, order; } *r = (typeof(r))ri->d; if ( opt.dump_all ) { - printf(" %s set_p2m_entry d%d o%d t %d g %llx m %llx\n", + printf(" %s set_p2m_entry d%u o%u t %u g %llx m %llx\n", ri->dump_header, r->d, r->order, r->p2mt, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Tue Jul 18 14:33:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jul 2023 14:33:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.565320.883379 (Exim 4.92) (envelope-from ) id 1qLllK-0005qt-0u; Tue, 18 Jul 2023 14:33:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 565320.883379; Tue, 18 Jul 2023 14:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLllJ-0005ql-UZ; Tue, 18 Jul 2023 14:33:13 +0000 Received: by outflank-mailman (input) for mailman id 565320; Tue, 18 Jul 2023 14:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLllI-0005qZ-12 for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 14:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLllI-0002e4-0B for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 14:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLllH-0002xz-UZ for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 14:33:11 +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=npRZ1AQjtU+tYuyDq36wU07eJV3B2TEHJdTYF4xCxyA=; b=TNOUPNS9zLq5V8++2dvxHnRmFX PGgMHBZVFHQEh0Y2A3Lto7PklnElh8lGUwxeceobq7qcH6LE+AHAhqtRH1/DD0VtY6mi/tFU4JMWY 38KNNb93fIQKxNr0KlwKmGmEZPJZU+mbuVGiLyOcZ6IRSBaK0Uj483Iee/d8derYMxrg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] vpci/header: cope with devices not having vpci allocated Message-Id: Date: Tue, 18 Jul 2023 14:33:11 +0000 commit c15221e45c0ffafdbb9faafd1a07ffb054b2cde3 Author: Roger Pau Monné AuthorDate: Mon Jul 17 08:32:34 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 17 08:32:34 2023 +0200 vpci/header: cope with devices not having vpci allocated When traversing the list of pci devices assigned to a domain cope with some of them not having the vpci struct allocated. It should be possible for the hardware domain to have read-only devices assigned that are not handled by vPCI, such support will be added by further patches. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: ee045f3a4a6dddb09f5aa96a50cceaae97d3245f master date: 2023-05-26 09:18:37 +0200 --- xen/drivers/vpci/header.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index 40ff79c33f..d59056fb18 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -269,6 +269,14 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t cmd, bool rom_only) */ for_each_pdev ( pdev->domain, tmp ) { + if ( !tmp->vpci ) + /* + * For the hardware domain it's possible to have devices assigned + * to it that are not handled by vPCI, either because those are + * read-only devices, or because vPCI setup has failed. + */ + continue; + if ( tmp == pdev ) { /* -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Tue Jul 18 14:33:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jul 2023 14:33:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.565321.883382 (Exim 4.92) (envelope-from ) id 1qLllU-0005tQ-2R; Tue, 18 Jul 2023 14:33:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 565321.883382; Tue, 18 Jul 2023 14:33: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 1qLllT-0005tI-W6; Tue, 18 Jul 2023 14:33:23 +0000 Received: by outflank-mailman (input) for mailman id 565321; Tue, 18 Jul 2023 14:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLllS-0005sl-4e for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 14:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLllS-0002eb-3s for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 14:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLllS-0002yT-2K for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 14:33: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=zvV0snhJxScAe9Vsbm/eJR49vI9ivb6zWxTJHzop+NA=; b=U/2ZuPDrno2m/hnCeBMZgaxu6O jdcHoz3TQIx/fVWUyzMQDtB1WblUUXtOM15LePCixfxm3yXyNhVYh591tnKxCuaVcOR14aP0mHmYI 1QDcoyFzEsuP6cO4TXBZk1Nl2RRgCkIPVJ0UZD3EGTf4GJ7dEO4q04UgpgUKyfxIKGrY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] x86/microcode: Add missing unlock in microcode_update_helper() Message-Id: Date: Tue, 18 Jul 2023 14:33:22 +0000 commit d3065bf0a83e02032d0900566fa8605d8865073d Author: Alejandro Vallejo AuthorDate: Mon Jul 17 08:34:11 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 17 08:34:11 2023 +0200 x86/microcode: Add missing unlock in microcode_update_helper() microcode_update_helper() may return early while holding cpu_add_remove_lock, hence preventing any writers from taking it again. Leave through the `put` label instead so it's properly released. Fixes: 5ed12565aa32 ("microcode: rendezvous CPUs in NMI handler and load ucode") Signed-off-by: Alejandro Vallejo Reviewed-by: Andrew Cooper master commit: b35b22acb887f682efe8385b3df165220bc84c86 master date: 2023-06-05 16:11:10 +0100 --- xen/arch/x86/cpu/microcode/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index ad150e5963..cd942130f5 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -594,7 +594,8 @@ static long microcode_update_helper(void *data) printk(XENLOG_WARNING "CPU%u is expected to lead ucode loading (but got CPU%u)\n", nmi_cpu, cpumask_first(&cpu_online_map)); - return -EPERM; + ret = -EPERM; + goto put; } patch = parse_blob(buffer->buffer, buffer->len); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Tue Jul 18 14:33:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jul 2023 14:33:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.565322.883387 (Exim 4.92) (envelope-from ) id 1qLlle-0005wv-4J; Tue, 18 Jul 2023 14:33:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 565322.883387; Tue, 18 Jul 2023 14:33: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 1qLlle-0005wn-1I; Tue, 18 Jul 2023 14:33:34 +0000 Received: by outflank-mailman (input) for mailman id 565322; Tue, 18 Jul 2023 14:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLllc-0005wV-7n for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 14:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLllc-0002ek-6y for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 14:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLllc-0002z4-62 for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 14:33: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=cKpaXtFZdStc4f94ZBqSskPhGjQ+cHb7ny8+y+vecr0=; b=0L27Ue7OuIr9UTbCxeRilhCzN5 zQS7QNxXqq0R/hgvTds63WpmyJYiqFoZM/RGrtc+4QfTEgDkbGjOLptlfv0WIr/o5b7WEyvyubEoi MiI1XSdBiQT3h9f2W/CUsAuKd5wORNso9M+AyuHCE7DV9KQCHtcqZXlCK8yXv2lFZDcY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] iommu/amd-vi: fix checking for Invalidate All support in amd_iommu_resume() Message-Id: Date: Tue, 18 Jul 2023 14:33:32 +0000 commit 606331e6562f7b64ef0be1fd2596423c0ae209da Author: Roger Pau Monné AuthorDate: Mon Jul 17 08:34:33 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 17 08:34:33 2023 +0200 iommu/amd-vi: fix checking for Invalidate All support in amd_iommu_resume() The iommu local variable does not point to to a valid amd_iommu element after the call to for_each_amd_iommu(). Instead check whether any IOMMU on the system doesn't support Invalidate All in order to perform the per-domain and per-device flushes. Fixes: 9c46139de889 ('amd iommu: Support INVALIDATE_IOMMU_ALL command.') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 5ecbb779748a56495f2c892f0610d57dd623c7cd master date: 2023-06-13 14:41:32 +0200 --- xen/drivers/passthrough/amd/iommu_init.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 559a734bda..ca791d4e54 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -1587,6 +1587,7 @@ void amd_iommu_crash_shutdown(void) void amd_iommu_resume(void) { struct amd_iommu *iommu; + bool invalidate_all = true; for_each_amd_iommu ( iommu ) { @@ -1596,10 +1597,12 @@ void amd_iommu_resume(void) */ disable_iommu(iommu); enable_iommu(iommu); + if ( !iommu->features.flds.ia_sup ) + invalidate_all = false; } /* flush all cache entries after iommu re-enabled */ - if ( !iommu->features.flds.ia_sup ) + if ( !invalidate_all ) { invalidate_all_devices(); invalidate_all_domain_pages(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Tue Jul 18 14:33:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Jul 2023 14:33:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.565323.883391 (Exim 4.92) (envelope-from ) id 1qLllo-0005zk-5Y; Tue, 18 Jul 2023 14:33:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 565323.883391; Tue, 18 Jul 2023 14:33: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 1qLllo-0005zc-2k; Tue, 18 Jul 2023 14:33:44 +0000 Received: by outflank-mailman (input) for mailman id 565323; Tue, 18 Jul 2023 14:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLllm-0005zM-Bd for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 14:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qLllm-0002et-AI for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 14:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qLllm-0002zV-9I for xen-changelog@lists.xenproject.org; Tue, 18 Jul 2023 14:33:42 +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=TLizfXNd14L3CCfcysjBFEe30KC4FzF1lU2suFLabFY=; b=V+TitmJNL5V1IkSQQL4gobx0aG sC9Q9IrHaHSDulg2MtOlf1k2G5XJABZEneReLPCXw+gRWCkDyJAG4MLXgykDaXuBVQ6UydkZnk37a J61rFG42lezRgNqww+0RdwdkbNNjyo3CxA38GqDcs4pk8lCq6wy6cp9PECM2cWjfVgBY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] xen/x86: Remove the use of K&R functions Message-Id: Date: Tue, 18 Jul 2023 14:33:42 +0000 commit 2b12f64f87b326e9434b09f249af5e8b1e287e24 Author: Andrew Cooper AuthorDate: Mon Jul 17 09:41:22 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 17 09:41:22 2023 +0200 xen/x86: Remove the use of K&R functions Clang-15 (as seen in the FreeBSD 14 tests) complains: arch/x86/time.c:1364:20: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] s_time_t get_s_time() ^ void The error message is a bit confusing but appears to new as part of -Wdeprecated-non-prototype which is part of supporting C2x which formally removes K&R syntax. Either way, fix the identified functions. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Backport: Also deal with powernow_register_driver() and flush_all_cache(). master commit: 22b2fa4766728c3057757c00e79da5f7803fff33 master date: 2023-02-17 11:01:54 +0000 --- xen/arch/x86/acpi/cpufreq/powernow.c | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 2 +- xen/arch/x86/time.c | 2 +- xen/drivers/passthrough/iommu.c | 4 ++-- xen/drivers/passthrough/vtd/x86/vtd.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/powernow.c b/xen/arch/x86/acpi/cpufreq/powernow.c index f620bebc7e..b17dc612ff 100644 --- a/xen/arch/x86/acpi/cpufreq/powernow.c +++ b/xen/arch/x86/acpi/cpufreq/powernow.c @@ -353,7 +353,7 @@ static const struct cpufreq_driver __initconstrel powernow_cpufreq_driver = { .update = powernow_cpufreq_update }; -unsigned int __init powernow_register_driver() +unsigned int __init powernow_register_driver(void) { unsigned int i, ret = 0; diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 237b13459d..c2a1d7280d 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -774,7 +774,7 @@ static int _vmx_cpu_up(bool bsp) return 0; } -int vmx_cpu_up() +int vmx_cpu_up(void) { return _vmx_cpu_up(false); } diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index db0b149ec6..3fceb9a468 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1265,7 +1265,7 @@ s_time_t get_s_time_fixed(u64 at_tsc) return t->stamp.local_stime + scale_delta(delta, &t->tsc_scale); } -s_time_t get_s_time() +s_time_t get_s_time(void) { return get_s_time_fixed(0); } diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 287f63fc73..7d69b1134b 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -515,7 +515,7 @@ int __init iommu_setup(void) return rc; } -int iommu_suspend() +int iommu_suspend(void) { if ( iommu_enabled ) return iommu_get_ops()->suspend(); @@ -523,7 +523,7 @@ int iommu_suspend() return 0; } -void iommu_resume() +void iommu_resume(void) { if ( iommu_enabled ) iommu_get_ops()->resume(); diff --git a/xen/drivers/passthrough/vtd/x86/vtd.c b/xen/drivers/passthrough/vtd/x86/vtd.c index 55f0faa521..2665114f70 100644 --- a/xen/drivers/passthrough/vtd/x86/vtd.c +++ b/xen/drivers/passthrough/vtd/x86/vtd.c @@ -47,7 +47,7 @@ void unmap_vtd_domain_page(const void *va) unmap_domain_page(va); } -void flush_all_cache() +void flush_all_cache(void) { wbinvd(); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Wed Jul 19 14:44:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jul 2023 14:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.565917.884534 (Exim 4.92) (envelope-from ) id 1qM8PV-0003UU-0t; Wed, 19 Jul 2023 14:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 565917.884534; Wed, 19 Jul 2023 14:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM8PU-0003UM-UX; Wed, 19 Jul 2023 14:44:12 +0000 Received: by outflank-mailman (input) for mailman id 565917; Wed, 19 Jul 2023 14:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM8PT-0003UE-LV for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 14:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM8PT-00057u-KJ for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 14:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qM8PT-0000Gu-Gk for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 14:44:11 +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=I0zVeBuDu0f6xHOC5P2Cu16G8EJK+G9K1WD+kCRbNR8=; b=fYaakYt82UuZhmCwoMigjrqbie kj/Qpi7uEAcBJvTOth1ZvC1YJSekmvPVm9UP6afCcO+S0hklKuS4CL9nncmjGIO4ElMtcJEwhu0AL EsP6TsLwoDJGSO/xfgFrpn6NvUuAOM0WS5OJXMhV/70xzROTL8i0P6ZTBv8f5lh9tttM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/x86: Use const char * for string literals Message-Id: Date: Wed, 19 Jul 2023 14:44:11 +0000 commit d642c07066780e67016a2f9391dc0f125f1123a6 Author: Andrew Cooper AuthorDate: Fri Jul 14 11:18:53 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Jul 17 11:35:41 2023 +0100 xen/x86: Use const char * for string literals For pre-ANSI-C compatibility reasons, string literals have a mutable type, but it is undefined behaviour to mutate them. Swap char *'s to const char *'s for variables which hold string literals. This fixes several violations of MISRA Rule 7.4: A string literal shall not be assigned to an object unless the object's type is "pointer to const-qualified char". No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 2 +- xen/arch/x86/cpu/mcheck/mce.c | 2 +- xen/arch/x86/cpu/mcheck/mce.h | 2 +- xen/arch/x86/e820.c | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 4 ++-- xen/arch/x86/include/asm/hvm/hvm.h | 2 +- xen/arch/x86/oprofile/nmi_int.c | 8 ++++---- xen/arch/x86/time.c | 4 ++-- xen/include/xen/dmi.h | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 427c8c89c5..cfce4cc040 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -302,7 +302,7 @@ static void print_hw_residencies(uint32_t cpu) hw_res.cc6, hw_res.cc7); } -static char* acpi_cstate_method_name[] = +static const char *const acpi_cstate_method_name[] = { "NONE", "SYSIO", diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 140634198c..c2173cfc78 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1705,7 +1705,7 @@ static void mc_panic_dump(void) dprintk(XENLOG_ERR, "End dump mc_info, %x mcinfo dumped\n", mcinfo_dumpped); } -void mc_panic(char *s) +void mc_panic(const char *s) { is_mc_panic = true; console_force_unlock(); diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index 5a751d1485..d40cee531a 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -57,7 +57,7 @@ struct mcinfo_extended *intel_get_extended_msrs( bool mce_available(const struct cpuinfo_x86 *c); unsigned int mce_firstbank(struct cpuinfo_x86 *c); /* Helper functions used for collecting error telemetry */ -void noreturn mc_panic(char *s); +void noreturn mc_panic(const char *s); void x86_mc_get_cpu_info(unsigned, uint32_t *, uint16_t *, uint16_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t *); diff --git a/xen/arch/x86/e820.c b/xen/arch/x86/e820.c index c5911cf48d..0b89935510 100644 --- a/xen/arch/x86/e820.c +++ b/xen/arch/x86/e820.c @@ -363,7 +363,7 @@ static unsigned long __init find_max_pfn(void) return max_pfn; } -static void __init clip_to_limit(uint64_t limit, char *warnmsg) +static void __init clip_to_limit(uint64_t limit, const char *warnmsg) { unsigned int i; char _warnmsg[160]; diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index b209563625..13719cc923 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1949,7 +1949,7 @@ static inline unsigned long vmr(unsigned long field) (uint32_t)vmr(fld); \ }) -static void vmx_dump_sel(char *name, uint32_t selector) +static void vmx_dump_sel(const char *name, uint32_t selector) { uint32_t sel, attr, limit; uint64_t base; @@ -1960,7 +1960,7 @@ static void vmx_dump_sel(char *name, uint32_t selector) printk("%s: %04x %05x %08x %016"PRIx64"\n", name, sel, attr, limit, base); } -static void vmx_dump_sel2(char *name, uint32_t lim) +static void vmx_dump_sel2(const char *name, uint32_t lim) { uint32_t limit; uint64_t base; diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/hvm/hvm.h index 9555b4c41f..3c37f522b9 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -92,7 +92,7 @@ struct hvm_vcpu_nonreg_state { * supports Intel's VT-x and AMD's SVM extensions. */ struct hvm_function_table { - char *name; + const char *name; /* Support Hardware-Assisted Paging? */ bool_t hap_supported; diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_int.c index 17bf3135f8..1313818af8 100644 --- a/xen/arch/x86/oprofile/nmi_int.c +++ b/xen/arch/x86/oprofile/nmi_int.c @@ -36,7 +36,7 @@ struct op_x86_model_spec const *__read_mostly model; static struct op_msrs cpu_msrs[NR_CPUS]; static unsigned long saved_lvtpc[NR_CPUS]; -static char *cpu_type; +static const char *cpu_type; static DEFINE_PER_CPU(struct vcpu *, nmi_cont_vcpu); @@ -309,7 +309,7 @@ void nmi_stop(void) } -static int __init p4_init(char ** cpu_type) +static int __init p4_init(const char **cpu_type) { unsigned int cpu_model = current_cpu_data.x86_model; @@ -353,7 +353,7 @@ static int __init cf_check force_cpu_type(const char *str) } custom_param("cpu_type", force_cpu_type); -static int __init ppro_init(char ** cpu_type) +static int __init ppro_init(const char **cpu_type) { if (force_arch_perfmon && cpu_has_arch_perfmon) return 0; @@ -375,7 +375,7 @@ static int __init ppro_init(char ** cpu_type) return 1; } -static int __init arch_perfmon_init(char **cpu_type) +static int __init arch_perfmon_init(const char **cpu_type) { if (!cpu_has_arch_perfmon) return 0; diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index f5e30d4e02..af40a9993c 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -64,8 +64,8 @@ struct cpu_time { }; struct platform_timesource { - char *id; - char *name; + const char *id; + const char *name; u64 frequency; /* Post-init this hook may only be invoked via the read_counter() wrapper! */ u64 (*read_counter)(void); diff --git a/xen/include/xen/dmi.h b/xen/include/xen/dmi.h index fa25f6cd38..71a5c46dc6 100644 --- a/xen/include/xen/dmi.h +++ b/xen/include/xen/dmi.h @@ -20,12 +20,12 @@ enum dmi_field { */ struct dmi_strmatch { u8 slot; - char *substr; + const char *substr; }; struct dmi_system_id { int (*callback)(const struct dmi_system_id *); - char *ident; + const char *ident; struct dmi_strmatch matches[4]; void *driver_data; }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 19 14:44:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jul 2023 14:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.565916.884530 (Exim 4.92) (envelope-from ) id 1qM8PK-0003Sv-VP; Wed, 19 Jul 2023 14:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 565916.884530; Wed, 19 Jul 2023 14:44:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM8PK-0003So-Sn; Wed, 19 Jul 2023 14:44:02 +0000 Received: by outflank-mailman (input) for mailman id 565916; Wed, 19 Jul 2023 14:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM8PJ-0003Si-OW for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 14:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM8PJ-00057Z-ED for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 14:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qM8PJ-0000GV-DA for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 14: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=V+/Nh5klOJZ/Xk3T2fFXnq33IvuwVWpBOcQEhx/xc6Q=; b=bsWaDn9SF7O9lkiElRv2RVkibj luoJsJzYa4K8HhW6MUkqeQtCMz/IFRLCUD62uX7Cu6VbouhVCzA7hdb/ccXzi1Suxq+Ia/Oc3Q4K3 kncix+ZkxIoqf85rxag553vql4c9VjSzf5/ap4Co6bvVwVpOsxWaUEFgIKXBEXknZnTM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/common: Use const char * for string literals Message-Id: Date: Wed, 19 Jul 2023 14:44:01 +0000 commit edecca33f9ef0e3506e3109914da247a9121999a Author: Andrew Cooper AuthorDate: Fri Jul 14 11:18:00 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Jul 17 11:35:41 2023 +0100 xen/common: Use const char * for string literals For pre-ANSI-C compatibility reasons, string literals have a mutable type, but it is undefined behaviour to mutate them. Swap char *'s to const char *'s for variables which hold string literals. This fixes several violations of MISRA Rule 7.4: A string literal shall not be assigned to an object unless the object's type is "pointer to const-qualified char". No functional change. Signed-off-by: Andrew Cooper Acked-by: Julien Grall --- xen/common/gunzip.c | 2 +- xen/common/ioreq.c | 3 ++- xen/common/libelf/libelf-dominfo.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/common/gunzip.c b/xen/common/gunzip.c index b810499be2..2c6eae167d 100644 --- a/xen/common/gunzip.c +++ b/xen/common/gunzip.c @@ -52,7 +52,7 @@ typedef unsigned long ulg; static long __initdata bytes_out; static void flush_window(void); -static __init void error(char *x) +static __init void error(const char *x) { panic("%s\n", x); } diff --git a/xen/common/ioreq.c b/xen/common/ioreq.c index ecb8f545e1..7cb717f7a2 100644 --- a/xen/common/ioreq.c +++ b/xen/common/ioreq.c @@ -501,7 +501,8 @@ static int ioreq_server_alloc_rangesets(struct ioreq_server *s, for ( i = 0; i < NR_IO_RANGE_TYPES; i++ ) { - char *name, *type; + const char *type; + char *name; switch ( i ) { diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c index fcaee2f7bc..a13a5e4db6 100644 --- a/xen/common/libelf/libelf-dominfo.c +++ b/xen/common/libelf/libelf-dominfo.c @@ -100,7 +100,7 @@ elf_errorstatus elf_xen_parse_note(struct elf_binary *elf, { /* *INDENT-OFF* */ static const struct { - char *name; + const char *name; bool str; } note_desc[] = { [XEN_ELFNOTE_ENTRY] = { "ENTRY", 0}, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 19 14:44:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jul 2023 14:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.565918.884538 (Exim 4.92) (envelope-from ) id 1qM8Pf-0003XX-2T; Wed, 19 Jul 2023 14:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 565918.884538; Wed, 19 Jul 2023 14:44:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM8Pe-0003XP-W3; Wed, 19 Jul 2023 14:44:22 +0000 Received: by outflank-mailman (input) for mailman id 565918; Wed, 19 Jul 2023 14:44:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM8Pd-0003XA-OA for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 14:44:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM8Pd-000588-NL for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 14:44:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qM8Pd-0000HN-MP for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 14:44:21 +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=1LmibHU6hY1jokBjbGHrGf7r5K8e6p53JlcARvOqzd4=; b=kbMrXAQ5uE8IyIGU9SIe4Ln+EW yEbYiWnkPNeOzWqCMk0sQSkQqCmGL10nCO5mFz73i259gqAjiPBChsK/A5+CI1MREw7Hs8UNo941U ec0lRBjCopHlHSTg24ldERWU2btjaM8mVn74QPAfr2VlHRtwGzzovh3xwiu9lS0gjBUM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ACPI: Remove the acpi_string type Message-Id: Date: Wed, 19 Jul 2023 14:44:21 +0000 commit 993f0ecb6bf507e573c41f19072e8d974f9f0e25 Author: Andrew Cooper AuthorDate: Fri Jul 14 13:28:24 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Jul 17 11:35:41 2023 +0100 xen/ACPI: Remove the acpi_string type Typedef-ing a naked pointer like this is an anti-pattern which is best avoided. Furthermore, it's problematic to pass a string literal in a mutable type. Delete the type entirely, and replace it with a plain 'const char *'. This highlights two further bugs. acpi_get_table() already had a mismatch in types between it's declaration and definition, and we have declarations for acpi_get_handle() and acpi_get_table_header() but no definition at all, nor any callers. This fixes violations of MISRA Rule 7.4: A string literal shall not be assigned to an object unless the object's type is "pointer to const-qualified char". and of Rule 8.3: All declarations of an object or function shall use the same names and type qualifiers. and of Rule 8.6: An identifier with external linkage shall have exactly one external definition. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/drivers/acpi/tables/tbxface.c | 4 ++-- xen/include/acpi/acpixf.h | 13 ++----------- xen/include/acpi/actypes.h | 1 - 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/xen/drivers/acpi/tables/tbxface.c b/xen/drivers/acpi/tables/tbxface.c index 21b2e5eae1..204d66caea 100644 --- a/xen/drivers/acpi/tables/tbxface.c +++ b/xen/drivers/acpi/tables/tbxface.c @@ -164,7 +164,7 @@ acpi_initialize_tables(struct acpi_table_desc * initial_table_array, * *****************************************************************************/ acpi_status __init -acpi_get_table(char *signature, +acpi_get_table(const char *signature, acpi_native_uint instance, struct acpi_table_header **out_table) { acpi_native_uint i; @@ -220,7 +220,7 @@ acpi_get_table(char *signature, * *****************************************************************************/ acpi_status __init -acpi_get_table_phys(acpi_string signature, acpi_native_uint instance, +acpi_get_table_phys(const char *signature, acpi_native_uint instance, acpi_physical_address *addr, acpi_native_uint *len) { acpi_native_uint i, j; diff --git a/xen/include/acpi/acpixf.h b/xen/include/acpi/acpixf.h index ba74908f04..8b70154b8f 100644 --- a/xen/include/acpi/acpixf.h +++ b/xen/include/acpi/acpixf.h @@ -69,25 +69,16 @@ acpi_status acpi_load_tables(void); acpi_status acpi_load_table(struct acpi_table_header *table_ptr); acpi_status -acpi_get_table_header(acpi_string signature, - acpi_native_uint instance, - struct acpi_table_header *out_table_header); - -acpi_status -acpi_get_table(acpi_string signature, +acpi_get_table(const char *signature, acpi_native_uint instance, struct acpi_table_header **out_table); acpi_status -acpi_get_table_phys(acpi_string signature, acpi_native_uint instance, +acpi_get_table_phys(const char *signature, acpi_native_uint instance, acpi_physical_address *addr, acpi_native_uint *len); /* * Namespace and name interfaces */ acpi_status -acpi_get_handle(acpi_handle parent, - acpi_string pathname, acpi_handle * ret_handle); - -acpi_status acpi_debug_trace(char *name, u32 debug_level, u32 debug_layer, u32 flags); acpi_status diff --git a/xen/include/acpi/actypes.h b/xen/include/acpi/actypes.h index f3e95abc3a..7023863d03 100644 --- a/xen/include/acpi/actypes.h +++ b/xen/include/acpi/actypes.h @@ -281,7 +281,6 @@ typedef acpi_native_uint acpi_size; */ typedef u32 acpi_status; /* All ACPI Exceptions */ typedef u32 acpi_name; /* 4-byte ACPI name */ -typedef char *acpi_string; /* Null terminated ASCII string */ typedef void *acpi_handle; /* Actually a ptr to a NS Node */ struct uint64_struct { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 19 14:44:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jul 2023 14:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.565920.884542 (Exim 4.92) (envelope-from ) id 1qM8Pp-0003ak-42; Wed, 19 Jul 2023 14:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 565920.884542; Wed, 19 Jul 2023 14:44:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM8Pp-0003ac-1J; Wed, 19 Jul 2023 14:44:33 +0000 Received: by outflank-mailman (input) for mailman id 565920; Wed, 19 Jul 2023 14:44:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM8Pn-0003aQ-RL for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 14:44:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM8Pn-00058H-QW for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 14:44:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qM8Pn-0000I5-Pa for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 14:44:31 +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=zOfKfz42giqy+7FNrkT+jipuPrAHSNXRTZEoDkHnnFw=; b=MylCFnK4RqxWiiDWJzaEk1dxBY 8ixwX+R0bEuIHq0KXwfP2o5BbVGUMcr6EMbVkwFvOGpVHe9omipVOfUm3eqeGMVHclYi6zYS+9eDB Kp5VsO5iZwrOmcfVshL4lBK8U9vefrZAD/8s4tGgZQmhW28sYoMxmuJAKFnMRCGdxYdo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ACPI: Use const char * for string literals Message-Id: Date: Wed, 19 Jul 2023 14:44:31 +0000 commit ceab2c1acd1098a3506b5128a001f3b4994b1176 Author: Andrew Cooper AuthorDate: Fri Jul 14 13:27:50 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Jul 17 11:35:41 2023 +0100 xen/ACPI: Use const char * for string literals For pre-ANSI-C compatibility reasons, string literals have a mutable type, but it is undefined behaviour to mutate them. Swap char *'s to const char *'s for variables which hold string literals. This fixes several violations of MISRA Rule 7.4: A string literal shall not be assigned to an object unless the object's type is "pointer to const-qualified char". No functional change. Signed-off-by: Andrew Cooper Acked-by: Julien Grall Acked-by: Jan Beulich --- xen/drivers/acpi/tables.c | 6 +++--- xen/drivers/acpi/tables/tbfadt.c | 2 +- xen/drivers/acpi/tables/tbutils.c | 2 +- xen/drivers/acpi/utilities/utmisc.c | 6 +++--- xen/include/acpi/actables.h | 2 +- xen/include/acpi/acutils.h | 12 ++++++------ xen/include/xen/acpi.h | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c index 96ff96b84c..20aed8929b 100644 --- a/xen/drivers/acpi/tables.c +++ b/xen/drivers/acpi/tables.c @@ -300,7 +300,7 @@ acpi_table_get_entry_madt(enum acpi_madt_type entry_id, } int __init -acpi_parse_entries(char *id, unsigned long table_size, +acpi_parse_entries(const char *id, unsigned long table_size, acpi_table_entry_handler handler, struct acpi_table_header *table_header, int entry_id, unsigned int max_entries) @@ -359,7 +359,7 @@ acpi_parse_entries(char *id, unsigned long table_size, } int __init -acpi_table_parse_entries(char *id, +acpi_table_parse_entries(const char *id, unsigned long table_size, int entry_id, acpi_table_entry_handler handler, @@ -405,7 +405,7 @@ acpi_table_parse_madt(enum acpi_madt_type id, * Scan the ACPI System Descriptor Table (STD) for a table matching @id, * run @handler on it. */ -int __init acpi_table_parse(char *id, acpi_table_handler handler) +int __init acpi_table_parse(const char *id, acpi_table_handler handler) { struct acpi_table_header *table = NULL; diff --git a/xen/drivers/acpi/tables/tbfadt.c b/xen/drivers/acpi/tables/tbfadt.c index d8fcc50dec..a03836e0dc 100644 --- a/xen/drivers/acpi/tables/tbfadt.c +++ b/xen/drivers/acpi/tables/tbfadt.c @@ -60,7 +60,7 @@ static void acpi_tb_validate_fadt(void); /* Table for conversion of FADT to common internal format and FADT validation */ typedef struct acpi_fadt_info { - char *name; + const char *name; u16 target; u16 source; u16 length; diff --git a/xen/drivers/acpi/tables/tbutils.c b/xen/drivers/acpi/tables/tbutils.c index 11412c47de..458989abea 100644 --- a/xen/drivers/acpi/tables/tbutils.c +++ b/xen/drivers/acpi/tables/tbutils.c @@ -243,7 +243,7 @@ u8 acpi_tb_checksum(u8 * buffer, acpi_native_uint length) void __init acpi_tb_install_table(acpi_physical_address address, - u8 flags, char *signature, acpi_native_uint table_index) + u8 flags, const char *signature, acpi_native_uint table_index) { struct acpi_table_header *table; diff --git a/xen/drivers/acpi/utilities/utmisc.c b/xen/drivers/acpi/utilities/utmisc.c index 4e1497ad0f..ee22c83e38 100644 --- a/xen/drivers/acpi/utilities/utmisc.c +++ b/xen/drivers/acpi/utilities/utmisc.c @@ -134,7 +134,7 @@ const char *__init acpi_ut_validate_exception(acpi_status status) ******************************************************************************/ void ACPI_INTERNAL_VAR_XFACE __init -acpi_ut_error(const char *module_name, u32 line_number, char *format, ...) +acpi_ut_error(const char *module_name, u32 line_number, const char *format, ...) { va_list args; @@ -147,7 +147,7 @@ acpi_ut_error(const char *module_name, u32 line_number, char *format, ...) } void ACPI_INTERNAL_VAR_XFACE __init -acpi_ut_warning(const char *module_name, u32 line_number, char *format, ...) +acpi_ut_warning(const char *module_name, u32 line_number, const char *format, ...) { va_list args; @@ -161,7 +161,7 @@ acpi_ut_warning(const char *module_name, u32 line_number, char *format, ...) } void ACPI_INTERNAL_VAR_XFACE __init -acpi_ut_info(const char *module_name, u32 line_number, char *format, ...) +acpi_ut_info(const char *module_name, u32 line_number, const char *format, ...) { va_list args; diff --git a/xen/include/acpi/actables.h b/xen/include/acpi/actables.h index d4cad35f41..527e1c9f9b 100644 --- a/xen/include/acpi/actables.h +++ b/xen/include/acpi/actables.h @@ -99,7 +99,7 @@ acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length); void acpi_tb_install_table(acpi_physical_address address, - u8 flags, char *signature, acpi_native_uint table_index); + u8 flags, const char *signature, acpi_native_uint table_index); acpi_status acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags); diff --git a/xen/include/acpi/acutils.h b/xen/include/acpi/acutils.h index b1b0df758b..ac54adaa8c 100644 --- a/xen/include/acpi/acutils.h +++ b/xen/include/acpi/acutils.h @@ -164,7 +164,7 @@ acpi_ut_debug_print(u32 requested_debug_level, u32 line_number, const char *function_name, const char *module_name, - u32 component_id, char *format, ...) ACPI_PRINTF_LIKE(6); + u32 component_id, const char *format, ...) ACPI_PRINTF_LIKE(6); void ACPI_INTERNAL_VAR_XFACE acpi_ut_debug_print_raw(u32 requested_debug_level, @@ -172,24 +172,24 @@ acpi_ut_debug_print_raw(u32 requested_debug_level, const char *function_name, const char *module_name, u32 component_id, - char *format, ...) ACPI_PRINTF_LIKE(6); + const char *format, ...) ACPI_PRINTF_LIKE(6); void ACPI_INTERNAL_VAR_XFACE acpi_ut_error(const char *module_name, - u32 line_number, char *format, ...) ACPI_PRINTF_LIKE(3); + u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3); void ACPI_INTERNAL_VAR_XFACE acpi_ut_exception(const char *module_name, u32 line_number, - acpi_status status, char *format, ...) ACPI_PRINTF_LIKE(4); + acpi_status status, const char *format, ...) ACPI_PRINTF_LIKE(4); void ACPI_INTERNAL_VAR_XFACE acpi_ut_warning(const char *module_name, - u32 line_number, char *format, ...) ACPI_PRINTF_LIKE(3); + u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3); void ACPI_INTERNAL_VAR_XFACE acpi_ut_info(const char *module_name, - u32 line_number, char *format, ...) ACPI_PRINTF_LIKE(3); + u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3); /* * utmisc diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index 352f27f6a7..8ec9579172 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -81,12 +81,12 @@ int erst_init(void); void acpi_hest_init(void); int acpi_table_init (void); -int acpi_table_parse(char *id, acpi_table_handler handler); -int acpi_parse_entries(char *id, unsigned long table_size, +int acpi_table_parse(const char *id, acpi_table_handler handler); +int acpi_parse_entries(const char *id, unsigned long table_size, acpi_table_entry_handler handler, struct acpi_table_header *table_header, int entry_id, unsigned int max_entries); -int acpi_table_parse_entries(char *id, unsigned long table_size, +int acpi_table_parse_entries(const char *id, unsigned long table_size, int entry_id, acpi_table_entry_handler handler, unsigned int max_entries); struct acpi_subtable_header *acpi_table_get_entry_madt(enum acpi_madt_type id, unsigned int entry_index); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 19 14:44:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jul 2023 14:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.565921.884545 (Exim 4.92) (envelope-from ) id 1qM8Pz-0003dd-5O; Wed, 19 Jul 2023 14:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 565921.884545; Wed, 19 Jul 2023 14:44:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM8Pz-0003dW-2n; Wed, 19 Jul 2023 14:44:43 +0000 Received: by outflank-mailman (input) for mailman id 565921; Wed, 19 Jul 2023 14:44:41 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM8Px-0003dM-UF for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 14:44:41 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM8Px-00058k-TU for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 14:44:41 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qM8Px-0000IZ-Sc for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 14:44:41 +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=FbnjgKe434mcN5Np0lzF55aFzthxeTPbLa3qLePi5oQ=; b=PDwcoHrfzAf5suW1gjU5JSfKRZ L/jHw3k+QvP6MbajF22cm+zj6tlpQUr/VslIklpgWsYVXMQVYK1eDjgsJtIVWBs3kgIuknnf/sBO0 b3JfX1ckNerh+3z0NMCYtqOP2ekZ6l0CVaprboHsS7G22lyPYeuTweNFV2FHjqyU98oI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ACPI: Remove acpi_get_pxm() entirely Message-Id: Date: Wed, 19 Jul 2023 14:44:41 +0000 commit e04cc8a08df3574bd7d5f7860008f1625e28f8b1 Author: Andrew Cooper AuthorDate: Fri Jul 14 14:11:31 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Jul 17 11:35:41 2023 +0100 xen/ACPI: Remove acpi_get_pxm() entirely There are no callers, and the non-stub implementation is #if 0'd out, with the internal trying to perform an AML invocation. There's no plausible way that code is getting un-#if 0'd, so drop it. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/drivers/acpi/numa.c | 21 --------------------- xen/include/xen/acpi.h | 9 --------- 2 files changed, 30 deletions(-) diff --git a/xen/drivers/acpi/numa.c b/xen/drivers/acpi/numa.c index bc6e888234..77945f8744 100644 --- a/xen/drivers/acpi/numa.c +++ b/xen/drivers/acpi/numa.c @@ -212,24 +212,3 @@ int __init acpi_numa_init(void) acpi_numa_arch_fixup(); return 0; } - -#if 0 -int acpi_get_pxm(acpi_handle h) -{ - unsigned long pxm; - acpi_status status; - acpi_handle handle; - acpi_handle phandle = h; - - do { - handle = phandle; - status = acpi_evaluate_integer(handle, "_PXM", NULL, &pxm); - if (ACPI_SUCCESS(status)) - return (int)pxm; - status = acpi_get_parent(handle, &phandle); - } while (ACPI_SUCCESS(status)); - return -1; -} - -EXPORT_SYMBOL(acpi_get_pxm); -#endif diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index 8ec9579172..6a2f5983fd 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -195,15 +195,6 @@ int acpi_set_pdc_bits(uint32_t acpi_id, XEN_GUEST_HANDLE(uint32)); #endif int arch_acpi_set_pdc_bits(u32 acpi_id, u32 *, u32 mask); -#ifdef CONFIG_ACPI_NUMA -int acpi_get_pxm(acpi_handle handle); -#else -static inline int acpi_get_pxm(acpi_handle handle) -{ - return 0; -} -#endif - void acpi_reboot(void); #ifdef CONFIG_INTEL_IOMMU -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 19 16:00:05 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jul 2023 16:00:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.565950.884589 (Exim 4.92) (envelope-from ) id 1qM9as-0007Le-JG; Wed, 19 Jul 2023 16:00:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 565950.884589; Wed, 19 Jul 2023 16:00:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM9as-0007LC-Ge; Wed, 19 Jul 2023 16:00:02 +0000 Received: by outflank-mailman (input) for mailman id 565950; Wed, 19 Jul 2023 16:00:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM9ar-0006pG-My for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 16:00:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM9ar-0006yi-Es for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 16:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qM9ar-0003WS-Dk for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 16:00: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=JL+393+gM6+KekVUz23I00sr8KxTLOFNkeaUTkefY24=; b=yFKHMwwU4ulsAN+M9mSYhTx0x6 35TIUqTCQB1rDQj6r1ordgCrCenPz5dsmkjpeDVOu8PKMZ6t14blAoL/b9JtR0XzCjSJKApOpECr0 FZwP2pUwDN1KVSyte1NIGZiU8RUO72D0VaR3PXB1hSsMemexpw92mPJVu4JtK1okBxj4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] tools: Remove the use of K&R functions Message-Id: Date: Wed, 19 Jul 2023 16:00:01 +0000 commit f5b0de706b415cd18537317116770d93af95dc63 Author: Andrew Cooper AuthorDate: Tue Jul 18 10:25:20 2023 +0200 Commit: Jan Beulich CommitDate: Tue Jul 18 10:25:20 2023 +0200 tools: Remove the use of K&R functions Clang-15 (as seen in the FreeBSD 14 tests) complains: xg_main.c:1248 error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] xg_init() ^ void The error message is a bit confusing but appears to new as part of -Wdeprecated-non-prototype which is part of supporting C2x which formally removes K&R syntax. Either way, fix the identified function. Signed-off-by: Andrew Cooper Acked-by: Anthony PERARD master commit: e2312e41f05c0f2e3b714710bd2551a3cd74cedd master date: 2023-02-17 11:01:54 +0000 --- tools/debugger/gdbsx/xg/xg_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/debugger/gdbsx/xg/xg_main.c b/tools/debugger/gdbsx/xg/xg_main.c index 4576c762af..580fe237b2 100644 --- a/tools/debugger/gdbsx/xg/xg_main.c +++ b/tools/debugger/gdbsx/xg/xg_main.c @@ -121,7 +121,7 @@ xgprt(const char *fn, const char *fmt, ...) * -1 failure, errno set. */ int -xg_init() +xg_init(void) { int flags, saved_errno; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Wed Jul 19 16:00:12 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Jul 2023 16:00:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.565951.884594 (Exim 4.92) (envelope-from ) id 1qM9b2-000836-Kt; Wed, 19 Jul 2023 16:00:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 565951.884594; Wed, 19 Jul 2023 16:00:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM9b2-00082y-I6; Wed, 19 Jul 2023 16:00:12 +0000 Received: by outflank-mailman (input) for mailman id 565951; Wed, 19 Jul 2023 16:00:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM9b1-00082q-J3 for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 16:00:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qM9b1-0007S4-Hs for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 16:00:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qM9b1-0003Xo-Gw for xen-changelog@lists.xenproject.org; Wed, 19 Jul 2023 16:00:11 +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=VLr92e2aAArlQvGGpWYJdnr9F+OUKyCmFkHyUdMl8uY=; b=roaajnjw9xsq8iZJpF0d9XMQam rRbYGyY5mg30l+hRQTGaZ7MsN5GKon3S2jW5A5SzkEc41morxLqJ9oop8UMLPFsZnpo48PoX0js7D rr4I73KYNBZHWGglgfxDMTc/iNgXE9yXcFaw2UCBd8BXhs4lJC3ZEk2I7HYVmT94eQrg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] update qemuu tag Message-Id: Date: Wed, 19 Jul 2023 16:00:11 +0000 commit 78f53920f406fe973bb70011ae36d6a53abf6942 Author: Jan Beulich AuthorDate: Tue Jul 18 10:26:07 2023 +0200 Commit: Jan Beulich CommitDate: Tue Jul 18 10:26:07 2023 +0200 update qemuu tag --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index 5b27248329..e3cf81f274 100644 --- a/Config.mk +++ b/Config.mk @@ -238,7 +238,7 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= 7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.16.4 +QEMU_UPSTREAM_REVISION ?= c02cb236b5e4a76cf74e641cc35a0e3ebd3e52f3 MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.16.4 SEABIOS_UPSTREAM_REVISION ?= rel-1.16.0 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Thu Jul 20 13:44:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jul 2023 13:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.566613.885650 (Exim 4.92) (envelope-from ) id 1qMTwq-00058J-1z; Thu, 20 Jul 2023 13:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 566613.885650; Thu, 20 Jul 2023 13:44: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 1qMTwp-00058B-VW; Thu, 20 Jul 2023 13:44:03 +0000 Received: by outflank-mailman (input) for mailman id 566613; Thu, 20 Jul 2023 13:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMTwo-000585-A4 for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMTwo-0005G3-0u for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMTwn-0005jC-Su for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13: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=o9HGE3ZvUgagjJpOKCrDnx7MS5voiRVDcCw6nMfSalI=; b=l0DAjzQ+8xCDxWwRMMm//q/M5e r/zAV4s9qfEI+y9PmoR1Zki+wMaKeoyrL8/axX1G+Gfn1PkqVksXeFbPiw2QK204/xsBX+VuVKNr1 v2F55lOX7iJ4sRMwxoB1phWRlvryOmG4aX3b4LEU619OpCOTKjEdUqFYgfHKig/D2WrA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: drop old (32-bit-only) MSR definitions Message-Id: Date: Thu, 20 Jul 2023 13:44:01 +0000 commit ee7867c6e43b4527c78daa61cd0eed516f1c1f51 Author: Jan Beulich AuthorDate: Tue Jul 18 12:37:57 2023 +0200 Commit: Jan Beulich CommitDate: Tue Jul 18 12:37:57 2023 +0200 x86: drop old (32-bit-only) MSR definitions Some of them aren't liked by Misra rule 7.2; rather than fixing them, drop the affected ones and a few more that aren't used (anymore). (Note that e.g. some MSR_K7_* are applicable on K8 and newer as well, so need retaining.) Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/include/asm/msr-index.h | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index 4f861c0bb4..2382fc8e11 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -334,7 +334,6 @@ #define MSR_K7_EVNTSEL3 0xc0010003 #define MSR_K7_PERFCTR3 0xc0010007 #define MSR_K8_TOP_MEM1 0xc001001a -#define MSR_K7_CLK_CTL 0xc001001b #define MSR_K8_TOP_MEM2 0xc001001d #define MSR_K8_HWCR 0xc0010015 @@ -427,46 +426,11 @@ #define MSR_AMD_PPIN_CTL 0xc00102f0 #define MSR_AMD_PPIN 0xc00102f1 -/* K6 MSRs */ -#define MSR_K6_EFER 0xc0000080 -#define MSR_K6_STAR 0xc0000081 -#define MSR_K6_WHCR 0xc0000082 -#define MSR_K6_UWCCR 0xc0000085 -#define MSR_K6_EPMR 0xc0000086 -#define MSR_K6_PSOR 0xc0000087 -#define MSR_K6_PFIR 0xc0000088 - -/* Centaur-Hauls/IDT defined MSRs. */ -#define MSR_IDT_FCR1 0x00000107 -#define MSR_IDT_FCR2 0x00000108 -#define MSR_IDT_FCR3 0x00000109 -#define MSR_IDT_FCR4 0x0000010a - -#define MSR_IDT_MCR0 0x00000110 -#define MSR_IDT_MCR1 0x00000111 -#define MSR_IDT_MCR2 0x00000112 -#define MSR_IDT_MCR3 0x00000113 -#define MSR_IDT_MCR4 0x00000114 -#define MSR_IDT_MCR5 0x00000115 -#define MSR_IDT_MCR6 0x00000116 -#define MSR_IDT_MCR7 0x00000117 -#define MSR_IDT_MCR_CTRL 0x00000120 - /* VIA Cyrix defined MSRs*/ #define MSR_VIA_FCR 0x00001107 -#define MSR_VIA_LONGHAUL 0x0000110a #define MSR_VIA_RNG 0x0000110b -#define MSR_VIA_BCR2 0x00001147 - -/* Transmeta defined MSRs */ -#define MSR_TMTA_LONGRUN_CTRL 0x80868010 -#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 -#define MSR_TMTA_LRTI_READOUT 0x80868018 -#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a /* Intel defined MSRs. */ -#define MSR_IA32_P5_MC_ADDR 0x00000000 -#define MSR_IA32_P5_MC_TYPE 0x00000001 #define MSR_IA32_TSC 0x00000010 #define MSR_IA32_PLATFORM_ID 0x00000017 #define MSR_IA32_EBL_CR_POWERON 0x0000002a -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 20 13:44:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jul 2023 13:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.566614.885653 (Exim 4.92) (envelope-from ) id 1qMTx0-0005A4-3D; Thu, 20 Jul 2023 13:44:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 566614.885653; Thu, 20 Jul 2023 13:44: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 1qMTx0-00059w-0l; Thu, 20 Jul 2023 13:44:14 +0000 Received: by outflank-mailman (input) for mailman id 566614; Thu, 20 Jul 2023 13:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMTwy-00059e-7r for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMTwy-0005GD-5W for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMTwy-0005jm-32 for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44: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=2QNXv2AJgAvj4NHM4WjYTiNgGWPKbEv5sPLU3cXCU9w=; b=IZ/rK9rfHmYFcBQULwp8G0fENq +bdWi5WPc+b3vKReXKb7ZhzdvRg0ND0soCXONyB3Ck87XMghfL8x4u7myvmNVo3KNVhLIb7gx5c7D FAqDQlitZ8XgDp4YgnwRyt/6LhOjc006B6naNGq8SPmXZBqlg/9Mv6pMMSO6SZUCgC04=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/HVM: adjust pIRQ calculation in hvm_inject_msi() Message-Id: Date: Thu, 20 Jul 2023 13:44:12 +0000 commit 62252f58d0c6dda82838e0d5c51c6ba63adddca6 Author: Jan Beulich AuthorDate: Tue Jul 18 12:39:00 2023 +0200 Commit: Jan Beulich CommitDate: Tue Jul 18 12:39:00 2023 +0200 x86/HVM: adjust pIRQ calculation in hvm_inject_msi() While the referenced commit came without any update to the public header (which doesn't clarify how the upper address bits are used), the intention looks to have been that bits 12..19 and 40..63 form the pIRQ. Negative values simply make no sense, and pirq_info() also generally wants invoking with an unsigned (and not just positive) value. Since the line was pointed out by Eclair, address Misra rule 7.2 at the same time, by adding the missing U suffix. Fixes: 88fccdd11ca0 ("xen: event channel remapping for emulated MSIs") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/hvm/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 1258371eb0..98cb28f366 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -383,7 +383,7 @@ int hvm_inject_msi(struct domain *d, uint64_t addr, uint32_t data) if ( !vector ) { - int pirq = ((addr >> 32) & 0xffffff00) | dest; + unsigned int pirq = ((addr >> 32) & 0xffffff00U) | dest; if ( pirq > 0 ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 20 13:44:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jul 2023 13:44:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.566615.885658 (Exim 4.92) (envelope-from ) id 1qMTxA-0005Cn-4w; Thu, 20 Jul 2023 13:44:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 566615.885658; Thu, 20 Jul 2023 13:44: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 1qMTxA-0005Cf-2B; Thu, 20 Jul 2023 13:44:24 +0000 Received: by outflank-mailman (input) for mailman id 566615; Thu, 20 Jul 2023 13:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMTx8-0005CQ-9M for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMTx8-0005GO-8c for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMTx8-0005kM-7g for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44: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=MBtTNdHF+9aQL9ESuKSZXV6SaA+KyHft9/GTLYnF4Ns=; b=yrljE8qypR8Evbffe3g1E1dB5h wLo78cULFHQDBdJ+eFjNpFb7SNMcjtUIbF17Zkm+GridLaZkfc6w4QaZ7MJYMKv9uoH2w2z0bQsmu ozKZDrdcnu6PyTY86WKjadWD5b0xMbq+tzjLlPrBztw+Zl4fIL23DOrUZ0aQkrg+6Vvk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/ACPI: correct off-by-1 in SGI MMCFG check Message-Id: Date: Thu, 20 Jul 2023 13:44:22 +0000 commit 168340ced86fcd020e6e44e0cf231cb31019bdf2 Author: Jan Beulich AuthorDate: Tue Jul 18 12:39:29 2023 +0200 Commit: Jan Beulich CommitDate: Tue Jul 18 12:39:29 2023 +0200 x86/ACPI: correct off-by-1 in SGI MMCFG check As supported by the printk() (deliberately made visible in context by also correcting a mis-indented return statement), "above 4GiB" is meant here. Avoid comparison with a constant to "escape" Misra rule 7.2 complaints. (Note however that even up-to-date Linux, which is where we "inherited" this code from, still uses the very same off-by-1 check.) Fixes: 94ea0622c5b8 ("x86-64/mmcfg: relax base address restriction") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/x86_64/acpi_mmcfg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_64/acpi_mmcfg.c b/xen/arch/x86/x86_64/acpi_mmcfg.c index 2159c68189..7b09046229 100644 --- a/xen/arch/x86/x86_64/acpi_mmcfg.c +++ b/xen/arch/x86/x86_64/acpi_mmcfg.c @@ -50,7 +50,7 @@ static int __init acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg, { int year; - if (cfg->address < 0xFFFFFFFF) + if (cfg->address == (uint32_t)cfg->address) return 0; if (!strncmp(mcfg->header.oem_id, "SGI", 3)) @@ -59,7 +59,7 @@ static int __init acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg, if (mcfg->header.revision >= 1 && dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL) && year >= 2010) - return 0; + return 0; printk(KERN_ERR "MCFG region for %04x:%02x-%02x at %#"PRIx64 " (above 4GB) ignored\n", -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 20 13:44:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jul 2023 13:44:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.566616.885662 (Exim 4.92) (envelope-from ) id 1qMTxK-0005Fu-6f; Thu, 20 Jul 2023 13:44:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 566616.885662; Thu, 20 Jul 2023 13:44: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 1qMTxK-0005Fn-3j; Thu, 20 Jul 2023 13:44:34 +0000 Received: by outflank-mailman (input) for mailman id 566616; Thu, 20 Jul 2023 13:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMTxI-0005FY-CG for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMTxI-0005GY-BR for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMTxI-0005ku-Ah for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44: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=JkxIWgITShcdDBzEgn9yLBTJt1Q+/Y53GeFZpjEp9Ko=; b=ELn6hZTSh9QlB0fa6RMyUNYpnu eW5P2cYTU7jO4oXNjTi8GvfPW88DTig/AcQAAuuITfW+sLGpchFNHtGsZib42xpQVlw3S7oYRYFJM f6dN+gf1aRriEWy4LEeu7WTviQaUG+rjSDd04qqT4MBb4YJXuwjIS5HGn7WmdYnwnqms=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] mm/pdx: Add comments throughout the codebase for pdx Message-Id: Date: Thu, 20 Jul 2023 13:44:32 +0000 commit 484e88e31d14624590f4889eeb6205898b26d9cc Author: Alejandro Vallejo AuthorDate: Tue Jul 18 12:40:02 2023 +0200 Commit: Jan Beulich CommitDate: Tue Jul 18 12:40:02 2023 +0200 mm/pdx: Add comments throughout the codebase for pdx Document the behaviour of the pdx machinery in Xen. Some logic is fairly opaque and hard to follow without it being documented anywhere. This explains the rationale behind compression and its relationship to frametable indexing and directmap management. While modifying the file: * Convert u64 -> uint64_t * Remove extern keyword from function prototypes No functional change. Signed-off-by: Alejandro Vallejo Reviewed-by: Jan Beulich --- xen/common/pdx.c | 59 +++++++++++++++++++-- xen/include/xen/mm.h | 11 ++++ xen/include/xen/pdx.h | 139 ++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 202 insertions(+), 7 deletions(-) diff --git a/xen/common/pdx.c b/xen/common/pdx.c index c91875fabe..ec64d3d2ef 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -20,13 +20,56 @@ #include #include -/* Parameters for PFN/MADDR compression. */ +/* + * Diagram to make sense of the following variables. The masks and shifts + * are done on mfn values in order to convert to/from pdx: + * + * pfn_hole_mask + * pfn_pdx_hole_shift (mask bitsize) + * | + * |---------| + * | | + * V V + * -------------------------- + * |HHHHHHH|000000000|LLLLLL| <--- mfn + * -------------------------- + * ^ ^ ^ ^ + * | | |------| + * | | | + * | | pfn_pdx_bottom_mask + * | | + * |-------| + * | + * pfn_top_mask + * + * ma_{top,va_bottom}_mask is simply a shifted pfn_{top,pdx_bottom}_mask, + * where ma_top_mask has zeroes shifted in while ma_va_bottom_mask has + * ones. + */ + +/** Maximum (non-inclusive) usable pdx */ unsigned long __read_mostly max_pdx; + +/** Mask for the lower non-compressible bits of an mfn */ unsigned long __read_mostly pfn_pdx_bottom_mask = ~0UL; + +/** Mask for the lower non-compressible bits of an maddr or vaddr */ unsigned long __read_mostly ma_va_bottom_mask = ~0UL; + +/** Mask for the higher non-compressible bits of an mfn */ unsigned long __read_mostly pfn_top_mask = 0; + +/** Mask for the higher non-compressible bits of an maddr or vaddr */ unsigned long __read_mostly ma_top_mask = 0; + +/** + * Mask for a pdx compression bit slice. + * + * Invariant: valid(mfn) implies (mfn & pfn_hole_mask) == 0 + */ unsigned long __read_mostly pfn_hole_mask = 0; + +/** Number of bits of the "compressible" bit slice of an mfn */ unsigned int __read_mostly pfn_pdx_hole_shift = 0; unsigned long __read_mostly pdx_group_valid[BITS_TO_LONGS( @@ -42,7 +85,7 @@ bool __mfn_valid(unsigned long mfn) } /* Sets all bits from the most-significant 1-bit down to the LSB */ -static u64 __init fill_mask(u64 mask) +static uint64_t __init fill_mask(uint64_t mask) { while (mask & (mask + 1)) mask |= mask + 1; @@ -57,8 +100,18 @@ uint64_t __init pdx_init_mask(uint64_t base_addr) (uint64_t)1 << (MAX_ORDER + PAGE_SHIFT)) - 1); } -u64 __init pdx_region_mask(u64 base, u64 len) +uint64_t __init pdx_region_mask(uint64_t base, uint64_t len) { + /* + * We say a bit "moves" in a range if there exist 2 addresses in that + * range that have that bit both set and cleared respectively. We want + * to create a mask of _all_ moving bits in this range. We do this by + * comparing the first and last addresses in the range, discarding the + * bits that remain the same (this is logically an XOR operation). The + * MSB of the resulting expression is the most significant moving bit + * in the range. Then it's a matter of setting every bit in lower + * positions in order to get the mask of moving bits. + */ return fill_mask(base ^ (base + len - 1)); } diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index b0dc3ba9c9..962ef216fd 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -31,6 +31,17 @@ * (i.e. all devices assigned to) a guest share a single DMA address space * and, by default, Xen will ensure dfn == pfn. * + * pdx: Page InDeX + * Indices into the frame table holding the per-page's book-keeping + * metadata. A compression scheme may be used, so there's a possibly non + * identity mapping between valid(mfn) <-> valid(pdx). See the comments + * in pdx.c for an in-depth explanation of that mapping. This may also + * have a knock-on effect on the directmap, as "compressed" pfns may not have + * corresponding mapped frames. + * + * maddr: Machine Address + * The physical address that corresponds to an mfn + * * WARNING: Some of these terms have changed over time while others have been * used inconsistently, meaning that a lot of existing code does not match the * definitions above. New code should use these terms as described here, and diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 9fcfb0ce52..de5439a5e5 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -1,6 +1,72 @@ #ifndef __XEN_PDX_H__ #define __XEN_PDX_H__ +/* + * PDX (Page inDeX) + * + * This file deals with optimisations pertaining to frame table and + * directmap indexing, A pdx is an index into the frame table, which + * typically also means an index into the directmap[1]. However, having an + * identity relationship between mfn and pdx could waste copious amounts of + * memory in empty frame table entries and page tables. There are some + * techniques to bring memory wastage down. + * + * [1] Some ports apply further modifications to a pdx before indexing the + * directmap. This doesn't change the fact that the same compression + * present in the frame table is also present in the directmap + * whenever said map is present. + * + * ## PDX grouping + * + * The frame table may have some sparsity even on systems where the memory + * banks are tightly packed. This is due to system quirks (like the PCI + * hole) which might introduce several GiB of unused page frame numbers + * that uselessly waste memory in the frame table. PDX grouping addresses + * this by keeping a bitmap of the ranges in the frame table containing + * invalid entries and not allocating backing memory for them. + * + * ## PDX compression + * + * This is a technique to avoid wasting memory on machines known to have + * split their machine address space in several big discontinuous and highly + * disjoint chunks. + * + * In its uncompressed form the frame table must have book-keeping metadata + * structures for every page between [0, max_mfn) (whether they are backed + * by RAM or not), and a similar condition exists for the direct map. We + * know some systems, however, that have some sparsity in their address + * space, leading to a lot of wastage in the form of unused frame table + * entries. + * + * This is where compression becomes useful. The idea is to note that if + * you have several big chunks of memory sufficiently far apart you can + * ignore the middle part of the address because it will always contain + * zeroes. + * + * i.e: + * Consider 2 regions of memory. One starts at 0 while the other starts + * at offset 2^off_h. Furthermore, let's assume both regions are smaller + * than 2^off_l. This means that all addresses between [2^off_l, 2^off_h) + * are invalid and we can assume them to be zero on all valid addresses. + * + * off_h off_l + * | | + * V V + * -------------------------- + * |HHHHHHH|000000000|LLLLLL| <--- mfn + * -------------------------- + * ^ | + * | | (de)compression by adding/removing "useless" zeroes + * | V + * --------------- + * |HHHHHHHLLLLLL| <--- pdx + * --------------- + * + * This scheme also holds for multiple regions, where HHHHHHH acts as + * the region identifier and LLLLLL fully contains the span of every + * region involved. + */ + #ifdef CONFIG_HAS_PDX extern unsigned long max_pdx; @@ -13,22 +79,78 @@ extern unsigned long pfn_top_mask, ma_top_mask; (sizeof(*frame_table) & -sizeof(*frame_table))) extern unsigned long pdx_group_valid[]; -extern uint64_t pdx_init_mask(u64 base_addr); -extern u64 pdx_region_mask(u64 base, u64 len); +/** + * Calculates a mask covering "moving" bits of all addresses of a region + * + * The i-th bit of the mask must be set if there's 2 different addresses + * in the region that have different j-th bits. where j >= i. + * + * e.g: + * base=0x1B00000000 + * len+base=0x1B00042000 + * + * ought to return 0x000007FFFF, which implies that every bit position + * with a zero in the mask remains unchanged in every address of the + * region. + * + * @param base Base address of the region + * @param len Size in octets of the region + * @return Mask of moving bits at the bottom of all the region addresses + */ +uint64_t pdx_region_mask(uint64_t base, uint64_t len); -extern void set_pdx_range(unsigned long smfn, unsigned long emfn); +/** + * Creates the mask to start from when calculating non-compressible bits + * + * This function is intimately related to pdx_region_mask(), and together + * they are meant to calculate the mask of non-compressible bits given the + * current memory map. + * + * @param base_addr Address of the first maddr in the system + * @return An integer of the form 2^n - 1 + */ +uint64_t pdx_init_mask(uint64_t base_addr); + +/** + * Mark [smfn, emfn) as accesible in the frame table + * + * @param smfn Start mfn + * @param emfn End mfn + */ +void set_pdx_range(unsigned long smfn, unsigned long emfn); #define page_to_pdx(pg) ((pg) - frame_table) #define pdx_to_page(pdx) gcc11_wrap(frame_table + (pdx)) +/** + * Invoked to determine if an mfn has an associated valid frame table entry + * + * In order for it to be legal it must pass bounds, grouping and + * compression sanity checks. + * + * @param mfn To-be-checked mfn + * @return True iff all checks pass + */ bool __mfn_valid(unsigned long mfn); +/** + * Map pfn to its corresponding pdx + * + * @param pfn Frame number + * @return Obtained pdx after compressing the pfn + */ static inline unsigned long pfn_to_pdx(unsigned long pfn) { return (pfn & pfn_pdx_bottom_mask) | ((pfn & pfn_top_mask) >> pfn_pdx_hole_shift); } +/** + * Map a pdx to its corresponding pfn + * + * @param pdx Page index + * @return Obtained pfn after decompressing the pdx + */ static inline unsigned long pdx_to_pfn(unsigned long pdx) { return (pdx & pfn_pdx_bottom_mask) | @@ -38,7 +160,16 @@ static inline unsigned long pdx_to_pfn(unsigned long pdx) #define mfn_to_pdx(mfn) pfn_to_pdx(mfn_x(mfn)) #define pdx_to_mfn(pdx) _mfn(pdx_to_pfn(pdx)) -extern void pfn_pdx_hole_setup(unsigned long); +/** + * Initializes global variables with information about the compressible + * range of the current memory regions. + * + * @param mask This mask is the biggest pdx_mask of every region in the + * system ORed with all base addresses of every region in the + * system. This results in a mask where every zero in a bit + * position marks a potentially compressible bit. + */ +void pfn_pdx_hole_setup(unsigned long mask); #endif /* HAS_PDX */ #endif /* __XEN_PDX_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 20 13:44:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jul 2023 13:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.566617.885665 (Exim 4.92) (envelope-from ) id 1qMTxU-0005IG-87; Thu, 20 Jul 2023 13:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 566617.885665; Thu, 20 Jul 2023 13:44: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 1qMTxU-0005I8-5L; Thu, 20 Jul 2023 13:44:44 +0000 Received: by outflank-mailman (input) for mailman id 566617; Thu, 20 Jul 2023 13:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMTxS-0005Hr-FV for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMTxS-0005Gl-EM for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMTxS-0005lJ-DP for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44:42 +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=mRMhHQCZ/3QCuFqjOvdR0HJYmnxrCLDD3WHs5spAWfQ=; b=K/y5j/SjEpvk/4FvYEU3dLS7YO lnrnX4MK6jXyTsrKujWjO9kGcIQfiMBVX4RaUhnd1o5Zzqiks7JlnW9V/jCe1L25jNUprAbX+tFP4 p1AUDhfJaLWRGt1WlD39hGmKiqutxYo/2BRsQD7MbYZjb1p4N8/ea0KrXyoRw+J6UuME=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] mm/pdx: Mark pdx hole description globals readonly after boot Message-Id: Date: Thu, 20 Jul 2023 13:44:42 +0000 commit 408a191b749b3d1620ad7ec9c614bab5924530c2 Author: Alejandro Vallejo AuthorDate: Tue Jul 18 12:40:53 2023 +0200 Commit: Jan Beulich CommitDate: Tue Jul 18 12:40:53 2023 +0200 mm/pdx: Mark pdx hole description globals readonly after boot They define where the compressible area of valid mfns is, and all of them are populated on boot (with the exception of max_pdx, that's updated on memory hotplug). No functional change. Signed-off-by: Alejandro Vallejo Reviewed-by: Jan Beulich --- xen/common/pdx.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/xen/common/pdx.c b/xen/common/pdx.c index ec64d3d2ef..99d4a90a50 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -47,30 +47,33 @@ * ones. */ -/** Maximum (non-inclusive) usable pdx */ +/** + * Maximum (non-inclusive) usable pdx. Must be + * modifiable after init due to memory hotplug + */ unsigned long __read_mostly max_pdx; /** Mask for the lower non-compressible bits of an mfn */ -unsigned long __read_mostly pfn_pdx_bottom_mask = ~0UL; +unsigned long __ro_after_init pfn_pdx_bottom_mask = ~0UL; /** Mask for the lower non-compressible bits of an maddr or vaddr */ -unsigned long __read_mostly ma_va_bottom_mask = ~0UL; +unsigned long __ro_after_init ma_va_bottom_mask = ~0UL; /** Mask for the higher non-compressible bits of an mfn */ -unsigned long __read_mostly pfn_top_mask = 0; +unsigned long __ro_after_init pfn_top_mask = 0; /** Mask for the higher non-compressible bits of an maddr or vaddr */ -unsigned long __read_mostly ma_top_mask = 0; +unsigned long __ro_after_init ma_top_mask = 0; /** * Mask for a pdx compression bit slice. * * Invariant: valid(mfn) implies (mfn & pfn_hole_mask) == 0 */ -unsigned long __read_mostly pfn_hole_mask = 0; +unsigned long __ro_after_init pfn_hole_mask = 0; /** Number of bits of the "compressible" bit slice of an mfn */ -unsigned int __read_mostly pfn_pdx_hole_shift = 0; +unsigned int __ro_after_init pfn_pdx_hole_shift = 0; unsigned long __read_mostly pdx_group_valid[BITS_TO_LONGS( (FRAMETABLE_NR + PDX_GROUP_COUNT - 1) / PDX_GROUP_COUNT)] = { [0] = 1 }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 20 13:44:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jul 2023 13:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.566618.885670 (Exim 4.92) (envelope-from ) id 1qMTxe-0005LO-Az; Thu, 20 Jul 2023 13:44:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 566618.885670; Thu, 20 Jul 2023 13:44: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 1qMTxe-0005LE-8B; Thu, 20 Jul 2023 13:44:54 +0000 Received: by outflank-mailman (input) for mailman id 566618; Thu, 20 Jul 2023 13:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMTxc-0005L4-Hz for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMTxc-0005HA-HC for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMTxc-0005lp-GO for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:44:52 +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=SWAsArWslTC2inGvBhSJwmXpWeH3aiEVzpvM8mNxHss=; b=AEaHxgc5uLdbhSrA7N2AfuAulV KbW7MlFU4Ea2rJeW4c35xYNQDJGWCvAJcJgOrtXZKWrlR7eEFIzwkayzOgAXPDAV8vB8cEzc3qFtS K5ja2/XZguOEgPJMUnuPqxJHAPBqq62N0WgMA/lTcghRWw0oEB9ytYsptG4EpwmgXylU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] common: move a few macros out of xen/lib.h Message-Id: Date: Thu, 20 Jul 2023 13:44:52 +0000 commit 8f324b966471698d245001e2365bb71707b07277 Author: Jan Beulich AuthorDate: Wed Jul 19 10:20:38 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 19 10:20:38 2023 +0200 common: move a few macros out of xen/lib.h Introduce xen/macros.h for this purpose. For now xen/lib.h simply includes xen/macro.h, until consumers can be suitable cleaned up. Signed-off-by: Jan Beulich Reviewed-by: Oleksii Kurochko Reviewed-by: Shawn Anastasio --- xen/include/xen/lib.h | 21 +-------------------- xen/include/xen/macros.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index a8958ed57b..dae2a1f085 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -1,26 +1,7 @@ #ifndef __LIB_H__ #define __LIB_H__ -#define ROUNDUP(x, a) (((x) + (a) - 1) & ~((a) - 1)) - -#define IS_ALIGNED(val, align) (!((val) & ((align) - 1))) - -#define DIV_ROUND(n, d) (((n) + (d) / 2) / (d)) -#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) - -#define MASK_EXTR(v, m) (((v) & (m)) / ((m) & -(m))) -#define MASK_INSR(v, m) (((v) * ((m) & -(m))) & (m)) - -#define count_args_(dot, a1, a2, a3, a4, a5, a6, a7, a8, x, ...) x -#define count_args(args...) \ - count_args_(., ## args, 8, 7, 6, 5, 4, 3, 2, 1, 0) - -/* Indirect macros required for expanded argument pasting. */ -#define PASTE_(a, b) a ## b -#define PASTE(a, b) PASTE_(a, b) - -#define __STR(...) #__VA_ARGS__ -#define STR(...) __STR(__VA_ARGS__) +#include #ifndef __ASSEMBLY__ diff --git a/xen/include/xen/macros.h b/xen/include/xen/macros.h new file mode 100644 index 0000000000..7b92d34504 --- /dev/null +++ b/xen/include/xen/macros.h @@ -0,0 +1,34 @@ +#ifndef __MACROS_H__ +#define __MACROS_H__ + +#define ROUNDUP(x, a) (((x) + (a) - 1) & ~((a) - 1)) + +#define IS_ALIGNED(val, align) (!((val) & ((align) - 1))) + +#define DIV_ROUND(n, d) (((n) + (d) / 2) / (d)) +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) + +#define MASK_EXTR(v, m) (((v) & (m)) / ((m) & -(m))) +#define MASK_INSR(v, m) (((v) * ((m) & -(m))) & (m)) + +#define count_args_(dot, a1, a2, a3, a4, a5, a6, a7, a8, x, ...) x +#define count_args(args...) \ + count_args_(., ## args, 8, 7, 6, 5, 4, 3, 2, 1, 0) + +/* Indirect macros required for expanded argument pasting. */ +#define PASTE_(a, b) a ## b +#define PASTE(a, b) PASTE_(a, b) + +#define __STR(...) #__VA_ARGS__ +#define STR(...) __STR(__VA_ARGS__) + +#endif /* __MACROS_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 Thu Jul 20 13:45:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jul 2023 13:45:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.566619.885673 (Exim 4.92) (envelope-from ) id 1qMTxo-0005PH-CM; Thu, 20 Jul 2023 13:45:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 566619.885673; Thu, 20 Jul 2023 13:45: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 1qMTxo-0005PA-9n; Thu, 20 Jul 2023 13:45:04 +0000 Received: by outflank-mailman (input) for mailman id 566619; Thu, 20 Jul 2023 13:45:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMTxm-0005P0-L6 for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMTxm-0005Hm-KM for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMTxm-0005mV-JM for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:45: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=+0+mCrSz8ns8VA5r7azrlRPtTJY2umQR2jg7tUY+fIg=; b=OseV4mzH9tnzh3Uz3GZargQyuU coA3pa2AC5BEZv7CKkJuy6p1Ol3gn23s1SK5hz68Rkw1DnYK7ZEE8eastqZrLS/IhtivxuEinoC21 FQdOypEISDk7eaeJO5qpeFfwUT3LbOopHWAgXz9Tc8puLCDucEYkWa8xJZLJf+Ldqo+0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: add SPDX tag to config.h Message-Id: Date: Thu, 20 Jul 2023 13:45:02 +0000 commit 8bf52f9d838473215dee76639ce11a66c98e2d8c Author: Oleksii Kurochko AuthorDate: Wed Jul 19 10:22:09 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 19 10:22:09 2023 +0200 xen/riscv: add SPDX tag to config.h Signed-off-by: Oleksii Kurochko Reviewed-by: Alistair Francis --- xen/arch/riscv/include/asm/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/riscv/include/asm/config.h b/xen/arch/riscv/include/asm/config.h index 38862df0b8..fa90ae0898 100644 --- a/xen/arch/riscv/include/asm/config.h +++ b/xen/arch/riscv/include/asm/config.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + #ifndef __RISCV_CONFIG_H__ #define __RISCV_CONFIG_H__ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 20 13:45:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jul 2023 13:45:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.566620.885678 (Exim 4.92) (envelope-from ) id 1qMTxy-0005Rd-EM; Thu, 20 Jul 2023 13:45:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 566620.885678; Thu, 20 Jul 2023 13:45: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 1qMTxy-0005RV-BQ; Thu, 20 Jul 2023 13:45:14 +0000 Received: by outflank-mailman (input) for mailman id 566620; Thu, 20 Jul 2023 13:45:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMTxw-0005RB-OJ for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:45:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMTxw-0005Hw-NZ for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:45:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMTxw-0005mu-Ma for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 13:45: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=O+AtQbvWXkHTg4jfOEORTz1F8WimMz/lsEjsqXgf6xo=; b=mnEPzsdwalxro5ypXH37nMi5Mc R0clgir2HOS9rQj/Z15ckH6XqnOKSxkzAn7s9yJYkJxWD79XEcKn+6Qp9nrfQERSL9O1VM4vDbzGw s1d4oeGJXKe7uUnfqb879ZjLdLsBkDwvhG2Va4Zo0N9168+KFPbspUPk5wyGUz2JImzs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: fix early boot output Message-Id: Date: Thu, 20 Jul 2023 13:45:12 +0000 commit b1c16800e52743d9afd9af62c810f03af16dd942 Author: Jan Beulich AuthorDate: Wed Jul 19 10:22:56 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jul 19 10:22:56 2023 +0200 x86: fix early boot output Loading the VGA base address involves sym_esi(), i.e. %esi still needs to hold the relocation base address. Therefore the address of the message to output cannot be "passed" in %esi. Put the message offset in %ecx instead, adding it into %esi _after_ its last use as base address. Fixes: b28044226e1c ("x86: make Xen early boot code relocatable") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/boot/head.S | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index 1eb829ab41..d8ac0f0494 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -146,17 +146,17 @@ efi_platform: early_error: /* Here to improve the disassembly. */ .Lbad_cpu: - add $sym_offs(.Lbad_cpu_msg), %esi + mov $sym_offs(.Lbad_cpu_msg), %ecx jmp .Lget_vtb .Lnot_multiboot: - add $sym_offs(.Lbad_ldr_msg), %esi + mov $sym_offs(.Lbad_ldr_msg), %ecx jmp .Lget_vtb .Lnot_aligned: - add $sym_offs(.Lbag_alg_msg), %esi + mov $sym_offs(.Lbag_alg_msg), %ecx jmp .Lget_vtb #ifdef CONFIG_REQUIRE_NX .Lno_nx: - add $sym_offs(.Lno_nx_msg), %esi + mov $sym_offs(.Lno_nx_msg), %ecx jmp .Lget_vtb #endif .Lmb2_no_st: @@ -164,11 +164,11 @@ early_error: /* Here to improve the disassembly. */ * Here we are on EFI platform. vga_text_buffer was zapped earlier * because there is pretty good chance that VGA is unavailable. */ - add $sym_offs(.Lbad_ldr_nst), %esi + mov $sym_offs(.Lbad_ldr_nst), %ecx jmp .Lget_vtb .Lmb2_no_ih: /* Ditto. */ - add $sym_offs(.Lbad_ldr_nih), %esi + mov $sym_offs(.Lbad_ldr_nih), %ecx jmp .Lget_vtb .Lmb2_no_bs: /* @@ -176,7 +176,7 @@ early_error: /* Here to improve the disassembly. */ * via start label. Then reliable vga_text_buffer zap is impossible * in Multiboot2 scanning loop and we have to zero %edi below. */ - add $sym_offs(.Lbad_ldr_nbs), %esi + mov $sym_offs(.Lbad_ldr_nbs), %ecx xor %edi,%edi # No VGA text buffer jmp .Lprint_err .Lmb2_efi_ia_32: @@ -184,12 +184,15 @@ early_error: /* Here to improve the disassembly. */ * Here we are on EFI IA-32 platform. Then reliable vga_text_buffer zap is * impossible in Multiboot2 scanning loop and we have to zero %edi below. */ - add $sym_offs(.Lbad_efi_msg), %esi + mov $sym_offs(.Lbad_efi_msg), %ecx xor %edi,%edi # No VGA text buffer jmp .Lprint_err .Lget_vtb: mov sym_esi(vga_text_buffer), %edi .Lprint_err: + add %ecx, %esi # Add string offset to relocation base. + # NOTE: No further use of sym_esi() till the end of the "function"! +1: lodsb test %al,%al # Terminate on '\0' sentinel je .Lhalt @@ -202,11 +205,11 @@ early_error: /* Here to improve the disassembly. */ mov %bl,%al out %al,%dx # Send a character over the serial line test %edi,%edi # Is the VGA text buffer available? - jz .Lprint_err + jz 1b stosb # Write a character to the VGA text buffer mov $7,%al stosb # Write an attribute to the VGA text buffer - jmp .Lprint_err + jmp 1b .Lhalt: hlt jmp .Lhalt -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jul 20 20:22:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jul 2023 20:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.566722.885931 (Exim 4.92) (envelope-from ) id 1qMa9z-0005ik-IX; Thu, 20 Jul 2023 20:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 566722.885931; Thu, 20 Jul 2023 20:22: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 1qMa9z-0005ib-F8; Thu, 20 Jul 2023 20:22:03 +0000 Received: by outflank-mailman (input) for mailman id 566722; Thu, 20 Jul 2023 20:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMa9y-0005iT-PP for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 20:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMa9y-0007Bq-41 for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 20:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMa9x-0004rC-Vx for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 20:22: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=zr55+ABYDywVeWIJBfSFKlv+pWqzzTTWidYEx1tHu+w=; b=2REunCL8PVFjqH5A4jPAg5BpGs 45qAoLoDCgMPFpTalMVZme9A8r4IOfyUXlXxV+HCYAekR7Zy01pTuD+sJOvzttkqTzYTMQelVfX+I bK+6n+cw215W9WkXlgD0hnOYGN/At1OX+D1FkDPQDVmtFEhzhPJwOY5ndVYveGqutWJ0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [qemu-xen stable-4.17] ebpf: replace deprecated bpf_program__set_socket_filter Message-Id: Date: Thu, 20 Jul 2023 20:22:01 +0000 commit 27ca28d169038bf7fe70341c4cbb8fddd3791e8b Author: Haochen Tong AuthorDate: Sat May 28 03:06:58 2022 +0800 Commit: Anthony PERARD CommitDate: Thu Oct 20 14:36:16 2022 +0100 ebpf: replace deprecated bpf_program__set_socket_filter bpf_program__set_ functions have been deprecated since libbpf 0.8. Replace with the equivalent bpf_program__set_type call to avoid a deprecation warning. Signed-off-by: Haochen Tong Reviewed-by: Zhang Chen Signed-off-by: Jason Wang (cherry picked from commit a495eba03c31c96d6a0817b13598ce2219326691) --- ebpf/ebpf_rss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebpf/ebpf_rss.c b/ebpf/ebpf_rss.c index 118c68da83..cee658c158 100644 --- a/ebpf/ebpf_rss.c +++ b/ebpf/ebpf_rss.c @@ -49,7 +49,7 @@ bool ebpf_rss_load(struct EBPFRSSContext *ctx) goto error; } - bpf_program__set_socket_filter(rss_bpf_ctx->progs.tun_rss_steering_prog); + bpf_program__set_type(rss_bpf_ctx->progs.tun_rss_steering_prog, BPF_PROG_TYPE_SOCKET_FILTER); if (rss_bpf__load(rss_bpf_ctx)) { trace_ebpf_error("eBPF RSS", "can not load RSS program"); -- generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Thu Jul 20 20:22:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jul 2023 20:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.566723.885934 (Exim 4.92) (envelope-from ) id 1qMaA9-0005kN-JD; Thu, 20 Jul 2023 20:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 566723.885934; Thu, 20 Jul 2023 20:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMaA9-0005kF-GX; Thu, 20 Jul 2023 20:22:13 +0000 Received: by outflank-mailman (input) for mailman id 566723; Thu, 20 Jul 2023 20:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMaA8-0005k5-8A for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 20:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMaA8-0007Bu-7L for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 20:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMaA8-0004rl-6F for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 20:22: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=E/Jlr9y1sRVyKAXoP+YfiASEAQ53Zne55IAoosi+9t8=; b=Yd1srI8s6wX96VHmWwhpjKhACn sug8qmdefPQXyCnfaHTIdkGoX7CrwzzFTriP36ZiNtXGabLIHXIYLU2DdqJ/bqi3oagtVq8w3Xh5p z6DeFYb5tLGZgb6DVuTVBmaTS+R91pX1uQFXzpicWOiQDXi0nW+9fpADwKUa9FH8VeOk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [qemu-xen stable-4.17] rtl8139: Remove unused variable Message-Id: Date: Thu, 20 Jul 2023 20:22:12 +0000 commit 7385a130d841aeaf39e8773af869eb54cc7d6a7f Author: Miroslav Rezanina AuthorDate: Wed Nov 9 10:57:11 2022 -0500 Commit: Anthony PERARD CommitDate: Mon Jul 17 11:06:47 2023 +0100 rtl8139: Remove unused variable Variable send_count used in rtl8139_cplus_transmit_one function is only incremented but never read. This causes 'Unused but set variable' warning on Clang 15.0.1 compiler. Removing the variable to prevent the warning. Signed-off-by: Miroslav Rezanina Reviewed-by: Thomas Huth Message-Id: <15a32dd06c492216cbf27cd3ddcbe1e9afb8d8f5.1668009030.git.mrezanin@redhat.com> Signed-off-by: Thomas Huth (cherry picked from commit 7d7238c72b983cff5064734349d2d45be9c6282c) --- hw/net/rtl8139.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 6b65823b4b..e6643e3c9d 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2156,7 +2156,6 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) ip_data_len, saved_size - ETH_HLEN, large_send_mss); int tcp_send_offset = 0; - int send_count = 0; /* maximum IP header length is 60 bytes */ uint8_t saved_ip_header[60]; @@ -2261,7 +2260,6 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) /* add transferred count to TCP sequence number */ stl_be_p(&p_tcp_hdr->th_seq, chunk_size + ldl_be_p(&p_tcp_hdr->th_seq)); - ++send_count; } /* Stop sending this frame */ -- generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Thu Jul 20 20:22:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jul 2023 20:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.566724.885938 (Exim 4.92) (envelope-from ) id 1qMaAJ-0005nL-Kc; Thu, 20 Jul 2023 20:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 566724.885938; Thu, 20 Jul 2023 20:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMaAJ-0005nE-Hw; Thu, 20 Jul 2023 20:22:23 +0000 Received: by outflank-mailman (input) for mailman id 566724; Thu, 20 Jul 2023 20:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMaAI-0005n2-B3 for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 20:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMaAI-0007C6-AE for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 20:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMaAI-0004sJ-9R for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 20:22: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=nmiqNTvQgLywgi+bekRCtdEsr7mXccaPNoq8HCX2zng=; b=frstiXwQmiqJU/hCo4btpJ7ELX wdp18LYSk8M2usIMwUlSS2Nkf8ytRmG49eiKpiLKH3wkHBEo8IFphqgNduTWBTzvuIinfqoON3AvG Hia58amx+EEJ1K73VBpnjRzpyF9F/iXm3aD2XcHL78aGkJgagYJcupdzEvXGbuyUfPyI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [qemu-xen stable-4.17] tulip: Remove unused variable Message-Id: Date: Thu, 20 Jul 2023 20:22:22 +0000 commit 83b8b039db0efefd851dc62160728a69b36e09aa Author: Miroslav Rezanina AuthorDate: Wed Nov 9 10:57:12 2022 -0500 Commit: Anthony PERARD CommitDate: Mon Jul 17 11:34:45 2023 +0100 tulip: Remove unused variable Variable n used in tulip_idblock_crc function is only incremented but never read. This causes 'Unused but set variable' warning on Clang 15.0.1 compiler. Removing the variable to prevent the warning. Signed-off-by: Miroslav Rezanina Reviewed-by: Thomas Huth Message-Id: <02e1560d115c208df32236df8916fed98429fda1.1668009030.git.mrezanin@redhat.com> Signed-off-by: Thomas Huth (cherry picked from commit 6083dcad80743718620a3f8a72fb76ea8b7c28ca) --- hw/net/tulip.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/net/tulip.c b/hw/net/tulip.c index d5b6cc5ee6..9b5a5d33bd 100644 --- a/hw/net/tulip.c +++ b/hw/net/tulip.c @@ -870,11 +870,10 @@ static const MemoryRegionOps tulip_ops = { static void tulip_idblock_crc(TULIPState *s, uint16_t *srom) { - int word, n; + int word; int bit; unsigned char bitval, crc; const int len = 9; - n = 0; crc = -1; for (word = 0; word < len; word++) { @@ -887,7 +886,6 @@ static void tulip_idblock_crc(TULIPState *s, uint16_t *srom) srom[len - 1] = (srom[len - 1] & 0xff00) | (unsigned short)crc; break; } - n++; bitval = ((srom[word] >> bit) & 1) ^ ((crc >> 7) & 1); crc = crc << 1; if (bitval == 1) { -- generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Thu Jul 20 20:22:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Jul 2023 20:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.566725.885943 (Exim 4.92) (envelope-from ) id 1qMaAT-0005qi-Md; Thu, 20 Jul 2023 20:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 566725.885943; Thu, 20 Jul 2023 20:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMaAT-0005qa-Ji; Thu, 20 Jul 2023 20:22:33 +0000 Received: by outflank-mailman (input) for mailman id 566725; Thu, 20 Jul 2023 20:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMaAS-0005qK-Ee for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 20:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMaAS-0007CD-Dr for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 20:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMaAS-0004sm-CQ for xen-changelog@lists.xenproject.org; Thu, 20 Jul 2023 20:22: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=lMZfIyYymjasu741NgIYHH8w2JXklb7+MIQs73uchCM=; b=TXg14tCIaW1+P04uoOe7aEBLEk HGUgW4oRuT11f+DdSnhAVhqg4BlYJ0LoKRSofQzwUCcrNrmGbnqPueibuXdzsZiAd6oss+XKnXBA7 eh8+jyD/0vTcaGuc+LFsP7X9sYND5H7jUHRnL9Hdvrcgz81oBBkiH+NagLE9ku/Zfkt0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [qemu-xen stable-4.17] qemu-img: remove unused variable Message-Id: Date: Thu, 20 Jul 2023 20:22:32 +0000 commit eeaede60ffb1760c06850cae562d104e4f98c859 Author: Miroslav Rezanina AuthorDate: Wed Nov 9 10:57:13 2022 -0500 Commit: Anthony PERARD CommitDate: Mon Jul 17 11:39:50 2023 +0100 qemu-img: remove unused variable Variable block_count used in img_dd function is only incremented but never read. This causes 'Unused but set variable' warning on Clang 15.0.1 compiler. Removing the variable to prevent the warning. Signed-off-by: Miroslav Rezanina Reviewed-by: Thomas Huth Message-Id: Signed-off-by: Thomas Huth (cherry picked from commit 0f48c47c679bc29fceb3a67283ee3b78175524bf) --- qemu-img.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 1caddfb23a..0240177af7 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -4914,7 +4914,7 @@ static int img_dd(int argc, char **argv) const char *out_fmt = "raw"; const char *fmt = NULL; int64_t size = 0; - int64_t block_count = 0, out_pos, in_pos; + int64_t out_pos, in_pos; bool force_share = false; struct DdInfo dd = { .flags = 0, @@ -5114,7 +5114,7 @@ static int img_dd(int argc, char **argv) in.buf = g_new(uint8_t, in.bsz); - for (out_pos = 0; in_pos < size; block_count++) { + for (out_pos = 0; in_pos < size; ) { int in_ret, out_ret; if (in_pos + in.bsz > size) { -- generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Fri Jul 21 10:44:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jul 2023 10:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.567475.886566 (Exim 4.92) (envelope-from ) id 1qMncA-000163-Kk; Fri, 21 Jul 2023 10:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 567475.886566; Fri, 21 Jul 2023 10:44:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMncA-00015v-Hf; Fri, 21 Jul 2023 10:44:02 +0000 Received: by outflank-mailman (input) for mailman id 567475; Fri, 21 Jul 2023 10:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMnc9-00015p-MI for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 10:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMnc9-00029a-Da for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 10:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMnc9-0000xM-Cf for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 10: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=62Eon8DH9eqz15U+LlqmADNACGh6nD1f5TtxauZ3d5A=; b=ZXLtxe07TAK0mvHXB4RqEpqqeZ ofMAKflhe0hEFGVh+6bu+Citm5gFw+C/Xf+2fEj7hnA6TUCB4YG36T3zEtxjwa5ShfcI7sraY8+K/ NBjVNQ/RiMohZIKcD7LCnTgjmrf0LQTWT6bddyWwS9pHSNghSjnbUrHXkXgCP8k7pBds=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/misra: diff-report.py: Fix UnifiedFormatParser change line registration Message-Id: Date: Fri, 21 Jul 2023 10:44:01 +0000 commit 43247f4f23db516a47f078042ddefc1d0f7fa496 Author: Luca Fancellu AuthorDate: Thu Jul 20 10:03:20 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jul 20 10:03:20 2023 +0200 xen/misra: diff-report.py: Fix UnifiedFormatParser change line registration Fix the line number on the registration of a 'remove' change type when consecutive 'remove' changes are registered. Currently the algorithm registers consecutive 'remove' changes at the same line it encounter the first one, 'add' changes type are not affected by the bug. Fixes: 1d7c45f895b6 ("xen/misra: diff-report.py: add report patching feature") Signed-off-by: Luca Fancellu Acked-by: Stefano Stabellini --- xen/scripts/xen_analysis/diff_tool/unified_format_parser.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xen/scripts/xen_analysis/diff_tool/unified_format_parser.py b/xen/scripts/xen_analysis/diff_tool/unified_format_parser.py index 8b3fbc318d..6c506caeaf 100644 --- a/xen/scripts/xen_analysis/diff_tool/unified_format_parser.py +++ b/xen/scripts/xen_analysis/diff_tool/unified_format_parser.py @@ -144,6 +144,7 @@ class UnifiedFormatParser(object): file_linenum = 0 hunk_a_linemax = 0 hunk_b_linemax = 0 + consecutive_remove = 0 diff_elem = None parse_state = ParserState.FIND_DIFF_HEADER ChangeMode = ChangeSet.ChangeMode @@ -210,14 +211,18 @@ class UnifiedFormatParser(object): if (hunk_b_linemax > 0) and line.startswith("+"): diff_elem.add_change(file_linenum, ChangeType.ADD) hunk_b_linemax -= 1 + consecutive_remove = 0 elif (hunk_a_linemax > 0) and line.startswith("-"): - diff_elem.add_change(file_linenum, ChangeType.REMOVE) + diff_elem.add_change(file_linenum + consecutive_remove, + ChangeType.REMOVE) hunk_a_linemax -= 1 file_linenum -= 1 + consecutive_remove += 1 elif ((hunk_a_linemax + hunk_b_linemax) > 0) and \ line.startswith(" "): hunk_a_linemax -= 1 if (hunk_a_linemax > 0) else 0 hunk_b_linemax -= 1 if (hunk_b_linemax > 0) else 0 + consecutive_remove = 0 if (hunk_a_linemax + hunk_b_linemax) <= 0: parse_state = ParserState.FIND_HUNK_OR_DIFF_HEADER -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 21 10:44:12 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jul 2023 10:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.567476.886569 (Exim 4.92) (envelope-from ) id 1qMncK-00018x-OG; Fri, 21 Jul 2023 10:44:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 567476.886569; Fri, 21 Jul 2023 10:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMncK-00018q-LX; Fri, 21 Jul 2023 10:44:12 +0000 Received: by outflank-mailman (input) for mailman id 567476; Fri, 21 Jul 2023 10:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMncJ-00018g-Je for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 10:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMncJ-0002AA-IO for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 10:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMncJ-0000xv-Fc for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 10:44:11 +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=qYrqo/LNqmDHq03JKt/vngz+QsxE7MhisJs8NFuPt6Y=; b=Fa+aW4apmMOUzrLBIkV28JAn59 LUzi0sXQ6Edr3dbbhf7DRcVjM24QcDdwjSUdnVJCq1f4ekMdlMQlY2vM1RTDnKBYrQ24mghyMHmoE XLgvZZEl5H3QT7ZtvM4dIqjYg7c0bfvtAyOtP78duFrQPFn0rG30hnl8Ogw7D7kbHcT0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/misra: diff-report.py: fix function invocation Message-Id: Date: Fri, 21 Jul 2023 10:44:11 +0000 commit 55c48d27bde9f0a798c0f7995aa8a155c55b6f11 Author: Luca Fancellu AuthorDate: Thu Jul 20 10:03:36 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jul 20 10:03:36 2023 +0200 xen/misra: diff-report.py: fix function invocation Fix the invocation of invoke_command() that takes an optional parameter for the exception type, but in the code the error message template was passed instead, so fix it passing a new exception type. Fixes: 1d7c45f895b6 ("xen/misra: diff-report.py: add report patching feature") Signed-off-by: Luca Fancellu Acked-by: Stefano Stabellini --- xen/scripts/diff-report.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/scripts/diff-report.py b/xen/scripts/diff-report.py index 636f98f5ee..a1fe6bc2fc 100755 --- a/xen/scripts/diff-report.py +++ b/xen/scripts/diff-report.py @@ -13,6 +13,10 @@ from xen_analysis.settings import repo_dir from xen_analysis.utils import invoke_command +class DiffReportError(Exception): + pass + + def log_info(text, end='\n'): # type: (str, str) -> None global args @@ -97,7 +101,7 @@ def main(argv): git_diff = invoke_command( "git --git-dir={}/.git diff -C -C {}..{}" .format(repo_dir, args.baseline_rev, args.report_rev), - True, "Error occured invoking:\n{}\n\n{}" + True, DiffReportError, "Error occured invoking:\n{}\n\n{}" ) diff_source = git_diff.splitlines(keepends=True) if diff_source: @@ -105,7 +109,7 @@ def main(argv): diffs = UnifiedFormatParser(diff_source) debug.debug_print_parsed_diff(diffs) log_info(" [OK]") - except (ReportError, UnifiedFormatParseError) as e: + except (DiffReportError, ReportError, UnifiedFormatParseError) as e: print("ERROR: {}".format(e)) sys.exit(1) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 21 10:44:22 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jul 2023 10:44:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.567478.886574 (Exim 4.92) (envelope-from ) id 1qMncU-0001C6-Pd; Fri, 21 Jul 2023 10:44:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 567478.886574; Fri, 21 Jul 2023 10:44:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMncU-0001Bz-N5; Fri, 21 Jul 2023 10:44:22 +0000 Received: by outflank-mailman (input) for mailman id 567478; Fri, 21 Jul 2023 10:44:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMncT-0001Bi-Nt for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 10:44:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMncT-0002AM-La for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 10:44:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMncT-0000yQ-KR for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 10:44:21 +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=nwyoiRsXimcvjWGpfKQSWIykpJAuGWpONvYMSVHFjsw=; b=CPVXvVd5MCPdUTmwXVyaNnlw4z +V77YyyF8/ApRpW0rypk8D1lRVlhRRVdEtb2W1xm13iyTedsnEhdEIByHa9f4Acag7x8tqFV754Z2 1G+jEOv3lZtEV4qgnha5knaHTVBdkqk6bRhXirl/agAlMKA3/Ov3aJcNZgaVcnVl4N7k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misc: fix document typo Message-Id: Date: Fri, 21 Jul 2023 10:44:21 +0000 commit 8301187452f7fcc25cff2148a02c2dbd76300f00 Author: Yang Xu AuthorDate: Thu Jul 20 10:03:53 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jul 20 10:03:53 2023 +0200 docs/misc: fix document typo Fix document typo for more accurate meaning Signed-off-by: Yang Xu Reviewed-by: Stefano Stabellini --- docs/misc/xen-makefiles/makefiles.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/misc/xen-makefiles/makefiles.rst b/docs/misc/xen-makefiles/makefiles.rst index 04bc72601c..bc2f932fbc 100644 --- a/docs/misc/xen-makefiles/makefiles.rst +++ b/docs/misc/xen-makefiles/makefiles.rst @@ -68,7 +68,7 @@ Descending down in directories It is good practice to use a `CONFIG_` variable when assigning directory names. This allows the build system to totally skip the directory if the - corresponding `CONFIG_` option is 'y'. + corresponding `CONFIG_` option is not set to 'y'. Compilation flags ----------------- -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 21 10:44:32 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jul 2023 10:44:32 +0000 Received: from list by lists.xenproject.org with outflank-mailman.567480.886578 (Exim 4.92) (envelope-from ) id 1qMnce-0001F5-RN; Fri, 21 Jul 2023 10:44:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 567480.886578; Fri, 21 Jul 2023 10:44:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMnce-0001Ex-Oc; Fri, 21 Jul 2023 10:44:32 +0000 Received: by outflank-mailman (input) for mailman id 567480; Fri, 21 Jul 2023 10:44:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMncd-0001Ef-RL for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 10:44:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMncd-0002AT-On for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 10:44:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMncd-0000zk-Nd for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 10:44:31 +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=kHc9DHu/y46JA9X32WYpeSXLvP3wWYGC6K45xAVbYFQ=; b=AxpcqM/5aFSsXeJxaa/CRO+kCj 0V+WoJS6eQ+zzZbTKL+fhv+L1FtcRkaOuPL/JQpnmahxKMCskiWMMfsIvGhXBYZV1m0kpy6tEi4aT pqDq/Szvo0lUIoaWt9L0vupqTfBQjXJfKwXiV3Cd/MaM0RQEyqnjLlI4lvHDCbvQUZoE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: change parameter name of hvm_monitor_msr() declaration Message-Id: Date: Fri, 21 Jul 2023 10:44:31 +0000 commit 1046c3900b8c9217875775a99f5b0573f97f6f98 Author: Federico Serafini AuthorDate: Thu Jul 20 10:04:17 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jul 20 10:04:17 2023 +0200 x86: change parameter name of hvm_monitor_msr() declaration Change the parameter name of hvm_monitor_msr() declaration from 'value' to 'new_value' to match the corresponding defintion. This fixes a violation of MISRA C:2012 Rule 8.3 ("All declarations of an object or function shall use the same names and type qualifiers"). Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini Acked-by: Tamas K Lengyel --- xen/arch/x86/include/asm/hvm/monitor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/hvm/monitor.h b/xen/arch/x86/include/asm/hvm/monitor.h index 5276b0af08..02021be47b 100644 --- a/xen/arch/x86/include/asm/hvm/monitor.h +++ b/xen/arch/x86/include/asm/hvm/monitor.h @@ -25,7 +25,7 @@ bool hvm_monitor_cr(unsigned int index, unsigned long value, unsigned long old); #define hvm_monitor_crX(cr, new, old) \ hvm_monitor_cr(VM_EVENT_X86_##cr, new, old) -bool hvm_monitor_msr(unsigned int msr, uint64_t value, uint64_t old_value); +bool hvm_monitor_msr(unsigned int msr, uint64_t new_value, uint64_t old_value); void hvm_monitor_descriptor_access(uint64_t exit_info, uint64_t vmx_exit_qualification, uint8_t descriptor, bool is_write); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 21 10:44:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jul 2023 10:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.567483.886582 (Exim 4.92) (envelope-from ) id 1qMnco-0001Hk-Sx; Fri, 21 Jul 2023 10:44:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 567483.886582; Fri, 21 Jul 2023 10:44:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMnco-0001Hf-Q5; Fri, 21 Jul 2023 10:44:42 +0000 Received: by outflank-mailman (input) for mailman id 567483; Fri, 21 Jul 2023 10:44:41 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMncn-0001HS-Sq for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 10:44:41 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMncn-0002Ac-S7 for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 10:44:41 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMncn-000109-Qu for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 10:44:41 +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=hk0RmuX9vVS4niwW4wqwDxgfT7JMcz0id4hY54qE8bU=; b=JzD5rS2Jn8N7fsVk+1MQnTTpal rmkOLkQQBDgMIsyeifpmSWxF7kHzVTjGX2hIFHcVWMl5CbuXpCV7+sU5G6IS+kozPHRzFzzC5rcKa f7KyJbkWJy2z5WG/PukBkQMYkE5XSeETFIVwFGOJ6q7dlxzsU+MFo3TJPGc+f2jSi8Mg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/HVM/emul: address violations of MISRA C:2012 Rules 8.2 and 8.3 Message-Id: Date: Fri, 21 Jul 2023 10:44:41 +0000 commit 4bf014c6f7d7cc9a9e017cef0eb5ff4bf27526e9 Author: Federico Serafini AuthorDate: Thu Jul 20 10:04:36 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jul 20 10:04:36 2023 +0200 x86/HVM/emul: address violations of MISRA C:2012 Rules 8.2 and 8.3 Give a name to unnamed parameters thus addressing violations of MISRA C:2012 Rule 8.2 ("Function types shall be in prototype form with named parameters"). Keep consistency between parameter names used in function declarations and names used in the corresponding function definitions thus addressing violations of MISRA C:2012 Rule 8.3 ("All declarations of an object or function shall use the same names and type qualifiers"). Signed-off-by: Federico Serafini Acked-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/arch/x86/include/asm/hvm/emulate.h | 8 ++++---- xen/arch/x86/include/asm/hvm/io.h | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/include/asm/hvm/emulate.h b/xen/arch/x86/include/asm/hvm/emulate.h index d8ba2df4e4..398d0db078 100644 --- a/xen/arch/x86/include/asm/hvm/emulate.h +++ b/xen/arch/x86/include/asm/hvm/emulate.h @@ -121,12 +121,12 @@ static inline void hvmemul_cache_destroy(struct vcpu *v) { XFREE(v->arch.hvm.hvm_io.cache); } -bool hvmemul_read_cache(const struct vcpu *, paddr_t gpa, +bool hvmemul_read_cache(const struct vcpu *v, paddr_t gpa, void *buffer, unsigned int size); -void hvmemul_write_cache(const struct vcpu *, paddr_t gpa, +void hvmemul_write_cache(const struct vcpu *v, paddr_t gpa, const void *buffer, unsigned int size); -unsigned int hvmemul_cache_disable(struct vcpu *); -void hvmemul_cache_restore(struct vcpu *, unsigned int token); +unsigned int hvmemul_cache_disable(struct vcpu *v); +void hvmemul_cache_restore(struct vcpu *v, unsigned int token); /* For use in ASSERT()s only: */ static inline bool hvmemul_cache_disabled(struct vcpu *v) { diff --git a/xen/arch/x86/include/asm/hvm/io.h b/xen/arch/x86/include/asm/hvm/io.h index 8df33eb6cc..e5225e75ef 100644 --- a/xen/arch/x86/include/asm/hvm/io.h +++ b/xen/arch/x86/include/asm/hvm/io.h @@ -46,17 +46,17 @@ struct hvm_io_handler { uint8_t type; }; -typedef int (*hvm_io_read_t)(const struct hvm_io_handler *, +typedef int (*hvm_io_read_t)(const struct hvm_io_handler *handler, uint64_t addr, uint32_t size, uint64_t *data); -typedef int (*hvm_io_write_t)(const struct hvm_io_handler *, +typedef int (*hvm_io_write_t)(const struct hvm_io_handler *handler, uint64_t addr, uint32_t size, uint64_t data); -typedef bool_t (*hvm_io_accept_t)(const struct hvm_io_handler *, +typedef bool_t (*hvm_io_accept_t)(const struct hvm_io_handler *handler, const ioreq_t *p); -typedef void (*hvm_io_complete_t)(const struct hvm_io_handler *); +typedef void (*hvm_io_complete_t)(const struct hvm_io_handler *handler); struct hvm_io_ops { hvm_io_accept_t accept; @@ -87,11 +87,11 @@ bool relocate_portio_handler( void send_timeoffset_req(unsigned long timeoff); bool handle_mmio_with_translation(unsigned long gla, unsigned long gpfn, - struct npfec); + struct npfec access); bool handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); -void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq); -void msix_write_completion(struct vcpu *); +void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi); +void msix_write_completion(struct vcpu *v); #ifdef CONFIG_HVM void msixtbl_init(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jul 21 21:22:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jul 2023 21:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.567704.887097 (Exim 4.92) (envelope-from ) id 1qMxZa-00005p-Df; Fri, 21 Jul 2023 21:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 567704.887097; Fri, 21 Jul 2023 21:22:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMxZa-00005i-BC; Fri, 21 Jul 2023 21:22:02 +0000 Received: by outflank-mailman (input) for mailman id 567704; Fri, 21 Jul 2023 21:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMxZZ-00005b-Q5 for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 21:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMxZZ-0001Or-PG for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 21:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMxZZ-0000Yz-NK for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 21:22: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=Tf6wuyVxH0NtRuyFlLtsjqgMRTElhNgYJos8Uk6qzME=; b=iSyqmFUk1wXiY/KN2UOorsAnaC J8kd/CYg48VOBzB9eM6mCmw2AtgIrW13ExPQ4c6Bag0ppGk5fgVGyB+A5QPpsO9+nL+WRRS6X65kA ZQbqTMZae56NrWRdVqs+TULOrE4m7VY4B4TQQBb4wFc1Y4ZbywNTdLHAReXNuzExp5sc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] tools: Remove the use of K&R functions Message-Id: Date: Fri, 21 Jul 2023 21:22:01 +0000 commit ec4cf867d1fe6e0613b2504ea636199316b464a9 Author: Andrew Cooper AuthorDate: Fri Jul 21 08:23:19 2023 +0200 Commit: Jan Beulich CommitDate: Fri Jul 21 08:23:19 2023 +0200 tools: Remove the use of K&R functions Clang-15 (as seen in the FreeBSD 14 tests) complains: xg_main.c:1248 error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] xg_init() ^ void The error message is a bit confusing but appears to new as part of -Wdeprecated-non-prototype which is part of supporting C2x which formally removes K&R syntax. Either way, fix the identified function. Signed-off-by: Andrew Cooper Acked-by: Anthony PERARD master commit: e2312e41f05c0f2e3b714710bd2551a3cd74cedd master date: 2023-02-17 11:01:54 +0000 --- tools/debugger/gdbsx/xg/xg_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/debugger/gdbsx/xg/xg_main.c b/tools/debugger/gdbsx/xg/xg_main.c index 4576c762af..580fe237b2 100644 --- a/tools/debugger/gdbsx/xg/xg_main.c +++ b/tools/debugger/gdbsx/xg/xg_main.c @@ -121,7 +121,7 @@ xgprt(const char *fn, const char *fmt, ...) * -1 failure, errno set. */ int -xg_init() +xg_init(void) { int flags, saved_errno; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Fri Jul 21 21:22:12 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Jul 2023 21:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.567705.887101 (Exim 4.92) (envelope-from ) id 1qMxZk-00007h-FA; Fri, 21 Jul 2023 21:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 567705.887101; Fri, 21 Jul 2023 21:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMxZk-00007a-Cg; Fri, 21 Jul 2023 21:22:12 +0000 Received: by outflank-mailman (input) for mailman id 567705; Fri, 21 Jul 2023 21:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMxZj-00007T-T3 for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 21:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qMxZj-0001Oy-SD for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 21:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qMxZj-0000ZS-RH for xen-changelog@lists.xenproject.org; Fri, 21 Jul 2023 21:22:11 +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=d2ou40Eh2drbw+U/9U6jhYT7QD2xhs6wPjIck6K6ML8=; b=R8/jkKmgyEXVByv9+MDbTPuUXn 4i/WM2VimXurJV2WfofILwxseoxUYFN0AQ/nvNIcQLWy93GF9zWQyWD0/NSokhxX0N704HxRVtgNS jwAdX25YzDav3oAor1U34q2/GOe1hxaOHKmLwCKOBImiQtr2HlZJR1wnj9hXNX1bdZ4w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] update qemuu tag Message-Id: Date: Fri, 21 Jul 2023 21:22:11 +0000 commit 69611e5b3c43f52ce130b89ac4c6bb1c2aeb25d3 Author: Jan Beulich AuthorDate: Fri Jul 21 08:23:52 2023 +0200 Commit: Jan Beulich CommitDate: Fri Jul 21 08:23:52 2023 +0200 update qemuu tag --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index b9b999af45..d474fc6242 100644 --- a/Config.mk +++ b/Config.mk @@ -229,7 +229,7 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= 7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.17.1 +QEMU_UPSTREAM_REVISION ?= eeaede60ffb1760c06850cae562d104e4f98c859 MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.17.1 SEABIOS_UPSTREAM_REVISION ?= rel-1.16.0 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat Jul 22 10:44:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Jul 2023 10:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.567913.887388 (Exim 4.92) (envelope-from ) id 1qNA5j-0000La-18; Sat, 22 Jul 2023 10:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 567913.887388; Sat, 22 Jul 2023 10:44:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNA5i-0000LQ-UD; Sat, 22 Jul 2023 10:44:02 +0000 Received: by outflank-mailman (input) for mailman id 567913; Sat, 22 Jul 2023 10:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNA5h-0000Kl-Nu for xen-changelog@lists.xenproject.org; Sat, 22 Jul 2023 10:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNA5h-0004WQ-N4 for xen-changelog@lists.xenproject.org; Sat, 22 Jul 2023 10:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNA5h-0007Up-Lf for xen-changelog@lists.xenproject.org; Sat, 22 Jul 2023 10: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=gal/Iyu10U8xqjRxJWLGWyaj8S6HP1g+OwBDvn+eFGw=; b=27iuN5bz5FfRcJTg2OA7ZicF+P bSbGRrFFwmmv+dTzpO8xsvBNbOmX7YPE4wPPnqVitUHPgKGPwYRePVgvABHyTmJSzMjhOGGJR+fcj jgYvGjBWKTSIdA/K4txy3UPoBEPfr1Rt4iCSVczSc6Zwkgb2DgFfDU6WvVumQUTwPuP8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [qemu-xen stable-4.17] stubs: update replay-tools to match replay.h types Message-Id: Date: Sat, 22 Jul 2023 10:44:01 +0000 commit df4fece4be5a8acf4fa9588b58497c6544bd326e Author: Claudio Fontana AuthorDate: Mon Jul 4 09:58:32 2022 +0200 Commit: Anthony PERARD CommitDate: Fri Jul 21 11:02:04 2023 +0100 stubs: update replay-tools to match replay.h types detected with GCC 13 [-Werror=enum-int-mismatch] Solves Issue #1096. Signed-off-by: Claudio Fontana Cc: Pavel Dovgalyuk Reviewed-by: Thomas Huth Message-Id: <20220704075832.31537-1-cfontana@suse.de> Signed-off-by: Paolo Bonzini (cherry picked from commit bb7e03cb5677b570c5966c7dd946f9ed7acd11bc) --- stubs/replay-tools.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stubs/replay-tools.c b/stubs/replay-tools.c index 43296b3d4e..f2e72bb225 100644 --- a/stubs/replay-tools.c +++ b/stubs/replay-tools.c @@ -7,13 +7,14 @@ bool replay_events_enabled(void) return false; } -int64_t replay_save_clock(unsigned int kind, int64_t clock, int64_t raw_icount) +int64_t replay_save_clock(ReplayClockKind kind, + int64_t clock, int64_t raw_icount) { abort(); return 0; } -int64_t replay_read_clock(unsigned int kind, int64_t raw_icount) +int64_t replay_read_clock(ReplayClockKind kind, int64_t raw_icount) { abort(); return 0; @@ -48,11 +49,11 @@ void replay_mutex_unlock(void) { } -void replay_register_char_driver(Chardev *chr) +void replay_register_char_driver(struct Chardev *chr) { } -void replay_chr_be_write(Chardev *s, uint8_t *buf, int len) +void replay_chr_be_write(struct Chardev *s, uint8_t *buf, int len) { abort(); } -- generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat Jul 22 10:44:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Jul 2023 10:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.567914.887391 (Exim 4.92) (envelope-from ) id 1qNA5t-0000R6-2i; Sat, 22 Jul 2023 10:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 567914.887391; Sat, 22 Jul 2023 10:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNA5s-0000Qy-WF; Sat, 22 Jul 2023 10:44:13 +0000 Received: by outflank-mailman (input) for mailman id 567914; Sat, 22 Jul 2023 10:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNA5r-0000PZ-RY for xen-changelog@lists.xenproject.org; Sat, 22 Jul 2023 10:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNA5r-0004WX-Qi for xen-changelog@lists.xenproject.org; Sat, 22 Jul 2023 10:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNA5r-0007VM-PC for xen-changelog@lists.xenproject.org; Sat, 22 Jul 2023 10:44:11 +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=FEogvsLiYyD5gomk7c2Fvrk4GP0/vlv7doX/99l+Pzs=; b=bwqhhXlHtnNGp9fsEpxnLsZcHP 9arjYcai6PaSs+2VhNSJJl0uVaPcq4jyB1u5hc8hXpTgVR1S+t7NeoRsQcYTChYRbanQL36Hz22pf dRKu7O0EK8xQ6jQzn2AM+lXKmzkWQn9aO2rKe+TCno7D9ASGNiaZ9dg/XbmQTb4Z3aYQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [qemu-xen stable-4.17] replay: Fix declaration of replay_read_next_clock Message-Id: Date: Sat, 22 Jul 2023 10:44:11 +0000 commit 97e8df50760afab883f7d58a0c8dcde30aa28e0f Author: Richard Henderson AuthorDate: Mon Nov 28 17:05:47 2022 -0800 Commit: Anthony PERARD CommitDate: Fri Jul 21 11:08:48 2023 +0100 replay: Fix declaration of replay_read_next_clock Fixes the build with gcc 13: replay/replay-time.c:34:6: error: conflicting types for \ 'replay_read_next_clock' due to enum/integer mismatch; \ have 'void(ReplayClockKind)' [-Werror=enum-int-mismatch] 34 | void replay_read_next_clock(ReplayClockKind kind) | ^~~~~~~~~~~~~~~~~~~~~~ In file included from ../qemu/replay/replay-time.c:14: replay/replay-internal.h:139:6: note: previous declaration of \ 'replay_read_next_clock' with type 'void(unsigned int)' 139 | void replay_read_next_clock(unsigned int kind); | ^~~~~~~~~~~~~~~~~~~~~~ Fixes: 8eda206e090 ("replay: recording and replaying clock ticks") Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Wilfred Mallawa Reviewed-by: Pavel Dovgalyuk Signed-off-by: Stefan Hajnoczi Message-Id: <20221129010547.284051-1-richard.henderson@linaro.org> (cherry picked from commit fb72e779ebe3a51f55b16a49738380ee3e54c7d5) --- replay/replay-internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 97649ed8d7..b4238226f4 100644 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -141,7 +141,7 @@ bool replay_next_event_is(int event); /*! Reads next clock value from the file. If clock kind read from the file is different from the parameter, the value is not used. */ -void replay_read_next_clock(unsigned int kind); +void replay_read_next_clock(ReplayClockKind kind); /* Asynchronous events queue */ -- generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat Jul 22 10:44:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Jul 2023 10:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.567916.887396 (Exim 4.92) (envelope-from ) id 1qNA63-0000cs-5t; Sat, 22 Jul 2023 10:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 567916.887396; Sat, 22 Jul 2023 10:44:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNA63-0000cl-2u; Sat, 22 Jul 2023 10:44:23 +0000 Received: by outflank-mailman (input) for mailman id 567916; Sat, 22 Jul 2023 10:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNA61-0000cQ-Vk for xen-changelog@lists.xenproject.org; Sat, 22 Jul 2023 10:44:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNA61-0004Wk-UW for xen-changelog@lists.xenproject.org; Sat, 22 Jul 2023 10:44:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNA61-0007Vr-T8 for xen-changelog@lists.xenproject.org; Sat, 22 Jul 2023 10:44:21 +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=3W0LbWwYRO/WSFJhesfooRc2l74RTm36tlUZA0p4xpA=; b=poC+kB5WsFalB0s6YVDaLXUEY9 pfwtb+XyUv+HoO0C0woMzOMp4fVZ51eH4K0IDW9yQ9/QDnvafX5IWBBiB1V7ynqAjqAkYiAzxWzvr Nk9mHF1wWILrXLcKowFvHrR109gozD9Z891nOrzSGwz7cq7Gt5WvOPBMmQ2OxlU7mTmg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [qemu-xen stable-4.17] softfloat: Fix declaration of partsN_compare Message-Id: Date: Sat, 22 Jul 2023 10:44:21 +0000 commit 69344f6be7bf94607c6ff0de79b81bac836e5f15 Author: Richard Henderson AuthorDate: Fri Apr 1 07:22:38 2022 -0600 Commit: Anthony PERARD CommitDate: Fri Jul 21 11:20:26 2023 +0100 softfloat: Fix declaration of partsN_compare The declaration used 'int', while the definition used 'FloatRelation'. This should have resulted in a compiler error, but mysteriously didn't. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Message-Id: <20220401132240.79730-2-richard.henderson@linaro.org> (cherry picked from commit b880867f15623b2e82b0fa6b149753d7c18c615c) --- fpu/softfloat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 7f524d4377..7e62fcf414 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -874,10 +874,10 @@ static FloatParts128 *parts128_minmax(FloatParts128 *a, FloatParts128 *b, #define parts_minmax(A, B, S, F) \ PARTS_GENERIC_64_128(minmax, A)(A, B, S, F) -static int parts64_compare(FloatParts64 *a, FloatParts64 *b, - float_status *s, bool q); -static int parts128_compare(FloatParts128 *a, FloatParts128 *b, - float_status *s, bool q); +static FloatRelation parts64_compare(FloatParts64 *a, FloatParts64 *b, + float_status *s, bool q); +static FloatRelation parts128_compare(FloatParts128 *a, FloatParts128 *b, + float_status *s, bool q); #define parts_compare(A, B, S, Q) \ PARTS_GENERIC_64_128(compare, A)(A, B, S, Q) -- generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat Jul 22 10:44:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Jul 2023 10:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.567918.887400 (Exim 4.92) (envelope-from ) id 1qNA6D-0000hZ-77; Sat, 22 Jul 2023 10:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 567918.887400; Sat, 22 Jul 2023 10:44:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNA6D-0000hS-4e; Sat, 22 Jul 2023 10:44:33 +0000 Received: by outflank-mailman (input) for mailman id 567918; Sat, 22 Jul 2023 10:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNA6C-0000hB-3a for xen-changelog@lists.xenproject.org; Sat, 22 Jul 2023 10:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNA6C-0004XA-1I for xen-changelog@lists.xenproject.org; Sat, 22 Jul 2023 10:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNA6C-0007WG-0I for xen-changelog@lists.xenproject.org; Sat, 22 Jul 2023 10:44: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=FgtIYOmLX+l/Z27pyiYSTdJ24P+oFJfz8ThZI6D+fh4=; b=1o0QPyEKUyJTEPiDl14f9lBqzy 7AnyuHRBKK5QSZ4K4KSmOAA4Rmk1rt1fjcjfEtKofFBV6UlV/rpYTID/X4BwRx7wBMLrT/0keZ1nl N25KHW95gpQe7hcgSZb7ZpW6l869Sgwt5sTAYliEzQA6CxpnceWAtdyZYQd08kYucVMA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [qemu-xen stable-4.17] async: Suppress GCC13 false positive in aio_bh_poll() Message-Id: Date: Sat, 22 Jul 2023 10:44:32 +0000 commit ffb451126550b22b43b62fb8731a0d78e3376c03 Author: Cédric Le Goater AuthorDate: Thu Apr 20 22:29:39 2023 +0200 Commit: Anthony PERARD CommitDate: Fri Jul 21 11:57:33 2023 +0100 async: Suppress GCC13 false positive in aio_bh_poll() GCC13 reports an error : ../util/async.c: In function ‘aio_bh_poll’: include/qemu/queue.h:303:22: error: storing the address of local variable ‘slice’ in ‘*ctx.bh_slice_list.sqh_last’ [-Werror=dangling-pointer=] 303 | (head)->sqh_last = &(elm)->field.sqe_next; \ | ~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~ ../util/async.c:169:5: note: in expansion of macro ‘QSIMPLEQ_INSERT_TAIL’ 169 | QSIMPLEQ_INSERT_TAIL(&ctx->bh_slice_list, &slice, next); | ^~~~~~~~~~~~~~~~~~~~ ../util/async.c:161:17: note: ‘slice’ declared here 161 | BHListSlice slice; | ^~~~~ ../util/async.c:161:17: note: ‘ctx’ declared here But the local variable 'slice' is removed from the global context list in following loop of the same routine. Add a pragma to silent GCC. Cc: Stefan Hajnoczi Cc: Paolo Bonzini Cc: Daniel P. Berrangé Signed-off-by: Cédric Le Goater Reviewed-by: Daniel Henrique Barboza Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Hajnoczi Reviewed-by: Thomas Huth Tested-by: Daniel Henrique Barboza Message-Id: <20230420202939.1982044-1-clg@kaod.org> Signed-off-by: Paolo Bonzini (cherry picked from commit d66ba6dc1cce914673bd8a89fca30a7715ea70d1) --- util/async.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/util/async.c b/util/async.c index 2ea1172f3e..0b3bf38e9d 100644 --- a/util/async.c +++ b/util/async.c @@ -150,7 +150,21 @@ int aio_bh_poll(AioContext *ctx) int ret = 0; QSLIST_MOVE_ATOMIC(&slice.bh_list, &ctx->bh_list); + + /* + * GCC13 [-Werror=dangling-pointer=] complains that the local variable + * 'slice' is being stored in the global 'ctx->bh_slice_list' but the + * list is emptied before this function returns. + */ +#if !defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" +#pragma GCC diagnostic ignored "-Wdangling-pointer=" +#endif QSIMPLEQ_INSERT_TAIL(&ctx->bh_slice_list, &slice, next); +#if !defined(__clang__) +#pragma GCC diagnostic pop +#endif while ((s = QSIMPLEQ_FIRST(&ctx->bh_slice_list))) { QEMUBH *bh; -- generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sun Jul 23 09:00:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Jul 2023 09:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.568164.887574 (Exim 4.92) (envelope-from ) id 1qNUwf-0003eb-5v; Sun, 23 Jul 2023 09:00:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 568164.887574; Sun, 23 Jul 2023 09:00: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 1qNUwf-0003dx-1v; Sun, 23 Jul 2023 09:00:05 +0000 Received: by outflank-mailman (input) for mailman id 568164; Sun, 23 Jul 2023 09:00:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNUwe-0003Se-5W for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 09:00:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNUwd-0002OO-SX for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 09:00:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNUwd-0005ec-RN for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 09:00: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=J/fGcuL17hZKLt75whHJ1Qva/E6XHqwHh9alqBX0aKI=; b=CLsEB7B6IqotjYPDULyxe9YPQc lFl8PiLcXZz0b23R/I1n6BVoh65cXCV8YTxWaiqsVAvaQXupsBLQIJJGBgj0l7uHhUD96Y5ZwvAoS mE4jfDyqn3XyKz85xqMheEG08Pv1+7mmPYnfMtXYe9RT4FrxY7aidhIOOmgPbLFpclAg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [qemu-xen master] Merge tag 'v7.2.4' into staging Message-Id: Date: Sun, 23 Jul 2023 09:00:03 +0000 === This changeset includes merge from high-traffic branch === Commits on that branch are not reported individually. commit 698407ef8395521a9a5b15ed9cd0b7e1fc258ded Merge: 8c51cd970509b97d8378d175646ec32889828158 681858ea14242d3b509b77e0179f7f63c99032bb Author: Anthony PERARD AuthorDate: Fri Jul 21 14:57:10 2023 +0100 Commit: Anthony PERARD CommitDate: Fri Jul 21 14:57:10 2023 +0100 Merge tag 'v7.2.4' into staging v7.2.4 release .gitlab-ci.d/buildtest.yml | 6 +- VERSION | 2 +- accel/tcg/cputlb.c | 2 +- block/curl.c | 44 ++++- block/io.c | 3 + block/iscsi.c | 1 + block/monitor/block-hmp-cmds.c | 10 +- block/qcow2-bitmap.c | 5 +- block/vhdx-log.c | 2 +- blockdev.c | 18 +- chardev/char-socket.c | 1 + configure | 2 +- docs/about/deprecated.rst | 4 +- docs/system/multi-process.rst | 2 +- fpu/softfloat.c | 2 +- fsdev/virtfs-proxy-helper.c | 27 ++- hw/9pfs/9p-util.h | 38 ++++ hw/9pfs/trace-events | 6 + hw/9pfs/xen-9p-backend.c | 35 ++-- hw/acpi/cpu_hotplug.c | 3 + hw/acpi/pcihp.c | 10 ++ hw/arm/aspeed.c | 42 ++--- hw/arm/boot.c | 40 ++--- hw/arm/raspi.c | 64 +++---- hw/arm/xlnx-zynqmp.c | 2 +- hw/core/machine.c | 11 ++ hw/display/virtio-gpu.c | 27 ++- hw/dma/xilinx_axidma.c | 11 +- hw/hppa/machine.c | 15 +- hw/i386/intel_iommu.c | 15 ++ hw/i386/microvm.c | 2 +- hw/i386/pc.c | 4 +- hw/i386/pc_piix.c | 3 +- hw/i386/pc_q35.c | 2 - hw/i386/x86.c | 88 ++------- hw/intc/allwinner-a10-pic.c | 7 +- hw/misc/aspeed_hace.c | 2 +- hw/net/allwinner-sun8i-emac.c | 22 ++- hw/net/e1000.c | 9 +- hw/net/e1000e_core.c | 5 +- hw/net/e1000x_common.c | 5 +- hw/net/msf2-emac.c | 18 +- hw/net/rtl8139.c | 3 + hw/net/virtio-net.c | 1 - hw/net/vmxnet3.c | 2 +- hw/nvme/ctrl.c | 35 +++- hw/nvram/fw_cfg.c | 12 +- hw/ppc/ppc.c | 2 + hw/ppc/prep.c | 4 +- hw/rdma/vmw/pvrdma_cmd.c | 6 + hw/remote/trace-events | 4 +- hw/riscv/numa.c | 6 + hw/scsi/lsi53c895a.c | 23 ++- hw/scsi/scsi-generic.c | 14 +- hw/sd/allwinner-sdhost.c | 31 +++- hw/smbios/smbios.c | 8 +- hw/timer/hpet.c | 19 +- hw/timer/nrf51_timer.c | 7 +- hw/usb/hcd-ohci.c | 2 + hw/vfio/pci.c | 8 +- hw/virtio/vhost-shadow-virtqueue.c | 7 +- hw/virtio/vhost-shadow-virtqueue.h | 3 + hw/virtio/vhost-user-gpio.c | 10 +- hw/virtio/vhost-user-i2c.c | 5 +- hw/virtio/vhost-user-rng.c | 5 +- hw/virtio/vhost-user.c | 104 ++--------- hw/virtio/vhost-vdpa.c | 17 +- hw/virtio/vhost.c | 87 ++++++--- hw/virtio/virtio-crypto.c | 20 ++- hw/virtio/virtio-mem.c | 6 +- hw/virtio/virtio.c | 11 +- hw/xen/xen_pt.c | 64 +++++-- hw/xen/xen_pt.h | 20 +++ hw/xen/xen_pt_stub.c | 4 + include/hw/arm/boot.h | 49 +++++ include/hw/i386/pc.h | 3 - include/hw/i386/x86.h | 3 +- include/hw/nvram/fw_cfg.h | 22 --- include/hw/virtio/vhost-user-gpio.h | 2 +- include/qemu/compiler.h | 13 ++ include/qemu/host-utils.h | 2 +- include/qemu/osdep.h | 2 +- io/channel-tls.c | 3 + linux-user/fd-trans.c | 10 +- linux-user/fd-trans.h | 1 + linux-user/generic/target_resource.h | 4 +- linux-user/mips/cpu_loop.c | 5 +- linux-user/s390x/cpu_loop.c | 9 + linux-user/syscall.c | 120 +++++++++---- meson.build | 6 +- migration/migration.c | 30 ++-- migration/ram.c | 9 +- net/vhost-vdpa.c | 11 +- pc-bios/hppa-firmware.img | Bin 719368 -> 720216 bytes pc-bios/keymaps/meson.build | 2 +- qemu-options.hx | 24 ++- qga/commands-posix.c | 12 +- qga/commands.c | 5 +- qga/installer/qemu-ga.wxs | 1 + qga/vss-win32/install.cpp | 2 +- roms/seabios-hppa | 2 +- scripts/device-crash-test | 4 +- scripts/shaderinclude.pl | 16 -- scripts/shaderinclude.py | 26 +++ scripts/symlink-install-tree.py | 1 - softmmu/icount.c | 9 +- subprojects/libvhost-user/libvhost-user.c | 7 + target/arm/cpu.h | 3 + target/arm/helper.c | 3 + target/arm/kvm.c | 2 + target/arm/kvm64.c | 18 +- target/arm/kvm_arm.h | 8 + target/arm/ptw.c | 6 +- target/arm/sve_helper.c | 20 ++- target/arm/tlb_helper.c | 13 +- target/arm/translate-a32.h | 7 + target/arm/translate-a64.c | 24 ++- target/arm/translate.c | 6 +- target/i386/cpu.c | 4 +- target/i386/ops_sse.h | 8 + target/i386/tcg/decode-new.c.inc | 15 +- target/i386/tcg/emit.c.inc | 61 ++++--- target/ppc/cpu_init.c | 2 +- target/ppc/excp_helper.c | 9 +- target/ppc/helper_regs.c | 73 ++++++-- target/ppc/helper_regs.h | 1 + target/ppc/machine.c | 8 +- target/ppc/power8-pmu.c | 38 ++-- target/ppc/power8-pmu.h | 4 +- target/ppc/translate.c | 1 + target/ppc/translate/vmx-impl.c.inc | 2 +- target/riscv/insn_trans/trans_privileged.c.inc | 6 + target/riscv/translate.c | 12 +- target/s390x/arch_dump.c | 2 +- target/s390x/cpu.h | 1 + target/s390x/cpu_models.c | 4 +- target/s390x/cpu_models.h | 10 +- target/s390x/s390x-internal.h | 3 +- target/s390x/tcg/insn-data.h.inc | 10 +- target/s390x/tcg/mem_helper.c | 1 + target/s390x/tcg/translate.c | 106 ++++++++--- target/sh4/cpu.c | 2 +- .../docker/dockerfiles/debian-xtensa-cross.docker | 2 +- tests/qtest/fuzz-lsi53c895a-test.c | 33 ++++ tests/tcg/Makefile.target | 2 + tests/tcg/i386/Makefile.target | 6 +- tests/tcg/i386/test-i386-adcox.c | 75 ++++++++ tests/tcg/i386/test-i386-bmi2.c | 197 +++++++++++---------- tests/tcg/multiarch/linux/linux-test.c | 6 +- tests/tcg/riscv64/Makefile.target | 6 + tests/tcg/riscv64/test-noc.S | 32 ++++ tests/tcg/s390x/Makefile.target | 13 +- tests/tcg/s390x/gdbstub/test-svc.py | 64 +++++++ tests/tcg/s390x/hello-s390x-asm.S | 20 +++ tests/tcg/s390x/lcbb.c | 51 ++++++ tests/tcg/s390x/locfhr.c | 29 +++ ui/console.c | 4 +- ui/gtk-egl.c | 9 +- ui/gtk-gl-area.c | 5 +- ui/gtk.c | 12 +- ui/sdl2-gl.c | 4 + ui/sdl2.c | 7 + ui/vnc-jobs.c | 3 +- ui/vnc.c | 2 +- util/async.c | 14 ++ util/fdmon-epoll.c | 25 ++- util/vfio-helpers.c | 8 +- 167 files changed, 1854 insertions(+), 850 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index d21b4a1fd4..10886bb414 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -109,8 +109,8 @@ crash-test-debian: IMAGE: debian-amd64 script: - cd build - - make check-venv - - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-i386 + - make NINJA=":" check-venv + - tests/venv/bin/python3 scripts/device-crash-test -q --tcg-only ./qemu-system-i386 build-system-fedora: extends: .native_build_job_template @@ -155,7 +155,7 @@ crash-test-fedora: IMAGE: fedora script: - cd build - - make check-venv + - make NINJA=":" check-venv - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-ppc - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-riscv32 diff --git a/VERSION b/VERSION index 0ee843cc60..2bbaead448 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.2.0 +7.2.4 diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 6f1c00682b..1160aec626 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1817,7 +1817,7 @@ static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr, } else /* if (prot & PAGE_READ) */ { tlb_addr = tlbe->addr_read; if (!tlb_hit(tlb_addr, addr)) { - if (!VICTIM_TLB_HIT(addr_write, addr)) { + if (!VICTIM_TLB_HIT(addr_read, addr)) { tlb_fill(env_cpu(env), addr, size, MMU_DATA_LOAD, mmu_idx, retaddr); index = tlb_index(env, mmu_idx, addr); diff --git a/block/curl.c b/block/curl.c index cba4c4cac7..0b125095e3 100644 --- a/block/curl.c +++ b/block/curl.c @@ -37,8 +37,15 @@ // #define DEBUG_VERBOSE +/* CURL 7.85.0 switches to a string based API for specifying + * the desired protocols. + */ +#if LIBCURL_VERSION_NUM >= 0x075500 +#define PROTOCOLS "HTTP,HTTPS,FTP,FTPS" +#else #define PROTOCOLS (CURLPROTO_HTTP | CURLPROTO_HTTPS | \ CURLPROTO_FTP | CURLPROTO_FTPS) +#endif #define CURL_NUM_STATES 8 #define CURL_NUM_ACB 8 @@ -509,9 +516,18 @@ static int curl_init_state(BDRVCURLState *s, CURLState *state) * obscure protocols. For example, do not allow POP3/SMTP/IMAP see * CVE-2013-0249. * - * Restricting protocols is only supported from 7.19.4 upwards. + * Restricting protocols is only supported from 7.19.4 upwards. Note: + * version 7.85.0 deprecates CURLOPT_*PROTOCOLS in favour of a string + * based CURLOPT_*PROTOCOLS_STR API. */ -#if LIBCURL_VERSION_NUM >= 0x071304 +#if LIBCURL_VERSION_NUM >= 0x075500 + if (curl_easy_setopt(state->curl, + CURLOPT_PROTOCOLS_STR, PROTOCOLS) || + curl_easy_setopt(state->curl, + CURLOPT_REDIR_PROTOCOLS_STR, PROTOCOLS)) { + goto err; + } +#elif LIBCURL_VERSION_NUM >= 0x071304 if (curl_easy_setopt(state->curl, CURLOPT_PROTOCOLS, PROTOCOLS) || curl_easy_setopt(state->curl, CURLOPT_REDIR_PROTOCOLS, PROTOCOLS)) { goto err; @@ -669,7 +685,12 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags, const char *file; const char *cookie; const char *cookie_secret; - double d; + /* CURL >= 7.55.0 uses curl_off_t for content length instead of a double */ +#if LIBCURL_VERSION_NUM >= 0x073700 + curl_off_t cl; +#else + double cl; +#endif const char *secretid; const char *protocol_delimiter; int ret; @@ -796,27 +817,36 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags, } if (curl_easy_perform(state->curl)) goto out; - if (curl_easy_getinfo(state->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d)) { + /* CURL 7.55.0 deprecates CURLINFO_CONTENT_LENGTH_DOWNLOAD in favour of + * the *_T version which returns a more sensible type for content length. + */ +#if LIBCURL_VERSION_NUM >= 0x073700 + if (curl_easy_getinfo(state->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &cl)) { + goto out; + } +#else + if (curl_easy_getinfo(state->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &cl)) { goto out; } +#endif /* Prior CURL 7.19.4 return value of 0 could mean that the file size is not * know or the size is zero. From 7.19.4 CURL returns -1 if size is not * known and zero if it is really zero-length file. */ #if LIBCURL_VERSION_NUM >= 0x071304 - if (d < 0) { + if (cl < 0) { pstrcpy(state->errmsg, CURL_ERROR_SIZE, "Server didn't report file size."); goto out; } #else - if (d <= 0) { + if (cl <= 0) { pstrcpy(state->errmsg, CURL_ERROR_SIZE, "Unknown file size or zero-length file."); goto out; } #endif - s->len = d; + s->len = cl; if ((!strncasecmp(s->url, "http://", strlen("http://")) || !strncasecmp(s->url, "https://", strlen("https://"))) diff --git a/block/io.c b/block/io.c index b9424024f9..bbaa0d1b2d 100644 --- a/block/io.c +++ b/block/io.c @@ -2087,6 +2087,9 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChild *child, if (bs->detect_zeroes == BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP) { flags |= BDRV_REQ_MAY_UNMAP; } + + /* Can't use optimization hint with bufferless zero write */ + flags &= ~BDRV_REQ_REGISTERED_BUF; } if (ret < 0) { diff --git a/block/iscsi.c b/block/iscsi.c index a316d46d96..1bba42a71b 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -268,6 +268,7 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status, timer_mod(&iTask->retry_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + retry_time); iTask->do_retry = 1; + return; } else if (status == SCSI_STATUS_CHECK_CONDITION) { int error = iscsi_translate_sense(&task->sense); if (error == EAGAIN) { diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c index b6135e9bfe..cf21b5e40a 100644 --- a/block/monitor/block-hmp-cmds.c +++ b/block/monitor/block-hmp-cmds.c @@ -213,15 +213,17 @@ void hmp_commit(Monitor *mon, const QDict *qdict) error_report("Device '%s' not found", device); return; } - if (!blk_is_available(blk)) { - error_report("Device '%s' has no medium", device); - return; - } bs = bdrv_skip_implicit_filters(blk_bs(blk)); aio_context = bdrv_get_aio_context(bs); aio_context_acquire(aio_context); + if (!blk_is_available(blk)) { + error_report("Device '%s' has no medium", device); + aio_context_release(aio_context); + return; + } + ret = bdrv_commit(bs); aio_context_release(aio_context); diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index bcad567c0c..3dff99ba06 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -115,7 +115,7 @@ static int update_header_sync(BlockDriverState *bs) return bdrv_flush(bs->file->bs); } -static inline void bitmap_table_to_be(uint64_t *bitmap_table, size_t size) +static inline void bitmap_table_bswap_be(uint64_t *bitmap_table, size_t size) { size_t i; @@ -1401,9 +1401,10 @@ static int store_bitmap(BlockDriverState *bs, Qcow2Bitmap *bm, Error **errp) goto fail; } - bitmap_table_to_be(tb, tb_size); + bitmap_table_bswap_be(tb, tb_size); ret = bdrv_pwrite(bs->file, tb_offset, tb_size * sizeof(tb[0]), tb, 0); if (ret < 0) { + bitmap_table_bswap_be(tb, tb_size); error_setg_errno(errp, -ret, "Failed to write bitmap '%s' to file", bm_name); goto fail; diff --git a/block/vhdx-log.c b/block/vhdx-log.c index 572582b87b..0866897a85 100644 --- a/block/vhdx-log.c +++ b/block/vhdx-log.c @@ -980,7 +980,7 @@ static int vhdx_log_write(BlockDriverState *bs, BDRVVHDXState *s, sector_write = merged_sector; } else if (i == sectors - 1 && trailing_length) { /* partial sector at the end of the buffer */ - ret = bdrv_pread(bs->file, file_offset, + ret = bdrv_pread(bs->file, file_offset + trailing_length, VHDX_LOG_SECTOR_SIZE - trailing_length, merged_sector + trailing_length, 0); if (ret < 0) { diff --git a/blockdev.c b/blockdev.c index 3f1dec6242..ae27a41efa 100644 --- a/blockdev.c +++ b/blockdev.c @@ -152,12 +152,22 @@ void blockdev_mark_auto_del(BlockBackend *blk) JOB_LOCK_GUARD(); - for (job = block_job_next_locked(NULL); job; - job = block_job_next_locked(job)) { - if (block_job_has_bdrv(job, blk_bs(blk))) { + do { + job = block_job_next_locked(NULL); + while (job && (job->job.cancelled || + job->job.deferred_to_main_loop || + !block_job_has_bdrv(job, blk_bs(blk)))) + { + job = block_job_next_locked(job); + } + if (job) { + /* + * This drops the job lock temporarily and polls, so we need to + * restart processing the list from the start after this. + */ job_cancel_locked(&job->job, false); } - } + } while (job); dinfo->auto_del = 1; } diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 879564aa8a..b00efb1482 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1065,6 +1065,7 @@ static void char_socket_finalize(Object *obj) qio_net_listener_set_client_func_full(s->listener, NULL, NULL, NULL, chr->gcontext); object_unref(OBJECT(s->listener)); + s->listener = NULL; } if (s->tls_creds) { object_unref(OBJECT(s->tls_creds)); diff --git a/configure b/configure index 08eac0d42c..3ecc35c217 100755 --- a/configure +++ b/configure @@ -2420,7 +2420,7 @@ echo "QEMU_OBJCFLAGS=$QEMU_OBJCFLAGS" >> $config_host_mak echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak echo "GLIB_LIBS=$glib_libs" >> $config_host_mak echo "GLIB_BINDIR=$glib_bindir" >> $config_host_mak -echo "GLIB_VERSION=$(pkg-config --modversion glib-2.0)" >> $config_host_mak +echo "GLIB_VERSION=$($pkg_config --modversion glib-2.0)" >> $config_host_mak echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 93affe3669..0b26c01da0 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -233,8 +233,8 @@ Use the more generic event ``DEVICE_UNPLUG_GUEST_ERROR`` instead. System emulator machines ------------------------ -Arm ``virt`` machine ``dtb-kaslr-seed`` property -'''''''''''''''''''''''''''''''''''''''''''''''' +Arm ``virt`` machine ``dtb-kaslr-seed`` property (since 7.1) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' The ``dtb-kaslr-seed`` property on the ``virt`` board has been deprecated; use the new name ``dtb-randomness`` instead. The new name diff --git a/docs/system/multi-process.rst b/docs/system/multi-process.rst index 210531ee17..1b8852c27c 100644 --- a/docs/system/multi-process.rst +++ b/docs/system/multi-process.rst @@ -2,7 +2,7 @@ Multi-process QEMU ================== This document describes how to configure and use multi-process qemu. -For the design document refer to docs/devel/qemu-multiprocess. +For the design document refer to docs/devel/multi-process.rst. 1) Configuration ---------------- diff --git a/fpu/softfloat.c b/fpu/softfloat.c index c7454c3eb1..108f9cb224 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -5135,7 +5135,7 @@ float32 float32_exp2(float32 a, float_status *status) float64_unpack_canonical(&rp, float64_one, status); for (i = 0 ; i < 15 ; i++) { float64_unpack_canonical(&tp, float32_exp2_coefficients[i], status); - rp = *parts_muladd(&tp, &xp, &rp, 0, status); + rp = *parts_muladd(&tp, &xnp, &rp, 0, status); xnp = *parts_mul(&xnp, &xp, status); } diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c index 5cafcd7703..d9511f429c 100644 --- a/fsdev/virtfs-proxy-helper.c +++ b/fsdev/virtfs-proxy-helper.c @@ -26,6 +26,7 @@ #include "qemu/xattr.h" #include "9p-iov-marshal.h" #include "hw/9pfs/9p-proxy.h" +#include "hw/9pfs/9p-util.h" #include "fsdev/9p-iov-marshal.h" #define PROGNAME "virtfs-proxy-helper" @@ -338,6 +339,28 @@ static void resetugid(int suid, int sgid) } } +/* + * Open regular file or directory. Attempts to open any special file are + * rejected. + * + * returns file descriptor or -1 on error + */ +static int open_regular(const char *pathname, int flags, mode_t mode) +{ + int fd; + + fd = open(pathname, flags, mode); + if (fd < 0) { + return fd; + } + + if (close_if_special_file(fd) < 0) { + return -1; + } + + return fd; +} + /* * send response in two parts * 1) ProxyHeader @@ -682,7 +705,7 @@ static int do_create(struct iovec *iovec) if (ret < 0) { goto unmarshal_err_out; } - ret = open(path.data, flags, mode); + ret = open_regular(path.data, flags, mode); if (ret < 0) { ret = -errno; } @@ -707,7 +730,7 @@ static int do_open(struct iovec *iovec) if (ret < 0) { goto err_out; } - ret = open(path.data, flags); + ret = open_regular(path.data, flags, 0); if (ret < 0) { ret = -errno; } diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h index c3526144c9..6b44e5f7a4 100644 --- a/hw/9pfs/9p-util.h +++ b/hw/9pfs/9p-util.h @@ -13,6 +13,8 @@ #ifndef QEMU_9P_UTIL_H #define QEMU_9P_UTIL_H +#include "qemu/error-report.h" + #ifdef O_PATH #define O_PATH_9P_UTIL O_PATH #else @@ -112,6 +114,38 @@ static inline void close_preserve_errno(int fd) errno = serrno; } +/** + * close_if_special_file() - Close @fd if neither regular file nor directory. + * + * @fd: file descriptor of open file + * Return: 0 on regular file or directory, -1 otherwise + * + * CVE-2023-2861: Prohibit opening any special file directly on host + * (especially device files), as a compromised client could potentially gain + * access outside exported tree under certain, unsafe setups. We expect + * client to handle I/O on special files exclusively on guest side. + */ +static inline int close_if_special_file(int fd) +{ + struct stat stbuf; + + if (fstat(fd, &stbuf) < 0) { + close_preserve_errno(fd); + return -1; + } + if (!S_ISREG(stbuf.st_mode) && !S_ISDIR(stbuf.st_mode)) { + error_report_once( + "9p: broken or compromised client detected; attempt to open " + "special file (i.e. neither regular file, nor directory)" + ); + close(fd); + errno = ENXIO; + return -1; + } + + return 0; +} + static inline int openat_dir(int dirfd, const char *name) { return openat(dirfd, name, @@ -146,6 +180,10 @@ again: return -1; } + if (close_if_special_file(fd) < 0) { + return -1; + } + serrno = errno; /* O_NONBLOCK was only needed to open the file. Let's drop it. We don't * do that with O_PATH since fcntl(F_SETFL) isn't supported, and openat() diff --git a/hw/9pfs/trace-events b/hw/9pfs/trace-events index 6c77966c0b..a12e55c165 100644 --- a/hw/9pfs/trace-events +++ b/hw/9pfs/trace-events @@ -48,3 +48,9 @@ v9fs_readlink(uint16_t tag, uint8_t id, int32_t fid) "tag %d id %d fid %d" v9fs_readlink_return(uint16_t tag, uint8_t id, char* target) "tag %d id %d name %s" v9fs_setattr(uint16_t tag, uint8_t id, int32_t fid, int32_t valid, int32_t mode, int32_t uid, int32_t gid, int64_t size, int64_t atime_sec, int64_t mtime_sec) "tag %u id %u fid %d iattr={valid %d mode %d uid %d gid %d size %"PRId64" atime=%"PRId64" mtime=%"PRId64" }" v9fs_setattr_return(uint16_t tag, uint8_t id) "tag %u id %u" + +# xen-9p-backend.c +xen_9pfs_alloc(char *name) "name %s" +xen_9pfs_connect(char *name) "name %s" +xen_9pfs_disconnect(char *name) "name %s" +xen_9pfs_free(char *name) "name %s" diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c index 65c4979c3c..ab1df8dd2f 100644 --- a/hw/9pfs/xen-9p-backend.c +++ b/hw/9pfs/xen-9p-backend.c @@ -24,6 +24,8 @@ #include "qemu/option.h" #include "fsdev/qemu-fsdev.h" +#include "trace.h" + #define VERSIONS "1" #define MAX_RINGS 8 #define MAX_RING_ORDER 9 @@ -335,6 +337,8 @@ static void xen_9pfs_disconnect(struct XenLegacyDevice *xendev) Xen9pfsDev *xen_9pdev = container_of(xendev, Xen9pfsDev, xendev); int i; + trace_xen_9pfs_disconnect(xendev->name); + for (i = 0; i < xen_9pdev->num_rings; i++) { if (xen_9pdev->rings[i].evtchndev != NULL) { qemu_set_fd_handler(xenevtchn_fd(xen_9pdev->rings[i].evtchndev), @@ -343,39 +347,40 @@ static void xen_9pfs_disconnect(struct XenLegacyDevice *xendev) xen_9pdev->rings[i].local_port); xen_9pdev->rings[i].evtchndev = NULL; } - } -} - -static int xen_9pfs_free(struct XenLegacyDevice *xendev) -{ - Xen9pfsDev *xen_9pdev = container_of(xendev, Xen9pfsDev, xendev); - int i; - - if (xen_9pdev->rings[0].evtchndev != NULL) { - xen_9pfs_disconnect(xendev); - } - - for (i = 0; i < xen_9pdev->num_rings; i++) { if (xen_9pdev->rings[i].data != NULL) { xen_be_unmap_grant_refs(&xen_9pdev->xendev, xen_9pdev->rings[i].data, (1 << xen_9pdev->rings[i].ring_order)); + xen_9pdev->rings[i].data = NULL; } if (xen_9pdev->rings[i].intf != NULL) { xen_be_unmap_grant_refs(&xen_9pdev->xendev, xen_9pdev->rings[i].intf, 1); + xen_9pdev->rings[i].intf = NULL; } if (xen_9pdev->rings[i].bh != NULL) { qemu_bh_delete(xen_9pdev->rings[i].bh); + xen_9pdev->rings[i].bh = NULL; } } g_free(xen_9pdev->id); + xen_9pdev->id = NULL; g_free(xen_9pdev->tag); + xen_9pdev->tag = NULL; g_free(xen_9pdev->path); + xen_9pdev->path = NULL; g_free(xen_9pdev->security_model); + xen_9pdev->security_model = NULL; g_free(xen_9pdev->rings); + xen_9pdev->rings = NULL; +} + +static int xen_9pfs_free(struct XenLegacyDevice *xendev) +{ + trace_xen_9pfs_free(xendev->name); + return 0; } @@ -387,6 +392,8 @@ static int xen_9pfs_connect(struct XenLegacyDevice *xendev) V9fsState *s = &xen_9pdev->state; QemuOpts *fsdev; + trace_xen_9pfs_connect(xendev->name); + if (xenstore_read_fe_int(&xen_9pdev->xendev, "num-rings", &xen_9pdev->num_rings) == -1 || xen_9pdev->num_rings > MAX_RINGS || xen_9pdev->num_rings < 1) { @@ -494,6 +501,8 @@ out: static void xen_9pfs_alloc(struct XenLegacyDevice *xendev) { + trace_xen_9pfs_alloc(xendev->name); + xenstore_write_be_str(xendev, "versions", VERSIONS); xenstore_write_be_int(xendev, "max-rings", MAX_RINGS); xenstore_write_be_int(xendev, "max-ring-page-order", MAX_RING_ORDER); diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index 53654f8638..ff14c3f410 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -52,6 +52,9 @@ static const MemoryRegionOps AcpiCpuHotplug_ops = { .endianness = DEVICE_LITTLE_ENDIAN, .valid = { .min_access_size = 1, + .max_access_size = 4, + }, + .impl = { .max_access_size = 1, }, }; diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index 84d75e6b84..a2a3738b46 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -429,6 +429,16 @@ void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev, * acpi_pcihp_eject_slot() when the operation is completed. */ pdev->qdev.pending_deleted_event = true; + /* if unplug was requested before OSPM is initialized, + * linux kernel will clear GPE0.sts[] bits during boot, which effectively + * hides unplug event. And than followup qmp_device_del() calls remain + * blocked by above flag permanently. + * Unblock qmp_device_del() by setting expire limit, so user can + * repeat unplug request later when OSPM has been booted. + */ + pdev->qdev.pending_deleted_expires_ms = + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL); /* 1 msec */ + s->acpi_pcihp_pci_status[bsel].down |= (1U << slot); acpi_send_event(DEVICE(hotplug_dev), ACPI_PCI_HOTPLUG_STATUS); } diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 55f114ef72..97fb1916ec 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -188,33 +188,35 @@ struct AspeedMachineState { static void aspeed_write_smpboot(ARMCPU *cpu, const struct arm_boot_info *info) { - static const uint32_t poll_mailbox_ready[] = { + AddressSpace *as = arm_boot_address_space(cpu, info); + static const ARMInsnFixup poll_mailbox_ready[] = { /* * r2 = per-cpu go sign value * r1 = AST_SMP_MBOX_FIELD_ENTRY * r0 = AST_SMP_MBOX_FIELD_GOSIGN */ - 0xee100fb0, /* mrc p15, 0, r0, c0, c0, 5 */ - 0xe21000ff, /* ands r0, r0, #255 */ - 0xe59f201c, /* ldr r2, [pc, #28] */ - 0xe1822000, /* orr r2, r2, r0 */ - - 0xe59f1018, /* ldr r1, [pc, #24] */ - 0xe59f0018, /* ldr r0, [pc, #24] */ - - 0xe320f002, /* wfe */ - 0xe5904000, /* ldr r4, [r0] */ - 0xe1520004, /* cmp r2, r4 */ - 0x1afffffb, /* bne */ - 0xe591f000, /* ldr pc, [r1] */ - AST_SMP_MBOX_GOSIGN, - AST_SMP_MBOX_FIELD_ENTRY, - AST_SMP_MBOX_FIELD_GOSIGN, + { 0xee100fb0 }, /* mrc p15, 0, r0, c0, c0, 5 */ + { 0xe21000ff }, /* ands r0, r0, #255 */ + { 0xe59f201c }, /* ldr r2, [pc, #28] */ + { 0xe1822000 }, /* orr r2, r2, r0 */ + + { 0xe59f1018 }, /* ldr r1, [pc, #24] */ + { 0xe59f0018 }, /* ldr r0, [pc, #24] */ + + { 0xe320f002 }, /* wfe */ + { 0xe5904000 }, /* ldr r4, [r0] */ + { 0xe1520004 }, /* cmp r2, r4 */ + { 0x1afffffb }, /* bne */ + { 0xe591f000 }, /* ldr pc, [r1] */ + { AST_SMP_MBOX_GOSIGN }, + { AST_SMP_MBOX_FIELD_ENTRY }, + { AST_SMP_MBOX_FIELD_GOSIGN }, + { 0, FIXUP_TERMINATOR } }; + static const uint32_t fixupcontext[FIXUP_MAX] = { 0 }; - rom_add_blob_fixed("aspeed.smpboot", poll_mailbox_ready, - sizeof(poll_mailbox_ready), - info->smp_loader_start); + arm_write_bootloader("aspeed.smpboot", as, info->smp_loader_start, + poll_mailbox_ready, fixupcontext); } static void aspeed_reset_secondary(ARMCPU *cpu, diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 15c2bf1867..8ff315f431 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -59,26 +59,6 @@ AddressSpace *arm_boot_address_space(ARMCPU *cpu, return cpu_get_address_space(cs, asidx); } -typedef enum { - FIXUP_NONE = 0, /* do nothing */ - FIXUP_TERMINATOR, /* end of insns */ - FIXUP_BOARDID, /* overwrite with board ID number */ - FIXUP_BOARD_SETUP, /* overwrite with board specific setup code address */ - FIXUP_ARGPTR_LO, /* overwrite with pointer to kernel args */ - FIXUP_ARGPTR_HI, /* overwrite with pointer to kernel args (high half) */ - FIXUP_ENTRYPOINT_LO, /* overwrite with kernel entry point */ - FIXUP_ENTRYPOINT_HI, /* overwrite with kernel entry point (high half) */ - FIXUP_GIC_CPU_IF, /* overwrite with GIC CPU interface address */ - FIXUP_BOOTREG, /* overwrite with boot register address */ - FIXUP_DSB, /* overwrite with correct DSB insn for cpu */ - FIXUP_MAX, -} FixupType; - -typedef struct ARMInsnFixup { - uint32_t insn; - FixupType fixup; -} ARMInsnFixup; - static const ARMInsnFixup bootloader_aarch64[] = { { 0x580000c0 }, /* ldr x0, arg ; Load the lower 32-bits of DTB */ { 0xaa1f03e1 }, /* mov x1, xzr */ @@ -149,9 +129,10 @@ static const ARMInsnFixup smpboot[] = { { 0, FIXUP_TERMINATOR } }; -static void write_bootloader(const char *name, hwaddr addr, - const ARMInsnFixup *insns, uint32_t *fixupcontext, - AddressSpace *as) +void arm_write_bootloader(const char *name, + AddressSpace *as, hwaddr addr, + const ARMInsnFixup *insns, + const uint32_t *fixupcontext) { /* Fix up the specified bootloader fragment and write it into * guest memory using rom_add_blob_fixed(). fixupcontext is @@ -213,8 +194,8 @@ static void default_write_secondary(ARMCPU *cpu, fixupcontext[FIXUP_DSB] = CP15_DSB_INSN; } - write_bootloader("smpboot", info->smp_loader_start, - smpboot, fixupcontext, as); + arm_write_bootloader("smpboot", as, info->smp_loader_start, + smpboot, fixupcontext); } void arm_write_secure_board_setup_dummy_smc(ARMCPU *cpu, @@ -686,7 +667,10 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo, qemu_register_reset_nosnapshotload(qemu_fdt_randomize_seeds, rom_ptr_for_as(as, addr, size)); - g_free(fdt); + if (fdt != ms->fdt) { + g_free(ms->fdt); + ms->fdt = fdt; + } return size; @@ -1171,8 +1155,8 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu, fixupcontext[FIXUP_ENTRYPOINT_LO] = entry; fixupcontext[FIXUP_ENTRYPOINT_HI] = entry >> 32; - write_bootloader("bootloader", info->loader_start, - primary_loader, fixupcontext, as); + arm_write_bootloader("bootloader", as, info->loader_start, + primary_loader, fixupcontext); if (info->write_board_setup) { info->write_board_setup(cpu, info); diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 92d068d1f9..a7d287b1a8 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -16,6 +16,7 @@ #include "qemu/units.h" #include "qemu/cutils.h" #include "qapi/error.h" +#include "hw/arm/boot.h" #include "hw/arm/bcm2836.h" #include "hw/registerfields.h" #include "qemu/error-report.h" @@ -124,20 +125,22 @@ static const char *board_type(uint32_t board_rev) static void write_smpboot(ARMCPU *cpu, const struct arm_boot_info *info) { - static const uint32_t smpboot[] = { - 0xe1a0e00f, /* mov lr, pc */ - 0xe3a0fe00 + (BOARDSETUP_ADDR >> 4), /* mov pc, BOARDSETUP_ADDR */ - 0xee100fb0, /* mrc p15, 0, r0, c0, c0, 5;get core ID */ - 0xe7e10050, /* ubfx r0, r0, #0, #2 ;extract LSB */ - 0xe59f5014, /* ldr r5, =0x400000CC ;load mbox base */ - 0xe320f001, /* 1: yield */ - 0xe7953200, /* ldr r3, [r5, r0, lsl #4] ;read mbox for our core*/ - 0xe3530000, /* cmp r3, #0 ;spin while zero */ - 0x0afffffb, /* beq 1b */ - 0xe7853200, /* str r3, [r5, r0, lsl #4] ;clear mbox */ - 0xe12fff13, /* bx r3 ;jump to target */ - 0x400000cc, /* (constant: mailbox 3 read/clear base) */ + static const ARMInsnFixup smpboot[] = { + { 0xe1a0e00f }, /* mov lr, pc */ + { 0xe3a0fe00 + (BOARDSETUP_ADDR >> 4) }, /* mov pc, BOARDSETUP_ADDR */ + { 0xee100fb0 }, /* mrc p15, 0, r0, c0, c0, 5;get core ID */ + { 0xe7e10050 }, /* ubfx r0, r0, #0, #2 ;extract LSB */ + { 0xe59f5014 }, /* ldr r5, =0x400000CC ;load mbox base */ + { 0xe320f001 }, /* 1: yield */ + { 0xe7953200 }, /* ldr r3, [r5, r0, lsl #4] ;read mbox for our core */ + { 0xe3530000 }, /* cmp r3, #0 ;spin while zero */ + { 0x0afffffb }, /* beq 1b */ + { 0xe7853200 }, /* str r3, [r5, r0, lsl #4] ;clear mbox */ + { 0xe12fff13 }, /* bx r3 ;jump to target */ + { 0x400000cc }, /* (constant: mailbox 3 read/clear base) */ + { 0, FIXUP_TERMINATOR } }; + static const uint32_t fixupcontext[FIXUP_MAX] = { 0 }; /* check that we don't overrun board setup vectors */ QEMU_BUILD_BUG_ON(SMPBOOT_ADDR + sizeof(smpboot) > MVBAR_ADDR); @@ -145,9 +148,8 @@ static void write_smpboot(ARMCPU *cpu, const struct arm_boot_info *info) QEMU_BUILD_BUG_ON((BOARDSETUP_ADDR & 0xf) != 0 || (BOARDSETUP_ADDR >> 4) >= 0x100); - rom_add_blob_fixed_as("raspi_smpboot", smpboot, sizeof(smpboot), - info->smp_loader_start, - arm_boot_address_space(cpu, info)); + arm_write_bootloader("raspi_smpboot", arm_boot_address_space(cpu, info), + info->smp_loader_start, smpboot, fixupcontext); } static void write_smpboot64(ARMCPU *cpu, const struct arm_boot_info *info) @@ -161,26 +163,28 @@ static void write_smpboot64(ARMCPU *cpu, const struct arm_boot_info *info) * the primary CPU goes into the kernel. We put these variables inside * a rom blob, so that the reset for ROM contents zeroes them for us. */ - static const uint32_t smpboot[] = { - 0xd2801b05, /* mov x5, 0xd8 */ - 0xd53800a6, /* mrs x6, mpidr_el1 */ - 0x924004c6, /* and x6, x6, #0x3 */ - 0xd503205f, /* spin: wfe */ - 0xf86678a4, /* ldr x4, [x5,x6,lsl #3] */ - 0xb4ffffc4, /* cbz x4, spin */ - 0xd2800000, /* mov x0, #0x0 */ - 0xd2800001, /* mov x1, #0x0 */ - 0xd2800002, /* mov x2, #0x0 */ - 0xd2800003, /* mov x3, #0x0 */ - 0xd61f0080, /* br x4 */ + static const ARMInsnFixup smpboot[] = { + { 0xd2801b05 }, /* mov x5, 0xd8 */ + { 0xd53800a6 }, /* mrs x6, mpidr_el1 */ + { 0x924004c6 }, /* and x6, x6, #0x3 */ + { 0xd503205f }, /* spin: wfe */ + { 0xf86678a4 }, /* ldr x4, [x5,x6,lsl #3] */ + { 0xb4ffffc4 }, /* cbz x4, spin */ + { 0xd2800000 }, /* mov x0, #0x0 */ + { 0xd2800001 }, /* mov x1, #0x0 */ + { 0xd2800002 }, /* mov x2, #0x0 */ + { 0xd2800003 }, /* mov x3, #0x0 */ + { 0xd61f0080 }, /* br x4 */ + { 0, FIXUP_TERMINATOR } }; + static const uint32_t fixupcontext[FIXUP_MAX] = { 0 }; static const uint64_t spintables[] = { 0, 0, 0, 0 }; - rom_add_blob_fixed_as("raspi_smpboot", smpboot, sizeof(smpboot), - info->smp_loader_start, as); + arm_write_bootloader("raspi_smpboot", as, info->smp_loader_start, + smpboot, fixupcontext); rom_add_blob_fixed_as("raspi_spintables", spintables, sizeof(spintables), SPINTABLE_ADDR, as); } diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 335cfc417d..5905a33015 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -213,7 +213,7 @@ static void xlnx_zynqmp_create_rpu(MachineState *ms, XlnxZynqMPState *s, const char *boot_cpu, Error **errp) { int i; - int num_rpus = MIN(ms->smp.cpus - XLNX_ZYNQMP_NUM_APU_CPUS, + int num_rpus = MIN((int)(ms->smp.cpus - XLNX_ZYNQMP_NUM_APU_CPUS), XLNX_ZYNQMP_NUM_RPU_CPUS); if (num_rpus <= 0) { diff --git a/hw/core/machine.c b/hw/core/machine.c index 8d34caa31d..19f42450f5 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -42,6 +42,9 @@ GlobalProperty hw_compat_7_1[] = { { "virtio-device", "queue_reset", "false" }, + { "virtio-rng-pci", "vectors", "0" }, + { "virtio-rng-pci-transitional", "vectors", "0" }, + { "virtio-rng-pci-non-transitional", "vectors", "0" }, }; const size_t hw_compat_7_1_len = G_N_ELEMENTS(hw_compat_7_1); @@ -1326,6 +1329,14 @@ void machine_run_board_init(MachineState *machine, const char *mem_path, Error * } } else if (machine_class->default_ram_id && machine->ram_size && numa_uses_legacy_mem()) { + if (object_property_find(object_get_objects_root(), + machine_class->default_ram_id)) { + error_setg(errp, "object name '%s' is reserved for the default" + " RAM backend, it can't be used for any other purposes." + " Change the object's 'id' to something else", + machine_class->default_ram_id); + return; + } if (!create_default_memdev(current_machine, mem_path, errp)) { return; } diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 5e15c79b94..4e2e0dd53a 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -498,6 +498,8 @@ static void virtio_gpu_resource_flush(VirtIOGPU *g, struct virtio_gpu_resource_flush rf; struct virtio_gpu_scanout *scanout; pixman_region16_t flush_region; + bool within_bounds = false; + bool update_submitted = false; int i; VIRTIO_GPU_FILL_CMD(rf); @@ -518,13 +520,28 @@ static void virtio_gpu_resource_flush(VirtIOGPU *g, rf.r.x < scanout->x + scanout->width && rf.r.x + rf.r.width >= scanout->x && rf.r.y < scanout->y + scanout->height && - rf.r.y + rf.r.height >= scanout->y && - console_has_gl(scanout->con)) { - dpy_gl_update(scanout->con, 0, 0, scanout->width, - scanout->height); + rf.r.y + rf.r.height >= scanout->y) { + within_bounds = true; + + if (console_has_gl(scanout->con)) { + dpy_gl_update(scanout->con, 0, 0, scanout->width, + scanout->height); + update_submitted = true; + } } } - return; + + if (update_submitted) { + return; + } + if (!within_bounds) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: flush bounds outside scanouts" + " bounds for flush %d: %d %d %d %d\n", + __func__, rf.resource_id, rf.r.x, rf.r.y, + rf.r.width, rf.r.height); + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; + return; + } } if (!res->blob && diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index cbb8f0f169..99e50f65e2 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -168,6 +168,11 @@ static inline int stream_idle(struct Stream *s) return !!(s->regs[R_DMASR] & DMASR_IDLE); } +static inline int stream_halted(struct Stream *s) +{ + return !!(s->regs[R_DMASR] & DMASR_HALTED); +} + static void stream_reset(struct Stream *s) { s->regs[R_DMASR] = DMASR_HALTED; /* starts up halted. */ @@ -269,7 +274,7 @@ static void stream_process_mem2s(struct Stream *s, StreamSink *tx_data_dev, uint64_t addr; bool eop; - if (!stream_running(s) || stream_idle(s)) { + if (!stream_running(s) || stream_idle(s) || stream_halted(s)) { return; } @@ -326,7 +331,7 @@ static size_t stream_process_s2mem(struct Stream *s, unsigned char *buf, unsigned int rxlen; size_t pos = 0; - if (!stream_running(s) || stream_idle(s)) { + if (!stream_running(s) || stream_idle(s) || stream_halted(s)) { return 0; } @@ -407,7 +412,7 @@ xilinx_axidma_data_stream_can_push(StreamSink *obj, XilinxAXIDMAStreamSink *ds = XILINX_AXI_DMA_DATA_STREAM(obj); struct Stream *s = &ds->dma->streams[1]; - if (!stream_running(s) || stream_idle(s)) { + if (!stream_running(s) || stream_idle(s) || stream_halted(s)) { ds->dma->notify = notify; ds->dma->notify_opaque = notify_opaque; return false; diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index de1cc7ab71..98a78b84b4 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -123,6 +123,7 @@ static FWCfgState *create_fw_cfg(MachineState *ms) { FWCfgState *fw_cfg; uint64_t val; + const char qemu_version[] = QEMU_VERSION; fw_cfg = fw_cfg_init_mem(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4); fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, ms->smp.cpus); @@ -148,6 +149,10 @@ static FWCfgState *create_fw_cfg(MachineState *ms) fw_cfg_add_i16(fw_cfg, FW_CFG_BOOT_DEVICE, ms->boot_config.order[0]); qemu_register_boot_set(fw_cfg_boot_set, fw_cfg); + fw_cfg_add_file(fw_cfg, "/etc/qemu-version", + g_memdup(qemu_version, sizeof(qemu_version)), + sizeof(qemu_version)); + return fw_cfg; } @@ -418,10 +423,16 @@ static void hppa_machine_reset(MachineState *ms, ShutdownCause reason) /* Start all CPUs at the firmware entry point. * Monarch CPU will initialize firmware, secondary CPUs - * will enter a small idle look and wait for rendevouz. */ + * will enter a small idle loop and wait for rendevouz. */ for (i = 0; i < smp_cpus; i++) { - cpu_set_pc(CPU(cpu[i]), firmware_entry); + CPUState *cs = CPU(cpu[i]); + + cpu_set_pc(cs, firmware_entry); + cpu[i]->env.psw = PSW_Q; cpu[i]->env.gr[5] = CPU_HPA + i * 0x1000; + + cs->exception_index = -1; + cs->halted = 0; } /* already initialized by machine_hppa_init()? */ diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index a08ee85edf..d025ef2873 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3179,6 +3179,7 @@ static int vtd_iommu_notify_flag_changed(IOMMUMemoryRegion *iommu, { VTDAddressSpace *vtd_as = container_of(iommu, VTDAddressSpace, iommu); IntelIOMMUState *s = vtd_as->iommu_state; + X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(s); /* TODO: add support for VFIO and vhost users */ if (s->snoop_control) { @@ -3186,6 +3187,20 @@ static int vtd_iommu_notify_flag_changed(IOMMUMemoryRegion *iommu, "Snoop Control with vhost or VFIO is not supported"); return -ENOTSUP; } + if (!s->caching_mode && (new & IOMMU_NOTIFIER_MAP)) { + error_setg_errno(errp, ENOTSUP, + "device %02x.%02x.%x requires caching mode", + pci_bus_num(vtd_as->bus), PCI_SLOT(vtd_as->devfn), + PCI_FUNC(vtd_as->devfn)); + return -ENOTSUP; + } + if (!x86_iommu->dt_supported && (new & IOMMU_NOTIFIER_DEVIOTLB_UNMAP)) { + error_setg_errno(errp, ENOTSUP, + "device %02x.%02x.%x requires device IOTLB mode", + pci_bus_num(vtd_as->bus), PCI_SLOT(vtd_as->devfn), + PCI_FUNC(vtd_as->devfn)); + return -ENOTSUP; + } /* Update per-address-space notifier flags */ vtd_as->notifier_flags = new; diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 170a331e3f..b231ceda9a 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -330,7 +330,7 @@ static void microvm_memory_init(MicrovmMachineState *mms) rom_set_fw(fw_cfg); if (machine->kernel_filename != NULL) { - x86_load_linux(x86ms, fw_cfg, 0, true, false); + x86_load_linux(x86ms, fw_cfg, 0, true); } if (mms->option_roms) { diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 546b703cb4..ec5a10534b 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -799,7 +799,7 @@ void xen_load_linux(PCMachineState *pcms) rom_set_fw(fw_cfg); x86_load_linux(x86ms, fw_cfg, pcmc->acpi_data_size, - pcmc->pvh_enabled, pcmc->legacy_no_rng_seed); + pcmc->pvh_enabled); for (i = 0; i < nb_option_roms; i++) { assert(!strcmp(option_rom[i].name, "linuxboot.bin") || !strcmp(option_rom[i].name, "linuxboot_dma.bin") || @@ -1119,7 +1119,7 @@ void pc_memory_init(PCMachineState *pcms, if (linux_boot) { x86_load_linux(x86ms, fw_cfg, pcmc->acpi_data_size, - pcmc->pvh_enabled, pcmc->legacy_no_rng_seed); + pcmc->pvh_enabled); } for (i = 0; i < nb_option_roms; i++) { diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 0ad0ed1603..04f793cca1 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -405,6 +405,7 @@ static void pc_xen_hvm_init(MachineState *machine) } pc_xen_hvm_init_pci(machine); + xen_igd_reserve_slot(pcms->bus); pci_create_simple(pcms->bus, -1, "xen-platform"); } #endif @@ -449,11 +450,9 @@ DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL, static void pc_i440fx_7_1_machine_options(MachineClass *m) { - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_i440fx_7_2_machine_options(m); m->alias = NULL; m->is_default = false; - pcmc->legacy_no_rng_seed = true; compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len); compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index a496bd6e74..f522874add 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -383,10 +383,8 @@ DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL, static void pc_q35_7_1_machine_options(MachineClass *m) { - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_7_2_machine_options(m); m->alias = NULL; - pcmc->legacy_no_rng_seed = true; compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len); compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len); } diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 78cc131926..80be3032cc 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -26,7 +26,6 @@ #include "qemu/cutils.h" #include "qemu/units.h" #include "qemu/datadir.h" -#include "qemu/guest-random.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qapi-visit-common.h" @@ -37,7 +36,6 @@ #include "sysemu/whpx.h" #include "sysemu/numa.h" #include "sysemu/replay.h" -#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "sysemu/cpu-timers.h" #include "sysemu/xen.h" @@ -657,12 +655,12 @@ DeviceState *ioapic_init_secondary(GSIState *gsi_state) return dev; } -typedef struct SetupData { +struct setup_data { uint64_t next; uint32_t type; uint32_t len; uint8_t data[]; -} __attribute__((packed)) SetupData; +} __attribute__((packed)); /* @@ -769,35 +767,10 @@ static bool load_elfboot(const char *kernel_filename, return true; } -typedef struct SetupDataFixup { - void *pos; - hwaddr orig_val, new_val; - uint32_t addr; -} SetupDataFixup; - -static void fixup_setup_data(void *opaque) -{ - SetupDataFixup *fixup = opaque; - stq_p(fixup->pos, fixup->new_val); -} - -static void reset_setup_data(void *opaque) -{ - SetupDataFixup *fixup = opaque; - stq_p(fixup->pos, fixup->orig_val); -} - -static void reset_rng_seed(void *opaque) -{ - SetupData *setup_data = opaque; - qemu_guest_getrandom_nofail(setup_data->data, le32_to_cpu(setup_data->len)); -} - void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, int acpi_data_size, - bool pvh_enabled, - bool legacy_no_rng_seed) + bool pvh_enabled) { bool linuxboot_dma_enabled = X86_MACHINE_GET_CLASS(x86ms)->fwcfg_dma_enabled; uint16_t protocol; @@ -805,17 +778,16 @@ void x86_load_linux(X86MachineState *x86ms, int dtb_size, setup_data_offset; uint32_t initrd_max; uint8_t header[8192], *setup, *kernel; - hwaddr real_addr, prot_addr, cmdline_addr, initrd_addr = 0, first_setup_data = 0; + hwaddr real_addr, prot_addr, cmdline_addr, initrd_addr = 0; FILE *f; char *vmode; MachineState *machine = MACHINE(x86ms); - SetupData *setup_data; + struct setup_data *setup_data; const char *kernel_filename = machine->kernel_filename; const char *initrd_filename = machine->initrd_filename; const char *dtb_filename = machine->dtb; const char *kernel_cmdline = machine->kernel_cmdline; SevKernelLoaderContext sev_load_ctx = {}; - enum { RNG_SEED_LENGTH = 32 }; /* Align to 16 bytes as a paranoia measure */ cmdline_size = (strlen(kernel_cmdline) + 16) & ~15; @@ -1092,41 +1064,19 @@ void x86_load_linux(X86MachineState *x86ms, } setup_data_offset = QEMU_ALIGN_UP(kernel_size, 16); - kernel_size = setup_data_offset + sizeof(SetupData) + dtb_size; + kernel_size = setup_data_offset + sizeof(struct setup_data) + dtb_size; kernel = g_realloc(kernel, kernel_size); + stq_p(header + 0x250, prot_addr + setup_data_offset); - setup_data = (SetupData *)(kernel + setup_data_offset); - setup_data->next = cpu_to_le64(first_setup_data); - first_setup_data = prot_addr + setup_data_offset; + setup_data = (struct setup_data *)(kernel + setup_data_offset); + setup_data->next = 0; setup_data->type = cpu_to_le32(SETUP_DTB); setup_data->len = cpu_to_le32(dtb_size); load_image_size(dtb_filename, setup_data->data, dtb_size); } - if (!legacy_no_rng_seed) { - setup_data_offset = QEMU_ALIGN_UP(kernel_size, 16); - kernel_size = setup_data_offset + sizeof(SetupData) + RNG_SEED_LENGTH; - kernel = g_realloc(kernel, kernel_size); - setup_data = (SetupData *)(kernel + setup_data_offset); - setup_data->next = cpu_to_le64(first_setup_data); - first_setup_data = prot_addr + setup_data_offset; - setup_data->type = cpu_to_le32(SETUP_RNG_SEED); - setup_data->len = cpu_to_le32(RNG_SEED_LENGTH); - qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH); - qemu_register_reset_nosnapshotload(reset_rng_seed, setup_data); - fw_cfg_add_bytes_callback(fw_cfg, FW_CFG_KERNEL_DATA, reset_rng_seed, NULL, - setup_data, kernel, kernel_size, true); - } else { - fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); - } - - fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); - fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); - sev_load_ctx.kernel_data = (char *)kernel; - sev_load_ctx.kernel_size = kernel_size; - /* * If we're starting an encrypted VM, it will be OVMF based, which uses the * efi stub for booting and doesn't require any values to be placed in the @@ -1135,20 +1085,16 @@ void x86_load_linux(X86MachineState *x86ms, * file the user passed in. */ if (!sev_enabled()) { - SetupDataFixup *fixup = g_malloc(sizeof(*fixup)); - memcpy(setup, header, MIN(sizeof(header), setup_size)); - /* Offset 0x250 is a pointer to the first setup_data link. */ - fixup->pos = setup + 0x250; - fixup->orig_val = ldq_p(fixup->pos); - fixup->new_val = first_setup_data; - fixup->addr = cpu_to_le32(real_addr); - fw_cfg_add_bytes_callback(fw_cfg, FW_CFG_SETUP_ADDR, fixup_setup_data, NULL, - fixup, &fixup->addr, sizeof(fixup->addr), true); - qemu_register_reset(reset_setup_data, fixup); - } else { - fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_ADDR, real_addr); } + + fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); + fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); + fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); + sev_load_ctx.kernel_data = (char *)kernel; + sev_load_ctx.kernel_size = kernel_size; + + fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_ADDR, real_addr); fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_SIZE, setup_size); fw_cfg_add_bytes(fw_cfg, FW_CFG_SETUP_DATA, setup, setup_size); sev_load_ctx.setup_data = (char *)setup; diff --git a/hw/intc/allwinner-a10-pic.c b/hw/intc/allwinner-a10-pic.c index 8cca124807..d0bf8d545b 100644 --- a/hw/intc/allwinner-a10-pic.c +++ b/hw/intc/allwinner-a10-pic.c @@ -49,12 +49,9 @@ static void aw_a10_pic_update(AwA10PICState *s) static void aw_a10_pic_set_irq(void *opaque, int irq, int level) { AwA10PICState *s = opaque; + uint32_t *pending_reg = &s->irq_pending[irq / 32]; - if (level) { - set_bit(irq % 32, (void *)&s->irq_pending[irq / 32]); - } else { - clear_bit(irq % 32, (void *)&s->irq_pending[irq / 32]); - } + *pending_reg = deposit32(*pending_reg, irq % 32, 1, !!level); aw_a10_pic_update(s); } diff --git a/hw/misc/aspeed_hace.c b/hw/misc/aspeed_hace.c index ac21be306c..69175e972d 100644 --- a/hw/misc/aspeed_hace.c +++ b/hw/misc/aspeed_hace.c @@ -189,7 +189,7 @@ static void do_hash_operation(AspeedHACEState *s, int algo, bool sg_mode, bool acc_mode) { struct iovec iov[ASPEED_HACE_MAX_SG]; - g_autofree uint8_t *digest_buf; + g_autofree uint8_t *digest_buf = NULL; size_t digest_len = 0; int niov = 0; int i; diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c index ecc0245fe8..c3fed5fcbe 100644 --- a/hw/net/allwinner-sun8i-emac.c +++ b/hw/net/allwinner-sun8i-emac.c @@ -350,8 +350,13 @@ static void allwinner_sun8i_emac_get_desc(AwSun8iEmacState *s, FrameDescriptor *desc, uint32_t phys_addr) { - dma_memory_read(&s->dma_as, phys_addr, desc, sizeof(*desc), + uint32_t desc_words[4]; + dma_memory_read(&s->dma_as, phys_addr, &desc_words, sizeof(desc_words), MEMTXATTRS_UNSPECIFIED); + desc->status = le32_to_cpu(desc_words[0]); + desc->status2 = le32_to_cpu(desc_words[1]); + desc->addr = le32_to_cpu(desc_words[2]); + desc->next = le32_to_cpu(desc_words[3]); } static uint32_t allwinner_sun8i_emac_next_desc(AwSun8iEmacState *s, @@ -400,10 +405,15 @@ static uint32_t allwinner_sun8i_emac_tx_desc(AwSun8iEmacState *s, } static void allwinner_sun8i_emac_flush_desc(AwSun8iEmacState *s, - FrameDescriptor *desc, + const FrameDescriptor *desc, uint32_t phys_addr) { - dma_memory_write(&s->dma_as, phys_addr, desc, sizeof(*desc), + uint32_t desc_words[4]; + desc_words[0] = cpu_to_le32(desc->status); + desc_words[1] = cpu_to_le32(desc->status2); + desc_words[2] = cpu_to_le32(desc->addr); + desc_words[3] = cpu_to_le32(desc->next); + dma_memory_write(&s->dma_as, phys_addr, &desc_words, sizeof(desc_words), MEMTXATTRS_UNSPECIFIED); } @@ -638,8 +648,7 @@ static uint64_t allwinner_sun8i_emac_read(void *opaque, hwaddr offset, break; case REG_TX_CUR_BUF: /* Transmit Current Buffer */ if (s->tx_desc_curr != 0) { - dma_memory_read(&s->dma_as, s->tx_desc_curr, &desc, sizeof(desc), - MEMTXATTRS_UNSPECIFIED); + allwinner_sun8i_emac_get_desc(s, &desc, s->tx_desc_curr); value = desc.addr; } else { value = 0; @@ -652,8 +661,7 @@ static uint64_t allwinner_sun8i_emac_read(void *opaque, hwaddr offset, break; case REG_RX_CUR_BUF: /* Receive Current Buffer */ if (s->rx_desc_curr != 0) { - dma_memory_read(&s->dma_as, s->rx_desc_curr, &desc, sizeof(desc), - MEMTXATTRS_UNSPECIFIED); + allwinner_sun8i_emac_get_desc(s, &desc, s->rx_desc_curr); value = desc.addr; } else { value = 0; diff --git a/hw/net/e1000.c b/hw/net/e1000.c index e26e0a64c1..0dfdf47313 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -567,7 +567,7 @@ e1000_send_packet(E1000State *s, const uint8_t *buf, int size) qemu_send_packet(nc, buf, size); } inc_tx_bcast_or_mcast_count(s, buf); - e1000x_increase_size_stats(s->mac_reg, PTCregs, size); + e1000x_increase_size_stats(s->mac_reg, PTCregs, size + 4); } static void @@ -631,10 +631,9 @@ xmit_seg(E1000State *s) } e1000x_inc_reg_if_not_full(s->mac_reg, TPT); - e1000x_grow_8reg_if_not_full(s->mac_reg, TOTL, s->tx.size); - s->mac_reg[GPTC] = s->mac_reg[TPT]; - s->mac_reg[GOTCL] = s->mac_reg[TOTL]; - s->mac_reg[GOTCH] = s->mac_reg[TOTH]; + e1000x_grow_8reg_if_not_full(s->mac_reg, TOTL, s->tx.size + 4); + e1000x_inc_reg_if_not_full(s->mac_reg, GPTC); + e1000x_grow_8reg_if_not_full(s->mac_reg, GOTCL, s->tx.size + 4); } static void diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index fc9cdb4528..c71d82ce1d 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -687,9 +687,8 @@ e1000e_on_tx_done_update_stats(E1000ECore *core, struct NetTxPkt *tx_pkt) g_assert_not_reached(); } - core->mac[GPTC] = core->mac[TPT]; - core->mac[GOTCL] = core->mac[TOTL]; - core->mac[GOTCH] = core->mac[TOTH]; + e1000x_inc_reg_if_not_full(core->mac, GPTC); + e1000x_grow_8reg_if_not_full(core->mac, GOTCL, tot_len); } static void diff --git a/hw/net/e1000x_common.c b/hw/net/e1000x_common.c index a8d93870b5..3fdc34f753 100644 --- a/hw/net/e1000x_common.c +++ b/hw/net/e1000x_common.c @@ -217,15 +217,14 @@ e1000x_update_rx_total_stats(uint32_t *mac, e1000x_increase_size_stats(mac, PRCregs, data_fcs_size); e1000x_inc_reg_if_not_full(mac, TPR); - mac[GPRC] = mac[TPR]; + e1000x_inc_reg_if_not_full(mac, GPRC); /* TOR - Total Octets Received: * This register includes bytes received in a packet from the field through the field, inclusively. * Always include FCS length (4) in size. */ e1000x_grow_8reg_if_not_full(mac, TORL, data_size + 4); - mac[GORCL] = mac[TORL]; - mac[GORCH] = mac[TORH]; + e1000x_grow_8reg_if_not_full(mac, GORCL, data_size + 4); } void diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c index 7ccd3e5142..db3a04deb1 100644 --- a/hw/net/msf2-emac.c +++ b/hw/net/msf2-emac.c @@ -118,14 +118,18 @@ static void emac_load_desc(MSF2EmacState *s, EmacDesc *d, hwaddr desc) d->next = le32_to_cpu(d->next); } -static void emac_store_desc(MSF2EmacState *s, EmacDesc *d, hwaddr desc) +static void emac_store_desc(MSF2EmacState *s, const EmacDesc *d, hwaddr desc) { - /* Convert from host endianness into LE. */ - d->pktaddr = cpu_to_le32(d->pktaddr); - d->pktsize = cpu_to_le32(d->pktsize); - d->next = cpu_to_le32(d->next); - - address_space_write(&s->dma_as, desc, MEMTXATTRS_UNSPECIFIED, d, sizeof *d); + EmacDesc outd; + /* + * Convert from host endianness into LE. We use a local struct because + * calling code may still want to look at the fields afterwards. + */ + outd.pktaddr = cpu_to_le32(d->pktaddr); + outd.pktsize = cpu_to_le32(d->pktsize); + outd.next = cpu_to_le32(d->next); + + address_space_write(&s->dma_as, desc, MEMTXATTRS_UNSPECIFIED, &outd, sizeof outd); } static void msf2_dma_tx(MSF2EmacState *s) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 700b1b66b6..eb679d7c40 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2154,6 +2154,9 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) int large_send_mss = (txdw0 >> CP_TC_LGSEN_MSS_SHIFT) & CP_TC_LGSEN_MSS_MASK; + if (large_send_mss == 0) { + goto skip_offload; + } DPRINTF("+++ C+ mode offloaded task TSO IP data %d " "frame data %d specified MSS=%d\n", diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index aba12759d5..4abd49e298 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -802,7 +802,6 @@ static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features, } if (!get_vhost_net(nc->peer)) { - virtio_add_feature(&features, VIRTIO_F_RING_RESET); return features; } diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index d2ab527ef4..56559cda24 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -1441,7 +1441,7 @@ static void vmxnet3_activate_device(VMXNET3State *s) vmxnet3_setup_rx_filtering(s); /* Cache fields from shared memory */ s->mtu = VMXNET3_READ_DRV_SHARED32(d, s->drv_shmem, devRead.misc.mtu); - assert(VMXNET3_MIN_MTU <= s->mtu && s->mtu < VMXNET3_MAX_MTU); + assert(VMXNET3_MIN_MTU <= s->mtu && s->mtu <= VMXNET3_MAX_MTU); VMW_CFPRN("MTU is %u", s->mtu); s->max_rx_frags = diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index e54276dc1d..749a6938dd 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -1331,10 +1331,23 @@ static inline void nvme_blk_write(BlockBackend *blk, int64_t offset, } } +static void nvme_update_cq_eventidx(const NvmeCQueue *cq) +{ + uint32_t v = cpu_to_le32(cq->head); + + //not in 7.2: trace_pci_nvme_update_cq_eventidx(cq->cqid, cq->head); + + pci_dma_write(PCI_DEVICE(cq->ctrl), cq->ei_addr, &v, sizeof(v)); +} + static void nvme_update_cq_head(NvmeCQueue *cq) { - pci_dma_read(&cq->ctrl->parent_obj, cq->db_addr, &cq->head, - sizeof(cq->head)); + uint32_t v; + + pci_dma_read(&cq->ctrl->parent_obj, cq->db_addr, &v, sizeof(v)); + + cq->head = le32_to_cpu(v); + trace_pci_nvme_shadow_doorbell_cq(cq->cqid, cq->head); } @@ -1351,6 +1364,7 @@ static void nvme_post_cqes(void *opaque) hwaddr addr; if (n->dbbuf_enabled) { + nvme_update_cq_eventidx(cq); nvme_update_cq_head(cq); } @@ -2477,6 +2491,9 @@ static uint16_t nvme_dsm(NvmeCtrl *n, NvmeRequest *req) status = nvme_h2c(n, (uint8_t *)iocb->range, sizeof(NvmeDsmRange) * nr, req); if (status) { + g_free(iocb->range); + qemu_aio_unref(iocb); + return status; } @@ -6141,15 +6158,21 @@ static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeRequest *req) static void nvme_update_sq_eventidx(const NvmeSQueue *sq) { - pci_dma_write(&sq->ctrl->parent_obj, sq->ei_addr, &sq->tail, - sizeof(sq->tail)); + uint32_t v = cpu_to_le32(sq->tail); + + pci_dma_write(&sq->ctrl->parent_obj, sq->ei_addr, &v, sizeof(v)); + trace_pci_nvme_eventidx_sq(sq->sqid, sq->tail); } static void nvme_update_sq_tail(NvmeSQueue *sq) { - pci_dma_read(&sq->ctrl->parent_obj, sq->db_addr, &sq->tail, - sizeof(sq->tail)); + uint32_t v; + + pci_dma_read(&sq->ctrl->parent_obj, sq->db_addr, &v, sizeof(v)); + + sq->tail = le32_to_cpu(v); + trace_pci_nvme_shadow_doorbell_sq(sq->sqid, sq->tail); } diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 6edf5ea3e9..371a45dfe2 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -693,12 +693,12 @@ static const VMStateDescription vmstate_fw_cfg = { } }; -void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t key, - FWCfgCallback select_cb, - FWCfgWriteCallback write_cb, - void *callback_opaque, - void *data, size_t len, - bool read_only) +static void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t key, + FWCfgCallback select_cb, + FWCfgWriteCallback write_cb, + void *callback_opaque, + void *data, size_t len, + bool read_only) { int arch = !!(key & FW_CFG_ARCH_LOCAL); diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index dc86c1c7db..fbdc48911e 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -806,6 +806,8 @@ static void __cpu_ppc_store_decr(PowerPCCPU *cpu, uint64_t *nextp, int64_t signed_decr; /* Truncate value to decr_width and sign extend for simplicity */ + value = extract64(value, 0, nr_bits); + decr = extract64(decr, 0, nr_bits); signed_value = sextract64(value, 0, nr_bits); signed_decr = sextract64(decr, 0, nr_bits); diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index fcbe4c5837..ec8d9584fb 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -271,9 +271,11 @@ static void ibm_40p_init(MachineState *machine) } /* PCI -> ISA bridge */ - i82378_dev = DEVICE(pci_create_simple(pci_bus, PCI_DEVFN(11, 0), "i82378")); + i82378_dev = DEVICE(pci_new(PCI_DEVFN(11, 0), "i82378")); qdev_connect_gpio_out(i82378_dev, 0, qdev_get_gpio_in(DEVICE(cpu), PPC6xx_INPUT_INT)); + qdev_realize_and_unref(i82378_dev, BUS(pci_bus), &error_fatal); + sysbus_connect_irq(pcihost, 0, qdev_get_gpio_in(i82378_dev, 15)); isa_bus = ISA_BUS(qdev_get_child_bus(i82378_dev, "isa.0")); diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c index da7ddfa548..89db963c46 100644 --- a/hw/rdma/vmw/pvrdma_cmd.c +++ b/hw/rdma/vmw/pvrdma_cmd.c @@ -796,6 +796,12 @@ int pvrdma_exec_cmd(PVRDMADev *dev) dsr_info = &dev->dsr_info; + if (!dsr_info->dsr) { + /* Buggy or malicious guest driver */ + rdma_error_report("Exec command without dsr, req or rsp buffers"); + goto out; + } + if (dsr_info->req->hdr.cmd >= sizeof(cmd_handlers) / sizeof(struct cmd_handler)) { rdma_error_report("Unsupported command"); diff --git a/hw/remote/trace-events b/hw/remote/trace-events index c167b3c7a5..0d1b7d56a5 100644 --- a/hw/remote/trace-events +++ b/hw/remote/trace-events @@ -5,8 +5,8 @@ mpqemu_recv_io_error(int cmd, int size, int nfds) "failed to receive %d size %d, # vfio-user-obj.c vfu_prop(const char *prop, const char *val) "vfu: setting %s as %s" -vfu_cfg_read(uint32_t offset, uint32_t val) "vfu: cfg: 0x%u -> 0x%x" -vfu_cfg_write(uint32_t offset, uint32_t val) "vfu: cfg: 0x%u <- 0x%x" +vfu_cfg_read(uint32_t offset, uint32_t val) "vfu: cfg: 0x%x -> 0x%x" +vfu_cfg_write(uint32_t offset, uint32_t val) "vfu: cfg: 0x%x <- 0x%x" vfu_dma_register(uint64_t gpa, size_t len) "vfu: registering GPA 0x%"PRIx64", %zu bytes" vfu_dma_unregister(uint64_t gpa) "vfu: unregistering GPA 0x%"PRIx64"" vfu_bar_register(int i, uint64_t addr, uint64_t size) "vfu: BAR %d: addr 0x%"PRIx64" size 0x%"PRIx64"" diff --git a/hw/riscv/numa.c b/hw/riscv/numa.c index 7fe92d402f..edf6750f54 100644 --- a/hw/riscv/numa.c +++ b/hw/riscv/numa.c @@ -207,6 +207,12 @@ int64_t riscv_numa_get_default_cpu_node_id(const MachineState *ms, int idx) { int64_t nidx = 0; + if (ms->numa_state->num_nodes > ms->smp.cpus) { + error_report("Number of NUMA nodes (%d)" + " cannot exceed the number of available CPUs (%d).", + ms->numa_state->num_nodes, ms->smp.max_cpus); + exit(EXIT_FAILURE); + } if (ms->numa_state->num_nodes) { nidx = idx / (ms->smp.cpus / ms->numa_state->num_nodes); if (ms->numa_state->num_nodes <= nidx) { diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index 50979640c3..42532c4744 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -1134,15 +1134,24 @@ static void lsi_execute_script(LSIState *s) uint32_t addr, addr_high; int opcode; int insn_processed = 0; + static int reentrancy_level; + + reentrancy_level++; s->istat1 |= LSI_ISTAT1_SRUN; again: - if (++insn_processed > LSI_MAX_INSN) { - /* Some windows drivers make the device spin waiting for a memory - location to change. If we have been executed a lot of code then - assume this is the case and force an unexpected device disconnect. - This is apparently sufficient to beat the drivers into submission. - */ + /* + * Some windows drivers make the device spin waiting for a memory location + * to change. If we have executed more than LSI_MAX_INSN instructions then + * assume this is the case and force an unexpected device disconnect. This + * is apparently sufficient to beat the drivers into submission. + * + * Another issue (CVE-2023-0330) can occur if the script is programmed to + * trigger itself again and again. Avoid this problem by stopping after + * being called multiple times in a reentrant way (8 is an arbitrary value + * which should be enough for all valid use cases). + */ + if (++insn_processed > LSI_MAX_INSN || reentrancy_level > 8) { if (!(s->sien0 & LSI_SIST0_UDC)) { qemu_log_mask(LOG_GUEST_ERROR, "lsi_scsi: inf. loop with UDC masked"); @@ -1596,6 +1605,8 @@ again: } } trace_lsi_execute_script_stop(); + + reentrancy_level--; } static uint8_t lsi_reg_readb(LSIState *s, int offset) diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 92cce20a4d..d513870181 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -190,12 +190,16 @@ static int scsi_handle_inquiry_reply(SCSIGenericReq *r, SCSIDevice *s, int len) if ((s->type == TYPE_DISK || s->type == TYPE_ZBC) && (r->req.cmd.buf[1] & 0x01)) { page = r->req.cmd.buf[2]; - if (page == 0xb0) { + if (page == 0xb0 && r->buflen >= 8) { + uint8_t buf[16] = {}; + uint8_t buf_used = MIN(r->buflen, 16); uint64_t max_transfer = calculate_max_transfer(s); - stl_be_p(&r->buf[8], max_transfer); - /* Also take care of the opt xfer len. */ - stl_be_p(&r->buf[12], - MIN_NON_ZERO(max_transfer, ldl_be_p(&r->buf[12]))); + + memcpy(buf, r->buf, buf_used); + stl_be_p(&buf[8], max_transfer); + stl_be_p(&buf[12], MIN_NON_ZERO(max_transfer, ldl_be_p(&buf[12]))); + memcpy(r->buf + 8, buf + 8, buf_used - 8); + } else if (s->needs_vpd_bl_emulation && page == 0x00 && r->buflen >= 4) { /* * Now we're capable of supplying the VPD Block Limits diff --git a/hw/sd/allwinner-sdhost.c b/hw/sd/allwinner-sdhost.c index 51e5e90830..92a0f42708 100644 --- a/hw/sd/allwinner-sdhost.c +++ b/hw/sd/allwinner-sdhost.c @@ -302,6 +302,30 @@ static void allwinner_sdhost_auto_stop(AwSdHostState *s) } } +static void read_descriptor(AwSdHostState *s, hwaddr desc_addr, + TransferDescriptor *desc) +{ + uint32_t desc_words[4]; + dma_memory_read(&s->dma_as, desc_addr, &desc_words, sizeof(desc_words), + MEMTXATTRS_UNSPECIFIED); + desc->status = le32_to_cpu(desc_words[0]); + desc->size = le32_to_cpu(desc_words[1]); + desc->addr = le32_to_cpu(desc_words[2]); + desc->next = le32_to_cpu(desc_words[3]); +} + +static void write_descriptor(AwSdHostState *s, hwaddr desc_addr, + const TransferDescriptor *desc) +{ + uint32_t desc_words[4]; + desc_words[0] = cpu_to_le32(desc->status); + desc_words[1] = cpu_to_le32(desc->size); + desc_words[2] = cpu_to_le32(desc->addr); + desc_words[3] = cpu_to_le32(desc->next); + dma_memory_write(&s->dma_as, desc_addr, &desc_words, sizeof(desc_words), + MEMTXATTRS_UNSPECIFIED); +} + static uint32_t allwinner_sdhost_process_desc(AwSdHostState *s, hwaddr desc_addr, TransferDescriptor *desc, @@ -312,9 +336,7 @@ static uint32_t allwinner_sdhost_process_desc(AwSdHostState *s, uint32_t num_bytes = max_bytes; uint8_t buf[1024]; - /* Read descriptor */ - dma_memory_read(&s->dma_as, desc_addr, desc, sizeof(*desc), - MEMTXATTRS_UNSPECIFIED); + read_descriptor(s, desc_addr, desc); if (desc->size == 0) { desc->size = klass->max_desc_size; } else if (desc->size > klass->max_desc_size) { @@ -356,8 +378,7 @@ static uint32_t allwinner_sdhost_process_desc(AwSdHostState *s, /* Clear hold flag and flush descriptor */ desc->status &= ~DESC_STATUS_HOLD; - dma_memory_write(&s->dma_as, desc_addr, desc, sizeof(*desc), - MEMTXATTRS_UNSPECIFIED); + write_descriptor(s, desc_addr, desc); return num_done; } diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index b4243de735..66a020999b 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -749,14 +749,16 @@ static void smbios_build_type_4_table(MachineState *ms, unsigned instance) t->core_count = (ms->smp.cores > 255) ? 0xFF : ms->smp.cores; t->core_enabled = t->core_count; - t->core_count2 = t->core_enabled2 = cpu_to_le16(ms->smp.cores); - t->thread_count = (ms->smp.threads > 255) ? 0xFF : ms->smp.threads; - t->thread_count2 = cpu_to_le16(ms->smp.threads); t->processor_characteristics = cpu_to_le16(0x02); /* Unknown */ t->processor_family2 = cpu_to_le16(0x01); /* Other */ + if (tbl_len == SMBIOS_TYPE_4_LEN_V30) { + t->core_count2 = t->core_enabled2 = cpu_to_le16(ms->smp.cores); + t->thread_count2 = cpu_to_le16(ms->smp.threads); + } + SMBIOS_BUILD_TABLE_POST; smbios_type4_count++; } diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 9520471be2..5f88ffdef8 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -352,6 +352,16 @@ static const VMStateDescription vmstate_hpet = { } }; +static void hpet_arm(HPETTimer *t, uint64_t ticks) +{ + if (ticks < ns_to_ticks(INT64_MAX / 2)) { + timer_mod(t->qemu_timer, + qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + ticks_to_ns(ticks)); + } else { + timer_del(t->qemu_timer); + } +} + /* * timer expiration callback */ @@ -374,13 +384,11 @@ static void hpet_timer(void *opaque) } } diff = hpet_calculate_diff(t, cur_tick); - timer_mod(t->qemu_timer, - qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + (int64_t)ticks_to_ns(diff)); + hpet_arm(t, diff); } else if (t->config & HPET_TN_32BIT && !timer_is_periodic(t)) { if (t->wrap_flag) { diff = hpet_calculate_diff(t, cur_tick); - timer_mod(t->qemu_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + - (int64_t)ticks_to_ns(diff)); + hpet_arm(t, diff); t->wrap_flag = 0; } } @@ -407,8 +415,7 @@ static void hpet_set_timer(HPETTimer *t) t->wrap_flag = 1; } } - timer_mod(t->qemu_timer, - qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + (int64_t)ticks_to_ns(diff)); + hpet_arm(t, diff); } static void hpet_del_timer(HPETTimer *t) diff --git a/hw/timer/nrf51_timer.c b/hw/timer/nrf51_timer.c index 42be79c736..50c6772383 100644 --- a/hw/timer/nrf51_timer.c +++ b/hw/timer/nrf51_timer.c @@ -45,7 +45,12 @@ static uint32_t update_counter(NRF51TimerState *s, int64_t now) uint32_t ticks = ns_to_ticks(s, now - s->update_counter_ns); s->counter = (s->counter + ticks) % BIT(bitwidths[s->bitmode]); - s->update_counter_ns = now; + /* + * Only advance the sync time to the timestamp of the last tick, + * not all the way to 'now', so we don't lose time if we do + * multiple resyncs in a single tick. + */ + s->update_counter_ns += ticks_to_ns(s, ticks); return ticks; } diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 9d68036d23..c3ab762f54 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -1210,6 +1210,8 @@ static void ohci_frame_boundary(void *opaque) /* Increment frame number and take care of endianness. */ ohci->frame_number = (ohci->frame_number + 1) & 0xffff; hcca.frame = cpu_to_le16(ohci->frame_number); + /* When the HC updates frame number, set pad to 0. Ref OHCI Spec 4.4.1*/ + hcca.pad = 0; if (ohci->done_count == 0 && !(ohci->intr_status & OHCI_INTR_WD)) { if (!ohci->done) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 939dcc3d4a..92a45de4c3 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -663,6 +663,8 @@ static void vfio_msi_enable(VFIOPCIDevice *vdev) vfio_disable_interrupts(vdev); + vdev->nr_vectors = msi_nr_vectors_allocated(&vdev->pdev); +retry: /* * Setting vector notifiers needs to enable route for each vector. * Deferring to commit the KVM routes once rather than per vector @@ -670,8 +672,6 @@ static void vfio_msi_enable(VFIOPCIDevice *vdev) */ vfio_prepare_kvm_msi_virq_batch(vdev); - vdev->nr_vectors = msi_nr_vectors_allocated(&vdev->pdev); -retry: vdev->msi_vectors = g_new0(VFIOMSIVector, vdev->nr_vectors); for (i = 0; i < vdev->nr_vectors; i++) { @@ -3159,7 +3159,9 @@ static void vfio_realize(PCIDevice *pdev, Error **errp) out_deregister: pci_device_set_intx_routing_notifier(&vdev->pdev, NULL); - kvm_irqchip_remove_change_notifier(&vdev->irqchip_change_notifier); + if (vdev->irqchip_change_notifier.notify) { + kvm_irqchip_remove_change_notifier(&vdev->irqchip_change_notifier); + } out_teardown: vfio_teardown_msi(vdev); vfio_bars_exit(vdev); diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-virtqueue.c index 5bd14cad96..d422418f2d 100644 --- a/hw/virtio/vhost-shadow-virtqueue.c +++ b/hw/virtio/vhost-shadow-virtqueue.c @@ -68,7 +68,7 @@ bool vhost_svq_valid_features(uint64_t features, Error **errp) */ static uint16_t vhost_svq_available_slots(const VhostShadowVirtqueue *svq) { - return svq->vring.num - (svq->shadow_avail_idx - svq->shadow_used_idx); + return svq->num_free; } /** @@ -263,6 +263,7 @@ int vhost_svq_add(VhostShadowVirtqueue *svq, const struct iovec *out_sg, return -EINVAL; } + svq->num_free -= ndescs; svq->desc_state[qemu_head].elem = elem; svq->desc_state[qemu_head].ndescs = ndescs; vhost_svq_kick(svq); @@ -449,6 +450,7 @@ static VirtQueueElement *vhost_svq_get_buf(VhostShadowVirtqueue *svq, last_used_chain = vhost_svq_last_desc_of_chain(svq, num, used_elem.id); svq->desc_next[last_used_chain] = svq->free_head; svq->free_head = used_elem.id; + svq->num_free += num; *len = used_elem.len; return g_steal_pointer(&svq->desc_state[used_elem.id].elem); @@ -522,7 +524,7 @@ static void vhost_svq_flush(VhostShadowVirtqueue *svq, size_t vhost_svq_poll(VhostShadowVirtqueue *svq) { int64_t start_us = g_get_monotonic_time(); - uint32_t len; + uint32_t len = 0; do { if (vhost_svq_more_used(svq)) { @@ -656,6 +658,7 @@ void vhost_svq_start(VhostShadowVirtqueue *svq, VirtIODevice *vdev, svq->vq = vq; svq->vring.num = virtio_queue_get_num(vdev, virtio_get_queue_index(vq)); + svq->num_free = svq->vring.num; driver_size = vhost_svq_driver_area_size(svq); device_size = vhost_svq_device_area_size(svq); svq->vring.desc = qemu_memalign(qemu_real_host_page_size(), driver_size); diff --git a/hw/virtio/vhost-shadow-virtqueue.h b/hw/virtio/vhost-shadow-virtqueue.h index d04c34a589..328a7fc075 100644 --- a/hw/virtio/vhost-shadow-virtqueue.h +++ b/hw/virtio/vhost-shadow-virtqueue.h @@ -107,6 +107,9 @@ typedef struct VhostShadowVirtqueue { /* Next head to consume from the device */ uint16_t last_used_idx; + + /* Size of SVQ vring free descriptors */ + uint16_t num_free; } VhostShadowVirtqueue; bool vhost_svq_valid_features(uint64_t features, Error **errp); diff --git a/hw/virtio/vhost-user-gpio.c b/hw/virtio/vhost-user-gpio.c index b7b82a1099..97145376eb 100644 --- a/hw/virtio/vhost-user-gpio.c +++ b/hw/virtio/vhost-user-gpio.c @@ -16,6 +16,7 @@ #include "trace.h" #define REALIZE_CONNECTION_RETRIES 3 +#define VHOST_NVQS 2 /* Features required from VirtIO */ static const int feature_bits[] = { @@ -198,8 +199,7 @@ static void do_vhost_user_cleanup(VirtIODevice *vdev, VHostUserGPIO *gpio) { virtio_delete_queue(gpio->command_vq); virtio_delete_queue(gpio->interrupt_vq); - g_free(gpio->vhost_dev.vqs); - gpio->vhost_dev.vqs = NULL; + g_free(gpio->vhost_vqs); virtio_cleanup(vdev); vhost_user_cleanup(&gpio->vhost_user); } @@ -219,6 +219,9 @@ static int vu_gpio_connect(DeviceState *dev, Error **errp) vhost_dev_set_config_notifier(vhost_dev, &gpio_ops); gpio->vhost_user.supports_config = true; + gpio->vhost_dev.nvqs = VHOST_NVQS; + gpio->vhost_dev.vqs = gpio->vhost_vqs; + ret = vhost_dev_init(vhost_dev, &gpio->vhost_user, VHOST_BACKEND_TYPE_USER, 0, errp); if (ret < 0) { @@ -337,10 +340,9 @@ static void vu_gpio_device_realize(DeviceState *dev, Error **errp) virtio_init(vdev, VIRTIO_ID_GPIO, sizeof(gpio->config)); - gpio->vhost_dev.nvqs = 2; gpio->command_vq = virtio_add_queue(vdev, 256, vu_gpio_handle_output); gpio->interrupt_vq = virtio_add_queue(vdev, 256, vu_gpio_handle_output); - gpio->vhost_dev.vqs = g_new0(struct vhost_virtqueue, gpio->vhost_dev.nvqs); + gpio->vhost_vqs = g_new0(struct vhost_virtqueue, VHOST_NVQS); gpio->connected = false; diff --git a/hw/virtio/vhost-user-i2c.c b/hw/virtio/vhost-user-i2c.c index dc5c828ba6..60eaf0d95b 100644 --- a/hw/virtio/vhost-user-i2c.c +++ b/hw/virtio/vhost-user-i2c.c @@ -143,8 +143,6 @@ static void do_vhost_user_cleanup(VirtIODevice *vdev, VHostUserI2C *i2c) vhost_user_cleanup(&i2c->vhost_user); virtio_delete_queue(i2c->vq); virtio_cleanup(vdev); - g_free(i2c->vhost_dev.vqs); - i2c->vhost_dev.vqs = NULL; } static int vu_i2c_connect(DeviceState *dev) @@ -228,6 +226,7 @@ static void vu_i2c_device_realize(DeviceState *dev, Error **errp) ret = vhost_dev_init(&i2c->vhost_dev, &i2c->vhost_user, VHOST_BACKEND_TYPE_USER, 0, errp); if (ret < 0) { + g_free(i2c->vhost_dev.vqs); do_vhost_user_cleanup(vdev, i2c); } @@ -239,10 +238,12 @@ static void vu_i2c_device_unrealize(DeviceState *dev) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); VHostUserI2C *i2c = VHOST_USER_I2C(dev); + struct vhost_virtqueue *vhost_vqs = i2c->vhost_dev.vqs; /* This will stop vhost backend if appropriate. */ vu_i2c_set_status(vdev, 0); vhost_dev_cleanup(&i2c->vhost_dev); + g_free(vhost_vqs); do_vhost_user_cleanup(vdev, i2c); } diff --git a/hw/virtio/vhost-user-rng.c b/hw/virtio/vhost-user-rng.c index 201a39e220..efc54cd3fb 100644 --- a/hw/virtio/vhost-user-rng.c +++ b/hw/virtio/vhost-user-rng.c @@ -229,6 +229,7 @@ static void vu_rng_device_realize(DeviceState *dev, Error **errp) return; vhost_dev_init_failed: + g_free(rng->vhost_dev.vqs); virtio_delete_queue(rng->req_vq); virtio_add_queue_failed: virtio_cleanup(vdev); @@ -239,12 +240,12 @@ static void vu_rng_device_unrealize(DeviceState *dev) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); VHostUserRNG *rng = VHOST_USER_RNG(dev); + struct vhost_virtqueue *vhost_vqs = rng->vhost_dev.vqs; vu_rng_set_status(vdev, 0); vhost_dev_cleanup(&rng->vhost_dev); - g_free(rng->vhost_dev.vqs); - rng->vhost_dev.vqs = NULL; + g_free(vhost_vqs); virtio_delete_queue(rng->req_vq); virtio_cleanup(vdev); vhost_user_cleanup(&rng->vhost_user); diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 8f635844af..d92b026e1c 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -305,19 +305,8 @@ static int vhost_user_read_header(struct vhost_dev *dev, VhostUserMsg *msg) return 0; } -struct vhost_user_read_cb_data { - struct vhost_dev *dev; - VhostUserMsg *msg; - GMainLoop *loop; - int ret; -}; - -static gboolean vhost_user_read_cb(void *do_not_use, GIOCondition condition, - gpointer opaque) +static int vhost_user_read(struct vhost_dev *dev, VhostUserMsg *msg) { - struct vhost_user_read_cb_data *data = opaque; - struct vhost_dev *dev = data->dev; - VhostUserMsg *msg = data->msg; struct vhost_user *u = dev->opaque; CharBackend *chr = u->user->chr; uint8_t *p = (uint8_t *) msg; @@ -325,8 +314,7 @@ static gboolean vhost_user_read_cb(void *do_not_use, GIOCondition condition, r = vhost_user_read_header(dev, msg); if (r < 0) { - data->ret = r; - goto end; + return r; } /* validate message size is sane */ @@ -334,8 +322,7 @@ static gboolean vhost_user_read_cb(void *do_not_use, GIOCondition condition, error_report("Failed to read msg header." " Size %d exceeds the maximum %zu.", msg->hdr.size, VHOST_USER_PAYLOAD_SIZE); - data->ret = -EPROTO; - goto end; + return -EPROTO; } if (msg->hdr.size) { @@ -346,84 +333,11 @@ static gboolean vhost_user_read_cb(void *do_not_use, GIOCondition condition, int saved_errno = errno; error_report("Failed to read msg payload." " Read %d instead of %d.", r, msg->hdr.size); - data->ret = r < 0 ? -saved_errno : -EIO; - goto end; + return r < 0 ? -saved_errno : -EIO; } } -end: - g_main_loop_quit(data->loop); - return G_SOURCE_REMOVE; -} - -static gboolean slave_read(QIOChannel *ioc, GIOCondition condition, - gpointer opaque); - -/* - * This updates the read handler to use a new event loop context. - * Event sources are removed from the previous context : this ensures - * that events detected in the previous context are purged. They will - * be re-detected and processed in the new context. - */ -static void slave_update_read_handler(struct vhost_dev *dev, - GMainContext *ctxt) -{ - struct vhost_user *u = dev->opaque; - - if (!u->slave_ioc) { - return; - } - - if (u->slave_src) { - g_source_destroy(u->slave_src); - g_source_unref(u->slave_src); - } - - u->slave_src = qio_channel_add_watch_source(u->slave_ioc, - G_IO_IN | G_IO_HUP, - slave_read, dev, NULL, - ctxt); -} - -static int vhost_user_read(struct vhost_dev *dev, VhostUserMsg *msg) -{ - struct vhost_user *u = dev->opaque; - CharBackend *chr = u->user->chr; - GMainContext *prev_ctxt = chr->chr->gcontext; - GMainContext *ctxt = g_main_context_new(); - GMainLoop *loop = g_main_loop_new(ctxt, FALSE); - struct vhost_user_read_cb_data data = { - .dev = dev, - .loop = loop, - .msg = msg, - .ret = 0 - }; - - /* - * We want to be able to monitor the slave channel fd while waiting - * for chr I/O. This requires an event loop, but we can't nest the - * one to which chr is currently attached : its fd handlers might not - * be prepared for re-entrancy. So we create a new one and switch chr - * to use it. - */ - slave_update_read_handler(dev, ctxt); - qemu_chr_be_update_read_handlers(chr->chr, ctxt); - qemu_chr_fe_add_watch(chr, G_IO_IN | G_IO_HUP, vhost_user_read_cb, &data); - - g_main_loop_run(loop); - - /* - * Restore the previous event loop context. This also destroys/recreates - * event sources : this guarantees that all pending events in the original - * context that have been processed by the nested loop are purged. - */ - qemu_chr_be_update_read_handlers(chr->chr, prev_ctxt); - slave_update_read_handler(dev, NULL); - - g_main_loop_unref(loop); - g_main_context_unref(ctxt); - - return data.ret; + return 0; } static int process_message_reply(struct vhost_dev *dev, @@ -1802,7 +1716,9 @@ static int vhost_setup_slave_channel(struct vhost_dev *dev) return -ECONNREFUSED; } u->slave_ioc = ioc; - slave_update_read_handler(dev, NULL); + u->slave_src = qio_channel_add_watch_source(u->slave_ioc, + G_IO_IN | G_IO_HUP, + slave_read, dev, NULL, NULL); if (reply_supported) { msg.hdr.flags |= VHOST_USER_NEED_REPLY_MASK; @@ -2108,8 +2024,8 @@ static int vhost_user_backend_init(struct vhost_dev *dev, void *opaque, } else { if (virtio_has_feature(protocol_features, VHOST_USER_PROTOCOL_F_CONFIG)) { - warn_reportf_err(*errp, "vhost-user backend supports " - "VHOST_USER_PROTOCOL_F_CONFIG but QEMU does not."); + warn_report("vhost-user backend supports " + "VHOST_USER_PROTOCOL_F_CONFIG but QEMU does not."); protocol_features &= ~(1ULL << VHOST_USER_PROTOCOL_F_CONFIG); } } diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 7468e44b87..03c78d25d8 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -707,26 +707,11 @@ static int vhost_vdpa_get_device_id(struct vhost_dev *dev, return ret; } -static void vhost_vdpa_reset_svq(struct vhost_vdpa *v) -{ - if (!v->shadow_vqs_enabled) { - return; - } - - for (unsigned i = 0; i < v->shadow_vqs->len; ++i) { - VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, i); - vhost_svq_stop(svq); - } -} - static int vhost_vdpa_reset_device(struct vhost_dev *dev) { - struct vhost_vdpa *v = dev->opaque; int ret; uint8_t status = 0; - vhost_vdpa_reset_svq(v); - ret = vhost_vdpa_call(dev, VHOST_VDPA_SET_STATUS, &status); trace_vhost_vdpa_reset_device(dev, status); return ret; @@ -1088,6 +1073,8 @@ static void vhost_vdpa_svqs_stop(struct vhost_dev *dev) for (unsigned i = 0; i < v->shadow_vqs->len; ++i) { VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, i); + + vhost_svq_stop(svq); vhost_vdpa_svq_unmap_rings(dev, svq); } } diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 7fb008bc9e..f38997b3f6 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -20,6 +20,7 @@ #include "qemu/range.h" #include "qemu/error-report.h" #include "qemu/memfd.h" +#include "qemu/log.h" #include "standard-headers/linux/vhost_types.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" @@ -106,6 +107,24 @@ static void vhost_dev_sync_region(struct vhost_dev *dev, } } +static bool vhost_dev_has_iommu(struct vhost_dev *dev) +{ + VirtIODevice *vdev = dev->vdev; + + /* + * For vhost, VIRTIO_F_IOMMU_PLATFORM means the backend support + * incremental memory mapping API via IOTLB API. For platform that + * does not have IOMMU, there's no need to enable this feature + * which may cause unnecessary IOTLB miss/update transactions. + */ + if (vdev) { + return virtio_bus_device_iommu_enabled(vdev) && + virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM); + } else { + return false; + } +} + static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, MemoryRegionSection *section, hwaddr first, @@ -137,8 +156,51 @@ static int vhost_sync_dirty_bitmap(struct vhost_dev *dev, continue; } - vhost_dev_sync_region(dev, section, start_addr, end_addr, vq->used_phys, - range_get_last(vq->used_phys, vq->used_size)); + if (vhost_dev_has_iommu(dev)) { + IOMMUTLBEntry iotlb; + hwaddr used_phys = vq->used_phys, used_size = vq->used_size; + hwaddr phys, s, offset; + + while (used_size) { + rcu_read_lock(); + iotlb = address_space_get_iotlb_entry(dev->vdev->dma_as, + used_phys, + true, + MEMTXATTRS_UNSPECIFIED); + rcu_read_unlock(); + + if (!iotlb.target_as) { + qemu_log_mask(LOG_GUEST_ERROR, "translation " + "failure for used_iova %"PRIx64"\n", + used_phys); + return -EINVAL; + } + + offset = used_phys & iotlb.addr_mask; + phys = iotlb.translated_addr + offset; + + /* + * Distance from start of used ring until last byte of + * IOMMU page. + */ + s = iotlb.addr_mask - offset; + /* + * Size of used ring, or of the part of it until end + * of IOMMU page. To avoid zero result, do the adding + * outside of MIN(). + */ + s = MIN(s, used_size - 1) + 1; + + vhost_dev_sync_region(dev, section, start_addr, end_addr, phys, + range_get_last(phys, s)); + used_size -= s; + used_phys += s; + } + } else { + vhost_dev_sync_region(dev, section, start_addr, + end_addr, vq->used_phys, + range_get_last(vq->used_phys, vq->used_size)); + } } return 0; } @@ -306,24 +368,6 @@ static inline void vhost_dev_log_resize(struct vhost_dev *dev, uint64_t size) dev->log_size = size; } -static bool vhost_dev_has_iommu(struct vhost_dev *dev) -{ - VirtIODevice *vdev = dev->vdev; - - /* - * For vhost, VIRTIO_F_IOMMU_PLATFORM means the backend support - * incremental memory mapping API via IOTLB API. For platform that - * does not have IOMMU, there's no need to enable this feature - * which may cause unnecessary IOTLB miss/update transactions. - */ - if (vdev) { - return virtio_bus_device_iommu_enabled(vdev) && - virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM); - } else { - return false; - } -} - static void *vhost_memory_map(struct vhost_dev *dev, hwaddr addr, hwaddr *plen, bool is_write) { @@ -1890,6 +1934,9 @@ fail_vq: } fail_mem: + if (vhost_dev_has_iommu(hdev)) { + memory_listener_unregister(&hdev->iommu_listener); + } fail_features: vdev->vhost_started = false; hdev->started = false; diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c index 97da74e719..a6dbdd32da 100644 --- a/hw/virtio/virtio-crypto.c +++ b/hw/virtio/virtio-crypto.c @@ -476,15 +476,17 @@ static void virtio_crypto_free_request(VirtIOCryptoReq *req) size_t max_len; CryptoDevBackendSymOpInfo *op_info = req->op_info.u.sym_op_info; - max_len = op_info->iv_len + - op_info->aad_len + - op_info->src_len + - op_info->dst_len + - op_info->digest_result_len; - - /* Zeroize and free request data structure */ - memset(op_info, 0, sizeof(*op_info) + max_len); - g_free(op_info); + if (op_info) { + max_len = op_info->iv_len + + op_info->aad_len + + op_info->src_len + + op_info->dst_len + + op_info->digest_result_len; + + /* Zeroize and free request data structure */ + memset(op_info, 0, sizeof(*op_info) + max_len); + g_free(op_info); + } } else if (req->flags == CRYPTODEV_BACKEND_ALG_ASYM) { CryptoDevBackendAsymOpInfo *op_info = req->op_info.u.asym_op_info; if (op_info) { diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index ed170def48..56db586c89 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -235,7 +235,7 @@ static int virtio_mem_for_each_plugged_section(const VirtIOMEM *vmem, uint64_t offset, size; int ret = 0; - first_bit = s->offset_within_region / vmem->bitmap_size; + first_bit = s->offset_within_region / vmem->block_size; first_bit = find_next_bit(vmem->bitmap, vmem->bitmap_size, first_bit); while (first_bit < vmem->bitmap_size) { MemoryRegionSection tmp = *s; @@ -267,7 +267,7 @@ static int virtio_mem_for_each_unplugged_section(const VirtIOMEM *vmem, uint64_t offset, size; int ret = 0; - first_bit = s->offset_within_region / vmem->bitmap_size; + first_bit = s->offset_within_region / vmem->block_size; first_bit = find_next_zero_bit(vmem->bitmap, vmem->bitmap_size, first_bit); while (first_bit < vmem->bitmap_size) { MemoryRegionSection tmp = *s; @@ -341,7 +341,7 @@ static int virtio_mem_notify_plug(VirtIOMEM *vmem, uint64_t offset, if (ret) { /* Notify all already-notified listeners. */ QLIST_FOREACH(rdl2, &vmem->rdl_list, next) { - MemoryRegionSection tmp = *rdl->section; + MemoryRegionSection tmp = *rdl2->section; if (rdl2 == rdl) { break; diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index eb6347ab5d..384c8f0f08 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1478,7 +1478,7 @@ static void virtqueue_split_get_avail_bytes(VirtQueue *vq, VRingMemoryRegionCaches *caches) { VirtIODevice *vdev = vq->vdev; - unsigned int max, idx; + unsigned int idx; unsigned int total_bufs, in_total, out_total; MemoryRegionCache indirect_desc_cache = MEMORY_REGION_CACHE_INVALID; int64_t len = 0; @@ -1487,13 +1487,12 @@ static void virtqueue_split_get_avail_bytes(VirtQueue *vq, idx = vq->last_avail_idx; total_bufs = in_total = out_total = 0; - max = vq->vring.num; - while ((rc = virtqueue_num_heads(vq, idx)) > 0) { MemoryRegionCache *desc_cache = &caches->desc; unsigned int num_bufs; VRingDesc desc; unsigned int i; + unsigned int max = vq->vring.num; num_bufs = total_bufs; @@ -1615,7 +1614,7 @@ static void virtqueue_packed_get_avail_bytes(VirtQueue *vq, VRingMemoryRegionCaches *caches) { VirtIODevice *vdev = vq->vdev; - unsigned int max, idx; + unsigned int idx; unsigned int total_bufs, in_total, out_total; MemoryRegionCache *desc_cache; MemoryRegionCache indirect_desc_cache = MEMORY_REGION_CACHE_INVALID; @@ -1627,14 +1626,14 @@ static void virtqueue_packed_get_avail_bytes(VirtQueue *vq, wrap_counter = vq->last_avail_wrap_counter; total_bufs = in_total = out_total = 0; - max = vq->vring.num; - for (;;) { unsigned int num_bufs = total_bufs; unsigned int i = idx; int rc; + unsigned int max = vq->vring.num; desc_cache = &caches->desc; + vring_packed_desc_read(vdev, &desc, desc_cache, idx, true); if (!is_desc_avail(desc.flags, wrap_counter)) { break; diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 0ec7e52183..5dd706efbf 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -57,6 +57,7 @@ #include #include "hw/pci/pci.h" +#include "hw/pci/pci_bus.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/xen/xen.h" @@ -780,15 +781,6 @@ static void xen_pt_realize(PCIDevice *d, Error **errp) s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function, s->dev.devfn); - xen_host_pci_device_get(&s->real_device, - s->hostaddr.domain, s->hostaddr.bus, - s->hostaddr.slot, s->hostaddr.function, - errp); - if (*errp) { - error_append_hint(errp, "Failed to \"open\" the real pci device"); - return; - } - s->is_virtfn = s->real_device.is_virtfn; if (s->is_virtfn) { XEN_PT_LOG(d, "%04x:%02x:%02x.%d is a SR-IOV Virtual Function\n", @@ -803,8 +795,10 @@ static void xen_pt_realize(PCIDevice *d, Error **errp) s->io_listener = xen_pt_io_listener; /* Setup VGA bios for passthrough GFX */ - if ((s->real_device.domain == 0) && (s->real_device.bus == 0) && - (s->real_device.dev == 2) && (s->real_device.func == 0)) { + if ((s->real_device.domain == XEN_PCI_IGD_DOMAIN) && + (s->real_device.bus == XEN_PCI_IGD_BUS) && + (s->real_device.dev == XEN_PCI_IGD_DEV) && + (s->real_device.func == XEN_PCI_IGD_FN)) { if (!is_igd_vga_passthrough(&s->real_device)) { error_setg(errp, "Need to enable igd-passthru if you're trying" " to passthrough IGD GFX"); @@ -950,11 +944,58 @@ static void xen_pci_passthrough_instance_init(Object *obj) PCI_DEVICE(obj)->cap_present |= QEMU_PCI_CAP_EXPRESS; } +void xen_igd_reserve_slot(PCIBus *pci_bus) +{ + if (!xen_igd_gfx_pt_enabled()) { + return; + } + + XEN_PT_LOG(0, "Reserving PCI slot 2 for IGD\n"); + pci_bus->slot_reserved_mask |= XEN_PCI_IGD_SLOT_MASK; +} + +static void xen_igd_clear_slot(DeviceState *qdev, Error **errp) +{ + ERRP_GUARD(); + PCIDevice *pci_dev = (PCIDevice *)qdev; + XenPCIPassthroughState *s = XEN_PT_DEVICE(pci_dev); + XenPTDeviceClass *xpdc = XEN_PT_DEVICE_GET_CLASS(s); + PCIBus *pci_bus = pci_get_bus(pci_dev); + + xen_host_pci_device_get(&s->real_device, + s->hostaddr.domain, s->hostaddr.bus, + s->hostaddr.slot, s->hostaddr.function, + errp); + if (*errp) { + error_append_hint(errp, "Failed to \"open\" the real pci device"); + return; + } + + if (!(pci_bus->slot_reserved_mask & XEN_PCI_IGD_SLOT_MASK)) { + xpdc->pci_qdev_realize(qdev, errp); + return; + } + + if (is_igd_vga_passthrough(&s->real_device) && + s->real_device.domain == XEN_PCI_IGD_DOMAIN && + s->real_device.bus == XEN_PCI_IGD_BUS && + s->real_device.dev == XEN_PCI_IGD_DEV && + s->real_device.func == XEN_PCI_IGD_FN && + s->real_device.vendor_id == PCI_VENDOR_ID_INTEL) { + pci_bus->slot_reserved_mask &= ~XEN_PCI_IGD_SLOT_MASK; + XEN_PT_LOG(pci_dev, "Intel IGD found, using slot 2\n"); + } + xpdc->pci_qdev_realize(qdev, errp); +} + static void xen_pci_passthrough_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + XenPTDeviceClass *xpdc = XEN_PT_DEVICE_CLASS(klass); + xpdc->pci_qdev_realize = dc->realize; + dc->realize = xen_igd_clear_slot; k->realize = xen_pt_realize; k->exit = xen_pt_unregister_device; k->config_read = xen_pt_pci_read_config; @@ -977,6 +1018,7 @@ static const TypeInfo xen_pci_passthrough_info = { .instance_size = sizeof(XenPCIPassthroughState), .instance_finalize = xen_pci_passthrough_finalize, .class_init = xen_pci_passthrough_class_init, + .class_size = sizeof(XenPTDeviceClass), .instance_init = xen_pci_passthrough_instance_init, .interfaces = (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index e7c4316a7d..292bdf7499 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -41,7 +41,20 @@ typedef struct XenPTReg XenPTReg; #define TYPE_XEN_PT_DEVICE "xen-pci-passthrough" OBJECT_DECLARE_SIMPLE_TYPE(XenPCIPassthroughState, XEN_PT_DEVICE) +#define XEN_PT_DEVICE_CLASS(klass) \ + OBJECT_CLASS_CHECK(XenPTDeviceClass, klass, TYPE_XEN_PT_DEVICE) +#define XEN_PT_DEVICE_GET_CLASS(obj) \ + OBJECT_GET_CLASS(XenPTDeviceClass, obj, TYPE_XEN_PT_DEVICE) + +typedef void (*XenPTQdevRealize)(DeviceState *qdev, Error **errp); + +typedef struct XenPTDeviceClass { + PCIDeviceClass parent_class; + XenPTQdevRealize pci_qdev_realize; +} XenPTDeviceClass; + uint32_t igd_read_opregion(XenPCIPassthroughState *s); +void xen_igd_reserve_slot(PCIBus *pci_bus); void igd_write_opregion(XenPCIPassthroughState *s, uint32_t val); void xen_igd_passthrough_isa_bridge_create(XenPCIPassthroughState *s, XenHostPCIDevice *dev); @@ -76,6 +89,13 @@ typedef int (*xen_pt_conf_byte_read) #define XEN_PCI_INTEL_OPREGION 0xfc +#define XEN_PCI_IGD_DOMAIN 0 +#define XEN_PCI_IGD_BUS 0 +#define XEN_PCI_IGD_DEV 2 +#define XEN_PCI_IGD_FN 0 +#define XEN_PCI_IGD_SLOT_MASK \ + (1UL << PCI_SLOT(PCI_DEVFN(XEN_PCI_IGD_DEV, XEN_PCI_IGD_FN))) + typedef enum { XEN_PT_GRP_TYPE_HARDWIRED = 0, /* 0 Hardwired reg group */ XEN_PT_GRP_TYPE_EMU, /* emul reg group */ diff --git a/hw/xen/xen_pt_stub.c b/hw/xen/xen_pt_stub.c index 2d8cac8d54..5c108446a8 100644 --- a/hw/xen/xen_pt_stub.c +++ b/hw/xen/xen_pt_stub.c @@ -20,3 +20,7 @@ void xen_igd_gfx_pt_set(bool value, Error **errp) error_setg(errp, "Xen PCI passthrough support not built in"); } } + +void xen_igd_reserve_slot(PCIBus *pci_bus) +{ +} diff --git a/include/hw/arm/boot.h b/include/hw/arm/boot.h index f18cc3064f..80c492d742 100644 --- a/include/hw/arm/boot.h +++ b/include/hw/arm/boot.h @@ -183,4 +183,53 @@ void arm_write_secure_board_setup_dummy_smc(ARMCPU *cpu, const struct arm_boot_info *info, hwaddr mvbar_addr); +typedef enum { + FIXUP_NONE = 0, /* do nothing */ + FIXUP_TERMINATOR, /* end of insns */ + FIXUP_BOARDID, /* overwrite with board ID number */ + FIXUP_BOARD_SETUP, /* overwrite with board specific setup code address */ + FIXUP_ARGPTR_LO, /* overwrite with pointer to kernel args */ + FIXUP_ARGPTR_HI, /* overwrite with pointer to kernel args (high half) */ + FIXUP_ENTRYPOINT_LO, /* overwrite with kernel entry point */ + FIXUP_ENTRYPOINT_HI, /* overwrite with kernel entry point (high half) */ + FIXUP_GIC_CPU_IF, /* overwrite with GIC CPU interface address */ + FIXUP_BOOTREG, /* overwrite with boot register address */ + FIXUP_DSB, /* overwrite with correct DSB insn for cpu */ + FIXUP_MAX, +} FixupType; + +typedef struct ARMInsnFixup { + uint32_t insn; + FixupType fixup; +} ARMInsnFixup; + +/** + * arm_write_bootloader - write a bootloader to guest memory + * @name: name of the bootloader blob + * @as: AddressSpace to write the bootloader + * @addr: guest address to write it + * @insns: the blob to be loaded + * @fixupcontext: context to be used for any fixups in @insns + * + * Write a bootloader to guest memory at address @addr in the address + * space @as. @name is the name to use for the resulting ROM blob, so + * it should be unique in the system and reasonably identifiable for debugging. + * + * @insns must be an array of ARMInsnFixup structs, each of which has + * one 32-bit value to be written to the guest memory, and a fixup to be + * applied to the value. FIXUP_NONE (do nothing) is value 0, so effectively + * the fixup is optional when writing a struct initializer. + * The final entry in the array must be { 0, FIXUP_TERMINATOR }. + * + * All other supported fixup types have the semantics "ignore insn + * and instead use the value from the array element @fixupcontext[fixup]". + * The caller should therefore provide @fixupcontext as an array of + * size FIXUP_MAX whose elements have been initialized for at least + * the entries that @insns refers to. + */ +void arm_write_bootloader(const char *name, + AddressSpace *as, hwaddr addr, + const ARMInsnFixup *insns, + const uint32_t *fixupcontext); + #endif /* HW_ARM_BOOT_H */ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index c95333514e..0c76e82626 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -128,9 +128,6 @@ struct PCMachineClass { /* create kvmclock device even when KVM PV features are not exposed */ bool kvmclock_create_always; - - /* skip passing an rng seed for legacy machines */ - bool legacy_no_rng_seed; }; #define TYPE_PC_MACHINE "generic-pc-machine" diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index 62fa5774f8..df82c5fd42 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -126,8 +126,7 @@ void x86_bios_rom_init(MachineState *ms, const char *default_firmware, void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, int acpi_data_size, - bool pvh_enabled, - bool legacy_no_rng_seed); + bool pvh_enabled); bool x86_machine_is_smm_enabled(const X86MachineState *x86ms); bool x86_machine_is_acpi_enabled(const X86MachineState *x86ms); diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 2e503904dc..c1f81a5f13 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -117,28 +117,6 @@ struct FWCfgMemState { */ void fw_cfg_add_bytes(FWCfgState *s, uint16_t key, void *data, size_t len); -/** - * fw_cfg_add_bytes_callback: - * @s: fw_cfg device being modified - * @key: selector key value for new fw_cfg item - * @select_cb: callback function when selecting - * @write_cb: callback function after a write - * @callback_opaque: argument to be passed into callback function - * @data: pointer to start of item data - * @len: size of item data - * @read_only: is file read only - * - * Add a new fw_cfg item, available by selecting the given key, as a raw - * "blob" of the given size. The data referenced by the starting pointer - * is only linked, NOT copied, into the data structure of the fw_cfg device. - */ -void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t key, - FWCfgCallback select_cb, From xen-changelog-bounces@lists.xenproject.org Sun Jul 23 15:11:11 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Jul 2023 15:11:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.568298.887587 (Exim 4.92) (envelope-from ) id 1qNajg-0007M6-79; Sun, 23 Jul 2023 15:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 568298.887587; Sun, 23 Jul 2023 15: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 1qNajg-0007Ly-4O; Sun, 23 Jul 2023 15:11:04 +0000 Received: by outflank-mailman (input) for mailman id 568298; Sun, 23 Jul 2023 15:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNaje-0007Ls-JI for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNaje-0002TV-C3 for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNaje-0003EP-A7 for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15: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=8v/1xkqAFRimf4bvt7DUDS4me15UL4W1BgnAUJCOALY=; b=LohLrPPqKssc3grhmjnPSHTQBl 2FiEE10A8+ZtoJ9ZWldrLjC1m2Viln9KRjVgT9JxZv8O2EgS8YxRpOvgRheI3kv/W3SDVj83gEnPK f2RCHaYsSGG1Mx16Z48dSwV00m68VpA67pG+85IsE2TcZo21Rp/rtOBNj8Ffj2Jw7ork=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Introduce arch_domain_teardown() Message-Id: Date: Sun, 23 Jul 2023 15:11:02 +0000 commit 2d775ee651e05596f083e1fe8dfb2ab410369d7d Author: Andrew Cooper AuthorDate: Mon Jul 17 09:20:44 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 20 23:20:04 2023 +0100 xen: Introduce arch_domain_teardown() Plumb it into domain_teardown(). Provide arch_val in the teardown continuation information for use by arch_domain_teardown(). No practical change. Signed-off-by: Andrew Cooper Signed-off-by: Jens Wiklander Reviewed-by: Jan Beulich Reviewed-by: Bertrand Marquis --- xen/arch/arm/domain.c | 5 +++++ xen/arch/x86/domain.c | 5 +++++ xen/common/domain.c | 6 ++++++ xen/include/xen/domain.h | 1 + xen/include/xen/sched.h | 1 + 5 files changed, 18 insertions(+) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 8c18e92079..15d9709a97 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -793,6 +793,11 @@ fail: return rc; } +int arch_domain_teardown(struct domain *d) +{ + return 0; +} + void arch_domain_destroy(struct domain *d) { /* IOMMU page table is shared with P2M, always call diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 39c2153165..5f66c2ae33 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -888,6 +888,11 @@ int arch_domain_create(struct domain *d, return rc; } +int arch_domain_teardown(struct domain *d) +{ + return 0; +} + void arch_domain_destroy(struct domain *d) { if ( is_hvm_domain(d) ) diff --git a/xen/common/domain.c b/xen/common/domain.c index caaa402637..304aa04fa6 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -439,6 +439,7 @@ static int domain_teardown(struct domain *d) PROG_none, PROG_gnttab_mappings, PROG_vcpu_teardown, + PROG_arch_teardown, PROG_done, }; @@ -459,6 +460,11 @@ static int domain_teardown(struct domain *d) return rc; } + PROGRESS(arch_teardown): + rc = arch_domain_teardown(d); + if ( rc ) + return rc; + PROGRESS(done): break; diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 1df8f933d0..d35af34841 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -81,6 +81,7 @@ int arch_domain_create(struct domain *d, struct xen_domctl_createdomain *config, unsigned int flags); +int arch_domain_teardown(struct domain *d); void arch_domain_destroy(struct domain *d); void arch_domain_shutdown(struct domain *d); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 85242a73d3..854f3e32c0 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -589,6 +589,7 @@ struct domain */ struct { unsigned int val; + unsigned int arch_val; struct vcpu *vcpu; } teardown; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 23 15:11:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Jul 2023 15:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.568299.887591 (Exim 4.92) (envelope-from ) id 1qNajp-0007Nb-8O; Sun, 23 Jul 2023 15:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 568299.887591; Sun, 23 Jul 2023 15:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNajp-0007NT-5q; Sun, 23 Jul 2023 15:11:13 +0000 Received: by outflank-mailman (input) for mailman id 568299; Sun, 23 Jul 2023 15:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNajo-0007NL-G3 for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNajo-0002Te-FF for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNajo-0003Ez-EH for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15: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=nbvzGhB64dgE6eeBiqZWKCIDHc6wjp4amUg2RVf4bAc=; b=CkQIHW8uRHeohUe/Hz5B5PZKot grmJe63wR3QNe2NmTxbiVvVVQ5qxku5xSkj82eeNgngWK6vLAxXGUd78buf5IpJNqRf1M4lAAuT8a pIo06ZuTfyxxMiX/JfNf+uHL6sJOGQuPBZh0nwlJF8lie9MRFI0i2KR8Qd9dvy4VSpWM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: add TEE teardown to arch_domain_teardown() Message-Id: Date: Sun, 23 Jul 2023 15:11:12 +0000 commit 12e5c93f9d5503e67b106846d69a7c404a2a01d1 Author: Jens Wiklander AuthorDate: Mon Jul 17 09:20:45 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 20 23:20:04 2023 +0100 xen/arm: add TEE teardown to arch_domain_teardown() Adds a progress state for tee_domain_teardown() to be called from arch_domain_teardown(). tee_domain_teardown() calls the new callback domain_teardown() in struct tee_mediator_ops. Note that the OP-TEE mediator should be updated in a future patch to use the new teardown facility, that is not done here. Co-developed-by: Andrew Cooper Signed-off-by: Andrew Cooper Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis --- xen/arch/arm/domain.c | 35 +++++++++++++++++++++++++++++++++++ xen/arch/arm/include/asm/tee/tee.h | 7 +++++++ xen/arch/arm/tee/optee.c | 6 ++++++ xen/arch/arm/tee/tee.c | 8 ++++++++ 4 files changed, 56 insertions(+) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 15d9709a97..3ae86ca620 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -795,6 +795,41 @@ fail: int arch_domain_teardown(struct domain *d) { + int ret = 0; + + BUG_ON(!d->is_dying); + + /* See domain_teardown() for an explanation of all of this magic. */ + switch ( d->teardown.arch_val ) + { +#define PROGRESS(x) \ + d->teardown.arch_val = PROG_ ## x; \ + fallthrough; \ + case PROG_ ## x + + enum { + PROG_none, + PROG_tee, + PROG_done, + }; + + case PROG_none: + BUILD_BUG_ON(PROG_none != 0); + + PROGRESS(tee): + ret = tee_domain_teardown(d); + if ( ret ) + return ret; + + PROGRESS(done): + break; + +#undef PROGRESS + + default: + BUG(); + } + return 0; } diff --git a/xen/arch/arm/include/asm/tee/tee.h b/xen/arch/arm/include/asm/tee/tee.h index f483986385..da324467e1 100644 --- a/xen/arch/arm/include/asm/tee/tee.h +++ b/xen/arch/arm/include/asm/tee/tee.h @@ -34,6 +34,7 @@ struct tee_mediator_ops { * guest and create own structures for the new domain. */ int (*domain_init)(struct domain *d); + int (*domain_teardown)(struct domain *d); /* * Called during domain destruction to relinquish resources used @@ -62,6 +63,7 @@ struct tee_mediator_desc { bool tee_handle_call(struct cpu_user_regs *regs); int tee_domain_init(struct domain *d, uint16_t tee_type); +int tee_domain_teardown(struct domain *d); int tee_relinquish_resources(struct domain *d); uint16_t tee_get_type(void); @@ -93,6 +95,11 @@ static inline int tee_relinquish_resources(struct domain *d) return 0; } +static inline int tee_domain_teardown(struct domain *d) +{ + return 0; +} + static inline uint16_t tee_get_type(void) { return XEN_DOMCTL_CONFIG_TEE_NONE; diff --git a/xen/arch/arm/tee/optee.c b/xen/arch/arm/tee/optee.c index 301d205a36..c91bd7d5ac 100644 --- a/xen/arch/arm/tee/optee.c +++ b/xen/arch/arm/tee/optee.c @@ -268,6 +268,11 @@ static int optee_domain_init(struct domain *d) return 0; } +static int optee_domain_teardown(struct domain *d) +{ + return 0; +} + static uint64_t regpair_to_uint64(register_t reg0, register_t reg1) { return ((uint64_t)reg0 << 32) | (uint32_t)reg1; @@ -1732,6 +1737,7 @@ static const struct tee_mediator_ops optee_ops = { .probe = optee_probe, .domain_init = optee_domain_init, + .domain_teardown = optee_domain_teardown, .relinquish_resources = optee_relinquish_resources, .handle_call = optee_handle_call, }; diff --git a/xen/arch/arm/tee/tee.c b/xen/arch/arm/tee/tee.c index 3964a8a5cd..ddd17506a9 100644 --- a/xen/arch/arm/tee/tee.c +++ b/xen/arch/arm/tee/tee.c @@ -52,6 +52,14 @@ int tee_domain_init(struct domain *d, uint16_t tee_type) return cur_mediator->ops->domain_init(d); } +int tee_domain_teardown(struct domain *d) +{ + if ( !cur_mediator ) + return 0; + + return cur_mediator->ops->domain_teardown(d); +} + int tee_relinquish_resources(struct domain *d) { if ( !cur_mediator ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 23 15:11:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Jul 2023 15:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.568300.887594 (Exim 4.92) (envelope-from ) id 1qNajz-0007QA-A0; Sun, 23 Jul 2023 15:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 568300.887594; Sun, 23 Jul 2023 15:11:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNajz-0007Q3-7M; Sun, 23 Jul 2023 15:11:23 +0000 Received: by outflank-mailman (input) for mailman id 568300; Sun, 23 Jul 2023 15:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNajy-0007Pt-JL for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNajy-0002Tt-IV for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNajy-0003FY-HQ for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15: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=N93qAB/UcjWmwYLOK6t6FZbcEyXRjxqXMHh0vwieTDo=; b=mRay9h0KFXCy9uLC1qREswXOpN aL+48qHC+rdA3t9fFEmlwAydPqG1NvDfklHR7IhXFIqxYrS7uLGmvvh0wKpv89LTRcNq0MyZcUKj2 Mk+JDG82rEyoAgniFOqEsKaMQKQR1xcN4rC5GZfAxbKk8Lxkc3kYceXr7BqqzBOYbmG8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: smccc: add support for SMCCCv1.2 extended input/output registers Message-Id: Date: Sun, 23 Jul 2023 15:11:22 +0000 commit 3069ecdf362eabfef452d8a29218290ba6d84b48 Author: Jens Wiklander AuthorDate: Mon Jul 17 09:20:46 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 20 23:20:04 2023 +0100 xen/arm: smccc: add support for SMCCCv1.2 extended input/output registers SMCCC v1.2 [1] AArch64 allows x0-x17 to be used as both parameter registers and result registers for the SMC and HVC instructions. Arm Firmware Framework for Armv8-A specification makes use of x0-x7 as parameter and result registers. Let us add new interface to support this extended set of input/output registers. This is based on 3fdc0cb59d97 ("arm64: smccc: Add support for SMCCCv1.2 extended input/output registers") by Sudeep Holla from the Linux kernel The SMCCC version reported to the VM is bumped to 1.2 in order to support handling FF-A messages. [1] https://developer.arm.com/documentation/den0028/c/?lang=en Signed-off-by: Jens Wiklander Reviewed-by: Luca Fancellu Reviewed-by: Bertrand Marquis Acked-by: Julien Grall --- xen/arch/arm/arm64/asm-offsets.c | 9 +++++++++ xen/arch/arm/arm64/smc.S | 42 ++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/include/asm/smccc.h | 40 ++++++++++++++++++++++++++++++++++++++ xen/arch/arm/vsmc.c | 2 +- 4 files changed, 92 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/arm64/asm-offsets.c b/xen/arch/arm/arm64/asm-offsets.c index 7226cd9b2e..7adb67a1b8 100644 --- a/xen/arch/arm/arm64/asm-offsets.c +++ b/xen/arch/arm/arm64/asm-offsets.c @@ -57,6 +57,15 @@ void __dummy__(void) BLANK(); OFFSET(SMCCC_RES_a0, struct arm_smccc_res, a0); OFFSET(SMCCC_RES_a2, struct arm_smccc_res, a2); + OFFSET(ARM_SMCCC_1_2_REGS_X0_OFFS, struct arm_smccc_1_2_regs, a0); + OFFSET(ARM_SMCCC_1_2_REGS_X2_OFFS, struct arm_smccc_1_2_regs, a2); + OFFSET(ARM_SMCCC_1_2_REGS_X4_OFFS, struct arm_smccc_1_2_regs, a4); + OFFSET(ARM_SMCCC_1_2_REGS_X6_OFFS, struct arm_smccc_1_2_regs, a6); + OFFSET(ARM_SMCCC_1_2_REGS_X8_OFFS, struct arm_smccc_1_2_regs, a8); + OFFSET(ARM_SMCCC_1_2_REGS_X10_OFFS, struct arm_smccc_1_2_regs, a10); + OFFSET(ARM_SMCCC_1_2_REGS_X12_OFFS, struct arm_smccc_1_2_regs, a12); + OFFSET(ARM_SMCCC_1_2_REGS_X14_OFFS, struct arm_smccc_1_2_regs, a14); + OFFSET(ARM_SMCCC_1_2_REGS_X16_OFFS, struct arm_smccc_1_2_regs, a16); } /* diff --git a/xen/arch/arm/arm64/smc.S b/xen/arch/arm/arm64/smc.S index 91bae62dd4..fc6b676e2e 100644 --- a/xen/arch/arm/arm64/smc.S +++ b/xen/arch/arm/arm64/smc.S @@ -27,3 +27,45 @@ ENTRY(__arm_smccc_1_0_smc) stp x2, x3, [x4, #SMCCC_RES_a2] 1: ret + +/* + * void arm_smccc_1_2_smc(const struct arm_smccc_1_2_regs *args, + * struct arm_smccc_1_2_regs *res) + */ +ENTRY(arm_smccc_1_2_smc) + /* Save `res` and free a GPR that won't be clobbered by SMC call */ + stp x1, x19, [sp, #-16]! + + /* Ensure `args` won't be clobbered while loading regs in next step */ + mov x19, x0 + + /* Load the registers x0 - x17 from the struct arm_smccc_1_2_regs */ + ldp x0, x1, [x19, #ARM_SMCCC_1_2_REGS_X0_OFFS] + ldp x2, x3, [x19, #ARM_SMCCC_1_2_REGS_X2_OFFS] + ldp x4, x5, [x19, #ARM_SMCCC_1_2_REGS_X4_OFFS] + ldp x6, x7, [x19, #ARM_SMCCC_1_2_REGS_X6_OFFS] + ldp x8, x9, [x19, #ARM_SMCCC_1_2_REGS_X8_OFFS] + ldp x10, x11, [x19, #ARM_SMCCC_1_2_REGS_X10_OFFS] + ldp x12, x13, [x19, #ARM_SMCCC_1_2_REGS_X12_OFFS] + ldp x14, x15, [x19, #ARM_SMCCC_1_2_REGS_X14_OFFS] + ldp x16, x17, [x19, #ARM_SMCCC_1_2_REGS_X16_OFFS] + + smc #0 + + /* Load the `res` from the stack */ + ldr x19, [sp] + + /* Store the registers x0 - x17 into the result structure */ + stp x0, x1, [x19, #ARM_SMCCC_1_2_REGS_X0_OFFS] + stp x2, x3, [x19, #ARM_SMCCC_1_2_REGS_X2_OFFS] + stp x4, x5, [x19, #ARM_SMCCC_1_2_REGS_X4_OFFS] + stp x6, x7, [x19, #ARM_SMCCC_1_2_REGS_X6_OFFS] + stp x8, x9, [x19, #ARM_SMCCC_1_2_REGS_X8_OFFS] + stp x10, x11, [x19, #ARM_SMCCC_1_2_REGS_X10_OFFS] + stp x12, x13, [x19, #ARM_SMCCC_1_2_REGS_X12_OFFS] + stp x14, x15, [x19, #ARM_SMCCC_1_2_REGS_X14_OFFS] + stp x16, x17, [x19, #ARM_SMCCC_1_2_REGS_X16_OFFS] + + /* Restore original x19 */ + ldp xzr, x19, [sp], #16 + ret diff --git a/xen/arch/arm/include/asm/smccc.h b/xen/arch/arm/include/asm/smccc.h index b3dbeecc90..1adcd37443 100644 --- a/xen/arch/arm/include/asm/smccc.h +++ b/xen/arch/arm/include/asm/smccc.h @@ -33,6 +33,7 @@ #define ARM_SMCCC_VERSION_1_0 SMCCC_VERSION(1, 0) #define ARM_SMCCC_VERSION_1_1 SMCCC_VERSION(1, 1) +#define ARM_SMCCC_VERSION_1_2 SMCCC_VERSION(1, 2) /* * This file provides common defines for ARM SMC Calling Convention as @@ -265,6 +266,45 @@ void __arm_smccc_1_0_smc(register_t a0, register_t a1, register_t a2, else \ arm_smccc_1_0_smc(__VA_ARGS__); \ } while ( 0 ) + +/* + * struct arm_smccc_1_2_regs - Arguments for or Results from SMC call + * @a0-a17 argument values from registers 0 to 17 + */ +struct arm_smccc_1_2_regs { + unsigned long a0; + unsigned long a1; + unsigned long a2; + unsigned long a3; + unsigned long a4; + unsigned long a5; + unsigned long a6; + unsigned long a7; + unsigned long a8; + unsigned long a9; + unsigned long a10; + unsigned long a11; + unsigned long a12; + unsigned long a13; + unsigned long a14; + unsigned long a15; + unsigned long a16; + unsigned long a17; +}; + +/* + * arm_smccc_1_2_smc() - make SMC calls + * @args: arguments passed via struct arm_smccc_1_2_regs + * @res: result values via struct arm_smccc_1_2_regs + * + * This function is used to make SMC calls following SMC Calling Convention + * v1.2 or above. The content of the supplied param are copied from the + * structure to registers prior to the SMC instruction. The return values + * are updated with the content from registers on return from the SMC + * instruction. + */ +void arm_smccc_1_2_smc(const struct arm_smccc_1_2_regs *args, + struct arm_smccc_1_2_regs *res); #endif /* CONFIG_ARM_64 */ #endif /* __ASSEMBLY__ */ diff --git a/xen/arch/arm/vsmc.c b/xen/arch/arm/vsmc.c index 7335276f3f..cd68fa80e9 100644 --- a/xen/arch/arm/vsmc.c +++ b/xen/arch/arm/vsmc.c @@ -85,7 +85,7 @@ static bool handle_arch(struct cpu_user_regs *regs) switch ( fid ) { case ARM_SMCCC_VERSION_FID: - set_user_reg(regs, 0, ARM_SMCCC_VERSION_1_1); + set_user_reg(regs, 0, ARM_SMCCC_VERSION_1_2); return true; case ARM_SMCCC_ARCH_FEATURES_FID: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 23 15:11:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Jul 2023 15:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.568301.887598 (Exim 4.92) (envelope-from ) id 1qNak9-0007Sf-Bd; Sun, 23 Jul 2023 15:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 568301.887598; Sun, 23 Jul 2023 15:11:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNak9-0007SY-96; Sun, 23 Jul 2023 15:11:33 +0000 Received: by outflank-mailman (input) for mailman id 568301; Sun, 23 Jul 2023 15:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNak8-0007SO-O4 for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNak8-0002U3-NG for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNak8-0003G2-Km for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15: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=13JWwG1wpvdgwPliuAVptC8J9YzRc05nG3y6Oyz/J9c=; b=zAltUoLBPk81rx6/HYK/j90PlS kola14hlqiK4IVHCZYkFVoMNjLzUodOc0j1HG3NHDUueOiF0Oo+NC7fsMaiUDmW7nCdBObY30aawS 8kGik2NChxk/sLjfhS+0hYTZDZ9XDWNbf4xq558Xf/kmZL8P0YObDRwKdHzSfY5r8CVk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: tee: add a primitive FF-A mediator Message-Id: Date: Sun, 23 Jul 2023 15:11:32 +0000 commit 38846de2176b991704e3062904d0e2fc455b47b9 Author: Jens Wiklander AuthorDate: Mon Jul 17 09:20:47 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 20 23:25:42 2023 +0100 xen/arm: tee: add a primitive FF-A mediator Adds a FF-A version 1.1 [1] mediator to communicate with a Secure Partition in secure world. This commit brings in only the parts needed to negotiate FF-A version number with guest and SPMC. [1] https://developer.arm.com/documentation/den0077/e Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis [jgrall: Make Kconfig depends on TEE + Remove kconfig.h include] Acked-by: Julien Grall --- xen/arch/arm/include/asm/psci.h | 4 + xen/arch/arm/include/asm/tee/ffa.h | 34 ++++++ xen/arch/arm/tee/Kconfig | 11 ++ xen/arch/arm/tee/Makefile | 1 + xen/arch/arm/tee/ffa.c | 225 +++++++++++++++++++++++++++++++++++++ xen/arch/arm/vsmc.c | 17 ++- xen/include/public/arch-arm.h | 1 + 7 files changed, 290 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/include/asm/psci.h b/xen/arch/arm/include/asm/psci.h index 832f77afff..4780972621 100644 --- a/xen/arch/arm/include/asm/psci.h +++ b/xen/arch/arm/include/asm/psci.h @@ -24,6 +24,10 @@ void call_psci_cpu_off(void); void call_psci_system_off(void); void call_psci_system_reset(void); +/* Range of allocated PSCI function numbers */ +#define PSCI_FNUM_MIN_VALUE _AC(0,U) +#define PSCI_FNUM_MAX_VALUE _AC(0x1f,U) + /* PSCI v0.2 interface */ #define PSCI_0_2_FN32(nr) ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ ARM_SMCCC_CONV_32, \ diff --git a/xen/arch/arm/include/asm/tee/ffa.h b/xen/arch/arm/include/asm/tee/ffa.h new file mode 100644 index 0000000000..24cd4d99c8 --- /dev/null +++ b/xen/arch/arm/include/asm/tee/ffa.h @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * xen/arch/arm/include/asm/tee/ffa.h + * + * Arm Firmware Framework for ARMv8-A(FFA) mediator + * + * Copyright (C) 2023 Linaro Limited + */ + +#ifndef __ASM_ARM_TEE_FFA_H__ +#define __ASM_ARM_TEE_FFA_H__ + +#include + +#include +#include + +#define FFA_FNUM_MIN_VALUE _AC(0x60,U) +#define FFA_FNUM_MAX_VALUE _AC(0x86,U) + +static inline bool is_ffa_fid(uint32_t fid) +{ + uint32_t fn = fid & ARM_SMCCC_FUNC_MASK; + + return fn >= FFA_FNUM_MIN_VALUE && fn <= FFA_FNUM_MAX_VALUE; +} + +#ifdef CONFIG_FFA +#define FFA_NR_FUNCS 12 +#else +#define FFA_NR_FUNCS 0 +#endif + +#endif /*__ASM_ARM_TEE_FFA_H__*/ diff --git a/xen/arch/arm/tee/Kconfig b/xen/arch/arm/tee/Kconfig index 392169b255..db3ea78faa 100644 --- a/xen/arch/arm/tee/Kconfig +++ b/xen/arch/arm/tee/Kconfig @@ -8,3 +8,14 @@ config OPTEE virtualization-enabled OP-TEE present. You can learn more about virtualization for OP-TEE at https://optee.readthedocs.io/architecture/virtualization.html + +config FFA + bool "Enable FF-A mediator support (UNSUPPORTED)" if UNSUPPORTED + default n + depends on ARM_64 && TEE + help + This option enables a minimal FF-A mediator. The mediator is + generic as it follows the FF-A specification [1], but it only + implements a small subset of the specification. + + [1] https://developer.arm.com/documentation/den0077/latest diff --git a/xen/arch/arm/tee/Makefile b/xen/arch/arm/tee/Makefile index 982c879684..58a1015e40 100644 --- a/xen/arch/arm/tee/Makefile +++ b/xen/arch/arm/tee/Makefile @@ -1,2 +1,3 @@ +obj-$(CONFIG_FFA) += ffa.o obj-y += tee.o obj-$(CONFIG_OPTEE) += optee.o diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c new file mode 100644 index 0000000000..927c4d33a3 --- /dev/null +++ b/xen/arch/arm/tee/ffa.c @@ -0,0 +1,225 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * xen/arch/arm/tee/ffa.c + * + * Arm Firmware Framework for ARMv8-A (FF-A) mediator + * + * Copyright (C) 2023 Linaro Limited + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +/* Error codes */ +#define FFA_RET_OK 0 +#define FFA_RET_NOT_SUPPORTED -1 +#define FFA_RET_INVALID_PARAMETERS -2 +#define FFA_RET_NO_MEMORY -3 +#define FFA_RET_BUSY -4 +#define FFA_RET_INTERRUPTED -5 +#define FFA_RET_DENIED -6 +#define FFA_RET_RETRY -7 +#define FFA_RET_ABORTED -8 + +/* FFA_VERSION helpers */ +#define FFA_VERSION_MAJOR_SHIFT 16U +#define FFA_VERSION_MAJOR_MASK 0x7FFFU +#define FFA_VERSION_MINOR_SHIFT 0U +#define FFA_VERSION_MINOR_MASK 0xFFFFU +#define MAKE_FFA_VERSION(major, minor) \ + ((((major) & FFA_VERSION_MAJOR_MASK) << FFA_VERSION_MAJOR_SHIFT) | \ + ((minor) & FFA_VERSION_MINOR_MASK)) + +#define FFA_VERSION_1_0 MAKE_FFA_VERSION(1, 0) +#define FFA_VERSION_1_1 MAKE_FFA_VERSION(1, 1) +/* The minimal FF-A version of the SPMC that can be supported */ +#define FFA_MIN_SPMC_VERSION FFA_VERSION_1_1 + +/* + * This is the version we want to use in communication with guests and SPs. + * During negotiation with a guest or a SP we may need to lower it for + * that particular guest or SP. + */ +#define FFA_MY_VERSION_MAJOR 1U +#define FFA_MY_VERSION_MINOR 1U +#define FFA_MY_VERSION MAKE_FFA_VERSION(FFA_MY_VERSION_MAJOR, \ + FFA_MY_VERSION_MINOR) + +/* Function IDs */ +#define FFA_ERROR 0x84000060U +#define FFA_SUCCESS_32 0x84000061U +#define FFA_VERSION 0x84000063U + +struct ffa_ctx { + /* FF-A version used by the guest */ + uint32_t guest_vers; +}; + +/* Negotiated FF-A version to use with the SPMC */ +static uint32_t __ro_after_init ffa_version; + +static bool ffa_get_version(uint32_t *vers) +{ + const struct arm_smccc_1_2_regs arg = { + .a0 = FFA_VERSION, + .a1 = FFA_MY_VERSION, + }; + struct arm_smccc_1_2_regs resp; + + arm_smccc_1_2_smc(&arg, &resp); + if ( resp.a0 == FFA_RET_NOT_SUPPORTED ) + { + gprintk(XENLOG_ERR, "ffa: FFA_VERSION returned not supported\n"); + return false; + } + + *vers = resp.a0; + + return true; +} + +static void set_regs(struct cpu_user_regs *regs, register_t v0, register_t v1, + register_t v2, register_t v3, register_t v4, register_t v5, + register_t v6, register_t v7) +{ + set_user_reg(regs, 0, v0); + set_user_reg(regs, 1, v1); + set_user_reg(regs, 2, v2); + set_user_reg(regs, 3, v3); + set_user_reg(regs, 4, v4); + set_user_reg(regs, 5, v5); + set_user_reg(regs, 6, v6); + set_user_reg(regs, 7, v7); +} + +static void handle_version(struct cpu_user_regs *regs) +{ + struct domain *d = current->domain; + struct ffa_ctx *ctx = d->arch.tee; + uint32_t vers = get_user_reg(regs, 1); + + if ( vers < FFA_VERSION_1_1 ) + vers = FFA_VERSION_1_0; + else + vers = FFA_VERSION_1_1; + + ctx->guest_vers = vers; + set_regs(regs, vers, 0, 0, 0, 0, 0, 0, 0); +} + +static bool ffa_handle_call(struct cpu_user_regs *regs) +{ + uint32_t fid = get_user_reg(regs, 0); + struct domain *d = current->domain; + struct ffa_ctx *ctx = d->arch.tee; + + if ( !ctx ) + return false; + + switch ( fid ) + { + case FFA_VERSION: + handle_version(regs); + return true; + + default: + gprintk(XENLOG_ERR, "ffa: unhandled fid 0x%x\n", fid); + return false; + } +} + +static int ffa_domain_init(struct domain *d) +{ + struct ffa_ctx *ctx; + + if ( !ffa_version ) + return -ENODEV; + + ctx = xzalloc(struct ffa_ctx); + if ( !ctx ) + return -ENOMEM; + + d->arch.tee = ctx; + + return 0; +} + +/* This function is supposed to undo what ffa_domain_init() has done */ +static int ffa_domain_teardown(struct domain *d) +{ + struct ffa_ctx *ctx = d->arch.tee; + + if ( !ctx ) + return 0; + + XFREE(d->arch.tee); + + return 0; +} + +static int ffa_relinquish_resources(struct domain *d) +{ + return 0; +} + +static bool ffa_probe(void) +{ + uint32_t vers; + unsigned int major_vers; + unsigned int minor_vers; + + /* + * psci_init_smccc() updates this value with what's reported by EL-3 + * or secure world. + */ + if ( smccc_ver < ARM_SMCCC_VERSION_1_2 ) + { + printk(XENLOG_ERR + "ffa: unsupported SMCCC version %#x (need at least %#x)\n", + smccc_ver, ARM_SMCCC_VERSION_1_2); + return false; + } + + if ( !ffa_get_version(&vers) ) + return false; + + if ( vers < FFA_MIN_SPMC_VERSION || vers > FFA_MY_VERSION ) + { + printk(XENLOG_ERR "ffa: Incompatible version %#x found\n", vers); + return false; + } + + major_vers = (vers >> FFA_VERSION_MAJOR_SHIFT) & FFA_VERSION_MAJOR_MASK; + minor_vers = vers & FFA_VERSION_MINOR_MASK; + printk(XENLOG_INFO "ARM FF-A Mediator version %u.%u\n", + FFA_MY_VERSION_MAJOR, FFA_MY_VERSION_MINOR); + printk(XENLOG_INFO "ARM FF-A Firmware version %u.%u\n", + major_vers, minor_vers); + + ffa_version = vers; + + return true; +} + +static const struct tee_mediator_ops ffa_ops = +{ + .probe = ffa_probe, + .domain_init = ffa_domain_init, + .domain_teardown = ffa_domain_teardown, + .relinquish_resources = ffa_relinquish_resources, + .handle_call = ffa_handle_call, +}; + +REGISTER_TEE_MEDIATOR(ffa, "FF-A", XEN_DOMCTL_CONFIG_TEE_FFA, &ffa_ops); diff --git a/xen/arch/arm/vsmc.c b/xen/arch/arm/vsmc.c index cd68fa80e9..7f2f5eb9ce 100644 --- a/xen/arch/arm/vsmc.c +++ b/xen/arch/arm/vsmc.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -24,7 +25,7 @@ #define XEN_SMCCC_FUNCTION_COUNT 3 /* Number of functions currently supported by Standard Service Service Calls. */ -#define SSSC_SMCCC_FUNCTION_COUNT (3 + VPSCI_NR_FUNCS) +#define SSSC_SMCCC_FUNCTION_COUNT (3 + VPSCI_NR_FUNCS + FFA_NR_FUNCS) static bool fill_uid(struct cpu_user_regs *regs, xen_uuid_t uuid) { @@ -188,13 +189,23 @@ static bool handle_existing_apis(struct cpu_user_regs *regs) return do_vpsci_0_1_call(regs, fid); } +static bool is_psci_fid(uint32_t fid) +{ + uint32_t fn = fid & ARM_SMCCC_FUNC_MASK; + + return fn >= PSCI_FNUM_MIN_VALUE && fn <= PSCI_FNUM_MAX_VALUE; +} + /* PSCI 0.2 interface and other Standard Secure Calls */ static bool handle_sssc(struct cpu_user_regs *regs) { uint32_t fid = (uint32_t)get_user_reg(regs, 0); - if ( do_vpsci_0_2_call(regs, fid) ) - return true; + if ( is_psci_fid(fid) ) + return do_vpsci_0_2_call(regs, fid); + + if ( is_ffa_fid(fid) ) + return tee_handle_call(regs); switch ( fid ) { diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 38311f5595..c6449893e4 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -296,6 +296,7 @@ DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t); #define XEN_DOMCTL_CONFIG_TEE_NONE 0 #define XEN_DOMCTL_CONFIG_TEE_OPTEE 1 +#define XEN_DOMCTL_CONFIG_TEE_FFA 2 struct xen_arch_domainconfig { /* IN/OUT */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 23 15:11:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Jul 2023 15:11:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.568302.887603 (Exim 4.92) (envelope-from ) id 1qNakJ-0007WA-F7; Sun, 23 Jul 2023 15:11:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 568302.887603; Sun, 23 Jul 2023 15:11:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNakJ-0007W2-CB; Sun, 23 Jul 2023 15:11:43 +0000 Received: by outflank-mailman (input) for mailman id 568302; Sun, 23 Jul 2023 15:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNakI-0007Vw-RG for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNakI-0002UH-QL for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNakI-0003HG-PO for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:11:42 +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=2G258dW3Awmez60LrSZ8iRSMC7mWB0y3qgb17AEE+mo=; b=wAVkAQqn6nMZ1z4/Uiks6t5J1g 15j5eEy9qJx/iv5stMwA5268/5aI5GHJ6n7GtPOOV9MXJxnhPtKb++8V+QYRYU0friCVa0lJOGOdv 71RGLLwU43TCI0ZcT4t4xKk13ZsV3B1D37TPQK4jY/7UnavTe5RQJMw5EEpeAPl9+wUo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: ffa: add remaining SMC function IDs Message-Id: Date: Sun, 23 Jul 2023 15:11:42 +0000 commit 9b6af1deb273f320e2d1c507aa1cb17f7356f805 Author: Jens Wiklander AuthorDate: Mon Jul 17 09:20:48 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 20 23:26:08 2023 +0100 xen/arm: ffa: add remaining SMC function IDs Adds the remaining SMC function IDs from FF-A 1.1 specification, DEN0077A version 1.1 REL0. Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis Reviewed-by: Henry Wang --- xen/arch/arm/tee/ffa.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index 927c4d33a3..2296e3115b 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -60,7 +60,41 @@ /* Function IDs */ #define FFA_ERROR 0x84000060U #define FFA_SUCCESS_32 0x84000061U +#define FFA_SUCCESS_64 0xC4000061U +#define FFA_INTERRUPT 0x84000062U #define FFA_VERSION 0x84000063U +#define FFA_FEATURES 0x84000064U +#define FFA_RX_ACQUIRE 0x84000084U +#define FFA_RX_RELEASE 0x84000065U +#define FFA_RXTX_MAP_32 0x84000066U +#define FFA_RXTX_MAP_64 0xC4000066U +#define FFA_RXTX_UNMAP 0x84000067U +#define FFA_PARTITION_INFO_GET 0x84000068U +#define FFA_ID_GET 0x84000069U +#define FFA_SPM_ID_GET 0x84000085U +#define FFA_MSG_WAIT 0x8400006BU +#define FFA_MSG_YIELD 0x8400006CU +#define FFA_RUN 0x8400006DU +#define FFA_MSG_SEND2 0x84000086U +#define FFA_MSG_SEND_DIRECT_REQ_32 0x8400006FU +#define FFA_MSG_SEND_DIRECT_REQ_64 0xC400006FU +#define FFA_MSG_SEND_DIRECT_RESP_32 0x84000070U +#define FFA_MSG_SEND_DIRECT_RESP_64 0xC4000070U +#define FFA_MEM_DONATE_32 0x84000071U +#define FFA_MEM_DONATE_64 0xC4000071U +#define FFA_MEM_LEND_32 0x84000072U +#define FFA_MEM_LEND_64 0xC4000072U +#define FFA_MEM_SHARE_32 0x84000073U +#define FFA_MEM_SHARE_64 0xC4000073U +#define FFA_MEM_RETRIEVE_REQ_32 0x84000074U +#define FFA_MEM_RETRIEVE_REQ_64 0xC4000074U +#define FFA_MEM_RETRIEVE_RESP 0x84000075U +#define FFA_MEM_RELINQUISH 0x84000076U +#define FFA_MEM_RECLAIM 0x84000077U +#define FFA_MEM_FRAG_RX 0x8400007AU +#define FFA_MEM_FRAG_TX 0x8400007BU +#define FFA_MSG_SEND 0x8400006EU +#define FFA_MSG_POLL 0x8400006AU struct ffa_ctx { /* FF-A version used by the guest */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 23 15:11:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Jul 2023 15:11:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.568303.887607 (Exim 4.92) (envelope-from ) id 1qNakT-0007ZX-GR; Sun, 23 Jul 2023 15:11:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 568303.887607; Sun, 23 Jul 2023 15:11:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNakT-0007ZP-Dk; Sun, 23 Jul 2023 15:11:53 +0000 Received: by outflank-mailman (input) for mailman id 568303; Sun, 23 Jul 2023 15:11:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNakS-0007ZH-Uv for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNakS-0002Uh-UD for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNakS-0003IR-SV for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:11:52 +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=h0ELl0Zco1xxivuKRFGhZtwPy1E+AacR+pZk55TXKWw=; b=u0EA2tXHkut1dXTKG8NPCT7n9F pz3lEjfwcfJTg+O5kHdhryhzPuH2BvYGl1tCcIGde+m5GAOsPEZ/z6zX/hmT9fanfqvCVkV2HeOeU Wfm6O5k2PJjPbaXxdCa1MrARYHVt2uZ5QEFMGiFm0CngnhIJlrQYt8McSAKUaQHb3Y1A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: ffa: add flags for FFA_PARTITION_INFO_GET Message-Id: Date: Sun, 23 Jul 2023 15:11:52 +0000 commit aaa416d425213ab37536088783f802df53af26d4 Author: Jens Wiklander AuthorDate: Mon Jul 17 09:20:49 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 20 23:26:08 2023 +0100 xen/arm: ffa: add flags for FFA_PARTITION_INFO_GET According to DEN0077A version 1.1 REL0, section 13.8, defines flags used for the function FFA_PARTITION_INFO_GET. Signed-off-by: Jens Wiklander Reviewed-by: Henry Wang Reviewed-by: Bertrand Marquis --- xen/arch/arm/tee/ffa.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index 2296e3115b..c1dead73d1 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -57,6 +57,40 @@ #define FFA_MY_VERSION MAKE_FFA_VERSION(FFA_MY_VERSION_MAJOR, \ FFA_MY_VERSION_MINOR) +/* + * Flags to determine partition properties in FFA_PARTITION_INFO_GET return + * message: + * BIT(0): Supports receipt of direct requests + * BIT(1): Can send direct requests + * BIT(2): Can send and receive indirect messages + * BIT(3): Supports receipt of notifications + * BIT(4-5): Partition ID is a PE endpoint ID + * BIT(6): Partition must be informed about each VM that is created by + * the Hypervisor + * BIT(7): Partition must be informed about each VM that is destroyed by + * the Hypervisor + * BIT(8): Partition runs in the AArch64 execution state else AArch32 + * execution state + */ +#define FFA_PART_PROP_DIRECT_REQ_RECV BIT(0, U) +#define FFA_PART_PROP_DIRECT_REQ_SEND BIT(1, U) +#define FFA_PART_PROP_INDIRECT_MSGS BIT(2, U) +#define FFA_PART_PROP_RECV_NOTIF BIT(3, U) +#define FFA_PART_PROP_IS_TYPE_MASK (3U << 4) +#define FFA_PART_PROP_IS_PE_ID (0U << 4) +#define FFA_PART_PROP_IS_SEPID_INDEP (1U << 4) +#define FFA_PART_PROP_IS_SEPID_DEP (2U << 4) +#define FFA_PART_PROP_IS_AUX_ID (3U << 4) +#define FFA_PART_PROP_NOTIF_CREATED BIT(6, U) +#define FFA_PART_PROP_NOTIF_DESTROYED BIT(7, U) +#define FFA_PART_PROP_AARCH64_STATE BIT(8, U) + +/* + * Flag used as parameter to FFA_PARTITION_INFO_GET to return partition + * count only. + */ +#define FFA_PARTITION_INFO_GET_COUNT_FLAG BIT(0, U) + /* Function IDs */ #define FFA_ERROR 0x84000060U #define FFA_SUCCESS_32 0x84000061U -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 23 15:12:03 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Jul 2023 15:12:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.568304.887610 (Exim 4.92) (envelope-from ) id 1qNakd-0007cL-Hh; Sun, 23 Jul 2023 15:12:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 568304.887610; Sun, 23 Jul 2023 15:12: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 1qNakd-0007cE-FD; Sun, 23 Jul 2023 15:12:03 +0000 Received: by outflank-mailman (input) for mailman id 568304; Sun, 23 Jul 2023 15:12:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNakd-0007c6-2Q for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:12:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNakd-0002V3-1e for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:12:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNakd-0003J1-03 for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15: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=RZMW9fR9dK0A24vR4cvsiFanLvLni2Y5ynTz4aZEh+U=; b=NYhcHdbsV/PjLBJLKa29r7rq1r nZuRsrJorvO3d+2nJA+wFvERysFqN7s94fyF6sbR5C1zL4USEgqM26nv154HpjvsDRhHXUa45/fWO IB1ySZbDpCj4fG+4c1XiWdkl2okqCRbzcgvHngPo/JSK3HZ9wGsSHQcDbKflsP5Dk25A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: ffa: add defines for framework direct request/response messages Message-Id: Date: Sun, 23 Jul 2023 15:12:03 +0000 commit 246fdc288e7a4832b8cc93816850b12cf8e4de91 Author: Jens Wiklander AuthorDate: Mon Jul 17 09:20:50 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 20 23:26:08 2023 +0100 xen/arm: ffa: add defines for framework direct request/response messages According to DEN0077A version 1.1 REL0, section 18.3, Table 18.{21, 25, 26, 27, 28}, add defines for framework direct request/response messages. Signed-off-by: Jens Wiklander Reviewed-by: Henry Wang Reviewed-by: Bertrand Marquis --- xen/arch/arm/tee/ffa.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index c1dead73d1..56a0a10c1e 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -57,6 +57,19 @@ #define FFA_MY_VERSION MAKE_FFA_VERSION(FFA_MY_VERSION_MAJOR, \ FFA_MY_VERSION_MINOR) +/* + * Flags and field values used for the MSG_SEND_DIRECT_REQ/RESP: + * BIT(31): Framework or partition message + * BIT(7-0): Message type for frameworks messages + */ +#define FFA_MSG_FLAG_FRAMEWORK BIT(31, U) +#define FFA_MSG_TYPE_MASK 0xFFU; +#define FFA_MSG_PSCI 0x0U +#define FFA_MSG_SEND_VM_CREATED 0x4U +#define FFA_MSG_RESP_VM_CREATED 0x5U +#define FFA_MSG_SEND_VM_DESTROYED 0x6U +#define FFA_MSG_RESP_VM_DESTROYED 0x7U + /* * Flags to determine partition properties in FFA_PARTITION_INFO_GET return * message: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 23 15:12:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Jul 2023 15:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.568305.887615 (Exim 4.92) (envelope-from ) id 1qNako-0007el-JT; Sun, 23 Jul 2023 15:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 568305.887615; Sun, 23 Jul 2023 15: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 1qNako-0007ed-Gj; Sun, 23 Jul 2023 15:12:14 +0000 Received: by outflank-mailman (input) for mailman id 568305; Sun, 23 Jul 2023 15:12:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNakn-0007eR-5p for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:12:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNakn-0002VC-4b for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:12:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNakn-0003Jl-3p for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15: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=uVXkNNUup61mc5ssKPdAEO95YaAPsYm6ckDSNNiv0wk=; b=ggNKGZWYUhyb+h3z4yDUTsPjRt qNOW+N5TMAbiiThsbuUzR9Bn6vfeCfwbe/HPV+UEemMZWHlIy5QsfIOl6TSe6AkBl7/ybC8UbvDxI kxhYEpDD6jOMF7/v199Im/1LZycC8FuWNttm2gzihCWXI04mZNfjaSU1PWYBMCLExKm4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: ffa: enforce dependency on 4k pages Message-Id: Date: Sun, 23 Jul 2023 15:12:13 +0000 commit 0dacee5cfbf1576b1ea5f44680c92996f7e4175c Author: Jens Wiklander AuthorDate: Mon Jul 17 09:20:51 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 20 23:26:08 2023 +0100 xen/arm: ffa: enforce dependency on 4k pages Adds a BUILD_BUG_ON() to assert the dependency on 4k pages in the FF-A mediator since the current implementation only works if Xen page size is the same as the FFA page size. Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis Reviewed-by: Henry Wang --- xen/arch/arm/tee/ffa.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index 56a0a10c1e..f0a2715d4b 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -57,6 +57,16 @@ #define FFA_MY_VERSION MAKE_FFA_VERSION(FFA_MY_VERSION_MAJOR, \ FFA_MY_VERSION_MINOR) +/* + * The FF-A specification explicitly works with 4K pages as a measure of + * memory size, for example, FFA_RXTX_MAP takes one parameter "RX/TX page + * count" which is the number of contiguous 4K pages allocated. Xen may use + * a different page size depending on the configuration to avoid confusion + * with PAGE_SIZE use a special define when it's a page size as in the FF-A + * specification. + */ +#define FFA_PAGE_SIZE SZ_4K + /* * Flags and field values used for the MSG_SEND_DIRECT_REQ/RESP: * BIT(31): Framework or partition message @@ -261,6 +271,17 @@ static bool ffa_probe(void) unsigned int major_vers; unsigned int minor_vers; + /* + * FF-A often works in units of 4K pages and currently it's assumed + * that we can map memory using that granularity. See also the comment + * above the FFA_PAGE_SIZE define. + * + * It is possible to support a PAGE_SIZE larger than 4K in Xen, but + * until that is fully handled in this code make sure that we only use + * 4K page sizes. + */ + BUILD_BUG_ON(PAGE_SIZE != FFA_PAGE_SIZE); + /* * psci_init_smccc() updates this value with what's reported by EL-3 * or secure world. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 23 15:12:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Jul 2023 15:12:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.568306.887620 (Exim 4.92) (envelope-from ) id 1qNaky-0007hT-MH; Sun, 23 Jul 2023 15:12:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 568306.887620; Sun, 23 Jul 2023 15: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 1qNaky-0007hL-IF; Sun, 23 Jul 2023 15:12:24 +0000 Received: by outflank-mailman (input) for mailman id 568306; Sun, 23 Jul 2023 15:12:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNakx-0007hB-8N for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:12:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNakx-0002VL-7Y for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:12:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNakx-0003Kq-6j for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15: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=+JcGGbPrn7CkZ6y2Cb9FXv9hkSmC6P0yLiwEaWNvBVU=; b=q0dyy7WUrdwL3t3T1fDlms5j7+ YUhkq9Yku+SOzuTbnBynxyi+SX43/08+O3MGBVwOPd4dI//hJxBh1RsmJB71wLpnaJf+YAu+WaL7b Fh/UfmSwtxim+lA7C7CkbBdxiGu0Wa13t+/WarRKQwqtqfELMWO0YWYC55TLLWUIN6hM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: ffa: add support for FFA_ID_GET Message-Id: Date: Sun, 23 Jul 2023 15:12:23 +0000 commit 1ab2ae1610d99423af5b810829959431e43de12d Author: Jens Wiklander AuthorDate: Mon Jul 17 09:20:52 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 20 23:26:08 2023 +0100 xen/arm: ffa: add support for FFA_ID_GET Adds support for the FF-A function FFA_ID_GET to return the ID of the calling client. Signed-off-by: Jens Wiklander Reviewed-by: Bertrand Marquis --- xen/arch/arm/tee/ffa.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c index f0a2715d4b..e157ed20ad 100644 --- a/xen/arch/arm/tee/ffa.c +++ b/xen/arch/arm/tee/ffa.c @@ -181,6 +181,12 @@ static bool ffa_get_version(uint32_t *vers) return true; } +static uint16_t get_vm_id(const struct domain *d) +{ + /* +1 since 0 is reserved for the hypervisor in FF-A */ + return d->domain_id + 1; +} + static void set_regs(struct cpu_user_regs *regs, register_t v0, register_t v1, register_t v2, register_t v3, register_t v4, register_t v5, register_t v6, register_t v7) @@ -195,6 +201,12 @@ static void set_regs(struct cpu_user_regs *regs, register_t v0, register_t v1, set_user_reg(regs, 7, v7); } +static void set_regs_success(struct cpu_user_regs *regs, uint32_t w2, + uint32_t w3) +{ + set_regs(regs, FFA_SUCCESS_32, 0, w2, w3, 0, 0, 0, 0); +} + static void handle_version(struct cpu_user_regs *regs) { struct domain *d = current->domain; @@ -224,6 +236,9 @@ static bool ffa_handle_call(struct cpu_user_regs *regs) case FFA_VERSION: handle_version(regs); return true; + case FFA_ID_GET: + set_regs_success(regs, get_vm_id(d), 0); + return true; default: gprintk(XENLOG_ERR, "ffa: unhandled fid 0x%x\n", fid); @@ -237,6 +252,12 @@ static int ffa_domain_init(struct domain *d) if ( !ffa_version ) return -ENODEV; + /* + * We can't use that last possible domain ID or get_vm_id() would cause + * an overflow. + */ + if ( d->domain_id >= UINT16_MAX) + return -ERANGE; ctx = xzalloc(struct ffa_ctx); if ( !ctx ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 23 15:12:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Jul 2023 15:12:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.568307.887623 (Exim 4.92) (envelope-from ) id 1qNal8-0007k6-Mh; Sun, 23 Jul 2023 15:12:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 568307.887623; Sun, 23 Jul 2023 15: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 1qNal8-0007jx-Jp; Sun, 23 Jul 2023 15:12:34 +0000 Received: by outflank-mailman (input) for mailman id 568307; Sun, 23 Jul 2023 15:12:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNal7-0007jm-BG for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:12:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNal7-0002VX-AV for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:12:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNal7-0003LR-9t for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15: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=L0ICfhyCQ5XCkIOdKSfgr04fqsGGEKYMhavWXD/uyW0=; b=mDqlRx2fodUR7+orJdSxynIPwX DpGUYUjXmimH7vo0gBMr4V/7jvEqrb3k08UU7riRLVIB9GhZKW4zzgM4UMcohN/dpd/NwGPWjdtBw +MWdk6dUfi6NOFsM1d1rSLt67f9EnzsViv0blKMc+6h9LLmcyyEQmK9hLlG7VpTXWNRY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: address MISRA C:2012 Rule 4.1 Message-Id: Date: Sun, 23 Jul 2023 15:12:33 +0000 commit cd5048353725f37746da231202feaf5b88ceb46a Author: Nicola Vetrini AuthorDate: Fri Jul 21 08:30:29 2023 +0200 Commit: Jan Beulich CommitDate: Fri Jul 21 08:30:29 2023 +0200 xen: address MISRA C:2012 Rule 4.1 MISRA C:2012 Rule 4.1 has the following headline: "Octal and hexadecimal escape sequences shall be terminated." The string literals modified by this patch contain octal or hexadecimal escape sequences that are neither terminated by the end of the literal, nor by the beginning of another escape sequence. Therefore, such unterminated sequences have been split into a separate literal as a way to comply with the rule and preserve the semantics of the code. No functional changes. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 2 +- xen/common/decompress.c | 4 ++-- xen/common/xz/stream.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 57363c2ae1..24ccf60d77 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3853,7 +3853,7 @@ void hvm_ud_intercept(struct cpu_user_regs *regs) cs, &addr) && (hvm_copy_from_guest_linear(sig, addr, sizeof(sig), walk, NULL) == HVMTRANS_okay) && - (memcmp(sig, "\xf\xbxen", sizeof(sig)) == 0) ) + (memcmp(sig, "\xf\xb" "xen", sizeof(sig)) == 0) ) { regs->rip += sizeof(sig); regs->eflags &= ~X86_EFLAGS_RF; diff --git a/xen/common/decompress.c b/xen/common/decompress.c index 989336983f..2c2c2ad877 100644 --- a/xen/common/decompress.c +++ b/xen/common/decompress.c @@ -19,13 +19,13 @@ int __init decompress(void *inbuf, unsigned int len, void *outbuf) if ( len >= 3 && !memcmp(inbuf, "\x42\x5a\x68", 3) ) return bunzip2(inbuf, len, NULL, NULL, outbuf, NULL, error); - if ( len >= 6 && !memcmp(inbuf, "\3757zXZ", 6) ) + if ( len >= 6 && !memcmp(inbuf, "\375" "7zXZ", 6) ) return unxz(inbuf, len, NULL, NULL, outbuf, NULL, error); if ( len >= 2 && !memcmp(inbuf, "\135\000", 2) ) return unlzma(inbuf, len, NULL, NULL, outbuf, NULL, error); - if ( len >= 5 && !memcmp(inbuf, "\x89LZO", 5) ) + if ( len >= 5 && !memcmp(inbuf, "\x89" "LZO", 5) ) return unlzo(inbuf, len, NULL, NULL, outbuf, NULL, error); if ( len >= 2 && !memcmp(inbuf, "\x02\x21", 2) ) diff --git a/xen/common/xz/stream.h b/xen/common/xz/stream.h index d36d0fec64..8d9fbbe1b5 100644 --- a/xen/common/xz/stream.h +++ b/xen/common/xz/stream.h @@ -18,7 +18,7 @@ #define STREAM_HEADER_SIZE 12 -#define HEADER_MAGIC "\3757zXZ" +#define HEADER_MAGIC "\375" "7zXZ" #define HEADER_MAGIC_SIZE 6 #define FOOTER_MAGIC "YZ" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 23 15:12:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Jul 2023 15:12:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.568308.887626 (Exim 4.92) (envelope-from ) id 1qNalI-0007n0-OD; Sun, 23 Jul 2023 15:12:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 568308.887626; Sun, 23 Jul 2023 15: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 1qNalI-0007ms-LH; Sun, 23 Jul 2023 15:12:44 +0000 Received: by outflank-mailman (input) for mailman id 568308; Sun, 23 Jul 2023 15:12:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNalH-0007mP-EI for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:12:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNalH-0002Vj-DR for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:12:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNalH-0003Lr-CY for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15: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=bKY154iyOn73R85iL2iJQEV4d9NnYKMyPRlwr0wYG3E=; b=zcvkFFpi1onO+twBlno16F5njS 5A+pfBR4XhOk1RAmOgpTYSxNbLfmrPwx94orE5ep3PKjdi2UBJoz6b6s3GHdzufOZx9B/Ly48n5Vx bxGIFqoErhobQN8r4/YASgZHdOrXAXi/+NZilxqZo33uSW+qF2R0AiPSFNZLYYRSBxPY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vRTC: move and tidy convert_hour() and {to,from}_bcd() Message-Id: Date: Sun, 23 Jul 2023 15:12:43 +0000 commit 60576722d0523122ce34c81b91fd1eafac8f7f5f Author: Jan Beulich AuthorDate: Fri Jul 21 08:31:09 2023 +0200 Commit: Jan Beulich CommitDate: Fri Jul 21 08:31:09 2023 +0200 x86/vRTC: move and tidy convert_hour() and {to,from}_bcd() This is to avoid the need for forward declarations, which in turn addresses a violation of MISRA C:2012 Rule 8.3 ("All declarations of an object or function shall use the same names and type qualifiers"). While doing so, - drop inline (leaving the decision to the compiler), - add const, - add unsigned, - correct style. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- xen/arch/x86/hvm/rtc.c | 67 +++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index c1ab6c7d58..206b4296e9 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -58,8 +58,6 @@ enum rtc_mode { static void rtc_copy_date(RTCState *s); static void rtc_set_time(RTCState *s); -static inline int from_bcd(RTCState *s, int a); -static inline int convert_hour(RTCState *s, int hour); static void rtc_update_irq(RTCState *s) { @@ -246,6 +244,40 @@ static void cf_check rtc_update_timer2(void *opaque) spin_unlock(&s->lock); } +static unsigned int to_bcd(const RTCState *s, unsigned int a) +{ + if ( s->hw.cmos_data[RTC_REG_B] & RTC_DM_BINARY ) + return a; + + return ((a / 10) << 4) | (a % 10); +} + +static unsigned int from_bcd(const RTCState *s, unsigned int a) +{ + if ( s->hw.cmos_data[RTC_REG_B] & RTC_DM_BINARY ) + return a; + + return ((a >> 4) * 10) + (a & 0x0f); +} + +/* + * Hours in 12 hour mode are in 1-12 range, not 0-11. So we need convert it + * before use. + */ +static unsigned int convert_hour(const RTCState *s, unsigned int raw) +{ + unsigned int hour = from_bcd(s, raw & 0x7f); + + if ( !(s->hw.cmos_data[RTC_REG_B] & RTC_24H) ) + { + hour %= 12; + if ( raw & 0x80 ) + hour += 12; + } + + return hour; +} + /* handle alarm timer */ static void alarm_timer_update(RTCState *s) { @@ -541,37 +573,6 @@ static int rtc_ioport_write(void *opaque, uint32_t addr, uint32_t data) return 1; } -static inline int to_bcd(RTCState *s, int a) -{ - if ( s->hw.cmos_data[RTC_REG_B] & RTC_DM_BINARY ) - return a; - else - return ((a / 10) << 4) | (a % 10); -} - -static inline int from_bcd(RTCState *s, int a) -{ - if ( s->hw.cmos_data[RTC_REG_B] & RTC_DM_BINARY ) - return a; - else - return ((a >> 4) * 10) + (a & 0x0f); -} - -/* Hours in 12 hour mode are in 1-12 range, not 0-11. - * So we need convert it before using it*/ -static inline int convert_hour(RTCState *s, int raw) -{ - int hour = from_bcd(s, raw & 0x7f); - - if (!(s->hw.cmos_data[RTC_REG_B] & RTC_24H)) - { - hour %= 12; - if (raw & 0x80) - hour += 12; - } - return hour; -} - static void rtc_set_time(RTCState *s) { struct tm *tm = &s->current_tm; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 23 15:12:55 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Jul 2023 15:12:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.568309.887631 (Exim 4.92) (envelope-from ) id 1qNalS-0007qP-RI; Sun, 23 Jul 2023 15:12:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 568309.887631; Sun, 23 Jul 2023 15: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 1qNalS-0007qG-OQ; Sun, 23 Jul 2023 15:12:54 +0000 Received: by outflank-mailman (input) for mailman id 568309; Sun, 23 Jul 2023 15:12:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNalR-0007q7-Hk for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:12:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNalR-0002WB-H2 for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:12:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNalR-0003MG-G6 for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15: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=47STbxHGNnWta4BR1tvbGTLzcZRgTSkZczJC3yiDago=; b=2axb0WTyttbk9ilODNnnY1MAMb jEwB6R9wn7uJ0oZHySJvK54b829ubnQ1qmjms86cJgIGwJZcpAWS95r5h3KNsbNhSyJHC1zEhxJRF V/cyLkN4tFT2Sf5KLmpRzRy9TK0pt93h+Z9fPIRHTieinyA8CtEE7v9kvZjsh1a6Keno=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/HVM: address violations of MISRA C:2012 Rules 8.2 and 8.3 Message-Id: Date: Sun, 23 Jul 2023 15:12:53 +0000 commit 652d8fbb8182f0b9a57ba371c24d21e0a981ee07 Author: Federico Serafini AuthorDate: Fri Jul 21 08:31:42 2023 +0200 Commit: Jan Beulich CommitDate: Fri Jul 21 08:31:42 2023 +0200 x86/HVM: address violations of MISRA C:2012 Rules 8.2 and 8.3 Give a name to unnamed parameters thus addressing violations of MISRA C:2012 Rule 8.2 ("Function types shall be in prototype form with named parameters"). Keep consistency between parameter names and types used in function declarations and the ones used in the corresponding function definitions, thus addressing violations of MISRA C:2012 Rule 8.3 ("All declarations of an object or function shall use the same names and type qualifiers"). No functional changes. Signed-off-by: Federico Serafini Acked-by: Jan Beulich --- xen/arch/x86/hvm/domain.c | 2 +- xen/arch/x86/hvm/hvm.c | 6 +++--- xen/arch/x86/hvm/svm/nestedsvm.c | 8 ++++---- xen/arch/x86/hvm/vioapic.c | 2 +- xen/arch/x86/include/asm/hvm/domain.h | 2 +- xen/arch/x86/include/asm/hvm/hvm.h | 20 ++++++++++---------- xen/arch/x86/include/asm/hvm/irq.h | 14 +++++++------- xen/arch/x86/include/asm/hvm/save.h | 4 ++-- xen/arch/x86/include/asm/hvm/support.h | 2 +- xen/arch/x86/include/asm/hvm/svm/vmcb.h | 2 +- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/hvm/domain.c b/xen/arch/x86/hvm/domain.c index 7692ee24c2..7f6e362a70 100644 --- a/xen/arch/x86/hvm/domain.c +++ b/xen/arch/x86/hvm/domain.c @@ -100,7 +100,7 @@ static int check_segment(struct segment_register *reg, enum x86_segment seg) } /* Called by VCPUOP_initialise for HVM guests. */ -int arch_set_info_hvm_guest(struct vcpu *v, const vcpu_hvm_context_t *ctx) +int arch_set_info_hvm_guest(struct vcpu *v, const struct vcpu_hvm_context *ctx) { const struct domain *d = v->domain; struct cpu_user_regs *uregs = &v->arch.user_regs; diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 24ccf60d77..0fa58ce6a0 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -272,7 +272,7 @@ uint8_t hvm_combine_hw_exceptions(uint8_t vec1, uint8_t vec2) return X86_EXC_DF; } -void hvm_set_rdtsc_exiting(struct domain *d, bool_t enable) +void hvm_set_rdtsc_exiting(struct domain *d, bool enable) { struct vcpu *v; @@ -280,7 +280,7 @@ void hvm_set_rdtsc_exiting(struct domain *d, bool_t enable) alternative_vcall(hvm_funcs.set_rdtsc_exiting, v, enable); } -void hvm_get_guest_pat(struct vcpu *v, u64 *guest_pat) +void hvm_get_guest_pat(struct vcpu *v, uint64_t *guest_pat) { if ( !alternative_call(hvm_funcs.get_guest_pat, v, guest_pat) ) *guest_pat = v->arch.hvm.pat_cr; @@ -426,7 +426,7 @@ static void hvm_set_guest_tsc_adjust(struct vcpu *v, u64 tsc_adjust) update_vcpu_system_time(v); } -u64 hvm_get_guest_tsc_fixed(struct vcpu *v, uint64_t at_tsc) +uint64_t hvm_get_guest_tsc_fixed(struct vcpu *v, uint64_t at_tsc) { uint64_t tsc; diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index 5d74863268..a09b6abaae 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -837,12 +837,12 @@ nsvm_vcpu_vmexit_inject(struct vcpu *v, struct cpu_user_regs *regs, } int cf_check nsvm_vcpu_vmexit_event( - struct vcpu *v, const struct x86_event *trap) + struct vcpu *v, const struct x86_event *event) { ASSERT(vcpu_nestedhvm(v).nv_vvmcx != NULL); - nestedsvm_vmexit_defer(v, VMEXIT_EXCEPTION_DE + trap->vector, - trap->error_code, trap->cr2); + nestedsvm_vmexit_defer(v, VMEXIT_EXCEPTION_DE + event->vector, + event->error_code, event->cr2); return NESTEDHVM_VMEXIT_DONE; } @@ -1538,7 +1538,7 @@ nestedsvm_vcpu_interrupt(struct vcpu *v, const struct hvm_intack intack) return NSVM_INTR_NOTINTERCEPTED; } -bool_t +bool nestedsvm_gif_isset(struct vcpu *v) { struct nestedsvm *svm = &vcpu_nestedsvm(v); diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index 41e3c4d5e4..4e40d3609a 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -43,7 +43,7 @@ /* HACK: Route IRQ0 only to VCPU0 to prevent time jumps. */ #define IRQ0_SPECIAL_ROUTING 1 -static void vioapic_deliver(struct hvm_vioapic *vioapic, unsigned int irq); +static void vioapic_deliver(struct hvm_vioapic *vioapic, unsigned int pin); static struct hvm_vioapic *addr_vioapic(const struct domain *d, unsigned long addr) diff --git a/xen/arch/x86/include/asm/hvm/domain.h b/xen/arch/x86/include/asm/hvm/domain.h index 02c32cf26d..6e53ce4449 100644 --- a/xen/arch/x86/include/asm/hvm/domain.h +++ b/xen/arch/x86/include/asm/hvm/domain.h @@ -47,7 +47,7 @@ struct hvm_pi_ops { * Hook into arch_vcpu_block(), which is called * from vcpu_block() and vcpu_do_poll(). */ - void (*vcpu_block)(struct vcpu *); + void (*vcpu_block)(struct vcpu *v); }; struct hvm_domain { diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/hvm/hvm.h index 3c37f522b9..6d53713fc3 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -151,8 +151,8 @@ struct hvm_function_table { void (*fpu_leave)(struct vcpu *v); - int (*get_guest_pat)(struct vcpu *v, u64 *); - int (*set_guest_pat)(struct vcpu *v, u64); + int (*get_guest_pat)(struct vcpu *v, uint64_t *gpat); + int (*set_guest_pat)(struct vcpu *v, uint64_t gpat); void (*set_tsc_offset)(struct vcpu *v, u64 offset, u64 at_tsc); @@ -180,8 +180,8 @@ struct hvm_function_table { int (*msr_write_intercept)(unsigned int msr, uint64_t msr_content); void (*handle_cd)(struct vcpu *v, unsigned long value); void (*set_info_guest)(struct vcpu *v); - void (*set_rdtsc_exiting)(struct vcpu *v, bool_t); - void (*set_descriptor_access_exiting)(struct vcpu *v, bool); + void (*set_rdtsc_exiting)(struct vcpu *v, bool enable); + void (*set_descriptor_access_exiting)(struct vcpu *v, bool enable); /* Nested HVM */ int (*nhvm_vcpu_initialise)(struct vcpu *v); @@ -265,10 +265,10 @@ int hvm_vcpu_cacheattr_init(struct vcpu *v); void hvm_vcpu_cacheattr_destroy(struct vcpu *v); void hvm_vcpu_reset_state(struct vcpu *v, uint16_t cs, uint16_t ip); -void hvm_get_guest_pat(struct vcpu *v, u64 *guest_pat); -int hvm_set_guest_pat(struct vcpu *v, u64 guest_pat); +void hvm_get_guest_pat(struct vcpu *v, uint64_t *guest_pat); +int hvm_set_guest_pat(struct vcpu *v, uint64_t guest_pat); -u64 hvm_get_guest_tsc_fixed(struct vcpu *v, u64 at_tsc); +uint64_t hvm_get_guest_tsc_fixed(struct vcpu *v, uint64_t at_tsc); u64 hvm_scale_tsc(const struct domain *d, u64 tsc); u64 hvm_get_tsc_scaling_ratio(u32 gtsc_khz); @@ -282,7 +282,7 @@ int vmsi_deliver( uint8_t dest, uint8_t dest_mode, uint8_t delivery_mode, uint8_t trig_mode); struct hvm_pirq_dpci; -void vmsi_deliver_pirq(struct domain *d, const struct hvm_pirq_dpci *); +void vmsi_deliver_pirq(struct domain *d, const struct hvm_pirq_dpci *pirq_dpci); int hvm_girq_dest_2_vcpu_id(struct domain *d, uint8_t dest, uint8_t dest_mode); enum hvm_intblk @@ -309,7 +309,7 @@ int hvm_event_needs_reinjection(uint8_t type, uint8_t vector); uint8_t hvm_combine_hw_exceptions(uint8_t vec1, uint8_t vec2); -void hvm_set_rdtsc_exiting(struct domain *d, bool_t enable); +void hvm_set_rdtsc_exiting(struct domain *d, bool enable); enum hvm_task_switch_reason { TSW_jmp, TSW_iret, TSW_call_or_int }; void hvm_task_switch( @@ -350,7 +350,7 @@ void *hvm_map_guest_frame_rw(unsigned long gfn, bool_t permanent, bool_t *writable); void *hvm_map_guest_frame_ro(unsigned long gfn, bool_t permanent); void hvm_unmap_guest_frame(void *p, bool_t permanent); -void hvm_mapped_guest_frames_mark_dirty(struct domain *); +void hvm_mapped_guest_frames_mark_dirty(struct domain *d); int hvm_debug_op(struct vcpu *v, int32_t op); diff --git a/xen/arch/x86/include/asm/hvm/irq.h b/xen/arch/x86/include/asm/hvm/irq.h index 2d136ab99b..1817ca6e2d 100644 --- a/xen/arch/x86/include/asm/hvm/irq.h +++ b/xen/arch/x86/include/asm/hvm/irq.h @@ -160,17 +160,17 @@ struct hvm_pirq_dpci { struct list_head softirq_list; }; -void pt_pirq_init(struct domain *, struct hvm_pirq_dpci *); -bool pt_pirq_cleanup_check(struct hvm_pirq_dpci *); +void pt_pirq_init(struct domain *d, struct hvm_pirq_dpci *dpci); +bool pt_pirq_cleanup_check(struct hvm_pirq_dpci *dpci); int pt_pirq_iterate(struct domain *d, - int (*cb)(struct domain *, - struct hvm_pirq_dpci *, void *arg), + int (*cb)(struct domain *d, + struct hvm_pirq_dpci *dpci, void *arg), void *arg); #ifdef CONFIG_HVM -bool pt_pirq_softirq_active(struct hvm_pirq_dpci *); +bool pt_pirq_softirq_active(struct hvm_pirq_dpci *pirq_dpci); #else -static inline bool pt_pirq_softirq_active(struct hvm_pirq_dpci *dpci) +static inline bool pt_pirq_softirq_active(struct hvm_pirq_dpci *pirq_dpci) { return false; } @@ -211,6 +211,6 @@ void hvm_assert_evtchn_irq(struct vcpu *v); void hvm_set_callback_via(struct domain *d, uint64_t via); struct pirq; -bool hvm_domain_use_pirq(const struct domain *, const struct pirq *); +bool hvm_domain_use_pirq(const struct domain *d, const struct pirq *pirq); #endif /* __ASM_X86_HVM_IRQ_H__ */ diff --git a/xen/arch/x86/include/asm/hvm/save.h b/xen/arch/x86/include/asm/hvm/save.h index 9d838c48e3..535cf68ed2 100644 --- a/xen/arch/x86/include/asm/hvm/save.h +++ b/xen/arch/x86/include/asm/hvm/save.h @@ -36,8 +36,8 @@ void _hvm_write_entry(struct hvm_domain_context *h, r; }) /* Unmarshalling: test an entry's size and typecode and record the instance */ -int _hvm_check_entry(struct hvm_domain_context *h, - uint16_t type, uint32_t len, bool_t strict_length); +int _hvm_check_entry(struct hvm_domain_context *h, + uint16_t type, uint32_t len, bool strict_length); /* Unmarshalling: copy the contents in a type-safe way */ void _hvm_read_entry(struct hvm_domain_context *h, diff --git a/xen/arch/x86/include/asm/hvm/support.h b/xen/arch/x86/include/asm/hvm/support.h index 8d4707e58c..ab7de0a43b 100644 --- a/xen/arch/x86/include/asm/hvm/support.h +++ b/xen/arch/x86/include/asm/hvm/support.h @@ -135,7 +135,7 @@ int hvm_descriptor_access_intercept(uint64_t exit_info, unsigned int descriptor, bool is_write); int hvm_mov_to_cr(unsigned int cr, unsigned int gpr); int hvm_mov_from_cr(unsigned int cr, unsigned int gpr); -void hvm_ud_intercept(struct cpu_user_regs *); +void hvm_ud_intercept(struct cpu_user_regs *regs); /* * May return X86EMUL_EXCEPTION, at which point the caller is responsible for diff --git a/xen/arch/x86/include/asm/hvm/svm/vmcb.h b/xen/arch/x86/include/asm/hvm/svm/vmcb.h index a1a8a7fd25..91221ff4e2 100644 --- a/xen/arch/x86/include/asm/hvm/svm/vmcb.h +++ b/xen/arch/x86/include/asm/hvm/svm/vmcb.h @@ -607,7 +607,7 @@ void setup_vmcb_dump(void); #define MSR_INTERCEPT_READ 1 #define MSR_INTERCEPT_WRITE 2 #define MSR_INTERCEPT_RW (MSR_INTERCEPT_WRITE | MSR_INTERCEPT_READ) -void svm_intercept_msr(struct vcpu *v, uint32_t msr, int enable); +void svm_intercept_msr(struct vcpu *v, uint32_t msr, int flags); #define svm_disable_intercept_for_msr(v, msr) svm_intercept_msr((v), (msr), MSR_INTERCEPT_NONE) #define svm_enable_intercept_for_msr(v, msr) svm_intercept_msr((v), (msr), MSR_INTERCEPT_RW) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 23 15:13:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Jul 2023 15:13:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.568310.887634 (Exim 4.92) (envelope-from ) id 1qNalc-0007t4-SY; Sun, 23 Jul 2023 15:13:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 568310.887634; Sun, 23 Jul 2023 15:13: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 1qNalc-0007sw-Pz; Sun, 23 Jul 2023 15:13:04 +0000 Received: by outflank-mailman (input) for mailman id 568310; Sun, 23 Jul 2023 15:13:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNalb-0007sl-Kz for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:13:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNalb-0002WX-KF for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:13:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNalb-0003N3-JK for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15: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=bdFx9JgISkNE+tpEg2ToQi40aCE+ivEazKXGNvd3n7w=; b=aTOiw2urNLXRC8VVWsMSiAl8et Le51FJ+Vyw0rjcxAGeGpgUh7lj4PJHEBMU6vEJ62n8e4X2F5y21PT5fN/uHUM8m+gJOojT9IpVCyx 4bsS/pCD/CViiTnt0T9YKyRaxZYVj99dTqy6JDx87NQx/RAK2Vo8dRTrqdqUsymNw4KU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mtrr: address violations of MISRA C:2012 Rule 8.3 on parameter types Message-Id: Date: Sun, 23 Jul 2023 15:13:03 +0000 commit 65fc6d8c92bc339d8ed874c5821e0e65101f6c52 Author: Federico Serafini AuthorDate: Fri Jul 21 08:32:15 2023 +0200 Commit: Jan Beulich CommitDate: Fri Jul 21 08:32:15 2023 +0200 x86/mtrr: address violations of MISRA C:2012 Rule 8.3 on parameter types Change parameter types of function declarations to be consistent with the ones used in the corresponding definitions, thus addressing violations of MISRA C:2012 Rule 8.3 ("All declarations of an object or function shall use the same names and type qualifiers"). No functional changes. Signed-off-by: Federico Serafini Acked-by: Roger Pau Monné --- xen/arch/x86/include/asm/mtrr.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/include/asm/mtrr.h b/xen/arch/x86/include/asm/mtrr.h index e4f6ca6048..14246e3387 100644 --- a/xen/arch/x86/include/asm/mtrr.h +++ b/xen/arch/x86/include/asm/mtrr.h @@ -59,9 +59,10 @@ extern int mtrr_del_page(int reg, unsigned long base, unsigned long size); extern int mtrr_get_type(const struct mtrr_state *m, paddr_t pa, unsigned int order); extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi); -extern u32 get_pat_flags(struct vcpu *v, u32 gl1e_flags, paddr_t gpaddr, - paddr_t spaddr, uint8_t gmtrr_mtype); -extern unsigned char pat_type_2_pte_flags(unsigned char pat_type); +extern uint32_t get_pat_flags(struct vcpu *v, uint32_t gl1e_flags, + paddr_t gpaddr, paddr_t spaddr, + uint8_t gmtrr_mtype); +extern uint8_t pat_type_2_pte_flags(uint8_t pat_type); extern int hold_mtrr_updates_on_aps; extern void mtrr_aps_sync_begin(void); extern void mtrr_aps_sync_end(void); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 23 15:13:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Jul 2023 15:13:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.568311.887640 (Exim 4.92) (envelope-from ) id 1qNalm-0007vZ-Uk; Sun, 23 Jul 2023 15:13:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 568311.887640; Sun, 23 Jul 2023 15:13: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 1qNalm-0007vM-RX; Sun, 23 Jul 2023 15:13:14 +0000 Received: by outflank-mailman (input) for mailman id 568311; Sun, 23 Jul 2023 15:13:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNall-0007vA-Nx for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:13:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qNall-0002Wi-NG for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15:13:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qNall-0003Nb-MV for xen-changelog@lists.xenproject.org; Sun, 23 Jul 2023 15: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=6MlSXAj9YR1xFFHRxH63lct+piMReEow+deUwp9D/IE=; b=gwMTXYDpNsy+nos4pNlIyPslUQ xgw7JAGcn3wXVDvzURQ8t71qdcvJyGXgYVuRWeAnsy78nnBSS3q8wmkDYH5tnpgPTduMbzwYoaq3/ DTb9OO8d7NBZFo8HptxUy7l+NRmrKb25p3+gDscGOK0pRb+SRH/x9nRHKPQRxa2cngTY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: fix XSA-417 patch Message-Id: Date: Sun, 23 Jul 2023 15:13:13 +0000 commit 0c53c638e16278078371ce028c74693841d7738a Author: Juergen Gross AuthorDate: Fri Jul 21 08:32:43 2023 +0200 Commit: Jan Beulich CommitDate: Fri Jul 21 08:32:43 2023 +0200 tools/xenstore: fix XSA-417 patch The fix for XSA-417 had a bug: domain_alloc_permrefs() will not return a negative value in case of an error, but a plain errno value. Note this is not considered to be a security issue, as the only case where domain_alloc_permrefs() will return an error is a failed memory allocation. As a guest should not be able to drive Xenstore out of memory, this is NOT a problem a guest can trigger at will. Fixes: ab128218225d ("tools/xenstore: fix checking node permissions") Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/xenstored_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 31a862b715..a1d3047e48 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1784,7 +1784,7 @@ static int do_set_perms(const void *ctx, struct connection *conn, if (!xenstore_strings_to_perms(perms.p, perms.num, permstr)) return errno; - if (domain_alloc_permrefs(&perms) < 0) + if (domain_alloc_permrefs(&perms)) return ENOMEM; if (perms.p[0].perms & XS_PERM_IGNORE) return ENOENT; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jul 25 13:55:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Jul 2023 13:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.569710.890690 (Exim 4.92) (envelope-from ) id 1qOIVC-0007nq-D9; Tue, 25 Jul 2023 13:55:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 569710.890690; Tue, 25 Jul 2023 13:55:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOIVC-0007nj-Aj; Tue, 25 Jul 2023 13:55:02 +0000 Received: by outflank-mailman (input) for mailman id 569710; Tue, 25 Jul 2023 13:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOIVB-0007nd-Gt for xen-changelog@lists.xenproject.org; Tue, 25 Jul 2023 13:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOIVB-0002nX-Cp for xen-changelog@lists.xenproject.org; Tue, 25 Jul 2023 13:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qOIVB-0004vo-AL for xen-changelog@lists.xenproject.org; Tue, 25 Jul 2023 13:55: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=uHBQyuDv5TzM+HNRNDV7Ey4nLeX7cXevNwxKz33FBQo=; b=0NcsG25sgyhLaVoO5+WsbgzAOk 3MzxDt9+CqH6avvAXA36MFU+p3+jv7wZLtL1/BN+IZlTngfB1Cb1NX4u6w5PeZIkonJrtpkZV77jC n7Fsrw2NNnLE03PVOCOR51HBp5vIkNB/sEHZYCQ7AQAbKBfo1mrQ57joqYcJREsn75Io=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/amd: Mitigations for Zenbleed Message-Id: Date: Tue, 25 Jul 2023 13:55:01 +0000 commit faa4e2b1cf8022497a7b60c5b50a3bd280a5fc65 Author: Andrew Cooper AuthorDate: Mon May 22 23:03:00 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Jul 24 17:14:46 2023 +0100 x86/amd: Mitigations for Zenbleed Zenbleed is a malfunction on AMD Zen2 uarch parts which results in corruption of the vector registers. An attacker can trigger this bug deliberately in order to access stale data in the physical vector register file. This can include data from sibling threads, or a higher-privilege context. Microcode is the preferred mitigation but in the case that's not available use the chickenbit as instructed by AMD. Re-evaluate the mitigation on late microcode load too. This is XSA-433 / CVE-2023-20593. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné (cherry picked from commit f91c5ea970675637721bb7f18adaa189837eb783) --- xen/arch/x86/cpu/amd.c | 69 ++++++++++++++++++++++++++++++++++++++++ xen/arch/x86/cpu/microcode/amd.c | 2 ++ xen/include/asm-x86/processor.h | 2 ++ 3 files changed, 73 insertions(+) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index a8d2fb8a15..dd4dc3157c 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "cpu.h" @@ -756,6 +757,72 @@ void amd_init_spectral_chicken(void) wrmsr_safe(MSR_AMD64_DE_CFG2, val | chickenbit); } +void amd_check_zenbleed(void) +{ + const struct cpu_signature *sig = &this_cpu(cpu_sig); + unsigned int good_rev, chickenbit = (1 << 9); + uint64_t val, old_val; + + /* + * If we're virtualised, we can't do family/model checks safely, and + * we likely wouldn't have access to DE_CFG even if we could see a + * microcode revision. + * + * A hypervisor may hide AVX as a stopgap mitigation. We're not in a + * position to care either way. An admin doesn't want to be disabling + * AVX as a mitigation on any build of Xen with this logic present. + */ + if (cpu_has_hypervisor || boot_cpu_data.x86 != 0x17) + return; + + switch (boot_cpu_data.x86_model) { + case 0x30 ... 0x3f: good_rev = 0x0830107a; break; + case 0x60 ... 0x67: good_rev = 0x0860010b; break; + case 0x68 ... 0x6f: good_rev = 0x08608105; break; + case 0x70 ... 0x7f: good_rev = 0x08701032; break; + case 0xa0 ... 0xaf: good_rev = 0x08a00008; break; + default: + /* + * With the Fam17h check above, parts getting here are Zen1. + * They're not affected. + */ + return; + } + + rdmsrl(MSR_AMD64_DE_CFG, val); + old_val = val; + + /* + * Microcode is the preferred mitigation, in terms of performance. + * However, without microcode, this chickenbit (specific to the Zen2 + * uarch) disables Floating Point Mov-Elimination to mitigate the + * issue. + */ + val &= ~chickenbit; + if (sig->rev < good_rev) + val |= chickenbit; + + if (val == old_val) + /* Nothing to change. */ + return; + + /* + * DE_CFG is a Core-scoped MSR, and this write is racy during late + * microcode load. However, both threads calculate the new value from + * state which is shared, and unrelated to the old value, so the + * result should be consistent. + */ + wrmsrl(MSR_AMD64_DE_CFG, val); + + /* + * Inform the admin that we changed something, but don't spam, + * especially during a late microcode load. + */ + if (smp_processor_id() == 0) + printk(XENLOG_INFO "Zenbleed mitigation - using %s\n", + val & chickenbit ? "chickenbit" : "microcode"); +} + static void init_amd(struct cpuinfo_x86 *c) { u32 l, h; @@ -1016,6 +1083,8 @@ static void init_amd(struct cpuinfo_x86 *c) if ((smp_processor_id() == 1) && !cpu_has(c, X86_FEATURE_ITSC)) disable_c1_ramping(); + amd_check_zenbleed(); + check_syscfg_dram_mod_en(); amd_log_freq(c); diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c index 809ba4967c..90629bee0d 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -254,6 +254,8 @@ static int apply_microcode(const struct microcode_patch *patch) printk(XENLOG_WARNING "microcode: CPU%u updated from revision %#x to %#x\n", cpu, old_rev, rev); + amd_check_zenbleed(); + return 0; } diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index c8745e1f31..7b5ba41a40 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -641,6 +641,8 @@ enum ap_boot_method { }; extern enum ap_boot_method ap_boot_method; +void amd_check_zenbleed(void); + #endif /* !__ASSEMBLY__ */ #endif /* __ASM_X86_PROCESSOR_H */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Tue Jul 25 16:55:10 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Jul 2023 16:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.569845.890995 (Exim 4.92) (envelope-from ) id 1qOLJP-0000z0-LF; Tue, 25 Jul 2023 16:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 569845.890995; Tue, 25 Jul 2023 16:55: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 1qOLJP-0000yr-IP; Tue, 25 Jul 2023 16:55:03 +0000 Received: by outflank-mailman (input) for mailman id 569845; Tue, 25 Jul 2023 16:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOLJO-0000yl-AK for xen-changelog@lists.xenproject.org; Tue, 25 Jul 2023 16:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOLJO-0008Lq-6s for xen-changelog@lists.xenproject.org; Tue, 25 Jul 2023 16:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qOLJO-0000ZI-5s for xen-changelog@lists.xenproject.org; Tue, 25 Jul 2023 16:55: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=tC0hgjJmR73tiBF513+uYQMKyv/OIjAkpmIS2O/Zw7k=; b=cWPm+MPXU9yxZ2taobuR8YfH95 S89dOMHNZxji3A2VTh8oTqwLoaId9T2nLUE2KBGahmXGd634d+F3h3d62vSaNnOnqt2F0XAL7RdfZ rFLUxDoLM9WkLxLn128IvHt9kkiDhA+PD5g0c2W47WuAmd2IQz3O9RwlSQmtRQf/KbhM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] x86/amd: Mitigations for Zenbleed Message-Id: Date: Tue, 25 Jul 2023 16:55:02 +0000 commit 64b40594f589c9069fb8cf3899d4aac59c86d4f1 Author: Andrew Cooper AuthorDate: Mon May 22 23:03:00 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Jul 24 17:16:41 2023 +0100 x86/amd: Mitigations for Zenbleed Zenbleed is a malfunction on AMD Zen2 uarch parts which results in corruption of the vector registers. An attacker can trigger this bug deliberately in order to access stale data in the physical vector register file. This can include data from sibling threads, or a higher-privilege context. Microcode is the preferred mitigation but in the case that's not available use the chickenbit as instructed by AMD. Re-evaluate the mitigation on late microcode load too. This is XSA-433 / CVE-2023-20593. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné (cherry picked from commit f91c5ea970675637721bb7f18adaa189837eb783) --- xen/arch/x86/cpu/amd.c | 69 ++++++++++++++++++++++++++++++++++++++++ xen/arch/x86/cpu/microcode/amd.c | 2 ++ xen/include/asm-x86/processor.h | 2 ++ 3 files changed, 73 insertions(+) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index b670ab6cd1..9db79f409a 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "cpu.h" @@ -756,6 +757,72 @@ void amd_init_spectral_chicken(void) wrmsr_safe(MSR_AMD64_DE_CFG2, val | chickenbit); } +void amd_check_zenbleed(void) +{ + const struct cpu_signature *sig = &this_cpu(cpu_sig); + unsigned int good_rev, chickenbit = (1 << 9); + uint64_t val, old_val; + + /* + * If we're virtualised, we can't do family/model checks safely, and + * we likely wouldn't have access to DE_CFG even if we could see a + * microcode revision. + * + * A hypervisor may hide AVX as a stopgap mitigation. We're not in a + * position to care either way. An admin doesn't want to be disabling + * AVX as a mitigation on any build of Xen with this logic present. + */ + if (cpu_has_hypervisor || boot_cpu_data.x86 != 0x17) + return; + + switch (boot_cpu_data.x86_model) { + case 0x30 ... 0x3f: good_rev = 0x0830107a; break; + case 0x60 ... 0x67: good_rev = 0x0860010b; break; + case 0x68 ... 0x6f: good_rev = 0x08608105; break; + case 0x70 ... 0x7f: good_rev = 0x08701032; break; + case 0xa0 ... 0xaf: good_rev = 0x08a00008; break; + default: + /* + * With the Fam17h check above, parts getting here are Zen1. + * They're not affected. + */ + return; + } + + rdmsrl(MSR_AMD64_DE_CFG, val); + old_val = val; + + /* + * Microcode is the preferred mitigation, in terms of performance. + * However, without microcode, this chickenbit (specific to the Zen2 + * uarch) disables Floating Point Mov-Elimination to mitigate the + * issue. + */ + val &= ~chickenbit; + if (sig->rev < good_rev) + val |= chickenbit; + + if (val == old_val) + /* Nothing to change. */ + return; + + /* + * DE_CFG is a Core-scoped MSR, and this write is racy during late + * microcode load. However, both threads calculate the new value from + * state which is shared, and unrelated to the old value, so the + * result should be consistent. + */ + wrmsrl(MSR_AMD64_DE_CFG, val); + + /* + * Inform the admin that we changed something, but don't spam, + * especially during a late microcode load. + */ + if (smp_processor_id() == 0) + printk(XENLOG_INFO "Zenbleed mitigation - using %s\n", + val & chickenbit ? "chickenbit" : "microcode"); +} + static void init_amd(struct cpuinfo_x86 *c) { u32 l, h; @@ -1016,6 +1083,8 @@ static void init_amd(struct cpuinfo_x86 *c) if ((smp_processor_id() == 1) && !cpu_has(c, X86_FEATURE_ITSC)) disable_c1_ramping(); + amd_check_zenbleed(); + check_syscfg_dram_mod_en(); amd_log_freq(c); diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c index 5eb93195c3..9101f93e42 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -251,6 +251,8 @@ static int apply_microcode(const struct microcode_patch *patch) printk(XENLOG_WARNING "microcode: CPU%u updated from revision %#x to %#x\n", cpu, old_rev, rev); + amd_check_zenbleed(); + return 0; } diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 3ff7cc5807..71b454d984 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -635,6 +635,8 @@ void tsx_init(void); void update_mcu_opt_ctrl(void); void set_in_mcu_opt_ctrl(uint32_t mask, uint32_t val); +void amd_check_zenbleed(void); + #endif /* !__ASSEMBLY__ */ #endif /* __ASM_X86_PROCESSOR_H */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Tue Jul 25 21:44:07 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Jul 2023 21:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.569955.891201 (Exim 4.92) (envelope-from ) id 1qOPp4-0006kt-Op; Tue, 25 Jul 2023 21:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 569955.891201; Tue, 25 Jul 2023 21:44:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOPp4-0006km-MP; Tue, 25 Jul 2023 21:44:02 +0000 Received: by outflank-mailman (input) for mailman id 569955; Tue, 25 Jul 2023 21:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOPp3-0006kg-FS for xen-changelog@lists.xenproject.org; Tue, 25 Jul 2023 21:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOPp3-0006SC-Eh for xen-changelog@lists.xenproject.org; Tue, 25 Jul 2023 21:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qOPp3-00066T-DB for xen-changelog@lists.xenproject.org; Tue, 25 Jul 2023 21: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=9x3MH7f5XYSgyzUj/SuCJwuHEj+5SnYycMu4eHOc9hM=; b=Zja4tVL2e22r+/Q1fCicE85BVm EYDHn2d5zi8EneWcCnDiws0xiieV2V0PuqMJQhdKPZHCTi46dHNCdGRnLVXBagmxJscrjiGGpXEZB Kl4ISKbBdXWBZC3AVCX0BM6DYl8XAfJuxIQzfTAmxmJFhhxeEPdlMxGWZjtnP9RbufIg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/amd: Mitigations for Zenbleed Message-Id: Date: Tue, 25 Jul 2023 21:44:01 +0000 commit 3141a0b85c37b76e069ec7dcb906ff202f5c4075 Author: Andrew Cooper AuthorDate: Mon May 22 23:03:00 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Jul 24 17:12:30 2023 +0100 x86/amd: Mitigations for Zenbleed Zenbleed is a malfunction on AMD Zen2 uarch parts which results in corruption of the vector registers. An attacker can trigger this bug deliberately in order to access stale data in the physical vector register file. This can include data from sibling threads, or a higher-privilege context. Microcode is the preferred mitigation but in the case that's not available use the chickenbit as instructed by AMD. Re-evaluate the mitigation on late microcode load too. This is XSA-433 / CVE-2023-20593. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné (cherry picked from commit f91c5ea970675637721bb7f18adaa189837eb783) --- xen/arch/x86/cpu/amd.c | 69 ++++++++++++++++++++++++++++++++++++ xen/arch/x86/cpu/microcode/amd.c | 2 ++ xen/arch/x86/include/asm/processor.h | 2 ++ 3 files changed, 73 insertions(+) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index b6a20d375a..8d23a5be0c 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "cpu.h" @@ -878,6 +879,72 @@ void __init detect_zen2_null_seg_behaviour(void) } +void amd_check_zenbleed(void) +{ + const struct cpu_signature *sig = &this_cpu(cpu_sig); + unsigned int good_rev, chickenbit = (1 << 9); + uint64_t val, old_val; + + /* + * If we're virtualised, we can't do family/model checks safely, and + * we likely wouldn't have access to DE_CFG even if we could see a + * microcode revision. + * + * A hypervisor may hide AVX as a stopgap mitigation. We're not in a + * position to care either way. An admin doesn't want to be disabling + * AVX as a mitigation on any build of Xen with this logic present. + */ + if (cpu_has_hypervisor || boot_cpu_data.x86 != 0x17) + return; + + switch (boot_cpu_data.x86_model) { + case 0x30 ... 0x3f: good_rev = 0x0830107a; break; + case 0x60 ... 0x67: good_rev = 0x0860010b; break; + case 0x68 ... 0x6f: good_rev = 0x08608105; break; + case 0x70 ... 0x7f: good_rev = 0x08701032; break; + case 0xa0 ... 0xaf: good_rev = 0x08a00008; break; + default: + /* + * With the Fam17h check above, parts getting here are Zen1. + * They're not affected. + */ + return; + } + + rdmsrl(MSR_AMD64_DE_CFG, val); + old_val = val; + + /* + * Microcode is the preferred mitigation, in terms of performance. + * However, without microcode, this chickenbit (specific to the Zen2 + * uarch) disables Floating Point Mov-Elimination to mitigate the + * issue. + */ + val &= ~chickenbit; + if (sig->rev < good_rev) + val |= chickenbit; + + if (val == old_val) + /* Nothing to change. */ + return; + + /* + * DE_CFG is a Core-scoped MSR, and this write is racy during late + * microcode load. However, both threads calculate the new value from + * state which is shared, and unrelated to the old value, so the + * result should be consistent. + */ + wrmsrl(MSR_AMD64_DE_CFG, val); + + /* + * Inform the admin that we changed something, but don't spam, + * especially during a late microcode load. + */ + if (smp_processor_id() == 0) + printk(XENLOG_INFO "Zenbleed mitigation - using %s\n", + val & chickenbit ? "chickenbit" : "microcode"); +} + static void cf_check init_amd(struct cpuinfo_x86 *c) { u32 l, h; @@ -1150,6 +1217,8 @@ static void cf_check init_amd(struct cpuinfo_x86 *c) if ((smp_processor_id() == 1) && !cpu_has(c, X86_FEATURE_ITSC)) disable_c1_ramping(); + amd_check_zenbleed(); + check_syscfg_dram_mod_en(); amd_log_freq(c); diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c index ded8fe90e6..c6d13f3fb3 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -262,6 +262,8 @@ static int cf_check apply_microcode(const struct microcode_patch *patch) "microcode: CPU%u updated from revision %#x to %#x, date = %04x-%02x-%02x\n", cpu, old_rev, rev, patch->year, patch->month, patch->day); + amd_check_zenbleed(); + return 0; } diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index 8e2816fae9..66611df6ef 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -637,6 +637,8 @@ enum ap_boot_method { }; extern enum ap_boot_method ap_boot_method; +void amd_check_zenbleed(void); + #endif /* !__ASSEMBLY__ */ #endif /* __ASM_X86_PROCESSOR_H */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jul 26 02:11:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jul 2023 02:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.570024.891266 (Exim 4.92) (envelope-from ) id 1qOTzS-0001mh-WD; Wed, 26 Jul 2023 02:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 570024.891266; Wed, 26 Jul 2023 02:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOTzS-0001mZ-TL; Wed, 26 Jul 2023 02:11:02 +0000 Received: by outflank-mailman (input) for mailman id 570024; Wed, 26 Jul 2023 02:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOTzR-0001mR-B0 for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 02:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOTzR-0003E8-9j for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 02:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qOTzR-0000Ho-8W for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 02:11: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=qS+RmLKNDQj4xXBrzAXJl5nbFy0ryx3cd4YH13xs6X0=; b=MKsjDp/fW77r2tsVofT59FGbBE mHWXsNM+jaSgp9/3A7ckartSNApJPNtT1XkOfF8jV5FtoTUoTvNQT5u4yuYY/8EEa/YdGoFssoxcl elY1mRT3m9NEMl6W9cdi+gzzVFP12QXNgj1ea68mCXF+/+32qScKQUizP+vhp3KWxyqs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] x86/amd: Mitigations for Zenbleed Message-Id: Date: Wed, 26 Jul 2023 02:11:01 +0000 commit 82c5ab6be04a1f5544e38ed5198e79b91cecac45 Author: Andrew Cooper AuthorDate: Mon May 22 23:03:00 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Jul 24 17:13:59 2023 +0100 x86/amd: Mitigations for Zenbleed Zenbleed is a malfunction on AMD Zen2 uarch parts which results in corruption of the vector registers. An attacker can trigger this bug deliberately in order to access stale data in the physical vector register file. This can include data from sibling threads, or a higher-privilege context. Microcode is the preferred mitigation but in the case that's not available use the chickenbit as instructed by AMD. Re-evaluate the mitigation on late microcode load too. This is XSA-433 / CVE-2023-20593. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné (cherry picked from commit f91c5ea970675637721bb7f18adaa189837eb783) --- xen/arch/x86/cpu/amd.c | 69 ++++++++++++++++++++++++++++++++++++++++ xen/arch/x86/cpu/microcode/amd.c | 2 ++ xen/include/asm-x86/processor.h | 2 ++ 3 files changed, 73 insertions(+) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 08e3e1e8a2..4ed08df4a8 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "cpu.h" @@ -769,6 +770,72 @@ void __init detect_zen2_null_seg_behaviour(void) } +void amd_check_zenbleed(void) +{ + const struct cpu_signature *sig = &this_cpu(cpu_sig); + unsigned int good_rev, chickenbit = (1 << 9); + uint64_t val, old_val; + + /* + * If we're virtualised, we can't do family/model checks safely, and + * we likely wouldn't have access to DE_CFG even if we could see a + * microcode revision. + * + * A hypervisor may hide AVX as a stopgap mitigation. We're not in a + * position to care either way. An admin doesn't want to be disabling + * AVX as a mitigation on any build of Xen with this logic present. + */ + if (cpu_has_hypervisor || boot_cpu_data.x86 != 0x17) + return; + + switch (boot_cpu_data.x86_model) { + case 0x30 ... 0x3f: good_rev = 0x0830107a; break; + case 0x60 ... 0x67: good_rev = 0x0860010b; break; + case 0x68 ... 0x6f: good_rev = 0x08608105; break; + case 0x70 ... 0x7f: good_rev = 0x08701032; break; + case 0xa0 ... 0xaf: good_rev = 0x08a00008; break; + default: + /* + * With the Fam17h check above, parts getting here are Zen1. + * They're not affected. + */ + return; + } + + rdmsrl(MSR_AMD64_DE_CFG, val); + old_val = val; + + /* + * Microcode is the preferred mitigation, in terms of performance. + * However, without microcode, this chickenbit (specific to the Zen2 + * uarch) disables Floating Point Mov-Elimination to mitigate the + * issue. + */ + val &= ~chickenbit; + if (sig->rev < good_rev) + val |= chickenbit; + + if (val == old_val) + /* Nothing to change. */ + return; + + /* + * DE_CFG is a Core-scoped MSR, and this write is racy during late + * microcode load. However, both threads calculate the new value from + * state which is shared, and unrelated to the old value, so the + * result should be consistent. + */ + wrmsrl(MSR_AMD64_DE_CFG, val); + + /* + * Inform the admin that we changed something, but don't spam, + * especially during a late microcode load. + */ + if (smp_processor_id() == 0) + printk(XENLOG_INFO "Zenbleed mitigation - using %s\n", + val & chickenbit ? "chickenbit" : "microcode"); +} + static void init_amd(struct cpuinfo_x86 *c) { u32 l, h; @@ -1041,6 +1108,8 @@ static void init_amd(struct cpuinfo_x86 *c) if ((smp_processor_id() == 1) && !cpu_has(c, X86_FEATURE_ITSC)) disable_c1_ramping(); + amd_check_zenbleed(); + check_syscfg_dram_mod_en(); amd_log_freq(c); diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c index 52182c1a23..483a9b547f 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -262,6 +262,8 @@ static int apply_microcode(const struct microcode_patch *patch) "microcode: CPU%u updated from revision %#x to %#x, date = %04x-%02x-%02x\n", cpu, old_rev, rev, patch->year, patch->month, patch->day); + amd_check_zenbleed(); + return 0; } diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 3d8aacd3aa..96621ec39f 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -639,6 +639,8 @@ enum ap_boot_method { }; extern enum ap_boot_method ap_boot_method; +void amd_check_zenbleed(void); + #endif /* !__ASSEMBLY__ */ #endif /* __ASM_X86_PROCESSOR_H */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Wed Jul 26 11:55:05 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jul 2023 11:55:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.570413.892164 (Exim 4.92) (envelope-from ) id 1qOd6d-0000Jm-4k; Wed, 26 Jul 2023 11:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 570413.892164; Wed, 26 Jul 2023 11:55: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 1qOd6d-0000Je-2B; Wed, 26 Jul 2023 11:55:03 +0000 Received: by outflank-mailman (input) for mailman id 570413; Wed, 26 Jul 2023 11:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOd6c-0000JY-8I for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 11:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOd6c-0000d7-3s for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 11:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qOd6c-0003EO-2s for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 11:55: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=DVBxyNSRtTtOilAbLd/ggHH2jWH9tGSyjoA7HpjGiCk=; b=Y4OCZtWsmxOrDDmOGZDrFdr1Dd BGbIvQ+P3kiNzlae8kxSTFk4qUAyj34noDyjDABvD96PDAJZ9scM+YRbSVaYf/I9PWbVlKF+W5gKI YS066YD28WlbI0BpVhvGS9mz9FzxHujFB9dQWWrTAMr9VDgCMrHglxwKBOJvvwOz4ZdQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] automation: qemu-smoke-arm64.sh: Increase RAM size Message-Id: Date: Wed, 26 Jul 2023 11:55:02 +0000 commit 04f14792a6c7a4e4cd8fda10b29c7e72837c5433 Author: Michal Orzel AuthorDate: Tue Sep 27 11:47:20 2022 +0200 Commit: Stefano Stabellini CommitDate: Tue Jul 25 17:28:07 2023 -0700 automation: qemu-smoke-arm64.sh: Increase RAM size In the follow-up patch we will add new jobs using debug Xen builds. Because the debug builds take more space and we might end up in a situation when there is not enough free space (especially during a static memory test that reserves some region in the middle), increase RAM size for QEMU from 1GB to 2GB. Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini Reviewed-by: Luca Fancellu (cherry picked from commit a0030a83e82a1fb03d6e3b7692678812d5971608) --- automation/scripts/qemu-smoke-arm64.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh index 80ec2b12f4..2b59346fdc 100755 --- a/automation/scripts/qemu-smoke-arm64.sh +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -43,7 +43,7 @@ curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom ./binaries/qemu-system-aarch64 \ -machine virtualization=true \ -cpu cortex-a57 -machine type=virt \ - -m 1024 -smp 2 -display none \ + -m 2048 -smp 2 -display none \ -machine dumpdtb=binaries/virt-gicv2.dtb # XXX disable pl061 to avoid Linux crash @@ -108,7 +108,7 @@ cd .. # ImageBuilder echo 'MEMORY_START="0x40000000" -MEMORY_END="0x80000000" +MEMORY_END="0xC0000000" DEVICE_TREE="virt-gicv2.dtb" XEN="xen" @@ -149,7 +149,7 @@ timeout -k 1 240 \ ./binaries/qemu-system-aarch64 \ -machine virtualization=true \ -cpu cortex-a57 -machine type=virt \ - -m 1024 -monitor none -serial stdio \ + -m 2048 -monitor none -serial stdio \ -smp 2 \ -no-reboot \ -device virtio-net-pci,netdev=n0 \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Wed Jul 26 21:33:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jul 2023 21:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.570698.892771 (Exim 4.92) (envelope-from ) id 1qOm7z-000899-Hl; Wed, 26 Jul 2023 21:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 570698.892771; Wed, 26 Jul 2023 21:33: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 1qOm7z-00088z-Ey; Wed, 26 Jul 2023 21:33:03 +0000 Received: by outflank-mailman (input) for mailman id 570698; Wed, 26 Jul 2023 21:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm7x-00088q-W3 for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm7x-0006KO-Uf for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qOm7x-0008FY-T5 for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33: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=0CL0cB0UG/3775y+rGIOadSweHuZmNKT0ugB9/7JJDk=; b=UJeHBub8Rugh55S9GG/YYI3Jj6 82lUQUOGRrY9udsjhm03vduXuAmT+dEiauqK80Y9qSHqTRT7Ukm2/V0IE8KGO+EjQXymNJehakKzt YxymXuR3ITrvBAiTCca82pEwamH1epO70TGNaSjQe2PMkpZgAhr40eRcfGNfJoaN0UgU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: arm: Add grant_usage parameter for virtio devices Message-Id: Date: Wed, 26 Jul 2023 21:33:01 +0000 commit c14254065ff4826e34f714e1790eab5217368c38 Author: Viresh Kumar AuthorDate: Mon Jul 24 14:11:35 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 24 14:11:35 2023 +0200 libxl: arm: Add grant_usage parameter for virtio devices Currently, the grant mapping related device tree properties are added if the backend domain is not Dom0. While Dom0 is privileged and can do foreign mapping for the entire guest memory, it is still desired for Dom0 to access guest's memory via grant mappings and hence map only what is required. This commit adds the "grant_usage" parameter for virtio devices, which provides better control over the functionality. Signed-off-by: Viresh Kumar Reviewed-by: Anthony PERARD Acked-by: George Dunlap --- docs/man/xl.cfg.5.pod.in | 8 ++++++++ tools/golang/xenlight/helpers.gen.go | 6 ++++++ tools/golang/xenlight/types.gen.go | 1 + tools/libs/light/libxl_arm.c | 22 +++++++++++++--------- tools/libs/light/libxl_types.idl | 1 + tools/libs/light/libxl_virtio.c | 23 +++++++++++++++++++++-- tools/xl/xl_parse.c | 2 ++ 7 files changed, 52 insertions(+), 11 deletions(-) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 3979be2a59..b6fc20ef01 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -1619,6 +1619,14 @@ hexadecimal format, without the "0x" prefix and all in lower case, like Specifies the transport mechanism for the Virtio device, only "mmio" is supported for now. +=item B + +If this option is B, the Xen grants are always enabled. +If this option is B, the Xen grants are always disabled. + +If this option is missing, then the default grant setting will be used, +i.e. enable grants if backend-domid != 0. + =back =item B diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index cd1a16e32e..3ecffdf0ef 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1794,6 +1794,9 @@ func (x *DeviceVirtio) fromC(xc *C.libxl_device_virtio) error { x.BackendDomname = C.GoString(xc.backend_domname) x.Type = C.GoString(xc._type) x.Transport = VirtioTransport(xc.transport) +if err := x.GrantUsage.fromC(&xc.grant_usage);err != nil { +return fmt.Errorf("converting field GrantUsage: %v", err) +} x.Devid = Devid(xc.devid) x.Irq = uint32(xc.irq) x.Base = uint64(xc.base) @@ -1811,6 +1814,9 @@ xc.backend_domname = C.CString(x.BackendDomname)} if x.Type != "" { xc._type = C.CString(x.Type)} xc.transport = C.libxl_virtio_transport(x.Transport) +if err := x.GrantUsage.toC(&xc.grant_usage); err != nil { +return fmt.Errorf("converting field GrantUsage: %v", err) +} xc.devid = C.libxl_devid(x.Devid) xc.irq = C.uint32_t(x.Irq) xc.base = C.uint64_t(x.Base) diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index b131a7eedc..4f40aac28c 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -706,6 +706,7 @@ BackendDomid Domid BackendDomname string Type string Transport VirtioTransport +GrantUsage Defbool Devid Devid Irq uint32 Base uint64 diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index 35f76dfc21..f98e1affa2 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -930,7 +930,8 @@ static int make_xen_iommu_node(libxl__gc *gc, void *fdt) /* The caller is responsible to complete / close the fdt node */ static int make_virtio_mmio_node_common(libxl__gc *gc, void *fdt, uint64_t base, - uint32_t irq, uint32_t backend_domid) + uint32_t irq, uint32_t backend_domid, + bool grant_usage) { int res; gic_interrupt intr; @@ -953,7 +954,7 @@ static int make_virtio_mmio_node_common(libxl__gc *gc, void *fdt, uint64_t base, res = fdt_property(fdt, "dma-coherent", NULL, 0); if (res) return res; - if (backend_domid != LIBXL_TOOLSTACK_DOMID) { + if (grant_usage) { uint32_t iommus_prop[2]; iommus_prop[0] = cpu_to_fdt32(GUEST_PHANDLE_IOMMU); @@ -967,11 +968,12 @@ static int make_virtio_mmio_node_common(libxl__gc *gc, void *fdt, uint64_t base, } static int make_virtio_mmio_node(libxl__gc *gc, void *fdt, uint64_t base, - uint32_t irq, uint32_t backend_domid) + uint32_t irq, uint32_t backend_domid, + bool grant_usage) { int res; - res = make_virtio_mmio_node_common(gc, fdt, base, irq, backend_domid); + res = make_virtio_mmio_node_common(gc, fdt, base, irq, backend_domid, grant_usage); if (res) return res; return fdt_end_node(fdt); @@ -1027,11 +1029,11 @@ static int make_virtio_mmio_node_gpio(libxl__gc *gc, void *fdt) static int make_virtio_mmio_node_device(libxl__gc *gc, void *fdt, uint64_t base, uint32_t irq, const char *type, - uint32_t backend_domid) + uint32_t backend_domid, bool grant_usage) { int res; - res = make_virtio_mmio_node_common(gc, fdt, base, irq, backend_domid); + res = make_virtio_mmio_node_common(gc, fdt, base, irq, backend_domid, grant_usage); if (res) return res; /* Add device specific nodes */ @@ -1371,7 +1373,8 @@ next_resize: iommu_needed = true; FDT( make_virtio_mmio_node(gc, fdt, disk->base, disk->irq, - disk->backend_domid) ); + disk->backend_domid, + disk->backend_domid != LIBXL_TOOLSTACK_DOMID) ); } } @@ -1381,12 +1384,13 @@ next_resize: if (virtio->transport != LIBXL_VIRTIO_TRANSPORT_MMIO) continue; - if (virtio->backend_domid != LIBXL_TOOLSTACK_DOMID) + if (libxl_defbool_val(virtio->grant_usage)) iommu_needed = true; FDT( make_virtio_mmio_node_device(gc, fdt, virtio->base, virtio->irq, virtio->type, - virtio->backend_domid) ); + virtio->backend_domid, + libxl_defbool_val(virtio->grant_usage)) ); } /* diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 9e48bb7726..700b44a164 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -762,6 +762,7 @@ libxl_device_virtio = Struct("device_virtio", [ ("backend_domname", string), ("type", string), ("transport", libxl_virtio_transport), + ("grant_usage", libxl_defbool), ("devid", libxl_devid), # Note that virtio-mmio parameters (irq and base) are for internal # use by libxl and can't be modified. diff --git a/tools/libs/light/libxl_virtio.c b/tools/libs/light/libxl_virtio.c index f8a78e22d1..e5e321adc5 100644 --- a/tools/libs/light/libxl_virtio.c +++ b/tools/libs/light/libxl_virtio.c @@ -23,8 +23,16 @@ static int libxl__device_virtio_setdefault(libxl__gc *gc, uint32_t domid, libxl_device_virtio *virtio, bool hotplug) { - return libxl__resolve_domid(gc, virtio->backend_domname, - &virtio->backend_domid); + int rc; + + rc = libxl__resolve_domid(gc, virtio->backend_domname, + &virtio->backend_domid); + if (rc < 0) return rc; + + libxl_defbool_setdefault(&virtio->grant_usage, + virtio->backend_domid != LIBXL_TOOLSTACK_DOMID); + + return 0; } static int libxl__device_from_virtio(libxl__gc *gc, uint32_t domid, @@ -53,6 +61,8 @@ static int libxl__set_xenstore_virtio(libxl__gc *gc, uint32_t domid, flexarray_append_pair(back, "base", GCSPRINTF("%#"PRIx64, virtio->base)); flexarray_append_pair(back, "type", GCSPRINTF("%s", virtio->type)); flexarray_append_pair(back, "transport", GCSPRINTF("%s", transport)); + flexarray_append_pair(back, "grant_usage", + libxl_defbool_val(virtio->grant_usage) ? "1" : "0"); return 0; } @@ -104,6 +114,15 @@ static int libxl__virtio_from_xenstore(libxl__gc *gc, const char *libxl_path, } } + tmp = NULL; + rc = libxl__xs_read_checked(gc, XBT_NULL, + GCSPRINTF("%s/grant_usage", be_path), &tmp); + if (rc) goto out; + + if (tmp) { + libxl_defbool_set(&virtio->grant_usage, strtoul(tmp, NULL, 0)); + } + tmp = NULL; rc = libxl__xs_read_checked(gc, XBT_NULL, GCSPRINTF("%s/type", be_path), &tmp); diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index f036e56fc2..dfd432ca02 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -1215,6 +1215,8 @@ static int parse_virtio_config(libxl_device_virtio *virtio, char *token) } else if (MATCH_OPTION("transport", token, oparg)) { rc = libxl_virtio_transport_from_string(oparg, &virtio->transport); if (rc) return rc; + } else if (MATCH_OPTION("grant_usage", token, oparg)) { + libxl_defbool_set(&virtio->grant_usage, strtoul(oparg, NULL, 0)); } else { fprintf(stderr, "Unknown string \"%s\" in virtio spec\n", token); return -1; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 26 21:33:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jul 2023 21:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.570699.892775 (Exim 4.92) (envelope-from ) id 1qOm89-0008B4-JT; Wed, 26 Jul 2023 21:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 570699.892775; Wed, 26 Jul 2023 21:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm89-0008Aw-GU; Wed, 26 Jul 2023 21:33:13 +0000 Received: by outflank-mailman (input) for mailman id 570699; Wed, 26 Jul 2023 21:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm88-0008Ai-2c for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm88-0006KV-1p for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qOm88-0008GO-0h for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33: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=Cw0HPbwG0Vy8Urkda/pdOX0KpdXQ+c9TJlbJbysheK0=; b=DZIoyS0AzQmZTPDjtoSQLg61Xb H6MVvqpj9SooIjqC/LzMN0JxspRmFk+1f57+/hUCiBS6IwFJMA0wY+z5OaHllpzAuL1L/g4N+jdS9 q6onT9KoKqDhhAx/4xik04mSQkBi0i7mJhwBWc09gvNpV6JWJ+8lSx9xXnw8q98f4J4E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpu-policy: address violations of MISRA C:2012 Rule 8.3 on parameter names Message-Id: Date: Wed, 26 Jul 2023 21:33:12 +0000 commit f0437c378effb8569d5199a0cb835c00c40e427a Author: Federico Serafini AuthorDate: Mon Jul 24 14:12:04 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 24 14:12:04 2023 +0200 x86/cpu-policy: address violations of MISRA C:2012 Rule 8.3 on parameter names Change parameter names in function declarations to be consistent with the ones used in the correponding definitions, thus addressing violations of MISRA C:2012 Rule 8.3: "All declarations of an object or function shall use the same names and type qualifiers". No functional changes. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/include/xen/lib/x86/cpu-policy.h | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/xen/include/xen/lib/x86/cpu-policy.h b/xen/include/xen/lib/x86/cpu-policy.h index 6d5e9edd26..bab3eecda6 100644 --- a/xen/include/xen/lib/x86/cpu-policy.h +++ b/xen/include/xen/lib/x86/cpu-policy.h @@ -451,23 +451,24 @@ typedef xen_msr_entry_t msr_entry_buffer_t[]; * Serialise the CPUID leaves of a cpu_policy object into an array of cpuid * leaves. * - * @param policy The cpu_policy to serialise. - * @param leaves The array of leaves to serialise into. - * @param nr_entries The number of entries in 'leaves'. + * @param p The cpu_policy to serialise. + * @param leaves The array of leaves to serialise into. + * @param nr_entries_p The number of entries in 'leaves'. * @returns -errno * * Writes at most CPUID_MAX_SERIALISED_LEAVES. May fail with -ENOBUFS if the * leaves array is too short. On success, nr_entries is updated with the * actual number of leaves written. */ -int x86_cpuid_copy_to_buffer(const struct cpu_policy *policy, - cpuid_leaf_buffer_t leaves, uint32_t *nr_entries); +int x86_cpuid_copy_to_buffer(const struct cpu_policy *p, + cpuid_leaf_buffer_t leaves, + uint32_t *nr_entries_p); /** * Unserialise the CPUID leaves of a cpu_policy object into an array of cpuid * leaves. * - * @param policy The cpu_policy to unserialise into. + * @param p The cpu_policy to unserialise into. * @param leaves The array of leaves to unserialise from. * @param nr_entries The number of entries in 'leaves'. * @param err_leaf Optional hint for error diagnostics. @@ -481,7 +482,7 @@ int x86_cpuid_copy_to_buffer(const struct cpu_policy *policy, * No content validation of in-range leaves is performed. Synthesised data is * recalculated. */ -int x86_cpuid_copy_from_buffer(struct cpu_policy *policy, +int x86_cpuid_copy_from_buffer(struct cpu_policy *p, const cpuid_leaf_buffer_t leaves, uint32_t nr_entries, uint32_t *err_leaf, uint32_t *err_subleaf); @@ -489,22 +490,22 @@ int x86_cpuid_copy_from_buffer(struct cpu_policy *policy, /** * Serialise the MSRs of a cpu_policy object into an array. * - * @param policy The cpu_policy to serialise. - * @param msrs The array of msrs to serialise into. - * @param nr_entries The number of entries in 'msrs'. + * @param p The cpu_policy to serialise. + * @param msrs The array of msrs to serialise into. + * @param nr_entries_p The number of entries in 'msrs'. * @returns -errno * * Writes at most MSR_MAX_SERIALISED_ENTRIES. May fail with -ENOBUFS if the * buffer array is too short. On success, nr_entries is updated with the * actual number of msrs written. */ -int x86_msr_copy_to_buffer(const struct cpu_policy *policy, - msr_entry_buffer_t msrs, uint32_t *nr_entries); +int x86_msr_copy_to_buffer(const struct cpu_policy *p, + msr_entry_buffer_t msrs, uint32_t *nr_entries_p); /** * Unserialise the MSRs of a cpu_policy object from an array of msrs. * - * @param policy The cpu_policy object to unserialise into. + * @param p The cpu_policy object to unserialise into. * @param msrs The array of msrs to unserialise from. * @param nr_entries The number of entries in 'msrs'. * @param err_msr Optional hint for error diagnostics. @@ -518,7 +519,7 @@ int x86_msr_copy_to_buffer(const struct cpu_policy *policy, * * No content validation is performed on the data stored in the policy object. */ -int x86_msr_copy_from_buffer(struct cpu_policy *policy, +int x86_msr_copy_from_buffer(struct cpu_policy *p, const msr_entry_buffer_t msrs, uint32_t nr_entries, uint32_t *err_msr); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 26 21:33:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jul 2023 21:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.570700.892779 (Exim 4.92) (envelope-from ) id 1qOm8J-0008Dn-Kx; Wed, 26 Jul 2023 21:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 570700.892779; Wed, 26 Jul 2023 21:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm8J-0008Df-Hz; Wed, 26 Jul 2023 21:33:23 +0000 Received: by outflank-mailman (input) for mailman id 570700; Wed, 26 Jul 2023 21:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm8I-0008DH-5Q for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm8I-0006Kg-4i for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qOm8I-0008Gs-3r for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33: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=h/OL1IQUcEujC8Fw5sBYsAjls/bMmLbPkY6/z9EQh5c=; b=2xaFB9JE+ZN+eb0W5mzVHc8fAW V4T0osbGgVzHcXRhEvJcfvB4xI9WuSgB628p7ibp5Tvnpixu1yj1GVlDxLyUuqefMGKrUZoUjBFAu zEkDtVFIngIXa/nXp9Wf/BE/1Qnos4REm2SJJJJSudQtB2xRPOctW6e9GJjhgSsssp64=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] common: Move a few more standalone macros from xen/lib.h to xen/macros.h Message-Id: Date: Wed, 26 Jul 2023 21:33:22 +0000 commit 0c683baa67e957ce4c91f803fd9283e08e4635e8 Author: Shawn Anastasio AuthorDate: Mon Jul 24 14:13:08 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 24 14:13:08 2023 +0200 common: Move a few more standalone macros from xen/lib.h to xen/macros.h Move a few more macros which have no dependencies on other headers from xen/lib.h to xen/macros.h. Notably, this includes BUILD_BUG_ON* and ARRAY_SIZE. Signed-off-by: Shawn Anastasio Reviewed-by: Jan Beulich --- xen/include/xen/lib.h | 28 ---------------------------- xen/include/xen/macros.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index dae2a1f085..359cfdc784 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -21,24 +21,6 @@ unlikely(ret_warn_on_); \ }) -/* All clang versions supported by Xen have _Static_assert. */ -#if defined(__clang__) || \ - (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) -/* Force a compilation error if condition is true */ -#define BUILD_BUG_ON(cond) ({ _Static_assert(!(cond), "!(" #cond ")"); }) - -/* Force a compilation error if condition is true, but also produce a - result (of value 0 and type size_t), so the expression can be used - e.g. in a structure initializer (or where-ever else comma expressions - aren't permitted). */ -#define BUILD_BUG_ON_ZERO(cond) \ - (sizeof(struct { char c; _Static_assert(!(cond), "!(" #cond ")"); }) & 0) -#else -#define BUILD_BUG_ON_ZERO(cond) \ - (sizeof(struct { unsigned u : !(cond); }) & 0) -#define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond)) -#endif - #ifndef NDEBUG #define ASSERT(p) \ do { if ( unlikely(!(p)) ) assert_failed(#p); } while (0) @@ -48,16 +30,6 @@ #define ASSERT_UNREACHABLE() do { } while (0) #endif -#define ABS(_x) ({ \ - typeof(_x) __x = (_x); \ - (__x < 0) ? -__x : __x; \ -}) - -#define SWAP(_a, _b) \ - do { typeof(_a) _t = (_a); (_a) = (_b); (_b) = _t; } while ( 0 ) - -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]) + __must_be_array(x)) - #define __ACCESS_ONCE(x) ({ \ (void)(typeof(x))0; /* Scalar typecheck. */ \ (volatile typeof(x) *)&(x); }) diff --git a/xen/include/xen/macros.h b/xen/include/xen/macros.h index 7b92d34504..d0caae7db2 100644 --- a/xen/include/xen/macros.h +++ b/xen/include/xen/macros.h @@ -22,6 +22,40 @@ #define __STR(...) #__VA_ARGS__ #define STR(...) __STR(__VA_ARGS__) +#ifndef __ASSEMBLY__ + +/* All clang versions supported by Xen have _Static_assert. */ +#if defined(__clang__) || \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) +/* Force a compilation error if condition is true */ +#define BUILD_BUG_ON(cond) ({ _Static_assert(!(cond), "!(" #cond ")"); }) + +/* + * Force a compilation error if condition is true, but also produce a + * result (of value 0 and type size_t), so the expression can be used + * e.g. in a structure initializer (or where-ever else comma expressions + * aren't permitted). + */ +#define BUILD_BUG_ON_ZERO(cond) \ + (sizeof(struct { char c; _Static_assert(!(cond), "!(" #cond ")"); }) & 0) +#else +#define BUILD_BUG_ON_ZERO(cond) \ + (sizeof(struct { unsigned u : !(cond); }) & 0) +#define BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond)) +#endif + +#define ABS(x) ({ \ + typeof(x) x_ = (x); \ + (x_ < 0) ? -x_ : x_; \ +}) + +#define SWAP(a, b) \ + do { typeof(a) t_ = (a); (a) = (b); (b) = t_; } while ( 0 ) + +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]) + __must_be_array(x)) + +#endif /* __ASSEMBLY__ */ + #endif /* __MACROS_H__ */ /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 26 21:33:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jul 2023 21:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.570701.892785 (Exim 4.92) (envelope-from ) id 1qOm8T-0008H1-NZ; Wed, 26 Jul 2023 21:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 570701.892785; Wed, 26 Jul 2023 21:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm8T-0008Gt-JY; Wed, 26 Jul 2023 21:33:33 +0000 Received: by outflank-mailman (input) for mailman id 570701; Wed, 26 Jul 2023 21:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm8S-0008Gi-9R for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm8S-0006Kn-8C for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qOm8S-0008Hu-6o for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33: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=WNBMZXRuM162G6BhdLTg+QrAbZp1x72FXV5/jmUQm9k=; b=K94yQ77EqgZrKR1EMFSUJ5IOQt 8y7+w29n+EOMVH45pm3LuxgrSdRtZZ6ufiwbm85tAafSSNxX2j2XRBHO3uUpQfGc51xaqN6/LlY3A KbRSgDMXvopWEE/5YQg7p/PD7KvSRn7FnGhavEFngwn7XnlpJw8BvgzIYNmCOS7Z9RI0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ppc: Set up a basic C environment Message-Id: Date: Wed, 26 Jul 2023 21:33:32 +0000 commit 3a4e6f67bc689365680cd544d05c8772f56b7a91 Author: Shawn Anastasio AuthorDate: Mon Jul 24 14:29:15 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jul 24 14:29:15 2023 +0200 xen/ppc: Set up a basic C environment Update ppc64/head.S to set up an initial boot stack, zero the .bss section, and jump to C. The required setup is done using 32-bit immediate address loads for now, but they will be changed to TOC-relative loads once the position-independent code model is enabled. Additionally, move the cpu0_boot_stack declaration to setup.c and change STACK_ORDER from 2 to 0. For now, ppc64 is using 64k pages and thus the larger STACK_ORDER is unnecessary. Finally, refactor the endian fixup trampoline into its own macro, since it will need to be used in multiple places, including every time we make a call into firmware. Signed-off-by: Shawn Anastasio Acked-by: Jan Beulich --- xen/arch/ppc/Makefile | 2 ++ xen/arch/ppc/include/asm/asm-defns.h | 40 ++++++++++++++++++++++++++++++++++++ xen/arch/ppc/include/asm/config.h | 2 +- xen/arch/ppc/ppc64/head.S | 38 ++++++++++++++++------------------ xen/arch/ppc/setup.c | 19 +++++++++++++++++ 5 files changed, 80 insertions(+), 21 deletions(-) diff --git a/xen/arch/ppc/Makefile b/xen/arch/ppc/Makefile index 98220648af..530fba2121 100644 --- a/xen/arch/ppc/Makefile +++ b/xen/arch/ppc/Makefile @@ -1,5 +1,7 @@ obj-$(CONFIG_PPC64) += ppc64/ +obj-y += setup.o + $(TARGET): $(TARGET)-syms cp -f $< $@ diff --git a/xen/arch/ppc/include/asm/asm-defns.h b/xen/arch/ppc/include/asm/asm-defns.h new file mode 100644 index 0000000000..6ea35f6edb --- /dev/null +++ b/xen/arch/ppc/include/asm/asm-defns.h @@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _ASM_PPC_ASM_DEFNS_H +#define _ASM_PPC_ASM_DEFNS_H + +/* + * Load a 64-bit immediate value into the specified GPR. + */ +#define LOAD_IMM64(reg, val) \ + lis reg, (val) @highest; \ + ori reg, reg, (val) @higher; \ + rldicr reg, reg, 32, 31; \ + oris reg, reg, (val) @h; \ + ori reg, reg, (val) @l; + +#define LOAD_IMM32(reg, val) \ + lis reg, (val) @h; \ + ori reg, reg, (val) @l; \ + +/* + * Depending on how we were booted, the CPU could be running in either + * Little Endian or Big Endian mode. The following trampoline from Linux + * cleverly uses an instruction that encodes to a NOP if the CPU's + * endianness matches the assumption of the assembler (LE, in our case) + * or a branch to code that performs the endian switch in the other case. + */ +#define FIXUP_ENDIAN \ + tdi 0, 0, 0x48; /* Reverse endian of b . + 8 */ \ + b . + 44; /* Skip trampoline if endian is good */ \ + .long 0xa600607d; /* mfmsr r11 */ \ + .long 0x01006b69; /* xori r11,r11,1 */ \ + .long 0x00004039; /* li r10,0 */ \ + .long 0x6401417d; /* mtmsrd r10,1 */ \ + .long 0x05009f42; /* bcl 20,31,$+4 */ \ + .long 0xa602487d; /* mflr r10 */ \ + .long 0x14004a39; /* addi r10,r10,20 */ \ + .long 0xa6035a7d; /* mtsrr0 r10 */ \ + .long 0xa6037b7d; /* mtsrr1 r11 */ \ + .long 0x2400004c /* rfid */ + +#endif /* _ASM_PPC_ASM_DEFNS_H */ diff --git a/xen/arch/ppc/include/asm/config.h b/xen/arch/ppc/include/asm/config.h index b9a6814f00..01ca5d0803 100644 --- a/xen/arch/ppc/include/asm/config.h +++ b/xen/arch/ppc/include/asm/config.h @@ -43,7 +43,7 @@ #define SMP_CACHE_BYTES (1 << 6) -#define STACK_ORDER 2 +#define STACK_ORDER 0 #define STACK_SIZE (PAGE_SIZE << STACK_ORDER) /* 288 bytes below the stack pointer must be preserved by interrupt handlers */ diff --git a/xen/arch/ppc/ppc64/head.S b/xen/arch/ppc/ppc64/head.S index 2fcefb40d8..49b3066396 100644 --- a/xen/arch/ppc/ppc64/head.S +++ b/xen/arch/ppc/ppc64/head.S @@ -1,30 +1,28 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#include + .section .text.header, "ax", %progbits ENTRY(start) /* - * Depending on how we were booted, the CPU could be running in either - * Little Endian or Big Endian mode. The following trampoline from Linux - * cleverly uses an instruction that encodes to a NOP if the CPU's - * endianness matches the assumption of the assembler (LE, in our case) - * or a branch to code that performs the endian switch in the other case. + * NOTE: argument registers (r3-r9) must be preserved until the C entrypoint */ - tdi 0, 0, 0x48 /* Reverse endian of b . + 8 */ - b . + 44 /* Skip trampoline if endian is good */ - .long 0xa600607d /* mfmsr r11 */ - .long 0x01006b69 /* xori r11,r11,1 */ - .long 0x00004039 /* li r10,0 */ - .long 0x6401417d /* mtmsrd r10,1 */ - .long 0x05009f42 /* bcl 20,31,$+4 */ - .long 0xa602487d /* mflr r10 */ - .long 0x14004a39 /* addi r10,r10,20 */ - .long 0xa6035a7d /* mtsrr0 r10 */ - .long 0xa6037b7d /* mtsrr1 r11 */ - .long 0x2400004c /* rfid */ - - /* Now that the endianness is confirmed, continue */ -1: b 1b + FIXUP_ENDIAN + + /* set up the TOC pointer */ + LOAD_IMM32(%r2, .TOC.) + + /* set up the initial stack */ + LOAD_IMM32(%r1, cpu0_boot_stack) + li %r11, 0 + stdu %r11, -STACK_FRAME_OVERHEAD(%r1) + + /* call the C entrypoint */ + bl start_xen + + /* should never return */ + trap .size start, . - start .type start, %function diff --git a/xen/arch/ppc/setup.c b/xen/arch/ppc/setup.c new file mode 100644 index 0000000000..9e90a6179a --- /dev/null +++ b/xen/arch/ppc/setup.c @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#include + +/* Xen stack for bringing up the first CPU. */ +unsigned char __initdata cpu0_boot_stack[STACK_SIZE] __aligned(STACK_SIZE); + +/* Macro to adjust thread priority for hardware multithreading */ +#define HMT_very_low() asm volatile ( "or %r31, %r31, %r31" ) + +void __init noreturn start_xen(unsigned long r3, unsigned long r4, + unsigned long r5, unsigned long r6, + unsigned long r7) +{ + for ( ; ; ) + /* Set current hardware thread to very low priority */ + HMT_very_low(); + + unreachable(); +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 26 21:33:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jul 2023 21:33:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.570702.892787 (Exim 4.92) (envelope-from ) id 1qOm8d-0008LU-Ps; Wed, 26 Jul 2023 21:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 570702.892787; Wed, 26 Jul 2023 21:33:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm8d-0008LM-Mq; Wed, 26 Jul 2023 21:33:43 +0000 Received: by outflank-mailman (input) for mailman id 570702; Wed, 26 Jul 2023 21:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm8c-0008Kx-CI for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm8c-0006LQ-BV for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qOm8c-0008IL-AX for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33:42 +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=zPSEhv1zOaxolwsNw6VQ7aq9ZK2AIRF0N91tB8FTKgQ=; b=oIMS4QXBDRrA0buxLMgc8cewwX hZxRIETV6SkSjClASfLhQ8J3S5irvUf6ay86HAJkseC6byEdoRz/Dzukaj/l8Iu1XkQc59RoYEmx7 qdMeS6ec2ow+Dvxaqkeabdf/ZQPrzzOD3IlNKy553cDqftRiz6G+sKEUIFeRfwQc33Ss=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/amd: Mitigations for Zenbleed Message-Id: Date: Wed, 26 Jul 2023 21:33:42 +0000 commit f91c5ea970675637721bb7f18adaa189837eb783 Author: Andrew Cooper AuthorDate: Mon May 22 23:03:00 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Jul 24 17:07:14 2023 +0100 x86/amd: Mitigations for Zenbleed Zenbleed is a malfunction on AMD Zen2 uarch parts which results in corruption of the vector registers. An attacker can trigger this bug deliberately in order to access stale data in the physical vector register file. This can include data from sibling threads, or a higher-privilege context. Microcode is the preferred mitigation but in the case that's not available use the chickenbit as instructed by AMD. Re-evaluate the mitigation on late microcode load too. This is XSA-433 / CVE-2023-20593. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- xen/arch/x86/cpu/amd.c | 69 ++++++++++++++++++++++++++++++++++++ xen/arch/x86/cpu/microcode/amd.c | 2 ++ xen/arch/x86/include/asm/processor.h | 2 ++ 3 files changed, 73 insertions(+) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 0eaef82e51..3ed06f6704 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "cpu.h" @@ -905,6 +906,72 @@ void __init detect_zen2_null_seg_behaviour(void) } +void amd_check_zenbleed(void) +{ + const struct cpu_signature *sig = &this_cpu(cpu_sig); + unsigned int good_rev, chickenbit = (1 << 9); + uint64_t val, old_val; + + /* + * If we're virtualised, we can't do family/model checks safely, and + * we likely wouldn't have access to DE_CFG even if we could see a + * microcode revision. + * + * A hypervisor may hide AVX as a stopgap mitigation. We're not in a + * position to care either way. An admin doesn't want to be disabling + * AVX as a mitigation on any build of Xen with this logic present. + */ + if (cpu_has_hypervisor || boot_cpu_data.x86 != 0x17) + return; + + switch (boot_cpu_data.x86_model) { + case 0x30 ... 0x3f: good_rev = 0x0830107a; break; + case 0x60 ... 0x67: good_rev = 0x0860010b; break; + case 0x68 ... 0x6f: good_rev = 0x08608105; break; + case 0x70 ... 0x7f: good_rev = 0x08701032; break; + case 0xa0 ... 0xaf: good_rev = 0x08a00008; break; + default: + /* + * With the Fam17h check above, parts getting here are Zen1. + * They're not affected. + */ + return; + } + + rdmsrl(MSR_AMD64_DE_CFG, val); + old_val = val; + + /* + * Microcode is the preferred mitigation, in terms of performance. + * However, without microcode, this chickenbit (specific to the Zen2 + * uarch) disables Floating Point Mov-Elimination to mitigate the + * issue. + */ + val &= ~chickenbit; + if (sig->rev < good_rev) + val |= chickenbit; + + if (val == old_val) + /* Nothing to change. */ + return; + + /* + * DE_CFG is a Core-scoped MSR, and this write is racy during late + * microcode load. However, both threads calculate the new value from + * state which is shared, and unrelated to the old value, so the + * result should be consistent. + */ + wrmsrl(MSR_AMD64_DE_CFG, val); + + /* + * Inform the admin that we changed something, but don't spam, + * especially during a late microcode load. + */ + if (smp_processor_id() == 0) + printk(XENLOG_INFO "Zenbleed mitigation - using %s\n", + val & chickenbit ? "chickenbit" : "microcode"); +} + static void cf_check init_amd(struct cpuinfo_x86 *c) { u32 l, h; @@ -1171,6 +1238,8 @@ static void cf_check init_amd(struct cpuinfo_x86 *c) if ((smp_processor_id() == 1) && !cpu_has(c, X86_FEATURE_ITSC)) disable_c1_ramping(); + amd_check_zenbleed(); + check_syscfg_dram_mod_en(); amd_log_freq(c); diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c index a9a5557835..75fc84e445 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -262,6 +262,8 @@ static int cf_check apply_microcode(const struct microcode_patch *patch) "microcode: CPU%u updated from revision %#x to %#x, date = %04x-%02x-%02x\n", cpu, old_rev, rev, patch->year, patch->month, patch->day); + amd_check_zenbleed(); + return 0; } diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index 3b3cf51814..c0529cc3d9 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -547,6 +547,8 @@ enum ap_boot_method { }; extern enum ap_boot_method ap_boot_method; +void amd_check_zenbleed(void); + #endif /* !__ASSEMBLY__ */ #endif /* __ASM_X86_PROCESSOR_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 26 21:33:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jul 2023 21:33:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.570703.892790 (Exim 4.92) (envelope-from ) id 1qOm8n-0008OC-Qi; Wed, 26 Jul 2023 21:33:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 570703.892790; Wed, 26 Jul 2023 21:33:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm8n-0008O5-OH; Wed, 26 Jul 2023 21:33:53 +0000 Received: by outflank-mailman (input) for mailman id 570703; Wed, 26 Jul 2023 21:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm8m-0008Nu-FM for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm8m-0006N7-EW for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qOm8m-0008Ip-DZ for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:33:52 +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=eGZVLpKormvL/a1IBI6d1nO4VPLxw7tF9TOE38G4UP0=; b=h7Y4OVpEQQmeb1lm1QjbEHvK93 O4ueAMhIuykDjXYQi6AzfNDmA0GM9lxsewbV/7ewoJE+BStJ/wnHy43JQlHQIH/IOILAstRsMy/j0 D82pFZyBfzO7oySMN43XhVkj+qe5K1xzfgLkrpt3DeyzLlBEFY1YfDdytOGvm83TRagE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: add Rule 1.1 and 5.6 Message-Id: Date: Wed, 26 Jul 2023 21:33:52 +0000 commit 9a51409452b52ffed132eb54e8673a3501d8ec95 Author: Stefano Stabellini AuthorDate: Fri Jul 21 15:16:36 2023 -0700 Commit: Stefano Stabellini CommitDate: Mon Jul 24 15:31:24 2023 -0700 docs/misra: add Rule 1.1 and 5.6 Rule 1.1 is uncontroversial and we are already following it. Rule 5.6 has been deemed a good rule to have by the MISRA C group. However, we do have a significant amount of violations that will take time to resolve and might require partial deviations in the form of in-code comments or MISRA C scanners special configurations (ECLAIR). For new code, we want this rule to generally apply hence the addition to docs/misra/rules.rst. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich --- docs/misra/rules.rst | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index 29a777938a..8f0e4d3f25 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -82,6 +82,14 @@ maintainers if you want to suggest a change. - Summary - Notes + * - `Rule 1.1 `_ + - Required + - The program shall contain no violations of the standard C syntax + and constraints, and shall not exceed the implementation's + translation limits + - We make use of several compiler extensions as documented by + `C-language-toolchain.rst `_ + * - `Rule 1.3 `_ - Required - There shall be no occurrence of undefined or critical unspecified @@ -156,6 +164,11 @@ maintainers if you want to suggest a change. headers (xen/include/public/) are allowed to retain longer identifiers for backward compatibility. + * - `Rule 5.6 `_ + - Required + - A typedef name shall be a unique identifier + - + * - `Rule 6.1 `_ - Required - Bit-fields shall only be declared with an appropriate type -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jul 26 21:34:03 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Jul 2023 21:34:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.570704.892795 (Exim 4.92) (envelope-from ) id 1qOm8x-0008Qt-SO; Wed, 26 Jul 2023 21:34:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 570704.892795; Wed, 26 Jul 2023 21:34: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 1qOm8x-0008Qm-Pq; Wed, 26 Jul 2023 21:34:03 +0000 Received: by outflank-mailman (input) for mailman id 570704; Wed, 26 Jul 2023 21:34:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm8w-0008Qa-IF for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:34:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qOm8w-0006NX-Ha for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:34:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qOm8w-0008JR-Gd for xen-changelog@lists.xenproject.org; Wed, 26 Jul 2023 21:34: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=z1hxDzXW/XaMaagW/xeikEuVLil6fLELTB9Us9ccJ/k=; b=uf4kWzGbW98vQx+YaxrDxE7cpI +3Q2dnYl3ezOOoo6VnnMbC7c8mM6n2h/gBUOurnXtaqnhzJS8aTAR3V1DOTK4wgn9Ult3lmJtKFdL an9KLwfrFuoQPsNvzWX03mF3m1/mGrskMSu88hmPDV/KKcUFUBTp8eLBjsGyg6X42nFc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] efi: mechanical renaming to address MISRA C:2012 Rule 5.3 Message-Id: Date: Wed, 26 Jul 2023 21:34:02 +0000 commit 0b1171be87698bc7d14760383c0770aeb6e41dd4 Author: Nicola Vetrini AuthorDate: Mon Jul 24 16:26:07 2023 +0200 Commit: Stefano Stabellini CommitDate: Mon Jul 24 15:34:16 2023 -0700 efi: mechanical renaming to address MISRA C:2012 Rule 5.3 Rule 5.3 has the following headline: "An identifier declared in an inner scope shall not hide an identifier declared in an outer scope" The function parameters renamed in this patch are hiding a variable defined in an enclosing scope. The following rename is made: - s/cfg/file/ to distinguish from the variable 'cfg', which is hidden by the parameter inside the modified functions. Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich Reviewed-by: Stefano Stabellini --- xen/common/efi/boot.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 24169b7b50..79a654af69 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -528,10 +528,10 @@ static char * __init split_string(char *s) return NULL; } -static char *__init get_value(const struct file *cfg, const char *section, +static char *__init get_value(const struct file *file, const char *section, const char *item) { - char *ptr = cfg->str, *end = ptr + cfg->size; + char *ptr = file->str, *end = ptr + file->size; size_t slen = section ? strlen(section) : 0, ilen = strlen(item); bool match = !slen; @@ -821,9 +821,9 @@ static bool __init read_section(const EFI_LOADED_IMAGE *image, return true; } -static void __init pre_parse(const struct file *cfg) +static void __init pre_parse(const struct file *file) { - char *ptr = cfg->str, *end = ptr + cfg->size; + char *ptr = file->str, *end = ptr + file->size; bool start = true, comment = false; for ( ; ptr < end; ++ptr ) @@ -844,7 +844,7 @@ static void __init pre_parse(const struct file *cfg) else start = 0; } - if ( cfg->size && end[-1] ) + if ( file->size && end[-1] ) PrintStr(L"No newline at end of config file," " last line will be ignored.\r\n"); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:11:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572262.896136 (Exim 4.92) (envelope-from ) id 1qPzdv-0004g4-Ok; Sun, 30 Jul 2023 06:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572262.896136; Sun, 30 Jul 2023 06:11: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 1qPzdv-0004fw-Le; Sun, 30 Jul 2023 06:11:03 +0000 Received: by outflank-mailman (input) for mailman id 572262; Sun, 30 Jul 2023 06:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzdu-0004fq-Iy for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzdu-0003en-GI for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzdu-0005Hq-ET for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=SnV4amJcc8gaXEaLsT/82tybZo4uivEHxrtPNTKWAQg=; b=zqGiMNhzoRfTpCX/dsnTSWN1QQ ctKsJCMbw4Sf1xbwz68bDeiuQp8RjrTQsJGGr2iMjLYaiEoX4U1ZqhoaHcPT2rdos8X9pk+eHkcm2 aMYmv5uFJOorZbuGH9Aa9bQFxQ7RP+SRcZvFoFl5i+pCsA9nkIGcc94o1v5ztZvKk06c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/cpu: change parameter name in __cpu_up() declaration Message-Id: Date: Sun, 30 Jul 2023 06:11:02 +0000 commit 1b631a67ac2a70474cc5e43794551f0536dde2ef Author: Federico Serafini AuthorDate: Tue Jul 25 16:43:02 2023 +0200 Commit: Stefano Stabellini CommitDate: Tue Jul 25 12:39:30 2023 -0700 xen/cpu: change parameter name in __cpu_up() declaration Change parameter name from 'cpunum' to 'cpu' to keep consistency with the name used in the corresponding definitions thus addressing a violation of MISRA C:2012 Rule 8.3: "All declarations of an object or function shall use the same names and type qualifiers". No functional changes. Signed-off-by: Federico Serafini Acked-by: Jan Beulich --- xen/include/xen/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/xen/cpu.h b/xen/include/xen/cpu.h index e8eeb217a0..e1d4eb5967 100644 --- a/xen/include/xen/cpu.h +++ b/xen/include/xen/cpu.h @@ -69,7 +69,7 @@ int disable_nonboot_cpus(void); void enable_nonboot_cpus(void); /* Private arch-dependent helpers for CPU hotplug. */ -int __cpu_up(unsigned int cpunum); +int __cpu_up(unsigned int cpu); void __cpu_disable(void); void __cpu_die(unsigned int cpu); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:11:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572263.896140 (Exim 4.92) (envelope-from ) id 1qPze5-0004hm-Py; Sun, 30 Jul 2023 06:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572263.896140; Sun, 30 Jul 2023 06:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPze5-0004he-NE; Sun, 30 Jul 2023 06:11:13 +0000 Received: by outflank-mailman (input) for mailman id 572263; Sun, 30 Jul 2023 06:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPze4-0004hS-Kd for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPze4-0003eu-JR for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPze4-0005IM-IV for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=/+AWb1qXOyxAG6DMnN9tTJ77ye2jdGvv1Ar5ksG7aG8=; b=yCTRoH9+3BheJYD47AS2ALdbk3 XVwgQxkGxCAs7s5FrL0/QqresaYCf3BEgUdLf5ZWpIZgRYVGUZeGsLEWLKZG6ZohNCJDW+/ji29Tx XF4e6Zloczol5fSBavr8wG/OtRnaty/Plyl1q9tIxakiWe4hLTBw/rxRXyLB4Jk1UUEY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs: Correct name for xen-command-line.pandoc Message-Id: Date: Sun, 30 Jul 2023 06:11:12 +0000 commit 89d7903172fee953b7c112160f67959f6de4731f Author: Leo Yan AuthorDate: Mon Jul 24 16:52:11 2023 +0800 Commit: Stefano Stabellini CommitDate: Tue Jul 25 12:40:02 2023 -0700 docs: Correct name for xen-command-line.pandoc In the commit d661611d08 ("docs/markdown: Switch to using pandoc, and fix underscore escaping"), the documentation suffix was changed from ".markdown" to ".pandoc"; however, the reference was missed to update. This patch updates the documentation name to xen-command-line.pandoc. Fixes: d661611d08 ("docs/markdown: Switch to using pandoc, and fix underscore escaping") Signed-off-by: Leo Yan Reviewed-by: Stefano Stabellini --- docs/features/sched_credit2.pandoc | 2 +- docs/misc/arm/big.LITTLE.txt | 2 +- xen/common/Kconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/features/sched_credit2.pandoc b/docs/features/sched_credit2.pandoc index 436ff9f8f6..ef07e463cb 100644 --- a/docs/features/sched_credit2.pandoc +++ b/docs/features/sched_credit2.pandoc @@ -27,7 +27,7 @@ different than `credit2`) parameter is passed to Xen via the bootloader. Other parameters are available for tuning the behavior of Credit2 -(see `docs/misc/xen-command-line.markdown` for a complete list and +(see `docs/misc/xen-command-line.pandoc` for a complete list and for their meaning). Once the system is live, for creating a cpupool with Credit2 as diff --git a/docs/misc/arm/big.LITTLE.txt b/docs/misc/arm/big.LITTLE.txt index b6ea1c9d61..1d11058444 100644 --- a/docs/misc/arm/big.LITTLE.txt +++ b/docs/misc/arm/big.LITTLE.txt @@ -42,5 +42,5 @@ The following option runs one domain vcpu as big and one as LITTLE: cpus = ["0-3", "4-7"] -[1] docs/misc/xen-command-line.markdown +[1] docs/misc/xen-command-line.pandoc [2] docs/man/xl.cfg.pod.5 diff --git a/xen/common/Kconfig b/xen/common/Kconfig index dd8d7c3f1c..0d248ab941 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -440,7 +440,7 @@ config DOM0_MEM The specified string will be used for the dom0_mem parameter in case it was not specified on the command line. - See docs/misc/xen-command-line.markdown for the supported syntax. + See docs/misc/xen-command-line.pandoc for the supported syntax. Leave empty if you are not sure what to specify. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:11:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572264.896143 (Exim 4.92) (envelope-from ) id 1qPzeF-0004kI-RB; Sun, 30 Jul 2023 06:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572264.896143; Sun, 30 Jul 2023 06:11:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzeF-0004kA-Od; Sun, 30 Jul 2023 06:11:23 +0000 Received: by outflank-mailman (input) for mailman id 572264; Sun, 30 Jul 2023 06:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzeE-0004ju-Ny for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzeE-0003f2-NC for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzeE-0005Ip-Lm for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=NCHOi5Ayp5+vKigvGUUBMY6JU+oBJHJbzSqKr43klLE=; b=KiJo5OocgGH+BsnXiAp9VJ+Vz7 2MNuQQAAeGNQBnfNJZkHvFQrDLkuLAFM0EWw5MgAfKKxwN3nj/HnmhCVelxTqrCyw6PRILguD+N5K 7ObfV5KxqAl/gjyrEI2D8Mtm7HnD8wsIsvQz0v93owq7crNzDh9YPow1UnsUzfcjS8cg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: document the usage of array range initializers Message-Id: Date: Sun, 30 Jul 2023 06:11:22 +0000 commit 1f8a6a99b225d34cf608f47b2938092e310f9e03 Author: Nicola Vetrini AuthorDate: Mon Jul 24 18:19:19 2023 +0200 Commit: Stefano Stabellini CommitDate: Tue Jul 25 12:40:24 2023 -0700 docs/misra: document the usage of array range initializers The usage of a documented GNU extension that allows a range of elements in an array to be initalized to the same value using a designated initalizer is added to this document, to fully comply with MISRA C:2012 Rule 1.1. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- docs/misra/C-language-toolchain.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/misra/C-language-toolchain.rst b/docs/misra/C-language-toolchain.rst index 8651f59118..785aed1eaf 100644 --- a/docs/misra/C-language-toolchain.rst +++ b/docs/misra/C-language-toolchain.rst @@ -196,6 +196,10 @@ The table columns are as follows: - X86_64 - See Section "6.9 128-bit Integers" of GCC_MANUAL. + * - Designated initializer for a range of elements + - ARM64, X86_64 + - See Section "6.29 Designated Initializers" of GCC_MANUAL + Translation Limits __________________ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:11:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572265.896148 (Exim 4.92) (envelope-from ) id 1qPzeP-0004n5-T7; Sun, 30 Jul 2023 06:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572265.896148; Sun, 30 Jul 2023 06:11:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzeP-0004my-Q8; Sun, 30 Jul 2023 06:11:33 +0000 Received: by outflank-mailman (input) for mailman id 572265; Sun, 30 Jul 2023 06:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzeO-0004mo-Rp for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzeO-0003f9-R5 for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzeO-0005JJ-Pi for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=JU6ZLI03JfLZiS8PjAim7hYQWD5bCfm25kh2/mzcuLM=; b=mG71ep3nzcwQwRNSxAtiH3+/3i tspQxDvkj+tdeOIgmfG+jHGnWZA8iWIeLDyPbburnmuZc4tADxWzUH2Vy5NkXY9LOs2bBr3WcU28L gMMpSYzXjFQGLjZnm1ctLAi9UPe7Wx1mwOHMbyO2O+cBtlbWJMCqfBmvGN3QqpC4GNBY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs/guest: introduce support for setting guest MSRs Message-Id: Date: Sun, 30 Jul 2023 06:11:32 +0000 commit ed742cf1b65c822759833027ca5cbb087c506a41 Author: Roger Pau Monne AuthorDate: Tue Jul 25 15:05:53 2023 +0200 Commit: Andrew Cooper CommitDate: Wed Jul 26 10:56:27 2023 +0100 libs/guest: introduce support for setting guest MSRs Like it's done with CPUID, introduce support for passing MSR values to xc_cpuid_apply_policy(). The chosen format for expressing MSR policy data matches the current one used for CPUID. Note that existing callers of xc_cpuid_apply_policy() can pass NULL as the value for the newly introduced 'msr' parameter in order to preserve the same functionality, and in fact that's done in libxl on this patch. Signed-off-by: Roger Pau Monné Acked-by: Anthony PERARD --- tools/include/xenctrl.h | 21 ++++- tools/libs/guest/xg_cpuid_x86.c | 169 +++++++++++++++++++++++++++++++++++++++- tools/libs/light/libxl_cpuid.c | 2 +- 3 files changed, 188 insertions(+), 4 deletions(-) diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h index dba33d5d0f..faec1dd824 100644 --- a/tools/include/xenctrl.h +++ b/tools/include/xenctrl.h @@ -1822,6 +1822,21 @@ struct xc_xend_cpuid { char *policy[4]; }; +/* + * MSR policy data. + * + * The format of the policy string is the following: + * '1' -> force to 1 + * '0' -> force to 0 + * 'x' -> we don't care (use default) + * 'k' -> pass through host value + */ +struct xc_msr { + uint32_t index; + char policy[65]; +}; +#define XC_MSR_INPUT_UNUSED 0xffffffffu + /* * Make adjustments to the CPUID settings for a domain. * @@ -1833,13 +1848,15 @@ struct xc_xend_cpuid { * Either pass a full new @featureset (and @nr_features), or adjust individual * features (@pae, @itsc, @nested_virt). * - * Then (optionally) apply legacy XEND overrides (@xend) to the result. + * Then (optionally) apply legacy XEND CPUID overrides (@xend) or MSR (@msr) + * to the result. */ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, bool restore, const uint32_t *featureset, unsigned int nr_features, bool pae, bool itsc, - bool nested_virt, const struct xc_xend_cpuid *xend); + bool nested_virt, const struct xc_xend_cpuid *xend, + const struct xc_msr *msr); int xc_mca_op(xc_interface *xch, struct xen_mc *mc); int xc_mca_op_inject_v2(xc_interface *xch, unsigned int flags, xc_cpumap_t cpumap, unsigned int nr_cpus); diff --git a/tools/libs/guest/xg_cpuid_x86.c b/tools/libs/guest/xg_cpuid_x86.c index 5b035223f4..f2b1e80901 100644 --- a/tools/libs/guest/xg_cpuid_x86.c +++ b/tools/libs/guest/xg_cpuid_x86.c @@ -423,10 +423,170 @@ static int xc_cpuid_xend_policy( return rc; } +static int compare_msr(const void *l, const void *r) +{ + const xen_msr_entry_t *lhs = l; + const xen_msr_entry_t *rhs = r; + + if ( lhs->idx == rhs->idx ) + return 0; + + return lhs->idx < rhs->idx ? -1 : 1; +} + +static xen_msr_entry_t *find_msr( + xen_msr_entry_t *msrs, unsigned int nr_msrs, + uint32_t index) +{ + const xen_msr_entry_t key = { .idx = index }; + + return bsearch(&key, msrs, nr_msrs, sizeof(*msrs), compare_msr); +} + + +static int xc_msr_policy(xc_interface *xch, domid_t domid, + const struct xc_msr *msr) +{ + int rc; + bool hvm; + xc_domaininfo_t di; + unsigned int nr_leaves, nr_msrs; + uint32_t err_leaf = -1, err_subleaf = -1, err_msr = -1; + /* + * Three full policies. The host, default for the domain type, + * and domain current. + */ + xen_msr_entry_t *host = NULL, *def = NULL, *cur = NULL; + unsigned int nr_host, nr_def, nr_cur; + + if ( (rc = xc_domain_getinfo_single(xch, domid, &di)) < 0 ) + { + PERROR("Failed to obtain d%d info", domid); + rc = -errno; + goto out; + } + hvm = di.flags & XEN_DOMINF_hvm_guest; + + rc = xc_cpu_policy_get_size(xch, &nr_leaves, &nr_msrs); + if ( rc ) + { + PERROR("Failed to obtain policy info size"); + rc = -errno; + goto out; + } + + if ( (host = calloc(nr_msrs, sizeof(*host))) == NULL || + (def = calloc(nr_msrs, sizeof(*def))) == NULL || + (cur = calloc(nr_msrs, sizeof(*cur))) == NULL ) + { + ERROR("Unable to allocate memory for %u CPUID leaves", nr_leaves); + rc = -ENOMEM; + goto out; + } + + /* Get the domain's current policy. */ + nr_leaves = 0; + nr_cur = nr_msrs; + rc = get_domain_cpu_policy(xch, domid, &nr_leaves, NULL, &nr_cur, cur); + if ( rc ) + { + PERROR("Failed to obtain d%d current policy", domid); + rc = -errno; + goto out; + } + + /* Get the domain type's default policy. */ + nr_leaves = 0; + nr_def = nr_msrs; + rc = get_system_cpu_policy(xch, hvm ? XEN_SYSCTL_cpu_policy_hvm_default + : XEN_SYSCTL_cpu_policy_pv_default, + &nr_leaves, NULL, &nr_def, def); + if ( rc ) + { + PERROR("Failed to obtain %s def policy", hvm ? "hvm" : "pv"); + rc = -errno; + goto out; + } + + /* Get the host policy. */ + nr_leaves = 0; + nr_host = nr_msrs; + rc = get_system_cpu_policy(xch, XEN_SYSCTL_cpu_policy_host, + &nr_leaves, NULL, &nr_host, host); + if ( rc ) + { + PERROR("Failed to obtain host policy"); + rc = -errno; + goto out; + } + + for ( ; msr->index != XC_MSR_INPUT_UNUSED; ++msr ) + { + xen_msr_entry_t *cur_msr = find_msr(cur, nr_cur, msr->index); + const xen_msr_entry_t *def_msr = find_msr(def, nr_def, msr->index); + const xen_msr_entry_t *host_msr = find_msr(host, nr_host, msr->index); + unsigned int i; + + if ( cur_msr == NULL || def_msr == NULL || host_msr == NULL ) + { + ERROR("Missing MSR %#x", msr->index); + rc = -ENOENT; + goto out; + } + + for ( i = 0; i < ARRAY_SIZE(msr->policy) - 1; i++ ) + { + bool val; + + if ( msr->policy[i] == '1' ) + val = true; + else if ( msr->policy[i] == '0' ) + val = false; + else if ( msr->policy[i] == 'x' ) + val = test_bit(63 - i, &def_msr->val); + else if ( msr->policy[i] == 'k' ) + val = test_bit(63 - i, &host_msr->val); + else + { + ERROR("MSR index %#x: bad character '%c' in policy string '%s'", + msr->index, msr->policy[i], msr->policy); + rc = -EINVAL; + goto out; + } + + if ( val ) + set_bit(63 - i, &cur_msr->val); + else + clear_bit(63 - i, &cur_msr->val); + } + } + + /* Feed the transformed policy back up to Xen. */ + rc = xc_set_domain_cpu_policy(xch, domid, 0, NULL, nr_cur, cur, + &err_leaf, &err_subleaf, &err_msr); + if ( rc ) + { + PERROR("Failed to set d%d's policy (err leaf %#x, subleaf %#x, msr %#x)", + domid, err_leaf, err_subleaf, err_msr); + rc = -errno; + goto out; + } + + /* Success! */ + + out: + free(cur); + free(def); + free(host); + + return rc; +} + int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, bool restore, const uint32_t *featureset, unsigned int nr_features, bool pae, bool itsc, bool nested_virt, - const struct xc_xend_cpuid *xend) + const struct xc_xend_cpuid *xend, + const struct xc_msr *msr) { int rc; bool hvm; @@ -663,6 +823,13 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, bool restore, if ( xend && (rc = xc_cpuid_xend_policy(xch, domid, xend)) ) goto out; + if ( msr ) + { + rc = xc_msr_policy(xch, domid, msr); + if ( rc ) + goto out; + } + rc = 0; out: diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index f5ce9f9795..c96aeb3bce 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -502,7 +502,7 @@ int libxl__cpuid_legacy(libxl_ctx *ctx, uint32_t domid, bool restore, info->tsc_mode == LIBXL_TSC_MODE_ALWAYS_EMULATE); r = xc_cpuid_apply_policy(ctx->xch, domid, restore, NULL, 0, - pae, itsc, nested_virt, info->cpuid); + pae, itsc, nested_virt, info->cpuid, NULL); if (r) LOGEVD(ERROR, -r, domid, "Failed to apply CPUID policy"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:11:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:11:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572266.896152 (Exim 4.92) (envelope-from ) id 1qPzeZ-0004pp-UL; Sun, 30 Jul 2023 06:11:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572266.896152; Sun, 30 Jul 2023 06:11:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzeZ-0004pg-Rg; Sun, 30 Jul 2023 06:11:43 +0000 Received: by outflank-mailman (input) for mailman id 572266; Sun, 30 Jul 2023 06:11:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzeY-0004pY-Vo for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzeY-0003fb-Ut for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzeY-0005KV-Tv for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:11:42 +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=Bov/gkVO8qMXpu7R0jvmIuT2slP7Byn51x7nHSNjpxo=; b=bLdDhfbxykldLuYCCi2oin/0mm +Cjswt1e9h0UWHoboHiLArQMwHA+Ri1l1mj6IdliJ1XrkP34fnvVLhZ0vVw6BGrZOwwDGgMv/fkxp alDrutOv7F27sIQQaVov+my8WfG59BJ6Q4NHZ/vs6ibnHuSK3fzuREQI44MRoKIkMByA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: change the type of libxl_cpuid_policy_list Message-Id: Date: Sun, 30 Jul 2023 06:11:42 +0000 commit 4825d19603580949144ac2ac5cb22df75c9da954 Author: Roger Pau Monne AuthorDate: Tue Jul 25 15:05:54 2023 +0200 Commit: Andrew Cooper CommitDate: Wed Jul 26 10:56:27 2023 +0100 libxl: change the type of libxl_cpuid_policy_list Currently libxl_cpuid_policy_list is an opaque type to the users of libxl, and internally it's an array of xc_xend_cpuid objects. Change the type to instead be a structure that contains one array for CPUID policies, in preparation for it also holding another array for MSR policies. Signed-off-by: Roger Pau Monné Reviewed-by: Anthony PERARD --- tools/include/libxl.h | 8 +--- tools/libs/light/libxl_cpuid.c | 87 +++++++++++++++++++++++++-------------- tools/libs/light/libxl_internal.h | 4 ++ 3 files changed, 63 insertions(+), 36 deletions(-) diff --git a/tools/include/libxl.h b/tools/include/libxl.h index cac641a7eb..f3975ecc02 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -1455,12 +1455,8 @@ typedef struct { void libxl_bitmap_init(libxl_bitmap *map); void libxl_bitmap_dispose(libxl_bitmap *map); -/* - * libxl_cpuid_policy is opaque in the libxl ABI. Users of both libxl and - * libxc may not make assumptions about xc_xend_cpuid. - */ -typedef struct xc_xend_cpuid libxl_cpuid_policy; -typedef libxl_cpuid_policy * libxl_cpuid_policy_list; +struct libxl__cpu_policy; +typedef struct libxl__cpu_policy *libxl_cpuid_policy_list; void libxl_cpuid_dispose(libxl_cpuid_policy_list *cpuid_list); int libxl_cpuid_policy_list_length(const libxl_cpuid_policy_list *l); void libxl_cpuid_policy_list_copy(libxl_ctx *ctx, diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index c96aeb3bce..3c8b2a72c0 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -19,22 +19,29 @@ int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl) return !libxl_cpuid_policy_list_length(pl); } -void libxl_cpuid_dispose(libxl_cpuid_policy_list *p_cpuid_list) +void libxl_cpuid_dispose(libxl_cpuid_policy_list *pl) { - int i, j; - libxl_cpuid_policy_list cpuid_list = *p_cpuid_list; + libxl_cpuid_policy_list policy = *pl; - if (cpuid_list == NULL) + if (policy == NULL) return; - for (i = 0; cpuid_list[i].input[0] != XEN_CPUID_INPUT_UNUSED; i++) { - for (j = 0; j < 4; j++) - if (cpuid_list[i].policy[j] != NULL) { - free(cpuid_list[i].policy[j]); - cpuid_list[i].policy[j] = NULL; + + if (policy->cpuid) { + unsigned int i, j; + struct xc_xend_cpuid *cpuid_list = policy->cpuid; + + for (i = 0; cpuid_list[i].input[0] != XEN_CPUID_INPUT_UNUSED; i++) { + for (j = 0; j < 4; j++) { + if (cpuid_list[i].policy[j] != NULL) { + free(cpuid_list[i].policy[j]); + } } + } + free(policy->cpuid); } - free(cpuid_list); - *p_cpuid_list = NULL; + + free(policy); + *pl = NULL; return; } @@ -62,11 +69,17 @@ struct cpuid_flags { /* go through the dynamic array finding the entry for a specified leaf. * if no entry exists, allocate one and return that. */ -static libxl_cpuid_policy_list cpuid_find_match(libxl_cpuid_policy_list *list, - uint32_t leaf, uint32_t subleaf) +static struct xc_xend_cpuid *cpuid_find_match(libxl_cpuid_policy_list *pl, + uint32_t leaf, uint32_t subleaf) { + libxl_cpuid_policy_list policy = *pl; + struct xc_xend_cpuid **list; int i = 0; + if (policy == NULL) + policy = *pl = calloc(1, sizeof(*policy)); + + list = &policy->cpuid; if (*list != NULL) { for (i = 0; (*list)[i].input[0] != XEN_CPUID_INPUT_UNUSED; i++) { if ((*list)[i].input[0] == leaf && (*list)[i].input[1] == subleaf) @@ -86,7 +99,7 @@ static libxl_cpuid_policy_list cpuid_find_match(libxl_cpuid_policy_list *list, * Will overwrite earlier entries and thus can be called multiple * times. */ -int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) +int libxl_cpuid_parse_config(libxl_cpuid_policy_list *policy, const char* str) { #define NA XEN_CPUID_INPUT_UNUSED static const struct cpuid_flags cpuid_flags[] = { @@ -345,7 +358,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) if (flag->name == NULL) { return 2; } - entry = cpuid_find_match(cpuid, flag->leaf, flag->subleaf); + entry = cpuid_find_match(policy, flag->leaf, flag->subleaf); resstr = entry->policy[flag->reg - 1]; num = strtoull(val, &endptr, 0); flags[flag->length] = 0; @@ -400,7 +413,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) * the strings for each register were directly exposed to the user. * Used for maintaining compatibility with older config files */ -int libxl_cpuid_parse_config_xend(libxl_cpuid_policy_list *cpuid, +int libxl_cpuid_parse_config_xend(libxl_cpuid_policy_list *policy, const char* str) { char *endptr; @@ -427,7 +440,7 @@ int libxl_cpuid_parse_config_xend(libxl_cpuid_policy_list *cpuid, return 3; } str = endptr + 1; - entry = cpuid_find_match(cpuid, leaf, subleaf); + entry = cpuid_find_match(policy, leaf, subleaf); for (str = endptr + 1; *str != 0;) { if (str[0] != 'e' || str[2] != 'x') { return 4; @@ -502,7 +515,8 @@ int libxl__cpuid_legacy(libxl_ctx *ctx, uint32_t domid, bool restore, info->tsc_mode == LIBXL_TSC_MODE_ALWAYS_EMULATE); r = xc_cpuid_apply_policy(ctx->xch, domid, restore, NULL, 0, - pae, itsc, nested_virt, info->cpuid, NULL); + pae, itsc, nested_virt, + info->cpuid ? info->cpuid->cpuid : NULL, NULL); if (r) LOGEVD(ERROR, -r, domid, "Failed to apply CPUID policy"); @@ -527,16 +541,18 @@ static const char *policy_names[4] = { "eax", "ebx", "ecx", "edx" }; */ yajl_gen_status libxl_cpuid_policy_list_gen_json(yajl_gen hand, - libxl_cpuid_policy_list *pcpuid) + libxl_cpuid_policy_list *pl) { - libxl_cpuid_policy_list cpuid = *pcpuid; + libxl_cpuid_policy_list policy = *pl; + struct xc_xend_cpuid *cpuid; yajl_gen_status s; int i, j; s = yajl_gen_array_open(hand); if (s != yajl_gen_status_ok) goto out; - if (cpuid == NULL) goto empty; + if (policy == NULL || policy->cpuid == NULL) goto empty; + cpuid = policy->cpuid; for (i = 0; cpuid[i].input[0] != XEN_CPUID_INPUT_UNUSED; i++) { s = yajl_gen_map_open(hand); @@ -575,7 +591,7 @@ int libxl__cpuid_policy_list_parse_json(libxl__gc *gc, libxl_cpuid_policy_list *p) { int i, size; - libxl_cpuid_policy_list l; + struct xc_xend_cpuid *l; flexarray_t *array; if (!libxl__json_object_is_array(o)) @@ -586,8 +602,10 @@ int libxl__cpuid_policy_list_parse_json(libxl__gc *gc, return 0; size = array->count; + *p = libxl__calloc(NOGC, 1, sizeof(**p)); /* need one extra slot as sentinel */ - l = *p = libxl__calloc(NOGC, size + 1, sizeof(libxl_cpuid_policy)); + l = (*p)->cpuid = libxl__calloc(NOGC, size + 1, + sizeof(struct xc_xend_cpuid)); l[size].input[0] = XEN_CPUID_INPUT_UNUSED; l[size].input[1] = XEN_CPUID_INPUT_UNUSED; @@ -630,8 +648,12 @@ int libxl__cpuid_policy_list_parse_json(libxl__gc *gc, int libxl_cpuid_policy_list_length(const libxl_cpuid_policy_list *pl) { int i = 0; - libxl_cpuid_policy_list l = *pl; + const struct xc_xend_cpuid *l; + + if (*pl == NULL) + return 0; + l = (*pl)->cpuid; if (l) { while (l[i].input[0] != XEN_CPUID_INPUT_UNUSED) i++; @@ -641,20 +663,25 @@ int libxl_cpuid_policy_list_length(const libxl_cpuid_policy_list *pl) } void libxl_cpuid_policy_list_copy(libxl_ctx *ctx, - libxl_cpuid_policy_list *dst, - const libxl_cpuid_policy_list *src) + libxl_cpuid_policy_list *pdst, + const libxl_cpuid_policy_list *psrc) { + struct xc_xend_cpuid **dst; + struct xc_xend_cpuid *const *src; GC_INIT(ctx); int i, j, len; - if (*src == NULL) { - *dst = NULL; + if (*psrc == NULL) { + *pdst = NULL; goto out; } - len = libxl_cpuid_policy_list_length(src); + *pdst = libxl__calloc(NOGC, 1, sizeof(**pdst)); + dst = &(*pdst)->cpuid; + src = &(*psrc)->cpuid; + len = libxl_cpuid_policy_list_length(psrc); /* one extra slot for sentinel */ - *dst = libxl__calloc(NOGC, len + 1, sizeof(libxl_cpuid_policy)); + *dst = libxl__calloc(NOGC, len + 1, sizeof(struct xc_xend_cpuid)); (*dst)[len].input[0] = XEN_CPUID_INPUT_UNUSED; (*dst)[len].input[1] = XEN_CPUID_INPUT_UNUSED; diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h index 1cf3d400bf..ef882cff39 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -4869,6 +4869,10 @@ int libxl__setresuid(uid_t ruid, uid_t euid, uid_t suid); _hidden int libxl__domain_set_paging_mempool_size( libxl__gc *gc, libxl_domain_config *d_config, uint32_t domid); +struct libxl__cpu_policy { + struct xc_xend_cpuid *cpuid; +}; + #endif /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:11:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:11:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572267.896157 (Exim 4.92) (envelope-from ) id 1qPzek-0004te-1t; Sun, 30 Jul 2023 06:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572267.896157; Sun, 30 Jul 2023 06: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 1qPzej-0004tW-Uh; Sun, 30 Jul 2023 06:11:53 +0000 Received: by outflank-mailman (input) for mailman id 572267; Sun, 30 Jul 2023 06:11:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzej-0004tL-39 for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:11:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzej-0003fm-2H for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:11:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzej-0005Lk-1J for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=ZdZoPix8uD8DP4BRMzzHI1HHJJusTJ0tQ5mGV55VO5c=; b=Oec/NLgAl/g5FfHTyz/FKYRs+l NdEZ7IBKoAl3HAsSdJ68i8wCNjB0qbwRH4kj+X6v1gsl+BPs8ZAkJ9ZRU01DswO9msSJeiF4tO/S4 LXdnjfw6q5e8dbcW4gSLZtp3n9rNW567+LWNhagQ8kKDOswCsMYEU21fFYskMGegD0zo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: introduce MSR data in libxl_cpuid_policy Message-Id: Date: Sun, 30 Jul 2023 06:11:53 +0000 commit 5b80cecb747b2176b9e85f6e7aa7be83416d77e1 Author: Roger Pau Monne AuthorDate: Wed Jul 26 09:47:53 2023 +0200 Commit: Andrew Cooper CommitDate: Wed Jul 26 10:56:27 2023 +0100 libxl: introduce MSR data in libxl_cpuid_policy Add a new array field to libxl_cpuid_policy in order to store the MSR policies. Adding the MSR data in the libxl_cpuid_policy_list type is done so that existing users can seamlessly pass MSR features as part of the CPUID data, without requiring the introduction of a separate domain_build_info field, and a new set of handlers functions. Note that support for parsing the old JSON format is kept, as that's required in order to restore domains or received migrations from previous tool versions. Differentiation between the old and the new formats is done based on whether the contents of the 'cpuid' field is an array or a map JSON object. Signed-off-by: Roger Pau Monné Reviewed-by: Anthony PERARD --- tools/libs/light/libxl_cpuid.c | 160 ++++++++++++++++++++++++++++++++++---- tools/libs/light/libxl_internal.h | 1 + tools/libs/light/libxl_types.idl | 2 +- 3 files changed, 146 insertions(+), 17 deletions(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index 3c8b2a72c0..2b53637e8a 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -16,7 +16,7 @@ int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl) { - return !libxl_cpuid_policy_list_length(pl); + return !*pl || (!libxl_cpuid_policy_list_length(pl) && !(*pl)->msr); } void libxl_cpuid_dispose(libxl_cpuid_policy_list *pl) @@ -40,6 +40,8 @@ void libxl_cpuid_dispose(libxl_cpuid_policy_list *pl) free(policy->cpuid); } + free(policy->msr); + free(policy); *pl = NULL; return; @@ -516,7 +518,8 @@ int libxl__cpuid_legacy(libxl_ctx *ctx, uint32_t domid, bool restore, r = xc_cpuid_apply_policy(ctx->xch, domid, restore, NULL, 0, pae, itsc, nested_virt, - info->cpuid ? info->cpuid->cpuid : NULL, NULL); + info->cpuid ? info->cpuid->cpuid : NULL, + info->cpuid ? info->cpuid->msr : NULL); if (r) LOGEVD(ERROR, -r, domid, "Failed to apply CPUID policy"); @@ -528,16 +531,22 @@ static const char *input_names[2] = { "leaf", "subleaf" }; static const char *policy_names[4] = { "eax", "ebx", "ecx", "edx" }; /* * Aiming for: - * [ - * { 'leaf': 'val-eax', - * 'subleaf': 'val-ecx', - * 'eax': 'filter', - * 'ebx': 'filter', - * 'ecx': 'filter', - * 'edx': 'filter' }, - * { 'leaf': 'val-eax', ..., 'eax': 'filter', ... }, - * ... etc ... - * ] + * { 'cpuid': [ + * { 'leaf': 'val-eax', + * 'subleaf': 'val-ecx', + * 'eax': 'filter', + * 'ebx': 'filter', + * 'ecx': 'filter', + * 'edx': 'filter' }, + * { 'leaf': 'val-eax', ..., 'eax': 'filter', ... }, + * ... etc ... + * ], + * 'msr': [ + * { 'index': 'val-index', + * 'policy': 'filter', }, + * ... etc ... + * ], + * } */ yajl_gen_status libxl_cpuid_policy_list_gen_json(yajl_gen hand, @@ -545,9 +554,16 @@ yajl_gen_status libxl_cpuid_policy_list_gen_json(yajl_gen hand, { libxl_cpuid_policy_list policy = *pl; struct xc_xend_cpuid *cpuid; + const struct xc_msr *msr; yajl_gen_status s; int i, j; + s = yajl_gen_map_open(hand); + if (s != yajl_gen_status_ok) goto out; + + s = libxl__yajl_gen_asciiz(hand, "cpuid"); + if (s != yajl_gen_status_ok) goto out; + s = yajl_gen_array_open(hand); if (s != yajl_gen_status_ok) goto out; @@ -582,6 +598,39 @@ yajl_gen_status libxl_cpuid_policy_list_gen_json(yajl_gen hand, empty: s = yajl_gen_array_close(hand); + if (s != yajl_gen_status_ok) goto out; + + s = libxl__yajl_gen_asciiz(hand, "msr"); + if (s != yajl_gen_status_ok) goto out; + + s = yajl_gen_array_open(hand); + if (s != yajl_gen_status_ok) goto out; + + if (!policy || !policy->msr) goto done; + msr = policy->msr; + + for (i = 0; msr[i].index != XC_MSR_INPUT_UNUSED; i++) { + s = yajl_gen_map_open(hand); + if (s != yajl_gen_status_ok) goto out; + + s = libxl__yajl_gen_asciiz(hand, "index"); + if (s != yajl_gen_status_ok) goto out; + s = yajl_gen_integer(hand, msr[i].index); + if (s != yajl_gen_status_ok) goto out; + s = libxl__yajl_gen_asciiz(hand, "policy"); + if (s != yajl_gen_status_ok) goto out; + s = yajl_gen_string(hand, + (const unsigned char *)msr[i].policy, 64); + if (s != yajl_gen_status_ok) goto out; + + s = yajl_gen_map_close(hand); + if (s != yajl_gen_status_ok) goto out; + } + +done: + s = yajl_gen_array_close(hand); + if (s != yajl_gen_status_ok) goto out; + s = yajl_gen_map_close(hand); out: return s; } @@ -592,17 +641,40 @@ int libxl__cpuid_policy_list_parse_json(libxl__gc *gc, { int i, size; struct xc_xend_cpuid *l; + struct xc_msr *msr; + const libxl__json_object *co; flexarray_t *array; + bool cpuid_only = false; + + /* + * Old JSON field was an array with just the CPUID data. With the addition + * of MSRs the object is now a map with two array fields. + * + * Use the object format to detect whether the passed data contains just + * CPUID leafs and thus is an array, or does also contain MSRs and is a + * map. + */ + if (libxl__json_object_is_array(o)) { + co = o; + cpuid_only = true; + goto parse_cpuid; + } - if (!libxl__json_object_is_array(o)) + if (!libxl__json_object_is_map(o)) return ERROR_FAIL; - array = libxl__json_object_get_array(o); + co = libxl__json_map_get("cpuid", o, JSON_ARRAY); + if (!libxl__json_object_is_array(co)) + return ERROR_FAIL; + +parse_cpuid: + *p = libxl__calloc(NOGC, 1, sizeof(**p)); + + array = libxl__json_object_get_array(co); if (!array->count) - return 0; + goto cpuid_empty; size = array->count; - *p = libxl__calloc(NOGC, 1, sizeof(**p)); /* need one extra slot as sentinel */ l = (*p)->cpuid = libxl__calloc(NOGC, size + 1, sizeof(struct xc_xend_cpuid)); @@ -641,6 +713,42 @@ int libxl__cpuid_policy_list_parse_json(libxl__gc *gc, libxl__strdup(NOGC, libxl__json_object_get_string(r)); } } + if (cpuid_only) + return 0; + +cpuid_empty: + co = libxl__json_map_get("msr", o, JSON_ARRAY); + if (!libxl__json_object_is_array(co)) + return ERROR_FAIL; + + array = libxl__json_object_get_array(co); + if (!array->count) + return 0; + size = array->count; + /* need one extra slot as sentinel */ + msr = (*p)->msr = libxl__calloc(NOGC, size + 1, sizeof(struct xc_msr)); + + msr[size].index = XC_MSR_INPUT_UNUSED; + + for (i = 0; i < size; i++) { + const libxl__json_object *t, *r; + + if (flexarray_get(array, i, (void**)&t) != 0) + return ERROR_FAIL; + + if (!libxl__json_object_is_map(t)) + return ERROR_FAIL; + + r = libxl__json_map_get("index", t, JSON_INTEGER); + if (!r) return ERROR_FAIL; + msr[i].index = libxl__json_object_get_integer(r); + r = libxl__json_map_get("policy", t, JSON_STRING); + if (!r) return ERROR_FAIL; + if (strlen(libxl__json_object_get_string(r)) != + ARRAY_SIZE(msr[i].policy) - 1) + return ERROR_FAIL; + strcpy(msr[i].policy, libxl__json_object_get_string(r)); + } return 0; } @@ -677,6 +785,10 @@ void libxl_cpuid_policy_list_copy(libxl_ctx *ctx, } *pdst = libxl__calloc(NOGC, 1, sizeof(**pdst)); + + if (!(*psrc)->cpuid) + goto copy_msr; + dst = &(*pdst)->cpuid; src = &(*psrc)->cpuid; len = libxl_cpuid_policy_list_length(psrc); @@ -696,6 +808,22 @@ void libxl_cpuid_policy_list_copy(libxl_ctx *ctx, (*dst)[i].policy[j] = NULL; } +copy_msr: + if ((*psrc)->msr) { + const struct xc_msr *msr = (*psrc)->msr; + + for (i = 0; msr[i].index != XC_MSR_INPUT_UNUSED; i++) + ; + len = i; + (*pdst)->msr = libxl__calloc(NOGC, len + 1, sizeof(struct xc_msr)); + (*pdst)->msr[len].index = XC_MSR_INPUT_UNUSED; + + for (i = 0; i < len; i++) { + (*pdst)->msr[i].index = msr[i].index; + strcpy((*pdst)->msr[i].policy, msr[i].policy); + } + } + out: GC_FREE; } diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h index ef882cff39..b1a7cd9f61 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -4871,6 +4871,7 @@ _hidden int libxl__domain_set_paging_mempool_size( struct libxl__cpu_policy { struct xc_xend_cpuid *cpuid; + struct xc_msr *msr; }; #endif diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 700b44a164..b524d1578b 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -19,7 +19,7 @@ libxl_mac = Builtin("mac", json_parse_type="JSON_STRING", passby=PASS_BY_REFEREN libxl_bitmap = Builtin("bitmap", json_parse_type="JSON_ARRAY", dispose_fn="libxl_bitmap_dispose", passby=PASS_BY_REFERENCE, check_default_fn="libxl_bitmap_is_empty", copy_fn="libxl_bitmap_copy_alloc") libxl_cpuid_policy_list = Builtin("cpuid_policy_list", dispose_fn="libxl_cpuid_dispose", passby=PASS_BY_REFERENCE, - json_parse_type="JSON_ARRAY", check_default_fn="libxl__cpuid_policy_is_empty", + json_parse_type="JSON_ANY", check_default_fn="libxl__cpuid_policy_is_empty", copy_fn="libxl_cpuid_policy_list_copy") libxl_string_list = Builtin("string_list", dispose_fn="libxl_string_list_dispose", passby=PASS_BY_REFERENCE, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:12:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:12:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572268.896159 (Exim 4.92) (envelope-from ) id 1qPzeu-0004wF-2o; Sun, 30 Jul 2023 06:12:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572268.896159; Sun, 30 Jul 2023 06: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 1qPzeu-0004w7-03; Sun, 30 Jul 2023 06:12:04 +0000 Received: by outflank-mailman (input) for mailman id 572268; Sun, 30 Jul 2023 06:12:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzet-0004vx-6P for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:12:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzet-0003g6-5h for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:12:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzet-0005MO-4j for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=VQZJ8qhlFvJMBfK8FbeDqXZazleSI0/jdpafSkUmN7g=; b=ZMsk2ooHAa2afuhtO2rk2s2Ibk vJbgEa7540X2nQZLw5OlCplgH8DzEitrQAemBRxt50UiQQ6iOiOLjs8q9HQOye8QA1r/sh9zOeJat rmTzoMKVK7ll10KzppqN20txdQdlv+2f9hnum3Bje5Ik3Aam1vF1EPoMgVE0js3TUEJw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: split logic to parse user provided CPUID features Message-Id: Date: Sun, 30 Jul 2023 06:12:03 +0000 commit e2b1da9b8fda0ed7d3dca7bd15829cfea496973a Author: Roger Pau Monne AuthorDate: Tue Jul 25 15:05:56 2023 +0200 Commit: Andrew Cooper CommitDate: Wed Jul 26 10:56:27 2023 +0100 libxl: split logic to parse user provided CPUID features Move the CPUID value parsers out of libxl_cpuid_parse_config() into a newly created cpuid_add() local helper. This is in preparation for also adding MSR feature parsing support. No functional change intended. Signed-off-by: Roger Pau Monné Reviewed-by: Anthony PERARD --- tools/libs/light/libxl_cpuid.c | 120 +++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 57 deletions(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index 2b53637e8a..e4afd7cf3d 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -96,6 +96,66 @@ static struct xc_xend_cpuid *cpuid_find_match(libxl_cpuid_policy_list *pl, return *list + i; } +static int cpuid_add(libxl_cpuid_policy_list *policy, + const struct cpuid_flags *flag, const char *val) +{ + struct xc_xend_cpuid *entry = cpuid_find_match(policy, flag->leaf, + flag->subleaf); + unsigned long num; + char flags[33], *resstr, *endptr; + unsigned int i; + + resstr = entry->policy[flag->reg - 1]; + num = strtoul(val, &endptr, 0); + flags[flag->length] = 0; + if (endptr != val) { + /* if this was a valid number, write the binary form into the string */ + for (i = 0; i < flag->length; i++) { + flags[flag->length - 1 - i] = "01"[(num >> i) & 1]; + } + } else { + switch(val[0]) { + case 'x': case 'k': case 's': + memset(flags, val[0], flag->length); + break; + default: + return 3; + } + } + + if (resstr == NULL) { + resstr = strdup("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + } + + /* the family and model entry is potentially split up across + * two fields in Fn0000_0001_EAX, so handle them here separately. + */ + if (!strcmp(flag->name, "family")) { + if (num < 16) { + memcpy(resstr + (32 - 4) - flag->bit, flags + 4, 4); + memcpy(resstr + (32 - 8) - 20, "00000000", 8); + } else { + num -= 15; + memcpy(resstr + (32 - 4) - flag->bit, "1111", 4); + for (i = 0; i < 7; i++) { + flags[7 - i] = "01"[num & 1]; + num >>= 1; + } + memcpy(resstr + (32 - 8) - 20, flags, 8); + } + } else if (!strcmp(flag->name, "model")) { + memcpy(resstr + (32 - 4) - 16, flags, 4); + memcpy(resstr + (32 - 4) - flag->bit, flags + 4, 4); + } else { + memcpy(resstr + (32 - flag->length) - flag->bit, flags, + flag->length); + } + entry->policy[flag->reg - 1] = resstr; + + return 0; + +} + /* parse a single key=value pair and translate it into the libxc * used interface using 32-characters strings for each register. * Will overwrite earlier entries and thus can be called multiple @@ -340,12 +400,8 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *policy, const char* str) {NULL, 0, NA, CPUID_REG_INV, 0, 0} }; #undef NA - char *sep, *val, *endptr; - int i; + const char *sep, *val; const struct cpuid_flags *flag; - struct xc_xend_cpuid *entry; - unsigned long num; - char flags[33], *resstr; sep = strchr(str, '='); if (sep == NULL) { @@ -355,60 +411,10 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *policy, const char* str) } for (flag = cpuid_flags; flag->name != NULL; flag++) { if(!strncmp(str, flag->name, sep - str) && flag->name[sep - str] == 0) - break; - } - if (flag->name == NULL) { - return 2; - } - entry = cpuid_find_match(policy, flag->leaf, flag->subleaf); - resstr = entry->policy[flag->reg - 1]; - num = strtoull(val, &endptr, 0); - flags[flag->length] = 0; - if (endptr != val) { - /* if this was a valid number, write the binary form into the string */ - for (i = 0; i < flag->length; i++) { - flags[flag->length - 1 - i] = "01"[!!(num & (1 << i))]; - } - } else { - switch(val[0]) { - case 'x': case 'k': case 's': - memset(flags, val[0], flag->length); - break; - default: - return 3; - } - } - - if (resstr == NULL) { - resstr = strdup("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + return cpuid_add(policy, flag, val); } - /* the family and model entry is potentially split up across - * two fields in Fn0000_0001_EAX, so handle them here separately. - */ - if (!strncmp(str, "family", sep - str)) { - if (num < 16) { - memcpy(resstr + (32 - 4) - flag->bit, flags + 4, 4); - memcpy(resstr + (32 - 8) - 20, "00000000", 8); - } else { - num -= 15; - memcpy(resstr + (32 - 4) - flag->bit, "1111", 4); - for (i = 0; i < 7; i++) { - flags[7 - i] = "01"[num & 1]; - num >>= 1; - } - memcpy(resstr + (32 - 8) - 20, flags, 8); - } - } else if (!strncmp(str, "model", sep - str)) { - memcpy(resstr + (32 - 4) - 16, flags, 4); - memcpy(resstr + (32 - 4) - flag->bit, flags + 4, 4); - } else { - memcpy(resstr + (32 - flag->length) - flag->bit, flags, - flag->length); - } - entry->policy[flag->reg - 1] = resstr; - - return 0; + return 2; } /* parse a single list item from the legacy Python xend syntax, where -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:12:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572269.896164 (Exim 4.92) (envelope-from ) id 1qPzf4-0004yc-4L; Sun, 30 Jul 2023 06:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572269.896164; Sun, 30 Jul 2023 06: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 1qPzf4-0004yU-1f; Sun, 30 Jul 2023 06:12:14 +0000 Received: by outflank-mailman (input) for mailman id 572269; Sun, 30 Jul 2023 06:12:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzf3-0004yK-AA for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:12:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzf3-0003gD-9M for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:12:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzf3-0005NF-8N for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=qbIrUBYEax4GU/7aDzygn6HHzS0m1Jf4zjXDXBiFgUc=; b=jIUdDBbeE4AIJl6gO7TzGVSC9G 7uJRz5KlVY/1VgywBU6hhUVJ6JKyvOz6xEzg8yrMZm4Hq/HfSnewTYU5nskYQigqwbd3bP7ivoeEn YRefj8tzSpzWzxQGq59cGOxLMw5So99ZPY+ORD0x4bwLo4eCMrGzjlG/nbOs5MGJ807g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: use the cpuid feature names from cpufeatureset.h Message-Id: Date: Sun, 30 Jul 2023 06:12:13 +0000 commit d638fe233cb3a45105319df75df0edfed2fde5a5 Author: Roger Pau Monne AuthorDate: Tue Jul 25 15:05:57 2023 +0200 Commit: Andrew Cooper CommitDate: Wed Jul 26 10:56:27 2023 +0100 libxl: use the cpuid feature names from cpufeatureset.h The current implementation in libxl_cpuid_parse_config() requires keeping a list of cpuid feature bits that should be mostly in sync with the contents of cpufeatureset.h. Avoid such duplication by using the automatically generated list of cpuid features in INIT_FEATURE_NAMES in order to map feature names to featureset bits, and then translate from featureset bits into cpuid leaf, subleaf, register tuple. Note that the full contents of the previous cpuid translation table can't be removed. That's because some feature names allowed by libxl are not described in the featuresets, or because naming has diverged and the previous nomenclature is preserved for compatibility reasons. Should result in no functional change observed by callers, albeit some new cpuid features will be available as a result of the change. While there constify cpuid_flags name field. Signed-off-by: Roger Pau Monné Reviewed-by: Anthony PERARD --- docs/man/xl.cfg.5.pod.in | 24 ++-- tools/libs/light/libxl_cpuid.c | 267 +++++++++++++++-------------------------- tools/xl/xl_parse.c | 3 + 3 files changed, 107 insertions(+), 187 deletions(-) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index b6fc20ef01..a2bccd5b48 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -2018,24 +2018,16 @@ proccount procpkg stepping =back -List of keys taking a character: +List of keys taking a character can be found in the public header file +L -=over 4 - -3dnow 3dnowext 3dnowprefetch abm acpi adx aes altmovcr8 apic arat avx avx2 -avx512-4fmaps avx512-4vnniw avx512bw avx512cd avx512dq avx512er avx512f -avx512ifma avx512pf avx512vbmi avx512vl bmi1 bmi2 clflushopt clfsh clwb cmov -cmplegacy cmpxchg16 cmpxchg8 cmt cntxid dca de ds dscpl dtes64 erms est extapic -f16c ffxsr fma fma4 fpu fsgsbase fxsr hle htt hypervisor ia64 ibs invpcid -invtsc lahfsahf lm lwp mca mce misalignsse mmx mmxext monitor movbe mpx msr -mtrr nodeid nx ospke osvw osxsave pae page1gb pat pbe pcid pclmulqdq pdcm -perfctr_core perfctr_nb pge pku popcnt pse pse36 psn rdrand rdseed rdtscp rtm -sha skinit smap smep smx ss sse sse2 sse3 sse4.1 sse4.2 sse4_1 sse4_2 sse4a -ssse3 svm svm_decode svm_lbrv svm_npt svm_nrips svm_pausefilt svm_tscrate -svm_vmcbclean syscall sysenter tbm tm tm2 topoext tsc tsc-deadline tsc_adjust -umip vme vmx wdt x2apic xop xsave xtpr +The feature names described in C should be specified in all +lowercase letters, and with underscores converted to hyphens. For example in +order to reference feature C the string C should be used. -=back +Note that C is described as an option that takes a value, and that +takes precedence over the C flag in C. The feature +flag must be referenced as C. =back diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index e4afd7cf3d..785b57f6f8 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -14,6 +14,8 @@ #include "libxl_internal.h" +#include + int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl) { return !*pl || (!libxl_cpuid_policy_list_length(pl) && !(*pl)->msr); @@ -60,7 +62,7 @@ void libxl_cpuid_dispose(libxl_cpuid_policy_list *pl) * Used for the static structure describing all features. */ struct cpuid_flags { - char* name; + const char *name; uint32_t leaf; uint32_t subleaf; int reg; @@ -153,7 +155,19 @@ static int cpuid_add(libxl_cpuid_policy_list *policy, entry->policy[flag->reg - 1] = resstr; return 0; +} + +struct feature_name { + const char *name; + unsigned int bit; +}; + +static int search_feature(const void *a, const void *b) +{ + const char *key = a; + const char *feat = ((const struct feature_name *)b)->name; + return strcmp(key, feat); } /* parse a single key=value pair and translate it into the libxc @@ -176,208 +190,42 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *policy, const char* str) {"proccount", 0x00000001, NA, CPUID_REG_EBX, 16, 8}, {"localapicid", 0x00000001, NA, CPUID_REG_EBX, 24, 8}, - {"sse3", 0x00000001, NA, CPUID_REG_ECX, 0, 1}, - {"pclmulqdq", 0x00000001, NA, CPUID_REG_ECX, 1, 1}, - {"dtes64", 0x00000001, NA, CPUID_REG_ECX, 2, 1}, - {"monitor", 0x00000001, NA, CPUID_REG_ECX, 3, 1}, - {"dscpl", 0x00000001, NA, CPUID_REG_ECX, 4, 1}, - {"vmx", 0x00000001, NA, CPUID_REG_ECX, 5, 1}, - {"smx", 0x00000001, NA, CPUID_REG_ECX, 6, 1}, {"est", 0x00000001, NA, CPUID_REG_ECX, 7, 1}, - {"tm2", 0x00000001, NA, CPUID_REG_ECX, 8, 1}, - {"ssse3", 0x00000001, NA, CPUID_REG_ECX, 9, 1}, {"cntxid", 0x00000001, NA, CPUID_REG_ECX, 10, 1}, - {"fma", 0x00000001, NA, CPUID_REG_ECX, 12, 1}, {"cmpxchg16", 0x00000001, NA, CPUID_REG_ECX, 13, 1}, - {"xtpr", 0x00000001, NA, CPUID_REG_ECX, 14, 1}, - {"pdcm", 0x00000001, NA, CPUID_REG_ECX, 15, 1}, - {"pcid", 0x00000001, NA, CPUID_REG_ECX, 17, 1}, - {"dca", 0x00000001, NA, CPUID_REG_ECX, 18, 1}, /* Linux uses sse4_{1,2}. Keep sse4.{1,2} for compatibility */ {"sse4_1", 0x00000001, NA, CPUID_REG_ECX, 19, 1}, {"sse4.1", 0x00000001, NA, CPUID_REG_ECX, 19, 1}, {"sse4_2", 0x00000001, NA, CPUID_REG_ECX, 20, 1}, {"sse4.2", 0x00000001, NA, CPUID_REG_ECX, 20, 1}, - {"x2apic", 0x00000001, NA, CPUID_REG_ECX, 21, 1}, - {"movbe", 0x00000001, NA, CPUID_REG_ECX, 22, 1}, - {"popcnt", 0x00000001, NA, CPUID_REG_ECX, 23, 1}, - {"tsc-deadline", 0x00000001, NA, CPUID_REG_ECX, 24, 1}, {"aes", 0x00000001, NA, CPUID_REG_ECX, 25, 1}, - {"xsave", 0x00000001, NA, CPUID_REG_ECX, 26, 1}, - {"osxsave", 0x00000001, NA, CPUID_REG_ECX, 27, 1}, - {"avx", 0x00000001, NA, CPUID_REG_ECX, 28, 1}, - {"f16c", 0x00000001, NA, CPUID_REG_ECX, 29, 1}, - {"rdrand", 0x00000001, NA, CPUID_REG_ECX, 30, 1}, - {"hypervisor", 0x00000001, NA, CPUID_REG_ECX, 31, 1}, - - {"fpu", 0x00000001, NA, CPUID_REG_EDX, 0, 1}, - {"vme", 0x00000001, NA, CPUID_REG_EDX, 1, 1}, - {"de", 0x00000001, NA, CPUID_REG_EDX, 2, 1}, - {"pse", 0x00000001, NA, CPUID_REG_EDX, 3, 1}, - {"tsc", 0x00000001, NA, CPUID_REG_EDX, 4, 1}, - {"msr", 0x00000001, NA, CPUID_REG_EDX, 5, 1}, - {"pae", 0x00000001, NA, CPUID_REG_EDX, 6, 1}, - {"mce", 0x00000001, NA, CPUID_REG_EDX, 7, 1}, + {"cmpxchg8", 0x00000001, NA, CPUID_REG_EDX, 8, 1}, - {"apic", 0x00000001, NA, CPUID_REG_EDX, 9, 1}, {"sysenter", 0x00000001, NA, CPUID_REG_EDX, 11, 1}, - {"mtrr", 0x00000001, NA, CPUID_REG_EDX, 12, 1}, - {"pge", 0x00000001, NA, CPUID_REG_EDX, 13, 1}, - {"mca", 0x00000001, NA, CPUID_REG_EDX, 14, 1}, - {"cmov", 0x00000001, NA, CPUID_REG_EDX, 15, 1}, - {"pat", 0x00000001, NA, CPUID_REG_EDX, 16, 1}, - {"pse36", 0x00000001, NA, CPUID_REG_EDX, 17, 1}, {"psn", 0x00000001, NA, CPUID_REG_EDX, 18, 1}, {"clfsh", 0x00000001, NA, CPUID_REG_EDX, 19, 1}, - {"ds", 0x00000001, NA, CPUID_REG_EDX, 21, 1}, - {"acpi", 0x00000001, NA, CPUID_REG_EDX, 22, 1}, - {"mmx", 0x00000001, NA, CPUID_REG_EDX, 23, 1}, - {"fxsr", 0x00000001, NA, CPUID_REG_EDX, 24, 1}, - {"sse", 0x00000001, NA, CPUID_REG_EDX, 25, 1}, - {"sse2", 0x00000001, NA, CPUID_REG_EDX, 26, 1}, - {"ss", 0x00000001, NA, CPUID_REG_EDX, 27, 1}, - {"htt", 0x00000001, NA, CPUID_REG_EDX, 28, 1}, {"tm", 0x00000001, NA, CPUID_REG_EDX, 29, 1}, {"ia64", 0x00000001, NA, CPUID_REG_EDX, 30, 1}, {"pbe", 0x00000001, NA, CPUID_REG_EDX, 31, 1}, {"arat", 0x00000006, NA, CPUID_REG_EAX, 2, 1}, - {"fsgsbase", 0x00000007, 0, CPUID_REG_EBX, 0, 1}, {"tsc_adjust", 0x00000007, 0, CPUID_REG_EBX, 1, 1}, - {"bmi1", 0x00000007, 0, CPUID_REG_EBX, 3, 1}, - {"hle", 0x00000007, 0, CPUID_REG_EBX, 4, 1}, - {"avx2", 0x00000007, 0, CPUID_REG_EBX, 5, 1}, - {"smep", 0x00000007, 0, CPUID_REG_EBX, 7, 1}, - {"bmi2", 0x00000007, 0, CPUID_REG_EBX, 8, 1}, - {"erms", 0x00000007, 0, CPUID_REG_EBX, 9, 1}, - {"invpcid", 0x00000007, 0, CPUID_REG_EBX, 10, 1}, - {"rtm", 0x00000007, 0, CPUID_REG_EBX, 11, 1}, {"cmt", 0x00000007, 0, CPUID_REG_EBX, 12, 1}, - {"mpx", 0x00000007, 0, CPUID_REG_EBX, 14, 1}, - {"avx512f", 0x00000007, 0, CPUID_REG_EBX, 16, 1}, - {"avx512dq", 0x00000007, 0, CPUID_REG_EBX, 17, 1}, - {"rdseed", 0x00000007, 0, CPUID_REG_EBX, 18, 1}, - {"adx", 0x00000007, 0, CPUID_REG_EBX, 19, 1}, - {"smap", 0x00000007, 0, CPUID_REG_EBX, 20, 1}, - {"avx512-ifma", 0x00000007, 0, CPUID_REG_EBX, 21, 1}, - {"clflushopt", 0x00000007, 0, CPUID_REG_EBX, 23, 1}, - {"clwb", 0x00000007, 0, CPUID_REG_EBX, 24, 1}, - {"proc-trace", 0x00000007, 0, CPUID_REG_EBX, 25, 1}, - {"avx512pf", 0x00000007, 0, CPUID_REG_EBX, 26, 1}, - {"avx512er", 0x00000007, 0, CPUID_REG_EBX, 27, 1}, - {"avx512cd", 0x00000007, 0, CPUID_REG_EBX, 28, 1}, - {"sha", 0x00000007, 0, CPUID_REG_EBX, 29, 1}, - {"avx512bw", 0x00000007, 0, CPUID_REG_EBX, 30, 1}, - {"avx512vl", 0x00000007, 0, CPUID_REG_EBX, 31, 1}, - - {"prefetchwt1", 0x00000007, 0, CPUID_REG_ECX, 0, 1}, - {"avx512-vbmi", 0x00000007, 0, CPUID_REG_ECX, 1, 1}, - {"umip", 0x00000007, 0, CPUID_REG_ECX, 2, 1}, - {"pku", 0x00000007, 0, CPUID_REG_ECX, 3, 1}, - {"ospke", 0x00000007, 0, CPUID_REG_ECX, 4, 1}, - {"avx512-vbmi2", 0x00000007, 0, CPUID_REG_ECX, 6, 1}, - {"cet-ss", 0x00000007, 0, CPUID_REG_ECX, 7, 1}, - {"gfni", 0x00000007, 0, CPUID_REG_ECX, 8, 1}, - {"vaes", 0x00000007, 0, CPUID_REG_ECX, 9, 1}, - {"vpclmulqdq", 0x00000007, 0, CPUID_REG_ECX, 10, 1}, - {"avx512-vnni", 0x00000007, 0, CPUID_REG_ECX, 11, 1}, - {"avx512-bitalg",0x00000007, 0, CPUID_REG_ECX, 12, 1}, - {"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}, - {"fsrm", 0x00000007, 0, CPUID_REG_EDX, 4, 1}, - {"avx512-vp2intersect",0x00000007,0,CPUID_REG_EDX,8, 1}, - {"srbds-ctrl", 0x00000007, 0, CPUID_REG_EDX, 9, 1}, - {"md-clear", 0x00000007, 0, CPUID_REG_EDX, 10, 1}, - {"serialize", 0x00000007, 0, CPUID_REG_EDX, 14, 1}, - {"tsxldtrk", 0x00000007, 0, CPUID_REG_EDX, 16, 1}, - {"cet-ibt", 0x00000007, 0, CPUID_REG_EDX, 20, 1}, - {"avx512-fp16", 0x00000007, 0, CPUID_REG_EDX, 23, 1}, - {"ibrsb", 0x00000007, 0, CPUID_REG_EDX, 26, 1}, - {"stibp", 0x00000007, 0, CPUID_REG_EDX, 27, 1}, - {"l1d-flush", 0x00000007, 0, CPUID_REG_EDX, 28, 1}, - {"arch-caps", 0x00000007, 0, CPUID_REG_EDX, 29, 1}, - {"core-caps", 0x00000007, 0, CPUID_REG_EDX, 30, 1}, - {"ssbd", 0x00000007, 0, CPUID_REG_EDX, 31, 1}, - - {"avx-vnni", 0x00000007, 1, CPUID_REG_EAX, 4, 1}, - {"avx512-bf16", 0x00000007, 1, CPUID_REG_EAX, 5, 1}, - {"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}, - {"avx-ifma", 0x00000007, 1, CPUID_REG_EAX, 23, 1}, - - {"avx-vnni-int8",0x00000007, 1, CPUID_REG_EDX, 4, 1}, - {"avx-ne-convert",0x00000007, 1, CPUID_REG_EDX, 5, 1}, - {"cet-sss", 0x00000007, 1, CPUID_REG_EDX, 18, 1}, - - {"intel-psfd", 0x00000007, 2, CPUID_REG_EDX, 0, 1}, - {"ipred-ctrl", 0x00000007, 2, CPUID_REG_EDX, 1, 1}, - {"rrsba-ctrl", 0x00000007, 2, CPUID_REG_EDX, 2, 1}, - {"ddp-ctrl", 0x00000007, 2, CPUID_REG_EDX, 3, 1}, - {"bhi-ctrl", 0x00000007, 2, CPUID_REG_EDX, 4, 1}, - {"mcdt-no", 0x00000007, 2, CPUID_REG_EDX, 5, 1}, {"lahfsahf", 0x80000001, NA, CPUID_REG_ECX, 0, 1}, {"cmplegacy", 0x80000001, NA, CPUID_REG_ECX, 1, 1}, - {"svm", 0x80000001, NA, CPUID_REG_ECX, 2, 1}, - {"extapic", 0x80000001, NA, CPUID_REG_ECX, 3, 1}, {"altmovcr8", 0x80000001, NA, CPUID_REG_ECX, 4, 1}, - {"abm", 0x80000001, NA, CPUID_REG_ECX, 5, 1}, - {"sse4a", 0x80000001, NA, CPUID_REG_ECX, 6, 1}, - {"misalignsse", 0x80000001, NA, CPUID_REG_ECX, 7, 1}, - {"3dnowprefetch",0x80000001, NA, CPUID_REG_ECX, 8, 1}, - {"osvw", 0x80000001, NA, CPUID_REG_ECX, 9, 1}, - {"ibs", 0x80000001, NA, CPUID_REG_ECX, 10, 1}, - {"xop", 0x80000001, NA, CPUID_REG_ECX, 11, 1}, - {"skinit", 0x80000001, NA, CPUID_REG_ECX, 12, 1}, - {"wdt", 0x80000001, NA, CPUID_REG_ECX, 13, 1}, - {"lwp", 0x80000001, NA, CPUID_REG_ECX, 15, 1}, - {"fma4", 0x80000001, NA, CPUID_REG_ECX, 16, 1}, {"nodeid", 0x80000001, NA, CPUID_REG_ECX, 19, 1}, - {"tbm", 0x80000001, NA, CPUID_REG_ECX, 21, 1}, - {"topoext", 0x80000001, NA, CPUID_REG_ECX, 22, 1}, {"perfctr_core", 0x80000001, NA, CPUID_REG_ECX, 23, 1}, {"perfctr_nb", 0x80000001, NA, CPUID_REG_ECX, 24, 1}, - {"syscall", 0x80000001, NA, CPUID_REG_EDX, 11, 1}, - {"nx", 0x80000001, NA, CPUID_REG_EDX, 20, 1}, - {"mmxext", 0x80000001, NA, CPUID_REG_EDX, 22, 1}, - {"ffxsr", 0x80000001, NA, CPUID_REG_EDX, 25, 1}, - {"page1gb", 0x80000001, NA, CPUID_REG_EDX, 26, 1}, - {"rdtscp", 0x80000001, NA, CPUID_REG_EDX, 27, 1}, - {"lm", 0x80000001, NA, CPUID_REG_EDX, 29, 1}, - {"3dnowext", 0x80000001, NA, CPUID_REG_EDX, 30, 1}, - {"3dnow", 0x80000001, NA, CPUID_REG_EDX, 31, 1}, - {"procpkg", 0x00000004, 0, CPUID_REG_EAX, 26, 6}, {"invtsc", 0x80000007, NA, CPUID_REG_EDX, 8, 1}, - {"clzero", 0x80000008, NA, CPUID_REG_EBX, 0, 1}, - {"rstr-fp-err-ptrs", 0x80000008, NA, CPUID_REG_EBX, 2, 1}, - {"wbnoinvd", 0x80000008, NA, CPUID_REG_EBX, 9, 1}, - {"ibpb", 0x80000008, NA, CPUID_REG_EBX, 12, 1}, - {"ibrs", 0x80000008, NA, CPUID_REG_EBX, 14, 1}, - {"amd-stibp", 0x80000008, NA, CPUID_REG_EBX, 15, 1}, - {"ibrs-always", 0x80000008, NA, CPUID_REG_EBX, 16, 1}, - {"stibp-always", 0x80000008, NA, CPUID_REG_EBX, 17, 1}, - {"ibrs-fast", 0x80000008, NA, CPUID_REG_EBX, 18, 1}, - {"ibrs-same-mode", 0x80000008, NA, CPUID_REG_EBX, 19, 1}, - {"no-lmsl", 0x80000008, NA, CPUID_REG_EBX, 20, 1}, {"ppin", 0x80000008, NA, CPUID_REG_EBX, 23, 1}, - {"amd-ssbd", 0x80000008, NA, CPUID_REG_EBX, 24, 1}, - {"virt-ssbd", 0x80000008, NA, CPUID_REG_EBX, 25, 1}, - {"ssb-no", 0x80000008, NA, CPUID_REG_EBX, 26, 1}, - {"psfd", 0x80000008, NA, CPUID_REG_EBX, 28, 1}, {"btc-no", 0x80000008, NA, CPUID_REG_EBX, 29, 1}, - {"ibpb-ret", 0x80000008, NA, CPUID_REG_EBX, 30, 1}, {"nc", 0x80000008, NA, CPUID_REG_ECX, 0, 8}, {"apicidsize", 0x80000008, NA, CPUID_REG_ECX, 12, 4}, @@ -391,17 +239,63 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *policy, const char* str) {"svm_pausefilt",0x8000000a, NA, CPUID_REG_EDX, 10, 1}, {"lfence+", 0x80000021, NA, CPUID_REG_EAX, 2, 1}, - {"nscb", 0x80000021, NA, CPUID_REG_EAX, 6, 1}, - {"auto-ibrs", 0x80000021, NA, CPUID_REG_EAX, 8, 1}, - {"cpuid-user-dis", 0x80000021, NA, CPUID_REG_EAX, 17, 1}, {"maxhvleaf", 0x40000000, NA, CPUID_REG_EAX, 0, 8}, {NULL, 0, NA, CPUID_REG_INV, 0, 0} }; + static const struct feature_name features[] = INIT_FEATURE_NAMES; + /* + * NB: if we switch to using a cpu_policy derived object instead of a + * libxl_cpuid_policy_list we could get rid of the featureset -> cpuid leaf + * conversion table and use a featureset directly as we have conversions + * to/from featureset and cpu_policy. + */ + static const struct { + enum { FEAT_CPUID, FEAT_MSR } type; + union { + struct { + uint32_t leaf, subleaf; + unsigned int reg; + } cpuid; + struct { + uint32_t index; + unsigned int reg; + } msr; + }; + } feature_to_policy[] = { +#define CPUID_ENTRY(l, s, r) \ + { .type = FEAT_CPUID, .cpuid.leaf = l, .cpuid.subleaf = s, .cpuid.reg = r } +#define MSR_ENTRY(i, r) \ + { .type = FEAT_MSR, .msr.index = i, .msr.reg = r } + CPUID_ENTRY(0x00000001, NA, CPUID_REG_EDX), + CPUID_ENTRY(0x00000001, NA, CPUID_REG_ECX), + CPUID_ENTRY(0x80000001, NA, CPUID_REG_EDX), + CPUID_ENTRY(0x80000001, NA, CPUID_REG_ECX), + CPUID_ENTRY(0x0000000D, 1, CPUID_REG_EAX), + CPUID_ENTRY(0x00000007, 0, CPUID_REG_EBX), + CPUID_ENTRY(0x00000007, 0, CPUID_REG_ECX), + CPUID_ENTRY(0x80000007, NA, CPUID_REG_EDX), + CPUID_ENTRY(0x80000008, NA, CPUID_REG_EBX), + CPUID_ENTRY(0x00000007, 0, CPUID_REG_EDX), + CPUID_ENTRY(0x00000007, 1, CPUID_REG_EAX), + CPUID_ENTRY(0x80000021, NA, CPUID_REG_EAX), + CPUID_ENTRY(0x00000007, 1, CPUID_REG_EBX), + CPUID_ENTRY(0x00000007, 2, CPUID_REG_EDX), + CPUID_ENTRY(0x00000007, 1, CPUID_REG_ECX), + CPUID_ENTRY(0x00000007, 1, CPUID_REG_EDX), + MSR_ENTRY(0x10a, CPUID_REG_EAX), + MSR_ENTRY(0x10a, CPUID_REG_EDX), +#undef MSR_ENTRY +#undef CPUID_ENTRY + }; #undef NA const char *sep, *val; + char *name; const struct cpuid_flags *flag; + const struct feature_name *feat; + + BUILD_BUG_ON(ARRAY_SIZE(feature_to_policy) != FEATURESET_NR_ENTRIES); sep = strchr(str, '='); if (sep == NULL) { @@ -414,6 +308,37 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *policy, const char* str) return cpuid_add(policy, flag, val); } + /* Provide a NUL terminated feature name to the search helper. */ + name = strndup(str, sep - str); + if (name == NULL) + return ERROR_NOMEM; + + feat = bsearch(name, features, ARRAY_SIZE(features), sizeof(features[0]), + search_feature); + free(name); + + if (feat == NULL) + return 2; + + switch (feature_to_policy[feat->bit / 32].type) { + case FEAT_CPUID: + { + struct cpuid_flags f; + + f.name = feat->name; + f.leaf = feature_to_policy[feat->bit / 32].cpuid.leaf; + f.subleaf = feature_to_policy[feat->bit / 32].cpuid.subleaf; + f.reg = feature_to_policy[feat->bit / 32].cpuid.reg; + f.bit = feat->bit % 32; + f.length = 1; + + return cpuid_add(policy, &f, val); + } + + case FEAT_MSR: + return 2; + } + return 2; } diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index dfd432ca02..1a5556d3bb 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2622,6 +2622,9 @@ skip_usbdev: case 3: errstr = "illegal CPUID value (must be: [0|1|x|k|s])"; break; + case ERROR_NOMEM: + errstr = "out of memory"; + break; default: errstr = "unknown error"; break; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:12:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:12:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572270.896168 (Exim 4.92) (envelope-from ) id 1qPzfE-00051j-7v; Sun, 30 Jul 2023 06:12:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572270.896168; Sun, 30 Jul 2023 06: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 1qPzfE-00051b-4g; Sun, 30 Jul 2023 06:12:24 +0000 Received: by outflank-mailman (input) for mailman id 572270; Sun, 30 Jul 2023 06:12:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzfD-00051S-DB for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:12:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzfD-0003gK-CP for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:12:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzfD-0005Nu-Bb for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=L0lRkQqdBllJzhYJLon1VgB73m7iOLRubjJsJ7eapgw=; b=eao9bTb5/DrOk8j343mMoY04PG v6NjOLTrTWYMquoFOeHPBEnUzrdX+nbKpg2vGE1PcxOO1u27s06urxbc05Y747t5Zoiq6EkfvxWDN gBJERf0g2BLa5JLpkUVqUzBYOppzxt2ilgzzxwxpY6JnoHHOzLIbPnYyVK3K5K0bY6c8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: add support for parsing MSR features Message-Id: Date: Sun, 30 Jul 2023 06:12:23 +0000 commit 6d21cedbaa34b3a3856f964189e911112c732b21 Author: Roger Pau Monne AuthorDate: Tue Jul 25 15:05:58 2023 +0200 Commit: Andrew Cooper CommitDate: Wed Jul 26 10:56:27 2023 +0100 libxl: add support for parsing MSR features Introduce support for handling MSR features in libxl_cpuid_parse_config(). The MSR policies are added to the libxl_cpuid_policy like the CPUID one, which gets passed to xc_cpuid_apply_policy(). This allows existing users of libxl to provide MSR related features as key=value pairs to libxl_cpuid_parse_config() without requiring the usage of a different API. Signed-off-by: Roger Pau Monné Acked-by: Anthony PERARD --- tools/libs/light/libxl_cpuid.c | 64 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index 785b57f6f8..5ec088b60c 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -157,6 +157,60 @@ static int cpuid_add(libxl_cpuid_policy_list *policy, return 0; } +static struct xc_msr *msr_find_match(libxl_cpuid_policy_list *pl, uint32_t index) +{ + unsigned int i = 0; + libxl_cpuid_policy_list policy = *pl; + + if (policy == NULL) + policy = *pl = calloc(1, sizeof(*policy)); + + if (policy->msr != NULL) { + for (i = 0; policy->msr[i].index != XC_MSR_INPUT_UNUSED; i++) { + if (policy->msr[i].index == index) { + return &policy->msr[i]; + } + } + } + + policy->msr = realloc(policy->msr, sizeof(struct xc_msr) * (i + 2)); + policy->msr[i].index = index; + memset(policy->msr[i].policy, 'x', ARRAY_SIZE(policy->msr[0].policy) - 1); + policy->msr[i].policy[ARRAY_SIZE(policy->msr[0].policy) - 1] = '\0'; + policy->msr[i + 1].index = XC_MSR_INPUT_UNUSED; + + return &policy->msr[i]; +} + +static int msr_add(libxl_cpuid_policy_list *policy, uint32_t index, unsigned int bit, + const char *val) +{ + struct xc_msr *entry = msr_find_match(policy, index); + + /* Only allow options taking a character for MSRs, no values allowed. */ + if (strlen(val) != 1) + return 3; + + switch (val[0]) { + case '0': + case '1': + case 'x': + case 'k': + entry->policy[63 - bit] = val[0]; + break; + + case 's': + /* Translate s -> k as xc_msr doesn't support the deprecated 's'. */ + entry->policy[63 - bit] = 'k'; + break; + + default: + return 3; + } + + return 0; +} + struct feature_name { const char *name; unsigned int bit; @@ -336,7 +390,15 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *policy, const char* str) } case FEAT_MSR: - return 2; + { + unsigned int bit = feat->bit % 32; + + if (feature_to_policy[feat->bit / 32].msr.reg == CPUID_REG_EDX) + bit += 32; + + return msr_add(policy, feature_to_policy[feat->bit / 32].msr.index, + bit, val); + } } return 2; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:12:35 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:12:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572271.896172 (Exim 4.92) (envelope-from ) id 1qPzfP-00054x-8w; Sun, 30 Jul 2023 06:12:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572271.896172; Sun, 30 Jul 2023 06:12: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 1qPzfP-00054q-6B; Sun, 30 Jul 2023 06:12:35 +0000 Received: by outflank-mailman (input) for mailman id 572271; Sun, 30 Jul 2023 06:12:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzfN-00054c-GE for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:12:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzfN-0003gS-FZ for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:12:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzfN-0005OL-Eh for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=m1In4lD8WLyybpZVsER7dDqu2iI4MAIDco89ZPaFXSc=; b=T9mW7GyODHCQk+Ih76Uj95G/iD vc3tXpqvUoRYEk1WHEx/jEDRrbuLNhru9Rprgabne3NVWCqqx4pErOnuvqIW11qYZtiHJGGOurHqc 560QlRSBbXCkbdfaXTCo5iv6E6/NWL8w4pwQNoy4oQUA+3/f5zjglpe+IxEfHQ6SMK3U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpu-policy: Advertise MSR_ARCH_CAPS to guests by default Message-Id: Date: Sun, 30 Jul 2023 06:12:33 +0000 commit 4b2cdbfe766e5666e6754198946df2dc16f6a642 Author: Andrew Cooper AuthorDate: Wed May 17 10:13:36 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Jul 26 10:56:27 2023 +0100 x86/cpu-policy: Advertise MSR_ARCH_CAPS to guests by default With xl/libxl now able to control the policy bits for MSR_ARCH_CAPS, it is safe to advertise to guests by default. In turn, we don't need the special case to expose details to dom0. This advertises MSR_ARCH_CAPS to guests on *all* Intel hardware, even if the register content ends up being empty. - Advertising ARCH_CAPS and not RSBA signals "retpoline is safe here and everywhere you might migrate to". This is important because it avoids the guest kernel needing to rely on model checks. - Alternatively, levelling for safety across the Broadwell/Skylake divide requires advertising ARCH_CAPS and RSBA, meaning "retpoline not safe on some hardware you might migrate to". On Cascade Lake and later hardware, guests can now see RDCL_NO (not vulnerable to Meltdown) amongst others. This causes substantial performance improvements, as guests are no longer applying software mitigations in cases where they don't need to. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu-policy.c | 11 ----------- xen/include/public/arch-x86/cpufeatureset.h | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index f40eeb8be8..1f954d4e59 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -888,17 +888,6 @@ void __init init_dom0_cpuid_policy(struct domain *d) if ( cpu_has_itsc ) p->extd.itsc = true; - /* - * Expose the "hardware speculation behaviour" bits of ARCH_CAPS to dom0, - * so dom0 can turn off workarounds as appropriate. Temporary, until the - * domain policy logic gains a better understanding of MSRs. - */ - if ( is_hardware_domain(d) && cpu_has_arch_caps ) - { - p->feat.arch_caps = true; - p->arch_caps.raw = host_cpu_policy.arch_caps.raw; - } - /* Apply dom0-cpuid= command line settings, if provided. */ if ( dom0_cpuid_cmdline ) { diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index ce7407d6a1..6d20810cb9 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -271,7 +271,7 @@ XEN_CPUFEATURE(AVX512_FP16, 9*32+23) /*A AVX512 FP16 instructions */ XEN_CPUFEATURE(IBRSB, 9*32+26) /*A IBRS and IBPB support (used by Intel) */ XEN_CPUFEATURE(STIBP, 9*32+27) /*A STIBP */ XEN_CPUFEATURE(L1D_FLUSH, 9*32+28) /*S MSR_FLUSH_CMD and L1D flush. */ -XEN_CPUFEATURE(ARCH_CAPS, 9*32+29) /*!a IA32_ARCH_CAPABILITIES MSR */ +XEN_CPUFEATURE(ARCH_CAPS, 9*32+29) /*!A IA32_ARCH_CAPABILITIES MSR */ XEN_CPUFEATURE(CORE_CAPS, 9*32+30) /* IA32_CORE_CAPABILITIES MSR */ XEN_CPUFEATURE(SSBD, 9*32+31) /*A MSR_SPEC_CTRL.SSBD available */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:12:45 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:12:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572272.896176 (Exim 4.92) (envelope-from ) id 1qPzfZ-00057h-AG; Sun, 30 Jul 2023 06:12:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572272.896176; Sun, 30 Jul 2023 06:12: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 1qPzfZ-00057Z-7p; Sun, 30 Jul 2023 06:12:45 +0000 Received: by outflank-mailman (input) for mailman id 572272; Sun, 30 Jul 2023 06:12:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzfX-00057N-KQ for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:12:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzfX-0003gy-JF for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:12:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzfX-0005Op-Hq for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=jqU6o5GmT4E+Xca+C4hQSJw/fiRM+QZa1H19XaloOkc=; b=NdwWwiOSzP6PRqhHZ2ZgL5ii+l lTKshUqQZX3wIeKK1Xdc/6YO+kIzUQWp1XETy+hWpWFTM/0HWRlbV8q1ddOzK3jv68b5PnP3xZov4 /p5eVRTUaLV+XrzYj2FDQY0OTdPd2f9CLCoxJmlS3pP7cScHc0BVOnqzmrbnotNOiYDA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Drop the (almost) unused extern start[] Message-Id: Date: Sun, 30 Jul 2023 06:12:43 +0000 commit 9380f06fe82fe1886a8ae468d22b901bd6c4d3d5 Author: Andrew Cooper AuthorDate: Tue Jul 25 16:32:35 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Jul 26 10:56:27 2023 +0100 xen: Drop the (almost) unused extern start[] This global variable is shadowed by plenty local variables, violating MISRA rule 5.3. Some architectures happen to have a symbol by the name of start in their head.S's, but it's not a useful symbol to reference from C. In fact, the single use of the global start[] in RISC-V means to use _start[] as the linker symbol at the beginning of the .text section, not the function which happens to be in the same location. Fix RISC-V to use the right symbol for it's calculation, and drop the extern. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Reviewed-by: Oleksii Kurochko --- xen/arch/riscv/mm.c | 2 +- xen/include/xen/kernel.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/riscv/mm.c b/xen/arch/riscv/mm.c index fddb3cd0bd..99ed5e9623 100644 --- a/xen/arch/riscv/mm.c +++ b/xen/arch/riscv/mm.c @@ -148,7 +148,7 @@ static bool __init check_pgtbl_mode_support(struct mmu_desc *mmu_desc, unsigned long aligned_load_start = load_start & level_map_mask; unsigned long aligned_page_size = XEN_PT_LEVEL_SIZE(page_table_level); - unsigned long xen_size = (unsigned long)(_end - start); + unsigned long xen_size = (unsigned long)(_end - _start); if ( (load_start + xen_size) > (aligned_load_start + aligned_page_size) ) { diff --git a/xen/include/xen/kernel.h b/xen/include/xen/kernel.h index 9ac2694dc7..46b3c9c026 100644 --- a/xen/include/xen/kernel.h +++ b/xen/include/xen/kernel.h @@ -66,7 +66,7 @@ }) /* SAF-0-safe */ -extern char _start[], _end[], start[]; +extern char _start[], _end[]; #define is_kernel(p) ({ \ char *__p = (char *)(unsigned long)(p); \ (__p >= _start) && (__p < _end); \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:12:56 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:12:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572273.896181 (Exim 4.92) (envelope-from ) id 1qPzfj-0005AC-Cj; Sun, 30 Jul 2023 06:12:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572273.896181; Sun, 30 Jul 2023 06:12: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 1qPzfj-0005A3-9F; Sun, 30 Jul 2023 06:12:55 +0000 Received: by outflank-mailman (input) for mailman id 572273; Sun, 30 Jul 2023 06:12:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzfh-00059q-NE for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:12:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzfh-0003h5-MT for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:12:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzfh-0005PE-Lf for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=sHZRBgGvA5BtvLfbSxBSUw6XfFJ1bLgHjMi3sJ9iUw4=; b=vERvCgUzo6aWsLpbyBebdZD+5Y 5yApaiiTsWFeBah8h/HDP/02C6/8K/PqPDiFFN7At2VVqMc+WIuVl1ddJKwhsWjblrWvrQdzUvJ/Y 7/zwY2OQB5zNAMM/Ee1r00dYGleKphmmRPFHFVAa7/Y5/0fZ3vP4Tzbgf3bChKd3HNBU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: Allow hvm_copy_to_guest_*() to come from const sources Message-Id: Date: Sun, 30 Jul 2023 06:12:53 +0000 commit 9895e3374237267697bd505c04810d2d10e42c7b Author: Andrew Cooper AuthorDate: Wed Jul 19 11:30:56 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Jul 26 13:58:27 2023 +0100 x86/hvm: Allow hvm_copy_to_guest_*() to come from const sources The work to fix MISRA rule 7.4 (using mutable pointers to string literals) identifies that string literals do indeed get passed into hvm_copy_to_guest_linear() by way of the PVH dom0 command line. This higlights that the copy_to_* helpers really ought to take a const source. Update the function types to match, and cast away constness in the wrappers around __hvm_copy() where HVMCOPY_to_guest is used. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 11 ++++++----- xen/arch/x86/include/asm/hvm/support.h | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0fa58ce6a0..0e471e02a1 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3401,9 +3401,10 @@ static enum hvm_translation_result __hvm_copy( } enum hvm_translation_result hvm_copy_to_guest_phys( - paddr_t paddr, void *buf, unsigned int size, struct vcpu *v) + paddr_t paddr, const void *buf, unsigned int size, struct vcpu *v) { - return __hvm_copy(buf, paddr, size, v, + return __hvm_copy((void *)buf /* HVMCOPY_to_guest doesn't modify */, + paddr, size, v, HVMCOPY_to_guest | HVMCOPY_phys, 0, NULL); } @@ -3415,11 +3416,11 @@ enum hvm_translation_result hvm_copy_from_guest_phys( } enum hvm_translation_result hvm_copy_to_guest_linear( - unsigned long addr, void *buf, unsigned int size, uint32_t pfec, + unsigned long addr, const void *buf, unsigned int size, uint32_t pfec, pagefault_info_t *pfinfo) { - return __hvm_copy(buf, addr, size, current, - HVMCOPY_to_guest | HVMCOPY_linear, + return __hvm_copy((void *)buf /* HVMCOPY_to_guest doesn't modify */, + addr, size, current, HVMCOPY_to_guest | HVMCOPY_linear, PFEC_page_present | PFEC_write_access | pfec, pfinfo); } diff --git a/xen/arch/x86/include/asm/hvm/support.h b/xen/arch/x86/include/asm/hvm/support.h index ab7de0a43b..2a7ba36af0 100644 --- a/xen/arch/x86/include/asm/hvm/support.h +++ b/xen/arch/x86/include/asm/hvm/support.h @@ -59,7 +59,7 @@ enum hvm_translation_result { * address range does not map entirely onto ordinary machine memory. */ enum hvm_translation_result hvm_copy_to_guest_phys( - paddr_t paddr, void *buf, unsigned int size, struct vcpu *v); + paddr_t paddr, const void *buf, unsigned int size, struct vcpu *v); enum hvm_translation_result hvm_copy_from_guest_phys( void *buf, paddr_t paddr, unsigned int size); @@ -85,7 +85,7 @@ typedef struct pagefault_info } pagefault_info_t; enum hvm_translation_result hvm_copy_to_guest_linear( - unsigned long addr, void *buf, unsigned int size, uint32_t pfec, + unsigned long addr, const void *buf, unsigned int size, uint32_t pfec, pagefault_info_t *pfinfo); enum hvm_translation_result hvm_copy_from_guest_linear( void *buf, unsigned long addr, unsigned int size, uint32_t pfec, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:13:05 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:13:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572274.896184 (Exim 4.92) (envelope-from ) id 1qPzft-0005Cs-Df; Sun, 30 Jul 2023 06:13:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572274.896184; Sun, 30 Jul 2023 06: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 1qPzft-0005Ck-Ar; Sun, 30 Jul 2023 06:13:05 +0000 Received: by outflank-mailman (input) for mailman id 572274; Sun, 30 Jul 2023 06:13:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzfr-0005CY-Q9 for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:13:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzfr-0003hP-PW for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:13:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzfr-0005Po-Oh for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=HLkAjsNUoXDFOaV9U0Wx6RZ4mqiXpfd3oVP12y6wQz8=; b=JPZrv3KdNPZWGd7SmPYeZgMnRF naV0HSrujYJH7DkuVMfeq2LgRIsVtkW65FDAHBEos3aqVqWen6ZHl8X7SixoPSK7r17hu+06PaMaq szl/mn8PrLdGygOtikS1O+A7gSzozWWzndVbkYUq5XyAb2Cx+zomSeMmcYHx/9Wzt2Qw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/x86: Use const char * for string literals (2) Message-Id: Date: Sun, 30 Jul 2023 06:13:03 +0000 commit 90732a8b4cb554254af473d0e570daf6b8c987a7 Author: Andrew Cooper AuthorDate: Wed Jul 19 11:57:46 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Jul 26 13:58:27 2023 +0100 xen/x86: Use const char * for string literals (2) This hunk was accidentally missing from a previous change. Fixes: d642c0706678 ("xen/x86: Use const char * for string literals") Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 74e3915a4d..2dbe9857aa 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -968,7 +968,7 @@ static struct domain *__init create_dom0(const module_t *image, void __init noreturn __start_xen(unsigned long mbi_p) { - char *memmap_type = NULL; + const char *memmap_type = NULL; char *cmdline, *kextra, *loader; void *bsp_stack; struct cpu_info *info = get_cpu_info(), *bsp_info; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:13:15 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:13:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572275.896188 (Exim 4.92) (envelope-from ) id 1qPzg3-0005Fj-FE; Sun, 30 Jul 2023 06:13:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572275.896188; Sun, 30 Jul 2023 06: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 1qPzg3-0005Fb-CN; Sun, 30 Jul 2023 06:13:15 +0000 Received: by outflank-mailman (input) for mailman id 572275; Sun, 30 Jul 2023 06:13:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzg1-0005FM-TL for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:13:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzg1-0003hX-SZ for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:13:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzg1-0005QM-Ru for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=Bk1c/qKgqnmXk3vLtgz/1e4Mu3Iy6U7TD4y4TmCUS0M=; b=RW1XT2Af6KRzEpH4AIAegYG3O/ wZs5g1WoEeDrg3XCPNexwSjxPHwG5aNe8v0jtj7vBNzUjckjgnBKdw7S8WnFiDtN2Fyw6TOvyJ1cs SR+bAc3upo3yeH/CIiEmr10utosAiwwaxXejrScX20oZGTpX0MCiz4hU6CNGqZgydNuc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Update construct_dom0() to take a const char *cmdline Message-Id: Date: Sun, 30 Jul 2023 06:13:13 +0000 commit 3d2d4ea026df73c37a7df7e216443cbf652ff892 Author: Andrew Cooper AuthorDate: Wed Jul 19 13:37:37 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Jul 26 13:58:27 2023 +0100 x86/boot: Update construct_dom0() to take a const char *cmdline With hvm_copy_to_guest_*() able to use const sources, update construct_dom0() and friends to pass a const cmdline pointer. Nothing in these paths have a reason to be modifying the command line passed in. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/dom0_build.c | 2 +- xen/arch/x86/hvm/dom0_build.c | 4 ++-- xen/arch/x86/include/asm/dom0_build.h | 4 ++-- xen/arch/x86/include/asm/setup.h | 2 +- xen/arch/x86/pv/dom0_build.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c index 9f5300a3ef..8b1fcc6471 100644 --- a/xen/arch/x86/dom0_build.c +++ b/xen/arch/x86/dom0_build.c @@ -564,7 +564,7 @@ int __init dom0_setup_permissions(struct domain *d) int __init construct_dom0(struct domain *d, const module_t *image, unsigned long image_headroom, module_t *initrd, - char *cmdline) + const char *cmdline) { int rc; diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index fd2cbf68bc..a7ae9c3b04 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -532,7 +532,7 @@ static paddr_t __init find_memory( static int __init pvh_load_kernel(struct domain *d, const module_t *image, unsigned long image_headroom, module_t *initrd, void *image_base, - char *cmdline, paddr_t *entry, + const char *cmdline, paddr_t *entry, paddr_t *start_info_addr) { void *image_start = image_base + image_headroom; @@ -1177,7 +1177,7 @@ static void __hwdom_init pvh_setup_mmcfg(struct domain *d) int __init dom0_construct_pvh(struct domain *d, const module_t *image, unsigned long image_headroom, module_t *initrd, - char *cmdline) + const char *cmdline) { paddr_t entry, start_info; int rc; diff --git a/xen/arch/x86/include/asm/dom0_build.h b/xen/arch/x86/include/asm/dom0_build.h index a5f8c9e67f..107c1ff983 100644 --- a/xen/arch/x86/include/asm/dom0_build.h +++ b/xen/arch/x86/include/asm/dom0_build.h @@ -16,12 +16,12 @@ int dom0_setup_permissions(struct domain *d); int dom0_construct_pv(struct domain *d, const module_t *image, unsigned long image_headroom, module_t *initrd, - char *cmdline); + const char *cmdline); int dom0_construct_pvh(struct domain *d, const module_t *image, unsigned long image_headroom, module_t *initrd, - char *cmdline); + const char *cmdline); unsigned long dom0_paging_pages(const struct domain *d, unsigned long nr_pages); diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/setup.h index ae0dd3915a..51fce66607 100644 --- a/xen/arch/x86/include/asm/setup.h +++ b/xen/arch/x86/include/asm/setup.h @@ -35,7 +35,7 @@ int construct_dom0( struct domain *d, const module_t *kernel, unsigned long kernel_headroom, module_t *initrd, - char *cmdline); + const char *cmdline); void setup_io_bitmap(struct domain *d); unsigned long initial_images_nrpages(nodeid_t node); diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index c99135a552..909ee9a899 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -358,7 +358,7 @@ int __init dom0_construct_pv(struct domain *d, const module_t *image, unsigned long image_headroom, module_t *initrd, - char *cmdline) + const char *cmdline) { int i, rc, order, machine; bool compatible, compat; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:13:25 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:13:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572276.896192 (Exim 4.92) (envelope-from ) id 1qPzgD-0005Id-Hq; Sun, 30 Jul 2023 06:13:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572276.896192; Sun, 30 Jul 2023 06: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 1qPzgD-0005IV-FE; Sun, 30 Jul 2023 06:13:25 +0000 Received: by outflank-mailman (input) for mailman id 572276; Sun, 30 Jul 2023 06:13:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzgC-0005IH-0C for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:13:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzgB-0003hg-Vg for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:13:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzgB-0005Qn-Uz for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:13: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=uJHabJhx39JnnY6SebD2tYtxm2vpTtzQu37SLQA8sqY=; b=0FmjIa//PHFVIFc3ZVK07Yqrme rQtVd84X72Yjr1AoJmqwJzz9SH5QFZ3bw4wbT6sIpzTipnT+nsb2ew9mfQmjWcdOPNLFne833cmir KJY863FXjM4baNs9zte1g9W7hBOsqh8Eb64nj1JpiqQu6ogpC962oprnfK7/0AOqmkTM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: use parameter name 'mcs' in arch_do_multicall_call() Message-Id: Date: Sun, 30 Jul 2023 06:13:23 +0000 commit b8cf4dea3cea66958f2a5d8492d69df32aef9d1c Author: Federico Serafini AuthorDate: Wed Jul 26 11:34:14 2023 +0200 Commit: Stefano Stabellini CommitDate: Wed Jul 26 15:10:12 2023 -0700 xen: use parameter name 'mcs' in arch_do_multicall_call() Make function declaration and definition consistent using the same parameter name ('mcs' do denote a pointer to an 'mc_state'). This addresses a violation of MISRA C:2012 Rule 8.3: "All declarations of an object or function shall use the same names and type qualifiers". Signed-off-by: Federico Serafini Acked-by: Jan Beulich Reviewed-by: Stefano Stabellini --- xen/arch/arm/traps.c | 4 ++-- xen/arch/x86/hypercall.c | 6 +++--- xen/include/xen/multicall.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index d1ef787638..eab2fcfc02 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1470,9 +1470,9 @@ static bool check_multicall_32bit_clean(struct multicall_entry *multi) return true; } -enum mc_disposition arch_do_multicall_call(struct mc_state *state) +enum mc_disposition arch_do_multicall_call(struct mc_state *mcs) { - struct multicall_entry *multi = &state->call; + struct multicall_entry *multi = &mcs->call; if ( multi->op >= ARRAY_SIZE(hypercall_args) ) { diff --git a/xen/arch/x86/hypercall.c b/xen/arch/x86/hypercall.c index cc9a6a9d59..01cd73040d 100644 --- a/xen/arch/x86/hypercall.c +++ b/xen/arch/x86/hypercall.c @@ -203,15 +203,15 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, return rc; } -enum mc_disposition arch_do_multicall_call(struct mc_state *state) +enum mc_disposition arch_do_multicall_call(struct mc_state *mcs) { const struct domain *currd = current->domain; if ( is_pv_domain(currd) ) - return pv_do_multicall_call(state); + return pv_do_multicall_call(mcs); if ( is_hvm_domain(currd) ) - return hvm_do_multicall_call(state); + return hvm_do_multicall_call(mcs); return mc_exit; } diff --git a/xen/include/xen/multicall.h b/xen/include/xen/multicall.h index ac8238660a..5bebeca7b2 100644 --- a/xen/include/xen/multicall.h +++ b/xen/include/xen/multicall.h @@ -25,6 +25,6 @@ enum mc_disposition { mc_continue, mc_exit, mc_preempt, -} arch_do_multicall_call(struct mc_state *mc); +} arch_do_multicall_call(struct mc_state *mcs); #endif /* __XEN_MULTICALL_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:13:35 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:13:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572277.896196 (Exim 4.92) (envelope-from ) id 1qPzgN-0005Ll-JJ; Sun, 30 Jul 2023 06:13:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572277.896196; Sun, 30 Jul 2023 06: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 1qPzgN-0005Ld-Gi; Sun, 30 Jul 2023 06:13:35 +0000 Received: by outflank-mailman (input) for mailman id 572277; Sun, 30 Jul 2023 06:13:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzgM-0005LH-35 for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:13:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzgM-0003hn-2M for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:13:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzgM-0005RQ-1e for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=AnBaY4tNAreddNIDOxLj3iQhXv1Pw96UFYBI2STtMgs=; b=LMTPwogrXNlPJ5NYxDz/KyJDpO bX7fo4c97LeFAR9VubltnOKUHyS9MpDFKcxlkeKlr79cP9swyb4Pg2exn/9UO0yP8D1IJu7OAiQLy cAfK5aFC8CjsTh3C7ItnB43VtCO5ppopOqYcE78H2ateOLNJGvzcV8c25J05aLZTnupE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/event: address violations of MISRA C:2012 Rules 8.2 and 8.3 Message-Id: Date: Sun, 30 Jul 2023 06:13:34 +0000 commit 357ef5351208b1bdf0d4cdb3474e426228d8ac0f Author: Federico Serafini AuthorDate: Wed Jul 26 10:27:38 2023 +0200 Commit: Stefano Stabellini CommitDate: Wed Jul 26 15:10:20 2023 -0700 xen/event: address violations of MISRA C:2012 Rules 8.2 and 8.3 Give a name to unnamed parameters thus addressing violations of MISRA C:2012 Rule 8.2 ("Function types shall be in prototype form with named parameters"). Keep consistency between parameter names and types used in function declarations and the ones used in the corresponding function definitions, thus addressing violations of MISRA C:2012 Rule 8.3 ("All declarations of an object or function shall use the same names and type qualifiers"). No functional changes. Signed-off-by: Federico Serafini Acked-by: Jan Beulich --- xen/include/xen/event.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 8eae9984a9..8e509e0784 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -48,10 +48,10 @@ int set_global_virq_handler(struct domain *d, uint32_t virq); * @d: Domain to which physical IRQ should be sent * @pirq: Physical IRQ number */ -void send_guest_pirq(struct domain *, const struct pirq *); +void send_guest_pirq(struct domain *d, const struct pirq *pirq); /* Send a notification from a given domain's event-channel port. */ -int evtchn_send(struct domain *d, unsigned int lport); +int evtchn_send(struct domain *ld, unsigned int lport); /* Bind a local event-channel port to the specified VCPU. */ int evtchn_bind_vcpu(evtchn_port_t port, unsigned int vcpu_id); @@ -69,7 +69,7 @@ int evtchn_close(struct domain *d1, int port1, bool guest); void evtchn_free(struct domain *d, struct evtchn *chn); /* Allocate a specific event channel port. */ -int evtchn_allocate_port(struct domain *d, unsigned int port); +int evtchn_allocate_port(struct domain *d, evtchn_port_t port); /* Allocate a new event channel */ int __must_check evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc, @@ -78,7 +78,7 @@ int __must_check evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc, /* Bind an event channel port to interdomain */ int __must_check evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind, struct domain *ld, - evtchn_port_t port); + evtchn_port_t lport); /* Unmask a local event-channel port. */ int evtchn_unmask(unsigned int port); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:13:45 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:13:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572278.896199 (Exim 4.92) (envelope-from ) id 1qPzgX-0005OT-Ki; Sun, 30 Jul 2023 06:13:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572278.896199; Sun, 30 Jul 2023 06: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 1qPzgX-0005OL-I9; Sun, 30 Jul 2023 06:13:45 +0000 Received: by outflank-mailman (input) for mailman id 572278; Sun, 30 Jul 2023 06:13:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzgW-0005Ny-6b for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:13:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzgW-0003iA-5e for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:13:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzgW-0005Ru-4q for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=sDUaSqNzzdGl/DCHGnwtNHNB1SmNIZwu2fSpwB2Ql7E=; b=ubqo0IbmdMbugkxZCcIMqghaIH ctjNL+kj6xgFzqBFDJ/EF8Nhghm1o7UPavGasx4GtB1rFPsyLQZbWBwpaH6dHxWFU4zxtHtst20jW 9xMXiMxj1dwaw1pFzbtBirOt149gNMQNjrfWDlycrfVRlinbzny6v2JS5Uc+MPgxsTCA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/kernel: change parameter name in add_taint() definition Message-Id: Date: Sun, 30 Jul 2023 06:13:44 +0000 commit 37c83b946e91405f78dbbba54460c5b6be75fc3f Author: Federico Serafini AuthorDate: Wed Jul 26 15:58:55 2023 +0200 Commit: Stefano Stabellini CommitDate: Wed Jul 26 15:10:20 2023 -0700 xen/kernel: change parameter name in add_taint() definition Change parameter name from 'flag' to 'taint' for consistency with the corresponding declaration. This addresses a violation of MISRA C:2012 Rule 8.3: "All declarations of an object or function shall use the same names and type qualifiers". No functional changes. Signed-off-by: Federico Serafini Acked-by: Jan Beulich --- xen/common/kernel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 719b08d6c7..fb919f3d9c 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -397,9 +397,9 @@ char *print_tainted(char *str) return str; } -void add_taint(unsigned int flag) +void add_taint(unsigned int taint) { - tainted |= flag; + tainted |= taint; } extern const initcall_t __initcall_start[], __presmp_initcall_end[], -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:14:05 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:14:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572279.896204 (Exim 4.92) (envelope-from ) id 1qPzgr-0005RF-Ma; Sun, 30 Jul 2023 06:14:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572279.896204; Sun, 30 Jul 2023 06: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 1qPzgr-0005R8-K0; Sun, 30 Jul 2023 06:14:05 +0000 Received: by outflank-mailman (input) for mailman id 572279; Sun, 30 Jul 2023 06:14:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzgq-0005R2-Dj for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:14:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzgq-0003kD-D3 for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:14:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzgq-0005TO-CQ for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=FUUSTmXQfJufIZ47/Z18EGA8gK2vrAoNnI66BXzoVOY=; b=Yr6D22nMU2bpDxPRTH0ZkTEodn u9xYQ0WDw3UMoVO6Bki4Ba1sY+0Ql0slpenGkYk1ZW5MP0P9OpckkUDod2Ro2ZtKF/RGUGE7XzqIE /S+V0KOtfwL/VmZzh4tDyUMkm+oa8l05+ppC1LDy9wm7SqgjK+IVsJjceXKAPWJ15RQY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Add xen builds for the ECLAIR analyses Message-Id: Date: Sun, 30 Jul 2023 06:14:04 +0000 commit 5b251cbca0a83fe58435ac582a3a2367d15a6ca2 Author: Simone Ballarin AuthorDate: Wed Jul 26 18:20:48 2023 +0200 Commit: Stefano Stabellini CommitDate: Wed Jul 26 15:11:50 2023 -0700 automation: Add xen builds for the ECLAIR analyses This patch defines an ARM64 and a X86_64 build for the ECLAIR pipelines. These files are used by the analyze.sh script in automation/eclair_analysis: it initially calls prepare.sh, then runs into an ECLAIR environment build.sh. Only the toolchain invocations triggered by build.sh are analyzed; the prepare.sh script is instead intended to perform all the required operations for building xen that are not supposed to be analyzed: e.g. dependencies build. Signed-off-by: Simone Ballarin Reviewed-by: Stefano Stabellini --- automation/eclair_analysis/Makefile.prepare | 6 ++ automation/eclair_analysis/build.sh | 44 ++++++++ automation/eclair_analysis/prepare.sh | 42 ++++++++ automation/eclair_analysis/xen_arm_config | 147 +++++++++++++++++++++++++++ automation/eclair_analysis/xen_x86_config | 152 ++++++++++++++++++++++++++++ 5 files changed, 391 insertions(+) diff --git a/automation/eclair_analysis/Makefile.prepare b/automation/eclair_analysis/Makefile.prepare new file mode 100644 index 0000000000..90f4a31172 --- /dev/null +++ b/automation/eclair_analysis/Makefile.prepare @@ -0,0 +1,6 @@ +include Makefile +prepare: + $(Q)$(MAKE) $(build)=tools + $(Q)$(MAKE) $(build)=. include/xen/compile.h + $(Q)$(MAKE) $(build)=include all + $(Q)$(MAKE) $(build)=arch/$(SRCARCH) include diff --git a/automation/eclair_analysis/build.sh b/automation/eclair_analysis/build.sh new file mode 100755 index 0000000000..ec087dd822 --- /dev/null +++ b/automation/eclair_analysis/build.sh @@ -0,0 +1,44 @@ +#!/bin/bash +# Stop immediately if any executed command has exit status different from 0. +set -e + +script_name="$(basename "$0")" + +fatal() { + echo "${script_name}: $*" >&2 + exit 1 +} + +usage() { + fatal "Usage: ${script_name} " +} + +if [ $# -ne 1 ]; then + usage +fi + +if [ "$1" = "X86_64" ]; then + export CROSS_COMPILE= + export XEN_TARGET_ARCH=x86_64 +elif [ "$1" = "ARM64" ]; then + export CROSS_COMPILE=aarch64-linux-gnu- + export XEN_TARGET_ARCH=arm64 +else + fatal "Unknown configuration: $1" +fi + +if [[ -f /proc/cpuinfo ]]; then + PROCESSORS=$(grep -c ^processor /proc/cpuinfo) +else + PROCESSORS=6 +fi + +( + cd xen + + make "-j${PROCESSORS}" "-l${PROCESSORS}.0" \ + "CROSS_COMPILE=${CROSS_COMPILE}" \ + "CC=${CROSS_COMPILE}gcc-12" \ + "CXX=${CROSS_COMPILE}g++-12" \ + "XEN_TARGET_ARCH=${XEN_TARGET_ARCH}" +) diff --git a/automation/eclair_analysis/prepare.sh b/automation/eclair_analysis/prepare.sh new file mode 100755 index 0000000000..275a1a3f51 --- /dev/null +++ b/automation/eclair_analysis/prepare.sh @@ -0,0 +1,42 @@ +#!/bin/bash +# Stop immediately if any executed command has exit status different from 0. +set -e + +script_name="$(basename "$0")" +script_dir="$( + cd "$(dirname "$0")" + echo "${PWD}" +)" + +fatal() { + echo "${script_name}: $*" >&2 + exit 1 +} + +usage() { + fatal "Usage: ${script_name}" +} + +if [ $# -ne 1 ]; then + usage + exit 1 +fi + +export XEN_TARGET_ARCH + +if [ "$1" = "X86_64" ]; then + CONFIG_FILE="${script_dir}/xen_x86_config" + XEN_TARGET_ARCH=x86_64 +elif [ "$1" = "ARM64" ]; then + CONFIG_FILE="${script_dir}/xen_arm_config" + XEN_TARGET_ARCH=arm64 +else + fatal "Unknown configuration: $1" +fi + +( + cd xen + cp "${CONFIG_FILE}" .config + make clean + make -f ${script_dir}/Makefile.prepare prepare +) diff --git a/automation/eclair_analysis/xen_arm_config b/automation/eclair_analysis/xen_arm_config new file mode 100644 index 0000000000..26f5fcca41 --- /dev/null +++ b/automation/eclair_analysis/xen_arm_config @@ -0,0 +1,147 @@ +# File provided in +# Re: Xen MISRA C: Source files in scope and out of scope +# from: Stefano Stabellini +# date: 6 giu 2023, 02:53 + +# +# Automatically generated file; DO NOT EDIT. +# Xen/arm 4.18-unstable Configuration +# +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=90400 +CONFIG_CLANG_VERSION=0 +CONFIG_LD_IS_GNU=y +CONFIG_CC_HAS_VISIBILITY_ATTRIBUTE=y +CONFIG_ARM_64=y +CONFIG_ARM=y +CONFIG_ARCH_DEFCONFIG="arch/arm/configs/arm64_defconfig" + +# UBSAN +CONFIG_UBSAN=n + +# +# Architecture Features +# +CONFIG_ARM64_SVE=n +CONFIG_64BIT=y +CONFIG_NR_CPUS=4 +# CONFIG_ACPI is not set +CONFIG_ARM_EFI=y +CONFIG_GICV3=y +CONFIG_HAS_ITS=y +CONFIG_HVM=y +# CONFIG_NEW_VGIC is not set +CONFIG_SBSA_VUART_CONSOLE=y +CONFIG_ARM_SSBD=y +CONFIG_HARDEN_BRANCH_PREDICTOR=y +# CONFIG_TEE is not set +# CONFIG_STATIC_SHM is not set +# end of Architecture Features + +# +# ARM errata workaround via the alternative framework +# +CONFIG_ARM64_ERRATUM_827319=y +CONFIG_ARM64_ERRATUM_824069=y +CONFIG_ARM64_ERRATUM_819472=y +CONFIG_ARM64_ERRATUM_843419=y +CONFIG_ARM64_ERRATUM_832075=y +CONFIG_ARM64_ERRATUM_834220=y +CONFIG_ARM_ERRATUM_858921=y +CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y +CONFIG_ARM64_ERRATUM_1286807=y +# end of ARM errata workaround via the alternative framework + +CONFIG_ARM64_HARDEN_BRANCH_PREDICTOR=y +# CONFIG_ALL_PLAT is not set +# CONFIG_QEMU is not set +# CONFIG_RCAR3 is not set +CONFIG_MPSOC=y +# CONFIG_NO_PLAT is not set +CONFIG_MPSOC_PLATFORM=y + +# +# Common Features +# +CONFIG_GRANT_TABLE=y +CONFIG_HAS_ALTERNATIVE=y +CONFIG_HAS_DEVICE_TREE=y +CONFIG_HAS_FAST_MULTIPLY=y +CONFIG_HAS_PDX=y +CONFIG_HAS_PMAP=y +# CONFIG_MEM_ACCESS is not set +CONFIG_STATIC_MEMORY=y + +# +# Speculative hardening +# +CONFIG_SPECULATIVE_HARDEN_ARRAY=y +# end of Speculative hardening + +# CONFIG_HYPFS is not set +CONFIG_IOREQ_SERVER=y +# CONFIG_EFI_SET_VIRTUAL_ADDRESS_MAP is not set +# CONFIG_XSM is not set +# CONFIG_ARGO is not set + +# +# Schedulers +# +# CONFIG_SCHED_CREDIT is not set +CONFIG_SCHED_CREDIT2=y +# CONFIG_SCHED_RTDS is not set +# CONFIG_SCHED_ARINC653 is not set +CONFIG_SCHED_NULL=y +CONFIG_SCHED_CREDIT2_DEFAULT=y +# CONFIG_SCHED_NULL_DEFAULT is not set +CONFIG_SCHED_DEFAULT="credit2" +# end of Schedulers + +CONFIG_BOOT_TIME_CPUPOOLS=y +# CONFIG_LIVEPATCH is not set +# CONFIG_ENFORCE_UNIQUE_SYMBOLS is not set +CONFIG_SUPPRESS_DUPLICATE_SYMBOL_WARNINGS=y +CONFIG_CMDLINE="" +CONFIG_DOM0_MEM="" +CONFIG_DTB_FILE="" +# CONFIG_TRACEBUFFER is not set +# end of Common Features + +# +# Device Drivers +# +# CONFIG_HAS_NS16550 is not set +CONFIG_HAS_CADENCE_UART=y +# CONFIG_HAS_IMX_LPUART is not set +# CONFIG_HAS_MVEBU is not set +# CONFIG_HAS_MESON is not set +CONFIG_HAS_PL011=y +# CONFIG_HAS_SCIF is not set +CONFIG_SERIAL_TX_BUFSIZE=16384 +CONFIG_HAS_PASSTHROUGH=y +CONFIG_ARM_SMMU=y +CONFIG_ARM_SMMU_V3=y +# CONFIG_IPMMU_VMSA is not set +CONFIG_IOMMU_FORCE_PT_SHARE=y +# end of Device Drivers + +CONFIG_EXPERT=y +CONFIG_UNSUPPORTED=y + +# +# Debugging Options +# +CONFIG_DEBUG=y +CONFIG_FRAME_POINTER=y +CONFIG_COVERAGE=y +CONFIG_DEBUG_LOCK_PROFILE=y +CONFIG_DEBUG_LOCKS=y +CONFIG_PERF_COUNTERS=y +CONFIG_PERF_ARRAYS=y +CONFIG_VERBOSE_DEBUG=y +CONFIG_DEVICE_TREE_DEBUG=y +CONFIG_SCRUB_DEBUG=y +CONFIG_DEBUG_TRACE=y +CONFIG_XMEM_POOL_POISON=y +CONFIG_DEBUG_INFO=y +# end of Debugging Options diff --git a/automation/eclair_analysis/xen_x86_config b/automation/eclair_analysis/xen_x86_config new file mode 100644 index 0000000000..d497814e01 --- /dev/null +++ b/automation/eclair_analysis/xen_x86_config @@ -0,0 +1,152 @@ +# File provided in +# Re: Xen MISRA C: Source files in scope and out of scope +# from: Stefano Stabellini +# date: 6 giu 2023, 02:53 + +# +# Automatically generated file; DO NOT EDIT. +# Xen/x86 4.18-unstable Configuration +# +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=90400 +CONFIG_CLANG_VERSION=0 +CONFIG_LD_IS_GNU=y +CONFIG_CC_HAS_VISIBILITY_ATTRIBUTE=y +CONFIG_X86_64=y +CONFIG_X86=y +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" +CONFIG_CC_HAS_INDIRECT_THUNK=y +CONFIG_HAS_AS_CET_SS=y +CONFIG_HAS_CC_CET_IBT=y + +CONFIG_REQUIRE_NX=n + +# +# Architecture Features +# +CONFIG_64BIT=y +CONFIG_NR_CPUS=16 +CONFIG_NR_NUMA_NODES=2 +# CONFIG_PV is not set +CONFIG_HVM=y +# CONFIG_XEN_SHSTK is not set +# CONFIG_XEN_IBT is not set +# CONFIG_SHADOW_PAGING is not set +# CONFIG_BIGMEM is not set +# CONFIG_HVM_FEP is not set +# CONFIG_TBOOT is not set +CONFIG_XEN_ALIGN_DEFAULT=y +# CONFIG_XEN_ALIGN_2M is not set +CONFIG_X2APIC_PHYSICAL=y +# CONFIG_XEN_GUEST is not set +# CONFIG_HYPERV_GUEST is not set +# CONFIG_MEM_PAGING is not set +# CONFIG_MEM_SHARING is not set +# end of Architecture Features + +# +# Common Features +# +CONFIG_COMPAT=y +CONFIG_CORE_PARKING=y +CONFIG_GRANT_TABLE=y +CONFIG_ALTERNATIVE_CALL=y +CONFIG_ARCH_MAP_DOMAIN_PAGE=y +CONFIG_GENERIC_BUG_FRAME=y +CONFIG_HAS_ALTERNATIVE=y +CONFIG_HAS_COMPAT=y +CONFIG_HAS_EX_TABLE=y +CONFIG_HAS_FAST_MULTIPLY=y +CONFIG_HAS_IOPORTS=y +CONFIG_HAS_KEXEC=y +CONFIG_HAS_PDX=y +CONFIG_HAS_SCHED_GRANULARITY=y +CONFIG_HAS_UBSAN=y +CONFIG_MEM_ACCESS_ALWAYS_ON=y +CONFIG_MEM_ACCESS=y +CONFIG_NEEDS_LIBELF=y +CONFIG_NUMA=y + +# +# Speculative hardening +# +CONFIG_INDIRECT_THUNK=y +CONFIG_SPECULATIVE_HARDEN_ARRAY=y +CONFIG_SPECULATIVE_HARDEN_BRANCH=y +# end of Speculative hardening + +# CONFIG_HYPFS is not set +CONFIG_IOREQ_SERVER=y +# CONFIG_KEXEC is not set +# CONFIG_EFI_SET_VIRTUAL_ADDRESS_MAP is not set +# CONFIG_XENOPROF is not set +# CONFIG_XSM is not set +# CONFIG_ARGO is not set + +# +# Schedulers +# +# CONFIG_SCHED_CREDIT is not set +CONFIG_SCHED_CREDIT2=y +# CONFIG_SCHED_RTDS is not set +# CONFIG_SCHED_ARINC653 is not set +CONFIG_SCHED_NULL=y +CONFIG_SCHED_CREDIT2_DEFAULT=y +# CONFIG_SCHED_NULL_DEFAULT is not set +CONFIG_SCHED_DEFAULT="credit2" +# end of Schedulers + +# CONFIG_LIVEPATCH is not set +# CONFIG_ENFORCE_UNIQUE_SYMBOLS is not set +# CONFIG_SUPPRESS_DUPLICATE_SYMBOL_WARNINGS is not set +CONFIG_CMDLINE="" +CONFIG_DOM0_MEM="" +# CONFIG_TRACEBUFFER is not set +# end of Common Features + +# +# Device Drivers +# +CONFIG_ACPI=y +CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y +CONFIG_ACPI_NUMA=y +CONFIG_HAS_NS16550=y +CONFIG_HAS_EHCI=y +CONFIG_SERIAL_TX_BUFSIZE=16384 +# CONFIG_XHCI is not set +CONFIG_HAS_CPUFREQ=y +CONFIG_HAS_PASSTHROUGH=y +CONFIG_AMD_IOMMU=y +# CONFIG_INTEL_IOMMU is not set +# CONFIG_IOMMU_QUARANTINE_NONE is not set +CONFIG_IOMMU_QUARANTINE_BASIC=y +# CONFIG_IOMMU_QUARANTINE_SCRATCH_PAGE is not set +CONFIG_HAS_PCI=y +CONFIG_HAS_PCI_MSI=y +CONFIG_VIDEO=y +CONFIG_VGA=y +CONFIG_HAS_VPCI=y +# end of Device Drivers + +CONFIG_EXPERT=y +CONFIG_UNSUPPORTED=y +CONFIG_ARCH_SUPPORTS_INT128=y + +# +# Debugging Options +# +CONFIG_DEBUG=y +# CONFIG_CRASH_DEBUG is not set +CONFIG_GDBSX=y +CONFIG_FRAME_POINTER=y +# CONFIG_COVERAGE is not set +# CONFIG_DEBUG_LOCK_PROFILE is not set +CONFIG_DEBUG_LOCKS=y +# CONFIG_PERF_COUNTERS is not set +CONFIG_VERBOSE_DEBUG=y +CONFIG_SCRUB_DEBUG=y +# CONFIG_UBSAN is not set +# CONFIG_DEBUG_TRACE is not set +CONFIG_XMEM_POOL_POISON=y +CONFIG_DEBUG_INFO=y +# end of Debugging Options -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:14:16 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:14:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572280.896208 (Exim 4.92) (envelope-from ) id 1qPzh1-0005TP-Or; Sun, 30 Jul 2023 06:14:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572280.896208; Sun, 30 Jul 2023 06: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 1qPzh1-0005TH-LX; Sun, 30 Jul 2023 06:14:15 +0000 Received: by outflank-mailman (input) for mailman id 572280; Sun, 30 Jul 2023 06:14:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzh0-0005T5-Gh for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:14:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzh0-0003kL-Ft for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:14:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzh0-0005Tr-FF for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=xFISd3Dv05jprs0RNpS7IAse0IcMTu5Pgf0K5Sb1hI0=; b=de+pj5uKY9umGHvNB+8ET1oZLo 6JunW9MWNFtf0Orfby9uHQYyfwTA/MXXDy0MhVRKwk6tZuQTixcSDrF5oprqu/LD7dzuRKCNbDmXW TdloXhUcYMpEhbrUkY9qVqWSN7wSw/OtgXpxDPDVq0hxOwM86y9VvzfhTncWCfHTM9qM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Add ECLAIR pipelines Message-Id: Date: Sun, 30 Jul 2023 06:14:14 +0000 commit 9336df4a3efad723c78db6896aa1f9e26ef07aaa Author: Simone Ballarin AuthorDate: Wed Jul 26 18:20:49 2023 +0200 Commit: Stefano Stabellini CommitDate: Wed Jul 26 15:11:55 2023 -0700 automation: Add ECLAIR pipelines Add two pipelines that analyze an ARM64 and a X86_64 build with the ECLAIR static analyzer on the guidelines contained in Set1. The analysis configuration is stored in automation/eclair_analysis. All commits on the xen-project/xen:staging branch will be analyzed and their artifacts will be stored indefinitely; the integration will report differential information with respect to the previous analysis. All commits on other branches or repositories will be analyzed and only the last ten artifacts will be kept; the integration will report differential information with respect to the analysis done on the common ancestor with xen-project/xen:staging (if available). Currently the pipeline variable ENABLE_ECLAIR_BOT is set to "n". Doing so disables the generation of comments with the analysis summary on the commit threads. The variable can be set to "y" if the a masked variable named ECLAIR_BOT_TOKEN is set with the impersonation token of an account with enough privileges to write on all repositories. Additionaly any repository should be able to read a masked variable named WTOKEN with the token provided by BUGSENG. The analysis fails if it contains violations of guidelines tagged as clean:added. The list of clean guidelines are maintained in automation/eclair_analysis/ECLAIR/tagging.ecl. Signed-off-by: Simone Ballarin Reviewed-by: Stefano Stabellini --- .gitlab-ci.yml | 2 ++ automation/gitlab-ci/analyze.yaml | 38 ++++++++++++++++++++++++++++++++++++++ automation/gitlab-ci/build.yaml | 1 + automation/scripts/eclair | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8bd7519d5..ee5430b8b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,9 @@ stages: + - analyze - build - test include: + - 'automation/gitlab-ci/analyze.yaml' - 'automation/gitlab-ci/build.yaml' - 'automation/gitlab-ci/test.yaml' diff --git a/automation/gitlab-ci/analyze.yaml b/automation/gitlab-ci/analyze.yaml new file mode 100644 index 0000000000..3d8166572b --- /dev/null +++ b/automation/gitlab-ci/analyze.yaml @@ -0,0 +1,38 @@ +.eclair-analysis: + stage: analyze + tags: + - eclair-analysis + variables: + ECLAIR_OUTPUT_DIR: "ECLAIR_out" + ANALYSIS_KIND: "normal" + ENABLE_ECLAIR_BOT: "n" + AUTO_PR_BRANCH: "staging" + AUTO_PR_REPOSITORY: "xen-project/xen" + artifacts: + when: always + paths: + - "${ECLAIR_OUTPUT_DIR}/*.log" + - "${ECLAIR_OUTPUT_DIR}/*.txt" + - '*.log' + reports: + codequality: gl-code-quality-report.json + +eclair-x86_64: + extends: .eclair-analysis + variables: + LOGFILE: "eclair-x86_64.log" + VARIANT: "X86_64" + RULESET: "Set1" + script: + - ./automation/scripts/eclair 2>&1 | tee "${LOGFILE}" + allow_failure: true + +eclair-ARM64: + extends: .eclair-analysis + variables: + LOGFILE: "eclair-ARM64.log" + VARIANT: "ARM64" + RULESET: "Set1" + script: + - ./automation/scripts/eclair 2>&1 | tee "${LOGFILE}" + allow_failure: true diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index c401f62d61..f01e2c32bb 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -11,6 +11,7 @@ - '*.log' - '*/*.log' when: always + needs: [] except: - master - smoke diff --git a/automation/scripts/eclair b/automation/scripts/eclair new file mode 100755 index 0000000000..813a56eb6a --- /dev/null +++ b/automation/scripts/eclair @@ -0,0 +1,34 @@ +#!/bin/sh -eu + +ECLAIR_ANALYSIS_DIR=automation/eclair_analysis +ECLAIR_DIR="${ECLAIR_ANALYSIS_DIR}/ECLAIR" +ECLAIR_OUTPUT_DIR=$(realpath "${ECLAIR_OUTPUT_DIR}") + +if [ -z "${WTOKEN:-}" ]; then + echo "Failure: the WTOKEN variable is not defined." >&2 + exit 1 +fi + +"${ECLAIR_ANALYSIS_DIR}/prepare.sh" "${VARIANT}" + +ex=0 +"${ECLAIR_DIR}/analyze.sh" "${VARIANT}" "${RULESET}" || ex=$? +"${ECLAIR_DIR}/action_log.sh" ANALYSIS_LOG \ + "ECLAIR analysis log" \ + "${ECLAIR_OUTPUT_DIR}/ANALYSIS.log" \ + "${ex}" +"${ECLAIR_DIR}/action_log.sh" REPORT_LOG \ + "ECLAIR report log" \ + "${ECLAIR_OUTPUT_DIR}/REPORT.log" \ + "${ex}" +[ "${ex}" = 0 ] || exit "${ex}" + +# Fail in case of new reports +"${ECLAIR_DIR}/action_clean_added.sh" "${ECLAIR_OUTPUT_DIR}" || ex=$? +"${ECLAIR_DIR}/action_log.sh" DIFF_CHECK_LOG \ + "ECLAIR diff check" \ + "${ECLAIR_OUTPUT_DIR}/clean_added.log" \ + "${ex}" + +"${ECLAIR_DIR}/action_push.sh" "${WTOKEN}" "${ECLAIR_OUTPUT_DIR}" +[ "${ex}" = 0 ] || exit "${ex}" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:14:25 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:14:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572281.896212 (Exim 4.92) (envelope-from ) id 1qPzhB-0005Wk-Ry; Sun, 30 Jul 2023 06:14:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572281.896212; Sun, 30 Jul 2023 06:14: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 1qPzhB-0005Wc-Oy; Sun, 30 Jul 2023 06:14:25 +0000 Received: by outflank-mailman (input) for mailman id 572281; Sun, 30 Jul 2023 06:14:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzhA-0005WR-JY for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:14:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzhA-0003kS-It for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:14:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzhA-0005UM-I9 for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=eAYjeys7IIYnlFmdHNbw/Op0Q//Aql1rKio4SO1Z2Bo=; b=H+/sfJL8t1yYNhEYwUeGw8R3Vd Ed33Nz/v4/mVgrPObSnaRjt69/1VoOb9xNeoGLyt6qN6/o2xtnvUpJRi+SnsEJ4Yfhw88R7XKygxi FpuI5KRaUVEMfffLcjS8PvE+Mu2Vs7iahOds6kEgqCeJT0cRV9deHeeT8kvea3KyfPMI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] maintainers: Add ECLAIR reviewer Message-Id: Date: Sun, 30 Jul 2023 06:14:24 +0000 commit f126d7eeba33a1de04f6d9f6f64855637d4eadb9 Author: Simone Ballarin AuthorDate: Wed Jul 26 18:20:50 2023 +0200 Commit: Stefano Stabellini CommitDate: Wed Jul 26 15:12:01 2023 -0700 maintainers: Add ECLAIR reviewer Signed-off-by: Simone Ballarin Acked-by: Stefano Stabellini --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 180e57dac4..d8a02a6c19 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -305,6 +305,12 @@ F: xen/include/xen/libfdt/ F: xen/include/xen/device_tree.h F: xen/drivers/passthrough/device_tree.c +ECLAIR +R: Simone Ballarin +S: Supported +F: automation/eclair_analysis/ +F: automation/scripts/eclair + EFI M: Jan Beulich S: Supported -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:14:35 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:14:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572282.896216 (Exim 4.92) (envelope-from ) id 1qPzhL-0005Zp-Sw; Sun, 30 Jul 2023 06:14:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572282.896216; Sun, 30 Jul 2023 06:14: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 1qPzhL-0005Zh-QM; Sun, 30 Jul 2023 06:14:35 +0000 Received: by outflank-mailman (input) for mailman id 572282; Sun, 30 Jul 2023 06:14:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzhK-0005ZY-MS for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:14:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzhK-0003kc-Ln for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:14:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzhK-0005Up-L7 for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=yYKWizrtQeBANO2r7e8dbXM40LJQO+/c0zbo0TcN2X0=; b=l3Iw//C5fLyzDJYBj/c8fyMwBT moB4NNuOIhLJga/Yd+pLirDddPpHcCEu14wgJAS+3S2RMuyzRIn1zdCbfA1KdbfeOExF/xxG6617t Dov4PghMNhBFfhaFDmgDHGtivwQ8U0hKvZ6gq89Xq0Vp6PI8fKLUuLAti9sitI0NegKc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/console: Add escape argument to configure escape character Message-Id: Date: Sun, 30 Jul 2023 06:14:34 +0000 commit 01e0e70c9a6d61d404082994d4d5b9828392e5e3 Author: Peter Hoyes AuthorDate: Thu Jul 27 09:47:33 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jul 27 09:47:33 2023 +0200 tools/console: Add escape argument to configure escape character Dom0 may be accessed via telnet, meaning the default escape character (which is the same as telnet's) cannot be directly used to exit the console. It would be helpful to make the escape character customizable in such use cases. Add --escape argument to console tool for this purpose. Add argument to getopt options, parse and validate the escape character and pass value to console_loop. If --escape is not specified, it falls back to the existing behavior using DEFAULT_ESCAPE_SEQUENCE. Signed-off-by: Peter Hoyes Reviewed-by: Anthony PERARD Reviewed-by: Hongda Deng --- tools/console/client/main.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/tools/console/client/main.c b/tools/console/client/main.c index 6775006488..d2dcc3ddca 100644 --- a/tools/console/client/main.c +++ b/tools/console/client/main.c @@ -42,7 +42,7 @@ #include #include "xenctrl.h" -#define ESCAPE_CHARACTER 0x1d +#define DEFAULT_ESCAPE_CHARACTER 0x1d static volatile sig_atomic_t received_signal = 0; static char lockfile[sizeof (XEN_LOCK_DIR "/xenconsole.") + 8] = { 0 }; @@ -77,6 +77,7 @@ static void usage(const char *program) { " -n, --num N use console number N\n" " --type TYPE console type. must be 'pv', 'serial' or 'vuart'\n" " --start-notify-fd N file descriptor used to notify parent\n" + " --escape E escape sequence to exit console\n" , program); } @@ -174,7 +175,7 @@ static void restore_term(int fd, struct termios *old) } static int console_loop(int fd, struct xs_handle *xs, char *pty_path, - bool interactive) + bool interactive, char escape_character) { int ret, xs_fd = xs_fileno(xs), max_fd = -1; @@ -215,7 +216,7 @@ static int console_loop(int fd, struct xs_handle *xs, char *pty_path, char msg[60]; len = read(STDIN_FILENO, msg, sizeof(msg)); - if (len == 1 && msg[0] == ESCAPE_CHARACTER) { + if (len == 1 && msg[0] == escape_character) { return 0; } @@ -335,6 +336,7 @@ int main(int argc, char **argv) { "help", 0, 0, 'h' }, { "start-notify-fd", 1, 0, 's' }, { "interactive", 0, 0, 'i' }, + { "escape", 1, 0, 'e' }, { 0 }, }; @@ -345,6 +347,7 @@ int main(int argc, char **argv) console_type type = CONSOLE_INVAL; bool interactive = 0; const char *console_names = "serial, pv, vuart"; + char escape_character = DEFAULT_ESCAPE_CHARACTER; while((ch = getopt_long(argc, argv, sopt, lopt, &opt_ind)) != -1) { switch(ch) { @@ -375,6 +378,16 @@ int main(int argc, char **argv) case 'i': interactive = 1; break; + case 'e': + if (optarg[0] == '^' && optarg[1] && optarg[2] == '\0') + escape_character = optarg[1] & 0x1f; + else if (optarg[0] && optarg[1] == '\0') + escape_character = optarg[0]; + else { + fprintf(stderr, "Invalid escape argument\n"); + exit(EINVAL); + } + break; default: fprintf(stderr, "Invalid argument\n"); fprintf(stderr, "Try `%s --help' for more information.\n", @@ -493,7 +506,7 @@ int main(int argc, char **argv) close(start_notify_fd); } - console_loop(spty, xs, path, interactive); + console_loop(spty, xs, path, interactive, escape_character); free(path); free(dom_path); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:14:47 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:14:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572283.896219 (Exim 4.92) (envelope-from ) id 1qPzhW-0005cX-UY; Sun, 30 Jul 2023 06:14:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572283.896219; Sun, 30 Jul 2023 06: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 1qPzhW-0005cQ-Ru; Sun, 30 Jul 2023 06:14:46 +0000 Received: by outflank-mailman (input) for mailman id 572283; Sun, 30 Jul 2023 06:14:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzhU-0005cB-Pp for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:14:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzhU-0003l4-Ox for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:14:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzhU-0005VJ-OB for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=ZNc95n4nykURN5k3R094GAL0xP0JkIXeYXxSdImSH2k=; b=23I+iFe44O9iGgX3PjzkyanKYM 0J3gbSfgs0SVKTQv9KRZPF8A60/AURGaJaTtzRLQsHv3xFN/g1hmXAkvWu0Pzx8H/uQus9oSu8ZXo BQ1k+2Xf6InAfcBY1itkXvbFVQ+Ef4eiO+HONFlZDmM1OQ6sofClX0Kt1ShR1X0K91zE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ppc: Implement early serial printk on pseries Message-Id: Date: Sun, 30 Jul 2023 06:14:44 +0000 commit 58bba23a2864bf0213d90d4c03ae23d6eb0575dd Author: Shawn Anastasio AuthorDate: Fri Jul 21 12:02:54 2023 -0500 Commit: Jan Beulich CommitDate: Thu Jul 27 09:48:00 2023 +0200 xen/ppc: Implement early serial printk on pseries On typical Power VMs (e.g. QEMU's -M pseries), a variety of services including an early serial console are provided by Open Firmware. Implement the required interfaces to call into Open Firmware and write to the serial console. Since Open Firmware runs in 32-bit Big Endian mode and Xen runs in 64-bit Little Endian mode, a thunk is required to save/restore any potentially-clobbered registers as well as to perform the required endianness switch. Thankfully, linux already has such a routine, which was imported into ppc64/of-call.S. Support for bare metal (PowerNV) will be implemented in a future patch. Signed-off-by: Shawn Anastasio Acked-by: Jan Beulich --- xen/arch/ppc/Kconfig.debug | 5 ++ xen/arch/ppc/Makefile | 2 + xen/arch/ppc/boot-of.c | 113 ++++++++++++++++++++++++++ xen/arch/ppc/configs/ppc64_defconfig | 1 + xen/arch/ppc/early_printk.c | 28 +++++++ xen/arch/ppc/include/asm/asm-defns.h | 16 ++++ xen/arch/ppc/include/asm/boot.h | 23 ++++++ xen/arch/ppc/include/asm/byteorder.h | 12 +++ xen/arch/ppc/include/asm/config.h | 3 + xen/arch/ppc/include/asm/early_printk.h | 15 ++++ xen/arch/ppc/include/asm/msr.h | 51 ++++++++++++ xen/arch/ppc/include/asm/processor.h | 138 ++++++++++++++++++++++++++++++++ xen/arch/ppc/include/asm/types.h | 21 +++++ xen/arch/ppc/ppc64/Makefile | 1 + xen/arch/ppc/ppc64/asm-offsets.c | 58 ++++++++++++++ xen/arch/ppc/ppc64/head.S | 9 +++ xen/arch/ppc/ppc64/of-call.S | 83 +++++++++++++++++++ xen/arch/ppc/setup.c | 19 ++++- 18 files changed, 595 insertions(+), 3 deletions(-) diff --git a/xen/arch/ppc/Kconfig.debug b/xen/arch/ppc/Kconfig.debug index e69de29bb2..608c9ff832 100644 --- a/xen/arch/ppc/Kconfig.debug +++ b/xen/arch/ppc/Kconfig.debug @@ -0,0 +1,5 @@ +config EARLY_PRINTK + bool "Enable early printk" + default DEBUG + help + Enables early printk debug messages diff --git a/xen/arch/ppc/Makefile b/xen/arch/ppc/Makefile index 530fba2121..098a4dd0a9 100644 --- a/xen/arch/ppc/Makefile +++ b/xen/arch/ppc/Makefile @@ -1,5 +1,7 @@ obj-$(CONFIG_PPC64) += ppc64/ +obj-y += boot-of.init.o +obj-$(CONFIG_EARLY_PRINTK) += early_printk.init.o obj-y += setup.o $(TARGET): $(TARGET)-syms diff --git a/xen/arch/ppc/boot-of.c b/xen/arch/ppc/boot-of.c new file mode 100644 index 0000000000..d6755ccc8e --- /dev/null +++ b/xen/arch/ppc/boot-of.c @@ -0,0 +1,113 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * This file was derived from Xen 3.2's xen/arch/powerpc/boot_of.c, + * originally licensed under GPL version 2 or later. + * + * Copyright IBM Corp. 2005, 2006, 2007 + * Copyright Raptor Engineering, LLC + * + * Authors: Jimi Xenidis + * Hollis Blanchard + * Shawn Anastasio + */ + +#include +#include +#include +#include +#include +#include +#include + +/* + * The Open Firmware client interface is called in 32-bit mode with the MMU off, + * so any addresses passed to it must be physical addresses under 4GB. + * + * Since the client interface is only used during early boot before the MMU is on + * and Xen itself was loaded by Open Firmware (and therefore resides below 4GB), + * we can achieve the desired result with a simple cast to uint32_t. + */ +#define ADDR(x) ((uint32_t)(unsigned long)(x)) + +/* OF entrypoint*/ +static unsigned long __initdata of_vec; + +static int __initdata of_out; + +static int __init of_call(const char *service, uint32_t nargs, uint32_t nrets, + int32_t rets[], ...) +{ + int rc; + va_list args; + unsigned int i; + struct of_service s; + + s.ofs_service = cpu_to_be32(ADDR(service)); + s.ofs_nargs = cpu_to_be32(nargs); + s.ofs_nrets = cpu_to_be32(nrets); + + /* Copy all the params into the args array */ + va_start(args, rets); + + for ( i = 0; i < nargs; i++ ) + s.ofs_args[i] = cpu_to_be32(va_arg(args, uint32_t)); + + va_end(args); + + rc = enter_of(&s, of_vec); + + /* Copy all return values to the output rets array */ + for ( i = 0; i < nrets; i++ ) + rets[i] = be32_to_cpu(s.ofs_args[i + nargs]); + + return rc; +} + +static int __init of_finddevice(const char *devspec) +{ + int32_t rets[1] = { OF_FAILURE }; + + of_call("finddevice", 1, ARRAY_SIZE(rets), rets, ADDR(devspec)); + return rets[0]; +} + +static int __init of_getprop(int ph, const char *name, void *buf, uint32_t buflen) +{ + int32_t rets[1] = { OF_FAILURE }; + + of_call("getprop", 4, ARRAY_SIZE(rets), rets, ph, ADDR(name), ADDR(buf), + buflen); + return rets[0]; +} + +int __init of_write(int ih, const char *addr, uint32_t len) +{ + int32_t rets[1] = { OF_FAILURE }; + + of_call("write", 3, ARRAY_SIZE(rets), rets, ih, ADDR(addr), len); + return rets[0]; +} + +static void __init of_putchar(char c) +{ + if ( c == '\n' ) + { + char buf = '\r'; + of_write(of_out, &buf, 1); + } + of_write(of_out, &c, 1); +} + +void __init boot_of_init(unsigned long vec) +{ + int bof_chosen; + + of_vec = vec; + + /* Get a handle to the default console */ + bof_chosen = of_finddevice("/chosen"); + of_getprop(bof_chosen, "stdout", &of_out, sizeof(of_out)); + of_out = be32_to_cpu(of_out); + + early_printk_init(of_putchar); +} diff --git a/xen/arch/ppc/configs/ppc64_defconfig b/xen/arch/ppc/configs/ppc64_defconfig index 8783eb3488..f7cc075e45 100644 --- a/xen/arch/ppc/configs/ppc64_defconfig +++ b/xen/arch/ppc/configs/ppc64_defconfig @@ -10,4 +10,5 @@ CONFIG_PPC64=y CONFIG_DEBUG=y CONFIG_DEBUG_INFO=y +CONFIG_EARLY_PRINTK=y CONFIG_EXPERT=y diff --git a/xen/arch/ppc/early_printk.c b/xen/arch/ppc/early_printk.c new file mode 100644 index 0000000000..781f82133e --- /dev/null +++ b/xen/arch/ppc/early_printk.c @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#include +#include + +static void __initdata (*putchar_func)(char); + +void __init early_printk_init(void (*putchar)(char)) +{ + putchar_func = putchar; +} + +void __init early_puts(const char *s, size_t nr) +{ + if ( !putchar_func ) + return; + + while ( nr-- > 0 ) + putchar_func(*s++); +} + +void __init early_printk(const char *s) +{ + if ( !putchar_func ) + return; + + while ( *s ) + putchar_func(*s++); +} diff --git a/xen/arch/ppc/include/asm/asm-defns.h b/xen/arch/ppc/include/asm/asm-defns.h index 6ea35f6edb..35b1c89d4e 100644 --- a/xen/arch/ppc/include/asm/asm-defns.h +++ b/xen/arch/ppc/include/asm/asm-defns.h @@ -37,4 +37,20 @@ .long 0xa6037b7d; /* mtsrr1 r11 */ \ .long 0x2400004c /* rfid */ +/* Taken from Linux kernel source (arch/powerpc/boot/crt0.S) */ +.macro OP_REGS op, width, start, end, base, offset + .Lreg=\start + .rept (\end - \start + 1) + \op .Lreg,\offset+\width*.Lreg(\base) + .Lreg=.Lreg+1 + .endr +.endm + +#define SAVE_GPRS(start, end, base) OP_REGS std, 8, start, end, base, 0 +#define REST_GPRS(start, end, base) OP_REGS ld, 8, start, end, base, 0 +#define SAVE_GPR(n, base) SAVE_GPRS(n, n, base) +#define REST_GPR(n, base) REST_GPRS(n, n, base) +#define SAVE_NVGPRS(base) SAVE_GPRS(14, 31, base) +#define REST_NVGPRS(base) REST_GPRS(14, 31, base) + #endif /* _ASM_PPC_ASM_DEFNS_H */ diff --git a/xen/arch/ppc/include/asm/boot.h b/xen/arch/ppc/include/asm/boot.h new file mode 100644 index 0000000000..9b8a7c43c2 --- /dev/null +++ b/xen/arch/ppc/include/asm/boot.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _ASM_PPC_BOOT_H +#define _ASM_PPC_BOOT_H + +#include + +/* a collection of interfaces used during boot. */ +enum { + OF_FAILURE = -1, + OF_SUCCESS = 0, +}; + +struct of_service { + __be32 ofs_service; + __be32 ofs_nargs; + __be32 ofs_nrets; + __be32 ofs_args[10]; +}; + +int enter_of(struct of_service *args, unsigned long entry); +void boot_of_init(unsigned long vec); + +#endif /* _ASM_PPC_BOOT_H */ diff --git a/xen/arch/ppc/include/asm/byteorder.h b/xen/arch/ppc/include/asm/byteorder.h new file mode 100644 index 0000000000..2b5f6b9f63 --- /dev/null +++ b/xen/arch/ppc/include/asm/byteorder.h @@ -0,0 +1,12 @@ +#ifndef _ASM_PPC_BYTEORDER_H +#define _ASM_PPC_BYTEORDER_H + +#define __arch__swab16 __builtin_bswap16 +#define __arch__swab32 __builtin_bswap32 +#define __arch__swab64 __builtin_bswap64 + +#define __BYTEORDER_HAS_U64__ + +#include + +#endif /* _ASM_PPC_BYTEORDER_H */ diff --git a/xen/arch/ppc/include/asm/config.h b/xen/arch/ppc/include/asm/config.h index 01ca5d0803..cb27d2781e 100644 --- a/xen/arch/ppc/include/asm/config.h +++ b/xen/arch/ppc/include/asm/config.h @@ -52,6 +52,9 @@ /* size of minimum stack frame; C code can write into the caller's stack */ #define STACK_FRAME_OVERHEAD 32 +/* ELFv2 ABI mandates 16 byte alignment */ +#define STACK_ALIGN 16 + #endif /* __PPC_CONFIG_H__ */ /* * Local variables: diff --git a/xen/arch/ppc/include/asm/early_printk.h b/xen/arch/ppc/include/asm/early_printk.h new file mode 100644 index 0000000000..d1d8b416f4 --- /dev/null +++ b/xen/arch/ppc/include/asm/early_printk.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _ASM_PPC_EARLY_PRINTK_H +#define _ASM_PPC_EARLY_PRINTK_H + +#include + +#ifdef CONFIG_EARLY_PRINTK +void early_printk_init(void (*putchar)(char)); +void early_printk(const char *s); +#else +static inline void early_printk_init(void (*putchar)(char)) {} +static inline void early_printk(const char *s) {} +#endif + +#endif /* _ASM_PPC_EARLY_PRINTK_H */ diff --git a/xen/arch/ppc/include/asm/msr.h b/xen/arch/ppc/include/asm/msr.h new file mode 100644 index 0000000000..144511e5c3 --- /dev/null +++ b/xen/arch/ppc/include/asm/msr.h @@ -0,0 +1,51 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) IBM Corp. 2005 + * Copyright Raptor Engineering, LLC + * + * Authors: Jimi Xenidis + * Shawn Anastasio + */ + +#ifndef _ASM_PPC_MSR_H +#define _ASM_PPC_MSR_H + +#include + +/* Flags in MSR: */ +#define MSR_SF _AC(0x8000000000000000, ULL) +#define MSR_TA _AC(0x4000000000000000, ULL) +#define MSR_ISF _AC(0x2000000000000000, ULL) +#define MSR_HV _AC(0x1000000000000000, ULL) +#define MSR_VMX _AC(0x0000000002000000, ULL) +#define MSR_MER _AC(0x0000000000200000, ULL) +#define MSR_POW _AC(0x0000000000040000, ULL) +#define MSR_ILE _AC(0x0000000000010000, ULL) +#define MSR_EE _AC(0x0000000000008000, ULL) +#define MSR_PR _AC(0x0000000000004000, ULL) +#define MSR_FP _AC(0x0000000000002000, ULL) +#define MSR_ME _AC(0x0000000000001000, ULL) +#define MSR_FE0 _AC(0x0000000000000800, ULL) +#define MSR_SE _AC(0x0000000000000400, ULL) +#define MSR_BE _AC(0x0000000000000200, ULL) +#define MSR_FE1 _AC(0x0000000000000100, ULL) +#define MSR_IP _AC(0x0000000000000040, ULL) +#define MSR_IR _AC(0x0000000000000020, ULL) +#define MSR_DR _AC(0x0000000000000010, ULL) +#define MSR_PMM _AC(0x0000000000000004, ULL) +#define MSR_RI _AC(0x0000000000000002, ULL) +#define MSR_LE _AC(0x0000000000000001, ULL) + +/* MSR bits set on the systemsim simulator */ +#define MSR_SIM _AC(0x0000000020000000, ULL) +#define MSR_SYSTEMSIM _AC(0x0000000010000000, ULL) + +/* On a trap, srr1's copy of msr defines some bits as follows: */ +#define MSR_TRAP_FE _AC(0x0000000000100000, ULL) /* Floating Point Exception */ +#define MSR_TRAP_IOP _AC(0x0000000000080000, ULL) /* Illegal Instruction */ +#define MSR_TRAP_PRIV _AC(0x0000000000040000, ULL) /* Privileged Instruction */ +#define MSR_TRAP _AC(0x0000000000020000, ULL) /* Trap Instruction */ +#define MSR_TRAP_NEXT _AC(0x0000000000010000, ULL) /* PC is next instruction */ +#define MSR_TRAP_BITS (MSR_TRAP_FE|MSR_TRAP_IOP|MSR_TRAP_PRIV|MSR_TRAP) + +#endif /* _ASM_PPC_MSR_H */ diff --git a/xen/arch/ppc/include/asm/processor.h b/xen/arch/ppc/include/asm/processor.h new file mode 100644 index 0000000000..838d279508 --- /dev/null +++ b/xen/arch/ppc/include/asm/processor.h @@ -0,0 +1,138 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright IBM Corp. 2005, 2006, 2007 + * Copyright Raptor Engineering, LLC + * + * Authors: Hollis Blanchard + * Christian Ehrhardt + * Timothy Pearson + * Shawn Anastasio + */ + +#ifndef _ASM_PPC_PROCESSOR_H +#define _ASM_PPC_PROCESSOR_H + +#define IOBMP_BYTES 8192 +#define IOBMP_INVALID_OFFSET 0x8000 + +/* Processor Version Register (PVR) field extraction */ + +#define PVR_VER(pvr) (((pvr) >> 16) & 0xFFFF) /* Version field */ +#define PVR_REV(pvr) (((pvr) >> 0) & 0xFFFF) /* Revison field */ + +#define __is_processor(pv) (PVR_VER(mfspr(SPRN_PVR)) == (pv)) + +/* + * IBM has further subdivided the standard PowerPC 16-bit version and + * revision subfields of the PVR for the PowerPC 403s into the following: + */ + +#define PVR_FAM(pvr) (((pvr) >> 20) & 0xFFF) /* Family field */ +#define PVR_MEM(pvr) (((pvr) >> 16) & 0xF) /* Member field */ +#define PVR_CORE(pvr) (((pvr) >> 12) & 0xF) /* Core field */ +#define PVR_CFG(pvr) (((pvr) >> 8) & 0xF) /* Configuration field */ +#define PVR_MAJ(pvr) (((pvr) >> 4) & 0xF) /* Major revision field */ +#define PVR_MIN(pvr) (((pvr) >> 0) & 0xF) /* Minor revision field */ + +/* Processor Version Numbers */ + +#define PVR_403GA 0x00200000 +#define PVR_403GB 0x00200100 +#define PVR_403GC 0x00200200 +#define PVR_403GCX 0x00201400 +#define PVR_405GP 0x40110000 +#define PVR_STB03XXX 0x40310000 +#define PVR_NP405H 0x41410000 +#define PVR_NP405L 0x41610000 +#define PVR_601 0x00010000 +#define PVR_602 0x00050000 +#define PVR_603 0x00030000 +#define PVR_603e 0x00060000 +#define PVR_603ev 0x00070000 +#define PVR_603r 0x00071000 +#define PVR_604 0x00040000 +#define PVR_604e 0x00090000 +#define PVR_604r 0x000A0000 +#define PVR_620 0x00140000 +#define PVR_740 0x00080000 +#define PVR_750 PVR_740 +#define PVR_740P 0x10080000 +#define PVR_750P PVR_740P +#define PVR_7400 0x000C0000 +#define PVR_7410 0x800C0000 +#define PVR_7450 0x80000000 +#define PVR_8540 0x80200000 +#define PVR_8560 0x80200000 +/* + * For the 8xx processors, all of them report the same PVR family for + * the PowerPC core. The various versions of these processors must be + * differentiated by the version number in the Communication Processor + * Module (CPM). + */ +#define PVR_821 0x00500000 +#define PVR_823 PVR_821 +#define PVR_850 PVR_821 +#define PVR_860 PVR_821 +#define PVR_8240 0x00810100 +#define PVR_8245 0x80811014 +#define PVR_8260 PVR_8240 + +/* 64-bit processors */ +#define PVR_NORTHSTAR 0x0033 +#define PVR_PULSAR 0x0034 +#define PVR_POWER4 0x0035 +#define PVR_ICESTAR 0x0036 +#define PVR_SSTAR 0x0037 +#define PVR_POWER4p 0x0038 +#define PVR_970 0x0039 +#define PVR_POWER5 0x003A +#define PVR_POWER5p 0x003B +#define PVR_970FX 0x003C +#define PVR_POWER6 0x003E +#define PVR_POWER7 0x003F +#define PVR_630 0x0040 +#define PVR_630p 0x0041 +#define PVR_970MP 0x0044 +#define PVR_970GX 0x0045 +#define PVR_POWER7p 0x004A +#define PVR_POWER8E 0x004B +#define PVR_POWER8NVL 0x004C +#define PVR_POWER8 0x004D +#define PVR_POWER9 0x004E +#define PVR_POWER10 0x0080 +#define PVR_BE 0x0070 +#define PVR_PA6T 0x0090 + +#ifndef __ASSEMBLY__ + +#include + +/* Macro to adjust thread priority for hardware multithreading */ +#define HMT_very_low() asm volatile ( "or %r31, %r31, %r31" ) + +/* + * User-accessible registers: most of these need to be saved/restored + * for every nested Xen invocation. + */ +struct cpu_user_regs +{ + uint64_t gprs[32]; + uint64_t lr; + uint64_t ctr; + uint64_t srr0; + uint64_t srr1; + uint64_t pc; + uint64_t msr; + uint64_t fpscr; + uint64_t xer; + uint64_t hid4; /* debug only */ + uint64_t dar; /* debug only */ + uint32_t dsisr; /* debug only */ + uint32_t cr; + uint32_t __pad; /* good spot for another 32bit reg */ + uint32_t entry_vector; +}; + +#endif + +#endif /* _ASM_PPC_PROCESSOR_H */ diff --git a/xen/arch/ppc/include/asm/types.h b/xen/arch/ppc/include/asm/types.h new file mode 100644 index 0000000000..cee08e111a --- /dev/null +++ b/xen/arch/ppc/include/asm/types.h @@ -0,0 +1,21 @@ +/* from xen/arch/x86/include/asm/types.h */ + +#ifndef _ASM_PPC_TYPES_H +#define _ASM_PPC_TYPES_H + +typedef signed char s8; +typedef unsigned char u8; + +typedef signed short s16; +typedef unsigned short u16; + +typedef signed int s32; +typedef unsigned int u32; + +typedef signed long s64; +typedef unsigned long u64; +typedef unsigned long paddr_t; +#define INVALID_PADDR (~0UL) +#define PRIpaddr "016lx" + +#endif /* _ASM_PPC_TYPES_H */ diff --git a/xen/arch/ppc/ppc64/Makefile b/xen/arch/ppc/ppc64/Makefile index 3340058c08..f4956daaa9 100644 --- a/xen/arch/ppc/ppc64/Makefile +++ b/xen/arch/ppc/ppc64/Makefile @@ -1 +1,2 @@ obj-y += head.o +obj-y += of-call.o diff --git a/xen/arch/ppc/ppc64/asm-offsets.c b/xen/arch/ppc/ppc64/asm-offsets.c index e69de29bb2..e1129cb0f4 100644 --- a/xen/arch/ppc/ppc64/asm-offsets.c +++ b/xen/arch/ppc/ppc64/asm-offsets.c @@ -0,0 +1,58 @@ +/* + * Generate definitions needed by assembly language modules. + * This code generates raw asm output which is post-processed + * to extract and format the required data. + */ + +#include +#include + +#define DEFINE(_sym, _val) \ + asm volatile ( "\n.ascii\"==>#define " #_sym " %0 /* " #_val " */<==\"" \ + : : "i" (_val) ) +#define BLANK() \ + asm volatile ( "\n.ascii\"==><==\"" : : ) +#define OFFSET(_sym, _str, _mem) \ + DEFINE(_sym, offsetof(_str, _mem)); + +/* base-2 logarithm */ +#define __L2(_x) (((_x) & 0x00000002) ? 1 : 0) +#define __L4(_x) (((_x) & 0x0000000c) ? ( 2 + __L2( (_x)>> 2)) : __L2( _x)) +#define __L8(_x) (((_x) & 0x000000f0) ? ( 4 + __L4( (_x)>> 4)) : __L4( _x)) +#define __L16(_x) (((_x) & 0x0000ff00) ? ( 8 + __L8( (_x)>> 8)) : __L8( _x)) +#define LOG_2(_x) (((_x) & 0xffff0000) ? (16 + __L16((_x)>>16)) : __L16(_x)) + +void __dummy__(void) +{ + BUILD_BUG_ON(!IS_ALIGNED(sizeof(struct cpu_user_regs), STACK_ALIGN)); + + DEFINE(GPR_WIDTH, sizeof(unsigned long)); + DEFINE(FPR_WIDTH, sizeof(double)); + + OFFSET(UREGS_gprs, struct cpu_user_regs, gprs); + OFFSET(UREGS_r0, struct cpu_user_regs, gprs[0]); + OFFSET(UREGS_r1, struct cpu_user_regs, gprs[1]); + OFFSET(UREGS_r13, struct cpu_user_regs, gprs[13]); + OFFSET(UREGS_srr0, struct cpu_user_regs, srr0); + OFFSET(UREGS_srr1, struct cpu_user_regs, srr1); + OFFSET(UREGS_pc, struct cpu_user_regs, pc); + OFFSET(UREGS_msr, struct cpu_user_regs, msr); + OFFSET(UREGS_lr, struct cpu_user_regs, lr); + OFFSET(UREGS_ctr, struct cpu_user_regs, ctr); + OFFSET(UREGS_xer, struct cpu_user_regs, xer); + OFFSET(UREGS_hid4, struct cpu_user_regs, hid4); + OFFSET(UREGS_dar, struct cpu_user_regs, dar); + OFFSET(UREGS_dsisr, struct cpu_user_regs, dsisr); + OFFSET(UREGS_cr, struct cpu_user_regs, cr); + OFFSET(UREGS_fpscr, struct cpu_user_regs, fpscr); + DEFINE(UREGS_sizeof, sizeof(struct cpu_user_regs)); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/ppc/ppc64/head.S b/xen/arch/ppc/ppc64/head.S index 49b3066396..02ff520458 100644 --- a/xen/arch/ppc/ppc64/head.S +++ b/xen/arch/ppc/ppc64/head.S @@ -18,6 +18,15 @@ ENTRY(start) li %r11, 0 stdu %r11, -STACK_FRAME_OVERHEAD(%r1) + /* clear .bss */ + LOAD_IMM32(%r14, __bss_start) + LOAD_IMM32(%r15, __bss_end) +1: + std %r11, 0(%r14) + addi %r14, %r14, 8 + cmpld %r14, %r15 + blt 1b + /* call the C entrypoint */ bl start_xen diff --git a/xen/arch/ppc/ppc64/of-call.S b/xen/arch/ppc/ppc64/of-call.S new file mode 100644 index 0000000000..2a2e308f6b --- /dev/null +++ b/xen/arch/ppc/ppc64/of-call.S @@ -0,0 +1,83 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Adapted from Linux's arch/powerpc/kernel/entry_64.S, with the + * following copyright notice: + * + * PowerPC version + * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) + * Rewritten by Cort Dougan (cort@cs.nmt.edu) for PReP + * Copyright (C) 1996 Cort Dougan + * Adapted for Power Macintosh by Paul Mackerras. + * Low-level exception handlers and MMU support + * rewritten by Paul Mackerras. + * Copyright (C) 1996 Paul Mackerras. + * MPC8xx modifications Copyright (C) 1997 Dan Malek (dmalek@jlc.net). + */ + +#include +#include +#include + +/* size of minimum stack frame that can hold an entire cpu_user_regs struct */ +#define STACK_SWITCH_FRAME_SIZE UREGS_sizeof + + .section .init.text, "ax", @progbits + +ENTRY(enter_of) + mflr %r0 + std %r0, 16(%r1) + stdu %r1, -STACK_SWITCH_FRAME_SIZE(%r1) /* Save SP and create stack space */ + + /* + * Because PROM is running in 32b mode, it clobbers the high order half + * of all registers that it saves. We therefore save those registers + * PROM might touch to the stack. (%r0, %r3-%r13 are caller saved) + */ + SAVE_GPR(2, %r1) + SAVE_GPR(13, %r1) + SAVE_NVGPRS(%r1) + mfcr %r10 + mfmsr %r11 + std %r10, UREGS_cr(%r1) + std %r11, UREGS_msr(%r1) + + /* Put PROM address in SRR0 */ + mtsrr0 %r4 + + /* Setup our trampoline return addr in LR */ + bcl 20, 31, .+4 +0: mflr %r4 + addi %r4, %r4, 1f - 0b + mtlr %r4 + + /* Prepare a 32-bit mode big endian MSR */ + LOAD_IMM64(%r12, MSR_SF | MSR_LE) + andc %r11, %r11, %r12 + mtsrr1 %r11 + rfid + +1: /* Return from OF */ + FIXUP_ENDIAN + + /* Just make sure that %r1 top 32 bits didn't get corrupt by OF */ + rldicl %r1, %r1, 0, 32 + + /* Restore the MSR (back to 64 bits) */ + ld %r0, UREGS_msr(%r1) + mtmsrd %r0 + isync + + /* Restore other registers */ + REST_GPR(2, %r1) + REST_GPR(13, %r1) + REST_NVGPRS(%r1) + ld %r4, UREGS_cr(%r1) + mtcr %r4 + + addi %r1, %r1, STACK_SWITCH_FRAME_SIZE + ld %r0, 16(%r1) + mtlr %r0 + blr + + .size enter_of, . - enter_of + .type enter_of, %function diff --git a/xen/arch/ppc/setup.c b/xen/arch/ppc/setup.c index 9e90a6179a..7c623a49f5 100644 --- a/xen/arch/ppc/setup.c +++ b/xen/arch/ppc/setup.c @@ -1,16 +1,29 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #include +#include +#include +#include /* Xen stack for bringing up the first CPU. */ unsigned char __initdata cpu0_boot_stack[STACK_SIZE] __aligned(STACK_SIZE); -/* Macro to adjust thread priority for hardware multithreading */ -#define HMT_very_low() asm volatile ( "or %r31, %r31, %r31" ) - void __init noreturn start_xen(unsigned long r3, unsigned long r4, unsigned long r5, unsigned long r6, unsigned long r7) { + if ( r5 ) + { + /* OpenFirmware boot protocol */ + boot_of_init(r5); + } + else + { + /* kexec boot: Unimplemented */ + __builtin_trap(); + } + + early_printk("Hello, ppc64le!\n"); + for ( ; ; ) /* Set current hardware thread to very low priority */ HMT_very_low(); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:14:56 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:14:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572284.896223 (Exim 4.92) (envelope-from ) id 1qPzhg-0005fB-2M; Sun, 30 Jul 2023 06:14:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572284.896223; Sun, 30 Jul 2023 06: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 1qPzhf-0005f4-W7; Sun, 30 Jul 2023 06:14:55 +0000 Received: by outflank-mailman (input) for mailman id 572284; Sun, 30 Jul 2023 06:14:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzhe-0005ew-T1 for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:14:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzhe-0003lJ-SG for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:14:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzhe-0005Vl-Ra for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=LsBcthY1r5frXB7TVxaKdQsCrbAMMGZfwdqG9RT9BSo=; b=XApSdKNdMMXpovVFUuh3fEDs0K ueTG9H/FvAOtSLogegvJ6gAuFVtzpjs3qde3+IIve9MQJstqLy4iDCoAJqrMc9OIudwUHcJw9xylW aQbGDEe7iuZwdgW2d8jQ+iyjGxPjW7ufHRueBrsaMHu0nAM0NMvuDInn7gmPW4+PjHDw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: add const to the return type of canonicalize() Message-Id: Date: Sun, 30 Jul 2023 06:14:54 +0000 commit 84f2751e103148fed3332a3575ba004dfa8558c1 Author: Juergen Gross AuthorDate: Thu Jul 27 09:48:40 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jul 27 09:48:40 2023 +0200 tools/xenstore: add const to the return type of canonicalize() The return type of canonicalize() can be modified to const char *. This avoids the need to cast the const away from the input parameter. There need to be quite some other functions modified to take const parameters in order to avoid further casts. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_control.c | 33 +++++++++++++++++---------------- tools/xenstore/xenstored_core.c | 26 ++++++++++++++------------ tools/xenstore/xenstored_core.h | 5 +++-- tools/xenstore/xenstored_domain.c | 4 ++-- tools/xenstore/xenstored_lu.c | 2 +- tools/xenstore/xenstored_lu.h | 4 ++-- tools/xenstore/xenstored_lu_daemon.c | 2 +- tools/xenstore/xenstored_lu_minios.c | 2 +- tools/xenstore/xenstored_watch.c | 14 ++++++++------ 9 files changed, 49 insertions(+), 43 deletions(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 145a0e5aff..3bdf2edc34 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -34,7 +34,7 @@ struct cmd_s { char *cmd; - int (*func)(const void *, struct connection *, char **, int); + int (*func)(const void *, struct connection *, const char **, int); char *pars; /* * max_pars can be used to limit the size of the parameter vector, @@ -47,7 +47,7 @@ struct cmd_s { }; static int do_control_check(const void *ctx, struct connection *conn, - char **vec, int num) + const char **vec, int num) { if (num) return EINVAL; @@ -59,7 +59,7 @@ 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) + const char **vec, int num) { int ret; @@ -126,7 +126,7 @@ static int quota_show_current(const void *ctx, struct connection *conn, } static int quota_set(const void *ctx, struct connection *conn, - char **vec, int num, struct quota *quotas) + const char **vec, int num, struct quota *quotas) { unsigned int i; int val; @@ -150,7 +150,7 @@ static int quota_set(const void *ctx, struct connection *conn, } static int quota_get(const void *ctx, struct connection *conn, - char **vec, int num) + const char **vec, int num) { if (num != 1) return EINVAL; @@ -159,7 +159,7 @@ static int quota_get(const void *ctx, struct connection *conn, } static int quota_max(const void *ctx, struct connection *conn, - char **vec, int num) + const char **vec, int num) { if (num > 1) return EINVAL; @@ -175,7 +175,7 @@ static int quota_max(const void *ctx, struct connection *conn, } static int do_control_quota(const void *ctx, struct connection *conn, - char **vec, int num) + const char **vec, int num) { if (num == 0) return quota_show_current(ctx, conn, hard_quotas); @@ -190,7 +190,7 @@ static int do_control_quota(const void *ctx, struct connection *conn, } static int do_control_quota_s(const void *ctx, struct connection *conn, - char **vec, int num) + const char **vec, int num) { if (num == 0) return quota_show_current(ctx, conn, soft_quotas); @@ -203,7 +203,7 @@ static int do_control_quota_s(const void *ctx, struct connection *conn, #ifdef __MINIOS__ static int do_control_memreport(const void *ctx, struct connection *conn, - char **vec, int num) + const char **vec, int num) { if (num) return EINVAL; @@ -215,7 +215,7 @@ static int do_control_memreport(const void *ctx, struct connection *conn, } #else static int do_control_logfile(const void *ctx, struct connection *conn, - char **vec, int num) + const char **vec, int num) { if (num != 1) return EINVAL; @@ -230,7 +230,7 @@ static int do_control_logfile(const void *ctx, struct connection *conn, } static int do_control_memreport(const void *ctx, struct connection *conn, - char **vec, int num) + const char **vec, int num) { FILE *fp; int fd; @@ -270,7 +270,7 @@ static int do_control_memreport(const void *ctx, struct connection *conn, #endif static int do_control_print(const void *ctx, struct connection *conn, - char **vec, int num) + const char **vec, int num) { if (num != 1) return EINVAL; @@ -281,7 +281,8 @@ static int do_control_print(const void *ctx, struct connection *conn, return 0; } -static int do_control_help(const void *, struct connection *, char **, int); +static int do_control_help(const void *, struct connection *, const char **, + int); static struct cmd_s cmds[] = { { "check", do_control_check, "" }, @@ -322,7 +323,7 @@ static struct cmd_s cmds[] = { }; static int do_control_help(const void *ctx, struct connection *conn, - char **vec, int num) + const char **vec, int num) { int cmd; char *resp; @@ -348,7 +349,7 @@ int do_control(const void *ctx, struct connection *conn, struct buffered_data *in) { unsigned int cmd, num, off; - char **vec = NULL; + const char **vec = NULL; if (domain_is_unprivileged(conn)) return EACCES; @@ -365,7 +366,7 @@ int do_control(const void *ctx, struct connection *conn, num = xenstore_count_strings(in->buffer, in->used); if (cmds[cmd].max_pars) num = min(num, cmds[cmd].max_pars); - vec = talloc_array(ctx, char *, num); + vec = (const char **)talloc_array(ctx, char *, num); if (!vec) return ENOMEM; if (get_strings(in, vec, num) < num) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index a1d3047e48..6d27b2dd7f 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -994,7 +994,7 @@ unsigned int get_string(const struct buffered_data *data, unsigned int offset) * ignore any data after the final nul. */ unsigned int get_strings(struct buffered_data *data, - char *vec[], unsigned int num) + const char *vec[], unsigned int num) { unsigned int off, i, len; @@ -1216,25 +1216,26 @@ static char *perms_to_strings(const void *ctx, const struct node_perms *perms, return strings; } -char *canonicalize(struct connection *conn, const void *ctx, const char *node) +const char *canonicalize(struct connection *conn, const void *ctx, + const char *node) { const char *prefix; if (!node || (node[0] == '/') || (node[0] == '@')) - return (char *)node; + return node; prefix = get_implicit_path(conn); if (prefix) return talloc_asprintf(ctx, "%s/%s", prefix, node); - return (char *)node; + return node; } static struct node *get_node_canonicalized(struct connection *conn, const void *ctx, const char *name, - char **canonical_name, + const char **canonical_name, unsigned int perm) { - char *tmp_name; + const char *tmp_name; if (!canonical_name) canonical_name = &tmp_name; @@ -1249,7 +1250,7 @@ static struct node *get_node_canonicalized(struct connection *conn, } static struct node *get_spec_node(struct connection *conn, const void *ctx, - const char *name, char **canonical_name, + const char *name, const char **canonical_name, unsigned int perm) { if (name[0] == '@') @@ -1538,8 +1539,8 @@ static int do_write(const void *ctx, struct connection *conn, { unsigned int offset, datalen; struct node *node; - char *vec[1] = { NULL }; /* gcc4 + -W + -Werror fucks code. */ - char *name; + const char *vec[1] = { NULL }; /* gcc4 + -W + -Werror fucks code. */ + const char *name; /* Extra "strings" can be created by binary data. */ if (get_strings(in, vec, ARRAY_SIZE(vec)) < ARRAY_SIZE(vec)) @@ -1574,7 +1575,7 @@ static int do_mkdir(const void *ctx, struct connection *conn, struct buffered_data *in) { struct node *node; - char *name; + const char *name; node = get_node_canonicalized(conn, ctx, onearg(in), &name, XS_PERM_WRITE); @@ -1703,7 +1704,7 @@ static int do_rm(const void *ctx, struct connection *conn, { struct node *node; int ret; - char *name; + const char *name; char *parentname; node = get_node_canonicalized(conn, ctx, onearg(in), &name, @@ -1765,7 +1766,8 @@ static int do_set_perms(const void *ctx, struct connection *conn, struct buffered_data *in) { struct node_perms perms, old_perms; - char *name, *permstr; + const char *name; + char *permstr; struct node *node; perms.num = xenstore_count_strings(in->buffer, in->used); diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 84a611cbb5..005556de90 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -212,7 +212,7 @@ const char *onearg(struct buffered_data *in); /* Break input into vectors, return the number, fill in up to num of them. */ unsigned int get_strings(struct buffered_data *data, - char *vec[], unsigned int num); + const char *vec[], unsigned int num); unsigned int get_string(const struct buffered_data *data, unsigned int offset); void send_reply(struct connection *conn, enum xsd_sockmsg_type type, @@ -224,7 +224,8 @@ void send_event(struct buffered_data *req, struct connection *conn, void send_ack(struct connection *conn, enum xsd_sockmsg_type type); /* Canonicalize this path if possible. */ -char *canonicalize(struct connection *conn, const void *ctx, const char *node); +const char *canonicalize(struct connection *conn, const void *ctx, + const char *node); /* Get access permissions. */ unsigned int perm_for_conn(struct connection *conn, diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 632ddb5efc..cc67af5b98 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -1014,7 +1014,7 @@ int do_introduce(const void *ctx, struct connection *conn, struct buffered_data *in) { struct domain *domain; - char *vec[3]; + const char *vec[3]; unsigned int domid; evtchn_port_t port; @@ -1055,7 +1055,7 @@ static struct domain *find_connected_domain(unsigned int domid) int do_set_target(const void *ctx, struct connection *conn, struct buffered_data *in) { - char *vec[2]; + const char *vec[2]; unsigned int domid, tdomid; struct domain *domain, *tdomain; if (get_strings(in, vec, ARRAY_SIZE(vec)) < ARRAY_SIZE(vec)) diff --git a/tools/xenstore/xenstored_lu.c b/tools/xenstore/xenstored_lu.c index b20d0d37ea..f7f76acbf9 100644 --- a/tools/xenstore/xenstored_lu.c +++ b/tools/xenstore/xenstored_lu.c @@ -360,7 +360,7 @@ static const char *lu_start(const void *ctx, struct connection *conn, return NULL; } -int do_control_lu(const void *ctx, struct connection *conn, char **vec, +int do_control_lu(const void *ctx, struct connection *conn, const char **vec, int num) { const char *ret = NULL; diff --git a/tools/xenstore/xenstored_lu.h b/tools/xenstore/xenstored_lu.h index d633a765a3..ac3c572ca8 100644 --- a/tools/xenstore/xenstored_lu.h +++ b/tools/xenstore/xenstored_lu.h @@ -50,7 +50,7 @@ void lu_read_state(void); /* Write the "OK" response for the live-update command */ unsigned int lu_write_response(FILE *fp); -int do_control_lu(const void *ctx, struct connection *conn, char **vec, +int do_control_lu(const void *ctx, struct connection *conn, const char **vec, int num); /* Live update private interfaces. */ @@ -59,7 +59,7 @@ void lu_close_dump_state(struct lu_dump_state *state); FILE *lu_dump_open(const void *ctx); void lu_dump_close(FILE *fp); char *lu_exec(const void *ctx, int argc, char **argv); -const char *lu_arch(const void *ctx, struct connection *conn, char **vec, +const char *lu_arch(const void *ctx, struct connection *conn, const char **vec, int num); const char *lu_begin(struct connection *conn); void lu_destroy_arch(void *data); diff --git a/tools/xenstore/xenstored_lu_daemon.c b/tools/xenstore/xenstored_lu_daemon.c index 310fb8c2e6..8c7522b0e1 100644 --- a/tools/xenstore/xenstored_lu_daemon.c +++ b/tools/xenstore/xenstored_lu_daemon.c @@ -118,7 +118,7 @@ static const char *lu_binary(const void *ctx, struct connection *conn, return NULL; } -const char *lu_arch(const void *ctx, struct connection *conn, char **vec, +const char *lu_arch(const void *ctx, struct connection *conn, const char **vec, int num) { if (num == 2 && !strcmp(vec[0], "-f")) diff --git a/tools/xenstore/xenstored_lu_minios.c b/tools/xenstore/xenstored_lu_minios.c index 88fb9e0f38..ae0483575e 100644 --- a/tools/xenstore/xenstored_lu_minios.c +++ b/tools/xenstore/xenstored_lu_minios.c @@ -104,7 +104,7 @@ static const char *lu_binary_save(const void *ctx, struct connection *conn, return NULL; } -const char *lu_arch(const void *ctx, struct connection *conn, char **vec, +const char *lu_arch(const void *ctx, struct connection *conn, const char **vec, int num) { if (num == 2 && !strcmp(vec[0], "-b")) diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_watch.c index 4195c59e17..fefbf56ab2 100644 --- a/tools/xenstore/xenstored_watch.c +++ b/tools/xenstore/xenstored_watch.c @@ -161,7 +161,7 @@ static int destroy_watch(void *_watch) } static int check_watch_path(struct connection *conn, const void *ctx, - char **path, bool *relative) + const char **path, bool *relative) { /* Check if valid event. */ if (strstarts(*path, "@")) { @@ -184,8 +184,9 @@ static int check_watch_path(struct connection *conn, const void *ctx, return errno; } -static struct watch *add_watch(struct connection *conn, char *path, char *token, - bool relative, bool no_quota_check) +static struct watch *add_watch(struct connection *conn, const char *path, + const char *token, bool relative, + bool no_quota_check) { struct watch *watch; @@ -217,7 +218,7 @@ static struct watch *add_watch(struct connection *conn, char *path, char *token, int do_watch(const void *ctx, struct connection *conn, struct buffered_data *in) { struct watch *watch; - char *vec[2]; + const char *vec[2]; bool relative; if (get_strings(in, vec, ARRAY_SIZE(vec)) != ARRAY_SIZE(vec)) @@ -258,7 +259,8 @@ int do_unwatch(const void *ctx, struct connection *conn, struct buffered_data *in) { struct watch *watch; - char *node, *vec[2]; + const char *node; + const char *vec[2]; if (get_strings(in, vec, ARRAY_SIZE(vec)) != ARRAY_SIZE(vec)) return EINVAL; @@ -336,7 +338,7 @@ void read_state_watch(const void *ctx, const void *state) { const struct xs_state_watch *sw = state; struct connection *conn; - char *path, *token; + const char *path, *token; bool relative; conn = get_connection_by_id(sw->conn_id); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:15:06 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:15:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572285.896228 (Exim 4.92) (envelope-from ) id 1qPzhq-0005jX-4L; Sun, 30 Jul 2023 06:15:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572285.896228; Sun, 30 Jul 2023 06: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 1qPzhq-0005jP-1P; Sun, 30 Jul 2023 06:15:06 +0000 Received: by outflank-mailman (input) for mailman id 572285; Sun, 30 Jul 2023 06:15:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzho-0005jC-WC for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:15:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzho-0003lq-VS for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:15:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzho-0005WP-Uj for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:15: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=tef6ewmtcEb+HBAvw9jAWOC2EVsP5VCCdY4EzLbZzRI=; b=FQ3sbyP6p3a7vxDtZ+QlKeF7mP Z5rW3cqhLWY39uSlR+oDnsKaxJb85nUk4MdIVZzRWlFVqfhXPXTfz67mnWLBosXYNOLctOAIZid2N jCsISRWT9Yreni6ewbxAXaP+vGp+rf979x+nxOnaJTTFm+huCtu+9WM1JQ0HAd15lBcU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: fix get_spec_node() Message-Id: Date: Sun, 30 Jul 2023 06:15:04 +0000 commit cef523b4a7ca34ba6cfd368d41b180fd640801bc Author: Juergen Gross AuthorDate: Thu Jul 27 09:48:58 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jul 27 09:48:58 2023 +0200 tools/xenstore: fix get_spec_node() In case get_spec_node() is being called for a special node starting with '@' it won't set *canonical_name. This can result in a crash of xenstored due to dereferencing the uninitialized name in fire_watches(). This is no security issue as it requires either a privileged caller or ownership of the special node in question by an unprivileged caller (which is questionable, as this would make the owner privileged in some way). Fixes: d6bb63924fc2 ("tools/xenstore: introduce dummy nodes for special watch paths") Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 6d27b2dd7f..9f1328a31f 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1253,8 +1253,11 @@ static struct node *get_spec_node(struct connection *conn, const void *ctx, const char *name, const char **canonical_name, unsigned int perm) { - if (name[0] == '@') + if (name[0] == '@') { + if (canonical_name) + *canonical_name = name; return get_node(conn, ctx, name, perm); + } return get_node_canonicalized(conn, ctx, name, canonical_name, perm); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:15:16 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:15:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572286.896232 (Exim 4.92) (envelope-from ) id 1qPzi0-0005mN-5b; Sun, 30 Jul 2023 06:15:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572286.896232; Sun, 30 Jul 2023 06: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 1qPzi0-0005mF-2u; Sun, 30 Jul 2023 06:15:16 +0000 Received: by outflank-mailman (input) for mailman id 572286; Sun, 30 Jul 2023 06:15:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzhz-0005m7-33 for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:15:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzhz-0003m0-2L for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:15:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzhz-0005Wo-1a for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=U13nC/kMCHwyIb9USREoqOPOAXesIzeNjYk/g7QcvYs=; b=YFSwd9QXOlVRDbwXYRHw/9rTwW Gflr75Yzs1yMf5qInIs+/PqEsRK3EkSU/DqxHJABeewE6rWRCwiREEB+3pQ0nyTjVzTl/6fayyDYx PFWOIZUjTlDxTZufQaNu/AO2ms0honiv1RF4b7tfENEbKIolXPk1kTD//XF2tTJn711U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vpci: add permission checks to map_range() Message-Id: Date: Sun, 30 Jul 2023 06:15:15 +0000 commit baa6ea7003868d1a339d06b17fd32d41b851d571 Author: Roger Pau Monné AuthorDate: Thu Jul 27 09:49:25 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jul 27 09:49:25 2023 +0200 vpci: add permission checks to map_range() Just like it's done for the XEN_DOMCTL_memory_mapping hypercall, add the permissions checks to vPCI map_range(), which is used to map the BARs into the domain p2m. Adding those checks requires that for x86 PVH hardware domain builder the permissions are set before initializing the IOMMU, or else attempts to initialize vPCI done as part of IOMMU device setup will fail due to missing permissions to create the BAR mappings. While moving the call to dom0_setup_permissions() convert the panic() used for error handling to a printk, the caller will already panic if required. Fixes: 9c244fdef7e7 ('vpci: add header handlers') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/x86/hvm/dom0_build.c | 21 ++++++++++++++------- xen/drivers/vpci/header.c | 20 ++++++++++++++++++++ 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index a7ae9c3b04..bc0e290db6 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -715,13 +715,6 @@ static int __init pvh_setup_cpus(struct domain *d, paddr_t entry, return rc; } - rc = dom0_setup_permissions(d); - if ( rc ) - { - panic("Unable to setup Dom0 permissions: %d\n", rc); - return rc; - } - update_domain_wallclock_time(d); v->is_initialised = 1; @@ -1184,6 +1177,20 @@ int __init dom0_construct_pvh(struct domain *d, const module_t *image, printk(XENLOG_INFO "*** Building a PVH Dom%d ***\n", d->domain_id); + if ( is_hardware_domain(d) ) + { + /* + * Setup permissions early so that calls to add MMIO regions to the + * p2m as part of vPCI setup don't fail due to permission checks. + */ + rc = dom0_setup_permissions(d); + if ( rc ) + { + printk("%pd unable to setup permissions: %d\n", d, rc); + return rc; + } + } + /* * NB: MMCFG initialization needs to be performed before iommu * initialization so the iommu code can fetch the MMCFG regions used by the diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index b41556d007..60f7049e34 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -17,10 +17,13 @@ * License along with this program; If not, see . */ +#include #include #include #include +#include + #include #include @@ -43,6 +46,23 @@ static int cf_check map_range( { unsigned long size = e - s + 1; + if ( !iomem_access_permitted(map->d, s, e) ) + { + printk(XENLOG_G_WARNING + "%pd denied access to MMIO range [%#lx, %#lx]\n", + map->d, s, e); + return -EPERM; + } + + rc = xsm_iomem_mapping(XSM_HOOK, map->d, s, e, map->map); + if ( rc ) + { + printk(XENLOG_G_WARNING + "%pd XSM denied access to MMIO range [%#lx, %#lx]: %d\n", + map->d, s, e, rc); + return rc; + } + /* * ARM TODOs: * - On ARM whether the memory is prefetchable or not should be passed -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:15:26 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:15:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572287.896236 (Exim 4.92) (envelope-from ) id 1qPziA-0005ow-72; Sun, 30 Jul 2023 06:15:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572287.896236; Sun, 30 Jul 2023 06: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 1qPziA-0005op-4M; Sun, 30 Jul 2023 06:15:26 +0000 Received: by outflank-mailman (input) for mailman id 572287; Sun, 30 Jul 2023 06:15:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzi9-0005oh-65 for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:15:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzi9-0003m9-5P for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:15:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzi9-0005XF-4e for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=rANmBedBP7aBLXXVqsTexUL8AwgqIOuSG+/mbC8IYAU=; b=CXzSD0Ya2evUrI4NJWZDmYWeDd LMBLkuj8SwsybdW1y5qPAMSZoDdFLmJ7M7FdTEAlk7QMxWucMorYSTGAyvXkQQceSozIV+0Hsli5a Y2Jd9eK1FI7sFI1GkqSUdPTqUicazcAjL6dMjEa8ltXnpN89QCeY9FakjcAWPdvVXXZs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Add smoke test for ppc64le Message-Id: Date: Sun, 30 Jul 2023 06:15:25 +0000 commit 0400946d532ec41bc5d0bedd3e9ef036308ce623 Author: Shawn Anastasio AuthorDate: Fri Jul 21 12:02:55 2023 -0500 Commit: Andrew Cooper CommitDate: Thu Jul 27 11:24:19 2023 +0100 automation: Add smoke test for ppc64le Add an initial smoke test that boots xen on a ppc64/pseries machine and checks for a magic string. Based on the riscv smoke test. Eventually the powernv9 (POWER9 bare metal) machine type will want to be tested as well, but for now we only boot on pseries. Signed-off-by: Shawn Anastasio Reviewed-by: Stefano Stabellini Reviewed-by: Jiamei Xie --- automation/gitlab-ci/test.yaml | 20 ++++++++++++++++++++ automation/scripts/qemu-smoke-ppc64le.sh | 27 +++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index d5cb238b0a..45e8ddb7a3 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -71,6 +71,19 @@ tags: - x86_64 +.qemu-ppc64le: + extends: .test-jobs-common + variables: + CONTAINER: debian:bullseye-ppc64le + LOGFILE: qemu-smoke-ppc64le.log + artifacts: + paths: + - smoke.serial + - '*.log' + when: always + tags: + - x86_64 + .xilinx-arm64: extends: .test-jobs-common variables: @@ -444,3 +457,10 @@ qemu-smoke-riscv64-gcc: - ./automation/scripts/qemu-smoke-riscv64.sh 2>&1 | tee ${LOGFILE} needs: - archlinux-current-gcc-riscv64-debug + +qemu-smoke-ppc64le-pseries-gcc: + extends: .qemu-ppc64le + script: + - ./automation/scripts/qemu-smoke-ppc64le.sh pseries-5.2 2>&1 | tee ${LOGFILE} + needs: + - debian-bullseye-gcc-ppc64le-debug diff --git a/automation/scripts/qemu-smoke-ppc64le.sh b/automation/scripts/qemu-smoke-ppc64le.sh new file mode 100755 index 0000000000..eb55221221 --- /dev/null +++ b/automation/scripts/qemu-smoke-ppc64le.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +set -ex + +# machine type from first arg passed directly to qemu -M +machine=$1 + +# Run the test +rm -f smoke.serial +set +e + +touch smoke.serial + +timeout -k 1 20 \ +qemu-system-ppc64 \ + -M $machine \ + -m 2g \ + -smp 1 \ + -vga none \ + -monitor none \ + -nographic \ + -serial file:smoke.serial \ + -kernel binaries/xen + +set -e +(grep -q "Hello, ppc64le!" smoke.serial) || exit 1 +exit 0 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:15:36 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:15:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572288.896241 (Exim 4.92) (envelope-from ) id 1qPziK-0005t9-AR; Sun, 30 Jul 2023 06:15:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572288.896241; Sun, 30 Jul 2023 06: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 1qPziK-0005t1-7R; Sun, 30 Jul 2023 06:15:36 +0000 Received: by outflank-mailman (input) for mailman id 572288; Sun, 30 Jul 2023 06:15:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPziJ-0005sl-9f for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:15:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPziJ-0003mJ-8u for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:15:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPziJ-0005Xk-88 for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=Q2tJ4zdXtrqLxeXOIx1DaqP8Jd3tqFdt8TGfsGT7gog=; b=629ZpjcKBDxJFFm7MOnWpxjvk1 Hiin8FP0sFMb0V5hryskUlEbQ1XhnFhXeOoqdDeK/7PeOoj1Qah4IJq4DtAgakV4Cx404Tr788d4f ryVM4rInLtFuisJtTgakSkv6CxuCf20wMgV5sYwRHt7QfsWhoX5bO+h/MuBUismnJVNM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: explicitly specify create or modify for tdb_store() Message-Id: Date: Sun, 30 Jul 2023 06:15:35 +0000 commit d99cf2f8ee22d640b9293c61147ba70f00b32d9c Author: Juergen Gross AuthorDate: Mon Jul 24 13:02:23 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 27 22:02:02 2023 +0100 tools/xenstore: explicitly specify create or modify for tdb_store() Instead of using TDB_REPLACE for either creating or modifying a TDB entry, use either TDB_INSERT or TDB_MODIFY when calling tdb_store(). At higher function levels use the abstract mode values NODE_CREATE and NODE_MODIFY. This is for preparing to get rid of TDB, even if it is beneficial while using TDB, too. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 32 +++++++++++++++++++------------- tools/xenstore/xenstored_core.h | 10 ++++++++-- tools/xenstore/xenstored_domain.c | 2 +- tools/xenstore/xenstored_transaction.c | 9 +++++++-- 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 9f1328a31f..b7fdf16718 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -601,7 +601,8 @@ static unsigned int get_acc_domid(struct connection *conn, TDB_DATA *key, } int do_tdb_write(struct connection *conn, TDB_DATA *key, TDB_DATA *data, - struct node_account_data *acc, bool no_quota_check) + struct node_account_data *acc, enum write_node_mode mode, + bool no_quota_check) { struct xs_tdb_record_hdr *hdr = (void *)data->dptr; struct node_account_data old_acc = {}; @@ -635,7 +636,8 @@ int do_tdb_write(struct connection *conn, TDB_DATA *key, TDB_DATA *data, } /* TDB should set errno, but doesn't even set ecode AFAICT. */ - if (tdb_store(tdb_ctx, *key, *data, TDB_REPLACE) != 0) { + if (tdb_store(tdb_ctx, *key, *data, + (mode == NODE_CREATE) ? TDB_INSERT : TDB_MODIFY) != 0) { domain_memory_add_nochk(conn, new_domid, -data->dsize - key->dsize); /* Error path, so no quota check. */ @@ -774,7 +776,7 @@ static bool read_node_can_propagate_errno(void) } int write_node_raw(struct connection *conn, TDB_DATA *key, struct node *node, - bool no_quota_check) + enum write_node_mode mode, bool no_quota_check) { TDB_DATA data; void *p; @@ -812,7 +814,7 @@ int write_node_raw(struct connection *conn, TDB_DATA *key, struct node *node, p += node->datalen; memcpy(p, node->children, node->childlen); - if (do_tdb_write(conn, key, &data, &node->acc, no_quota_check)) + if (do_tdb_write(conn, key, &data, &node->acc, mode, no_quota_check)) return EIO; return 0; @@ -823,14 +825,14 @@ int write_node_raw(struct connection *conn, TDB_DATA *key, struct node *node, * node->key. This can later be used if the change needs to be reverted. */ static int write_node(struct connection *conn, struct node *node, - bool no_quota_check) + enum write_node_mode mode, bool no_quota_check) { int ret; if (access_node(conn, node, NODE_ACCESS_WRITE, &node->key)) return errno; - ret = write_node_raw(conn, &node->key, node, no_quota_check); + ret = write_node_raw(conn, &node->key, node, mode, no_quota_check); if (ret && conn && conn->transaction) { /* * Reverting access_node() is hard, so just fail the @@ -1500,7 +1502,8 @@ static struct node *create_node(struct connection *conn, const void *ctx, goto err; } - ret = write_node(conn, i, false); + ret = write_node(conn, i, i->parent ? NODE_CREATE : NODE_MODIFY, + false); if (ret) goto err; @@ -1564,7 +1567,7 @@ static int do_write(const void *ctx, struct connection *conn, } else { node->data = in->buffer + offset; node->datalen = datalen; - if (write_node(conn, node, false)) + if (write_node(conn, node, NODE_MODIFY, false)) return errno; } @@ -1614,7 +1617,7 @@ static int remove_child_entry(struct connection *conn, struct node *node, memdel(node->children, offset, childlen + 1, node->childlen); node->childlen -= childlen + 1; - return write_node(conn, node, true); + return write_node(conn, node, NODE_MODIFY, true); } static int delete_child(struct connection *conn, @@ -1812,7 +1815,7 @@ static int do_set_perms(const void *ctx, struct connection *conn, if (domain_nbentry_inc(conn, get_node_owner(node))) return ENOMEM; - if (write_node(conn, node, false)) + if (write_node(conn, node, NODE_MODIFY, false)) return errno; fire_watches(conn, ctx, name, node, false, &old_perms); @@ -2326,7 +2329,7 @@ static void manual_node(const char *name, const char *child) if (child) node->childlen = strlen(child) + 1; - if (write_node(NULL, node, false)) + if (write_node(NULL, node, NODE_CREATE, false)) barf_perror("Could not create initial node %s", name); talloc_free(node); } @@ -3474,12 +3477,15 @@ void read_state_node(const void *ctx, const void *state) barf("allocation error restoring node"); set_tdb_key(parentname, &key); - if (write_node_raw(NULL, &key, parent, true)) + if (write_node_raw(NULL, &key, parent, NODE_MODIFY, true)) barf("write parent error restoring node"); } set_tdb_key(name, &key); - if (write_node_raw(NULL, &key, node, true)) + + /* The "/" node is already existing, so it can only be modified here. */ + if (write_node_raw(NULL, &key, node, + strcmp(name, "/") ? NODE_CREATE : NODE_MODIFY, true)) barf("write node error restoring node"); if (domain_nbentry_inc(&conn, get_node_owner(node))) diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 005556de90..19a81adc49 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -238,8 +238,13 @@ static inline unsigned int get_node_owner(const struct node *node) } /* Write a node to the tdb data base. */ +enum write_node_mode { + NODE_CREATE, + NODE_MODIFY +}; + int write_node_raw(struct connection *conn, TDB_DATA *key, struct node *node, - bool no_quota_check); + enum write_node_mode mode, bool no_quota_check); /* Get a node from the tdb data base. */ struct node *read_node(struct connection *conn, const void *ctx, @@ -359,7 +364,8 @@ int remember_string(struct hashtable *hash, const char *str); void set_tdb_key(const char *name, TDB_DATA *key); int do_tdb_write(struct connection *conn, TDB_DATA *key, TDB_DATA *data, - struct node_account_data *acc, bool no_quota_check); + struct node_account_data *acc, enum write_node_mode mode, + bool no_quota_check); int do_tdb_delete(struct connection *conn, TDB_DATA *key, struct node_account_data *acc); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index cc67af5b98..569c3bfbd0 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -523,7 +523,7 @@ static int domain_tree_remove_sub(const void *ctx, struct connection *conn, node->perms.p[0].id = priv_domid; node->acc.memory = 0; domain_nbentry_inc(NULL, priv_domid); - if (write_node_raw(NULL, &key, node, true)) { + if (write_node_raw(NULL, &key, node, NODE_MODIFY, true)) { /* That's unfortunate. We only can try to continue. */ syslog(LOG_ERR, "error when moving orphaned node %s to dom0\n", diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c index 334f1609f1..baad9e472d 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -290,7 +290,8 @@ int access_node(struct connection *conn, struct node *node, i->check_gen = true; if (node->generation != NO_GENERATION) { set_tdb_key(i->trans_name, &local_key); - ret = write_node_raw(conn, &local_key, node, true); + ret = write_node_raw(conn, &local_key, node, + NODE_CREATE, true); if (ret) goto err; i->ta_node = true; @@ -401,12 +402,16 @@ static int finalize_transaction(struct connection *conn, set_tdb_key(i->trans_name, &ta_key); data = tdb_fetch(tdb_ctx, ta_key); if (data.dptr) { + enum write_node_mode mode; + trace_tdb("read %s size %zu\n", ta_key.dptr, ta_key.dsize + data.dsize); hdr = (void *)data.dptr; hdr->generation = ++generation; + mode = (i->generation == NO_GENERATION) + ? NODE_CREATE : NODE_MODIFY; *is_corrupt |= do_tdb_write(conn, &key, &data, - NULL, true); + NULL, mode, true); talloc_free(data.dptr); if (do_tdb_delete(conn, &ta_key, NULL)) *is_corrupt = true; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:15:46 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:15:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572289.896245 (Exim 4.92) (envelope-from ) id 1qPziU-0005w2-Bx; Sun, 30 Jul 2023 06:15:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572289.896245; Sun, 30 Jul 2023 06: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 1qPziU-0005vs-8v; Sun, 30 Jul 2023 06:15:46 +0000 Received: by outflank-mailman (input) for mailman id 572289; Sun, 30 Jul 2023 06:15:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPziT-0005vZ-Co for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:15:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPziT-0003mi-C1 for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:15:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPziT-0005Y9-BN for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=lrQYnuI2IEdeRkey0B+uPnhwoKw1Nq3Azm4R3c7NrIs=; b=OY8TwlJA+7eMUVmdPg1iEdCwk5 3ShG2onCV9nKA0EMl4vBQnQwC8vBc6ke2k/4bjGWKp61LSoEc2LxElz+9meBSpgJWX5Er4xqMkAcT 4djhzefOz90dj3gi6mGytopRlCozMjmQ+3H9pfBQRLA3acGeQN/L4z5LJRtccrdSytVI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: replace key in struct node with data base name Message-Id: Date: Sun, 30 Jul 2023 06:15:45 +0000 commit 7185eee09c9c66c4f18eac324318ae5194fbb042 Author: Juergen Gross AuthorDate: Mon Jul 24 13:02:24 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 27 22:02:02 2023 +0100 tools/xenstore: replace key in struct node with data base name Instead of storing the TDB key in struct node, only store the name of the node used to access it in the data base. Associated with that change replace the key parameter of access_node() with the equivalent db_name. This is in preparation to replace TDB with a more simple data storage. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 19 +++++++++++++------ tools/xenstore/xenstored_core.h | 4 ++-- tools/xenstore/xenstored_transaction.c | 10 +++++----- tools/xenstore/xenstored_transaction.h | 2 +- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index b7fdf16718..ba4798dd6e 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -821,18 +821,20 @@ int write_node_raw(struct connection *conn, TDB_DATA *key, struct node *node, } /* - * Write the node. If the node is written, caller can find the key used in - * node->key. This can later be used if the change needs to be reverted. + * Write the node. If the node is written, caller can find the DB name used in + * node->db_name. This can later be used if the change needs to be reverted. */ static int write_node(struct connection *conn, struct node *node, enum write_node_mode mode, bool no_quota_check) { int ret; + TDB_DATA key; - if (access_node(conn, node, NODE_ACCESS_WRITE, &node->key)) + if (access_node(conn, node, NODE_ACCESS_WRITE, &node->db_name)) return errno; - ret = write_node_raw(conn, &node->key, node, mode, no_quota_check); + set_tdb_key(node->db_name, &key); + ret = write_node_raw(conn, &key, node, mode, no_quota_check); if (ret && conn && conn->transaction) { /* * Reverting access_node() is hard, so just fail the @@ -1450,10 +1452,13 @@ nomem: static void destroy_node_rm(struct connection *conn, struct node *node) { + TDB_DATA key; + if (streq(node->name, "/")) corrupt(NULL, "Destroying root node!"); - do_tdb_delete(conn, &node->key, &node->acc); + set_tdb_key(node->db_name, &key); + do_tdb_delete(conn, &key, &node->acc); } static int destroy_node(struct connection *conn, struct node *node) @@ -1643,10 +1648,11 @@ static int delnode_sub(const void *ctx, struct connection *conn, const char *root = arg; bool watch_exact; int ret; + const char *db_name; TDB_DATA key; /* Any error here will probably be repeated for all following calls. */ - ret = access_node(conn, node, NODE_ACCESS_DELETE, &key); + ret = access_node(conn, node, NODE_ACCESS_DELETE, &db_name); if (ret > 0) return WALK_TREE_SUCCESS_STOP; @@ -1654,6 +1660,7 @@ static int delnode_sub(const void *ctx, struct connection *conn, return WALK_TREE_ERROR_STOP; /* In case of error stop the walk. */ + set_tdb_key(db_name, &key); if (!ret && do_tdb_delete(conn, &key, &node->acc)) return WALK_TREE_ERROR_STOP; diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 19a81adc49..ec7a56a869 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -181,8 +181,8 @@ struct node_account_data { struct node { const char *name; - /* Key used to update TDB */ - TDB_DATA key; + /* Name used to access data base. */ + const char *db_name; /* Parent (optional) */ struct node *parent; diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c index baad9e472d..020b70d954 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -227,7 +227,7 @@ void transaction_prepend(struct connection *conn, const char *name, * to be accessed in the data base. */ int access_node(struct connection *conn, struct node *node, - enum node_access_type type, TDB_DATA *key) + enum node_access_type type, const char **db_name) { struct accessed_node *i = NULL; struct transaction *trans; @@ -243,8 +243,8 @@ int access_node(struct connection *conn, struct node *node, if (!conn || !conn->transaction) { /* They're changing the global database. */ - if (key) - set_tdb_key(node->name, key); + if (db_name) + *db_name = node->name; return 0; } @@ -308,8 +308,8 @@ int access_node(struct connection *conn, struct node *node, /* Nothing to delete. */ return -1; - if (key) { - set_tdb_key(i->trans_name, key); + if (db_name) { + *db_name = i->trans_name; if (type == NODE_ACCESS_WRITE) i->ta_node = true; if (type == NODE_ACCESS_DELETE) diff --git a/tools/xenstore/xenstored_transaction.h b/tools/xenstore/xenstored_transaction.h index 883145163f..f6a2e2f7f5 100644 --- a/tools/xenstore/xenstored_transaction.h +++ b/tools/xenstore/xenstored_transaction.h @@ -41,7 +41,7 @@ void ta_node_created(struct transaction *trans); /* This node was accessed. */ int __must_check access_node(struct connection *conn, struct node *node, - enum node_access_type type, TDB_DATA *key); + enum node_access_type type, const char **db_name); /* Queue watches for a modified node. */ void queue_watches(struct connection *conn, const char *name, bool watch_exact); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:15:56 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:15:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572293.896260 (Exim 4.92) (envelope-from ) id 1qPzie-0006Fs-QC; Sun, 30 Jul 2023 06:15:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572293.896260; Sun, 30 Jul 2023 06: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 1qPzie-0006Fh-MK; Sun, 30 Jul 2023 06:15:56 +0000 Received: by outflank-mailman (input) for mailman id 572293; Sun, 30 Jul 2023 06:15:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzid-0006Ex-Fg for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:15:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzid-0003mx-F1 for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:15:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzid-0005Yi-EO for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=CxkDmwrWKbub7OHsXZSlHD5BBoglySwhxq+4Ch+phSk=; b=EsZuNDaBFBVXvQL8a67evpsmCQ Axz3SoRjH6mpATDhZsHK0mcnbpcWtHe+B1nLwCKWivuutn/fjKCucZnnBA+1NbQxzPs95XAm6k43B egfyj2Khxp0LSWyV0VoQ6ih/7S5F8fyxae87OM2ZLfajc5oU+98CCj/kb4igiulbo/Sc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: let transaction_prepend() return the name for access Message-Id: Date: Sun, 30 Jul 2023 06:15:55 +0000 commit 471c2410c845a47e761301782070ca29bd3d8f15 Author: Juergen Gross AuthorDate: Mon Jul 24 13:02:25 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 27 22:02:02 2023 +0100 tools/xenstore: let transaction_prepend() return the name for access Instead of setting the TDB key for accessing the node in the data base, let transaction_prepend() return the associated name instead. This is in preparation to replace TDB with a more simple data storage. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 4 +++- tools/xenstore/xenstored_transaction.c | 11 ++++------- tools/xenstore/xenstored_transaction.h | 3 +-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index ba4798dd6e..474bc57e73 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -695,6 +695,7 @@ struct node *read_node(struct connection *conn, const void *ctx, TDB_DATA key, data; struct xs_tdb_record_hdr *hdr; struct node *node; + const char *db_name; int err; node = talloc(ctx, struct node); @@ -709,7 +710,8 @@ struct node *read_node(struct connection *conn, const void *ctx, return NULL; } - transaction_prepend(conn, name, &key); + db_name = transaction_prepend(conn, name); + set_tdb_key(db_name, &key); data = tdb_fetch(tdb_ctx, key); diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c index 020b70d954..36567db753 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -196,20 +196,17 @@ static char *transaction_get_node_name(void *ctx, struct transaction *trans, * Prepend the transaction to name if node has been modified in the current * transaction. */ -void transaction_prepend(struct connection *conn, const char *name, - TDB_DATA *key) +const char *transaction_prepend(struct connection *conn, const char *name) { struct accessed_node *i; if (conn && conn->transaction) { i = find_accessed_node(conn->transaction, name); - if (i) { - set_tdb_key(i->trans_name, key); - return; - } + if (i) + return i->trans_name; } - set_tdb_key(name, key); + return name; } /* diff --git a/tools/xenstore/xenstored_transaction.h b/tools/xenstore/xenstored_transaction.h index f6a2e2f7f5..b196b1ab07 100644 --- a/tools/xenstore/xenstored_transaction.h +++ b/tools/xenstore/xenstored_transaction.h @@ -47,8 +47,7 @@ int __must_check access_node(struct connection *conn, struct node *node, void queue_watches(struct connection *conn, const char *name, bool watch_exact); /* Prepend the transaction to name if appropriate. */ -void transaction_prepend(struct connection *conn, const char *name, - TDB_DATA *key); +const char *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); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:16:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:16:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572294.896262 (Exim 4.92) (envelope-from ) id 1qPzio-0006LK-Qj; Sun, 30 Jul 2023 06:16:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572294.896262; Sun, 30 Jul 2023 06:16: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 1qPzio-0006LD-Ns; Sun, 30 Jul 2023 06:16:06 +0000 Received: by outflank-mailman (input) for mailman id 572294; Sun, 30 Jul 2023 06:16:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzin-0006Kg-Ji for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:16:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzin-0003nH-I7 for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:16:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzin-0005Zd-HN for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=NfsQozoQsNsZ/Wp05WQh1w76N42xVt6ofTyLvdTtim0=; b=wKEs0CPND5PyzpIhgIEh7q7yHc EzY2Lh9BaWSoz2KGBTrfnMBrWWmd6kF43vWQusSVCPQ5EFTGZObq5cucebOvDBV1+BEQsHdGlEKOl uv4A5lcr6O53Tz/oPpeavook5XGPALiV6v5XCqBvKFmhxYKoss99a7gg86NK8YK90kp0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: rename do_tdb_delete() and change parameter type Message-Id: Date: Sun, 30 Jul 2023 06:16:05 +0000 commit 549c4238b939fd303e51b1005b03ec0767b4b174 Author: Juergen Gross AuthorDate: Mon Jul 24 13:02:26 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 27 22:02:02 2023 +0100 tools/xenstore: rename do_tdb_delete() and change parameter type Rename do_tdb_delete() to db_delete() and replace the key parameter with db_name specifying the name of the node in the data base. This is in preparation to replace TDB with a more simple data storage. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 31 ++++++++++++++----------------- tools/xenstore/xenstored_core.h | 5 +++-- tools/xenstore/xenstored_transaction.c | 16 ++++++---------- 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 474bc57e73..aa3885682d 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -658,28 +658,31 @@ int do_tdb_write(struct connection *conn, TDB_DATA *key, TDB_DATA *data, return 0; } -int do_tdb_delete(struct connection *conn, TDB_DATA *key, - struct node_account_data *acc) +int db_delete(struct connection *conn, const char *name, + struct node_account_data *acc) { struct node_account_data tmp_acc; unsigned int domid; + TDB_DATA key; + + set_tdb_key(name, &key); if (!acc) { acc = &tmp_acc; acc->memory = -1; } - get_acc_data(key, acc); + get_acc_data(&key, acc); - if (tdb_delete(tdb_ctx, *key)) { + if (tdb_delete(tdb_ctx, key)) { errno = EIO; return errno; } - trace_tdb("delete %s\n", key->dptr); + trace_tdb("delete %s\n", name); if (acc->memory) { - domid = get_acc_domid(conn, key, acc->domid); - domain_memory_add_nochk(conn, domid, -acc->memory - key->dsize); + domid = get_acc_domid(conn, &key, acc->domid); + domain_memory_add_nochk(conn, domid, -acc->memory - key.dsize); } return 0; @@ -1454,13 +1457,10 @@ nomem: static void destroy_node_rm(struct connection *conn, struct node *node) { - TDB_DATA key; - if (streq(node->name, "/")) corrupt(NULL, "Destroying root node!"); - set_tdb_key(node->db_name, &key); - do_tdb_delete(conn, &key, &node->acc); + db_delete(conn, node->db_name, &node->acc); } static int destroy_node(struct connection *conn, struct node *node) @@ -1651,7 +1651,6 @@ static int delnode_sub(const void *ctx, struct connection *conn, bool watch_exact; int ret; const char *db_name; - TDB_DATA key; /* Any error here will probably be repeated for all following calls. */ ret = access_node(conn, node, NODE_ACCESS_DELETE, &db_name); @@ -1662,8 +1661,7 @@ static int delnode_sub(const void *ctx, struct connection *conn, return WALK_TREE_ERROR_STOP; /* In case of error stop the walk. */ - set_tdb_key(db_name, &key); - if (!ret && do_tdb_delete(conn, &key, &node->acc)) + if (!ret && db_delete(conn, db_name, &node->acc)) return WALK_TREE_ERROR_STOP; /* @@ -2489,9 +2487,8 @@ static int clean_store_(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA val, } if (!hashtable_search(reachable, name)) { log("clean_store: '%s' is orphaned!", name); - if (recovery) { - do_tdb_delete(NULL, &key, NULL); - } + if (recovery) + db_delete(NULL, name, NULL); } talloc_free(name); diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index ec7a56a869..1aae324c77 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -362,12 +362,13 @@ extern xengnttab_handle **xgt_handle; int remember_string(struct hashtable *hash, const char *str); +/* Data base access functions. */ void set_tdb_key(const char *name, TDB_DATA *key); int do_tdb_write(struct connection *conn, TDB_DATA *key, TDB_DATA *data, struct node_account_data *acc, enum write_node_mode mode, bool no_quota_check); -int do_tdb_delete(struct connection *conn, TDB_DATA *key, - struct node_account_data *acc); +int db_delete(struct connection *conn, const char *name, + struct node_account_data *acc); void conn_free_buffered_data(struct connection *conn); diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c index 36567db753..4a243369b0 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -384,8 +384,7 @@ static int finalize_transaction(struct connection *conn, /* Entries for unmodified nodes can be removed early. */ if (!i->modified) { if (i->ta_node) { - set_tdb_key(i->trans_name, &ta_key); - if (do_tdb_delete(conn, &ta_key, NULL)) + if (db_delete(conn, i->trans_name, NULL)) return EIO; } list_del(&i->list); @@ -394,7 +393,6 @@ static int finalize_transaction(struct connection *conn, } while ((i = list_top(&trans->accessed, struct accessed_node, list))) { - set_tdb_key(i->node, &key); if (i->ta_node) { set_tdb_key(i->trans_name, &ta_key); data = tdb_fetch(tdb_ctx, ta_key); @@ -407,10 +405,11 @@ static int finalize_transaction(struct connection *conn, hdr->generation = ++generation; mode = (i->generation == NO_GENERATION) ? NODE_CREATE : NODE_MODIFY; + set_tdb_key(i->node, &key); *is_corrupt |= do_tdb_write(conn, &key, &data, NULL, mode, true); talloc_free(data.dptr); - if (do_tdb_delete(conn, &ta_key, NULL)) + if (db_delete(conn, i->trans_name, NULL)) *is_corrupt = true; } else { *is_corrupt = true; @@ -423,7 +422,7 @@ static int finalize_transaction(struct connection *conn, */ *is_corrupt |= (i->generation == NO_GENERATION) ? false - : do_tdb_delete(conn, &key, NULL); + : db_delete(conn, i->node, NULL); } if (i->fire_watch) fire_watches(conn, trans, i->node, NULL, i->watch_exact, @@ -440,15 +439,12 @@ static int destroy_transaction(void *_transaction) { struct transaction *trans = _transaction; struct accessed_node *i; - TDB_DATA key; wrl_ntransactions--; trace_destroy(trans, "transaction"); while ((i = list_top(&trans->accessed, struct accessed_node, list))) { - if (i->ta_node) { - set_tdb_key(i->trans_name, &key); - do_tdb_delete(trans->conn, &key, NULL); - } + if (i->ta_node) + db_delete(trans->conn, i->trans_name, NULL); list_del(&i->list); talloc_free(i); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:16:17 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:16:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572296.896266 (Exim 4.92) (envelope-from ) id 1qPziy-0006YP-UA; Sun, 30 Jul 2023 06:16:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572296.896266; Sun, 30 Jul 2023 06:16: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 1qPziy-0006YI-RK; Sun, 30 Jul 2023 06:16:16 +0000 Received: by outflank-mailman (input) for mailman id 572296; Sun, 30 Jul 2023 06:16:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzix-0006Xu-MH for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:16:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzix-0003nO-LU for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:16:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzix-0005a4-Kd for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=CP7dma41PlY78fkRyDevVYva7qNfs6+6zsi88heizAA=; b=iYZb8r6VR31WcsMpRNhsV79Inb ZvdA3UrPWpJ2aaMSBlFansjrdCL+TXOhu1ohm41O7NPOJKBFsgLxV0SXYpUD+jea0QCfwAd0OczXr jnqMqCDTH/WHvXynOFW0RTGQKl7vRAm63CCT9AXJKw8kJyJf9SGhKEKu6oZzLpkeDUnQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: rename do_tdb_write() and change parameter type Message-Id: Date: Sun, 30 Jul 2023 06:16:15 +0000 commit 42c71d258eae876b6e274a2a876656e6c4508428 Author: Juergen Gross AuthorDate: Mon Jul 24 13:02:27 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 27 22:02:02 2023 +0100 tools/xenstore: rename do_tdb_write() and change parameter type Rename do_tdb_write() to db_write() and replace the key parameter with db_name specifying the name of the node in the data base, and the data parameter with a data pointer and a length. Do the same key parameter type change for write_node_raw(), too. This is in preparation to replace TDB with a more simple data storage. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 70 +++++++++++++++++----------------- tools/xenstore/xenstored_core.h | 11 +++--- tools/xenstore/xenstored_domain.c | 4 +- tools/xenstore/xenstored_transaction.c | 10 ++--- 4 files changed, 46 insertions(+), 49 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index aa3885682d..2aa3d37c18 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -600,23 +600,27 @@ static unsigned int get_acc_domid(struct connection *conn, TDB_DATA *key, ? domid : conn->id; } -int do_tdb_write(struct connection *conn, TDB_DATA *key, TDB_DATA *data, - struct node_account_data *acc, enum write_node_mode mode, - bool no_quota_check) +int db_write(struct connection *conn, const char *db_name, void *data, + size_t size, struct node_account_data *acc, + enum write_node_mode mode, bool no_quota_check) { - struct xs_tdb_record_hdr *hdr = (void *)data->dptr; + struct xs_tdb_record_hdr *hdr = data; struct node_account_data old_acc = {}; unsigned int old_domid, new_domid; int ret; + TDB_DATA key, dat; + set_tdb_key(db_name, &key); + dat.dptr = data; + dat.dsize = size; if (!acc) old_acc.memory = -1; else old_acc = *acc; - get_acc_data(key, &old_acc); - old_domid = get_acc_domid(conn, key, old_acc.domid); - new_domid = get_acc_domid(conn, key, hdr->perms[0].id); + get_acc_data(&key, &old_acc); + old_domid = get_acc_domid(conn, &key, old_acc.domid); + new_domid = get_acc_domid(conn, &key, hdr->perms[0].id); /* * Don't check for ENOENT, as we want to be able to switch orphaned @@ -624,35 +628,34 @@ int do_tdb_write(struct connection *conn, TDB_DATA *key, TDB_DATA *data, */ if (old_acc.memory) domain_memory_add_nochk(conn, old_domid, - -old_acc.memory - key->dsize); - ret = domain_memory_add(conn, new_domid, - data->dsize + key->dsize, no_quota_check); + -old_acc.memory - key.dsize); + ret = domain_memory_add(conn, new_domid, size + key.dsize, + no_quota_check); if (ret) { /* Error path, so no quota check. */ if (old_acc.memory) domain_memory_add_nochk(conn, old_domid, - old_acc.memory + key->dsize); + old_acc.memory + key.dsize); return ret; } /* TDB should set errno, but doesn't even set ecode AFAICT. */ - if (tdb_store(tdb_ctx, *key, *data, + if (tdb_store(tdb_ctx, key, dat, (mode == NODE_CREATE) ? TDB_INSERT : TDB_MODIFY) != 0) { - domain_memory_add_nochk(conn, new_domid, - -data->dsize - key->dsize); + domain_memory_add_nochk(conn, new_domid, -size - key.dsize); /* Error path, so no quota check. */ if (old_acc.memory) domain_memory_add_nochk(conn, old_domid, - old_acc.memory + key->dsize); + old_acc.memory + key.dsize); errno = EIO; return errno; } - trace_tdb("store %s size %zu\n", key->dptr, data->dsize + key->dsize); + trace_tdb("store %s size %zu\n", db_name, size + key.dsize); if (acc) { /* Don't use new_domid, as it might be a transaction node. */ acc->domid = hdr->perms[0].id; - acc->memory = data->dsize; + acc->memory = size; } return 0; @@ -780,33 +783,35 @@ static bool read_node_can_propagate_errno(void) return errno == ENOMEM || errno == ENOSPC; } -int write_node_raw(struct connection *conn, TDB_DATA *key, struct node *node, - enum write_node_mode mode, bool no_quota_check) +int write_node_raw(struct connection *conn, const char *db_name, + struct node *node, enum write_node_mode mode, + bool no_quota_check) { - TDB_DATA data; + void *data; + size_t size; void *p; struct xs_tdb_record_hdr *hdr; if (domain_adjust_node_perms(node)) return errno; - data.dsize = sizeof(*hdr) + size = sizeof(*hdr) + node->perms.num * sizeof(node->perms.p[0]) + node->datalen + node->childlen; /* Call domain_max_chk() in any case in order to record max values. */ - if (domain_max_chk(conn, ACC_NODESZ, data.dsize) && !no_quota_check) { + if (domain_max_chk(conn, ACC_NODESZ, size) && !no_quota_check) { errno = ENOSPC; return errno; } - data.dptr = talloc_size(node, data.dsize); - if (!data.dptr) { + data = talloc_size(node, size); + if (!data) { errno = ENOMEM; return errno; } - hdr = (void *)data.dptr; + hdr = data; hdr->generation = node->generation; hdr->num_perms = node->perms.num; hdr->datalen = node->datalen; @@ -819,7 +824,8 @@ int write_node_raw(struct connection *conn, TDB_DATA *key, struct node *node, p += node->datalen; memcpy(p, node->children, node->childlen); - if (do_tdb_write(conn, key, &data, &node->acc, mode, no_quota_check)) + if (db_write(conn, db_name, data, size, &node->acc, mode, + no_quota_check)) return EIO; return 0; @@ -833,13 +839,11 @@ static int write_node(struct connection *conn, struct node *node, enum write_node_mode mode, bool no_quota_check) { int ret; - TDB_DATA key; if (access_node(conn, node, NODE_ACCESS_WRITE, &node->db_name)) return errno; - set_tdb_key(node->db_name, &key); - ret = write_node_raw(conn, &key, node, mode, no_quota_check); + ret = write_node_raw(conn, node->db_name, node, mode, no_quota_check); if (ret && conn && conn->transaction) { /* * Reverting access_node() is hard, so just fail the @@ -3429,7 +3433,6 @@ void read_state_node(const void *ctx, const void *state) { const struct xs_state_node *sn = state; struct node *node, *parent; - TDB_DATA key; char *name, *parentname; unsigned int i; struct connection conn = { .id = priv_domid }; @@ -3482,15 +3485,12 @@ void read_state_node(const void *ctx, const void *state) if (add_child(node, parent, name)) barf("allocation error restoring node"); - set_tdb_key(parentname, &key); - if (write_node_raw(NULL, &key, parent, NODE_MODIFY, true)) + if (write_node_raw(NULL, parentname, parent, NODE_MODIFY, true)) barf("write parent error restoring node"); } - set_tdb_key(name, &key); - /* The "/" node is already existing, so it can only be modified here. */ - if (write_node_raw(NULL, &key, node, + if (write_node_raw(NULL, name, node, strcmp(name, "/") ? NODE_CREATE : NODE_MODIFY, true)) barf("write node error restoring node"); diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 1aae324c77..875ee5192b 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -243,8 +243,9 @@ enum write_node_mode { NODE_MODIFY }; -int write_node_raw(struct connection *conn, TDB_DATA *key, struct node *node, - enum write_node_mode mode, bool no_quota_check); +int write_node_raw(struct connection *conn, const char *db_name, + struct node *node, enum write_node_mode mode, + bool no_quota_check); /* Get a node from the tdb data base. */ struct node *read_node(struct connection *conn, const void *ctx, @@ -364,9 +365,9 @@ int remember_string(struct hashtable *hash, const char *str); /* Data base access functions. */ void set_tdb_key(const char *name, TDB_DATA *key); -int do_tdb_write(struct connection *conn, TDB_DATA *key, TDB_DATA *data, - struct node_account_data *acc, enum write_node_mode mode, - bool no_quota_check); +int db_write(struct connection *conn, const char *db_name, void *data, + size_t size, struct node_account_data *acc, + enum write_node_mode mode, bool no_quota_check); int db_delete(struct connection *conn, const char *name, struct node_account_data *acc); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 569c3bfbd0..10d2280f84 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -511,19 +511,17 @@ static int domain_tree_remove_sub(const void *ctx, struct connection *conn, struct node *node, void *arg) { struct domain *domain = arg; - TDB_DATA key; int ret = WALK_TREE_OK; if (node->perms.p[0].id != domain->domid) return WALK_TREE_OK; if (keep_orphans) { - set_tdb_key(node->name, &key); domain_nbentry_dec(NULL, domain->domid); node->perms.p[0].id = priv_domid; node->acc.memory = 0; domain_nbentry_inc(NULL, priv_domid); - if (write_node_raw(NULL, &key, node, NODE_MODIFY, true)) { + if (write_node_raw(NULL, node->name, node, NODE_MODIFY, true)) { /* That's unfortunate. We only can try to continue. */ syslog(LOG_ERR, "error when moving orphaned node %s to dom0\n", diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c index 4a243369b0..1961aef0d7 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -228,7 +228,6 @@ int access_node(struct connection *conn, struct node *node, { struct accessed_node *i = NULL; struct transaction *trans; - TDB_DATA local_key; int ret; bool introduce = false; @@ -286,8 +285,7 @@ int access_node(struct connection *conn, struct node *node, i->generation = node->generation; i->check_gen = true; if (node->generation != NO_GENERATION) { - set_tdb_key(i->trans_name, &local_key); - ret = write_node_raw(conn, &local_key, node, + ret = write_node_raw(conn, i->trans_name, node, NODE_CREATE, true); if (ret) goto err; @@ -405,9 +403,9 @@ static int finalize_transaction(struct connection *conn, hdr->generation = ++generation; mode = (i->generation == NO_GENERATION) ? NODE_CREATE : NODE_MODIFY; - set_tdb_key(i->node, &key); - *is_corrupt |= do_tdb_write(conn, &key, &data, - NULL, mode, true); + *is_corrupt |= db_write(conn, i->node, + data.dptr, data.dsize, + NULL, mode, true); talloc_free(data.dptr); if (db_delete(conn, i->trans_name, NULL)) *is_corrupt = true; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:16:27 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:16:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572298.896270 (Exim 4.92) (envelope-from ) id 1qPzj8-0006eT-Vp; Sun, 30 Jul 2023 06:16:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572298.896270; Sun, 30 Jul 2023 06:16: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 1qPzj8-0006eM-St; Sun, 30 Jul 2023 06:16:26 +0000 Received: by outflank-mailman (input) for mailman id 572298; Sun, 30 Jul 2023 06:16:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzj7-0006e6-PB for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:16:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzj7-0003nW-OV for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:16:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzj7-0005aT-Nk for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=x5Yd2lvI+eRpQDM6emoOFkMNWSH9+pQkKl6+HXUZMs8=; b=JXEI1LVV/AqnO0mW/HGEBkYOpj /HBriClfnYgQ1s8APGHrawUeCAKt/fxheyaijhKNCKOISeMWLaLVuHqcTukW0hU6sxBK6SIzV0vcs 36+XdMCyTuosStEgyfeKSQlLDPYvr4tSd4htDoKVVPth9ghaiwQckR3HkeiviXw/hn2Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: switch get_acc_data() to use name instead of key Message-Id: Date: Sun, 30 Jul 2023 06:16:25 +0000 commit f56aa985babd6dad8b05cdbf213a15d7762f0835 Author: Juergen Gross AuthorDate: Mon Jul 24 13:02:28 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 27 22:02:02 2023 +0100 tools/xenstore: switch get_acc_data() to use name instead of key Eliminate further TDB_DATA usage by switching get_acc_data() and get_acc_domid() from a TDB key to the name of the node in the data base as a parameter. This is in preparation to replace TDB with a more simple data storage. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 2aa3d37c18..dab09b5236 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -566,19 +566,20 @@ void set_tdb_key(const char *name, TDB_DATA *key) key->dsize = strlen(name); } -static void get_acc_data(TDB_DATA *key, struct node_account_data *acc) +static void get_acc_data(const char *name, struct node_account_data *acc) { - TDB_DATA old_data; + TDB_DATA key, old_data; struct xs_tdb_record_hdr *hdr; if (acc->memory < 0) { - old_data = tdb_fetch(tdb_ctx, *key); + set_tdb_key(name, &key); + old_data = tdb_fetch(tdb_ctx, key); /* No check for error, as the node might not exist. */ if (old_data.dptr == NULL) { acc->memory = 0; } else { - trace_tdb("read %s size %zu\n", key->dptr, - old_data.dsize + key->dsize); + trace_tdb("read %s size %zu\n", name, + old_data.dsize + key.dsize); hdr = (void *)old_data.dptr; acc->memory = old_data.dsize; acc->domid = hdr->perms[0].id; @@ -593,11 +594,10 @@ static void get_acc_data(TDB_DATA *key, struct node_account_data *acc) * count prepended (e.g. 123/local/domain/...). So testing for the node's * key not to start with "/" or "@" is sufficient. */ -static unsigned int get_acc_domid(struct connection *conn, TDB_DATA *key, +static unsigned int get_acc_domid(struct connection *conn, const char *name, unsigned int domid) { - return (!conn || key->dptr[0] == '/' || key->dptr[0] == '@') - ? domid : conn->id; + return (!conn || name[0] == '/' || name[0] == '@') ? domid : conn->id; } int db_write(struct connection *conn, const char *db_name, void *data, @@ -618,9 +618,9 @@ int db_write(struct connection *conn, const char *db_name, void *data, else old_acc = *acc; - get_acc_data(&key, &old_acc); - old_domid = get_acc_domid(conn, &key, old_acc.domid); - new_domid = get_acc_domid(conn, &key, hdr->perms[0].id); + get_acc_data(db_name, &old_acc); + old_domid = get_acc_domid(conn, db_name, old_acc.domid); + new_domid = get_acc_domid(conn, db_name, hdr->perms[0].id); /* * Don't check for ENOENT, as we want to be able to switch orphaned @@ -675,7 +675,7 @@ int db_delete(struct connection *conn, const char *name, acc->memory = -1; } - get_acc_data(&key, acc); + get_acc_data(name, acc); if (tdb_delete(tdb_ctx, key)) { errno = EIO; @@ -684,7 +684,7 @@ int db_delete(struct connection *conn, const char *name, trace_tdb("delete %s\n", name); if (acc->memory) { - domid = get_acc_domid(conn, &key, acc->domid); + domid = get_acc_domid(conn, name, acc->domid); domain_memory_add_nochk(conn, domid, -acc->memory - key.dsize); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:16:37 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:16:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572299.896273 (Exim 4.92) (envelope-from ) id 1qPzjJ-0006hn-0d; Sun, 30 Jul 2023 06:16:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572299.896273; Sun, 30 Jul 2023 06:16: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 1qPzjI-0006hg-UP; Sun, 30 Jul 2023 06:16:36 +0000 Received: by outflank-mailman (input) for mailman id 572299; Sun, 30 Jul 2023 06:16:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzjH-0006hL-SM for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:16:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzjH-0003nz-Rh for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:16:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzjH-0005b0-Qx for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=GVQBwf/GH3zO6QmzgSsYB5H3LsoU3W8poY1H4hnmjFU=; b=as1ywx7yER7Wse+MBpWzoR/fta UeTza8t5mFFpIyL8rU+MEhi6peiUl1em5puMvcrDJsQS/k5gQp38RRO+0dHjX9dVQTtu9Sl6Ad0jR RSG1QUOOMvGAf9SIB0+RbSXApDksEAr7cxRQi5dwDqWZ6UoQN9zBvpeQ4Pvc9Xd5NKlQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: add wrapper for tdb_fetch() Message-Id: Date: Sun, 30 Jul 2023 06:16:35 +0000 commit 3e55f826f4dc0dfd8a67525181c68189243539cc Author: Juergen Gross AuthorDate: Mon Jul 24 13:02:29 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 27 22:02:02 2023 +0100 tools/xenstore: add wrapper for tdb_fetch() Add a wrapper function for tdb_fetch taking the name of the node in the data base as a parameter. Let it return a data pointer and the length of the data via a length pointer provided as additional parameter. Move logging of the TDB access from the callers into the wrapper. This enables to make set_tdb_key() and tdb_ctx static. This is in preparation to replace TDB with a more simple data storage. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 55 ++++++++++++++++++++-------------- tools/xenstore/xenstored_core.h | 3 +- tools/xenstore/xenstored_transaction.c | 31 +++++++------------ 3 files changed, 44 insertions(+), 45 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index dab09b5236..a12ede147c 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -85,7 +85,7 @@ bool keep_orphans = false; static int reopen_log_pipe[2]; static int reopen_log_pipe0_pollfd_idx = -1; char *tracefile = NULL; -TDB_CONTEXT *tdb_ctx = NULL; +static TDB_CONTEXT *tdb_ctx = NULL; unsigned int trace_flags = TRACE_OBJ | TRACE_IO; static const char *sockmsg_string(enum xsd_sockmsg_type type); @@ -556,7 +556,7 @@ static void initialize_fds(int *p_sock_pollfd_idx, int *ptimeout) } } -void set_tdb_key(const char *name, TDB_DATA *key) +static void set_tdb_key(const char *name, TDB_DATA *key) { /* * Dropping const is fine here, as the key will never be modified @@ -566,25 +566,39 @@ void set_tdb_key(const char *name, TDB_DATA *key) key->dsize = strlen(name); } +struct xs_tdb_record_hdr *db_fetch(const char *db_name, size_t *size) +{ + TDB_DATA key, data; + + set_tdb_key(db_name, &key); + data = tdb_fetch(tdb_ctx, key); + if (!data.dptr) { + errno = (tdb_error(tdb_ctx) == TDB_ERR_NOEXIST) ? ENOENT : EIO; + *size = 0; + } else { + *size = data.dsize; + trace_tdb("read %s size %zu\n", db_name, + *size + strlen(db_name)); + } + + return (struct xs_tdb_record_hdr *)data.dptr; +} + static void get_acc_data(const char *name, struct node_account_data *acc) { - TDB_DATA key, old_data; + size_t size; struct xs_tdb_record_hdr *hdr; if (acc->memory < 0) { - set_tdb_key(name, &key); - old_data = tdb_fetch(tdb_ctx, key); + hdr = db_fetch(name, &size); /* No check for error, as the node might not exist. */ - if (old_data.dptr == NULL) { + if (hdr == NULL) { acc->memory = 0; } else { - trace_tdb("read %s size %zu\n", name, - old_data.dsize + key.dsize); - hdr = (void *)old_data.dptr; - acc->memory = old_data.dsize; + acc->memory = size; acc->domid = hdr->perms[0].id; } - talloc_free(old_data.dptr); + talloc_free(hdr); } } @@ -698,7 +712,7 @@ int db_delete(struct connection *conn, const char *name, struct node *read_node(struct connection *conn, const void *ctx, const char *name) { - TDB_DATA key, data; + size_t size; struct xs_tdb_record_hdr *hdr; struct node *node; const char *db_name; @@ -717,29 +731,24 @@ struct node *read_node(struct connection *conn, const void *ctx, } db_name = transaction_prepend(conn, name); - set_tdb_key(db_name, &key); + hdr = db_fetch(db_name, &size); - data = tdb_fetch(tdb_ctx, key); - - if (data.dptr == NULL) { - if (tdb_error(tdb_ctx) == TDB_ERR_NOEXIST) { + if (hdr == NULL) { + if (errno == ENOENT) { node->generation = NO_GENERATION; err = access_node(conn, node, NODE_ACCESS_READ, NULL); errno = err ? : ENOENT; } else { - log("TDB error on read: %s", tdb_errorstr(tdb_ctx)); + log("DB error on read: %s", strerror(errno)); errno = EIO; } goto error; } - trace_tdb("read %s size %zu\n", key.dptr, data.dsize + key.dsize); - node->parent = NULL; - talloc_steal(node, data.dptr); + talloc_steal(node, hdr); /* Datalen, childlen, number of permissions */ - hdr = (void *)data.dptr; node->generation = hdr->generation; node->perms.num = hdr->num_perms; node->datalen = hdr->datalen; @@ -748,7 +757,7 @@ struct node *read_node(struct connection *conn, const void *ctx, /* Permissions are struct xs_permissions. */ node->perms.p = hdr->perms; node->acc.domid = get_node_owner(node); - node->acc.memory = data.dsize; + node->acc.memory = size; if (domain_adjust_node_perms(node)) goto error; diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 875ee5192b..f5aa8d51a0 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -315,7 +315,6 @@ do { \ trace("tdb: " __VA_ARGS__); \ } while (0) -extern TDB_CONTEXT *tdb_ctx; extern int dom0_domid; extern int dom0_event; extern int priv_domid; @@ -364,7 +363,7 @@ extern xengnttab_handle **xgt_handle; int remember_string(struct hashtable *hash, const char *str); /* Data base access functions. */ -void set_tdb_key(const char *name, TDB_DATA *key); +struct xs_tdb_record_hdr *db_fetch(const char *db_name, size_t *size); int db_write(struct connection *conn, const char *db_name, void *data, size_t size, struct node_account_data *acc, enum write_node_mode mode, bool no_quota_check); diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c index 1961aef0d7..1981d1d55d 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -356,25 +356,21 @@ static int finalize_transaction(struct connection *conn, struct transaction *trans, bool *is_corrupt) { struct accessed_node *i, *n; - TDB_DATA key, ta_key, data; + size_t size; struct xs_tdb_record_hdr *hdr; uint64_t gen; list_for_each_entry_safe(i, n, &trans->accessed, list) { if (i->check_gen) { - set_tdb_key(i->node, &key); - data = tdb_fetch(tdb_ctx, key); - hdr = (void *)data.dptr; - if (!data.dptr) { - if (tdb_error(tdb_ctx) != TDB_ERR_NOEXIST) - return EIO; + hdr = db_fetch(i->node, &size); + if (!hdr) { + if (errno != ENOENT) + return errno; gen = NO_GENERATION; } else { - trace_tdb("read %s size %zu\n", key.dptr, - key.dsize + data.dsize); gen = hdr->generation; } - talloc_free(data.dptr); + talloc_free(hdr); if (i->generation != gen) return EAGAIN; } @@ -392,21 +388,16 @@ static int finalize_transaction(struct connection *conn, while ((i = list_top(&trans->accessed, struct accessed_node, list))) { if (i->ta_node) { - set_tdb_key(i->trans_name, &ta_key); - data = tdb_fetch(tdb_ctx, ta_key); - if (data.dptr) { + hdr = db_fetch(i->trans_name, &size); + if (hdr) { enum write_node_mode mode; - trace_tdb("read %s size %zu\n", ta_key.dptr, - ta_key.dsize + data.dsize); - hdr = (void *)data.dptr; hdr->generation = ++generation; mode = (i->generation == NO_GENERATION) ? NODE_CREATE : NODE_MODIFY; - *is_corrupt |= db_write(conn, i->node, - data.dptr, data.dsize, - NULL, mode, true); - talloc_free(data.dptr); + *is_corrupt |= db_write(conn, i->node, hdr, + size, NULL, mode, true); + talloc_free(hdr); if (db_delete(conn, i->trans_name, NULL)) *is_corrupt = true; } else { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:16:47 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:16:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572300.896278 (Exim 4.92) (envelope-from ) id 1qPzjT-0006kV-2j; Sun, 30 Jul 2023 06:16:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572300.896278; Sun, 30 Jul 2023 06: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 1qPzjS-0006kN-W1; Sun, 30 Jul 2023 06:16:46 +0000 Received: by outflank-mailman (input) for mailman id 572300; Sun, 30 Jul 2023 06:16:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzjR-0006kE-Vm for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:16:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzjR-0003oF-Ut for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:16:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzjR-0005cu-Tv for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=s0BuNfeDGPtK2Z8MpIK8Hhuo5cOtu7Byde/uU4RkA2w=; b=QJvfZrqPrLlHVhHhZpcTvWlatp PQ4DmS9x+JIC3H5DrXIlqlxQYyAGRue1QMlrCecQDAdW6OrXrZTT98/N76TjskVQCh2G0yyiZKXi/ oFKikQpvaRZJ7PtMUqtW8Roxyx4yIBCj3EvZevwCHd06sYI2+LMVF+vGzs9azdXA2ZnQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Move TEE mediators in a kconfig submenu Message-Id: Date: Sun, 30 Jul 2023 06:16:45 +0000 commit 48b52e9428167ae33ca04ba66bb07dbd04a9585e Author: Bertrand Marquis AuthorDate: Tue Jul 25 16:42:37 2023 +0100 Commit: Julien Grall CommitDate: Thu Jul 27 22:59:57 2023 +0100 xen/arm: Move TEE mediators in a kconfig submenu Rework TEE mediators to put them under a submenu in Kconfig. The submenu is only visible if UNSUPPORTED is activated as all currently existing mediators are UNSUPPORTED. While there rework a bit the configuration so that OP-TEE and FF-A mediators are selecting the generic TEE interface instead of depending on it. Make the TEE option hidden as it is of no interest for anyone to select it without one of the mediators so having them select it instead should be enough. Signed-off-by: Bertrand Marquis Reviewed-by: Julien Grall --- xen/arch/arm/Kconfig | 7 ------- xen/arch/arm/tee/Kconfig | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 439cc94f33..fd57a82dd2 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -175,13 +175,6 @@ config ARM64_BTI Branch Target Identification support. This feature is not supported in Xen. -config TEE - bool "Enable TEE mediators support (UNSUPPORTED)" if UNSUPPORTED - default n - help - This option enables generic TEE mediators support. It allows guests - to access real TEE via one of TEE mediators implemented in XEN. - source "arch/arm/tee/Kconfig" config STATIC_SHM diff --git a/xen/arch/arm/tee/Kconfig b/xen/arch/arm/tee/Kconfig index db3ea78faa..c5b0f88d75 100644 --- a/xen/arch/arm/tee/Kconfig +++ b/xen/arch/arm/tee/Kconfig @@ -1,7 +1,14 @@ +menu "TEE mediators" + visible if UNSUPPORTED + +config TEE + bool + default n + config OPTEE - bool "Enable OP-TEE mediator" + bool "Enable OP-TEE mediator (UNSUPPORTED)" if UNSUPPORTED default n - depends on TEE + select TEE help Enable the OP-TEE mediator. It allows guests to access OP-TEE running on your platform. This requires @@ -12,10 +19,14 @@ config OPTEE config FFA bool "Enable FF-A mediator support (UNSUPPORTED)" if UNSUPPORTED default n - depends on ARM_64 && TEE + depends on ARM_64 + select TEE help This option enables a minimal FF-A mediator. The mediator is generic as it follows the FF-A specification [1], but it only implements a small subset of the specification. [1] https://developer.arm.com/documentation/den0077/latest + +endmenu + -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:16:57 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:16:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572301.896282 (Exim 4.92) (envelope-from ) id 1qPzjd-0006nn-5V; Sun, 30 Jul 2023 06:16:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572301.896282; Sun, 30 Jul 2023 06: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 1qPzjd-0006ng-2W; Sun, 30 Jul 2023 06:16:57 +0000 Received: by outflank-mailman (input) for mailman id 572301; Sun, 30 Jul 2023 06:16:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzjc-0006nO-2Z for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:16:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzjc-0003oM-1s for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:16:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzjc-0005dL-19 for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=aCPXHJxgciDTasaTPbehV4+GD8LWzo6p0+YMlb0KtD0=; b=sENNwReBvgyKj/X614A3J7RSUa QJYxOFbeXSBQkiOmWL5hj/9Wqrgw9tHqDQkkcHKiCE1ceMD7R7HK/5Nh1OJTKLjM0/+P74P7V8wlc MC/AuT4eaztutRNI918VR1JEsgfOhN0LGuVqc22IMuln7Tk2I3IFsOOOTrvdplhtS2HU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] device_tree: address violations of MISRA C:2012 Rules 8.2 and 8.3 Message-Id: Date: Sun, 30 Jul 2023 06:16:56 +0000 commit 3e5918d87a09873fcfbb177e93140ec3fabe574c Author: Federico Serafini AuthorDate: Tue Jul 25 15:56:44 2023 +0200 Commit: Julien Grall CommitDate: Thu Jul 27 23:02:25 2023 +0100 device_tree: address violations of MISRA C:2012 Rules 8.2 and 8.3 Give a name to unnamed parameters thus addressing violations of MISRA C:2012 Rule 8.2 ("Function types shall be in prototype form with named parameters"). Keep consistency between parameter names and types used in function declarations and the ones used in the corresponding function definitions, thus addressing violations of MISRA C:2012 Rule 8.3 ("All declarations of an object or function shall use the same names and type qualifiers"). No functional changes. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini --- xen/common/device_tree.c | 16 ++++++++-------- xen/include/xen/device_tree.h | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 0677193ab3..0522fdf976 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -85,11 +85,11 @@ struct dt_bus unsigned int (*get_flags)(const __be32 *addr); }; -void dt_get_range(const __be32 **cell, const struct dt_device_node *np, +void dt_get_range(const __be32 **cellp, const struct dt_device_node *np, u64 *address, u64 *size) { - *address = dt_next_cell(dt_n_addr_cells(np), cell); - *size = dt_next_cell(dt_n_size_cells(np), cell); + *address = dt_next_cell(dt_n_addr_cells(np), cellp); + *size = dt_next_cell(dt_n_size_cells(np), cellp); } void dt_set_cell(__be32 **cellp, int size, u64 val) @@ -993,9 +993,9 @@ int dt_device_get_paddr(const struct dt_device_node *dev, unsigned int index, } int dt_for_each_range(const struct dt_device_node *dev, - int (*cb)(const struct dt_device_node *, + int (*cb)(const struct dt_device_node *dev, uint64_t addr, uint64_t length, - void *), + void *data), void *data) { const struct dt_device_node *parent = NULL; @@ -1197,9 +1197,9 @@ unsigned int dt_number_of_address(const struct dt_device_node *dev) } int dt_for_each_irq_map(const struct dt_device_node *dev, - int (*cb)(const struct dt_device_node *, - const struct dt_irq *, - void *), + int (*cb)(const struct dt_device_node *dev, + const struct dt_irq *dt_irq, + void *data), void *data) { const struct dt_device_node *ipar, *tnode, *old = NULL; diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index c2eada7489..1d79e23b28 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -538,7 +538,7 @@ bool_t dt_machine_is_compatible(const char *compat); * Returns a node pointer with refcount incremented, use * of_node_put() on it when done. */ -struct dt_device_node *dt_find_node_by_name(struct dt_device_node *node, +struct dt_device_node *dt_find_node_by_name(struct dt_device_node *from, const char *name); /** @@ -622,12 +622,12 @@ unsigned int dt_number_of_irq(const struct dt_device_node *device); /** * dt_number_of_address - Get the number of addresses for a device - * @device: the device whose number of address is to be retrieved + * @dev: the device whose number of address is to be retrieved * * Return the number of address for this device or 0 if there is no * address or an error occurred. */ -unsigned int dt_number_of_address(const struct dt_device_node *device); +unsigned int dt_number_of_address(const struct dt_device_node *dev); /** * dt_device_get_irq - Resolve an interrupt for a device @@ -639,7 +639,7 @@ unsigned int dt_number_of_address(const struct dt_device_node *device); * device-tree node. It's the high level pendant to dt_device_get_raw_irq(). */ int dt_device_get_irq(const struct dt_device_node *device, unsigned int index, - struct dt_irq *irq); + struct dt_irq *out_irq); /** * dt_device_get_raw_irq - Resolve an interrupt for a device without translation @@ -652,7 +652,7 @@ int dt_device_get_irq(const struct dt_device_node *device, unsigned int index, */ int dt_device_get_raw_irq(const struct dt_device_node *device, unsigned int index, - struct dt_raw_irq *irq); + struct dt_raw_irq *out_irq); /** * dt_irq_translate - Translate an irq @@ -668,9 +668,9 @@ int dt_irq_translate(const struct dt_raw_irq *raw, struct dt_irq *out_irq); * @data: Caller data passed to callback */ int dt_for_each_irq_map(const struct dt_device_node *dev, - int (*cb)(const struct dt_device_node *, - const struct dt_irq *, - void *), + int (*cb)(const struct dt_device_node *dev, + const struct dt_irq *dt_irq, + void *data), void *data); /** @@ -680,9 +680,9 @@ int dt_for_each_irq_map(const struct dt_device_node *dev, * @data: Caller data passed to callback */ int dt_for_each_range(const struct dt_device_node *dev, - int (*cb)(const struct dt_device_node *, + int (*cb)(const struct dt_device_node *dev, uint64_t addr, uint64_t length, - void *), + void *data), void *data); /** -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Jul 30 06:17:07 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Jul 2023 06:17:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.572302.896285 (Exim 4.92) (envelope-from ) id 1qPzjn-0006qz-6Y; Sun, 30 Jul 2023 06:17:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 572302.896285; Sun, 30 Jul 2023 06: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 1qPzjn-0006qs-44; Sun, 30 Jul 2023 06:17:07 +0000 Received: by outflank-mailman (input) for mailman id 572302; Sun, 30 Jul 2023 06:17:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzjm-0006qa-5b for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:17:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qPzjm-0003og-4t for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06:17:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qPzjm-0005dt-4C for xen-changelog@lists.xenproject.org; Sun, 30 Jul 2023 06: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=McGBgk2oYqUmggi6+93WQ8tJmTbxaYgB2GfvRONdNzM=; b=ar68Ca48i0TbmJ8Glwa3vhaoaY 6mhFcfLLgoPnsLUjc93cjoNiCZ5sudnmx99GehIC8PNa8ekDj4MhwT2ZKSi5fvACUasVsS6Jav2Y/ Iud2Y1XlXDHS6WM9YpmFv5XPiHtJjQYK927SjKX3b6Jpf8YZArIGiQUiKiOnXkfErrkw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm32: head: Widen the use of the temporary mapping Message-Id: Date: Sun, 30 Jul 2023 06:17:06 +0000 commit 5e213f0f4d2ca4f286f8423316ed8090bcc5fef8 Author: Julien Grall AuthorDate: Mon Jul 24 11:14:58 2023 +0100 Commit: Julien Grall CommitDate: Thu Jul 27 23:05:53 2023 +0100 xen/arm32: head: Widen the use of the temporary mapping At the moment, the temporary mapping is only used when the virtual runtime region of Xen is clashing with the physical region. In follow-up patches, we will rework how secondary CPU bring-up works and it will be convenient to use the fixmap area for accessing the root page-table (it is per-cpu). Rework the code to use temporary mapping when the Xen physical address is not overlapping with the temporary mapping. This also has the advantage to simplify the logic to identity map Xen. Signed-off-by: Julien Grall ---- This patch was originally part of [1] but it was reverted due to Xen not booting on the Arndale. The second patch of this series is fixing it (confirmed by booting on the Arndale). So I am including this patch. [1] https://lore.kernel.org/xen-devel/20230416143211.72227-1-julien@xen.org/ Changes in new v2: - Rebase - Drop reviewed-by tags Changelog from the previous series: Changes in v6: - Add Henry's reviewed-by and tested-by tag - Add Michal's reviewed-by - Add newline in remove_identity_mapping for clarity Changes in v5: - Fix typo in a comment - No need to link boot_{second, third}_id again if we need to create a temporary area. Changes in v3: - Resolve conflicts after switching from "ldr rX,