Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <97c58b06-11b5-182b-eed2-e5a74824241c@intel.com>
Date:   Fri, 8 Apr 2022 09:01:05 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: Re: [PATCH net v2] ice: Fix incorrect locking in
 ice_vc_process_vf_msg()
Content-Language: en-US
To:     Alexander Lobakin <alexandr.lobakin@intel.com>
CC:     Ivan Vecera <ivecera@redhat.com>, <netdev@vger.kernel.org>,
        <poros@redhat.com>, <mschmidt@redhat.com>,
        <jacob.e.keller@intel.com>,
        "Jesse Brandeburg" <jesse.brandeburg@intel.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Brett Creeley <brett@pensando.io>,
        "moderated list:INTEL ETHERNET DRIVERS" 
        <intel-wired-lan@lists.osuosl.org>,
        open list <linux-kernel@vger.kernel.org>
References: <20220401104052.1711721-1-ivecera@redhat.com>
 <20220408134714.1834349-1-alexandr.lobakin@intel.com>
From:   Tony Nguyen <anthony.l.nguyen@intel.com>
In-Reply-To: <20220408134714.1834349-1-alexandr.lobakin@intel.com>
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?SURZTEZsZnFvUHlmME0wVEErK2RVdXA2TC94ellVL0h6ejhUQ3paQi9CcXFP?=
 =?utf-8?B?L1BSaVF2TFZEZnptcTNVUnA1RlZHQ2E3RXcyWHVSVWdHT0VWbWFOQXY0czQ0?=
 =?utf-8?B?ZGZaaGxoOUxXTGZjbTVWTnFlZThtWkNncGNCSXFtZHB4OG5WZUlsbHcvY0RU?=
 =?utf-8?B?QXdZRTIyclloTXFJRTg4dVI1YmpicWhFTm8wTVY3RytBZ0t5WW1zaGdwcmdT?=
 =?utf-8?B?ZEtrcFB2UlpYYkZ4TDlwZzdjQTBncHErN3p3ZDFiN1FEOU9yRm5ianZndHpx?=
 =?utf-8?B?cEhablQwSHFaaFNLT3c0V3ZJdklXNUY1Ynl1N29rdFJtUkM2V0lGUUc3QkdL?=
 =?utf-8?B?djJaRWtNa0xvbHA0QkJHRlI5UjVFY3dXb1hFZ2wrdVczbkcraXNnTW9CTXA2?=
 =?utf-8?B?eEFadkYyTmtzenVpRU9aZXcvV2I2Nk5pVzc5U0RhMFlxYnA1THhELy9NOXRE?=
 =?utf-8?B?T0JNbmpsLzdaT3daclBPMUhPdkM1YmliYkZ6elQybVNES0k5cHRpbDhjSWtJ?=
 =?utf-8?B?di9BWnJWWXVzc0lCditaczE5Z243bXJiM1BFV3o3UmtUQTk5TkNkWGtrbkF2?=
 =?utf-8?B?M3RQUllZYWUyWTVjb1Q1bmJxN2dIdE92d3BUall5WkFMOVFMR2lvWXJzOHVE?=
 =?utf-8?B?eG5zYkhNQ2RxT1lvL21yUkE3Z2dSNWZIdENSdWRrNTRic2lJTVlXc1dub0Rt?=
 =?utf-8?B?NjMwYXYzeS9NYVlyWFBab2xGSzFnTWtLSkJ5eWZaSEpmandUTFl1ZEJoUVEy?=
 =?utf-8?B?VVluWGlvWkxFR2ZiYUtmZU1HRmNSWnlwU08yZVVPVlFHNmdVUDFLbmpUY1Fv?=
 =?utf-8?B?cnRndUpJL2VpQ241OUovWEFwRnNaYmNoZDNVWGdxS0ZFZmhOcFZnbjRSZm16?=
 =?utf-8?B?THB4RmNzOGFWMXQwRDdSQTVrcVBUMW1rNFBlR21ZU09mZTRTWGU0NEVzamdW?=
 =?utf-8?B?a09uUDV5U2RvVCtEU2hIYlVtUTd5WGdFUHVyaklZWXd0UVRORXFQM3l1ZG5Y?=
 =?utf-8?B?K2JneFRHMzlDN3BXNzNGY1JaK2NRZEFja3B3aVhwWFhPR09wQ2dXMFRZdmRn?=
 =?utf-8?B?RkhPUC9LZWlqNDVIRWdHM3gwSW91QnFqVTQvMnBIaDZIVVhUU1BaUnh3NGRT?=
 =?utf-8?B?Z294K0x3YVJLckhTb25kT0JvWkdlMWROUHNId29RTjExZ3ZmaXFvQXh3Mnpw?=
 =?utf-8?B?Y0NzTkhSVTJkeFp1RWxySiszcDB0RDZMRHdCTHp5TEtRYzNvWkJJb1VUN2J5?=
 =?utf-8?B?OWJHQzhOV2lOeWNMT0UvNDR5Qi9FSGpzVGNSLzYrcjBPYXRpVmh1MWZCeU1r?=
 =?utf-8?B?UjZCc0xXeGhteXN3S2p5SEZnZXdYbjJ3cHdNdGcrR2tIQnhwQlFjekFSOWRy?=
 =?utf-8?B?RG12RWpkNXZaeGZOdTFrZEJXR1JXY1BpS0o0VHpzVHV5c2FyUDRNcTdrL2th?=
 =?utf-8?B?VGpsYVZXWEd6R1JUdTAyS0l6RW4zQURVUzlRVVFFS2xGSlpodnRaeTRWeEIy?=
 =?utf-8?B?MGJrRitBRHYya3ZRQUx4UVp5THgzTGxEVUkvbnorU1BscERKbVY0T3ZDNUFa?=
 =?utf-8?B?WmRTSnZYbDl5UWE5MDZvWHJkc0drMDNtNjZZYS8vYk5VUTM1SjJBU1hrM0pR?=
 =?utf-8?B?WTZid08zVU9BWEpBRTllbmFFVWNlRDlabHpaWWNvdlpFTzlGNFRMblh5SWxH?=
 =?utf-8?B?R1Z5Ymc0alRKSWc1WnpQYitLOGJza3JnUWQzcmdKUTRhWGd1NnRKY2M0akh6?=
 =?utf-8?B?MDRJM0g4R3pxSHAwc3NPTmZ1dENBcUF2akt3aUQvVXo5OEpSZk9ibWNSYmoz?=
 =?utf-8?B?YkttU0UvTFVrYnhzUFhjNW9nZzZaV1ArWUFFdXRYaFJoaitmMG5PVDdtaHEr?=
 =?utf-8?B?aUI3ZGNRb3RhZXFZRHh3OVhSUHFKZmpJd2JFSGFmVUtZelZnQ0JqZ01UQ2Vt?=
 =?utf-8?B?ZjRlRTVud1VKSDA4bzZXb1pGUE5jcjkxbUpYMS8zSk5vWFl2UURuRWpVUVVW?=
 =?utf-8?B?enNCOUN5ak52YnZUTklaTy9vbEltMXhWb3pNZDk3bnA1MDVRUGhGdE5pdHVl?=
 =?utf-8?B?QzgyaERqZUZ4cHdENGFUS1l5NE1SVWJsdmIraytNVkt0R2l3ZWI3UTlRYkcz?=
 =?utf-8?B?SmRyM3dNV0FUdHdhK1RmcGNVWXdENjFuUkdFN1plbFo1OVBRYXVoYVZmYlRy?=
 =?utf-8?B?TXE3SmJ0Szd1K2lOSXcyUEY0TmtoUCs0NmgyZ2dMNkFCSDhzMGNEa3kxUnYz?=
 =?utf-8?B?dzRPeFBUNFVuSjgyZmI3V2ZWVEJDWFd3TWljQUlNOUZIS2xBNnlzNW9OOEh4?=
 =?utf-8?B?STFZOWRPOHY5SWp4YmxycmFZOUp4NDJ0QTBud3NCZ05xVmZRekIwVlgxbUd2?=
 =?utf-8?Q?FKHigSnXz1sQRDRo=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 942f7e3f-3c8b-47e2-6231-08da19790eda
