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: <7ffb8783-a102-afb6-5f9d-a744bbfbbbe6@nvidia.com>
Date:   Tue, 9 May 2023 10:08:14 -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 v4] virtio_net: Fix error unwinding of XDP
 initialization
To:     "Michael S. Tsirkin" <mst@redhat.com>
Cc:     virtualization@lists.linux-foundation.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org, bpf@vger.kernel.org,
        Jason Wang <jasowang@redhat.com>,
        Xuan Zhuo <xuanzhuo@linux.alibaba.com>,
        Simon Horman <simon.horman@corigine.com>,
        Bodong Wang <bodong@nvidia.com>, Jiri Pirko <jiri@nvidia.com>
References: <20230508222708.68281-1-feliu@nvidia.com>
 <20230509004010-mutt-send-email-mst@kernel.org>
From:   Feng Liu <feliu@nvidia.com>
In-Reply-To: <20230509004010-mutt-send-email-mst@kernel.org>
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?SzFwVDJFV3RaR0dpZDNvWmVIbXBTdERDZmZBZStTZW80TGlyVktaRk1rZDQ5?=
 =?utf-8?B?cmpvQUt6aFlta3FPOFlRemVCM2ZsRlhXYWtQQlIwQXFYWmMvYmtiSHZJbjVN?=
 =?utf-8?B?MExkelhsVG95RnlNSldGQk9KdG52NnExaVhHOVl5K3o0SjlyN3d3b2E5Y2pL?=
 =?utf-8?B?YlBZazB2WUpsUTBkNEpXUUNpZ2JqTVltdHVWK1daczJaUytaaGRKVlZDQzVW?=
 =?utf-8?B?ODVjeEFydkV0SzMzWE1RN2FzSFA4YWU2N0R4VDl5OVJmaU1LT01RbXoxUG5Y?=
 =?utf-8?B?WnNBcERzNDJ2WG12TUVxeFhibHVTWU5BTjdkU0RwVldqb1NHMllzLzhVYmJE?=
 =?utf-8?B?SzJ2alNNVUluK0k3T3kxblkyazVDM0xacSsvKzhGT1BNUVJEejRsNUtCcjQ4?=
 =?utf-8?B?K2hHMEpjbXpMczRWazRYUjVhNDk1ai90TkVCdkhmU1AwWkkvdzlVbHAxOUdS?=
 =?utf-8?B?L2tBYWFIL0lIbElsVGRnYkxFZnRDV1Z1ODZ3SFJCOXpFQVhSRXc1RGdHbHFM?=
 =?utf-8?B?LytmR01PUC92Vy9BV0QrbkVXTHdqV0ZFMk9tbC93QmQxOFhuaDlFanFqMVlV?=
 =?utf-8?B?VW83dDNYT0VtQjcrNDNBdXU4aHZSS21xNElYWWtYRVZFcWJJdXZtdXU1NXFs?=
 =?utf-8?B?ZVpLSnJlTDdGWHE4K1I4UzFNSlYvdlpWVkFUZjVGQkFDV3RvTDhiTlY1V0RP?=
 =?utf-8?B?TDgvSE9waTRaWFVxY0ViaWJoUUZBRnhYTDZ6b1QyWVhkOHFDVE5wZkx6dU1D?=
 =?utf-8?B?QWVnSE9tUE8yUXQ2TGZXb2JSY1lDcWd4OWJkdTl0MGIvdGNMMzh4MzJBTHBI?=
 =?utf-8?B?OFZ0bkpTM2tFVjY5dlJ2eGhLYXFIYmYrQXA2c1lsQUJpNlUwOEQ5NjczL3h0?=
 =?utf-8?B?Z1VpNEdxanRpMlZNcDF0eEZwMEh2dFFOQ1Y5bm9pVjJ3YUlOd3RhcUlEcmhJ?=
 =?utf-8?B?R2ZXeXRuVUVOV3NqdFV5cnJhUEFteVRwcnFJSHZqVXgyUWdTS0xrLzdOcWhC?=
 =?utf-8?B?eXhJMy8xQVpJaVRzbjhoL0VkckVOVnVMWVZsYzBNMjUydGlwc1BxazliaDZ3?=
 =?utf-8?B?OUN3U2VsQWtBMjJQRXByVlpHYnBYcTNZS2FreStBeEhSdFNBcEhZYm9ra2xa?=
 =?utf-8?B?MHBNR0g4ZDFZWlBHWkpJYURjYmZpbHJXK2JIYkZVYVFBcXYvRDcvR1YzQWkv?=
 =?utf-8?B?TW5seFNQdVp3b0IwOWFXMU1wOTlpSFk3V3dhNUdzcFNpNjY4aVlrUHlZeTds?=
 =?utf-8?B?UHpiYUNoQWx1Z09aajEweVp4K3ZXQW50alltcE42d3E4UTBScGdESzFhNW9Y?=
 =?utf-8?B?V2kyWldIcXlRNlVoRW1KRWV2R09vSk1WbEhLV2t1cFZIeHRtRkJLa1dRc0xl?=
 =?utf-8?B?UGVyK3Z0K0RxUEQ3eGRTdEx2MEw1VU9pczFhMEpEdDI2OS9tbjNjY2VFaUx0?=
 =?utf-8?B?ODIzNGx4SnFXTW5ZSWtBY0F2MlRNZkFqdm5NT0NlaGZnV3ZKMHFTbW4wNk5n?=
 =?utf-8?B?NXdMMk9FUWR5cUdLOFV0NEdMNHc3dWdVM1JiUFdVZThLazFWU0MrLzl6d0VL?=
 =?utf-8?B?WE1rbzk1SHVXM3NQYzM1MGVpWUtieWdLaGpQQnNoK0RtRi9YcWlNcWdLbldp?=
 =?utf-8?B?eEJLU0hJZHc5Yk83TzBEbkxNbndJa3RnQURCNnpoK2dpNGdaOGo0dURzeUJi?=
 =?utf-8?B?bFFTYkIwTDUveEdqd2dkZzl2YjZreEZxRUc5dFRmbCtna2doM0o1ZGhHVjZa?=
 =?utf-8?B?Y1FVdEtTMC9YWXJVRDZ1aGVaSEtzSlk0TW52MUdGM0daUjBRaGVNeTZqbXZh?=
 =?utf-8?B?b0lFRFFyZlVVN2VFbTV4NTRES2tyVG1mWGdQZ1JQVG5JdmFEOUlXUDVYRUJo?=
 =?utf-8?B?ZGJtV05PRW9hbHhjT3l3Smo3UVIvamVNb0ppdFlUbHkyQjRIc2pTd0dFczhI?=
 =?utf-8?B?cU9ZcHRDcFgzeEVrMVgvdHA2TGU3RExCdlhGNkxUUjhyeWxSQmlWUldOM3Jq?=
 =?utf-8?B?d3Y3Y3c5WmIwb0lrRFFEUkcwZUEyVkdVY3o1RFg5WFBHVytBUDdPblliZS9j?=
 =?utf-8?B?Y2lZeGVCZXZwRk03T2pkcGhQZ0xwUFIxdG5RZXlaNDhNSkdXVmUxZDBMeTEv?=
 =?utf-8?Q?nvJc/TOzzkcVgujISGwEdqcGo?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4a29a218-198a-4961-1a34-08db5096d70b
