From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by dpdk.org (Postfix) with ESMTP id 9B75829CB for ; Fri, 14 Jul 2017 12:36:52 +0200 (CEST) Received: by mail-pf0-f194.google.com with SMTP id q85so10557711pfq.2 for ; Fri, 14 Jul 2017 03:36:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pio7+qWYT2lEiXgXr0InvEcKbTYpg+gkQTNb7YaxHQA=; b=mqzPdPk3pmykKsf1Lay7K7hmVFhrrSA6mY95GUOmUL1IkiL25U1uE5+MHVpmkhN/S8 w1p5fA1zZc6tESSVsmg9hub9z9UEZjb2K37Tmp+PwADujlgLnxZwvUZQOA5y/B4gvGzn /4LJbcK9rLOZRupC7iY7N5AG7HqkgCk2IWk1kmhmTuiJFD4o29RtfFlB4Nmnhc3BjZm4 FBaRfX5q3G1sUB5P2pds4YQ2YhIXM3ExbFhxk5s0GiTf/o5HGN4B10Llwx5BLok9K/yk HJ//zSTMHoobmeZzDK+HXshUdi7OdovGANxs/Ue2bg+GFwdwrfK8pOUmrbka0WNus2MY y/aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pio7+qWYT2lEiXgXr0InvEcKbTYpg+gkQTNb7YaxHQA=; b=e56K9k/0tpQffXGyGW7W6kq9yc5Yfp4dZkARP6CF0z+JFBrfL0wf/gHgVCCwyDQgQX dbmrX4AdEW4vNOeVIDKNFK7HJN7S+YMrbd9tO+qyIY2LZXnZfEjTxk/YgIiBnSTUAF16 TS8qyTKtSlp3LoyPnBH4fgKiB1utJo5ov1grHArK/gK1h1yrEv79wMYKU6foJdPQ/1lR FQpdlfe7KTCkkov1iQBhc565Cgv4M36KY1jdQr5W8Xx+CpwRWQKe7gE9l3qYQm/ySRqI mLbu6dV5mm5RpOH7Rcnr8gxp0/TjIWb4ZToEN+kpAjLuPxRsaMO1yvg4eRFziUCJQo++ 6hRA== X-Gm-Message-State: AIVw111cIgfBErhvZe7YsuWy+HlsYr4rxvrj8eRUg2bwooyBMp9szIWX 8hw4ojKmTskmNCQ1 X-Received: by 10.84.231.199 with SMTP id g7mr15468963pln.258.1500028611965; Fri, 14 Jul 2017 03:36:51 -0700 (PDT) Received: from localhost.localdomain ([180.158.48.171]) by smtp.gmail.com with ESMTPSA id y205sm15273553pfb.124.2017.07.14.03.36.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Jul 2017 03:36:50 -0700 (PDT) From: Yuanhan Liu To: Vasily Philipov Cc: Adrien Mazarguil , dpdk stable Date: Fri, 14 Jul 2017 18:34:03 +0800 Message-Id: <1500028450-25989-39-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500028450-25989-1-git-send-email-yliu@fridaylinux.org> References: <1500028450-25989-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/mlx4: fix mbuf poisoning in debug code' has been queued to LTS release 16.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jul 2017 10:36:52 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/19/17. So please shout if anyone has objections. Thanks. --yliu --- >>From 496d42edbb06743f6a178038c334983c32ac862a Mon Sep 17 00:00:00 2001 From: Vasily Philipov Date: Wed, 5 Jul 2017 14:49:22 +0300 Subject: [PATCH] net/mlx4: fix mbuf poisoning in debug code [ upstream commit 4be06219012181c6f500c8f23440baaf7d4d3618 ] In debug mode, all mbuf ol_flags are temporarily enabled while sitting in the Rx queue to detect otherwise silent data corruption, however some of them are special (indirect and control) and must be cleared before returning mbufs to the pool to avoid crashing. Fixes: 7fae69eeff13 ("mlx4: new poll mode driver") Signed-off-by: Vasily Philipov Acked-by: Adrien Mazarguil --- drivers/net/mlx4/mlx4.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 83f9143..f682413 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -3157,6 +3157,13 @@ mlx4_rx_burst_sp(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n) NB_SEGS(rep) = 0x2a; PORT(rep) = 0x2a; rep->ol_flags = -1; + /* + * Clear special flags in mbuf to avoid + * crashing while freeing. + */ + rep->ol_flags &= + ~(uint64_t)(IND_ATTACHED_MBUF | + CTRL_MBUF_FLAG); #endif assert(rep->buf_len == seg->buf_len); /* Reconfigure sge to use rep instead of seg. */ -- 2.7.4