Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
Message-ID: <745e6518-6253-4ef0-8f05-1421ee4e1fef@intel.com>
Date:   Mon, 20 Nov 2023 13:02:22 +0100
User-Agent: Mozilla Thunderbird
Subject: Re: [net PATCH] octeontx2-pf: Fix ntuple rule creation to direct
 packet to VF with higher Rx queue than its PF
Content-Language: en-US
To:     Suman Ghosh <sumang@marvell.com>, <sgoutham@marvell.com>,
        <gakula@marvell.com>, <sbhatta@marvell.com>, <hkelam@marvell.com>,
        <lcherian@marvell.com>, <jerinj@marvell.com>,
        <davem@davemloft.net>, <edumazet@google.com>, <kuba@kernel.org>,
        <pabeni@redhat.com>, <netdev@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <horms@kernel.org>
References: <20231120055138.3602102-1-sumang@marvell.com>
From:   Wojciech Drewek <wojciech.drewek@intel.com>
In-Reply-To: <20231120055138.3602102-1-sumang@marvell.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YnNWSnJ5eWJTRTRlUUJQWnNENzNxTzEybFBmRlBTWUdwMUx3VkhLTmFzaGpE?=
 =?utf-8?B?QlNGalphTGNPRFhqSjRkMUs4MHlsRGprcUJCd3lCaUJwbEdoUkpNQy9sSlFK?=
 =?utf-8?B?MWRYZjVmM1o1M3RLaUJuMlR6bXBJamVWeE9MT3c0SEhRcC9WWnA2clB4VXBI?=
 =?utf-8?B?akZsTGJMLzdyK2ozdUlla2tQcUdIaFVjTWUxWEdPOEhacjJQUG13NmM1TmtI?=
 =?utf-8?B?N0ljY1FhYzRqN0NrNDlMaStWRkV2SGFkVXZiWWxkcExVU0lqK1BXMXQxRm04?=
 =?utf-8?B?czZhdVhac0NiaFZvSU8xaW1kNjArelhQKzhzd1BWbUVpK0lFbklDUGJxSmE2?=
 =?utf-8?B?WnJ5NnlDSGEya3RUaXBEckpSWkZuY2NPL0RZaFpGQnZxRkc5L0JVaExDQ2J3?=
 =?utf-8?B?akdTOGdPb3VRUTVWK3NWeVBmS0RDRW1mWkJ4SUl3a3lxcmxJaXI1eXFVR2hz?=
 =?utf-8?B?bG5nVTlWUlUza0ZZaVBlMjJTZUFVRHhQc2R6dVIxNkFNLzFpMnRHSEl5YzFT?=
 =?utf-8?B?cUxLQk5HV2t6RW1tOTQvZ1RzWFdIVW5BeFl3VDFBV2hTUE1JRHQxWkw4TURu?=
 =?utf-8?B?c1MyaWwrL2QyZCtwNFUvV3RCTjFrYUwrN2hXdGdjbzliWUJmell5REdaSEQ4?=
 =?utf-8?B?YXlGSE81ODhXUWUzMUxxZDNTRERjMkNnTWJhRTVIQlppY0dvNmxrWWJuaTRG?=
 =?utf-8?B?Y3NEaWFTYjI1emovdkh0SitoM1M3Rm83VEo0Zi9XeDV6ak1qWDhnSUJiM2lt?=
 =?utf-8?B?T2JoU0QzOGlqQmYzcmFJd0FqSHR5djh6SUdvQXZWUVlPZkVlL3A5MDhxYlFu?=
 =?utf-8?B?QVh4TTNBNnNlbDIvYUNsMFUzSDhNR1ZHRU5Bb3dQVEx5RzV2QTVyWkJWd1p2?=
 =?utf-8?B?V0U4eXAxaTRoMm1aQTlCcEo4YUJ4eS9JUjBiSEtLaklONUtoMC9SZXpiS256?=
 =?utf-8?B?Zk5WVGRFZUNDWTBxb05XZzE3dWQ0THltdlAvM0lVUS9FSXlacStBbXdXU2JC?=
 =?utf-8?B?TzBnZ3phL2x6dWFzaHUrSmRTdHZXRXZ0YWh4bzBGNWFqcXNCdDQzR0tPbG5F?=
 =?utf-8?B?MFcwQk1zeUZDL3B3T1FjQWE4LzFEYituNGplNHZXY1RrdmNmNERTdG1UTVZo?=
 =?utf-8?B?MDdrMG1Mb1JiTTlpbk80UkNSTDhRWG01M0xBd3VkaktGQ0hjVUkrdTU4aFp5?=
 =?utf-8?B?aUZkNDdxdlZKV3ZSUFhodlJudVJQcXkwZ29rZWFJSkVZdTgyN0tNQWNGNGdZ?=
 =?utf-8?B?QkJGSWxmcE1YSDJCNklYN3hzb01HOGdnNFo1cEZJSUlhSjVyUm9JK3F1Q0tz?=
 =?utf-8?B?TXpXN2dvc0dWSDIzZXZBVVRhcTVPVjYzNkE4OGJ0M2xlY3BpZ1A5RjBFZUdu?=
 =?utf-8?B?aWNxdCtTZWNxdXVuaHhJc3pJS001NndxeVBoOEZCYkZJLzd1amsybk5pR2xU?=
 =?utf-8?B?TVl4Y2JyQUdSSEpQOE52MkF4RXRRNUIwYjQwM0g0bW1DdGQ0RUtuelVWRjI3?=
 =?utf-8?B?M3JmNGZORklYbnFCSVdVNkgxMVBKYWdPRjFnNi9lTkM1Q3pGTmhJQjFHR2o2?=
 =?utf-8?B?eis3aytxVFpwS3RYVk9hVXYrZ0ZoMzhsTzlBVzRoN0tYbXUrZ2JFYlBHK01q?=
 =?utf-8?B?Z3gvbDdRcDQwYWFySEwvRlNWV3VmQ3IxenQwQSt5U2hhaWlqa0s5OEJpRENH?=
 =?utf-8?B?MzArTGV4UVo5RWcxQzRoWTFWa2ROaTRVSmxqM2RkUkF2Vzl6RUNIQlhiVEdW?=
 =?utf-8?B?M2hUdG9hL2VEQTJWRnBsL2dEMFlCVFBkZS94aVlsSDlablluQzNKVVVqZ0o2?=
 =?utf-8?B?QWY5ZWNnVjR1S2VFcVdtOHFrdTJSWVdiY09uaGpMbGFMd1paa25rT1NKeHpM?=
 =?utf-8?B?bXZXcVJTd3lsejluU3VRL2N6aHdFbU5vRkV6Yk1XUXlHSkI4Z21WV2ZtY09a?=
 =?utf-8?B?dnVRNkpoZm9rckt0WUFwcm5kemNuV1NIVFA5Tk12Tk04Slc1WGlLdGFybVVE?=
 =?utf-8?B?WU5FOENZc2hvdU9WVHJFRGx5Q0x0WGYwR2w2NGtVbDZuZjk4dXFTWklydksw?=
 =?utf-8?B?anFtVHdSVXdjNkFSMk9YMGhkV2pGa0d3UDVoR25RbEVqdUs0MHVodk92Y2VX?=
 =?utf-8?B?eDJQeTgxVWlidXU2cUpveS85dllmbVVDUHV0ZWc3TzFnenpCSngrT1NZU2lk?=
 =?utf-8?B?Umc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 85d8e302-c10f-4350-3965-08dbe9c09183
