Include CPU flags in read_cpuinfo

[pve-common.git] / src / PVE / ProcFSTools.pm

diff --git a/src/PVE/ProcFSTools.pm b/src/PVE/ProcFSTools.pm
index 99f767a172b7e1f0bc687d44c043a8123fd0d347..027aa3ad1bc5140926e8367dc07f76b7f6469bf9 100644 (file)
--- a/src/PVE/ProcFSTools.pm
+++ b/src/PVE/ProcFSTools.pm
@@ -8,6 +8,12 @@ use IO::File;
 use PVE::Tools;
 use Cwd qw();
 
+use Socket qw(PF_INET PF_INET6 SOCK_DGRAM IPPROTO_IP);
+
+use constant IFF_UP => 1;
+use constant IFNAMSIZ => 16;
+use constant SIOCGIFFLAGS => 0x8913;
+
 my $clock_ticks = POSIX::sysconf(&POSIX::_SC_CLK_TCK);
 
 my $cpuinfo;
@@ -23,6 +29,7 @@ sub read_cpuinfo {
        mhz => 0,
        cpus => 1,
        sockets => 1,
+       flags => '',
     };
 
     my $fh = IO::File->new ($fn, "r");
@@ -37,19 +44,22 @@ sub read_cpuinfo {
            $res->{model} = $1 if $res->{model} eq 'unknown';
        } elsif ($line =~ m/^cpu\s+MHz\s*:\s*(\d+\.\d+)\s*$/i) {
            $res->{mhz} = $1 if !$res->{mhz};
-       } elsif ($line =~ m/^flags\s*:.*(vmx|svm)/) {
-           $res->{hvm} = 1; # Hardware Virtual Machine (Intel VT / AMD-V)
+       } elsif ($line =~ m/^flags\s*:\s*(.*)$/) {
+           $res->{flags} = $1 if !length $res->{flags};
        } elsif ($line =~ m/^physical id\s*:\s*(\d+)\s*$/i) {
            $idhash->{$1} = 1;
        }
     }
 
+    # Hardware Virtual Machine (Intel VT / AMD-V)
+    $res->{hvm} = $res->{flags} =~ m/\s(vmx|svm)\s/;
+
     $res->{sockets} = scalar(keys %$idhash) || 1;
 
     $res->{cpus} = $count;
 
     $fh->close;
-    
+
     $cpuinfo = $res;
 
     return $res;
@@ -286,7 +296,7 @@ sub read_proc_net_route {
 }
 
 sub read_proc_mounts {
-    return PVE::Tools::file_get_contents("/proc/mounts");
+    return PVE::Tools::file_get_contents("/proc/mounts", 512*1024);
 }
 
 # mounts encode spaces (\040), tabs (\011), newlines (\012), backslashes (\\ or \134)
@@ -323,6 +333,8 @@ sub is_mounted {
 
     $mountpoint = Cwd::realpath($mountpoint);
 
+    return 0 if !defined($mountpoint); # path does not exist
+
     my $mounts = parse_proc_mounts();
     return (grep { $_->[1] eq $mountpoint } @$mounts) ? 1 : 0;
 }
@@ -352,4 +364,56 @@ sub read_proc_net_ipv6_route {
     return $res;
 }
 
+sub upid_wait {
+    my ($upid, $waitfunc, $sleep_intervall) = @_;
+
+    my $task = PVE::Tools::upid_decode($upid);
+
+    $sleep_intervall = $sleep_intervall ? $sleep_intervall : 1;
+
+    my $next_time = time + $sleep_intervall;
+
+    while (check_process_running($task->{pid}, $task->{pstart})) {
+
+       if (time >= $next_time && $waitfunc && ref($waitfunc) eq 'CODE'){
+           &$waitfunc($task);
+           $next_time = time + $sleep_intervall;
+       }
+
+       CORE::sleep(1);
+    }
+}
+
+# struct ifreq { // FOR SIOCGIFFLAGS:
+#   char ifrn_name[IFNAMSIZ]
+#   short ifru_flags
+# };
+my $STRUCT_IFREQ_SIOCGIFFLAGS = 'Z' . IFNAMSIZ . 's1';
+sub get_active_network_interfaces {
+    # Use the interface name list from /proc/net/dev
+    open my $fh, '<', '/proc/net/dev'
+       or die "failed to open /proc/net/dev: $!\n";
+    # And filter by IFF_UP flag fetched via a PF_INET6 socket ioctl:
+    my $sock;
+    socket($sock, PF_INET6, SOCK_DGRAM, &IPPROTO_IP)
+    or socket($sock, PF_INET, SOCK_DGRAM, &IPPROTO_IP)
+    or return [];
+
+    my $ifaces = [];
+    while(defined(my $line = <$fh>)) {
+       next if $line !~ /^\s*([^:\s]+):/;
+       my $ifname = $1;
+       my $ifreq = pack($STRUCT_IFREQ_SIOCGIFFLAGS, $ifname, 0);
+       if (!defined(ioctl($sock, SIOCGIFFLAGS, $ifreq))) {
+           warn "failed to get interface flags for: $ifname\n";
+           next;
+       }
+       my ($name, $flags) = unpack($STRUCT_IFREQ_SIOCGIFFLAGS, $ifreq);
+       push @$ifaces, $ifname if ($flags & IFF_UP);
+    }
+    close $fh;
+    close $sock;
+    return $ifaces;
+}
+
 1;