Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Message-ID: <248da3d7-cb00-14b6-12f0-6bb9fda6d532@intel.com>
Date:   Fri, 15 Apr 2022 13:55:06 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.8.0
Subject: Re: [Intel-wired-lan] [PATCH net] ice: Protect vf_state check by
 cfg_lock in ice_vc_process_vf_msg()
Content-Language: en-US
To:     Maciej Fijalkowski <maciej.fijalkowski@intel.com>,
        Ivan Vecera <ivecera@redhat.com>
CC:     Fei Liu <feliu@redhat.com>, <netdev@vger.kernel.org>,
        <mschmidt@redhat.com>, Brett Creeley <brett@pensando.io>,
        open list <linux-kernel@vger.kernel.org>,
        "moderated list:INTEL ETHERNET DRIVERS" 
        <intel-wired-lan@lists.osuosl.org>,
        Jakub Kicinski <kuba@kernel.org>,
        "Paolo Abeni" <pabeni@redhat.com>,
        "David S. Miller" <davem@davemloft.net>
References: <20220413072259.3189386-1-ivecera@redhat.com>
 <YlldFriBVkKEgbBs@boxer> <YlldsfrRJURXpp5d@boxer>
From:   Tony Nguyen <anthony.l.nguyen@intel.com>
In-Reply-To: <YlldsfrRJURXpp5d@boxer>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NDQ0eERCTDJqVFRSMDhmU0xsT3FyRWRMU3Z0Nmcra1k0RVN1cnArMm9kODVx?=
 =?utf-8?B?ZHlWSzVTWHRicFUxUWxncnZBNDhhQ0hOeEt1QmduK3lVUFZ4c243ejBXOFZj?=
 =?utf-8?B?MzNqZ2NOdFJGWmkzZW94b3J3NEp1SnVpdFM4VWVkSUlsb05GUDhVTWU1R2wr?=
 =?utf-8?B?Unc0YTQvZ2hucTV5UmNENTlxR1NrdDlub0hlRzNOQnBuNUdxRjh5RWRLVGFm?=
 =?utf-8?B?NGhReVBZaThsWVpWN2pqVnVKelNoZHFVcXN1S1pBNCtpWkxpNURyWmFjTEVz?=
 =?utf-8?B?ODVNclV0V09MbVB4eitlMEY4ZzJJM3NRN1NLci81a3NPbDVVSC9jSlBBNXpK?=
 =?utf-8?B?WEFOYW1nRzRtKzBEYXlNaWtWQ0grTlNUSitaTHJ5d2QvNS9PdWI0N3NuRXBs?=
 =?utf-8?B?eFpxZnAwZkYxekxYc3U2b2hNZzlYblZvOHI1bjlicU54amp0aUI4OFF4QktR?=
 =?utf-8?B?b29SbUFtOXhCcEk0c1RHanVtNnRhZG1vMFl5eStzVEUrY0dUeWl2STVrdXdr?=
 =?utf-8?B?Sm1GKy9pdUZQNnBHN1FCL0cxN3FxOWtNTFp6QWRKVjM2SWpReFJLMU9WcWFx?=
 =?utf-8?B?Mm51YUpvVjhUVjBvNDUxMW0rVDRVY1dOVG9QUXA0WWVseE5TdUtEeUhzWXcw?=
 =?utf-8?B?eGxWWS9qOHl1OE1zMFVHM0RmcmhKWFMybjUycG8vYnVRYWpxUjZZdkpJZ2k4?=
 =?utf-8?B?dXZ1UWcvMVBLMHJEZUN5Q091ZWpldkJLejkvNEw1TGFqSjNyVUh6U29oSW1q?=
 =?utf-8?B?NGp4OUEyb3hpcVZlWllPRVVCNE5RYzV6K01udWw4eDBMeTc1d0xoa2hWTlQ2?=
 =?utf-8?B?T1FjaHZOSWcrbnc4T0FRQ3hqNHNIR3krS1p0c3lWRVNUMG5GOEJpOVJ6aUZ3?=
 =?utf-8?B?c3ZlNHFxWis0OEgvSlpzRkVydTlpcEE1d3p2SmMvb1JKTnFKY0JTN3V4VHRG?=
 =?utf-8?B?a0JRekVlUXFEd2k2WmxRK24ybG5WWUQxTmQyWWZyaVJ6b2JyaHNlQUJxc09Y?=
 =?utf-8?B?cmV4b1pDMzd5NTBVNlRiOUJUUGZCeldqTXNRVzlhNHNaQzU1SXUwTmU1VVg1?=
 =?utf-8?B?b21WN25DOHRSckhOZHJlS3dCYzYrZ011T1NqeS8zRyt4blJKeG5xN3R2emY0?=
 =?utf-8?B?MFVNdWVwazdwd2pZRE1IeFNvV2dPVVhTRStTNWxoeHAwaVNHNFlONERLQUxQ?=
 =?utf-8?B?TGl4dWd0b0NSemhEbERqNkRyQ3NRN0JFdXVDNXpybkowWnM3eUtVTkNENVN0?=
 =?utf-8?B?T2JVdHNXdkZoUXdhd2xZdXBZWHNjYVR6Q3dXWDBybm1MV01MQkRIQzkzZmp2?=
 =?utf-8?B?Y0pUUnkvU3ZKRlNhVnYvSVhXNGw3VTN4MWFuODJoT2cvUDc1Qk0zbVNqUnpG?=
 =?utf-8?B?NEJ4MEtoQThpeFh1dVl5U1VySVJ2dFlIQWpNSU5BMnJhNUo1ZHoxNExkTDB3?=
 =?utf-8?B?eDEza1U0OGlPUWs4YzRVSVl3dWRETWpsSndaSEZSd1lHVWZZVmNkMkZYc2N6?=
 =?utf-8?B?R2thSU1xQjREdFpJK1dHVG5lcXo1ZlBhS3orcEFxRUhSK1lqTFFoK0hDdGEy?=
 =?utf-8?B?ekNjWVNuSFNuOGZ0TjJTU0p2bHhqeWx4NWpDWFRlUUlLQmtDb0grUHdKN09C?=
 =?utf-8?B?YXI5R3FSK1ZlY1YrRFplYmczWFVBbmptZU8rUHpDWW1wbTZpZ1A4NnpHejBz?=
 =?utf-8?B?b3oyNjlXdSs4Zlg2K1lPcWtZMnhiQjRHdzN6T29vRGQva0Q3MDdtTU9nWG5l?=
 =?utf-8?B?Qks4RmJTc0pCVFBqU2tkOFlzV05LTENsdEcxemVXTHlKZENrSE9SN044M1NS?=
 =?utf-8?B?Y1VjeFJrMDlOaG9vc1VpZWMwWmVtRTBTU3JtOEN6SkkzaU5EbVRvM0ZqNHF3?=
 =?utf-8?B?TEdyY2lzUWM1Q3dES1REVENNQ2I1SkM5Ti9ieUIxNzhyS055NGRrZk5KZUZY?=
 =?utf-8?B?MGkwMmtrZ25vZnhYMUtKLzZ1ZEV0b0RaRzZEOGR6bHU5T2F4MWhRdVNyMTUz?=
 =?utf-8?B?YnNDVnlBcVBFdzZtTUF5SGpRWThCUFVSM3ljdjdCSnlKNi9Cd0tCL0M2b1JG?=
 =?utf-8?B?S21heXJENFFhNEkycVBOS3hSemEvdzAxLzE3Nk0yUDAxWlpxNTY2Z3U0NFEz?=
 =?utf-8?B?OENLSHJ2WmllR3JGc0lwbjU3S1FHR2R4VUljLytOVjRGeUo1UDFINzJteXpa?=
 =?utf-8?B?WnVIL1AyS0ZnOUpDZW5vYmlTVnhaaFZwSHE0M3VYMmRJVFNXdmp2VkhkdnRn?=
 =?utf-8?B?Zzhnam5oV2pmNG15OTlyUDEvV25DTUh1TEUxT2lyTXZ0UGsyNENTS0FHWi90?=
 =?utf-8?B?c2dKNGRQWm42b2h2dldLbVEwN3RHaGlNYnZ3eTNzMENVeGZsWityU3JiWXQ2?=
 =?utf-8?Q?/MhHvYpnXogme+pg=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: d1f21a4b-7980-41c1-812f-08da1f223a7d
