From patchwork Thu Jun 28 22:48:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Gora X-Patchwork-Id: 41890 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A92CB37AF; Fri, 29 Jun 2018 00:51:26 +0200 (CEST) Received: from mail-ot0-f194.google.com (mail-ot0-f194.google.com [74.125.82.194]) by dpdk.org (Postfix) with ESMTP id 4451A31FC for ; Fri, 29 Jun 2018 00:51:25 +0200 (CEST) Received: by mail-ot0-f194.google.com with SMTP id h6-v6so7966140otj.0 for ; Thu, 28 Jun 2018 15:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=fGC1/toUFvY8asYAO6HL+f7p7INZeOaqNCTBQH8reiw=; b=nWJ4YXoKo6/cToyF9ZZaK+tzo0VUdy1IHvF+x7n9hm4AZ2ObmTBV++V2s+K6RzTKud +qz1OsOezsqOL6dasdUE2T5jZ/BZjRoXqPWHC1shl5qaptCw8M4V6AsL7SZlzDa1Npsy gULRzE1I7TPPBol0TsyBpMnBkzPOzf4nswhSsYjRWtj31CvU5FdnN46Dqu7s0EcEM1G5 U/iFdro/gvf2L0e/UvRzGY88PTIYF2THBFfGXsfKoTWQIN4Blo1F2z41LFfWyL9EwOdZ u9tM95Twq7O6rdVrSStfzFEhKQIEeivDLpbvR+m423xiR3PirYzejbDpzyh6yffJ8ETB fxhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=fGC1/toUFvY8asYAO6HL+f7p7INZeOaqNCTBQH8reiw=; b=XNhp1OvJpTzDbGwPcHy2oc6tQwMfp2F+Z8zRooFkXnVrDRmtvRlypq6h0FSnXjB0h8 IIQpNIsFMGy8ZSCrtTG7860sEIfaSKVqrH2CNzyFvkeJm55phGR7JFdWJZQxgGbCo7pj Oin43xH0r/u7KURGstHJNSzbjBDcHLR3H3hs8kL6IJeZ5bTgShFgFPbmnGK0q8a/uhGd Gp3qjTGk/qcjj6IWZ8pnZamVZ5GAkVcO1KDbUk2TrVkqCeVwYPosVPg/kRRxcd9Nodsh ZLJ5dPigSe1InmCqj36dN8mmM/ggsQ0LgB8l6JQ0/ckHgX68yXHtpCpMXPuoZU3CIEMh +Hmw== X-Gm-Message-State: APt69E3/Z8Tw4laZUDn2N1Y0xWX99iCBolRsexA7nYUYzQqfhAbfAx6E BWvk8kAfQu5QEZk+ESQx6Xc= X-Google-Smtp-Source: AAOMgpcLm1+WC4ijHd94HTIHNXQ5kukemfAmYbsAKS3DJDM35ZP41y3gawu5nXzsqSEcEczlsNJicg== X-Received: by 2002:a9d:6a1:: with SMTP id 30-v6mr6677898otx.3.1530226284423; Thu, 28 Jun 2018 15:51:24 -0700 (PDT) Received: from linux.adax.com (172-11-198-60.lightspeed.sntcca.sbcglobal.net. [172.11.198.60]) by smtp.gmail.com with ESMTPSA id j29-v6sm3735537oth.60.2018.06.28.15.51.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Jun 2018 15:51:23 -0700 (PDT) From: Dan Gora To: Ferruh Yigit Cc: dev@dpdk.org, Dan Gora Date: Thu, 28 Jun 2018 15:48:23 -0700 Message-Id: <20180628224823.19423-1-dg@adax.com> X-Mailer: git-send-email 2.18.0.rc1.1.g6f333ff2f Subject: [dpdk-dev] [PATCH 03/10] kni: don't touch struct kni_dev after freeing X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Since the struct kni_dev is allocated as part of the netdev with alloc_netdev, when free_netdev is called, this also frees the struct kni_dev embedded in it. This means that we cannot touch struct kni_dev after calling free_netdev since that memory was already deallocated. Separate unregistering the net_dev with unregister_netdev from freeing the net_device and kni_dev structures into separate functions and ensure that we do not touch anything in the kni_dev structure after freeing it (ie don't call list_del(), etc...). Signed-off-by: Dan Gora --- kernel/linux/kni/kni_dev.h | 1 + kernel/linux/kni/kni_misc.c | 28 +++++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h index ed42989cc..f9aa90ff9 100644 --- a/kernel/linux/kni/kni_dev.h +++ b/kernel/linux/kni/kni_dev.h @@ -37,6 +37,7 @@ struct kni_dev { struct list_head list; struct net_device_stats stats; + uint16_t registered; /* 0 if already released, 1 otherwise */ uint16_t group_id; /* Group ID of a group of KNI devices */ uint32_t core_id; /* Core ID to bind */ char name[RTE_KNI_NAMESIZE]; /* Network device name */ diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c index d889ffc4b..1c38cfa1a 100644 --- a/kernel/linux/kni/kni_misc.c +++ b/kernel/linux/kni/kni_misc.c @@ -184,17 +184,34 @@ kni_dev_remove(struct kni_dev *dev) ixgbe_kni_remove(dev->pci_dev); else if (pci_match_id(igb_pci_tbl, dev->pci_dev)) igb_kni_remove(dev->pci_dev); + dev->pci_dev = NULL; } #endif - if (dev->net_dev) { + if (dev->registered) { unregister_netdev(dev->net_dev); - free_netdev(dev->net_dev); + dev->registered = 0; } return 0; } +static void +kni_dev_free(struct kni_dev *dev) +{ + struct net_device *net_dev; + /* + * Remember that struct kni_dev is part of the netdev + * structure, so we free *both* with free_netdev. + */ + if (dev == NULL) + return; + net_dev = dev->net_dev; + dev->net_dev = NULL; + if (net_dev) + free_netdev(net_dev); +} + static int kni_release(struct inode *inode, struct file *file) { @@ -224,6 +241,7 @@ kni_release(struct inode *inode, struct file *file) kni_dev_remove(dev); kni_net_release_fifo_phy(dev); list_del(&dev->list); + kni_dev_free(dev); } up_write(&knet->kni_list_lock); @@ -457,15 +475,18 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num, if (ret) { pr_err("error %i registering device \"%s\"\n", ret, dev_info.name); + kni_dev_remove(kni); kni_net_release_fifo_phy(kni); - free_netdev(net_dev); + kni_dev_free(kni); return -ENODEV; } + kni->registered = 1; ret = kni_run_thread(knet, kni, dev_info.force_bind); if (ret != 0) { kni_dev_remove(kni); kni_net_release_fifo_phy(kni); + kni_dev_free(kni); return ret; } @@ -550,6 +571,7 @@ kni_ioctl_free(struct net *net, uint32_t ioctl_num, kni_net_release_fifo_phy(dev); list_del(&dev->list); + kni_dev_free(dev); up_write(&knet->kni_list_lock); pr_info("Successfully freed kni interface: %s\n", dev_info.name);