From patchwork Fri Jan 10 09:53:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Furong Xu <0x1207@gmail.com> X-Patchwork-Id: 13934132 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D5C620969D; Fri, 10 Jan 2025 09:54:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736502855; cv=none; b=a+1FTSZn2zCGIRF3OWlzhh8A3kHo4mcIyKZNtWukYWBObd1G3heE6Ktx47fQAq7msTHAqKTbx4Z5nbzm6n9cH/g1tD96yv2eY4Bo5eVyo9Es3LTpVD6c5X/sKf9wxW8GQvvRuDHJufCz8d/yYovCrUIoGbL+P2sAEO8BlY9I4IQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736502855; c=relaxed/simple; bh=U+eiV0d/i5OMqn8InIF1E943YQZtjb87eMZss1sSYJo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LIX7OlE19iSMwLBmxo3giKeqeutq/2BF+WRIl8FUBGRYxj/X64p/ghStmOG/IxLZDLATkZxrVyW6G2R03oHZ64b01kv4V6WLJQ/IkpMtLgKJIYiaPGk056KJ/3Io7gEtAZJiJD05OCyDzgxcYQ9GILLo2WpLDAKU3AUhxXRAUKk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RU3Zy6XM; arc=none smtp.client-ip=209.85.214.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RU3Zy6XM" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-21661be2c2dso28682825ad.1; Fri, 10 Jan 2025 01:54:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736502852; x=1737107652; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SxF3XO1B6LZpy7SsHuT7EE8l6m2FcLCgWD0toKoIsSE=; b=RU3Zy6XMQV6i/nzTU9/q0sLMg3ju1h54L0NWFA//UqnHfxRw4bn0ppwx6EVLlLvfZ+ QBS5jrIWWGtffFSgUUMnUtJX/DbFY9ZlTvlrKnn6ocvpr4GKajCJvzR40zcORg5rI1J1 NYNaPBStEVJBpo7PYwRhcALi3YOPuJqxeAkDVgHMmWlg+M9Av96Sqg9qnHkSCDoEPGpx yhrHWo03W9cwsuT5GejORN1SpYTCJtIbrPGyCM/n5iUtbM85odEtJiprbLyWzZcOBVlw 2buL5Pk49BI29/63XjmVWvR8N65UOkF4PyJhTNjyEO7PEBx3kj6Kt+1m+K1KfVRZVzc9 zJpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736502852; x=1737107652; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SxF3XO1B6LZpy7SsHuT7EE8l6m2FcLCgWD0toKoIsSE=; b=F5zfbQjFVYZEyYEKbjaD0OjEdDhx4thVv6XG9WHNZNHoYdCfKCPxg6tWkZFqcaoXmO tq1+ZGD2cvaQS3MawSosFezz4VAb8b1OYSxdCe2H8BJ/7koIf5ZXNUPM1H9YB8J7AycZ +6gZVpZfMRb99y5WUm2oK06+5DgVENNxGobiXM9Vm8IOn2JO+W/DBFnjlwOjd7ObNUpC 1HcLSOXo2iBQ/hhPa1hpIstdsmeWuZUJ4wmTsOxKWvgb73RVJHh8rnzPwCBCaRYnctR7 iN1iz7oRF4uXWYcLlfSEB3wjCKQHziKQs6kIUlirdTnRQwZYdSOtpSrRmADAaQlcrlOL IBzg== X-Forwarded-Encrypted: i=1; AJvYcCU9hByJsWACLVtRrHDOZEstqMOHn+HCPX55mDVpj9aQi1LxHe9K/oSYHWEyvt1+K9g8kjV17vJJhp8/mnU=@vger.kernel.org X-Gm-Message-State: AOJu0YyaGhEYbi5Tt3CU5UjsRK32cHdnIFrKI5xhehbKlrEnEZU67Dt1 afhQBG6R6IrpbCAYjT+Asbh5GWZHnXVz8leKwLCCAKjHhZti1M+z9/bj/Q== X-Gm-Gg: ASbGncuBLg5WLaiTN09dUYv1/Qn22a06uktiPKUBQC7uILmNXHwG6TcLcCASrFhzWMf Fh+1IvXKG2URo0bzZ1ayGxEXvh42yaNYNZjZL47veBDwsfDFHdstf8QAQl4p8y8w1tD4+cvPHJi xE1r5r9hlnSwZWjXyr9Ku+cIMWSrxV3CxoWjcexRMA/4YWbAh1nn7lv+OMzFZ9eNfy8LK1Nm7IS EnCf1/L15lRvnDJRA/dGCJO3OJaEgejyuKLbX1/knAV+AWXnR9KNoh400kda6GaEuRZgA== X-Google-Smtp-Source: AGHT+IFkCU9VmZRMCAwHW5xP2aexBm6vAYxF+cTLnmmRPs6gpn7mMaFELbrG88Frm/BNN1k4tXE+QA== X-Received: by 2002:a05:6a00:1404:b0:725:d9b6:3958 with SMTP id d2e1a72fcca58-72d21f471c5mr15157812b3a.14.1736502852468; Fri, 10 Jan 2025 01:54:12 -0800 (PST) Received: from localhost.localdomain ([129.146.253.192]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-72d4069217dsm1186183b3a.151.2025.01.10.01.54.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2025 01:54:12 -0800 (PST) From: Furong Xu <0x1207@gmail.com> To: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , xfr@outlook.com, Furong Xu <0x1207@gmail.com> Subject: [PATCH net-next v1 1/3] net: stmmac: Switch to zero-copy in non-XDP RX path Date: Fri, 10 Jan 2025 17:53:57 +0800 Message-Id: <600c76e88b6510f6a4635401ec1e224b3bbb76ec.1736500685.git.0x1207@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Avoid memcpy in non-XDP RX path by marking all allocated SKBs to be recycled in the upper network stack. This patch brings ~11.5% driver performance improvement in a TCP RX throughput test with iPerf tool on a single isolated Cortex-A65 CPU core, from 2.18 Gbits/sec increased to 2.43 Gbits/sec. Signed-off-by: Furong Xu <0x1207@gmail.com> --- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + .../net/ethernet/stmicro/stmmac/stmmac_main.c | 23 +++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index 548b28fed9b6..5c39292313de 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -126,6 +126,7 @@ struct stmmac_rx_queue { unsigned int cur_rx; unsigned int dirty_rx; unsigned int buf_alloc_num; + unsigned int napi_skb_frag_size; dma_addr_t dma_rx_phy; u32 rx_tail_addr; unsigned int state_saved; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 038df1b2bb58..43125a6f8f6b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1320,7 +1320,7 @@ static unsigned int stmmac_rx_offset(struct stmmac_priv *priv) if (stmmac_xdp_is_enabled(priv)) return XDP_PACKET_HEADROOM; - return 0; + return NET_SKB_PAD; } static int stmmac_set_bfsize(int mtu, int bufsize) @@ -2019,17 +2019,21 @@ static int __alloc_dma_rx_desc_resources(struct stmmac_priv *priv, struct stmmac_channel *ch = &priv->channel[queue]; bool xdp_prog = stmmac_xdp_is_enabled(priv); struct page_pool_params pp_params = { 0 }; - unsigned int num_pages; + unsigned int dma_buf_sz_pad, num_pages; unsigned int napi_id; int ret; + dma_buf_sz_pad = stmmac_rx_offset(priv) + dma_conf->dma_buf_sz + + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); + num_pages = DIV_ROUND_UP(dma_buf_sz_pad, PAGE_SIZE); + rx_q->queue_index = queue; rx_q->priv_data = priv; + rx_q->napi_skb_frag_size = num_pages * PAGE_SIZE; pp_params.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV; pp_params.pool_size = dma_conf->dma_rx_size; - num_pages = DIV_ROUND_UP(dma_conf->dma_buf_sz, PAGE_SIZE); - pp_params.order = ilog2(num_pages); + pp_params.order = order_base_2(num_pages); pp_params.nid = dev_to_node(priv->device); pp_params.dev = priv->device; pp_params.dma_dir = xdp_prog ? DMA_BIDIRECTIONAL : DMA_FROM_DEVICE; @@ -5574,19 +5578,20 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) /* XDP program may expand or reduce tail */ buf1_len = ctx.xdp.data_end - ctx.xdp.data; - skb = napi_alloc_skb(&ch->rx_napi, buf1_len); + skb = napi_build_skb(page_address(buf->page), + rx_q->napi_skb_frag_size); if (!skb) { + page_pool_recycle_direct(rx_q->page_pool, + buf->page); rx_dropped++; count++; goto drain_data; } /* XDP program may adjust header */ - skb_copy_to_linear_data(skb, ctx.xdp.data, buf1_len); + skb_reserve(skb, ctx.xdp.data - ctx.xdp.data_hard_start); skb_put(skb, buf1_len); - - /* Data payload copied into SKB, page ready for recycle */ - page_pool_recycle_direct(rx_q->page_pool, buf->page); + skb_mark_for_recycle(skb); buf->page = NULL; } else if (buf1_len) { dma_sync_single_for_cpu(priv->device, buf->addr, From patchwork Fri Jan 10 09:53:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Furong Xu <0x1207@gmail.com> X-Patchwork-Id: 13934133 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47B01207A2A; Fri, 10 Jan 2025 09:54:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736502861; cv=none; b=Reu2XnMzCCMMVG76JrCEjfsTIa3u2FI/uXwmTO67krBmTjefnrZzAetn3R3ARQG/LjVHkvrrwr/dZ3aV3c4XDw+5TXZncHOunbZS2dUe3ksnjUaUexK0D3UNnZ1k7VoXuQ+Diei2w8IscrSrCyI2LJVWh154XhE/0YK2mxMrIOw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736502861; c=relaxed/simple; bh=30f2ez8x6hKGpO7dpUM7/KVxepJSM03jK0tXKMas4N4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AV0j6YU73GELmqEiPo1Yv624lvBPXMAJQF6galnTs+ftbFwvyKmmPmikh00B2hmXvYcE6MX1F4RV1oLyUMC3oykqoIvnEfoc54O8X3b2pYgKSZd8EGM6G+/WXeFBteIp/E8WQfho2pZtXRyCYyO/aMvSVo9cOrpbAa06Ni2BJa8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=S3j3unXX; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="S3j3unXX" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-21628b3fe7dso30898095ad.3; Fri, 10 Jan 2025 01:54:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736502857; x=1737107657; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SUq/PWSOM6Jgkh8a1Vg6y06uVsWzXgd/e9CTRW/3aLI=; b=S3j3unXXQGGivR+BiIy6kq77PxlzAqG7CqcuY4i1bF8+Przn3odAAWgbPSH8UIP43o LENsPLoX4xLYS14socGBBONp8R5EHioTZzzmAcXpbudVpRY8GNTFL8EMVzXjfg7McWVs m8ZeHzsUnKT0L2yIBJcHx239l4viGUKQs3AMNOprMcjulRhwlfipCVn40YxhWLVjExAI nwJeag5+9ksmCpnFRDDM5PgQGM++8SA8CV9F8Xe5U9hX/oMEhnNWo37WH71a5nuoDQuO R/W7gUpNLk9wc4ednvp5Z4cfE6GKARhBUhpyFe4GfqFHYOYs3cdWKN4u1j7a8NUdxiqf lGnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736502857; x=1737107657; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SUq/PWSOM6Jgkh8a1Vg6y06uVsWzXgd/e9CTRW/3aLI=; b=LQRGHQaoS/7eT4X/3ZSOL/Q+J4SJLzcPJsSXOP+wJyI3fj0AFbGau0QU0rr9zgAWqL Q6nqsB+P8edA/DkOhNnJTkOry80/VMPp2tXYWLt9ydCstNnqHGaAhX/M7w3WihzCDFf/ CH3Swat4msFwjMH6iMYwmIXfLR66n368nAkZ3o4SBQDY6qd6HuMMWxBVu0yyOnYUNzTy tkOTVs84B1qtXcUt1oL/qz1z2vrWh89IhqZ7mYQmCccWK54Hvl7FC3QiRWlCnfnbTX2i Uu2/bPvYJy9bl2s+q28jfYMFSVeAQOZl7l0sejBvaHqdk+rUDTL9SHSCSxjtq7iZvWaK UlhA== X-Forwarded-Encrypted: i=1; AJvYcCUhJu5ycC+z2hZuaxw+3agLtO81cXBWmansH4I+stznDmkb8g/VyF/8welf+fF7uNRv7chegPtIvC7w2SY=@vger.kernel.org X-Gm-Message-State: AOJu0YxwMcwOlBtMFtwjtoon6az29LloVKyIQP4aovlQX0DAGDU51X+2 GnSsUzJtHEnnC0gj+txijBjqAg0ZBp0VQ+NPyCuqEprFT+V2DMfGxEBhOw== X-Gm-Gg: ASbGnctx9TEFoyDcmn75g+kS9SrvMrQydyHvJsa3E8uvQ5iTRkVtZFOLfSasCZUhG8q gPnI4gmYAknIYvofUx/cHQyqb+1tzFX5LP4kJq9nrj4VILaBFoTs8YrtuMhk02JrRMNz6efKPu2 BN3eC5NcT7VwRswpHgtTtZ3ZQuw0dN9dCE5vbXOT4ohkqtKc5yRAQn4yr0CLApLtHSOtH9hGCq0 zFOYXsU1OhYLzclo1eiL9cTgxZ3G4G07pjtJIn6k4o07GuQZiGUnIvaxbZYluFxe1okcw== X-Google-Smtp-Source: AGHT+IHNOyExXpjKEAJvj5VF4TsAcm/8iRdMra6jEOVD+0OivVdVmbGUe1wn2Z9fO5OhUfPCMwcgdA== X-Received: by 2002:a05:6a00:91cb:b0:72a:bc54:84a5 with SMTP id d2e1a72fcca58-72d21f296edmr12960201b3a.6.1736502856641; Fri, 10 Jan 2025 01:54:16 -0800 (PST) Received: from localhost.localdomain ([129.146.253.192]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-72d4069217dsm1186183b3a.151.2025.01.10.01.54.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2025 01:54:16 -0800 (PST) From: Furong Xu <0x1207@gmail.com> To: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , xfr@outlook.com, Furong Xu <0x1207@gmail.com> Subject: [PATCH net-next v1 2/3] net: stmmac: Set page_pool_params.max_len to a precise size Date: Fri, 10 Jan 2025 17:53:58 +0800 Message-Id: <4bfc67ece5ef615ce65972173f5256f10ea27f9a.1736500685.git.0x1207@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org DMA engine will always write no more than dma_buf_sz bytes of a received frame into a page buffer, the remaining spaces are unused or used by CPU exclusively. Setting page_pool_params.max_len to almost the full size of page(s) helps nothing more, but wastes more CPU cycles on cache maintenance. For a standard MTU of 1500, then dma_buf_sz is assigned to 1536, and this patch brings ~16.9% driver performance improvement in a TCP RX throughput test with iPerf tool on a single isolated Cortex-A65 CPU core, from 2.43 Gbits/sec increased to 2.84 Gbits/sec. Signed-off-by: Furong Xu <0x1207@gmail.com> --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 43125a6f8f6b..c1aeaec53b4c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2038,7 +2038,7 @@ static int __alloc_dma_rx_desc_resources(struct stmmac_priv *priv, pp_params.dev = priv->device; pp_params.dma_dir = xdp_prog ? DMA_BIDIRECTIONAL : DMA_FROM_DEVICE; pp_params.offset = stmmac_rx_offset(priv); - pp_params.max_len = STMMAC_MAX_RX_BUF_SIZE(num_pages); + pp_params.max_len = dma_conf->dma_buf_sz; rx_q->page_pool = page_pool_create(&pp_params); if (IS_ERR(rx_q->page_pool)) { diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.h b/drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.h index 896dc987d4ef..77ce8cfbe976 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.h @@ -4,7 +4,6 @@ #ifndef _STMMAC_XDP_H_ #define _STMMAC_XDP_H_ -#define STMMAC_MAX_RX_BUF_SIZE(num) (((num) * PAGE_SIZE) - XDP_PACKET_HEADROOM) #define STMMAC_RX_DMA_ATTR (DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_WEAK_ORDERING) int stmmac_xdp_setup_pool(struct stmmac_priv *priv, struct xsk_buff_pool *pool, From patchwork Fri Jan 10 09:53:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Furong Xu <0x1207@gmail.com> X-Patchwork-Id: 13934134 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2686A20ADCA; Fri, 10 Jan 2025 09:54:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736502863; cv=none; b=Li89YAr34tsbc55wZMscx4hVIcUWlgESuPpSDutn+mYlQfrip+iukgzzl+yeWS/riFVJbUv+CO7mlMAxnH3Y0Ds+tqHBmmPSiH4MrWAeaAazIzH9NG6CORPEJ8/XXr+h/fqfsLoOjkJEZ8FSjnCFs1jKgS9HMgwQE41iwEZeVPM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736502863; c=relaxed/simple; bh=MDiHtDtCxAKrxu2Y8Tbr5jhnAYSpC+h1/eBK8wy37us=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AMlgtSzQ9QGFk9MlnnRzfQeXlCARvUsHqT9L0sNOJ9J+RFY7+fckSo+iS0dfwLLM3oHDah+jEVpRP0+yHNroCSyURM8WqgPSiNyAVnMrjZmskAHkpUOqnGkIgmijbqwqT4123WiGbYKfiWl7DnCnBC6BvGFIqW1vx71mfL8Bixo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RAQ0A+Se; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RAQ0A+Se" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2165448243fso34107385ad.1; Fri, 10 Jan 2025 01:54:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736502861; x=1737107661; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ion4rvgZVuG6XSBAcwwShmk186Mw8JOkfuQ4D1b8sOM=; b=RAQ0A+SeHPbm03SVc5K/8FQB+wiX+X/5vUqwYdFJAaMIKE/l5qy5l33Mjsc7ztN3XF o9IOFmqA580cq/5sVmVVMDuiANxWxgVlhGg4IykEFqgAqKsVstYwGskICSxY+8c57qGp krKGRYcqwOAgWK8tqJevWBQX1dRpuE8v1wziH8Gvlg83gYHXwF5czZkA/TDswfiUpwTu 5jeOBv56gBKn3r3EC9BIldR/jl4jMmqtiOnfgGI86bwqmcBqPflrjEaLcpFjPhB/a7g/ tpx+rnYWqxv7ygu3toorxXnbQMmV4ir52UpdkbNmkqJaCAQei0DjAmkS7H0ZBKREl8PA qOfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736502861; x=1737107661; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ion4rvgZVuG6XSBAcwwShmk186Mw8JOkfuQ4D1b8sOM=; b=ddNr8BO9e4a7DcGN7DfRafk+kOL8obIuV/TJev5QEZiVMXx+sN2ZiB244vYnbtO1X5 EnT2EM8m7O6OvMxEZIeB74t4QUKHahOP2v5+L6BmpxRkm4W9AbUuAEXqh9tD5gyGYPfx vJhUA7NDu0mVCHH/qLXs7hbJTep3Qb6Eg69Lnrfwkw7x8yl948ct0WYtgTymmSyOed57 foJc6D8BUOV8FyCl1BNd1rE5zlxKOnTSq+1/pOLs7NnjmpgdN+6nXflh0BRfBO4hRJmP sBbjEOu/YZXcQAnGWQbr8mi7hoNXLxjx+wCtpu2qMQnYpHyVHeLZTtRfpc3cqzc4RSaf mnlw== X-Forwarded-Encrypted: i=1; AJvYcCWX0FRxlhhh7Ijbf/T33Z3LoCA0wqN4FLnpn5lyW6R2/COh9bce1xJtzI2srRrFGI5xvtRu5VEOY/laJYQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzbtAX6XeecxrApa/t5zSyLY5f99Tg8Gp3JqAQ0gxUcAuKSb349 amvuj7Y7sN8bR1KE6VxnKWevBLGVIc1/OlUtBFd6xuhVAgB0l9RqqqKT4g== X-Gm-Gg: ASbGncuEstLfvAY7PU0i2MM6+U5SxAt/iYLAElyC6RCrCwDzxYgDjl6O8WK2aj3DJWd tIyqU75q8ZAQ52PnFlF0Y7F/Eu+H1nu0GMRYBy7v684bF24K+j+yllJojYWDAyyK5gO3pMd800Q XzHq0RY1vf9xYdKPNl/YSwY3GFx/W2Fo0y6rizmWzbP+KX1eD1TdfZJBUaI6sdC+NuRldkmRWpR amC4NboIrJkEqHZL+GLapcLSYmvqoP6qRL2ylQ/hPb6Enl/5nJ9CINLJnldWEsFQQdTSw== X-Google-Smtp-Source: AGHT+IFujh/KkTTFRhKx5MyKUB6ge9k+IJCqCvJTkEaAIWn/8HcGt05DziMhWszOmGBiewczqCOY1A== X-Received: by 2002:a05:6a21:339b:b0:1e8:bd4e:c330 with SMTP id adf61e73a8af0-1e8bd4ec502mr734199637.30.1736502861030; Fri, 10 Jan 2025 01:54:21 -0800 (PST) Received: from localhost.localdomain ([129.146.253.192]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-72d4069217dsm1186183b3a.151.2025.01.10.01.54.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2025 01:54:20 -0800 (PST) From: Furong Xu <0x1207@gmail.com> To: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , xfr@outlook.com, Furong Xu <0x1207@gmail.com> Subject: [PATCH net-next v1 3/3] net: stmmac: Optimize cache prefetch in RX path Date: Fri, 10 Jan 2025 17:53:59 +0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Current code prefetches cache lines for the received frame first, and then dma_sync_single_for_cpu() against this frame, this is wrong. Cache prefetch should be triggered after dma_sync_single_for_cpu(). This patch brings ~2.8% driver performance improvement in a TCP RX throughput test with iPerf tool on a single isolated Cortex-A65 CPU core, 2.84 Gbits/sec increased to 2.92 Gbits/sec. Signed-off-by: Furong Xu <0x1207@gmail.com> --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index c1aeaec53b4c..1b4e8b035b1a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5497,10 +5497,6 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) /* Buffer is good. Go on. */ - prefetch(page_address(buf->page) + buf->page_offset); - if (buf->sec_page) - prefetch(page_address(buf->sec_page)); - buf1_len = stmmac_rx_buf1_len(priv, p, status, len); len += buf1_len; buf2_len = stmmac_rx_buf2_len(priv, p, status, len); @@ -5522,6 +5518,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) dma_sync_single_for_cpu(priv->device, buf->addr, buf1_len, dma_dir); + prefetch(page_address(buf->page) + buf->page_offset); xdp_init_buff(&ctx.xdp, buf_sz, &rx_q->xdp_rxq); xdp_prepare_buff(&ctx.xdp, page_address(buf->page), @@ -5596,6 +5593,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) } else if (buf1_len) { dma_sync_single_for_cpu(priv->device, buf->addr, buf1_len, dma_dir); + prefetch(page_address(buf->page) + buf->page_offset); skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, buf->page, buf->page_offset, buf1_len, priv->dma_conf.dma_buf_sz); @@ -5608,6 +5606,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) if (buf2_len) { dma_sync_single_for_cpu(priv->device, buf->sec_addr, buf2_len, dma_dir); + prefetch(page_address(buf->sec_page)); skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, buf->sec_page, 0, buf2_len, priv->dma_conf.dma_buf_sz);