From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 20345381B9; Mon, 15 Apr 2024 14:33:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713191625; cv=none; b=LsGpZYg7fHg6xQGI7obAh0sCsoTIB4fMEzh1j8C1yX3l7E8gF+E8ZC1YLZZ8vyeplbLxgeR/d/DbxcLwPGtBMoAZsnqXZ2wHRCaTJQv3GN0xKv2T16amjDZuEv6Q9af74xkQmBm/3fhSHn786ua5+p6GQuDPNm6jYZXhbePeMWw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713191625; c=relaxed/simple; bh=dq1EUdUa6HHlWHOeR9jpuSCLgGF1Nzhe3O5tnt3gCsQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kmQQkMw0ZPLx1BOkXfSkJgkl5aYArN3uIp2832htrM7C4SogCft2BZ+Z9vU80DiisjySHzHpwc4wnLZptLgi5wMbHVJkrtsnROX6XqQHA21vh8IEWxvmQAXYOTRCknKVt/W+iuelBG5k1eGHhgCZOE0kso2CGLmhd81Oj/483wU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LDawBpl7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LDawBpl7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92F8CC113CC; Mon, 15 Apr 2024 14:33:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1713191625; bh=dq1EUdUa6HHlWHOeR9jpuSCLgGF1Nzhe3O5tnt3gCsQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LDawBpl7hGinO74yP91mFTySP2OOn+kFG6VNzp3Rjx9afLoAh9oXfQOkrUbXdIS3N LsQ8UCrvGq+DbEoquLxq9cIOCFumlLmdVjfCbSedUVFFaa4YEZg51hWyyztbcJzlNR orawgjHxVYJXuv351kujOEZMT6YQ4Gm4Tju65Myo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ilya Maximets , Eelco Chaudron , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 031/122] net: openvswitch: fix unwanted error log on timeout policy probing Date: Mon, 15 Apr 2024 16:19:56 +0200 Message-ID: <20240415141954.304290531@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240415141953.365222063@linuxfoundation.org> References: <20240415141953.365222063@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ilya Maximets [ Upstream commit 4539f91f2a801c0c028c252bffae56030cfb2cae ] On startup, ovs-vswitchd probes different datapath features including support for timeout policies. While probing, it tries to execute certain operations with OVS_PACKET_ATTR_PROBE or OVS_FLOW_ATTR_PROBE attributes set. These attributes tell the openvswitch module to not log any errors when they occur as it is expected that some of the probes will fail. For some reason, setting the timeout policy ignores the PROBE attribute and logs a failure anyway. This is causing the following kernel log on each re-start of ovs-vswitchd: kernel: Failed to associated timeout policy `ovs_test_tp' Fix that by using the same logging macro that all other messages are using. The message will still be printed at info level when needed and will be rate limited, but with a net rate limiter instead of generic printk one. The nf_ct_set_timeout() itself will still print some info messages, but at least this change makes logging in openvswitch module more consistent. Fixes: 06bd2bdf19d2 ("openvswitch: Add timeout support to ct action") Signed-off-by: Ilya Maximets Acked-by: Eelco Chaudron Link: https://lore.kernel.org/r/20240403203803.2137962-1-i.maximets@ovn.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/openvswitch/conntrack.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index 3019a4406ca4f..74b63cdb59923 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -1380,8 +1380,9 @@ int ovs_ct_copy_action(struct net *net, const struct nlattr *attr, if (ct_info.timeout[0]) { if (nf_ct_set_timeout(net, ct_info.ct, family, key->ip.proto, ct_info.timeout)) - pr_info_ratelimited("Failed to associated timeout " - "policy `%s'\n", ct_info.timeout); + OVS_NLERR(log, + "Failed to associated timeout policy '%s'", + ct_info.timeout); else ct_info.nf_ct_timeout = rcu_dereference( nf_ct_timeout_find(ct_info.ct)->timeout); -- 2.43.0