From: longli@linuxonhyperv.com
To: "K. Y. Srinivasan" <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Stephen Hemminger <sthemmin@microsoft.com>,
Wei Liu <wei.liu@kernel.org>, Dexuan Cui <decui@microsoft.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Jason Gunthorpe <jgg@ziepe.ca>, Leon Romanovsky <leon@kernel.org>,
edumazet@google.com, shiraz.saleem@intel.com,
Ajay Sharma <sharmaajay@microsoft.com>
Cc: linux-hyperv@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org,
Long Li <longli@microsoft.com>
Subject: [Patch v3 10/12] net: mana: Define max values for SGL entries
Date: Sun, 12 Jun 2022 14:14:52 -0700 [thread overview]
Message-ID: <1655068494-16440-11-git-send-email-longli@linuxonhyperv.com> (raw)
In-Reply-To: <1655068494-16440-1-git-send-email-longli@linuxonhyperv.com>
From: Long Li <longli@microsoft.com>
The number of maximum SGl entries should be computed from the maximum
WQE size for the intended queue type and the corresponding OOB data
size. This guarantees the hardware queue can successfully queue requests
up to the queue depth exposed to the upper layer.
Signed-off-by: Long Li <longli@microsoft.com>
---
drivers/net/ethernet/microsoft/mana/mana_en.c | 2 +-
include/net/mana/gdma.h | 7 +++++++
include/net/mana/mana.h | 4 +---
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index e7e99ba77673..b8d2e155bffc 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -187,7 +187,7 @@ int mana_start_xmit(struct sk_buff *skb, struct net_device *ndev)
pkg.wqe_req.client_data_unit = 0;
pkg.wqe_req.num_sge = 1 + skb_shinfo(skb)->nr_frags;
- WARN_ON_ONCE(pkg.wqe_req.num_sge > 30);
+ WARN_ON_ONCE(pkg.wqe_req.num_sge > MAX_TX_WQE_SGL_ENTRIES);
if (pkg.wqe_req.num_sge <= ARRAY_SIZE(pkg.sgl_array)) {
pkg.wqe_req.sgl = pkg.sgl_array;
diff --git a/include/net/mana/gdma.h b/include/net/mana/gdma.h
index b1bec8ab5695..ef5de92dd98d 100644
--- a/include/net/mana/gdma.h
+++ b/include/net/mana/gdma.h
@@ -436,6 +436,13 @@ struct gdma_wqe {
#define MAX_TX_WQE_SIZE 512
#define MAX_RX_WQE_SIZE 256
+#define MAX_TX_WQE_SGL_ENTRIES ((GDMA_MAX_SQE_SIZE - \
+ sizeof(struct gdma_sge) - INLINE_OOB_SMALL_SIZE) / \
+ sizeof(struct gdma_sge))
+
+#define MAX_RX_WQE_SGL_ENTRIES ((GDMA_MAX_RQE_SIZE - \
+ sizeof(struct gdma_sge)) / sizeof(struct gdma_sge))
+
struct gdma_cqe {
u32 cqe_data[GDMA_COMP_DATA_SIZE / 4];
diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h
index e7719c861395..a58e86b0aebe 100644
--- a/include/net/mana/mana.h
+++ b/include/net/mana/mana.h
@@ -264,8 +264,6 @@ struct mana_cq {
int budget;
};
-#define GDMA_MAX_RQE_SGES 15
-
struct mana_recv_buf_oob {
/* A valid GDMA work request representing the data buffer. */
struct gdma_wqe_request wqe_req;
@@ -275,7 +273,7 @@ struct mana_recv_buf_oob {
/* SGL of the buffer going to be sent has part of the work request. */
u32 num_sge;
- struct gdma_sge sgl[GDMA_MAX_RQE_SGES];
+ struct gdma_sge sgl[MAX_RX_WQE_SGL_ENTRIES];
/* Required to store the result of mana_gd_post_work_request.
* gdma_posted_wqe_info.wqe_size_in_bu is required for progressing the
--
2.17.1
next prev parent reply other threads:[~2022-06-12 21:15 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-12 21:14 [Patch v3 00/12] Introduce Microsoft Azure Network Adapter (MANA) RDMA driver longli
2022-06-12 21:14 ` [Patch v3 01/12] net: mana: Add support for auxiliary device longli
2022-06-12 21:14 ` [Patch v3 02/12] net: mana: Record the physical address for doorbell page region longli
2022-06-12 21:14 ` [Patch v3 03/12] net: mana: Handle vport sharing between devices longli
2022-06-13 10:50 ` David Miller
2022-06-13 18:25 ` Long Li
2022-06-12 21:14 ` [Patch v3 04/12] net: mana: Add functions for allocating doorbell page from GDMA longli
2022-06-12 21:14 ` [Patch v3 05/12] net: mana: Set the DMA device max segment size longli
2022-06-12 21:14 ` [Patch v3 06/12] net: mana: Define data structures for protection domain and memory registration longli
2022-06-12 21:14 ` [Patch v3 07/12] net: mana: Export Work Queue functions for use by RDMA driver longli
2022-06-12 21:14 ` [Patch v3 08/12] net: mana: Record port number in netdev longli
2022-06-12 21:14 ` [Patch v3 09/12] net: mana: Move header files to a common location longli
2022-06-12 21:14 ` longli [this message]
2022-06-12 21:14 ` [Patch v3 11/12] net: mana: Define and process GDMA response code GDMA_STATUS_MORE_ENTRIES longli
2022-06-12 21:14 ` [Patch v3 12/12] RDMA/mana_ib: Add a driver for Microsoft Azure Network Adapter longli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1655068494-16440-11-git-send-email-longli@linuxonhyperv.com \
--to=longli@linuxonhyperv.com \
--cc=davem@davemloft.net \
--cc=decui@microsoft.com \
--cc=edumazet@google.com \
--cc=haiyangz@microsoft.com \
--cc=jgg@ziepe.ca \
--cc=kuba@kernel.org \
--cc=kys@microsoft.com \
--cc=leon@kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=longli@microsoft.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sharmaajay@microsoft.com \
--cc=shiraz.saleem@intel.com \
--cc=sthemmin@microsoft.com \
--cc=wei.liu@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).