Launch one vhal_proxy_server for each instance

In case of CF multi-tenancy, switch from shared VHAL server for all
instances to independent VHAL server for each instance.

Bug: b/440435240

Author: chihchiachen

base/cvd/cuttlefish/host/commands/assemble_cvd/assemble_cvd_flags.cpp

@@ -166,13 +166,6 @@ DEFINE_bool(enable_automotive_proxy, CF_DEFAULTS_ENABLE_AUTOMOTIVE_PROXY,
 DEFINE_vec(enable_vhal_proxy_server,
            fmt::format("{}", CF_DEFAULTS_ENABLE_VHAL_PROXY_SERVER),
            "Enable the vhal proxy service on the host.");
-DEFINE_int32(vhal_proxy_server_instance_num,
-             CF_DEFAULTS_VHAL_PROXY_SERVER_INSTANCE_NUM,
-             "If it is greater than 0, use an existing vhal proxy server "
-             "instance which is "
-             "launched from cuttlefish instance "
-             "with vhal_proxy_server_instance_num. Else, launch a new vhal "
-             "proxy server instance");
 
 /**
  * crosvm sandbox feature requires /var/empty and seccomp directory

base/cvd/cuttlefish/host/commands/assemble_cvd/bootconfig_args.cpp

@@ -228,9 +228,9 @@ Result<std::unordered_map<std::string, std::string>> BootconfigArgsFromConfig(
               ? "com.android.hardware.graphics.composer.drm_hwcomposer"
               : "com.android.hardware.graphics.composer.ranchu";
 
-  if (config.vhal_proxy_server_port()) {
+  if (instance.vhal_proxy_server_port()) {
     bootconfig_args["androidboot.vhal_proxy_server_port"] =
-        std::to_string(config.vhal_proxy_server_port());
+        std::to_string(instance.vhal_proxy_server_port());
     int32_t instance_id;
     CF_EXPECT(android::base::ParseInt(instance.id(), &instance_id),
               "instance id: " << instance.id() << " is not a valid int");

base/cvd/cuttlefish/host/commands/assemble_cvd/flags.cc

@@ -460,6 +460,9 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
 
   tmp_config_obj.set_enable_automotive_proxy(FLAGS_enable_automotive_proxy);
 
+  std::vector<bool> enable_vhal_proxy_server_vec =
+      CF_EXPECT(GET_FLAG_BOOL_VALUE(enable_vhal_proxy_server));
+
   std::vector<std::string> gnss_file_paths =
       CF_EXPECT(GET_FLAG_STR_VALUE(gnss_file_path));
   std::vector<std::string> fixed_location_file_paths =
@@ -677,22 +680,6 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
   std::set<std::string> straced_set(straced.begin(), straced.end());
   tmp_config_obj.set_straced_host_executables(straced_set);
 
-  auto vhal_proxy_server_instance_num = *instance_nums.begin() - 1;
-  if (FLAGS_vhal_proxy_server_instance_num > 0) {
-    vhal_proxy_server_instance_num = FLAGS_vhal_proxy_server_instance_num - 1;
-  }
-  tmp_config_obj.set_vhal_proxy_server_port(
-      cuttlefish::vhal_proxy_server::kDefaultEthPort +
-      vhal_proxy_server_instance_num);
-  std::vector<bool> enable_vhal_proxy_server_vec =
-      CF_EXPECT(GET_FLAG_BOOL_VALUE(enable_vhal_proxy_server));
-  bool enable_vhal_proxy_server =
-      std::any_of(enable_vhal_proxy_server_vec.begin(),
-                  enable_vhal_proxy_server_vec.end(), [](bool e) { return e; });
-  LOG(DEBUG) << "launch vhal proxy server: "
-             << (enable_vhal_proxy_server &&
-                 vhal_proxy_server_instance_num <= 0);
-
   tmp_config_obj.set_kvm_path(FLAGS_kvm_path);
   tmp_config_obj.set_vhost_vsock_path(FLAGS_vhost_vsock_path);
 
@@ -1043,6 +1030,11 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
     instance.set_adb_ip_and_port("0.0.0.0:" + std::to_string(6520 + num - 1));
     instance.set_fastboot_host_port(const_instance.adb_host_port());
 
+    instance.set_enable_vhal_proxy_server(
+        enable_vhal_proxy_server_vec[instance_index]);
+    instance.set_vhal_proxy_server_port(
+        cuttlefish::vhal_proxy_server::kDefaultEthPort + num - 1);
+
     std::uint8_t ethernet_mac[6] = {};
     std::uint8_t mobile_mac[6] = {};
     std::uint8_t wifi_mac[6] = {};
@@ -1226,9 +1218,6 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
 
     instance.set_start_pica(is_first_instance && any_not_netsim_uwb &&
                             FLAGS_pica_instance_num <= 0);
-    instance.set_start_vhal_proxy_server(
-        is_first_instance && enable_vhal_proxy_server &&
-        FLAGS_vhal_proxy_server_instance_num <= 0);
 
     // TODO(b/288987294) Remove this when separating environment is done
     bool instance_start_wmediumd = is_first_instance && start_wmediumd;

base/cvd/cuttlefish/host/commands/assemble_cvd/flags_defaults.h

@@ -193,7 +193,6 @@
 
 // Vhal Proxy Server default parameter
 #define CF_DEFAULTS_ENABLE_VHAL_PROXY_SERVER false
-#define CF_DEFAULTS_VHAL_PROXY_SERVER_INSTANCE_NUM 0
 
 // Bluetooth default parameters
 #define CF_DEFAULTS_ENABLE_HOST_BLUETOOTH true

base/cvd/cuttlefish/host/commands/run_cvd/launch/vhal_proxy_server.cpp

@@ -32,12 +32,11 @@
 namespace cuttlefish {
 
 std::optional<MonitorCommand> VhalProxyServer(
-    const CuttlefishConfig& config,
     const CuttlefishConfig::InstanceSpecific& instance) {
-  if (!instance.start_vhal_proxy_server()) {
+  if (!instance.enable_vhal_proxy_server()) {
     return {};
   }
-  int port = config.vhal_proxy_server_port();
+  int port = instance.vhal_proxy_server_port();
   Command command = Command(VhalProxyServerBinary())
                         .AddParameter(VhalProxyServerConfig())
                         .AddParameter(fmt::format(

base/cvd/cuttlefish/host/commands/run_cvd/launch/vhal_proxy_server.h

@@ -21,7 +21,6 @@
 namespace cuttlefish {
 
 std::optional<MonitorCommand> VhalProxyServer(
-    const CuttlefishConfig& config,
     const CuttlefishConfig::InstanceSpecific& instance);
 
 }  // namespace cuttlefish

base/cvd/cuttlefish/host/libs/config/cuttlefish_config.cpp

@@ -213,14 +213,6 @@ bool CuttlefishConfig::enable_automotive_proxy() const {
   return (*dictionary_)[kEnableAutomotiveProxy].asBool();
 }
 
-static constexpr char kVhalProxyServerPort[] = "vhal_proxy_server_port";
-void CuttlefishConfig::set_vhal_proxy_server_port(int port) {
-  (*dictionary_)[kVhalProxyServerPort] = port;
-}
-int CuttlefishConfig::vhal_proxy_server_port() const {
-  return (*dictionary_)[kVhalProxyServerPort].asInt();
-}
-
 static constexpr char kEnableHostNfc[] = "enable_host_nfc";
 void CuttlefishConfig::set_enable_host_nfc(bool enable_host_nfc) {
   (*dictionary_)[kEnableHostNfc] = enable_host_nfc;

base/cvd/cuttlefish/host/libs/config/cuttlefish_config.h

@@ -125,10 +125,6 @@ class CuttlefishConfig {
   void set_enable_automotive_proxy(bool enable_automotive_proxy);
   bool enable_automotive_proxy() const;
 
-  // The vsock port used by vhal_proxy_server
-  void set_vhal_proxy_server_port(int port);
-  int vhal_proxy_server_port() const;
-
   void set_enable_host_nfc(bool enable_host_nfc);
   bool enable_host_nfc() const;
 
@@ -624,7 +620,8 @@ class CuttlefishConfig {
     std::string filename_encryption_mode() const;
     ExternalNetworkMode external_network_mode() const;
 
-    bool start_vhal_proxy_server() const;
+    bool enable_vhal_proxy_server() const;
+    int vhal_proxy_server_port() const;
 
     int audio_output_streams_count() const;
 
@@ -852,9 +849,8 @@ class CuttlefishConfig {
     void set_filename_encryption_mode(const std::string& filename_encryption_mode);
     void set_external_network_mode(ExternalNetworkMode network_mode);
 
-    // Whether we should start vhal_proxy_server for the guest-side VHAL to
-    // connect to.
-    void set_start_vhal_proxy_server(bool start_vhal_proxy_server);
+    void set_enable_vhal_proxy_server(bool enable_vhal_proxy_server);
+    void set_vhal_proxy_server_port(int port);
 
     void set_audio_output_streams_count(int count);
 

base/cvd/cuttlefish/host/libs/config/cuttlefish_config_instance.cpp

@@ -1955,13 +1955,22 @@ void CuttlefishConfig::MutableInstanceSpecific::set_wifi_mac_prefix(
   (*Dictionary())[kWifiMacPrefix] = wifi_mac_prefix;
 }
 
-static constexpr char kStartVhalProxyServer[] = "start_vhal_proxy_server";
-void CuttlefishConfig::MutableInstanceSpecific::set_start_vhal_proxy_server(
-    bool start_vhal_proxy_server) {
-  (*Dictionary())[kStartVhalProxyServer] = start_vhal_proxy_server;
+static constexpr char kEnableVhalProxyServer[] = "enable_vhal_proxy_server";
+void CuttlefishConfig::MutableInstanceSpecific::set_enable_vhal_proxy_server(
+    bool enable_vhal_proxy_server) {
+  (*Dictionary())[kEnableVhalProxyServer] = enable_vhal_proxy_server;
 }
-bool CuttlefishConfig::InstanceSpecific::start_vhal_proxy_server() const {
-  return (*Dictionary())[kStartVhalProxyServer].asBool();
+bool CuttlefishConfig::InstanceSpecific::enable_vhal_proxy_server() const {
+  return (*Dictionary())[kEnableVhalProxyServer].asBool();
+}
+
+static constexpr char kVhalProxyServerPort[] = "vhal_proxy_server_port";
+void CuttlefishConfig::MutableInstanceSpecific::set_vhal_proxy_server_port(
+    int port) {
+  (*Dictionary())[kVhalProxyServerPort] = port;
+}
+int CuttlefishConfig::InstanceSpecific::vhal_proxy_server_port() const {
+  return (*Dictionary())[kVhalProxyServerPort].asInt();
 }
 
 static constexpr char kAudioOutputStreamsCount[] = "audio_output_streams_count";