Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp594imm; Tue, 10 Jul 2018 19:29:16 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeEYC3ueexttbftAdkFt7CN5c8tRlJeWPgYrPaOvRS76bYfeV+09B/qKZ0vAWxwIamlTtJN X-Received: by 2002:a62:9652:: with SMTP id c79-v6mr28331377pfe.114.1531276156180; Tue, 10 Jul 2018 19:29:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531276156; cv=none; d=google.com; s=arc-20160816; b=B/Mzp8ILsFgnqmvVMZqBarjik03gtVKJubIv3WHGIhwuVpJ4kkMIMDbi1HNiJTZGUC UlOsSB/TetwR0eTajriepDyN6H5BG4bia6BYItFUiFWkRi/T7DQ3Hn8wr9TN5LkHJ2kk BjfVRdZ5/QSXE8+rLVuIVNwdTIlmNUqqGzh6a2rhsEKAD8EFhMTw3Sb8iyRBckF3FhKF 1t9iPtzGtLj8Ef/tOZaOCpeV648OVs3ifmD3UfBO7Uqs1I02+XkdI6BeuDGxin92MWII 7lG1In/V5V16dtGh9N+WM7nfFhH7xSc++rVvHrIPxD/YQ6VgxX0ry0pYVCwOLrDjI+yf u+ow== 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=gW81p55z/Az/tnSch7BxV7oLA4Rab9Wi9tqnuFh+10k=; b=kedY20w+I7CQqNjcnLlz0XJlv7yKGL9hkGo81bGgC3hsuAdb0q/fGgxMNezCdsiNZ8 GJA9n9UsmkjhfdOgYrgPy5UU/tQQ4vEWzdVnAywimc2h0YdZhCWlCNbJSWYi0pX3aj7S 3AwwYT9zJhkdAnhQYvheG2SOxo8DfDFBHbUnNib96csdUWqJMhkJdbJpWfom41jVLRUG xWgS6I460/tuErxWsGiCfyk9MaUOJeNlPw2EBbnZLbQM484hApb58CZFiUHGDSaEvQnv lYeCVj92kkEEoXNQmnUeCGXsE3WDHy7Eww19/U0P+L6mhFzxFvDKQr7Y5smVmFEEpd9g SzOQ== 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 38-v6si17856651pgz.286.2018.07.10.19.29.00; Tue, 10 Jul 2018 19:29:16 -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 S1732578AbeGKC3f (ORCPT + 99 others); Tue, 10 Jul 2018 22:29:35 -0400 Received: from mga11.intel.com ([192.55.52.93]:24665 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732287AbeGKC3e (ORCPT ); Tue, 10 Jul 2018 22:29:34 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2018 19:27:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,336,1526367600"; d="scan'208";a="71744473" Received: from debian.sh.intel.com ([10.67.104.228]) by orsmga001.jf.intel.com with ESMTP; 10 Jul 2018 19:27:35 -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, virtio-dev@lists.oasis-open.org Cc: wexu@redhat.com, jfreimann@redhat.com, tiwei.bie@intel.com Subject: [PATCH net-next v2 1/5] virtio: add packed ring definitions Date: Wed, 11 Jul 2018 10:27:07 +0800 Message-Id: <20180711022711.7090-2-tiwei.bie@intel.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180711022711.7090-1-tiwei.bie@intel.com> References: <20180711022711.7090-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 | 3 +++ include/uapi/linux/virtio_ring.h | 43 ++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/include/uapi/linux/virtio_config.h b/include/uapi/linux/virtio_config.h index 449132c76b1c..1196e1c1d4f6 100644 --- a/include/uapi/linux/virtio_config.h +++ b/include/uapi/linux/virtio_config.h @@ -75,6 +75,9 @@ */ #define VIRTIO_F_IOMMU_PLATFORM 33 +/* This feature indicates support for the packed virtqueue layout. */ +#define VIRTIO_F_RING_PACKED 34 + /* * Does the device support Single Root I/O Virtualization? */ diff --git a/include/uapi/linux/virtio_ring.h b/include/uapi/linux/virtio_ring.h index 6d5d5faa989b..0254a2ba29cf 100644 --- a/include/uapi/linux/virtio_ring.h +++ b/include/uapi/linux/virtio_ring.h @@ -44,6 +44,10 @@ /* This means the buffer contains a list of buffer descriptors. */ #define VRING_DESC_F_INDIRECT 4 +/* Mark a descriptor as available or used. */ +#define VRING_DESC_F_AVAIL (1ul << 7) +#define VRING_DESC_F_USED (1ul << 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 +57,17 @@ * optimization. */ #define VRING_AVAIL_F_NO_INTERRUPT 1 +/* Enable events. */ +#define VRING_EVENT_F_ENABLE 0x0 +/* Disable events. */ +#define VRING_EVENT_F_DISABLE 0x1 +/* + * Enable events for a specific descriptor + * (as specified by Descriptor Ring Change Event Offset/Wrap Counter). + * Only valid if VIRTIO_RING_F_EVENT_IDX has been negotiated. + */ +#define VRING_EVENT_F_DESC 0x2 + /* We support indirect buffer descriptors */ #define VIRTIO_RING_F_INDIRECT_DESC 28 @@ -171,4 +186,32 @@ 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 { + /* Descriptor Ring Change Event Offset/Wrap Counter. */ + __virtio16 off_wrap; + /* Descriptor Ring Change 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.18.0