Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
Message-ID: <a0b808bb-a123-4030-9e51-f40226c7ed56@oracle.com>
Date:   Mon, 4 Dec 2023 08:37:07 -0500
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH V3] vdpa/mlx5: preserve CVQ vringh index
Content-Language: en-US
To:     "Michael S. Tsirkin" <mst@redhat.com>
Cc:     virtualization@lists.linux-foundation.org,
        linux-kernel@vger.kernel.org, Jason Wang <jasowang@redhat.com>,
        Eli Cohen <elic@nvidia.com>,
        Si-Wei Liu <si-wei.liu@oracle.com>,
        Dragos Tatulea <dtatulea@nvidia.com>,
        Xuan Zhuo <xuanzhuo@linux.alibaba.com>,
        Eugenio Perez Martin <eperezma@redhat.com>
References: <1699014387-194368-1-git-send-email-steven.sistare@oracle.com>
 <22981f62-5c57-41c4-8ed2-a11b7b93d062@oracle.com>
 <20231204083524-mutt-send-email-mst@kernel.org>
From:   Steven Sistare <steven.sistare@oracle.com>
Organization: Oracle Corporation
In-Reply-To: <20231204083524-mutt-send-email-mst@kernel.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TWtrQ2x6REloRzhhdFBqU2c4M3ZHREU2ZW5GTHZqYWZOZjVlRXJPQW1jRDR4?=
 =?utf-8?B?WVk5UEJPQlRtTkU4RnB5d3o0eWdZRktZSW82V2ptcCtFM2ZYQzFvNldVcCt6?=
 =?utf-8?B?L2hrRWhEcE1nWjlNYzVwZVJQOHMydjIxSW5pUGJkKzZvMHBqUHFqQ2h3Z2FD?=
 =?utf-8?B?UHozUWtwNWcyQmUwMFRKTEk3am9OdVM3dXpuUGdpR3BiOWJxL3ZjcFFpMDFH?=
 =?utf-8?B?TnU5enVmK2R6ZEFhSklQVVBtcGQyZXlPNE55SzJoOTFLVkY0R0FXcHh6M2pY?=
 =?utf-8?B?cXpoU0h2c0M3Zld5MFU4VktNL2xwZ05RMWsrWHhsUWFCUkh4ZGpwYXJKcm9n?=
 =?utf-8?B?ZkdvaG4rcjJUdkpQY3ZXYjVIL21BaXBKa29tbitneUwvSlU1Y1d0b3ZERnR6?=
 =?utf-8?B?V2REZlZlcDh6UFVMblVMREZVQWpCM2F4MlBNRnlETmQwcXFXTUlvSWtvZjZF?=
 =?utf-8?B?SWFNT3l4UWNKQzg5M0l6K0ZWWjdlNXRRemVLZlVDc1liRDBsSXRxREFwN2hn?=
 =?utf-8?B?MjVHWVJUS1o3OVdHYkhTUHg2dUtKeXhXT2R3UE1VSWlqclcyMjhNdWN4b3BD?=
 =?utf-8?B?eWxOZ3dqd1BXRmJRSXhPSDdSQzlhK1lzUkI0TlAzQkMrMHU0Y2VPdnRrTkN6?=
 =?utf-8?B?OVZ5aGd1K011YnR5R3RUYk4vREdzZTBWT00vTVR5OFFnSENwRTYyTVBtZ01T?=
 =?utf-8?B?bDFaWGNmRWpka0srUEpsVkF4UkJUay95bUkyZ0tQOGVsM2dsZHhSelZTajZN?=
 =?utf-8?B?ZVlmcXZraXdINGprVVU1ZEpReVR4aXFNaWFtVjNkcWpJeDVmejVoM2ZoV0ha?=
 =?utf-8?B?d2M1L3Jnc1BwWHhQM2djMlFYVnJZeHNpTjVvUTduc2pIOTZPQmQvSlEzeEtm?=
 =?utf-8?B?SXdPNlFpT1lmOVkwM0Q5aUVDWEM2REhqMyt2SmNPd05iSU9RTi9VTGFSMEg1?=
 =?utf-8?B?WVF4d2NKaTR2UWRkOUpqb3k3QWxwd3BIczZLOWZ5RDdxdWZLdHpMS2FjWTZO?=
 =?utf-8?B?QWpJbW1kNDhhVUtESUJMN3FEcEdQbnFBNXFMUVJxZ2w5NXM5NlRvRGFWMG9q?=
 =?utf-8?B?QUJxdU9kbzRPMHo1bCtTVGorYy9ERE1hVTVoWk1RSFZLR1lGNWpmdlVoN3R0?=
 =?utf-8?B?OTEweENGOVBUYVFwWU5Ea1FhVTNmUkFxbGxrdUJ1VzkxbFJKSjBBdE40aTB1?=
 =?utf-8?B?aExGUFFaKzBCbXd3Wk1OZ1dzc3ZJTjN4VkEwZUFkd0VrYUVOcWpRQUpMWnNG?=
 =?utf-8?B?SkYxY3E2UEk0RnRLREh5SjI0bFpiWGxIYWwxUHM1Wk0zMGIvMFA5M1dRTHp3?=
 =?utf-8?B?T1dIVmNMWWtKMjIrcEpJSHpOY1daa2V0bVcxc01zWjU5Y2ExdlhiUlYxRGF1?=
 =?utf-8?B?emdDZkpDMlVXVWRiYmxVU1FtR2VoT0ZtSmN5S1ZYWU5sSzNQNkFtTm9aSTNV?=
 =?utf-8?B?azZyZWRpcm92NDhPTGRKdXZiZnBORlgyOFRIc1QvSHQzRHJVMU42QnNCbmVS?=
 =?utf-8?B?djk2cXJnMStYaDlWOE11cWNEUnE5RXhhQi8wbnpxLzJkcmVvSkx2NHhQN3Av?=
 =?utf-8?B?M2pGTmlBVHdHWU9iME51d2ttTWkwUUxDbWFGb3p5bVNEN3k1enA5a2JUZmQ3?=
 =?utf-8?B?NTJoYVlhUk5yWDBBSWVMYlBuZ09GMFJXMzI4dzVjalVWZUtPQWFwcGpQSlc4?=
 =?utf-8?B?R1R0aGdVTkR0REFRbjloY242QWtpOHdPVUJjbGNHOXUyZ2FjRmdwYlFyMlNO?=
 =?utf-8?B?VFlsZURURnZOMDRTNlJ3Uk1Kcjc2bThRN3ZiaHVlZE40enFBSHc3ZG50WSty?=
 =?utf-8?B?Tld6K28rc2NIMlVoK2MwQmcwQ0VhZ3N4YVNIdGtzcFE3V0FkbzhHaDZKK2hW?=
 =?utf-8?B?QWhCdkJFSmJyZ3RCOFFKSGVOTnlPR01UZ2g3T3FBVG9XdjNmSXFGVjE4MnFk?=
 =?utf-8?B?TDhxTDcvRWZwbkZmcFVDbzhkUnV1WG5XUFNDUWFucHlURkJpUDFyK3JtbUR6?=
 =?utf-8?B?Yy81U3VtNlFtYVZIV3krMDhOSDJINmpHR2VrK3JnNW1OUEhKMHI3eFRzemdZ?=
 =?utf-8?B?WGtVMHF3bXhyR0xLM3hFZExDYU9lRlBMK1pLbVYvRFByWExBdVZFZWhuT1RF?=
 =?utf-8?B?Y1V6SmpuSk9jMU9ZY2NOYkhKblBLb1NtL3o4UDBkMERmQWdBTkNzREhZSFdI?=
 =?utf-8?B?TGc9PQ==?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?utf-8?B?d242cWJiU1lTaHpXSko3SE83VUU3anRKU0xOcG9lazRwT3dTcU9XN0tvenBD?=
 =?utf-8?B?M1NUMktvYnV5SUJVejY4UTZ3SlVpSXJReGZ2QUtWNVJFallFNDE2MkdrTUdj?=
 =?utf-8?B?TUM4dFFWQWdteGIwSkpuMTZOZUh5Wk5sSGoyc1J6WVR2dXNET09DNER6TFdZ?=
 =?utf-8?B?T3BWMmRkbjlJT1E1bm0rUko5TVBod2JhQ3BIMXIwT08xZHpXMlRTcGZ4bVRm?=
 =?utf-8?B?cTBLNFdrNjN5Q2M4dDE2bDF6NHJ2SGFDaTMxQUUxVnpmSHdFaEgwWjNySmlB?=
 =?utf-8?B?L3NpSG9FLy9YWUc1VlpZSmt6SzkyVlgwV25Fc0RBaEVidGdhSDJmbGdsZ1VU?=
 =?utf-8?B?d0tWSkkyazkybEtPNld3ak5wVW5WSzE3eFRibWo0RG5KVjhINVExbEdTOWw0?=
 =?utf-8?B?ZEo4NzRIQXIwcjBaNjVGZTl2ZlNBRVY2aDVhSjMrSmRPUjUwY2RIcFo0WC9I?=
 =?utf-8?B?Y09pOGNXWXV2UjBFc29ML0d5bDd6dXRiL1RrRTNtL202bnM1NDZCVTJRa2tm?=
 =?utf-8?B?QnJrTHBiK1lRelVMeTFRWEUvcDNDbUJ0N0Nnb0pGR1o1VXBhYXNlS1ZGRm9G?=
 =?utf-8?B?V0IwbHBreXpTdkdMZit4b0FCNlBCODk0MHg0MXV5UVhad2E2cEwxNWJvaUZB?=
 =?utf-8?B?ZVhJR2lsd2pxdmZHNEFLUGhjdjJudktxYXRtZmJybDJCQTV2dE9PN3phWFh2?=
 =?utf-8?B?aXpwRE1JejBzRHczRHk4RG5BZGxHMXhteWZQSUZ2Szl5NndMV1FxamNDRCtE?=
 =?utf-8?B?RTNGSkFPd2lhamcxZVlLcUQ0aC9VZXdPV0dFM3BwUmVWNVhCNm82TVEwQXdt?=
 =?utf-8?B?MGV2czBialB2L2ErM0ZEYjlnc3loT2llZDkzZ1I1am04Nmx1TGVIWDZnQXda?=
 =?utf-8?B?Q3VIUHcvZmNHS094eTZGbXZDakhIRjcrTTBYMXNQaExrUHZWTDFaMit1SnF2?=
 =?utf-8?B?a3BweXV0VUVxVXQwdTVHeVFSZjBCVU5kUU9OaDZ2dFgwaS9RTVZpSmRDM2xa?=
 =?utf-8?B?MG95TFVQc2hmVWhQR2lqaGdKcVJsYXN2YWhTRWZDLzBUNmorK1dRZm5EMWdx?=
 =?utf-8?B?N3lBbEFDWVYwZmVrOHRYSXN1UG0zNnNyRnowTURoc2tYM0UvSHRnSVcweG5n?=
 =?utf-8?B?bDMzQmFYYkNCc2h6TWhQMHZsQmhJTkUzSjNlSTBsME8yTEw4alovbER6c2lT?=
 =?utf-8?B?UjE4blFkUTlxYUYzZnM2ZXcvSHpmNDVLTW96ZGR1VGJ3bHhXd2cyNlVPUTJy?=
 =?utf-8?Q?xGvdfPJjJFx/peH?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a88599dc-8a27-4663-70ab-08dbf4ce1e06
