From patchwork Sat Oct 22 00:01:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: longli@linuxonhyperv.com X-Patchwork-Id: 7042 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp961185wrr; Fri, 21 Oct 2022 17:06:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4NRuXBdhMm5QSuYBapg9tsiKqkdQic2zPRJ8mhYhTBlP0Q/7AjmOtAyG9PC6hl3vciJtny X-Received: by 2002:a17:906:dac3:b0:780:a242:2f14 with SMTP id xi3-20020a170906dac300b00780a2422f14mr17165510ejb.668.1666397210875; Fri, 21 Oct 2022 17:06:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666397210; cv=none; d=google.com; s=arc-20160816; b=cmiTUtLpOBzFvChsQkNi5sq/sn5yZZUgIVzKGGXofbhfMJYxkInvohHf2TfVkPE85s +uu1RIm8zfS3BXZlXB9JtQK/R6aIdTb1BaNpg2P8xiyfx4/fqt9/g5dt2grDXHTyKajT a1LwMqOW2lWVycCpYe228cqiWcCGj1iFfuyjmtEJTQV5mII9XocB5c0rvQ28gsCzv1yn bMSk0OO9yPK4/0McLVWmvE4QhUkbdkgZhBYfOS8ASYomvmgPF73GVHz14o++ByDbu7Ri 1bOeB/GbkZWPgc4tEdBeFHZxBRggNV/IT7B2XJAe/I3FX6k14rH5tNcm5/Pttz+QOfEw vXIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=f/L5JWQtlV4EWOSXR6x1yXXG40XtIaw4c4cKTQrFw1k=; b=ZDdji146QNdtWOy8W/hLbm2lYG1mYlJa8wSdMhe+YqsLzR0VT2Af1dVv4vvKppdSBx sm0qi+mhEnJQzaCI97KX83sbSEjXBG/wOSxTo4gIzQvZ3aox7BFDCasmEaQ5JH0rYwa2 ldwfhp4pzwP1hlXRAZVMgfwzeyNWZWES1TjOHWh8x0wCZwCsWAhhQxnQeMgWKzFScRXG OlLMGiec7gGHah54OZZRk1UZYPs/O95scIkK+RcFTMpa913OcqMT7NbZcg5YzbdjTfxM GWAOBPAvcWHEttDTE8mR+/kNaXjsDFY5CmBPNZXSQfsy9ZgGt/d2Q4RVso3wzgLkcdju O5ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxonhyperv.com header.s=default header.b=or0ILBuZ; 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=NONE sp=NONE dis=NONE) header.from=linuxonhyperv.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fe8-20020a056402390800b004612505ece4si4408106edb.483.2022.10.21.17.06.27; Fri, 21 Oct 2022 17:06:50 -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=@linuxonhyperv.com header.s=default header.b=or0ILBuZ; 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=NONE sp=NONE dis=NONE) header.from=linuxonhyperv.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230186AbiJVACt (ORCPT + 99 others); Fri, 21 Oct 2022 20:02:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229996AbiJVABq (ORCPT ); Fri, 21 Oct 2022 20:01:46 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 17041263F29; Fri, 21 Oct 2022 17:01:42 -0700 (PDT) Received: by linux.microsoft.com (Postfix, from userid 1004) id ED2F420FF4E6; Fri, 21 Oct 2022 17:01:40 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com ED2F420FF4E6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxonhyperv.com; s=default; t=1666396900; bh=f/L5JWQtlV4EWOSXR6x1yXXG40XtIaw4c4cKTQrFw1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To:From; b=or0ILBuZasAw2eDR3COtxxo6hz+QpDPSfcXoS48AwK8kYoRBsoyszy5iKI9xUMqJf c4APW9aoY5a7ZPbVzPl+fA3eYScIEQTsBRdjpQucpSFbI/ZpTwCrWBFJQDoBRcghfF yodR/Nn06Q6aF8Hf67q/yMh40OZMStDc2gXvYCn8= From: longli@linuxonhyperv.com To: "K. Y. Srinivasan" , Haiyang Zhang , Stephen Hemminger , Wei Liu , Dexuan Cui , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Jason Gunthorpe , Leon Romanovsky , edumazet@google.com, shiraz.saleem@intel.com, Ajay Sharma Cc: linux-hyperv@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, Long Li Subject: [Patch v9 08/12] net: mana: Define max values for SGL entries Date: Fri, 21 Oct 2022 17:01:25 -0700 Message-Id: <1666396889-31288-9-git-send-email-longli@linuxonhyperv.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666396889-31288-1-git-send-email-longli@linuxonhyperv.com> References: <1666396889-31288-1-git-send-email-longli@linuxonhyperv.com> Reply-To: longli@microsoft.com X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS,USER_IN_DEF_SPF_WL 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747344121547994938?= X-GMAIL-MSGID: =?utf-8?q?1747344121547994938?= From: Long Li 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. Reviewed-by: Dexuan Cui Signed-off-by: Long Li Acked-by: Haiyang Zhang --- 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 ffa2a0e2c213..f6bcd0cc6cda 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -189,7 +189,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 72eaec2470c0..0b0c0cd0b6bd 100644 --- a/include/net/mana/gdma.h +++ b/include/net/mana/gdma.h @@ -427,6 +427,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 6e9e86fb4c02..713a8f8cca9a 100644 --- a/include/net/mana/mana.h +++ b/include/net/mana/mana.h @@ -265,8 +265,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; @@ -276,7 +274,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