From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 0D90A25B1D8 for ; Thu, 14 Aug 2025 20:09:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755202172; cv=none; b=E8PUGrYiaJ/GmqH4Qu6J+yVJpZZLWOwm8GDIOFM4VagOul2IGV8ewgQVadbeTKRmH5QuSM30Y5yE/it0PiWCvwhDiIWWLXD++Rcg2ue516bXXCT6C9e6iJlM98ZOSb3dNWGG5kQ8SsoxEPruE+6wZfNHReV/NKNL5bTGw9csDdw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755202172; c=relaxed/simple; bh=uNJ0DbaVTgLxqMO9rrZlPFBGceNd4I5Fu6cwHhD2+Os=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=BsDhEkgA1eXToxTbt0rf4UTbR8xHqTfIoyNdydSe4NnLR9n8u5tlDhNyFB4fAPd/c6B2leClUU3xZVzDkjJYuxjCVN2E3IcNv+IG2QoqbWu7ETIfAEp2zD1MCZw3KcFCN2/Yz7tEYUdz/xkXd3ad5OT8HihXN6o+PbsyU2bcT0g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--kuniyu.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=XthCeYqR; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--kuniyu.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="XthCeYqR" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-24458264c5aso12521195ad.3 for ; Thu, 14 Aug 2025 13:09:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755202170; x=1755806970; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=UARZd9qLkSRlP8HijwL/4OYfjtGDpQLLXgE19FfQX14=; b=XthCeYqRBYs5V6GXNZHWb6I6MG33rkXQ63dsNy+v1cMOtDxtP+orieEIrF4shMSmxJ lSVrk0FuRNDs1rgGQrv3wDlJj/lgyTady7gpLuBKyhR43b+kdB3qATt5yrfijZKNzkrV 7pJhsRU0FDYFsOrI7VMB45eykWqMGjCiNl66VJaw1EPe9ep0R7xQnWZVgGIzE4T9ypIB ffueWPuy51sPH3xkyAEKX6vCtWqPf0vDTguklRbMpDiJSLzpRb8mK5Gsng73iUTtbUVq SNQiP0ktRYRwOzlZDSqvcD1yOBHSI7l0NGsRMsHUHCbTdq1CdgvzUK6kd4jGEcnzjT8q ijsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755202170; x=1755806970; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UARZd9qLkSRlP8HijwL/4OYfjtGDpQLLXgE19FfQX14=; b=b7vcvJhTdBdrubHixVjUqrn9ZrTagdITA7ilAXBSwWS0E+kGGS4FhQAs9nkBC6Z/PG vIznV9cBQWa5UnPTDZ55gzmk7ubwQ6NYT4k+YrgfqQAV5A/dxeNoaYHeqnw9W9kCquet fZd0wy1xjHcLRcMBMcEcp6p9SOcGSRESlldkHVT/qvLG3QSFOVT2Gl8lzTPnu0aQeuE9 WhERhMpglUVaVk8N9XZxxKcy6EzJzwr9tpfq8P5HTQUoxoDnHYaTM8FvEGxgGtsmvbwY e58M8dsfyt5hj5NtY8wvVygMrLGCUQrFk7Yq363Ny3OxFpNQFSJjS9G5J7mR4OsbmqXJ 3vVA== X-Forwarded-Encrypted: i=1; AJvYcCVovrYLj4AK5bWTFy+uSXQZu1HbVaMDACjj3GVHBphpXOVPo3lwa2YrtRi72aDFovMPAfKGPoge@vger.kernel.org X-Gm-Message-State: AOJu0YyqLD+5k7nX4icRmyKa6h+GvhQIOgkMtfgXe0xd6nV+JiIXKB9j dsJDoeoEB8pVETwrMq/mznNeD7nWaI2DXaetLPi1ZJQeqntv5BvaCfXTyQ9i5xxVJCc3jNhBuCc pTEs05g== X-Google-Smtp-Source: AGHT+IEr2KzFw5L5eoFv7qE7SLsTY7h0r30kka9wgKEfCc5e8mASPVpzRfuL9JgzHtqNiN7oenCLbFowFlo= X-Received: from plbml5.prod.google.com ([2002:a17:903:34c5:b0:242:abac:216c]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:228b:b0:243:12d5:db43 with SMTP id d9443c01a7336-2446a15730bmr3842755ad.0.1755202170389; Thu, 14 Aug 2025 13:09:30 -0700 (PDT) Date: Thu, 14 Aug 2025 20:08:42 +0000 In-Reply-To: <20250814200912.1040628-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: cgroups@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250814200912.1040628-1-kuniyu@google.com> X-Mailer: git-send-email 2.51.0.rc1.163.g2494970778-goog Message-ID: <20250814200912.1040628-11-kuniyu@google.com> Subject: [PATCH v4 net-next 10/10] net: Define sk_memcg under CONFIG_MEMCG. From: Kuniyuki Iwashima To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Neal Cardwell , Paolo Abeni , Willem de Bruijn , Matthieu Baerts , Mat Martineau , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Andrew Morton , "=?UTF-8?q?Michal=20Koutn=C3=BD?=" , Tejun Heo Cc: Simon Horman , Geliang Tang , Muchun Song , Mina Almasry , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org, mptcp@lists.linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" Except for sk_clone_lock(), all accesses to sk->sk_memcg is done under CONFIG_MEMCG. As a bonus, let's define sk->sk_memcg under CONFIG_MEMCG. Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet --- include/net/sock.h | 2 ++ net/core/sock.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/include/net/sock.h b/include/net/sock.h index 3bc4d566f7d0..1c49ea13af4a 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -443,7 +443,9 @@ struct sock { __cacheline_group_begin(sock_read_rxtx); int sk_err; struct socket *sk_socket; +#ifdef CONFIG_MEMCG struct mem_cgroup *sk_memcg; +#endif #ifdef CONFIG_XFRM struct xfrm_policy __rcu *sk_policy[2]; #endif diff --git a/net/core/sock.c b/net/core/sock.c index 5537ca263858..ab6953d295df 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2512,8 +2512,10 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) sock_reset_flag(newsk, SOCK_DONE); +#ifdef CONFIG_MEMCG /* sk->sk_memcg will be populated at accept() time */ newsk->sk_memcg = NULL; +#endif cgroup_sk_clone(&newsk->sk_cgrp_data); @@ -4452,7 +4454,9 @@ static int __init sock_struct_check(void) CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rxtx, sk_err); CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rxtx, sk_socket); +#ifdef CONFIG_MEMCG CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rxtx, sk_memcg); +#endif CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_rxtx, sk_lock); CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_rxtx, sk_reserved_mem); -- 2.51.0.rc1.163.g2494970778-goog