From patchwork Tue Sep 12 03:00:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cindy Lu X-Patchwork-Id: 139946 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp718747vqi; Thu, 14 Sep 2023 17:45:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGum0wn7+f+n7p7Jr17qvtQ7C2JGz1TJeP53yYBo0RNKbyN8Hcr0VUFvvT887ZwBFPyfhfm X-Received: by 2002:a17:90a:9f82:b0:267:c0cb:e462 with SMTP id o2-20020a17090a9f8200b00267c0cbe462mr92191pjp.48.1694738721246; Thu, 14 Sep 2023 17:45:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694738721; cv=none; d=google.com; s=arc-20160816; b=UR0JfnrwsG8dk2NJzYJCsaUg++1FLTC0vYU9yj124CxbONtEZZmLxj2gqIsVVmkkBZ TFY1F+x/dZK3Wc3VyOGbheG7e+E3S8c/aXzEVOmFscDPhfYWQtKAHWctTpcs3cK83CQP oU2Y3CgENsvTUHyGs3NRLARQafR5RTFId4ML4544Iwg99JDh/0v5+y/u/HezLGdj47CS ltk1XpaQJGw+y57DPD13o+bM5qTwujyoyeMTO04Kq4Cd9HeRJXQ0YbLvS9QJcAHdDD3d 7o1D1pdzJKGYcLGKcD2zAhFjuSlXtNU5nfPMQpDDF7tKM37PNN5ortQ+pLZG4mP8HQ+P I26A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kwKuz+pEy562YxDwzJRjoqIMWX9vZPgr9ApgXLFv6FY=; fh=E8uCy2UoKRrKjgDakfUdRLlW20LdfkTjtJs3toefLrk=; b=axlr2UgeJJf0Pehykjw1v/UqZAtOWtWvZRLuJV4qC4Z3Cma69VEik5kl5LXgw5i/We 6zjp93GtrDKmBe25oc+Vm+z/c3Ogzzu1NJWnNlODzcxEw/UjIezmAp2DVgUHQAy4gVaD FW6poSC3vBzceGUFNm8yAgMcG+yJUcYTMGV95puJk0sUBQqVTTfAuvOQHd4UchjdFlg5 Ho6nefAGZGezbF3e+NjOQHRpn6tEx2aK9HZrMkU0zzGKcDkwBdnS2EYVxFkievmItN0Z /ZTo3SxCfvYEAl/mT2MzkDq7tge3ixYGaZ3iIx9jw24HQsVrk323lhbyEURvxhijx2zD EkaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=MrGFaYdU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id k8-20020a17090a514800b0026b7d81b779si4486154pjm.152.2023.09.14.17.45.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 17:45:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=MrGFaYdU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 3C08F827FF90; Mon, 11 Sep 2023 21:20:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.8 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237092AbjILDw1 (ORCPT + 40 others); Mon, 11 Sep 2023 23:52:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237260AbjILDwL (ORCPT ); Mon, 11 Sep 2023 23:52:11 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5E28129135 for ; Mon, 11 Sep 2023 20:00:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694487628; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kwKuz+pEy562YxDwzJRjoqIMWX9vZPgr9ApgXLFv6FY=; b=MrGFaYdUMODwVpZnowjSiFFaFFlFHIkxT0YLa+9bkdGgxF6RTgFbckHW0Ez1bmL+309sEe E0u/YscSE450nrQVHzeZDAp1p3e+auXjvHR1AmpnqdGOH+DmFVgvof2HAMOGPP7hh7aM1L 6Iw4T6PNgE2dy6qsTD7gSeNELmL/SSE= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-369-yWHp0cIoMQqnm9uiFbZKbQ-1; Mon, 11 Sep 2023 23:00:25 -0400 X-MC-Unique: yWHp0cIoMQqnm9uiFbZKbQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7FB723C0D859; Tue, 12 Sep 2023 03:00:24 +0000 (UTC) Received: from server.redhat.com (unknown [10.72.112.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id B456C40C6EA8; Tue, 12 Sep 2023 03:00:20 +0000 (UTC) From: Cindy Lu To: lulu@redhat.com, jasowang@redhat.com, mst@redhat.com, maxime.coquelin@redhat.com, xieyongji@bytedance.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Cc: stable@vger.kernel.org Subject: [RFC v2 1/4] vduse: Add function to get/free the pages for reconnection Date: Tue, 12 Sep 2023 11:00:05 +0800 Message-Id: <20230912030008.3599514-2-lulu@redhat.com> In-Reply-To: <20230912030008.3599514-1-lulu@redhat.com> References: <20230912030008.3599514-1-lulu@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 11 Sep 2023 21:20:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777062349374561448 X-GMAIL-MSGID: 1777062349374561448 Add the function vduse_alloc_reconnnect_info_mem and vduse_alloc_reconnnect_info_mem In this 2 function, vduse will get/free (vq_num + 1)*page   Page 0 will be used to save the reconnection information, The Userspace App will maintain this. Page 1 ~ vq_num + 1 will save the reconnection information for vqs. Signed-off-by: Cindy Lu --- drivers/vdpa/vdpa_user/vduse_dev.c | 86 ++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c index 26b7e29cb900..4c256fa31fc4 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -30,6 +30,10 @@ #include #include +#ifdef CONFIG_X86 +#include +#endif + #include "iova_domain.h" #define DRV_AUTHOR "Yongji Xie " @@ -41,6 +45,23 @@ #define VDUSE_IOVA_SIZE (128 * 1024 * 1024) #define VDUSE_MSG_DEFAULT_TIMEOUT 30 +/* struct vdpa_reconnect_info save the page information for reconnection + * kernel will init these information while alloc the pages + * and use these information to free the pages + */ +struct vdpa_reconnect_info { + /* Offset (within vm_file) in PAGE_SIZE, + * this just for check, not using + */ + u32 index; + /* physical address for this page*/ + phys_addr_t addr; + /* virtual address for this page*/ + unsigned long vaddr; + /* memory size, here always page_size*/ + phys_addr_t size; +}; + struct vduse_virtqueue { u16 index; u16 num_max; @@ -57,6 +78,7 @@ struct vduse_virtqueue { struct vdpa_callback cb; struct work_struct inject; struct work_struct kick; + struct vdpa_reconnect_info reconnect_info; }; struct vduse_dev; @@ -106,6 +128,7 @@ struct vduse_dev { u32 vq_align; struct vduse_umem *umem; struct mutex mem_lock; + struct vdpa_reconnect_info reconnect_status; }; struct vduse_dev_msg { @@ -1030,6 +1053,65 @@ static int vduse_dev_reg_umem(struct vduse_dev *dev, return ret; } +int vduse_alloc_reconnnect_info_mem(struct vduse_dev *dev) +{ + struct vdpa_reconnect_info *info; + struct vduse_virtqueue *vq; + void *addr; + + /*page 0 is use to save status,dpdk will use this to save the information + *needed in reconnection,kernel don't need to maintain this + */ + info = &dev->reconnect_status; + addr = (void *)get_zeroed_page(GFP_KERNEL); + if (!addr) + return -1; + + info->addr = virt_to_phys(addr); + info->vaddr = (unsigned long)(addr); + info->size = PAGE_SIZE; + /* index is vm Offset in PAGE_SIZE */ + info->index = 0; + + /*page 1~ vq_num + 1 save the reconnect info for vqs*/ + for (int i = 0; i < dev->vq_num + 1; i++) { + vq = &dev->vqs[i]; + info = &vq->reconnect_info; + addr = (void *)get_zeroed_page(GFP_KERNEL); + if (!addr) + return -1; + + info->addr = virt_to_phys(addr); + info->vaddr = (unsigned long)(addr); + info->size = PAGE_SIZE; + info->index = i + 1; + } + + return 0; +} + +int vduse_free_reconnnect_info_mem(struct vduse_dev *dev) +{ + struct vdpa_reconnect_info *info; + struct vduse_virtqueue *vq; + + info = &dev->reconnect_status; + free_page(info->vaddr); + info->size = 0; + info->addr = 0; + info->vaddr = 0; + for (int i = 0; i < dev->vq_num + 1; i++) { + vq = &dev->vqs[i]; + info = &vq->reconnect_info; + free_page(info->vaddr); + info->size = 0; + info->addr = 0; + info->vaddr = 0; + } + + return 0; +} + static long vduse_dev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { @@ -1390,6 +1472,8 @@ static int vduse_destroy_dev(char *name) mutex_unlock(&dev->lock); return -EBUSY; } + vduse_free_reconnnect_info_mem(dev); + dev->connected = true; mutex_unlock(&dev->lock); @@ -1542,6 +1626,8 @@ static int vduse_create_dev(struct vduse_dev_config *config, ret = PTR_ERR(dev->dev); goto err_dev; } + + vduse_alloc_reconnnect_info_mem(dev); __module_get(THIS_MODULE); return 0; From patchwork Tue Sep 12 03:00:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cindy Lu X-Patchwork-Id: 139093 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp87906vqb; Wed, 13 Sep 2023 14:09:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPnce/+pTpOYUKcs+b2WCr6+UCAU7votC8SDjuYJd6uLWXfwvbgSoiLryN6xlEbd7ezJ7Z X-Received: by 2002:a17:90a:4ce4:b0:268:13c4:b800 with SMTP id k91-20020a17090a4ce400b0026813c4b800mr3654819pjh.21.1694639368115; Wed, 13 Sep 2023 14:09:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694639368; cv=none; d=google.com; s=arc-20160816; b=EL4e2mDdYe4aHIAmYojyvZG+3H1Jp/7JreCz8KCbWjSsvdI7aRpj1GWmbUio2/7/E/ iSt/2wAKFWRpW/47Opkq7GI/On2xb52Qfpuyr7lPnes3/ZOSb9ve5iCZNUEXmETd4zVD dAbmIZetOuNi1nC4svaGWFy4feWTucnUVQV9tq1evmpGZ+uFBLGfqn7vRbY9plWFtHGW uoYDyD7piqLYY78uQlYbybQPzL+jmlyeFf1lJSj/EK4e0dxb65I88AOxPbWK6N5OGvJ+ uvIh1V61jbzA4dGowONjELcPd2Cba90GHSZz+aWIsaHg3JbSdMudJFCYh1ymFEeyjO7f 8xcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=RvcAHd1Sx6r1hbCkmerjsL+BU6ZA4iisCRaqRkbDPg0=; fh=E8uCy2UoKRrKjgDakfUdRLlW20LdfkTjtJs3toefLrk=; b=zqAG34EbPO1yaDyKtM1AAbXU6qdsJZtSeh1duKlk+SIMIr7WRCZS6JKRPm6AnoOdM1 xTV7HSsQR/4uBYnzLUKa7fVR5tI1yz2dybADJ48EfKNvhHHEk6/g2qH+aDX0WP8ENW1P fVfF0ajEo+hvbeNNmHdUYz/UNb0Z62GPDNPdhGNlSJbcXR13kdRdRPlmOVaRFdf54imr y4scvv8x0hRERnyZsPSRdDpZqg+Oa4VjTXZUe8XAx9BX3Tkgs+ZcoMyKO1vLUVi7N6gN Dl8UJMN2Sq/ybjmTvkST6tGMigeQhtvlSNgzkREbj2tRA3coLq2WEftK5HMlNeerZ+zM z9Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Hat976UJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id kk17-20020a17090b4a1100b00262f0035181si2526929pjb.26.2023.09.13.14.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 14:09:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Hat976UJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id BE9BC8298B56; Mon, 11 Sep 2023 21:23:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.8 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238234AbjILDwY (ORCPT + 40 others); Mon, 11 Sep 2023 23:52:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238356AbjILDwJ (ORCPT ); Mon, 11 Sep 2023 23:52:09 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 312B4296C2 for ; Mon, 11 Sep 2023 20:00:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694487634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RvcAHd1Sx6r1hbCkmerjsL+BU6ZA4iisCRaqRkbDPg0=; b=Hat976UJXn+nC+BCZdUcqe51AZXnYDw9lC4/nNc6oYCxyKyq+VotmiiVZ0BTEX5QSsnKlH LQ/uQZdzLFox4xgAckvSqqB9eVIBx50I2e93U9JKDRDuJj2kZuCbDB5vLXt5gYvBpdGNuI wP/4Jemcqq2q9sLsORHSk9bTjnbCLy4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-151-LtaHkr5JNEGcRN0MMZ4H8w-1; Mon, 11 Sep 2023 23:00:29 -0400 X-MC-Unique: LtaHkr5JNEGcRN0MMZ4H8w-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DE9F98A21EE; Tue, 12 Sep 2023 03:00:28 +0000 (UTC) Received: from server.redhat.com (unknown [10.72.112.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FDCB40C6EA8; Tue, 12 Sep 2023 03:00:24 +0000 (UTC) From: Cindy Lu To: lulu@redhat.com, jasowang@redhat.com, mst@redhat.com, maxime.coquelin@redhat.com, xieyongji@bytedance.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Cc: stable@vger.kernel.org Subject: [RFC v2 2/4] vduse: Add file operation for mmap Date: Tue, 12 Sep 2023 11:00:06 +0800 Message-Id: <20230912030008.3599514-3-lulu@redhat.com> In-Reply-To: <20230912030008.3599514-1-lulu@redhat.com> References: <20230912030008.3599514-1-lulu@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 11 Sep 2023 21:23:09 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776958170003760560 X-GMAIL-MSGID: 1776958170003760560 Add the operation for mmap, The user space APP will use this function to map the pages to userspace Signed-off-by: Cindy Lu --- drivers/vdpa/vdpa_user/vduse_dev.c | 63 ++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c index 4c256fa31fc4..2c69f4004a6e 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -1388,6 +1388,67 @@ static struct vduse_dev *vduse_dev_get_from_minor(int minor) return dev; } +static vm_fault_t vduse_vm_fault(struct vm_fault *vmf) +{ + struct vduse_dev *dev = vmf->vma->vm_file->private_data; + struct vm_area_struct *vma = vmf->vma; + u16 index = vma->vm_pgoff; + struct vduse_virtqueue *vq; + struct vdpa_reconnect_info *info; + + if (index == 0) { + info = &dev->reconnect_status; + } else { + vq = &dev->vqs[index - 1]; + info = &vq->reconnect_info; + } + vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); + if (remap_pfn_range(vma, vmf->address & PAGE_MASK, PFN_DOWN(info->addr), + PAGE_SIZE, vma->vm_page_prot)) + return VM_FAULT_SIGBUS; + return VM_FAULT_NOPAGE; +} + +static const struct vm_operations_struct vduse_vm_ops = { + .fault = vduse_vm_fault, +}; + +static int vduse_dev_mmap(struct file *file, struct vm_area_struct *vma) +{ + struct vduse_dev *dev = file->private_data; + struct vdpa_reconnect_info *info; + unsigned long index = vma->vm_pgoff; + struct vduse_virtqueue *vq; + + if (vma->vm_end - vma->vm_start != PAGE_SIZE) + return -EINVAL; + if ((vma->vm_flags & VM_SHARED) == 0) + return -EINVAL; + + if (index > 65535) + return -EINVAL; + + if (index == 0) { + info = &dev->reconnect_status; + } else { + vq = &dev->vqs[index - 1]; + info = &vq->reconnect_info; + } + + if (info->index != index) + return -EINVAL; + + if (info->addr & (PAGE_SIZE - 1)) + return -EINVAL; + if (vma->vm_end - vma->vm_start != info->size) + return -EOPNOTSUPP; + + vm_flags_set(vma, VM_IO | VM_PFNMAP | VM_DONTDUMP); + vma->vm_ops = &vduse_vm_ops; + + return 0; +} + static int vduse_dev_open(struct inode *inode, struct file *file) { int ret; @@ -1420,6 +1481,8 @@ static const struct file_operations vduse_dev_fops = { .unlocked_ioctl = vduse_dev_ioctl, .compat_ioctl = compat_ptr_ioctl, .llseek = noop_llseek, + .mmap = vduse_dev_mmap, + }; static struct vduse_dev *vduse_dev_create(void) From patchwork Tue Sep 12 03:00:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cindy Lu X-Patchwork-Id: 138652 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp875083vqx; Tue, 12 Sep 2023 22:57:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFqb0YUt8AKv6OkebzEjFCdo165Glshn/b1x1BYEL6V/e7v8wWAO6MNVwnIAa8BetSjxlSc X-Received: by 2002:a05:6a21:78a6:b0:14d:8624:b14f with SMTP id bf38-20020a056a2178a600b0014d8624b14fmr1536623pzc.56.1694584678381; Tue, 12 Sep 2023 22:57:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694584678; cv=none; d=google.com; s=arc-20160816; b=lgKj9poGazaavoEVu/101LC4uJiyIqC3cN2PPAcnKmZsSFlvqC3uFlgtYIG5Q0lxwa xpg/CdbndF/X3J0fIBv3MOnLMQQyK7jAtlItcuX3Ede7NudomgurROarnGK/YQWyaS0/ 5b+7EkqTzwyq7WMbKwt9IoMzF9AoVbn/BXuRpBb/SXjIboTs3V0v8may1VIByiB41PnN S8b7kZt7sbUuePTcQVuw5/mRcUtpEuXuf1iT8aAFgG1YEQ4pm8gaCpI7sDd3XbGDiptf +rRP9cyqIqYbjfvPZU+LUtfzfBg303zXkBNjn73WKiTzQsNh1hJN7lS5497eiNlSa2Xj d7rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GC7kin1JeAsa+JwSskswsZ+EfkakP69SisNc/3XqZfo=; fh=E8uCy2UoKRrKjgDakfUdRLlW20LdfkTjtJs3toefLrk=; b=ipU3nBETK37hVGqhiqK5uxS5d4wJvHjcwLIeAIsGMj+mf/rMqVf4jEer2nQVOjUFyT Kplt2djsMNgYAIvoHbQIGyzdVDIhpxpxOKOnGKFhUHWGCqZyD0SM1JkYPLrCBVCkcld7 oWA6/j91bGaDM6thp3r3WMHD6jugZ5iIsnRg6llbyz5/EgDVMW3FrsqvGONITYplnxbI fhRS4Mw/2g1I5mZ/Y5w1/wpQSgPr0LQuXuxhI7yqo1rideP+mj2UPss3ajDe5wXYSjNN 6kbNVgw0YqALguuJKK5nfzKxWM7PBlCkTMbwMxexlPTXyN5DLV/N6li6iPNg0bz6cbw/ D0SQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LZO+cJYr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id ip8-20020a17090b314800b0026d55291b15si898592pjb.0.2023.09.12.22.57.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 22:57:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LZO+cJYr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id E4360823CC7F; Mon, 11 Sep 2023 21:33:02 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233105AbjILDYz (ORCPT + 40 others); Mon, 11 Sep 2023 23:24:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236363AbjILDYd (ORCPT ); Mon, 11 Sep 2023 23:24:33 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A30A2296D6 for ; Mon, 11 Sep 2023 20:00:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694487636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GC7kin1JeAsa+JwSskswsZ+EfkakP69SisNc/3XqZfo=; b=LZO+cJYrHpuC/7dW4i2kwvJynoFNsAT1z4PrJRWS3Pqixw9OlbesQhUVdDobrzNNof8NJb gwTpcWAbfgJpjEBTA++Ac7/2olrgg8tU8mlXpwpUgPhuCxRjjB1q9+Ad2Jhw5OhYflp7Al U2Z7ALlFHwq2UMXJTJtCwm1R7yxnFHQ= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-696-iLfAFYcYN1yjSWG1J-LD9A-1; Mon, 11 Sep 2023 23:00:33 -0400 X-MC-Unique: iLfAFYcYN1yjSWG1J-LD9A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4A7A93801BC2; Tue, 12 Sep 2023 03:00:33 +0000 (UTC) Received: from server.redhat.com (unknown [10.72.112.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7EC5440C6EA8; Tue, 12 Sep 2023 03:00:29 +0000 (UTC) From: Cindy Lu To: lulu@redhat.com, jasowang@redhat.com, mst@redhat.com, maxime.coquelin@redhat.com, xieyongji@bytedance.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Cc: stable@vger.kernel.org Subject: [RFC v2 3/4] vduse: update the vq_info in ioctl Date: Tue, 12 Sep 2023 11:00:07 +0800 Message-Id: <20230912030008.3599514-4-lulu@redhat.com> In-Reply-To: <20230912030008.3599514-1-lulu@redhat.com> References: <20230912030008.3599514-1-lulu@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 11 Sep 2023 21:33:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776887133373786195 X-GMAIL-MSGID: 1776900823345074739 In VDUSE_VQ_GET_INFO, the driver will sync the last_avail_idx with reconnect info, After mapping the reconnect pages to userspace The userspace App will update the reconnect_time in struct vhost_reconnect_vring, If this is not 0 then it means this vq is reconnected and will update the last_avail_idx Signed-off-by: Cindy Lu --- drivers/vdpa/vdpa_user/vduse_dev.c | 13 +++++++++++++ include/uapi/linux/vduse.h | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c index 2c69f4004a6e..680b23dbdde2 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -1221,6 +1221,8 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd, struct vduse_vq_info vq_info; struct vduse_virtqueue *vq; u32 index; + struct vdpa_reconnect_info *area; + struct vhost_reconnect_vring *vq_reconnect; ret = -EFAULT; if (copy_from_user(&vq_info, argp, sizeof(vq_info))) @@ -1252,6 +1254,17 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd, vq_info.ready = vq->ready; + area = &vq->reconnect_info; + + vq_reconnect = (struct vhost_reconnect_vring *)area->vaddr; + /*check if the vq is reconnect, if yes then update the last_avail_idx*/ + if ((vq_reconnect->last_avail_idx != + vq_info.split.avail_index) && + (vq_reconnect->reconnect_time != 0)) { + vq_info.split.avail_index = + vq_reconnect->last_avail_idx; + } + ret = -EFAULT; if (copy_to_user(argp, &vq_info, sizeof(vq_info))) break; diff --git a/include/uapi/linux/vduse.h b/include/uapi/linux/vduse.h index 11bd48c72c6c..d585425803fd 100644 --- a/include/uapi/linux/vduse.h +++ b/include/uapi/linux/vduse.h @@ -350,4 +350,10 @@ struct vduse_dev_response { }; }; +struct vhost_reconnect_vring { + __u16 reconnect_time; + __u16 last_avail_idx; + _Bool avail_wrap_counter; +}; + #endif /* _UAPI_VDUSE_H_ */ From patchwork Tue Sep 12 03:00:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cindy Lu X-Patchwork-Id: 138657 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp882216vqx; Tue, 12 Sep 2023 23:13:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHIrsHUd3r99iiV8cxkDptBIOFQvutoGuUc1HCh9wBQQ/+Xmxj3iAtRSRxUazsi0fl3rMxp X-Received: by 2002:a05:6870:b406:b0:1d1:425b:802d with SMTP id x6-20020a056870b40600b001d1425b802dmr1872702oap.7.1694585621347; Tue, 12 Sep 2023 23:13:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694585621; cv=none; d=google.com; s=arc-20160816; b=CiFuZv1e4HMdmlJuRE2DGaE5bfP56GZKeaAB+R5Yf3FhJ4jBYzXMX/JuMsICKXsPx2 KLWHtGDPojAQFRw3876lRhMVIrVcm+6V8pB2kSlhfSdNRMKlINy5G4j1KpBXbCWJok+W euHPENQ4cm93kH+0BoFcBNLOPnmiq5W7qvGCWIt4bqG5P3G70hFnyBN8+Jqg9DxUFVeP p8zM0zohCQpIqMgSjoH+xTH+eWBu3o+Mj/I/Tm8tKc9XBCUmIUeFoGhluabWvrNguuhO l0nKYAge3MK2X5IkXtmPuAJcxksV0ac1c2aMPaabzHodamwFpEtEpCCowrAcvVsUY6Qi ss5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WI0RMvdlyM2CoPU0JPuivhklmmTZZnT8q78FFwqlw28=; fh=E8uCy2UoKRrKjgDakfUdRLlW20LdfkTjtJs3toefLrk=; b=D6KgcMDVLmGS5vwPVeftRC6XRzZwJr0OpouVlKIEPpO5DdFS4zyWldDye2lsXDBH3i VAIGB/qMtimWmS2jIf9cwXAOPKThyCwMUk78d271k80VyS9tZB07a/JW9c05z6q5uSH2 zYgCcJnNXKvd2xnMNXdRt3I3lxvLeVXST9x6NqWQXp5U9aOulUBwgaARFFCaYPVl9cM+ ik9XOnykKpcM1NpIlWgpZ8iQkD3uwk10skt0Dn2kmZEIcVimvr66L713PFFadYtH2Q63 bObEjfOI8HkB50LKWyKExI9T9J5ANSM64+i+YP7uhebSQfWOLHOh99posZGroKZA7u5U Mg5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JfwhkaaV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id h8-20020a636c08000000b00565dd3ea771si9093344pgc.137.2023.09.12.23.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 23:13:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JfwhkaaV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 47F7885F6E94; Mon, 11 Sep 2023 21:50:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237177AbjILDYx (ORCPT + 40 others); Mon, 11 Sep 2023 23:24:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236375AbjILDYd (ORCPT ); Mon, 11 Sep 2023 23:24:33 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D1C03296FD for ; Mon, 11 Sep 2023 20:01:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694487663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WI0RMvdlyM2CoPU0JPuivhklmmTZZnT8q78FFwqlw28=; b=JfwhkaaVuDHhGVFg6tmhOJhvCGknF15HUKw/0J2yXa3In3K43e3Swptxx0l4WXLnLW226e sYyPUYo6BLLfMLnk70heg746W5cDuXIIZFs+ctLXYHNhRa5gH3euZKo+zPbOK1j5K00y3A GfCE1Lw7qqSjnnWe1WGPdn1TNyPdpec= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-281-ozpCd5wROgmlUEP7zF_bpA-1; Mon, 11 Sep 2023 23:00:59 -0400 X-MC-Unique: ozpCd5wROgmlUEP7zF_bpA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 488CB803C96; Tue, 12 Sep 2023 03:00:59 +0000 (UTC) Received: from server.redhat.com (unknown [10.72.112.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7725110005D4; Tue, 12 Sep 2023 03:00:55 +0000 (UTC) From: Cindy Lu To: lulu@redhat.com, jasowang@redhat.com, mst@redhat.com, maxime.coquelin@redhat.com, xieyongji@bytedance.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Cc: stable@vger.kernel.org Subject: [RFC v2 4/4] vduse: Add new ioctl VDUSE_GET_RECONNECT_INFO Date: Tue, 12 Sep 2023 11:00:08 +0800 Message-Id: <20230912030008.3599514-5-lulu@redhat.com> In-Reply-To: <20230912030008.3599514-1-lulu@redhat.com> References: <20230912030008.3599514-1-lulu@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 11 Sep 2023 21:50:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776901812381794951 X-GMAIL-MSGID: 1776901812381794951 In VDUSE_GET_RECONNECT_INFO, the Userspace App can get the map size and The number of mapping memory pages from the kernel. The userspace App can use this information to map the pages. Signed-off-by: Cindy Lu --- drivers/vdpa/vdpa_user/vduse_dev.c | 15 +++++++++++++++ include/uapi/linux/vduse.h | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c index 680b23dbdde2..c99f99892b5c 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -1368,6 +1368,21 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd, ret = 0; break; } + case VDUSE_GET_RECONNECT_INFO: { + struct vduse_reconnect_mmap_info info; + + ret = -EFAULT; + if (copy_from_user(&info, argp, sizeof(info))) + break; + + info.size = PAGE_SIZE; + info.max_index = dev->vq_num + 1; + + if (copy_to_user(argp, &info, sizeof(info))) + break; + ret = 0; + break; + } default: ret = -ENOIOCTLCMD; break; diff --git a/include/uapi/linux/vduse.h b/include/uapi/linux/vduse.h index d585425803fd..ce55e34f63d7 100644 --- a/include/uapi/linux/vduse.h +++ b/include/uapi/linux/vduse.h @@ -356,4 +356,19 @@ struct vhost_reconnect_vring { _Bool avail_wrap_counter; }; +/** + * struct vduse_reconnect_mmap_info + * @size: mapping memory size, always page_size here + * @max_index: the number of pages allocated in kernel,just + * use for check + */ + +struct vduse_reconnect_mmap_info { + __u32 size; + __u32 max_index; +}; + +#define VDUSE_GET_RECONNECT_INFO \ + _IOWR(VDUSE_BASE, 0x1b, struct vduse_reconnect_mmap_info) + #endif /* _UAPI_VDUSE_H_ */