From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 822DB2C83 for ; Sat, 9 Oct 2021 05:19:42 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 81E8760F6F; Sat, 9 Oct 2021 05:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633756782; bh=pUE5rhYEEacp7Estu/aEsIop9rFkTz0XLUt7TITMCkg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=0xTJqu6aVf9jaa4PLDGjfFS3RUIyELChdiht3fzkIZ5ZiESPsFFHibGA5cDwzRv8Z mWs9N7bhubOo/AThkvV5tot0U+wVD961DLdlDOdYfi8ctOjwrVj8g1duJQMO0UE4Bm qb4kopNX0ufpuntGQ5bRrlA0jqaXF1MC59+JWPDg= Date: Sat, 9 Oct 2021 07:19:39 +0200 From: Greg KH To: Xuan Zhuo Cc: Corentin =?iso-8859-1?Q?No=EBl?= , "Michael S. Tsirkin" , Jason Wang , virtualization@lists.linux-foundation.org, regressions@lists.linux.dev, Eric Dumazet , stable@vger.kernel.org Subject: Re: virtio-net: kernel panic in virtio_net.c Message-ID: References: <1633710428.4908655-1-xuanzhuo@linux.alibaba.com> Precedence: bulk X-Mailing-List: regressions@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1633710428.4908655-1-xuanzhuo@linux.alibaba.com> On Sat, Oct 09, 2021 at 12:27:08AM +0800, Xuan Zhuo wrote: > On Fri, 8 Oct 2021 10:06:57 +0200, Greg KH wrote: > > On Fri, Oct 08, 2021 at 12:17:26AM +0800, Xuan Zhuo wrote: > > > On Thu, 7 Oct 2021 17:25:02 +0200, Greg KH wrote: > > > > On Thu, Oct 07, 2021 at 11:06:12PM +0800, Xuan Zhuo wrote: > > > > > On Thu, 07 Oct 2021 14:04:22 +0200, Corentin Noël wrote: > > > > > > I've been experiencing crashes with 5.14-rc1 and above that do not > > > > > > occur with 5.13, > > > > > > > > > > I should have fixed this problem before. I don't know why, I just looked at the > > > > > latest net code, and this commit seems to be lost. > > > > > > > > > > 1a8024239dacf53fcf39c0f07fbf2712af22864f virtio-net: fix for skb_over_panic inside big mode > > > > > > > > > > Can you test this patch again? > > > > > > > > That commit showed up in 5.13-rc5, so 5.14-rc1 and 5.13 should have had > > > > it in it, right? > > > > > > > > > > Yes, it may be lost due to conflicts during a certain merge. > > > > Really? I tried to apply that again to 5.14 and it did not work. So I > > do not understand what to do here, can you try to explain it better? > > I took a look, and there is actually another missing patch: > > A. 8fb7da9e990793299c89ed7a4281c235bfdd31f8 virtio_net: get build_skb() buf by data ptr > B. 1a8024239dacf53fcf39c0f07fbf2712af22864f virtio-net: fix for skb_over_panic inside big mode > > A is replaced by another patch: > > commit c32325b8fdf2f979befb9fd5587918c0d5412db3 > Author: Jakub Kicinski > Date: Mon Aug 2 10:57:29 2021 -0700 > > virtio-net: realign page_to_skb() after merges > > We ended up merging two versions of the same patch set: > > commit 8fb7da9e9907 ("virtio_net: get build_skb() buf by data ptr") > commit 5c37711d9f27 ("virtio-net: fix for unable to handle page fault for address") > > into net, and > > commit 7bf64460e3b2 ("virtio-net: get build_skb() buf by data ptr") > commit 6c66c147b9a4 ("virtio-net: fix for unable to handle page fault for address") > > into net-next. Redo the merge from commit 126285651b7f ("Merge > ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net"), so that > the most recent code remains. > > Acked-by: Michael S. Tsirkin > Signed-off-by: Jakub Kicinski > Acked-by: Jason Wang > Signed-off-by: David S. Miller > > So after this patch, patch B can be applied normally. > > So on the latest net branch, only lost > > 1a8024239dacf53fcf39c0f07fbf2712af22864f virtio-net: fix for skb_over_panic inside big mode Again, I do not know what to do here, can you submit the needed fix to the networking developers so this gets fixed? thanks, greg k-h