All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tiwei Bie <tiwei.bie@intel.com>
To: maxime.coquelin@redhat.com, zhihong.wang@intel.com, dev@dpdk.org
Subject: [PATCH 07/10] net/virtio: drop unused field in Tx region structure
Date: Tue, 19 Mar 2019 14:43:09 +0800	[thread overview]
Message-ID: <20190319064312.13743-8-tiwei.bie@intel.com> (raw)
In-Reply-To: <20190319064312.13743-1-tiwei.bie@intel.com>

Drop the unused field tx_indir_pq from virtio_tx_region
structure.

Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
---
 drivers/net/virtio/virtio_ethdev.c | 10 +---------
 drivers/net/virtio/virtqueue.h     |  8 ++------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index f452a9a79..8aa250997 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -603,17 +603,9 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx)
 		memset(txr, 0, vq_size * sizeof(*txr));
 		for (i = 0; i < vq_size; i++) {
 			struct vring_desc *start_dp = txr[i].tx_indir;
-			struct vring_packed_desc *start_dp_packed =
-				txr[i].tx_indir_pq;
 
 			/* first indirect descriptor is always the tx header */
-			if (vtpci_packed_queue(hw)) {
-				start_dp_packed->addr = txvq->virtio_net_hdr_mem
-					+ i * sizeof(*txr)
-					+ offsetof(struct virtio_tx_region,
-						   tx_hdr);
-				start_dp_packed->len = hw->vtnet_hdr_size;
-			} else {
+			if (!vtpci_packed_queue(hw)) {
 				vring_desc_init_split(start_dp,
 						      RTE_DIM(txr[i].tx_indir));
 				start_dp->addr = txvq->virtio_net_hdr_mem
diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
index 78df6d390..6dab7db8e 100644
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -277,12 +277,8 @@ struct virtio_net_hdr_mrg_rxbuf {
 #define VIRTIO_MAX_TX_INDIRECT 8
 struct virtio_tx_region {
 	struct virtio_net_hdr_mrg_rxbuf tx_hdr;
-	union {
-		struct vring_desc tx_indir[VIRTIO_MAX_TX_INDIRECT]
-			__attribute__((__aligned__(16)));
-		struct vring_packed_desc tx_indir_pq[VIRTIO_MAX_TX_INDIRECT]
-			__attribute__((__aligned__(16)));
-	};
+	struct vring_desc tx_indir[VIRTIO_MAX_TX_INDIRECT]
+		__attribute__((__aligned__(16)));
 };
 
 static inline int
-- 
2.17.1

  parent reply	other threads:[~2019-03-19  6:43 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-19  6:43 [PATCH 00/10] net/virtio: cleanups and fixes for packed/split ring Tiwei Bie
2019-03-19  6:43 ` [PATCH 01/10] net/virtio: fix typo in packed ring init Tiwei Bie
2019-03-19  8:39   ` Jens Freimann
2019-03-19 12:46   ` Maxime Coquelin
2019-03-19  6:43 ` [PATCH 02/10] net/virtio: fix interrupt helper for packed ring Tiwei Bie
2019-03-19 12:48   ` Maxime Coquelin
2019-03-19  6:43 ` [PATCH 03/10] net/virtio: add missing barrier in interrupt enable Tiwei Bie
2019-03-19 12:49   ` Maxime Coquelin
2019-03-19  6:43 ` [PATCH 04/10] net/virtio: optimize flags update for packed ring Tiwei Bie
2019-03-19  8:54   ` Jens Freimann
2019-03-19  9:37     ` Tiwei Bie
2019-03-19 10:11       ` Jens Freimann
2019-03-19 12:50         ` Maxime Coquelin
2019-03-19 12:58   ` Maxime Coquelin
2019-03-19  6:43 ` [PATCH 05/10] net/virtio: refactor virtqueue structure Tiwei Bie
2019-03-19  9:44   ` Jens Freimann
2019-03-19 10:09     ` Tiwei Bie
2019-03-19 13:28       ` Maxime Coquelin
2019-03-19 13:47         ` Jens Freimann
2019-03-19 13:50           ` Maxime Coquelin
2019-03-19 14:59             ` Kevin Traynor
2019-03-20  4:40               ` Tiwei Bie
2019-03-20 17:50                 ` Stephen Hemminger
2019-03-21 14:18                   ` Maxime Coquelin
2019-03-20  4:35         ` Tiwei Bie
2019-03-19 13:28   ` Maxime Coquelin
2019-03-19  6:43 ` [PATCH 06/10] net/virtio: drop redundant suffix in packed ring structure Tiwei Bie
2019-03-19  9:47   ` Jens Freimann
2019-03-19 13:29   ` Maxime Coquelin
2019-03-19  6:43 ` Tiwei Bie [this message]
2019-03-19  9:51   ` [PATCH 07/10] net/virtio: drop unused field in Tx region structure Jens Freimann
2019-03-19 13:33   ` Maxime Coquelin
2019-03-19  6:43 ` [PATCH 08/10] net/virtio: add interrupt helper for split ring Tiwei Bie
2019-03-19  9:53   ` Jens Freimann
2019-03-19 13:34   ` Maxime Coquelin
2019-03-19  6:43 ` [PATCH 09/10] net/virtio: add ctrl vq " Tiwei Bie
2019-03-19  9:54   ` Jens Freimann
2019-03-19 13:54   ` Maxime Coquelin
2019-03-19  6:43 ` [PATCH 10/10] net/virtio: improve batching in standard Rx path Tiwei Bie
2019-03-19 10:04   ` Jens Freimann
2019-03-19 10:28     ` Tiwei Bie
2019-03-19 11:08       ` Maxime Coquelin
2019-03-19 14:15   ` Maxime Coquelin
2019-03-20  7:35 ` [PATCH 00/10] net/virtio: cleanups and fixes for packed/split ring Maxime Coquelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190319064312.13743-8-tiwei.bie@intel.com \
    --to=tiwei.bie@intel.com \
    --cc=dev@dpdk.org \
    --cc=maxime.coquelin@redhat.com \
    --cc=zhihong.wang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.