From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <s.lendl@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (2048 bits))
 (No client certificate requested)
 by lists.proxmox.com (Postfix) with ESMTPS id 779CD931C6
 for <pve-devel@lists.proxmox.com>; Mon,  8 Apr 2024 14:19:00 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id 5982B99D7
 for <pve-devel@lists.proxmox.com>; Mon,  8 Apr 2024 14:18:30 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
 [94.136.29.106])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (2048 bits))
 (No client certificate requested)
 by firstgate.proxmox.com (Proxmox) with ESMTPS
 for <pve-devel@lists.proxmox.com>; Mon,  8 Apr 2024 14:18:29 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
 by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0BF7044088
 for <pve-devel@lists.proxmox.com>; Mon,  8 Apr 2024 14:18:29 +0200 (CEST)
From: Stefan Lendl <s.lendl@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Mon,  8 Apr 2024 14:17:42 +0200
Message-ID: <20240408121742.236867-2-s.lendl@proxmox.com>
X-Mailer: git-send-email 2.44.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results:  0
 AWL 0.019 Adjusted score from AWL reputation of From: address
 BAYES_00                 -1.9 Bayes spam probability is 0 to 1%
 DMARC_MISSING             0.1 Missing DMARC policy
 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
 SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
 SPF_PASS               -0.001 SPF: sender matches SPF record
Subject: [pve-devel] [PATCH v2 ksm-control-daemon 1/2] ksmtuned: revert to
 use rsz instead of vsz to compute memory usage
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 08 Apr 2024 12:19:00 -0000

For summing up actual memory usage of precesses rsz is more suitable
then vsz.

This reverts commit cd5cf20cc8af53427dcb9b08486c68f376ce8743.

Signed-off-by: Stefan Lendl <s.lendl@proxmox.com>
---
 debian/patches/series                      |  1 -
 debian/patches/use-vsz-instead-of-rsz.diff | 13 -------------
 2 files changed, 14 deletions(-)
 delete mode 100644 debian/patches/use-vsz-instead-of-rsz.diff

diff --git a/debian/patches/series b/debian/patches/series
index 7aaec2c..32d3a35 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 init-script.diff
 ksmtuned.diff
 adjust-ksm-slepp.diff
-use-vsz-instead-of-rsz.diff
diff --git a/debian/patches/use-vsz-instead-of-rsz.diff b/debian/patches/use-vsz-instead-of-rsz.diff
deleted file mode 100644
index 6cc4544..0000000
--- a/debian/patches/use-vsz-instead-of-rsz.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: new/ksmtuned
-===================================================================
---- new.orig/ksmtuned	2011-09-23 12:05:44.000000000 +0200
-+++ new/ksmtuned	2011-09-23 12:06:34.000000000 +0200
-@@ -72,7 +72,7 @@
-     # calculate how much memory is committed to running qemu processes
-     local progname
-     progname=${1:-kvm}
--    ps -C "$progname" -o rsz | awk '{ sum += $1 }; END { print sum }'
-+    ps -C "$progname" -o vsz= | awk '{ sum += $1 }; END { print sum }'
- }
- 
- free_memory () {
-- 
2.44.0