Received: by 10.192.165.148 with SMTP id m20csp3040843imm; Sun, 22 Apr 2018 22:39:11 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+6buZImpIFfEHj9EWYaSM8I/Kxpncbfq9Pq83ZcCt9C0lgjdcs6k49limgF2Eh4OGbNjO+ X-Received: by 2002:a17:902:7b84:: with SMTP id w4-v6mr11671859pll.116.1524461951154; Sun, 22 Apr 2018 22:39:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524461951; cv=none; d=google.com; s=arc-20160816; b=m6mWbUh6t+4Hpkemr+DAf2pfo6Ipg4VhfLHx9LydVs9RY/Rdi1QlunGrOQ5qZC01Af 0+KaMhJ5JlUZ7r07ap/dPO7pHdoKRXMo/2crN4joIrD+XdsJ4mVLTMc6qV878HPbsqFf gshwPJgmxynUhHqVb8RdU41FSvioj3AZAFMhBo4w7aabMnGkzqAtkYqmgOguN/kNUJXO nFd2f+/Yz7OhN4kdaQbECnw0Ni1EQKvPy9C8JB3w/4L5/MSj1Lv+eEdNAcOwb1DQm5qQ IlXPNtp3pKTrtlR+4O/DWcclygBL3TEzUmHtMhFg4ia7qn2ODOIEtPGrxdfmVdMxzG9a gRpw== 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=21GrEkcpGytJZsFah9FjWcBafAqWulWVGkOD8L4zwL0=; b=ESIFRke1bujyCYSkIA+QlCgF2LaBzvqqrRTYARzNqfQXHDP+/YUsdJIbcgakRTJIWh Vz9m8+xxvskH1IVGKLOppsSNCiHLjfeATSk6t56tlcJQEbLXOfCXobZmF3fA+qHzgbBe uA73PQhmxbysQnp4nmMbLj06/F341Kky+dznW3TyViAC+Lh/494p90P3gvEAWPMq1qqR z9B+bLaFPTgdOd9rFRZAGiCLLJbBFtldQcA4IyVADQN5XLF+Yfje3wu/YFId7sVVaZRy cESNS72Xoa+kSe/LY6UvhDphRhd4RI3r4iSg9x/30IaQyxjQIZJ5mgtNmSGOjpaMUnIB gkLg== 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 b10-v6si11516510pla.260.2018.04.22.22.38.57; Sun, 22 Apr 2018 22:39:11 -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=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754198AbeDWFhk (ORCPT + 99 others); Mon, 23 Apr 2018 01:37:40 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:60456 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752968AbeDWFf2 (ORCPT ); Mon, 23 Apr 2018 01:35:28 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C7909EBFE5; Mon, 23 Apr 2018 05:35:27 +0000 (UTC) Received: from jason-ThinkPad-T450s.redhat.com (ovpn-12-101.pek2.redhat.com [10.72.12.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 380332023239; Mon, 23 Apr 2018 05:35:23 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com Cc: kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, tiwei.bie@intel.com, jfreimann@redhat.com, wexu@redhat.com Subject: [RFC V3 PATCH 4/8] vhost_net: do not explicitly manipulate vhost_used_elem Date: Mon, 23 Apr 2018 13:34:56 +0800 Message-Id: <1524461700-5469-5-git-send-email-jasowang@redhat.com> In-Reply-To: <1524461700-5469-1-git-send-email-jasowang@redhat.com> References: <1524461700-5469-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Mon, 23 Apr 2018 05:35:27 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Mon, 23 Apr 2018 05:35:27 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jasowang@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Two helpers of setting/getting used len were introduced to avoid explicitly manipulating vhost_used_elem in zerocopy code. This will be used to hide used_elem internals and simplify packed ring implementation. Signed-off-by: Jason Wang --- drivers/vhost/net.c | 11 +++++------ drivers/vhost/vhost.c | 12 ++++++++++-- drivers/vhost/vhost.h | 5 +++++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 3826f1f..30273ad 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -341,9 +341,10 @@ static void vhost_zerocopy_signal_used(struct vhost_net *net, int j = 0; for (i = nvq->done_idx; i != nvq->upend_idx; i = (i + 1) % UIO_MAXIOV) { - if (vq->heads[i].elem.len == VHOST_DMA_FAILED_LEN) + if (vhost_get_used_len(vq, &vq->heads[i]) == + VHOST_DMA_FAILED_LEN) vhost_net_tx_err(net); - if (VHOST_DMA_IS_DONE(vq->heads[i].elem.len)) { + if (VHOST_DMA_IS_DONE(vhost_get_used_len(vq, &vq->heads[i]))) { vq->heads[i].elem.len = VHOST_DMA_CLEAR_LEN; ++j; } else @@ -542,10 +543,8 @@ static void handle_tx(struct vhost_net *net) struct ubuf_info *ubuf; ubuf = nvq->ubuf_info + nvq->upend_idx; - vq->heads[nvq->upend_idx].elem.id = - cpu_to_vhost32(vq, used.elem.id); - vq->heads[nvq->upend_idx].elem.len = - VHOST_DMA_IN_PROGRESS; + vhost_set_used_len(vq, &used, VHOST_DMA_IN_PROGRESS); + vq->heads[nvq->upend_idx] = used; ubuf->callback = vhost_zerocopy_callback; ubuf->ctx = nvq->ubufs; ubuf->desc = nvq->upend_idx; diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 24f3013..5cc1cdb 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -2099,11 +2099,19 @@ int vhost_get_vq_desc(struct vhost_virtqueue *vq, } EXPORT_SYMBOL_GPL(vhost_get_vq_desc); -static void vhost_set_used_len(struct vhost_virtqueue *vq, - struct vhost_used_elem *used, int len) +void vhost_set_used_len(struct vhost_virtqueue *vq, + struct vhost_used_elem *used, int len) { used->elem.len = cpu_to_vhost32(vq, len); } +EXPORT_SYMBOL_GPL(vhost_set_used_len); + +int vhost_get_used_len(struct vhost_virtqueue *vq, + struct vhost_used_elem *used) +{ + return vhost32_to_cpu(vq, used->elem.len); +} +EXPORT_SYMBOL_GPL(vhost_get_used_len); /* This is a multi-buffer version of vhost_get_desc, that works if * vq has read descriptors only. diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index 8dea44b..604821b 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -198,6 +198,11 @@ int vhost_get_bufs(struct vhost_virtqueue *vq, unsigned *log_num, unsigned int quota, s16 *count); +void vhost_set_used_len(struct vhost_virtqueue *vq, + struct vhost_used_elem *used, + int len); +int vhost_get_used_len(struct vhost_virtqueue *vq, + struct vhost_used_elem *used); void vhost_discard_vq_desc(struct vhost_virtqueue *, int n); int vhost_vq_init_access(struct vhost_virtqueue *); -- 2.7.4