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 F2AAD45BB5; Wed, 23 Oct 2024 21:04:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7E20E42ECD; Wed, 23 Oct 2024 21:04:50 +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 42F90406BC for ; Wed, 23 Oct 2024 21:04:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729710288; 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:autocrypt:autocrypt; bh=j+HUeU1jLqd+A1YmuyxANLkETP/Wwc8qgntn8xQsXjc=; b=EQAj3O5MUecH8e8xuEPmigKepeUWYDdFHUlWJNVudRMsev1RAR6wwxAROgRHNXX5cki0cm sTnritq6D60YW/RE0GU0fYzqBACChxSoIJcbbJcANzNPlXS0rASLjlA+cgsQgkIN4V/gLe Hdo1fOkuHwkiYU0aM6uUuRFQOqKbb3Q= Received: from mx-prod-mc-04.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-530-qHMLYZXoOziNDuG1225dhg-1; Wed, 23 Oct 2024 15:04:46 -0400 X-MC-Unique: qHMLYZXoOziNDuG1225dhg-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A04B919560BC; Wed, 23 Oct 2024 19:04:45 +0000 (UTC) Received: from [10.39.208.26] (unknown [10.39.208.26]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 658AA19560A2; Wed, 23 Oct 2024 19:04:43 +0000 (UTC) Message-ID: <712b60db-8cc8-4aee-b869-550e264959c6@redhat.com> Date: Wed, 23 Oct 2024 21:04:41 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 4/6] vhost: refactor VDUSE reconnection log mapping To: David Marchand Cc: dev@dpdk.org, chenbox@nvidia.com References: <20241023151552.2863387-1-maxime.coquelin@redhat.com> <20241023151552.2863387-5-maxime.coquelin@redhat.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= In-Reply-To: X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed 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 On 10/23/24 18:07, David Marchand wrote: > On Wed, Oct 23, 2024 at 5:16 PM Maxime Coquelin > wrote: >> >> 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, 75 insertions(+), 63 deletions(-) >> >> diff --git a/lib/vhost/vduse.c b/lib/vhost/vduse.c >> index c8c4761293..985d4cc58d 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) > > You can pass struct virtio_net *dev instead of patch 6. At patch 4, the struct virtio_net *dev has not yet been allocated when this function is called. Or, maybe you mean I should squash patch 6 with this one? > > >> +{ >> + 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; > > Weird indent. Fixed. > >> + } >> + >> + 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,7 +587,7 @@ 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 }}; >> @@ -527,7 +595,6 @@ vduse_device_create(const char *path, bool compliant_ol_flags) >> uint64_t features; >> struct vduse_dev_config *dev_config = NULL; >> const char *name = path + strlen("/dev/vduse/"); >> - char reconnect_file[PATH_MAX]; >> struct vhost_reconnect_data *reconnect_log = MAP_FAILED; >> bool reconnect = false; >> >> @@ -539,20 +606,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", >> @@ -592,26 +645,10 @@ 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; >> - goto out_dev_close; >> + ret = vduse_reconnect_log_map(name, &reconnect_log, false); >> + if (ret < 0) { >> + VHOST_CONFIG_LOG(name, ERR, "Failed to map reconnect log file"); > > No additional log, all error cases are covered, afaics. Ack. > > >> + goto out_ctrl_close; and it should be out_dev_close here, will change in v2. Thanks, Maxime >> } >> >> if (reconnect_log->version != VHOST_RECONNECT_VERSION) { > >