X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB3229.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2022 16:01:35.8995
 (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: Rj5tBWNlvCsNkK4jmoFufwu6GdUhbvDBAf7h4W4jjJBt/kDeu1B424R8J0L+tCxP49iU2nghAwZKvz2oBLN8c1y81ID7W8Rz8j27X9kOFUs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR11MB5348
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham 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/8/2022 6:47 AM, Alexander Lobakin wrote:
> From: Ivan Vecera <ivecera@redhat.com>
> Date: Fri,  1 Apr 2022 12:40:52 +0200
>
>> Usage of mutex_trylock() in ice_vc_process_vf_msg() is incorrect
>> because message sent from VF is ignored and never processed.
>>
>> Use mutex_lock() instead to fix the issue. It is safe because this
>> mutex is used to prevent races between VF related NDOs and
>> handlers processing request messages from VF and these handlers
>> are running in ice_service_task() context. Additionally move this
>> mutex lock prior ice_vc_is_opcode_allowed() call to avoid potential
>> races during allowlist acccess.
>>
>> Fixes: e6ba5273d4ed ("ice: Fix race conditions between virtchnl handling and VF ndo ops")
>> Signed-off-by: Ivan Vecera <ivecera@redhat.com>
> Hey Tony,
>
> I guess you missed this one due to being on a vacation previously.
> It's been previously reviewed IIRC, could you take it into
> net-queue?

I remember applying this but I don't see it on the tree so I must be 
mistaken. :( I'll get it applied, thanks for catching.

-Tony

>> ---
>>   drivers/net/ethernet/intel/ice/ice_virtchnl.c | 21 +++++++------------
>>   1 file changed, 7 insertions(+), 14 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
>> index 3f1a63815bac..a465f3743ffc 100644
>> --- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c
>> +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
>> @@ -3642,14 +3642,6 @@ void ice_vc_process_vf_msg(struct ice_pf *pf, struct ice_rq_event_info *event)
>>   			err = -EINVAL;
>>   	}
>>   
>> -	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);
>> -		ice_put_vf(vf);
>> -		return;
>> -	}
>> -
>>   error_handler:
>>   	if (err) {
>>   		ice_vc_send_msg_to_vf(vf, v_opcode, VIRTCHNL_STATUS_ERR_PARAM,
>> @@ -3660,12 +3652,13 @@ void ice_vc_process_vf_msg(struct ice_pf *pf, struct ice_rq_event_info *event)
>>   		return;
>>   	}
>>   
>> -	/* VF is being configured in another context that triggers a VFR, so no
>> -	 * need to process this message
>> -	 */
>> -	if (!mutex_trylock(&vf->cfg_lock)) {
>> -		dev_info(dev, "VF %u is being configured in another context that will trigger a VFR, so there is no need to handle this message\n",
>> -			 vf->vf_id);
>> +	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;
>>   	}
>> -- 
>> 2.35.1
> Thanks,
> Al