p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xen-netback: Rename map ops 

Rename identifiers to state explicitly that they refer to map ops.

Signed-off-by: Zoltan Kiss <zoltan.kiss@citrix.com>
Reviewed-by: Paul Durrant <paul.durrant@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Zoltan Kiss 2014-04-02 18:04:57 +01:00 committed by David S. Miller
parent acdd32be6d
commit 9074ce2493
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/net/xen-netback/netback.c
View File

@ -820,13 +820,13 @@ struct xenvif_tx_cb {
#define XENVIF_TX_CB(skb) ((struct xenvif_tx_cb *)(skb)->cb) #define XENVIF_TX_CB(skb) ((struct xenvif_tx_cb *)(skb)->cb)
static inline void xenvif_tx_create_gop(struct xenvif *vif, static inline void xenvif_tx_create_map_op(struct xenvif *vif,
u16 pending_idx, u16 pending_idx,
struct xen_netif_tx_request *txp, struct xen_netif_tx_request *txp,
struct gnttab_map_grant_ref *gop) struct gnttab_map_grant_ref *mop)
{ {
vif->pages_to_map[gop-vif->tx_map_ops] = vif->mmap_pages[pending_idx]; vif->pages_to_map[mop-vif->tx_map_ops] = vif->mmap_pages[pending_idx];
gnttab_set_map_op(gop, idx_to_kaddr(vif, pending_idx), gnttab_set_map_op(mop, idx_to_kaddr(vif, pending_idx),
GNTMAP_host_map | GNTMAP_readonly, GNTMAP_host_map | GNTMAP_readonly,
txp->gref, vif->domid); txp->gref, vif->domid);
@ -880,7 +880,7 @@ static struct gnttab_map_grant_ref *xenvif_get_requests(struct xenvif *vif,
shinfo->nr_frags++, txp++, gop++) { shinfo->nr_frags++, txp++, gop++) {
index = pending_index(vif->pending_cons++); index = pending_index(vif->pending_cons++);
pending_idx = vif->pending_ring[index]; pending_idx = vif->pending_ring[index];
xenvif_tx_create_gop(vif, pending_idx, txp, gop); xenvif_tx_create_map_op(vif, pending_idx, txp, gop);
frag_set_pending_idx(&frags[shinfo->nr_frags], pending_idx); frag_set_pending_idx(&frags[shinfo->nr_frags], pending_idx);
} }
@ -900,7 +900,7 @@ static struct gnttab_map_grant_ref *xenvif_get_requests(struct xenvif *vif,
shinfo->nr_frags++, txp++, gop++) { shinfo->nr_frags++, txp++, gop++) {
index = pending_index(vif->pending_cons++); index = pending_index(vif->pending_cons++);
pending_idx = vif->pending_ring[index]; pending_idx = vif->pending_ring[index];
xenvif_tx_create_gop(vif, pending_idx, txp, gop); xenvif_tx_create_map_op(vif, pending_idx, txp, gop);
frag_set_pending_idx(&frags[shinfo->nr_frags], frag_set_pending_idx(&frags[shinfo->nr_frags],
pending_idx); pending_idx);
} }
@ -940,9 +940,9 @@ static inline void xenvif_grant_handle_reset(struct xenvif *vif,
static int xenvif_tx_check_gop(struct xenvif *vif, static int xenvif_tx_check_gop(struct xenvif *vif,
struct sk_buff *skb, struct sk_buff *skb,
struct gnttab_map_grant_ref **gopp) struct gnttab_map_grant_ref **gopp_map)
{ {
struct gnttab_map_grant_ref *gop = *gopp; struct gnttab_map_grant_ref *gop_map = *gopp_map;
u16 pending_idx = XENVIF_TX_CB(skb)->pending_idx; u16 pending_idx = XENVIF_TX_CB(skb)->pending_idx;
struct skb_shared_info *shinfo = skb_shinfo(skb); struct skb_shared_info *shinfo = skb_shinfo(skb);
struct pending_tx_info *tx_info; struct pending_tx_info *tx_info;
@ -951,11 +951,11 @@ static int xenvif_tx_check_gop(struct xenvif *vif,
struct sk_buff *first_skb = NULL; struct sk_buff *first_skb = NULL;
/* Check status of header. */ /* Check status of header. */
err = gop->status; err = gop_map->status;
if (unlikely(err)) if (unlikely(err))
xenvif_idx_release(vif, pending_idx, XEN_NETIF_RSP_ERROR); xenvif_idx_release(vif, pending_idx, XEN_NETIF_RSP_ERROR);
else else
xenvif_grant_handle_set(vif, pending_idx , gop->handle); xenvif_grant_handle_set(vif, pending_idx , gop_map->handle);
/* Skip first skb fragment if it is on same page as header fragment. */ /* Skip first skb fragment if it is on same page as header fragment. */
start = (frag_get_pending_idx(&shinfo->frags[0]) == pending_idx); start = (frag_get_pending_idx(&shinfo->frags[0]) == pending_idx);
@ -968,10 +968,12 @@ static int xenvif_tx_check_gop(struct xenvif *vif,
tx_info = &vif->pending_tx_info[pending_idx]; tx_info = &vif->pending_tx_info[pending_idx];
/* Check error status: if okay then remember grant handle. */ /* Check error status: if okay then remember grant handle. */
newerr = (++gop)->status; newerr = (++gop_map)->status;
if (likely(!newerr)) { if (likely(!newerr)) {
xenvif_grant_handle_set(vif, pending_idx , gop->handle); xenvif_grant_handle_set(vif,
pending_idx,
gop_map->handle);
/* Had a previous error? Invalidate this fragment. */ /* Had a previous error? Invalidate this fragment. */
if (unlikely(err)) if (unlikely(err))
xenvif_idx_unmap(vif, pending_idx); xenvif_idx_unmap(vif, pending_idx);
@ -1023,7 +1025,7 @@ static int xenvif_tx_check_gop(struct xenvif *vif,
} }
} }
*gopp = gop + 1; *gopp_map = gop_map + 1;
return err; return err;
} }
@ -1292,7 +1294,7 @@ static unsigned xenvif_tx_build_gops(struct xenvif *vif, int budget)
} }
} }
xenvif_tx_create_gop(vif, pending_idx, &txreq, gop); xenvif_tx_create_map_op(vif, pending_idx, &txreq, gop);
gop++; gop++;
@ -1399,7 +1401,7 @@ static int xenvif_handle_frag_list(struct xenvif *vif, struct sk_buff *skb)
static int xenvif_tx_submit(struct xenvif *vif) static int xenvif_tx_submit(struct xenvif *vif)
{ {
struct gnttab_map_grant_ref *gop = vif->tx_map_ops; struct gnttab_map_grant_ref *gop_map = vif->tx_map_ops;
struct sk_buff *skb; struct sk_buff *skb;
int work_done = 0; int work_done = 0;
@ -1412,7 +1414,7 @@ static int xenvif_tx_submit(struct xenvif *vif)
txp = &vif->pending_tx_info[pending_idx].req; txp = &vif->pending_tx_info[pending_idx].req;
/* Check the remap error code. */ /* Check the remap error code. */
if (unlikely(xenvif_tx_check_gop(vif, skb, &gop))) { if (unlikely(xenvif_tx_check_gop(vif, skb, &gop_map))) {
netdev_dbg(vif->dev, "netback grant failed.\n"); netdev_dbg(vif->dev, "netback grant failed.\n");
skb_shinfo(skb)->nr_frags = 0; skb_shinfo(skb)->nr_frags = 0;
kfree_skb(skb); kfree_skb(skb);
@ -1611,21 +1613,21 @@ static inline void xenvif_tx_dealloc_action(struct xenvif *vif)
/* Called after netfront has transmitted */ /* Called after netfront has transmitted */
int xenvif_tx_action(struct xenvif *vif, int budget) int xenvif_tx_action(struct xenvif *vif, int budget)
{ {
unsigned nr_gops; unsigned nr_mops;
int work_done, ret; int work_done, ret;
if (unlikely(!tx_work_todo(vif))) if (unlikely(!tx_work_todo(vif)))
return 0; return 0;
nr_gops = xenvif_tx_build_gops(vif, budget); nr_mops = xenvif_tx_build_gops(vif, budget);
if (nr_gops == 0) if (nr_mops == 0)
return 0; return 0;
ret = gnttab_map_refs(vif->tx_map_ops, ret = gnttab_map_refs(vif->tx_map_ops,
NULL, NULL,
vif->pages_to_map, vif->pages_to_map,
nr_gops); nr_mops);
BUG_ON(ret); BUG_ON(ret);
work_done = xenvif_tx_submit(vif); work_done = xenvif_tx_submit(vif);