From: "Jan Beulich" <JBeulich@suse.com>
To: xen-devel <xen-devel@lists.xenproject.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>,
Wei Liu <wei.liu2@citrix.com>,
George Dunlap <George.Dunlap@eu.citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>, Tim Deegan <tim@xen.org>
Subject: [PATCH 4/8] gnttab: drop pointless leading double underscores
Date: Tue, 15 Aug 2017 08:40:42 -0600 [thread overview]
Message-ID: <5993240A020000780016FECF@prv-mh.provo.novell.com> (raw)
In-Reply-To: <59931E0F020000780016FEA3@prv-mh.provo.novell.com>
They're violating name space rules, and we don't really need them. When
followed by "gnttab_", also drop that.
Signed-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -233,8 +233,9 @@ static inline void active_entry_release(
If rc == GNTST_okay, *page contains the page struct with a ref taken.
Caller must do put_page(*page).
If any error, *page = NULL, *frame = INVALID_MFN, no ref taken. */
-static int __get_paged_frame(unsigned long gfn, unsigned long *frame, struct page_info **page,
- int readonly, struct domain *rd)
+static int get_paged_frame(unsigned long gfn, unsigned long *frame,
+ struct page_info **page, bool readonly,
+ struct domain *rd)
{
int rc = GNTST_okay;
#if defined(P2M_PAGED_TYPES) || defined(P2M_SHARED_TYPES)
@@ -300,7 +301,7 @@ double_gt_unlock(struct grant_table *lgt
#define INVALID_MAPTRACK_HANDLE UINT_MAX
static inline grant_handle_t
-__get_maptrack_handle(
+_get_maptrack_handle(
struct grant_table *t,
struct vcpu *v)
{
@@ -361,7 +362,7 @@ static grant_handle_t steal_maptrack_han
{
grant_handle_t handle;
- handle = __get_maptrack_handle(t, currd->vcpu[i]);
+ handle = _get_maptrack_handle(t, currd->vcpu[i]);
if ( handle != INVALID_MAPTRACK_HANDLE )
{
maptrack_entry(t, handle).vcpu = curr->vcpu_id;
@@ -415,7 +416,7 @@ get_maptrack_handle(
grant_handle_t handle;
struct grant_mapping *new_mt = NULL;
- handle = __get_maptrack_handle(lgt, curr);
+ handle = _get_maptrack_handle(lgt, curr);
if ( likely(handle != INVALID_MAPTRACK_HANDLE) )
return handle;
@@ -770,7 +771,7 @@ static unsigned int mapkind(
* update, as indicated by the GNTMAP_contains_pte flag.
*/
static void
-__gnttab_map_grant_ref(
+map_grant_ref(
struct gnttab_map_grant_ref *op)
{
struct domain *ld, *rd, *owner = NULL;
@@ -869,8 +870,8 @@ __gnttab_map_grant_ref(
shared_entry_v1(rgt, op->ref).frame :
shared_entry_v2(rgt, op->ref).full_page.frame;
- rc = __get_paged_frame(gfn, &frame, &pg,
- !!(op->flags & GNTMAP_readonly), rd);
+ rc = get_paged_frame(gfn, &frame, &pg,
+ op->flags & GNTMAP_readonly, rd);
if ( rc != GNTST_okay )
goto unlock_out_clear;
act->gfn = gfn;
@@ -900,7 +901,7 @@ __gnttab_map_grant_ref(
active_entry_release(act);
grant_read_unlock(rgt);
- /* pg may be set, with a refcount included, from __get_paged_frame */
+ /* pg may be set, with a refcount included, from get_paged_frame(). */
if ( !pg )
{
pg = mfn_valid(_mfn(frame)) ? mfn_to_page(frame) : NULL;
@@ -1109,7 +1110,7 @@ gnttab_map_grant_ref(
return i;
if ( unlikely(__copy_from_guest_offset(&op, uop, i, 1)) )
return -EFAULT;
- __gnttab_map_grant_ref(&op);
+ map_grant_ref(&op);
if ( unlikely(__copy_to_guest_offset(uop, i, &op, 1)) )
return -EFAULT;
}
@@ -1118,7 +1119,7 @@ gnttab_map_grant_ref(
}
static void
-__gnttab_unmap_common(
+unmap_common(
struct gnttab_unmap_common *op)
{
domid_t dom;
@@ -1178,8 +1179,8 @@ __gnttab_unmap_common(
/*
* This ought to be impossible, as such a mapping should not have
* been established (see the nr_grant_entries(rgt) bounds check in
- * __gnttab_map_grant_ref()). Doing this check only in
- * __gnttab_unmap_common_complete() - as it used to be done - would,
+ * gnttab_map_grant_ref()). Doing this check only in
+ * gnttab_unmap_common_complete() - as it used to be done - would,
* however, be too late.
*/
rc = GNTST_bad_gntref;
@@ -1293,7 +1294,7 @@ __gnttab_unmap_common(
}
static void
-__gnttab_unmap_common_complete(struct gnttab_unmap_common *op)
+unmap_common_complete(struct gnttab_unmap_common *op)
{
struct domain *ld, *rd = op->rd;
struct grant_table *rgt;
@@ -1304,7 +1305,7 @@ __gnttab_unmap_common_complete(struct gn
if ( !op->done )
{
- /* __gntab_unmap_common() didn't do anything - nothing to complete. */
+ /* unmap_common() didn't do anything - nothing to complete. */
return;
}
@@ -1373,7 +1374,7 @@ __gnttab_unmap_common_complete(struct gn
}
static void
-__gnttab_unmap_grant_ref(
+unmap_grant_ref(
struct gnttab_unmap_grant_ref *op,
struct gnttab_unmap_common *common)
{
@@ -1387,7 +1388,7 @@ __gnttab_unmap_grant_ref(
common->rd = NULL;
common->frame = 0;
- __gnttab_unmap_common(common);
+ unmap_common(common);
op->status = common->status;
}
@@ -1409,7 +1410,7 @@ gnttab_unmap_grant_ref(
{
if ( unlikely(__copy_from_guest(&op, uop, 1)) )
goto fault;
- __gnttab_unmap_grant_ref(&op, &(common[i]));
+ unmap_grant_ref(&op, &common[i]);
++partial_done;
if ( unlikely(__copy_field_to_guest(uop, &op, status)) )
goto fault;
@@ -1419,7 +1420,7 @@ gnttab_unmap_grant_ref(
gnttab_flush_tlb(current->domain);
for ( i = 0; i < partial_done; i++ )
- __gnttab_unmap_common_complete(&(common[i]));
+ unmap_common_complete(&common[i]);
count -= c;
done += c;
@@ -1434,12 +1435,12 @@ fault:
gnttab_flush_tlb(current->domain);
for ( i = 0; i < partial_done; i++ )
- __gnttab_unmap_common_complete(&(common[i]));
+ unmap_common_complete(&common[i]);
return -EFAULT;
}
static void
-__gnttab_unmap_and_replace(
+unmap_and_replace(
struct gnttab_unmap_and_replace *op,
struct gnttab_unmap_common *common)
{
@@ -1453,7 +1454,7 @@ __gnttab_unmap_and_replace(
common->rd = NULL;
common->frame = 0;
- __gnttab_unmap_common(common);
+ unmap_common(common);
op->status = common->status;
}
@@ -1474,7 +1475,7 @@ gnttab_unmap_and_replace(
{
if ( unlikely(__copy_from_guest(&op, uop, 1)) )
goto fault;
- __gnttab_unmap_and_replace(&op, &(common[i]));
+ unmap_and_replace(&op, &common[i]);
++partial_done;
if ( unlikely(__copy_field_to_guest(uop, &op, status)) )
goto fault;
@@ -1484,7 +1485,7 @@ gnttab_unmap_and_replace(
gnttab_flush_tlb(current->domain);
for ( i = 0; i < partial_done; i++ )
- __gnttab_unmap_common_complete(&(common[i]));
+ unmap_common_complete(&common[i]);
count -= c;
done += c;
@@ -1499,7 +1500,7 @@ fault:
gnttab_flush_tlb(current->domain);
for ( i = 0; i < partial_done; i++ )
- __gnttab_unmap_common_complete(&(common[i]));
+ unmap_common_complete(&common[i]);
return -EFAULT;
}
@@ -1849,9 +1850,10 @@ gnttab_transfer(
#ifdef CONFIG_X86
{
- p2m_type_t __p2mt;
- mfn = mfn_x(get_gfn_unshare(d, gop.mfn, &__p2mt));
- if ( p2m_is_shared(__p2mt) || !p2m_is_valid(__p2mt) )
+ p2m_type_t p2mt;
+
+ mfn = mfn_x(get_gfn_unshare(d, gop.mfn, &p2mt));
+ if ( p2m_is_shared(p2mt) || !p2m_is_valid(p2mt) )
mfn = mfn_x(INVALID_MFN);
}
#else
@@ -2038,10 +2040,12 @@ gnttab_transfer(
return 0;
}
-/* Undo __acquire_grant_for_copy. Again, this has no effect on page
- type and reference counts. */
+/*
+ * Undo acquire_grant_for_copy(). This has no effect on page type and
+ * reference counts.
+ */
static void
-__release_grant_for_copy(
+release_grant_for_copy(
struct domain *rd, grant_ref_t gref, bool readonly)
{
struct grant_table *rgt = rd->grant_table;
@@ -2096,7 +2100,7 @@ __release_grant_for_copy(
* Recursive call, but it is bounded (acquire permits only a single
* level of transitivity), so it's okay.
*/
- __release_grant_for_copy(td, trans_gref, readonly);
+ release_grant_for_copy(td, trans_gref, readonly);
rcu_unlock_domain(td);
}
@@ -2107,8 +2111,8 @@ __release_grant_for_copy(
under the domain's grant table lock. */
/* Only safe on transitive grants. Even then, note that we don't
attempt to drop any pin on the referent grant. */
-static void __fixup_status_for_copy_pin(const struct active_grant_entry *act,
- uint16_t *status)
+static void fixup_status_for_copy_pin(const struct active_grant_entry *act,
+ uint16_t *status)
{
if ( !(act->pin & (GNTPIN_hstw_mask | GNTPIN_devw_mask)) )
gnttab_clear_flag(_GTF_writing, status);
@@ -2122,7 +2126,7 @@ static void __fixup_status_for_copy_pin(
take one ref count on the target page, stored in *page.
If there is any error, *page = NULL, no ref taken. */
static int
-__acquire_grant_for_copy(
+acquire_grant_for_copy(
struct domain *rd, grant_ref_t gref, domid_t ldom, bool readonly,
unsigned long *frame, struct page_info **page,
uint16_t *page_off, uint16_t *length, bool allow_transitive)
@@ -2206,24 +2210,24 @@ __acquire_grant_for_copy(
trans_domid);
/*
- * __acquire_grant_for_copy() could take the lock on the
+ * acquire_grant_for_copy() could take the lock on the
* remote table (if rd == td), so we have to drop the lock
* here and reacquire.
*/
active_entry_release(act);
grant_read_unlock(rgt);
- rc = __acquire_grant_for_copy(td, trans_gref, rd->domain_id,
- readonly, &grant_frame, page,
- &trans_page_off, &trans_length,
- false);
+ rc = acquire_grant_for_copy(td, trans_gref, rd->domain_id,
+ readonly, &grant_frame, page,
+ &trans_page_off, &trans_length,
+ false);
grant_read_lock(rgt);
act = active_entry_acquire(rgt, gref);
if ( rc != GNTST_okay )
{
- __fixup_status_for_copy_pin(act, status);
+ fixup_status_for_copy_pin(act, status);
rcu_unlock_domain(td);
active_entry_release(act);
grant_read_unlock(rgt);
@@ -2244,8 +2248,8 @@ __acquire_grant_for_copy(
act->trans_gref != trans_gref ||
!act->is_sub_page)) )
{
- __release_grant_for_copy(td, trans_gref, readonly);
- __fixup_status_for_copy_pin(act, status);
+ release_grant_for_copy(td, trans_gref, readonly);
+ fixup_status_for_copy_pin(act, status);
rcu_unlock_domain(td);
active_entry_release(act);
grant_read_unlock(rgt);
@@ -2285,7 +2289,7 @@ __acquire_grant_for_copy(
{
unsigned long gfn = shared_entry_v1(rgt, gref).frame;
- rc = __get_paged_frame(gfn, &grant_frame, page, readonly, rd);
+ rc = get_paged_frame(gfn, &grant_frame, page, readonly, rd);
if ( rc != GNTST_okay )
goto unlock_out_clear;
act->gfn = gfn;
@@ -2295,7 +2299,8 @@ __acquire_grant_for_copy(
}
else if ( !(sha2->hdr.flags & GTF_sub_page) )
{
- rc = __get_paged_frame(sha2->full_page.frame, &grant_frame, page, readonly, rd);
+ rc = get_paged_frame(sha2->full_page.frame, &grant_frame, page,
+ readonly, rd);
if ( rc != GNTST_okay )
goto unlock_out_clear;
act->gfn = sha2->full_page.frame;
@@ -2305,7 +2310,8 @@ __acquire_grant_for_copy(
}
else
{
- rc = __get_paged_frame(sha2->sub_page.frame, &grant_frame, page, readonly, rd);
+ rc = get_paged_frame(sha2->sub_page.frame, &grant_frame, page,
+ readonly, rd);
if ( rc != GNTST_okay )
goto unlock_out_clear;
act->gfn = sha2->sub_page.frame;
@@ -2465,7 +2471,7 @@ static void gnttab_copy_release_buf(stru
}
if ( buf->have_grant )
{
- __release_grant_for_copy(buf->domain, buf->ptr.u.ref, buf->read_only);
+ release_grant_for_copy(buf->domain, buf->ptr.u.ref, buf->read_only);
buf->have_grant = 0;
}
}
@@ -2481,11 +2487,11 @@ static int gnttab_copy_claim_buf(const s
if ( op->flags & gref_flag )
{
- rc = __acquire_grant_for_copy(buf->domain, ptr->u.ref,
- current->domain->domain_id,
- buf->read_only,
- &buf->frame, &buf->page,
- &buf->ptr.offset, &buf->len, true);
+ rc = acquire_grant_for_copy(buf->domain, ptr->u.ref,
+ current->domain->domain_id,
+ buf->read_only,
+ &buf->frame, &buf->page,
+ &buf->ptr.offset, &buf->len, true);
if ( rc != GNTST_okay )
goto out;
buf->ptr.u.ref = ptr->u.ref;
@@ -2493,8 +2499,8 @@ static int gnttab_copy_claim_buf(const s
}
else
{
- rc = __get_paged_frame(ptr->u.gmfn, &buf->frame, &buf->page,
- buf->read_only, buf->domain);
+ rc = get_paged_frame(ptr->u.gmfn, &buf->frame, &buf->page,
+ buf->read_only, buf->domain);
if ( rc != GNTST_okay )
PIN_FAIL(out, rc,
"source frame %"PRI_xen_pfn" invalid.\n", ptr->u.gmfn);
@@ -2905,7 +2911,7 @@ gnttab_get_version(XEN_GUEST_HANDLE_PARA
}
static s16
-__gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b)
+swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b)
{
struct domain *d = rcu_lock_current_domain();
struct grant_table *gt = d->grant_table;
@@ -2981,7 +2987,7 @@ gnttab_swap_grant_ref(XEN_GUEST_HANDLE_P
return i;
if ( unlikely(__copy_from_guest(&op, uop, 1)) )
return -EFAULT;
- op.status = __gnttab_swap_grant_ref(op.ref_a, op.ref_b);
+ op.status = swap_grant_ref(op.ref_a, op.ref_b);
if ( unlikely(__copy_field_to_guest(uop, &op, status)) )
return -EFAULT;
guest_handle_add_offset(uop, 1);
@@ -2989,8 +2995,7 @@ gnttab_swap_grant_ref(XEN_GUEST_HANDLE_P
return 0;
}
-static int __gnttab_cache_flush(gnttab_cache_flush_t *cflush,
- grant_ref_t *cur_ref)
+static int cache_flush(gnttab_cache_flush_t *cflush, grant_ref_t *cur_ref)
{
struct domain *d, *owner;
struct page_info *page;
@@ -3080,7 +3085,7 @@ gnttab_cache_flush(XEN_GUEST_HANDLE_PARA
return -EFAULT;
for ( ; ; )
{
- int ret = __gnttab_cache_flush(&op, cur_ref);
+ int ret = cache_flush(&op, cur_ref);
if ( ret < 0 )
return ret;
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-08-15 14:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-15 14:15 [PATCH 0/8] gnttab: recent XSA follow-up Jan Beulich
2017-08-15 14:38 ` [PATCH RESEND 1/8] gnttab: drop useless locking Jan Beulich
2017-08-15 16:08 ` Andrew Cooper
2017-08-15 14:39 ` [PATCH RESEND 2/8] gnttab: avoid spurious maptrack handle allocation failures Jan Beulich
2017-08-15 16:52 ` Andrew Cooper
2017-08-15 14:40 ` [PATCH 3/8] gnttab: type adjustments Jan Beulich
2017-08-15 17:04 ` Andrew Cooper
2017-08-15 14:40 ` Jan Beulich [this message]
2017-08-15 17:09 ` [PATCH 4/8] gnttab: drop pointless leading double underscores Andrew Cooper
2017-08-15 14:41 ` [PATCH 5/8] gnttab: re-arrange struct active_grant_entry Jan Beulich
2017-08-15 17:12 ` Andrew Cooper
2017-08-15 14:41 ` [PATCH 6/8] gnttab: move GNTPIN_* out of header file Jan Beulich
2017-08-15 17:14 ` Andrew Cooper
2017-08-16 6:54 ` Jan Beulich
2017-08-15 14:42 ` [PATCH 7/8] gnttab: use DIV_ROUND_UP() instead of open-coding it Jan Beulich
2017-08-15 17:15 ` Andrew Cooper
2017-08-15 14:42 ` [PATCH 8/8] gnttab: drop struct active_grant_entry's gfn field for release builds Jan Beulich
2017-08-15 17:18 ` Andrew Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5993240A020000780016FECF@prv-mh.provo.novell.com \
--to=jbeulich@suse.com \
--cc=George.Dunlap@eu.citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=sstabellini@kernel.org \
--cc=tim@xen.org \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.