Received: by 2002:ac0:8c9a:0:0:0:0:0 with SMTP id r26csp4291833ima; Mon, 4 Feb 2019 13:45:58 -0800 (PST) X-Google-Smtp-Source: AHgI3Ibd3iB/jBT/3YGnr9SwbJZQRm0bTl9DTBvXY9rMt13XHQvzpuRCsbYj/r9UNFxbrAW9OUh7 X-Received: by 2002:a17:902:b01:: with SMTP id 1mr1531546plq.331.1549316758736; Mon, 04 Feb 2019 13:45:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549316758; cv=none; d=google.com; s=arc-20160816; b=zoqiJKXKFkoPUTeIailW0hV8AIIfLdZBr4qjCTr0oP3l8HkFxF5g86Wq+QqN30FZjk zlvjJWTiW2YXyYkrRuzvUpE2dAfm5ag3wyEfJQTRMwAzED9+6l7yut6rtBwoVRtFV6Wy lSoOUYnjzx5QyZgrVUcFt1DtOIz8Ts8iGA3ooQZGoPaUrkp+1oxklANyctU2I66lWP3a RRGvVdIl+Z/fN2umb8lkcBpXJlTVjefmJ0FqTVbH8lu+rjNSeqzMzlYi4yrAY0q219r5 Roo2uR9mcbDQrKbonHY71NhaKxfrSRKDSd9CZdcWdmp5aQbnj6g1Pqd96CnUHClh95Or QHfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:to:from; bh=M1bkW0xLiDmznsfteiNQaanVzIkF/uVbAdkI+7uKm20=; b=hwzUE0R4h1dqQ4c1yo2aeofm7JXfxNqxMkoaRhrs6wkbKwmVDp/gCiyrxi2eqPV+cD 84SGXT1Ypmzfrmt7pJ2IZ1YBv6+ZxRQQreiGOZnjwhpNBzSsGfCmLQlXU721qMqYprDc IJvkg4wOSQ4xePwIj/CuRCbnBnGzCqutDcA6IijPVb0oD8f6oovLkH+gSw2icWC3fz/s 5x9dOsRMr9gb8AFV52IMz4vOptQT8w36eiWIpclN9vszN1HRnusSIz3e0pLuIAd8nNm9 LpYLxtXcW09eF9HhH2e2qWPgfnzFfXPCVcHV8zsyYLpP/dKKEMk5ToeefKdzB4GnWRCE LQSQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t63si1051055pgd.78.2019.02.04.13.45.42; Mon, 04 Feb 2019 13:45:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728272AbfBDUT6 (ORCPT + 99 others); Mon, 4 Feb 2019 15:19:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47246 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728094AbfBDUT4 (ORCPT ); Mon, 4 Feb 2019 15:19:56 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 376CF5D61C; Mon, 4 Feb 2019 20:19:56 +0000 (UTC) Received: from virtlab420.virt.lab.eng.bos.redhat.com (virtlab420.virt.lab.eng.bos.redhat.com [10.19.152.148]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E4E175C79; Mon, 4 Feb 2019 20:19:48 +0000 (UTC) From: Nitesh Narayan Lal To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, pbonzini@redhat.com, lcapitulino@redhat.com, pagupta@redhat.com, wei.w.wang@intel.com, yang.zhang.wz@gmail.com, riel@surriel.com, david@redhat.com, mst@redhat.com, dodgen@google.com, konrad.wilk@oracle.com, dhildenb@redhat.com, aarcange@redhat.com Subject: [RFC][Patch v8 5/7] virtio: Enables to add a single descriptor to the host Date: Mon, 4 Feb 2019 15:18:52 -0500 Message-Id: <20190204201854.2328-6-nitesh@redhat.com> In-Reply-To: <20190204201854.2328-1-nitesh@redhat.com> References: <20190204201854.2328-1-nitesh@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 04 Feb 2019 20:19:56 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch enables the caller to expose a single buffers to the other end using vring descriptor. It also allows the caller to perform this action in synchornous manner by using virtqueue_kick_sync. Signed-off-by: Nitesh Narayan Lal --- drivers/virtio/virtio_ring.c | 72 ++++++++++++++++++++++++++++++++++++ include/linux/virtio.h | 4 ++ 2 files changed, 76 insertions(+) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index cd7e755484e3..93c161ac6a28 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -1695,6 +1695,52 @@ static inline int virtqueue_add(struct virtqueue *_vq, out_sgs, in_sgs, data, ctx, gfp); } +/** + * virtqueue_add_desc - add a buffer to a chain using a vring desc + * @vq: the struct virtqueue we're talking about. + * @addr: address of the buffer to add. + * @len: length of the buffer. + * @in: set if the buffer is for the device to write. + * + * Returns zero or a negative error (ie. ENOSPC, ENOMEM, EIO). + */ +int virtqueue_add_desc(struct virtqueue *_vq, u64 addr, u32 len, int in) +{ + struct vring_virtqueue *vq = to_vvq(_vq); + struct vring_desc *desc = vq->split.vring.desc; + u16 flags = in ? VRING_DESC_F_WRITE : 0; + unsigned int i; + void *data = (void *)addr; + int avail_idx; + + /* Sanity check */ + if (!_vq) + return -EINVAL; + + START_USE(vq); + if (unlikely(vq->broken)) { + END_USE(vq); + return -EIO; + } + + i = vq->free_head; + flags &= ~VRING_DESC_F_NEXT; + desc[i].flags = cpu_to_virtio16(_vq->vdev, flags); + desc[i].addr = cpu_to_virtio64(_vq->vdev, addr); + desc[i].len = cpu_to_virtio32(_vq->vdev, len); + + vq->vq.num_free--; + vq->free_head = virtio16_to_cpu(_vq->vdev, desc[i].next); + vq->split.desc_state[i].data = data; + vq->split.avail_idx_shadow = 1; + avail_idx = vq->split.avail_idx_shadow; + vq->split.vring.avail->idx = cpu_to_virtio16(_vq->vdev, avail_idx); + vq->num_added = 1; + END_USE(vq); + return 0; +} +EXPORT_SYMBOL_GPL(virtqueue_add_desc); + /** * virtqueue_add_sgs - expose buffers to other end * @vq: the struct virtqueue we're talking about. @@ -1842,6 +1888,32 @@ bool virtqueue_notify(struct virtqueue *_vq) } EXPORT_SYMBOL_GPL(virtqueue_notify); +/** + * virtqueue_kick_sync - update after add_buf and busy wait till update is done + * @vq: the struct virtqueue + * + * After one or more virtqueue_add_* calls, invoke this to kick + * the other side. Busy wait till the other side is done with the update. + * + * Caller must ensure we don't call this with other virtqueue + * operations at the same time (except where noted). + * + * Returns false if kick failed, otherwise true. + */ +bool virtqueue_kick_sync(struct virtqueue *vq) +{ + u32 len; + + if (likely(virtqueue_kick(vq))) { + while (!virtqueue_get_buf(vq, &len) && + !virtqueue_is_broken(vq)) + cpu_relax(); + return true; + } + return false; +} +EXPORT_SYMBOL_GPL(virtqueue_kick_sync); + /** * virtqueue_kick - update after add_buf * @vq: the struct virtqueue diff --git a/include/linux/virtio.h b/include/linux/virtio.h index fa1b5da2804e..58943a3a0e8d 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -57,6 +57,10 @@ int virtqueue_add_sgs(struct virtqueue *vq, unsigned int in_sgs, void *data, gfp_t gfp); +/* A desc with this init id is treated as an invalid desc */ +int virtqueue_add_desc(struct virtqueue *_vq, u64 addr, u32 len, int in); + +bool virtqueue_kick_sync(struct virtqueue *vq); bool virtqueue_kick(struct virtqueue *vq); -- 2.17.2