From patchwork Mon Oct 24 11:28:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9675 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp535173wru; Mon, 24 Oct 2022 09:12:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5AFmfpnyPGQpV74uwfCaFhhJT0GcJfrzkghadQf1VlkWuhCTNWx/KI+sk8BWmO5LMAFLZp X-Received: by 2002:a63:1e5a:0:b0:43c:b966:e2d6 with SMTP id p26-20020a631e5a000000b0043cb966e2d6mr28359592pgm.569.1666627948509; Mon, 24 Oct 2022 09:12:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666627948; cv=none; d=google.com; s=arc-20160816; b=m5G9LLzybUbxLqK1UwlGjAyqDUIc8X0Orwx0SZVd7jvgY8mVjgv5+JgePcIqv4iqGg jtIKaRzMKzAZrkX7Ti+VRqOfilnILBaobSTSQZjN6TjfMAyepB2vbnBKmuAzRAeQ0S/X QOwLkQRRcVE2sS85/iEn6QhJTcmJR/qeaV+t7g9UN/76XWsiILoKTrOxiw4Wq5UgyWCk yJzQpyC9yHTECqCNZDaNrAEjB5UCQP+90u4Y3FAQy1wSwXDtmI0ZSJcExjXt1dZbZA1u 2ALYfu2C/g7qWYngCa/qc36IQuSU31k/SlKRNjUj53Q4Mmqlyh0/KQryTsLWq8IxDYvJ iNGw== 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=ePxCFBdP2F0q/hDCv+afoewfkOGA/V2Pvw5Bf+PtF64=; b=Nrz9AXhbeECRXRdECa1qfd90hBsGEXTC81sz5m5ZKWUNJl6Dh11I8M+RqRFVX1YIZ/ 1YT/zJ1PPidMPG4doQ17pdizQ1+S7qejzt3m2TUb6KnuWp1wb4fkqMGLb6tqRoGDpxWN erFvYvLAl5Re+se+7R7iuj/QbrHtVnSs16vPDHn86dgcxp18rYG3My6qOJ8f6/PL/xk4 rDsb4t+MddjHqyEaDNUiMCbi+e/kMfYb1BuG0T72iiAspxn5vT0VCnRy5mRX0IsIXt75 Y7gNp6ZjyfXRFhbuMPeeSqr/Z1flpTNoZFtwLYZP5+wkhmLK4BvJunOiSDNK1KGVz84b x4qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=enXaguFt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nn15-20020a17090b38cf00b002100c234c6dsi10585879pjb.35.2022.10.24.09.12.14; Mon, 24 Oct 2022 09:12:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=enXaguFt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S233771AbiJXQLt (ORCPT + 99 others); Mon, 24 Oct 2022 12:11:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233955AbiJXQFM (ORCPT ); Mon, 24 Oct 2022 12:05:12 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7ED1F3FD46; Mon, 24 Oct 2022 07:58:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C89B1B81604; Mon, 24 Oct 2022 12:21:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D3E0C433C1; Mon, 24 Oct 2022 12:21:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614095; bh=AybWWjy5oG4YPj4VEwcpauYIDdXd/B6+9qt+qJHjKpk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=enXaguFtE4putR+euSPwN1y84BNv5dCOZR1J40021fkniXQ0kxZ2t+pg1t2QwjRpF 30uDEnBn0qJyTKhL9KvQJoxgvdyfUrJojhilET7NPmH9hNcNbpSaj12BcQ8HQEV93Q LZRaEqMFdn9b88mCPaS+0zsqhBWeiY4Cu3/OiBaI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Junichi Uekawa , Stefano Garzarella , "Michael S. Tsirkin" , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.10 131/390] vhost/vsock: Use kvmalloc/kvfree for larger packets. Date: Mon, 24 Oct 2022 13:28:48 +0200 Message-Id: <20221024113028.257081646@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747586067283179237?= X-GMAIL-MSGID: =?utf-8?q?1747586067283179237?= From: Junichi Uekawa [ Upstream commit 0e3f72931fc47bb81686020cc643cde5d9cd0bb8 ] When copying a large file over sftp over vsock, data size is usually 32kB, and kmalloc seems to fail to try to allocate 32 32kB regions. vhost-5837: page allocation failure: order:4, mode:0x24040c0 Call Trace: [] dump_stack+0x97/0xdb [] warn_alloc_failed+0x10f/0x138 [] ? __alloc_pages_direct_compact+0x38/0xc8 [] __alloc_pages_nodemask+0x84c/0x90d [] alloc_kmem_pages+0x17/0x19 [] kmalloc_order_trace+0x2b/0xdb [] __kmalloc+0x177/0x1f7 [] ? copy_from_iter+0x8d/0x31d [] vhost_vsock_handle_tx_kick+0x1fa/0x301 [vhost_vsock] [] vhost_worker+0xf7/0x157 [vhost] [] kthread+0xfd/0x105 [] ? vhost_dev_set_owner+0x22e/0x22e [vhost] [] ? flush_kthread_worker+0xf3/0xf3 [] ret_from_fork+0x4e/0x80 [] ? flush_kthread_worker+0xf3/0xf3 Work around by doing kvmalloc instead. Fixes: 433fc58e6bf2 ("VSOCK: Introduce vhost_vsock.ko") Signed-off-by: Junichi Uekawa Reviewed-by: Stefano Garzarella Acked-by: Michael S. Tsirkin Link: https://lore.kernel.org/r/20220928064538.667678-1-uekawa@chromium.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/vhost/vsock.c | 2 +- net/vmw_vsock/virtio_transport_common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index 5d2d6ce7ff41..b0153617fe0e 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -359,7 +359,7 @@ vhost_vsock_alloc_pkt(struct vhost_virtqueue *vq, return NULL; } - pkt->buf = kmalloc(pkt->len, GFP_KERNEL); + pkt->buf = kvmalloc(pkt->len, GFP_KERNEL); if (!pkt->buf) { kfree(pkt); return NULL; diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index d6d3a05c008a..c9ee9259af48 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -1196,7 +1196,7 @@ EXPORT_SYMBOL_GPL(virtio_transport_recv_pkt); void virtio_transport_free_pkt(struct virtio_vsock_pkt *pkt) { - kfree(pkt->buf); + kvfree(pkt->buf); kfree(pkt); } EXPORT_SYMBOL_GPL(virtio_transport_free_pkt);