From patchwork Sat Dec 5 07:56:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianguo Wu X-Patchwork-Id: 1411391 Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.a=rsa-sha256 header.s=s110527 header.b=GllMevoh; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Cp3BP39sjz9sWj for ; Sat, 5 Dec 2020 19:48:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727430AbgLEIqr (ORCPT ); Sat, 5 Dec 2020 03:46:47 -0500 Received: from m12-12.163.com ([220.181.12.12]:53680 "EHLO m12-12.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726012AbgLEIp6 (ORCPT ); Sat, 5 Dec 2020 03:45:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Message-ID:Date:MIME-Version; bh=lo0fQ H/9l/nq7ES+mbfSWt9riSontKVcAaw594W7Qtc=; b=GllMevohO5vBMvmnoD30N z0la5JuURXuSq7Q6DOQOBXUq/NoOe/Lib6LSnOyYWsrRm86WwzkItiGjTMrhar1Z Lw03YSpfMcocxdr0FivUYkQtNej/yLJ3e85fG5jtT+gjnT9Ga4oMsX1+AlTANSUO pnst0TPCDdej6BCcz+bMh4= Received: from [10.8.0.186] (unknown [36.111.140.26]) by smtp8 (Coremail) with SMTP id DMCowAAHBfoxPctfGZvdFQ--.24759S2; Sat, 05 Dec 2020 15:56:35 +0800 (CST) From: Jianguo Wu Subject: [PATCH net v2] mptcp: print new line in mptcp_seq_show() if mptcp isn't in use To: Jakub Kicinski , Florian Westphal Cc: netdev@vger.kernel.org, mathew.j.martineau@linux.intel.com, pabeni@redhat.com, davem@davemloft.net Message-ID: <142e2fd9-58d9-bb13-fb75-951cccc2331e@163.com> Date: Sat, 5 Dec 2020 15:56:33 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.5.1 MIME-Version: 1.0 X-CM-TRANSID: DMCowAAHBfoxPctfGZvdFQ--.24759S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7Wr1rXw4DGw4DWF17Cw13XFb_yoWDtFg_Ga 9rXr97Kw45Xr1UGrs8GF4rJFyFkrWak3saqFn7tay3GwnxJ3W29ry09wn3Gr18Gws0vF98 ur40yrsFvr1IkjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU5Q18PUUUUU== X-Originating-IP: [36.111.140.26] X-CM-SenderInfo: 5zxmxt5qjx0iiqw6il2tof0z/xtbBSRPxkFaD86nNzgAAs3 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jianguo Wu When do cat /proc/net/netstat, the output isn't append with a new line, it looks like this: [root@localhost ~]# cat /proc/net/netstat ... MPTcpExt: 0 0 0 0 0 0 0 0 0 0 0 0 0[root@localhost ~]# This is because in mptcp_seq_show(), if mptcp isn't in use, net->mib.mptcp_statistics is NULL, so it just puts all 0 after "MPTcpExt:", and return, forgot the '\n'. After this patch: [root@localhost ~]# cat /proc/net/netstat ... MPTcpExt: 0 0 0 0 0 0 0 0 0 0 0 0 0 [root@localhost ~]# Fixes: fc518953bc9c8d7d ("mptcp: add and use MIB counter infrastructure") Signed-off-by: Jianguo Wu Acked-by: Florian Westphal --- net/mptcp/mib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index 84d1194..b921cbd 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -67,6 +67,7 @@ void mptcp_seq_show(struct seq_file *seq) for (i = 0; mptcp_snmp_list[i].name; i++) seq_puts(seq, " 0"); + seq_putc(seq, '\n'); return; }