X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/d201cd533d268792760c5e5303ed96d95e68e3d4..094a4d970ccefa2e6409c8147c1edbdaaa74df0f:/tools/helpers/lxc.py diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py index de217e3..0808d98 100644 --- a/tools/helpers/lxc.py +++ b/tools/helpers/lxc.py @@ -6,7 +6,9 @@ import re import logging import glob import shutil +import time import platform +import gbinder import tools.config import tools.helpers.run @@ -51,7 +53,7 @@ def generate_nodes_lxc_config(args): make_entry("/dev/pvr_sync") make_entry("/dev/pmsg0") make_entry("/dev/dxg") - make_entry("/dev/dri", options="bind,create=dir,optional 0 0") + make_entry(tools.helpers.gpu.getDriNode(args), "dev/dri/renderD128") for n in glob.glob("/dev/fb*"): make_entry(n) @@ -74,6 +76,9 @@ def generate_nodes_lxc_config(args): make_entry("none", "dev/pts", "devpts", "defaults,mode=644,ptmxmode=666,create=dir 0 0", False) make_entry("/dev/uhid") + # TUN/TAP device node for VPN + make_entry("/dev/net/tun", "dev/tun") + # Low memory killer sys node make_entry("/sys/module/lowmemorykiller", options="bind,create=dir,optional 0 0") @@ -87,6 +92,8 @@ def generate_nodes_lxc_config(args): # Recursive mount /run to provide necessary host sockets make_entry("/run", options="rbind,create=dir 0 0") + # And /dev/shm + make_entry("/dev/shm", options="rbind,create=dir,optional 0 0") # Necessary sw_sync node for HWC make_entry("/dev/sw_sync") @@ -118,25 +125,54 @@ def generate_nodes_lxc_config(args): for n in glob.glob("/tmp/run-*"): make_entry(n, options="rbind,create=dir,optional 0 0") + # NFC config + make_entry("/system/etc/libnfc-nci.conf", options="bind,optional 0 0") + return nodes +LXC_APPARMOR_PROFILE = "lxc-waydroid" +def get_apparmor_status(args): + enabled = False + if shutil.which("aa-enabled"): + enabled = (tools.helpers.run.user(args, ["aa-enabled", "--quiet"], check=False) == 0) + if not enabled and shutil.which("systemctl"): + enabled = (tools.helpers.run.user(args, ["systemctl", "is-active", "-q", "apparmor"], check=False) == 0) + try: + with open("/sys/kernel/security/apparmor/profiles", "r") as f: + enabled &= (LXC_APPARMOR_PROFILE in f.read()) + except: + enabled = False + return enabled def set_lxc_config(args): lxc_path = tools.config.defaults["lxc"] + "/waydroid" - config_file = "config_2" lxc_ver = get_lxc_version(args) if lxc_ver == 0: raise OSError("LXC is not installed") - elif lxc_ver <= 2: - config_file = "config_1" - config_path = tools.config.tools_src + "/data/configs/" + config_file + config_paths = tools.config.tools_src + "/data/configs/config_" + seccomp_profile = tools.config.tools_src + "/data/configs/waydroid.seccomp" + + config_snippets = [ config_paths + "base" ] + # lxc v1 and v2 are bit special because some options got renamed later + if lxc_ver <= 2: + config_snippets.append(config_paths + "1") + else: + for ver in range(3, 5): + snippet = config_paths + str(ver) + if lxc_ver >= ver and os.path.exists(snippet): + config_snippets.append(snippet) command = ["mkdir", "-p", lxc_path] tools.helpers.run.user(args, command) - command = ["cp", "-fpr", config_path, lxc_path + "/config"] + command = ["sh", "-c", "cat {} > \"{}\"".format(' '.join('"{0}"'.format(w) for w in config_snippets), lxc_path + "/config")] tools.helpers.run.user(args, command) command = ["sed", "-i", "s/LXCARCH/{}/".format(platform.machine()), lxc_path + "/config"] tools.helpers.run.user(args, command) + command = ["cp", "-fpr", seccomp_profile, lxc_path + "/waydroid.seccomp"] + tools.helpers.run.user(args, command) + if get_apparmor_status(args): + command = ["sed", "-i", "-E", "/lxc.aa_profile|lxc.apparmor.profile/ s/unconfined/{}/g".format(LXC_APPARMOR_PROFILE), lxc_path + "/config"] + tools.helpers.run.user(args, command) nodes = generate_nodes_lxc_config(args) config_nodes_tmp_path = args.work + "/config_nodes" @@ -165,12 +201,30 @@ def make_base_props(args): return prop return "" + def find_hidl(intf): + if args.vendor_type == "MAINLINE": + return False + + try: + sm = gbinder.ServiceManager("/dev/hwbinder") + return intf in sm.list_sync() + except: + return False + props = [] + + if not os.path.exists("/dev/ashmem"): + props.append("sys.use_memfd=true") + egl = tools.helpers.props.host_get(args, "ro.hardware.egl") + dri = tools.helpers.gpu.getDriNode(args) gralloc = find_hal("gralloc") - if gralloc == "": - if os.path.exists("/dev/dri"): + if not gralloc: + if find_hidl("android.hardware.graphics.allocator@4.0::IAllocator/default"): + gralloc = "android" + if not gralloc: + if dri: gralloc = "gbm" egl = "mesa" else: @@ -199,7 +253,9 @@ def make_base_props(args): props.append("ro.vendor.extension_library=" + ext_library) vulkan = find_hal("vulkan") - if vulkan != "": + if not vulkan and dri: + vulkan = tools.helpers.gpu.getVulkanDriver(args, os.path.basename(dri)) + if vulkan: props.append("ro.hardware.vulkan=" + vulkan) treble = tools.helpers.props.host_get(args, "ro.treble.enabled") @@ -213,16 +269,45 @@ def make_base_props(args): opengles = tools.helpers.props.host_get(args, "ro.opengles.version") if opengles == "": - opengles = "196608" + opengles = "196609" props.append("ro.opengles.version=" + opengles) - props.append("waydroid.system_ota=" + args.system_ota) - props.append("waydroid.vendor_ota=" + args.vendor_ota) + if args.images_path not in tools.config.defaults["preinstalled_images_paths"]: + props.append("waydroid.system_ota=" + args.system_ota) + props.append("waydroid.vendor_ota=" + args.vendor_ota) + else: + props.append("waydroid.updater.disabled=true") + props.append("waydroid.tools_version=" + tools.config.version) if args.vendor_type == "MAINLINE": props.append("ro.vndk.lite=true") + for product in ["brand", "device", "manufacturer", "model", "name"]: + prop_product = tools.helpers.props.host_get( + args, "ro.product.vendor." + product) + if prop_product != "": + props.append("ro.product.waydroid." + product + "=" + prop_product) + else: + if os.path.isfile("/proc/device-tree/" + product): + with open("/proc/device-tree/" + product) as f: + f_value = f.read().strip().rstrip('\x00') + if f_value != "": + props.append("ro.product.waydroid." + + product + "=" + f_value) + + prop_fp = tools.helpers.props.host_get(args, "ro.vendor.build.fingerprint") + if prop_fp != "": + props.append("ro.build.fingerprint=" + prop_fp) + + # now append/override with values in [properties] section of waydroid.cfg + cfg = tools.config.load(args) + for k, v in cfg["properties"].items(): + for idx, elem in enumerate(props): + if (k+"=") in elem: + props.pop(idx) + props.append(k+"="+v) + base_props = open(args.work + "/waydroid_base.prop", "w") for prop in props: base_props.write(prop + "\n") @@ -260,13 +345,27 @@ def setup_host_perms(args): def status(args): command = ["lxc-info", "-P", tools.config.defaults["lxc"], "-n", "waydroid", "-sH"] out = subprocess.run(command, stdout=subprocess.PIPE).stdout.decode('utf-8').strip() - os.chmod(args.log, 0o666) return out +def wait_for_running(args): + lxc_status = status(args) + timeout = 10 + while lxc_status != "RUNNING" and timeout > 0: + lxc_status = status(args) + logging.info( + "waiting {} seconds for container to start...".format(timeout)) + timeout = timeout - 1 + time.sleep(1) + if lxc_status != "RUNNING": + raise OSError("container failed to start") + def start(args): command = ["lxc-start", "-P", tools.config.defaults["lxc"], "-F", "-n", "waydroid", "--", "/init"] tools.helpers.run.user(args, command, output="background") + wait_for_running(args) + # Workaround lxc-start changing stdout/stderr permissions to 700 + os.chmod(args.log, 0o666) def stop(args): command = ["lxc-stop", "-P", @@ -283,21 +382,31 @@ def unfreeze(args): tools.helpers.run.user(args, command) def shell(args): - if status(args) != "RUNNING": - logging.error("WayDroid container is {}".format(status(args))) + state = status(args) + if state == "FROZEN": + unfreeze(args) + elif state != "RUNNING": + logging.error("WayDroid container is {}".format(state)) return command = ["lxc-attach", "-P", tools.config.defaults["lxc"], "-n", "waydroid", "--"] if args.COMMAND: - command.append(args.COMMAND) + command.extend(args.COMMAND) else: command.append("/system/bin/sh") subprocess.run(command, env={"PATH": os.environ['PATH'] + ":/system/bin:/vendor/bin"}) + if state == "FROZEN": + freeze(args) def logcat(args): - if status(args) != "RUNNING": - logging.error("WayDroid container is {}".format(status(args))) + state = status(args) + if state == "FROZEN": + unfreeze(args) + elif state != "RUNNING": + logging.error("WayDroid container is {}".format(state)) return command = ["lxc-attach", "-P", tools.config.defaults["lxc"], "-n", "waydroid", "--", "/system/bin/logcat"] subprocess.run(command) + if state == "FROZEN": + freeze(args)