From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.netfilter.org (mail.netfilter.org [217.70.190.124]) (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 3BC6538332A; Fri, 19 Jun 2026 11:55:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.190.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781870113; cv=none; b=s/eptV3/NOECb0V1fMC5dI6end+mqyvJRQFUdxK3IF7mFCSKlKqUB7hl6/yX3tKv0VBkZ4xy1osjTcQvQq9b7Y6cmuwd3GsdfZ2JGU46MyqX4fOB1wT9RQlDTNJhc8ow7fWJXXJu72I/+Y/Ltz73fYT+Dj7ReTshMFZRTEqkRpE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781870113; c=relaxed/simple; bh=Iujzt5heb9H8WLppDhY1E1rPktZleQ5dnFQhD90BUFc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Hyn6lxZ82Cy/tOSOZZs8Le2UslDqqfxJJ62/yIdpOCwF0YK5BYLyouTTXDDBi5szWrndtbKaSYj4jP77/85BlqJ0dC2LH3cHHs6YYZXRpSD6XQhY9g4fZ7s7oBcUMDPrNlGVQmOydfjF6zB3or0vMmtseRBtaal1+/ziVbeiS3g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=netfilter.org; spf=pass smtp.mailfrom=netfilter.org; dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org header.b=vl1osgok; arc=none smtp.client-ip=217.70.190.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=netfilter.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=netfilter.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org header.b="vl1osgok" Received: from localhost.localdomain (mail-agni [217.70.190.124]) by mail.netfilter.org (Postfix) with ESMTPSA id 783F4601C1; Fri, 19 Jun 2026 13:55:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netfilter.org; s=2025; t=1781870109; bh=fUUW68ZRi9UR+MamkxJBulOTEpebj5NGu71sMmoSmRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vl1osgokoqJnKmY05p2BEyQsltnnccySTHU/geK+Qhlt2YPm7Iw/W1Cfh/BAipt4v 1QpYJoUa7ClsKsJ7vqXZQi8pIzK4cO+OvCvjEqRewTzhpvwXJgj7Yb/I/np9+ZJBq0 So1gCcJ5mGxA5XhMCIz2x8C4VCP/5XLqxaFKG0S9oYvsmXgz/68APDFfzAFzqLBCpB /mCoBYCkANSG0jPaqD45pZqgGMO4jB6EIVrl3YND9D1d5ZrErfqWTtw/hDK7l87u1M Z16yrs9wQqNQ9aVpklM8yGn7ZSwYj0dITOYAhd+zHl8KWNtEEV4UXJ36A2asLcUzL2 Oz5PuZaKXxtcQ== From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, fw@strlen.de, horms@kernel.org Subject: [PATCH net 09/16] netfilter: ipset: make sure gc is properly stopped Date: Fri, 19 Jun 2026 13:54:44 +0200 Message-ID: <20260619115452.93949-10-pablo@netfilter.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260619115452.93949-1-pablo@netfilter.org> References: <20260619115452.93949-1-pablo@netfilter.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jozsef Kadlecsik Sashiko noticed that when destroying a set, cancel_delayed_work_sync() was called while gc calls queue_delayed_work() unconditionally which can lead not to properly shutting down the gc. Fixes: f66ee0410b1c ("netfilter: ipset: Fix "INFO: rcu detected stall in hash_xxx" reports") Signed-off-by: Jozsef Kadlecsik Signed-off-by: Pablo Neira Ayuso --- net/netfilter/ipset/ip_set_hash_gen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h index 00c27b95207f..dedf59b661dd 100644 --- a/net/netfilter/ipset/ip_set_hash_gen.h +++ b/net/netfilter/ipset/ip_set_hash_gen.h @@ -606,7 +606,7 @@ mtype_cancel_gc(struct ip_set *set) struct htype *h = set->data; if (SET_WITH_TIMEOUT(set)) - cancel_delayed_work_sync(&h->gc.dwork); + disable_delayed_work_sync(&h->gc.dwork); } static int -- 2.47.3