xen/netback: use struct ubuf_info_msgzc

struct ubuf_info will be changed, use ubuf_info_msgzc instead.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
index 8174d7b2966c0a10ae520e470bcd2dda720f4693..1545cbee77a46c37c4cdbafc63c1ae3c9f7cc06c 100644 (file)
--- a/drivers/net/xen-netback/common.h
+++ b/drivers/net/xen-netback/common.h
@@ -62,7 +62,7 @@ struct pending_tx_info {
         * ubuf_to_vif is a helper which finds the struct xenvif from a pointer
         * to this field.
         */
-       struct ubuf_info callback_struct;
+       struct ubuf_info_msgzc callback_struct;
 };
 
 #define XEN_NETIF_TX_RING_SIZE __CONST_RING_SIZE(xen_netif_tx, XEN_PAGE_SIZE)

diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index fb32ae82d9b04afae68032ace0b1792648d2e108..e579ecd40b7400fd2eef2da473f6202a1243ca1d 100644 (file)
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -591,8 +591,8 @@ int xenvif_init_queue(struct xenvif_queue *queue)
        }
 
        for (i = 0; i < MAX_PENDING_REQS; i++) {
-               queue->pending_tx_info[i].callback_struct = (struct ubuf_info)
-                       { .callback = xenvif_zerocopy_callback,
+               queue->pending_tx_info[i].callback_struct = (struct ubuf_info_msgzc)
+                       { { .callback = xenvif_zerocopy_callback },
                          { { .ctx = NULL,
                              .desc = i } } };
                queue->grant_tx_handle[i] = NETBACK_INVALID_HANDLE;

diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index a256695fc89ec3a2d98aa07e59b906df0cedefef..3d2081bbbc8609ad018b00b4d1379e775c6ffdbb 100644 (file)
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -133,7 +133,7 @@ static inline unsigned long idx_to_kaddr(struct xenvif_queue *queue,
 
 /* Find the containing VIF's structure from a pointer in pending_tx_info array
  */
-static inline struct xenvif_queue *ubuf_to_queue(const struct ubuf_info *ubuf)
+static inline struct xenvif_queue *ubuf_to_queue(const struct ubuf_info_msgzc *ubuf)
 {
        u16 pending_idx = ubuf->desc;
        struct pending_tx_info *temp =
@@ -1228,11 +1228,12 @@ static int xenvif_tx_submit(struct xenvif_queue *queue)
        return work_done;
 }
 
-void xenvif_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *ubuf,
+void xenvif_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *ubuf_base,
                              bool zerocopy_success)
 {
        unsigned long flags;
        pending_ring_idx_t index;
+       struct ubuf_info_msgzc *ubuf = uarg_to_msgzc(ubuf_base);
        struct xenvif_queue *queue = ubuf_to_queue(ubuf);
 
        /* This is the only place where we grab this lock, to protect callbacks
@@ -1241,7 +1242,7 @@ void xenvif_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *ubuf,
        spin_lock_irqsave(&queue->callback_lock, flags);
        do {
                u16 pending_idx = ubuf->desc;
-               ubuf = (struct ubuf_info *) ubuf->ctx;
+               ubuf = (struct ubuf_info_msgzc *) ubuf->ctx;
                BUG_ON(queue->dealloc_prod - queue->dealloc_cons >=
                        MAX_PENDING_REQS);
                index = pending_index(queue->dealloc_prod);