From patchwork Fri Apr 29 18:37:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1624497 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=FsW0PacJ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Kqh6w66M3z9s2R for ; Sat, 30 Apr 2022 04:37:27 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nkVUX-0006J4-Rh; Fri, 29 Apr 2022 18:37:21 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nkVUU-0006H7-RB for kernel-team@lists.ubuntu.com; Fri, 29 Apr 2022 18:37:18 +0000 Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 4F01D3F1AE for ; Fri, 29 Apr 2022 18:37:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1651257437; bh=M0eeIMznSkqDJE/fZA3Ci7wDKShKvOsIUfsv3jsPo3s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FsW0PacJt9D9QuljZfrb6z4mAo08Z6Ok1k2kxynIjqAILfsJ3YnSDQ+kA6tUo8Z+B 9JxcBDBWKyRu6Bhbtz3bxCxw/vbnguTu6EwhDxIspdeffgiZLFNdf0C9SuYPJXBM1p oKQlPT9VWSCB5koIJCkw8TfuD8TxjAE/jokIjERpSBTyLhRQZap1hK88p8ni736U8n 3QXgdrOBdllKMkuLGkn0kwGrjWy+bwwrMVvst8U7F9Hu97+jeroglEHz1vmYxnVmDo gCZyvRSijtPnDQzCeHOGiUE6bQrs6D55aXmOfoJ4ZCPQanMcm9zznK+gLcPWzVRy65 7cHvuMkGTtTpg== Received: by mail-pj1-f70.google.com with SMTP id v9-20020a17090a7c0900b001cb45f88cdcso4336594pjf.0 for ; Fri, 29 Apr 2022 11:37:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M0eeIMznSkqDJE/fZA3Ci7wDKShKvOsIUfsv3jsPo3s=; b=BGrO4sHjJXn861VKkcxVkx0XggLBG2aKkv2/06xSldjlRYTzHmh0sKZTfQctClgdho o77+iaDEu7xA0eB3Lk+ulVlZGksTvjdhj3Xdz9a/LzKVdRdagbSNtx+qMn+Efv39kf1h g0+FrgoxhnhmlCypxMhibJT3PoQCFUqc/hyCxzg+LlGmmggvAIGBSCH1bYspdULY+fSO Htt2LKswUZrMeVSZyB0TJVct+/wxp4Yu1Eu8prZFeom3mij3UgC73jLirUisy0GXVj9Q PZf6bhkkUARrk46G0N+dDEGZlwLxRaLJreqQbXg/wwJKyjqVnh02Oxx306zuERtOM7cW JeUg== X-Gm-Message-State: AOAM533Z+r00bqNPKH+yxf2bipaHoiraUI29KXGhPz5RiQQxdOIRC59U 0G9KlM1uEQFYb+gL07u7NA4KhZE+MxLVIpTAy03HKtnyWjvt3iG+ev3G+TLs3CqR2pOBXe0wWS0 tA3/d/LGjOHujI9W/D7ZU1d2lZwdkRhEYJ+/X7Q1N6Q== X-Received: by 2002:a62:fb0f:0:b0:4f2:6d3f:5ffb with SMTP id x15-20020a62fb0f000000b004f26d3f5ffbmr568549pfm.55.1651257435506; Fri, 29 Apr 2022 11:37:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzt30jexSaisEllwLq7kXMZrZft3IJVB95lHOfoLcaeFRIi3obbQsVNd3M7ChDzA6asmtHiAg== X-Received: by 2002:a62:fb0f:0:b0:4f2:6d3f:5ffb with SMTP id x15-20020a62fb0f000000b004f26d3f5ffbmr568530pfm.55.1651257435205; Fri, 29 Apr 2022 11:37:15 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id s22-20020a17090ad49600b001cd4989fee1sm14505703pju.45.2022.04.29.11.37.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 11:37:14 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/3] Drivers: hv: balloon: Support status report for larger page sizes Date: Fri, 29 Apr 2022 12:37:05 -0600 Message-Id: <20220429183707.25448-2-tim.gardner@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220429183707.25448-1-tim.gardner@canonical.com> References: <20220429183707.25448-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Boqun Feng BugLink: https://bugs.launchpad.net/bugs/1970468 DM_STATUS_REPORT expects the numbers of pages in the unit of 4k pages (HV_HYP_PAGE) instead of guest pages, so to make it work when guest page sizes are larger than 4k, convert the numbers of guest pages into the numbers of HV_HYP_PAGEs. Note that the numbers of guest pages are still used for tracing because tracing is internal to the guest kernel. Reported-by: Vitaly Kuznetsov Signed-off-by: Boqun Feng Reviewed-by: Michael Kelley Link: https://lore.kernel.org/r/20220325023212.1570049-2-boqun.feng@gmail.com Signed-off-by: Wei Liu (cherry picked from commit b3d6dd09ff00fdcf4f7c0cb54700ffd5dd343502) Signed-off-by: Tim Gardner --- drivers/hv/hv_balloon.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c index a86e2e71e4f94..c8c454dc06458 100644 --- a/drivers/hv/hv_balloon.c +++ b/drivers/hv/hv_balloon.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -1136,6 +1137,7 @@ static void post_status(struct hv_dynmem_device *dm) struct dm_status status; unsigned long now = jiffies; unsigned long last_post = last_post_time; + unsigned long num_pages_avail, num_pages_committed; if (pressure_report_delay > 0) { --pressure_report_delay; @@ -1160,16 +1162,21 @@ static void post_status(struct hv_dynmem_device *dm) * num_pages_onlined) as committed to the host, otherwise it can try * asking us to balloon them out. */ - status.num_avail = si_mem_available(); - status.num_committed = vm_memory_committed() + + num_pages_avail = si_mem_available(); + num_pages_committed = vm_memory_committed() + dm->num_pages_ballooned + (dm->num_pages_added > dm->num_pages_onlined ? dm->num_pages_added - dm->num_pages_onlined : 0) + compute_balloon_floor(); - trace_balloon_status(status.num_avail, status.num_committed, + trace_balloon_status(num_pages_avail, num_pages_committed, vm_memory_committed(), dm->num_pages_ballooned, dm->num_pages_added, dm->num_pages_onlined); + + /* Convert numbers of pages into numbers of HV_HYP_PAGEs. */ + status.num_avail = num_pages_avail * NR_HV_HYP_PAGES_IN_PAGE; + status.num_committed = num_pages_committed * NR_HV_HYP_PAGES_IN_PAGE; + /* * If our transaction ID is no longer current, just don't * send the status. This can happen if we were interrupted