From patchwork Wed Aug 16 15:56:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 802116 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="1iG0EtRn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xXYqr4gv8z9sR9 for ; Thu, 17 Aug 2017 01:56:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752485AbdHPP4i (ORCPT ); Wed, 16 Aug 2017 11:56:38 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:33893 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751943AbdHPP4f (ORCPT ); Wed, 16 Aug 2017 11:56:35 -0400 Received: by mail-pf0-f175.google.com with SMTP id o86so7829421pfj.1 for ; Wed, 16 Aug 2017 08:56:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YABA6DewU9wqJvBqb5jzNH9aG5MP5Vmlx5PQbi1p60s=; b=1iG0EtRni9QDfQkgkjxuugJf99qPWTdcluw2eRhWAfgbVexwD8ZEbPkMrcG+ngt/10 /0VCT4dQ5l4oJIujBzTfR+WrZ1GfebTEKDCOT5tVzkxKnbT9a9TjoN7RKUHQsm6J2MLe JqyZWvBZsfoq1Sl/YUiWIXx4RvpwIYhIeoIv78nU46WHBqYFFml+yBjQmL668eF/LDEk /w2cKolWsfUjJ1+TRDR6PCf0XoAs+VZ0f8YLW8+bsYFz4FCUsKt9bpkkpXicR0hlK56t 37H6Ow5ZjZlETDm7I3AFq0krpN+QUbn3QpUgOwkjYBq5LS7Ea/d6k8wXFaa9aYHgcGqh z9xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YABA6DewU9wqJvBqb5jzNH9aG5MP5Vmlx5PQbi1p60s=; b=Cgp83Wgyhh6TI3aCVUBxX8ed+gT87UEECft4MeGnT8ZJcy0gGCbjofUOX6lr0Y71ZD QQgFinN4OTfaeHYW82mNYqxwvLCPzKpcAfB5H3Petl/rszZzhUNnNGEqB9oSbMgv2z6F 0n27Ba+I9jWaDvxpoarfeQO9gFcq6t9yJEhH2wKqK5QjITG6bjNaXnX2BgiYEg3NcJaj jE2q0I/0qsGOCRvJRWww7GPmgsIADxMM9pClJdDTlYDUVPbVcx1WPZmc4BqFmMZS0Lhf 6k9BzST2ryCsBW2fRKhAreWy2vL0UodXKA9pnmsxJtkApg3fzoqJW4ZAQhHgh9/APrpk /mAw== X-Gm-Message-State: AHYfb5iPzR8wt00GTwSk+eqEnu9rFb+giqwQdZD4Wve5DtGedtY17t5N Z0mYNvtnO8vZzcOf X-Received: by 10.84.194.228 with SMTP id h91mr2396249pld.46.1502898995279; Wed, 16 Aug 2017 08:56:35 -0700 (PDT) Received: from xeon-e3.lan (76-14-207-240.or.wavecable.com. [76.14.207.240]) by smtp.gmail.com with ESMTPSA id x4sm2386291pfb.79.2017.08.16.08.56.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Aug 2017 08:56:34 -0700 (PDT) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com Cc: devel@linuxdriverproject.org, netdev@vger.kernel.org Subject: [PATCH net-next 1/3] vmbus: remove unused vmbus_sendpacket_multipagebuffer Date: Wed, 16 Aug 2017 08:56:24 -0700 Message-Id: <20170816155626.16580-2-sthemmin@microsoft.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170816155626.16580-1-sthemmin@microsoft.com> References: <20170816155626.16580-1-sthemmin@microsoft.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This function is not used anywhere in current code. Signed-off-by: Stephen Hemminger --- drivers/hv/channel.c | 56 -------------------------------------------------- include/linux/hyperv.h | 6 ------ 2 files changed, 62 deletions(-) diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c index e57cc40cb768..756a1e841142 100644 --- a/drivers/hv/channel.c +++ b/drivers/hv/channel.c @@ -814,62 +814,6 @@ int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel, } EXPORT_SYMBOL_GPL(vmbus_sendpacket_mpb_desc); -/* - * vmbus_sendpacket_multipagebuffer - Send a multi-page buffer packet - * using a GPADL Direct packet type. - */ -int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel, - struct hv_multipage_buffer *multi_pagebuffer, - void *buffer, u32 bufferlen, u64 requestid) -{ - struct vmbus_channel_packet_multipage_buffer desc; - u32 descsize; - u32 packetlen; - u32 packetlen_aligned; - struct kvec bufferlist[3]; - u64 aligned_data = 0; - u32 pfncount = NUM_PAGES_SPANNED(multi_pagebuffer->offset, - multi_pagebuffer->len); - - if (pfncount > MAX_MULTIPAGE_BUFFER_COUNT) - return -EINVAL; - - /* - * Adjust the size down since vmbus_channel_packet_multipage_buffer is - * the largest size we support - */ - descsize = sizeof(struct vmbus_channel_packet_multipage_buffer) - - ((MAX_MULTIPAGE_BUFFER_COUNT - pfncount) * - sizeof(u64)); - packetlen = descsize + bufferlen; - packetlen_aligned = ALIGN(packetlen, sizeof(u64)); - - - /* Setup the descriptor */ - desc.type = VM_PKT_DATA_USING_GPA_DIRECT; - desc.flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED; - desc.dataoffset8 = descsize >> 3; /* in 8-bytes granularity */ - desc.length8 = (u16)(packetlen_aligned >> 3); - desc.transactionid = requestid; - desc.rangecount = 1; - - desc.range.len = multi_pagebuffer->len; - desc.range.offset = multi_pagebuffer->offset; - - memcpy(desc.range.pfn_array, multi_pagebuffer->pfn_array, - pfncount * sizeof(u64)); - - bufferlist[0].iov_base = &desc; - bufferlist[0].iov_len = descsize; - bufferlist[1].iov_base = buffer; - bufferlist[1].iov_len = bufferlen; - bufferlist[2].iov_base = &aligned_data; - bufferlist[2].iov_len = (packetlen_aligned - packetlen); - - return hv_ringbuffer_write(channel, bufferlist, 3); -} -EXPORT_SYMBOL_GPL(vmbus_sendpacket_multipagebuffer); - /** * vmbus_recvpacket() - Retrieve the user packet on the specified channel * @channel: Pointer to vmbus_channel structure. diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index b7d7bbec74e0..39a080ce17da 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -1052,12 +1052,6 @@ extern int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel, u64 requestid, u32 flags); -extern int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel, - struct hv_multipage_buffer *mpb, - void *buffer, - u32 bufferlen, - u64 requestid); - extern int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel, struct vmbus_packet_mpb_array *mpb, u32 desc_size,