From: wangyunjian <wangyunjian@huawei.com> To: <dev@dpdk.org> Cc: <david.marchand@redhat.com>, <thomas@monjalon.net>, <anatoly.burakov@intel.com>, <jerry.lilijun@huawei.com>, <xudingke@huawei.com>, Yunjian Wang <wangyunjian@huawei.com>, <stable@dpdk.org> Subject: [dpdk-stable] [dpdk-dev] [PATCH v4] eal: fix create user mem map repeatedly when it exists Date: Mon, 7 Dec 2020 19:08:49 +0800 Message-ID: <1607339329-624-1-git-send-email-wangyunjian@huawei.com> (raw) In-Reply-To: <1602840525-8848-1-git-send-email-wangyunjian@huawei.com> From: Yunjian Wang <wangyunjian@huawei.com> Currently, user mem maps will check if the newly mapped area is adjacent to any existing mapping, but will not check if the mapping is identical because it assumes that the API will never get called with the same mapping twice. This will result in duplicate entries in the user mem maps list. Fix it by also checking for duplicate mappings, and skipping them if they are found. Fixes: 0cbce3a167f1 ("vfio: skip DMA map failure if already mapped") Cc: stable@dpdk.org Signed-off-by: Yunjian Wang <wangyunjian@huawei.com> Acked-by: Anatoly Burakov <anatoly.burakov@intel.com> --- v4: Update commit log suggested by Anatoly Burakov --- lib/librte_eal/linux/eal_vfio.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/librte_eal/linux/eal_vfio.c b/lib/librte_eal/linux/eal_vfio.c index 050082444e..0967215783 100644 --- a/lib/librte_eal/linux/eal_vfio.c +++ b/lib/librte_eal/linux/eal_vfio.c @@ -168,6 +168,10 @@ adjust_map(struct user_mem_map *src, struct user_mem_map *end, static int merge_map(struct user_mem_map *left, struct user_mem_map *right) { + /* merge the same maps into one */ + if (memcmp(left, right, sizeof(struct user_mem_map)) == 0) + goto out; + if (left->addr + left->len != right->addr) return 0; if (left->iova + left->len != right->iova) @@ -175,6 +179,7 @@ merge_map(struct user_mem_map *left, struct user_mem_map *right) left->len += right->len; +out: memset(right, 0, sizeof(*right)); return 1; -- 2.23.0
prev parent reply other threads:[~2020-12-07 11:09 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-16 13:38 [dpdk-stable] [PATCH 1/1] eal/linux: do not " wangyunjian 2020-07-17 14:19 ` [dpdk-stable] [dpdk-dev] " Burakov, Anatoly 2020-07-17 14:23 ` Burakov, Anatoly 2020-07-20 2:00 ` wangyunjian 2020-07-20 11:46 ` Burakov, Anatoly 2020-07-22 12:47 ` wangyunjian 2020-07-23 14:48 ` [dpdk-stable] [dpdk-dev] [PATCH v2] " wangyunjian 2020-07-24 13:25 ` Burakov, Anatoly 2020-07-25 9:59 ` wangyunjian 2020-07-27 9:24 ` Burakov, Anatoly 2020-07-30 13:16 ` wangyunjian 2020-07-31 11:55 ` Burakov, Anatoly 2020-08-05 12:58 ` wangyunjian 2020-09-17 11:33 ` Burakov, Anatoly 2020-09-17 11:35 ` Burakov, Anatoly 2020-10-15 12:46 ` wangyunjian 2020-10-15 12:54 ` David Marchand 2020-10-16 9:48 ` wangyunjian 2020-10-16 9:28 ` [dpdk-stable] [dpdk-dev] [PATCH v3] eal: fix " wangyunjian 2020-10-20 14:09 ` Thomas Monjalon 2020-11-15 14:23 ` Thomas Monjalon 2020-11-22 18:20 ` Thomas Monjalon 2020-11-23 7:40 ` wangyunjian 2020-11-27 12:54 ` Burakov, Anatoly 2020-12-07 11:08 ` wangyunjian [this message]
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1607339329-624-1-git-send-email-wangyunjian@huawei.com \ --to=wangyunjian@huawei.com \ --cc=anatoly.burakov@intel.com \ --cc=david.marchand@redhat.com \ --cc=dev@dpdk.org \ --cc=jerry.lilijun@huawei.com \ --cc=stable@dpdk.org \ --cc=thomas@monjalon.net \ --cc=xudingke@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git