From: "Jan Beulich" Subject: [PATCH] gnttab: fix and clean up gnttab_set_version() Date: Wed, 17 Jun 2015 13:53:15 +0100 Message-ID: <558189DB0200007800086205@mail.emea.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part7A4EA3AB.1__=" Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5CqE-0001rL-TC for xen-devel@lists.xenproject.org; Wed, 17 Jun 2015 12:53:19 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel Cc: Ian Campbell , Keir Fraser , Ian Jackson , Tim Deegan List-Id: xen-devel@lists.xenproject.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part7A4EA3AB.1__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline - don't silently truncate frame numbers - drop pointless nr_grant_entries() check from loop over reserved entries (adding suitable BUILD_BUG_ON()s to validate that) - adjust types - rename d to currd - formatting Signed-off-by: Jan Beulich --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -356,10 +356,16 @@ static unsigned int nr_grant_entries(str { switch ( gt->gt_version ) { +#define f2e(nr, ver) (((nr) << PAGE_SHIFT) / sizeof(grant_entry_v##ver##_t= )) case 1: - return (nr_grant_frames(gt) << PAGE_SHIFT) / sizeof(grant_entry_v1= _t); + BUILD_BUG_ON(f2e(INITIAL_NR_GRANT_FRAMES, 1) < + GNTTAB_NR_RESERVED_ENTRIES); + return f2e(nr_grant_frames(gt), 1); case 2: - return (nr_grant_frames(gt) << PAGE_SHIFT) / sizeof(grant_entry_v2= _t); + BUILD_BUG_ON(f2e(INITIAL_NR_GRANT_FRAMES, 2) < + GNTTAB_NR_RESERVED_ENTRIES); + return f2e(nr_grant_frames(gt), 2); +#undef f2e } =20 return 0; @@ -2453,17 +2459,17 @@ static long gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t) uop) { gnttab_set_version_t op; - struct domain *d =3D current->domain; - struct grant_table *gt =3D d->grant_table; + struct domain *currd =3D current->domain; + struct grant_table *gt =3D currd->grant_table; grant_entry_v1_t reserved_entries[GNTTAB_NR_RESERVED_ENTRIES]; - long res; - int i; + int res; + unsigned int i; =20 - if (copy_from_guest(&op, uop, 1)) + if ( copy_from_guest(&op, uop, 1) ) return -EFAULT; =20 res =3D -EINVAL; - if (op.version !=3D 1 && op.version !=3D 2) + if ( op.version !=3D 1 && op.version !=3D 2 ) goto out; =20 res =3D 0; @@ -2471,10 +2477,12 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARA goto out; =20 write_lock(>->lock); - /* Make sure that the grant table isn't currently in use when we - change the version number, except for the first 8 entries which - are allowed to be in use (xenstore/xenconsole keeps them mapped). - (You need to change the version number for e.g. kexec.) */ + /* + * Make sure that the grant table isn't currently in use when we + * change the version number, except for the first 8 entries which + * are allowed to be in use (xenstore/xenconsole keeps them mapped). + * (You need to change the version number for e.g. kexec.) + */ for ( i =3D GNTTAB_NR_RESERVED_ENTRIES; i < nr_grant_entries(gt); i++ = ) { if ( read_atomic(&_active_entry(gt, i).pin) !=3D 0 ) @@ -2487,76 +2495,106 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARA } } =20 - /* XXX: If we're going to version 2, we could maybe shrink the - active grant table here. */ - - if ( op.version =3D=3D 2 && gt->gt_version < 2 ) + switch ( gt->gt_version ) { - res =3D gnttab_populate_status_frames(d, gt, nr_grant_frames(gt));= - if ( res < 0) - goto out_unlock; + case 0: + if ( op.version =3D=3D 2 ) + { + case 1: + /* XXX: We could maybe shrink the active grant table here. */ + res =3D gnttab_populate_status_frames(currd, gt, nr_grant_fram= es(gt)); + if ( res < 0) + goto out_unlock; + } + break; + case 2: + for ( i =3D 0; i < GNTTAB_NR_RESERVED_ENTRIES; i++ ) + { + if ( ((shared_entry_v2(gt, i).hdr.flags & GTF_type_mask) = =3D=3D + GTF_permit_access) && + (shared_entry_v2(gt, i).full_page.frame >> 32) ) + { + gdprintk(XENLOG_WARNING, + "tried to change grant table version to 1 with = non-representable entries\n"); + res =3D -ERANGE; + goto out_unlock; + } + } + break; } =20 - /* Preserve the first 8 entries (toolstack reserved grants) */ - if ( gt->gt_version =3D=3D 1 ) - { - memcpy(reserved_entries, &shared_entry_v1(gt, 0), sizeof(reserved_= entries)); - } - else if ( gt->gt_version =3D=3D 2 ) + /* Preserve the first 8 entries (toolstack reserved grants). */ + switch ( gt->gt_version ) { - for ( i =3D 0; i < GNTTAB_NR_RESERVED_ENTRIES && i < nr_grant_entr= ies(gt); i++ ) + case 1: + memcpy(reserved_entries, &shared_entry_v1(gt, 0), + sizeof(reserved_entries)); + break; + case 2: + for ( i =3D 0; i < GNTTAB_NR_RESERVED_ENTRIES; i++ ) { - int flags =3D status_entry(gt, i); - flags |=3D shared_entry_v2(gt, i).hdr.flags; - if ((flags & GTF_type_mask) =3D=3D GTF_permit_access) + unsigned int flags =3D shared_entry_v2(gt, i).hdr.flags; + + switch ( flags & GTF_type_mask ) { - reserved_entries[i].flags =3D flags; + case GTF_permit_access: + reserved_entries[i].flags =3D flags | status_entry(gt, = i); reserved_entries[i].domid =3D shared_entry_v2(gt, = i).hdr.domid; reserved_entries[i].frame =3D shared_entry_v2(gt, = i).full_page.frame; - } - else - { - if ((flags & GTF_type_mask) !=3D GTF_invalid) - gdprintk(XENLOG_INFO, "d%d: bad flags %x in grant %d = when switching grant version\n", - d->domain_id, flags, i); + break; + default: + gdprintk(XENLOG_INFO, + "bad flags %x in grant %u when switching = version\n", + flags, i); + /* fall through */ + case GTF_invalid: memset(&reserved_entries[i], 0, sizeof(reserved_entries[i]= )); + break; } } + break; } =20 if ( op.version < 2 && gt->gt_version =3D=3D 2 ) - gnttab_unpopulate_status_frames(d, gt); + gnttab_unpopulate_status_frames(currd, gt); =20 - /* Make sure there's no crud left over in the table from the - old version. */ + /* Make sure there's no crud left over from the old version. */ for ( i =3D 0; i < nr_grant_frames(gt); i++ ) clear_page(gt->shared_raw[i]); =20 - /* Restore the first 8 entries (toolstack reserved grants) */ - if ( gt->gt_version !=3D 0 && op.version =3D=3D 1 ) - { - memcpy(&shared_entry_v1(gt, 0), reserved_entries, sizeof(reserved_= entries)); - } - else if ( gt->gt_version !=3D 0 && op.version =3D=3D 2 ) + /* Restore the first 8 entries (toolstack reserved grants). */ + if ( gt->gt_version ) { - for ( i =3D 0; i < GNTTAB_NR_RESERVED_ENTRIES; i++ ) + switch ( op.version ) { - status_entry(gt, i) =3D reserved_entries[i].flags & (GTF_readi= ng|GTF_writing); - shared_entry_v2(gt, i).hdr.flags =3D reserved_entries[i].flags= & ~(GTF_reading|GTF_writing); - shared_entry_v2(gt, i).hdr.domid =3D reserved_entries[i].domid= ; - shared_entry_v2(gt, i).full_page.frame =3D reserved_entries[i]= .frame; + case 1: + memcpy(&shared_entry_v1(gt, 0), reserved_entries, sizeof(reser= ved_entries)); + break; + case 2: + for ( i =3D 0; i < GNTTAB_NR_RESERVED_ENTRIES; i++ ) + { + status_entry(gt, i) =3D + reserved_entries[i].flags & (GTF_reading | GTF_writing= ); + shared_entry_v2(gt, i).hdr.flags =3D + reserved_entries[i].flags & ~(GTF_reading | GTF_writin= g); + shared_entry_v2(gt, i).hdr.domid =3D + reserved_entries[i].domid; + shared_entry_v2(gt, i).full_page.frame =3D + reserved_entries[i].frame; + } + break; } } =20 gt->gt_version =3D op.version; =20 -out_unlock: + out_unlock: write_unlock(>->lock); =20 -out: + out: op.version =3D gt->gt_version; =20 - if (__copy_to_guest(uop, &op, 1)) + if ( __copy_to_guest(uop, &op, 1) ) res =3D -EFAULT; =20 return res; --=__Part7A4EA3AB.1__= Content-Type: text/plain; name="gnttab-set-version.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="gnttab-set-version.patch" gnttab: fix and clean up gnttab_set_version()=0A=0A- don't silently = truncate frame numbers=0A- drop pointless nr_grant_entries() check from = loop over reserved=0A entries (adding suitable BUILD_BUG_ON()s to = validate that)=0A- adjust types=0A- rename d to currd=0A- formatting=0A=0AS= igned-off-by: Jan Beulich =0A=0A--- a/xen/common/grant_t= able.c=0A+++ b/xen/common/grant_table.c=0A@@ -356,10 +356,16 @@ static = unsigned int nr_grant_entries(str=0A {=0A switch ( gt->gt_version )=0A = {=0A+#define f2e(nr, ver) (((nr) << PAGE_SHIFT) / sizeof(grant_entry_v#= #ver##_t))=0A case 1:=0A- return (nr_grant_frames(gt) << = PAGE_SHIFT) / sizeof(grant_entry_v1_t);=0A+ BUILD_BUG_ON(f2e(INITIAL= _NR_GRANT_FRAMES, 1) <=0A+ GNTTAB_NR_RESERVED_ENTRIES);= =0A+ return f2e(nr_grant_frames(gt), 1);=0A case 2:=0A- = return (nr_grant_frames(gt) << PAGE_SHIFT) / sizeof(grant_entry_v2_t);=0A+ = BUILD_BUG_ON(f2e(INITIAL_NR_GRANT_FRAMES, 2) <=0A+ = GNTTAB_NR_RESERVED_ENTRIES);=0A+ return f2e(nr_grant_frames(gt), = 2);=0A+#undef f2e=0A }=0A =0A return 0;=0A@@ -2453,17 +2459,17 @@ = static long=0A gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version= _t) uop)=0A {=0A gnttab_set_version_t op;=0A- struct domain *d =3D = current->domain;=0A- struct grant_table *gt =3D d->grant_table;=0A+ = struct domain *currd =3D current->domain;=0A+ struct grant_table *gt = =3D currd->grant_table;=0A grant_entry_v1_t reserved_entries[GNTTAB_NR_= RESERVED_ENTRIES];=0A- long res;=0A- int i;=0A+ int res;=0A+ = unsigned int i;=0A =0A- if (copy_from_guest(&op, uop, 1))=0A+ if ( = copy_from_guest(&op, uop, 1) )=0A return -EFAULT;=0A =0A res = =3D -EINVAL;=0A- if (op.version !=3D 1 && op.version !=3D 2)=0A+ if = ( op.version !=3D 1 && op.version !=3D 2 )=0A goto out;=0A =0A = res =3D 0;=0A@@ -2471,10 +2477,12 @@ gnttab_set_version(XEN_GUEST_HANDLE_PA= RA=0A goto out;=0A =0A write_lock(>->lock);=0A- /* Make = sure that the grant table isn't currently in use when we=0A- change = the version number, except for the first 8 entries which=0A- are = allowed to be in use (xenstore/xenconsole keeps them mapped).=0A- = (You need to change the version number for e.g. kexec.) */=0A+ /*=0A+ = * Make sure that the grant table isn't currently in use when we=0A+ = * change the version number, except for the first 8 entries which=0A+ = * are allowed to be in use (xenstore/xenconsole keeps them mapped).=0A+ = * (You need to change the version number for e.g. kexec.)=0A+ */=0A = for ( i =3D GNTTAB_NR_RESERVED_ENTRIES; i < nr_grant_entries(gt); i++ = )=0A {=0A if ( read_atomic(&_active_entry(gt, i).pin) !=3D 0 = )=0A@@ -2487,76 +2495,106 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARA=0A = }=0A }=0A =0A- /* XXX: If we're going to version 2, we could = maybe shrink the=0A- active grant table here. */=0A-=0A- if ( = op.version =3D=3D 2 && gt->gt_version < 2 )=0A+ switch ( gt->gt_version = )=0A {=0A- res =3D gnttab_populate_status_frames(d, gt, = nr_grant_frames(gt));=0A- if ( res < 0)=0A- goto = out_unlock;=0A+ case 0:=0A+ if ( op.version =3D=3D 2 )=0A+ = {=0A+ case 1:=0A+ /* XXX: We could maybe shrink the active = grant table here. */=0A+ res =3D gnttab_populate_status_frames(c= urrd, gt, nr_grant_frames(gt));=0A+ if ( res < 0)=0A+ = goto out_unlock;=0A+ }=0A+ break;=0A+ case 2:=0A+ = for ( i =3D 0; i < GNTTAB_NR_RESERVED_ENTRIES; i++ )=0A+ {=0A+ = if ( ((shared_entry_v2(gt, i).hdr.flags & GTF_type_mask) = =3D=3D=0A+ GTF_permit_access) &&=0A+ = (shared_entry_v2(gt, i).full_page.frame >> 32) )=0A+ {=0A+ = gdprintk(XENLOG_WARNING,=0A+ "tried to = change grant table version to 1 with non-representable entries\n");=0A+ = res =3D -ERANGE;=0A+ goto out_unlock;=0A+ = }=0A+ }=0A+ break;=0A }=0A =0A- /* Preserve the = first 8 entries (toolstack reserved grants) */=0A- if ( gt->gt_version = =3D=3D 1 )=0A- {=0A- memcpy(reserved_entries, &shared_entry_v1(gt= , 0), sizeof(reserved_entries));=0A- }=0A- else if ( gt->gt_version = =3D=3D 2 )=0A+ /* Preserve the first 8 entries (toolstack reserved = grants). */=0A+ switch ( gt->gt_version )=0A {=0A- for ( i = =3D 0; i < GNTTAB_NR_RESERVED_ENTRIES && i < nr_grant_entries(gt); i++ = )=0A+ case 1:=0A+ memcpy(reserved_entries, &shared_entry_v1(gt, = 0),=0A+ sizeof(reserved_entries));=0A+ break;=0A+ = case 2:=0A+ for ( i =3D 0; i < GNTTAB_NR_RESERVED_ENTRIES; i++ )=0A = {=0A- int flags =3D status_entry(gt, i);=0A- = flags |=3D shared_entry_v2(gt, i).hdr.flags;=0A- if ((flags & = GTF_type_mask) =3D=3D GTF_permit_access)=0A+ unsigned int flags = =3D shared_entry_v2(gt, i).hdr.flags;=0A+=0A+ switch ( flags & = GTF_type_mask )=0A {=0A- reserved_entries[i].fla= gs =3D flags;=0A+ case GTF_permit_access:=0A+ = reserved_entries[i].flags =3D flags | status_entry(gt, i);=0A = reserved_entries[i].domid =3D shared_entry_v2(gt, i).hdr.domid;=0A = reserved_entries[i].frame =3D shared_entry_v2(gt, i).full_page.f= rame;=0A- }=0A- else=0A- {=0A- = if ((flags & GTF_type_mask) !=3D GTF_invalid)=0A- = gdprintk(XENLOG_INFO, "d%d: bad flags %x in grant %d when switching grant = version\n",=0A- d->domain_id, flags, i);=0A+ = break;=0A+ default:=0A+ gdprintk(XENLO= G_INFO,=0A+ "bad flags %x in grant %u when = switching version\n",=0A+ flags, i);=0A+ = /* fall through */=0A+ case GTF_invalid:=0A = memset(&reserved_entries[i], 0, sizeof(reserved_entries[i]));=0A+ = break;=0A }=0A }=0A+ break;=0A }=0A = =0A if ( op.version < 2 && gt->gt_version =3D=3D 2 )=0A- = gnttab_unpopulate_status_frames(d, gt);=0A+ gnttab_unpopulate_status= _frames(currd, gt);=0A =0A- /* Make sure there's no crud left over in = the table from the=0A- old version. */=0A+ /* Make sure there's = no crud left over from the old version. */=0A for ( i =3D 0; i < = nr_grant_frames(gt); i++ )=0A clear_page(gt->shared_raw[i]);=0A = =0A- /* Restore the first 8 entries (toolstack reserved grants) */=0A- = if ( gt->gt_version !=3D 0 && op.version =3D=3D 1 )=0A- {=0A- = memcpy(&shared_entry_v1(gt, 0), reserved_entries, sizeof(reserved_entries))= ;=0A- }=0A- else if ( gt->gt_version !=3D 0 && op.version =3D=3D 2 = )=0A+ /* Restore the first 8 entries (toolstack reserved grants). = */=0A+ if ( gt->gt_version )=0A {=0A- for ( i =3D 0; i < = GNTTAB_NR_RESERVED_ENTRIES; i++ )=0A+ switch ( op.version )=0A = {=0A- status_entry(gt, i) =3D reserved_entries[i].flags & = (GTF_reading|GTF_writing);=0A- shared_entry_v2(gt, i).hdr.flags = =3D reserved_entries[i].flags & ~(GTF_reading|GTF_writing);=0A- = shared_entry_v2(gt, i).hdr.domid =3D reserved_entries[i].domid;=0A- = shared_entry_v2(gt, i).full_page.frame =3D reserved_entries[i].frame;= =0A+ case 1:=0A+ memcpy(&shared_entry_v1(gt, 0), = reserved_entries, sizeof(reserved_entries));=0A+ break;=0A+ = case 2:=0A+ for ( i =3D 0; i < GNTTAB_NR_RESERVED_ENTRIES; = i++ )=0A+ {=0A+ status_entry(gt, i) =3D=0A+ = reserved_entries[i].flags & (GTF_reading | GTF_writing);=0A+ = shared_entry_v2(gt, i).hdr.flags =3D=0A+ = reserved_entries[i].flags & ~(GTF_reading | GTF_writing);=0A+ = shared_entry_v2(gt, i).hdr.domid =3D=0A+ reserved_entr= ies[i].domid;=0A+ shared_entry_v2(gt, i).full_page.frame = =3D=0A+ reserved_entries[i].frame;=0A+ }=0A+ = break;=0A }=0A }=0A =0A gt->gt_version =3D = op.version;=0A =0A-out_unlock:=0A+ out_unlock:=0A write_unlock(>->loc= k);=0A =0A-out:=0A+ out:=0A op.version =3D gt->gt_version;=0A =0A- = if (__copy_to_guest(uop, &op, 1))=0A+ if ( __copy_to_guest(uop, &op, 1) = )=0A res =3D -EFAULT;=0A =0A return res;=0A --=__Part7A4EA3AB.1__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part7A4EA3AB.1__=--