From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41C4EECE561 for ; Mon, 24 Sep 2018 14:51:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EA3ED2087A for ; Mon, 24 Sep 2018 14:51:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=microsoft.com header.i=@microsoft.com header.b="Iam/WJKD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EA3ED2087A Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=microsoft.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388842AbeIXUxi (ORCPT ); Mon, 24 Sep 2018 16:53:38 -0400 Received: from mail-eopbgr720135.outbound.protection.outlook.com ([40.107.72.135]:34196 "EHLO NAM05-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731416AbeIXUxh (ORCPT ); Mon, 24 Sep 2018 16:53:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xLX7/gNiSG52HARcjq6yGsSkS0BTWqCzXyNVmyDVHqI=; b=Iam/WJKDSwHiG3kokzb8c3XRUwPVpTZiEJUaIPTkLWzoOuwztAFUSrv9DLhQMsaYKl4/VbjEFcU/aYEXrwS2qdh1nd1NLA/qvyv9Hm20wGaIjEvBsZZ+DYnd7EaZ7ounE12QAuwa8Lsc2pVlRgTero1rgWFxdUvSOK4ru2x8HLg= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0821.namprd21.prod.outlook.com (10.173.192.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.3; Mon, 24 Sep 2018 14:51:03 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::54e2:88e0:b622:b36]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::54e2:88e0:b622:b36%5]) with mapi id 15.20.1207.003; Mon, 24 Sep 2018 14:51:03 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Emmanuel Grumbach , Luca Coelho , Johannes Berg , Sasha Levin Subject: [PATCH AUTOSEL 4.9 21/23] mac80211: shorten the IBSS debug messages Thread-Topic: [PATCH AUTOSEL 4.9 21/23] mac80211: shorten the IBSS debug messages Thread-Index: AQHUVBXPy5oU2g4w/0WHIYjqu88OzA== Date: Mon, 24 Sep 2018 14:49:35 +0000 Message-ID: <20180924144919.164617-21-alexander.levin@microsoft.com> References: <20180924144919.164617-1-alexander.levin@microsoft.com> In-Reply-To: <20180924144919.164617-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;CY4PR21MB0821;6:DcYzLYNkhoABn/ZENe5V1Pq3REnW/c0k/5CI+m3mMz+ssLCM7NUIRDrxuEszTxwTnJcqulVxt8abv5YECgSh3p3N4AGfz34IvTjfNtH79iRalJ/b9ALSRRgLhvATBwRorl0A2D/AUL54tIA+XZMoTCkaqjSzwSRgEXrlGfLYxfSK+E6Bdiqbu0SM/1ulbwJYs5TwkzF+BPPw7mHGuNedyx1ntSiiTDGyI7YXkFJcXYioJ3c4ZL6iPcVwZygNLymtq/SDBHHDQa4RBIaDfWnZd9lYicOfOQDSePp/LIFeui8N3EsGTM0ETT868LujwLgbFK5qIPFsx2Zn4tnZejxKzB+B/VGuT0U5yYQ3Ba730yai+B3yw23ClUaKHJ4EJM9Y0dha3FaJ8CTL1HNkWSZIzf6OABRDKTnRIw7+sy6SaqxsCjwFJoVFNtCxKB5DEGfnUrDZTvPa3YK1iIzcYy09SA==;5:4ZenPNh/dmyQkgjUD87MUhpAbwueRdMuVhqEKoBDNG+UHpPbE7RLHfCtj3K6kD2O9D0RHy6ty8nWyfv8iM2qSMLlnFrhy1nbsiMnAvY2paiad/4Iw0ntvVfyxyRZU/fk9I09NiIUVCX/iFibBDJ4v3YhdKLNwO5sDh9zwkzGSF4=;7:zHxdjM1XoEan//xG5szXUxX7sA2Aiky4do6OKBMiovpBVth9vDkk1TjaqR0nEugfX2lpvQtcZRAA0ke+xUh4/qr/rME28Ij2Jo0kKEr1uRU/81dJd3cohMImvCKiyCL4hpQz93kSMkwObykheHcW6yDdso6EeilF/z5+eOQen9OQvrzznwjHB6HIZvKLLcY8VeRL7iG0f+Oc3BnmbkXmP5so/2W5ZV8VcriImUC0Amvso8uH5DBgi8HQs966lW3Q x-ms-office365-filtering-correlation-id: d5566053-459c-4515-938b-08d6222d2683 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7193020);SRVR:CY4PR21MB0821; x-ms-traffictypediagnostic: CY4PR21MB0821: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(228905959029699)(28532068793085)(89211679590171); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231355)(944501410)(52105095)(2018427008)(6055026)(149066)(150027)(6041310)(20161123562045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699051)(76991041);SRVR:CY4PR21MB0821;BCL:0;PCL:0;RULEID:;SRVR:CY4PR21MB0821; x-forefront-prvs: 0805EC9467 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(346002)(376002)(136003)(396003)(366004)(199004)(189003)(51234002)(102836004)(5660300001)(53936002)(551934003)(6512007)(6436002)(256004)(14444005)(217873002)(6666003)(6486002)(2501003)(15650500001)(10090500001)(2906002)(68736007)(5250100002)(97736004)(107886003)(66066001)(36756003)(4326008)(25786009)(1076002)(3846002)(6116002)(2900100001)(8936002)(81166006)(81156014)(8676002)(86612001)(86362001)(7736002)(305945005)(72206003)(186003)(26005)(10290500003)(6506007)(6346003)(478600001)(14454004)(110136005)(2616005)(446003)(11346002)(476003)(76176011)(486006)(54906003)(99286004)(105586002)(106356001)(71190400001)(71200400001)(22452003)(316002);DIR:OUT;SFP:1102;SCL:1;SRVR:CY4PR21MB0821;H:CY4PR21MB0776.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: bc5F0s4Sc1DS8c5KVJS9TME6PltNiY0+6rDvHB9OKvoRVQbtt9muRmC7laPx5To8wUk42ZtiyaziStgdExtBMl7vhStCjUpiyEMeadgQeTTCJjyK99ayITfhkJJ3fLcDB66g5EMV7dwRxJnVwpBODhhNtxmvOEQePp99nAkrvPeVNOyN7xzdCJnyei+hDvZzF8NwFBX62NWhOjyfB2hzoQnmVG+N/6Mq0jLPY2KKl+Ye4jz1lhb+lWXL0L8G7+n7y3VYVJZDejXu0psOICUDLGjJd6Cx2A0fcLKt8pMR/m2cusTBqbleuX6LDZsdZ/azTYI3WeyNtMmcrLD9H0EFuyzLg9CR/OI6Gx96avmqLU8= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: d5566053-459c-4515-938b-08d6222d2683 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Sep 2018 14:49:35.6500 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0821 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Emmanuel Grumbach [ Upstream commit c6e57b3896fc76299913b8cfd82d853bee8a2c84 ] When tracing is enabled, all the debug messages are recorded and must not exceed MAX_MSG_LEN (100) columns. Longer debug messages grant the user with: WARNING: CPU: 3 PID: 32642 at /tmp/wifi-core-20180806094828/src/iwlwifi-sta= ck-dev/net/mac80211/./trace_msg.h:32 trace_event_raw_event_mac80211_msg_eve= nt+0xab/0xc0 [mac80211] Workqueue: phy1 ieee80211_iface_work [mac80211] RIP: 0010:trace_event_raw_event_mac80211_msg_event+0xab/0xc0 [mac80211] Call Trace: __sdata_dbg+0xbd/0x120 [mac80211] ieee80211_ibss_rx_queued_mgmt+0x15f/0x510 [mac80211] ieee80211_iface_work+0x21d/0x320 [mac80211] Signed-off-by: Emmanuel Grumbach Signed-off-by: Luca Coelho Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/ibss.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index a5acaf1efaab..0c0695eb2609 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -948,8 +948,8 @@ static void ieee80211_rx_mgmt_deauth_ibss(struct ieee80= 211_sub_if_data *sdata, if (len < IEEE80211_DEAUTH_FRAME_LEN) return; =20 - ibss_dbg(sdata, "RX DeAuth SA=3D%pM DA=3D%pM BSSID=3D%pM (reason: %d)\n", - mgmt->sa, mgmt->da, mgmt->bssid, reason); + ibss_dbg(sdata, "RX DeAuth SA=3D%pM DA=3D%pM\n", mgmt->sa, mgmt->da); + ibss_dbg(sdata, "\tBSSID=3D%pM (reason: %d)\n", mgmt->bssid, reason); sta_info_destroy_addr(sdata, mgmt->sa); } =20 @@ -967,9 +967,9 @@ static void ieee80211_rx_mgmt_auth_ibss(struct ieee8021= 1_sub_if_data *sdata, auth_alg =3D le16_to_cpu(mgmt->u.auth.auth_alg); auth_transaction =3D le16_to_cpu(mgmt->u.auth.auth_transaction); =20 - ibss_dbg(sdata, - "RX Auth SA=3D%pM DA=3D%pM BSSID=3D%pM (auth_transaction=3D%d)\n", - mgmt->sa, mgmt->da, mgmt->bssid, auth_transaction); + ibss_dbg(sdata, "RX Auth SA=3D%pM DA=3D%pM\n", mgmt->sa, mgmt->da); + ibss_dbg(sdata, "\tBSSID=3D%pM (auth_transaction=3D%d)\n", + mgmt->bssid, auth_transaction); =20 if (auth_alg !=3D WLAN_AUTH_OPEN || auth_transaction !=3D 1) return; @@ -1176,10 +1176,10 @@ static void ieee80211_rx_bss_info(struct ieee80211_= sub_if_data *sdata, rx_timestamp =3D drv_get_tsf(local, sdata); } =20 - ibss_dbg(sdata, - "RX beacon SA=3D%pM BSSID=3D%pM TSF=3D0x%llx BCN=3D0x%llx diff=3D%lld @= %lu\n", + ibss_dbg(sdata, "RX beacon SA=3D%pM BSSID=3D%pM TSF=3D0x%llx\n", mgmt->sa, mgmt->bssid, - (unsigned long long)rx_timestamp, + (unsigned long long)rx_timestamp); + ibss_dbg(sdata, "\tBCN=3D0x%llx diff=3D%lld @%lu\n", (unsigned long long)beacon_timestamp, (unsigned long long)(rx_timestamp - beacon_timestamp), jiffies); @@ -1538,9 +1538,9 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80= 211_sub_if_data *sdata, =20 tx_last_beacon =3D drv_tx_last_beacon(local); =20 - ibss_dbg(sdata, - "RX ProbeReq SA=3D%pM DA=3D%pM BSSID=3D%pM (tx_last_beacon=3D%d)\n", - mgmt->sa, mgmt->da, mgmt->bssid, tx_last_beacon); + ibss_dbg(sdata, "RX ProbeReq SA=3D%pM DA=3D%pM\n", mgmt->sa, mgmt->da); + ibss_dbg(sdata, "\tBSSID=3D%pM (tx_last_beacon=3D%d)\n", + mgmt->bssid, tx_last_beacon); =20 if (!tx_last_beacon && is_multicast_ether_addr(mgmt->da)) return; --=20 2.17.1