X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4684.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2023 13:37:10.8483
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 3QOhrgtmQC1JV7J1hH276BWyI3zdLzn5FgVbkMfQlF3uGx7EXJ4bnA6aAX5Vso/iGLSdX3yb2GZ8mGq+hNOwB5qu6eSPle0L93hGYWjPJZE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4897
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-12-04_12,2023-12-04_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 malwarescore=0
 mlxlogscore=999 mlxscore=0 suspectscore=0 adultscore=0 spamscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311060000 definitions=main-2312040102
X-Proofpoint-GUID: w_BJDFgaj0eCGUhF6efTO-wUtszyVk9q
X-Proofpoint-ORIG-GUID: w_BJDFgaj0eCGUhF6efTO-wUtszyVk9q
X-Spam-Status: No, score=-0.9 required=5.0 tests=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 agentk.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 (agentk.vger.email [0.0.0.0]); Mon, 04 Dec 2023 05:53:18 -0800 (PST)

Glad to hear it, thanks - Steve

On 12/4/2023 8:35 AM, Michael S. Tsirkin wrote:
> It's in my tee and I'm sending it to Linus.
> 
> On Mon, Dec 04, 2023 at 08:33:22AM -0500, Steven Sistare wrote:
>> What's the decision here, pull it, or do not fix it?
>>
>> - Steve
>>
>> On 11/3/2023 8:26 AM, Steve Sistare wrote:
>>> mlx5_vdpa does not preserve userland's view of vring base for the control
>>> queue in the following sequence:
>>>
>>> ioctl VHOST_SET_VRING_BASE
>>> ioctl VHOST_VDPA_SET_STATUS VIRTIO_CONFIG_S_DRIVER_OK
>>>   mlx5_vdpa_set_status()
>>>     setup_cvq_vring()
>>>       vringh_init_iotlb()
>>>         vringh_init_kern()
>>>           vrh->last_avail_idx = 0;
>>> ioctl VHOST_GET_VRING_BASE
>>>
>>> To fix, restore the value of cvq->vring.last_avail_idx after calling
>>> vringh_init_iotlb.
>>>
>>> Fixes: 5262912ef3cf ("vdpa/mlx5: Add support for control VQ and MAC setting")
>>>
>>> Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
>>> Acked-by: Eugenio Pérez <eperezma@redhat.com>
>>> Acked-by: Jason Wang <jasowang@redhat.com>
>>> ---
>>>  drivers/vdpa/mlx5/net/mlx5_vnet.c | 7 ++++++-
>>>  1 file changed, 6 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
>>> index 946488b8989f..ca972af3c89a 100644
>>> --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
>>> +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
>>> @@ -2795,13 +2795,18 @@ static int setup_cvq_vring(struct mlx5_vdpa_dev *mvdev)
>>>  	struct mlx5_control_vq *cvq = &mvdev->cvq;
>>>  	int err = 0;
>>>  
>>> -	if (mvdev->actual_features & BIT_ULL(VIRTIO_NET_F_CTRL_VQ))
>>> +	if (mvdev->actual_features & BIT_ULL(VIRTIO_NET_F_CTRL_VQ)) {
>>> +		u16 idx = cvq->vring.last_avail_idx;
>>> +
>>>  		err = vringh_init_iotlb(&cvq->vring, mvdev->actual_features,
>>>  					MLX5_CVQ_MAX_ENT, false,
>>>  					(struct vring_desc *)(uintptr_t)cvq->desc_addr,
>>>  					(struct vring_avail *)(uintptr_t)cvq->driver_addr,
>>>  					(struct vring_used *)(uintptr_t)cvq->device_addr);
>>>  
>>> +		if (!err)
>>> +			cvq->vring.last_avail_idx = cvq->vring.last_used_idx = idx;
>>> +	}
>>>  	return err;
>>>  }
>>>  
>