From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751277AbdBUDXN (ORCPT <rfc822;w@1wt.eu>);
        Mon, 20 Feb 2017 22:23:13 -0500
Received: from shards.monkeyblade.net ([184.105.139.130]:46440 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750987AbdBUDXM (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 20 Feb 2017 22:23:12 -0500
Date: Mon, 20 Feb 2017 22:23:09 -0500 (EST)
Message-Id: <20170220.222309.245000834571259773.davem@davemloft.net>
To: jasowang@redhat.com
Cc: mst@redhat.com, virtualization@lists.linux-foundation.org,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        john.fastabend@gmail.com
Subject: Re: [PATCH net-next V2] virito-net: set queues after reset during
 xdp_set
From: David Miller <davem@davemloft.net>
In-Reply-To: <1487562620-10146-1-git-send-email-jasowang@redhat.com>
References: <1487562620-10146-1-git-send-email-jasowang@redhat.com>
X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Mon, 20 Feb 2017 18:24:16 -0800 (PST)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Jason Wang <jasowang@redhat.com>
Date: Mon, 20 Feb 2017 11:50:20 +0800

> We set queues before reset which will cause a crash[1]. This is
> because is_xdp_raw_buffer_queue() depends on the old xdp queue pairs
> number to do the correct detection. So fix this by
> 
> - passing xdp queue pairs and current queue pairs to virtnet_reset()
> - change vi->xdp_qp after reset but before refill, to make sure both
>   free_unused_bufs() and refill can make correct detection of XDP.
> - remove the duplicated queue pairs setting before virtnet_reset()
>   since we will do it inside virtnet_reset()
> 
> [1]
 ...
> Fixes: 2de2f7f40ef9 ("virtio_net: XDP support for adjust_head")
> Cc: John Fastabend <john.fastabend@gmail.com>
> Signed-off-by: Jason Wang <jasowang@redhat.com>

Applied and queued up for -stable, thanks Jason.