Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1428611
| From | Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH net-next 10/19] net: hns: bugfix about pfc pause frame statistics |
| Date | 2016-06-22 11:50 +0200 |
| Message-ID | <rMMXg-1FM-9@gated-at.bofh.it> (permalink) |
| References | <rMkHD-l2-5@gated-at.bofh.it> <rMkRj-qs-13@gated-at.bofh.it> <rMrpM-4GP-7@gated-at.bofh.it> <rMFsJ-5eQ-1@gated-at.bofh.it> |
| Organization | Intel Finland Oy |
On Wed, 2016-06-22 at 09:43 +0800, Yisen Zhuang wrote:
>
> 在 2016/6/21 18:32, Andy Shevchenko 写道:
> > On Tue, 2016-06-21 at 11:56 +0800, Yisen Zhuang wrote:
> > > From: Daode Huang <huangdaode@hisilicon.com>
> > >
> > > 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.
>
> Above cann't be merged to 1 for-loop, because lenght of the string is
> unknowable.
It doesn't matter since you are incrementing start position by
constant.
snprintf(buff, ETH_GSTRING_LEN, "inod%d_pfc_prio%d_pkts", node, i);
snprintf(buff, ETH_GSTRING_LEN, "onod%d_pfc_prio%d_pkts", node, i);
Same approach as below can be used
snprintf(buff + 0 * ETH_GSTRING_LEN * DSAF_PRIO_NR, ETH_GSTRING_LEN, ...
snprintf(buff + 1 * ETH_GSTRING_LEN * DSAF_PRIO_NR, ETH_GSTRING_LEN, ...
Of course to make it less verbose you may add new definition(s) and/ or
variable(s).
>
> And here we put everything to one to reduce codes.
>
I would suggest to use following pattern for such lines
p[13 + i + 0 * DSAF_PRIO_NR] = hw_stats->rx_pfc[i];
p[13 + i + 1 * DSAF_PRIO_NR] = hw_stats->tx_pfc[i];
That's allow reader to see what are you doing here.
P.S. This is for the future patches since current is already applied.
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH net-next 00/19] net: hns: fix some bugs in hns driver Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
[PATCH net-next 08/19] net: hns: fix ethtool loopback fail bug Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
[PATCH net-next 16/19] net: hns: fix bug that alloc skb fail lead to port unavailable Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
Re: [PATCH net-next 16/19] net: hns: fix bug that alloc skb fail lead to port unavailable Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-06-21 15:30 +0200
Re: [PATCH net-next 16/19] net: hns: fix bug that alloc skb fail lead to port unavailable Yisen Zhuang <Yisen.zhuang@huawei.com> - 2016-06-22 03:50 +0200
[PATCH net-next 05/19] net: hns: Remove unnecessary device resource free Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
[PATCH net-next 10/19] net: hns: bugfix about pfc pause frame statistics Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
Re: [PATCH net-next 10/19] net: hns: bugfix about pfc pause frame statistics Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-06-21 12:50 +0200
Re: [PATCH net-next 10/19] net: hns: bugfix about pfc pause frame statistics Yisen Zhuang <Yisen.zhuang@huawei.com> - 2016-06-22 03:50 +0200
Re: [PATCH net-next 10/19] net: hns: bugfix about pfc pause frame statistics Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-06-22 11:50 +0200
Re: [PATCH net-next 10/19] net: hns: bugfix about pfc pause frame statistics Yisen Zhuang <Yisen.zhuang@huawei.com> - 2016-06-23 07:50 +0200
[PATCH net-next 18/19] net: hns: change the default coalesce usecs Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
[PATCH net-next 04/19] net: hns: typo fix of annotation info for hns_nic_reset_subtask() Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
[PATCH net-next 12/19] net: hns: fix bug of getting the wrong tcam data Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
[PATCH net-next 15/19] net: hns: bug fix about led control logic when link down Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
[PATCH net-next 03/19] net: hns: add skb_reset_mac_header() after skb being alloc Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
[PATCH net-next 17/19] net: hns: fix sbm default parameters config error Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
[PATCH net-next 02/19] net: hns: fix hns dsaf v1 dont support tx_pause close Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
[PATCH net-next 14/19] net: hns: delete redundancy ring enable operations Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
Re: [PATCH net-next 00/19] net: hns: fix some bugs in hns driver David Miller <davem@davemloft.net> - 2016-06-21 11:00 +0200
csiph-web