From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat.com>,
David Miller <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>,
Networking <netdev@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Subject: Re: linux-next: manual merge of the vhost tree with the net-next tree
Date: Tue, 11 Jul 2023 11:01:05 +1000 [thread overview]
Message-ID: <20230711110105.467f896d@canb.auug.org.au> (raw)
In-Reply-To: <20230623130443.6c9a481e@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2080 bytes --]
Hi all,
On Fri, 23 Jun 2023 13:04:43 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the vhost tree got a conflict in:
>
> drivers/net/virtio_net.c
>
> between commit:
>
> 80f50f918c6e ("virtio_net: separate the logic of freeing the rest mergeable buf")
>
> from the net-next tree and commit:
>
> 21081476b808 ("virtio_net: support dma premapped")
This is now commit
c8dc5b9adff9 ("virtio_net: support dma premapped")
> from the vhost tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc drivers/net/virtio_net.c
> index 0db14f6b87d3,d67b36fdba0d..000000000000
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@@ -1128,28 -1136,6 +1233,28 @@@ err
> return NULL;
> }
>
> +static void mergeable_buf_free(struct receive_queue *rq, int num_buf,
> + struct net_device *dev,
> + struct virtnet_rq_stats *stats)
> +{
> + struct page *page;
> + void *buf;
> + int len;
> +
> + while (num_buf-- > 1) {
> - buf = virtqueue_get_buf(rq->vq, &len);
> ++ buf = virtnet_rq_get_buf(rq, &len, NULL);
> + if (unlikely(!buf)) {
> + pr_debug("%s: rx error: %d buffers missing\n",
> + dev->name, num_buf);
> + dev->stats.rx_length_errors++;
> + break;
> + }
> + stats->bytes += len;
> + page = virt_to_head_page(buf);
> + put_page(page);
> + }
> +}
> +
> /* Why not use xdp_build_skb_from_frame() ?
> * XDP core assumes that xdp frags are PAGE_SIZE in length, while in
> * virtio-net there are 2 points that do not match its requirements:
This is now a conflict between the vhost tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-07-11 1:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-23 3:04 linux-next: manual merge of the vhost tree with the net-next tree Stephen Rothwell
2023-07-11 1:01 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-15 8:01 Stephen Rothwell
2019-04-03 4:22 Stephen Rothwell
2016-06-16 4:19 Stephen Rothwell
2013-04-29 7:29 Stephen Rothwell
2012-04-19 5:35 Stephen Rothwell
2012-04-19 5:40 ` Michael S. Tsirkin
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=20230711110105.467f896d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=xuanzhuo@linux.alibaba.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).