From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934106AbdC3Obl (ORCPT ); Thu, 30 Mar 2017 10:31:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33136 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933838AbdC3Obj (ORCPT ); Thu, 30 Mar 2017 10:31:39 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C3B5519CF90 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=mst@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C3B5519CF90 Date: Thu, 30 Mar 2017 17:31:37 +0300 From: "Michael S. Tsirkin" To: Cornelia Huck Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, John Fastabend , virtualization@lists.linux-foundation.org Subject: Re: [PATCH 4/6] virtio_net: allow specifying context for rx Message-ID: <20170330173031-mutt-send-email-mst@kernel.org> References: <1490820507-8005-1-git-send-email-mst@redhat.com> <1490820507-8005-5-git-send-email-mst@redhat.com> <20170330092651.7767dfac.cornelia.huck@de.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170330092651.7767dfac.cornelia.huck@de.ibm.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 30 Mar 2017 14:31:38 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 30, 2017 at 09:26:51AM +0200, Cornelia Huck wrote: > On Wed, 29 Mar 2017 23:48:54 +0300 > "Michael S. Tsirkin" wrote: > > > With mergeable buffers we never use s/g for rx, > > so allow specifying context in that case. > > > > Signed-off-by: Michael S. Tsirkin > > --- > > drivers/net/virtio_net.c | 15 ++++++++++++++- > > 1 file changed, 14 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > > index 6802169..340f737 100644 > > --- a/drivers/net/virtio_net.c > > +++ b/drivers/net/virtio_net.c > > @@ -2044,6 +2044,7 @@ static int virtnet_find_vqs(struct virtnet_info *vi) > > int ret = -ENOMEM; > > int i, total_vqs; > > const char **names; > > + const bool *ctx; > > > > /* We expect 1 RX virtqueue followed by 1 TX virtqueue, followed by > > * possible N-1 RX/TX queue pairs used in multiqueue mode, followed by > > @@ -2062,6 +2063,13 @@ static int virtnet_find_vqs(struct virtnet_info *vi) > > names = kmalloc(total_vqs * sizeof(*names), GFP_KERNEL); > > if (!names) > > goto err_names; > > + if (vi->mergeable_rx_bufs) { > > + ctx = kzalloc(total_vqs * sizeof(*ctx), GFP_KERNEL); > > + if (!ctx) > > + goto err_ctx; > > + } else { > > + ctx = NULL; > > + } > > > > /* Parameters for control virtqueue, if any */ > > if (vi->has_cvq) { > > @@ -2077,9 +2085,12 @@ static int virtnet_find_vqs(struct virtnet_info *vi) > > sprintf(vi->sq[i].name, "output.%d", i); > > names[rxq2vq(i)] = vi->rq[i].name; > > names[txq2vq(i)] = vi->sq[i].name; > > + if (ctx) > > + ctx[rxq2vq(i)] = true; > > } > > > > - ret = virtio_find_vqs(vi->vdev, total_vqs, vqs, callbacks, names, NULL); > > + ret = vi->vdev->config->find_vqs(vi->vdev, total_vqs, vqs, callbacks, > > + names, ctx, NULL); > > virtio_find_vqs_ctx()? (Needs to be exported, obviously.) I guess I can do that but there's a single user ATM. Do you think it's worth doing right now, or wait until it gets more users? > > if (ret) > > goto err_find; > > > > @@ -2101,6 +2112,8 @@ static int virtnet_find_vqs(struct virtnet_info *vi) > > return 0; > > > > err_find: > > + kfree(ctx); > > +err_ctx: > > kfree(names); > > err_names: > > kfree(callbacks);