Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp4532787imw; Tue, 12 Jul 2022 09:31:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s9tBt9yVAc3R1T39ImT2XeT2ejShAQjvXRUo1oOkPTie57iGnncL0V/a6/R1uTBD1P31Je X-Received: by 2002:a17:907:6ea4:b0:72b:8550:90db with SMTP id sh36-20020a1709076ea400b0072b855090dbmr3005414ejc.135.1657643481144; Tue, 12 Jul 2022 09:31:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657643481; cv=none; d=google.com; s=arc-20160816; b=JxWR0Pbx64EyC3CC7Vc/R5VbilytvxtfDSVlEXN1XJMj39A7pKWt4LiRtn4VnrvVWF fTdGsYAIpURjOYKlYTC1nM9bI4W0kd/eeBRst7Xufp47gvNesdBQCCSdfUT7Bx3Fdxqr BWE4Cq9sbQRSxtF8dLqYspneV8ijNi0WmgUrtPkzfh95Q3Vw56OU2JJX+W5E1ySx1z/Y FqG//n34qPtbGDVpZmnUlr3aanOHNbYDvo9f4bNYdlQKze+BjkgRYcFENyLUpbF5zc92 xDL+5T0pCO8o8uUg38JEJqVFMZUEL15thR/VQfCzZpeZWLrjXznp9CSPWvyfuj+S5MJb NWpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:date:from:references:in-reply-to :message-id:dkim-signature; bh=Hw21+wotN9D+Z0hozfXdxMixZLaL8X+liJ1Yr85K26w=; b=PzEKYdrohSpi5yNPC6belmT6yPMx6EWyqrpHcSVPCyummdCdpVJcAoj7VbQ4MWAIZi zFHIFFSBBlu7grofwwSe2tWi7uHLASkYE8VSQivkGmaJSCY4VsN30pRNpfMlZhNAtUKI ekoz/x97oYCi4z0XJexnl1zW7m+ZbSerpRE+0f0Cuvfj/pGVSBSm8D3LFiwi+ZYNvTJn HbbhTcdn8oU0Nat5jGCqjp3B2D7cbhPBMVN2Xf2OTUteMmr20EMKbRGXbjy/2sGvIZtj 812WpqrUN8rly7ONAmKAEXQCcbhlkHBkfenkBEUWbF6xC/OIt8CBb7DxS5KDrWwfk92u I1DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crudebyte.com header.s=lizzy header.b=EI1PewTg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=crudebyte.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k2-20020a1709060ca200b006fea113fc9fsi12185908ejh.762.2022.07.12.09.30.52; Tue, 12 Jul 2022 09:31:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@crudebyte.com header.s=lizzy header.b=EI1PewTg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=crudebyte.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233367AbiGLP4R (ORCPT + 99 others); Tue, 12 Jul 2022 11:56:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234071AbiGLP4I (ORCPT ); Tue, 12 Jul 2022 11:56:08 -0400 X-Greylist: delayed 2343 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 12 Jul 2022 08:55:56 PDT Received: from lizzy.crudebyte.com (lizzy.crudebyte.com [91.194.90.13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFBC7C5978 for ; Tue, 12 Jul 2022 08:55:56 -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=Hw21+wotN9D+Z0hozfXdxMixZLaL8X+liJ1Yr85K26w=; b=EI1Pe wTgvrPexh1OdWt9EE3Rv2uPRLxgxbBqasVKnA5y51Gq9cLwprFlRmPj6ajW1jcTrN7Irsi9xGDaqZ LnV5LVKaGspZcmpLTewm+1WxCZfv4V28M6PVbkagbOPxjjYpp+JUdn/gxforUGW7iBBP8N81ptluh 2ScyWqVJrwyzP/774Tp4JXsuKzVHXUpgN+uhhlLWS3jR/55bbUCrL5I6ewYN6/fCjrLAvXtRYmLwc hBVnQkzzjLA6UeBPlYP3QtselfkLthWK1Cu2dQFFNOBjSbzYffmp/9krfVTwT1pwWz+4pTFok2gMi rLqRx8cX1uxnE6mL03Tv0wxF4IDXQ==; Message-Id: In-Reply-To: References: From: Christian Schoenebeck Date: Tue, 12 Jul 2022 16:31:14 +0200 Subject: [PATCH v5 02/11] 9p/trans_virtio: turn amount of sg lists into runtime info 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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The size of scatter/gather lists used by the virtio transport is currently hard coded. Refactor this to using a runtime variable. Signed-off-by: Christian Schoenebeck --- net/9p/trans_virtio.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 2693e618080c..18bdfa64b934 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -36,7 +36,7 @@ #include #include "trans_common.h" -#define VIRTQUEUE_NUM 128 +#define VIRTQUEUE_DEFAULT_NUM 128 /* a single mutex to manage channel initialization and attachment */ static DEFINE_MUTEX(virtio_9p_lock); @@ -54,6 +54,7 @@ static atomic_t vp_pinned = ATOMIC_INIT(0); * @vc_wq: wait queue for waiting for thing to be added to ring buf * @p9_max_pages: maximum number of pinned pages * @sg: scatter gather list which is used to pack a request (protected?) + * @sg_n: amount of elements in sg array * @chan_list: linked list of channels * * We keep all per-channel information in a structure. @@ -78,6 +79,7 @@ struct virtio_chan { unsigned long p9_max_pages; /* Scatterlist: can be too big for stack. */ struct scatterlist *sg; + size_t sg_n; /** * @tag: name to identify a mount null terminated */ @@ -270,12 +272,12 @@ p9_virtio_request(struct p9_client *client, struct p9_req_t *req) out_sgs = in_sgs = 0; /* Handle out VirtIO ring buffers */ out = pack_sg_list(chan->sg, 0, - VIRTQUEUE_NUM, req->tc.sdata, req->tc.size); + chan->sg_n, req->tc.sdata, req->tc.size); if (out) sgs[out_sgs++] = chan->sg; in = pack_sg_list(chan->sg, out, - VIRTQUEUE_NUM, req->rc.sdata, req->rc.capacity); + chan->sg_n, req->rc.sdata, req->rc.capacity); if (in) sgs[out_sgs + in_sgs++] = chan->sg + out; @@ -447,14 +449,14 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, /* out data */ out = pack_sg_list(chan->sg, 0, - VIRTQUEUE_NUM, req->tc.sdata, req->tc.size); + chan->sg_n, req->tc.sdata, req->tc.size); if (out) sgs[out_sgs++] = chan->sg; if (out_pages) { sgs[out_sgs++] = chan->sg + out; - out += pack_sg_list_p(chan->sg, out, VIRTQUEUE_NUM, + out += pack_sg_list_p(chan->sg, out, chan->sg_n, out_pages, out_nr_pages, offs, outlen); } @@ -466,13 +468,13 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, * allocated memory and payload onto the user buffer. */ in = pack_sg_list(chan->sg, out, - VIRTQUEUE_NUM, req->rc.sdata, in_hdr_len); + chan->sg_n, req->rc.sdata, in_hdr_len); if (in) sgs[out_sgs + in_sgs++] = chan->sg + out; if (in_pages) { sgs[out_sgs + in_sgs++] = chan->sg + out + in; - in += pack_sg_list_p(chan->sg, out + in, VIRTQUEUE_NUM, + in += pack_sg_list_p(chan->sg, out + in, chan->sg_n, in_pages, in_nr_pages, offs, inlen); } @@ -574,13 +576,14 @@ static int p9_virtio_probe(struct virtio_device *vdev) goto fail; } - chan->sg = kmalloc_array(VIRTQUEUE_NUM, + chan->sg = kmalloc_array(VIRTQUEUE_DEFAULT_NUM, sizeof(struct scatterlist), GFP_KERNEL); if (!chan->sg) { pr_err("Failed to allocate virtio 9P channel\n"); err = -ENOMEM; goto out_free_chan_shallow; } + chan->sg_n = VIRTQUEUE_DEFAULT_NUM; chan->vdev = vdev; @@ -593,7 +596,7 @@ static int p9_virtio_probe(struct virtio_device *vdev) chan->vq->vdev->priv = chan; spin_lock_init(&chan->lock); - sg_init_table(chan->sg, VIRTQUEUE_NUM); + sg_init_table(chan->sg, chan->sg_n); chan->inuse = false; if (virtio_has_feature(vdev, VIRTIO_9P_MOUNT_TAG)) { @@ -777,7 +780,7 @@ static struct p9_trans_module p9_virtio_trans = { * that are not at page boundary, that can result in an extra * page in zero copy. */ - .maxsize = PAGE_SIZE * (VIRTQUEUE_NUM - 3), + .maxsize = PAGE_SIZE * (VIRTQUEUE_DEFAULT_NUM - 3), .def = 1, .owner = THIS_MODULE, }; -- 2.30.2