Received: by 2002:ab2:60d1:0:b0:1f7:5705:b850 with SMTP id i17csp1694434lqm; Fri, 3 May 2024 03:56:03 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCU57eCcnPJ3dvJTlkwWIaOcT91QV6ssopkL7/N/2hO+GugFRZI7ryOWCI0o7LcuudwwfFTeHuL8wo6ZqRlQElz1Q3tJhJ2UGujKs/pF/Q== X-Google-Smtp-Source: AGHT+IG9yYoZuyXUByyEmeugtWb0Rs1L2EHkdhnPKQig+4U4nnD/jO2t/utQ5m8m5iVQPpaThwI1 X-Received: by 2002:a17:906:f20f:b0:a55:bee5:52bb with SMTP id gt15-20020a170906f20f00b00a55bee552bbmr1271570ejb.3.1714733762913; Fri, 03 May 2024 03:56:02 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714733762; cv=pass; d=google.com; s=arc-20160816; b=Fp1uSypXDfHMcelHObd60+M5rSDIaS+o7RkqiDzvQwn58GGPUMDXqlLVpPuXTAHKBH npwmziP1GGWNKN7aXt6x57jcKvgVOXz4v3ODUYAc0TnCr/C8KDX6ouhkbYj++rMJam+2 SaAgnMGHCmm6n7jYbMy5VwvxGmbeqVXojWIHKOxrINJ9r1+E53GWiNpdMo1kUrZGCLmI rXLVQTrezFZh9T78CVadNyvkLvOZy3VOGhzgle1pUzSCt8twgw3rULON8kA8x7BqZG3W jokFrVv64oo6jUXqlixYfAERhFbB2bqkbpXliQyb9Yb5zuX8L7MR4aILe5QkOT88jtr1 O0Xg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=0eKPIAAJlsDAqbjH0mEEqyKeHRLDLoyKPeeVgzATk3o=; fh=wpGFVURqdBYDJvISrQoODZEHnVcuUZOfUAhWJ5UTCYQ=; b=To0U83LQuAg0cXlp25dCvg9q1M1eQLhFLZOoItJ2x8YWi1jvQtF9WWJm7r7wS8ycG6 7slRmfekmvNtBNMF71AciLceKS5imB9MhrM6NBAZTvHg1KaxYNsJBZLQnD1IzmPlVd0e gdjVRz2aq6rc/k3NxRrfKb40I8K3RJalu5A0ZKqQ/wKpRKpWoy37WRTsTAhUAI1bTQdx fWvM2LftssZENRSPnssZDKygqsZlnXgbMmMI8GbulM9EFG06XwclKbqcR7rW0k+19kii QlpY5iC7VwKWQ4BsCyd2SzNqxigx7U3yClFJPb3aHUK9hcXCf0Tv7pdyLWyLHHdz5zN0 KrmA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@fiberby.net header.s=202008 header.b="scVx3x5/"; arc=pass (i=1 spf=pass spfdomain=fiberby.net dkim=pass dkdomain=fiberby.net dmarc=pass fromdomain=fiberby.net); spf=pass (google.com: domain of linux-kernel+bounces-167542-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-167542-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fiberby.net Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id js14-20020a17090797ce00b00a598eddeb4bsi664086ejc.154.2024.05.03.03.56.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 May 2024 03:56:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-167542-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@fiberby.net header.s=202008 header.b="scVx3x5/"; arc=pass (i=1 spf=pass spfdomain=fiberby.net dkim=pass dkdomain=fiberby.net dmarc=pass fromdomain=fiberby.net); spf=pass (google.com: domain of linux-kernel+bounces-167542-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-167542-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fiberby.net Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id A36701F23264 for ; Fri, 3 May 2024 10:56:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1790A15250F; Fri, 3 May 2024 10:55:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fiberby.net header.i=@fiberby.net header.b="scVx3x5/" Received: from mail1.fiberby.net (mail1.fiberby.net [193.104.135.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 4FD8E150982; Fri, 3 May 2024 10:55:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.104.135.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714733735; cv=none; b=OzRvDQcVBC8GHFKYPAWXLz2ANBndap2IkqL9jlY+2ZdM/wB4PBQ1N1TU3IVlkKQ36jZW0QScP5tale1j2OBJBCmmyQfai9Irf/CxCaQ/WBChAwvLdbTx+veqtKEUgLS+evSsuBc2yrEMrlLnBVyx/bs+jpG+IcKgeSsxmKRMTUE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714733735; c=relaxed/simple; bh=/4zLaVQuU1wmeIeAfJH/eguO+ohhbE6XUdh7n4342pU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=p1p3O5+amp27FGgB6C0mVZmhUYyEePH0ZrOUlr5PGo3be9Q7EUlq5PPpGVYh9tCbXemSKwos1qJCrqgRX85f3XvbyZWHKGuNcH0Y5oR/26cW6WsqSsNjYJEuQ588xS4GkBYHQzI9dE8MJ3GcCriPC+v/HcFLE4/NkrzI8o+n7o4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fiberby.net; spf=pass smtp.mailfrom=fiberby.net; dkim=pass (2048-bit key) header.d=fiberby.net header.i=@fiberby.net header.b=scVx3x5/; arc=none smtp.client-ip=193.104.135.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fiberby.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fiberby.net Received: from x201s (193-104-135-243.ip4.fiberby.net [193.104.135.243]) by mail1.fiberby.net (Postfix) with ESMTPSA id 92ECB600A7; Fri, 3 May 2024 10:55:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fiberby.net; s=202008; t=1714733723; bh=/4zLaVQuU1wmeIeAfJH/eguO+ohhbE6XUdh7n4342pU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=scVx3x5/gLpgoyoIzDOg7FpjAu5K34yUsCx4Z+B0tdNicRPPHpOgA6TvHgURzaBX3 Z0t+p1PEZOstkeixFT/4RbqqAQM/U79iVgM5XGpQb9HEVgYOQvma/4l1/YwyY7Zq+o 0bEmCBjukHS4/vygo74rwaMSrHl0A2EgMJyldCjyBSyotC7T9yWVTB6siVr43EGO7j Q60C5qPhqNiLmAoi8FblbcrCS+UAC7dQHA0+8R7CFvbNVM6YN4WUwLW1KtOVTt+rjv Hok6JUCNjJsQ/qKCvInHR1Q7WA0yklClVcAfTAIUgcud0rtdeLGbxK1fYNMI99V1Ye 1s0BZyqp8GVtQ== Received: by x201s (Postfix, from userid 1000) id 333EA21BB74; Fri, 03 May 2024 10:55:12 +0000 (UTC) From: =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= To: netdev@vger.kernel.org Cc: =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= , linux-kernel@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Manish Chopra Subject: [PATCH net-next 3/3] net: qede: use return from qede_flow_parse_ports() Date: Fri, 3 May 2024 10:55:03 +0000 Message-ID: <20240503105505.839342-4-ast@fiberby.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240503105505.839342-1-ast@fiberby.net> References: <20240503105505.839342-1-ast@fiberby.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When calling qede_flow_parse_ports(), then the return code was only used for a non-zero check, and then -EINVAL was returned. qede_flow_parse_ports() can currently fail with: * -EINVAL This patch changes qede_flow_parse_v{4,6}_common() to use the actual return code from qede_flow_parse_ports(), so it's no longer assumed that all errors are -EINVAL. Only compile tested. Signed-off-by: Asbjørn Sloth Tønnesen --- drivers/net/ethernet/qlogic/qede/qede_filter.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qede/qede_filter.c b/drivers/net/ethernet/qlogic/qede/qede_filter.c index 07af0464eb1e..ded48523c383 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_filter.c +++ b/drivers/net/ethernet/qlogic/qede/qede_filter.c @@ -1725,6 +1725,7 @@ qede_flow_parse_v6_common(struct qede_dev *edev, struct flow_rule *rule, struct qede_arfs_tuple *t) { struct in6_addr zero_addr, addr; + int err; memset(&zero_addr, 0, sizeof(addr)); memset(&addr, 0xff, sizeof(addr)); @@ -1746,8 +1747,9 @@ qede_flow_parse_v6_common(struct qede_dev *edev, struct flow_rule *rule, memcpy(&t->dst_ipv6, &match.key->dst, sizeof(addr)); } - if (qede_flow_parse_ports(edev, rule, t)) - return -EINVAL; + err = qede_flow_parse_ports(edev, rule, t); + if (err) + return err; return qede_set_v6_tuple_to_profile(edev, t, &zero_addr); } @@ -1756,6 +1758,8 @@ static int qede_flow_parse_v4_common(struct qede_dev *edev, struct flow_rule *rule, struct qede_arfs_tuple *t) { + int err; + if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_IPV4_ADDRS)) { struct flow_match_ipv4_addrs match; @@ -1770,8 +1774,9 @@ qede_flow_parse_v4_common(struct qede_dev *edev, struct flow_rule *rule, t->dst_ipv4 = match.key->dst; } - if (qede_flow_parse_ports(edev, rule, t)) - return -EINVAL; + err = qede_flow_parse_ports(edev, rule, t); + if (err) + return err; return qede_set_v4_tuple_to_profile(edev, t); } -- 2.43.0