From patchwork Fri Sep 11 15:09:39 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Li Wang
X-Patchwork-Id: 1362489
X-Patchwork-Delegate: davem@davemloft.net
Return-Path:
X-Original-To: patchwork-incoming-netdev@ozlabs.org
Delivered-To: patchwork-incoming-netdev@ozlabs.org
Authentication-Results: ozlabs.org;
spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org
(client-ip=23.128.96.18; helo=vger.kernel.org;
envelope-from=netdev-owner@vger.kernel.org; receiver=)
Authentication-Results: ozlabs.org;
dmarc=none (p=none dis=none) header.from=windriver.com
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
by ozlabs.org (Postfix) with ESMTP id 4Bnzq40Ydjz9sTN
for ;
Sat, 12 Sep 2020 01:16:00 +1000 (AEST)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1726221AbgIKPPw (ORCPT
);
Fri, 11 Sep 2020 11:15:52 -0400
Received: from mail1.windriver.com ([147.11.146.13]:59212 "EHLO
mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1726074AbgIKPNX (ORCPT
); Fri, 11 Sep 2020 11:13:23 -0400
Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com
[147.11.189.40])
by mail1.windriver.com (8.15.2/8.15.2) with ESMTPS id 08BFCplq011659
(version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL);
Fri, 11 Sep 2020 08:12:51 -0700 (PDT)
Received: from pek-lwang1-u1404.wrs.com (128.224.162.178) by
ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id
14.3.487.0; Fri, 11 Sep 2020 08:12:50 -0700
From: Li Wang
To: ,
CC: , ,
,
Subject: [PATCH] vhost: reduce stack usage in log_used
Date: Fri, 11 Sep 2020 23:09:39 +0800
Message-ID: <1599836979-4950-1-git-send-email-li.wang@windriver.com>
X-Mailer: git-send-email 2.7.4
MIME-Version: 1.0
Sender: netdev-owner@vger.kernel.org
Precedence: bulk
List-ID:
X-Mailing-List: netdev@vger.kernel.org
Fix the warning: [-Werror=-Wframe-larger-than=]
drivers/vhost/vhost.c: In function log_used:
drivers/vhost/vhost.c:1906:1:
warning: the frame size of 1040 bytes is larger than 1024 bytes
Signed-off-by: Li Wang
---
drivers/vhost/vhost.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index b45519c..41769de 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -1884,25 +1884,31 @@ static int log_write_hva(struct vhost_virtqueue *vq, u64 hva, u64 len)
static int log_used(struct vhost_virtqueue *vq, u64 used_offset, u64 len)
{
- struct iovec iov[64];
+ struct iovec *iov;
int i, ret;
if (!vq->iotlb)
return log_write(vq->log_base, vq->log_addr + used_offset, len);
+ iov = kcalloc(64, sizeof(*iov), GFP_KERNEL);
+ if (!iov)
+ return -ENOMEM;
+
ret = translate_desc(vq, (uintptr_t)vq->used + used_offset,
len, iov, 64, VHOST_ACCESS_WO);
if (ret < 0)
- return ret;
+ goto out;
for (i = 0; i < ret; i++) {
ret = log_write_hva(vq, (uintptr_t)iov[i].iov_base,
iov[i].iov_len);
if (ret)
- return ret;
+ goto out;
}
- return 0;
+out:
+ kfree(iov);
+ return ret;
}
int vhost_log_write(struct vhost_virtqueue *vq, struct vhost_log *log,