From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by dpdk.org (Postfix) with ESMTP id 41E962A58 for ; Wed, 5 Jul 2017 16:35:57 +0200 (CEST) Received: by mail-wm0-f54.google.com with SMTP id w126so224195550wme.0 for ; Wed, 05 Jul 2017 07:35:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=MiEUjwQCSKH2/7UytP8UcpJjFkJo3QnWgFBQEdhO028=; b=Lr3MehxCFdZxRsO6+LlEt5NWm62fx3wearK3tWMRYCNfzpr8ghdd/iTAN3pbsKpxq0 UBj5u/axwxfpeLPZtxOq5WBslkpXt99Xa5ERpJ/bfAZPVpHrEGcbgSCvBaU6982MjGCo YO34NrEI4VeY3M2dR11pSc1j7Ari1rwCcAQUDpgTXBCiIr65A+066ZX2HOlGb0h3bd2R WHsC8Bi0NWD8RGQtc1v5FY3lFblG/FJ/M1kzB3ZNUjG8su56ap0MNqcH9T4BjeHWdU0q l7vnRRf9kLK0P1ANi5dzyzXtqliF6CmbNdTrgLoS3YYSg7XHURdE4iF/51r1uKhcwt1P x6pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=MiEUjwQCSKH2/7UytP8UcpJjFkJo3QnWgFBQEdhO028=; b=WzMObncK2whWktEpBXJJ95n8Yy1IJXRx9e9pCXoOaGlyPJG+nzBQ9WYvYda8M/zr+e 9HlFs+MpM7AvGWa3Uqz5kgCXyyzPnPM4pS35UXXSu0OJzXOZUnsykKlZpaYHEmLIEFVU ctSBA/rztZzChXxdqunZfFumfk3agXTZfmSQoEweWYO1Iwr+7DkLkw150yPtbiSrzbSY /RRhPQiaWsRy/Ww8IYy1dY75OMFYQTfUmXqQTl2qlaZLUN/IZoodMaQxqB4Xvfal5Emo BLRwjot6yisr1scTBd7d17O9K6VZjYPpNlylmjFye6DJB42THzbgVgVVu8k8G4YxEiZH oOyg== X-Gm-Message-State: AKS2vOwyuRFnWW0P00IUVmktm5ahkFN75oeth3F6cnFg74Zr3UU9BW3l 4UpNMIqdPaZwZVOl X-Received: by 10.28.29.21 with SMTP id d21mr30769321wmd.37.1499265356840; Wed, 05 Jul 2017 07:35:56 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id t62sm4577235wmb.24.2017.07.05.07.35.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 07:35:55 -0700 (PDT) Date: Wed, 5 Jul 2017 16:35:47 +0200 From: Adrien Mazarguil To: Vasily Philipov Cc: dev@dpdk.org, Nelio Laranjeiro , stable@dpdk.org Message-ID: <20170705143547.GA19852@6wind.com> References: <513298ea9e590eda85def2ef4bc7029879dbcb32.1499243201.git.vasilyf@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <513298ea9e590eda85def2ef4bc7029879dbcb32.1499243201.git.vasilyf@mellanox.com> Subject: Re: [dpdk-dev] [PATCH] net/mlx4: fix mbuf poisoning in debug code 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: , X-List-Received-Date: Wed, 05 Jul 2017 14:35:57 -0000 On Wed, Jul 05, 2017 at 02:49:22PM +0300, Vasily Philipov wrote: > 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") > CC: stable@dpdk.org > > Signed-off-by: Vasily Philipov Thanks Vasily, except for the minor nit below, 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 16cafae..03c5c98 100644 > --- a/drivers/net/mlx4/mlx4.c > +++ b/drivers/net/mlx4/mlx4.c > @@ -3008,6 +3008,13 @@ struct txq_mp2mr_mbuf_check_data { > NB_SEGS(rep) = 0x2a; > PORT(rep) = 0x2a; > rep->ol_flags = -1; > + /* > + * Clear special flags in membuf to avoid "membuf" => "mbuf" > + * 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. */ > -- > 1.8.3.1 > -- Adrien Mazarguil 6WIND