X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB3229.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 20:55:09.8717
 (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: O/CRrGzFInQnz798sdPWH9IDMw7lpYPeZsrAF+FGcl2wRX1XwhzxTG5EwwBV52Slk6iW5ADS86MWNoBIgWUwIJlGQlKCqvP0of4TEeAaBBY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR11MB5337
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-5.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,NICE_REPLY_A,RDNS_NONE,SPF_HELO_NONE,
	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
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 4/15/2022 4:57 AM, Maciej Fijalkowski wrote:

<snip>

>>> diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
>>> index 5612c032f15a..553287a75b50 100644
>>> --- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c
>>> +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
>>> @@ -3625,44 +3625,39 @@ void ice_vc_process_vf_msg(struct ice_pf *pf, struct ice_rq_event_info *event)
>>>   		return;
>>>   	}
>>>   
>>> +	mutex_lock(&vf->cfg_lock);
>>> +
>>>   	/* Check if VF is disabled. */
>>>   	if (test_bit(ICE_VF_STATE_DIS, vf->vf_states)) {
>>>   		err = -EPERM;
>>> -		goto error_handler;
>>> -	}
>>> -
>>> -	ops = vf->virtchnl_ops;
>>> -
>>> -	/* Perform basic checks on the msg */
>>> -	err = virtchnl_vc_validate_vf_msg(&vf->vf_ver, v_opcode, msg, msglen);
>>> -	if (err) {
>>> -		if (err == VIRTCHNL_STATUS_ERR_PARAM)
>>> -			err = -EPERM;
>>> -		else
>>> -			err = -EINVAL;
>>> +	} else {
>>> +		/* Perform basic checks on the msg */
>>> +		err = virtchnl_vc_validate_vf_msg(&vf->vf_ver, v_opcode, msg,
>>> +						  msglen);
>>> +		if (err) {
>>> +			if (err == VIRTCHNL_STATUS_ERR_PARAM)
>>> +				err = -EPERM;
>>> +			else
>>> +				err = -EINVAL;
>>> +		}
>> The chunk above feels a bit like unnecessary churn, no?
>> Couldn't this patch be simply focused only on extending critical section?

Agree, this doesn't seem related to the fix.

Thanks,

Tony


>>>   	}
>>> -
>>> -error_handler:
>>>   	if (err) {
>>>   		ice_vc_send_msg_to_vf(vf, v_opcode, VIRTCHNL_STATUS_ERR_PARAM,
>>>   				      NULL, 0);
>>>   		dev_err(dev, "Invalid message from VF %d, opcode %d, len %d, error %d\n",
>>>   			vf_id, v_opcode, msglen, err);
>>> -		ice_put_vf(vf);
>>> -		return;
>>> +		goto finish;
>>>   	}
>>>   
>>> -	mutex_lock(&vf->cfg_lock);
>>> -
>>>   	if (!ice_vc_is_opcode_allowed(vf, v_opcode)) {
>>>   		ice_vc_send_msg_to_vf(vf, v_opcode,
>>>   				      VIRTCHNL_STATUS_ERR_NOT_SUPPORTED, NULL,
>>>   				      0);
>>> -		mutex_unlock(&vf->cfg_lock);
>>> -		ice_put_vf(vf);
>>> -		return;
>>> +		goto finish;
>>>   	}
>>>   
>>> +	ops = vf->virtchnl_ops;
>>> +
>>>   	switch (v_opcode) {
>>>   	case VIRTCHNL_OP_VERSION:
>>>   		err = ops->get_ver_msg(vf, msg);
>>> @@ -3773,6 +3768,7 @@ void ice_vc_process_vf_msg(struct ice_pf *pf, struct ice_rq_event_info *event)
>>>   			 vf_id, v_opcode, err);
>>>   	}
>>>   
>>> +finish:
>>>   	mutex_unlock(&vf->cfg_lock);
>>>   	ice_put_vf(vf);
>>>   }
>>> -- 
>>> 2.35.1
>>>
>>> _______________________________________________
>>> Intel-wired-lan mailing list
>>> Intel-wired-lan@osuosl.org
>>> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan@osuosl.org
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan