Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp1283904imm; Tue, 22 May 2018 01:19:42 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqzDST3NP0OhKuRO1D5IPXtzajI9WFuUHnCXXXfzAkfkAE3DbIklR9vz7VNlpUNJxEoGaqb X-Received: by 2002:a17:902:6045:: with SMTP id a5-v6mr23513561plt.138.1526977182344; Tue, 22 May 2018 01:19:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526977182; cv=none; d=google.com; s=arc-20160816; b=X9IVmpme5e8eQfvn+kOp5TiMOEhJNgSJ/kblcQdyuofeAsIuLpfveepnSYJe9NuJnu XJRAG+peab2daKCBT86GmQVy2ks5GQgwZQCxE2MrTZtwsnKThVfcaAm7lw5BNeP2Ktw/ 648zXVHpHqd1IYWLcorBrZJiyqSWK4TuRsjx1AxbeLQT7R4CcsFKvDXSS4x9ZDk1osBC CKgI7kBpTK+EJCcYs39WcYrerIiP7MJN16e4+GGZVJm6gA8XuDWp6FCG2eI9XjVWPHX7 xXOpwNqaUhqGSkgbwgZBGWpED0961LhLreQjd/cNApW4r126bMVlKwl9PKTlVABwanLa Olow== 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:cc:to:from:arc-authentication-results; bh=/qbUmSg2rCpH2BLK2rdYte6raa/qStZNTdSgQCW9+B8=; b=eRPtsB/2EbCatVU+QiSmYi4fqeYtQh23N5kanCfQk5+0h3fJ7aUj0nuqO9oLAXZvcp 5KZrWnhLLLigWfJTwfWX2fVC9cg9o39VEgJiHIb1YGtowXl/rJfVj6GibAbsB3LVgH+f +dWl71X8IwTVpT5awk57AAhkNpOdmu9jqjTOqpC37DIQhbI4CDZNB3tDKtq0s6T6Sbwo GxxsBZDVUpVDR9UmNEveQc5MdsUIOzJrXchsz7MVP7eFXBPLuhdeVUkUYoP3Qkly8vHG GREg1L/BUzVClKQwTJUCl+7F3WRnJeWyvwBjruExzI+2t1txNor31z8BHeoWx1a3Dn6e QLtw== 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=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z10-v6si12276603pgp.419.2018.05.22.01.19.27; Tue, 22 May 2018 01:19:42 -0700 (PDT) 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751447AbeEVIRV (ORCPT + 99 others); Tue, 22 May 2018 04:17:21 -0400 Received: from mga05.intel.com ([192.55.52.43]:23522 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751002AbeEVIRR (ORCPT ); Tue, 22 May 2018 04:17:17 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 May 2018 01:17:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,429,1520924400"; d="scan'208";a="51200164" Received: from debian.sh.intel.com ([10.67.104.203]) by FMSMGA003.fm.intel.com with ESMTP; 22 May 2018 01:17:12 -0700 From: Tiwei Bie To: mst@redhat.com, jasowang@redhat.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: wexu@redhat.com, jfreimann@redhat.com, tiwei.bie@intel.com Subject: [RFC v5 1/5] virtio: add packed ring definitions Date: Tue, 22 May 2018 16:16:44 +0800 Message-Id: <20180522081648.14768-2-tiwei.bie@intel.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522081648.14768-1-tiwei.bie@intel.com> References: <20180522081648.14768-1-tiwei.bie@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Tiwei Bie --- include/uapi/linux/virtio_config.h | 5 ++++- include/uapi/linux/virtio_ring.h | 36 ++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/virtio_config.h b/include/uapi/linux/virtio_config.h index 308e2096291f..932a6ecc8e46 100644 --- a/include/uapi/linux/virtio_config.h +++ b/include/uapi/linux/virtio_config.h @@ -49,7 +49,7 @@ * transport being used (eg. virtio_ring), the rest are per-device feature * bits. */ #define VIRTIO_TRANSPORT_F_START 28 -#define VIRTIO_TRANSPORT_F_END 34 +#define VIRTIO_TRANSPORT_F_END 35 #ifndef VIRTIO_CONFIG_NO_LEGACY /* Do we get callbacks when the ring is completely used, even if we've @@ -71,4 +71,7 @@ * this is for compatibility with legacy systems. */ #define VIRTIO_F_IOMMU_PLATFORM 33 + +/* This feature indicates support for the packed virtqueue layout. */ +#define VIRTIO_F_RING_PACKED 34 #endif /* _UAPI_LINUX_VIRTIO_CONFIG_H */ diff --git a/include/uapi/linux/virtio_ring.h b/include/uapi/linux/virtio_ring.h index 6d5d5faa989b..3932cb80c347 100644 --- a/include/uapi/linux/virtio_ring.h +++ b/include/uapi/linux/virtio_ring.h @@ -44,6 +44,9 @@ /* This means the buffer contains a list of buffer descriptors. */ #define VRING_DESC_F_INDIRECT 4 +#define VRING_DESC_F_AVAIL(b) ((b) << 7) +#define VRING_DESC_F_USED(b) ((b) << 15) + /* The Host uses this in used->flags to advise the Guest: don't kick me when * you add a buffer. It's unreliable, so it's simply an optimization. Guest * will still kick if it's out of buffers. */ @@ -53,6 +56,10 @@ * optimization. */ #define VRING_AVAIL_F_NO_INTERRUPT 1 +#define VRING_EVENT_F_ENABLE 0x0 +#define VRING_EVENT_F_DISABLE 0x1 +#define VRING_EVENT_F_DESC 0x2 + /* We support indirect buffer descriptors */ #define VIRTIO_RING_F_INDIRECT_DESC 28 @@ -171,4 +178,33 @@ static inline int vring_need_event(__u16 event_idx, __u16 new_idx, __u16 old) return (__u16)(new_idx - event_idx - 1) < (__u16)(new_idx - old); } +struct vring_packed_desc_event { + /* __virtio16 off : 15; // Descriptor Event Offset + * __virtio16 wrap : 1; // Descriptor Event Wrap Counter */ + __virtio16 off_wrap; + /* __virtio16 flags : 2; // Descriptor Event Flags */ + __virtio16 flags; +}; + +struct vring_packed_desc { + /* Buffer Address. */ + __virtio64 addr; + /* Buffer Length. */ + __virtio32 len; + /* Buffer ID. */ + __virtio16 id; + /* The flags depending on descriptor type. */ + __virtio16 flags; +}; + +struct vring_packed { + unsigned int num; + + struct vring_packed_desc *desc; + + struct vring_packed_desc_event *driver; + + struct vring_packed_desc_event *device; +}; + #endif /* _UAPI_LINUX_VIRTIO_RING_H */ -- 2.17.0