From patchwork Sat Oct 22 07:22:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7354 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1095478wrr; Sat, 22 Oct 2022 01:02:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5YvtXAxWZu0rMZ9O3/naW565tvlfEcwW+x7AZ4zGs5xi+knlTnl1583bga4ajZTVPdx+OO X-Received: by 2002:a63:f921:0:b0:46b:18b:fe4d with SMTP id h33-20020a63f921000000b0046b018bfe4dmr19933985pgi.573.1666425766287; Sat, 22 Oct 2022 01:02:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666425766; cv=none; d=google.com; s=arc-20160816; b=tMZzH5812kZAV02FnHUKyF0qcqWrleUsvkVHaAeCkzkRigNMhiKs3TnBoF9hsVgj08 rNC+lBg9c5O1SLGtvioH6wQIjNuOOoD8pu7xXos3t/AFao/2Ysl5j0RK6PO808imqgFF qJq54IYwkUeBTmn04rTh4k16sp3D4Fu47DZqymuVnCox6g6DABlDbG8XKF+LVavyc0J9 gvDTK6tQW+DRcFNkEN/vnkD3TF4TbeR4MepXn7Jq4/m2goASjf80gFRg95PwUhIBWSiT q4KtWb79bjB++OXY0jJMW58/Mlzzih4Q0K9G612QTuCKxvBPsYQAlH8LVYJrjmAPZr45 HVyA== 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=TrJi4IFQSSyIRcOaI4/eWPMMO9CVY6q+RJgai3SVUsg=; b=kE2I3nnOvADO9mBXIVodEpcFnjkficIh9kw0upw4NQbsZvT07giaf8c/OQlBUjter0 HBuM9XykIYG3oO8PY6YHTHl+shPLQuwwql6IR9YF/uU7f2gxxhOlxcbw6WxLiG11jJey Md7RI9ehFE7AJovB/q26SwfSSmDejd/VjZ+LNZaVGxRODbg5SzcyKLf1/pbM6Mq63L46 KCB2NEjvzrI9GgHnyrgIj9CE7R63dofU3LxYPrffvyhP7L3RJ7aaImKs/G3nOpJ2LAK5 CeR8t2uqdcSvi9DY/RS2hbIhK8r7VAjCLbPEAoWc/i7yvqx7WfIR70slvXr5k2pOOSZz MAjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="VP/Z0QJq"; 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 me8-20020a17090b17c800b001fd7cab081bsi2608495pjb.125.2022.10.22.01.02.33; Sat, 22 Oct 2022 01:02:46 -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="VP/Z0QJq"; 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 S232543AbiJVICO (ORCPT + 99 others); Sat, 22 Oct 2022 04:02:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232244AbiJVHyb (ORCPT ); Sat, 22 Oct 2022 03:54:31 -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 E9CCE63D3A; Sat, 22 Oct 2022 00:47:33 -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 04FC9B82DF3; Sat, 22 Oct 2022 07:46:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 723FAC433D6; Sat, 22 Oct 2022 07:46:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424787; bh=qI9liugzN9G0XVfsXLBml/djNWH/lcscIH6cMpNxmU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VP/Z0QJqSJUdp5Oj1h5vjvZz7wTV0FB6K3m60vkZaOZfpsUUe0PhGdvA1/2yw6ALm TGyz+jRGl5qMzlHeJTq95xxkDm2Ks/Hbc/fURQ+TAmrYPuWVx/ZuGxws70Zqcs+S5p vZ1/WV+AUZKPZQt2yz/fok6paxeJmBCXAeRd2EPY= 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.19 277/717] vhost/vsock: Use kvmalloc/kvfree for larger packets. Date: Sat, 22 Oct 2022 09:22:36 +0200 Message-Id: <20221022072503.105679795@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 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?1747374064257283568?= X-GMAIL-MSGID: =?utf-8?q?1747374064257283568?= 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 368330417bde..5703775af129 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -393,7 +393,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 ec2c2afbf0d0..3a12aee33e92 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -1342,7 +1342,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);