From:   Alistair Popple <apopple@nvidia.com>
To:     linux-mm@kvack.org, cgroups@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org, jgg@nvidia.com, jhubbard@nvidia.com,
        tjmercier@google.com, hannes@cmpxchg.org, surenb@google.com,
        mkoutny@suse.com, daniel@ffwll.ch,
        "Daniel P . Berrange" <berrange@redhat.com>,
        Alex Williamson <alex.williamson@redhat.com>,
        Alistair Popple <apopple@nvidia.com>,
        "Michael S. Tsirkin" <mst@redhat.com>,
        Jason Wang <jasowang@redhat.com>,
        virtualization@lists.linux-foundation.org
Subject: [PATCH 03/19] drivers/vdpa: Convert vdpa to use the new vm_structure
Date:   Mon,  6 Feb 2023 18:47:40 +1100
Message-Id: <c40915698054f89d42d8deeb61f9854bd8c0d5ce.1675669136.git-series.apopple@nvidia.com>
In-Reply-To: <cover.c238416f0e82377b449846dbb2459ae9d7030c8e.1675669136.git-series.apopple@nvidia.com>
References: <cover.c238416f0e82377b449846dbb2459ae9d7030c8e.1675669136.git-series.apopple@nvidia.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?k0mLF4eRyOue/HvSpJitpT6GorGUlHNMDaBeTwzcOkP+IHge4vG0XvM/3k1K?=
 =?us-ascii?Q?b112t12MKY8alY7sgvTb0cVZ6JGyRBoEINfXVWXFIYCEb8wzoZMeOOClB/gu?=
 =?us-ascii?Q?sKDqpGl2b57ZClnF5WLKbElPmkg9oVApmhw+IpF6a864u4Zu2dGSuTLj7JdH?=
 =?us-ascii?Q?wdafz+/saMGh8tM8ux/zj9KZ1lvakrUfhMSPYTDos48Foae+flFBFaljn3LF?=
 =?us-ascii?Q?1U+tzbjkJB9mB0wnOvbRrGKgntE85yz4xacN8W6bYt7aYKmRu3CfT5LEsJbU?=
 =?us-ascii?Q?ox6Mbh/Z6+S2y2Kl0sTLhODmz/sShp4Wdx5FbuKo/Y4hJQfKL05z0yu04Y+l?=
 =?us-ascii?Q?QuXIO61LwcsXKGWHjIrnvfss0He96SCwZ6tzSef0bBSWV6vAQQvXeo54moxZ?=
 =?us-ascii?Q?EQss9M27H4xA9lmsLapxTJUA1fcsIWk1+sbdKN6ldn58B/yAGRB7pDeKb4kf?=
 =?us-ascii?Q?eYcfM1Ucfs0u8gmX3S8Q2lGThhxrqrGfe6mvG09Fc+mDpjafH/4xH2a+4cvz?=
 =?us-ascii?Q?vOxeIPrf22qlAReo8MRbDjiWWzZpKtbZ0OrpuZE0QuU5WzgToM2YWFJiuUj2?=
 =?us-ascii?Q?0Vcw2cpi9k0/DM5FZTxtzlfAUptDhmqFF7zngut81gF7Xd3v7ibIhcmPjrIF?=
 =?us-ascii?Q?0NLG5Eh7LVJYs0ZpQvGgjih2M1DcU8Go3zJD2oU7xqLyqtG7wls/6/2xQIZ/?=
 =?us-ascii?Q?egtNv5mr6HTVLLjnWIFyzexYFRLRH1mi1Wo3KCy7raftkqlWqFTTHan4Cup/?=
 =?us-ascii?Q?3FHKmlIyDMjV5W+RfppMqo4j7/NltH/uBuvfKWH/Wk6yysL1QfsDzaq9zYW+?=
 =?us-ascii?Q?F4apMygtkVpYfCRGlrtt5XS6Nfy4l6hVnrfxMXLED88MoEeEFHhL6a4hyGZr?=
 =?us-ascii?Q?p+IFXkyDWD5Az2UFiXpGepgzb+slM1IU0vmGtN6okc8hO4PdpNlIKj4Eg+CH?=
 =?us-ascii?Q?0SLDRZdBO2yUpFb6Y7RkQzbYUpLuwcwH93QSDKVRsjmnaBA0dHK3zLGH7t2j?=
 =?us-ascii?Q?3luWzG1YTnS0CRppsmxRzxWAX9nbkI0Lg1luHKCEBzXhZPsh6pNkMYzcoqG4?=
 =?us-ascii?Q?pOm7LO4HvcMHEh8/G9bYZiuFfeB+Y5DvafNiDGNBrIRA7OcVjDaOIfcjQovd?=
 =?us-ascii?Q?a21+7+VNj07fOgNpqbg84TGmXdK/KacuSZnIbqn/pXnq07MYLn3T8cSqL20+?=
 =?us-ascii?Q?muD83tapi+knWpozP4qusz+d1XcVSpnhZBrytBEMUPp/Dq021szGeOunQvDU?=
 =?us-ascii?Q?POa48nfNRz9h0Jb+9j8fC+b3iO10iFB5Mk5mWqMJf6ToMMx9iznNs7S40TOY?=
 =?us-ascii?Q?sMkvITuxvlJYgKqx42N3bx0adFVt7pGhRfYe7KmGuInx1b1qwbx3u3hz/IkT?=
 =?us-ascii?Q?68Tx+bT9LeTCwWTrtd24dlCY7nvkEagZaw4Bhhwy3tt4oqTYFL0J0dQDMDq/?=
 =?us-ascii?Q?v7rDzkZAoodMLYPhfkUW7pHWKn9apDB5Hf+32yeHs6PXcKytAzyjLovbAdOz?=
 =?us-ascii?Q?SdhqAAAEfW+jxYFIRg3pkA4t5S20yL6tNfxT18yzbUqaMAV/9kTyVLFFj/3n?=
 =?us-ascii?Q?G7HWb9dMtoL/eaXXb3IrHlY50oNe1sECjTLg68V4?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4f96889b-f944-4864-2769-08db08168d53
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3176.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2023 07:48:35.7803
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Zukif6znujczilGtEBPn7wj4+KQRdgve8X5+fOdAxWvqS2ez0x9z6k+im9OFh3SMgIuhyXqLexI0/d6efbD8Rg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7097
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Convert vdpa to use the new vm_structure and associated
account_pinned_vm() functions. This also fixes a bug where
vduse_dev_reg_umem() could exceed the rlimit due to non-atomically
checking and updating mm->pinned_vm which could lead to a race.

