From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 DA662321431; Mon, 18 Aug 2025 10:22:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755512551; cv=none; b=eL4by8ZIqrfmvXXNwheQSePznLoB2QPLSmqnKYI2yU+eQ1Bz8vDrW66FYwNdXNRQna2akn4F+VNWT56e4CTpu4/Ye4mHqfDndrJcTG3DbDGRgCK6tDeq2QCPe9QGZ5o8QNhu3D4bU3E3k8hvo4ezOmRxWYI5KIzYyGua49U4ouU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755512551; c=relaxed/simple; bh=CfqE/a0AYWhHeGM4omJMHc7qbh6ZqyeekgnvNGExtTk=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=t1Lk3nXApVPK2WBgfcEJ9gYX1tc8/Rz5H5FsZehvL657jHPI8FBHmBwEvMqlmsh6O6vaGK56ZXz77IJHmkXbSibGSWarRNLvcXD8vFAmblRIjk3Ex13uA9GG3YoYAmu2x+lC8HmKB332Ywr+1hOSvyRxGEJrTUyqB01wo9G5SU4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=SF9naEHS; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=aEQSfpII; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="SF9naEHS"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="aEQSfpII" Date: Mon, 18 Aug 2025 10:22:27 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1755512548; h=from:from:sender:sender:reply-to: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; bh=6v7KspcXNZRUeewopSwi2W9EzONUPKEhYP9BfeJZ4TU=; b=SF9naEHSmcfAoyMxS+XNTNEdN1qb9R3B1GpYM3b6BbXCkYuUVEP8CishKforiSk413kZIT mJrA7EGfZHbWbBiZkdJT9GWqJ5jK5jxWHvg4nyVtAM+gG2G10Ob6u6Sjt5iIY/zoAAb80T pXbmm4O8cMNoMfqrB1GqYrUE6xJGqRplEh9qdi4b0jUjFt0jSqWo00xXWj78XO3LtfL5NE FGvFPLKGT7mSYIvTIXoZQyVC6TXmPS0Mx/92TBbFPwKeIwD7iwqb+Zczy9hKxv1gClZQSx +McFDM2IU51BkT2+MjGQoElsP7jMnv1rbxIVQiCCFEqxRjwVX0ryAKYF4mUrLA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1755512548; h=from:from:sender:sender:reply-to: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; bh=6v7KspcXNZRUeewopSwi2W9EzONUPKEhYP9BfeJZ4TU=; b=aEQSfpII1xmYii5wp13z/k5YOAeGfjMWiJLS92CAwoJ6WI3Rj4IEn4HX9lIofap/Fdah08 NIGJiUWrVsNlIgCw== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] perf: Reflow to get rid of aux_success label Cc: "Peter Zijlstra (Intel)" , Lorenzo Stoakes , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20250812104019.362581570@infradead.org> References: <20250812104019.362581570@infradead.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <175551254711.1420.1426722808953103975.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the perf/core branch of tip: Commit-ID: 8558dca9fbdf825edf30b5fb74fbbbf3e6ba5dce Gitweb: https://git.kernel.org/tip/8558dca9fbdf825edf30b5fb74fbbbf3e6b= a5dce Author: Peter Zijlstra AuthorDate: Tue, 12 Aug 2025 12:39:07 +02:00 Committer: Peter Zijlstra CommitterDate: Fri, 15 Aug 2025 13:13:00 +02:00 perf: Reflow to get rid of aux_success label Mostly re-indent noise needed to get rid of that label. Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Lorenzo Stoakes Link: https://lore.kernel.org/r/20250812104019.362581570@infradead.org --- kernel/events/core.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 236c60a..5bbea81 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7130,30 +7130,29 @@ static int perf_mmap(struct file *file, struct vm_are= a_struct *vma) if (rb_has_aux(rb)) { atomic_inc(&rb->aux_mmap_count); ret =3D 0; - goto aux_success; - } =20 - if (!perf_mmap_calc_limits(vma, &user_extra, &extra)) { - ret =3D -EPERM; - atomic_dec(&rb->mmap_count); - goto unlock; - } + } else { + if (!perf_mmap_calc_limits(vma, &user_extra, &extra)) { + ret =3D -EPERM; + atomic_dec(&rb->mmap_count); + goto unlock; + } =20 - WARN_ON(!rb && event->rb); + WARN_ON(!rb && event->rb); =20 - if (vma->vm_flags & VM_WRITE) - flags |=3D RING_BUFFER_WRITABLE; + if (vma->vm_flags & VM_WRITE) + flags |=3D RING_BUFFER_WRITABLE; =20 - ret =3D rb_alloc_aux(rb, event, vma->vm_pgoff, nr_pages, - event->attr.aux_watermark, flags); - if (ret) { - atomic_dec(&rb->mmap_count); - goto unlock; - } + ret =3D rb_alloc_aux(rb, event, vma->vm_pgoff, nr_pages, + event->attr.aux_watermark, flags); + if (ret) { + atomic_dec(&rb->mmap_count); + goto unlock; + } =20 - atomic_set(&rb->aux_mmap_count, 1); - rb->aux_mmap_locked =3D extra; -aux_success: + atomic_set(&rb->aux_mmap_count, 1); + rb->aux_mmap_locked =3D extra; + } perf_mmap_account(vma, user_extra, extra); atomic_inc(&event->mmap_count); }