From 1cd256dbaf85e4abaf8fb4250e0cb029be43e89a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 2 Jun 2017 18:37:10 +0200 Subject: nailgun-agent: AArch64: Allow platform bus storage While at it, transform all Armband patche for fuel-nailgun-agent into Debian patches. Change-Id: I3147ea151244158d2a4bef875008ef2fa0e49377 Signed-off-by: Alexandru Avadanii --- ...ch64-Read-hugepage-size-from-proc-meminfo.patch | 71 +++++++++++++++------- 1 file changed, 50 insertions(+), 21 deletions(-) (limited to 'patches/fuel-nailgun-agent/0004-AArch64-Read-hugepage-size-from-proc-meminfo.patch') diff --git a/patches/fuel-nailgun-agent/0004-AArch64-Read-hugepage-size-from-proc-meminfo.patch b/patches/fuel-nailgun-agent/0004-AArch64-Read-hugepage-size-from-proc-meminfo.patch index 384dafca..8a51c359 100644 --- a/patches/fuel-nailgun-agent/0004-AArch64-Read-hugepage-size-from-proc-meminfo.patch +++ b/patches/fuel-nailgun-agent/0004-AArch64-Read-hugepage-size-from-proc-meminfo.patch @@ -7,7 +7,7 @@ : http://www.apache.org/licenses/LICENSE-2.0 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: From: Alexandru Avadanii -Date: Sun, 15 Jan 2017 08:14:12 +0100 +Date: Fri, 19 May 2017 20:38:01 +0200 Subject: [PATCH] AArch64: Read hugepage size from /proc/meminfo This method should be arch-indepedent, provided /proc/meminfo @@ -15,24 +15,53 @@ reports the correct information. Signed-off-by: Alexandru Avadanii --- - agent | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/agent b/agent -index eeb4d26..d514de6 100755 ---- a/agent -+++ b/agent -@@ -1399,6 +1399,13 @@ class NodeAgent - def supported_hugepages - return [2048, 1048576] if _get_detailed_cpuinfo['0'][:flags].include?('pdpe1gb') - return [2048] if _get_detailed_cpuinfo['0'][:flags].include?('pse') -+ # AArch64 does not expose CPU flags, but we can rely on /proc/meminfo -+ File.open('/proc/meminfo').each do |l| -+ case l.strip -+ when /Hugepagesize:\s+(\d+)\s+kB/ -+ return [$1.to_i()] -+ end -+ end - [] - end + ...ch64-Read-hugepage-size-from-proc-meminfo.patch | 30 ++++++++++++++++++++++ + debian/patches/series | 1 + + 2 files changed, 31 insertions(+) + create mode 100644 debian/patches/0004-AArch64-Read-hugepage-size-from-proc-meminfo.patch +diff --git a/debian/patches/0004-AArch64-Read-hugepage-size-from-proc-meminfo.patch b/debian/patches/0004-AArch64-Read-hugepage-size-from-proc-meminfo.patch +new file mode 100644 +index 0000000..16d78b5 +--- /dev/null ++++ b/debian/patches/0004-AArch64-Read-hugepage-size-from-proc-meminfo.patch +@@ -0,0 +1,30 @@ ++From: Alexandru Avadanii ++Date: Sun, 15 Jan 2017 08:14:12 +0100 ++Subject: [PATCH 3/4] AArch64: Read hugepage size from /proc/meminfo ++ ++This method should be arch-indepedent, provided /proc/meminfo ++reports the correct information. ++ ++Signed-off-by: Alexandru Avadanii ++--- ++ agent | 7 +++++++ ++ 1 file changed, 7 insertions(+) ++ ++diff --git a/agent b/agent ++index c3f5d28..01c17fe 100755 ++--- a/agent +++++ b/agent ++@@ -1379,6 +1379,13 @@ class NodeAgent ++ def supported_hugepages ++ return [2048, 1048576] if _get_detailed_cpuinfo['0'][:flags].include?('pdpe1gb') ++ return [2048] if _get_detailed_cpuinfo['0'][:flags].include?('pse') +++ # AArch64 does not expose CPU flags, but we can rely on /proc/meminfo +++ File.open('/proc/meminfo').each do |l| +++ case l.strip +++ when /Hugepagesize:\s+(\d+)\s+kB/ +++ return [$1.to_i()] +++ end +++ end ++ [] ++ end ++ +diff --git a/debian/patches/series b/debian/patches/series +index fa57b98..93ef079 100644 +--- a/debian/patches/series ++++ b/debian/patches/series +@@ -1,3 +1,4 @@ + 0001-ohai-Support-reading-L1-info-from-ethtool.patch + 0002-Temporary-SR-IOV-Fix-VNICs-broken-filter.patch + 0003-AArch64-Add-CPU-details-detection.patch ++0004-AArch64-Read-hugepage-size-from-proc-meminfo.patch -- cgit 1.2.3-korg