Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 29 Nov 2018 06:46:21 +0000 (UTC)
From:      Andrew Rybchenko <arybchik@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r341209 - head/sys/dev/sfxge/common
Message-ID:  <201811290646.wAT6kLW6025982@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: arybchik
Date: Thu Nov 29 06:46:21 2018
New Revision: 341209
URL: https://svnweb.freebsd.org/changeset/base/341209

Log:
  sfxge(4): get max supported value for action MARK
  
  The mark value for MATCH_ACTION_MARK has a maximum value.
  Requesting a value larger than the maximum will cause the
  filter insertion to fail with EINVAL. This patch allows the
  driver to check the value at the filter validation.
  
  Submitted by:   Roman Zhukov <roman.zhukov at oktetlabs.ru>
  Sponsored by:   Solarflare Communications, Inc.
  Differential Revision:  https://reviews.freebsd.org/D18240

Modified:
  head/sys/dev/sfxge/common/ef10_nic.c
  head/sys/dev/sfxge/common/efx.h
  head/sys/dev/sfxge/common/siena_nic.c

Modified: head/sys/dev/sfxge/common/ef10_nic.c
==============================================================================
--- head/sys/dev/sfxge/common/ef10_nic.c	Thu Nov 29 06:46:10 2018	(r341208)
+++ head/sys/dev/sfxge/common/ef10_nic.c	Thu Nov 29 06:46:21 2018	(r341209)
@@ -1023,7 +1023,7 @@ ef10_get_datapath_caps(
 	efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
 	efx_mcdi_req_t req;
 	uint8_t payload[MAX(MC_CMD_GET_CAPABILITIES_IN_LEN,
-			    MC_CMD_GET_CAPABILITIES_V4_OUT_LEN)];
+			    MC_CMD_GET_CAPABILITIES_V5_OUT_LEN)];
 	efx_rc_t rc;
 
 	if ((rc = ef10_mcdi_get_pf_count(enp, &encp->enc_hw_pf_count)) != 0)
@@ -1035,7 +1035,7 @@ ef10_get_datapath_caps(
 	req.emr_in_buf = payload;
 	req.emr_in_length = MC_CMD_GET_CAPABILITIES_IN_LEN;
 	req.emr_out_buf = payload;
-	req.emr_out_length = MC_CMD_GET_CAPABILITIES_V4_OUT_LEN;
+	req.emr_out_length = MC_CMD_GET_CAPABILITIES_V5_OUT_LEN;
 
 	efx_mcdi_execute_quiet(enp, &req);
 
@@ -1331,6 +1331,13 @@ ef10_get_datapath_caps(
 		encp->enc_filter_action_mark_supported = B_TRUE;
 	else
 		encp->enc_filter_action_mark_supported = B_FALSE;
+
+	/* Get maximum supported value for "MARK" filter action */
+	if (req.emr_out_length_used >= MC_CMD_GET_CAPABILITIES_V5_OUT_LEN)
+		encp->enc_filter_action_mark_max = MCDI_OUT_DWORD(req,
+		    GET_CAPABILITIES_V5_OUT_FILTER_ACTION_MARK_MAX);
+	else
+		encp->enc_filter_action_mark_max = 0;
 
 #undef CAP_FLAGS1
 #undef CAP_FLAGS2

Modified: head/sys/dev/sfxge/common/efx.h
==============================================================================
--- head/sys/dev/sfxge/common/efx.h	Thu Nov 29 06:46:10 2018	(r341208)
+++ head/sys/dev/sfxge/common/efx.h	Thu Nov 29 06:46:21 2018	(r341209)
@@ -1324,6 +1324,7 @@ typedef struct efx_nic_cfg_s {
 	/* Firmware support for "FLAG" and "MARK" filter actions */
 	boolean_t		enc_filter_action_flag_supported;
 	boolean_t		enc_filter_action_mark_supported;
+	uint32_t		enc_filter_action_mark_max;
 } efx_nic_cfg_t;
 
 #define	EFX_PCI_FUNCTION_IS_PF(_encp)	((_encp)->enc_vf == 0xffff)

Modified: head/sys/dev/sfxge/common/siena_nic.c
==============================================================================
--- head/sys/dev/sfxge/common/siena_nic.c	Thu Nov 29 06:46:10 2018	(r341208)
+++ head/sys/dev/sfxge/common/siena_nic.c	Thu Nov 29 06:46:21 2018	(r341209)
@@ -203,6 +203,7 @@ siena_board_cfg(
 
 	encp->enc_filter_action_flag_supported = B_FALSE;
 	encp->enc_filter_action_mark_supported = B_FALSE;
+	encp->enc_filter_action_mark_max = 0;
 
 	return (0);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811290646.wAT6kLW6025982>