From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77098C2BA80 for ; Mon, 6 Apr 2020 21:35:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4CB42206C3 for ; Mon, 6 Apr 2020 21:35:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NwgMhIdG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726930AbgDFVfX (ORCPT ); Mon, 6 Apr 2020 17:35:23 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:35570 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726798AbgDFVfN (ORCPT ); Mon, 6 Apr 2020 17:35:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586208912; 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=qxsCmO2anPyq8x1F5Rc9demQ45Mib3q8zcUy7zKxbTE=; b=NwgMhIdG9ImYGdtXoAV6ju//fah8e6+NizXat/6pWbuRNF+efA/puEwPopF07vhVTl7TIw exIGUlZw3aKMvcoEcybhiExeNCUVmHt32e4pk66falg/Wkqjr6O+IRd9s6ng0QIkDnd1tc wC0qMoYJEaS4TQILVDd8yTnQzNarqrY= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-320-GJExX99gMaWjtimCvtn48w-1; Mon, 06 Apr 2020 17:35:10 -0400 X-MC-Unique: GJExX99gMaWjtimCvtn48w-1 Received: by mail-wr1-f69.google.com with SMTP id h95so571218wrh.11 for ; Mon, 06 Apr 2020 14:35:10 -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=qxsCmO2anPyq8x1F5Rc9demQ45Mib3q8zcUy7zKxbTE=; b=IIJbptFkvOL8sDh4F10A36n6jx7vchK69QBwIkIYpZYaRN7xgBjc//cZtJ9VFkHWQ/ rb3/mDhUq11zLRVLpO22YE0c3vypmaNckjlXw8Fpys7eWilMhoCAv5/qaAik4XYbi4Qm eJWUQVA/LprJDp1x98uc0ljjLLm+1URsdXKq4ZAG4i+4K3YIHTO/05wVuwTb+deN3jv5 jOTBKdhY1XwtFLOCfznUzuVoLaQwnpuQHENFVCeYMgwXyxrn0hAd+NffURmgZOzBLRhF Id4z/1Y47IRjKEANqopKT5S5eC2OPk4LThvAJD+S08qDz1hzZVQoNlhr5Ln3ndCduWoj uFPA== X-Gm-Message-State: AGi0PuaOHZQcZbZwrMN9ealn8pvuvmGPWx+0LmZra7g5XG4HYJIUHm0v fJEWEyF9UF6N4yNe0PselS9sVka3y0JuoClDKXYjYoo8kXpauW6fbPIBDx/1r1aopPZQhcxCUFr AZL+fuxDmLaXMYRQSoUjxuN8B X-Received: by 2002:a7b:c2a1:: with SMTP id c1mr1029195wmk.138.1586208909562; Mon, 06 Apr 2020 14:35:09 -0700 (PDT) X-Google-Smtp-Source: APiQypI9b+LX+l4YiYBZj2i6VJ5KIEQ3hmFVk2kz6aT/tabWoxNGudtjGpT+UQ2sfcrxQWp7m/ymbQ== X-Received: by 2002:a7b:c2a1:: with SMTP id c1mr1029181wmk.138.1586208909389; Mon, 06 Apr 2020 14:35:09 -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 g2sm27474875wrs.42.2020.04.06.14.35.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 14:35:08 -0700 (PDT) Date: Mon, 6 Apr 2020 17:35:07 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Jason Wang , virtualization@lists.linux-foundation.org Subject: [PATCH v5 07/12] virtio: add legacy init/size APIs Message-ID: <20200406213314.248038-8-mst@redhat.com> References: <20200406213314.248038-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org vring_init/vring_size (in the uapi directory) 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 vring_legacy_init/vring_legacy_size. Signed-off-by: Michael S. Tsirkin --- include/linux/virtio_ring.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h index c3f9ca054250..766d70bca492 100644 --- a/include/linux/virtio_ring.h +++ b/include/linux/virtio_ring.h @@ -140,4 +140,22 @@ void vring_del_virtqueue(struct virtqueue *vq); void vring_transport_features(struct virtio_device *vdev); irqreturn_t vring_interrupt(int irq, void *_vq); + +static inline void vring_legacy_init(struct vring *vr, unsigned int num, void *p, + unsigned long align) +{ + vr->num = num; + vr->desc = p; + vr->avail = (struct vring_avail *)((char *)p + num * sizeof(struct vring_desc)); + vr->used = (void *)(((uintptr_t)&vr->avail->ring[num] + sizeof(__virtio16) + + align-1) & ~(align - 1)); +} + +static inline unsigned vring_legacy_size(unsigned int num, unsigned long align) +{ + return ((sizeof(struct vring_desc) * num + sizeof(__virtio16) * (3 + num) + + align - 1) & ~(align - 1)) + + sizeof(__virtio16) * 3 + sizeof(struct vring_used_elem) * num; +} + #endif /* _LINUX_VIRTIO_RING_H */ -- MST