Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Haiyang Zhang <haiyangz@microsoft.com>
To:     Long Li <longli@linuxonhyperv.com>,
        KY Srinivasan <kys@microsoft.com>,
        Stephen Hemminger <sthemmin@microsoft.com>,
        "James E . J . Bottomley" <JBottomley@odin.com>,
        "Martin K . Petersen" <martin.petersen@oracle.com>,
        "devel@linuxdriverproject.org" <devel@linuxdriverproject.org>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Long Li <longli@microsoft.com>
Subject: RE: [PATCH 2/3] Netvsc: Use the vmbus functiton to calculate ring
 buffer percentage
Thread-Topic: [PATCH 2/3] Netvsc: Use the vmbus functiton to calculate ring
 buffer percentage
Thread-Index: AQHTwjxHWhwOiuv98ESE/MCGzQ8uiqPd6lwg
Date:   Fri, 23 Mar 2018 15:00:31 +0000
Message-ID: <BL0PR2101MB1108CF3AEE2D04D064BA76FACAA80@BL0PR2101MB1108.namprd21.prod.outlook.com>
References: <20180323001538.31876-1-longli@linuxonhyperv.com>
 <20180323001538.31876-2-longli@linuxonhyperv.com>
In-Reply-To: <20180323001538.31876-2-longli@linuxonhyperv.com>
Accept-Language: en-US
Content-Language: en-US
msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=True;
 MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47;
 MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Owner=haiyangz@microsoft.com;
 MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2018-03-23T15:00:29.3110697Z;
 MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=General;
 MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Application=Microsoft Azure
 Information Protection;
 MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Extended_MSFT_Method=Automatic;
 Sensitivity=General
