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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 CFA72C433DB for ; Tue, 19 Jan 2021 08:09:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A16220773 for ; Tue, 19 Jan 2021 08:09:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389879AbhASF0C (ORCPT ); Tue, 19 Jan 2021 00:26:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387737AbhASFKM (ORCPT ); Tue, 19 Jan 2021 00:10:12 -0500 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3888C0613ED for ; Mon, 18 Jan 2021 21:08:24 -0800 (PST) Received: by mail-pf1-x42e.google.com with SMTP id o20so3115868pfu.0 for ; Mon, 18 Jan 2021 21:08:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l78+ic827fPeMtI4N3ruxnowwLavtkMdAQhrpxNvn10=; b=oLZ/lu9L9mSnnZyW00ltwHXyo44TYvX+ccpYXJTgwbiOiMXgHoMO3elQD5sQez2Sny ZrfOE/n85EPsc0U/9VpAgeIEA3Bcl8zawvPFtB5Y4kE1S2fBT//UvJjqi9ZqS/WlGhou qPeifQuk6xDi/b1qB/VrpXDIZcZ4x21hH7SLerZvvs+3QaAWVUkX4ggU7otSMaD3NF6N MM8TX7MrijhH3YO8q6l7lJym+s52rruIvIx1XhXorEqEXSF2k/V5Npl6vr4kcHngP8sq 8JGHk470/POpPqUVzGcbHTKpIjWt8zPdr0PBjgDCyGUsX7I/oymzLxsqaClwVfX5WZU3 4qGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l78+ic827fPeMtI4N3ruxnowwLavtkMdAQhrpxNvn10=; b=DFt3U3JMgjzwtUiP4Wykq/FOCsY4QAothTVoXeTX+sfumMQ/R2m7sbYqngrv7RVz98 w2SUjTphYIZj7uZ5gDR2OrMdMDHk8mLrNN7TUAQ+Cnpwvc4AoxmyJSUf/J8HJhUqf4vS ByRnpemscKFW8xIuAewrhvt6zzjdUNpUHXVuMdJgZdt7A4NUYcgKfYKTcMZ1NiRYcks5 hN4U+0EX9U6vx/NAEhcfglIamliyTRt4EIpKXwK8t5gx/M63cVKGmUjpuEbaxB4vumZg v1CjK6WOvJNipSc2gxvCjS1alJHpPTMLVvFCLlazoPUa67f3CPJRLq5P7WPugGHQPIYh azoQ== X-Gm-Message-State: AOAM530J0qg+Jw3fr7en9eWXYN9/yvx22VSf4wVrunuaC9ZkEnJMFmXr jc5f9V9OfKes7wAn6poGYxnY X-Google-Smtp-Source: ABdhPJz/fxwy4DYXVrnw1qnj25AW0O26rp73QlbMoxmwaU+d+WKNpvYSFfXNGAXSbsWGK45vrdkKRw== X-Received: by 2002:a62:160d:0:b029:1b3:fc7b:9237 with SMTP id 13-20020a62160d0000b02901b3fc7b9237mr2578724pfw.35.1611032904596; Mon, 18 Jan 2021 21:08:24 -0800 (PST) Received: from localhost ([139.177.225.243]) by smtp.gmail.com with ESMTPSA id b11sm17087042pfr.38.2021.01.18.21.08.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 21:08:24 -0800 (PST) From: Xie Yongji To: mst@redhat.com, jasowang@redhat.com, stefanha@redhat.com, sgarzare@redhat.com, parav@nvidia.com, bob.liu@oracle.com, hch@infradead.org, rdunlap@infradead.org, willy@infradead.org, viro@zeniv.linux.org.uk, axboe@kernel.dk, bcrl@kvack.org, corbet@lwn.net Cc: virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, kvm@vger.kernel.org, linux-aio@kvack.org, linux-fsdevel@vger.kernel.org Subject: [RFC v3 09/11] vduse: Add VDUSE_GET_DEV ioctl Date: Tue, 19 Jan 2021 13:07:54 +0800 Message-Id: <20210119050756.600-3-xieyongji@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210119050756.600-1-xieyongji@bytedance.com> References: <20210119045920.447-1-xieyongji@bytedance.com> <20210119050756.600-1-xieyongji@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This new ioctl will be used to retrieve the file descriptor referring to userspace vDPA device to support reconnecting. Signed-off-by: Xie Yongji --- drivers/vdpa/vdpa_user/vduse_dev.c | 30 ++++++++++++++++++++++++++++++ include/uapi/linux/vduse.h | 1 + 2 files changed, 31 insertions(+) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c index 1cf759bc5914..4d21203da5b6 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -872,9 +872,14 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd, static int vduse_dev_release(struct inode *inode, struct file *file) { struct vduse_dev *dev = file->private_data; + struct vduse_dev_msg *msg; vduse_kickfd_release(dev); vduse_virqfd_release(dev); + + while ((msg = vduse_dev_dequeue_msg(dev, &dev->recv_list))) + vduse_dev_enqueue_msg(dev, msg, &dev->send_list); + dev->connected = false; return 0; @@ -937,6 +942,28 @@ static struct vduse_dev *vduse_find_dev(u32 id) return dev; } +static int vduse_get_dev(u32 id) +{ + int fd; + char name[64]; + struct vduse_dev *dev = vduse_find_dev(id); + + if (!dev) + return -EINVAL; + + if (dev->connected) + return -EBUSY; + + snprintf(name, sizeof(name), "[vduse-dev:%u]", dev->id); + fd = anon_inode_getfd(name, &vduse_dev_fops, dev, O_RDWR | O_CLOEXEC); + if (fd < 0) + return fd; + + dev->connected = true; + + return fd; +} + static int vduse_destroy_dev(u32 id) { struct vduse_dev *dev = vduse_find_dev(id); @@ -1024,6 +1051,9 @@ static long vduse_ioctl(struct file *file, unsigned int cmd, ret = vduse_create_dev(&config); break; } + case VDUSE_GET_DEV: + ret = vduse_get_dev(arg); + break; case VDUSE_DESTROY_DEV: ret = vduse_destroy_dev(arg); break; diff --git a/include/uapi/linux/vduse.h b/include/uapi/linux/vduse.h index 9fb555ddcfbd..b3694f0d3b77 100644 --- a/include/uapi/linux/vduse.h +++ b/include/uapi/linux/vduse.h @@ -117,6 +117,7 @@ struct vduse_vq_eventfd { #define VDUSE_CREATE_DEV _IOW(VDUSE_BASE, 0x01, struct vduse_dev_config) #define VDUSE_DESTROY_DEV _IO(VDUSE_BASE, 0x02) +#define VDUSE_GET_DEV _IO(VDUSE_BASE, 0x03) #define VDUSE_IOTLB_GET_FD _IOWR(VDUSE_BASE, 0x04, struct vduse_iotlb_entry) #define VDUSE_VQ_SETUP_KICKFD _IOW(VDUSE_BASE, 0x05, struct vduse_vq_eventfd) -- 2.11.0