Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3039534imu; Sun, 9 Dec 2018 15:48:16 -0800 (PST) X-Google-Smtp-Source: AFSGD/Xf6GwtvHihL0KuTY/7r4EVDR2gjcKP7F/8Uv7dFXeyBuJS9QZmxn2f+gF6i+GaMS8HV7N2 X-Received: by 2002:a17:902:a5c3:: with SMTP id t3mr9942732plq.117.1544399296036; Sun, 09 Dec 2018 15:48:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544399296; cv=none; d=google.com; s=arc-20160816; b=S18L+DgOTHw+JdtFvn+UiXPYY+pwzw4n5dVTgQEILoFrcH6G1lP1tqRQifwuDWvwdn xyskAIWU7P0rOEwjL2C8tQ11sCKod2ty39ZdKsKEl1CT8Mb1ixZQVYLwdsHuWv8HXPXC DjW56TuU52xknkYemwxYTAJHufFW0HhPQIFXMJqjiI/I+zrsAuDCeX6qM+hSF3XxK66w 89kC819oJJbY+bP8MMJ3pr1aXog2uT3cYafr9SVcwFfg4SDXzxfHJ5rx1qjiyUU8GeS2 YilQ47x3DNiDx9g5OWaxMbs4rqpK+A7U3XD6MDDLciq+b9i4BT6x6gndZkFRDI5gYAqh cAYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from; bh=CA9V2XjTB2N8enjl20QTQtAn3a+725gkPOye9CjWpy0=; b=uBfqGfJgUT9jO50rRo8R/sk9MiNeP0VzQQtE3sUTJUICwVA/1lpbtvkO4wLd0W1/KQ h4L40/u+GOSWyPnsHoHpWNY34ly4rbzrVQnDbfWm65SMRyaUR5BIVytyZGup35YKKydZ Y6UPshR4W1XHCGAgb9DiMnbRlf1kf8s9ExE3a7we2T4bmClrSyKDsuQJow+/7U5UJ5UZ BH7iC96fusALQq+u5IExCGzgHTR6txqNE+bcwnhsuRQVjLVxUTSOhURXvJyjR4k+Swrt Pm4X3/XRcBegJgmMQUuSuhRfyiqL0MwKXZ3YgyI0N1Y9t5tIEtI/HmbqFfwDrcbHauFY Ie1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bi2si8447307plb.200.2018.12.09.15.48.01; Sun, 09 Dec 2018 15:48:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726574AbeLIXYz (ORCPT + 99 others); Sun, 9 Dec 2018 18:24:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50494 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726323AbeLIXYz (ORCPT ); Sun, 9 Dec 2018 18:24:55 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 16790368E7; Sun, 9 Dec 2018 23:24:54 +0000 (UTC) Received: from vitty.brq.redhat.com.redhat.com (ovpn-204-21.brq.redhat.com [10.40.204.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 260A25DAA0; Sun, 9 Dec 2018 23:24:51 +0000 (UTC) From: Vitaly Kuznetsov To: Ben Hutchings , linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: akpm@linux-foundation.org, "David S. Miller" , Ross Lagerwall Subject: Re: [PATCH 3.16 047/328] xen-netfront: fix queue name setting In-Reply-To: References: Date: Mon, 10 Dec 2018 00:24:53 +0100 Message-ID: <87y38ycmgq.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Sun, 09 Dec 2018 23:24:55 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ben Hutchings writes: > 3.16.62-rc1 review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Vitaly Kuznetsov > > commit 2d408c0d4574b01b9ed45e02516888bf925e11a9 upstream. > > Commit f599c64fdf7d ("xen-netfront: Fix race between device setup and > open") changed the initialization order: xennet_create_queues() now > happens before we do register_netdev() so using netdev->name in > xennet_init_queue() is incorrect, we end up with the following in > /proc/interrupts: > > 60: 139 0 xen-dyn -event eth%d-q0-tx > 61: 265 0 xen-dyn -event eth%d-q0-rx > 62: 234 0 xen-dyn -event eth%d-q1-tx > 63: 1 0 xen-dyn -event eth%d-q1-rx > > and this looks ugly. Actually, using early netdev name (even when it's > already set) is also not ideal: nowadays we tend to rename eth devices > and queue name may end up not corresponding to the netdev name. > > Use nodename from xenbus device for queue naming: this can't change in VM's > lifetime. Now /proc/interrupts looks like > > 62: 202 0 xen-dyn -event device/vif/0-q0-tx > 63: 317 0 xen-dyn -event device/vif/0-q0-rx > 64: 262 0 xen-dyn -event device/vif/0-q1-tx > 65: 17 0 xen-dyn -event device/vif/0-q1-rx > > Fixes: f599c64fdf7d ("xen-netfront: Fix race between device setup and open") > Signed-off-by: Vitaly Kuznetsov > Reviewed-by: Ross Lagerwall > Signed-off-by: David S. Miller > Signed-off-by: Ben Hutchings > --- > drivers/net/xen-netfront.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- a/drivers/net/xen-netfront.c > +++ b/drivers/net/xen-netfront.c > @@ -1646,7 +1646,7 @@ static int xennet_init_queue(struct netf > queue->rx_refill_timer.function = rx_refill_timeout; > > snprintf(queue->name, sizeof(queue->name), "%s-q%u", > - queue->info->netdev->name, queue->id); > + queue->info->xbdev->nodename, queue->id); > > /* Initialise tx_skbs as a free chain containing every entry. */ > queue->tx_skb_freelist = 0; > We should also take commit 21f2706b20100bb3db378461ab9b8e2035309b5b Author: Xiao Liang Date: Tue Aug 14 23:21:28 2018 +0800 xen-netfront: fix warn message as irq device name has '/' as it fixes an issue introduced by the commit in question. Sorry if this is already in your series but I wasn't CCed on it. -- Vitaly