From patchwork Tue Jan 14 07:44:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianyu Lan X-Patchwork-Id: 11331485 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C890314B7 for ; Tue, 14 Jan 2020 07:44:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 93E5724655 for ; Tue, 14 Jan 2020 07:44:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="V7KEAGOq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 93E5724655 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B6CB28E0005; Tue, 14 Jan 2020 02:44:50 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id AF6298E0003; Tue, 14 Jan 2020 02:44:50 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9BE358E0005; Tue, 14 Jan 2020 02:44:50 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0216.hostedemail.com [216.40.44.216]) by kanga.kvack.org (Postfix) with ESMTP id 846B98E0003 for ; Tue, 14 Jan 2020 02:44:50 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id EF597181AC9B6 for ; Tue, 14 Jan 2020 07:44:49 +0000 (UTC) X-FDA: 76375453098.19.root91_81754917dc756 X-Spam-Summary: 2,0,0,b73c5af63c925c4b,d41d8cd98f00b204,lantianyu1986@gmail.com,:tglx@linutronix.de:mingo@redhat.com:bp@alien8.de:hpa@zytor.com:x86@kernel.org:dave.hansen@linux.intel.com:luto@kernel.org:peterz@infradead.org:kys@microsoft.com:haiyangz@microsoft.com:sthemmin@microsoft.com:sashal@kernel.org:akpm@linux-foundation.org:michael.h.kelley@microsoft.com:decui@microsoft.com:tianyu.lan@microsoft.com:linux-kernel@vger.kernel.org:linux-hyperv@vger.kernel.org::vkuznets@redhat.com:stable@vger.kernel.org,RULES_HIT:41:355:379:541:560:800:960:968:973:988:989:1260:1345:1437:1534:1541:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:2693:2731:3138:3139:3140:3141:3142:3352:3865:3866:3867:3868:3870:3872:3874:4321:4419:5007:6261:6653:6737:7576:7688:8603:9413:9592:10004:11026:11232:11473:11658:11914:12048:12296:12297:12517:12519:12555:12679:12895:12986:13069:13311:13357:14096:14181:14384:14394:14721:21080:21212:21444:21451:21627:21666:21990:30012:30034:30054,0,RBL:209.85.210.196:@gm ail.com: X-HE-Tag: root91_81754917dc756 X-Filterd-Recvd-Size: 4849 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Tue, 14 Jan 2020 07:44:49 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id x6so6163478pfo.10 for ; Mon, 13 Jan 2020 23:44:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Ji4/GGpTpCHtZjwRvAzGm3fytTn1eM1/uYYEuqSMvlo=; b=V7KEAGOqYjfGtkT+aweWULgGvMOzq6GY5wvsDR1sJdb64//nhwfaSD0nOvGnCLEjl2 0KPkZx6/HX96zUi+9gxvqP5LwKvkIs5UfgdB8qCsGkaBClX/eqik4m7nYTYdoWz1D0Vw pNOg/HJuG7UUFBMV6O8o73HCTlMrhBq07//BJdsnfXERnQ5bnfooehnVtlCTB9EOjLIx aPqNfPG2EdrmsmDWPJaVQybqDQ9x0YymC5mSFSZuyqwPKmO0SuWKXAlcaSZSz7Hvd4AE a6mLXqGH7cdyVKn1hiLPmbTAG7lYKIcL4xlUu1mJjSCnjNZxHmGGHQKbMY7+Cv5For94 LxCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Ji4/GGpTpCHtZjwRvAzGm3fytTn1eM1/uYYEuqSMvlo=; b=Xgut895Y8QS6UgfRQUkJOdtnXumZePMTOnpx2rDgFoo1Xz12febjgS+1LLpI6Zek5d yWXKyjuQ9Zl8EUcBcG/8ebtIOHsSoxot0ww6iaZUQ9dNTRkI4vDaAzhEubQrcXJEuD+W qiha99W4H7yielAC2KXM3FAh6wF3HgLxHwzjwt/kUySEbduMPyPg9IAo6JJab/y5oCxg OZ0jYnqQJfUNLP5iFaIS4I6LyNrLC7BNCclij2f4/CK/87cArtxUXi0lp2+kb5nlOUJj BlBkvLvtTN6qC426Zf6xOr0t+sOvQg8yzP/QhGRxc7Eg6yNwP0TXgsWyQVB29G5SeehV 5ifg== X-Gm-Message-State: APjAAAUKNejj2w5DC9c+jj7IJ4tno8wRxZSpZFg9GBKS1tSIvoXuis3F p2Kg7TKIaOUS6XMBkXY7Qdc= X-Google-Smtp-Source: APXvYqyR5qwh+EUVMQkFPgPEHQisjOpHIgs/mjN2cccTS/mUHiwuYt7H2FWIoKBjBCSftyqoVQPsNg== X-Received: by 2002:aa7:9808:: with SMTP id e8mr24349821pfl.32.1578987888490; Mon, 13 Jan 2020 23:44:48 -0800 (PST) Received: from localhost.corp.microsoft.com ([167.220.255.5]) by smtp.googlemail.com with ESMTPSA id k3sm16350745pgc.3.2020.01.13.23.44.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jan 2020 23:44:47 -0800 (PST) From: lantianyu1986@gmail.com X-Google-Original-From: Tianyu.Lan@microsoft.com To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, x86@kernel.org, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com, sashal@kernel.org, akpm@linux-foundation.org, michael.h.kelley@microsoft.com, decui@microsoft.com Cc: Tianyu Lan , linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-mm@kvack.org, vkuznets@redhat.com, stable@vger.kernel.org Subject: [PATCH] x86/Hyper-V: Balloon up according to request page number Date: Tue, 14 Jan 2020 15:44:35 +0800 Message-Id: <20200114074435.12732-1-Tianyu.Lan@microsoft.com> X-Mailer: git-send-email 2.14.5 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Tianyu Lan Current code has assumption that balloon request memory size aligns with 2MB. But actually Hyper-V doesn't guarantee such alignment. When balloon driver receives non-aligned balloon request, it produces warning and balloon up more memory than requested in order to keep 2MB alignment. Remove the warning and balloon up memory according to actual requested memory size. Fixes: f6712238471a ("hv: hv_balloon: avoid memory leak on alloc_error of 2MB memory block") Cc: stable@vger.kernel.org Signed-off-by: Tianyu Lan --- drivers/hv/hv_balloon.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c index 7f3e7ab22d5d..38ad0e44e927 100644 --- a/drivers/hv/hv_balloon.c +++ b/drivers/hv/hv_balloon.c @@ -1684,7 +1684,7 @@ static unsigned int alloc_balloon_pages(struct hv_dynmem_device *dm, if (num_pages < alloc_unit) return 0; - for (i = 0; (i * alloc_unit) < num_pages; i++) { + for (i = 0; i < num_pages / alloc_unit; i++) { if (bl_resp->hdr.size + sizeof(union dm_mem_page_range) > HV_HYP_PAGE_SIZE) return i * alloc_unit; @@ -1722,7 +1722,7 @@ static unsigned int alloc_balloon_pages(struct hv_dynmem_device *dm, } - return num_pages; + return i * alloc_unit; } static void balloon_up(union dm_msg_info *msg_info) @@ -1737,9 +1737,6 @@ static void balloon_up(union dm_msg_info *msg_info) long avail_pages; unsigned long floor; - /* The host balloons pages in 2M granularity. */ - WARN_ON_ONCE(num_pages % PAGES_IN_2M != 0); - /* * We will attempt 2M allocations. However, if we fail to * allocate 2M chunks, we will go back to PAGE_SIZE allocations.