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: <559ad341-2278-5fad-6805-c7f632e9894e@nvidia.com>
Date:   Sat, 6 May 2023 08:08:02 -0400
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0)
 Gecko/20100101 Thunderbird/102.9.0
Subject: Re: [PATCH net v3] virtio_net: Fix error unwinding of XDP
 initialization
To:     Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Cc:     Jason Wang <jasowang@redhat.com>,
        "Michael S . Tsirkin" <mst@redhat.com>,
        Simon Horman <simon.horman@corigine.com>,
        Bodong Wang <bodong@nvidia.com>, William Tu <witu@nvidia.com>,
        Parav Pandit <parav@nvidia.com>,
        virtualization@lists.linux-foundation.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org, bpf@vger.kernel.org
References: <20230503003525.48590-1-feliu@nvidia.com>
 <1683340417.612963-3-xuanzhuo@linux.alibaba.com>
From:   Feng Liu <feliu@nvidia.com>
In-Reply-To: <1683340417.612963-3-xuanzhuo@linux.alibaba.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QnFzQkVDMU9tNzMwKy9DM2tIUEJsWHhwRCtnQ0dGNXRmR2VPZG1DbkVySzRq?=
 =?utf-8?B?QUszNDE4b1NDemNsd3VaNU1XMFQxaXB6NytxRWdLMUdKbEdiTWFoL1lCbTUv?=
 =?utf-8?B?RGQrT0JuZGpZQVN3Si9sMTFpemxNc0h5TS9MU1dZMmhTK2ErRzBnYlR1cEMx?=
 =?utf-8?B?SFBqdVp6eGxEeUo5WkdIU3J3MWVWeWxoMk9KQitjc1lnK2hqM1AvWG5KVFY4?=
 =?utf-8?B?WG5rc29CQWFab2xPU09HTytMVUFQVVpObnBIdHg1MUxrRDRmRDBjSTQ0TTF4?=
 =?utf-8?B?ak03L1hrTHJ6S3BTVCt0elRvQVhmd1MzRHBJT0Y5YjNjN0w4Q0FKbFEwRDBt?=
 =?utf-8?B?LzBsMDJkaTdzUnpScjV1a2VrWGRhak9SVEJQczBjREFrckF4R2laOXg4Z2xB?=
 =?utf-8?B?TUdPbXBsUktKSHFKL1hPYW4yWk8wVkQwN0o2cFNTRSs3UUxLWmgyUmgyNllP?=
 =?utf-8?B?ZzByNkNuM2JDYjQ1RlVjTE9taG1kNUlsd1hSaVdiVE1TenJYZUhrdURUZUdN?=
 =?utf-8?B?emp5czNUOERTTStuMmZLMnYyUVd6NkZEVS9hQ1JFQS8xQWEvT1A0QW5CeXdr?=
 =?utf-8?B?Q2xOWk4vS2FWcmJRZXIyNjltQ05aNWpicDEreFR6SExBWDNtbEp5QzZ0ZGIx?=
 =?utf-8?B?K25WS2MwOFA4dWc5T05ra2x2NGtCc3YycWtVdUY1aE5hYWJpMTQzclpIaUx3?=
 =?utf-8?B?UVpMbjhBSVhDTm1GNUc4NE5DK2swc0VNK2hFWUlPeVFzUnRzZ1dZaDhFSjYw?=
 =?utf-8?B?VDduVXdSakw3Rlh4eUJkZFVDZjhJUmlmN25IOWRpZjFHeGo2eHllZmNzVnFN?=
 =?utf-8?B?cjFSM2FjN1hwNDJSRldnZEhrTmh4Ri9xRU43dlFnbiszM2VuV0FpQWc1Mklu?=
 =?utf-8?B?OTRLQldySzAvVHl2UHVITkF0Qm5OZFpFdTJ0TUxvYllvOWMxaHRiRmtycEto?=
 =?utf-8?B?K05mckZDWEVRYXBYWTFKZ3JROWxNVWJoUVdENHIrcXREbXRaZldkaWJlLzlx?=
 =?utf-8?B?RFZLcVFGWDk1cTZrYkt2c3dqOElHSC96TE1jYTVSQVlpUkQ5Q053NkFma2Q0?=
 =?utf-8?B?dlV4emhKekZhaHVneEh2ZCtqSG1tdm8wSG1qbTlaQ3FWSTMzRGlRa3VZOXQ5?=
 =?utf-8?B?dnNacy9ZRjIxeDluenQ3aTNTTW01dGNvVGxjaTZSNHdLNm5ZMTluNVVPbVRr?=
 =?utf-8?B?bldENE1Yc2s5eDJ2MEswcENIVktUNDJIcW9wWjE3RjZjb0srTlEwdkNCVG5H?=
 =?utf-8?B?OGw2UFRGWVZGNWtiakZBM1J3NjV0TTJ0bVorQnJucjhyVjlDbWlOc1NPNGtC?=
 =?utf-8?B?Ti9HM1B5NkI5aXQraEJwVkU1MCszOCtIdTI4NmlBM1NzRnkrTXdmbUNCWlRn?=
 =?utf-8?B?YzhvQmgxaUN4ZDEveURqNjQwMmhlVzBCLzArRFZmdHQzZktsOC95VlVtWEtG?=
 =?utf-8?B?ZVFtOXZWdnE5aFdHcVUza040UjJFcVJEdTZrQ0xPcjB3Uk16THh1ZTlObWpa?=
 =?utf-8?B?dWFBS3hvNVFIREp5RXM3Q0w4cVFWOEYvUk1yM2laSTV1ekVXVmg5b0M4Ukhv?=
 =?utf-8?B?MUhldDhhWVRuOFJSZm1JNVdabGZ0RGtmV0Fob1NqMkFpODJsUklBdWd3UDNJ?=
 =?utf-8?B?WEtTSlJlVmlOVTJUV2VtSk5UbnJsZHJ1WXNEdUlIMUlNNkdEZEFBS09jSDNo?=
 =?utf-8?B?OUZkNnJ0Y2wrUkJmQUptY2J6WDErUWRva0hURmVueFhCTExwWHRkQlFKc1hq?=
 =?utf-8?B?cXpJbjdUR09hTzM5YThkYmNxWmp5RktxamIxdDJ0WThjOXFLb29JM3ltbmEr?=
 =?utf-8?B?MzBoNG1IdWdjWHlSSHV4cFNmUHVOQVlpamZ5SlluMWRidnpHeVZKb2NRTzhn?=
 =?utf-8?B?emRxZ3RxTkxoS0t4MnJOOGdiSzQ4MWREUUM5SG0rRDZZWGMyRmphd21iSkhY?=
 =?utf-8?B?NzdpNHZOcVJMQmtNOWd1WFpFSmpORHdXZUxZVGt5cjA1V1lJYUVkOE1JZEt1?=
 =?utf-8?B?STNjWTArMGIyU05WMGN0bTdXQnpnWS8yS3dKV2FCNFpYcnBkd01adGpPWVZn?=
 =?utf-8?B?ekhpQWxiRm5lRU5mMTAxeFdXWDRTVEFRVG1sc0JxU0FVVU9ZVW45MTVmRDE5?=
 =?utf-8?Q?wESGpbZqGFiDUGAceedy00Qwn?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2f90a787-3e77-4643-d04a-08db4e2a8ced
