Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp2492963ybl; Thu, 29 Aug 2019 08:55:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqxyucE+DPODVh9gGAx3Wa23wgX9EtztvEH6bv2JWuNVmVGcf7xQmrz/QV00NBxQUjYNYy4S X-Received: by 2002:aa7:8a86:: with SMTP id a6mr12336436pfc.76.1567094141798; Thu, 29 Aug 2019 08:55:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567094141; cv=none; d=google.com; s=arc-20160816; b=IFvjCEmBlLWCivrP0ViDHY7bYNAB2nAaKt9DqLxHsG3hhKYCmRcs7nb+F4hhi0Mm6r 33MR1B5VW2I8d2ShdCNsCNLX4MCWBDmj2RaIkoHtjZOw+hNlfj3njhW3eOo9E81q1Vn5 ZHPMd+De3qe3vHL7vdWNRdcfTDBdGlBkyZ7eUMAgIB7won3PnWSiqn50/XcJPjOcdVuU uQIWhNZ8OwMyUb/1O1IX8CcUxfu2v8R6128qX36d02kLGgeiJXX5wVLq2LwK6lSZ9QiL bx79/cCnK5+NvuspKxwTk+MZlzzmBrTKDvPx3oBdgMF0OKhodOWXonOrPueEG+qFqFCl 8m/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=ioZ+JfnsUUD8UiGNxKeFQMLhM3bnVtElsPe+wTUng7A=; b=HmqKwpuGu3d5GCIt0k7hqNSt9U7rC946CkAJk9U0dfSNbQM5YOsMmpzoixIGoKZWpS Vm4w6s6rQIEmD3JbkKmCYt+TyVvPTsoev6gEqdpV3E5QDLW+l1h+1fhu4/3eGL3sjVLC uTAL6nwF8sieoZU0GwYf8rRrdPgjTLrgkuGR9S9DhMoyP/kB4xwtpKfHikIeFVs3t/4+ 9dI218Q4VwLXMmH6fwZqf5dGWlZZAHNYVQ0uX8tqHndvq8WexQ1y3+AKlF9E+0io+ORH mGZr5S1h5AIohOXWGGsh1uUb6CHNaukj7Lyka2s6ewqxIGlx4unbjZWCtp1HeUzVMs0K 88sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=ZGwkXiJH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b5si2322228pgi.324.2019.08.29.08.55.25; Thu, 29 Aug 2019 08:55:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=ZGwkXiJH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728320AbfH2PxJ (ORCPT + 99 others); Thu, 29 Aug 2019 11:53:09 -0400 Received: from mail-qk1-f196.google.com ([209.85.222.196]:40044 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727122AbfH2PxJ (ORCPT ); Thu, 29 Aug 2019 11:53:09 -0400 Received: by mail-qk1-f196.google.com with SMTP id f10so3375718qkg.7; Thu, 29 Aug 2019 08:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=ioZ+JfnsUUD8UiGNxKeFQMLhM3bnVtElsPe+wTUng7A=; b=ZGwkXiJHqAtV+JCPJOeiRPEL19aCTJG0iUo1GcyA13cQXILHAX71nOjecvBWnxh33S /I76lZ80uyyYxLB+BwAFHTIEgiWBKPQ4tbZ1PC6Q9VVA6sSFcrat7NmGapzjPQ0I3Bqt 5rqWkN+uqw49TlREjShKZxY+d0FbxhvZciKk2kOh7bscxdTNuy00hZwY58BSUsnrcXE3 +f9DP7dTz6EwsOJKQ6Q6uox/0PPe8w7wUbOkI8jky8+W8uXrkEhGHt7u//bpCR21cUxQ XvaShzQ4s4IWaclSTZ1kxjbU9BcEpx/jsKlyWeQ69iG44mLZJF0eEexc0vQy/GXrorhQ 62Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=ioZ+JfnsUUD8UiGNxKeFQMLhM3bnVtElsPe+wTUng7A=; b=Bnm96XRnP6eFIjtTGrBW+f1vNyqo3B2px5GVL92hqbE2DGfylRDPw5sdKwPB8P6O/M q8n3xuRGW/nj0v4zWLum36QQ5PhnOfQ2bNAxBTqmU+ecnJIOYIL92E7+X3Zg35hyoyOJ YXvRcZ2h4mQoGvSujBxxwEInk7NBOrbiYwPHLwamvpWVvI5gj0yQQFU/SBB8LVpycBv+ 0EIO4DmeGWGUX5js7gKVh1mt2wXp5cnVBKZEGU0rd9Y95xZqij/5r8eNKnrbCdVuVoBJ TcnFye3dpXB7TM33D56CS+rGUmhZUNHFp8labCUOvJRB1V8VDeTAwtczYQXYLweZ5O6J RwCA== X-Gm-Message-State: APjAAAWMA3YEtvgyunnXDxf7jMrtNIs6rHbAVQt+QydHiU4i3BLLyxLg e2q248zI3E4ScCe1hWQPczY= X-Received: by 2002:a37:8e06:: with SMTP id q6mr9566213qkd.89.1567093988083; Thu, 29 Aug 2019 08:53:08 -0700 (PDT) Received: from localhost ([2620:10d:c091:500::1:7e32]) by smtp.gmail.com with ESMTPSA id h13sm1359655qkk.12.2019.08.29.08.53.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Aug 2019 08:53:07 -0700 (PDT) Date: Thu, 29 Aug 2019 08:53:06 -0700 From: Tejun Heo To: axboe@kernel.dk, newella@fb.com, clm@fb.com, josef@toxicpanda.com, dennisz@fb.com, lizefan@huawei.com, hannes@cmpxchg.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, kernel-team@fb.com, cgroups@vger.kernel.org, Josef Bacik , Rik van Riel Subject: [PATCH] blkcg: fix missing free on error path of blk_iocost_init() Message-ID: <20190829155306.GV2263813@devbig004.ftw2.facebook.com> References: <20190828220600.2527417-1-tj@kernel.org> <20190828220600.2527417-9-tj@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190828220600.2527417-9-tj@kernel.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org blk_iocost_init() forgot to free its percpu stat on the error path. Fix it. Signed-off-by: Tejun Heo Reported-by: Hillf Danton --- block/blk-iocost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index f04a4ed1cb45..9c8046ac5925 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -1876,6 +1876,7 @@ static int blk_iocost_init(struct request_queue *q) ret = blkcg_activate_policy(q, &blkcg_policy_iocost); if (ret) { rq_qos_del(q, rqos); + free_percpu(ioc->pcpu_stat); kfree(ioc); return ret; }