Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4143958pxb; Mon, 27 Sep 2021 10:16:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzASz4fp+XdKsktpktLktXmB2pA+yuZ2tz4PSUpiFL0SUF72aD9nlpekYFezyMaufWheoLc X-Received: by 2002:aa7:93a6:0:b0:44b:875f:fd41 with SMTP id x6-20020aa793a6000000b0044b875ffd41mr965161pff.61.1632762984602; Mon, 27 Sep 2021 10:16:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632762984; cv=none; d=google.com; s=arc-20160816; b=zJ/abfEqwB2sMYqoYBe6qIpwgZXJWo/UT2vrLquK2/9KrgpLX3hZvvGOdpWGDqN2kH fG36iI0lORkrtlIXgreRK5qpyCYUhqcT29VsUM2W8BYKR7YE3KD2tNnldxCnUL7UH+3B ZYBHEuTPqgVjYZ6jnObtvKH16f8eHMrUxPQWHRwwi14G3ucNRivrPdwo6M0+V+14JIn/ SQFfDJVdHhEDGocuv1aO9erlzKgjRYG/qW8qbfGYE16rfuD5s43VAZPLu9EMmxuCA/Tq oub/RYFhN8iZxUPase92g6np86WdMIZ0LB3Kwhf6kqs916SxhZkptjFDQuEf9x3QaMmt p+qA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3Ytbbpne3wSTQgfxE0RjoZIYvouSIdZHvKqhXcBaRjk=; b=MA07xv/8HNVdpv42Ou2udnu20hAIJ2ymanf5aXAec6vRIEvULHY83+ZixmzzNLqZ7y ty1/BH8hmWD4ipryDWuuvxbCyZ5MAzNAKEMa3zxvWMnHb+DfdeuIQc0NsJQG1mT3TaLW L4fljSjpJQpHxMUtTDQmiybdCy5eHhEEhwnTZ9wZ9QtkcBmAxJh6B5mgVibIXDiuiZwW SoY9pCSz5zJo+qrJlC+UXxasmBA12pH3mbMt8V7cDZn5CfgqYNmQAA073bRwCfK5LZAD kzIM3nyA3sXnipib10fyLwUN3YJRg4RioLYMLBz04FMEg1m+GVemIcD9iz1G0HHCWgty ZoXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=q6+wRRsA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 9si20889061pll.311.2021.09.27.10.16.10; Mon, 27 Sep 2021 10:16:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=q6+wRRsA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237078AbhI0RRB (ORCPT + 99 others); Mon, 27 Sep 2021 13:17:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:56208 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236956AbhI0RN0 (ORCPT ); Mon, 27 Sep 2021 13:13:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 19C9A61350; Mon, 27 Sep 2021 17:09:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632762561; bh=5PpxMosUvbaHxWTsZ4bA+bjUF2Cj80aRhhZh5tYbYn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q6+wRRsApZkqpPa6CTH6pRShzd7jai8+bk8LHMjV76cONoHYvUzIVYljyGFNYrOsv ImH9Y2utXrvqqhhqKiMmjcYfjrZCkFjfkIB8NJe8g80cH8AGA0c3TnLCoArWxwSr1A EsxfwTmx3A/8/MB9v/oQ4KiRnGkr4ZPz/NbBBJqc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jens Axboe , Sasha Levin Subject: [PATCH 5.10 071/103] io_uring: put provided buffer meta data under memcg accounting Date: Mon, 27 Sep 2021 19:02:43 +0200 Message-Id: <20210927170228.223387332@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210927170225.702078779@linuxfoundation.org> References: <20210927170225.702078779@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jens Axboe [ Upstream commit 9990da93d2bf9892c2c14c958bef050d4e461a1a ] For each provided buffer, we allocate a struct io_buffer to hold the data associated with it. As a large number of buffers can be provided, account that data with memcg. Fixes: ddf0322db79c ("io_uring: add IORING_OP_PROVIDE_BUFFERS") Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- fs/io_uring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index a8d07273ddc0..26753d0cb431 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -4041,7 +4041,7 @@ static int io_add_buffers(struct io_provide_buf *pbuf, struct io_buffer **head) int i, bid = pbuf->bid; for (i = 0; i < pbuf->nbufs; i++) { - buf = kmalloc(sizeof(*buf), GFP_KERNEL); + buf = kmalloc(sizeof(*buf), GFP_KERNEL_ACCOUNT); if (!buf) break; -- 2.33.0