X-MS-Exchange-CrossTenant-AuthSource: CY5PR12MB6201.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2023 14:08:18.7763
 (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: X90vMWd/EyLylvMXVIuLnXGQ5a39cN7644h6ujmhtAhXuTpinZBre7yoQlU+B7Qw0jxALd/mhWzLiEH9bgC2KQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8746
X-Spam-Status: No, score=-1.5 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=no
        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-09 a.m.12:42, Michael S. Tsirkin wrote:
> External email: Use caution opening links or attachments
> 
> 
> On Mon, May 08, 2023 at 06:27:08PM -0400, Feng Liu 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 helper functions of disable and enable queue pairs.
>> Use newly introduced disable helper function in error unwinding and
>> virtnet_close. Use enable helper function in virtnet_open.
>>
>> Fixes: 754b8a21a96d ("virtio_net: setup xdp_rxq_info")
>> Signed-off-by: Feng Liu <feliu@nvidia.com>
>> Reviewed-by: Jiri Pirko <jiri@nvidia.com>
>> ---
>>
>> v3 -> v4
>> feedbacks from Jiri Pirko
>> - Add symmetric helper function virtnet_enable_qp to enable queues.
>> - Error handle:  cleanup current queue pair in virtnet_enable_qp,
>>    and complete the reset queue pairs cleanup in virtnet_open.
>> - Fix coding style.
>> feedbacks from Parav Pandit
>> - Remove redundant debug message and white space.
>>
>> v2 -> v3
>> feedbacks from Michael S. Tsirkin
>> - Remove redundant comment.
>>
>> v1 -> v2
>> feedbacks from Michael S. Tsirkin
>> - squash two patches together.
>>
>> ---
>>   drivers/net/virtio_net.c | 58 ++++++++++++++++++++++++++++------------
>>   1 file changed, 41 insertions(+), 17 deletions(-)
>>
>> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
>> index 8d8038538fc4..df7c08048fa7 100644
>> --- a/drivers/net/virtio_net.c
>> +++ b/drivers/net/virtio_net.c
>> @@ -1868,6 +1868,38 @@ static int virtnet_poll(struct napi_struct *napi, int budget)
>>        return received;
>>   }
>>
>> +static void virtnet_disable_qp(struct virtnet_info *vi, int qp_index)
> 
> 
> I am guessing _qp stands for queue pair? Let's call it
> virtnet_disable_queue_pair please, consistently with max_queue_pairs.
> 
Yes, qp stands for queue pair
will do, thanks

