From nobody Sun Feb 8 20:48:20 2026 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5FA3D136E11 for ; Mon, 20 May 2024 15:21:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.177.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716218480; cv=none; b=KvHv7S2Hs6LYlOILzZvjVCT5ecxEPTUrp0+S9DtwFC8qoqOoyWdX3s/l1WRTtvzdZSIndiUThG5jE37LubA5IMJimbkGMbj36wdUo6/F9RlaNy6I6ovt2dHlRRM2KKFqUw3eCkaLYyZ5QxhdtpNDIc/kVEzRKwiKBDMmNoqit1s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716218480; c=relaxed/simple; bh=/3brYIh4ncfYVMXJoPhV83VZYuPd5O5RDQ/MbvSpQEU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=MbwVB9WU0VW8YyUH2WAMunpzHdQjVb2mvwq7ABZSTiT7kavQdhWrkPpNb9OkEKL+KgZ3uvaUJTFily9Zp01ohwa1IJD2qllLn2nMpUCEhn9CvoQh8e5unnEFDI2YwzdqTfmiyjzcFFGIwI2ejTvBGM4pcPACUyNARXKK1bNbpSI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=IKqncCq0; arc=none smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="IKqncCq0" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 44KEISnf012978; Mon, 20 May 2024 15:21:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2023-11-20; bh=nghfDIm9aaZnyFv3eR1D94oo2A5AFx5js+8s3mtdwrM=; b=IKqncCq05zoMKCpHMQL5opifFSneKn3B+g9AmKdLdHhiV3OiSTx2q9Az9a7evNNT7OCT uRX0wqKVT8ZPbrO5vISzeFt+C6HZDsJJPSHZhMXVHcGLsy2UY0hfXm0M61CG64IP6kIm gnTrB09scg1b+bvqygv8KzaImOhm9i80ohLCH12yJM+jqyJAhey+Vtyp2fYNuzEdA1ZK qEu4o9gr8xmVyxzDDS9CMtg2ZDmr1aH2HkydjmQ/PuBWIPh/UJdJwxgfrJgDgy6RKUw4 fLUnthJMzZ1swsCFWJJ7oEyi34XfkNOj09+imPD149BRFJX2w09DC20cqwYu+DcnYtJc xQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3y6k462yb6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 May 2024 15:21:06 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 44KDofkx002667; Mon, 20 May 2024 15:21:05 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3y6js6cy8c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 May 2024 15:21:05 +0000 Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 44KFK19Z038962; Mon, 20 May 2024 15:21:04 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3y6js6cy5w-2; Mon, 20 May 2024 15:21:04 +0000 From: Steve Sistare To: virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Cc: "Michael S. Tsirkin" , Jason Wang , Si-Wei Liu , Eugenio Perez Martin , Xie Yongji , Stefano Garzarella , Steve Sistare Subject: [PATCH V3 1/3] vhost-vdpa: flush workers on suspend Date: Mon, 20 May 2024 08:21:00 -0700 Message-Id: <1716218462-84587-2-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1716218462-84587-1-git-send-email-steven.sistare@oracle.com> References: <1716218462-84587-1-git-send-email-steven.sistare@oracle.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-20_05,2024-05-17_03,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 suspectscore=0 spamscore=0 mlxscore=0 adultscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2405200122 X-Proofpoint-ORIG-GUID: FEWjuJD8h_Agj9XKmCL28DK9qdJ5pDiv X-Proofpoint-GUID: FEWjuJD8h_Agj9XKmCL28DK9qdJ5pDiv Flush to guarantee no workers are running when suspend returns. Fixes: f345a0143b4d ("vhost-vdpa: uAPI to suspend the device") Signed-off-by: Steve Sistare Acked-by: Eugenio P=C3=A9rez --- drivers/vhost/vdpa.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index ba52d128aeb7..189596caaec9 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -594,6 +594,7 @@ static long vhost_vdpa_suspend(struct vhost_vdpa *v) struct vdpa_device *vdpa =3D v->vdpa; const struct vdpa_config_ops *ops =3D vdpa->config; int ret; + struct vhost_dev *vdev =3D &v->vdev; =20 if (!(ops->get_status(vdpa) & VIRTIO_CONFIG_S_DRIVER_OK)) return 0; @@ -601,6 +602,8 @@ static long vhost_vdpa_suspend(struct vhost_vdpa *v) if (!ops->suspend) return -EOPNOTSUPP; =20 + vhost_dev_flush(vdev); + ret =3D ops->suspend(vdpa); if (!ret) v->suspended =3D true; --=20 2.39.3 From nobody Sun Feb 8 20:48:20 2026 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 104CF136E26 for ; Mon, 20 May 2024 15:21:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.165.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716218481; cv=none; b=kODkDeHzN2+Sqpw9ykHspo7yepcI7xfbt7ePOc/0uMIlwnsQ6eMm928HT1Hy5j6FKRXKBQf5MrgsbVvzLJYAfbK3XsXTRGSWPeGWihrbRcb9YuF80FpJFzPAhyHj2eCP9AVSkxuWlgCilpfch41G35SGF/slq02jm+PAcnl698U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716218481; c=relaxed/simple; bh=HrG1frKSm9Ao52Qtu4zIFLvSeb/ikKJa5HWbYe126cI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=shvN0OuexFWgvPpzRT6O/4GeKP07mduuqZcWMuRZ2qYTCK7yPRMZO2WhRRdBaK9r0ghovz1lx1uOCQuwB7qwdLD4zaZT2tPeQnTayrgN7mkW9NWpso97bhUMXwcIq9lSARYlPymSQucTNatiwxyWDSsuf8VyzGIwPU29eNbX5fQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=l2Gr2h7X; arc=none smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="l2Gr2h7X" Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 44KEEcPT007287; Mon, 20 May 2024 15:21:09 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2023-11-20; bh=o334WAUhRrMsc9og5ljSkGlZxzW6jxl5NiSFCIJGl0E=; b=l2Gr2h7XeTcVZ2X6kHXk6kF1ZHhkPIG6Y4y/hFcNltvxKFnG5tL24VSdbYRsFqSIbQ4+ R8UwW6Pa0K6QxYqLRhcwIz52dnZBS6uYJ7vT5ouXrWrhPZEDsD8xDG+zK5Nx3DFeZvMQ Z+FMAltAf+RBzF4NuTabA8lbUjShsOgKmH2GrAd08R8EjH5KUt9mTZwv5U5AD0T+4pmW tTb/T7+0Daq+NyJPQQ0g1uOPsrLpysHcHRES00/xeCoVeIFUqt+3+2yy01Q5LwgCtcsi t1NYXRN6SxJhWOURIghlIQnI+o4EZ6nNDYCnLCnpVFMtKKGxkVarqjgzPqgzY4G73KH0 MQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3y6mvv2wby-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 May 2024 15:21:08 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 44KEKAo7002729; Mon, 20 May 2024 15:21:06 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3y6js6cy9h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 May 2024 15:21:06 +0000 Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 44KFK19b038962; Mon, 20 May 2024 15:21:06 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3y6js6cy5w-3; Mon, 20 May 2024 15:21:06 +0000 From: Steve Sistare To: virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Cc: "Michael S. Tsirkin" , Jason Wang , Si-Wei Liu , Eugenio Perez Martin , Xie Yongji , Stefano Garzarella , Steve Sistare Subject: [PATCH V3 2/3] vduse: suspend Date: Mon, 20 May 2024 08:21:01 -0700 Message-Id: <1716218462-84587-3-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1716218462-84587-1-git-send-email-steven.sistare@oracle.com> References: <1716218462-84587-1-git-send-email-steven.sistare@oracle.com> X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-20_05,2024-05-17_03,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 suspectscore=0 spamscore=0 mlxscore=0 adultscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2405200122 X-Proofpoint-ORIG-GUID: L_TSt-mL4E8q1G8zZpmwZq9sQzrx6nbr X-Proofpoint-GUID: L_TSt-mL4E8q1G8zZpmwZq9sQzrx6nbr Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Support the suspend operation. There is little to do, except flush to guarantee no workers are running when suspend returns. Signed-off-by: Steve Sistare --- drivers/vdpa/vdpa_user/vduse_dev.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vd= use_dev.c index 73c89701fc9d..7dc46f771f12 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -472,6 +472,18 @@ static void vduse_dev_reset(struct vduse_dev *dev) up_write(&dev->rwsem); } =20 +static void vduse_flush_work(struct vduse_dev *dev) +{ + flush_work(&dev->inject); + + for (int i =3D 0; i < dev->vq_num; i++) { + struct vduse_virtqueue *vq =3D dev->vqs[i]; + + flush_work(&vq->inject); + flush_work(&vq->kick); + } +} + static int vduse_vdpa_set_vq_address(struct vdpa_device *vdpa, u16 idx, u64 desc_area, u64 driver_area, u64 device_area) @@ -724,6 +736,17 @@ static int vduse_vdpa_reset(struct vdpa_device *vdpa) return ret; } =20 +static int vduse_vdpa_suspend(struct vdpa_device *vdpa) +{ + struct vduse_dev *dev =3D vdpa_to_vduse(vdpa); + + down_write(&dev->rwsem); + vduse_flush_work(dev); + up_write(&dev->rwsem); + + return 0; +} + static u32 vduse_vdpa_get_generation(struct vdpa_device *vdpa) { struct vduse_dev *dev =3D vdpa_to_vduse(vdpa); @@ -806,6 +829,7 @@ static const struct vdpa_config_ops vduse_vdpa_config_o= ps =3D { .set_vq_affinity =3D vduse_vdpa_set_vq_affinity, .get_vq_affinity =3D vduse_vdpa_get_vq_affinity, .reset =3D vduse_vdpa_reset, + .suspend =3D vduse_vdpa_suspend, .set_map =3D vduse_vdpa_set_map, .free =3D vduse_vdpa_free, }; --=20 2.39.3 From nobody Sun Feb 8 20:48:20 2026 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1801136E3C for ; Mon, 20 May 2024 15:21:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.165.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716218482; cv=none; b=sGHOAZFgcu7msOlawm4iVGHPsdeQYpNwfjhSvSHF/Lk2d1JKCoYMVLr8Cd+41SGY21jEARJ9nNSDEz+3flE8Jmai239rUjlfS5QYJyxS4id9ucJHfjlV+4b4fWb7rHcqZE79tAinoEso3sKYoru25MAVMLocZVdoyr/rRdKEJ9o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716218482; c=relaxed/simple; bh=1Ie0VYID0/xUJRKDRvyDar8Mu+/VDQvE4b530gQ8yB0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=i1i3Q/l23fc2mcJUFlweIZqF2UcZ2d8cfX2C2goXGb4nEkGFUB0IlrrNMPrzNJS6yhRh5DK3aBcXhFrMfdYQzwVRO9AysV+gwzJvQoDqN9cFRBjPvq3X67D/8j/FF46ck3ZepdFEHEnEdIcyZOQ1GxPo2cIG5EwYEsQ7K3DoJHE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=TVyLs57L; arc=none smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="TVyLs57L" Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 44KEEcdb007298; Mon, 20 May 2024 15:21:09 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2023-11-20; bh=nfzq6tEmp2Q89g33znNEwGSUnngv4O1I4ljx3zbDuCk=; b=TVyLs57LoVyupW4SaJMUTok/AMfpqkF/kyP8ypBS4faFKnA3/Pl+s2RRDT6A5LoFUPrd PMrw57kg8Cz0CfzQDKjLVVA35V8OMfAP7YGNq9iXT5P/g0LpMYb9ytre3/LVhV557gZT fZ+kbH6Gxth6m35r9s3bd4CAoEepAprIwzPgAE9l6ig5vopSdmeSk9sWLxfeZs2T0oT+ JgD0tFwIkMGwyrYlRtxQ/VnZljL3yQARFma4rgySLaHj5MNFkGNKyJ/4tGK1v8yzWP9t kNLUlaiPt2JQH6JpDM6Wa5ZmMKi9h/qdSDx/dTsELueF0GHkEKbeWSlEsqz72kSdRYUO fw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3y6mvv2wc1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 May 2024 15:21:09 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 44KETIfg002745; Mon, 20 May 2024 15:21:08 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3y6js6cyan-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 May 2024 15:21:08 +0000 Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 44KFK19d038962; Mon, 20 May 2024 15:21:07 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3y6js6cy5w-4; Mon, 20 May 2024 15:21:07 +0000 From: Steve Sistare To: virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Cc: "Michael S. Tsirkin" , Jason Wang , Si-Wei Liu , Eugenio Perez Martin , Xie Yongji , Stefano Garzarella , Steve Sistare Subject: [PATCH V3 3/3] vdpa_sim: flush workers on suspend Date: Mon, 20 May 2024 08:21:02 -0700 Message-Id: <1716218462-84587-4-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1716218462-84587-1-git-send-email-steven.sistare@oracle.com> References: <1716218462-84587-1-git-send-email-steven.sistare@oracle.com> X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-20_05,2024-05-17_03,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 suspectscore=0 spamscore=0 mlxscore=0 adultscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2405200122 X-Proofpoint-ORIG-GUID: oP9sXgCGj8LQZwW0uhy1kNIupgTo22EF X-Proofpoint-GUID: oP9sXgCGj8LQZwW0uhy1kNIupgTo22EF Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Flush to guarantee no workers are running when suspend returns. Add a lock to enforce ordering between clearing running, flushing, and posting new work in vdpasim_kick_vq. It must be a spin lock because vdpasim_kick_vq may be reached va eventfd_write. Signed-off-by: Steve Sistare --- drivers/vdpa/vdpa_sim/vdpa_sim.c | 16 ++++++++++++++-- drivers/vdpa/vdpa_sim/vdpa_sim.h | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_= sim.c index 8ffea8430f95..67ed49d95bf0 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c @@ -322,7 +322,7 @@ static u16 vdpasim_get_vq_size(struct vdpa_device *vdpa= , u16 idx) return VDPASIM_QUEUE_MAX; } =20 -static void vdpasim_kick_vq(struct vdpa_device *vdpa, u16 idx) +static void vdpasim_do_kick_vq(struct vdpa_device *vdpa, u16 idx) { struct vdpasim *vdpasim =3D vdpa_to_sim(vdpa); struct vdpasim_virtqueue *vq =3D &vdpasim->vqs[idx]; @@ -337,6 +337,15 @@ static void vdpasim_kick_vq(struct vdpa_device *vdpa, = u16 idx) vdpasim_schedule_work(vdpasim); } =20 +static void vdpasim_kick_vq(struct vdpa_device *vdpa, u16 idx) +{ + struct vdpasim *vdpasim =3D vdpa_to_sim(vdpa); + + spin_lock(&vdpasim->kick_lock); + vdpasim_do_kick_vq(vdpa, idx); + spin_unlock(&vdpasim->kick_lock); +} + static void vdpasim_set_vq_cb(struct vdpa_device *vdpa, u16 idx, struct vdpa_callback *cb) { @@ -520,8 +529,11 @@ static int vdpasim_suspend(struct vdpa_device *vdpa) struct vdpasim *vdpasim =3D vdpa_to_sim(vdpa); =20 mutex_lock(&vdpasim->mutex); + spin_lock(&vdpasim->kick_lock); vdpasim->running =3D false; + spin_unlock(&vdpasim->kick_lock); mutex_unlock(&vdpasim->mutex); + kthread_flush_work(&vdpasim->work); =20 return 0; } @@ -537,7 +549,7 @@ static int vdpasim_resume(struct vdpa_device *vdpa) if (vdpasim->pending_kick) { /* Process pending descriptors */ for (i =3D 0; i < vdpasim->dev_attr.nvqs; ++i) - vdpasim_kick_vq(vdpa, i); + vdpasim_do_kick_vq(vdpa, i); =20 vdpasim->pending_kick =3D false; } diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.h b/drivers/vdpa/vdpa_sim/vdpa_= sim.h index bb137e479763..5eb6ca9c5ec5 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.h +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.h @@ -75,6 +75,7 @@ struct vdpasim { bool pending_kick; /* spinlock to synchronize iommu table */ spinlock_t iommu_lock; + spinlock_t kick_lock; }; =20 struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *attr, --=20 2.39.3