From patchwork Tue Aug 26 02:07:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 216 Return-Path: Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) by dpdk.org (Postfix) with ESMTP id 2AC0AB396 for ; Tue, 26 Aug 2014 04:04:59 +0200 (CEST) Received: by mail-pd0-f182.google.com with SMTP id fp1so21324042pdb.41 for ; Mon, 25 Aug 2014 19:08:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:user-agent:date:from:to:cc:subject :references:mime-version:content-type:content-disposition; bh=6t+jTkSsvGBYEZd94Mkgupql3YL92qX7xFSJcC5/us4=; b=JyIZdIPUj1FVtZWNeb+4W5cTN1RQ4Msskdr28DULdbvXLiL5GbXYzN81oh+kcqCF4i 3RemtwIbbFWXtiwiIMkzFCkofLsq5ae3En6yZKT9Z4MsCVZuPD1eH3iBNHJO7rKFtItW AIboW9oJkthgTF9RlenJMqujRiA7hNg7ddhPIHhGoSbv25UUvQLvq4tYItyV9BmsKAyn b94VzQdGV1XdMJy+ADBLeAG5TQfyoKYtxauPZ1I09/lOuy4HmHEzuARCIGVT3X+85A9x CwhNR4NOiNM4cOs7zpig4nvXzew1es+kCTVna8cM4rpkcM6f1Yi/7ZTIstOFxvnBlcAX Cazw== X-Gm-Message-State: ALoCoQlNrAKmAH4/+XStzSBgDIc5qy2gupceKzRq2fbCR35ca4otWbLTNIS+Iz7xCyH4wqG3QQa5 X-Received: by 10.68.57.140 with SMTP id i12mr33662942pbq.44.1409018936173; Mon, 25 Aug 2014 19:08:56 -0700 (PDT) Received: from localhost (static-50-53-65-80.bvtn.or.frontiernet.net. [50.53.65.80]) by mx.google.com with ESMTPSA id kk7sm5152020pab.31.2014.08.25.19.08.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Aug 2014 19:08:55 -0700 (PDT) Message-Id: <20140826020853.851222673@networkplumber.org> User-Agent: quilt/0.63-1 Date: Mon, 25 Aug 2014 19:07:54 -0700 From: Stephen Hemminger To: Ouyang Changchun References: <20140826020746.062748014@networkplumber.org> MIME-Version: 1.0 Content-Disposition: inline; filename=virtio-no-align.patch Cc: dev@dpdk.org Subject: [dpdk-dev] [RFC 08/10] virtio: remove redundant vq_alignment X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 02:04:59 -0000 Since vq_alignment is constant (always 4K), it does not need to be part of the vring struct. Signed-off-by: Stephen Hemminger --- lib/librte_pmd_virtio/virtio_ethdev.c | 1 - lib/librte_pmd_virtio/virtio_rxtx.c | 2 +- lib/librte_pmd_virtio/virtqueue.h | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) --- a/lib/librte_pmd_virtio/virtio_ethdev.c 2014-08-25 19:00:09.918550097 -0700 +++ b/lib/librte_pmd_virtio/virtio_ethdev.c 2014-08-25 19:00:09.918550097 -0700 @@ -290,7 +290,6 @@ int virtio_dev_queue_setup(struct rte_et vq->port_id = dev->data->port_id; vq->queue_id = queue_idx; vq->vq_queue_index = vtpci_queue_idx; - vq->vq_alignment = VIRTIO_PCI_VRING_ALIGN; vq->vq_nentries = vq_size; vq->vq_free_cnt = vq_size; --- a/lib/librte_pmd_virtio/virtio_rxtx.c 2014-08-25 19:00:09.918550097 -0700 +++ b/lib/librte_pmd_virtio/virtio_rxtx.c 2014-08-25 19:00:09.918550097 -0700 @@ -258,7 +258,7 @@ virtio_dev_vring_start(struct virtqueue * Reinitialise since virtio port might have been stopped and restarted */ memset(vq->vq_ring_virt_mem, 0, vq->vq_ring_size); - vring_init(vr, size, ring_mem, vq->vq_alignment); + vring_init(vr, size, ring_mem, VIRTIO_PCI_VRING_ALIGN); vq->vq_used_cons_idx = 0; vq->vq_desc_head_idx = 0; vq->vq_avail_idx = 0; --- a/lib/librte_pmd_virtio/virtqueue.h 2014-08-25 19:00:09.918550097 -0700 +++ b/lib/librte_pmd_virtio/virtqueue.h 2014-08-25 19:00:09.918550097 -0700 @@ -139,8 +139,7 @@ struct virtqueue { uint8_t port_id; /**< Device port identifier. */ void *vq_ring_virt_mem; /**< linear address of vring*/ - int vq_alignment; - int vq_ring_size; + unsigned int vq_ring_size; phys_addr_t vq_ring_mem; /**< physical address of vring */ struct vring vq_ring; /**< vring keeping desc, used and avail */