From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 01C98A04C5 for ; Fri, 4 Sep 2020 16:59:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EA52F1C0BD; Fri, 4 Sep 2020 16:59:36 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id DE3FF1C0BD for ; Fri, 4 Sep 2020 16:59:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599231575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=OZNSoGg7taxq+1e8BPVnKwiKjAuTluDka5jE4W+ZV/o=; b=OjvV0yxAnx/peJuFC0ddMt2jwWTSjUBp4ROwLowm7A4ArxtcZBJlmyY9YBtSZkCpawjUe6 F9YLPqu15GFYDBy5An2Hru9gU8n5vhD2FyFKVH9smW4YMCGTJCZJqkR7R1S55tgruWhvAE aXkn7fMNqQENrVdSydOpXto1jNMXQFE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-41-sia6cLAfPK-HfrmhQPHLqQ-1; Fri, 04 Sep 2020 10:59:31 -0400 X-MC-Unique: sia6cLAfPK-HfrmhQPHLqQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F39D8100CCB6; Fri, 4 Sep 2020 14:59:12 +0000 (UTC) Received: from [10.33.36.103] (unknown [10.33.36.103]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6DFF16571; Fri, 4 Sep 2020 14:59:11 +0000 (UTC) To: Rahul Lakkireddy Cc: stable@dpdk.org References: <1599222867-25240-1-git-send-email-rahul.lakkireddy@chelsio.com> <2cb588e2-b5ff-3d39-4dc7-650a57bb32d0@redhat.com> <20200904143034.GA25421@chelsio.com> From: Kevin Traynor Autocrypt: addr=ktraynor@redhat.com; keydata= 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 Message-ID: <8a3a1c4d-f658-3fa1-acb4-ac334ef634d1@redhat.com> Date: Fri, 4 Sep 2020 15:59:10 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20200904143034.GA25421@chelsio.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US Subject: Re: [dpdk-stable] [PATCH 18.11] net/cxgbe: fix L2T leak in filter error and free path 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On 04/09/2020 15:33, Rahul Lakkireddy wrote: > On Friday, September 09/04/20, 2020 at 15:10:43 +0100, Kevin Traynor wrote: >> On 04/09/2020 13:34, Rahul Lakkireddy wrote: >>> [ upstream commit e0e1496be5fcabd31807ef9981c421963a9f8578 ] >>> >>> Free up Layer 2 Table (L2T) entry properly during filter create >>> failure and filter delete. >>> >>> Fixes: 1decc62b1cbe ("net/cxgbe: add flow operations to offload VLAN actions") >>> >>> Signed-off-by: Rahul Lakkireddy >>> --- >> >> Thanks Rahul. There was a bit of fuzz when applying because I had >> rebased below locally. >> >> net/cxgbe: fix double MPS alloc by flow validate and create >> >> [ upstream commit be5f4d5ced10f9d7edc8ba4b3f1d98b9d476d367 ] >> >> Both commits are in the queue, please take a look and let me know if any >> issue. >> >> https://github.com/kevintraynor/dpdk-stable-queue/commit/b82919008c7462a0f2e117e65210754ccb7470f1 >> >> https://github.com/kevintraynor/dpdk-stable-queue/commit/7d482e8b14c7436f73e0497b6f1a0f00e0dc6eba >> >> Kevin. >> > > Hi Kevin, > > Could you move the cxgbe_l2t_release() above the cxgbe_mpstcam_remove()? > Like below: > Sure > if (f->l2t) > cxgbe_l2t_release(f->l2t); > > if (f->fs.mask.macidx) > cxgbe_mpstcam_remove(pi, f->fs.val.macidx); > > Let me know if you want me to resend the patch on top of > dpdk-stable-queue tree with the fuzz fixed. > No need. I've done it here: https://github.com/kevintraynor/dpdk-stable-queue/commit/02647630a2f0be86f3daea2cc753c90357d46f85 > Thanks, > Rahul > >>> drivers/net/cxgbe/cxgbe_filter.c | 29 ++++++++++++++++------------- >>> 1 file changed, 16 insertions(+), 13 deletions(-) >>> >>> diff --git a/drivers/net/cxgbe/cxgbe_filter.c b/drivers/net/cxgbe/cxgbe_filter.c >>> index 489c23249..0b6629895 100644 >>> --- a/drivers/net/cxgbe/cxgbe_filter.c >>> +++ b/drivers/net/cxgbe/cxgbe_filter.c >>> @@ -276,6 +276,9 @@ static void clear_filter(struct filter_entry *f) >>> if (f->clipt) >>> cxgbe_clip_release(f->dev, f->clipt); >>> >>> + if (f->l2t) >>> + cxgbe_l2t_release(f->l2t); >>> + >>> /* The zeroing of the filter rule below clears the filter valid, >>> * pending, locked flags etc. so it's all we need for >>> * this operation. >>> @@ -711,19 +714,6 @@ static int set_filter_wr(struct rte_eth_dev *dev, unsigned int fidx) >>> unsigned int port_id = ethdev2pinfo(dev)->port_id; >>> int ret; >>> >>> - /* >>> - * If the new filter requires loopback Destination MAC and/or VLAN >>> - * rewriting then we need to allocate a Layer 2 Table (L2T) entry for >>> - * the filter. >>> - */ >>> - if (f->fs.newvlan) { >>> - /* allocate L2T entry for new filter */ >>> - f->l2t = cxgbe_l2t_alloc_switching(f->dev, f->fs.vlan, >>> - f->fs.eport, f->fs.dmac); >>> - if (!f->l2t) >>> - return -ENOMEM; >>> - } >>> - >>> ctrlq = &adapter->sge.ctrlq[port_id]; >>> mbuf = rte_pktmbuf_alloc(ctrlq->mb_pool); >>> if (!mbuf) { >>> @@ -1015,6 +1005,19 @@ int cxgbe_set_filter(struct rte_eth_dev *dev, unsigned int filter_id, >>> } >>> } >>> >>> + /* If the new filter requires loopback Destination MAC and/or VLAN >>> + * rewriting then we need to allocate a Layer 2 Table (L2T) entry for >>> + * the filter. >>> + */ >>> + if (f->fs.newvlan) { >>> + f->l2t = cxgbe_l2t_alloc_switching(f->dev, f->fs.vlan, >>> + f->fs.eport, f->fs.dmac); >>> + if (!f->l2t) { >>> + ret = -ENOMEM; >>> + goto free_tid; >>> + } >>> + } >>> + >>> /* >>> * Attempt to set the filter. If we don't succeed, we clear >>> * it and return the failure. >>> >> >