From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E88A9A034F; Wed, 9 Feb 2022 07:54:19 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 99A7E41155; Wed, 9 Feb 2022 07:54:10 +0100 (CET) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mails.dpdk.org (Postfix) with ESMTP id 9D31041144 for ; Wed, 9 Feb 2022 07:54:09 +0100 (CET) Received: by mail-pl1-f174.google.com with SMTP id x4so1431597plb.4 for ; Tue, 08 Feb 2022 22:54:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UzrRtEHu8eVrP6oM3+9bkaCXgtYt+orUvvwiveWvEoE=; b=ykmTRyM4rxPb5FK61Xg0k9UbcqQiWlEJbkpSeNCXmgZ2hn3NRUI3wBnMHlXZikcQFu KE7cG90Pf/mrZLT8TdoLyJhjHIg1rgxm/7th0RMZjoE3z7ZvBuBJeY9vOc5kQLdmrv5V zJT9jXZBJjlMoMMBIADxJEjwrOB/umN9fuMo1RJcUOE8tsE37jPgRJug5Hx9vKDYx4Vt /xFvL6u6ywuU1k2TZDNNumtyjZ6sj/xlnNTjbPgP47NR7RZ4r00cY6VE3I4mpjqvRcTn B/dSqI+XleVSfdzu95ZPL5hcxz5Alad/sDNC7X270NBXqSy3JZ/CLH9PImYGwHqlU+AY gTeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UzrRtEHu8eVrP6oM3+9bkaCXgtYt+orUvvwiveWvEoE=; b=2NhzdJIZItlBFD/Zrhh1lotz7pOsb/dJeEc1r7PfvoDXNBy/Mhtqhx8qQBkaRVg3BI nhRQRZCP6U/mCiwrkxISDAnKIIALk1pazGYlNm2XQAF6zchjwfyW75N8Q6yaSryKFE5V uTu/yZgvlKBmImBvoSWWnF/YpJjeJHA73Q/oQVda+TGrVMqVSWNbNppUoU62vztryjg/ V47mvEsTCRCQDrYMCFG2h/ccFeG48m98DXYs6C/Xa/E9ym6vAFhJgQ/MCZYTZ+ntN0WZ 2LXCpr8i/cdMCgfUqmQVB26wSJx/PQOzVTukk33F4wr4ZB0PG5ubeEGOPg+dwLYibYEr OeNg== X-Gm-Message-State: AOAM533pskaszifEUANWfmrbIO533JqRtl7e9OcvtRw+krElufT9eRTC 02BaIo2G2TMY4qcHSpKXQvVWeLzWJve322ms X-Google-Smtp-Source: ABdhPJzniF8GfwRTdL+6TYUSZY5LbbMcKnlcqHHgGyumN9V2C4lySr6040mmC4pfrMKViAJELSo6Bg== X-Received: by 2002:a17:90b:1d0d:: with SMTP id on13mr1840497pjb.171.1644389648461; Tue, 08 Feb 2022 22:54:08 -0800 (PST) Received: from hermes.local (204-195-112-199.wavecable.com. [204.195.112.199]) by smtp.gmail.com with ESMTPSA id oa5sm5208892pjb.0.2022.02.08.22.54.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 22:54:07 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Bruce Richardson , =?UTF-8?q?Morten=20Br=C3=B8rup?= Subject: [PATCH v3 2/3] eal: support systemd service convention for runtime directory Date: Tue, 8 Feb 2022 22:54:02 -0800 Message-Id: <20220209065403.168475-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220209065403.168475-1-stephen@networkplumber.org> References: <20211223233907.181033-1-stephen@networkplumber.org> <20220209065403.168475-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Systemd.exec supports configuring the runtime directory of a service via RuntimeDirectory=. This creates the directory with the necessary permissions which actual service may not have if running in container. The change to DPDK is to look for the environment RUNTIME_DIRECTORY first and use that in preference to the fallback alternatives. Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson Reviewed-by: Morten Brørup --- lib/eal/linux/eal.c | 23 +++++++++++++---------- usertools/dpdk-telemetry.py | 10 +++++++--- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index e37372ac7305..e9764f6c9f37 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -86,25 +86,28 @@ struct lcore_config lcore_config[RTE_MAX_LCORE]; /* used by rte_rdtsc() */ int rte_cycles_vmware_tsc_map; -static const char *default_runtime_dir = "/var/run"; - int eal_create_runtime_dir(void) { - const char *directory = default_runtime_dir; - const char *xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"); - const char *fallback = "/tmp"; + const char *directory; char run_dir[PATH_MAX]; char tmp[PATH_MAX]; int ret; - if (getuid() != 0) { - /* try XDG path first, fall back to /tmp */ - if (xdg_runtime_dir != NULL) - directory = xdg_runtime_dir; + /* from RuntimeDirectory= see systemd.exec */ + directory = getenv("RUNTIME_DIRECTORY"); + if (directory == NULL) { + /* + * Used standard convention defined in + * XDG Base Directory Specification and + * Filesystem Hierarchy Standard. + */ + if (getuid() == 0) + directory = "/var/run"; else - directory = fallback; + directory = getenv("XDG_RUNTIME_DIR") ? : "/tmp"; } + /* create DPDK subdirectory under runtime dir */ ret = snprintf(tmp, sizeof(tmp), "%s/dpdk", directory); if (ret < 0 || ret == sizeof(tmp)) { diff --git a/usertools/dpdk-telemetry.py b/usertools/dpdk-telemetry.py index 5b3bf83356c3..a81868a54789 100755 --- a/usertools/dpdk-telemetry.py +++ b/usertools/dpdk-telemetry.py @@ -75,9 +75,13 @@ def print_socket_options(prefix, paths): def get_dpdk_runtime_dir(fp): """ Using the same logic as in DPDK's EAL, get the DPDK runtime directory based on the file-prefix and user """ - if (os.getuid() == 0): - return os.path.join('/var/run/dpdk', fp) - return os.path.join(os.environ.get('XDG_RUNTIME_DIR', '/tmp'), 'dpdk', fp) + run_dir = os.environ.get('RUNTIME_DIRECTORY') + if not run_dir: + if (os.getuid() == 0): + run_dir = '/var/run' + else: + run_dir = os.environ.get('XDG_RUNTIME_DIR', '/tmp') + return os.path.join(run_dir, 'dpdk', fp) def list_fp(): -- 2.34.1