From patchwork Tue Oct 13 13:45:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 80517 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CCF14A04B7; Tue, 13 Oct 2020 15:48:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 15AB61DBB7; Tue, 13 Oct 2020 15:46:18 +0200 (CEST) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id D07A41DA8F for ; Tue, 13 Oct 2020 15:46:02 +0200 (CEST) Received: from mx1-us1.ppe-hosted.com (unknown [10.110.50.143]) by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 6B32B20096 for ; Tue, 13 Oct 2020 13:46:01 +0000 (UTC) Received: from us4-mdac16-40.at1.mdlocal (unknown [10.110.51.55]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 69FBE8009B for ; Tue, 13 Oct 2020 13:46:01 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.110.49.106]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 04BDF4007E for ; Tue, 13 Oct 2020 13:46:01 +0000 (UTC) Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id C0A1EB40072 for ; Tue, 13 Oct 2020 13:46:00 +0000 (UTC) Received: from ukex01.SolarFlarecom.com (10.17.10.4) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 13 Oct 2020 14:45:56 +0100 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 13 Oct 2020 14:45:55 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (ukv-loginhost.uk.solarflarecom.com [10.17.10.39]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 09DDjt2T006011; Tue, 13 Oct 2020 14:45:55 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 9AD441613A9; Tue, 13 Oct 2020 14:45:55 +0100 (BST) From: Andrew Rybchenko To: CC: Igor Romanov Date: Tue, 13 Oct 2020 14:45:24 +0100 Message-ID: <1602596753-32282-8-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1602596753-32282-1-git-send-email-arybchenko@solarflare.com> References: <1602596753-32282-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.6.1012-25722.003 X-TM-AS-Result: No-2.294400-8.000000-10 X-TMASE-MatchedRID: dydEoroocbOQ3kQwYrE0yKfOxh7hvX713/sybDt23/4dXtyyzrIOt254 wXAMmy/8PEoGb8keCDpTvVffeIwvQ60iin8P0KjVPwKTD1v8YV5MkOX0Uoduucc322cceBeEbKk ttqpnhv3KMO9OVP8AdS9r+L3LjrGVX9vT/VxM5p9mPsTq8ee41kpFpc3bJiMe7L2+zGEubN49XS +aqhvjaeLzNWBegCW2wgn7iDBesS0nRE+fI6etkpW0k3Xjh9tEMQpncIpbJkxvWyxh0mR7TAdNd kx/Vmw2djfHGFMOJZSO5o53VRuM5/xrtUX1cKrOh/5jQIJDkxLJQIHSmb2DI71NuKS30BZnQIFI ZLtsgG0DUH+nVLNyiCsqIP9TxvtJMb6p570ilnc= X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--2.294400-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.6.1012-25722.003 X-MDID: 1602596761-6-SR01uxm9F0 X-PPE-DISP: 1602596761;6-SR01uxm9F0 Subject: [dpdk-dev] [PATCH 07/36] net/sfc: check vs maximum number of Rx scatter buffers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Igor Romanov Update generic code to check that MTU and Rx buffer sizes do not result in more Rx scatter segments than NIC can make. Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_ethdev.c | 3 ++- drivers/net/sfc/sfc_rx.c | 17 ++++++++++++++--- drivers/net/sfc/sfc_rx.h | 1 + 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index f41d0f5fe2..ca1b99a00f 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -954,7 +954,8 @@ sfc_check_scatter_on_all_rx_queues(struct sfc_adapter *sa, size_t pdu) if (!sfc_rx_check_scatter(pdu, sa->rxq_ctrl[i].buf_size, encp->enc_rx_prefix_size, - scatter_enabled, &error)) { + scatter_enabled, + encp->enc_rx_scatter_max, &error)) { sfc_err(sa, "MTU check for RxQ %u failed: %s", i, error); return EINVAL; diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c index 3e5c8e42da..7c50fe58b8 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -378,10 +378,20 @@ sfc_efx_rx_qdesc_status(struct sfc_dp_rxq *dp_rxq, uint16_t offset) boolean_t sfc_rx_check_scatter(size_t pdu, size_t rx_buf_size, uint32_t rx_prefix_size, - boolean_t rx_scatter_enabled, const char **error) + boolean_t rx_scatter_enabled, uint32_t rx_scatter_max, + const char **error) { - if ((rx_buf_size < pdu + rx_prefix_size) && !rx_scatter_enabled) { - *error = "Rx scatter is disabled and RxQ mbuf pool object size is too small"; + uint32_t effective_rx_scatter_max; + uint32_t rx_scatter_bufs; + + effective_rx_scatter_max = rx_scatter_enabled ? rx_scatter_max : 1; + rx_scatter_bufs = EFX_DIV_ROUND_UP(pdu + rx_prefix_size, rx_buf_size); + + if (rx_scatter_bufs > effective_rx_scatter_max) { + if (rx_scatter_enabled) + *error = "Possible number of Rx scatter buffers exceeds maximum number"; + else + *error = "Rx scatter is disabled and RxQ mbuf pool object size is too small"; return B_FALSE; } @@ -1084,6 +1094,7 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index, if (!sfc_rx_check_scatter(sa->port.pdu, buf_size, encp->enc_rx_prefix_size, (offloads & DEV_RX_OFFLOAD_SCATTER), + encp->enc_rx_scatter_max, &error)) { sfc_err(sa, "RxQ %u MTU check failed: %s", sw_index, error); sfc_err(sa, "RxQ %u calculated Rx buffer size is %u vs " diff --git a/drivers/net/sfc/sfc_rx.h b/drivers/net/sfc/sfc_rx.h index b0b5327a49..d6ee9cf802 100644 --- a/drivers/net/sfc/sfc_rx.h +++ b/drivers/net/sfc/sfc_rx.h @@ -147,6 +147,7 @@ uint64_t sfc_rx_hf_efx_to_rte(struct sfc_rss *rss, efx_rx_hash_type_t efx); boolean_t sfc_rx_check_scatter(size_t pdu, size_t rx_buf_size, uint32_t rx_prefix_size, boolean_t rx_scatter_enabled, + uint32_t rx_scatter_max, const char **error); #ifdef __cplusplus