{"id":814674,"url":"http://patchwork.ozlabs.org/api/patches/814674/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170917172426.32345-1-roman@advem.lv/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170917172426.32345-1-roman@advem.lv>","list_archive_url":null,"date":"2017-09-17T17:24:26","name":"[net-next,v2,2/7] net: korina: optimize rx descriptor flags processing","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"b2049e7c9fe2c9de321b6d19667e615f01bf9bc3","submitter":{"id":65345,"url":"http://patchwork.ozlabs.org/api/people/65345/?format=json","name":"Roman Yeryomin","email":"leroi.lists@gmail.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170917172426.32345-1-roman@advem.lv/mbox/","series":[{"id":3532,"url":"http://patchwork.ozlabs.org/api/series/3532/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3532","date":"2017-09-17T17:23:53","name":"korina: performance fixes and cleanup","version":2,"mbox":"http://patchwork.ozlabs.org/series/3532/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814674/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814674/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"U64HD8QC\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xwGGS1P3Qz9s83\n\tfor ;\n\tMon, 18 Sep 2017 03:24:32 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751626AbdIQRY3 (ORCPT );\n\tSun, 17 Sep 2017 13:24:29 -0400","from mail-lf0-f66.google.com ([209.85.215.66]:37719 \"EHLO\n\tmail-lf0-f66.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751554AbdIQRY2 (ORCPT\n\t); Sun, 17 Sep 2017 13:24:28 -0400","by mail-lf0-f66.google.com with SMTP id q132so3432956lfe.4\n\tfor ; Sun, 17 Sep 2017 10:24:27 -0700 (PDT)","from ubrain.corp.ubnt.com\n\t([2a02:16d8:105:4000:76d4:35ff:fe88:7631])\n\tby smtp.googlemail.com with ESMTPSA id\n\t34sm1136538lfy.54.2017.09.17.10.24.26 for \n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSun, 17 Sep 2017 10:24:26 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025; h=from:to:subject:date:message-id;\n\tbh=u2E69xpvcCZvcPg4VIbW85I2Ll29GWh69K3gjwDtciw=;\n\tb=U64HD8QCA36Q4TpPExWl6TecB1bCCuTqLSEN9uP6iO9wfeQQsS2GfjX57QDrzbLYK6\n\tiUeDNRcV2W6hULvP/DQIj6zhYtb4PruPOO8h6XaTt/VjLmL5ghAzano4/6kjZvkFW14c\n\tQMur7kPZj6/wr8PI6U8VV5A6UAFSPdoiJINyGIHvHE3qhLmnqHnvMFPMyDfWWiqymzJi\n\t2/XMxnVUcCA/zmMdIF48ybx6IJTG7qjYuFrNPoW+pvt76W/egSMTMn2R6O/j7evG2feA\n\tXDukltiq5ZllyK5cTUkh+6t1HZ7nXlnt1nftdt0MHyRiwINjSmrx5xlz/YppOd0+1Hht\n\td+8w==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:subject:date:message-id;\n\tbh=u2E69xpvcCZvcPg4VIbW85I2Ll29GWh69K3gjwDtciw=;\n\tb=S7U7L1SNVMEev7E33cnzgztz3qMPZMiny0D0IxUB6S5lqqqPl8EHPHp05KN6weZCMN\n\tZlibzk7pjtDBMsqgalpK3GllsH+ae0Q0SbDgnAGyEWiFieHNXYGEqYACV2cPbMpHvZ8U\n\tnA92O5vBF5C73Anqkn7Q1fY/pcsAoQCF4N7+Jct/DyG0mo1kDnl7h/hgH8Thgzytj/wi\n\tFa/ud4hsZ/nx9BBgG4GpJfydFayQsKz3hWT9wFsQ+vgT6atve56LnEbcZzh/c4ValgjA\n\tGboFhUF1Zbh7tacyYp2j3JgEOvL8DipKZqpN8BMUZaPi3HvHaAygzkpGjXVws3M2jmkf\n\tvH5g==","X-Gm-Message-State":"AHPjjUhIZBtKfSFc5ogStlSCeJXaSsQ9isCj7FYyaKN5t0k9Q4THxo1U\n\thWoTfsiFUFxR1Iw8","X-Google-Smtp-Source":"AOwi7QD/9kFpUjK+8sZRlD7OV+P/i6O9fEi+62l2Fha/VozVTowpp/IBvpZmPXLi4hESLheCZjMLdw==","X-Received":"by 10.25.33.2 with SMTP id h2mr2892581lfh.75.1505669066992;\n\tSun, 17 Sep 2017 10:24:26 -0700 (PDT)","From":"Roman Yeryomin ","X-Google-Original-From":"Roman Yeryomin ","To":"netdev ","Subject":"[PATCH net-next v2 2/7] net: korina: optimize rx descriptor flags\n\tprocessing","Date":"Sun, 17 Sep 2017 20:24:26 +0300","Message-Id":"<20170917172426.32345-1-roman@advem.lv>","X-Mailer":"git-send-email 2.11.0","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Signed-off-by: Roman Yeryomin \n---\n drivers/net/ethernet/korina.c | 87 ++++++++++++++++++++++---------------------\n 1 file changed, 44 insertions(+), 43 deletions(-)","diff":"diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c\nindex 98d686ed69a9..e5466e19994a 100644\n--- a/drivers/net/ethernet/korina.c\n+++ b/drivers/net/ethernet/korina.c\n@@ -363,59 +363,60 @@ static int korina_rx(struct net_device *dev, int limit)\n \t\tif ((KORINA_RBSIZE - (u32)DMA_COUNT(rd->control)) == 0)\n \t\t\tbreak;\n \n-\t\t/* Update statistics counters */\n-\t\tif (devcs & ETH_RX_CRC)\n-\t\t\tdev->stats.rx_crc_errors++;\n-\t\tif (devcs & ETH_RX_LOR)\n-\t\t\tdev->stats.rx_length_errors++;\n-\t\tif (devcs & ETH_RX_LE)\n-\t\t\tdev->stats.rx_length_errors++;\n-\t\tif (devcs & ETH_RX_OVR)\n-\t\t\tdev->stats.rx_fifo_errors++;\n-\t\tif (devcs & ETH_RX_CV)\n-\t\t\tdev->stats.rx_frame_errors++;\n-\t\tif (devcs & ETH_RX_CES)\n-\t\t\tdev->stats.rx_length_errors++;\n-\t\tif (devcs & ETH_RX_MP)\n-\t\t\tdev->stats.multicast++;\n-\n-\t\tif ((devcs & ETH_RX_LD) != ETH_RX_LD) {\n-\t\t\t/* check that this is a whole packet\n-\t\t\t * WARNING: DMA_FD bit incorrectly set\n-\t\t\t * in Rc32434 (errata ref #077) */\n+\t\t/* check that this is a whole packet\n+\t\t * WARNING: DMA_FD bit incorrectly set\n+\t\t * in Rc32434 (errata ref #077) */\n+\t\tif (!(devcs & ETH_RX_LD))\n+\t\t\tgoto next;\n+\n+\t\tif (!(devcs & ETH_RX_ROK)) {\n+\t\t\t/* Update statistics counters */\n \t\t\tdev->stats.rx_errors++;\n \t\t\tdev->stats.rx_dropped++;\n-\t\t} else if ((devcs & ETH_RX_ROK)) {\n-\t\t\tpkt_len = RCVPKT_LENGTH(devcs);\n+\t\t\tif (devcs & ETH_RX_CRC)\n+\t\t\t\tdev->stats.rx_crc_errors++;\n+\t\t\tif (devcs & ETH_RX_LE)\n+\t\t\t\tdev->stats.rx_length_errors++;\n+\t\t\tif (devcs & ETH_RX_OVR)\n+\t\t\t\tdev->stats.rx_fifo_errors++;\n+\t\t\tif (devcs & ETH_RX_CV)\n+\t\t\t\tdev->stats.rx_frame_errors++;\n+\t\t\tif (devcs & ETH_RX_CES)\n+\t\t\t\tdev->stats.rx_frame_errors++;\n+\n+\t\t\tgoto next;\n+\t\t}\n \n-\t\t\t/* must be the (first and) last\n-\t\t\t * descriptor then */\n-\t\t\tpkt_buf = (u8 *)lp->rx_skb[lp->rx_next_done]->data;\n+\t\tpkt_len = RCVPKT_LENGTH(devcs);\n \n-\t\t\t/* invalidate the cache */\n-\t\t\tdma_cache_inv((unsigned long)pkt_buf, pkt_len - 4);\n+\t\t/* must be the (first and) last\n+\t\t * descriptor then */\n+\t\tpkt_buf = (u8 *)lp->rx_skb[lp->rx_next_done]->data;\n \n-\t\t\t/* Malloc up new buffer. */\n-\t\t\tskb_new = netdev_alloc_skb_ip_align(dev, KORINA_RBSIZE);\n+\t\t/* invalidate the cache */\n+\t\tdma_cache_inv((unsigned long)pkt_buf, pkt_len - 4);\n \n-\t\t\tif (!skb_new)\n-\t\t\t\tbreak;\n-\t\t\t/* Do not count the CRC */\n-\t\t\tskb_put(skb, pkt_len - 4);\n-\t\t\tskb->protocol = eth_type_trans(skb, dev);\n+\t\t/* Malloc up new buffer. */\n+\t\tskb_new = netdev_alloc_skb_ip_align(dev, KORINA_RBSIZE);\n \n-\t\t\t/* Pass the packet to upper layers */\n-\t\t\tnetif_receive_skb(skb);\n-\t\t\tdev->stats.rx_packets++;\n-\t\t\tdev->stats.rx_bytes += pkt_len;\n+\t\tif (!skb_new)\n+\t\t\tbreak;\n+\t\t/* Do not count the CRC */\n+\t\tskb_put(skb, pkt_len - 4);\n+\t\tskb->protocol = eth_type_trans(skb, dev);\n \n-\t\t\t/* Update the mcast stats */\n-\t\t\tif (devcs & ETH_RX_MP)\n-\t\t\t\tdev->stats.multicast++;\n+\t\t/* Pass the packet to upper layers */\n+\t\tnetif_receive_skb(skb);\n+\t\tdev->stats.rx_packets++;\n+\t\tdev->stats.rx_bytes += pkt_len;\n \n-\t\t\tlp->rx_skb[lp->rx_next_done] = skb_new;\n-\t\t}\n+\t\t/* Update the mcast stats */\n+\t\tif (devcs & ETH_RX_MP)\n+\t\t\tdev->stats.multicast++;\n+\n+\t\tlp->rx_skb[lp->rx_next_done] = skb_new;\n \n+next:\n \t\trd->devcs = 0;\n \n \t\t/* Restore descriptor's curr_addr */\n","prefixes":["net-next","v2","2/7"]}