X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5776.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2023 12:02:28.9894
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: wBAkZmyt2m8elkZizkEuobZfYobS4AZw5k5u3b+ezD5SdKBCbjdyrlAuR3XvsYbaEPtyNXdJvZBpuDZa8dWlKXI4U0Ceymc1mFbYmCSstY4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR11MB8768
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 20 Nov 2023 04:03:01 -0800 (PST)


On 20.11.2023 06:51, Suman Ghosh wrote:
> It is possible to add a ntuple rule which would like to direct packet to
> a VF whose number of queues are greater/less than its PF's queue numbers.
> For example a PF can have 2 Rx queues but a VF created on that PF can have
> 8 Rx queues. As of today, ntuple rule will reject rule because it is
> checking the requested queue number against PF's number of Rx queues.
> As a part of this fix if the action of a ntuple rule is to move a packet
> to a VF's queue then the check is removed. Also, a debug information is
> printed to aware user that it is user's responsibility to cross check if
> the requested queue number on that VF is a valid one.
> 
> Fixes: f0a1913f8a6f ("octeontx2-pf: Add support for ethtool ntuple filters")
> Signed-off-by: Suman Ghosh <sumang@marvell.com>
> ---
>  .../marvell/octeontx2/nic/otx2_flows.c        | 21 +++++++++++++++++++
>  1 file changed, 21 insertions(+)
> 
> diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
> index 4762dbea64a1..4200f2d387f6 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
> +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
> @@ -1088,6 +1088,7 @@ int otx2_add_flow(struct otx2_nic *pfvf, struct ethtool_rxnfc *nfc)
>  	struct ethhdr *eth_hdr;
>  	bool new = false;
>  	int err = 0;
> +	u64 vf_num;
>  	u32 ring;
>  
>  	if (!flow_cfg->max_flows) {
> @@ -1100,9 +1101,26 @@ int otx2_add_flow(struct otx2_nic *pfvf, struct ethtool_rxnfc *nfc)
>  	if (!(pfvf->flags & OTX2_FLAG_NTUPLE_SUPPORT))
>  		return -ENOMEM;
>  
> +	/* Number of queues on a VF can be greater or less than
> +	 * the PF's queue. Hence no need to check for the
> +	 * queue count. Hence no need to check queue count if PF
> +	 * is installing for its VF. Below is the expected vf_num value
> +	 * based on the ethtool commands.
> +	 *
> +	 * e.g.
> +	 * 1. ethtool -U <netdev> ... action -1  ==> vf_num:255
> +	 * 2. ethtool -U <netdev> ... action <queue_num>  ==> vf_num:0
> +	 * 3. ethtool -U <netdev> ... vf <vf_idx> queue <queue_num>  ==>
> +	 *    vf_num:vf_idx+1
> +	 */
> +	vf_num = ethtool_get_flow_spec_ring_vf(fsp->ring_cookie);
> +	if (!is_otx2_vf(pfvf->pcifunc) && vf_num)
> +		goto bypass_queue_check;

Let's just add this condition to the next if, no need for goto.

> +
>  	if (ring >= pfvf->hw.rx_queues && fsp->ring_cookie != RX_CLS_FLOW_DISC)
>  		return -EINVAL;
>  
> +bypass_queue_check:
>  	if (fsp->location >= otx2_get_maxflows(flow_cfg))
>  		return -EINVAL;
>  
> @@ -1182,6 +1200,9 @@ int otx2_add_flow(struct otx2_nic *pfvf, struct ethtool_rxnfc *nfc)
>  		flow_cfg->nr_flows++;
>  	}
>  
> +	if (flow->is_vf)
> +		netdev_info(pfvf->netdev,
> +			    "Make sure that VF's queue number is within its queue limit\n");
>  	return 0;
>  }
>