x-originating-ip: [69.130.166.81]
x-ms-publictraffictype: Email
x-microsoft-exchange-diagnostics: 1;BL0PR2101MB1025;7:JBWp3idRvSEuLy26t6Zmr3Xpnvbx4VbS1U5g5LO5+JLGkHQSAPhSVY+C2Z2UXNAzp3k4Hu+EpVjNHHPRs+SQ7Kbqz2DZnCdoc9utQ3vSLulFhaCOtQv6JVtXhQo51si5OBj37dm0gLKB4aeo/Blr0eIN+HtMUaEnodCiSnE/1AUUOIuyAXN8Wr1YqRWjC9RhzJpiaSUG7RegrN3GrEihK4OQK+16D8tq+O8TwFECRzoD/7c74GBLPgDB6KOxf3R5;20:pctsSu0WTYlOKqS73JYBr7gEst/XISS9ANY73iHvO7PqsTyDgIHyohH/oi5l31FuwzPq70aFYHFWrQ5gxnZ7pmbpSTl8xRcAVEh9632DQbcgfxVbL+T79Z7mcQw+aM11j/1KnRZiHziHYUghKvr/iGFHmmmF1do5UHyJROLZYgk=
x-ms-exchange-antispam-srfa-diagnostics: SOS;
x-ms-office365-filtering-ht: Tenant
x-ms-office365-filtering-correlation-id: 0ef63626-5b65-4a77-4cac-08d590ced2bf
x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:BL0PR2101MB1025;
x-ms-traffictypediagnostic: BL0PR2101MB1025:
x-microsoft-antispam-prvs: <BL0PR2101MB1025ABC4C8FDACE41B187ED3CAA80@BL0PR2101MB1025.namprd21.prod.outlook.com>
x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(9452136761055)(146099531331640);
x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(6072148)(201708071742011);SRVR:BL0PR2101MB1025;BCL:0;PCL:0;RULEID:;SRVR:BL0PR2101MB1025;
x-forefront-prvs: 0620CADDF3
x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(979002)(396003)(346002)(376002)(366004)(39860400002)(39380400002)(13464003)(199004)(189003)(11346002)(99286004)(575784001)(86362001)(1511001)(76176011)(8990500004)(2201001)(3280700002)(53546011)(25786009)(6506007)(9686003)(55016002)(7696005)(305945005)(6436002)(2900100001)(7736002)(10290500003)(316002)(478600001)(2906002)(68736007)(5660300001)(105586002)(81156014)(81166006)(4326008)(106356001)(86612001)(53936002)(6346003)(6246003)(6116002)(22452003)(110136005)(3846002)(10090500001)(107886003)(14454004)(229853002)(33656002)(66066001)(5250100002)(186003)(2501003)(446003)(102836004)(97736004)(74316002)(8676002)(26005)(8936002)(3660700001)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1102;SCL:1;SRVR:BL0PR2101MB1025;H:BL0PR2101MB1108.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=haiyangz@microsoft.com; 
x-microsoft-antispam-message-info: QeUP2/jmCIBdz3H5DWrHuSR1KybL36pvX3YGfCkaLkWPHlkUFdtoKE9HInIIPJVr54zV98PG78IDkJ2IhwG0ge22VZdJa0hgmqEbtIVJ3EWgSUeOKesD3B5HpcrG3qLhoOT5XUwnYZXFIR3XdD9j8g0LlqnJZunszTer29CxEdXeY6QLG1yUzg+SaPw0a+GJzx9ClKP6u0k+vVAJVgp+sPHDaQzf09QAYVk9bgA7X5dufFDeMGED5tAS7q1fwuy9iyiJkn2ULSjPWo4kYeXefQ+FM0GbVpdMqYTg0eRR9VshV6pjHpvsnhsbwUg3cHVTjP3KDXYx4Xk2UTSTYYQyqQ==
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: microsoft.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0ef63626-5b65-4a77-4cac-08d590ced2bf
X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Mar 2018 15:00:31.4487
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR2101MB1025
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Long Li <longli@linuxonhyperv.com>
> Sent: Thursday, March 22, 2018 8:16 PM
> To: KY Srinivasan <kys@microsoft.com>; Haiyang Zhang
> <haiyangz@microsoft.com>; Stephen Hemminger <sthemmin@microsoft.com>;
> James E . J . Bottomley <JBottomley@odin.com>; Martin K . Petersen
> <martin.petersen@oracle.com>; devel@linuxdriverproject.org; linux-
> scsi@vger.kernel.org; linux-kernel@vger.kernel.org
> Cc: Long Li <longli@microsoft.com>
> Subject: [PATCH 2/3] Netvsc: Use the vmbus functiton to calculate ring bu=
ffer
> percentage
>=20
> From: Long Li <longli@microsoft.com>
>=20
> In Vmbus, we have defined a function to calculate available ring buffer
> percentage to write.
>=20
> Use that function and remove duplicate netvsc code.
>=20
> Signed-off-by: Long Li <longli@microsoft.com>
> ---
>  drivers/net/hyperv/netvsc.c     | 17 +++--------------
>  drivers/net/hyperv/netvsc_drv.c |  3 ---
>  2 files changed, 3 insertions(+), 17 deletions(-)
>=20
> diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c in=
dex
> 0265d703eb03..8af0069e4d8c 100644
> --- a/drivers/net/hyperv/netvsc.c
> +++ b/drivers/net/hyperv/netvsc.c
> @@ -31,7 +31,6 @@
>  #include <linux/vmalloc.h>
>  #include <linux/rtnetlink.h>
>  #include <linux/prefetch.h>
> -#include <linux/reciprocal_div.h>
>=20
>  #include <asm/sync_bitops.h>
>=20
> @@ -590,17 +589,6 @@ void netvsc_device_remove(struct hv_device *device)
> #define RING_AVAIL_PERCENT_HIWATER 20  #define
> RING_AVAIL_PERCENT_LOWATER 10
>=20
> -/*
> - * Get the percentage of available bytes to write in the ring.
> - * The return value is in range from 0 to 100.
> - */
> -static u32 hv_ringbuf_avail_percent(const struct hv_ring_buffer_info
> *ring_info) -{
> -	u32 avail_write =3D hv_get_bytes_to_write(ring_info);
> -
> -	return reciprocal_divide(avail_write  * 100, netvsc_ring_reciprocal);
> -}
> -
>  static inline void netvsc_free_send_slot(struct netvsc_device *net_devic=
e,
>  					 u32 index)
>  {
> @@ -649,7 +637,8 @@ static void netvsc_send_tx_complete(struct
> netvsc_device *net_device,
>  		wake_up(&net_device->wait_drain);
>=20
>  	if (netif_tx_queue_stopped(netdev_get_tx_queue(ndev, q_idx)) &&
> -	    (hv_ringbuf_avail_percent(&channel->outbound) >
> RING_AVAIL_PERCENT_HIWATER ||
> +	    (hv_get_avail_to_write_percent(&channel->outbound) >
> +	     RING_AVAIL_PERCENT_HIWATER ||
>  	     queue_sends < 1)) {
>  		netif_tx_wake_queue(netdev_get_tx_queue(ndev, q_idx));
>  		ndev_ctx->eth_stats.wake_queue++;
> @@ -757,7 +746,7 @@ static inline int netvsc_send_pkt(
>  	struct netdev_queue *txq =3D netdev_get_tx_queue(ndev, packet->q_idx);
>  	u64 req_id;
>  	int ret;
> -	u32 ring_avail =3D hv_ringbuf_avail_percent(&out_channel->outbound);
> +	u32 ring_avail =3D
> +hv_get_avail_to_write_percent(&out_channel->outbound);
>=20
>  	nvmsg.hdr.msg_type =3D NVSP_MSG1_TYPE_SEND_RNDIS_PKT;
>  	if (skb)
> diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_=
drv.c
> index faea0be18924..b0b1c2fd2b7b 100644
> --- a/drivers/net/hyperv/netvsc_drv.c
> +++ b/drivers/net/hyperv/netvsc_drv.c
> @@ -35,7 +35,6 @@
>  #include <linux/slab.h>
>  #include <linux/rtnetlink.h>
>  #include <linux/netpoll.h>
> -#include <linux/reciprocal_div.h>
>=20
>  #include <net/arp.h>
>  #include <net/route.h>
> @@ -55,7 +54,6 @@ static unsigned int ring_size __ro_after_init =3D 128;
> module_param(ring_size, uint, S_IRUGO);  MODULE_PARM_DESC(ring_size,
> "Ring buffer size (# of pages)");  unsigned int netvsc_ring_bytes __ro_af=
ter_init;
> -struct reciprocal_value netvsc_ring_reciprocal __ro_after_init;
>=20
>  static const u32 default_msg =3D NETIF_MSG_DRV | NETIF_MSG_PROBE |
>  				NETIF_MSG_LINK | NETIF_MSG_IFUP |
> @@ -2186,7 +2184,6 @@ static int __init netvsc_drv_init(void)
>  			ring_size);
>  	}
>  	netvsc_ring_bytes =3D ring_size * PAGE_SIZE;
> -	netvsc_ring_reciprocal =3D reciprocal_value(netvsc_ring_bytes);
>=20
>  	ret =3D vmbus_driver_register(&netvsc_drv);
>  	if (ret)
> --


Please also remove netvsc_ring_reciprocal from hyperv_net.h
Thanks.

Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>