From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=95.215.58.244 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795153554; b=5loM2Wq2/uEQaMntnvXSPS5GTiAHWxfar1DpJnReEGgKLuObZvLcSxtvla0VPvLzJQNh ciRmOiznELVzOFQVtJZ1AoUdh/twY6BqOSRkIKoTUGPJMAWiV+bfgXdJCHxn+hm6OID72 ZxHox5a48LOOCQtDA4reSHROXnev7YIFGNyhFdDP+lKt0ythcFH1ztc0cO0z0PDB8biVp W8MU4G2IoyAtcfdiKsuncqPTWhuqJqLGXXYI3ipQytsh8P2yUR2xb6pWZhx2kEOlEt5Hd XUwkG1tfGH1kMQLovW3l+kogmU1VCpYz2ItKr18nrXgRtnVR1AUzl6Ym7mldluOj+Dw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795153554; h=DMARC-Filter:X-Envelope-To:DKIM-Signature:X-Envelope-To:Received: X-Mizu-Trace-ID:X-Migadu-Flow:From:To:Cc:Subject:Date:Message-ID: X-Mailer:MIME-Version:Content-Transfer-Encoding; bh=vQWVv+Wg/WG0fo9yZQewcLpDeRqvrAZXwdWLu1wXdIc=; b=CXI1ITVbpK5exUEIXO9txCmGNVCu7nReV3E1aZZdkDn3cHfm2JX7ILYaR/G94D1qsemy 8xHEk362UmlGMFf4WftZLK5IXWKQ9N/rz1iExwzPyOb+ui9AALWMy1wjU2mKL2CtIiF7N cMVF4QXNk6Wqy2Wv96yNza0hEaMpjQUODWcljlTX++gwfvvWtXnelThPX1NjDf1xFmSoM n5c+KrkriCp7caWFzfxe+HHkYsGWk0rW9a2B4wGd4/iJGQ6eBIV6qzqNvN9azBTmWMHWz cWOpDng7rcIeEtWU/qAFq78c6vJhauWJQwXePbbBvjmPAlJtLi6hUiZI0HXArdJ+VBQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=XWLNBU2n; arc=none smtp.remote-ip=95.215.58.244 Received: from mta1.migadu.com (out-244.mta1.migadu.com [95.215.58.244]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A4255606A320 for ; Fri, 20 Nov 2026 05:45:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org A4255606A320 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=XWLNBU2n X-Envelope-To: kvm@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=eSR3rU1fyPP9d9Xw/Xci8K+WmM5Afd8iPXlwguo1i4Q=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1795153551; v=1; x=1795758351; b=XWLNBU2n70Cr55/Q/A9rMIW0gC5+4McEXcH2rA1M97NSar8Mxsdg+sMsH4XNE6/W+K0GXqPO 1oGPkp3KUS+TrOJJ9zoCR9dQPOjJVBQCWPOKgN4jDThjUI8MPYHlkYAfVRYdAvSEeYc/eI+3XvL PyZSka26LAzW5BA22sBIRXXU= X-Envelope-To: kvm@vger.kernel.org Received: by smtp.migadu.com with ESMTPS id 42a3411e7df6d71e; Fri, 20 Nov 2026 05:45:51 +0000 X-Mizu-Trace-ID: 42a3411e7df6d71e X-Migadu-Flow: FLOW_OUT From: Tao Cui To: "Michael S. Tsirkin" Cc: Jason Wang , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Stefan Hajnoczi , Stefano Garzarella , Bobby Eshleman , Andrey Drobyshev , virtualization@lists.linux.dev, kvm@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, cuitao@kylinos.cn, cui.tao@linux.dev Subject: [PATCH v2] vhost: account the per-device kernel allocations to memcg Date: Fri, 20 Nov 2026 13:45:17 +0800 Message-ID: <20261120054517.526275-1-cui.tao@linux.dev> X-Mailer: git-send-email 2.53.0 X-Mailing-List: kvm@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Tao Cui Everything except the worker struct is allocated with plain GFP_KERNEL: the per-vq iovec and log arrays at VHOST_SET_OWNER, the memory table at VHOST_SET_MEM_TABLE whose size follows the user supplied region count, the pending message nodes, and the vhost_net/vhost_vsock device structs with their fallback to vmalloc. The worker has been accounted since the vhost_task conversion. A container that can open /dev/vhost-net or /dev/vhost-vsock, which device plugins hand out with passthrough, holds roughly 150KB of resident kernel memory per device after SET_OWNER. Charge the rest the same way the worker already is. Acked-by: Michael S. Tsirkin Signed-off-by: Tao Cui --- Changes in v2: - rebased on next-20261118, where the vq->nheads allocation now uses kmalloc_objs(); the flag addition follows the new form. No functional change. Carries Michael's Acked-by from v1. Link to v1: https://lore.kernel.org/r/20261106131829.3228926-4-cui.tao@linux.dev drivers/vhost/net.c | 14 ++++++++------ drivers/vhost/vhost.c | 17 +++++++++++------ drivers/vhost/vsock.c | 5 +++-- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 435d8ed3851f..390858056d20 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -249,7 +249,7 @@ vhost_net_ubuf_alloc(struct vhost_virtqueue *vq, bool zcopy) /* No zero copy backend? Nothing to count. */ if (!zcopy) return NULL; - ubufs = kmalloc_obj(*ubufs); + ubufs = kmalloc_obj(*ubufs, GFP_KERNEL_ACCOUNT); if (!ubufs) return ERR_PTR(-ENOMEM); atomic_set(&ubufs->refcount, 1); @@ -302,7 +302,8 @@ static int vhost_net_set_ubuf_info(struct vhost_net *n) if (!zcopy) continue; n->vqs[i].ubuf_info = - kmalloc_objs(*n->vqs[i].ubuf_info, UIO_MAXIOV); + kmalloc_objs(*n->vqs[i].ubuf_info, UIO_MAXIOV, + GFP_KERNEL_ACCOUNT); if (!n->vqs[i].ubuf_info) goto err; } @@ -1340,17 +1341,18 @@ static int vhost_net_open(struct inode *inode, struct file *f) struct xdp_buff *xdp; int i; - n = kvmalloc_obj(*n, GFP_KERNEL | __GFP_RETRY_MAYFAIL); + n = kvmalloc_obj(*n, GFP_KERNEL | __GFP_RETRY_MAYFAIL | + __GFP_ACCOUNT); if (!n) return -ENOMEM; - vqs = kmalloc_objs(*vqs, VHOST_NET_VQ_MAX); + vqs = kmalloc_objs(*vqs, VHOST_NET_VQ_MAX, GFP_KERNEL_ACCOUNT); if (!vqs) { kvfree(n); return -ENOMEM; } queue = kmalloc_array(VHOST_NET_BATCH, sizeof(void *), - GFP_KERNEL); + GFP_KERNEL_ACCOUNT); if (!queue) { kfree(vqs); kvfree(n); @@ -1358,7 +1360,7 @@ static int vhost_net_open(struct inode *inode, struct file *f) } n->vqs[VHOST_NET_VQ_RX].rxq.queue = queue; - xdp = kmalloc_objs(*xdp, VHOST_NET_BATCH); + xdp = kmalloc_objs(*xdp, VHOST_NET_BATCH, GFP_KERNEL_ACCOUNT); if (!xdp) { kfree(vqs); kvfree(n); diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index dc973287567c..e8f9dce52aa7 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -526,10 +526,14 @@ static long vhost_dev_alloc_iovecs(struct vhost_dev *dev) for (i = 0; i < dev->nvqs; ++i) { vq = dev->vqs[i]; - vq->indirect = kmalloc_objs(*vq->indirect, UIO_MAXIOV); - vq->log = kmalloc_objs(*vq->log, dev->iov_limit); - vq->heads = kmalloc_objs(*vq->heads, dev->iov_limit); - vq->nheads = kmalloc_objs(*vq->nheads, dev->iov_limit); + vq->indirect = kmalloc_objs(*vq->indirect, UIO_MAXIOV, + GFP_KERNEL_ACCOUNT); + vq->log = kmalloc_objs(*vq->log, dev->iov_limit, + GFP_KERNEL_ACCOUNT); + vq->heads = kmalloc_objs(*vq->heads, dev->iov_limit, + GFP_KERNEL_ACCOUNT); + vq->nheads = kmalloc_objs(*vq->nheads, dev->iov_limit, + GFP_KERNEL_ACCOUNT); if (!vq->indirect || !vq->log || !vq->heads || !vq->nheads) goto err_nomem; } @@ -2052,7 +2056,8 @@ static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m) return -E2BIG; if (max_iotlb_entries <= 0) return -EINVAL; - newmem = kvzalloc_flex(*newmem, regions, mem.nregions); + newmem = kvzalloc_flex(*newmem, regions, mem.nregions, + GFP_KERNEL_ACCOUNT); if (!newmem) return -ENOMEM; @@ -3407,7 +3412,7 @@ EXPORT_SYMBOL_GPL(vhost_disable_notify); struct vhost_msg_node *vhost_new_msg(struct vhost_virtqueue *vq, int type) { /* Make sure all padding within the structure is initialized. */ - struct vhost_msg_node *node = kzalloc_obj(*node); + struct vhost_msg_node *node = kzalloc_obj(*node, GFP_KERNEL_ACCOUNT); if (!node) return NULL; diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index 88a310390eb0..2fa205967f8a 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -719,11 +719,12 @@ static int vhost_vsock_dev_open(struct inode *inode, struct file *file) /* This struct is large and allocation could fail, fall back to vmalloc * if there is no other way. */ - vsock = kvmalloc_obj(*vsock, GFP_KERNEL | __GFP_RETRY_MAYFAIL); + vsock = kvmalloc_obj(*vsock, GFP_KERNEL | __GFP_RETRY_MAYFAIL | + __GFP_ACCOUNT); if (!vsock) return -ENOMEM; - vqs = kmalloc_objs(*vqs, ARRAY_SIZE(vsock->vqs)); + vqs = kmalloc_objs(*vqs, ARRAY_SIZE(vsock->vqs), GFP_KERNEL_ACCOUNT); if (!vqs) { ret = -ENOMEM; goto out; -- 2.53.0