From patchwork Sun Jun 7 14:11:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 11591579 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B60B9913 for ; Sun, 7 Jun 2020 14:13:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9CCA3206A4 for ; Sun, 7 Jun 2020 14:13:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="aWEwTjyp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726779AbgFGOLo (ORCPT ); Sun, 7 Jun 2020 10:11:44 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:30521 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726760AbgFGOLm (ORCPT ); Sun, 7 Jun 2020 10:11:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591539101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wp6BO12ZdY311uANoeiTSpiBXoC9bVPHS+5RWfNAiPw=; b=aWEwTjypIXyku/geRCCP71LGFIRv2DGCeTDLsO48bc2T4HbowCD6qxvo1jqG0ko9qcAE3w PX2QKc9FopTnNEsRS6vTBHTAfECpdN9ipGZOQ42H85SXtjk4vv0zvtZGYwR3Gv0iwlFNI+ +MpqWLMTYb9J3V+vXtReLd2ZeE1qXqM= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-120-Ul8IN2ecMEynfKfqpSAcMg-1; Sun, 07 Jun 2020 10:11:39 -0400 X-MC-Unique: Ul8IN2ecMEynfKfqpSAcMg-1 Received: by mail-wm1-f69.google.com with SMTP id h25so4804337wmb.0 for ; Sun, 07 Jun 2020 07:11:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=wp6BO12ZdY311uANoeiTSpiBXoC9bVPHS+5RWfNAiPw=; b=dCEtt9opThd4iV0ntmtH75Wat/LB7nsArqh8byYNlDwHKYduEfdjIW6aSW7Wtl8rCe h+4F+doJd7S5rvughZ+LuzQJ5Dq5seL73L51byyMsVnDZPIpnRv0giVE7QVnO3J2dacq 9gkz8aZ0FcKGHWPRzF/T94rW3Kz5an+Vgp02RxAQtZLcKKiAF0mjkC5cbqfrm7NY3Gxo 3784ZeeAMuE9WCAfm/qncdAZkK462pIvMIJieYbWWLOUVglDA7F9SrZWWblLUPlLfrqW RjHIB4xdZGMQ7HBX1YqbIY+nH/2Q6RayU69C4+eHFZypuIelzCTDAUPrsgBeq02QpPip dGzQ== X-Gm-Message-State: AOAM530Z9MtMSjIQbEcn7s1jnLEoep5bvaqyI90MMCyLUNqVW63mUzPh fbUKAC/uxJ8Xj7gGS1X79q/lBmMUq62GPYXc9ut+NcwIhQn+8eeK4vcqgseTJTs1AMhUpauO0Pf fNyKDuzk1M9zH X-Received: by 2002:a1c:e20a:: with SMTP id z10mr11194106wmg.63.1591539098286; Sun, 07 Jun 2020 07:11:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFt8FJP6Ka1KJy2iQ809xCaM+/JyNuAYCSvk8oDmutDU4mYkXzFPpUiOv4ag1sD+vroAfCPA== X-Received: by 2002:a1c:e20a:: with SMTP id z10mr11194090wmg.63.1591539098051; Sun, 07 Jun 2020 07:11:38 -0700 (PDT) Received: from redhat.com (bzq-82-81-31-23.red.bezeqint.net. [82.81.31.23]) by smtp.gmail.com with ESMTPSA id o10sm18638815wrq.40.2020.06.07.07.11.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2020 07:11:37 -0700 (PDT) Date: Sun, 7 Jun 2020 10:11:36 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, Jason Wang , eperezma@redhat.com Subject: [PATCH RFC v5 06/13] vhost: reorder functions Message-ID: <20200607141057.704085-7-mst@redhat.com> References: <20200607141057.704085-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200607141057.704085-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Reorder functions in the file to not rely on forward declarations, in preparation to making them static down the road. Signed-off-by: Michael S. Tsirkin --- drivers/vhost/vhost.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 5075505cfe55..3ffcba4e27e9 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -2299,6 +2299,13 @@ static int fetch_buf(struct vhost_virtqueue *vq) return 1; } +/* Reverse the effect of vhost_get_vq_desc. Useful for error handling. */ +void vhost_discard_vq_desc(struct vhost_virtqueue *vq, int n) +{ + vq->last_avail_idx -= n; +} +EXPORT_SYMBOL_GPL(vhost_discard_vq_desc); + /* This function returns a value > 0 if a descriptor was found, or 0 if none were found. * A negative code is returned on error. */ static int fetch_descs(struct vhost_virtqueue *vq) @@ -2413,26 +2420,6 @@ int vhost_get_vq_desc(struct vhost_virtqueue *vq, } EXPORT_SYMBOL_GPL(vhost_get_vq_desc); -/* Reverse the effect of vhost_get_vq_desc. Useful for error handling. */ -void vhost_discard_vq_desc(struct vhost_virtqueue *vq, int n) -{ - vq->last_avail_idx -= n; -} -EXPORT_SYMBOL_GPL(vhost_discard_vq_desc); - -/* After we've used one of their buffers, we tell them about it. We'll then - * want to notify the guest, using eventfd. */ -int vhost_add_used(struct vhost_virtqueue *vq, unsigned int head, int len) -{ - struct vring_used_elem heads = { - cpu_to_vhost32(vq, head), - cpu_to_vhost32(vq, len) - }; - - return vhost_add_used_n(vq, &heads, 1); -} -EXPORT_SYMBOL_GPL(vhost_add_used); - static int __vhost_add_used_n(struct vhost_virtqueue *vq, struct vring_used_elem *heads, unsigned count) @@ -2502,6 +2489,19 @@ int vhost_add_used_n(struct vhost_virtqueue *vq, struct vring_used_elem *heads, } EXPORT_SYMBOL_GPL(vhost_add_used_n); +/* After we've used one of their buffers, we tell them about it. We'll then + * want to notify the guest, using eventfd. */ +int vhost_add_used(struct vhost_virtqueue *vq, unsigned int head, int len) +{ + struct vring_used_elem heads = { + cpu_to_vhost32(vq, head), + cpu_to_vhost32(vq, len) + }; + + return vhost_add_used_n(vq, &heads, 1); +} +EXPORT_SYMBOL_GPL(vhost_add_used); + static bool vhost_notify(struct vhost_dev *dev, struct vhost_virtqueue *vq) { __u16 old, new;