>> +{
>> +     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_enable_qp(struct virtnet_info *vi, int qp_index)
> 
> Similarly, virtnet_enable_queue_pair
> 
will do, thanks

>> +{
>> +     struct net_device *dev = vi->dev;
>> +     int err;
>> +
>> +     err = xdp_rxq_info_reg(&vi->rq[qp_index].xdp_rxq, dev, qp_index,
>> +                            vi->rq[qp_index].napi.napi_id);
>> +     if (err < 0)
>> +             return err;
>> +
>> +     err = xdp_rxq_info_reg_mem_model(&vi->rq[qp_index].xdp_rxq,
>> +                                      MEM_TYPE_PAGE_SHARED, NULL);
>> +     if (err < 0)
>> +             goto err_xdp_reg_mem_model;
>> +
>> +     virtnet_napi_enable(vi->rq[qp_index].vq, &vi->rq[qp_index].napi);
>> +     virtnet_napi_tx_enable(vi, vi->sq[qp_index].vq, &vi->sq[qp_index].napi);
>> +
>> +     return 0;
>> +
>> +err_xdp_reg_mem_model:
>> +     xdp_rxq_info_unreg(&vi->rq[qp_index].xdp_rxq);
>> +     return err;
>> +}
>> +
>>   static int virtnet_open(struct net_device *dev)
>>   {
>>        struct virtnet_info *vi = netdev_priv(dev);
>> @@ -1881,22 +1913,17 @@ static int virtnet_open(struct net_device *dev)
>>                        if (!try_fill_recv(vi, &vi->rq[i], GFP_KERNEL))
>>                                schedule_delayed_work(&vi->refill, 0);
>>
>> -             err = xdp_rxq_info_reg(&vi->rq[i].xdp_rxq, dev, i, vi->rq[i].napi.napi_id);
>> +             err = virtnet_enable_qp(vi, i);
>>                if (err < 0)
>> -                     return err;
>> -
>> -             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;
>> -             }
>> -
>> -             virtnet_napi_enable(vi->rq[i].vq, &vi->rq[i].napi);
>> -             virtnet_napi_tx_enable(vi, vi->sq[i].vq, &vi->sq[i].napi);
>> +                     goto err_enable_qp;
>>        }
>>
>>        return 0;
>> +
>> +err_enable_qp:
>> +     for (i--; i >= 0; i--)
>> +             virtnet_disable_qp(vi, i);
>> +     return err;
>>   }
>>
>>   static int virtnet_poll_tx(struct napi_struct *napi, int budget)
>> @@ -2305,11 +2332,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)
>