From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755503AbdC3H1C (ORCPT ); Thu, 30 Mar 2017 03:27:02 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:54480 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755255AbdC3H1A (ORCPT ); Thu, 30 Mar 2017 03:27:00 -0400 Date: Thu, 30 Mar 2017 09:26:51 +0200 From: Cornelia Huck To: "Michael S. Tsirkin" 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 In-Reply-To: <1490820507-8005-5-git-send-email-mst@redhat.com> References: <1490820507-8005-1-git-send-email-mst@redhat.com> <1490820507-8005-5-git-send-email-mst@redhat.com> Organization: IBM Deutschland Research & Development GmbH Vorsitzende des Aufsichtsrats: Martina Koederitz =?UTF-8?B?R2VzY2jDpGZ0c2bDvGhydW5nOg==?= Dirk Wittkopp Sitz der Gesellschaft: =?UTF-8?B?QsO2Ymxpbmdlbg==?= Registergericht: Amtsgericht Stuttgart, HRB 243294 X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.23; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 17033007-0020-0000-0000-000003344723 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17033007-0021-0000-0000-0000410832EF Message-Id: <20170330092651.7767dfac.cornelia.huck@de.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-03-30_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1703300067 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.) > 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);