Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp1942799imm; Wed, 16 May 2018 05:35:23 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoVULmtbJKQVdUzadkLl2oDGgybJ/XQ32z9RDUFvCq5FeMIC1jZUmPSUzW3mdmufHVPv7Aa X-Received: by 2002:a62:9b57:: with SMTP id r84-v6mr782426pfd.109.1526474123090; Wed, 16 May 2018 05:35:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526474123; cv=none; d=google.com; s=arc-20160816; b=r1JSIGYX/r/4BIbSixRetixhTUyB62cDVAkF1lpy+1wWybnTrf0Bzj0AgpPgxxI7pr VdibuVv9FhpAYAms7yj/TKdRdNoOQTY4okTHdqhDlSI1cZ0NJ3LT2NsaTEx8IEzRWgNu yQT1AWCnfa9qThlEIekjLSKeqCMhfT1cJxuCjhhgSKWnqfKS9JriI+rSI0Zc4q/6UI6D Tq3U0UgNmIc0Zl8ANxT18Rsd2DXNFRoWfS0cGOHCH9Rgis9eWtln0kcPyjxk5y352GYA +JehdIgJe/AfPIhjZPpLv8Kl9KUCCRiNvHHxwY9bZliycDO+n4JXVArhePgjlic3lW92 CaVA== 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=taRGAqX47CBolHSkOoQRTahJGoirpTFZEdrCKJ0n7HQ=; b=idH75TBTNpJ6tk+xGz67CAIZHl6rDErNUA06yMVbA1M3yFxfZc0oH64DzwcHzS68fS tDfGZ/sE7IPNjHKUA3HOOmcW1y6LNW7z3Dj0zQ8nQy5FmjBO+MTrdfpX0hHHrdX+tKBO N38bbgxLwQS1a/Wmm6xgDFs1OI6GmtOQdE79g9+Esm1mVwRzNxaC1NXmSlrXfpzLWrqv W7hmx2FCZc7sCYiCYa1jPLAu39BHPFTvFnnV2tPnjvXT+8WqgAmBQw8bs/80XAgzbgzS vsE9Fq6YEnwEw5oOiF+ciiNhyso1uGQrsOwNS7rb3XMJcgpduNcrEz57UmcVjjOQXjEF wfuQ== 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 f1-v6si1944940pgo.590.2018.05.16.05.35.08; Wed, 16 May 2018 05:35:23 -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 S1752601AbeEPMe3 (ORCPT + 99 others); Wed, 16 May 2018 08:34:29 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:52386 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752544AbeEPMcv (ORCPT ); Wed, 16 May 2018 08:32:51 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C5D77407048B; Wed, 16 May 2018 12:32:50 +0000 (UTC) Received: from jason-ThinkPad-T450s.redhat.com (ovpn-12-64.pek2.redhat.com [10.72.12.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DDE5215CDA7; Wed, 16 May 2018 12:32:45 +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, jfreimann@redhat.com, wexu@redhat.com, tiwei.bie@intel.com Subject: [RFC V4 PATCH 4/8] vhost_net: do not explicitly manipulate vhost_used_elem Date: Wed, 16 May 2018 20:32:17 +0800 Message-Id: <1526473941-16199-5-git-send-email-jasowang@redhat.com> In-Reply-To: <1526473941-16199-1-git-send-email-jasowang@redhat.com> References: <1526473941-16199-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 16 May 2018 12:32:50 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 16 May 2018 12:32:50 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.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 afd4119..2ef1859 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -2064,11 +2064,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