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 D7C57A00C2; Fri, 1 Jul 2022 09:56:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 78F664069D; Fri, 1 Jul 2022 09:56:37 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 6287240150 for ; Fri, 1 Jul 2022 09:56:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656662195; 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=k5TWR2A87PTm/bYr+8m4fagObFnXsdkosanWXwJ8M/A=; b=aFG/Jy20XVq5cEERFgEU1TjHUuhlVBxwsyaw5BHi1csLMlFYYat87lfpfrP1KJNuSA7+I0 +vJ0VARjhgWAfRWLXp5TmfGgA5tV8QiNA1Un1nCYTINqrCEZiD/lNSTKxQVC+h0Ulhq4kd v2MhfmaSGfz118mQvcbS4o8qHTzfkpM= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-373-o7qYs5eMOti8XFeN6-gspw-1; Fri, 01 Jul 2022 03:56:32 -0400 X-MC-Unique: o7qYs5eMOti8XFeN6-gspw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9EC572919ED6; Fri, 1 Jul 2022 07:56:32 +0000 (UTC) Received: from [10.39.208.30] (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 085A140EC002; Fri, 1 Jul 2022 07:56:31 +0000 (UTC) Message-ID: Date: Fri, 1 Jul 2022 09:56:30 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: Re: [PATCH 4/4] vhost: prefix logs with context To: David Marchand Cc: dev , "Xia, Chenbo" References: <20220627092728.78214-1-david.marchand@redhat.com> <20220627092728.78214-5-david.marchand@redhat.com> <9bf2e67e-4234-9f5c-5eaf-03be6c2a93e0@redhat.com> From: Maxime Coquelin In-Reply-To: X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com 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: 7bit 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 7/1/22 09:13, David Marchand wrote: > On Thu, Jun 30, 2022 at 6:13 PM Maxime Coquelin > wrote: >> On 6/27/22 11:27, David Marchand wrote: >>> We recently improved the log messages in the vhost library, adding some >>> context that helps filtering for a given vhost-user device. >>> However, some parts of the code were missed, and some later code changes >>> broke this new convention (fixes were sent previous to this patch). >>> >>> Change the VHOST_LOG_CONFIG/DATA helpers and always ask for a string >>> used as context. This should help limit regressions on this topic. >>> >>> Most of the time, the context is the vhost-user device socket path. >>> For the rest when a vhost-user device can not be related, generic >>> names were chosen: >>> - "dma", for vhost-user async DMA operations, >>> - "device", for vhost-user device creation and lookup, >>> - "thread", for threads management, >>> >>> Signed-off-by: David Marchand >>> --- >>> lib/vhost/iotlb.c | 30 +- >>> lib/vhost/socket.c | 129 ++++----- >>> lib/vhost/vdpa.c | 4 +- >>> lib/vhost/vhost.c | 144 ++++----- >>> lib/vhost/vhost.h | 20 +- >>> lib/vhost/vhost_user.c | 642 +++++++++++++++++++++-------------------- >>> lib/vhost/virtio_net.c | 258 +++++++++-------- >>> 7 files changed, 634 insertions(+), 593 deletions(-) >>> >> >>> diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h >>> index 810bc71c9d..310aaf88ff 100644 >>> --- a/lib/vhost/vhost.h >>> +++ b/lib/vhost/vhost.h >>> @@ -625,14 +625,14 @@ vhost_log_write_iova(struct virtio_net *dev, struct vhost_virtqueue *vq, >>> extern int vhost_config_log_level; >>> extern int vhost_data_log_level; >>> >>> -#define VHOST_LOG_CONFIG(level, fmt, args...) \ >>> +#define VHOST_LOG_CONFIG(prefix, level, fmt, args...) \ >>> rte_log(RTE_LOG_ ## level, vhost_config_log_level, \ >>> - "VHOST_CONFIG: " fmt, ##args) >>> + "VHOST_CONFIG: (%s): " fmt, prefix, ##args) >>> >>> -#define VHOST_LOG_DATA(level, fmt, args...) \ >>> +#define VHOST_LOG_DATA(prefix, level, fmt, args...) \ >>> (void)((RTE_LOG_ ## level <= RTE_LOG_DP_LEVEL) ? \ >>> rte_log(RTE_LOG_ ## level, vhost_data_log_level, \ >>> - "VHOST_DATA : " fmt, ##args) : \ >>> + "VHOST_DATA: (%s):" fmt, prefix, ##args) : \ >>> 0) >> >> As discussed off-list, adding the function will break OVS tests once >> again. I propose to pick the first 3 patches for now. > > The issue with OVS tests is that they match the log message content, > and this current patch changes the format. > > For example, before we have: > VHOST_CONFIG: (vhost0.sock) vhost-user server: socket created, fd: 57 > VHOST_CONFIG: (vhost0.sock) binding succeeded > After: > VHOST_CONFIG: (vhost0.sock): vhost-user server: socket created, fd: 56 > VHOST_CONFIG: (vhost0.sock): binding succeeded > > I can respin, removing the extra ':' in VHOST_* macros. > WDYT? Sounds good! Thanks, Maxime