From mboxrd@z Thu Jan 1 00:00:00 1970 From: andriy.shevchenko@linux.intel.com (Andy Shevchenko) Date: Tue, 21 Jun 2016 13:32:58 +0300 Subject: [PATCH net-next 10/19] net: hns: bugfix about pfc pause frame statistics In-Reply-To: <1466481399-70080-11-git-send-email-Yisen.Zhuang@huawei.com> References: <1466481399-70080-1-git-send-email-Yisen.Zhuang@huawei.com> <1466481399-70080-11-git-send-email-Yisen.Zhuang@huawei.com> Message-ID: <1466505178.30123.201.camel@linux.intel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, 2016-06-21 at 11:56 +0800, Yisen Zhuang wrote: > From: Daode Huang > > For SoC hip06, PFC pause handled in dsaf, while hip05 in XGMAC, > so change the statistics of pfc pause in dsaf and remove the old > pfc pause frame statistics. > > +static char *hns_dsaf_get_node_stats_strings(char *data, int node, > + ?????struct dsaf_device > *dsaf_dev) > ?{ > ? char *buff = data; > + int i; > + bool is_ver1 = AE_IS_VER1(dsaf_dev->dsaf_ver); > ? > ? snprintf(buff, ETH_GSTRING_LEN, "innod%d_pad_drop_pkts", > node); > ? buff = buff + ETH_GSTRING_LEN; > @@ -2502,6 +2530,18 @@ static char > *hns_dsaf_get_node_stats_strings(char *data, int node) > ? buff = buff + ETH_GSTRING_LEN; > ? snprintf(buff, ETH_GSTRING_LEN, "innod%d_stp_drop_pkts", > node); > ? buff = buff + ETH_GSTRING_LEN; > + if ((node < DSAF_SERVICE_NW_NUM) && (!is_ver1)) { Redundant parens. > + for (i = 0; i < DSAF_PRIO_NR; i++) { > + snprintf(buff, ETH_GSTRING_LEN, > + ?"inod%d_pfc_prio%d_pkts", node, i); > + buff = buff + ETH_GSTRING_LEN; buff += ... > + } > + for (i = 0; i < DSAF_PRIO_NR; i++) { > + snprintf(buff, ETH_GSTRING_LEN, > + ?"onod%d_pfc_prio%d_pkts", node, i); > + buff = buff + ETH_GSTRING_LEN; Ditto. > ?{ > ? u64 *p = data; > + int i; > ? struct dsaf_hw_stats *hw_stats = &ddev->hw_stats[node_num]; > + bool is_ver1 = AE_IS_VER1(ddev->dsaf_ver); > ? > ? p[0] = hw_stats->pad_drop; > ? p[1] = hw_stats->man_pkts; > @@ -2527,8 +2569,16 @@ static u64 *hns_dsaf_get_node_stats(struct > dsaf_device *ddev, u64 *data, > ? p[10] = hw_stats->local_addr_false; > ? p[11] = hw_stats->vlan_drop; > ? p[12] = hw_stats->stp_drop; > - p[13] = hw_stats->tx_pkts; > + if ((node_num < DSAF_SERVICE_NW_NUM) && (!is_ver1)) { > + for (i = 0; i < DSAF_PRIO_NR; i++) { > + p[13 + i] = hw_stats->rx_pfc[i]; > + p[13 + i + DSAF_PRIO_NR] = hw_stats- > >tx_pfc[i]; > + } Two different approaches how to assign data. Above uses 2 for-loops, here you put everything to one. > + p[29] = hw_stats->tx_pkts; > + return &p[30]; > + } > ? > + p[13] = hw_stats->tx_pkts; > ? return &p[14]; > ?} -- Andy Shevchenko Intel Finland Oy From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751821AbcFUKkS (ORCPT ); Tue, 21 Jun 2016 06:40:18 -0400 Received: from mga14.intel.com ([192.55.52.115]:61609 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751545AbcFUKkO (ORCPT ); Tue, 21 Jun 2016 06:40:14 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,503,1459839600"; d="scan'208";a="1006569106" Message-ID: <1466505178.30123.201.camel@linux.intel.com> Subject: Re: [PATCH net-next 10/19] net: hns: bugfix about pfc pause frame statistics From: Andy Shevchenko To: Yisen Zhuang , davem@davemloft.net, salil.mehta@huawei.com, yankejian@huawei.com Cc: liguozhu@huawei.com, huangdaode@hisilicon.com, arnd@arndb.de, andrew@lunn.ch, geliangtang@163.com, ivecera@redhat.com, fengguang.wu@intel.com, charles.chenxin@huawei.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxarm@huawei.com Date: Tue, 21 Jun 2016 13:32:58 +0300 In-Reply-To: <1466481399-70080-11-git-send-email-Yisen.Zhuang@huawei.com> References: <1466481399-70080-1-git-send-email-Yisen.Zhuang@huawei.com> <1466481399-70080-11-git-send-email-Yisen.Zhuang@huawei.com> Organization: Intel Finland Oy Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.20.3-1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2016-06-21 at 11:56 +0800, Yisen Zhuang wrote: > From: Daode Huang > > For SoC hip06, PFC pause handled in dsaf, while hip05 in XGMAC, > so change the statistics of pfc pause in dsaf and remove the old > pfc pause frame statistics. > > +static char *hns_dsaf_get_node_stats_strings(char *data, int node, > +      struct dsaf_device > *dsaf_dev) >  { >   char *buff = data; > + int i; > + bool is_ver1 = AE_IS_VER1(dsaf_dev->dsaf_ver); >   >   snprintf(buff, ETH_GSTRING_LEN, "innod%d_pad_drop_pkts", > node); >   buff = buff + ETH_GSTRING_LEN; > @@ -2502,6 +2530,18 @@ static char > *hns_dsaf_get_node_stats_strings(char *data, int node) >   buff = buff + ETH_GSTRING_LEN; >   snprintf(buff, ETH_GSTRING_LEN, "innod%d_stp_drop_pkts", > node); >   buff = buff + ETH_GSTRING_LEN; > + if ((node < DSAF_SERVICE_NW_NUM) && (!is_ver1)) { Redundant parens. > + for (i = 0; i < DSAF_PRIO_NR; i++) { > + snprintf(buff, ETH_GSTRING_LEN, > +  "inod%d_pfc_prio%d_pkts", node, i); > + buff = buff + ETH_GSTRING_LEN; buff += ... > + } > + for (i = 0; i < DSAF_PRIO_NR; i++) { > + snprintf(buff, ETH_GSTRING_LEN, > +  "onod%d_pfc_prio%d_pkts", node, i); > + buff = buff + ETH_GSTRING_LEN; Ditto. >  { >   u64 *p = data; > + int i; >   struct dsaf_hw_stats *hw_stats = &ddev->hw_stats[node_num]; > + bool is_ver1 = AE_IS_VER1(ddev->dsaf_ver); >   >   p[0] = hw_stats->pad_drop; >   p[1] = hw_stats->man_pkts; > @@ -2527,8 +2569,16 @@ static u64 *hns_dsaf_get_node_stats(struct > dsaf_device *ddev, u64 *data, >   p[10] = hw_stats->local_addr_false; >   p[11] = hw_stats->vlan_drop; >   p[12] = hw_stats->stp_drop; > - p[13] = hw_stats->tx_pkts; > + if ((node_num < DSAF_SERVICE_NW_NUM) && (!is_ver1)) { > + for (i = 0; i < DSAF_PRIO_NR; i++) { > + p[13 + i] = hw_stats->rx_pfc[i]; > + p[13 + i + DSAF_PRIO_NR] = hw_stats- > >tx_pfc[i]; > + } Two different approaches how to assign data. Above uses 2 for-loops, here you put everything to one. > + p[29] = hw_stats->tx_pkts; > + return &p[30]; > + } >   > + p[13] = hw_stats->tx_pkts; >   return &p[14]; >  } -- Andy Shevchenko Intel Finland Oy From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Shevchenko Subject: Re: [PATCH net-next 10/19] net: hns: bugfix about pfc pause frame statistics Date: Tue, 21 Jun 2016 13:32:58 +0300 Message-ID: <1466505178.30123.201.camel@linux.intel.com> References: <1466481399-70080-1-git-send-email-Yisen.Zhuang@huawei.com> <1466481399-70080-11-git-send-email-Yisen.Zhuang@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: ivecera@redhat.com, andrew@lunn.ch, liguozhu@huawei.com, arnd@arndb.de, charles.chenxin@huawei.com, linux-kernel@vger.kernel.org, linuxarm@huawei.com, geliangtang@163.com, huangdaode@hisilicon.com, netdev@vger.kernel.org, fengguang.wu@intel.com, linux-arm-kernel@lists.infradead.org To: Yisen Zhuang , davem@davemloft.net, salil.mehta@huawei.com, yankejian@huawei.com Return-path: In-Reply-To: <1466481399-70080-11-git-send-email-Yisen.Zhuang@huawei.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org List-Id: netdev.vger.kernel.org T24gVHVlLCAyMDE2LTA2LTIxIGF0IDExOjU2ICswODAwLCBZaXNlbiBaaHVhbmcgd3JvdGU6Cj4g RnJvbTogRGFvZGUgSHVhbmcgPGh1YW5nZGFvZGVAaGlzaWxpY29uLmNvbT4KPiAKPiBGb3IgU29D IGhpcDA2LCBQRkMgcGF1c2UgaGFuZGxlZCBpbiBkc2FmLCB3aGlsZSBoaXAwNSBpbiBYR01BQywK PiBzbyBjaGFuZ2UgdGhlIHN0YXRpc3RpY3Mgb2YgcGZjIHBhdXNlIGluIGRzYWYgYW5kIHJlbW92 ZSB0aGUgb2xkCj4gcGZjIHBhdXNlIGZyYW1lIHN0YXRpc3RpY3MuCj4gCgoKPiArc3RhdGljIGNo YXIgKmhuc19kc2FmX2dldF9ub2RlX3N0YXRzX3N0cmluZ3MoY2hhciAqZGF0YSwgaW50IG5vZGUs Cj4gKwkJCQkJwqDCoMKgwqDCoHN0cnVjdCBkc2FmX2RldmljZQo+ICpkc2FmX2RldikKPiDCoHsK PiDCoAljaGFyICpidWZmID0gZGF0YTsKPiArCWludCBpOwo+ICsJYm9vbCBpc192ZXIxID0gQUVf SVNfVkVSMShkc2FmX2Rldi0+ZHNhZl92ZXIpOwo+IMKgCj4gwqAJc25wcmludGYoYnVmZiwgRVRI X0dTVFJJTkdfTEVOLCAiaW5ub2QlZF9wYWRfZHJvcF9wa3RzIiwKPiBub2RlKTsKPiDCoAlidWZm ID0gYnVmZiArIEVUSF9HU1RSSU5HX0xFTjsKPiBAQCAtMjUwMiw2ICsyNTMwLDE4IEBAIHN0YXRp YyBjaGFyCj4gKmhuc19kc2FmX2dldF9ub2RlX3N0YXRzX3N0cmluZ3MoY2hhciAqZGF0YSwgaW50 IG5vZGUpCj4gwqAJYnVmZiA9IGJ1ZmYgKyBFVEhfR1NUUklOR19MRU47Cj4gwqAJc25wcmludGYo YnVmZiwgRVRIX0dTVFJJTkdfTEVOLCAiaW5ub2QlZF9zdHBfZHJvcF9wa3RzIiwKPiBub2RlKTsK PiDCoAlidWZmID0gYnVmZiArIEVUSF9HU1RSSU5HX0xFTjsKPiArCWlmICgobm9kZSA8IERTQUZf U0VSVklDRV9OV19OVU0pICYmICghaXNfdmVyMSkpIHsKClJlZHVuZGFudCBwYXJlbnMuCgo+ICsJ CWZvciAoaSA9IDA7IGkgPCBEU0FGX1BSSU9fTlI7IGkrKykgewo+ICsJCQlzbnByaW50ZihidWZm LCBFVEhfR1NUUklOR19MRU4sCj4gKwkJCQnCoCJpbm9kJWRfcGZjX3ByaW8lZF9wa3RzIiwgbm9k ZSwgaSk7Cj4gKwkJCWJ1ZmYgPSBidWZmICsgRVRIX0dTVFJJTkdfTEVOOwoKYnVmZiArPSAuLi4K Cj4gKwkJfQo+ICsJCWZvciAoaSA9IDA7IGkgPCBEU0FGX1BSSU9fTlI7IGkrKykgewo+ICsJCQlz bnByaW50ZihidWZmLCBFVEhfR1NUUklOR19MRU4sCj4gKwkJCQnCoCJvbm9kJWRfcGZjX3ByaW8l ZF9wa3RzIiwgbm9kZSwgaSk7Cj4gKwkJCWJ1ZmYgPSBidWZmICsgRVRIX0dTVFJJTkdfTEVOOwoK RGl0dG8uCgo+IMKgewo+IMKgCXU2NCAqcCA9IGRhdGE7Cj4gKwlpbnQgaTsKPiDCoAlzdHJ1Y3Qg ZHNhZl9od19zdGF0cyAqaHdfc3RhdHMgPSAmZGRldi0+aHdfc3RhdHNbbm9kZV9udW1dOwo+ICsJ Ym9vbCBpc192ZXIxID0gQUVfSVNfVkVSMShkZGV2LT5kc2FmX3Zlcik7Cj4gwqAKPiDCoAlwWzBd ID0gaHdfc3RhdHMtPnBhZF9kcm9wOwo+IMKgCXBbMV0gPSBod19zdGF0cy0+bWFuX3BrdHM7Cj4g QEAgLTI1MjcsOCArMjU2OSwxNiBAQCBzdGF0aWMgdTY0ICpobnNfZHNhZl9nZXRfbm9kZV9zdGF0 cyhzdHJ1Y3QKPiBkc2FmX2RldmljZSAqZGRldiwgdTY0ICpkYXRhLAo+IMKgCXBbMTBdID0gaHdf c3RhdHMtPmxvY2FsX2FkZHJfZmFsc2U7Cj4gwqAJcFsxMV0gPSBod19zdGF0cy0+dmxhbl9kcm9w Owo+IMKgCXBbMTJdID0gaHdfc3RhdHMtPnN0cF9kcm9wOwo+IC0JcFsxM10gPSBod19zdGF0cy0+ dHhfcGt0czsKPiArCWlmICgobm9kZV9udW0gPCBEU0FGX1NFUlZJQ0VfTldfTlVNKSAmJiAoIWlz X3ZlcjEpKSB7Cj4gKwkJZm9yIChpID0gMDsgaSA8IERTQUZfUFJJT19OUjsgaSsrKSB7Cj4gKwkJ CXBbMTMgKyBpXSA9IGh3X3N0YXRzLT5yeF9wZmNbaV07Cj4gKwkJCXBbMTMgKyBpICsgRFNBRl9Q UklPX05SXSA9IGh3X3N0YXRzLQo+ID50eF9wZmNbaV07Cj4gKwkJfQoKVHdvIGRpZmZlcmVudCBh cHByb2FjaGVzIGhvdyB0byBhc3NpZ24gZGF0YS4gQWJvdmUgdXNlcyAyIGZvci1sb29wcywKaGVy ZSB5b3UgcHV0IGV2ZXJ5dGhpbmcgdG8gb25lLgoKPiArCQlwWzI5XSA9IGh3X3N0YXRzLT50eF9w a3RzOwo+ICsJCXJldHVybiAmcFszMF07Cj4gKwl9Cj4gwqAKPiArCXBbMTNdID0gaHdfc3RhdHMt PnR4X3BrdHM7Cj4gwqAJcmV0dXJuICZwWzE0XTsKPiDCoH0KCi0tIAoKQW5keSBTaGV2Y2hlbmtv IDxhbmRyaXkuc2hldmNoZW5rb0BsaW51eC5pbnRlbC5jb20+CkludGVsIEZpbmxhbmQgT3kKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1r ZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpo dHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJu ZWwK