From patchwork Fri May 7 20:11:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Stevens X-Patchwork-Id: 51951 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B9152B7D53 for ; Sat, 8 May 2010 06:11:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932076Ab0EGULS (ORCPT ); Fri, 7 May 2010 16:11:18 -0400 Received: from e38.co.us.ibm.com ([32.97.110.159]:48362 "EHLO e38.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758152Ab0EGULR (ORCPT ); Fri, 7 May 2010 16:11:17 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e38.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id o47K4s1F017974 for ; Fri, 7 May 2010 14:04:54 -0600 Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id o47KBBET243220 for ; Fri, 7 May 2010 14:11:11 -0600 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o47KBAJj003223 for ; Fri, 7 May 2010 14:11:10 -0600 Received: from [9.47.18.17] (w-dls.beaverton.ibm.com [9.47.18.17]) by d03av01.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id o47KB9X9003196; Fri, 7 May 2010 14:11:09 -0600 Subject: [PATCH] fix multi-buffer logging with mergeable buffers From: David L Stevens Reply-To: dlstevens@us.ibm.com To: mst@redhat.com Cc: netdev@vger.kernel.org Organization: IBM Date: Fri, 07 May 2010 13:11:08 -0700 Message-ID: <1273263068.24088.1.camel@w-dls.beaverton.ibm.com> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 (2.28.3-1.fc12) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch fixes the multibuffer case of logging with mergeable buffers. Signed-off-by: David L Stevens --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 85519b4..d526b68 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -236,8 +236,9 @@ static int get_rx_bufs(struct vhost_virtqueue *vq, int seg = 0; int headcount = 0; unsigned d; - int r; + int r, nlogs; + nlogs = 0; while (datalen > 0) { if (unlikely(headcount >= VHOST_NET_MAX_SG)) { r = -ENOBUFS; @@ -245,7 +246,8 @@ static int get_rx_bufs(struct vhost_virtqueue *vq, } d = vhost_get_desc(vq->dev, vq, vq->iov + seg, ARRAY_SIZE(vq->iov) - seg, &out, - &in, log, log_num); + &in, log+nlogs, log_num); + nlogs += log ? *log_num : 0; if (d == vq->num) { r = 0; goto err; @@ -263,6 +265,8 @@ static int get_rx_bufs(struct vhost_virtqueue *vq, seg += in; } *iovcount = seg; + if (unlikely(log)) + *log_num = nlogs; return headcount; err: vhost_discard_desc(vq, headcount);