Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1134434imm; Wed, 26 Sep 2018 12:15:56 -0700 (PDT) X-Google-Smtp-Source: ACcGV62zA4LE4HFSE7Vm24JGKZlPg4T5Dpb09PUL8IFS0Nfs6HZcPbNU91blzz3RUgXvLSs8SIX9 X-Received: by 2002:a17:902:7689:: with SMTP id m9-v6mr7267679pll.295.1537989356709; Wed, 26 Sep 2018 12:15:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537989356; cv=none; d=google.com; s=arc-20160816; b=c4IXxXcZ8OG0cjVpp2b0KmRyd0MUaGSupP8vCwpXnksVGJ77iXkxOR5ErjK5yMGaYW 7RfZ2xnHwp7ZAuxZvheJ+B+uj96QDkkC50lrqBNNJnKrZKBfe4tOPVvVMlQ2rsO5x8Ps 9X2F9cyHlQNJemOHOC8Z5Q9a1DEzkK2/WAGhVZyhX0/oWyzkXkf8WD2qqs2bn1R2GThO ZNdBY3lUrXupgsbhYI75rVfwlkQZHqdPUXRFJmGExpatmuQMkMPirHxo6IDNYXt6S4RZ HMB1OLgFL78Jjwf7LqtwWopog7b3YFA6VwjvUE/KUI+Mq+mZ7Na62ieUbiOAThEHAkzL aL1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=L1Ly6ocfnnlFmmIopnDO1PdprmVva+zVpHeVybrdNFs=; b=Mb7QD96d5qB3pBzDY4Zj9u1DtBh/ATo6/thDpeRkaOTVpGDGsFWw0VwSJ600hF2/tr 2EQAREjpWSKU0KrphUoO0pOEEPC3CF/5I19niZCEcVoFpUnCQW+fcJ+aHCfaO64VZ84y dXHE7vCAGXofQHyHLSCOA8MvBPP5AKOPB9EPQUNg/1L7AUbhz2uwqQ/J8WRRtVfGjNta Wgc0qnmhq9iZhTUkfGJ+sUas3rDHrktaAvnIivfKkRvTX6Wt8JfpU5mY0hIBSw78zt7L pDf1q2xuBciZTBoQV40IboEMOKgeB/RM+QoZ0VuVe4HJGH0VpHZARnLhf0JXRSfAXdSF zsQg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vmware.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t15-v6si609205pgg.422.2018.09.26.12.15.41; Wed, 26 Sep 2018 12:15:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vmware.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727468AbeI0B3x (ORCPT + 99 others); Wed, 26 Sep 2018 21:29:53 -0400 Received: from ex13-edg-ou-002.vmware.com ([208.91.0.190]:25069 "EHLO EX13-EDG-OU-002.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727090AbeI0B3w (ORCPT ); Wed, 26 Sep 2018 21:29:52 -0400 Received: from sc9-mailhost2.vmware.com (10.113.161.72) by EX13-EDG-OU-002.vmware.com (10.113.208.156) with Microsoft SMTP Server id 15.0.1156.6; Wed, 26 Sep 2018 12:15:05 -0700 Received: from sc2-haas01-esx0118.eng.vmware.com (sc2-haas01-esx0118.eng.vmware.com [10.172.44.118]) by sc9-mailhost2.vmware.com (Postfix) with ESMTP id 2B08AB0E85; Wed, 26 Sep 2018 15:15:10 -0400 (EDT) From: Nadav Amit To: Arnd Bergmann , CC: Xavier Deguillard , , Nadav Amit Subject: [PATCH v3 20/20] vmw_balloon: split refused pages Date: Wed, 26 Sep 2018 12:13:36 -0700 Message-ID: <20180926191336.101885-21-namit@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180926191336.101885-1-namit@vmware.com> References: <20180926191336.101885-1-namit@vmware.com> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: None (EX13-EDG-OU-002.vmware.com: namit@vmware.com does not designate permitted sender hosts) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The hypervisor might refuse to inflate pages. While the balloon driver handles this scenario correctly, a refusal to inflate a 2MB pages might cause the same page to be allocated again later just for its inflation to be refused again. This wastes energy and time. To avoid this situation we split the 2MB page to 4KB pages, and then try to inflate each one individually. Most of the 4KB pages out of the 2MB should be inflated successfully, and we are likely to prevent the scenario of repeated refused inflation. Reviewed-by: Xavier Deguillard Signed-off-by: Nadav Amit --- drivers/misc/vmw_balloon.c | 63 +++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 11 deletions(-) diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c index 8d60c7e65242..61d53acb2b9f 100644 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@ -235,6 +235,7 @@ static DEFINE_STATIC_KEY_FALSE(balloon_stat_enabled); struct vmballoon_ctl { struct list_head pages; struct list_head refused_pages; + struct list_head prealloc_pages; unsigned int n_refused_pages; unsigned int n_pages; enum vmballoon_page_size_type page_size; @@ -634,15 +635,25 @@ static int vmballoon_alloc_page_list(struct vmballoon *b, unsigned int i; for (i = 0; i < req_n_pages; i++) { - if (ctl->page_size == VMW_BALLOON_2M_PAGE) - page = alloc_pages(__GFP_HIGHMEM|__GFP_NOWARN| + /* + * First check if we happen to have pages that were allocated + * before. This happens when 2MB page rejected during inflation + * by the hypervisor, and then split into 4KB pages. + */ + if (!list_empty(&ctl->prealloc_pages)) { + page = list_first_entry(&ctl->prealloc_pages, + struct page, lru); + list_del(&page->lru); + } else { + if (ctl->page_size == VMW_BALLOON_2M_PAGE) + page = alloc_pages(__GFP_HIGHMEM|__GFP_NOWARN| __GFP_NOMEMALLOC, VMW_BALLOON_2M_ORDER); - else - page = balloon_page_alloc(); + else + page = balloon_page_alloc(); - /* Update statistics */ - vmballoon_stats_page_inc(b, VMW_BALLOON_PAGE_STAT_ALLOC, - ctl->page_size); + vmballoon_stats_page_inc(b, VMW_BALLOON_PAGE_STAT_ALLOC, + ctl->page_size); + } if (page) { /* Success. Add the page to the list and continue. */ @@ -886,7 +897,8 @@ static void vmballoon_release_page_list(struct list_head *page_list, __free_pages(page, vmballoon_page_order(page_size)); } - *n_pages = 0; + if (n_pages) + *n_pages = 0; } @@ -1018,6 +1030,32 @@ static void vmballoon_dequeue_page_list(struct vmballoon *b, *n_pages = i; } +/** + * vmballoon_split_refused_pages() - Split the 2MB refused pages to 4k. + * + * If inflation of 2MB pages was denied by the hypervisor, it is likely to be + * due to one or few 4KB pages. These 2MB pages may keep being allocated and + * then being refused. To prevent this case, this function splits the refused + * pages into 4KB pages and adds them into @prealloc_pages list. + * + * @ctl: pointer for the %struct vmballoon_ctl, which defines the operation. + */ +static void vmballoon_split_refused_pages(struct vmballoon_ctl *ctl) +{ + struct page *page, *tmp; + unsigned int i, order; + + order = vmballoon_page_order(ctl->page_size); + + list_for_each_entry_safe(page, tmp, &ctl->refused_pages, lru) { + list_del(&page->lru); + split_page(page, order); + for (i = 0; i < (1 << order); i++) + list_add(&page[i].lru, &ctl->prealloc_pages); + } + ctl->n_refused_pages = 0; +} + /** * vmballoon_inflate() - Inflate the balloon towards its target size. * @@ -1029,6 +1067,7 @@ static void vmballoon_inflate(struct vmballoon *b) struct vmballoon_ctl ctl = { .pages = LIST_HEAD_INIT(ctl.pages), .refused_pages = LIST_HEAD_INIT(ctl.refused_pages), + .prealloc_pages = LIST_HEAD_INIT(ctl.prealloc_pages), .page_size = b->max_page_size, .op = VMW_BALLOON_INFLATE }; @@ -1076,10 +1115,10 @@ static void vmballoon_inflate(struct vmballoon *b) break; /* - * Ignore errors from locking as we now switch to 4k - * pages and we might get different errors. + * Split the refused pages to 4k. This will also empty + * the refused pages list. */ - vmballoon_release_refused_pages(b, &ctl); + vmballoon_split_refused_pages(&ctl); ctl.page_size--; } @@ -1093,6 +1132,8 @@ static void vmballoon_inflate(struct vmballoon *b) */ if (ctl.n_refused_pages != 0) vmballoon_release_refused_pages(b, &ctl); + + vmballoon_release_page_list(&ctl.prealloc_pages, NULL, ctl.page_size); } /** -- 2.17.1