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 79199A00C2; Fri, 1 Jul 2022 09:13:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 47DA240A7B; Fri, 1 Jul 2022 09:13:33 +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 38EF94069D for ; Fri, 1 Jul 2022 09:13:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656659611; 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: in-reply-to:in-reply-to:references:references; bh=De9VMlUuZa+kTvGYGlW2hf6nXT5Zov2wNvfDS7kMilU=; b=SgVHrGWazQAYQr3ffT3n0nMIrDYAVyco8R4WajExR7NIn9jZgN/rbDSB83D/iaP+DbmJuE UwQ1zf1G8nfKGhg5bRCQfTGt7zycOUAtoliD+PSZzLSNY0acHA+uZeaAbSa/V6YDbetemi JfD91Pt0hrVhY5dp3euUAoz6ObOkit0= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-317-ZEgmAEZhO3-IYHdiHfjxgA-1; Fri, 01 Jul 2022 03:13:30 -0400 X-MC-Unique: ZEgmAEZhO3-IYHdiHfjxgA-1 Received: by mail-lf1-f72.google.com with SMTP id bp15-20020a056512158f00b0047f603e5f92so735083lfb.20 for ; Fri, 01 Jul 2022 00:13:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=De9VMlUuZa+kTvGYGlW2hf6nXT5Zov2wNvfDS7kMilU=; b=S87GhjrcB4ai2pueGCejUObdRRVWzQpekj5B2m0tKcHo5/hJvbYP5bMTQnCCtLC1/o vJORtOTEqQY39UJETA2qEdDCzyYTIzrAtegLP32H9gYm/gY45IIL5u6AalVK2XUN3t0w dmV+nGwV2RBUBOKv9rUe1/lOmxslVfkswp6THFK9S3cvO4WOSi57U3Qz62GqVxBSasOA 7PzwjX3SoJJTvNwAA/JtUkB3yKSG4Wi/Ut7M6m5IiiQ58+pJ0c4X7Kwbv7zZsTJCEgTG skVfqDKOFNAQm74SQre5X99u/80E+QVZQdtAwQs1Q2p7/zlUCGMQmUKRJf634/D+dztH k5zw== X-Gm-Message-State: AJIora8JTgfYYJouElubE8HkX/QwOsk968vm0XnRXNC5PPAHzrVmiBwC bCrHTReTakluY6A/9lXnR8cuYaWoQtomJs7abe0m9J1/VJU3wcMC56WXlAfD0x3bkd9xHBz3RSw 44sBjDgQInRY5e6sx8NE= X-Received: by 2002:a2e:9941:0:b0:25b:c885:3143 with SMTP id r1-20020a2e9941000000b0025bc8853143mr7729267ljj.477.1656659608932; Fri, 01 Jul 2022 00:13:28 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vx78W54ONvF7j6F/NseFcAVQtE+HJAdLjXVq3eU6JTDul59jPQSQ0+GGTJI0SGYauUiuaDdnAvduOKqqFQviU= X-Received: by 2002:a2e:9941:0:b0:25b:c885:3143 with SMTP id r1-20020a2e9941000000b0025bc8853143mr7729258ljj.477.1656659608683; Fri, 01 Jul 2022 00:13:28 -0700 (PDT) MIME-Version: 1.0 References: <20220627092728.78214-1-david.marchand@redhat.com> <20220627092728.78214-5-david.marchand@redhat.com> <9bf2e67e-4234-9f5c-5eaf-03be6c2a93e0@redhat.com> In-Reply-To: <9bf2e67e-4234-9f5c-5eaf-03be6c2a93e0@redhat.com> From: David Marchand Date: Fri, 1 Jul 2022 09:13:17 +0200 Message-ID: Subject: Re: [PATCH 4/4] vhost: prefix logs with context To: Maxime Coquelin Cc: dev , "Xia, Chenbo" Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dmarchan@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" 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 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? -- David Marchand