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.133.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 4DD2030EF7E for ; Mon, 17 Nov 2025 07:27:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763364440; cv=none; b=RUUGyBpe/vArus/wOXJycd9vA/P9qaSR7f7MkUNHsloXLEdIb98KsYCsdtrOZFOs/LFVPmzvteQU1RKMbCWYslKEM+9nGxvr7X4RN41bwq8WiiYcMK20ej2Plk5OI4dgkFMYXSrDq5s+qNiyve0N0dyJRTLPNqcBc2UdZZpqWtE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763364440; c=relaxed/simple; bh=pZDfu12fHDg9J8tfCHVsKMOH1EzpTWEl4OvuFZkKjDE=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=CoE3QeJAdL5pZTVuQ1hhZI4TbL2p/ihBJj8KJA3T0Kp7zqp+nm7bbWHRW6AZvuqRD+a/Y8cA7zDTodkjBWrruu6k7jHS+p93pmc/4ZEwup2Aaio/Vpsn/Snvt3hLsMvdIwW6jzAylOTJnPJ3KONAKnieJc6gT15ENuXPcVZUXmo= 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=QYvjhlan; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=fsXFX5Qq; arc=none smtp.client-ip=170.10.133.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="QYvjhlan"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="fsXFX5Qq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763364437; 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=4XfReGVYt8gedLXNHKQWA8lz0lxzQsS/hZAf8h+4C/Q=; b=QYvjhlanyZygaP3t05zy2aqHbA8pJlXnRp2bYGle5EDMmAG6bRqBwVc6YPasVDucRdZRkU 4QBG3oJqTMPH4gets/67Wp+07yhVmbLg49Jkw8upxSnluVNMSNT1NOju0eElWAFjKfkZN2 9QWr+qa0dxlmy7gE0679/LsFKtVuWhQ= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-688-byiLDWDKNw206UFwyP1zBA-1; Mon, 17 Nov 2025 02:27:15 -0500 X-MC-Unique: byiLDWDKNw206UFwyP1zBA-1 X-Mimecast-MFC-AGG-ID: byiLDWDKNw206UFwyP1zBA_1763364434 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-42b3339cab7so3176674f8f.0 for ; Sun, 16 Nov 2025 23:27:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1763364434; x=1763969234; darn=vger.kernel.org; h=mime-version:user-agent:content-transfer-encoding:autocrypt :references:in-reply-to:date:cc:to:from:subject:message-id:from:to :cc:subject:date:message-id:reply-to; bh=4XfReGVYt8gedLXNHKQWA8lz0lxzQsS/hZAf8h+4C/Q=; b=fsXFX5QqKzISDPs7H5DBQ/cLMmjZFEC+j3CKx9/sO61i/Xk5wSc52g7KjxKgAAAa65 jMZ1pf/BDRVJcS6CvcYvUtaNvpBrBRx3CQB1zw1DBZzSCzctcXLAALMseTziySGrgmuI TAqPo7m7RM0iaw5rxn2yvRTPPL2pBOvdd94n19tDcrK46S0tDdcGowgNIGOBnKjR5xUm RmAbF0iMXVViAp0ZYbK9Je/0sFxafpB1JBU2gSf/667UKEYpPf5JK8vsfgKAxh7W8KGf 7LcpU3XrvwPEWhG9HxCB65uNKt0cg43MBIjFpwkwNDIbJpzcLFCBLGTF2dyC1repS5hJ C8hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763364434; x=1763969234; h=mime-version:user-agent:content-transfer-encoding:autocrypt :references:in-reply-to:date:cc:to:from:subject:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4XfReGVYt8gedLXNHKQWA8lz0lxzQsS/hZAf8h+4C/Q=; b=HqY3/95dTje1SErDe3UloKXUgnaOgzbsWsiPa4hFSrKcEywLRE3JmsOXRNgmlDNkOV fMYbqBi9m0DT7zVFrL6U7jkrmRjCs2f5TC312wJZBiS7HkZ16hadRSgnCb+1UodJqtzQ Z7iC54jJ0LyQhgXolDc/DyGAM4OYXFJsZnK4yiAzk9WEQ93w9qejTW76JxGEqzLHKHfH 8YN8ouZEbk72rplwqRNt/aNY/VvFw7K8USnpbBBAvF3ZrpCGPp0KQnJRFFODYCsX0hkk 94e/xkv+MA3LMD8N1toD6m8/eHO/PnvG7yl4jgloqJmZgRWNfmhMyzzYHqTfPmGlCqcq BIYQ== X-Forwarded-Encrypted: i=1; AJvYcCUNJQ02t/Hyhm7C5IjZdd5/af+OChxOGfb4LCfSuXrQV3dVArbotceRlkhkbNvAnPxkTODYgylztknnBz0=@vger.kernel.org X-Gm-Message-State: AOJu0Yyr2Bx+shzgdGTQsMMl7VHAb5ZeVd7QJ6gHfDYFUDSGWWWU0MKe iCh3x+tt+wXY0EOt0Un8/bUk3UDL5EtAq1Ev2NZ9WHO955B8VGG8aAckKiVc1dwMfFJEb2KDY8J ut4+g2bvoLaRkh/1HFeKkYpGAV1kRhS+nJBeK8293F5vqQYDYFx6Ij5OeLUi+3wjUdg== X-Gm-Gg: ASbGncte0MnGO13S33C1ZrJURxHZAr8GHQU++Jgk0Tp3+1RTXIgwq5HuWJHvx5air6U JziNxmt85db8hf20/QHm+S4QolqfMSje9/8+L4qZwFzy6ysqxWYUJM7lTlINwkjz+rs7DO4HxxW glG248DrWpsx8AjF7oOXVx9mE4ICQnHt3A5uX5zshxd0XBTKSI0BDi2gZSvVEKRgpgQM2BeWDFD WpXsIQDEdpsFds7/MM/BvoerIp9wyN65DrbrMrfCsqiDVjnqsjsvnNH1XqCMD4PPXk7pakBMTQh TaX8nc3tMKUig+xflbp7L2YAyjka2Tvx1k6iLogCDQGL5ritd3BPV82+yqhiUTCJgUzM4PwCnHE fgvA6d47tPOHyh+M2rhGX+6eg X-Received: by 2002:a05:6000:2405:b0:42b:3a84:1ec3 with SMTP id ffacd0b85a97d-42b5937ff2emr11469717f8f.29.1763364434307; Sun, 16 Nov 2025 23:27:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IEgv9n+I5f56kePGfs3qeSxsWE5OOS7Br5LF/KAhCLZiPZpVH4cHIjXXCVIYo7Ir4788yuzDA== X-Received: by 2002:a05:6000:2405:b0:42b:3a84:1ec3 with SMTP id ffacd0b85a97d-42b5937ff2emr11469693f8f.29.1763364433890; Sun, 16 Nov 2025 23:27:13 -0800 (PST) Received: from gmonaco-thinkpadt14gen3.rmtit.csb ([185.107.56.42]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42b53e7ae47sm24134429f8f.4.2025.11.16.23.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Nov 2025 23:27:13 -0800 (PST) Message-ID: Subject: Re: [PATCH 2/2] rv: Convert to use __free From: Gabriele Monaco To: Nam Cao , Steven Rostedt Cc: Masami Hiramatsu , Mathieu Desnoyers , linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 17 Nov 2025 08:27:11 +0100 In-Reply-To: <6b2a618815b45ac4ac09976ef4fb0bd3635c143d.1763306824.git.namcao@linutronix.de> References: <6b2a618815b45ac4ac09976ef4fb0bd3635c143d.1763306824.git.namcao@linutronix.de> Autocrypt: addr=gmonaco@redhat.com; prefer-encrypt=mutual; keydata=mDMEZuK5YxYJKwYBBAHaRw8BAQdAmJ3dM9Sz6/Hodu33Qrf8QH2bNeNbOikqYtxWFLVm0 1a0JEdhYnJpZWxlIE1vbmFjbyA8Z21vbmFjb0BrZXJuZWwub3JnPoiZBBMWCgBBFiEEysoR+AuB3R Zwp6j270psSVh4TfIFAmjKX2MCGwMFCQWjmoAFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgk Q70psSVh4TfIQuAD+JulczTN6l7oJjyroySU55Fbjdvo52xiYYlMjPG7dCTsBAMFI7dSL5zg98I+8 cXY1J7kyNsY6/dcipqBM4RMaxXsOtCRHYWJyaWVsZSBNb25hY28gPGdtb25hY29AcmVkaGF0LmNvb T6InAQTFgoARAIbAwUJBaOagAULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgBYhBMrKEfgLgd0WcK eo9u9KbElYeE3yBQJoymCyAhkBAAoJEO9KbElYeE3yjX4BAJ/ETNnlHn8OjZPT77xGmal9kbT1bC1 7DfrYVISWV2Y1AP9HdAMhWNAvtCtN2S1beYjNybuK6IzWYcFfeOV+OBWRDQ== Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.58.1 (3.58.1-1.fc43) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On Sun, 2025-11-16 at 15:35 +0000, Nam Cao wrote: > Convert to use __free to tidy up the code. >=20 > Signed-off-by: Nam Cao Both patches look very neat, thanks! I have a few comments on this one: > --- > =C2=A0kernel/trace/rv/rv.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 | 65 +++++++++++++++-------------------- > =C2=A0kernel/trace/rv/rv.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 |=C2=A0 6 ++-- > =C2=A0kernel/trace/rv/rv_reactors.c | 32 ++++++++--------- > =C2=A03 files changed, 46 insertions(+), 57 deletions(-) >=20 > diff --git a/kernel/trace/rv/rv.c b/kernel/trace/rv/rv.c > index b1059a3cf4fa..e83dc9f0c7bb 100644 > --- a/kernel/trace/rv/rv.c > +++ b/kernel/trace/rv/rv.c > @@ -420,35 +420,28 @@ static const struct file_operations interface_desc_= fops > =3D { > =C2=A0static int create_monitor_dir(struct rv_monitor *mon, struct rv_mon= itor > *parent) > =C2=A0{ > ...=C2=A0 > + mon->root_d =3D dir; > + retain_and_null_ptr(dir); I think you could just save a line by doing: + mon->root_d =3D no_free_ptr(dir); > =C2=A0 return 0; > - > -out_remove_root: > - rv_remove(mon->root_d); > - return retval; > =C2=A0} > =C2=A0 > =C2=A0/* > @@ -827,39 +820,37 @@ int __init rv_init_interface(void) > =C2=A0{ > =C2=A0 struct dentry *tmp; > =C2=A0 int retval; > + struct dentry *root_dir __free(rv_remove) =3D rv_create_dir("rv", > NULL); > =C2=A0 > - rv_root.root_dir =3D rv_create_dir("rv", NULL); > - if (!rv_root.root_dir) > - goto out_err; > + if (!root_dir) > + return 1; > =C2=A0 > - rv_root.monitors_dir =3D rv_create_dir("monitors", rv_root.root_dir); > + rv_root.monitors_dir =3D rv_create_dir("monitors", root_dir); > =C2=A0 if (!rv_root.monitors_dir) > - goto out_err; > + return 1; > =C2=A0 > - tmp =3D rv_create_file("available_monitors", RV_MODE_READ, > rv_root.root_dir, NULL, > + tmp =3D rv_create_file("available_monitors", RV_MODE_READ, root_dir, > NULL, > =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 &available_monitors_ops); > =C2=A0 if (!tmp) > - goto out_err; > + return 1; > =C2=A0 > - tmp =3D rv_create_file("enabled_monitors", RV_MODE_WRITE, > rv_root.root_dir, NULL, > + tmp =3D rv_create_file("enabled_monitors", RV_MODE_WRITE, root_dir, > NULL, > =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 &enabled_monitors_ops); > =C2=A0 if (!tmp) > - goto out_err; > + return 1; > =C2=A0 > - tmp =3D rv_create_file("monitoring_on", RV_MODE_WRITE, > rv_root.root_dir, NULL, > + tmp =3D rv_create_file("monitoring_on", RV_MODE_WRITE, root_dir, NULL, > =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 &monitoring_on_fops); > =C2=A0 if (!tmp) > - goto out_err; > - retval =3D init_rv_reactors(rv_root.root_dir); > + return 1; > + retval =3D init_rv_reactors(root_dir); > =C2=A0 if (retval) > - goto out_err; > + return 1; > =C2=A0 > =C2=A0 turn_monitoring_on(); > =C2=A0 > - return 0; > + rv_root.root_dir =3D root_dir; > + retain_and_null_ptr(root_dir); Same as above: + mon->root_d =3D no_free_ptr(root_dir); > =C2=A0 > -out_err: > - rv_remove(rv_root.root_dir); > - printk(KERN_ERR "RV: Error while creating the RV interface\n"); By removing this, you are also not logging in case of failure, right? I'm still liking to be rid of goto's, but what about moving this error repo= rting to the caller tracer_init_tracefs() ? > - return 1; > + return 0; > =C2=A0} > diff --git a/kernel/trace/rv/rv.h b/kernel/trace/rv/rv.h > index 1485a70c1bf4..8661d1b6ede4 100644 > --- a/kernel/trace/rv/rv.h > +++ b/kernel/trace/rv/rv.h > @@ -17,6 +17,8 @@ struct rv_interface { > =C2=A0#define rv_create_file tracefs_create_file > =C2=A0#define rv_remove tracefs_remove > =C2=A0 > +DEFINE_FREE(rv_remove, struct dentry *, rv_remove(_T)); It's kind of idiomatic to do things like `if (_T) free(_T)` in those. Although free (like tracefs_remove) checks for null, it's probably safer to= keep it that way here as well (as the entire system, including the return_ptr ma= gic relies on it): +DEFINE_FREE(rv_remove, struct dentry *, if (_T) rv_remove(_T)); > diff --git a/kernel/trace/rv/rv_reactors.c b/kernel/trace/rv/rv_reactors.= c > index 37d1d37a27a3..ce7d22cbde57 100644 > --- a/kernel/trace/rv/rv_reactors.c > +++ b/kernel/trace/rv/rv_reactors.c > @@ -438,30 +439,25 @@ static struct rv_reactor rv_nop =3D { > =C2=A0 > =C2=A0int init_rv_reactors(struct dentry *root_dir) > =C2=A0{ > - struct dentry *available, *reacting; > =C2=A0 int retval; > =C2=A0 > - available =3D rv_create_file("available_reactors", RV_MODE_READ, > root_dir, NULL, > - =C2=A0=C2=A0 &available_reactors_ops); > - if (!available) > - goto out_err; > + struct dentry *available __free(rv_remove) =3D > + rv_create_file("available_reactors", RV_MODE_READ, root_dir, > + NULL, &available_reactors_ops); > =C2=A0 > - reacting =3D rv_create_file("reacting_on", RV_MODE_WRITE, root_dir, > NULL, &reacting_on_fops); > - if (!reacting) > - goto rm_available; > + struct dentry *reacting =3D > + rv_create_file("reacting_on", RV_MODE_WRITE, root_dir, NULL, > &reacting_on_fops); Nothing is removing "reacting_on" in case of successive failure, is it? Am I missing anything or couldn't we just set both variables to __free() ? Thanks, Gabriele > + > + if (!reacting || !available) > + return -ENOMEM; > =C2=A0 > =C2=A0 retval =3D __rv_register_reactor(&rv_nop); > =C2=A0 if (retval) > - goto rm_reacting; > + return retval; > =C2=A0 > =C2=A0 turn_reacting_on(); > =C2=A0 > + retain_and_null_ptr(available); > + retain_and_null_ptr(reacting); > =C2=A0 return 0; > - > -rm_reacting: > - rv_remove(reacting); > -rm_available: > - rv_remove(available); > -out_err: > - return -ENOMEM; > =C2=A0}