Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/41890/?format=api
{ "id": 41890, "url": "http://patches.dpdk.org/api/patches/41890/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20180628224823.19423-1-dg@adax.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20180628224823.19423-1-dg@adax.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180628224823.19423-1-dg@adax.com", "date": "2018-06-28T22:48:23", "name": "[03/10] kni: don't touch struct kni_dev after freeing", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "95d3767a8c6d1bf19607b2ba339938b776380a5a", "submitter": { "id": 1040, "url": "http://patches.dpdk.org/api/people/1040/?format=api", "name": "Dan Gora", "email": "dg@adax.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20180628224823.19423-1-dg@adax.com/mbox/", "series": [ { "id": 301, "url": "http://patches.dpdk.org/api/series/301/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=301", "date": "2018-06-28T22:45:13", "name": "kni: Interface detach and link status fixes.", "version": 1, "mbox": "http://patches.dpdk.org/series/301/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/41890/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/41890/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id A92CB37AF;\n\tFri, 29 Jun 2018 00:51:26 +0200 (CEST)", "from mail-ot0-f194.google.com (mail-ot0-f194.google.com\n\t[74.125.82.194]) by dpdk.org (Postfix) with ESMTP id 4451A31FC\n\tfor <dev@dpdk.org>; Fri, 29 Jun 2018 00:51:25 +0200 (CEST)", "by mail-ot0-f194.google.com with SMTP id h6-v6so7966140otj.0\n\tfor <dev@dpdk.org>; Thu, 28 Jun 2018 15:51:25 -0700 (PDT)", "from linux.adax.com (172-11-198-60.lightspeed.sntcca.sbcglobal.net.\n\t[172.11.198.60]) by smtp.gmail.com with ESMTPSA id\n\tj29-v6sm3735537oth.60.2018.06.28.15.51.23\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tThu, 28 Jun 2018 15:51:23 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=sender:from:to:cc:subject:date:message-id;\n\tbh=fGC1/toUFvY8asYAO6HL+f7p7INZeOaqNCTBQH8reiw=;\n\tb=nWJ4YXoKo6/cToyF9ZZaK+tzo0VUdy1IHvF+x7n9hm4AZ2ObmTBV++V2s+K6RzTKud\n\t+qz1OsOezsqOL6dasdUE2T5jZ/BZjRoXqPWHC1shl5qaptCw8M4V6AsL7SZlzDa1Npsy\n\tgULRzE1I7TPPBol0TsyBpMnBkzPOzf4nswhSsYjRWtj31CvU5FdnN46Dqu7s0EcEM1G5\n\tU/iFdro/gvf2L0e/UvRzGY88PTIYF2THBFfGXsfKoTWQIN4Blo1F2z41LFfWyL9EwOdZ\n\tu9tM95Twq7O6rdVrSStfzFEhKQIEeivDLpbvR+m423xiR3PirYzejbDpzyh6yffJ8ETB\n\tfxhQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:from:to:cc:subject:date:message-id;\n\tbh=fGC1/toUFvY8asYAO6HL+f7p7INZeOaqNCTBQH8reiw=;\n\tb=XNhp1OvJpTzDbGwPcHy2oc6tQwMfp2F+Z8zRooFkXnVrDRmtvRlypq6h0FSnXjB0h8\n\tIIQpNIsFMGy8ZSCrtTG7860sEIfaSKVqrH2CNzyFvkeJm55phGR7JFdWJZQxgGbCo7pj\n\tOin43xH0r/u7KURGstHJNSzbjBDcHLR3H3hs8kL6IJeZ5bTgShFgFPbmnGK0q8a/uhGd\n\tGp3qjTGk/qcjj6IWZ8pnZamVZ5GAkVcO1KDbUk2TrVkqCeVwYPosVPg/kRRxcd9Nodsh\n\tZLJ5dPigSe1InmCqj36dN8mmM/ggsQ0LgB8l6JQ0/ckHgX68yXHtpCpMXPuoZU3CIEMh\n\t+Hmw==", "X-Gm-Message-State": "APt69E3/Z8Tw4laZUDn2N1Y0xWX99iCBolRsexA7nYUYzQqfhAbfAx6E\n\tBWvk8kAfQu5QEZk+ESQx6Xc=", "X-Google-Smtp-Source": "AAOMgpcLm1+WC4ijHd94HTIHNXQ5kukemfAmYbsAKS3DJDM35ZP41y3gawu5nXzsqSEcEczlsNJicg==", "X-Received": "by 2002:a9d:6a1:: with SMTP id 30-v6mr6677898otx.3.1530226284423;\n\tThu, 28 Jun 2018 15:51:24 -0700 (PDT)", "From": "Dan Gora <dg@adax.com>", "To": "Ferruh Yigit <ferruh.yigit@intel.com>", "Cc": "dev@dpdk.org,\n\tDan Gora <dg@adax.com>", "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\n\tfreeing", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Since the struct kni_dev is allocated as part of the netdev with\nalloc_netdev, when free_netdev is called, this also frees the struct\nkni_dev embedded in it.\n\nThis means that we cannot touch struct kni_dev after calling\nfree_netdev since that memory was already deallocated.\n\nSeparate unregistering the net_dev with unregister_netdev from freeing\nthe net_device and kni_dev structures into separate functions and\nensure that we do not touch anything in the kni_dev structure after\nfreeing it (ie don't call list_del(), etc...).\n\nSigned-off-by: Dan Gora <dg@adax.com>\n---\n kernel/linux/kni/kni_dev.h | 1 +\n kernel/linux/kni/kni_misc.c | 28 +++++++++++++++++++++++++---\n 2 files changed, 26 insertions(+), 3 deletions(-)", "diff": "diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h\nindex ed42989cc..f9aa90ff9 100644\n--- a/kernel/linux/kni/kni_dev.h\n+++ b/kernel/linux/kni/kni_dev.h\n@@ -37,6 +37,7 @@ struct kni_dev {\n \tstruct list_head list;\n \n \tstruct net_device_stats stats;\n+\tuint16_t registered; /* 0 if already released, 1 otherwise */\n \tuint16_t group_id; /* Group ID of a group of KNI devices */\n \tuint32_t core_id; /* Core ID to bind */\n \tchar name[RTE_KNI_NAMESIZE]; /* Network device name */\ndiff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c\nindex d889ffc4b..1c38cfa1a 100644\n--- a/kernel/linux/kni/kni_misc.c\n+++ b/kernel/linux/kni/kni_misc.c\n@@ -184,17 +184,34 @@ kni_dev_remove(struct kni_dev *dev)\n \t\t\tixgbe_kni_remove(dev->pci_dev);\n \t\telse if (pci_match_id(igb_pci_tbl, dev->pci_dev))\n \t\t\tigb_kni_remove(dev->pci_dev);\n+\t\tdev->pci_dev = NULL;\n \t}\n #endif\n \n-\tif (dev->net_dev) {\n+\tif (dev->registered) {\n \t\tunregister_netdev(dev->net_dev);\n-\t\tfree_netdev(dev->net_dev);\n+\t\tdev->registered = 0;\n \t}\n \n \treturn 0;\n }\n \n+static void\n+kni_dev_free(struct kni_dev *dev)\n+{\n+\tstruct net_device *net_dev;\n+\t/*\n+\t * Remember that struct kni_dev is part of the netdev\n+\t * structure, so we free *both* with free_netdev.\n+\t */\n+\tif (dev == NULL)\n+\t\treturn;\n+\tnet_dev = dev->net_dev;\n+\tdev->net_dev = NULL;\n+\tif (net_dev)\n+\t\tfree_netdev(net_dev);\n+}\n+\n static int\n kni_release(struct inode *inode, struct file *file)\n {\n@@ -224,6 +241,7 @@ kni_release(struct inode *inode, struct file *file)\n \t\tkni_dev_remove(dev);\n \t\tkni_net_release_fifo_phy(dev);\n \t\tlist_del(&dev->list);\n+\t\tkni_dev_free(dev);\n \t}\n \tup_write(&knet->kni_list_lock);\n \n@@ -457,15 +475,18 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,\n \tif (ret) {\n \t\tpr_err(\"error %i registering device \\\"%s\\\"\\n\",\n \t\t\t\t\tret, dev_info.name);\n+\t\tkni_dev_remove(kni);\n \t\tkni_net_release_fifo_phy(kni);\n-\t\tfree_netdev(net_dev);\n+\t\tkni_dev_free(kni);\n \t\treturn -ENODEV;\n \t}\n+\tkni->registered = 1;\n \n \tret = kni_run_thread(knet, kni, dev_info.force_bind);\n \tif (ret != 0) {\n \t\tkni_dev_remove(kni);\n \t\tkni_net_release_fifo_phy(kni);\n+\t\tkni_dev_free(kni);\n \t\treturn ret;\n \t}\n \n@@ -550,6 +571,7 @@ kni_ioctl_free(struct net *net, uint32_t ioctl_num,\n \n \t\tkni_net_release_fifo_phy(dev);\n \t\tlist_del(&dev->list);\n+\t\tkni_dev_free(dev);\n \t\tup_write(&knet->kni_list_lock);\n \t\tpr_info(\"Successfully freed kni interface: %s\\n\",\n \t\t\tdev_info.name);\n", "prefixes": [ "03/10" ] }