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 34E4545BC0; Thu, 24 Oct 2024 11:44:43 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7027E43404; Thu, 24 Oct 2024 11:44:27 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 8D6D743400 for ; Thu, 24 Oct 2024 11:44:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729763060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VbZ7uP0Wei4ByO720Pa2S63pzcVHb3SAQuoQsADJ+nA=; b=hIF3Nkw3aWk1qjmyqK39QpoajfluWKgteHhWzlFF9KcuwSm8EFbfKw49PgymVosfDmI/wI VqbJogixt15gVnSSwX3mWBqSIj+V5iAK4R4ZTmRmjBjJJ902tbnmiszmtrbA00B8mcqcc7 qTYnkL1oDg//pu+BfoflINbOd05rMaM= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-246-_aeWekv6M1SQ0hC-0-6YPw-1; Thu, 24 Oct 2024 05:44:18 -0400 X-MC-Unique: _aeWekv6M1SQ0hC-0-6YPw-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E89FF1955BC7; Thu, 24 Oct 2024 09:44:17 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.26]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8D5B8300018D; Thu, 24 Oct 2024 09:44:16 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, david.marchand@redhat.com, chenbox@nvidia.com Cc: Maxime Coquelin Subject: [PATCH v3 4/6] vhost: refactor VDUSE reconnection log mapping Date: Thu, 24 Oct 2024 11:44:04 +0200 Message-ID: <20241024094406.3826637-5-maxime.coquelin@redhat.com> In-Reply-To: <20241024094406.3826637-1-maxime.coquelin@redhat.com> References: <20241024094406.3826637-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 This patch moves the VDUSE reconnection log mapping, as well as creation if needed, into a dedicated function. This is a preliminary rework to simplify VDUSE device creation. Signed-off-by: Maxime Coquelin --- lib/vhost/vduse.c | 138 ++++++++++++++++++++++++---------------------- 1 file changed, 73 insertions(+), 65 deletions(-) diff --git a/lib/vhost/vduse.c b/lib/vhost/vduse.c index 346e6795f4..aae20dfc55 100644 --- a/lib/vhost/vduse.c +++ b/lib/vhost/vduse.c @@ -431,6 +431,9 @@ vduse_reconnect_path_init(void) const char *directory; int ret; + if (vduse_reconnect_path_set == true) + return 0; + /* from RuntimeDirectory= see systemd.exec */ directory = getenv("RUNTIME_DIRECTORY"); if (directory == NULL) { @@ -462,9 +465,74 @@ vduse_reconnect_path_init(void) VHOST_CONFIG_LOG("vduse", INFO, "Created VDUSE reconnect directory in %s", vduse_reconnect_dir); + vduse_reconnect_path_set = true; + return 0; } +static int +vduse_reconnect_log_map(const char *dev_name, struct vhost_reconnect_data **reco_log, bool create) +{ + char reco_file[PATH_MAX]; + int fd, ret; + + if (vduse_reconnect_path_init() < 0) { + VHOST_CONFIG_LOG(dev_name, ERR, "Failed to initialize reconnect path"); + return -1; + } + + ret = snprintf(reco_file, sizeof(reco_file), "%s/%s", vduse_reconnect_dir, dev_name); + if (ret < 0 || ret == sizeof(reco_file)) { + VHOST_CONFIG_LOG(dev_name, ERR, "Failed to create vduse reconnect path name"); + return -1; + } + + if (create) { + fd = open(reco_file, O_CREAT | O_EXCL | O_RDWR, 0600); + if (fd < 0) { + if (errno == EEXIST) { + VHOST_CONFIG_LOG(dev_name, ERR, "Reconnect file %s exists but not the device", + reco_file); + } else { + VHOST_CONFIG_LOG(dev_name, ERR, "Failed to open reconnect file %s (%s)", + reco_file, strerror(errno)); + } + return -1; + } + + ret = ftruncate(fd, sizeof(**reco_log)); + if (ret < 0) { + VHOST_CONFIG_LOG(dev_name, ERR, "Failed to truncate reconnect file %s (%s)", + reco_file, strerror(errno)); + goto out_close; + } + } else { + fd = open(reco_file, O_RDWR, 0600); + if (fd < 0) { + if (errno == ENOENT) + VHOST_CONFIG_LOG(dev_name, ERR, "Missing reconnect file (%s)", reco_file); + else + VHOST_CONFIG_LOG(dev_name, ERR, "Failed to open reconnect file %s (%s)", + reco_file, strerror(errno)); + return -1; + } + } + + *reco_log = mmap(NULL, sizeof(**reco_log), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (*reco_log == MAP_FAILED) { + VHOST_CONFIG_LOG(dev_name, ERR, "Failed to mmap reconnect file %s (%s)", + reco_file, strerror(errno)); + ret = -1; + goto out_close; + } + ret = 0; + +out_close: + close(fd); + + return ret; +} + static void vduse_reconnect_handler(int fd, void *arg, int *remove) { @@ -519,14 +587,13 @@ vduse_reconnect_start_device(struct virtio_net *dev) int vduse_device_create(const char *path, bool compliant_ol_flags) { - int control_fd, dev_fd, vid, ret, reco_fd; + int control_fd, dev_fd, vid, ret; uint32_t i, max_queue_pairs, total_queues; struct virtio_net *dev; struct virtio_net_config vnet_config = {{ 0 }}; uint64_t ver = VHOST_VDUSE_API_VERSION; uint64_t features; const char *name = path + strlen("/dev/vduse/"); - char reconnect_file[PATH_MAX]; struct vhost_reconnect_data *reconnect_log = MAP_FAILED; bool reconnect = false; @@ -538,20 +605,6 @@ vduse_device_create(const char *path, bool compliant_ol_flags) } } - if (vduse_reconnect_path_set == false) { - if (vduse_reconnect_path_init() < 0) { - VHOST_CONFIG_LOG(path, ERR, "failed to initialize reconnect path"); - return -1; - } - vduse_reconnect_path_set = true; - } - - ret = snprintf(reconnect_file, sizeof(reconnect_file), "%s/%s", vduse_reconnect_dir, name); - if (ret < 0 || ret == sizeof(reconnect_file)) { - VHOST_CONFIG_LOG(name, ERR, "Failed to create vduse reconnect path name"); - return -1; - } - control_fd = open(VDUSE_CTRL_PATH, O_RDWR); if (control_fd < 0) { VHOST_CONFIG_LOG(name, ERR, "Failed to open %s: %s", @@ -591,27 +644,9 @@ vduse_device_create(const char *path, bool compliant_ol_flags) VHOST_CONFIG_LOG(name, INFO, "Device already exists, reconnecting..."); reconnect = true; - reco_fd = open(reconnect_file, O_RDWR, 0600); - if (reco_fd < 0) { - if (errno == ENOENT) - VHOST_CONFIG_LOG(name, ERR, "Missing reconnect file (%s)", - reconnect_file); - else - VHOST_CONFIG_LOG(name, ERR, "Failed to open reconnect file %s (%s)", - reconnect_file, strerror(errno)); - ret = -1; - goto out_dev_close; - } - - reconnect_log = mmap(NULL, sizeof(*reconnect_log), PROT_READ | PROT_WRITE, - MAP_SHARED, reco_fd, 0); - close(reco_fd); - if (reconnect_log == MAP_FAILED) { - VHOST_CONFIG_LOG(name, ERR, "Failed to mmap reconnect file %s (%s)", - reconnect_file, strerror(errno)); - ret = -1; + ret = vduse_reconnect_log_map(name, &reconnect_log, false); + if (ret < 0) goto out_dev_close; - } if (reconnect_log->version != VHOST_RECONNECT_VERSION) { VHOST_CONFIG_LOG(name, ERR, @@ -637,36 +672,9 @@ vduse_device_create(const char *path, bool compliant_ol_flags) } else if (errno == ENOENT) { struct vduse_dev_config *dev_config; - reco_fd = open(reconnect_file, O_CREAT | O_EXCL | O_RDWR, 0600); - if (reco_fd < 0) { - if (errno == EEXIST) { - VHOST_CONFIG_LOG(name, ERR, "Reconnect file %s exists but not the device", - reconnect_file); - } else { - VHOST_CONFIG_LOG(name, ERR, "Failed to open reconnect file %s (%s)", - reconnect_file, strerror(errno)); - } - ret = -1; - goto out_ctrl_close; - } - - ret = ftruncate(reco_fd, sizeof(*reconnect_log)); - if (ret < 0) { - VHOST_CONFIG_LOG(name, ERR, "Failed to truncate reconnect file %s (%s)", - reconnect_file, strerror(errno)); - close(reco_fd); - goto out_ctrl_close; - } - - reconnect_log = mmap(NULL, sizeof(*reconnect_log), PROT_READ | PROT_WRITE, - MAP_SHARED, reco_fd, 0); - close(reco_fd); - if (reconnect_log == MAP_FAILED) { - VHOST_CONFIG_LOG(name, ERR, "Failed to mmap reconnect file %s (%s)", - reconnect_file, strerror(errno)); - ret = -1; + ret = vduse_reconnect_log_map(name, &reconnect_log, true); + if (ret < 0) goto out_ctrl_close; - } reconnect_log->version = VHOST_RECONNECT_VERSION; -- 2.46.2