From patchwork Wed Oct 19 08:26:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4671 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp212809wrs; Wed, 19 Oct 2022 02:08:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Ww/1RShBkG5sg4kLBITijO+v7DqG6IC22Afw2IIh7Kp1h+nmkBxHqe2HGzkUKje7/3VqL X-Received: by 2002:a05:6402:2686:b0:45d:82c0:c2b6 with SMTP id w6-20020a056402268600b0045d82c0c2b6mr6278013edd.390.1666170500320; Wed, 19 Oct 2022 02:08:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666170500; cv=none; d=google.com; s=arc-20160816; b=GXivSiIHaguYREmXdmEYKuGHA9gBaeWeHYTAqaHWz1KkwvwWSdLolPtudGLb4PLczs oyLqoiP2lMEQGLquGlyu3v4XRfAvuTV1/+axBswhti1o7fDnMtYSs0CmxqLLbLbjDMEn yr4gbjSrgN5Q7Qhev0fXznxk5y/xP2pMLyZERNOtXYG/izJVhBBcJtlhNrF4Q2Ll2+YH tHK0VDuUjo8Nc+uRBTRI7vfJ/07ohCM0Gm0wmh5gR+1I9LL50q1/B6b71dYi7hG6CEcT RKLI1Y5Wp8QpI1eUJjvmV9mE1IXbTPWSUfv8h3y2jSSclRoeFDe0OWZJV1rJCAGfqDho kC8w== 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=bEaZY1nJ39LX3IIFTL475KTwSyhgeh2EuMQTzUdVKFzNTlbe7W5uq5xCfWQsQeJFDc YfivkCKUPffSKhxlFhE3k+GlYfc1G24yHEpTUYzvCpaKBThaMzhLGgLU8QbuALsvqbRz RjjXA9uBXY7/J4OqSjs8DhpgTVy2mKXkf7J14o3+nhxpBwW4rY7xNr6CG45FSbJFj5hK LuC/uPbFUOHT/6OE+jkwSXeZpUHOi6YpjbDRcbqnM4DGBg4VQKQcL1OAleDeGsi3wXlc k5v/ZWu8TnrIBCyqa69bezStTrFDLlQVPEAt8W2i+gY2ODNcFw3mc5qAYAS9kXbmaG+N YzaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1otpvgNo; 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 f9-20020a17090660c900b00782c6ab6f01si11760419ejk.410.2022.10.19.02.07.48; Wed, 19 Oct 2022 02:08:20 -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=1otpvgNo; 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 S232086AbiJSJCV (ORCPT + 99 others); Wed, 19 Oct 2022 05:02:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232339AbiJSI7a (ORCPT ); Wed, 19 Oct 2022 04:59:30 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F2C645F59; Wed, 19 Oct 2022 01:55:01 -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 dfw.source.kernel.org (Postfix) with ESMTPS id B4B786186A; Wed, 19 Oct 2022 08:52:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8476C433C1; Wed, 19 Oct 2022 08:52:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169577; bh=qI9liugzN9G0XVfsXLBml/djNWH/lcscIH6cMpNxmU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1otpvgNo50GNs9CuQUCXlBilL1KKhzwP+QHO+jG/wo2a7z0hH6u5d5AtVJZKto5xx UsNqlsBLupIvFO4NONaXGqPDpoJ1Vojt43hy3rlwmqurJJ1IrDWIWvPrCDAY/zAAD8 vbt6mOxuGJ0s635YmBCEWqXB37QYfPlUzTZ819sk= 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 6.0 328/862] vhost/vsock: Use kvmalloc/kvfree for larger packets. Date: Wed, 19 Oct 2022 10:26:55 +0200 Message-Id: <20221019083304.525246952@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 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?1747106398426013990?= X-GMAIL-MSGID: =?utf-8?q?1747106398426013990?= 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);