From patchwork Fri Jul 15 21:32:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Schoenebeck X-Patchwork-Id: 12919925 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9DEA8C43334 for ; Fri, 15 Jul 2022 23:55:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230458AbiGOXz4 (ORCPT ); Fri, 15 Jul 2022 19:55:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231201AbiGOXzx (ORCPT ); Fri, 15 Jul 2022 19:55:53 -0400 X-Greylist: delayed 1814 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Fri, 15 Jul 2022 16:55:47 PDT Received: from lizzy.crudebyte.com (lizzy.crudebyte.com [91.194.90.13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA3E795B0C for ; Fri, 15 Jul 2022 16:55:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=crudebyte.com; s=lizzy; h=Cc:To:Subject:Date:From:References:In-Reply-To: Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Content-ID: Content-Description; bh=RZjBSUb81N+yJRTwiRNL5/W/pr19dZwDiM2ueBOpRVE=; b=L/yyu D0A+4p87Zus6SXcq23d2tfpLD4mIu6FsarA91Xzi3wJwCS8oqxAkOvHsxkuqItYO6pdQx+eukfKH6 Jw9pau/Hy5Dcyjh+MSE7XUdN2fz5YKZFrKgwqJqysxvupHKEiccj1Vl2DABzV0cwkuEIPH+gtmOe1 wSzetu+b46C3jRzve4he/wJ1tqoeN7Nt41KzAinwaglqp5qB6f0mo2Cak5wR4WSUnIYo4yoZRfElB Xue5BZuGjjVgcWGmgkkiXfHCqwwOdmJ2036/tE6cKaezeW2+HzV+JHH9Nm4mAJ30ET8cj9dwrmbpk s3wvoU7jpiMswsU4l+4gVra3W0nNw==; Message-Id: <006266b4ef857c8218b517b83db5835b4908ebe3.1657920926.git.linux_oss@crudebyte.com> In-Reply-To: References: From: Christian Schoenebeck Date: Fri, 15 Jul 2022 23:32:25 +0200 Subject: [PATCH v6 06/11] 9p/trans_virtio: resize sg lists to whatever is possible To: v9fs-developer@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Dominique Martinet , Eric Van Hensbergen , Latchesar Ionkov , Nikolay Kichukov Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Right now vq_sg_resize() used a lazy implementation following the all-or-nothing princible. So it either resized exactly to the requested new amount of sg lists, or it did not resize at all. The problem with this is if a user supplies a very large msize value, resize would simply fail and the user would stick to the default maximum msize supported by the virtio transport. To resolve this potential issue, change vq_sg_resize() to resize the passed sg list to whatever is possible on the machine. Signed-off-by: Christian Schoenebeck --- As previously discussed in v5, this patch could probably be dropped. net/9p/trans_virtio.c | 76 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 63 insertions(+), 13 deletions(-) diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 921caa022570..52d00cb3c105 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -218,24 +218,67 @@ static struct virtqueue_sg *vq_sg_alloc(unsigned int nsgl) * amount of lists * @_vq_sg: scatter/gather lists to be resized * @nsgl: new amount of scatter/gather lists + * + * Old scatter/gather lists are retained. Only growing the size is supported. + * If the requested amount cannot be satisfied, then lists are increased to + * whatever is possible. */ static int vq_sg_resize(struct virtqueue_sg **_vq_sg, unsigned int nsgl) { struct virtqueue_sg *vq_sg; + unsigned int i; + size_t sz; + int ret = 0; BUG_ON(!_vq_sg || !nsgl); vq_sg = *_vq_sg; + if (nsgl > VIRTQUEUE_SG_NSGL_MAX) + nsgl = VIRTQUEUE_SG_NSGL_MAX; if (vq_sg->nsgl == nsgl) return 0; + if (vq_sg->nsgl > nsgl) + return -ENOTSUPP; + + vq_sg = kzalloc(sizeof(struct virtqueue_sg) + + nsgl * sizeof(struct scatterlist *), + GFP_KERNEL); - /* lazy resize implementation for now */ - vq_sg = vq_sg_alloc(nsgl); if (!vq_sg) return -ENOMEM; + /* copy over old scatter gather lists */ + sz = sizeof(struct virtqueue_sg) + + (*_vq_sg)->nsgl * sizeof(struct scatterlist *); + memcpy(vq_sg, *_vq_sg, sz); + + vq_sg->nsgl = nsgl; + + for (i = (*_vq_sg)->nsgl; i < nsgl; ++i) { + vq_sg->sgl[i] = kmalloc_array( + SG_MAX_SINGLE_ALLOC, sizeof(struct scatterlist), + GFP_KERNEL + ); + /* + * handle failed allocation as soft error, we take whatever + * we get + */ + if (!vq_sg->sgl[i]) { + ret = -ENOMEM; + vq_sg->nsgl = nsgl = i; + break; + } + sg_init_table(vq_sg->sgl[i], SG_MAX_SINGLE_ALLOC); + if (i) { + /* chain the lists */ + sg_chain(vq_sg->sgl[i - 1], SG_MAX_SINGLE_ALLOC, + vq_sg->sgl[i]); + } + } + sg_mark_end(&vq_sg->sgl[nsgl - 1][SG_MAX_SINGLE_ALLOC - 1]); + kfree(*_vq_sg); *_vq_sg = vq_sg; - return 0; + return ret; } /** @@ -860,16 +903,23 @@ p9_virtio_create(struct p9_client *client, const char *devname, char *args) * if resize fails, no big deal, then just continue with * whatever we got */ - if (!vq_sg_resize(&chan->vq_sg, nsgl)) { - /* - * decrement 2 pages as both 9p request and 9p reply have - * to fit into the virtio round-trip message - */ - client->trans_maxsize = - PAGE_SIZE * - clamp_t(int, - (nsgl * SG_USER_PAGES_PER_LIST) - 2, - 0, VIRTIO_MAX_DESCRIPTORS - 2); + vq_sg_resize(&chan->vq_sg, nsgl); + /* + * actual allocation size might be less than requested, so use + * vq_sg->nsgl instead of nsgl, and decrement 2 pages as both + * 9p request and 9p reply have to fit into the virtio + * round-trip message + */ + client->trans_maxsize = + PAGE_SIZE * + clamp_t(int, + (chan->vq_sg->nsgl * SG_USER_PAGES_PER_LIST) - 2, + 0, VIRTIO_MAX_DESCRIPTORS - 2); + if (nsgl > chan->vq_sg->nsgl) { + pr_info("limiting 'msize' to %d as only %d " + "of %zu SG lists could be allocated", + client->trans_maxsize, + chan->vq_sg->nsgl, nsgl); } } #endif /* CONFIG_ARCH_NO_SG_CHAIN */