From nobody Thu Dec 18 07:12:20 2025 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 C63061514EE for ; Fri, 14 Mar 2025 05:46:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741931193; cv=none; b=HQQJFTuqqXsBasHiUv90PPmDhUy+2zJ26Fr1eNsqZj/8Gw/VzhFYGy4tAN4IJe1O6HKDkRhqF3y4JjFqZLRCivdtu0WqOZAUz4tY98U4AOyYtwgAB6SgZrGaQNpSioK/ABO4SfN70TQ4mUEQHMJI4LjDI9S9DPqX0CkIooD5Uck= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741931193; c=relaxed/simple; bh=eI04HedwGrj5qLVlTsC440XRtGlC/SclPwlxp94Ld2E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d4XMZ+aZ3vvjf4FWCvkk8PPFkNMmHCoz+s0fgrqPT49jXm1G2Nf/Oc88EujT2Ge5lSziD0zPXZsiDDHtUDYNcj+qDm55MkY1MPh6cW90fkAzTlhwtR68mT+4o/14RIFm9imCOC4RWy8bA9U0C43myadNOne+aX8flst169Zsgig= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=VaOKzo0G; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="VaOKzo0G" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 52DNP1bY030636; Fri, 14 Mar 2025 05:46:18 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=rHiuokT753NlluXTP eZq8TFHySwH4S01ZogXJ3+Y+w0=; b=VaOKzo0GdpXRufdfxNuVB1cDGzh7EXbCf 6N1SJsJ/1iekCMyWfkCvn6FueLWNVqX2c7coXP2v30sy+DNTmBnFeEN+tDQZIh8T AIBZ/5ekJV9JJIbGq2A3zXJLKfUsEM95SNTcGQwy0pyGxLP/BglQ5f5hP5bOziwG RSC0Ao7aDdh9vImD6AUS7qPvJs79esS7eTcTBsDS6dNSy7BnxgMiSYc0DC+pRGYI agQFMS9jMZBy/5J7z9JbcTZtmC/NUvrNPtJn7OB3FhEmrQnusIBtx1BWrhImBk1w YDmJyyKbUW1sbJ3vLZJvNnKse3/yuM6ljwNLJRguPxrurMqw+JWyg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 45byd8vf8t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Mar 2025 05:46:17 +0000 (GMT) Received: from m0353729.ppops.net (m0353729.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 52E5kHUo031530; Fri, 14 Mar 2025 05:46:17 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 45byd8vf8q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Mar 2025 05:46:17 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 52E42Xb6003181; Fri, 14 Mar 2025 05:46:16 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 45atstwes5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Mar 2025 05:46:16 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 52E5kCrE56885648 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 14 Mar 2025 05:46:12 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CD9732004B; Fri, 14 Mar 2025 05:46:12 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 54AF820043; Fri, 14 Mar 2025 05:46:09 +0000 (GMT) Received: from li-7bb28a4c-2dab-11b2-a85c-887b5c60d769.ibm.com.com (unknown [9.39.22.126]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 14 Mar 2025 05:46:09 +0000 (GMT) From: Shrikanth Hegde To: maddy@linux.ibm.com, linuxppc-dev@lists.ozlabs.org Cc: sshegde@linux.ibm.com, npiggin@gmail.com, christophe.leroy@csgroup.eu, mpe@ellerman.id.au, peterz@infradead.org, fbarrat@linux.ibm.com, ajd@linux.ibm.com, mahesh@linux.ibm.com, oohall@gmail.com, hbathini@linux.ibm.com, dhowells@redhat.com, haren@linux.ibm.com, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] powerpc: rtas: use lock guard for mutex Date: Fri, 14 Mar 2025 11:15:40 +0530 Message-ID: <20250314054544.1998928-3-sshegde@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250314054544.1998928-1-sshegde@linux.ibm.com> References: <20250314054544.1998928-1-sshegde@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: IBlATTYsNKDMT8dsNglSO243_h1UCjor X-Proofpoint-ORIG-GUID: GLkJoCAn9DenybbOgYEdK--V0EnxENV3 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-14_01,2025-03-13_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 spamscore=0 malwarescore=0 impostorscore=0 priorityscore=1501 bulkscore=0 phishscore=0 lowpriorityscore=0 suspectscore=0 mlxlogscore=999 clxscore=1015 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2503140041 Content-Type: text/plain; charset="utf-8" use guard(mutex) for scope based resource management of mutex. This would make the code simpler and easier to maintain. More details on lock guards can be found at https://lore.kernel.org/all/20230612093537.614161713@infradead.org/T/#u Signed-off-by: Shrikanth Hegde --- arch/powerpc/kernel/rtas_flash.c | 64 ++++++++++---------------------- 1 file changed, 20 insertions(+), 44 deletions(-) diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_fl= ash.c index 5407024881e5..583dc16e9d3c 100644 --- a/arch/powerpc/kernel/rtas_flash.c +++ b/arch/powerpc/kernel/rtas_flash.c @@ -312,13 +312,13 @@ static ssize_t rtas_flash_write(struct file *file, co= nst char __user *buffer, { struct rtas_update_flash_t *const uf =3D &rtas_update_flash_data; char *p; - int next_free, rc; + int next_free; struct flash_block_list *fl; =20 - mutex_lock(&rtas_update_flash_mutex); + guard(mutex)(&rtas_update_flash_mutex); =20 if (uf->status =3D=3D FLASH_AUTH || count =3D=3D 0) - goto out; /* discard data */ + return count; /* discard data */ =20 /* In the case that the image is not ready for flashing, the memory * allocated for the block list will be freed upon the release of the=20 @@ -327,7 +327,7 @@ static ssize_t rtas_flash_write(struct file *file, cons= t char __user *buffer, if (uf->flist =3D=3D NULL) { uf->flist =3D kmem_cache_zalloc(flash_block_cache, GFP_KERNEL); if (!uf->flist) - goto nomem; + return -ENOMEM; } =20 fl =3D uf->flist; @@ -338,7 +338,7 @@ static ssize_t rtas_flash_write(struct file *file, cons= t char __user *buffer, /* Need to allocate another block_list */ fl->next =3D kmem_cache_zalloc(flash_block_cache, GFP_KERNEL); if (!fl->next) - goto nomem; + return -ENOMEM; fl =3D fl->next; next_free =3D 0; } @@ -347,25 +347,17 @@ static ssize_t rtas_flash_write(struct file *file, co= nst char __user *buffer, count =3D RTAS_BLK_SIZE; p =3D kmem_cache_zalloc(flash_block_cache, GFP_KERNEL); if (!p) - goto nomem; + return -ENOMEM; =09 if(copy_from_user(p, buffer, count)) { kmem_cache_free(flash_block_cache, p); - rc =3D -EFAULT; - goto error; + return -EFAULT; } fl->blocks[next_free].data =3D p; fl->blocks[next_free].length =3D count; fl->num_blocks++; -out: - mutex_unlock(&rtas_update_flash_mutex); - return count; =20 -nomem: - rc =3D -ENOMEM; -error: - mutex_unlock(&rtas_update_flash_mutex); - return rc; + return count; } =20 /* @@ -405,19 +397,18 @@ static ssize_t manage_flash_write(struct file *file, = const char __user *buf, static const char reject_str[] =3D "0"; static const char commit_str[] =3D "1"; char stkbuf[10]; - int op, rc; + int op; =20 - mutex_lock(&rtas_manage_flash_mutex); + guard(mutex)(&rtas_manage_flash_mutex); =20 if ((args_buf->status =3D=3D MANAGE_AUTH) || (count =3D=3D 0)) - goto out; + return count; =09 op =3D -1; if (buf) { if (count > 9) count =3D 9; - rc =3D -EFAULT; if (copy_from_user (stkbuf, buf, count)) - goto error; + return -EFAULT; if (strncmp(stkbuf, reject_str, strlen(reject_str)) =3D=3D 0)=20 op =3D RTAS_REJECT_TMP_IMG; else if (strncmp(stkbuf, commit_str, strlen(commit_str)) =3D=3D 0)=20 @@ -425,18 +416,11 @@ static ssize_t manage_flash_write(struct file *file, = const char __user *buf, } =09 if (op =3D=3D -1) { /* buf is empty, or contains invalid string */ - rc =3D -EINVAL; - goto error; + return -EINVAL; } =20 manage_flash(args_buf, op); -out: - mutex_unlock(&rtas_manage_flash_mutex); return count; - -error: - mutex_unlock(&rtas_manage_flash_mutex); - return rc; } =20 /* @@ -499,16 +483,14 @@ static ssize_t validate_flash_write(struct file *file= , const char __user *buf, { struct rtas_validate_flash_t *const args_buf =3D &rtas_validate_flash_data; - int rc; =20 - mutex_lock(&rtas_validate_flash_mutex); + guard(mutex)(&rtas_validate_flash_mutex); =20 /* We are only interested in the first 4K of the * candidate image */ if ((*off >=3D VALIDATE_BUF_SIZE) ||=20 (args_buf->status =3D=3D VALIDATE_AUTH)) { *off +=3D count; - mutex_unlock(&rtas_validate_flash_mutex); return count; } =20 @@ -519,20 +501,14 @@ static ssize_t validate_flash_write(struct file *file= , const char __user *buf, args_buf->status =3D VALIDATE_INCOMPLETE; } =20 - if (!access_ok(buf, count)) { - rc =3D -EFAULT; - goto done; - } - if (copy_from_user(args_buf->buf + *off, buf, count)) { - rc =3D -EFAULT; - goto done; - } + if (!access_ok(buf, count)) + return -EFAULT; + + if (copy_from_user(args_buf->buf + *off, buf, count)) + return -EFAULT; =20 *off +=3D count; - rc =3D count; -done: - mutex_unlock(&rtas_validate_flash_mutex); - return rc; + return count; } =20 static int validate_flash_release(struct inode *inode, struct file *file) --=20 2.39.3