From patchwork Mon Apr 6 21:35:02 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: 11476639 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 752F392C for ; Mon, 6 Apr 2020 21:35:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4942C2078A for ; Mon, 6 Apr 2020 21:35:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XQ+aDFZ9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726749AbgDFVfJ (ORCPT ); Mon, 6 Apr 2020 17:35:09 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:43812 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726733AbgDFVfI (ORCPT ); Mon, 6 Apr 2020 17:35:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586208908; 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=s9Mom4OhtTxtDHxzUnnXxvRU3zaONixqwgs5hBxczCA=; b=XQ+aDFZ9+4bYDdDkcoVe7fU6mRMoRPkTQTE6JyK+HbWCsnQUpM84/Idmyc35Qg6vf8mbDF vlWexOuJsDd3V8KsjwZeB/N+KLzEiPyHA2Gj92/6MWCJeupL1aGzW/MKni1JD81w8nftwn hJVxboMbttrrMD3bkz8AxCwOYZpPw1o= 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-145-YddccTjDMN2OKjo3nnh8Wg-1; Mon, 06 Apr 2020 17:35:06 -0400 X-MC-Unique: YddccTjDMN2OKjo3nnh8Wg-1 Received: by mail-wm1-f69.google.com with SMTP id f81so417519wmf.2 for ; Mon, 06 Apr 2020 14:35:06 -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=s9Mom4OhtTxtDHxzUnnXxvRU3zaONixqwgs5hBxczCA=; b=Ktna9nfqC5dr/oh+I3ANAQy+NlDou7Je2HruwUymCDHcT5QTX0vt8LMNQw8ye6ko93 d1buVzSH6vui4kLCz44NBxK6eJbS3kEkjF7JpRldACzjt6a/xkf1/0Vjvi5srH0/Dw7j ehQk7HcITI6pZ0+QSwJfnpD3iWyPYHxFEu/0/e9T4IgAzVN6pUO1V9nLpvv1c0RcabcI e6zee/ephFRlQBPP+0F1rI8iWBa43mVIMBUBEUrxay5VSW9tP4HfgREyPvoAQfGMmkk6 LyXn9uGX/rfGI48jouwZ9QW0y17oYiz3Q7lX+QKJkej9BZ+1nrmBE5atH3hnU9A7lgEr P8qA== X-Gm-Message-State: AGi0PuacmMj0BkaHM2RIPZ+NL5mOGoLZzeD9xTo8dcgt1tGSIIDo/yuQ RUOyGYl9HgoBL/jYG76lF6nBF9uIfJxG56WNoVNQPTjstZkpc9eeu898BCysSn0y/bLGvkehd/Y Tyz2bYE2Mp6QG8ShwMHBe1EY= X-Received: by 2002:a1c:a344:: with SMTP id m65mr1085018wme.20.1586208904590; Mon, 06 Apr 2020 14:35:04 -0700 (PDT) X-Google-Smtp-Source: APiQypKQS8eELGxP1CiHyVt8zaFr65G004GNObWifgUCCYuDSdGnBqNiBsJWh3gS5NLmtJObwlGW/A== X-Received: by 2002:a1c:a344:: with SMTP id m65mr1084996wme.20.1586208904336; Mon, 06 Apr 2020 14:35:04 -0700 (PDT) Received: from redhat.com (bzq-79-176-51-222.red.bezeqint.net. [79.176.51.222]) by smtp.gmail.com with ESMTPSA id h2sm1041241wmb.16.2020.04.06.14.35.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 14:35:03 -0700 (PDT) Date: Mon, 6 Apr 2020 17:35:02 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Jason Wang , Paolo Bonzini , Stefan Hajnoczi , Jens Axboe , virtualization@lists.linux-foundation.org, linux-block@vger.kernel.org Subject: [PATCH v5 05/12] virtio: stop using legacy struct vring in kernel Message-ID: <20200406213314.248038-6-mst@redhat.com> References: <20200406213314.248038-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200406213314.248038-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org struct vring (in the uapi directory) and supporting APIs are kept around to solely avoid breaking old userspace builds. It's not actually part of the UAPI - it was kept in the UAPI header by mistake, and using it in kernel isn't necessary and prevents us from making changes safely. In particular, the APIs actually assume the legacy layout. Add an internal kernel-only struct vring and switch everyone to use that. Signed-off-by: Michael S. Tsirkin --- drivers/block/virtio_blk.c | 1 + include/linux/virtio.h | 1 - include/linux/virtio_ring.h | 10 ++++++++++ include/linux/vringh.h | 1 + include/uapi/linux/virtio_ring.h | 26 ++++++++++++++++---------- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 0736248999b0..dd5732dc4b07 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -15,6 +15,7 @@ #include #include #include +#include #define PART_BITS 4 #define VQ_NAME_LEN 16 diff --git a/include/linux/virtio.h b/include/linux/virtio.h index 15f906e4a748..a493eac08393 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -9,7 +9,6 @@ #include #include #include -#include /** * virtqueue - a queue to register buffers for sending or receiving. diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h index 3dc70adfe5f5..11680e74761a 100644 --- a/include/linux/virtio_ring.h +++ b/include/linux/virtio_ring.h @@ -60,6 +60,16 @@ static inline void virtio_store_mb(bool weak_barriers, struct virtio_device; struct virtqueue; +struct vring { + unsigned int num; + + struct vring_desc *desc; + + struct vring_avail *avail; + + struct vring_used *used; +}; + /* * Creates a virtqueue and allocates the descriptor ring. If * may_reduce_num is set, then this may allocate a smaller ring than diff --git a/include/linux/vringh.h b/include/linux/vringh.h index 9e2763d7c159..d71b3710f58e 100644 --- a/include/linux/vringh.h +++ b/include/linux/vringh.h @@ -11,6 +11,7 @@ #ifndef _LINUX_VRINGH_H #define _LINUX_VRINGH_H #include +#include #include #include #include diff --git a/include/uapi/linux/virtio_ring.h b/include/uapi/linux/virtio_ring.h index 9223c3a5c46a..8961a4adda5c 100644 --- a/include/uapi/linux/virtio_ring.h +++ b/include/uapi/linux/virtio_ring.h @@ -118,16 +118,6 @@ struct vring_used { struct vring_used_elem ring[]; }; -struct vring { - unsigned int num; - - struct vring_desc *desc; - - struct vring_avail *avail; - - struct vring_used *used; -}; - /* Alignment requirements for vring elements. * When using pre-virtio 1.0 layout, these fall out naturally. */ @@ -166,6 +156,21 @@ struct vring { #define vring_used_event(vr) ((vr)->avail->ring[(vr)->num]) #define vring_avail_event(vr) (*(__virtio16 *)&(vr)->used->ring[(vr)->num]) +#ifndef __KERNEL__ +/* + * The following definitions have been put in the UAPI header by mistake. We + * keep them around to avoid breaking old userspace builds. + */ +struct vring { + unsigned int num; + + struct vring_desc *desc; + + struct vring_avail *avail; + + struct vring_used *used; +}; + static inline void vring_init(struct vring *vr, unsigned int num, void *p, unsigned long align) { @@ -182,6 +187,7 @@ static inline unsigned vring_size(unsigned int num, unsigned long align) + align - 1) & ~(align - 1)) + sizeof(__virtio16) * 3 + sizeof(struct vring_used_elem) * num; } +#endif #endif /* VIRTIO_RING_NO_LEGACY */