From patchwork Mon Jun 12 09:06:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arend van Spriel X-Patchwork-Id: 9780597 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2628D60212 for ; Mon, 12 Jun 2017 09:06:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 166FB283BF for ; Mon, 12 Jun 2017 09:06:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0AE39284BE; Mon, 12 Jun 2017 09:06:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EF0D283BF for ; Mon, 12 Jun 2017 09:06:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750868AbdFLJGg (ORCPT ); Mon, 12 Jun 2017 05:06:36 -0400 Received: from lpdvrndsmtp01.broadcom.com ([192.19.229.170]:59983 "EHLO rnd-relay.smtp.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750730AbdFLJGf (ORCPT ); Mon, 12 Jun 2017 05:06:35 -0400 Received: from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net [10.75.224.233]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 7E97E30C00B; Mon, 12 Jun 2017 02:06:33 -0700 (PDT) Received: from jenkins-cam-14.cam.broadcom.com (jenkins-cam-14.cam.broadcom.com [10.177.128.77]) by mail-irv-17.broadcom.com (Postfix) with ESMTP id A368681EA7; Mon, 12 Jun 2017 02:06:33 -0700 (PDT) Received: by jenkins-cam-14.cam.broadcom.com (Postfix, from userid 25152) id BFD3DB89342; Mon, 12 Jun 2017 10:06:30 +0100 (BST) From: Arend van Spriel To: Johannes Berg Cc: backports@vger.kernel.org, Arend van Spriel Subject: [PATCH] backport: handle change in netdevice destructor usage Date: Mon, 12 Jun 2017 10:06:25 +0100 Message-Id: <1497258385-5116-1-git-send-email-arend.vanspriel@broadcom.com> X-Mailer: git-send-email 1.9.1 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch deals with changes made in struct net_device by commit cf124db566e6 ("net: Fix inconsistent teardown and release of private netdev state."). This only looks for instances that need free_netdev() call, ie. struct net_device::needs_free_netdev == true. Signed-off-by: Arend van Spriel --- backport/backport-include/linux/netdevice.h | 12 +++++++++++ patches/0079-netdev-destructor.cocci | 33 +++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 patches/0079-netdev-destructor.cocci diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h index 06230b5..4e30383 100644 --- a/backport/backport-include/linux/netdevice.h +++ b/backport/backport-include/linux/netdevice.h @@ -320,4 +320,16 @@ static inline void netif_trans_update(struct net_device *dev) } #endif +static inline +void netdev_set_priv_destructor(struct net_device *dev, + void (*destructor)(struct net_device *dev)) +{ +#if LINUX_VERSION_IS_LESS(4,12,0) + dev->destructor = destructor; +#else + dev->needs_free_netdev = true; + dev->priv_destructor = destructor; +#endif +} + #endif /* __BACKPORT_NETDEVICE_H */ diff --git a/patches/0079-netdev-destructor.cocci b/patches/0079-netdev-destructor.cocci new file mode 100644 index 0000000..d8a439d --- /dev/null +++ b/patches/0079-netdev-destructor.cocci @@ -0,0 +1,33 @@ +@r1@ +struct net_device *ndev; +identifier D, C; +@@ +C(...) +{ + <... +- ndev->needs_free_netdev = true; +- ndev->priv_destructor = D; ++ netdev_set_priv_destructor(ndev, D); + ...> +} + +@r2 depends on r1@ +struct net_device *NDEV; +identifier r1.D; +identifier r1.C; +fresh identifier E2 = "__" ## D; +@@ + ++static void E2(struct net_device *dev) ++{ ++ D(dev); ++ free_netdev(dev); ++} ++ +C(...) +{ + <... +- netdev_set_priv_destructor(NDEV, D); ++ netdev_set_priv_destructor(NDEV, E2); + ...> +}