From nobody Tue Nov 26 15:35:48 2024 Received: from mx1.t-argos.ru (mx1.t-argos.ru [109.73.34.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 750F91D9677; Thu, 17 Oct 2024 10:09:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=109.73.34.58 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729159768; cv=none; b=NbujYgQRUcr7J+Nw7MvS5PUgHmX3nSREb4m2rHwbxKzyNRmmbeXZF9xGkYCAF6NBwZwDrUAEDz+iiiS8kGO5wuJFUSpSqapbzSn2hzEOFbefIBEZs8KPF4/aQXqkQuJNk924KuNfVx0WOgKwOVdtw0pqEV/WpoNnTHZRFwbCFLk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729159768; c=relaxed/simple; bh=iBDHNPmA0rZe8zhFkOEkuSp9OXesrimhWdyxHD9fRnw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=S18K3t77AbYFqPHhdQzGg4EeWETiDJKE68VqiEQhh1CADlH1ltXVhrESNojEdDLTgRbzaaduIfTnZV1tXCo2lDFhkyW6SwXi1/jLoevpPr65JBJt7t/EOvqPVepWqCgfB/iPYPOeM98rQM6d5oM092b6UdKB3RFIBOKpoBo4+TE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=t-argos.ru; spf=pass smtp.mailfrom=t-argos.ru; dkim=pass (2048-bit key) header.d=t-argos.ru header.i=@t-argos.ru header.b=S2bnxns9; arc=none smtp.client-ip=109.73.34.58 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=t-argos.ru Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=t-argos.ru Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=t-argos.ru header.i=@t-argos.ru header.b="S2bnxns9" Received: from mx1.t-argos.ru (localhost [127.0.0.1]) by mx1.t-argos.ru (Postfix) with ESMTP id 8191D10000A; Thu, 17 Oct 2024 13:09:07 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t-argos.ru; s=mail; t=1729159747; bh=uRYLmJ8aJYKdwU/1v18RZIA4g8rsNWlg2Md1dnpX5jA=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=S2bnxns9ZQT+mBADwS4p21uOEw0oGU02K6vdQBut/Iv2inWH7Z6LbocxYORB+oOpQ 6scIL5Y+8CwXJrXfmdWimXGg8FExMmCn1pqHykFsJVZJAdjW/R6PVMP1+ZX0yE7Maj RsjowLPh9Z7siMuMs2DzxwxAB6SMQZfxI3gE/V+6TGW+29AERlODQOujcTKRVtsY8M k9R04+/CzFGxH2czis+YQOFmxZMSLJucQte7d8gFM98G4t4SyanaXJVnuj3sLBNWl/ ZQxjHmT9u9At/XpO3nshhHii3xOwpJeNtjx9/Z/73PsxRx5Wj0QOsWVo9r1YPM7KYr lPkB3VBAoAKQA== Received: from mx1.t-argos.ru.ru (ta-mail-02.ta.t-argos.ru [172.17.13.212]) by mx1.t-argos.ru (Postfix) with ESMTP; Thu, 17 Oct 2024 13:08:00 +0300 (MSK) Received: from Comp.ta.t-argos.ru (172.17.44.124) by ta-mail-02 (172.17.13.212) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Thu, 17 Oct 2024 13:07:05 +0300 From: Aleksandr Mishin To: Veerasenareddy Burru , Abhijit Ayarekar , Satananda Burla , Sathesh Edara CC: Aleksandr Mishin , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , , , , Simon Horman Subject: [PATCH net v5 1/2] octeon_ep: Implement helper for iterating packets in Rx queue Date: Thu, 17 Oct 2024 13:06:50 +0300 Message-ID: <20241017100651.15863-2-amishin@t-argos.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20241017100651.15863-1-amishin@t-argos.ru> References: <20241017100651.15863-1-amishin@t-argos.ru> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: ta-mail-02.ta.t-argos.ru (172.17.13.212) To ta-mail-02 (172.17.13.212) X-KSMG-Rule-ID: 1 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 188506 [Oct 17 2024] X-KSMG-AntiSpam-Version: 6.1.0.4 X-KSMG-AntiSpam-Envelope-From: amishin@t-argos.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 39 0.3.39 e168d0b3ce73b485ab2648dd465313add1404cce, {Tracking_uf_ne_domains}, {Tracking_from_domain_doesnt_match_to}, mx1.t-argos.ru.ru:7.1.1;t-argos.ru:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2;lore.kernel.org:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean, bases: 2024/10/17 09:58:00 X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2024/10/17 05:21:00 #26765332 X-KSMG-AntiVirus-Status: Clean, skipped Content-Type: text/plain; charset="utf-8" The common code with some packet and index manipulations is extracted and moved to newly implemented helper to make the code more readable and avoid duplication. This is a preparation for skb allocation failure handling. Found by Linux Verification Center (linuxtesting.org) with SVACE. Suggested-by: Simon Horman Suggested-by: Paolo Abeni Signed-off-by: Aleksandr Mishin Reviewed-by: Jacob Keller --- Compile tested only. v5: - Unmap paged buffer before the skb creation as suggested by Paolo (https://lore.kernel.org/all/cf656975-69b4-427e-8769-d16575774bba@redha= t.com/) v4: https://lore.kernel.org/all/20241012094950.9438-1-amishin@t-argos.ru/ - Split patch up as suggested by Jakub (https://lore.kernel.org/all/20241004073311.223efca4@kernel.org/) v3: https://lore.kernel.org/all/20240930053328.9618-1-amishin@t-argos.ru/ - Implement helper which frees current packet resources and increase index and descriptor as suggested by Simon (https://lore.kernel.org/all/20240919134812.GB1571683@kernel.org/) - v3 has been reviewed-by Simon Horman (https://lore.kernel.org/all/20240930162622.GF1310185@kernel.org/) v1: https://lore.kernel.org/all/20240906063907.9591-1-amishin@t-argos.ru/ .../net/ethernet/marvell/octeon_ep/octep_rx.c | 55 +++++++++++-------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c b/drivers/ne= t/ethernet/marvell/octeon_ep/octep_rx.c index 4746a6b258f0..a889c1510518 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c @@ -336,6 +336,30 @@ static int octep_oq_check_hw_for_pkts(struct octep_dev= ice *oct, return new_pkts; } =20 +/** + * octep_oq_next_pkt() - Move to the next packet in Rx queue. + * + * @oq: Octeon Rx queue data structure. + * @buff_info: Current packet buffer info. + * @read_idx: Current packet index in the ring. + * @desc_used: Current packet descriptor number. + * + * Free the resources associated with a packet. + * Increment packet index in the ring and packet descriptor number. + */ +static void octep_oq_next_pkt(struct octep_oq *oq, + struct octep_rx_buffer *buff_info, + u32 *read_idx, u32 *desc_used) +{ + dma_unmap_page(oq->dev, oq->desc_ring[*read_idx].buffer_ptr, + PAGE_SIZE, DMA_FROM_DEVICE); + buff_info->page =3D NULL; + (*read_idx)++; + (*desc_used)++; + if (*read_idx =3D=3D oq->max_count) + *read_idx =3D 0; +} + /** * __octep_oq_process_rx() - Process hardware Rx queue and push to stack. * @@ -367,10 +391,7 @@ static int __octep_oq_process_rx(struct octep_device *= oct, desc_used =3D 0; for (pkt =3D 0; pkt < pkts_to_process; pkt++) { buff_info =3D (struct octep_rx_buffer *)&oq->buff_info[read_idx]; - dma_unmap_page(oq->dev, oq->desc_ring[read_idx].buffer_ptr, - PAGE_SIZE, DMA_FROM_DEVICE); resp_hw =3D page_address(buff_info->page); - buff_info->page =3D NULL; =20 /* Swap the length field that is in Big-Endian to CPU */ buff_info->len =3D be64_to_cpu(resp_hw->length); @@ -394,36 +415,27 @@ static int __octep_oq_process_rx(struct octep_device = *oct, data_offset =3D OCTEP_OQ_RESP_HW_SIZE; rx_ol_flags =3D 0; } + + octep_oq_next_pkt(oq, buff_info, &read_idx, &desc_used); + + skb =3D build_skb((void *)resp_hw, PAGE_SIZE); + skb_reserve(skb, data_offset); + rx_bytes +=3D buff_info->len; =20 if (buff_info->len <=3D oq->max_single_buffer_size) { - skb =3D build_skb((void *)resp_hw, PAGE_SIZE); - skb_reserve(skb, data_offset); skb_put(skb, buff_info->len); - read_idx++; - desc_used++; - if (read_idx =3D=3D oq->max_count) - read_idx =3D 0; } else { struct skb_shared_info *shinfo; u16 data_len; =20 - skb =3D build_skb((void *)resp_hw, PAGE_SIZE); - skb_reserve(skb, data_offset); /* Head fragment includes response header(s); * subsequent fragments contains only data. */ skb_put(skb, oq->max_single_buffer_size); - read_idx++; - desc_used++; - if (read_idx =3D=3D oq->max_count) - read_idx =3D 0; - shinfo =3D skb_shinfo(skb); data_len =3D buff_info->len - oq->max_single_buffer_size; while (data_len) { - dma_unmap_page(oq->dev, oq->desc_ring[read_idx].buffer_ptr, - PAGE_SIZE, DMA_FROM_DEVICE); buff_info =3D (struct octep_rx_buffer *) &oq->buff_info[read_idx]; if (data_len < oq->buffer_size) { @@ -438,11 +450,8 @@ static int __octep_oq_process_rx(struct octep_device *= oct, buff_info->page, 0, buff_info->len, buff_info->len); - buff_info->page =3D NULL; - read_idx++; - desc_used++; - if (read_idx =3D=3D oq->max_count) - read_idx =3D 0; + + octep_oq_next_pkt(oq, buff_info, &read_idx, &desc_used); } } =20 --=20 2.30.2 From nobody Tue Nov 26 15:35:48 2024 Received: from mx1.t-argos.ru (mx1.t-argos.ru [109.73.34.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E6921DA109; Thu, 17 Oct 2024 10:09:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=109.73.34.58 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729159792; cv=none; b=nXojA7L3TXvhIsQnAZhGD8hHdqa7pmKvmN1iINvvP534hzQCMue4+O7LrBkvv47usqoOsyvKtyDQg90anxydA1oyc2saOByJ5GIuUuL9JnCByXNsxcMUxCPJT8pZTPej+wS6gBxbf/M6p+lM2h5mbpLXvqRGrgHFpOgEKgMYLkA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729159792; c=relaxed/simple; bh=+bhHXwcb55SnWiF8KaDD5/LiMHXYDze02UDytzKIZZw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nfiHB7HBD2CVpR5cMDoUNHrpZZTKhb8IYHyAp1U0Nf1FgtnfMTFAWOYc7cduQl8G+lVqur3TH3H1I5LcDjwj0ECPAkIp5CQ2+/hE8ilUcuzEhNFMZemdUMMfLu8V+YekzSnT4WId5eLohkI/jaZ/56zpzXxYxAZWXskVqVFq4RE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=t-argos.ru; spf=pass smtp.mailfrom=t-argos.ru; dkim=pass (2048-bit key) header.d=t-argos.ru header.i=@t-argos.ru header.b=TY/gR5yr; arc=none smtp.client-ip=109.73.34.58 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=t-argos.ru Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=t-argos.ru Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=t-argos.ru header.i=@t-argos.ru header.b="TY/gR5yr" Received: from mx1.t-argos.ru (localhost [127.0.0.1]) by mx1.t-argos.ru (Postfix) with ESMTP id 67F1D100009; Thu, 17 Oct 2024 13:09:32 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t-argos.ru; s=mail; t=1729159772; bh=YIV/RAinDIcXSNrlNeJ40M/saxtLocKX7l7RCOBaBMs=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=TY/gR5yr9kFqEDR7u185e1fpuS6dOrN0VWtxKK+OLNJrTEeURJzFUZZxk12Hwe6X7 Sxm8HYaA9GpE8zJ3zNDf9eGLfBLJ/rmGp6vmNtIXmMH10aAYb6CQFpc52hGhU2ip5t F4DucqmOPukENxNiutu3joLqvXxZG5KCURrC8SwEKzskZTDM5EmbAeyFS4WznvmGbw JIxxp4nusDpepsEcfRMyB9RNO5nU7x+Hw4CkDN4LuufToss2+PNeBSSrDRlugSciRS HC8DiLXSIMHDZwDAB6QCdgLa16f35SDtYoh08ZLLHtmFkBoR2YxzdzWW5sNwiWDtxh i1r9S27UT/+FQ== Received: from mx1.t-argos.ru.ru (ta-mail-02.ta.t-argos.ru [172.17.13.212]) by mx1.t-argos.ru (Postfix) with ESMTP; Thu, 17 Oct 2024 13:08:30 +0300 (MSK) Received: from Comp.ta.t-argos.ru (172.17.44.124) by ta-mail-02 (172.17.13.212) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Thu, 17 Oct 2024 13:07:05 +0300 From: Aleksandr Mishin To: Veerasenareddy Burru , Abhijit Ayarekar , Satananda Burla , Sathesh Edara CC: Aleksandr Mishin , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , , , Subject: [PATCH net v5 2/2] octeon_ep: Add SKB allocation failures handling in __octep_oq_process_rx() Date: Thu, 17 Oct 2024 13:06:51 +0300 Message-ID: <20241017100651.15863-3-amishin@t-argos.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20241017100651.15863-1-amishin@t-argos.ru> References: <20241017100651.15863-1-amishin@t-argos.ru> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: ta-mail-02.ta.t-argos.ru (172.17.13.212) To ta-mail-02 (172.17.13.212) X-KSMG-Rule-ID: 1 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 188506 [Oct 17 2024] X-KSMG-AntiSpam-Version: 6.1.0.4 X-KSMG-AntiSpam-Envelope-From: amishin@t-argos.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 39 0.3.39 e168d0b3ce73b485ab2648dd465313add1404cce, {Tracking_uf_ne_domains}, {Tracking_from_domain_doesnt_match_to}, 127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;lore.kernel.org:7.1.1;mx1.t-argos.ru.ru:7.1.1;t-argos.ru:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean, bases: 2024/10/17 09:58:00 X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2024/10/17 05:21:00 #26765332 X-KSMG-AntiVirus-Status: Clean, skipped Content-Type: text/plain; charset="utf-8" build_skb() returns NULL in case of a memory allocation failure so handle it inside __octep_oq_process_rx() to avoid NULL pointer dereference. __octep_oq_process_rx() is called during NAPI polling by the driver. If skb allocation fails, keep on pulling packets out of the Rx DMA queue: we shouldn't break the polling immediately and thus falsely indicate to the octep_napi_poll() that the Rx pressure is going down. As there is no associated skb in this case, don't process the packets and don't push them up the network stack - they are skipped. Helper function is implemented to unmmap/flush all the fragment buffers used by the dropped packet. 'alloc_failures' counter is incremented to mark the skb allocation error in driver statistics. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 37d79d059606 ("octeon_ep: add Tx/Rx processing and interrupt support= ") Suggested-by: Paolo Abeni Signed-off-by: Aleksandr Mishin Reviewed-by: Jacob Keller --- Compile tested only. v5: - Update helper as suggested by Paolo (https://lore.kernel.org/all/cf656975-69b4-427e-8769-d16575774bba@redha= t.com/) v4: https://lore.kernel.org/all/20241012094950.9438-1-amishin@t-argos.ru/ - Split patch up as suggested by Jakub (https://lore.kernel.org/all/20241004073311.223efca4@kernel.org/) v3: https://lore.kernel.org/all/20240930053328.9618-1-amishin@t-argos.ru/ - Optimize helper as suggested by Paolo (https://lore.kernel.org/all/b9ae8575-f903-425f-aa42-0c2a7605aa94@redha= t.com/) - v3 has been reviewed-by Simon Horman (https://lore.kernel.org/all/20240930162622.GF1310185@kernel.org/) v2: https://lore.kernel.org/all/20240916060212.12393-1-amishin@t-argos.ru/ - Implement helper instead of adding multiple checks for '!skb' and remove 'rx_bytes' increasing in case of packet dropping as suggested by Paolo (https://lore.kernel.org/all/ba514498-3706-413b-a09f-f577861eef28@redha= t.com/) v1: https://lore.kernel.org/all/20240906063907.9591-1-amishin@t-argos.ru/ .../net/ethernet/marvell/octeon_ep/octep_rx.c | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c b/drivers/ne= t/ethernet/marvell/octeon_ep/octep_rx.c index a889c1510518..8af75cb37c3e 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c @@ -360,6 +360,27 @@ static void octep_oq_next_pkt(struct octep_oq *oq, *read_idx =3D 0; } =20 +/** + * octep_oq_drop_rx() - Free the resources associated with a packet. + * + * @oq: Octeon Rx queue data structure. + * @buff_info: Current packet buffer info. + * @read_idx: Current packet index in the ring. + * @desc_used: Current packet descriptor number. + * + */ +static void octep_oq_drop_rx(struct octep_oq *oq, + struct octep_rx_buffer *buff_info, + u32 *read_idx, u32 *desc_used) +{ + int data_len =3D buff_info->len - oq->max_single_buffer_size; + + while (data_len > 0) { + octep_oq_next_pkt(oq, buff_info, read_idx, desc_used); + data_len -=3D oq->buffer_size; + }; +} + /** * __octep_oq_process_rx() - Process hardware Rx queue and push to stack. * @@ -419,6 +440,12 @@ static int __octep_oq_process_rx(struct octep_device *= oct, octep_oq_next_pkt(oq, buff_info, &read_idx, &desc_used); =20 skb =3D build_skb((void *)resp_hw, PAGE_SIZE); + if (!skb) { + octep_oq_drop_rx(oq, buff_info, + &read_idx, &desc_used); + oq->stats.alloc_failures++; + continue; + } skb_reserve(skb, data_offset); =20 rx_bytes +=3D buff_info->len; --=20 2.30.2