From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 58911219300; Mon, 19 May 2025 20:36:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747687013; cv=none; b=NrUNNJZElnMjoF3jpzkapipchSfPw47rEEhegUJVWRrU5biezFYj/TPaqpOtXWPJeRZuuy5t7NMoO012sYWP/CqqJ7+zL07cNRwQXw2d16kEAP41jfZ6rTWetxT8rBQtIqH5gv7rdPoxUk6glZyC23pwuj1Lg3HDYI4o8+LMFJ0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747687013; c=relaxed/simple; bh=7e3pkU/irk3/IN3e2dkkJRFby/ke4thAcruyEImcmtw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XLX1rYm7rnqhjHDmMMuc4UnMQSDFDCiR/LxKxR6KbJq40KmBAAzOTiQkD+yA31yjZ0zPv6Q9v3VbS/T8PIFEnlieGuaCg3wzmS2uq2oqSN4jYGfMBmivcZWjtCjwYtH1YpX5BkFAnvpPBkLpcO8RD4m92BzJFqWAsTCkhXL7Zbw= 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=AqIO/jUq; arc=none smtp.client-ip=209.85.210.178 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="AqIO/jUq" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-7399a2dc13fso6239116b3a.2; Mon, 19 May 2025 13:36:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747687011; x=1748291811; 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=dTasnn+jrPCrGF5fOJPvKSOQICNsS3mKkqOmSlRONuE=; b=AqIO/jUqntY2mah9su4QpbjhmX49U11erfjbdT/JunmEL+Ie/oUVDESkiNxLcfzktE 7NRNby4w6Rwd7t3ER3GDbSRyTbeiJc96lmep/5KMG57c3FBv48/orifYkDNN2MvH+bMP I80aD+KiSmLyPI3mcar5exNoQY1QTpQY1E7fUseH6mmKhPkbwp94lt9yQudkZvYMdbpb zfiI9vTVsKNoODIbqYwjv2mDMThYf5wnWCglk/7V2Jy9pc7zGUYz0FxnIROY7zUT1uTm CnvwkSbMk6dcZNY8VnTr+fkVvKE62CiXCuD1yGwS7u7K47nyFcmsQ//fOBo7jbg7zeC3 K1sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747687011; x=1748291811; 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=dTasnn+jrPCrGF5fOJPvKSOQICNsS3mKkqOmSlRONuE=; b=lMS/Ph2q14FwlNR1RpU9NocXJ0pXNbGDRV2hoBYMRfsULgF0hv7qhQV6VGmJaH0V/l OU/eZi3lguOmjLhWMEcFPfDfEXaaKZirrNy2QZQ+8+uhnmUuSNXkH2c/gHaIzOrn37yE PyA8tUwP/6DFJn4bQpENWebjumaC9ohoDM00uoH3xTM7PKflJzh0KoLL9HCplXsPqmVQ YQ9LjnRdm0hlBDad6EeIfpoZoQuoRBJ/ZlQR7zve/4Fni+0I7SYsuul60ejUdcmig4Jn Tn1ojMl4tYCcNSxZMe/N+qSGYhk0pV25igb6R9JZTzxl/MPnhx6VqglNSUs14SFbPm/n RZBg== X-Gm-Message-State: AOJu0Yy4TLmaipbDcaKxmTXNgvMV8xPbxBg+R9UoQKRnYsR4fT3hF14v L+kcOI/btkYjU1fvofxBGfY7G9LWH/RGgFwplCkakUxJ9sSOeygCmrVVB5uqhg== X-Gm-Gg: ASbGncuF1XpcZKPOHupY+1xs0DScVkVOtFbLmn4FteaNnX6B7pG3PitLUsAq+3Me918 T0cHn4gEi9BU8xgM83Y3iwpOTdT1APxtur0k/WWrHY7AYm7TBEy6raamqfoM4njQtS2HjiR+8dr Lyeh+2IXxlVrig9mm3NSh0eYZ9uxyElL+8eyniqmU7hfg6H+XNNK1uv+qvGk25mchVn1ijX81Wd VJAGtfWfqg8HIi/LTFP31SGyw8121bNrG6cGkSlSHOMLkMy/f8OwynrzpiEivR3zsS2HDTqtlxz XueEiOLN3pobkeaJnqW/abZJWjW38hVQsD/8a+t4O1WGV3iWlV/M77W8g7VIyQ== X-Google-Smtp-Source: AGHT+IHVhsgu2wJgrzJd88G8f98TrumKKKyL/SEn8e6gyhXOqO1Q2si68s2Wqqo7OLd1tewBQrMUZA== X-Received: by 2002:a05:6a00:3e0b:b0:736:34a2:8a18 with SMTP id d2e1a72fcca58-742acd75e6amr21782398b3a.24.1747687011208; Mon, 19 May 2025 13:36:51 -0700 (PDT) Received: from pop-os.scu.edu ([129.210.115.104]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a970d5aasm6865112b3a.63.2025.05.19.13.36.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 May 2025 13:36:50 -0700 (PDT) From: Cong Wang To: netdev@vger.kernel.org Cc: bpf@vger.kernel.org, zhoufeng.zf@bytedance.com, jakub@cloudflare.com, john.fastabend@gmail.com, zijianzhang@bytedance.com, Cong Wang Subject: [Patch bpf-next v3 2/4] skmsg: implement slab allocator cache for sk_msg Date: Mon, 19 May 2025 13:36:26 -0700 Message-Id: <20250519203628.203596-3-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250519203628.203596-1-xiyou.wangcong@gmail.com> References: <20250519203628.203596-1-xiyou.wangcong@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Zijian Zhang Optimizing redirect ingress performance requires frequent allocation and deallocation of sk_msg structures. Introduce a dedicated kmem_cache for sk_msg to reduce memory allocation overhead and improve performance. Reviewed-by: Cong Wang Signed-off-by: Zijian Zhang --- include/linux/skmsg.h | 21 ++++++++++++--------- net/core/skmsg.c | 28 +++++++++++++++++++++------- net/ipv4/tcp_bpf.c | 5 ++--- 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h index d6f0a8cd73c4..bf28ce9b5fdb 100644 --- a/include/linux/skmsg.h +++ b/include/linux/skmsg.h @@ -121,6 +121,7 @@ struct sk_psock { struct rcu_work rwork; }; +struct sk_msg *sk_msg_alloc(gfp_t gfp); int sk_msg_expand(struct sock *sk, struct sk_msg *msg, int len, int elem_first_coalesce); int sk_msg_clone(struct sock *sk, struct sk_msg *dst, struct sk_msg *src, @@ -143,6 +144,8 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg, int len, int flags); bool sk_msg_is_readable(struct sock *sk); +extern struct kmem_cache *sk_msg_cachep; + static inline void sk_msg_check_to_free(struct sk_msg *msg, u32 i, u32 bytes) { WARN_ON(i == msg->sg.end && bytes); @@ -319,6 +322,13 @@ static inline void sock_drop(struct sock *sk, struct sk_buff *skb) kfree_skb(skb); } +static inline void kfree_sk_msg(struct sk_msg *msg) +{ + if (msg->skb) + consume_skb(msg->skb); + kmem_cache_free(sk_msg_cachep, msg); +} + static inline bool sk_psock_queue_msg(struct sk_psock *psock, struct sk_msg *msg) { @@ -330,7 +340,7 @@ static inline bool sk_psock_queue_msg(struct sk_psock *psock, ret = true; } else { sk_msg_free(psock->sk, msg); - kfree(msg); + kfree_sk_msg(msg); ret = false; } spin_unlock_bh(&psock->ingress_lock); @@ -378,13 +388,6 @@ static inline bool sk_psock_queue_empty(const struct sk_psock *psock) return psock ? list_empty(&psock->ingress_msg) : true; } -static inline void kfree_sk_msg(struct sk_msg *msg) -{ - if (msg->skb) - consume_skb(msg->skb); - kfree(msg); -} - static inline void sk_psock_report_error(struct sk_psock *psock, int err) { struct sock *sk = psock->sk; @@ -441,7 +444,7 @@ static inline void sk_psock_cork_free(struct sk_psock *psock) { if (psock->cork) { sk_msg_free(psock->sk, psock->cork); - kfree(psock->cork); + kfree_sk_msg(psock->cork); psock->cork = NULL; } } diff --git a/net/core/skmsg.c b/net/core/skmsg.c index 8e85f4a3406e..30220185fd45 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -10,6 +10,8 @@ #include #include +struct kmem_cache *sk_msg_cachep; + static bool sk_msg_try_coalesce_ok(struct sk_msg *msg, int elem_first_coalesce) { if (msg->sg.end > msg->sg.start && @@ -503,16 +505,17 @@ bool sk_msg_is_readable(struct sock *sk) } EXPORT_SYMBOL_GPL(sk_msg_is_readable); -static struct sk_msg *alloc_sk_msg(gfp_t gfp) +struct sk_msg *sk_msg_alloc(gfp_t gfp) { struct sk_msg *msg; - msg = kzalloc(sizeof(*msg), gfp | __GFP_NOWARN); + msg = kmem_cache_zalloc(sk_msg_cachep, gfp | __GFP_NOWARN); if (unlikely(!msg)) return NULL; sg_init_marker(msg->sg.data, NR_MSG_FRAG_IDS); return msg; } +EXPORT_SYMBOL_GPL(sk_msg_alloc); static struct sk_msg *sk_psock_create_ingress_msg(struct sock *sk, struct sk_buff *skb) @@ -523,7 +526,7 @@ static struct sk_msg *sk_psock_create_ingress_msg(struct sock *sk, if (!sk_rmem_schedule(sk, skb, skb->truesize)) return NULL; - return alloc_sk_msg(GFP_KERNEL); + return sk_msg_alloc(GFP_KERNEL); } static int sk_psock_skb_ingress_enqueue(struct sk_buff *skb, @@ -598,7 +601,7 @@ static int sk_psock_skb_ingress(struct sk_psock *psock, struct sk_buff *skb, skb_set_owner_r(skb, sk); err = sk_psock_skb_ingress_enqueue(skb, off, len, psock, sk, msg, true); if (err < 0) - kfree(msg); + kfree_sk_msg(msg); return err; } @@ -609,7 +612,7 @@ static int sk_psock_skb_ingress(struct sk_psock *psock, struct sk_buff *skb, static int sk_psock_skb_ingress_self(struct sk_psock *psock, struct sk_buff *skb, u32 off, u32 len, bool take_ref) { - struct sk_msg *msg = alloc_sk_msg(GFP_ATOMIC); + struct sk_msg *msg = sk_msg_alloc(GFP_ATOMIC); struct sock *sk = psock->sk; int err; @@ -618,7 +621,7 @@ static int sk_psock_skb_ingress_self(struct sk_psock *psock, struct sk_buff *skb skb_set_owner_r(skb, sk); err = sk_psock_skb_ingress_enqueue(skb, off, len, psock, sk, msg, take_ref); if (err < 0) - kfree(msg); + kfree_sk_msg(msg); return err; } @@ -787,7 +790,7 @@ static void __sk_psock_purge_ingress_msg(struct sk_psock *psock) if (!msg->skb) atomic_sub(msg->sg.size, &psock->sk->sk_rmem_alloc); sk_msg_free(psock->sk, msg); - kfree(msg); + kfree_sk_msg(msg); } } @@ -1272,3 +1275,14 @@ void sk_psock_stop_verdict(struct sock *sk, struct sk_psock *psock) sk->sk_data_ready = psock->saved_data_ready; psock->saved_data_ready = NULL; } + +static int __init sk_msg_cachep_init(void) +{ + sk_msg_cachep = kmem_cache_create("sk_msg_cachep", + sizeof(struct sk_msg), + 0, + SLAB_HWCACHE_ALIGN | SLAB_ACCOUNT, + NULL); + return 0; +} +late_initcall(sk_msg_cachep_init); diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c index 85b64ffc20c6..f0ef41c951e2 100644 --- a/net/ipv4/tcp_bpf.c +++ b/net/ipv4/tcp_bpf.c @@ -38,7 +38,7 @@ static int bpf_tcp_ingress(struct sock *sk, struct sk_psock *psock, struct sk_msg *tmp; int i, ret = 0; - tmp = kzalloc(sizeof(*tmp), __GFP_NOWARN | GFP_KERNEL); + tmp = sk_msg_alloc(GFP_KERNEL); if (unlikely(!tmp)) return -ENOMEM; @@ -406,8 +406,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, msg->cork_bytes > msg->sg.size && !enospc) { psock->cork_bytes = msg->cork_bytes - msg->sg.size; if (!psock->cork) { - psock->cork = kzalloc(sizeof(*psock->cork), - GFP_ATOMIC | __GFP_NOWARN); + psock->cork = sk_msg_alloc(GFP_ATOMIC); if (!psock->cork) return -ENOMEM; } -- 2.34.1