From patchwork Mon Jul 24 16:19:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 792875 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xGRTB6FVjz9s3T for ; Tue, 25 Jul 2017 02:21:34 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753666AbdGXQVc (ORCPT ); Mon, 24 Jul 2017 12:21:32 -0400 Received: from Chamillionaire.breakpoint.cc ([146.0.238.67]:48088 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751370AbdGXQV3 (ORCPT ); Mon, 24 Jul 2017 12:21:29 -0400 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.84_2) (envelope-from ) id 1dZg5A-0007Lj-7P; Mon, 24 Jul 2017 18:19:44 +0200 Date: Mon, 24 Jul 2017 18:19:44 +0200 From: Florian Westphal To: Denys Fedoryshchenko Cc: Linux Kernel Network Developers , Florian Westphal Subject: Re: nf_nat_pptp 4.12.3 kernel lockup/reboot Message-ID: <20170724161944.GB23964@breakpoint.cc> References: <69c0c47e920e763bce702521baae9caa@nuclearcat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <69c0c47e920e763bce702521baae9caa@nuclearcat.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Denys Fedoryshchenko wrote: > Hi, > > I am trying to upgrade kernel 4.11.8 to 4.12.3 (it is a nat/router, handling > approx 2gbps of pppoe users traffic) and noticed that after while server > rebooting(i have set reboot on panic and etc). > I can't run serial console, and in pstore / netconsole there is nothing. > Best i got is some very short message about softlockup in ipmi, but as > storage very limited there - it is near useless. > > By preliminary testing (can't do it much, as it's production) - it seems > following lines causing issue, they worked in 4.11.8 and no more in 4.12.3. Wild guess here, does this help? Tested-by: Denys Fedoryshchenko diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c --- a/net/netfilter/nf_conntrack_helper.c +++ b/net/netfilter/nf_conntrack_helper.c @@ -266,6 +266,8 @@ int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl, help = nf_ct_helper_ext_add(ct, helper, flags); if (help == NULL) return -ENOMEM; + if (!nf_ct_ext_add(ct, NF_CT_EXT_NAT, flags)); + return -ENOMEM; } else { /* We only allow helper re-assignment of the same sort since * we cannot reallocate the helper extension area.