From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f202.google.com (mail-qk1-f202.google.com [209.85.222.202]) (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 79B5E337688 for ; Mon, 2 Mar 2026 18:14:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772475286; cv=none; b=ME24GuOj5kmnFAf3p+d2Eg9EsXnT1POu2907pyUJ8M4DiNKaJfSLn2t3d0jp4jijbFWLnWzbTmzpyfoVTNAqiaCIlOfFG5vfxmR5vfW9F3cNgNY+GgepL2ePv+4+TEKGfjSwzEhyBRAdLNLKBCViWhmxm/6MBp05bAVfrRQxQbw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772475286; c=relaxed/simple; bh=i0s2jMnm3hYZngJv4K/QTbRjAuGsVclPA1pNuEwKiNI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=iI4+QlbU7k4tHTjetmuYwqFwn/negzrY+lwfjpaoV/f7Nka++roEQtdPxA0IvDSJwOPL8BoV6TM9qRnCHpKqs3NGbDnbnETCFTvUxHLjfzi/qOkg8dYBApfkDYkYABScMhvmJl0ADZ7eipMnl0LCMubpVvxXiRqq27Yr/nv2nzM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=2zCivgXx; arc=none smtp.client-ip=209.85.222.202 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--edumazet.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="2zCivgXx" Received: by mail-qk1-f202.google.com with SMTP id af79cd13be357-8cb4e37a796so3274011485a.2 for ; Mon, 02 Mar 2026 10:14:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1772475284; x=1773080084; 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=NVYacPiJSJO5cSbY5SOeRlsCxSqadtlsMm00j720Rbk=; b=2zCivgXx1R7umAHmoplrZqTZzOjPSP/9WZOMFbxuFqtyZtuq4f6T+jPbyDTWFkzBtX RGDteobRjQ2tpuR+wx7TcLspN/bED7Qr2u/tv0VFMLSVRrXuisXSYPG3u1BISSdyp+yr 0IqaUrjcAus1Pk/zOtubifzZghtw0exj8qxhxdccZX0gsLiVUsG8NARGxNdLrA+hmq6F HfA1k82bY4xLU1xsZNAC+BeLYR4dT5FOWfHxTGEamJ4xD/oTLjGdpfZeuMjKmTpIuKAm M1FUkvtVQhOXJyqvn0PbBDMFOF7Tk8H81EYdCTlXv1HanW3Kk9ibuvUP9EoUnhTDYZ2q ZALA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772475284; x=1773080084; 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=NVYacPiJSJO5cSbY5SOeRlsCxSqadtlsMm00j720Rbk=; b=O7nkdFr4mrvM+HSlmH+e2qScQbc+3larj9ryuGuFdttHep4QvF3g6zuZ0KJvPSu8uu DV2W2AFnfGiuzVYcZnwVI0muuOHEE0lCHM9cYDcOUtcVBQcDDOdg5MHWteaHThsM/c/h An7iBG1sJj58Nhud0l+GYHMp4GMcmQagz1qXb/K2waTFVS5GlGzdA/6Zc+skrP+fjvAf FWSSLqmkvIgYfywmuQzX0HsSif0q3pQxJ1k+RjPwsV1iAb0hfBZZEuwWBvsrSU7XPrue Z2jpof9rHtTjIfNNpQV+FjyBjXtmJsBHUiUJvPGNkiaFCjXez64BMrAmuD8CAuAiOKJY ajZw== X-Forwarded-Encrypted: i=1; AJvYcCWBeiweCWwaMRjQp8w5pRwfWv7Lmadb6pmQZPifq/9nxX+7W6mETz481ghDk0DbfUEm8FSoL9M=@vger.kernel.org X-Gm-Message-State: AOJu0YwRW3HqrskiZIyNmnQHW6CcP3h+ITCA0z1fjlTz2bl8GZFYT9NE oLi5NPSMFDIjNF/yoHs6hB3ZvkhUP/erUMiHt5sNE4W5R3dYqNHdgdWF3sX+4NTMv2ibRk+tFEO A4wFRFt4lrVpv1w== X-Received: from qkil19.prod.google.com ([2002:a05:620a:c13:b0:8cb:4c74:5ab9]) (user=edumazet job=prod-delivery.src-stubby-dispatcher) by 2002:a05:620a:458a:b0:8cb:52e0:15e7 with SMTP id af79cd13be357-8cbc8d8684dmr1638861685a.33.1772475284345; Mon, 02 Mar 2026 10:14:44 -0800 (PST) Date: Mon, 2 Mar 2026 18:14:31 +0000 In-Reply-To: <20260302181432.1836150-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260302181432.1836150-1-edumazet@google.com> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog Message-ID: <20260302181432.1836150-7-edumazet@google.com> Subject: [PATCH v3 net-next 6/7] net-sysfs: remove rcu field from 'struct rps_dev_flow_table' From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: Simon Horman , Kuniyuki Iwashima , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet Content-Type: text/plain; charset="UTF-8" Remove rps_dev_flow_table_release() in favor of kvfree_rcu_mightsleep(). In the following pach, we will remove "u8 @log" field and 'struct rps_dev_flow_table' size will be a power-of-two. Signed-off-by: Eric Dumazet --- include/net/rps.h | 1 - net/core/net-sysfs.c | 11 ++--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/include/net/rps.h b/include/net/rps.h index dee930d9dd38e0e975e78d938bc7adc96048b724..e900480e828b487c721b3ef392f4abb427ad442c 100644 --- a/include/net/rps.h +++ b/include/net/rps.h @@ -44,7 +44,6 @@ struct rps_dev_flow { */ struct rps_dev_flow_table { u8 log; - struct rcu_head rcu; struct rps_dev_flow flows[]; }; #define RPS_DEV_FLOW_TABLE_SIZE(_num) (sizeof(struct rps_dev_flow_table) + \ diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 52fcf7fa58a808e79c1a17c8719830bcfb7c1674..fd6f81930bc6437957f32206c84db87ee242fede 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -1072,13 +1072,6 @@ static ssize_t show_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue, return sysfs_emit(buf, "%lu\n", val); } -static void rps_dev_flow_table_release(struct rcu_head *rcu) -{ - struct rps_dev_flow_table *table = container_of(rcu, - struct rps_dev_flow_table, rcu); - vfree(table); -} - static ssize_t store_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue, const char *buf, size_t len) { @@ -1131,7 +1124,7 @@ static ssize_t store_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue, RCU_INITIALIZER(table))); if (old_table) - call_rcu(&old_table->rcu, rps_dev_flow_table_release); + kvfree_rcu_mightsleep(old_table); return len; } @@ -1168,7 +1161,7 @@ static void rx_queue_release(struct kobject *kobj) old_table = unrcu_pointer(xchg(&queue->rps_flow_table, NULL)); if (old_table) - call_rcu(&old_table->rcu, rps_dev_flow_table_release); + kvfree_rcu_mightsleep(old_table); #endif memset(kobj, 0, sizeof(*kobj)); -- 2.53.0.473.g4a7958ca14-goog