From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 209303D332A for ; Mon, 30 Mar 2026 13:13:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774876392; cv=none; b=m0Z3aWIK/VOsHs6DDloAvAN57scwMKnK4SjVSjedYnXJziX/mMqEnVdK3tD3MkpWaPzERnxrAQme/MHeH3BSX7tK2mYGc8CTFAgUmvk6GP/hQWh5GWJVnPGuV9+keN6VA8ju9G6fuugsrsOcwjYMEKmL+NL0vFkA3EK2FvemFJQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774876392; c=relaxed/simple; bh=1B8TDAFwpLGHwiDqq4lc4BeRA9+0ahIvheZoJR/1alo=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=lawfqg7FgSM3nWJQLgrWINScxlYGiAvpie/eVfIBTlidebwhe8OfFHKp0b8q9hnagoRilN7gmKiOJZ4hpfecWYMGwBJrLYNSHVpjHEoiDqoGMeHmp5Ojf6cNQiSXfQ5jFO0uvwx7pypx9qQm6DqZ1pr5Mq7EUcDPsSOP6NlzcUA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=TgDgnMXu; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=kIoRXkWS; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="TgDgnMXu"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="kIoRXkWS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774876390; 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: in-reply-to:in-reply-to:references:references; bh=JUo0/wHcRmQzbX45cbbWi4ZZUfa7cbgmLMG4WHaF32c=; b=TgDgnMXubbTMc2S4OQ9C3FtseK+1w4oNmOhQTkPEyDvhwJxzjEA6GZhdkbATQDo7r1bIWY vXJuC32BxV3eOyvNHBY/38l19aFXdwYazdu8r7NG1ea4nvf/JTsNQ7aC5wuIU/rXASNvTX rkSuCFpWjzQzbMvEZs/i48nq/lHxDv4= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-107-KWLgW377N9OnpuEFvEq2AQ-1; Mon, 30 Mar 2026 09:13:08 -0400 X-MC-Unique: KWLgW377N9OnpuEFvEq2AQ-1 X-Mimecast-MFC-AGG-ID: KWLgW377N9OnpuEFvEq2AQ_1774876387 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-89c4ec516e5so221308776d6.0 for ; Mon, 30 Mar 2026 06:13:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1774876387; x=1775481187; darn=vger.kernel.org; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=JUo0/wHcRmQzbX45cbbWi4ZZUfa7cbgmLMG4WHaF32c=; b=kIoRXkWSMfpZFaT9BNZxi1L2HTIn36z2AQEdB2cZS4a6zQdcWSDG2zLIhTQ/f5u1If ZRNVIwYkpG6lVjt/UunMnTecxXTJWctWv9aN3cv8uil8NsTwXqbp9/QroizT+dWl1V/W SCDwFrylNlJPeEj9jg9o09biAOH+AhZVkkn7zEs+l+P+HaNk4mV8JyKrAMPWKX2DulcL KgQakbR7EEJoml88E+73Yj2RPYUZD+J3rpKlDkewNF4MMZL7Swj+B2z1McgnJ/q0E+t6 GnpyTA6ncmNzpVwAnvBTniUISI/Zax3Sg9OA8A9gNagDuQhxvKrHKBgBpOUy1W/jrMnP JY6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774876387; x=1775481187; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=JUo0/wHcRmQzbX45cbbWi4ZZUfa7cbgmLMG4WHaF32c=; b=LckRZWLZAjqM82YLd9oUyttZLcG9/Cnm/hkusnIFmhoXhcwOFVe5VMxGqElWXrm1ua PjghyD67nRhhUQsgY0jsDVPJ+dhWoNyIhEy7JhGF9SOVSrMGS3TrUK4L4WzqJgLh5waX fOuYl+tllSJjW6MDjGm8s64XdGe+UdQ1rmjJWUCoFlUM2hYgqzI1YGmVAU/N8NFLz56A nGDR2Ngm0fxgs0DCs32136442eAmkEWQXQp8qg/cpyqEi/KgX6JdVHrA1bIhXETfMTvm ow54b6xbBsKOIcWuAYVh1fBsaOJWqr+ZEKMkra5wDpPXYNPjHUEeSfZweQlhHXCaDywR nqfQ== X-Forwarded-Encrypted: i=1; AJvYcCWofhduEY0u53JosprgVc1NOkm5wSw6XzU43C6WuGEqcN40mc/iC4szjlyIkwAf7R6BH8SxRchGBCLiIco=@vger.kernel.org X-Gm-Message-State: AOJu0YwUXj94TAqHfOJ+Y0E3BwC0GlLX92xKi891d2Y1VsxjebxGtZuG OSvGWMfRgCabxSuv8LZiStSUZ5QIsvFzgK/dkfThgQiFJ/bzd4BQCeiB7qwxQk1vzLeXNvfEgZU JJJ4TIbI8/Nl1jEwjNL6M/BkKISoRRVB9UxEhKQKsfobWvIAFwUeLy/S9I5uX0JSymA== X-Gm-Gg: ATEYQzxJ/9Iqj1uQinYvHIJVyEDXatVCXvDGwrUX8p79DeihwF2bROUwNbMNmwjd5Wz SPQN5q9oJ8vAQaPFrLLGfqvTJtELbYwpeBzrqUJiLkT4yEOCZKVnIaCZDq2Sq3c0LW2PM3JngG4 AKqYlzMgMvSo22KVGwmw7K0MmacDRO8LQGD3Nfse374YEY4q7bdWvijqO8fkdrP/YhGj6K3iUwr vAe1+tTQQiBy0xhZAbA8JpoaC8QD8cLzJZutDcf1K5jjtxWKQ1T3UZuzJD6HfLtEqRU5e7wpA5H KSpEmUR3NbnCt1OSzBq5Fw1TlruVWaSD5CGYF6YAyj3xgzFboGaClJCJZ5/uxexXwCaZbiBo+lE OCY681MFnsi09TK5aIi8/2hqTXByZ8RmIEGFy2IoTHZcqE031rm//YHbq X-Received: by 2002:a05:6214:4105:b0:8a0:22bb:1d3c with SMTP id 6a1803df08f44-8a022bb1fb2mr76477646d6.3.1774876387553; Mon, 30 Mar 2026 06:13:07 -0700 (PDT) X-Received: by 2002:a05:6214:4105:b0:8a0:22bb:1d3c with SMTP id 6a1803df08f44-8a022bb1fb2mr76476806d6.3.1774876386785; Mon, 30 Mar 2026 06:13:06 -0700 (PDT) Received: from redhat.com (c-73-183-52-120.hsd1.pa.comcast.net. [73.183.52.120]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-89ec6ec2266sm63989576d6.0.2026.03.30.06.13.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2026 06:13:06 -0700 (PDT) Date: Mon, 30 Mar 2026 09:13:04 -0400 From: Brian Masney To: Rosen Penev Cc: linux-clk@vger.kernel.org, Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Michael Turquette , Stephen Boyd , Kees Cook , "Gustavo A. R. Silva" , "moderated list:ARM/Marvell Kirkwood and Armada 370, 375, 38x,..." , open list , "open list:KERNEL HARDENING (not covered by other areas):Keyword:b__counted_by(_le|_be)?b" Subject: Re: [PATCH] clk: kirkwood: use kzalloc_flex Message-ID: References: <20260326045555.240730-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260326045555.240730-1-rosenp@gmail.com> User-Agent: Mutt/2.3.0 (2026-01-25) On Wed, Mar 25, 2026 at 09:55:55PM -0700, Rosen Penev wrote: > Simplify allocation by using a flexible array member and kzalloc_flex to > combine allocations. > > Add __counted_by for extra runtime analysis. Move counting variable > assignment to right after allocation as required by __counted_by. > > Signed-off-by: Rosen Penev > --- > drivers/clk/mvebu/kirkwood.c | 19 ++++++++----------- > 1 file changed, 8 insertions(+), 11 deletions(-) > > diff --git a/drivers/clk/mvebu/kirkwood.c b/drivers/clk/mvebu/kirkwood.c > index ed061d82fb65..fc2972538008 100644 > --- a/drivers/clk/mvebu/kirkwood.c > +++ b/drivers/clk/mvebu/kirkwood.c > @@ -253,8 +253,8 @@ struct clk_muxing_soc_desc { > > struct clk_muxing_ctrl { > spinlock_t *lock; > - struct clk **muxes; > int num_muxes; > + struct clk *muxes[] __counted_by(num_muxes); > }; > > static const char *powersave_parents[] = { > @@ -297,21 +297,18 @@ static void __init kirkwood_clk_muxing_setup(struct device_node *np, > if (WARN_ON(!base)) > return; > > - ctrl = kzalloc_obj(*ctrl); > - if (WARN_ON(!ctrl)) > - goto ctrl_out; > - > - /* lock must already be initialized */ > - ctrl->lock = &ctrl_gating_lock; > - > /* Count, allocate, and register clock muxes */ > for (n = 0; desc[n].name;) > n++; > > + ctrl = kzalloc_flex(*ctrl, muxes, n); > + if (WARN_ON(!ctrl)) > + goto ctrl_out; > + > ctrl->num_muxes = n; > - ctrl->muxes = kzalloc_objs(struct clk *, ctrl->num_muxes); > - if (WARN_ON(!ctrl->muxes)) > - goto muxes_out; Question from Sashiko: https://sashiko.dev/#/patchset/20260326045555.240730-1-rosenp%40gmail.com This isn't a bug, but since the goto muxes_out error path was removed here, should the muxes_out label and its kfree(ctrl) be removed at the end of the function? They appear to be dead code now and might cause an unused label warning: return; muxes_out: kfree(ctrl); ctrl_out: iounmap(base); } Brian > + > + /* lock must already be initialized */ > + ctrl->lock = &ctrl_gating_lock; > > for (n = 0; n < ctrl->num_muxes; n++) { > ctrl->muxes[n] = clk_register_mux(NULL, desc[n].name, > -- > 2.53.0 >