From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA665C10F16 for ; Tue, 23 Apr 2024 03:41:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4735A6B0087; Mon, 22 Apr 2024 23:41:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4229E6B0088; Mon, 22 Apr 2024 23:41:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 29C6E6B0089; Mon, 22 Apr 2024 23:41:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 11C726B0087 for ; Mon, 22 Apr 2024 23:41:23 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C57B71404B0 for ; Tue, 23 Apr 2024 03:41:22 +0000 (UTC) X-FDA: 82039396404.14.D00B8D6 Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) by imf06.hostedemail.com (Postfix) with ESMTP id 213CD180010 for ; Tue, 23 Apr 2024 03:41:20 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=BscZvZue; spf=pass (imf06.hostedemail.com: domain of pizhenwei@bytedance.com designates 209.85.210.44 as permitted sender) smtp.mailfrom=pizhenwei@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713843681; a=rsa-sha256; cv=none; b=Kr5mARXEyshHoSffIFaSJHJ0zsa4a3bBHxoW95PfNmSfxsMhdizy6J5JC4Mfe+whKrovl8 XWSF3D5GlMZ+X7CzcwACT3SL/dKxfPDwHjlXQTlTjeqqhTMsxcApCIdT2r/aPqWRrNEwsl szKxg46OB2M1ZtsHu3T5oIJGUrpe/Ds= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=BscZvZue; spf=pass (imf06.hostedemail.com: domain of pizhenwei@bytedance.com designates 209.85.210.44 as permitted sender) smtp.mailfrom=pizhenwei@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713843681; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=KkBGMpzb7Zyfmx1ZstJgk5Op8ktl/5dFs5p8PlYlyX8=; b=nJ+83/SPCaIGM0RQhKIG0dJrbOWeJwBFdMl4XY3+hIhIAC+Rdq48YoOM0GM0mry/REHz9V beNHODdNpSEPzgELA+A5kd2ObLVdlUF7LbZxgpefyXaGtFgl6Nf4ncM6QbgABmcGBIUze4 ciVjwAm63ouJd9vYFaWDXjfy1mXjWsA= Received: by mail-ot1-f44.google.com with SMTP id 46e09a7af769-6eb658ca1ceso3900910a34.2 for ; Mon, 22 Apr 2024 20:41:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1713843680; x=1714448480; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KkBGMpzb7Zyfmx1ZstJgk5Op8ktl/5dFs5p8PlYlyX8=; b=BscZvZueAO1CqTiadI08O3+S6WOfn8QDkf6XvWHi9Aqzb2NKAVCs+dH+/X+ftZDqUu sTE3J7k3YNG3k+8pBLB1tddrmoyZ+3UAg88A0vtQ+/0PC1FHE9VTVBwvGXFqQcxBMoSw mP+YldWFgdrfmdXDiTDM5PyhsgXRCTiUF5oRcygSDO1a56TZPzjlrmrrsNvQdD8AzsZP 772pOJnUu09WInK/TkKbqX1vz8zxQao7J07P54eRx1UHP5hapgrocEGe6scqnDiVAp5t dh2NNVZojLBuDTFX1+Vyiehszr9M9g+j14EeNLVP2veAvvatmbZ7lZ1b7trte9uOa9Rs IXUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713843680; x=1714448480; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KkBGMpzb7Zyfmx1ZstJgk5Op8ktl/5dFs5p8PlYlyX8=; b=oVvr6mC68Vuw0rdjwv3IIWG3SS+rJu3+fzH3QHI/hKT1YO3IZe/9iNAOvkYsiIfXE7 rKS5pxuah63c9oqkOKIsaHWY0oKIl6yY7FCvAxdDLIbGTigVlGcYlgKztWcjLQuq0DPZ bvRYjGEAJaAkvBpCs788NqLesYp4lYGwTgEB9qGiU6MwUjmrtWBfi0lwGrCLs0myjk09 iE265Z1t7izOJNHhlUcGySf1hlQFxG5c38WE7LNWBNOm9awyXYXwvAG3VdBZesr8CMyJ 6Azd7m/a1AvGjPmY2MLJwzw5AHK6irJ291nIPFL9wT+R0n9jK90JwnmFScVCtoJxWFbZ rwRQ== X-Forwarded-Encrypted: i=1; AJvYcCWKDReiEGXyK0gomXQX5TRREz34WTz4bKktaACoZc2G6ZjrKnkkwg839Pip3R97k5H2QDJateotMPTzhBhjwYo0CIY= X-Gm-Message-State: AOJu0Yx4spDcAszgDFe4pULsDSya9FbOPPk6bmhujlVne2s1UCXElBXq DAlnMWoNg8dqbWfp7bj9C+ly/KK+JIUTDhrzq6rIahuckggDMnwpHk78FcDo+hs= X-Google-Smtp-Source: AGHT+IFPWbPsOAgDjqPCg7khKs3ioBh3D8C//sMkXvFal/sejW6ukQN3/LZM7rjAVP3UsOTPrF/iBA== X-Received: by 2002:a05:6830:4392:b0:6ed:686:b43 with SMTP id s18-20020a056830439200b006ed06860b43mr9633062otv.17.1713843680244; Mon, 22 Apr 2024 20:41:20 -0700 (PDT) Received: from libai.bytedance.net ([61.213.176.11]) by smtp.gmail.com with ESMTPSA id b16-20020a63d810000000b005e438fe702dsm8266980pgh.65.2024.04.22.20.41.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 20:41:19 -0700 (PDT) From: zhenwei pi To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, virtualization@lists.linux.dev Cc: mst@redhat.com, david@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, akpm@linux-foundation.org, zhenwei pi Subject: [PATCH v3 1/4] virtio_balloon: separate vm events into a function Date: Tue, 23 Apr 2024 11:41:06 +0800 Message-Id: <20240423034109.1552866-2-pizhenwei@bytedance.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240423034109.1552866-1-pizhenwei@bytedance.com> References: <20240423034109.1552866-1-pizhenwei@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 213CD180010 X-Stat-Signature: 9izpawt7ep6znu4amkajztgjy3s1fdo5 X-Rspam-User: X-HE-Tag: 1713843680-589735 X-HE-Meta: U2FsdGVkX1+hrByw0G2OTBlCNj7tHDLwOESskN67CQOw51Wj+ZOHtR1sRpBzsHMurSi/kF64ZpO1XDCT6N8X0eQn5r8YV9F+7bXb/oqir1nZpC1RZsyk+7aj19MKsemGfyZjICYYApqyZqcn0djRAO3h4z9VUhrD8+JEt+OXaVmb9DfrMlwfLIZNXhc0xbpGNg4U5DHPwo0U/mzCv9PxRdVFFhGMglszz73Nd/coNR/H77wolmRl9nZE04I3g20OioZMY2HYhxHsuxr8GcGQacJqG8FziRd3eyUA8eU7MviRUMtj+br5/JOs3zvPJfc+gA7K9rs+DlYOf6Lhm5x/m69acdIWT5e1nl6+s06AiW4fI2fy2hplOpvpF+F0+BxDQmxQKrPfcAYxuLj6ABRa/rQ6awXiNJ4Abmgpjs5PslMjD+wJDFuS+W4ufg8ga3qpewxYdPlobTtRx0JpWtqjDPRqz9yNIZ8mhg2AlyjRQGpU/G3wnyTk7wmIsEQTfob9aJsBlOMkniZTwD5z1Kq7vgtXBxUggPLkQ+YPcFQeqG76EgQttQ7QUm4wQvJtH7S7YSTFganBvIli/eCHJM+4VITY0X2dPjDR+afR6KgmEOZDdKFsaXYl0ZDdjGBkt7E3tcbNvhIKfEYYmBFn+abOwSBELUsrZT+rTfbHXVokcsiMFDvBJko7FDOcE4CmAStHi2PoPCI2KmE0PEHalHk3JcaD/Z9gjKuOio/bSIK/kVKrqjkeXwcg891IIRnKyqtBTbMlvoeGV83D0G06/U6Pu3qeEkGy9SLjYt6ZF6g6xraFAPkultvfmwK/ZWloYz2aE+4Ft6ipDnNHTCdjd2te26rWzZwHuuoWfoLnJPOAzC7VECpo3jXApi/nTg3tbu7XMrzY7vV0RuWW5p9OPlwLZmCGuMkFJBTfvkfWeoBpqaC8fJUSgNi6+4Cir6Gu5bfmxGOxgXPI50MfxAlLdBG mo0ViG8j 4o1G0suJljPQdO4CsuIw+DyKTIw3zh3psORPLlmJY+vhQugTjEXQAfCFmEPiQQyxOFH+P9lda/e6Row8eMXZVI82e2kv66YZIF1y3QeCtKJCd0m1vTrRnVH6p81etPtK5BMr8uUrxB3Jfk/HMGiEPqbYMdqcLRdq9ULNkx/TDRBpcSis= 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: List-Subscribe: List-Unsubscribe: All the VM events related statistics have dependence on 'CONFIG_VM_EVENT_COUNTERS', separate these events into a function to make code clean. Then we can remove 'CONFIG_VM_EVENT_COUNTERS' from 'update_balloon_stats'. Signed-off-by: zhenwei pi --- drivers/virtio/virtio_balloon.c | 43 ++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 1f5b3dd31fcf..1710e3098ecd 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -316,34 +316,49 @@ static inline void update_stat(struct virtio_balloon *vb, int idx, #define pages_to_bytes(x) ((u64)(x) << PAGE_SHIFT) -static unsigned int update_balloon_stats(struct virtio_balloon *vb) +#ifdef CONFIG_VM_EVENT_COUNTERS +/* Return the number of entries filled by vm events */ +static inline unsigned int update_balloon_vm_stats(struct virtio_balloon *vb) { unsigned long events[NR_VM_EVENT_ITEMS]; - struct sysinfo i; unsigned int idx = 0; - long available; - unsigned long caches; all_vm_events(events); - si_meminfo(&i); - - available = si_mem_available(); - caches = global_node_page_state(NR_FILE_PAGES); - -#ifdef CONFIG_VM_EVENT_COUNTERS update_stat(vb, idx++, VIRTIO_BALLOON_S_SWAP_IN, - pages_to_bytes(events[PSWPIN])); + pages_to_bytes(events[PSWPIN])); update_stat(vb, idx++, VIRTIO_BALLOON_S_SWAP_OUT, - pages_to_bytes(events[PSWPOUT])); + pages_to_bytes(events[PSWPOUT])); update_stat(vb, idx++, VIRTIO_BALLOON_S_MAJFLT, events[PGMAJFAULT]); update_stat(vb, idx++, VIRTIO_BALLOON_S_MINFLT, events[PGFAULT]); + #ifdef CONFIG_HUGETLB_PAGE update_stat(vb, idx++, VIRTIO_BALLOON_S_HTLB_PGALLOC, events[HTLB_BUDDY_PGALLOC]); update_stat(vb, idx++, VIRTIO_BALLOON_S_HTLB_PGFAIL, events[HTLB_BUDDY_PGALLOC_FAIL]); -#endif -#endif +#endif /* CONFIG_HUGETLB_PAGE */ + + return idx; +} +#else /* CONFIG_VM_EVENT_COUNTERS */ +static inline unsigned int update_balloon_vm_stats(struct virtio_balloon *vb) +{ + return 0; +} +#endif /* CONFIG_VM_EVENT_COUNTERS */ + +static unsigned int update_balloon_stats(struct virtio_balloon *vb) +{ + struct sysinfo i; + unsigned int idx; + long available; + unsigned long caches; + + idx = update_balloon_vm_stats(vb); + + si_meminfo(&i); + available = si_mem_available(); + caches = global_node_page_state(NR_FILE_PAGES); update_stat(vb, idx++, VIRTIO_BALLOON_S_MEMFREE, pages_to_bytes(i.freeram)); update_stat(vb, idx++, VIRTIO_BALLOON_S_MEMTOT, -- 2.34.1