From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (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 87DDC7BB06 for ; Tue, 23 Apr 2024 11:22:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713871337; cv=none; b=ZN5wf9WLZwT63AhRx/z6muZtNDkgEfEzFduo+IeffcSlZe9ZvyeBWDFR4v++lS3OFMAbjEtF7zLdxZJ8+0+R1mhvhpuOP2f6QgiL3M3VZCfwsNpzKaIGd9s0kuws5r4jjqjZsPw7FREIOIbt2YdJZGtFw8xj+K8DivOVnGFG1a4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713871337; c=relaxed/simple; bh=sbwsy7H0Q4NCfjx1+u1la9di8b5NQHCylCaYM8kjwUk=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=qIDZO0sqbKD9rMyEALOmyPfl0MzCUNJi5BMpQj6WQt/02KjLdNXG344xqmYFqOMTAoa0ilbDysiRqkYK/OOC5Rk2D7DBJj3MTi5nFJjVsHrwukkjsek3DFmYq2MmjjpWIANVCrBxhINddX257j4yLKJs7K+5RKciDoMiAHz5cTE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=resnulli.us; spf=none smtp.mailfrom=resnulli.us; dkim=pass (2048-bit key) header.d=resnulli-us.20230601.gappssmtp.com header.i=@resnulli-us.20230601.gappssmtp.com header.b=IGpHQCS5; arc=none smtp.client-ip=209.85.208.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=resnulli.us Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=resnulli.us Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20230601.gappssmtp.com header.i=@resnulli-us.20230601.gappssmtp.com header.b="IGpHQCS5" Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-571e3f40e31so2851229a12.2 for ; Tue, 23 Apr 2024 04:22:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20230601.gappssmtp.com; s=20230601; t=1713871335; x=1714476135; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=6GfSqgOkja5B7lN2FDN4RxNCKSJQEPLwozcaK1N5KbU=; b=IGpHQCS5+s1VaC2f1kJ/tONZZnTfl98KqG3qAelBDfzXrBgzE0pRRTf8w0Gim5Zizt guxkZFju83ec7oyrNpmAiZD7jj8wZ4nSneS+P0lVmQlVYTdYAgkB93XiLVjp9EhG5plj yqetoiul84CxjHRTrV6f6IOO38EcJBgDS3FTZdeWu5ORgTVJyLPfPHP3a977OiQ5i8+w ZSFghzZIO8kQDrBLZpFAQBH65ULYbpazbkECTMgKSw7qTn7CsLbAjyRfhEkGkDVZQaAZ Q7vPCVMOdApMfyUJHRvyaAqa774J+iD6UDvj+Qeu83BBYzJdUlq13X7SGiEIkw83uFu6 XXcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713871335; x=1714476135; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=6GfSqgOkja5B7lN2FDN4RxNCKSJQEPLwozcaK1N5KbU=; b=AzuLOw4jiQMxd0OdIhdZ4d9jrKzDsIMukII/pYXG7LSICvj7pYJqP3nbO+lWFRPpc9 aCgmES9GxCPfe3f6jamHmsTXJI5y/vk61cpJeHsj+QEQXvYNBe/vmxD4BvpoGr3LDvIk nCdaPrBK0uW/FA0zgabwx1ZSvLqv1stppCttzHyd7dHloJuE4HPh+JbDxk9/l7KatDpj I2wT3ZdzyWDdXnRhxVLuNZFBZClUI0TQWyNT29QDivMurRlb7kN2vbyPLv2QOpjTvDre Xy9Z4ZMyLJ2JciRWVLYyLi1+Xn3P6GKEJW5ZOmnR9/0ypiLZH8Th2z4RYT6zSgg4vdak PVtg== X-Gm-Message-State: AOJu0YzzkYQsnxBqsqJx0qVB9tjZfirgIGI8+PrwqIdSzSOD6nnoafRj wHd1owfaJ82WQYBZMmPGFEQLKkVVsYhw1SLknAxftwPw+gpDRXA34TsHU088fVn2F45qHkL+pvM E X-Google-Smtp-Source: AGHT+IGuR5GgCcJg+xPSyAb5CwWgjaYTDGRS4H6mfciAQsSwyxxjblLd3xP29uyBcvc67SkP4YONOQ== X-Received: by 2002:a17:906:410a:b0:a55:664b:fa35 with SMTP id j10-20020a170906410a00b00a55664bfa35mr8718575ejk.6.1713871334784; Tue, 23 Apr 2024 04:22:14 -0700 (PDT) Received: from localhost (78-80-105-131.customers.tmcz.cz. [78.80.105.131]) by smtp.gmail.com with ESMTPSA id z12-20020a170906270c00b00a55895c7f50sm5415223ejc.151.2024.04.23.04.22.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Apr 2024 04:22:14 -0700 (PDT) Date: Tue, 23 Apr 2024 13:22:12 +0200 From: Jiri Pirko To: =?iso-8859-1?Q?Asbj=F8rn_Sloth_T=F8nnesen?= Cc: netdev@vger.kernel.org, Steen Hegelund , Lars Povlsen , Daniel Machon , UNGLinuxDriver@microchip.com, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org, Jacob Keller Subject: Re: [PATCH net-next 1/2] net: sparx5: flower: cleanup sparx5_tc_flower_handler_control_usage() Message-ID: References: <20240423102728.228765-1-ast@fiberby.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240423102728.228765-1-ast@fiberby.net> Tue, Apr 23, 2024 at 12:27:26PM CEST, ast@fiberby.net wrote: >Define extack locally, to reduce line lengths and future users. > >Only perform fragment handling, when at least one fragment flag is set. > >Remove goto, as it's only used once, and the error message is specific >to that context. 3 changes, 3 patches? > >Only compile tested. > >Signed-off-by: Asbjørn Sloth Tønnesen >--- > .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > >diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c b/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c >index 663571fe7b2d..d846edd77a01 100644 >--- a/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c >+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c >@@ -159,13 +159,14 @@ sparx5_tc_flower_handler_basic_usage(struct vcap_tc_flower_parse_usage *st) > static int > sparx5_tc_flower_handler_control_usage(struct vcap_tc_flower_parse_usage *st) > { >+ struct netlink_ext_ack *extack = st->fco->common.extack; > struct flow_match_control mt; > u32 value, mask; > int err = 0; > > flow_rule_match_control(st->frule, &mt); > >- if (mt.mask->flags) { >+ if (mt.mask->flags & (FLOW_DIS_IS_FRAGMENT | FLOW_DIS_FIRST_FRAG)) { > u8 is_frag_key = !!(mt.key->flags & FLOW_DIS_IS_FRAGMENT); > u8 is_frag_mask = !!(mt.mask->flags & FLOW_DIS_IS_FRAGMENT); > u8 is_frag_idx = (is_frag_key << 1) | is_frag_mask; >@@ -190,17 +191,15 @@ sparx5_tc_flower_handler_control_usage(struct vcap_tc_flower_parse_usage *st) > err = vcap_rule_add_key_u32(st->vrule, > VCAP_KF_L3_FRAGMENT_TYPE, > value, mask); >- if (err) >- goto out; >+ if (err) { >+ NL_SET_ERR_MSG_MOD(extack, "ip_frag parse error"); >+ return err; >+ } > } > > st->used_keys |= BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL); > > return err; >- >-out: >- NL_SET_ERR_MSG_MOD(st->fco->common.extack, "ip_frag parse error"); >- return err; > } > > static int >-- >2.43.0 > >