X-MS-Exchange-CrossTenant-AuthSource: CY5PR12MB6201.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2023 12:08:06.6772
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: iMXt3A6k1oOmPTGnSdHcg0g5iyH6nTCqpdNbX9gv0/r7s3uv5wndoF0PHHDjyRvQH13OsvVahoSO1MBOn8ZJIA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4491
X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,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 2023-05-05 p.m.10:33, Xuan Zhuo wrote:
> External email: Use caution opening links or attachments
> 
> 
> On Tue, 2 May 2023 20:35:25 -0400, Feng Liu <feliu@nvidia.com> wrote:
>> When initializing XDP in virtnet_open(), some rq xdp initialization
>> may hit an error causing net device open failed. However, previous
>> rqs have already initialized XDP and enabled NAPI, which is not the
>> expected behavior. Need to roll back the previous rq initialization
>> to avoid leaks in error unwinding of init code.
>>
>> Also extract a helper function of disable queue pairs, and use newly
>> introduced helper function in error unwinding and virtnet_close;
>>
>> Issue: 3383038
>> Fixes: 754b8a21a96d ("virtio_net: setup xdp_rxq_info")
>> Signed-off-by: Feng Liu <feliu@nvidia.com>
>> Reviewed-by: William Tu <witu@nvidia.com>
>> Reviewed-by: Parav Pandit <parav@nvidia.com>
>> Reviewed-by: Simon Horman <simon.horman@corigine.com>
>> Acked-by: Michael S. Tsirkin <mst@redhat.com>
>> Change-Id: Ib4c6a97cb7b837cfa484c593dd43a435c47ea68f
>> ---
>>   drivers/net/virtio_net.c | 30 ++++++++++++++++++++----------
>>   1 file changed, 20 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
>> index 8d8038538fc4..3737cf120cb7 100644
>> --- a/drivers/net/virtio_net.c
>> +++ b/drivers/net/virtio_net.c
>> @@ -1868,6 +1868,13 @@ static int virtnet_poll(struct napi_struct *napi, int budget)
>>        return received;
>>   }
>>
>> +static void virtnet_disable_qp(struct virtnet_info *vi, int qp_index)
>> +{
>> +     virtnet_napi_tx_disable(&vi->sq[qp_index].napi);
>> +     napi_disable(&vi->rq[qp_index].napi);
>> +     xdp_rxq_info_unreg(&vi->rq[qp_index].xdp_rxq);
>> +}
>> +
>>   static int virtnet_open(struct net_device *dev)
>>   {
>>        struct virtnet_info *vi = netdev_priv(dev);
>> @@ -1883,20 +1890,26 @@ static int virtnet_open(struct net_device *dev)
>>
>>                err = xdp_rxq_info_reg(&vi->rq[i].xdp_rxq, dev, i, vi->rq[i].napi.napi_id);
>>                if (err < 0)
>> -                     return err;
>> +                     goto err_xdp_info_reg;
>>
>>                err = xdp_rxq_info_reg_mem_model(&vi->rq[i].xdp_rxq,
>>                                                 MEM_TYPE_PAGE_SHARED, NULL);
>> -             if (err < 0) {
>> -                     xdp_rxq_info_unreg(&vi->rq[i].xdp_rxq);
>> -                     return err;
>> -             }
>> +             if (err < 0)
>> +                     goto err_xdp_reg_mem_model;
>>
>>                virtnet_napi_enable(vi->rq[i].vq, &vi->rq[i].napi);
>>                virtnet_napi_tx_enable(vi, vi->sq[i].vq, &vi->sq[i].napi);
>>        }
>>
>>        return 0;
>> +
>> +err_xdp_reg_mem_model:
>> +     xdp_rxq_info_unreg(&vi->rq[i].xdp_rxq);
>> +err_xdp_info_reg:
>> +     for (i = i - 1; i >= 0; i--)
>> +             virtnet_disable_qp(vi, i);
> 
> 
> I would to know should we handle for these:
> 
>          disable_delayed_refill(vi);
>          cancel_delayed_work_sync(&vi->refill);
> 
> 
> Maybe we should call virtnet_close() with "i" directly.
> 
> Thanks.
> 
> 
Can’t use i directly here, because if xdp_rxq_info_reg fails, napi has 
not been enabled for current qp yet, I should roll back from the queue 
pairs where napi was enabled before(i--), otherwise it will hang at napi 
disable api

>> +
>> +     return err;
>>   }
>>
>>   static int virtnet_poll_tx(struct napi_struct *napi, int budget)
>> @@ -2305,11 +2318,8 @@ static int virtnet_close(struct net_device *dev)
>>        /* Make sure refill_work doesn't re-enable napi! */
>>        cancel_delayed_work_sync(&vi->refill);
>>
>> -     for (i = 0; i < vi->max_queue_pairs; i++) {
>> -             virtnet_napi_tx_disable(&vi->sq[i].napi);
>> -             napi_disable(&vi->rq[i].napi);
>> -             xdp_rxq_info_unreg(&vi->rq[i].xdp_rxq);
>> -     }
>> +     for (i = 0; i < vi->max_queue_pairs; i++)
>> +             virtnet_disable_qp(vi, i);
>>
>>        return 0;
>>   }
>> --
>> 2.37.1 (Apple Git-137.1)
>>