Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp1887702imm; Sun, 15 Jul 2018 20:29:51 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcQ7EoiJAuaoNr2I+tKsLU3EGQqtT0hfoO9YbIkhho+8Y9TPXdPr3WJIHYU2p9xKca8EQtZ X-Received: by 2002:a65:58c8:: with SMTP id e8-v6mr13874976pgu.96.1531711791933; Sun, 15 Jul 2018 20:29:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531711791; cv=none; d=google.com; s=arc-20160816; b=AmWLXp6UpY19SXnrgGThFBQ5ON4HdCZC6fum2FDGcqVS0Y+Z6X/grfsmuD0ScsjUaq rGb9DaKnGYXk31o3TsyGqgm4FKcmkjVK2NIHgbrE/8R1Bq1tUZY2xT88QioqPc1GpeBi zisHhWUUbcYhpVNma6yNZWqTHc0WKuXJgGtobykKjy8sjtTnYyk2GiheJfIeLb+70CpH xDiLCRw90ZS+GqGfUbcpoKxD+NgBQ0Hmrdt9zm3R2u7uP2FCoxZ7pRnMgEg/9Fled8Cn Y1LG9J/ifN7g79vaCqsSkkgTk8Mij1sfV4gpsK03UEXb07oTDTQR5camHImtIOiwIfPa e5VQ== 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=A8dGJVP/uk6BzVoBG6uLjAwSutngRH7C4xxVOMf5BAA=; b=t7pbkD2DhMrNY4H40UPJgZ1EmBNBeT7j2YfPCzg84y/lBe/DEwJLFgxTOFOiqynPeU 1qDQ7kbWf/zjlwP++bqa1KOser9xQ/n5VNix6rywY6cBVmaGxS2WrCKKCkO2mENi49z+ HbQQFjmpKTDqv2fcJ3sBu3N5195TJ1NMM+hujEkcD0jvTHCywpgsXirTH8gm6OH2vvyd HQ6JU0JeWAOqG75rHXLGcGNYgvOoHvXdIlCxfDIc47ia0UCW/rJGfw5QmsCNP3mJXMCl /tCSkKeAzIyItWBXKa4/qmcViRP0ldPIZrQSz1f5N9B3Nhj2qeftTuXeZUPfWUs5TnHn 5/9g== 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 s184-v6si28409483pgb.161.2018.07.15.20.29.37; Sun, 15 Jul 2018 20:29:51 -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 S1729854AbeGPDyA (ORCPT + 99 others); Sun, 15 Jul 2018 23:54:00 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:37604 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728442AbeGPDyA (ORCPT ); Sun, 15 Jul 2018 23:54:00 -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 BC2D7402312B; Mon, 16 Jul 2018 03:28:43 +0000 (UTC) Received: from jason-ThinkPad-T450s.redhat.com (ovpn-12-140.pek2.redhat.com [10.72.12.140]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3AE112026D66; Mon, 16 Jul 2018 03:28:38 +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, wexu@redhat.com, jfreimann@redhat.com, tiwei.bie@intel.com, maxime.coquelin@redhat.com Subject: [PATCH net-next V2 4/8] vhost_net: do not explicitly manipulate vhost_used_elem Date: Mon, 16 Jul 2018 11:28:07 +0800 Message-Id: <1531711691-6769-5-git-send-email-jasowang@redhat.com> In-Reply-To: <1531711691-6769-1-git-send-email-jasowang@redhat.com> References: <1531711691-6769-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.6]); Mon, 16 Jul 2018 03:28:43 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Mon, 16 Jul 2018 03:28:43 +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 2f1395a..2432002 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -348,9 +348,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 @@ -557,10 +558,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 641f4c6..af15bec 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -2071,11 +2071,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