From: Ian Campbell <Ian.Campbell@citrix.com>
To: Zoltan Kiss <zoltan.kiss@citrix.com>
Cc: <wei.liu2@citrix.com>, <xen-devel@lists.xenproject.org>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<jonathan.davies@citrix.com>
Subject: Re: [PATCH net-next v5 4/9] xen-netback: Change RX path for mapped SKB fragments
Date: Tue, 18 Feb 2014 17:45:32 +0000 [thread overview]
Message-ID: <1392745532.23084.65.camel@kazak.uk.xensource.com> (raw)
In-Reply-To: <1390253069-25507-5-git-send-email-zoltan.kiss@citrix.com>
On Mon, 2014-01-20 at 21:24 +0000, Zoltan Kiss wrote:
Re the Subject: change how? Perhaps "handle foreign mapped pages on the
guest RX path" would be clearer.
> RX path need to know if the SKB fragments are stored on pages from another
> domain.
Does this not need to be done either before the mapping change or at the
same time? -- otherwise you have a window of a couple of commits where
things are broken, breaking bisectability.
>
> v4:
> - indentation fixes
>
> Signed-off-by: Zoltan Kiss <zoltan.kiss@citrix.com>
> ---
> drivers/net/xen-netback/netback.c | 46 +++++++++++++++++++++++++++++++++----
> 1 file changed, 41 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
> index f74fa92..d43444d 100644
> --- a/drivers/net/xen-netback/netback.c
> +++ b/drivers/net/xen-netback/netback.c
> @@ -226,7 +226,9 @@ static struct xenvif_rx_meta *get_next_rx_buffer(struct xenvif *vif,
> static void xenvif_gop_frag_copy(struct xenvif *vif, struct sk_buff *skb,
> struct netrx_pending_operations *npo,
> struct page *page, unsigned long size,
> - unsigned long offset, int *head)
> + unsigned long offset, int *head,
> + struct xenvif *foreign_vif,
> + grant_ref_t foreign_gref)
> {
> struct gnttab_copy *copy_gop;
> struct xenvif_rx_meta *meta;
> @@ -268,8 +270,15 @@ static void xenvif_gop_frag_copy(struct xenvif *vif, struct sk_buff *skb,
> copy_gop->flags = GNTCOPY_dest_gref;
> copy_gop->len = bytes;
>
> - copy_gop->source.domid = DOMID_SELF;
> - copy_gop->source.u.gmfn = virt_to_mfn(page_address(page));
> + if (foreign_vif) {
> + copy_gop->source.domid = foreign_vif->domid;
> + copy_gop->source.u.ref = foreign_gref;
> + copy_gop->flags |= GNTCOPY_source_gref;
> + } else {
> + copy_gop->source.domid = DOMID_SELF;
> + copy_gop->source.u.gmfn =
> + virt_to_mfn(page_address(page));
> + }
> copy_gop->source.offset = offset;
>
> copy_gop->dest.domid = vif->domid;
> @@ -330,6 +339,9 @@ static int xenvif_gop_skb(struct sk_buff *skb,
> int old_meta_prod;
> int gso_type;
> int gso_size;
> + struct ubuf_info *ubuf = skb_shinfo(skb)->destructor_arg;
> + grant_ref_t foreign_grefs[MAX_SKB_FRAGS];
> + struct xenvif *foreign_vif = NULL;
>
> old_meta_prod = npo->meta_prod;
>
> @@ -370,6 +382,26 @@ static int xenvif_gop_skb(struct sk_buff *skb,
> npo->copy_off = 0;
> npo->copy_gref = req->gref;
>
> + if ((skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) &&
> + (ubuf->callback == &xenvif_zerocopy_callback)) {
> + u16 pending_idx = ubuf->desc;
> + int i = 0;
> + struct pending_tx_info *temp =
> + container_of(ubuf,
> + struct pending_tx_info,
> + callback_struct);
> + foreign_vif =
> + container_of(temp - pending_idx,
> + struct xenvif,
> + pending_tx_info[0]);
> + do {
> + pending_idx = ubuf->desc;
> + foreign_grefs[i++] =
> + foreign_vif->pending_tx_info[pending_idx].req.gref;
> + ubuf = (struct ubuf_info *) ubuf->ctx;
> + } while (ubuf);
> + }
> +
> data = skb->data;
> while (data < skb_tail_pointer(skb)) {
> unsigned int offset = offset_in_page(data);
> @@ -379,7 +411,9 @@ static int xenvif_gop_skb(struct sk_buff *skb,
> len = skb_tail_pointer(skb) - data;
>
> xenvif_gop_frag_copy(vif, skb, npo,
> - virt_to_page(data), len, offset, &head);
> + virt_to_page(data), len, offset, &head,
> + NULL,
> + 0);
> data += len;
> }
>
> @@ -388,7 +422,9 @@ static int xenvif_gop_skb(struct sk_buff *skb,
> skb_frag_page(&skb_shinfo(skb)->frags[i]),
> skb_frag_size(&skb_shinfo(skb)->frags[i]),
> skb_shinfo(skb)->frags[i].page_offset,
> - &head);
> + &head,
> + foreign_vif,
> + foreign_grefs[i]);
> }
>
> return npo->meta_prod - old_meta_prod;
next prev parent reply other threads:[~2014-02-18 17:45 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-20 21:24 [PATCH net-next v5 0/9] xen-netback: TX grant mapping with SKBTX_DEV_ZEROCOPY instead of copy Zoltan Kiss
2014-01-20 21:24 ` [PATCH net-next v5 1/9] xen-netback: Introduce TX grant map definitions Zoltan Kiss
2014-02-18 17:06 ` Ian Campbell
2014-02-18 20:36 ` Zoltan Kiss
2014-02-19 10:05 ` Ian Campbell
2014-02-19 19:54 ` Zoltan Kiss
2014-02-20 9:33 ` Ian Campbell
2014-02-21 1:19 ` Zoltan Kiss
2014-02-24 11:13 ` Ian Campbell
2014-02-20 10:13 ` Wei Liu
2014-02-18 17:24 ` Ian Campbell
2014-02-19 19:19 ` Zoltan Kiss
2014-01-20 21:24 ` [PATCH net-next v5 2/9] xen-netback: Change TX path from grant copy to mapping Zoltan Kiss
2014-02-18 17:40 ` Ian Campbell
2014-02-18 18:46 ` [Xen-devel] " David Vrabel
2014-02-19 9:54 ` Ian Campbell
2014-02-19 12:27 ` David Vrabel
2014-02-22 22:33 ` Zoltan Kiss
2014-02-24 16:56 ` Zoltan Kiss
2014-01-20 21:24 ` [PATCH net-next v5 3/9] xen-netback: Remove old TX grant copy definitons and fix indentations Zoltan Kiss
2014-01-20 21:24 ` [PATCH net-next v5 4/9] xen-netback: Change RX path for mapped SKB fragments Zoltan Kiss
2014-02-18 17:45 ` Ian Campbell [this message]
2014-02-22 23:18 ` Zoltan Kiss
2014-02-24 13:49 ` Zoltan Kiss
2014-02-24 15:08 ` Zoltan Kiss
2014-02-27 12:43 ` Wei Liu
2014-02-27 15:49 ` Zoltan Kiss
2014-02-27 16:01 ` Wei Liu
2014-01-20 21:24 ` [PATCH net-next v5 5/9] xen-netback: Add stat counters for zerocopy Zoltan Kiss
2014-01-20 21:24 ` [PATCH net-next v5 6/9] xen-netback: Handle guests with too many frags Zoltan Kiss
2014-01-20 21:24 ` [PATCH net-next v5 7/9] xen-netback: Add stat counters for frag_list skbs Zoltan Kiss
2014-01-20 21:24 ` [PATCH net-next v5 8/9] xen-netback: Timeout packets in RX path Zoltan Kiss
2014-01-20 22:03 ` Wei Liu
2014-01-20 22:12 ` Wei Liu
2014-01-21 0:24 ` Zoltan Kiss
2014-01-20 21:24 ` [PATCH net-next v5 9/9] xen-netback: Aggregate TX unmap operations Zoltan Kiss
2014-01-23 1:50 ` [PATCH net-next v5 0/9] xen-netback: TX grant mapping with SKBTX_DEV_ZEROCOPY instead of copy David Miller
2014-01-23 13:13 ` Zoltan Kiss
2014-01-23 21:39 ` David Miller
2014-01-23 21:49 ` Zoltan Kiss
2014-02-19 9:50 ` Ian Campbell
2014-02-24 15:31 ` Zoltan Kiss
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=1392745532.23084.65.camel@kazak.uk.xensource.com \
--to=ian.campbell@citrix.com \
--cc=jonathan.davies@citrix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
--cc=zoltan.kiss@citrix.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).