Signed-off-by: Alistair Popple <apopple@nvidia.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: virtualization@lists.linux-foundation.org
Cc: linux-kernel@vger.kernel.org
---
 drivers/vdpa/vdpa_user/vduse_dev.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c
index 0c3b486..bc300e2 100644
--- a/drivers/vdpa/vdpa_user/vduse_dev.c
+++ b/drivers/vdpa/vdpa_user/vduse_dev.c
@@ -23,6 +23,7 @@
 #include <linux/nospec.h>
 #include <linux/vmalloc.h>
 #include <linux/sched/mm.h>
+#include <linux/vm_account.h>
 #include <uapi/linux/vduse.h>
 #include <uapi/linux/vdpa.h>
 #include <uapi/linux/virtio_config.h>
@@ -70,7 +71,7 @@ struct vduse_umem {
 	unsigned long iova;
 	unsigned long npages;
 	struct page **pages;
-	struct mm_struct *mm;
+	struct vm_account vm_account;
 };
 
 struct vduse_dev {
@@ -950,8 +951,7 @@ static int vduse_dev_dereg_umem(struct vduse_dev *dev,
 	vduse_domain_remove_user_bounce_pages(dev->domain);
 	unpin_user_pages_dirty_lock(dev->umem->pages,
 				    dev->umem->npages, true);
-	atomic64_sub(dev->umem->npages, &dev->umem->mm->pinned_vm);
-	mmdrop(dev->umem->mm);
+	vm_unaccount_pinned(&dev->umem->vm_account, dev->umem->npages);
 	vfree(dev->umem->pages);
 	kfree(dev->umem);
 	dev->umem = NULL;
@@ -967,7 +967,7 @@ static int vduse_dev_reg_umem(struct vduse_dev *dev,
 	struct page **page_list = NULL;
 	struct vduse_umem *umem = NULL;
 	long pinned = 0;
-	unsigned long npages, lock_limit;
+	unsigned long npages;
 	int ret;
 
 	if (!dev->domain->bounce_map ||
@@ -990,8 +990,8 @@ static int vduse_dev_reg_umem(struct vduse_dev *dev,
 
 	mmap_read_lock(current->mm);
 
-	lock_limit = PFN_DOWN(rlimit(RLIMIT_MEMLOCK));
-	if (npages + atomic64_read(&current->mm->pinned_vm) > lock_limit)
+	vm_account_init_current(&umem->vm_account);
+	if (vm_account_pinned(&umem->vm_account, npages))
 		goto out;
 
 	pinned = pin_user_pages(uaddr, npages, FOLL_LONGTERM | FOLL_WRITE,
@@ -1006,22 +1006,21 @@ static int vduse_dev_reg_umem(struct vduse_dev *dev,
 	if (ret)
 		goto out;
 
-	atomic64_add(npages, &current->mm->pinned_vm);
-
 	umem->pages = page_list;
 	umem->npages = pinned;
 	umem->iova = iova;
-	umem->mm = current->mm;
-	mmgrab(current->mm);
 
 	dev->umem = umem;
 out:
-	if (ret && pinned > 0)
+	if (ret && pinned > 0) {
 		unpin_user_pages(page_list, pinned);
+		vm_unaccount_pinned(&umem->vm_account, npages);
+	}
 
 	mmap_read_unlock(current->mm);
 unlock:
 	if (ret) {
+		vm_account_release(&umem->vm_account);
 		vfree(page_list);
 		kfree(umem);
 	}
-- 
git-series 0.9.1